merge master and bump bbui

hosting/docker-compose.yaml

@@ -1,8 +1,11 @@
 version: "3"
 
+# optional ports are specified throughout for more advanced use cases.
+
 services:
   app-service:
     restart: always
+    #build: ./build/server
     image: budibase/budibase-apps
     ports:
       - "${APP_PORT}:4002"
@@ -20,6 +23,7 @@ services:
 
   worker-service:
     restart: always
+    #build: ./build/worker
     image: budibase/budibase-worker
     ports:
       - "${WORKER_PORT}:4003"
@@ -62,7 +66,7 @@ services:
       - ./envoy.yaml:/etc/envoy/envoy.yaml
     ports:
       - "${MAIN_PORT}:10000"
-      - "9901:9901"
+      #- "9901:9901"
     depends_on:
       - minio-service
       - worker-service
@@ -77,8 +81,8 @@ services:
       - COUCHDB_USER=${COUCH_DB_USER}
     ports:
       - "${COUCH_DB_PORT}:5984"
-      - "4369:4369"
+      #- "4369:4369"
-      - "9100:9100"
+      #- "9100:9100"
     volumes:
       - couchdb_data:/couchdb
 

hosting/envoy.yaml

@@ -21,6 +21,11 @@ static_resources:
                   cluster: app-service
                   prefix_rewrite: "/"
 
+              # special case for presenting our static self hosting page
+              - match: { path: "/" }
+                route:
+                  cluster: app-service
+              
               # special case for when API requests are made, can just forward, not to minio    
               - match: { prefix: "/api/" }
                 route:

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.2",
+  "version": "0.7.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.6.2",
+  "version": "0.7.4",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -63,27 +63,26 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.55.2",
+    "@budibase/bbui": "^1.57.0",
-    "@budibase/client": "^0.6.2",
+    "@budibase/client": "^0.7.4",
-    "@budibase/colorpicker": "^1.0.1",
+    "@budibase/colorpicker": "1.0.1",
-    "@budibase/string-templates": "^0.6.2",
+    "@budibase/string-templates": "^0.7.4",
     "@budibase/svelte-ag-grid": "^0.0.16",
     "@sentry/browser": "5.19.1",
-    "@svelteschool/svelte-forms": "^0.7.0",
+    "@svelteschool/svelte-forms": "0.7.0",
-    "britecharts": "^2.16.0",
     "codemirror": "^5.59.0",
     "d3-selection": "^1.4.1",
     "deepmerge": "^4.2.2",
-    "downloadjs": "^1.4.7",
+    "downloadjs": "1.4.7",
     "fast-sort": "^2.2.0",
-    "lodash": "^4.17.13",
+    "lodash": "4.17.13",
     "posthog-js": "1.4.5",
-    "remixicon": "^2.5.0",
+    "remixicon": "2.5.0",
-    "shortid": "^2.2.15",
+    "shortid": "2.2.15",
     "svelte-loading-spinners": "^0.1.1",
