saving of models and fields

packages/builder/src/builderStore/store/backend.js

@@ -1,13 +1,5 @@
 import { writable } from "svelte/store"
 import api from "../api"
-import { getContext } from "svelte"
-
-/** TODO: DEMO SOLUTION
- * this section should not be here, it is a quick fix for a demo
- * when we reorg the backend UI, this should disappear
- *  **/
-import { CreateEditModelModal } from "components/database/ModelDataTable/modals"
-/** DEMO SOLUTION  END **/
 
 export const getBackendUiStore = () => {
   const INITIAL_BACKEND_UI_STATE = {
@@ -17,6 +9,7 @@ export const getBackendUiStore = () => {
     users: [],
     selectedDatabase: {},
     selectedModel: {},
+    draftModel: {}
   }
 
   const store = writable(INITIAL_BACKEND_UI_STATE)
@@ -32,6 +25,7 @@ export const getBackendUiStore = () => {
           state.selectedDatabase = db
           if (models && models.length > 0) {
             state.selectedModel = models[0]
+            state.draftModel = models[0]
             state.selectedView = `all_${models[0]._id}`
           }
           state.breadcrumbs = [db.name]
@@ -61,16 +55,39 @@ export const getBackendUiStore = () => {
     models: {
       select: model => store.update(state => {
         state.selectedModel = model;
-        return state;
+        // TODO: prevent pointing to same obj
-      }),
+        state.draftModel = model;
-      create: model =>
+        state.selectedField = null
-        store.update(state => {
-          state.models.push(model)
-          state.models = state.models
-          state.selectedModel = model
-          state.selectedView = `all_${model._id}`
         return state
-        })
+      }),
+      save: model =>
+        store.update(async state => {
+          const SAVE_MODEL_URL = `/api/${state.selectedDatabase._id}/models`
+          const response = await api.post(SAVE_MODEL_URL, model)
+          const savedModel = await response.json()
+
+          state.models = [...state.models, savedModel]
+          state.selectedModel = savedModel
+          state.draftModel = savedModel
+          state.selectedView = `all_${savedModel._id}`
+          return state
+        }),
+        addField: field => {
+          store.update(state => {
+            if (!state.draftModel.schema) {
+              state.draftModel.schema = {}
+            }
+
+            state.draftModel.schema = {
+              ...state.draftModel.schema,
+              [field.name]: field
+            }
+
+            state.selectedField = field
+
+            return state
+          });
+        }
     },
     views: {
       select: view =>

packages/builder/src/components/database/ModelDataTable/modals/CreateEditModel/FieldView.svelte

@@ -30,9 +30,7 @@
 
   const save = () => {
     constraints.presence = required ? { allowEmpty: false } : false
-    draftField.constraints = constraints
+    schema[field.name] = { type, constraints }
-    draftField.type = type
-    schema[field.name] = draftField
     goBack()
   }
 

packages/builder/src/components/nav/ModelNavigator/BlockNavigator.svelte

@@ -1,9 +1,8 @@
 <script>
   import * as blockDefinitions from "constants/backend"
+  import { backendUiStore } from "builderStore";
   import Block from "./Block.svelte"
 
-  console.log(blockDefinitions)
-
   const HEADINGS = [
     {
       title: "Fields",
@@ -20,6 +19,10 @@
   ]
 
   let selectedTab = "FIELDS"
+
+  function addField(blockDefinition) {
+    backendUiStore.actions.models.addField(blockDefinition)
+  }
 </script>
 
 <section>
@@ -36,6 +39,7 @@
   <div class="block-grid">
     {#each Object.values(blockDefinitions[selectedTab]) as blockDefinition}
       <Block
+        on:click={() => addField(blockDefinition)}
         primary={true}
         secondary={false}
         tertiary={false}

packages/builder/src/components/nav/ModelNavigator/ModelNavigator.svelte

@@ -3,7 +3,7 @@
   import { Switcher } from "@budibase/bbui"
   import { goto } from "@sveltech/routify"
   import { store, backendUiStore } from "builderStore"
-  import BlockNavigator from "./BlockNavigator.svelte";
+  import BlockNavigator from "./BlockNavigator.svelte"
   import SchemaManagementDrawer from "../SchemaManagementDrawer.svelte"
   import HierarchyRow from "../HierarchyRow.svelte"
   import ListItem from "./ListItem.svelte"
@@ -28,21 +28,30 @@
     backendUiStore.actions.models.select(model)
   }
 
-  function selectField() {}
+  function selectField(field) {
+    backendUiStore.update(state => {
+      state.selectedField = field
+      return state
+    });
+  }
+
+  function setupForNewModel() {
+    backendUiStore.update(state => {
+      state.selectedModel = {}
+      state.draftModel = { schema: {} }
+      return state
+    })
+    $goto(`./database/${$backendUiStore.selectedDatabase._id}/newmodel`)
+  }
 </script>
 
 <div class="items-root">
-  {#if $backendUiStore.selectedDatabase._id}
+  {#if $backendUiStore.selectedDatabase && $backendUiStore.selectedDatabase._id}
     <div class="hierarchy">
       <div class="components-list-container">
         <Switcher headings={HEADINGS} bind:value={selectedTab}>
           {#if selectedTab === 'NAVIGATE'}
-            <Button
+            <Button secondary wide on:click={setupForNewModel}>Create New Model</Button>
-              secondary
-              wide
-              on:click={() => $goto(`./database/${$backendUiStore.selectedDatabase._id}/newmodel`)}>
-              Create New Model
-            </Button>
           <div class="hierarchy-items-container">
               {#each $backendUiStore.models as model}
                 <ListItem
@@ -55,7 +64,7 @@
                     indented
                     icon="ri-layout-column-fill"
                     title={field}
-                    on:click={() => selectField(model.schema[field])} />
+                    on:click={() => selectField({ name: field, ...model.schema[field] })} />
                 {/each}
               {/each}
             </div>

packages/builder/src/components/nav/ModelSetupNav/FieldView.svelte

@@ -0,0 +1,65 @@
+<script>
+  import { backendUiStore } from "builderStore"
+  import { Button } from "@budibase/bbui"
+  import Dropdown from "components/common/Dropdown.svelte"
+  import Textbox from "components/common/Textbox.svelte"
+  import ButtonGroup from "components/common/ButtonGroup.svelte"
+  import NumberBox from "components/common/NumberBox.svelte"
+  import ValuesList from "components/common/ValuesList.svelte"
+  import ErrorsBox from "components/common/ErrorsBox.svelte"
+  import Checkbox from "components/common/Checkbox.svelte"
+  import ActionButton from "components/common/ActionButton.svelte"
+  import DatePicker from "components/common/DatePicker.svelte"
+  import { keys, cloneDeep } from "lodash/fp"
+
+  const FIELD_TYPES = ["string", "number", "boolean", "link"]
+
+  export let field
+
+  $: type = field.type
+  $: constraints = field.constraints
+  $: required =
+    constraints && constraints.presence && !constraints.presence.allowEmpty
+
+  $: console.log(field)
+
+  const save = () => {
+    // constraints.presence = required ? { allowEmpty: false } : false
+    // draft[field.name] = { type, constraints }
+    backendUiStore.actions.models.save($backendUiStore.draftModel)
+  }
+</script>
+
+<form on:submit|preventDefault class="uk-form-stacked">
+  <Textbox label="Name" bind:text={field.name} />
+  <Dropdown label="Type" bind:selected={type} options={FIELD_TYPES} />
+
+  <Checkbox label="Required" bind:checked={required} />
+
+  {#if type === 'string'}
+    <NumberBox label="Max Length" bind:value={constraints.length.maximum} />
+    <ValuesList label="Categories" bind:values={constraints.inclusion} />
+  {:else if type === 'datetime'}
+    <DatePicker label="Min Value" bind:value={constraints.datetime.earliest} />
+    <DatePicker label="Max Value" bind:value={constraints.datetime.latest} />
+  {:else if type === 'number'}
+    <NumberBox
+      label="Min Value"
+      bind:value={constraints.numericality.greaterThanOrEqualTo} />
+    <NumberBox
+      label="Max Value"
+      bind:value={constraints.numericality.lessThanOrEqualTo} />
+  {:else if type === 'link'}
+    <select class="budibase__input" bind:value={field.modelId}>
+      <option value={''} />
+      {#each $backendUiStore.models as model}
+        <option value={model._id}>{model.name}</option>
+      {/each}
+    </select>
+  {/if}
+</form>
+<Button attention wide on:click={save}>Save</Button>
+
+<style>
+
+</style>

packages/builder/src/components/nav/ModelSetupNav/ModelSetupNav.svelte

@@ -2,14 +2,8 @@
   import { getContext, onMount } from "svelte"
   import { Button, Switcher } from "@budibase/bbui"
   import { store, backendUiStore } from "builderStore"
-  import HierarchyRow from "./HierarchyRow.svelte"
-  import NavItem from "./NavItem.svelte"
-  import getIcon from "components/common/icon"
   import api from "builderStore/api"
-  import {
+  import FieldView from "./FieldView.svelte"
-    CreateEditModelModal,
-    CreateEditViewModal,
-  } from "components/database/ModelDataTable/modals"
 
   const { open, close } = getContext("simple-modal")
 
@@ -29,18 +23,15 @@
   ]
 
   let selectedTab = "SETUP"
-  let modelName = $backendUiStore.selectedModel.name
-  let edited
 
-  $: if (modelName) {
+  // TODO: draftModel undefined after save
-    edited = modelName !== $backendUiStore.selectedModel.name
+  $: edited = $backendUiStore.draftModel.name !== $backendUiStore.selectedModel.name
-  }
 
   async function deleteModel() {
-    const modelToDelete = $backendUiStore.selectedModel
+    backendUiStore.update(async state => {
-    const DELETE_MODEL_URL = `/api/${instanceId}/models/${modelToDelete._id}/${modelToDelete._rev}`
+      const modelToDelete = state.selectedModel
+      const DELETE_MODEL_URL = `/api/${state.selectedDatabase._id}/models/${modelToDelete._id}/${modelToDelete._rev}`
       const response = await api.delete(DELETE_MODEL_URL)
-    backendUiStore.update(state => {
       state.models = state.models.filter(
         model => model._id !== modelToDelete._id
       )
@@ -49,39 +40,35 @@
     })
   }
 
-  function selectView(view) {
+  async function saveModel() {
-    backendUiStore.update(state => {
+    await backendUiStore.actions.models.save($backendUiStore.draftModel)
-      state.selectedView = view.name
-      return state
-    })
   }
 </script>
 
 <div class="items-root">
   <Switcher headings={ITEMS} bind:value={selectedTab}>
     {#if selectedTab === 'SETUP'}
+      {#if $backendUiStore.selectedField}
+        <FieldView field={$backendUiStore.selectedField} />
+      {:else}
         <div class="titled-input">
           <header>Name</header>
-        <input type="text" class="budibase__input" bind:value={modelName} />
+          <input
+            type="text"
+            class="budibase__input"
+            bind:value={$backendUiStore.draftModel.name} />
         </div>
         <div class="titled-input">
           <header>Import Data</header>
           <Button wide secondary>Import CSV</Button>
         </div>
 
-      <Button
+        <Button attention wide on:click={saveModel}>Save</Button>
-        disabled={!edited}
+      {/if}
-        attention={edited}
-        wide
-        on:click={() => alert('Clicked!')}>
-        Save
-      </Button>
     {:else if selectedTab === 'DELETE'}
       <div class="titled-input">
         <header>Danger Zone</header>
-        <Button error wide on:click={deleteModel}>
+        <Button error wide on:click={deleteModel}>Delete</Button>
-          Delete
-        </Button>
       </div>
     {/if}
   </Switcher>

packages/builder/src/components/nav/ModelSetupNav/index.js

@@ -0,0 +1 @@
+export { default as ModelSetupNav } from "./ModelSetupNav.svelte";

packages/builder/src/constants/backend/index.js

@@ -4,7 +4,6 @@ export const FIELDS = {
   PLAIN_TEXT: {
     name: "Plain Text",
     icon: "ri-text",
-    definition: {
     type: "string",
     constraints: {
       type: "string",
@@ -12,11 +11,9 @@ export const FIELDS = {
       presence: false,
     },
   },
-  },
   NUMBER: {
     name: "Number",
     icon: "ri-number-1",
-    definition: {
     type: "number",
     constraints: {
       type: "number",
@@ -24,73 +21,60 @@ export const FIELDS = {
       numericality: {},
     },
   },
-  },
   BOOLEAN: {
     name: "True/False",
     icon: "ri-toggle-line",
-    definition: {
     type: "boolean",
     constraints: {
       type: "boolean",
       presence: false,
     },
   },
-  },
   OPTIONS: {
     name: "Options",
     icon: "ri-list-check-2",
-    definition: {
     type: "options",
     constraints: {
       type: "string",
       presence: false,
     },
   },
-  },
   DATETIME: {
     name: "Date/Time",
     icon: "ri-calendar-event-fill",
-    definition: {
+    type: "datetime",
-      type: "date",
     constraints: {
       type: "date",
       datetime: {},
       presence: false,
     },
   },
-  },
   IMAGE: {
     name: "Image",
     icon: "ri-image-line",
-    definition: {
     type: "image",
     constraints: {
       type: "string",
       presence: false,
     },
   },
-  },
   FILE: {
     name: "Image",
     icon: "ri-file-line",
-    definition: {
     type: "file",
     constraints: {
       type: "string",
       presence: false,
     },
   },
-  },
   DATA_LINK: {
     name: "Data Links",
     icon: "ri-link",
-    definition: {
     type: "link",
     modelId: null,
     constraints: {
       type: "array",
-      },
+    }
-    },
   },
 }
 

packages/builder/src/pages/[application]/backend/_layout.svelte

@@ -4,7 +4,7 @@
   import * as api from "components/database/ModelDataTable/api"
 
   import ModelNavigator from "components/nav/ModelNavigator/ModelNavigator.svelte"
-  import ModelSetupNav from "components/nav/ModelSetupNav.svelte"
+  import { ModelSetupNav } from "components/nav/ModelSetupNav"
 </script>
 
 <div class="root">

packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte

@@ -22,13 +22,6 @@
 
   let selectedRecord
 
-  async function selectRecord(record) {
-    selectedRecord = await api.loadRecord(record.key, {
-      appname: $store.appname,
-      instanceId: selectedDatabase,
-    })
-  }
-
   $: breadcrumbs = $backendUiStore.breadcrumbs.join(" / ")
 </script>
 
@@ -41,7 +34,7 @@
   {/if}
 </div>
 {#if $backendUiStore.selectedDatabase._id && $backendUiStore.selectedModel.name}
-  <ModelDataTable {selectRecord} />
+  <ModelDataTable />
 {:else}
   <i style="color: var(--grey-dark)">
     create your first model to start building

packages/server/package.json

@@ -47,6 +47,7 @@
     "@sendgrid/mail": "^7.1.1",
     "bcryptjs": "^2.4.3",
     "dotenv": "^8.2.0",
+    "electron": "^9.0.4",
     "electron-is-dev": "^1.2.0",
     "electron-unhandled": "^3.0.2",
     "electron-updater": "^4.3.1",
@@ -73,7 +74,6 @@
   },
   "devDependencies": {
     "@jest/test-sequencer": "^24.8.0",
-    "electron": "^8.2.5",
     "electron-builder": "^22.6.0",
     "electron-builder-notarize": "^1.1.2",
     "eslint": "^6.8.0",

packages/server/src/api/controllers/model.js

@@ -16,16 +16,16 @@ exports.find = async function(ctx) {
   ctx.body = model
 }
 
-exports.create = async function(ctx) {
+exports.save = async function(ctx) {
   const db = new CouchDB(ctx.params.instanceId)
-  const newModel = {
+  const modelToSave = {
     type: "model",
-    ...ctx.request.body,
     _id: newid(),
+    ...ctx.request.body,
   }
 
-  const result = await db.post(newModel)
+  const result = await db.post(modelToSave)
-  newModel._rev = result.rev
+  modelToSave._rev = result.rev
 
   const { schema } = ctx.request.body
   for (let key in schema) {
@@ -33,9 +33,9 @@ exports.create = async function(ctx) {
     if (schema[key].type === "link") {
       // create the link field in the other model
       const linkedModel = await db.get(schema[key].modelId)
-      linkedModel.schema[newModel.name] = {
+      linkedModel.schema[modelToSave.name] = {
         type: "link",
-        modelId: newModel._id,
+        modelId: modelToSave._id,
         constraints: {
           type: "array",
         },
@@ -47,9 +47,9 @@ exports.create = async function(ctx) {
   const designDoc = await db.get("_design/database")
   designDoc.views = {
     ...designDoc.views,
-    [`all_${newModel._id}`]: {
+    [`all_${modelToSave._id}`]: {
       map: `function(doc) {
-        if (doc.modelId === "${newModel._id}") {
+        if (doc.modelId === "${modelToSave._id}") {
           emit(doc[doc.key], doc._id); 
         }
       }`,
@@ -58,12 +58,10 @@ exports.create = async function(ctx) {
   await db.put(designDoc)
 
   ctx.status = 200
-  ctx.message = `Model ${ctx.request.body.name} created successfully.`
+  ctx.message = `Model ${ctx.request.body.name} saved successfully.`
-  ctx.body = newModel
+  ctx.body = modelToSave
 }
 
-exports.update = async function() {}
-
 exports.destroy = async function(ctx) {
   const db = new CouchDB(ctx.params.instanceId)
 

packages/server/src/api/routes/model.js

@@ -8,8 +8,7 @@ const router = Router()
 router
   .get("/api/:instanceId/models", authorized(BUILDER), modelController.fetch)
   .get("/api/:instanceId/models/:id", authorized(BUILDER), modelController.find)
-  .post("/api/:instanceId/models", authorized(BUILDER), modelController.create)
+  .post("/api/:instanceId/models", authorized(BUILDER), modelController.save)
-  // .patch("/api/:instanceId/models", controller.update)
   .delete(
     "/api/:instanceId/models/:modelId/:revId",
     authorized(BUILDER),

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"
@@ -1924,10 +1970,10 @@ electron-updater@^4.3.1:
     lodash.isequal "^4.5.0"
     semver "^7.1.3"
 
-electron@^8.2.5:
+electron@^9.0.4:
-  version "8.2.5"
+  version "9.0.4"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-8.2.5.tgz#ae3cb23d5517b2189fd35298e487198d65d1a291"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-9.0.4.tgz#5aa72c1576c82c19f6e087311ffe1d7b74358d25"
-  integrity sha512-LxSCUwmlfJtRwthd3ofpYaZ+1C2hQSW8Ep1DD9K3VbnDItO+kb3t1z35daJgAab78j54aOwo9gMxJtvU0Ftj6w==
+  integrity sha512-QzkeZNAiNB7KxcdoQKSoaiVT/GQdB4Vt0/ZZOuU8tIKABAsni2I7ztiAbUzxcsnQsqEBSfChuPuDQ5A4VbbzPg==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -2018,6 +2064,36 @@ 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-abstract@^1.17.4:
+  version "1.17.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
+  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.0"
+    is-regex "^1.1.0"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.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 +3086,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 +3108,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"
@@ -3032,6 +3123,11 @@ is-callable@^1.1.4, is-callable@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
+is-callable@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
+  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+
 is-ci@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
@@ -3058,7 +3154,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 +3229,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 +3280,28 @@ is-regex@^1.0.5:
   dependencies:
     has "^1.0.3"
 
+is-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
+  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
+  dependencies:
+    has-symbols "^1.0.1"
+
+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 +3318,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 +3368,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"
@@ -4637,6 +4785,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"
@@ -5358,6 +5514,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"
@@ -5686,6 +5855,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"
@@ -5938,7 +6115,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-string.prototype.trimend@^1.0.0:
+string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
   integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
@@ -5964,7 +6141,7 @@ string.prototype.trimright@^2.1.1:
     es-abstract "^1.17.5"
     string.prototype.trimend "^1.0.0"
 
-string.prototype.trimstart@^1.0.0:
+string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
   integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
@@ -6094,6 +6271,11 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+svelte@^3.9.2:
+  version "3.23.2"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.23.2.tgz#f3e500384261a2e77b29681ee744c3c790fbcdc3"
+  integrity sha512-hE8GeTM83YVR4GY6/6PeDEcGct4JS5aCi+IYbCAa76oaPSfuF7L85DQYULQxlTK/KPWzw3L1GRGmC3oPG/PQoA==
+
 symbol-tree@^3.2.2:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -6579,11 +6761,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"