npm - @budibase/server - Versions diffs - 0.9.184 → 0.9.185-alpha.11 - Mend

@budibase/server 0.9.184 → 0.9.185-alpha.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (290) hide show

package/Dockerfile +1 -1
package/__mocks__/mssql.ts +1 -1
package/__mocks__/pg.ts +3 -0
package/builder/assets/bb-space-man.5be51a45.svg +290 -0
package/builder/assets/index.053c6f7a.js +1321 -0
package/builder/assets/index.4a7c5636.css +1 -0
package/builder/assets/vendor.470042a4.js +152 -0
package/builder/assets/vendor.5e1fe644.css +1 -0
package/builder/index.html +4 -4
package/coverage/clover.xml +1357 -959
package/coverage/coverage-final.json +91 -87
package/coverage/lcov-report/api/controllers/analytics.js.html +2 -2
package/coverage/lcov-report/api/controllers/apikeys.js.html +2 -2
package/coverage/lcov-report/api/controllers/application.js.html +65 -14
package/coverage/lcov-report/api/controllers/auth.js.html +19 -10
package/coverage/lcov-report/api/controllers/automation.js.html +3 -3
package/coverage/lcov-report/api/controllers/backup.js.html +1 -1
package/coverage/lcov-report/api/controllers/cloud.js.html +1 -1
package/coverage/lcov-report/api/controllers/component.js.html +4 -4
package/coverage/lcov-report/api/controllers/datasource.js.html +147 -27
package/coverage/lcov-report/api/controllers/dev.js.html +16 -7
package/coverage/lcov-report/api/controllers/hosting.js.html +10 -10
package/coverage/lcov-report/api/controllers/index.html +90 -90
package/coverage/lcov-report/api/controllers/integration.js.html +1 -1
package/coverage/lcov-report/api/controllers/layout.js.html +3 -3
package/coverage/lcov-report/api/controllers/metadata.js.html +3 -3
package/coverage/lcov-report/api/controllers/permission.js.html +3 -3
package/coverage/lcov-report/api/controllers/query.js.html +53 -209
package/coverage/lcov-report/api/controllers/role.js.html +9 -9
package/coverage/lcov-report/api/controllers/routing.js.html +3 -3
package/coverage/lcov-report/api/controllers/row/external.js.html +12 -6
package/coverage/lcov-report/api/controllers/row/index.html +26 -26
package/coverage/lcov-report/api/controllers/row/index.js.html +2 -2
package/coverage/lcov-report/api/controllers/row/internal.js.html +9 -9
package/coverage/lcov-report/api/controllers/row/internalSearch.js.html +2 -2
package/coverage/lcov-report/api/controllers/row/utils.js.html +21 -30
package/coverage/lcov-report/api/controllers/screen.js.html +2 -2
package/coverage/lcov-report/api/controllers/script.js.html +3 -3
package/coverage/lcov-report/api/controllers/table/external.js.html +980 -0
package/coverage/lcov-report/api/controllers/table/index.html +56 -26
package/coverage/lcov-report/api/controllers/table/index.js.html +80 -350
package/coverage/lcov-report/api/controllers/table/internal.js.html +545 -0
package/coverage/lcov-report/api/controllers/table/utils.js.html +172 -49
package/coverage/lcov-report/api/controllers/templates.js.html +4 -4
package/coverage/lcov-report/api/controllers/user.js.html +390 -33
package/coverage/lcov-report/api/controllers/view/exporters.js.html +1 -1
package/coverage/lcov-report/api/controllers/view/index.html +9 -9
package/coverage/lcov-report/api/controllers/view/index.js.html +5 -5
package/coverage/lcov-report/api/controllers/view/utils.js.html +11 -11
package/coverage/lcov-report/api/controllers/view/viewBuilder.js.html +3 -3
package/coverage/lcov-report/api/controllers/webhook.js.html +4 -4
package/coverage/lcov-report/api/index.html +1 -1
package/coverage/lcov-report/api/index.js.html +1 -1
package/coverage/lcov-report/api/routes/analytics.js.html +1 -1
package/coverage/lcov-report/api/routes/apikeys.js.html +1 -1
package/coverage/lcov-report/api/routes/application.js.html +1 -1
package/coverage/lcov-report/api/routes/auth.js.html +1 -1
package/coverage/lcov-report/api/routes/automation.js.html +1 -1
package/coverage/lcov-report/api/routes/backup.js.html +1 -1
package/coverage/lcov-report/api/routes/cloud.js.html +1 -1
package/coverage/lcov-report/api/routes/component.js.html +1 -1
package/coverage/lcov-report/api/routes/datasource.js.html +1 -1
package/coverage/lcov-report/api/routes/deploy.js.html +1 -1
package/coverage/lcov-report/api/routes/dev.js.html +2 -2
package/coverage/lcov-report/api/routes/hosting.js.html +1 -1
package/coverage/lcov-report/api/routes/index.html +4 -4
package/coverage/lcov-report/api/routes/index.js.html +1 -1
package/coverage/lcov-report/api/routes/integration.js.html +1 -1
package/coverage/lcov-report/api/routes/layout.js.html +1 -1
package/coverage/lcov-report/api/routes/metadata.js.html +1 -1
package/coverage/lcov-report/api/routes/permission.js.html +1 -1
package/coverage/lcov-report/api/routes/query.js.html +5 -2
package/coverage/lcov-report/api/routes/role.js.html +1 -1
package/coverage/lcov-report/api/routes/routing.js.html +1 -1
package/coverage/lcov-report/api/routes/row.js.html +1 -1
package/coverage/lcov-report/api/routes/screen.js.html +1 -1
package/coverage/lcov-report/api/routes/script.js.html +1 -1
package/coverage/lcov-report/api/routes/static.js.html +2 -2
package/coverage/lcov-report/api/routes/table.js.html +35 -2
package/coverage/lcov-report/api/routes/templates.js.html +1 -1
package/coverage/lcov-report/api/routes/user.js.html +17 -2
package/coverage/lcov-report/api/routes/view.js.html +1 -1
package/coverage/lcov-report/api/routes/webhook.js.html +1 -1
package/coverage/lcov-report/automations/actions.js.html +2 -2
package/coverage/lcov-report/automations/automationUtils.js.html +3 -3
package/coverage/lcov-report/automations/bullboard.js.html +71 -20
package/coverage/lcov-report/automations/index.html +33 -48
package/coverage/lcov-report/automations/index.js.html +2 -2
package/coverage/lcov-report/automations/steps/bash.js.html +1 -1
package/coverage/lcov-report/automations/steps/createRow.js.html +1 -1
package/coverage/lcov-report/automations/steps/delay.js.html +1 -1
package/coverage/lcov-report/automations/steps/deleteRow.js.html +1 -1
package/coverage/lcov-report/automations/steps/discord.js.html +3 -3
package/coverage/lcov-report/automations/steps/executeQuery.js.html +1 -1
package/coverage/lcov-report/automations/steps/executeScript.js.html +3 -3
package/coverage/lcov-report/automations/steps/filter.js.html +1 -1
package/coverage/lcov-report/automations/steps/index.html +14 -14
package/coverage/lcov-report/automations/steps/integromat.js.html +1 -1
package/coverage/lcov-report/automations/steps/outgoingWebhook.js.html +3 -3
package/coverage/lcov-report/automations/steps/queryRows.js.html +3 -3
package/coverage/lcov-report/automations/steps/sendSmtpEmail.js.html +1 -1
package/coverage/lcov-report/automations/steps/serverLog.js.html +1 -1
package/coverage/lcov-report/automations/steps/slack.js.html +1 -1
package/coverage/lcov-report/automations/steps/updateRow.js.html +1 -1
package/coverage/lcov-report/automations/steps/utils.js.html +7 -7
package/coverage/lcov-report/automations/steps/zapier.js.html +1 -1
package/coverage/lcov-report/automations/triggerInfo/app.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/cron.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/index.html +1 -1
package/coverage/lcov-report/automations/triggerInfo/index.js.html +8 -8
package/coverage/lcov-report/automations/triggerInfo/rowDeleted.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/rowSaved.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/rowUpdated.js.html +2 -2
package/coverage/lcov-report/automations/triggerInfo/webhook.js.html +2 -2
package/coverage/lcov-report/automations/triggers.js.html +22 -10
package/coverage/lcov-report/automations/utils.js.html +42 -12
package/coverage/lcov-report/constants/index.html +5 -5
package/coverage/lcov-report/constants/index.js.html +49 -4
package/coverage/lcov-report/constants/layouts.js.html +1 -1
package/coverage/lcov-report/constants/screens.js.html +1 -1
package/coverage/lcov-report/db/client.js.html +2 -2
package/coverage/lcov-report/db/inMemoryView.js.html +2 -2
package/coverage/lcov-report/db/index.html +2 -2
package/coverage/lcov-report/db/index.js.html +1 -1
package/coverage/lcov-report/db/linkedRows/LinkController.js.html +6 -6
package/coverage/lcov-report/db/linkedRows/index.html +10 -10
package/coverage/lcov-report/db/linkedRows/index.js.html +5 -5
package/coverage/lcov-report/db/linkedRows/linkUtils.js.html +6 -6
package/coverage/lcov-report/db/newid.js.html +1 -1
package/coverage/lcov-report/db/utils.js.html +1 -1
package/coverage/lcov-report/events/AutomationEmitter.js.html +6 -6
package/coverage/lcov-report/events/index.html +6 -6
package/coverage/lcov-report/events/index.js.html +1 -1
package/coverage/lcov-report/events/utils.js.html +5 -5
package/coverage/lcov-report/index.html +98 -83
package/coverage/lcov-report/integrations/tests/TestConfiguration.js.html +1 -1
package/coverage/lcov-report/integrations/tests/index.html +1 -1
package/coverage/lcov-report/middleware/appInfo.js.html +2 -2
package/coverage/lcov-report/middleware/authorized.js.html +11 -8
package/coverage/lcov-report/middleware/builder.js.html +16 -7
package/coverage/lcov-report/middleware/currentapp.js.html +6 -6
package/coverage/lcov-report/middleware/index.html +23 -23
package/coverage/lcov-report/middleware/joi-validator.js.html +2 -2
package/coverage/lcov-report/middleware/resourceId.js.html +18 -18
package/coverage/lcov-report/middleware/selfhost.js.html +2 -2
package/coverage/lcov-report/middleware/usageQuota.js.html +4 -4
package/coverage/lcov-report/middleware/utils.js.html +1 -1
package/coverage/lcov-report/{automations/thread.js.html → threads/automation.js.html} +83 -32
package/coverage/lcov-report/threads/index.html +141 -0
package/coverage/lcov-report/threads/index.js.html +260 -0
package/coverage/lcov-report/threads/query.js.html +269 -0
package/coverage/lcov-report/utilities/bcrypt.js.html +1 -1
package/coverage/lcov-report/utilities/budibaseDir.js.html +1 -1
package/coverage/lcov-report/utilities/centralPath.js.html +1 -1
package/coverage/lcov-report/utilities/csvParser.js.html +144 -15
package/coverage/lcov-report/utilities/global.js.html +26 -11
package/coverage/lcov-report/utilities/index.html +49 -49
package/coverage/lcov-report/utilities/index.js.html +65 -17
package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html +30 -9
package/coverage/lcov-report/utilities/queue/index.html +14 -14
package/coverage/lcov-report/utilities/routing/index.html +1 -1
package/coverage/lcov-report/utilities/routing/index.js.html +1 -1
package/coverage/lcov-report/utilities/rowProcessor/index.html +4 -4
package/coverage/lcov-report/utilities/rowProcessor/index.js.html +2 -2
package/coverage/lcov-report/utilities/rowProcessor/utils.js.html +3 -3
package/coverage/lcov-report/utilities/scriptRunner.js.html +16 -7
package/coverage/lcov-report/utilities/security.js.html +3 -3
package/coverage/lcov-report/utilities/statusCodes.js.html +1 -1
package/coverage/lcov-report/utilities/users.js.html +1 -1
package/coverage/lcov-report/utilities/workerRequests.js.html +5 -5
package/coverage/lcov.info +2301 -1599
package/dist/api/controllers/application.js +16 -2
package/dist/api/controllers/auth.js +3 -3
package/dist/api/controllers/datasource.js +47 -16
package/dist/api/controllers/deploy/index.js +2 -0
package/dist/api/controllers/dev.js +4 -1
package/dist/api/controllers/query.js +30 -58
package/dist/api/controllers/row/ExternalRequest.js +37 -14
package/dist/api/controllers/row/external.js +1 -0
package/dist/api/controllers/row/utils.js +6 -12
package/dist/api/controllers/static/index.js +1 -1
package/dist/api/controllers/table/external.js +242 -0
package/dist/api/controllers/table/index.js +49 -123
package/dist/api/controllers/table/internal.js +150 -0
package/dist/api/controllers/table/utils.js +62 -28
package/dist/api/controllers/user.js +123 -11
package/dist/api/routes/query.js +1 -1
package/dist/api/routes/table.js +7 -1
package/dist/api/routes/user.js +2 -1
package/dist/app.js +2 -11
package/dist/automations/bullboard.js +37 -10
package/dist/automations/triggers.js +7 -3
package/dist/automations/utils.js +11 -2
package/dist/constants/index.js +13 -0
package/dist/definitions/datasource.js +4 -0
package/dist/integrations/base/IntegrationBase.js +2 -0
package/dist/integrations/base/datasourcePlus.js +2 -0
package/dist/integrations/base/sql.js +334 -180
package/dist/integrations/base/sqlTable.js +143 -0
package/dist/integrations/base/utils.js +30 -0
package/dist/integrations/microsoftSqlServer.js +117 -9
package/dist/integrations/mysql.js +14 -84
package/dist/integrations/postgres.js +35 -28
package/dist/integrations/utils.js +56 -9
package/dist/middleware/authorized.js +2 -1
package/dist/middleware/builder.js +4 -1
package/dist/package.json +7 -6
package/dist/tests/utilities/TestConfiguration.js +2 -1
package/dist/{automations/thread.js → threads/automation.js} +23 -7
package/dist/threads/index.js +58 -0
package/dist/threads/query.js +61 -0
package/dist/tsconfig.tsbuildinfo +1 -1
package/dist/utilities/csvParser.js +46 -5
package/dist/utilities/global.js +6 -2
package/dist/utilities/index.js +18 -2
package/dist/utilities/queue/inMemoryQueue.js +8 -0
package/dist/utilities/scriptRunner.js +4 -1
package/package.json +8 -7
package/scripts/integrations/mssql/data/Dockerfile +9 -0
package/scripts/integrations/mssql/data/entrypoint.sh +24 -0
package/scripts/integrations/mssql/data/setup.sql +54 -0
package/scripts/integrations/mssql/docker-compose.yaml +12 -0
package/scripts/integrations/mssql/reset.sh +3 -0
package/scripts/likeCypress.ts +33 -0
package/src/api/controllers/application.js +19 -2
package/src/api/controllers/auth.js +3 -0
package/src/api/controllers/datasource.js +56 -16
package/src/api/controllers/deploy/index.js +2 -0
package/src/api/controllers/dev.js +4 -1
package/src/api/controllers/query.js +29 -81
package/src/api/controllers/row/ExternalRequest.ts +47 -16
package/src/api/controllers/row/external.js +2 -0
package/src/api/controllers/row/utils.js +8 -11
package/src/api/controllers/static/index.js +1 -1
package/src/api/controllers/table/external.js +300 -0
package/src/api/controllers/table/index.js +47 -137
package/src/api/controllers/table/internal.js +155 -0
package/src/api/controllers/table/utils.js +74 -33
package/src/api/controllers/user.js +132 -13
package/src/api/routes/query.js +1 -0
package/src/api/routes/table.js +11 -0
package/src/api/routes/tests/datasource.spec.js +2 -2
package/src/api/routes/tests/misc.spec.js +5 -1
package/src/api/routes/tests/query.spec.js +0 -1
package/src/api/routes/user.js +5 -0
package/src/app.ts +2 -10
package/src/automations/bullboard.js +28 -11
package/src/automations/tests/automation.spec.js +3 -4
package/src/automations/triggers.js +7 -3
package/src/automations/utils.js +12 -2
package/src/constants/index.js +15 -0
package/src/definitions/common.ts +7 -1
package/src/definitions/datasource.ts +9 -3
package/src/integrations/airtable.ts +2 -1
package/src/integrations/arangodb.ts +2 -1
package/src/integrations/base/IntegrationBase.ts +6 -0
package/src/integrations/base/datasourcePlus.ts +9 -0
package/src/integrations/base/sql.ts +359 -222
package/src/integrations/base/sqlTable.ts +180 -0
package/src/integrations/base/utils.ts +22 -0
package/src/integrations/couchdb.ts +2 -1
package/src/integrations/dynamodb.ts +2 -1
package/src/integrations/elasticsearch.ts +2 -1
package/src/integrations/microsoftSqlServer.ts +145 -13
package/src/integrations/mongodb.ts +2 -1
package/src/integrations/mysql.ts +20 -94
package/src/integrations/postgres.ts +45 -35
package/src/integrations/rest.ts +2 -1
package/src/integrations/s3.ts +2 -1
package/src/integrations/tests/microsoftSqlServer.spec.js +22 -15
package/src/integrations/tests/postgres.spec.js +4 -0
package/src/integrations/utils.ts +60 -8
package/src/middleware/authorized.js +2 -1
package/src/middleware/builder.js +4 -1
package/src/tests/utilities/TestConfiguration.js +2 -1
package/src/{automations/thread.js → threads/automation.js} +24 -7
package/src/threads/index.js +60 -0
package/src/threads/query.js +63 -0
package/src/utilities/csvParser.js +48 -5
package/src/utilities/global.js +7 -2
package/src/utilities/index.js +18 -2
package/src/utilities/queue/inMemoryQueue.js +7 -0
package/src/utilities/scriptRunner.js +4 -1
package/src/utilities/tests/__snapshots__/csvParser.spec.js.snap +0 -6
package/src/utilities/tests/csvParser.spec.js +3 -0
package/tsconfig.json +1 -1
package/builder/assets/index.34964222.js +0 -201
package/builder/assets/index.7469e1e4.css +0 -29
package/builder/assets/vendor.278a305c.js +0 -9
package/builder/assets/vendor.d75d5eb7.css +0 -1

