From 176906e7667eace650cf58781ef3975acbc60d27 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 1 Jun 2020 16:22:13 +0100 Subject: [PATCH] server side workflows --- .../builderStore/store/workflow/Workflow.js | 37 ++-- .../src/builderStore/store/workflow/index.js | 8 +- .../EventsEditor/StateBindingCascader.svelte | 8 - .../PropertyCascader/PropertyCascader.svelte | 121 ----------- .../StateBindingOptions.svelte | 63 ------ .../userInterface/PropertyCascader/index.js | 1 - .../userInterface/StateBindingControl.svelte | 55 +++-- .../WorkflowPanel/BlockList/BlockList.svelte | 4 +- .../workflow/[workflow]/_layout.svelte | 3 + packages/client/src/api/workflow/index.js | 76 ++++++- .../client/src/api/workflow/orchestrator.js | 5 +- packages/server/package.json | 3 +- .../server/src/api/controllers/instance.js | 2 +- .../workflow/actions/SEND_EMAIL.js | 3 +- packages/server/src/events/index.js | 36 ++-- packages/server/src/events/workflow.js | 52 +++++ packages/server/yarn.lock | 195 +++++++++++++++++- 17 files changed, 394 insertions(+), 278 deletions(-) delete mode 100644 packages/builder/src/components/userInterface/PropertyCascader/PropertyCascader.svelte delete mode 100644 packages/builder/src/components/userInterface/PropertyCascader/StateBindingOptions.svelte delete mode 100644 packages/builder/src/components/userInterface/PropertyCascader/index.js create mode 100644 packages/server/src/events/workflow.js diff --git a/packages/builder/src/builderStore/store/workflow/Workflow.js b/packages/builder/src/builderStore/store/workflow/Workflow.js index d50e16b5da..e2bc5c1ee2 100644 --- a/packages/builder/src/builderStore/store/workflow/Workflow.js +++ b/packages/builder/src/builderStore/store/workflow/Workflow.js @@ -11,19 +11,16 @@ export default class Workflow { this.workflow = workflow } - isEmpty() { - return this.workflow.definition.trigger.length === 0 + hasTrigger() { + return this.workflow.definition.trigger } addBlock(block) { // Make sure to add trigger if doesn't exist - // if (this.isEmpty()) { - // this.workflow.definition.triggers.push({ - // id: generate(), - // ...block, - // }) - // return; - // } + if (!this.hasTrigger()) { + this.workflow.definition.trigger = { id: generate(), ...block } + return; + } this.workflow.definition.steps.push({ id: generate(), @@ -33,23 +30,27 @@ export default class Workflow { updateBlock(updatedBlock, id) { const { steps, trigger } = this.workflow.definition - // TODO: Account for trigger + + if (trigger && trigger.id === id) { + this.workflow.definition.trigger = null + return + } const stepIdx = steps.findIndex(step => step.id === id) - if (stepIdx < 0) throw new Error("Block not found.") - steps.splice(stepIdx, 1, updatedBlock) } deleteBlock(id) { const { steps, trigger } = this.workflow.definition - // TODO: Account for trigger + + if (trigger && trigger.id === id) { + this.workflow.definition.trigger = null + return + } const stepIdx = steps.findIndex(step => step.id === id) - if (stepIdx < 0) throw new Error("Block not found.") - steps.splice(stepIdx, 1) } @@ -59,7 +60,7 @@ export default class Workflow { } static buildUiTree(definition) { - return definition.steps.map(step => { + const steps = definition.steps.map(step => { // The client side display definition for the block const definition = blockDefinitions[step.type][step.actionId] if (!definition) { @@ -87,5 +88,9 @@ export default class Workflow { name: definition.name, } }) + + console.log(definition); + + return definition.trigger ? [definition.trigger, ...steps] : steps } } diff --git a/packages/builder/src/builderStore/store/workflow/index.js b/packages/builder/src/builderStore/store/workflow/index.js index b41bb8d8f7..cc403115b4 100644 --- a/packages/builder/src/builderStore/store/workflow/index.js +++ b/packages/builder/src/builderStore/store/workflow/index.js @@ -13,8 +13,12 @@ const workflowActions = store => ({ }) }, create: async ({ instanceId, name }) => { - // TODO: set these defaults in the backend - const workflow = { name, definition: { trigger: {}, steps: [] } } + const workflow = { + name, + definition: { + steps: [] + } + }; const CREATE_WORKFLOW_URL = `/api/${instanceId}/workflows` const response = await api.post(CREATE_WORKFLOW_URL, workflow) const json = await response.json() diff --git a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte index 37681aa399..2f72d98672 100644 --- a/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte +++ b/packages/builder/src/components/userInterface/EventsEditor/StateBindingCascader.svelte @@ -10,7 +10,6 @@ allHandlers, } from "components/common/eventHandlers" import { store, workflowStore } from "builderStore" - import StateBindingOptions from "../PropertyCascader/StateBindingOptions.svelte" import { ArrowDownIcon } from "components/common/Icons/" export let parameter @@ -38,13 +37,6 @@ - {#if isOpen} - { - onChange(option) - isOpen = false - }} /> - {/if} {/if} diff --git a/packages/builder/src/components/userInterface/PropertyCascader/PropertyCascader.svelte b/packages/builder/src/components/userInterface/PropertyCascader/PropertyCascader.svelte deleted file mode 100644 index dba1001f8f..0000000000 --- a/packages/builder/src/components/userInterface/PropertyCascader/PropertyCascader.svelte +++ /dev/null @@ -1,121 +0,0 @@ - - -
-
- { - setBindingFallback(e.target.value) - onChanged(e.target.value) - }} /> - -
- {#if isOpen} - { - onChanged(option) - isOpen = false - }} /> - {/if} -
- - diff --git a/packages/builder/src/components/userInterface/PropertyCascader/StateBindingOptions.svelte b/packages/builder/src/components/userInterface/PropertyCascader/StateBindingOptions.svelte deleted file mode 100644 index 06f8289a34..0000000000 --- a/packages/builder/src/components/userInterface/PropertyCascader/StateBindingOptions.svelte +++ /dev/null @@ -1,63 +0,0 @@ - - -
    - {#each options as option} -
  • onSelect(`${option.name}.`)}> - {option.name} - {option.description} -
    • - {/each} -
- - diff --git a/packages/builder/src/components/userInterface/PropertyCascader/index.js b/packages/builder/src/components/userInterface/PropertyCascader/index.js deleted file mode 100644 index 2a2573830a..0000000000 --- a/packages/builder/src/components/userInterface/PropertyCascader/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from "./PropertyCascader.svelte" diff --git a/packages/builder/src/components/userInterface/StateBindingControl.svelte b/packages/builder/src/components/userInterface/StateBindingControl.svelte index a89b805e5b..57a6bf13f9 100644 --- a/packages/builder/src/components/userInterface/StateBindingControl.svelte +++ b/packages/builder/src/components/userInterface/StateBindingControl.svelte @@ -2,7 +2,6 @@ import { backendUiStore } from "builderStore" import IconButton from "../common/IconButton.svelte" import Input from "../common/Input.svelte" - // import PropertyCascader from "./PropertyCascader" import Colorpicker from "../common/Colorpicker.svelte" export let value = "" @@ -22,34 +21,32 @@ size="19" on:click={() => onChanged(!value)} /> - {:else if type === 'models'} - - {:else if type === 'options' || type === 'models'} - - {:else} - + {:else if type === 'models'} + + {:else if type === 'options' || type === 'models'} + {/if} diff --git a/packages/builder/src/components/workflow/WorkflowPanel/BlockList/BlockList.svelte b/packages/builder/src/components/workflow/WorkflowPanel/BlockList/BlockList.svelte index b173f30f15..523545a929 100644 --- a/packages/builder/src/components/workflow/WorkflowPanel/BlockList/BlockList.svelte +++ b/packages/builder/src/components/workflow/WorkflowPanel/BlockList/BlockList.svelte @@ -13,7 +13,7 @@ $: { if ( - !$workflowStore.currentWorkflow.isEmpty() && + $workflowStore.currentWorkflow.hasTrigger() && selectedTab === "TRIGGER" ) { selectedTab = "ACTION" @@ -23,7 +23,7 @@
- {#if $workflowStore.currentWorkflow.isEmpty()} + {#if !$workflowStore.currentWorkflow.hasTrigger()} + store.setCurrentPage($params.page) + \ No newline at end of file diff --git a/packages/client/src/api/workflow/index.js b/packages/client/src/api/workflow/index.js index 795dafca20..94cd6fb6f8 100644 --- a/packages/client/src/api/workflow/index.js +++ b/packages/client/src/api/workflow/index.js @@ -1,11 +1,73 @@ -import Orchestrator, { clientStrategy } from "./orchestrator" +import { get } from "svelte/store" +import mustache from "mustache" +import { appStore } from "../../state/store" +import Orchestrator from "./orchestrator"; +import clientActions from "./actions" -export const triggerWorkflow = api => ({ workflow }) => { - const workflowOrchestrator = new Orchestrator( - api, - "inst_ad75c7f_4f3e7d5d80a74b17a5187a18e2aba85e" - ) +// Execute a workflow from a running budibase app +export const clientStrategy = ({ api, instanceId }) => ({ + context: {}, + bindContextArgs: function(args) { + const mappedArgs = { ...args } + + // bind the workflow action args to the workflow context, if required + for (let arg in args) { + const argValue = args[arg] + + // We don't want to render mustache templates on non-strings + if (typeof argValue !== "string") continue + + // Render the string with values from the workflow context and state + mappedArgs[arg] = mustache.render(argValue, { + context: this.context, + state: get(appStore), + }) + } + + return mappedArgs + }, + run: async function(workflow) { + for (let block of workflow.steps) { + console.log("Executing workflow block", block) + + // This code gets run in the browser + if (block.environment === "CLIENT") { + const action = clientActions[block.actionId] + await action({ + context: this.context, + args: this.bindContextArgs(block.args), + id: block.id, + }) + } + + // this workflow block gets executed on the server + if (block.environment === "SERVER") { + const EXECUTE_WORKFLOW_URL = `/api/${instanceId}/workflows/action` + const response = await api.post({ + url: EXECUTE_WORKFLOW_URL, + body: { + action: block.actionId, + args: this.bindContextArgs(block.args, api), + }, + }) + + this.context = { + ...this.context, + [block.actionId]: response, + } + } + } + }, +}) + +export const triggerWorkflow = api => async ({ workflow }) => { + const instanceId = "inst_ad75c7f_4f3e7d5d80a74b17a5187a18e2aba85e"; + + const workflowOrchestrator = new Orchestrator(api, instanceId) workflowOrchestrator.strategy = clientStrategy - workflowOrchestrator.execute(workflow) + const EXECUTE_WORKFLOW_URL = `/api/${instanceId}/workflows/${workflow}` + const workflowDefinition = await api.get({ url: EXECUTE_WORKFLOW_URL }) + + workflowOrchestrator.execute(workflowDefinition) } diff --git a/packages/client/src/api/workflow/orchestrator.js b/packages/client/src/api/workflow/orchestrator.js index e69e41b918..df0520409a 100644 --- a/packages/client/src/api/workflow/orchestrator.js +++ b/packages/client/src/api/workflow/orchestrator.js @@ -20,10 +20,7 @@ export default class Orchestrator { this._strategy = strategy({ api: this.api, instanceId: this.instanceId }) } - async execute(workflowId) { - const EXECUTE_WORKFLOW_URL = `/api/${this.instanceId}/workflows/${workflowId}` - const workflow = await this.api.get({ url: EXECUTE_WORKFLOW_URL }) - + async execute(workflow) { if (workflow.live) { this._strategy.run(workflow.definition) } diff --git a/packages/server/package.json b/packages/server/package.json index 6e2d095655..52a7200fee 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -28,7 +28,7 @@ "test:watch": "jest -w", "initialise": "node ../cli/bin/budi init -b local -q", "budi": "node ../cli/bin/budi", - "dev:builder": "node ../cli/bin/budi run", + "dev:builder": "nodemon ../cli/bin/budi run", "electron": "electron src/electron.js", "build:electron": "electron-builder --dir", "publish:electron": "electron-builder -mwl --publish always", @@ -61,6 +61,7 @@ "koa-session": "^5.12.0", "koa-static": "^5.0.0", "lodash": "^4.17.13", + "mustache": "^4.0.1", "pino-pretty": "^4.0.0", "pouchdb": "^7.2.1", "pouchdb-all-dbs": "^1.0.2", diff --git a/packages/server/src/api/controllers/instance.js b/packages/server/src/api/controllers/instance.js index 4e6db897d5..fe40cf9fb4 100644 --- a/packages/server/src/api/controllers/instance.js +++ b/packages/server/src/api/controllers/instance.js @@ -32,7 +32,7 @@ exports.create = async function(ctx) { by_workflow_trigger: { map: function(doc) { if (doc.type === "workflow") { - const trigger = doc.definition.next + const trigger = doc.definition.trigger if (trigger) { emit([trigger.event], trigger) } diff --git a/packages/server/src/api/controllers/workflow/actions/SEND_EMAIL.js b/packages/server/src/api/controllers/workflow/actions/SEND_EMAIL.js index ef582781b8..b56e95defa 100644 --- a/packages/server/src/api/controllers/workflow/actions/SEND_EMAIL.js +++ b/packages/server/src/api/controllers/workflow/actions/SEND_EMAIL.js @@ -14,9 +14,10 @@ module.exports = async function sendEmail(args) { await sgMail.send(msg) return { success: true, - err, + ...args, } } catch (err) { + console.error(err) return { success: false, err, diff --git a/packages/server/src/events/index.js b/packages/server/src/events/index.js index 5c386e97b6..93b08bd1d8 100644 --- a/packages/server/src/events/index.js +++ b/packages/server/src/events/index.js @@ -1,37 +1,33 @@ const EventEmitter = require("events").EventEmitter const CouchDB = require("../db") +const { Orchestrator, serverStrategy } = require("./workflow"); const emitter = new EventEmitter() -async function determineWorkflowsToTrigger(instanceId, event) { - const db = new CouchDB(instanceId) +async function executeRelevantWorkflows(event, eventType) { + const db = new CouchDB(event.instanceId) const workflowsToTrigger = await db.query("database/by_workflow_trigger", { - key: [event], + key: [eventType], + include_docs: true }) - return workflowsToTrigger.rows + const workflows = workflowsToTrigger.rows.map(wf => wf.doc) + + // Create orchestrator + const workflowOrchestrator = new Orchestrator() + workflowOrchestrator.strategy = serverStrategy + + for (let workflow of workflows) { + workflowOrchestrator.execute(workflow) + } } emitter.on("record:save", async function(event) { - const workflowsToTrigger = await determineWorkflowsToTrigger( - instanceId, - "record:save" - ) - - for (let workflow of workflowsToTrigger) { - // TODO: server side workflow triggers - } + await executeRelevantWorkflows(event, "record:save"); }) emitter.on("record:delete", async function(event) { - const workflowsToTrigger = await determineWorkflowsToTrigger( - instanceId, - "record:delete" - ) - - for (let workflow of workflowsToTrigger) { - // TODO: server side workflow triggers - } + await executeRelevantWorkflows(event, "record:delete"); }) module.exports = emitter diff --git a/packages/server/src/events/workflow.js b/packages/server/src/events/workflow.js new file mode 100644 index 0000000000..f2796d91e2 --- /dev/null +++ b/packages/server/src/events/workflow.js @@ -0,0 +1,52 @@ +const mustache = require("mustache") + +/** + * The workflow orchestrator is a class responsible for executing workflows. + * It relies on the strategy pattern, which allows composable behaviour to be + * passed into its execute() function. This allows custom execution behaviour based + * on where the orchestrator is run. + * + */ +exports.Orchestrator = class Orchestrator { + set strategy(strategy) { + this._strategy = strategy() + } + + async execute(workflow) { + if (workflow.live) { + this._strategy.run(workflow.definition) + } + } +} + +exports.serverStrategy = () => ({ + context: {}, + bindContextArgs: function(args) { + const mappedArgs = { ...args } + + // bind the workflow action args to the workflow context, if required + for (let arg in args) { + const argValue = args[arg] + // We don't want to render mustache templates on non-strings + if (typeof argValue !== "string") continue + + mappedArgs[arg] = mustache.render(argValue, { context: this.context }) + } + + return mappedArgs + }, + run: async function(workflow) { + for (let block of workflow.steps) { + console.log("Executing workflow block", block) + if (block.type === "CLIENT") continue + + const action = require(`../api/controllers/workflow/actions/${block.actionId}`) + const response = await action(this.bindContextArgs(block.args)) + + this.context = { + ...this.context, + [block.id]: response, + } + } + } +}); diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 3fc1f15622..62f4dc7d70 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -194,6 +194,20 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@budibase/client@^0.0.32": + version "0.0.32" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-0.0.32.tgz#76d9f147563a0bf939eae7f32ce75b2a527ba496" + integrity sha512-jmCCLn0CUoQbL6h623S5IqK6+GYLqX3WzUTZInSb1SCBOM3pI0eLP5HwTR6s7r42SfD0v9jTWRdyTnHiElNj8A== + dependencies: + "@nx-js/compiler-util" "^2.0.0" + bcryptjs "^2.4.3" + deep-equal "^2.0.1" + lodash "^4.17.15" + lunr "^2.3.5" + regexparam "^1.3.0" + shortid "^2.2.8" + svelte "^3.9.2" + "@budibase/core@^0.0.32": version "0.0.32" resolved "https://registry.yarnpkg.com/@budibase/core/-/core-0.0.32.tgz#c5d9ab869c5e9596a1ac337aaf041e795b1cc7fa" @@ -849,6 +863,11 @@ array-equal@^1.0.0: resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= +array-filter@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" + integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= + array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" @@ -921,6 +940,13 @@ atomic-sleep@^1.0.0: resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== +available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" + integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== + dependencies: + array-filter "^1.0.0" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -1643,6 +1669,26 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" +deep-equal@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.3.tgz#cad1c15277ad78a5c01c49c2dee0f54de8a6a7b0" + integrity sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA== + dependencies: + es-abstract "^1.17.5" + es-get-iterator "^1.1.0" + is-arguments "^1.0.4" + is-date-object "^1.0.2" + is-regex "^1.0.5" + isarray "^2.0.5" + object-is "^1.1.2" + object-keys "^1.1.1" + object.assign "^4.1.0" + regexp.prototype.flags "^1.3.0" + side-channel "^1.0.2" + which-boxed-primitive "^1.0.1" + which-collection "^1.0.1" + which-typed-array "^1.1.2" + deep-equal@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" @@ -2001,7 +2047,7 @@ error-inject@^1.0.0: resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37" integrity sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc= -es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5: +es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4, es-abstract@^1.17.5: version "1.17.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== @@ -2018,6 +2064,19 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5: string.prototype.trimleft "^2.1.1" string.prototype.trimright "^2.1.1" +es-get-iterator@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8" + integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ== + dependencies: + es-abstract "^1.17.4" + has-symbols "^1.0.1" + is-arguments "^1.0.4" + is-map "^2.0.1" + is-set "^2.0.1" + is-string "^1.0.5" + isarray "^2.0.5" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -3010,11 +3069,21 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-arguments@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" + integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= +is-bigint@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4" + integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g== + is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -3022,6 +3091,11 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" +is-boolean-object@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" + integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ== + is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -3058,7 +3132,7 @@ is-data-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-date-object@^1.0.1: +is-date-object@^1.0.1, is-date-object@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== @@ -3133,11 +3207,21 @@ is-installed-globally@^0.3.1: global-dirs "^2.0.1" is-path-inside "^3.0.1" +is-map@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" + integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== + is-npm@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== +is-number-object@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" + integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -3174,11 +3258,21 @@ is-regex@^1.0.5: dependencies: has "^1.0.3" +is-set@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" + integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= +is-string@^1.0.4, is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + is-symbol@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" @@ -3195,11 +3289,31 @@ is-type-of@^1.0.0: is-class-hotfix "~0.0.6" isstream "~0.1.2" +is-typed-array@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d" + integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ== + dependencies: + available-typed-arrays "^1.0.0" + es-abstract "^1.17.4" + foreach "^2.0.5" + has-symbols "^1.0.1" + is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-weakmap@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" + integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== + +is-weakset@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" + integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -3225,6 +3339,11 @@ isarray@1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + isbinaryfile@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" @@ -4441,6 +4560,11 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +mustache@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz#d99beb031701ad433338e7ea65e0489416c854a2" + integrity sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA== + mute-stream@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" @@ -4632,6 +4756,14 @@ object-inspect@^1.7.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== +object-is@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6" + integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -5353,6 +5485,19 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexp.prototype.flags@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + +regexparam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" + integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== + regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -5681,6 +5826,14 @@ shortid@^2.2.8: dependencies: nanoid "^2.1.0" +side-channel@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" + integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== + dependencies: + es-abstract "^1.17.0-next.1" + object-inspect "^1.7.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -6089,6 +6242,11 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +svelte@^3.9.2: + version "3.23.0" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.23.0.tgz#bbcd6887cf588c24a975b14467455abfff9acd3f" + integrity sha512-cnyd96bK/Nw5DnYuB1hzm5cl6+I1fpmdKOteA7KLzU9KGLsLmvWsSkSKbcntzODCLmSySN3HjcgTHRo6/rJNTw== + symbol-tree@^3.2.2: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -6569,11 +6727,44 @@ whatwg-url@^7.0.0: tr46 "^1.0.1" webidl-conversions "^4.0.2" +which-boxed-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1" + integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ== + dependencies: + is-bigint "^1.0.0" + is-boolean-object "^1.0.0" + is-number-object "^1.0.3" + is-string "^1.0.4" + is-symbol "^1.0.2" + +which-collection@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" + integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== + dependencies: + is-map "^2.0.1" + is-set "^2.0.1" + is-weakmap "^2.0.1" + is-weakset "^2.0.1" + which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-typed-array@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2" + integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ== + dependencies: + available-typed-arrays "^1.0.2" + es-abstract "^1.17.5" + foreach "^2.0.5" + function-bind "^1.1.1" + has-symbols "^1.0.1" + is-typed-array "^1.1.3" + which@^1.2.9, which@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"