@budibase/server 1.0.49-alpha.5 → 1.0.49-alpha.9

package/coverage/lcov-report/threads/automation.js.html

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.21% </span>
+                <span class="strong">84.41% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>64/76</span>
+                <span class='fraction'>65/77</span>
             </div>
         
             
@@ -37,16 +37,16 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">90% </span>
+                <span class="strong">90.9% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>9/10</span>
+                <span class='fraction'>10/11</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.21% </span>
+                <span class="strong">84.41% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>64/76</span>
+                <span class='fraction'>65/77</span>
             </div>
         
             
@@ -203,7 +203,9 @@
 <a name='L144'></a><a href='#L144'>144</a>
 <a name='L145'></a><a href='#L145'>145</a>
 <a name='L146'></a><a href='#L146'>146</a>
-<a name='L147'></a><a href='#L147'>147</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">4x</span>
+<a name='L147'></a><a href='#L147'>147</a>
+<a name='L148'></a><a href='#L148'>148</a>
+<a name='L149'></a><a href='#L149'>149</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
@@ -265,7 +267,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
@@ -337,6 +338,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -349,6 +352,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">require("./utils").threadSetup()
 const env = require("../environment")
 const actions = require("../automations/actions")
@@ -356,11 +360,11 @@ const automationUtils = require("../automations/automationUtils")
 const AutomationEmitter = require("../events/AutomationEmitter")
 const { processObject } = require("@budibase/string-templates")
 const { DEFAULT_TENANT_ID } = require("@budibase/backend-core/constants")
-const CouchDB = require("../db")
 const { DocumentTypes, isDevAppID } = require("../db/utils")
 const { doInTenant } = require("@budibase/backend-core/tenancy")
 const usage = require("../utilities/usageQuota")
 const { definitions: triggerDefs } = require("../automations/triggerInfo")
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId
 const CRON_STEP_ID = triggerDefs.CRON.stepId
@@ -410,11 +414,10 @@ class Orchestrator {
   }
 &nbsp;
   async getApp() {
-    const appId = this._appId
     <span class="missing-if-branch" title="if path not taken" >I</span>if (this._app) {
 <span class="cstat-no" title="statement not covered" >      return this._app</span>
     }
-    const db = new CouchDB(appId)
+    const db = getAppDB()
     this._app = await db.get(DocumentTypes.APP_METADATA)
     return this._app
   }
@@ -482,18 +485,21 @@ class Orchestrator {
 }
 &nbsp;
 module.exports = (input, callback) =&gt; {
-  const automationOrchestrator = new Orchestrator(
-    input.data.automation,
-    input.data.event
-  )
-  automationOrchestrator
-    .execute()
-    .then(response =&gt; {
-      callback(null, response)
-    })
-    .catch(<span class="fstat-no" title="function not covered" >er</span>r =&gt; {
-<span class="cstat-no" title="statement not covered" >      callback(err)</span>
-    })
+  const appId = input.data.event.appId
+  doInAppContext(appId, () =&gt; {
+    const automationOrchestrator = new Orchestrator(
+      input.data.automation,
+      input.data.event
+    )
+    automationOrchestrator
+      .execute()
+      .then(response =&gt; {
+        callback(null, response)
+      })
+      .catch(<span class="fstat-no" title="function not covered" >er</span>r =&gt; {
+<span class="cstat-no" title="statement not covered" >        callback(err)</span>
+      })
+  })
 }
 &nbsp;</pre></td></tr></table></pre>
 
@@ -502,7 +508,7 @@ module.exports = (input, callback) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/index.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.29% </span>
+                <span class="strong">84.43% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>220/261</span>
+                <span class='fraction'>217/257</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">63.47% </span>
+                <span class="strong">63.96% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>73/115</span>
+                <span class='fraction'>71/111</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">91.89% </span>
+                <span class="strong">92.3% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>34/37</span>
+                <span class='fraction'>36/39</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">84.76% </span>
+                <span class="strong">84.92% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>217/256</span>
+                <span class='fraction'>214/252</span>
             </div>
         
             