package/coverage/lcov-report/api/controllers/query.js.html CHANGED Viewed

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.57% </span>
+                <span class="strong">84.93% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>77/98</span>
+                <span class='fraction'>62/73</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">53.66% </span>
+                <span class="strong">48% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>22/41</span>
+                <span class='fraction'>12/25</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">92.31% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>12/13</span>
+                <span class='fraction'>9/9</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.95% </span>
+                <span class="strong">84.72% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>75/95</span>
+                <span class='fraction'>61/72</span>
             </div>
@@ -55,7 +55,7 @@
             Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
         </p>
     </div>
-    <div class='status-line medium'></div>
+    <div class='status-line high'></div>
     <pre><table class="coverage">
 <tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
 <a name='L2'></a><a href='#L2'>2</a>
@@ -213,64 +213,13 @@
 <a name='L154'></a><a href='#L154'>154</a>
 <a name='L155'></a><a href='#L155'>155</a>
 <a name='L156'></a><a href='#L156'>156</a>
-<a name='L157'></a><a href='#L157'>157</a>
-<a name='L158'></a><a href='#L158'>158</a>
-<a name='L159'></a><a href='#L159'>159</a>
-<a name='L160'></a><a href='#L160'>160</a>
-<a name='L161'></a><a href='#L161'>161</a>
-<a name='L162'></a><a href='#L162'>162</a>
-<a name='L163'></a><a href='#L163'>163</a>
-<a name='L164'></a><a href='#L164'>164</a>
-<a name='L165'></a><a href='#L165'>165</a>
-<a name='L166'></a><a href='#L166'>166</a>
-<a name='L167'></a><a href='#L167'>167</a>
-<a name='L168'></a><a href='#L168'>168</a>
-<a name='L169'></a><a href='#L169'>169</a>
-<a name='L170'></a><a href='#L170'>170</a>
-<a name='L171'></a><a href='#L171'>171</a>
-<a name='L172'></a><a href='#L172'>172</a>
-<a name='L173'></a><a href='#L173'>173</a>
-<a name='L174'></a><a href='#L174'>174</a>
-<a name='L175'></a><a href='#L175'>175</a>
-<a name='L176'></a><a href='#L176'>176</a>
-<a name='L177'></a><a href='#L177'>177</a>
-<a name='L178'></a><a href='#L178'>178</a>
-<a name='L179'></a><a href='#L179'>179</a>
-<a name='L180'></a><a href='#L180'>180</a>
-<a name='L181'></a><a href='#L181'>181</a>
-<a name='L182'></a><a href='#L182'>182</a>
-<a name='L183'></a><a href='#L183'>183</a>
-<a name='L184'></a><a href='#L184'>184</a>
-<a name='L185'></a><a href='#L185'>185</a>
-<a name='L186'></a><a href='#L186'>186</a>
-<a name='L187'></a><a href='#L187'>187</a>
-<a name='L188'></a><a href='#L188'>188</a>
-<a name='L189'></a><a href='#L189'>189</a>
-<a name='L190'></a><a href='#L190'>190</a>
-<a name='L191'></a><a href='#L191'>191</a>
-<a name='L192'></a><a href='#L192'>192</a>
-<a name='L193'></a><a href='#L193'>193</a>
-<a name='L194'></a><a href='#L194'>194</a>
-<a name='L195'></a><a href='#L195'>195</a>
-<a name='L196'></a><a href='#L196'>196</a>
-<a name='L197'></a><a href='#L197'>197</a>
-<a name='L198'></a><a href='#L198'>198</a>
-<a name='L199'></a><a href='#L199'>199</a>
-<a name='L200'></a><a href='#L200'>200</a>
-<a name='L201'></a><a href='#L201'>201</a>
-<a name='L202'></a><a href='#L202'>202</a>
-<a name='L203'></a><a href='#L203'>203</a>
-<a name='L204'></a><a href='#L204'>204</a>
-<a name='L205'></a><a href='#L205'>205</a>
-<a name='L206'></a><a href='#L206'>206</a>
-<a name='L207'></a><a href='#L207'>207</a>
-<a name='L208'></a><a href='#L208'>208</a>
-<a name='L209'></a><a href='#L209'>209</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">34x</span>
+<a name='L157'></a><a href='#L157'>157</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -285,47 +234,6 @@
 <span class="cline-any cline-yes">4x</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">2x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<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-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>