-    "svelte-portal": "^0.1.0",
+    "svelte-portal": "0.1.0",
-    "uuid": "^8.3.1",
+    "uuid": "8.3.1",
-    "yup": "^0.29.2"
+    "yup": "0.29.2"
   },
   "devDependencies": {
     "@babel/core": "^7.5.5",

packages/builder/src/builderStore/dataBinding.js

@@ -2,6 +2,7 @@ import { cloneDeep } from "lodash/fp"
 import { get } from "svelte/store"
 import { backendUiStore, store } from "builderStore"
 import { findAllMatchingComponents, findComponentPath } from "./storeUtils"
+import { makePropSafe } from "@budibase/string-templates"
 import { TableNames } from "../constants"
 
 // Regex to match all instances of template strings
@@ -106,7 +107,9 @@ export const getContextBindings = (rootComponent, componentId) => {
 
       contextBindings.push({
         type: "context",
-        runtimeBinding: `${component._id}.${runtimeBoundKey}`,
+        runtimeBinding: `${makePropSafe(component._id)}.${makePropSafe(
+          runtimeBoundKey
+        )}`,
         readableBinding: `${component._instanceName}.${table.name}.${key}`,
         fieldSchema,
         providerId: component._id,
@@ -167,7 +170,7 @@ export const getComponentBindings = rootComponent => {
     return {
       type: "instance",
       providerId: component._id,
-      runtimeBinding: `${component._id}`,
+      runtimeBinding: `${makePropSafe(component._id)}`,
       readableBinding: `${component._instanceName}`,
     }
   })
@@ -199,43 +202,52 @@ export const getSchemaForDatasource = datasource => {
 }
 
 /**
- * Converts a readable data binding into a runtime data binding
+ * utility function for the readableToRuntimeBinding and runtimeToReadableBinding.
  */
-export function readableToRuntimeBinding(bindableProperties, textWithBindings) {
+function bindingReplacement(bindableProperties, textWithBindings, convertTo) {
+  const convertFrom =
+    convertTo === "runtimeBinding" ? "readableBinding" : "runtimeBinding"
   if (typeof textWithBindings !== "string") {
     return textWithBindings
   }
+  const convertFromProps = bindableProperties
+    .map(el => el[convertFrom])
+    .sort((a, b) => {
+      return b.length - a.length
+    })
   const boundValues = textWithBindings.match(CAPTURE_VAR_INSIDE_TEMPLATE) || []
   let result = textWithBindings
-  boundValues.forEach(boundValue => {
+  for (let boundValue of boundValues) {
-    const binding = bindableProperties.find(({ readableBinding }) => {
+    let newBoundValue = boundValue
-      return boundValue === `{{ ${readableBinding} }}`
+    for (let from of convertFromProps) {
-    })
+      if (newBoundValue.includes(from)) {
-    if (binding) {
+        const binding = bindableProperties.find(el => el[convertFrom] === from)
-      result = result.replace(boundValue, `{{ ${binding.runtimeBinding} }}`)
+        newBoundValue = newBoundValue.replace(from, binding[convertTo])
+      }
     }
-  })
+    result = result.replace(boundValue, newBoundValue)
+  }
   return result
 }
 
+/**
+ * Converts a readable data binding into a runtime data binding
+ */
+export function readableToRuntimeBinding(bindableProperties, textWithBindings) {
+  return bindingReplacement(
+    bindableProperties,
+    textWithBindings,
+    "runtimeBinding"
+  )
+}
+
 /**
  * Converts a runtime data binding into a readable data binding
  */
 export function runtimeToReadableBinding(bindableProperties, textWithBindings) {
-  if (typeof textWithBindings !== "string") {
+  return bindingReplacement(
-    return textWithBindings
+    bindableProperties,
-  }
+    textWithBindings,
-  const boundValues = textWithBindings.match(CAPTURE_VAR_INSIDE_TEMPLATE) || []
+    "readableBinding"
-  let result = textWithBindings
+  )
-  boundValues.forEach(boundValue => {
-    const binding = bindableProperties.find(({ runtimeBinding }) => {
-      return boundValue === `{{ ${runtimeBinding} }}`
-    })
-    // Show invalid bindings as invalid rather than a long ID
-    result = result.replace(
-      boundValue,
-      `{{ ${binding?.readableBinding ?? "Invalid binding"} }}`
-    )
-  })
-  return result
 }

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

@@ -119,6 +119,18 @@ export const getBackendUiStore = () => {
         return json
       },
       save: async (datasourceId, query) => {
+        const integrations = get(store).integrations
+        const dataSource = get(store).datasources.filter(
+          ds => ds._id === datasourceId
+        )
+        // check if readable attribute is found
+        if (dataSource.length !== 0) {
+          const integration = integrations[dataSource[0].source]
+          const readable = integration.query[query.queryVerb].readable
+          if (readable) {
+            query.readable = readable
+          }
+        }
         query.datasourceId = datasourceId
         const response = await api.post(`/api/queries`, query)
         const json = await response.json()

packages/builder/src/builderStore/store/screenTemplates/rowDetailScreen.js

@@ -2,6 +2,7 @@ import sanitizeUrl from "./utils/sanitizeUrl"
 import { rowListUrl } from "./rowListScreen"
 import { Screen } from "./utils/Screen"
 import { Component } from "./utils/Component"
+import { makePropSafe } from "@budibase/string-templates"
 import {
   makeMainContainer,
   makeBreadcrumbContainer,
@@ -12,7 +13,7 @@ import {
 export default function(tables) {
   return tables.map(table => {
     const heading = table.primaryDisplay
-      ? `{{ data.${table.primaryDisplay} }}`
+      ? `{{ data.${makePropSafe(table.primaryDisplay)} }}`
       : null
     return {
       name: `${table.name} - Detail`,
@@ -60,8 +61,8 @@ function generateTitleContainer(table, title, providerId) {
       onClick: [
         {
           parameters: {
-            rowId: `{{ ${providerId}._id }}`,
+            rowId: `{{ ${makePropSafe(providerId)}._id }}`,
-            revId: `{{ ${providerId}._rev }}`,
+            revId: `{{ ${makePropSafe(providerId)}._rev }}`,
             tableId: table._id,
           },
           "##eventHandlerType": "Delete Row",

packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte

@@ -64,7 +64,11 @@
     {:else if value.customType === 'password'}
       <Input type="password" extraThin bind:value={block.inputs[key]} />
     {:else if value.customType === 'email'}
-      <Input type="email" extraThin bind:value={block.inputs[key]} />
+      <BindableInput
+        type={'email'}
+        extraThin
+        bind:value={block.inputs[key]}
+        {bindings} />
     {:else if value.customType === 'table'}
       <TableSelector bind:value={block.inputs[key]} />
     {:else if value.customType === 'row'}
@@ -75,7 +79,7 @@
       <SchemaSetup bind:value={block.inputs[key]} />
     {:else if value.type === 'string' || value.type === 'number'}
       <BindableInput
-        type="string"
+        type={value.customType}
         extraThin
         bind:value={block.inputs[key]}
         {bindings} />

packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte

@@ -3,6 +3,7 @@
   import {
     TextArea,
     Label,
+    Input,
     Heading,
     Body,
     Spacer,
@@ -10,6 +11,9 @@
     Popover,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
+  import { isValid } from "@budibase/string-templates"
+  import { handlebarsCompletions } from "constants/completions"
+
   const dispatch = createEventDispatcher()
 
   export let value = ""
@@ -18,9 +22,14 @@
   export let align
   export let popover = null
 
+  let helpers = handlebarsCompletions()
   let getCaretPosition
+  let validity = true
+  let search = ""
 
   $: categories = Object.entries(groupBy("category", bindings))
+  $: value && checkValid()
+  $: searchRgx = new RegExp(search, "ig")
 
   function onClickBinding(binding) {
     const position = getCaretPosition()
@@ -34,18 +43,27 @@
       value += toAdd
     }
   }
+
+  function checkValid() {
+    validity = isValid(value)
+  }
 </script>
 
 <Popover {anchor} {align} bind:this={popover}>
   <div class="container">
     <div class="bindings">
       <Heading small>Available bindings</Heading>
+      <Spacer medium />
+      <Input extraThin placeholder="Search" bind:value={search} />
+      <Spacer medium />
       <div class="bindings__wrapper">
         <div class="bindings__list">
           {#each categories as [categoryName, bindings]}
             <Heading extraSmall>{categoryName}</Heading>
             <Spacer extraSmall />
-            {#each bindings as binding}
+            {#each bindings.filter(binding =>
+              binding.label.match(searchRgx)
+            ) as binding}
               <div class="binding" on:click={() => onClickBinding(binding)}>
                 <span class="binding__label">{binding.label}</span>
                 <span class="binding__type">{binding.type}</span>
@@ -56,6 +74,18 @@
               </div>
             {/each}
           {/each}
+          <Heading extraSmall>Helpers</Heading>
+          <Spacer extraSmall />
+          {#each helpers.filter(helper => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
+            <div class="binding" on:click={() => onClickBinding(helper)}>
+              <span class="binding__label">{helper.label}</span>
+              <br />
+              <div class="binding__description">
+                {@html helper.description || ''}
+              </div>
+              <pre>{helper.example || ''}</pre>
+            </div>
+          {/each}
         </div>
       </div>
     </div>
@@ -70,11 +100,20 @@
         bind:getCaretPosition
         bind:value
         placeholder="Add options from the left, type text, or do both" />
+      {#if !validity}
+        <p class="syntax-error">
+          Current Handlebars syntax is invalid, please check the guide
+          <a href="https://handlebarsjs.com/guide/">here</a>
+          for more details.
+        </p>
+      {/if}
       <div class="controls">
         <a href="https://docs.budibase.com/design/binding">
           <Body small>Learn more about binding</Body>
         </a>
-        <Button on:click={popover.hide} primary>Done</Button>
+        <Button on:click={popover.hide} disabled={!validity} primary>
+          Done
+        </Button>
       </div>
     </div>
   </div>
@@ -128,7 +167,13 @@
   .binding__description {
     color: var(--grey-8);
     margin-top: 2px;
+    white-space: normal;
   }
+
+  pre {
+    white-space: normal;
+  }
+
   .binding__type {
     font-family: monospace;
     background-color: var(--grey-2);
@@ -152,4 +197,14 @@
     align-items: center;
     margin-top: var(--spacing-m);
   }
+
+  .syntax-error {
+    color: var(--red);
+    font-size: 12px;
+  }
+
+  .syntax-error a {
+    color: var(--red);
+    text-decoration: underline;
+  }
 </style>

packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte

@@ -9,7 +9,7 @@
   let permissions = []
   let selectedRole = {}
   let errors = []
-  let builtInRoles = ['Admin', 'Power', 'Basic', 'Public']
+  let builtInRoles = ["Admin", "Power", "Basic", "Public"]
   $: selectedRoleId = selectedRole._id
   $: otherRoles = $backendUiStore.roles.filter(
     role => role._id !== selectedRoleId
@@ -103,7 +103,11 @@
     {/each}
   </Select>
   {#if selectedRole}
-    <Input label="Name" bind:value={selectedRole.name} thin disabled={builtInRoles.includes(selectedRole.name)}/>
+    <Input
+      label="Name"
+      bind:value={selectedRole.name}
+      thin
+      disabled={builtInRoles.includes(selectedRole.name)} />
     <Select
       thin
       secondary

packages/builder/src/components/backend/DataTable/popovers/ExportPopover.svelte

@@ -1,6 +1,7 @@
 <script>
   import api from "builderStore/api"
   import { Button, Select } from "@budibase/bbui"
+  import download from "downloadjs"
 
   const FORMATS = [
     {
@@ -19,13 +20,12 @@
   let exportFormat = FORMATS[0].key
 
   async function exportView() {
-    const response = await api.post(
+    download(
-      `/api/views/export?format=${exportFormat}`,
+      `/api/views/export?view=${encodeURIComponent(
-      view
+        view.name
+      )}&format=${exportFormat}`
     )
-    const downloadInfo = await response.json()
     onClosed()
-    window.location = downloadInfo.url
   }
 </script>
 

packages/builder/src/components/common/BindableInput.svelte

@@ -41,7 +41,7 @@
 
   .icon {
     right: 2px;
-    top: 2px;
+    top: 26px;
     bottom: 2px;
     position: absolute;
     align-items: center;

packages/builder/src/components/design/PropertiesPanel/BindingPanel.svelte

@@ -1,59 +1,128 @@
 <script>
   import groupBy from "lodash/fp/groupBy"
-  import { Button, TextArea, Drawer, Heading, Spacer } from "@budibase/bbui"
+  import { Input, TextArea, Heading, Spacer, Label } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
+  import { isValid } from "@budibase/string-templates"
+  import {
+    getBindableProperties,
+    readableToRuntimeBinding,
+  } from "builderStore/dataBinding"
+  import { currentAsset, store } from "../../../builderStore"
+  import { handlebarsCompletions } from "constants/completions"
 
   const dispatch = createEventDispatcher()
+
   export let bindableProperties
   export let value = ""
   export let bindingDrawer
+  export let valid = true
+
+  let originalValue = value
+  let helpers = handlebarsCompletions()
+  let getCaretPosition
+  let search = ""
+
+  $: value && checkValid()
+  $: bindableProperties = getBindableProperties(
+    $currentAsset.props,
+    $store.selectedComponentId
+  )
+  $: dispatch("update", value)
+  $: ({ instance, context } = groupBy("type", bindableProperties))
+  $: searchRgx = new RegExp(search, "ig")
+
+  function checkValid() {
+    // TODO: need to convert the value to the runtime binding
+    const runtimeBinding = readableToRuntimeBinding(bindableProperties, value)
+    valid = isValid(runtimeBinding)
+  }
 
   function addToText(readableBinding) {
-    value = `${value || ""}{{ ${readableBinding} }}`
+    const position = getCaretPosition()
+    const toAdd = `{{ ${readableBinding} }}`
+    if (position.start) {
+      value =
+        value.substring(0, position.start) +
+        toAdd +
+        value.substring(position.end, value.length)
+    } else {
+      value += toAdd
+    }
   }
-  let originalValue = value
-
-  $: dispatch("update", value)
 
   export function cancel() {
     dispatch("update", originalValue)
     bindingDrawer.close()
   }
 
-  $: ({ instance, context } = groupBy("type", bindableProperties))
+  function updateValue({ detail }) {
+    value = detail.value
+  }
 </script>
 
 <div class="drawer-contents">
   <div class="container" data-cy="binding-dropdown-modal">
     <div class="list">
+      <Input extraThin placeholder="Search" bind:value={search} />
+      <Spacer medium />
       {#if context}
         <Heading extraSmall>Columns</Heading>
         <Spacer small />
         <ul>
-          {#each context as { readableBinding }}
+          {#each context.filter(context =>
+            context.readableBinding.match(searchRgx)
+          ) as { readableBinding }}
             <li on:click={() => addToText(readableBinding)}>
               {readableBinding}
             </li>
           {/each}
         </ul>
       {/if}
+      <Spacer small />
       {#if instance}
         <Heading extraSmall>Components</Heading>
+        <Spacer small />
         <ul>
-          {#each instance as { readableBinding }}
+          {#each instance.filter(instance =>
+            instance.readableBinding.match(searchRgx)
+          ) as { readableBinding }}
             <li on:click={() => addToText(readableBinding)}>
               {readableBinding}
             </li>
           {/each}
         </ul>
       {/if}
+      <Spacer small />
+      <Heading extraSmall>Helpers</Heading>
+      <Spacer small />
+      <ul>
+        {#each helpers.filter(helper => helper.label.match(searchRgx) || helper.description.match(searchRgx)) as helper}
+          <li on:click={() => addToText(helper.text)}>
+            <div>
+              <Label extraSmall>{helper.displayText}</Label>
+              <div class="description">
+                {@html helper.description}
+              </div>
+              <pre>{helper.example || ''}</pre>
+            </div>
+          </li>
+        {/each}
+      </ul>
     </div>
     <div class="text">
       <TextArea
+        bind:getCaretPosition
         thin
         bind:value
         placeholder="Add text, or click the objects on the left to add them to
         the textbox." />
+      {#if !valid}
+        <p class="syntax-error">
+          Current Handlebars syntax is invalid, please check the guide
+          <a href="https://handlebarsjs.com/guide/">here</a>
+          for more details.
+        </p>
+      {/if}
     </div>
   </div>
 </div>
@@ -101,6 +170,11 @@
     border-width: 1px 0 1px 0;
   }
 
+  pre,
+  .description {
+    white-space: normal;
+  }
+
   li:hover {
     color: var(--ink);
     font-weight: 500;
@@ -114,4 +188,27 @@
     height: 40vh;
     overflow-y: auto;
   }
+
+  .syntax-error {
+    padding-top: var(--spacing-m);
+    color: var(--red);
+    font-size: 12px;
+  }
+
+  .syntax-error a {
+    color: var(--red);
+    text-decoration: underline;
+  }
+
+  .description :global(p) {
+    color: var(--grey-7);
+  }
+
+  .description :global(p:hover) {
+    color: var(--ink);
+  }
+
+  .description :global(p a) {
+    color: var(--grey-7);
+  }
 </style>

packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte

@@ -21,6 +21,7 @@
   let bindingDrawer
   let temporaryBindableValue = value
   let anchor
+  let valid
 
   $: bindableProperties = getBindableProperties(
     $currentAsset.props,
@@ -79,7 +80,7 @@
       class="icon"
       data-cy={`${key}-binding-button`}
       on:click={bindingDrawer.show}>
-      <Icon name="edit" />
+      <Icon name="lightning" />
     </div>
   {/if}
 </div>
@@ -90,10 +91,11 @@
     </Body>
   </div>
   <heading slot="buttons">
-    <Button thin blue on:click={handleClose}>Save</Button>
+    <Button thin blue disabled={!valid} on:click={handleClose}>Save</Button>
   </heading>
   <div slot="body">
     <BindingPanel
+      bind:valid
       value={safeValue}
       close={handleClose}
       on:update={e => (temporaryBindableValue = e.detail)}
@@ -142,7 +144,7 @@
     border-top-right-radius: var(--border-radius-m);
     border-bottom-right-radius: var(--border-radius-m);
     color: var(--grey-7);
-    font-size: 16px;
+    font-size: 14px;
   }
   .icon:hover {
     color: var(--ink);

packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte

@@ -35,7 +35,7 @@
     return [...acc, ...viewsArr]
   }, [])
   $: queries = $backendUiStore.queries
-    .filter(query => query.queryVerb === "read")
+    .filter(query => query.queryVerb === "read" || query.readable)
     .map(query => ({
       label: query.name,
       name: query.name,

packages/builder/src/components/feedback/FeedbackNavLink.svelte

@@ -1,6 +1,7 @@
 <script>
   import { Popover } from "@budibase/bbui"
   import { store } from "builderStore"
+  import { onMount } from "svelte"
 
   import FeedbackIframe from "./FeedbackIframe.svelte"
   import analytics from "analytics"
@@ -10,9 +11,15 @@
   let iconContainer
   let popover
 
-  setInterval(() => {
+  onMount(() => {
-    $store.highlightFeedbackIcon = analytics.highlightFeedbackIcon()
+    const interval = setInterval(() => {
-  }, FIVE_MINUTES)
+      store.update(state => {
+        state.highlightFeedbackIcon = analytics.highlightFeedbackIcon()
+        return state
+      })
+    }, FIVE_MINUTES)
+    return () => clearInterval(interval)
+  })
 </script>
 
 <div class="container" bind:this={iconContainer} on:click={popover.show}>

packages/builder/src/components/integration/QueryEditor.svelte

@@ -2,6 +2,7 @@
   import CodeMirror from "./codemirror"
   import { onMount, createEventDispatcher } from "svelte"
   import { themeStore } from "builderStore"
+  import { handlebarsCompletions } from "constants/completions"
 
   const dispatch = createEventDispatcher()
 
@@ -15,6 +16,14 @@
   export let lineNumbers = true
   export let tab = true
   export let mode
+  // export let parameters = []
+
+  let completions = handlebarsCompletions()
+
+  // $: completions = parameters.map(param => ({
+  //   text: `{{ ${param.name} }}`,
+  //   displayText: param.name,
+  // }))
 
   let width
   let height
@@ -109,6 +118,7 @@
       mode: modes[mode] || {
         name: mode,
       },
+
       readOnly,
       autoCloseBrackets: true,
       autoCloseTags: true,
@@ -136,6 +146,18 @@
       }
     })
 
+    // editor.on("cursorActivity", function() {
+    //   editor.showHint({
+    //     hint: function() {
+    //       return {
+    //         from: editor.getDoc().getCursor(),
+    //         to: editor.getDoc().getCursor(),
+    //         list: completions,
+    //       }
+    //     },
+    //   })
+    // })
+
     if (first) await sleep(50)
     editor.refresh()
 

packages/builder/src/components/integration/QueryViewer.svelte

@@ -132,7 +132,8 @@
 
 <header>
   <div class="input">
-    <Input placeholder="✎ Edit Query Name" bind:value={query.name} />
+    <div class="label">Enter query name:</div>
+    <Input outline border bind:value={query.name} />
   </div>
   {#if config}
     <div class="props">
@@ -216,7 +217,9 @@
 
 <style>
   .input {
-    width: 300px;
+    width: 500px;
+    display: flex;
+    align-items: center;
   }
 
   .select {
@@ -288,4 +291,12 @@
     margin-top: -28px;
     z-index: -2;
   }
+
+  .label {
+    font-family: var(--font-sans);
+    color: var(--grey-8);
+    font-size: var(--font-size-s);
+    margin-right: 8px;
+    font-weight: 600;
+  }
 </style>

packages/builder/src/components/integration/codemirror.js

@@ -1,10 +1,12 @@
 import CodeMirror from "codemirror"
 import "codemirror/lib/codemirror.css"
 import "codemirror/theme/tomorrow-night-eighties.css"
+import "codemirror/addon/hint/show-hint.css"
 import "codemirror/theme/neo.css"
 import "codemirror/mode/sql/sql"
 import "codemirror/mode/css/css"
 import "codemirror/mode/handlebars/handlebars"
 import "codemirror/mode/javascript/javascript"
+import "codemirror/addon/hint/show-hint"
 
 export default CodeMirror

packages/builder/src/components/integration/index.svelte

@@ -28,14 +28,16 @@
         mode="sql"
         on:change={updateQuery}
         readOnly={!editable}
-        value={query.fields.sql} />
+        value={query.fields.sql}
+        parameters={query.parameters} />
     {:else if schema.type === QueryTypes.JSON}
       <Editor
         label="Query"
         mode="json"
         on:change={updateQuery}
         readOnly={!editable}
-        value={query.fields.json} />
+        value={query.fields.json}
+        parameters={query.parameters} />
     {:else if schema.type === QueryTypes.FIELDS}
       <FieldsBuilder bind:fields={query.fields} {schema} {editable} />
     {/if}

packages/builder/src/components/start/AppCard.svelte

@@ -14,9 +14,12 @@
   async function exportApp() {
     appExportLoading = true
     try {
-      download(`/api/backups/export?appId=${_id}`)
+      download(
+        `/api/backups/export?appId=${_id}&appname=${encodeURIComponent(name)}`
+      )
       notifier.success("App Export Complete.")
     } catch (err) {
+      console.error(err)
       notifier.danger("App Export Failed.")
     } finally {
       appExportLoading = false
@@ -29,13 +32,13 @@
   <Spacer medium />
   <div class="card-footer">
     <TextButton text medium blue href="/_builder/{_id}">
-      Open
+      Open {name} →
-      {name}
-      →
     </TextButton>
     {#if appExportLoading}
       <Spinner size="10" />
-    {:else}<i class="ri-folder-download-line" on:click={exportApp} />{/if}
+    {:else}
+      <i class="ri-folder-download-line" on:click={exportApp} />
+    {/if}
   </div>
 </div>
 

packages/builder/src/constants/completions.js

@@ -0,0 +1,16 @@
+import { getManifest } from "@budibase/string-templates"
+
+export function handlebarsCompletions() {
+  const manifest = getManifest()
+
+  return Object.keys(manifest).flatMap(key =>
+    Object.entries(manifest[key]).map(([helperName, helperConfig]) => ({
+      text: helperName,
+      path: helperName,
+      example: helperConfig.example,
+      label: helperName,
+      displayText: helperName,
+      description: helperConfig.description,
+    }))
+  )
+}

packages/builder/yarn.lock

@@ -842,10 +842,10 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
-"@budibase/bbui@^1.55.2":
+"@budibase/bbui@^1.57.0":
-  version "1.55.2"
+  version "1.57.0"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.55.2.tgz#be636e8b86b7e516a08eb626bb50c4b1f9774bf8"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.57.0.tgz#d57bd3baee21bcf1588ac01afe8f90e2b460a4b0"
-  integrity sha512-CevH/olxDFIko9uwYUpUTevPmpShrLwJSR7+wn/JetZERwhTwbLhOXzpsyXaK226qQ8vWhm0U31HRSKI1HwDDg==
+  integrity sha512-mEKfKVc3WNHhWd/ltBMczq9PlaYainYIFBkqin9Dh5J1zSqizDTxxKsSwLdo72ZsxK23JECm8R20nyoU6csU9w==
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"
@@ -854,7 +854,7 @@
     svelte-portal "^1.0.0"
     turndown "^7.0.0"
 
-"@budibase/colorpicker@^1.0.1":
+"@budibase/colorpicker@1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@budibase/colorpicker/-/colorpicker-1.0.1.tgz#940c180e7ebba0cb0756c4c8ef13f5dfab58e810"
   integrity sha512-+DTHYhU0sTi5RfCyd7AAvMsLFwyF/wgs0owf7KyQU+ZILRW+YsWa7OQMz+hKQfgVAmvzwrNz8ATiBlG3Ac6Asg==
@@ -1257,7 +1257,7 @@
     node-fetch "^2.6.0"
     utf-8-validate "^5.0.2"
 
-"@svelteschool/svelte-forms@^0.7.0":
+"@svelteschool/svelte-forms@0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@svelteschool/svelte-forms/-/svelte-forms-0.7.0.tgz#4ecba15e9a9ab2b04fad3d892931a561118a4cea"
   integrity sha512-TSt8ROqK6wq+Hav7EhZL1I0GtsZhg28aJuuDSviBzG/NG9pC0eprf8roWjl59DKHOVWIUTPTeY+T+lipb9gf8w==
@@ -1775,11 +1775,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base-64@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb"
-  integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs=
-
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
@@ -1870,15 +1865,6 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-britecharts@^2.16.0:
-  version "2.17.2"
-  resolved "https://registry.yarnpkg.com/britecharts/-/britecharts-2.17.2.tgz#78e7743e7c1dcaccd78ab7dacc479d37d509cdf2"
-  integrity sha512-+wMG/ci+UHPRIySppTs8wQZmmlYFQHn2bCvbNiWUOYd1qAoiEQyKA/dVtgdTyR09qM+h8b9YsFofaWHJRT1mQg==
-  dependencies:
-    base-64 "^0.1.0"
-    d3 "^5.16.0"
-    lodash.assign "^4.2.0"
-
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -2282,16 +2268,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commander@2.17.x:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 commander@^5.0.0, commander@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
@@ -2536,254 +2522,11 @@ cypress@^5.1.0:
     url "^0.11.0"
     yauzl "^2.10.0"
 
-d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
+d3-selection@^1.4.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
-  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
-
-d3-axis@1:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9"
-  integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
-
-d3-brush@1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
-  integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
-d3-chord@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f"
-  integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==
-  dependencies:
-    d3-array "1"
-    d3-path "1"
-
-d3-collection@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
-  integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
-
-d3-color@1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
-  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
-
-d3-contour@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
-  integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
-  dependencies:
-    d3-array "^1.1.1"
-
-d3-dispatch@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
-  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
-
-d3-drag@1:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
-  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
-  dependencies:
-    d3-dispatch "1"
-    d3-selection "1"
-
-d3-dsv@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
-  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
-  dependencies:
-    commander "2"
-    iconv-lite "0.4"
-    rw "1"
-
-d3-ease@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
-  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
-
-d3-fetch@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
-  integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
-  dependencies:
-    d3-dsv "1"
-
-d3-force@1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
-  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
-  dependencies:
-    d3-collection "1"
-    d3-dispatch "1"
-    d3-quadtree "1"
-    d3-timer "1"
-
-d3-format@1:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
-  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
-
-d3-geo@1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
-  integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
-  dependencies:
-    d3-array "1"
-
-d3-hierarchy@1:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
-  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
-
-d3-interpolate@1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
-  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
-  dependencies:
-    d3-color "1"
-
-d3-path@1:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
-  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
-
-d3-polygon@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
-  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
-
-d3-quadtree@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
-  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
-
-d3-random@1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291"
-  integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
-
-d3-scale-chromatic@1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
-  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
-  dependencies:
-    d3-color "1"
-    d3-interpolate "1"
-
-d3-scale@2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
-  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
-  dependencies:
-    d3-array "^1.2.0"
-    d3-collection "1"
-    d3-format "1"
-    d3-interpolate "1"
-    d3-time "1"
-    d3-time-format "2"
-
-d3-selection@1, d3-selection@^1.1.0, d3-selection@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
   integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
 
-d3-shape@1:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
-  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
-  dependencies:
-    d3-path "1"
-
-d3-time-format@2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
-  integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
-  dependencies:
-    d3-time "1"
-
-d3-time@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
-  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
-
-d3-timer@1:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
-  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
-
-d3-transition@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
-  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
-  dependencies:
-    d3-color "1"
-    d3-dispatch "1"
-    d3-ease "1"
-    d3-interpolate "1"
-    d3-selection "^1.1.0"
-    d3-timer "1"
-
-d3-voronoi@1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
-  integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
-
-d3-zoom@1:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
-  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
-d3@^5.16.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
-  integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
-  dependencies:
-    d3-array "1"
-    d3-axis "1"
-    d3-brush "1"
-    d3-chord "1"
-    d3-collection "1"
-    d3-color "1"
-    d3-contour "1"
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-dsv "1"
-    d3-ease "1"
-    d3-fetch "1"
-    d3-force "1"
-    d3-format "1"
-    d3-geo "1"
-    d3-hierarchy "1"
-    d3-interpolate "1"
-    d3-path "1"
-    d3-polygon "1"
-    d3-quadtree "1"
-    d3-random "1"
-    d3-scale "2"
-    d3-scale-chromatic "1"
-    d3-selection "1"
-    d3-shape "1"
-    d3-time "1"
-    d3-time-format "2"
-    d3-timer "1"
-    d3-transition "1"
-    d3-voronoi "1"
-    d3-zoom "1"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2995,7 +2738,7 @@ dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
 
-downloadjs@^1.4.7:
+downloadjs@1.4.7:
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c"
   integrity sha1-9p+W+UDg0FU9rCkROYZaPNAQHjw=
@@ -3842,7 +3585,7 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-iconv-lite@0.4, iconv-lite@0.4.24:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5047,11 +4790,6 @@ lodash-es@^4.17.11:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
   integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
 
-lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-
 lodash.once@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
@@ -5062,7 +4800,12 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
-lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19:
+lodash@4.17.13:
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93"
+  integrity sha512-vm3/XWXfWtRua0FkUyEHBZy8kCPjErNBT9fJx8Zvs+U6zjqPbTUOpkaoum3O5uiA8sm+yNMHXfYkTUHFoMxFNA==
+
+lodash@^4.17.15, lodash@^4.17.19:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -6135,7 +5878,7 @@ relateurl@0.2.x:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-remixicon@^2.5.0:
+remixicon@2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41"
   integrity sha512-q54ra2QutYDZpuSnFjmeagmEiN9IMo56/zz5dDNitzKD23oFRw77cWo4TsrAdmdkPiEn8mxlrTqxnkujDbEGww==
@@ -6436,11 +6179,6 @@ run-parallel@^1.1.9:
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
   integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
 
-rw@1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
-  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
-
 rxjs@^6.3.3, rxjs@^6.5.5:
   version "6.6.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
@@ -6583,10 +6321,10 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
-shortid@^2.2.15:
+shortid@2.2.15:
-  version "2.2.16"
+  version "2.2.15"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"
+  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.15.tgz#2b902eaa93a69b11120373cd42a1f1fe4437c122"
-  integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==
+  integrity sha512-5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw==
   dependencies:
     nanoid "^2.1.0"
 
@@ -6996,7 +6734,7 @@ svelte-loading-spinners@^0.1.1:
   resolved "https://registry.yarnpkg.com/svelte-loading-spinners/-/svelte-loading-spinners-0.1.1.tgz#a35a811b7db0389ec2a5de6904c718c58c36e1f9"
   integrity sha512-or4zs10VOdczOJo3u25IINXQOkZbLNAxMrXK0PRbzVoJtPQq/QZPNxI32383bpe+soYcEKmESbmW+JlW3MbUKQ==
 
-svelte-portal@^0.1.0:
+svelte-portal@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742"
   integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg==
@@ -7317,16 +7055,16 @@ util.promisify@^1.0.0:
     has-symbols "^1.0.1"
     object.getownpropertydescriptors "^2.1.0"
 
+uuid@8.3.1:
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
+  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
+
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^8.3.1:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
-  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -7586,10 +7324,10 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yup@^0.29.2:
+yup@0.29.2:
-  version "0.29.3"
+  version "0.29.2"
-  resolved "https://registry.yarnpkg.com/yup/-/yup-0.29.3.tgz#69a30fd3f1c19f5d9e31b1cf1c2b851ce8045fea"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.29.2.tgz#5302abd9024cca335b987793f8df868e410b7b67"
-  integrity sha512-RNUGiZ/sQ37CkhzKFoedkeMfJM0vNQyaz+wRZJzxdKE7VfDeVKH8bb4rr7XhRLbHJz5hSjoDNwMEIaKhuMZ8gQ==
+  integrity sha512-FbAAeopli+TnpZ8Lzv2M72wltLw58iWBT7wW8FuAPFPb3CelXmSKCXQbV1o4keywpIK1BZ0ULTLv2s3w1CfOwA==
   dependencies:
     "@babel/runtime" "^7.10.5"
     fn-name "~3.0.0"

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.6.2",
+  "version": "0.7.4",
   "license": "MPL-2.0",
   "main": "dist/budibase-client.js",
   "module": "dist/budibase-client.js",
@@ -9,14 +9,14 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/string-templates": "^0.6.2",
+    "@budibase/string-templates": "^0.7.4",
     "deep-equal": "^2.0.1",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"
   },
   "devDependencies": {
-    "@budibase/standard-components": "^0.6.2",
+    "@budibase/standard-components": "^0.7.4",
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "fs-extra": "^8.1.0",
@@ -26,9 +26,9 @@
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-svelte": "^6.1.1",
-    "rollup-plugin-terser": "^4.0.4",
+    "rollup-plugin-terser": "^7.0.2",
     "svelte": "^3.30.0",
     "svelte-jester": "^1.0.6"
   },
-  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
 }

packages/client/rollup.config.js

@@ -2,6 +2,7 @@ import commonjs from "@rollup/plugin-commonjs"
 import resolve from "@rollup/plugin-node-resolve"
 import builtins from "rollup-plugin-node-builtins"
 import svelte from "rollup-plugin-svelte"
+import { terser } from "rollup-plugin-terser"
 
 const production = !process.env.ROLLUP_WATCH
 
@@ -25,6 +26,7 @@ export default {
     }),
     commonjs(),
     builtins(),
+    production && terser(),
   ],
   watch: {
     clearScreen: false,

packages/client/src/api/views.js

@@ -18,7 +18,7 @@ export const fetchViewData = async ({
     params.set("calculation", calculation)
   }
   if (groupBy) {
-    params.set("group", groupBy)
+    params.set("group", groupBy ? "true" : "false")
   }
 
   const QUERY_VIEW_URL = field

packages/client/yarn.lock

@@ -9,6 +9,13 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.10.4":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
@@ -373,7 +380,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.19.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -847,6 +854,11 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -1097,13 +1109,14 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-jest-worker@^24.0.0:
+jest-worker@^26.2.1:
-  version "24.9.0"
+  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
   dependencies:
+    "@types/node" "*"
     merge-stream "^2.0.0"
-    supports-color "^6.1.0"
+    supports-color "^7.0.0"
 
 js-tokens@^4.0.0:
   version "4.0.0"
@@ -1564,7 +1577,7 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -1744,15 +1757,15 @@ rollup-plugin-svelte@^6.1.1:
     rollup-pluginutils "^2.8.2"
     sourcemap-codec "^1.4.8"
 
-rollup-plugin-terser@^4.0.4:
+rollup-plugin-terser@^7.0.2:
-  version "4.0.4"
+  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz#6f661ef284fa7c27963d242601691dc3d23f994e"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
-  integrity sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==
+  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
+    "@babel/code-frame" "^7.10.4"
-    jest-worker "^24.0.0"
+    jest-worker "^26.2.1"
-    serialize-javascript "^1.6.1"
+    serialize-javascript "^4.0.0"
-    terser "^3.14.1"
+    terser "^5.0.0"
 
 rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
   version "2.8.2"
@@ -1795,10 +1808,12 @@ semver@~2.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52"
   integrity sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI=
 
-serialize-javascript@^1.6.1:
+serialize-javascript@^4.0.0:
-  version "1.9.1"
+  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
@@ -1823,7 +1838,7 @@ side-channel@^1.0.2:
     es-abstract "^1.18.0-next.0"
     object-inspect "^1.8.0"
 
-source-map-support@~0.5.10:
+source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -1836,6 +1851,11 @@ source-map@^0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@~0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
 sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
@@ -1908,12 +1928,12 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
+supports-color@^7.0.0:
-  version "6.1.0"
+  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
 
 svelte-jester@^1.0.6:
   version "1.1.5"
@@ -1939,14 +1959,14 @@ symbol-tree@^3.2.4:
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-terser@^3.14.1:
+terser@^5.0.0:
-  version "3.17.0"
+  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289"
-  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
+  integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==
   dependencies:
-    commander "^2.19.0"
+    commander "^2.20.0"
-    source-map "~0.6.1"
+    source-map "~0.7.2"
-    source-map-support "~0.5.10"
+    source-map-support "~0.5.19"
 
 tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.6.2",
+  "version": "0.7.4",
   "description": "Budibase Web Server",
   "main": "src/electron.js",
   "repository": {
@@ -50,58 +50,58 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/client": "^0.6.2",
+    "@budibase/client": "^0.7.4",
-    "@budibase/string-templates": "^0.6.2",
+    "@budibase/string-templates": "^0.7.4",
-    "@elastic/elasticsearch": "^7.10.0",
+    "@elastic/elasticsearch": "7.10.0",
-    "@koa/router": "^8.0.0",
+    "@koa/router": "8.0.0",
-    "@sendgrid/mail": "^7.1.1",
+    "@sendgrid/mail": "7.1.1",
-    "@sentry/node": "^5.19.2",
+    "@sentry/node": "5.19.2",
-    "airtable": "^0.10.1",
+    "airtable": "0.10.1",
-    "arangojs": "^7.2.0",
+    "arangojs": "7.2.0",
     "aws-sdk": "^2.767.0",
-    "bcryptjs": "^2.4.3",
+    "bcryptjs": "2.4.3",
-    "chmodr": "^1.2.0",
+    "chmodr": "1.2.0",
-    "csvtojson": "^2.0.10",
+    "csvtojson": "2.0.10",
-    "dotenv": "^8.2.0",
+    "dotenv": "8.2.0",
-    "download": "^8.0.0",
+    "download": "8.0.0",
-    "electron-is-dev": "^1.2.0",
+    "electron-is-dev": "1.2.0",
-    "electron-unhandled": "^3.0.2",
+    "electron-unhandled": "3.0.2",
-    "electron-updater": "^4.3.1",
+    "electron-updater": "4.3.1",
-    "electron-util": "^0.14.2",
+    "electron-util": "0.14.2",
-    "fix-path": "^3.0.0",
+    "fix-path": "3.0.0",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "8.1.0",
-    "jimp": "^0.16.1",
+    "jimp": "0.16.1",
-    "joi": "^17.2.1",
+    "joi": "17.2.1",
-    "jsonschema": "^1.4.0",
+    "jsonschema": "1.4.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "8.5.1",
-    "koa": "^2.7.0",
+    "koa": "2.7.0",
-    "koa-body": "^4.2.0",
+    "koa-body": "4.2.0",
-    "koa-compress": "^4.0.1",
+    "koa-compress": "4.0.1",
-    "koa-pino-logger": "^3.0.0",
+    "koa-pino-logger": "3.0.0",
-    "koa-send": "^5.0.0",
+    "koa-send": "5.0.0",
-    "koa-session": "^5.12.0",
+    "koa-session": "5.12.0",
-    "koa-static": "^5.0.0",
+    "koa-static": "5.0.0",
-    "lodash": "^4.17.13",
+    "lodash": "4.17.13",
-    "mongodb": "^3.6.3",
+    "mongodb": "3.6.3",
-    "mssql": "^6.2.3",
+    "mssql": "6.2.3",
-    "mysql": "^2.18.1",
+    "mysql": "2.18.1",
-    "node-fetch": "^2.6.0",
+    "node-fetch": "2.6.0",
-    "open": "^7.3.0",
+    "open": "7.3.0",
-    "pg": "^8.5.1",
+    "pg": "8.5.1",
-    "pino-pretty": "^4.0.0",
+    "pino-pretty": "4.0.0",
-    "pouchdb": "^7.2.1",
+    "pouchdb": "7.2.1",
-    "pouchdb-all-dbs": "^1.0.2",
+    "pouchdb-all-dbs": "1.0.2",
-    "pouchdb-replication-stream": "^1.2.9",
+    "pouchdb-replication-stream": "1.2.9",
-    "sanitize-s3-objectkey": "^0.0.1",
+    "sanitize-s3-objectkey": "0.0.1",
-    "server-destroy": "^1.0.1",
+    "server-destroy": "1.0.1",
-    "svelte": "^3.30.0",
+    "svelte": "3.30.0",
-    "tar-fs": "^2.1.0",
+    "tar-fs": "2.1.0",
-    "to-json-schema": "^0.2.5",
+    "to-json-schema": "0.2.5",
-    "uuid": "^3.3.2",
+    "uuid": "3.3.2",
-    "validate.js": "^0.13.1",
+    "validate.js": "0.13.1",
-    "worker-farm": "^1.7.0",
+    "worker-farm": "1.7.0",
-    "yargs": "^13.2.4",
+    "yargs": "13.2.4",
-    "zlib": "^1.0.5"
+    "zlib": "1.0.5"
   },
   "devDependencies": {
     "@jest/test-sequencer": "^24.8.0",
@@ -120,5 +120,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
 }

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

@@ -45,7 +45,7 @@ exports.authenticate = async ctx => {
       expiresIn: "1 day",
     })
 
-    setCookie(ctx, appId, token)
+    setCookie(ctx, token, appId)
 
     delete dbUser.password
     ctx.body = {

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

@@ -6,10 +6,12 @@ const fs = require("fs-extra")
 exports.exportAppDump = async function(ctx) {
   const { appId } = ctx.query
 
+  const appname = decodeURI(ctx.query.appname)
+
   const backupsDir = path.join(os.homedir(), ".budibase", "backups")
   fs.ensureDirSync(backupsDir)
 
-  const backupIdentifier = `${appId} Backup: ${new Date()}.txt`
+  const backupIdentifier = `${appname}Backup${new Date().getTime()}.txt`
 
   await performDump({
     dir: backupsDir,
@@ -23,19 +25,4 @@ exports.exportAppDump = async function(ctx) {
 
   ctx.attachment(backupIdentifier)
   ctx.body = fs.createReadStream(backupFile)
-  // ctx.body = {
-  //   url: `/api/backups/download/${backupIdentifier}`,
-  // }
 }
-
-// exports.downloadAppDump = async function(ctx) {
-//   const fileName = ctx.params.fileName
-
-//   const backupsDir = path.join(os.homedir(), ".budibase", "backups")
-//   fs.ensureDirSync(backupsDir)
-
-//   const backupFile = path.join(backupsDir, fileName)
-
-//   ctx.attachment(fileName)
-//   ctx.body = fs.createReadStream(backupFile)
-// }

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

@@ -1,8 +1,18 @@
-const handlebars = require("handlebars")
+const { processString } = require("@budibase/string-templates")
 const CouchDB = require("../../db")
 const { generateQueryID, getQueryParams } = require("../../db/utils")
 const { integrations } = require("../../integrations")
 
+function formatResponse(resp) {
+  if (typeof resp === "string") {
+    resp = JSON.parse(resp)
+  }
+  if (!Array.isArray(resp)) {
+    resp = [resp]
+  }
+  return resp
+}
+
 exports.fetch = async function(ctx) {
   const db = new CouchDB(ctx.user.appId)
 
@@ -29,19 +39,22 @@ exports.save = async function(ctx) {
   ctx.message = `Query ${query.name} saved successfully.`
 }
 
-function enrichQueryFields(fields, parameters) {
+async function enrichQueryFields(fields, parameters) {
   const enrichedQuery = {}
 
   // enrich the fields with dynamic parameters
-  for (let key in fields) {
+  for (let key of Object.keys(fields)) {
-    const template = handlebars.compile(fields[key])
+    enrichedQuery[key] = await processString(fields[key], parameters)
-    enrichedQuery[key] = template(parameters)
   }
 
   if (enrichedQuery.json || enrichedQuery.customData) {
-    enrichedQuery.json = JSON.parse(
+    try {
-      enrichedQuery.json || enrichedQuery.customData
+      enrichedQuery.json = JSON.parse(
-    )
+        enrichedQuery.json || enrichedQuery.customData
+      )
+    } catch (err) {
+      throw { message: `JSON Invalid - error: ${err}` }
+    }
     delete enrichedQuery.customData
   }
 
@@ -62,9 +75,11 @@ exports.preview = async function(ctx) {
 
   const { fields, parameters, queryVerb } = ctx.request.body
 
-  const enrichedQuery = enrichQueryFields(fields, parameters)
+  const enrichedQuery = await enrichQueryFields(fields, parameters)
 
-  ctx.body = await new Integration(datasource.config)[queryVerb](enrichedQuery)
+  ctx.body = formatResponse(
+    await new Integration(datasource.config)[queryVerb](enrichedQuery)
+  )
 }
 
 exports.execute = async function(ctx) {
@@ -80,17 +95,15 @@ exports.execute = async function(ctx) {
     return
   }
 
-  const enrichedQuery = enrichQueryFields(
+  const enrichedQuery = await enrichQueryFields(
     query.fields,
     ctx.request.body.parameters
   )
 
   // call the relevant CRUD method on the integration class
-  const response = await new Integration(datasource.config)[query.queryVerb](
+  ctx.body = formatResponse(
-    enrichedQuery
+    await new Integration(datasource.config)[query.queryVerb](enrichedQuery)
   )
-
-  ctx.body = response
 }
 
 exports.destroy = async function(ctx) {

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

@@ -9,7 +9,7 @@ const {
   ViewNames,
 } = require("../../db/utils")
 const usersController = require("./user")
-const { coerceRowValues } = require("../../utilities")
+const { coerceRowValues, enrichRows } = require("../../utilities")
 
 const TABLE_VIEW_BEGINS_WITH = `all${SEPARATOR}${DocumentTypes.TABLE}${SEPARATOR}`
 
@@ -190,7 +190,15 @@ exports.fetchView = async function(ctx) {
 
   if (!calculation) {
     response.rows = response.rows.map(row => row.doc)
-    ctx.body = await linkRows.attachLinkInfo(appId, response.rows)
+    let table
+    try {
+      table = await db.get(ctx.params.tableId)
+    } catch (err) {
+      table = {
+        schema: {},
+      }
+    }
+    ctx.body = await enrichRows(appId, table, response.rows)
   }
 
   if (calculation === CALCULATION_TYPES.STATS) {
@@ -217,14 +225,15 @@ exports.fetchView = async function(ctx) {
 
 exports.fetchTableRows = async function(ctx) {
   const appId = ctx.user.appId
+  const db = new CouchDB(appId)
 
   // special case for users, fetch through the user controller
-  let rows
+  let rows,
+    table = await db.get(ctx.params.tableId)
   if (ctx.params.tableId === ViewNames.USERS) {
     await usersController.fetch(ctx)
     rows = ctx.body
   } else {
-    const db = new CouchDB(appId)
     const response = await db.allDocs(
       getRowParams(ctx.params.tableId, null, {
         include_docs: true,
@@ -232,15 +241,16 @@ exports.fetchTableRows = async function(ctx) {
     )
     rows = response.rows.map(row => row.doc)
   }
-  ctx.body = await linkRows.attachLinkInfo(appId, rows)
+  ctx.body = await enrichRows(appId, table, rows)
 }
 
 exports.find = async function(ctx) {
   const appId = ctx.user.appId
   const db = new CouchDB(appId)
   try {
+    const table = await db.get(ctx.params.tableId)
     const row = await findRow(db, appId, ctx.params.tableId, ctx.params.rowId)
-    ctx.body = await linkRows.attachLinkInfo(appId, row)
+    ctx.body = await enrichRows(appId, table, row)
   } catch (err) {
     ctx.throw(400, err)
   }
@@ -325,8 +335,9 @@ exports.fetchEnrichedRow = async function(ctx) {
     keys: linkVals.map(linkVal => linkVal.id),
   })
   // need to include the IDs in these rows for any links they may have
-  let linkedRows = await linkRows.attachLinkInfo(
+  let linkedRows = await enrichRows(
     appId,
+    table,
     response.rows.map(row => row.doc)
   )
   // insert the link rows in the correct place throughout the main row

packages/server/src/api/controllers/static/index.js

@@ -17,11 +17,12 @@ const CouchDB = require("../../../db")
 const setBuilderToken = require("../../../utilities/builder/setBuilderToken")
 const fileProcessor = require("../../../utilities/fileProcessor")
 const env = require("../../../environment")
+const { OBJ_STORE_DIRECTORY } = require("../../../constants")
 
 function objectStoreUrl() {
   if (env.SELF_HOSTED) {
     // can use a relative url for this as all goes through the proxy (this is hosted in minio)
-    return `/app-assets/assets`
+    return OBJ_STORE_DIRECTORY
   } else {
     return "https://cdn.app.budi.live/assets"
   }
@@ -49,6 +50,17 @@ exports.serveBuilder = async function(ctx) {
   await send(ctx, ctx.file, { root: ctx.devPath || builderPath })
 }
 
+exports.serveSelfHostPage = async function(ctx) {
+  const logo = fs.readFileSync(resolve(__dirname, "selfhost/logo.svg"), "utf8")
+  const hostingHbs = fs.readFileSync(
+    resolve(__dirname, "selfhost/index.hbs"),
+    "utf8"
+  )
+  ctx.body = await processString(hostingHbs, {
+    logo,
+  })
+}
+
 exports.uploadFile = async function(ctx) {
   let files
   files =

packages/server/src/api/controllers/static/selfhost/index.hbs

@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Budibase self hosting️</title>
+  <style>
+    body {
+      font-family: Inter, -apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+      height: 100%;
+      width: 100%;
+      margin: 0;
+      padding: 0;
+      background: #fafafa;
+    }
+
+    .main {
+      padding: 0 20px;
+      margin: 30px auto;
+      width: 60%;
+    }
+
+    h2 {
+      font-size: clamp(24px, 1.5vw, 30px);
+      text-align: center;
+      line-height: 1.3;
+      font-weight: bold;
+    }
+
+    .card-grid {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 3rem;
+    }
+
+    .card {
+      display: grid;
+      background-color: #222222;
+      grid-template-columns: 1fr;
+      align-items: center;
+      padding: 2.5rem 1.75rem;
+      border-radius: 12px;
+      color: white;
+    }
+
+    .card h3 {
+      margin: 0;
+      font-size: 24px;
+      font-family: sans-serif;
+      font-weight: 600;
+    }
+
+    .card h3 b {
+      text-wrap: normal;
+      font-size: 36px;
+      padding-right: 14px;
+    }
+
+    .card p {
+      color: #ffffff;
+      opacity: 0.8;
+      font-size: 18px;
+      text-align: left;
+      line-height: 1.3;
+      margin-top: 1rem;
+    }
+
+    .logo {
+      width: 60px;
+      height: 60px;
+      margin: auto;
+    }
+
+    .top-text {
+      text-align: center;
+      color: #707070;
+      margin: 0 0 1.5rem 0;
+    }
+
+    .button {
+      cursor: pointer;
+      display: block;
+      background: #4285f4;
+      color: white;
+      padding: 12px 16px;
+      font-size: 16px;
+      font-weight: 600;
+      border-radius: 6px;
+      max-width: 120px;
+      text-align: center;
+      transition: 200ms background ease;
+      text-decoration: none;
+    }
+
+    .info {
+      background: #f5f5f5;
+      padding: 1rem 1rem 1rem 1rem;
+      border: #ccc 1px solid;
+      border-radius: 6px;
+      margin-top: 40px;
+      display: flex;
+      align-items: center;
+    }
+
+    .info p {
+      margin-left: 20px;
+      color: #222222;
+      font-family: sans-serif;
+    }
+
+    .info p {
+      margin-right: 20px;
+    }
+
+    .info svg {
+      margin-left: 20px;
+    }
+
+    .info a {
+      color: #4285f4;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <div class="logo">
+      {{logo}}
+    </div>
+    <h2>Get started with Budibase Self Hosting</h2>
+    <p class="top-text">Use the address <b id="url"></b> in your Builder</p>
+    <div class="card-grid">
+      <div class="card">
+        <h3><b>📚</b>Documentation</h3>
+        <p>
+          Find out more about your self hosted platform.
+        </p>
+        <a class="button"
+           href="https://docs.budibase.com/self-hosting/introduction-to-self-hosting">
+          Documentation
+        </a>
+      </div>
+      <div class="card">
+        <h3><b>💻</b>Next steps</h3>
+        <p>
+          Find out how to make use of your self hosted Budibase platform.
+        </p>
+        <a class="button"
+           href="https://docs.budibase.com/self-hosting/builder-settings">
+          Next steps
+        </a>
+      </div>
+    </div>
+    <div class="info">
+      <svg preserveAspectRatio="xMidYMid meet" height="28px" width="28px" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"
+           xmlns:xlink="http://www.w3.org/1999/xlink" stroke="none" class="icon-7f6730be--text-3f89f380">
+        <g>
+          <path d="M12.2 8.98c.06-.01.12-.03.18-.06.06-.02.12-.05.18-.09l.15-.12c.18-.19.29-.45.29-.71 0-.06-.01-.13-.02-.19a.603.603 0 0 0-.06-.19.757.757 0 0 0-.09-.18c-.03-.05-.08-.1-.12-.15-.28-.27-.72-.37-1.09-.21-.13.05-.23.12-.33.21-.04.05-.09.1-.12.15-.04.06-.07.12-.09.18-.03.06-.05.12-.06.19-.01.06-.02.13-.02.19 0 .26.11.52.29.71.1.09.2.16.33.21.12.05.25.08.38.08.06 0 .13-.01.2-.02M13 16v-4a1 1 0 1 0-2 0v4a1 1 0 1 0 2 0M12 3c-4.962 0-9 4.038-9 9 0 4.963 4.038 9 9 9 4.963 0 9-4.037 9-9 0-4.962-4.037-9-9-9m0 20C5.935 23 1 18.065 1 12S5.935 1 12 1c6.066 0 11 4.935 11 11s-4.934 11-11 11" fill-rule="evenodd">
+          </path>
+        </g>
+      </svg>
+      <p>A <b>Hosting Key</b> will also be required, this can be found in your hosting properties, info found <a href="https://docs.budibase.com/self-hosting/hosting-settings">here</a>.</p>
+    </div>
+  </div>
+  <script>
+    window.addEventListener("load", () => {
+      let url = document.URL.split("//")[1]
+      if (url.substring(url.length - 1) === "/") {
+        url = url.substring(0, url.length - 1)
+      }
+      document.getElementById("url").innerHTML = url
+    })
+  </script>
+</body>
+</html>

packages/server/src/api/controllers/static/selfhost/logo.svg

@@ -0,0 +1,17 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 48 48" xml:space="preserve">
+  <style>
+    .st0{fill:#393c44}.st1{fill:#fff}
+  </style>
+    <path class="st0" d="M-152.17-24.17H-56V72h-96.17z"/>
+    <path class="st1" d="M-83.19 48h-41.79c-1.76 0-3.19-1.43-3.19-3.19V3.02c0-1.76 1.43-3.19 3.19-3.19h41.79c1.76 0 3.19 1.43 3.19 3.19v41.79c0 1.76-1.43 3.19-3.19 3.19z"/>
+    <path class="st0" d="M-99.62 12.57v9.94c1.15-1.21 2.59-1.81 4.32-1.81 1.03 0 1.97.19 2.82.58.86.39 1.59.91 2.19 1.57.6.66 1.08 1.43 1.42 2.32.34.89.51 1.84.51 2.85 0 1.03-.18 1.99-.53 2.89-.35.9-.84 1.68-1.47 2.35-.63.67-1.37 1.19-2.23 1.58-.86.39-1.78.58-2.77.58-1.8 0-3.22-.66-4.27-1.97V35h-4.89V12.57h4.9zm6.16 15.54c0-.43-.08-.84-.24-1.23-.16-.39-.39-.72-.68-1.01-.29-.29-.62-.52-1-.69-.38-.17-.79-.26-1.24-.26-.43 0-.84.08-1.22.24-.38.16-.71.39-.99.68-.28.29-.5.63-.68 1.01-.17.39-.26.8-.26 1.23 0 .43.08.84.24 1.22.16.38.39.71.68.99.29.28.63.5 1.01.68.39.17.8.26 1.23.26.43 0 .84-.08 1.22-.24.38-.16.71-.39.99-.68.28-.29.5-.62.68-1 .17-.39.26-.79.26-1.2z"/>
+    <path class="st0" d="M-114.76 12.57v9.94c1.15-1.21 2.59-1.81 4.32-1.81 1.03 0 1.97.19 2.82.58.86.39 1.59.91 2.19 1.57.6.66 1.08 1.43 1.42 2.32.34.89.51 1.84.51 2.85 0 1.03-.18 1.99-.53 2.89-.35.9-.84 1.68-1.47 2.35-.63.67-1.37 1.19-2.23 1.58-.86.39-1.78.58-2.77.58-1.8 0-3.22-.66-4.27-1.97V35h-4.89V12.57h4.9zm6.16 15.54c0-.43-.08-.84-.24-1.23-.16-.39-.39-.72-.68-1.01-.29-.29-.62-.52-1-.69-.38-.17-.79-.26-1.24-.26-.43 0-.84.08-1.22.24-.38.16-.71.39-.99.68-.28.29-.5.63-.68 1.01-.17.39-.26.8-.26 1.23 0 .43.08.84.24 1.22.16.38.39.71.68.99.29.28.63.5 1.01.68.39.17.8.26 1.23.26.43 0 .84-.08 1.22-.24.38-.16.71-.39.99-.68.28-.29.5-.62.68-1 .18-.39.26-.79.26-1.2z"/>
+    <path d="M44.81 159H3.02c-1.76 0-3.19-1.43-3.19-3.19v-41.79c0-1.76 1.43-3.19 3.19-3.19h41.79c1.76 0 3.19 1.43 3.19 3.19v41.79c0 1.76-1.43 3.19-3.19 3.19z" fill="#4285f4"/>
+    <path class="st1" d="M28.38 123.57v9.94c1.15-1.21 2.59-1.81 4.32-1.81 1.03 0 1.97.19 2.82.58.86.39 1.59.91 2.19 1.57.6.66 1.08 1.43 1.42 2.32.34.89.51 1.84.51 2.85 0 1.03-.18 1.99-.53 2.89-.35.9-.84 1.68-1.47 2.35-.63.67-1.37 1.19-2.23 1.58-.86.39-1.78.58-2.77.58-1.8 0-3.22-.66-4.27-1.97V146h-4.89v-22.43h4.9zm6.16 15.54c0-.43-.08-.84-.24-1.23-.16-.39-.39-.72-.68-1.01-.29-.29-.62-.52-1-.69-.38-.17-.79-.26-1.24-.26-.43 0-.84.08-1.22.24-.38.16-.71.39-.99.68-.28.29-.5.63-.68 1.01-.17.39-.26.8-.26 1.23 0 .43.08.84.24 1.22.16.38.39.71.68.99.29.28.63.5 1.01.68.39.17.8.26 1.23.26.43 0 .84-.08 1.22-.24.38-.16.71-.39.99-.68.28-.29.5-.62.68-1 .17-.39.26-.79.26-1.2z"/>
+    <path class="st1" d="M13.24 123.57v9.94c1.15-1.21 2.59-1.81 4.32-1.81 1.03 0 1.97.19 2.82.58.86.39 1.59.91 2.19 1.57.6.66 1.08 1.43 1.42 2.32.34.89.51 1.84.51 2.85 0 1.03-.18 1.99-.53 2.89-.35.9-.84 1.68-1.47 2.35-.63.67-1.37 1.19-2.23 1.58-.86.39-1.78.58-2.77.58-1.8 0-3.22-.66-4.27-1.97V146H8.35v-22.43h4.89zm6.16 15.54c0-.43-.08-.84-.24-1.23-.16-.39-.39-.72-.68-1.01-.29-.29-.62-.52-1-.69-.38-.17-.79-.26-1.24-.26-.43 0-.84.08-1.22.24-.38.16-.71.39-.99.68-.28.29-.5.63-.68 1.01-.17.39-.26.8-.26 1.23 0 .43.08.84.24 1.22.16.38.39.71.68.99.29.28.63.5 1.01.68.39.17.8.26 1.23.26.43 0 .84-.08 1.22-.24.38-.16.71-.39.99-.68.28-.29.5-.62.68-1 .18-.39.26-.79.26-1.2z"/>
+    <g>
+    <path class="st0" d="M44 48H4c-2.21 0-4-1.79-4-4V4c0-2.21 1.79-4 4-4h40c2.21 0 4 1.79 4 4v40c0 2.21-1.79 4-4 4z"/>
+        <path class="st1" d="M28.48 12v10.44c1.18-1.27 2.65-1.9 4.42-1.9 1.05 0 2.01.2 2.89.61.87.41 1.62.96 2.24 1.65.62.69 1.1 1.5 1.45 2.44.35.94.52 1.93.52 2.99 0 1.08-.18 2.09-.54 3.04-.36.95-.86 1.77-1.51 2.47-.64.7-1.4 1.25-2.28 1.66-.87.4-1.81.6-2.83.6-1.84 0-3.3-.69-4.37-2.07v1.62h-5V12h5.01zm6.3 16.31c0-.45-.08-.88-.25-1.29-.17-.41-.4-.76-.69-1.06-.3-.3-.64-.54-1.02-.72-.39-.18-.81-.27-1.27-.27-.44 0-.86.09-1.24.26-.39.17-.72.41-1.01.71-.29.3-.52.66-.69 1.06-.18.41-.26.84-.26 1.29s.08.88.25 1.28c.17.4.4.74.69 1.04.29.29.64.53 1.04.71.4.18.82.27 1.26.27.44 0 .86-.09 1.24-.26.39-.17.72-.41 1.01-.71.29-.3.52-.65.69-1.05.16-.41.25-.82.25-1.26z"/>
+        <path class="st1" d="M13 12v10.44c1.18-1.27 2.65-1.9 4.42-1.9 1.05 0 2.01.2 2.89.61.87.41 1.62.96 2.24 1.65.62.69 1.1 1.5 1.45 2.44.35.94.52 1.93.52 2.99 0 1.08-.18 2.09-.54 3.04-.36.95-.86 1.77-1.51 2.47-.64.7-1.4 1.25-2.28 1.66-.87.4-1.81.6-2.82.6-1.84 0-3.3-.69-4.37-2.07v1.62H8V12h5zm6.3 16.31c0-.45-.08-.88-.25-1.29-.17-.41-.4-.76-.69-1.06-.3-.3-.64-.54-1.02-.72-.39-.18-.81-.27-1.27-.27-.44 0-.86.09-1.24.26-.39.17-.72.41-1.01.71-.29.3-.52.66-.69 1.06-.18.41-.26.84-.26 1.29s.08.88.25 1.28c.17.4.4.74.69 1.04.29.29.64.53 1.04.71.4.18.82.27 1.26.27.44 0 .86-.09 1.24-.26.39-.17.72-.41 1.01-.71.29-.3.52-.65.69-1.05.16-.41.25-.82.25-1.26z"/>
+  </g>
+</svg>

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

@@ -108,7 +108,7 @@ exports.save = async function(ctx) {
   }
 
   // update linked rows
-  await linkRows.updateLinks({
+  const linkResp = await linkRows.updateLinks({
     appId,
     eventType: oldTable
       ? linkRows.EventType.TABLE_UPDATED
@@ -116,6 +116,9 @@ exports.save = async function(ctx) {
     table: tableToSave,
     oldTable: oldTable,
   })
+  if (linkResp != null && linkResp._rev) {
+    tableToSave._rev = linkResp._rev
+  }
 
   // don't perform any updates until relationships have been
   // checked by the updateLinks function

packages/server/src/api/controllers/view/index.js

@@ -83,23 +83,42 @@ const controller = {
     ctx.message = `View ${ctx.params.viewName} saved successfully.`
   },
   exportView: async ctx => {
-    const view = ctx.query.view
+    const db = new CouchDB(ctx.user.appId)
+    const designDoc = await db.get("_design/database")
+
+    const viewName = decodeURI(ctx.query.view)
+
+    const view = designDoc.views[viewName]
     const format = ctx.query.format
 
-    // Fetch view rows
+    if (view) {
-    ctx.params.viewName = view.name
+      ctx.params.viewName = viewName
-    ctx.query.group = view.groupBy
+      // Fetch view rows
-    if (view.field) {
+      ctx.query = {
-      ctx.query.stats = true
+        group: view.meta.groupBy,
-      ctx.query.field = view.field
+        calculation: view.meta.calculation,
+        stats: !!view.meta.field,
+        field: view.meta.field,
+      }
+    } else {
+      // table all_ view
+      ctx.params.viewName = viewName
     }
+
     await fetchView(ctx)
 
+    let schema = view && view.meta && view.meta.schema
+    if (!schema) {
+      const tableId = ctx.params.tableId || view.meta.tableId
+      const table = await db.get(tableId)
+      schema = table.schema
+    }
+
     // Export part
-    let headers = Object.keys(view.schema)
+    let headers = Object.keys(schema)
     const exporter = exporters[format]
     const exportedFile = exporter(headers, ctx.body)
-    const filename = `${view.name}.${format}`
+    const filename = `${viewName}.${format}`
     fs.writeFileSync(join(os.tmpdir(), filename), exportedFile)
 
     ctx.attachment(filename)

packages/server/src/api/index.js

@@ -65,6 +65,8 @@ for (let route of mainRoutes) {
 router.use(staticRoutes.routes())
 router.use(staticRoutes.allowedMethods())
 
-router.redirect("/", "/_builder")
+if (!env.SELF_HOSTED && !env.CLOUD) {
+  router.redirect("/", "/_builder")
+}
 
 module.exports = router

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

@@ -6,10 +6,5 @@ const { BUILDER } = require("../../utilities/security/permissions")
 const router = Router()
 
 router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump)
-// .get(
-//   "/api/backups/download/:fileName",
-//   authorized(BUILDER),
-//   controller.downloadAppDump
-// )
 
 module.exports = router

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

@@ -26,6 +26,7 @@ function generateQueryValidation() {
     name: Joi.string().required(),
     fields: Joi.object().required(),
     datasourceId: Joi.string().required(),
+    readable: Joi.boolean(),
     parameters: Joi.array().items(Joi.object({
       name: Joi.string(),
       default: Joi.string()

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

@@ -23,6 +23,10 @@ if (env.NODE_ENV !== "production") {
   router.get("/_builder/:file*", controller.serveBuilder)
 }
 
+if (env.SELF_HOSTED) {
+  router.get("/", controller.serveSelfHostPage)
+}
+
 router
   .post(
     "/api/attachments/process",

packages/server/src/api/routes/tests/couchTestUtils.js

@@ -37,29 +37,31 @@ exports.defaultHeaders = appId => {
   return headers
 }
 
-exports.createTable = async (request, appId, table) => {
+exports.BASE_TABLE = {
-  if (table != null && table._id) {
+  name: "TestTable",
-    delete table._id
+  type: "table",
-  }
+  key: "name",
-  table = table || {
+  schema: {
-    name: "TestTable",
+    name: {
-    type: "table",
+      type: "string",
-    key: "name",
+      constraints: {
-    schema: {
-      name: {
         type: "string",
-        constraints: {
-          type: "string",
-        },
-      },
-      description: {
-        type: "string",
-        constraints: {
-          type: "string",
-        },
       },
     },
+    description: {
+      type: "string",
+      constraints: {
+        type: "string",
+      },
+    },
+  },
+}
+
+exports.createTable = async (request, appId, table, removeId = true) => {
+  if (removeId && table != null && table._id) {
+    delete table._id
   }
+  table = table || exports.BASE_TABLE
 
   const res = await request
     .post(`/api/tables`)
@@ -68,6 +70,25 @@ exports.createTable = async (request, appId, table) => {
   return res.body
 }
 
+exports.createLinkedTable = async (request, appId) => {
+  // get the ID to link to
+  const table = await exports.createTable(request, appId)
+  table.schema.link = {
+    type: "link",
+    fieldName: "link",
+    tableId: table._id,
+  }
+  return exports.createTable(request, appId, table, false)
+}
+
+exports.createAttachmentTable = async (request, appId) => {
+  const table = await exports.createTable(request, appId)
+  table.schema.attachment = {
+    type: "attachment",
+  }
+  return exports.createTable(request, appId, table, false)
+}
+
 exports.getAllFromTable = async (request, appId, tableId) => {
   const res = await request
     .get(`/api/${tableId}/rows`)

packages/server/src/api/routes/tests/row.spec.js

@@ -3,7 +3,11 @@ const {
   createTable,
   supertest,
   defaultHeaders,
+  createLinkedTable,
+  createAttachmentTable,
 } = require("./couchTestUtils");
+const { enrichRows } = require("../../../utilities")
+const env = require("../../../environment")
 
 describe("/rows", () => {
   let request
@@ -270,4 +274,44 @@ describe("/rows", () => {
 
     })
   })
+
+  describe("enrich row unit test", () => {
+    it("should allow enriching some linked rows", async () => {
+      const table = await createLinkedTable(request, appId)
+      const firstRow = (await createRow({
+        name: "Test Contact",
+        description: "original description",
+        tableId: table._id
+      })).body
+      const secondRow = (await createRow({
+        name: "Test 2",
+        description: "og desc",
+        link: [firstRow._id],
+        tableId: table._id,
+      })).body
+      const enriched = await enrichRows(appId, table, [secondRow])
+      expect(enriched[0].link.length).toBe(1)
+      expect(enriched[0].link[0]).toBe(firstRow._id)
+    })
+  })
+
+  it("should allow enriching attachment rows", async () => {
+    const table = await createAttachmentTable(request, appId)
+    const row = (await createRow({
+      name: "test",
+      description: "test",
+      attachment: [{
+        url: "/test/thing",
+      }],
+      tableId: table._id,
+    })).body
+    // the environment needs configured for this
+    env.CLOUD = 1
+    env.SELF_HOSTED = 1
+    const enriched = await enrichRows(appId, table, [row])
+    expect(enriched[0].attachment[0].url).toBe(`/app-assets/assets/${appId}/test/thing`)
+    // remove env config
+    env.CLOUD = undefined
+    env.SELF_HOSTED = undefined
+  })
 })

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

@@ -12,6 +12,7 @@ const usage = require("../../middleware/usageQuota")
 const router = Router()
 
 router
+  .get("/api/views/export", authorized(BUILDER), viewController.exportView)
   .get(
     "/api/views/:viewName",
     authorized(PermissionTypes.VIEW, PermissionLevels.READ),
@@ -25,6 +26,5 @@ router
     viewController.destroy
   )
   .post("/api/views", authorized(BUILDER), usage, viewController.save)
-  .post("/api/views/export", authorized(BUILDER), viewController.exportView)
 
 module.exports = router

packages/server/src/constants/index.js

@@ -43,3 +43,4 @@ exports.AuthTypes = AuthTypes
 exports.USERS_TABLE_SCHEMA = USERS_TABLE_SCHEMA
 exports.BUILDER_CONFIG_DB = "builder-config-db"
 exports.HOSTING_DOC = "hosting-doc"
+exports.OBJ_STORE_DIRECTORY = "/app-assets/assets"

packages/server/src/db/linkedRows/LinkController.js

@@ -252,7 +252,11 @@ class LinkController {
           tableId: table._id,
           fieldName: fieldName,
         }
-        await this._db.put(linkedTable)
+        const response = await this._db.put(linkedTable)
+        // special case for when linking back to self, make sure rev updated
+        if (linkedTable._id === table._id) {
+          table._rev = response.rev
+        }
       }
     }
     return table

packages/server/src/db/linkedRows/linkUtils.js

@@ -31,11 +31,14 @@ exports.createLinkView = async appId => {
           thisId: doc1.rowId,
           fieldName: doc1.fieldName,
         })
-        emit([doc2.tableId, doc2.rowId], {
+        // if linking to same table can't emit twice
-          id: doc1.rowId,
+        if (doc1.tableId !== doc2.tableId) {
-          thisId: doc2.rowId,
+          emit([doc2.tableId, doc2.rowId], {
-          fieldName: doc2.fieldName,
+            id: doc1.rowId,
-        })
+            thisId: doc2.rowId,
+            fieldName: doc2.fieldName,
+          })
+        }
       }
     }.toString(),
   }
@@ -81,6 +84,13 @@ exports.getLinkDocuments = async function({
     // filter to get unique entries
     const foundIds = []
     linkRows = linkRows.filter(link => {
+      // make sure anything unique is the correct key
+      if (
+        (tableId && link.key[0] !== tableId) ||
+        (rowId && link.key[1] !== rowId)
+      ) {
+        return false
+      }
       const unique = foundIds.indexOf(link.id) === -1
       if (unique) {
         foundIds.push(link.id)

packages/server/src/integrations/dynamodb.js

@@ -17,20 +17,27 @@ const SCHEMA = {
       type: FIELD_TYPES.PASSWORD,
       required: true,
     },
+    endpoint: {
+      type: FIELD_TYPES.STRING,
+      required: false,
+      default: "https://dynamodb.us-east-1.amazonaws.com",
+    },
   },
   query: {
     create: {
       type: QUERY_TYPES.FIELDS,
+      customisable: true,
       fields: {
         table: {
           type: FIELD_TYPES.STRING,
           required: true,
         },
-        customisable: true,
       },
     },
     read: {
       type: QUERY_TYPES.FIELDS,
+      customisable: true,
+      readable: true,
       fields: {
         table: {
           type: FIELD_TYPES.STRING,
@@ -39,30 +46,51 @@ const SCHEMA = {
         index: {
           type: FIELD_TYPES.STRING,
         },
-        customisable: true,
+      },
+    },
+    scan: {
+      type: QUERY_TYPES.FIELDS,
+      customisable: true,
+      readable: true,
+      fields: {
+        table: {
+          type: FIELD_TYPES.STRING,
+          required: true,
+        },
+        index: {
+          type: FIELD_TYPES.STRING,
+        },
+      },
+    },
+    get: {
+      type: QUERY_TYPES.FIELDS,
+      customisable: true,
+      readable: true,
+      fields: {
+        table: {
+          type: FIELD_TYPES.STRING,
+          required: true,
+        },
       },
     },
     update: {
       type: QUERY_TYPES.FIELDS,
+      customisable: true,
       fields: {
         table: {
           type: FIELD_TYPES.STRING,
           required: true,
         },
-        customisable: true,
       },
     },
     delete: {
       type: QUERY_TYPES.FIELDS,
+      customisable: true,
       fields: {
         table: {
           type: FIELD_TYPES.STRING,
           required: true,
         },
-        key: {
-          type: FIELD_TYPES.STRING,
-          required: true,
-        },
       },
     },
   },
@@ -72,7 +100,15 @@ class DynamoDBIntegration {
   constructor(config) {
     this.config = config
     this.connect()
-    this.client = new AWS.DynamoDB.DocumentClient()
+    let options = {
+      correctClockSkew: true,
+    }
+    if (config.endpoint) {
+      options.endpoint = config.endpoint
+    }
+    this.client = new AWS.DynamoDB.DocumentClient({
+      correctClockSkew: true,
+    })
   }
 
   async connect() {
@@ -80,37 +116,65 @@ class DynamoDBIntegration {
   }
 
   async create(query) {
-    const response = await this.client.query({
+    const params = {
       TableName: query.table,
-      Item: query.json,
+      ...query.json,
-    })
+    }
-    return response
+    return this.client.put(params).promise()
   }
 
   async read(query) {
-    const response = await this.client.query({
+    const params = {
-      TableName: query.Table,
+      TableName: query.table,
       ...query.json,
-    })
+    }
+    if (query.index) {
+      params.IndexName = query.index
+    }
+    const response = await this.client.query(params).promise()
+    if (response.Items) {
+      return response.Items
+    }
     return response
   }
 
+  async scan(query) {
+    const params = {
+      TableName: query.table,
+      ...query.json,
+    }
+    if (query.index) {
+      params.IndexName = query.index
+    }
+    const response = await this.client.scan(params).promise()
+    if (response.Items) {
+      return response.Items
+    }
+    return response
+  }
+
+  async get(query) {
+    const params = {
+      TableName: query.table,
+      ...query.json,
+    }
+    return this.client.get(params).promise()
+  }
+
   async update(query) {
-    const response = await this.client.query({
+    const params = {
       TableName: query.Table,
       ...query.json,
-    })
+    }
-    return response
+    return this.client.update(params).promise()
   }
 
   async delete(query) {
-    const response = await this.client.query({
+    const params = {
-      TableName: query.Table,
+      TableName: query.table,
-      Key: {
+      ...query.json,
-        id: query.key,
+    }
-      },
+    return this.client.delete(params).promise()
-    })
-    return response
   }
 }
 

packages/server/src/integrations/microsoftSqlServer.js

@@ -17,6 +17,11 @@ const SCHEMA = {
       type: FIELD_TYPES.STRING,
       default: "localhost",
     },
+    port: {
+      type: FIELD_TYPES.NUMBER,
+      required: false,
+      default: 1433,
+    },
     database: {
       type: FIELD_TYPES.STRING,
       default: "root",

packages/server/src/integrations/mysql.js

@@ -1,25 +1,31 @@
 const mysql = require("mysql")
+const { FIELD_TYPES } = require("./Integration")
 
 const SCHEMA = {
   docs: "https://github.com/mysqljs/mysql",
   datasource: {
     host: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       default: "localhost",
       required: true,
     },
+    port: {
+      type: FIELD_TYPES.NUMBER,
+      default: 1433,
+      required: false,
+    },
     user: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       default: "root",
       required: true,
     },
     password: {
-      type: "password",
+      type: FIELD_TYPES.PASSWORD,
       default: "root",
       required: true,
     },
     database: {
-      type: "string",
+      type: FIELD_TYPES.STRING,
       required: true,
     },
   },

packages/server/src/middleware/authenticated.js

@@ -2,7 +2,13 @@ const jwt = require("jsonwebtoken")
 const STATUS_CODES = require("../utilities/statusCodes")
 const { getRole, BUILTIN_ROLES } = require("../utilities/security/roles")
 const { AuthTypes } = require("../constants")
-const { getAppId, getCookieName, setCookie, isClient } = require("../utilities")
+const {
+  getAppId,
+  getCookieName,
+  clearCookie,
+  setCookie,
+  isClient,
+} = require("../utilities")
 
 module.exports = async (ctx, next) => {
   if (ctx.path === "/_builder") {
@@ -15,16 +21,18 @@ module.exports = async (ctx, next) => {
   let appId = getAppId(ctx)
   const cookieAppId = ctx.cookies.get(getCookieName("currentapp"))
   if (appId && cookieAppId !== appId) {
-    setCookie(ctx, "currentapp", appId)
+    setCookie(ctx, appId, "currentapp")
   } else if (cookieAppId) {
     appId = cookieAppId
   }
-
+  let token, authType
-  let token = ctx.cookies.get(getCookieName(appId))
+  if (!isClient(ctx)) {
-  let authType = AuthTypes.APP
-  if (!token && !isClient(ctx)) {
-    authType = AuthTypes.BUILDER
     token = ctx.cookies.get(getCookieName())
+    authType = AuthTypes.BUILDER
+  }
+  if (!token && appId) {
+    token = ctx.cookies.get(getCookieName(appId))
+    authType = AuthTypes.APP
   }
 
   if (!token) {
@@ -49,9 +57,13 @@ module.exports = async (ctx, next) => {
       role: await getRole(appId, jwtPayload.roleId),
     }
   } catch (err) {
-    // TODO - this can happen if the JWT secret is changed and can never login
+    if (authType === AuthTypes.BUILDER) {
-    // TODO: wipe cookies if they exist
+      clearCookie(ctx)
-    ctx.throw(err.status || STATUS_CODES.FORBIDDEN, err.text)
+      ctx.status = 200
+      return
+    } else {
+      ctx.throw(err.status || STATUS_CODES.FORBIDDEN, err.text)
+    }
   }
 
   await next()

packages/server/src/utilities/builder/setBuilderToken.js

@@ -3,7 +3,7 @@ const env = require("../../environment")
 const CouchDB = require("../../db")
 const jwt = require("jsonwebtoken")
 const { DocumentTypes, SEPARATOR } = require("../../db/utils")
-const { setCookie } = require("../index")
+const { setCookie, clearCookie } = require("../index")
 const APP_PREFIX = DocumentTypes.APP + SEPARATOR
 
 module.exports = async (ctx, appId, version) => {
@@ -20,13 +20,13 @@ module.exports = async (ctx, appId, version) => {
   })
 
   // set the builder token
-  setCookie(ctx, "builder", token)
+  setCookie(ctx, token, "builder")
-  setCookie(ctx, "currentapp", appId)
+  setCookie(ctx, appId, "currentapp")
   // need to clear all app tokens or else unable to use the app in the builder
   let allDbNames = await CouchDB.allDbs()
   allDbNames.map(dbName => {
     if (dbName.startsWith(APP_PREFIX)) {
-      setCookie(ctx, dbName, "")
+      clearCookie(ctx, dbName)
     }
   })
 }

packages/server/src/utilities/index.js

@@ -3,6 +3,8 @@ const { DocumentTypes, SEPARATOR } = require("../db/utils")
 const fs = require("fs")
 const { cloneDeep } = require("lodash/fp")
 const CouchDB = require("../db")
+const { OBJ_STORE_DIRECTORY } = require("../constants")
+const linkRows = require("../db/linkedRows")
 
 const APP_PREFIX = DocumentTypes.APP + SEPARATOR
 
@@ -111,16 +113,28 @@ exports.getCookieName = (name = "builder") => {
  * @param {string} name The name of the cookie to set.
  * @param {string|object} value The value of cookie which will be set.
  */
-exports.setCookie = (ctx, name, value) => {
+exports.setCookie = (ctx, value, name = "builder") => {
   const expires = new Date()
   expires.setDate(expires.getDate() + 1)
 
-  ctx.cookies.set(exports.getCookieName(name), value, {
+  const cookieName = exports.getCookieName(name)
-    expires,
+  if (!value) {
-    path: "/",
+    ctx.cookies.set(cookieName)
-    httpOnly: false,
+  } else {
-    overwrite: true,
+    ctx.cookies.set(cookieName, value, {
-  })
+      expires,
+      path: "/",
+      httpOnly: false,
+      overwrite: true,
+    })
+  }
+}
+
+/**
+ * Utility function, simply calls setCookie with an empty string for value
+ */
+exports.clearCookie = (ctx, name) => {
+  exports.setCookie(ctx, "", name)
 }
 
 exports.isClient = ctx => {
@@ -199,3 +213,34 @@ exports.getAllApps = async () => {
       .map(({ value }) => value)
   }
 }
+
+/**
+ * This function "enriches" the input rows with anything they are supposed to contain, for example
+ * link records or attachment links.
+ * @param {string} appId the ID of the application for which rows are being enriched.
+ * @param {object} table the table from which these rows came from originally, this is used to determine
+ * the schema of the rows and then enrich.
+ * @param {object[]} rows the rows which are to be enriched.
+ * @returns {object[]} the enriched rows will be returned.
+ */
+exports.enrichRows = async (appId, table, rows) => {
+  // attach any linked row information
+  const enriched = await linkRows.attachLinkInfo(appId, rows)
+  // update the attachments URL depending on hosting
+  if (env.CLOUD && env.SELF_HOSTED) {
+    for (let [property, column] of Object.entries(table.schema)) {
+      if (column.type === "attachment") {
+        for (let row of enriched) {
+          if (row[property] == null || row[property].length === 0) {
+            continue
+          }
+          row[property].forEach(attachment => {
+            attachment.url = `${OBJ_STORE_DIRECTORY}/${appId}/${attachment.url}`
+            attachment.url = attachment.url.replace("//", "/")
+          })
+        }
+      }
+    }
+  }
+  return enriched
+}

packages/standard-components/manifest.json

@@ -183,18 +183,8 @@
       },
       {
         "type": "text",
-        "label": "Text 1",
+        "label": "Subheading",
-        "key": "text1"
+        "key": "subheading"
-      },
-      {
-        "type": "text",
-        "label": "Text 2",
-        "key": "text2"
-      },
-      {
-        "type": "text",
-        "label": "Text 3",
-        "key": "text3"
       },
       {
         "type": "screen",

packages/standard-components/package.json

@@ -34,9 +34,9 @@
   "keywords": [
     "svelte"
   ],
-  "version": "0.6.2",
+  "version": "0.7.4",
   "license": "MIT",
-  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd",
   "dependencies": {
     "@budibase/bbui": "^1.55.1",
     "@budibase/svelte-ag-grid": "^0.0.16",

packages/standard-components/src/Navigation.svelte

@@ -60,13 +60,18 @@
   .nav__menu {
     display: flex;
     margin-top: 40px;
-    gap: 16px;
     flex-direction: row;
     justify-content: flex-start;
     align-items: center;
   }
-  .nav__menu > a {
+
+  .nav__menu > * {
+    margin-right: 16px;
+  }
+
+  :global(.nav__menu > a) {
     font-size: 1.5em;
     text-decoration: none;
+    margin-right: 16px;
   }
 </style>

packages/standard-components/src/StackedList.svelte

@@ -6,9 +6,7 @@
 
   export let imageUrl = ""
   export let heading = ""
-  export let text1 = ""
+  export let subheading = ""
-  export let text2 = ""
-  export let text3 = ""
   export let destinationUrl = ""
 
   $: showImage = !!imageUrl
@@ -16,16 +14,16 @@
 
 <div class="container" use:styleable={$component.styles}>
   <a href={destinationUrl}>
-    <div class="content">
+    <div class="stackedlist">
       {#if showImage}
         <div class="image-block">
           <img class="image" src={imageUrl} alt="" />
         </div>
       {/if}
-      <h2 class="heading">{heading}</h2>
+      <div class="content">
-      <h4 class="text">{text1}</h4>
+        <div class="heading">{heading}</div>
-      <h4 class="text">{text2}</h4>
+        <div class="subheading">{subheading}</div>
-      <h4 class="text3">{text3}</h4>
+      </div>
     </div>
   </a>
 </div>
@@ -34,61 +32,51 @@
   a {
     text-decoration: none;
     color: inherit;
+    cursor: pointer;
   }
   .container {
-    padding: 20px;
+    padding: 1rem 1.5rem;
+    min-height: 3rem;
+    display: block;
+    align-items: flex-start;
+  }
+
+  .stackedlist {
+    display: flex;
+    flex-direction: row;
+    overflow: hidden;
+    max-width: 100%;
+  }
+
+  .subheading {
+    opacity: 0.6;
   }
 
   .content {
-    display: grid;
+    min-width: 0;
-    grid-template-columns: 120px 300px 1fr 1fr 1fr;
+    max-width: 100%;
-    align-items: center;
+    flex: 1 1 auto;
-    gap: 20px;
-    min-height: 80px;
-  }
-
-  @media (max-width: 800px) {
-    .content {
-      display: grid;
-      grid-template-columns: 1fr;
-      gap: 20px;
-    }
-  }
-  .image-block {
-    width: 80px;
-    height: 80px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .image {
-    padding: 2px;
-    max-width: 80px;
-    max-height: 80px;
-    margin-right: 20px;
   }
 
   .heading {
-    font-size: 24px;
+    font-weight: 600;
-    margin: 0;
-    min-width: 200px;
   }
 
-  .text {
+  .image-block {
-    font-size: 16px;
+    display: flex;
-    font-weight: 400;
+    flex: 0 0 auto;
+    margin-right: 1.5rem;
+    color: inherit;
+    text-decoration: none;
   }
 
-  .text3 {
+  .image {
-    text-align: end;
+    display: block;
-    font-size: 16px;
+    overflow: hidden;
-    font-weight: 400;
+    width: 3rem;
-  }
+    max-width: 100%;
-
+    -webkit-user-select: none;
-  @media (max-width: 800px) {
+    user-select: none;
-    .text3 {
+    border-radius: 99px;
-      text-align: start;
-    }
   }
 </style>

packages/standard-components/yarn.lock

@@ -40,9 +40,9 @@
     to-fast-properties "^2.0.0"
 
 "@budibase/bbui@^1.55.1":
-  version "1.55.1"
+  version "1.56.2"
-  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.55.1.tgz#291fb6fa10479b49f078d3a911ad0ed42c2e6b12"
+  resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.56.2.tgz#bb8f7d9b9b5ed06a22df877fbe028780d7602471"
-  integrity sha512-bxsHBwkOqCtuFz89e0hAXwvwycfS4xPPrEge5PxK1Lh3uqetO4bXoIxYaIDjfi2Ku7CYIzEmOwSloNaQWeTF4g==
+  integrity sha512-cWYkT1FNwNGTjisxtC5/MlQ1zeu7MYbMJsD6UyCEW3Ku6JIQZ6jyOkV6HKrmNND8VzVfddEGpzR37q+NoDpDFQ==
   dependencies:
     markdown-it "^12.0.2"
     quill "^1.3.7"
@@ -1034,7 +1034,12 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-flatpickr@^4.5.2, flatpickr@^4.6.6:
+flatpickr@^4.5.2:
+  version "4.6.9"
+  resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.9.tgz#9a13383e8a6814bda5d232eae3fcdccb97dc1499"
+  integrity sha512-F0azNNi8foVWKSF+8X+ZJzz8r9sE1G4hl06RyceIaLvyltKvDl6vqk9Lm/6AUUCi5HWaIjiUbk7UpeE/fOXOpw==
+
+flatpickr@^4.6.6:
   version "4.6.6"
   resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.6.tgz#34d2ad80adfa34254e62583a34264d472f1038d6"
   integrity sha512-EZ48CJMttMg3maMhJoX+GvTuuEhX/RbA1YeuI19attP3pwBdbYy6+yqAEVm0o0hSBFYBiLbVxscLW6gJXq6H3A==
@@ -1558,9 +1563,9 @@ loader-utils@^1.1.0:
     json5 "^1.0.1"
 
 local-access@^1.0.1:
-  version "1.0.1"
+  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/local-access/-/local-access-1.0.1.tgz#5121258146d64e869046c642ea4f1dd39ff942bb"
+  resolved "https://registry.yarnpkg.com/local-access/-/local-access-1.1.0.tgz#e007c76ba2ca83d5877ba1a125fc8dfe23ba4798"
-  integrity sha512-ykt2pgN0aqIy6KQC1CqdWTWkmUwNgaOS6dcpHVjyBJONA+Xi7AtSB1vuxC/U/0tjIP3wcRudwQk1YYzUvzk2bA==
+  integrity sha512-XfegD5pyTAfb+GY6chk283Ox5z8WexG56OvM06RWLpAc/UHozO8X6xAxEkIitZOtsSMM1Yr3DkHgW5W+onLhCw==
 
 lodash.camelcase@^4.3.0:
   version "4.3.0"
@@ -1648,9 +1653,9 @@ miller-rabin@^4.0.0:
     brorand "^1.0.1"
 
 mime@^2.3.1:
-  version "2.4.6"
+  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.0.tgz#2b4af934401779806ee98026bb42e8c1ae1876b1"
-  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
+  integrity sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
@@ -2481,9 +2486,9 @@ rollup@^2.11.2:
     fsevents "~2.1.2"
 
 sade@^1.4.0:
-  version "1.7.3"
+  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/sade/-/sade-1.7.3.tgz#a217ccc4fb4abb2d271648bf48f6628b2636fa1b"
+  resolved "https://registry.yarnpkg.com/sade/-/sade-1.7.4.tgz#ea681e0c65d248d2095c90578c03ca0bb1b54691"
-  integrity sha512-m4BctppMvJ60W1dXnHq7jMmFe3hPJZDAH85kQ3ACTo7XZNVUuTItCQ+2HfyaMeV5cKrbw7l4vD/6We3GBxvdJw==
+  integrity sha512-y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA==
   dependencies:
     mri "^1.1.0"
 

packages/string-templates/README.md

@@ -0,0 +1,96 @@
+# String templating
+This package provides a common system for string templating across the Budibase Builder, client and server.
+The templating is provided through the use of [Handlebars](https://handlebarsjs.com/) an extension of Mustache
+which is capable of carrying out logic. We have also extended the base Handlebars functionality through the use 
+of a set of helpers provided through the [handlebars-helpers](https://github.com/budibase/handlebars-helpers) package.
+
+We have not implemented all the helpers provided by the helpers package as some of them provide functionality
+we felt would not be beneficial. The following collections of helpers have been implemented:
+1. [Math](https://github.com/budibase/handlebars-helpers/tree/master#math) - a set of useful helpers for 
+carrying out logic pertaining to numbers e.g. `avg`, `add`, `abs` and so on.
+2. [Array](https://github.com/budibase/handlebars-helpers/tree/master#array) - some very specific helpers
+for use with arrays, useful for example in automations. Helpers like `first`, `last`, `after` and `join` 
+can be useful for getting particular portions of arrays or turning them into strings.
+3. [Number](https://github.com/budibase/handlebars-helpers/tree/master#number) - unlike the math helpers these
+are useful for converting numbers into useful formats for display, e.g. `bytes`, `addCommas` and `toPrecision`.
+4. [URL](https://github.com/budibase/handlebars-helpers/tree/master#url) - very specific helpers for dealing with URLs,
+such as `encodeURI`, `escape`, `stripQueryString` and `stripProtocol`. These are primarily useful
+for building up particular URLs to hit as say part of an automation.
+5. [String](https://github.com/budibase/handlebars-helpers/tree/master#string) - these helpers are useful for building 
+strings and preparing them for display, e.g. `append`, `camelcase`, `capitalize` and `ellipsis`.
+6. [Comparison](https://github.com/budibase/handlebars-helpers/tree/master#comparison) - these helpers are mainly for 
+building strings when particular conditions are met, for example `and`, `or`, `gt`, `lt`, `not` and so on. This is a very
+extensive set of helpers but is mostly as would be expected from a set of logical operators.
+7. [Object](https://github.com/budibase/handlebars-helpers/tree/master#object) - useful operator for parsing objects, as well
+as converting them to JSON strings.
+8. [Regex](https://github.com/budibase/handlebars-helpers/tree/master#regex) - allows performing regex tests on strings that 
+can be used in conditional statements.
+9. [Date](https://github.com/helpers/helper-date) - last but certainly not least is a moment based date helper, which can
+format ISO/timestamp based dates into something human-readable. An example of this would be `{{date dateProperty "DD-MM-YYYY"}}`.
+
+## Date formatting
+This package uses the standard method for formatting date times, using the following syntax:
+| Input | Example | Description |
+| ----- | ------- | ----------- |
+| YYYY | 2014 | 4 or 2 digit year. Note: Only 4 digit can be parsed on strict mode |
+| YY | 14	| 2 digit year |
+| Y | -25 | Year with any number of digits and sign |
+| Q | 1..4 | Quarter of year. Sets month to first month in quarter. |
+| M MM | 1..12 | Month number |
+| MMM MMMM | Jan..December | Month name in locale set by moment.locale() |
+| D DD | 1..31 | Day of month |
+| Do | 1st..31st | Day of month with ordinal |
+| DDD DDDD | 1..365 | Day of year |
+| X | 1410715640.579 | Unix timestamp |
+| x	| 1410715640579 | Unix ms timestamp |
+
+## Template format
+There are two main ways that the templating system can be used, the first is very similar to that which
+would be produced by Mustache - a single statement:
+```
+Hello I'm building a {{uppercase adjective}} string with Handlebars!
+```
+In the statement above provided a context of `{adjective: "cool"}` will produce a string of `Hello I'm building a COOL string with Handlebars!`.
+Here we can see an example of how string helpers can be used to make a string exactly as we need it. These statements are relatively
+simple; we can also stack helpers as such: `{{ uppercase (remove string "bad") }}` with the use of parenthesis.
+
+The other type of statement that can be made with the templating system is conditional ones, that appear as such:
+```
+Hello I'm building a {{ #gte score "50" }}Great{{ else }}Bad{{ /gte }} string with Handlebars!
+``` 
+In this string we can see that the string `Great` or `Bad` will be inserted depending on the state of the 
+`score` context variable. The comparison, string and array helpers all provide some conditional operators which can be used
+in this way. There will also be some operators which will be built with a very similar syntax but will produce an 
+iterative operation, like a for each - an example of this would be the `forEach` array helper.
+
+## Usage
+Usage of this templating package is through one of the primary functions provided by the package - these functions are 
+as follows:
+1. `processString` - `async (string, object)` - given a template string and a context object this will build a string 
+using our pre-processors, post-processors and handlebars.
+2. `processObject` - `async (object, object)` - carries out the functionality provided by `processString` for any string 
+inside the given object. This will recurse deeply into the provided object so for very large objects this could be slow.
+3. `processStringSync` - `(string, object)` - a reduced functionality processing of strings which is synchronous, like 
+functions provided by Node (e.g. `readdirSync`)
+4. `processObjectSync` - `(object, object)` - as with the sync'd string, recurses an object to process it synchronously.
+5. `makePropSafe` - `(string)` - some properties cannot be handled by Handlebars, for example `Table 1` is not valid due 
+to spaces found in the property name. This will update the property name to `[Table 1]` wrapping it in literal
+specifiers so that it is safe for use in Handlebars. Ideally this function should be called for every level of an object
+being accessed, for example `[Table 1].[property name]` is the syntax that is required for Handlebars. 
+6. `isValid` - `(string)` - checks the given string for any templates and provides a boolean stating whether it is a valid
+template.
+7. `getManifest` - returns the manifest JSON which has been generated for the helpers, describing them and their params.
+
+## Development
+This library is built with [Rollup](https://rollupjs.org/guide/en/) as many of the packages built by Budibase are. We have
+built the string templating package as a UMD so that it can be used by Node and Browser based applications. This package also 
+builds Typescript stubs which when making use of the library will be used by your IDE to provide code completion. The following 
+commands are provided for development purposes:
+1. `yarn build` - will build the Typescript stubs and the bundle into the `dist` directory.
+2. `yarn test` - runs the test suite which will check various helpers are still functioning as
+expected and a few expected use cases.
+3. `yarn dev:builder` - an internal command which is used by lerna to watch and build any changes
+to the package as part of the main `yarn dev` of the repo.
+
+It is also important to note this package is managed in the same manner as all other in the mono-repo,
+through lerna.

packages/string-templates/package.json

@@ -1,31 +1,37 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.6.2",
+  "version": "0.7.4",
   "description": "Handlebars wrapper for Budibase templating.",
-  "main": "dist/bundle.js",
+  "main": "src/index.js",
-  "module": "dist/bundle.js",
+  "module": "src/index.js",
+  "browser": "dist/bundle.js",
   "license": "AGPL-3.0",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && rollup -c",
     "dev:builder": "tsc && rollup -cw",
-    "test": "jest"
+    "test": "jest",
+    "manifest": "node ./scripts/gen-collection-info.js"
   },
   "dependencies": {
+    "@budibase/handlebars-helpers": "^0.11.3",
+    "dayjs": "^1.10.4",
     "handlebars": "^4.7.6",
-    "handlebars-helpers": "^0.10.0",
     "handlebars-utils": "^1.0.6",
-    "helper-date": "^1.0.1",
     "lodash": "^4.17.20"
   },
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-json": "^4.1.0",
+    "doctrine": "^3.0.0",
     "jest": "^26.6.3",
+    "marked": "^1.2.8",
     "rollup": "^2.36.2",
-    "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-node-globals": "^1.4.0",
     "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-terser": "^7.0.2",
     "typescript": "^4.1.3"
-  }
+  },
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
 }

packages/string-templates/rollup.config.js

@@ -1,28 +1,32 @@
-import commonjs from "rollup-plugin-commonjs"
+import commonjs from "@rollup/plugin-commonjs"
 import resolve from "rollup-plugin-node-resolve"
 import builtins from "rollup-plugin-node-builtins"
 import globals from "rollup-plugin-node-globals"
 import json from "@rollup/plugin-json"
+import { terser } from "rollup-plugin-terser"
 
+const production = !process.env.ROLLUP_WATCH
 export default {
-  input: "src/index.js",
+  input: "src/esIndex.js",
   output: [
     {
       sourcemap: true,
-      format: "umd",
+      format: "esm",
       file: "./dist/bundle.js",
-      name: "string-templates",
+      name: "templates",
       exports: "named",
     },
   ],
   plugins: [
     resolve({
+      mainFields: ["module", "main"],
       preferBuiltins: true,
       browser: true,
     }),
     commonjs(),
     globals(),
     builtins(),
+    production && terser(),
     json(),
   ],
 }

packages/string-templates/scripts/gen-collection-info.js

@@ -0,0 +1,169 @@
+const HELPER_LIBRARY = "@budibase/handlebars-helpers"
+const helpers = require(HELPER_LIBRARY)
+const { HelperFunctionBuiltin } = require("../src/helpers/constants")
+const fs = require("fs")
+const doctrine = require("doctrine")
+const marked = require("marked")
+
+/**
+ * full list of supported helpers can be found here:
+ * https://github.com/budibase/handlebars-helpers
+ */
+
+const DIRECTORY = fs.existsSync("node_modules") ? "." : ".."
+const COLLECTIONS = ["math", "array", "number", "url", "string", "comparison"]
+const FILENAME = `${DIRECTORY}/manifest.json`
+const outputJSON = {}
+const ADDED_HELPERS = {
+  date: {
+    date: {
+      args: ["datetime", "format"],
+      numArgs: 2,
+      example: '{{date now "DD-MM-YYYY"}} -> 21-01-2021',
+      description: "Format a date using moment.js date formatting.",
+    },
+    duration: {
+      args: ["time", "durationType"],
+      numArgs: 2,
+      example: '{{duration timeLeft "seconds"}} -> a few seconds',
+      description:
+        "Produce a humanized duration left/until given an amount of time and the type of time measurement.",
+    },
+  },
+}
+
+function fixSpecialCases(name, obj) {
+  const args = obj.args
+  if (name === "ifNth") {
+    args[0] = "a"
+    args[1] = "b"
+  }
+  if (name === "eachIndex") {
+    obj.description = "Iterates the array, listing an item and the index of it."
+  }
+  if (name === "toFloat") {
+    obj.description = "Convert input to a float."
+  }
+  if (name === "toInt") {
+    obj.description = "Convert input to an integer."
+  }
+  return obj
+}
+
+function lookForward(lines, funcLines, idx) {
+  const funcLen = funcLines.length
+  for (let i = idx, j = 0; i < idx + funcLen; ++i, j++) {
+    if (!lines[i].includes(funcLines[j])) {
+      return false
+    }
+  }
+  return true
+}
+
+function getCommentInfo(file, func) {
+  const lines = file.split("\n")
+  const funcLines = func.split("\n")
+  let comment = null
+  for (let idx = 0; idx < lines.length; ++idx) {
+    // from here work back until we have the comment
+    if (lookForward(lines, funcLines, idx)) {
+      let fromIdx = idx
+      let start = 0,
+        end = 0
+      do {
+        if (lines[fromIdx].includes("*/")) {
+          end = fromIdx
+        } else if (lines[fromIdx].includes("/*")) {
+          start = fromIdx
+        }
+        if (start && end) {
+          break
+        }
+        fromIdx--
+      } while (fromIdx > 0)
+      comment = lines.slice(start, end + 1).join("\n")
+    }
+  }
+  if (comment == null) {
+    return { description: "" }
+  }
+  const docs = doctrine.parse(comment, { unwrap: true })
+  // some hacky fixes
+  docs.description = docs.description.replace(/\n/g, " ")
+  docs.description = docs.description.replace(/[ ]{2,}/g, " ")
+  docs.description = docs.description.replace(/is is/g, "is")
+  const examples = docs.tags
+    .filter(el => el.title === "example")
+    .map(el => el.description)
+  const blocks = docs.description.split("```")
+  if (examples.length > 0) {
+    docs.example = examples.join(" ")
+  }
+  docs.description = blocks[0].trim()
+  return docs
+}
+
+/**
+ * This script is very specific to purpose, parsing the handlebars-helpers files to attempt to get information about them.
+ */
+function run() {
+  const foundNames = []
+  for (let collection of COLLECTIONS) {
+    const collectionFile = fs.readFileSync(
+      `${DIRECTORY}/node_modules/${HELPER_LIBRARY}/lib/${collection}.js`,
+      "utf8"
+    )
+    const collectionInfo = {}
+    // collect information about helper
+    let hbsHelperInfo = helpers[collection]()
+    for (let entry of Object.entries(hbsHelperInfo)) {
+      const name = entry[0]
+      // skip built in functions and ones seen already
+      if (
+        HelperFunctionBuiltin.indexOf(name) !== -1 ||
+        foundNames.indexOf(name) !== -1
+      ) {
+        continue
+      }
+      foundNames.push(name)
+      // this is ridiculous, but it parse the function header
+      const fnc = entry[1].toString()
+      const jsDocInfo = getCommentInfo(collectionFile, fnc)
+      let args = jsDocInfo.tags
+        .filter(tag => tag.title === "param")
+        .map(
+          tag =>
+            tag.description &&
+            tag.description
+              .replace(/`/g, "")
+              .split(" ")[0]
+              .trim()
+        )
+      collectionInfo[name] = fixSpecialCases(name, {
+        args,
+        numArgs: args.length,
+        example: jsDocInfo.example || undefined,
+        description: jsDocInfo.description,
+      })
+    }
+    outputJSON[collection] = collectionInfo
+  }
+  // add extra helpers
+  for (let [collectionName, collection] of Object.entries(ADDED_HELPERS)) {
+    let input = collection
+    if (outputJSON[collectionName]) {
+      input = Object.assign(outputJSON[collectionName], collection)
+    }
+    outputJSON[collectionName] = input
+  }
+
+  // convert all markdown to HTML
+  for (let collection of Object.values(outputJSON)) {
+    for (let helper of Object.values(collection)) {
+      helper.description = marked(helper.description)
+    }
+  }
+  fs.writeFileSync(FILENAME, JSON.stringify(outputJSON, null, 2))
+}
+
+run()

packages/string-templates/src/esIndex.js

@@ -0,0 +1,12 @@
+import templates from "./index"
+
+/**
+ * This file is simply an entrypoint for rollup - makes a lot of cjs problems go away
+ */
+export const isValid = templates.isValid
+export const makePropSafe = templates.makePropSafe
+export const getManifest = templates.getManifest
+export const processStringSync = templates.processStringSync
+export const processObjectSync = templates.processObjectSync
+export const processString = templates.processString
+export const processObject = templates.processObject

packages/string-templates/src/helpers/constants.js

@@ -18,4 +18,7 @@ module.exports.HelperFunctionBuiltin = [
 module.exports.HelperFunctionNames = {
   OBJECT: "object",
   ALL: "all",
+  LITERAL: "literal",
 }
+
+module.exports.LITERAL_MARKER = "%LITERAL%"

packages/string-templates/src/helpers/date.js

@@ -0,0 +1,105 @@
+const dayjs = require("dayjs")
+dayjs.extend(require("dayjs/plugin/duration"))
+dayjs.extend(require("dayjs/plugin/advancedFormat"))
+dayjs.extend(require("dayjs/plugin/relativeTime"))
+
+/**
+ * This file was largely taken from the helper-date package - we did this for two reasons:
+ * 1. It made use of both moment of date.js - this caused some weird bugs with some relatively simple
+ * syntax and didn't offer much in return.
+ * 2. Replacing moment with dayjs helps massively reduce bundle size.
+ * The original package can be found here:
+ * https://github.com/helpers/helper-date
+ */
+
+function isOptions(val) {
+  return typeof val === "object" && typeof val.hash === "object"
+}
+
+function isApp(thisArg) {
+  return (
+    typeof thisArg === "object" &&
+    typeof thisArg.options === "object" &&
+    typeof thisArg.app === "object"
+  )
+}
+
+function getContext(thisArg, locals, options) {
+  if (isOptions(thisArg)) {
+    return getContext({}, locals, thisArg)
+  }
+  // ensure args are in the correct order
+  if (isOptions(locals)) {
+    return getContext(thisArg, options, locals)
+  }
+  const appContext = isApp(thisArg) ? thisArg.context : {}
+  options = options || {}
+
+  // if "options" is not handlebars options, merge it onto locals
+  if (!isOptions(options)) {
+    locals = Object.assign({}, locals, options)
+  }
+  // merge handlebars root data onto locals if specified on the hash
+  if (isOptions(options) && options.hash.root === true) {
+    locals = Object.assign({}, options.data.root, locals)
+  }
+  let context = Object.assign({}, appContext, locals, options.hash)
+  if (!isApp(thisArg)) {
+    context = Object.assign({}, thisArg, context)
+  }
+  if (isApp(thisArg) && thisArg.view && thisArg.view.data) {
+    context = Object.assign({}, context, thisArg.view.data)
+  }
+  return context
+}
+
+function initialConfig(str, pattern, options) {
+  if (isOptions(pattern)) {
+    options = pattern
+    pattern = null
+  }
+
+  if (isOptions(str)) {
+    options = str
+    pattern = null
+    str = null
+  }
+  return { str, pattern, options }
+}
+
+function setLocale(str, pattern, options) {
+  // if options is null then it'll get updated here
+  const config = initialConfig(str, pattern, options)
+  const defaults = { lang: "en", date: new Date(config.str) }
+  const opts = getContext(this, defaults, config.options)
+
+  // set the language to use
+  dayjs.locale(opts.lang || opts.language)
+}
+
+module.exports.date = (str, pattern, options) => {
+  const config = initialConfig(str, pattern, options)
+
+  // if no args are passed, return a formatted date
+  if (config.str == null && config.pattern == null) {
+    dayjs.locale("en")
+    return dayjs().format("MMMM DD, YYYY")
+  }
+
+  setLocale(config.str, config.pattern, config.options)
+
+  return dayjs(new Date(config.str)).format(config.pattern)
+}
+
+module.exports.duration = (str, pattern, format) => {
+  const config = initialConfig(str, pattern)
+
+  setLocale(config.str, config.pattern)
+
+  const duration = dayjs.duration(config.str, config.pattern)
+  if (!isOptions(format)) {
+    return duration.format(format)
+  } else {
+    return duration.humanize()
+  }
+}

packages/string-templates/src/helpers/external.js

@@ -1,10 +1,10 @@
-const helpers = require("handlebars-helpers")
+const helpers = require("@budibase/handlebars-helpers")
-const dateHelper = require("helper-date")
+const { date, duration } = require("./date")
 const { HelperFunctionBuiltin } = require("./constants")
 
 /**
  * full list of supported helpers can be found here:
- * https://github.com/helpers/handlebars-helpers
+ * https://github.com/Budibase/handlebars-helpers
  */
 
 const EXTERNAL_FUNCTION_COLLECTIONS = [
@@ -13,13 +13,20 @@ const EXTERNAL_FUNCTION_COLLECTIONS = [
   "number",
   "url",
   "string",
-  "markdown",
+  "comparison",
+  "object",
+  "regex",
 ]
 
-const DATE_NAME = "date"
+const ADDED_HELPERS = {
+  date: date,
+  duration: duration,
+}
 
 exports.registerAll = handlebars => {
-  handlebars.registerHelper(DATE_NAME, dateHelper)
+  for (let [name, helper] of Object.entries(ADDED_HELPERS)) {
+    handlebars.registerHelper(name, helper)
+  }
   let externalNames = []
   for (let collection of EXTERNAL_FUNCTION_COLLECTIONS) {
     // collect information about helper
@@ -41,12 +48,13 @@ exports.registerAll = handlebars => {
     })
   }
   // add date external functionality
-  externalNames.push(DATE_NAME)
+  exports.externalHelperNames = externalNames.concat(Object.keys(ADDED_HELPERS))
-  exports.externalHelperNames = externalNames
 }
 
 exports.unregisterAll = handlebars => {
-  handlebars.unregisterHelper(DATE_NAME)
+  for (let name of Object.keys(ADDED_HELPERS)) {
+    handlebars.unregisterHelper(name)
+  }
   for (let name of module.exports.externalHelperNames) {
     handlebars.unregisterHelper(name)
   }

packages/string-templates/src/helpers/index.js

@@ -1,7 +1,11 @@
 const Helper = require("./Helper")
 const { SafeString } = require("handlebars")
 const externalHandlebars = require("./external")
-const { HelperFunctionNames, HelperFunctionBuiltin } = require("./constants")
+const {
+  HelperFunctionNames,
+  HelperFunctionBuiltin,
+  LITERAL_MARKER,
+} = require("./constants")
 
 const HTML_SWAPS = {
   "<": "&lt;",
@@ -27,6 +31,12 @@ const HELPERS = [
       return HTML_SWAPS[tag] || tag
     })
   }),
+  // adds a note for post-processor
+  new Helper(HelperFunctionNames.LITERAL, value => {
+    const type = typeof value
+    const outputVal = type === "object" ? JSON.stringify(value) : value
+    return `{{-${LITERAL_MARKER}-${type}-${outputVal}-}}`
+  }),
 ]
 
 module.exports.HelperNames = () => {

packages/string-templates/src/index.js

@@ -2,7 +2,12 @@ const handlebars = require("handlebars")
 const { registerAll } = require("./helpers/index")
 const processors = require("./processors")
 const { cloneDeep } = require("lodash/fp")
-const { removeNull } = require("./utilities")
+const {
+  removeNull,
+  addConstants,
+  removeHandlebarsStatements,
+} = require("./utilities")
+const manifest = require("../manifest.json")
 
 const hbsInstance = handlebars.create()
 registerAll(hbsInstance)
@@ -82,24 +87,79 @@ module.exports.processObjectSync = (object, context) => {
  * @returns {string} The enriched string, all templates should have been replaced if they can be.
  */
 module.exports.processStringSync = (string, context) => {
-  const clonedContext = removeNull(cloneDeep(context))
+  if (!exports.isValid(string)) {
+    return string
+  }
+  // take a copy of input incase error
+  const input = string
+  let clonedContext = removeNull(cloneDeep(context))
+  clonedContext = addConstants(clonedContext)
   // remove any null/undefined properties
   if (typeof string !== "string") {
     throw "Cannot process non-string types."
   }
-  let template
+  try {
-  string = processors.preprocess(string)
+    string = processors.preprocess(string)
-  // this does not throw an error when template can't be fulfilled, have to try correct beforehand
+    // this does not throw an error when template can't be fulfilled, have to try correct beforehand
-  template = hbsInstance.compile(string)
+    const template = hbsInstance.compile(string, {
-  return processors.postprocess(template(clonedContext))
+      strict: false,
+    })
+    return processors.postprocess(template(clonedContext))
+  } catch (err) {
+    return removeHandlebarsStatements(input)
+  }
 }
 
 /**
- * Errors can occur if a user of this library attempts to use a helper that has not been added to the system, these errors
+ * Simple utility function which makes sure that a templating property has been wrapped in literal specifiers correctly.
- * can be captured to alert the user of the mistake.
+ * @param {string} property The property which is to be wrapped.
- * @param {function} handler a function which will be called every time an error occurs when processing a handlebars
+ * @returns {string} The wrapped property ready to be added to a templating string.
- * statement.
  */
-module.exports.errorEvents = handler => {
+module.exports.makePropSafe = property => {
-  hbsInstance.registerHelper("helperMissing", handler)
+  return `[${property}]`.replace("[[", "[").replace("]]", "]")
+}
+
+/**
+ * Checks whether or not a template string contains totally valid syntax (simply tries running it)
+ * @param string The string to test for valid syntax - this may contain no templates and will be considered valid.
+ * @returns {boolean} Whether or not the input string is valid.
+ */
+module.exports.isValid = string => {
+  const validCases = [
+    "string",
+    "number",
+    "object",
+    "array",
+    "cannot read property",
+  ]
+  // this is a portion of a specific string always output by handlebars in the case of a syntax error
+  const invalidCases = [`expecting '`]
+  // don't really need a real context to check if its valid
+  const context = {}
+  try {
+    hbsInstance.compile(processors.preprocess(string, false))(context)
+    return true
+  } catch (err) {
+    const msg = err && err.message ? err.message : err
+    if (!msg) {
+      return false
+    }
+    const invalidCase = invalidCases.some(invalidCase =>
+      msg.toLowerCase().includes(invalidCase)
+    )
+    const validCase = validCases.some(validCase =>
+      msg.toLowerCase().includes(validCase)
+    )
+    // special case for maths functions - don't have inputs yet
+    return validCase && !invalidCase
+  }
+}
+
+/**
+ * We have generated a static manifest file from the helpers that this string templating package makes use of.
+ * This manifest provides information about each of the helpers and how it can be used.
+ * @returns The manifest JSON which has been generated from the helpers.
+ */
+module.exports.getManifest = () => {
+  return manifest
 }

packages/string-templates/src/processors/index.js

@@ -2,23 +2,35 @@ const { FIND_HBS_REGEX } = require("../utilities")
 const preprocessor = require("./preprocessor")
 const postprocessor = require("./postprocessor")
 
-function process(string, processors) {
+function process(output, processors) {
   for (let processor of processors) {
+    // if a literal statement has occurred stop
+    if (typeof output !== "string") {
+      break
+    }
     // re-run search each time incase previous processor updated/removed a match
-    let regex = new RegExp(FIND_HBS_REGEX)
+    let regexp = new RegExp(FIND_HBS_REGEX)
-    let matches = string.match(regex)
+    let matches = output.match(regexp)
     if (matches == null) {
       continue
     }
     for (let match of matches) {
-      string = processor.process(string, match)
+      output = processor.process(output, match)
     }
   }
-  return string
+  return output
 }
 
-module.exports.preprocess = string => {
+module.exports.preprocess = (string, finalise = true) => {
-  return process(string, preprocessor.processors)
+  let processors = preprocessor.processors
+  // the pre-processor finalisation stops handlebars from ever throwing an error
+  // might want to pre-process for other benefits but still want to see errors
+  if (!finalise) {
+    processors = processors.filter(
+      processor => processor.name !== preprocessor.PreprocessorNames.FINALISE
+    )
+  }
+  return process(string, processors)
 }
 
 module.exports.postprocess = string => {

packages/string-templates/src/processors/postprocessor.js

@@ -1,9 +1,43 @@
+const { LITERAL_MARKER } = require("../helpers/constants")
+
+const PostProcessorNames = {
+  CONVERT_LITERALS: "convert-literals",
+}
+
 /* eslint-disable no-unused-vars */
 class Postprocessor {
   constructor(name, fn) {
     this.name = name
     this.fn = fn
   }
+
+  process(statement) {
+    return this.fn(statement)
+  }
 }
 
-module.exports.processors = []
+module.exports.processors = [
+  new Postprocessor(PostProcessorNames.CONVERT_LITERALS, statement => {
+    if (!statement.includes(LITERAL_MARKER)) {
+      return statement
+    }
+
+    const components = statement.split("-")
+    // pop and shift remove the empty array elements from the first and last dash
+    components.pop()
+    components.shift()
+    const type = components[1]
+    const value = components[2]
+    switch (type) {
+      case "string":
+        return value
+      case "number":
+        return parseFloat(value)
+      case "boolean":
+        return value === "true"
+      case "object":
+        return JSON.parse(value)
+    }
+    return value
+  }),
+]

packages/string-templates/src/processors/preprocessor.js

@@ -1,9 +1,11 @@
 const { HelperNames } = require("../helpers")
 const { swapStrings, isAlphaNumeric } = require("../utilities")
 
+const FUNCTION_CASES = ["#", "else", "/"]
+
 const PreprocessorNames = {
   SWAP_TO_DOT: "swap-to-dot-notation",
-  HANDLE_SPACES: "handle-spaces-in-properties",
+  FIX_FUNCTIONS: "fix-functions",
   FINALISE: "finalise",
 }
 
@@ -37,42 +39,16 @@ module.exports.processors = [
     return statement
   }),
 
-  new Preprocessor(PreprocessorNames.HANDLE_SPACES, statement => {
+  new Preprocessor(PreprocessorNames.FIX_FUNCTIONS, statement => {
-    // exclude helpers and brackets, regex will only find double brackets
+    for (let specialCase of FUNCTION_CASES) {
-    const exclusions = HelperNames()
+      const toFind = `{ ${specialCase}`,
-    // find all the parts split by spaces
+        replacement = `{${specialCase}`
-    const splitBySpaces = statement
+      statement = statement.replace(new RegExp(toFind, "g"), replacement)
-      .split(" ")
-      .filter(el => el !== "{{" && el !== "}}")
-    // remove braces if they are found and weren't spaced out
-    splitBySpaces[0] = splitBySpaces[0].replace("{", "")
-    splitBySpaces[splitBySpaces.length - 1] = splitBySpaces[
-      splitBySpaces.length - 1
-    ].replace("}", "")
-    // remove the excluded elements
-    const propertyParts = splitBySpaces.filter(
-      part => exclusions.indexOf(part) === -1
-    )
-    // rebuild to get the full property
-    const fullProperty = propertyParts.join(" ")
-    // now work out the dot notation layers and split them up
-    const propertyLayers = fullProperty.split(".")
-    // find the layers which need to be wrapped and wrap them
-    for (let layer of propertyLayers) {
-      if (layer.indexOf(" ") !== -1) {
-        statement = swapStrings(
-          statement,
-          statement.indexOf(layer),
-          layer.length,
-          `[${layer}]`
-        )
-      }
     }
-    // remove the edge case of double brackets being entered (in-case user already has specified)
+    return statement
-    return statement.replace(/\[\[/g, "[").replace(/]]/g, "]")
   }),
 
-  new Preprocessor(Preprocessor.FINALISE, statement => {
+  new Preprocessor(PreprocessorNames.FINALISE, statement => {
     let insideStatement = statement.slice(2, statement.length - 2)
     if (insideStatement.charAt(0) === " ") {
       insideStatement = insideStatement.slice(1)
@@ -81,9 +57,17 @@ module.exports.processors = [
       insideStatement = insideStatement.slice(0, insideStatement.length - 1)
     }
     const possibleHelper = insideStatement.split(" ")[0]
-    if (HelperNames().some(option => possibleHelper === option)) {
+    // function helpers can't be wrapped
+    for (let specialCase of FUNCTION_CASES) {
+      if (possibleHelper.includes(specialCase)) {
+        return statement
+      }
+    }
+    if (HelperNames().some(option => option.includes(possibleHelper))) {
       insideStatement = `(${insideStatement})`
     }
     return `{{ all ${insideStatement} }}`
   }),
 ]
+
+module.exports.PreprocessorNames = PreprocessorNames

packages/string-templates/src/utilities.js

@@ -1,6 +1,7 @@
+const _ = require("lodash")
 const ALPHA_NUMERIC_REGEX = /^[A-Za-z0-9]+$/g
 
-module.exports.FIND_HBS_REGEX = /{{([^{}])+}}/g
+module.exports.FIND_HBS_REGEX = /{{([^{].*?)}}/g
 
 module.exports.isAlphaNumeric = char => {
   return char.match(ALPHA_NUMERIC_REGEX)
@@ -12,12 +13,35 @@ module.exports.swapStrings = (string, start, length, swap) => {
 
 // removes null and undefined
 module.exports.removeNull = obj => {
-  return Object.fromEntries(
+  obj = _(obj)
-    Object.entries(obj)
+    .omitBy(_.isUndefined)
-      .filter(entry => entry[1] != null)
+    .omitBy(_.isNull)
-      .map(([key, value]) => [
+    .value()
-        key,
+  for (let [key, value] of Object.entries(obj)) {
-        value === Object(value) ? module.exports.removeNull(value) : value,
+    // only objects
-      ])
+    if (typeof value === "object" && !Array.isArray(value)) {
-  )
+      obj[key] = module.exports.removeNull(value)
+    }
+  }
+  return obj
+}
+
+module.exports.addConstants = obj => {
+  if (obj.now == null) {
+    obj.now = new Date()
+  }
+  return obj
+}
+
+module.exports.removeHandlebarsStatements = string => {
+  let regexp = new RegExp(exports.FIND_HBS_REGEX)
+  let matches = string.match(regexp)
+  if (matches == null) {
+    return string
+  }
+  for (let match of matches) {
+    const idx = string.indexOf(match)
+    string = exports.swapStrings(string, idx, match.length, "Invalid Binding")
+  }
+  return string
 }

packages/string-templates/test/basic.spec.js

@@ -1,6 +1,9 @@
 const {
   processObject,
   processString,
+  isValid,
+  makePropSafe,
+  getManifest,
 } = require("../src/index")
 
 describe("Test that the string processing works correctly", () => {
@@ -82,3 +85,28 @@ describe("Test that the object processing works correctly", () => {
     expect(error).not.toBeNull()
   })
 })
+
+describe("check the utility functions", () => {
+  it("should return false for an invalid template string", () => {
+    const valid = isValid("{{ table1.thing prop }}")
+    expect(valid).toBe(false)
+  })
+
+  it("should state this template is valid", () => {
+    const valid = isValid("{{ thing }}")
+    expect(valid).toBe(true)
+  })
+
+  it("should make a property safe", () => {
+    const property = makePropSafe("thing")
+    expect(property).toEqual("[thing]")
+  })
+})
+
+describe("check manifest", () => {
+  it("should be able to retrieve the manifest", () => {
+    const manifest = getManifest()
+    expect(manifest.math).not.toBeNull()
+    expect(manifest.math.abs.description).toBe("<p>Return the magnitude of <code>a</code>.</p>\n")
+  })
+})

packages/string-templates/test/escapes.spec.js

@@ -4,30 +4,30 @@ const {
 
 describe("Handling context properties with spaces in their name", () => {
   it("should allow through literal specifiers", async () => {
-    const output = await processString("test {{ [test thing] }}", {
+    const output = await processString("test {{ [one thing] }}", {
-      "test thing": 1
+      "one thing": 1
     })
     expect(output).toBe("test 1")
   })
 
   it("should convert to dot notation where required", async () => {
-    const output = await processString("test {{ test[0] }}", {
+    const output = await processString("test {{ one[0] }}", {
-      test: [2]
+      one: [2]
     })
     expect(output).toBe("test 2")
   })
 
   it("should be able to handle a property with a space in its name", async () => {
-    const output = await processString("hello my name is {{ person name }}", {
+    const output = await processString("hello my name is {{ [person name] }}", {
       "person name": "Mike",
     })
     expect(output).toBe("hello my name is Mike")
   })
 
   it("should be able to handle an object with layers that requires escaping", async () => {
-    const output = await processString("testcase {{ testing.test case }}", {
+    const output = await processString("testcase {{ thing.[one case] }}", {
-      testing: {
+      thing: {
-        "test case": 1
+        "one case": 1
       }
     })
     expect(output).toBe("testcase 1")
@@ -44,8 +44,19 @@ describe("attempt some complex problems", () => {
         },
       },
     }
-    const hbs = "{{ New Repeater.Get Actors.first_name }} {{ New Repeater.Get Actors.last_name }}"
+    const hbs = "{{ [New Repeater].[Get Actors].[first_name] }} {{ [New Repeater].[Get Actors].[last_name] }}"
     const output = await processString(hbs, context)
     expect(output).toBe("Bob Bobert")
   })
+
+  it("should be able to process an odd string produced by builder", async () => {
+    const context = {
+      "c306d140d7e854f388bae056db380a0eb": {
+        "one prop": "test",
+      }
+    }
+    const hbs = "null{{ [c306d140d7e854f388bae056db380a0eb].[one prop] }}"
+    const output = await processString(hbs, context)
+    expect(output).toBe("nulltest")
+  })
 })

packages/string-templates/test/helpers.spec.js

@@ -1,5 +1,7 @@
 const {
   processString,
+  processObject,
+  isValid,
 } = require("../src/index")
 
 describe("test the custom helpers we have applied", () => {
@@ -9,5 +11,342 @@ describe("test the custom helpers we have applied", () => {
     })
     expect(output).toBe("object is {\"a\":1}")
   })
-
+})
+
+describe("test the math helpers", () => {
+  it("should be able to produce an absolute", async () => {
+    const output = await processString("{{abs a}}", {
+      a: -10,
+    })
+    expect(parseInt(output)).toBe(10)
+  })
+
+  it("should be able to add", async () => {
+    const output = await processString("{{add a b}}", {
+      a: 10,
+      b: 10,
+    })
+    expect(parseInt(output)).toBe(20)
+  })
+
+  it("should be able to average", async () => {
+    const output = await processString("{{avg a b c}}", {
+      a: 1,
+      b: 2,
+      c: 3,
+    })
+    expect(parseInt(output)).toBe(2)
+  })
+
+  it("should be able to times", async () => {
+    const output = await processString("{{times a b}}", {
+      a: 5,
+      b: 5,
+    })
+    expect(parseInt(output)).toBe(25)
+  })
+})
+
+describe("test the array helpers", () => {
+  const array = ["hi", "person", "how", "are", "you"]
+  it("should allow use of the after helper", async () => {
+    const output = await processString("{{after array 1}}", {
+      array,
+    })
+    expect(output).toBe("person,how,are,you")
+  })
+
+  it("should allow use of the before helper", async () => {
+    const output = await processString("{{before array 2}}", {
+      array,
+    })
+    expect(output).toBe("hi,person,how")
+  })
+
+  it("should allow use of the filter helper", async () => {
+    const output = await processString("{{#filter array \"person\"}}THING{{else}}OTHER{{/filter}}", {
+      array,
+    })
+    expect(output).toBe("THING")
+  })
+
+  it("should allow use of the itemAt helper", async () => {
+    const output = await processString("{{itemAt array 1}}", {
+      array,
+    })
+    expect(output).toBe("person")
+  })
+
+  it("should allow use of the join helper", async () => {
+    const output = await processString("{{join array \"-\"}}", {
+      array,
+    })
+    expect(output).toBe("hi-person-how-are-you")
+  })
+
+  it("should allow use of the sort helper", async () => {
+    const output = await processString("{{sort array}}", {
+      array: ["d", "a", "c", "e"]
+    })
+    expect(output).toBe("a,c,d,e")
+  })
+
+  it("should allow use of the unique helper", async () => {
+    const output = await processString("{{unique array}}", {
+      array: ["a", "a", "b"]
+    })
+    expect(output).toBe("a,b")
+  })
+})
+
+describe("test the number helpers", () => {
+  it("should allow use of the addCommas helper", async () => {
+    const output = await processString("{{ addCommas number }}", {
+      number: 10000000
+    })
+    expect(output).toBe("10,000,000")
+  })
+
+  it("should allow use of the phoneNumber helper", async () => {
+    const output = await processString("{{ phoneNumber number }}", {
+      number: 4490102030,
+    })
+    expect(output).toBe("(449) 010-2030")
+  })
+
+  it("should allow use of the toPrecision helper", async () => {
+    const output = await processString("{{ toPrecision number 2 }}", {
+      number: 1.222222222,
+    })
+    expect(output).toBe("1.2")
+  })
+
+  it("should allow use of the bytes helper", async () => {
+    const output = await processString("{{ bytes number }}", {
+      number: 1000000,
+    })
+    expect(output).toBe("1 MB")
+  })
+})
+
+describe("test the url helpers", () => {
+  const url = "http://example.com?query=1"
+  it("should allow use of the stripQueryString helper", async () => {
+    const output = await processString('{{stripQuerystring url }}', {
+      url,
+    })
+    expect(output).toBe("http://example.com")
+  })
+
+  it("should allow use of the stripProtocol helper", async () => {
+    const output = await processString("{{ stripProtocol url }}", {
+      url,
+    })
+    expect(output).toBe("//example.com/?query=1")
+  })
+
+  it("should allow use of the urlParse helper", async () => {
+    const output = await processString("{{ object ( urlParse url ) }}", {
+      url,
+    })
+    expect(output).toBe("{\"protocol\":\"http:\",\"slashes\":true,\"auth\":null,\"host\":\"example.com\"," +
+      "\"port\":null,\"hostname\":\"example.com\",\"hash\":null,\"search\":\"?query=1\"," +
+      "\"query\":\"query=1\",\"pathname\":\"/\",\"path\":\"/?query=1\"," +
+      "\"href\":\"http://example.com/?query=1\"}")
+  })
+})
+
+describe("test the date helpers", () => {
+  it("should allow use of the date helper", async () => {
+    const date = new Date(1611577535000)
+    const output = await processString("{{ date time 'YYYY-MM-DD' }}", {
+      time: date.toISOString(),
+    })
+    expect(output).toBe("2021-01-25")
+  })
+
+  it("should allow use of the date helper with now time", async () => {
+    const date = new Date()
+    const output = await processString("{{ date now 'DD' }}", {})
+    expect(parseInt(output)).toBe(date.getDate())
+  })
+})
+
+describe("test the string helpers", () => {
+  it("should allow use of the append helper", async () => {
+    const output = await processString("{{ append filename '.txt' }}", {
+      filename: "yummy",
+    })
+    expect(output).toBe("yummy.txt")
+  })
+
+  it("should allow use of the camelcase helper", async () => {
+    const output = await processString("{{ camelcase camel }}", {
+      camel: "testing this thing",
+    })
+    expect(output).toBe("testingThisThing")
+  })
+
+  it("should allow use of the capitalize helper", async () => {
+    const output = await processString("{{ capitalize string }}", {
+      string: "this is a string",
+    })
+    expect(output).toBe("This is a string")
+  })
+
+  it("should allow use of the capitalizeAll helper", async () => {
+    const output = await processString("{{ capitalizeAll string }}", {
+      string: "this is a string",
+    })
+    expect(output).toBe("This Is A String")
+  })
+
+  it("should allow use of the replace helper", async () => {
+    const output = await processString("{{ replace string 'Mike' name }}", {
+      string: "Hello my name is Mike",
+      name: "David",
+    })
+    expect(output).toBe("Hello my name is David")
+  })
+
+  it("should allow use of the split helper", async () => {
+    const output = await processString("{{ first ( split string ' ' ) }}", {
+      string: "this is a string",
+    })
+    expect(output).toBe("this")
+  })
+
+  it("should allow use of the remove helper", async () => {
+    const output = await processString("{{ remove string 'string' }}", {
+      string: "this is a string",
+    })
+    expect(output).toBe("this is a ")
+  })
+
+  it("should allow use of the startsWith helper", async () => {
+    const output = await processString("{{ #startsWith 'Hello' string }}Hi!{{ else }}Goodbye!{{ /startsWith }}", {
+      string: "Hello my name is Mike",
+    })
+    expect(output).toBe("Hi!")
+  })
+})
+
+describe("test the comparison helpers", () => {
+  async function compare(func, a, b) {
+    const output = await processString(`{{ #${func} a b }}Success{{ else }}Fail{{ /${func} }}`, {
+      a,
+      b,
+    })
+    expect(output).toBe("Success")
+  }
+  it("should allow use of the lt helper", async () => {
+    await compare("lt", 10, 15)
+  })
+
+  it("should allow use of the gt helper", async () => {
+    await compare("gt", 15, 10)
+  })
+
+  it("should allow use of the and helper", async () => {
+    await compare("and", true, true)
+  })
+
+  it("should allow use of the or helper", async () => {
+    await compare("or", false, true)
+  })
+
+  it("should allow use of gte with a literal value", async () => {
+    const output = await processString(`{{ #gte a "50" }}s{{ else }}f{{ /gte }}`, {
+      a: 51,
+    })
+    expect(output).toBe("s")
+  })
+})
+
+describe("Test the literal helper", () => {
+  it("should allow use of the literal specifier for a number", async () => {
+    const output = await processString(`{{literal a}}`, {
+      a: 51,
+    })
+    expect(output).toBe(51)
+  })
+
+  it("should allow use of the literal specifier for an object", async () => {
+    const output = await processString(`{{literal a}}`, {
+      a: {b: 1},
+    })
+    expect(output.b).toBe(1)
+  })
+})
+
+describe("Cover a few complex use cases", () => {
+  it("should allow use of three different collection helpers", async () => {
+    const output = await processString(`{{ join ( after ( split "My name is: Joe Smith" " " ) 3 ) " " }}`, {})
+    expect(output).toBe("Joe Smith")
+  })
+
+  it("should allow a complex array case", async () => {
+    const output = await processString("{{ last ( sort ( unique array ) ) }}", {
+      array: ["a", "a", "d", "c", "e"]
+    })
+    expect(output).toBe("e")
+  })
+
+  it("should allow a complex forIn case", async () => {
+    const input = `{{#forIn (JSONparse '{"a":1, "b":2, "c":3}' )}}number: {{.}}\n{{/forIn}}`
+    const output = await processString(input, {})
+    expect(output).toBe("number: 1\nnumber: 2\nnumber: 3\n")
+  })
+
+  it("should make sure case is valid", () => {
+    const validity = isValid("{{ avg [c355ec2b422e54f988ae553c8acd811ea].[a] [c355ec2b422e54f988ae553c8acd811ea].[b] }}")
+    expect(validity).toBe(true)
+  })
+
+  it("should make sure object functions check out valid", () => {
+    const validity = isValid("{{ JSONstringify obj }}")
+    expect(validity).toBe(true)
+  })
+
+  it("should be able to solve an example from docs", async () => {
+    const output = await processString(`{{first ( split "a-b-c" "-") 2}}`, {})
+    expect(output).toBe(`a,b`)
+  })
+
+  it("should confirm a subtraction validity", () => {
+    const validity = isValid("{{ subtract [c390c23a7f1b6441c98d2fe2a51248ef3].[total profit] [c390c23a7f1b6441c98d2fe2a51248ef3].[total revenue]  }}")
+    expect(validity).toBe(true)
+  })
+
+  it("test a very complex duration output", async () => {
+    const currentTime = new Date(1612432082000).toISOString(),
+      eventTime = new Date(1612432071000).toISOString()
+    const input = `{{duration ( subtract (date currentTime "X")(date eventTime "X")) "seconds"}}`
+    const output = await processString(input, {
+      currentTime,
+      eventTime,
+    })
+    expect(output).toBe("a few seconds")
+  })
+
+  it("should confirm a bunch of invalid strings", () => {
+    const invalids = ["{{ awd )", "{{ awdd () ", "{{ awdwad ", "{{ awddawd }"]
+    for (let invalid of invalids) {
+      const validity = isValid(invalid)
+      expect(validity).toBe(false)
+    }
+  })
+
+  it("input a garbage string, expect it to be returned", async () => {
+    const input = `{{{{{{ } {{ ]] ] ] }}} {{ ] {{ {   } { dsa { dddddd }}}}}}} }DDD`
+    const output = await processString(input, {})
+    expect(output).toBe(input)
+  })
+
+  it("getting a nice date from the user", async () => {
+    const input = {text: `{{ date user.subscriptionDue "DD-MM" }}`}
+    const context = JSON.parse(`{"user":{"email":"test@test.com","roleId":"ADMIN","type":"user","tableId":"ta_users","subscriptionDue":"2021-01-12T12:00:00.000Z","_id":"ro_ta_users_us_test@test.com","_rev":"2-24cc794985eb54183ecb93e148563f3d"}}`)
+    const output = await processObject(input, context)
+    expect(output.text).toBe("12-01")
+  })
 })

packages/string-templates/yarn.lock

@@ -270,6 +270,38 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@budibase/handlebars-helpers@^0.11.3":
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.3.tgz#b6e5c91b83e8906e7d7ff10ddde277a3d561016e"
+  integrity sha512-MS1ptZEYq8o9J3tNLM7cZ2RGSSJIer4GiMIUHtbBI3sC9UKqZebao1JYNfmZKpNjntuqhZKgjqc5GfnVIEjsYQ==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-sort "^0.1.4"
+    define-property "^1.0.0"
+    extend-shallow "^3.0.2"
+    "falsey" "^0.3.2"
+    for-in "^1.0.2"
+    for-own "^1.0.0"
+    get-object "^0.2.0"
+    get-value "^2.0.6"
+    handlebars "^4.0.11"
+    handlebars-utils "^1.0.6"
+    has-value "^1.0.0"
+    helper-date "^1.0.1"
+    helper-markdown "^1.0.0"
+    helper-md "^0.2.2"
+    html-tag "^2.0.0"
+    is-even "^1.0.0"
+    is-glob "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    logging-helpers "^1.0.0"
+    micromatch "^3.1.4"
+    relative "^3.0.2"
+    striptags "^3.1.0"
+    to-gfm-code-block "^0.1.1"
+    year "^0.2.1"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
@@ -465,6 +497,19 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
+"@rollup/plugin-commonjs@^17.1.0":
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz#757ec88737dffa8aa913eb392fade2e45aef2a2d"
+  integrity sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    commondir "^1.0.1"
+    estree-walker "^2.0.1"
+    glob "^7.1.6"
+    is-reference "^1.2.1"
+    magic-string "^0.25.7"
+    resolve "^1.17.0"
+
 "@rollup/plugin-json@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
@@ -472,7 +517,7 @@
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
-"@rollup/pluginutils@^3.0.8":
+"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
   integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
@@ -1389,6 +1434,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
@@ -1441,16 +1496,6 @@ create-ecdh@^4.0.0:
     bn.js "^4.1.0"
     elliptic "^6.5.3"
 
-create-frame@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/create-frame/-/create-frame-1.0.0.tgz#8b95f2691e3249b6080443e33d0bad9f8f6975aa"
-  integrity sha1-i5XyaR4ySbYIBEPjPQutn49pdao=
-  dependencies:
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    isobject "^3.0.0"
-    lazy-cache "^2.0.2"
-
 create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
@@ -1551,6 +1596,11 @@ date.js@^0.3.1:
   dependencies:
     debug "~3.1.0"
 
+dayjs@^1.10.4:
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2"
+  integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==
+
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -1665,6 +1715,13 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
 domexception@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
@@ -1781,6 +1838,11 @@ estree-walker@^1.0.1:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
+estree-walker@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -2074,7 +2136,7 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -2110,48 +2172,6 @@ gulp-header@^1.7.1:
     lodash.template "^4.4.0"
     through2 "^2.0.0"
 
-handlebars-helper-create-frame@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/handlebars-helper-create-frame/-/handlebars-helper-create-frame-0.1.0.tgz#8aa51d10aeb6408fcc6605d40d77356288487a03"
-  integrity sha1-iqUdEK62QI/MZgXUDXc1YohIegM=
-  dependencies:
-    create-frame "^1.0.0"
-    isobject "^3.0.0"
-
-handlebars-helpers@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/handlebars-helpers/-/handlebars-helpers-0.10.0.tgz#663d49e718928eafbead1473419ed7bc24bcd45a"
-  integrity sha512-QiyhQz58u/DbuV41VnfpE0nhy6YCH4vB514ajysV8SoKmP+DxU+pR+fahVyNECHj+jiwEN2VrvxD/34/yHaLUg==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-sort "^0.1.4"
-    create-frame "^1.0.0"
-    define-property "^1.0.0"
-    "falsey" "^0.3.2"
-    for-in "^1.0.2"
-    for-own "^1.0.0"
-    get-object "^0.2.0"
-    get-value "^2.0.6"
-    handlebars "^4.0.11"
-    handlebars-helper-create-frame "^0.1.0"
-    handlebars-utils "^1.0.6"
-    has-value "^1.0.0"
-    helper-date "^1.0.1"
-    helper-markdown "^1.0.0"
-    helper-md "^0.2.2"
-    html-tag "^2.0.0"
-    is-even "^1.0.0"
-    is-glob "^4.0.0"
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    lazy-cache "^2.0.2"
-    logging-helpers "^1.0.0"
-    micromatch "^3.1.4"
-    relative "^3.0.2"
-    striptags "^3.1.0"
-    to-gfm-code-block "^0.1.1"
-    year "^0.2.1"
-
 handlebars-utils@^1.0.2, handlebars-utils@^1.0.4, handlebars-utils@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9"
@@ -2553,7 +2573,7 @@ is-potential-custom-element-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
   integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
 
-is-reference@^1.1.2:
+is-reference@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
   integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
@@ -3037,7 +3057,7 @@ jest-watcher@^26.6.2:
     jest-util "^26.6.2"
     string-length "^4.0.1"
 
-jest-worker@^26.6.2:
+jest-worker@^26.2.1, jest-worker@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
@@ -3176,7 +3196,7 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
-lazy-cache@^2.0.1, lazy-cache@^2.0.2:
+lazy-cache@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
   integrity sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=
@@ -3371,7 +3391,7 @@ magic-string@^0.22.5:
   dependencies:
     vlq "^0.2.2"
 
-magic-string@^0.25.2:
+magic-string@^0.25.7:
   version "0.25.7"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
   integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
@@ -3404,6 +3424,11 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+marked@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.8.tgz#5008ece15cfa43e653e85845f3525af4beb6bdd4"
+  integrity sha512-lzmFjGnzWHkmbk85q/ILZjFoHHJIQGF+SxGEfIdGk/XhiTPhqGs37gbru6Kkd48diJnEyYwnG67nru0Z2gQtuQ==
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -3886,7 +3911,7 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -4074,7 +4099,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.18.1:
+resolve@^1.10.0, resolve@^1.11.1, resolve@^1.17.0, resolve@^1.18.1:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -4102,17 +4127,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-commonjs@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
-  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
-  dependencies:
-    estree-walker "^0.6.1"
-    is-reference "^1.1.2"
-    magic-string "^0.25.2"
-    resolve "^1.11.0"
-    rollup-pluginutils "^2.8.1"
-
 rollup-plugin-node-builtins@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz#24a1fed4a43257b6b64371d8abc6ce1ab14597e9"
@@ -4146,6 +4160,16 @@ rollup-plugin-node-resolve@^5.2.0:
     resolve "^1.11.1"
     rollup-pluginutils "^2.8.1"
 
+rollup-plugin-terser@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
+  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    jest-worker "^26.2.1"
+    serialize-javascript "^4.0.0"
+    terser "^5.0.0"
+
 rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.8.1:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
@@ -4236,6 +4260,13 @@ semver@~2.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52"
   integrity sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI=
 
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -4351,7 +4382,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6:
+source-map-support@^0.5.6, source-map-support@~0.5.19:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -4360,9 +4391,9 @@ source-map-support@^0.5.6:
     source-map "^0.6.0"
 
 source-map-url@^0.4.0:
-  version "0.4.0"
+  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
 source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
@@ -4374,7 +4405,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
+source-map@^0.7.3, source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -4565,6 +4596,15 @@ terminal-link@^2.0.0:
     ansi-escapes "^4.2.1"
     supports-hyperlinks "^2.0.0"
 
+terser@^5.0.0:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289"
+  integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.7.2"
+    source-map-support "~0.5.19"
+
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -4732,9 +4772,9 @@ typescript@^4.1.3:
   integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
 uglify-js@^3.1.4:
-  version "3.12.4"
+  version "3.12.6"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.4.tgz#93de48bb76bb3ec0fc36563f871ba46e2ee5c7ee"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.6.tgz#f884584fcc42e10bca70db5cb32e8625c2c42535"
-  integrity sha512-L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A==
+  integrity sha512-aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw==
 
 union-value@^1.0.0:
   version "1.0.1"

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/deployment",
   "email": "hi@budibase.com",
-  "version": "0.6.2",
+  "version": "0.7.4",
   "description": "Budibase Deployment Server",
   "main": "src/index.js",
   "repository": {
@@ -34,5 +34,5 @@
     "pouchdb-all-dbs": "^1.0.2",
     "server-destroy": "^1.0.1"
   },
-  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
 }