@@ -74,17 +74,17 @@
 </thead>
 <tbody><tr>
 	<td class="file high" data-value="automation.js"><a href="automation.js.html">automation.js</a></td>
-	<td data-value="84.21" class="pic high">
+	<td data-value="84.41" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 84%"></div><div class="cover-empty" style="width: 16%"></div></div>
 	</td>
-	<td data-value="84.21" class="pct high">84.21%</td>
-	<td data-value="76" class="abs high">64/76</td>
+	<td data-value="84.41" class="pct high">84.41%</td>
+	<td data-value="77" class="abs high">65/77</td>
 	<td data-value="56.52" class="pct medium">56.52%</td>
 	<td data-value="23" class="abs medium">13/23</td>
-	<td data-value="90" class="pct high">90%</td>
-	<td data-value="10" class="abs high">9/10</td>
-	<td data-value="84.21" class="pct high">84.21%</td>
-	<td data-value="76" class="abs high">64/76</td>
+	<td data-value="90.9" class="pct high">90.9%</td>
+	<td data-value="11" class="abs high">10/11</td>
+	<td data-value="84.41" class="pct high">84.41%</td>
+	<td data-value="77" class="abs high">65/77</td>
 	</tr>
 
 <tr>
@@ -104,17 +104,17 @@
 
 <tr>
 	<td class="file high" data-value="query.js"><a href="query.js.html">query.js</a></td>
-	<td data-value="86.44" class="pic high">
+	<td data-value="86.72" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 86%"></div><div class="cover-empty" style="width: 14%"></div></div>
 	</td>
-	<td data-value="86.44" class="pct high">86.44%</td>
-	<td data-value="118" class="abs high">102/118</td>
-	<td data-value="68.33" class="pct medium">68.33%</td>
-	<td data-value="60" class="abs medium">41/60</td>
-	<td data-value="92.3" class="pct high">92.3%</td>
-	<td data-value="13" class="abs high">12/13</td>
-	<td data-value="86.84" class="pct high">86.84%</td>
-	<td data-value="114" class="abs high">99/114</td>
+	<td data-value="86.72" class="pct high">86.72%</td>
+	<td data-value="113" class="abs high">98/113</td>
+	<td data-value="69.64" class="pct medium">69.64%</td>
+	<td data-value="56" class="abs medium">39/56</td>
+	<td data-value="92.85" class="pct high">92.85%</td>
+	<td data-value="14" class="abs high">13/14</td>
+	<td data-value="87.15" class="pct high">87.15%</td>
+	<td data-value="109" class="abs high">95/109</td>
 	</tr>
 
 <tr>
@@ -140,7 +140,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/index.js.html

@@ -262,7 +262,7 @@ module.exports.ThreadType = ThreadType
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/query.js.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">86.44% </span>
+                <span class="strong">86.72% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>102/118</span>
+                <span class='fraction'>98/113</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">68.33% </span>
+                <span class="strong">69.64% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>41/60</span>
+                <span class='fraction'>39/56</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">92.3% </span>
+                <span class="strong">92.85% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>12/13</span>
+                <span class='fraction'>13/14</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">86.84% </span>
+                <span class="strong">87.15% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>99/114</span>
+                <span class='fraction'>95/109</span>
             </div>
         
             
@@ -284,26 +284,15 @@
 <a name='L225'></a><a href='#L225'>225</a>
 <a name='L226'></a><a href='#L226'>226</a>
 <a name='L227'></a><a href='#L227'>227</a>