-<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">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<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-yes">2x</span>
-<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-yes">2x</span>
-<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-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</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-yes">34x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -353,10 +261,10 @@
 <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">2x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -367,11 +275,13 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <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-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-yes">2x</span>
+<span class="cline-any cline-yes">4x</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>
@@ -388,7 +298,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-yes">2x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">34x</span>
@@ -409,16 +319,10 @@
 <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-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</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>
@@ -431,7 +335,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
-<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>
@@ -443,18 +346,12 @@
 <span class="cline-any cline-neutral">&nbsp;</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">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</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">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</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>
@@ -463,7 +360,6 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
-<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>
@@ -476,64 +372,24 @@
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const { processString } = require("@budibase/string-templates")
 const CouchDB = require("../../db")
 const { generateQueryID, getQueryParams } = require("../../db/utils")
-const { integrations } = require("../../integrations")
 const { BaseQueryVerbs } = require("../../constants")
 const env = require("../../environment")
-const ScriptRunner = require("../../utilities/scriptRunner")
+const { Thread, ThreadType } = require("../../threads")
+&nbsp;
+const Runner = new Thread(ThreadType.QUERY, { timeoutMs: 10000 })
 &nbsp;
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {
   const wasArray = Array.isArray(input)
   const queries = wasArray ? input : [input]
   for (let query of queries) {
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (query.queryVerb === BaseQueryVerbs.READ) {
+    if (query.queryVerb === BaseQueryVerbs.READ) {
       query.readable = true
     }
   }
   return wasArray ? queries : queries[0]
 }
 &nbsp;
-function formatResponse(resp) {
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof resp === "string") {
-<span class="cstat-no" title="statement not covered" >    try {</span>
-<span class="cstat-no" title="statement not covered" >      resp = JSON.parse(resp)</span>
-    } catch (err) {
-<span class="cstat-no" title="statement not covered" >      resp = { response: resp }</span>
-    }
-  }
-  return resp
-}
-&nbsp;
-async function runAndTransform(
-  integration,
-  queryVerb,
-  enrichedQuery,
-  transformer
-) {
-  let rows = formatResponse(await integration[queryVerb](enrichedQuery))
-&nbsp;
-  // transform as required
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (transformer) {
-    const runner = <span class="cstat-no" title="statement not covered" >new ScriptRunner(transformer, { data: rows })</span>
-<span class="cstat-no" title="statement not covered" >    rows = runner.execute()</span>
-  }
-&nbsp;
-  // needs to an array for next step
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (!Array.isArray(rows)) {
-<span class="cstat-no" title="statement not covered" >    rows = [rows]</span>
-  }
-&nbsp;
-  // map into JSON if just raw primitive here
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (rows.find(row =&gt; typeof row !== "object")) {
-<span class="cstat-no" title="statement not covered" >    rows = rows.map(<span class="fstat-no" title="function not covered" >va</span>lue =&gt; (<span class="cstat-no" title="statement not covered" >{ value })</span>)</span>
-  }
-&nbsp;
-  // get all the potential fields in the schema
-  let keys = rows.flatMap(Object.keys)
-&nbsp;
-  return { rows, keys }
-}
-&nbsp;
 exports.fetch = async function (ctx) {
   const db = new CouchDB(ctx.appId)
 &nbsp;
@@ -549,7 +405,7 @@ exports.save = async function (ctx) {
   const db = new CouchDB(ctx.appId)
   const query = ctx.request.body
 &nbsp;
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (!query._id) {
+  if (!query._id) {
     query._id = generateQueryID(query.datasourceId)
   }
 &nbsp;
@@ -573,7 +429,9 @@ async function enrichQueryFields(fields, parameters = <span class="branch-0 cbra
 <span class="cstat-no" title="statement not covered" >      enrichedQuery[key] = await enrichQueryFields(fields[key], parameters)</span>
     } else <span class="cstat-no" title="statement not covered" >if (typeof fields[key] === "string") {</span>
       // enrich string value as normal
-<span class="cstat-no" title="statement not covered" >      enrichedQuery[key] = await processString(fields[key], parameters)</span>
+<span class="cstat-no" title="statement not covered" >      enrichedQuery[key] = await processString(fields[key], parameters, {</span>
+        noHelpers: true,
+      })
     } else {
 <span class="cstat-no" title="statement not covered" >      enrichedQuery[key] = fields[key]</span>
     }
@@ -615,31 +473,24 @@ exports.preview = async function (ctx) {
   const db = new CouchDB(ctx.appId)
 &nbsp;
   const datasource = await db.get(ctx.request.body.datasourceId)
-&nbsp;
-  const Integration = integrations[datasource.source]
-&nbsp;
-  if (!Integration) {
-    ctx.throw(400, "Integration type does not exist.")
-  }
 &nbsp;
   const { fields, parameters, queryVerb, transformer } = ctx.request.body
   const enrichedQuery = await enrichQueryFields(fields, parameters)
-  const integration = new Integration(datasource.config)
 &nbsp;
-  const { rows, keys } = await runAndTransform(
-    integration,
-    queryVerb,
-    enrichedQuery,
-    transformer
-  )
+  try {
+    const { rows, keys } = await Runner.run({
+      datasource,
+      queryVerb,
+      query: enrichedQuery,
+      transformer,
+    })
 &nbsp;
-  ctx.body = {
-    rows,
-    schemaFields: [...new Set(keys)],
-  }
-  // cleanup
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (integration.end) {
-<span class="cstat-no" title="statement not covered" >    integration.end()</span>
+    ctx.body = {
+      rows,
+      schemaFields: [...new Set(keys)],
+    }
+  } catch (err) {
+    ctx.throw(400, err)
   }
 }
 &nbsp;
@@ -648,30 +499,23 @@ exports.execute = async function (ctx) {
 &nbsp;
   const query = await db.get(ctx.params.queryId)
   const datasource = await db.get(query.datasourceId)
-&nbsp;
-  const Integration = integrations[datasource.source]
-&nbsp;
-  if (!Integration) {
-    ctx.throw(400, "Integration type does not exist.")
-  }
 &nbsp;
   const enrichedQuery = await enrichQueryFields(
     query.fields,
     ctx.request.body.parameters
   )
-  const integration = new Integration(datasource.config)
 &nbsp;
   // call the relevant CRUD method on the integration class
-  const { rows } = await runAndTransform(
-    integration,
-    query.queryVerb,
-    enrichedQuery,
-    query.transformer
-  )
-  ctx.body = rows
-  // cleanup
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (integration.end) {
-<span class="cstat-no" title="statement not covered" >    integration.end()</span>
+  try {
+    const { rows } = await Runner.run({
+      datasource,
+      queryVerb: query.queryVerb,
+      query: enrichedQuery,
+      transformer: query.transformer,
+    })
+    ctx.body = rows
+  } catch (err) {
+    ctx.throw(400, err)
   }
 }
 &nbsp;
@@ -688,7 +532,7 @@ exports.destroy = async function (ctx) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/role.js.html CHANGED Viewed

@@ -23,28 +23,28 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">87.04% </span>
+                <span class="strong">87.03% </span>
                 <span class="quiet">Statements</span>
                 <span class='fraction'>47/54</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">63.64% </span>
+                <span class="strong">63.63% </span>
                 <span class="quiet">Branches</span>
                 <span class='fraction'>14/22</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">71.43% </span>
+                <span class="strong">71.42% </span>
                 <span class="quiet">Functions</span>
                 <span class='fraction'>5/7</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">88.68% </span>
+                <span class="strong">88.67% </span>
                 <span class="quiet">Lines</span>
                 <span class='fraction'>47/53</span>
             </div>
@@ -283,13 +283,13 @@ async function updateRolesOnUserTable(db, roleId, updateOption) {
       const indexOf = constraints.inclusion.indexOf(roleId)
       if (remove &amp;&amp; indexOf !== -1) {
         constraints.inclusion.splice(indexOf, 1)
-      } else <span class="missing-if-branch" title="else path not taken" >E</span>if (!remove &amp;&amp; indexOf === -1) {
+      } else if (!remove &amp;&amp; indexOf === -1) {
         constraints.inclusion.push(roleId)
       }
       break
     }
   }
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (updated) {
+  if (updated) {
     await db.put(table)
   }
 }
@@ -305,9 +305,9 @@ exports.find = async function (ctx) {
 exports.save = async function (ctx) {
   const db = new CouchDB(ctx.appId)
   let { _id, name, inherits, permissionId } = ctx.request.body
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (!_id) {
+  if (!_id) {
     _id = generateRoleID()
-  } else <span class="cstat-no" title="statement not covered" >if (isBuiltin(_id)) {</span>
+  } else <span class="cstat-no" title="statement not covered" ><span class="missing-if-branch" title="else path not taken" >E</span>if (isBuiltin(_id)) {</span>
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Cannot update builtin roles.")</span>
   }
   const role = new Role(_id, name)
@@ -358,7 +358,7 @@ exports.destroy = async function (ctx) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/routing.js.html CHANGED Viewed

@@ -23,7 +23,7 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">89.8% </span>
+                <span class="strong">89.79% </span>
                 <span class="quiet">Statements</span>
                 <span class='fraction'>44/49</span>
             </div>
@@ -44,7 +44,7 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">89.8% </span>
+                <span class="strong">89.79% </span>
                 <span class="quiet">Lines</span>
                 <span class='fraction'>44/49</span>
             </div>
@@ -343,7 +343,7 @@ exports.clientFetch = async ctx =&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 Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/api/controllers/row/external.js.html CHANGED Viewed

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">14.14% </span>
+                <span class="strong">15% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>14/99</span>
+                <span class='fraction'>15/100</span>
             </div>
@@ -44,9 +44,9 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">14.43% </span>
+                <span class="strong">15.3% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>14/97</span>
+                <span class='fraction'>15/98</span>
             </div>
@@ -285,7 +285,9 @@
 <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></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<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></td><td class="line-coverage quiet"><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>
@@ -318,6 +320,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">34x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -545,6 +549,8 @@ async function <span class="fstat-no" title="function not covered" >handleReques
   )
 }
 &nbsp;
+exports.handleRequest = handleRequest
+&nbsp;
 exports.patch = <span class="fstat-no" title="function not covered" >as</span>ync ctx =&gt; {
   const appId = <span class="cstat-no" title="statement not covered" >ctx.appId</span>
   const inputs = <span class="cstat-no" title="statement not covered" >ctx.request.body</span>
@@ -748,7 +754,7 @@ exports.fetchEnrichedRow = <span class="fstat-no" title="function not covered" >
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Thu Nov 11 2021 11:32:22 GMT+0000 (Coordinated Universal Time)
+                at Mon Nov 22 2021 10:23:31 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../../prettify.js"></script>