-<a name='L228'></a><a href='#L228'>228</a>
-<a name='L229'></a><a href='#L229'>229</a>
-<a name='L230'></a><a href='#L230'>230</a>
-<a name='L231'></a><a href='#L231'>231</a>
-<a name='L232'></a><a href='#L232'>232</a>
-<a name='L233'></a><a href='#L233'>233</a>
-<a name='L234'></a><a href='#L234'>234</a>
-<a name='L235'></a><a href='#L235'>235</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2x</span>
+<a name='L228'></a><a href='#L228'>228</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-yes">15x</span>
@@ -413,7 +402,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">6x</span>
@@ -485,10 +473,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">19x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -518,6 +502,7 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -525,19 +510,16 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const threadUtils = require("./utils")
 threadUtils.threadSetup()
 const ScriptRunner = require("../utilities/scriptRunner")
 const { integrations } = require("../integrations")
 const { processStringSync } = require("@budibase/string-templates")
-const CouchDB = require("../db")
-&nbsp;
-const IS_TRIPLE_BRACE = new RegExp(/^{{3}.*}{3}$/)
-const IS_HANDLEBARS = new RegExp(/^{{2}.*}{2}$/)
+const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
 &nbsp;
 class QueryRunner {
   constructor(input, flags = { noRecursiveQuery: false }) {
-    this.appId = input.appId
     this.datasource = input.datasource
     this.queryVerb = input.queryVerb
     this.fields = input.fields
@@ -631,12 +613,11 @@ class QueryRunner {
   }
 &nbsp;
   async runAnotherQuery(queryId, parameters) {
-    const db = new CouchDB(this.appId)
+    const db = getAppDB()
     const query = await db.get(queryId)
     const datasource = await db.get(query.datasourceId)
     return new QueryRunner(
       {
-        appId: this.appId,
         datasource,
         queryVerb: query.queryVerb,
         fields: query.fields,
@@ -717,12 +698,8 @@ class QueryRunner {
 <span class="cstat-no" title="statement not covered" >        enrichedQuery[key] = this.enrichQueryFields(fields[key], parameters)</span>
       } else if (typeof fields[key] === "string") {
         // enrich string value as normal
-        let value = fields[key]
-        // add triple brace to avoid escaping e.g. '=' in cookie header
-        <span class="missing-if-branch" title="if path not taken" >I</span>if (IS_HANDLEBARS.test(value) &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >!IS_TRIPLE_BRACE.test(value))</span> {
-<span class="cstat-no" title="statement not covered" >          value = `{${value}}`</span>
-        }
-        enrichedQuery[key] = processStringSync(value, parameters, {
+        enrichedQuery[key] = processStringSync(fields[key], parameters, {
+          noEscaping: true,
           noHelpers: true,
         })
       } else <span class="missing-if-branch" title="else path not taken" >E</span>{
@@ -750,14 +727,16 @@ class QueryRunner {
 }
 &nbsp;
 module.exports = (input, callback) =&gt; {
-  const Runner = new QueryRunner(input)
-  Runner.execute()
-    .then(response =&gt; {
-      callback(null, response)
-    })
-    .catch(err =&gt; {
-      callback(err)
-    })
+  doInAppContext(input.appId, () =&gt; {
+    const Runner = new QueryRunner(input)
+    Runner.execute()
+      .then(response =&gt; {
+        callback(null, response)
+      })
+      .catch(err =&gt; {
+        callback(err)
+      })
+  })
 }
 &nbsp;</pre></td></tr></table></pre>
 
@@ -766,7 +745,7 @@ module.exports = (input, callback) =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/threads/utils.js.html

@@ -298,7 +298,7 @@ exports.hasExtraData = response => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/bcrypt.js.html

@@ -109,7 +109,7 @@ const SALT_ROUNDS = <span class="cstat-no" title="statement not covered" >env.SA
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/budibaseDir.js.html

@@ -94,7 +94,7 @@ module.exports.budibaseTempDir = budibaseTempDir
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/centralPath.js.html

@@ -130,7 +130,7 @@ exports.resolve = <span class="fstat-no" title="function not covered" >fu</span>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/csvParser.js.html

@@ -496,7 +496,7 @@ module.exports = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Feb 01 2022 10:11:17 GMT+0000 (Coordinated Universal Time)
+                at Thu Feb 03 2022 20:58:15 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>