@budibase/server 0.9.167-alpha.4 → 0.9.167-alpha.8

package/dist/api/controllers/query.js

@@ -14,6 +14,7 @@ const { generateQueryID, getQueryParams } = require("../../db/utils");
 const { integrations } = require("../../integrations");
 const { BaseQueryVerbs } = require("../../constants");
 const env = require("../../environment");
+const ScriptRunner = require("../../utilities/scriptRunner");
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {
     const wasArray = Array.isArray(input);
@@ -35,11 +36,29 @@ function formatResponse(resp) {
             resp = { response: resp };
         }
     }
-    if (!Array.isArray(resp)) {
-        resp = [resp];
-    }
     return resp;
 }
+function runAndTransform(integration, queryVerb, enrichedQuery, transformer) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let rows = formatResponse(yield integration[queryVerb](enrichedQuery));
+        // transform as required
+        if (transformer) {
+            const runner = new ScriptRunner(transformer, { data: rows });
+            rows = runner.execute();
+        }
+        // needs to an array for next step
+        if (!Array.isArray(rows)) {
+            rows = [rows];
+        }
+        // map into JSON if just raw primitive here
+        if (rows.find(row => typeof row !== "object")) {
+            rows = rows.map(value => ({ value }));
+        }
+        // get all the potential fields in the schema
+        let keys = rows.flatMap(Object.keys);
+        return { rows, keys };
+    });
+}
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
@@ -119,12 +138,10 @@ exports.preview = function (ctx) {
         if (!Integration) {
             ctx.throw(400, "Integration type does not exist.");
         }
-        const { fields, parameters, queryVerb } = ctx.request.body;
+        const { fields, parameters, queryVerb, transformer } = ctx.request.body;
         const enrichedQuery = yield enrichQueryFields(fields, parameters);
         const integration = new Integration(datasource.config);
-        const rows = formatResponse(yield integration[queryVerb](enrichedQuery));
-        // get all the potential fields in the schema
-        const keys = rows.flatMap(Object.keys);
+        const { rows, keys } = yield runAndTransform(integration, queryVerb, enrichedQuery, transformer);
         ctx.body = {
             rows,
             schemaFields: [...new Set(keys)],
@@ -147,7 +164,8 @@ exports.execute = function (ctx) {
         const enrichedQuery = yield enrichQueryFields(query.fields, ctx.request.body.parameters);
         const integration = new Integration(datasource.config);
         // call the relevant CRUD method on the integration class
-        ctx.body = formatResponse(yield integration[query.queryVerb](enrichedQuery));
+        const { rows } = yield runAndTransform(integration, query.queryVerb, enrichedQuery, query.transformer);
+        ctx.body = rows;
         // cleanup
         if (integration.end) {
             integration.end();

package/dist/api/controllers/script.js

@@ -8,24 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const fetch = require("node-fetch");
-const vm = require("vm");
-class ScriptExecutor {
-    constructor(body) {
-        const code = `let fn = () => {\n${body.script}\n}; out = fn();`;
-        this.script = new vm.Script(code);
-        this.context = vm.createContext(body.context);
-        this.context.fetch = fetch;
-    }
-    execute() {
-        this.script.runInContext(this.context);
-        return this.context.out;
-    }
-}
+const ScriptRunner = require("../../utilities/scriptRunner");
 exports.execute = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const executor = new ScriptExecutor(ctx.request.body);
-        ctx.body = executor.execute();
+        const { script, context } = ctx.request.body;
+        const runner = new ScriptRunner(script, context);
+        ctx.body = runner.execute();
     });
 };
 exports.save = function (ctx) {

package/dist/api/controllers/table/utils.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const CouchDB = require("../../../db");
-const linkRows = require("../../../db/linkedRows");
 const csvParser = require("../../../utilities/csvParser");
 const { getRowParams, generateRowID, InternalTables, } = require("../../../db/utils");
 const { isEqual } = require("lodash/fp");
@@ -86,16 +85,9 @@ exports.handleDataImport = (appId, user, table, dataImport) => __awaiter(void 0,
                     ];
                 }
             }
-            // make sure link rows are up to date
-            finalData.push(linkRows.updateLinks({
-                appId,
-                eventType: linkRows.EventType.ROW_SAVE,
-                row,
-                tableId: row.tableId,
-                table,
-            }));
+            finalData.push(row);
         }
-        yield db.bulkDocs(yield Promise.all(finalData));
+        yield db.bulkDocs(finalData);
         let response = yield db.put(table);
         table._rev = response._rev;
     }

package/dist/api/routes/query.js

@@ -22,7 +22,8 @@ function generateQueryValidation() {
         })),
         queryVerb: Joi.string().allow().required(),
         extra: Joi.object().optional(),
-        schema: Joi.object({}).required().unknown(true)
+        schema: Joi.object({}).required().unknown(true),
+        transformer: Joi.string().optional(),
     }));
 }
 function generateQueryPreviewValidation() {
@@ -32,6 +33,7 @@ function generateQueryPreviewValidation() {
         queryVerb: Joi.string().allow().required(),
         extra: Joi.object().optional(),
         datasourceId: Joi.string().required(),
+        transformer: Joi.string().optional(),
         parameters: Joi.object({}).required().unknown(true)
     }));
 }

package/dist/automations/actions.js

@@ -13,7 +13,6 @@ const createRow = require("./steps/createRow");
 const updateRow = require("./steps/updateRow");
 const deleteRow = require("./steps/deleteRow");
 const executeScript = require("./steps/executeScript");
-const bash = require("./steps/bash");
 const executeQuery = require("./steps/executeQuery");
 const outgoingWebhook = require("./steps/outgoingWebhook");
 const serverLog = require("./steps/serverLog");
@@ -24,6 +23,7 @@ const integromat = require("./steps/integromat");
 let filter = require("./steps/filter");
 let delay = require("./steps/delay");
 let queryRow = require("./steps/queryRows");
+const env = require("../environment");
 const ACTION_IMPLS = {
     SEND_EMAIL_SMTP: sendSmtpEmail.run,
     CREATE_ROW: createRow.run,
@@ -31,7 +31,6 @@ const ACTION_IMPLS = {
     DELETE_ROW: deleteRow.run,
     OUTGOING_WEBHOOK: outgoingWebhook.run,
     EXECUTE_SCRIPT: executeScript.run,
-    EXECUTE_BASH: bash.run,
     EXECUTE_QUERY: executeQuery.run,
     SERVER_LOG: serverLog.run,
     DELAY: delay.run,
@@ -51,7 +50,6 @@ const ACTION_DEFINITIONS = {
     OUTGOING_WEBHOOK: outgoingWebhook.definition,
     EXECUTE_SCRIPT: executeScript.definition,
     EXECUTE_QUERY: executeQuery.definition,
-    EXECUTE_BASH: bash.definition,
     SERVER_LOG: serverLog.definition,
     DELAY: delay.definition,
     FILTER: filter.definition,
@@ -62,6 +60,14 @@ const ACTION_DEFINITIONS = {
     zapier: zapier.definition,
     integromat: integromat.definition,
 };
+// don't add the bash script/definitions unless in self host
+// the fact this isn't included in any definitions means it cannot be
+// ran at all
+if (env.SELF_HOSTED) {
+    const bash = require("./steps/bash");
+    ACTION_IMPLS["EXECUTE_BASH"] = bash.run;
+    ACTION_DEFINITIONS["EXECUTE_BASH"] = bash.definition;
+}
 /* istanbul ignore next */
 exports.getAction = function (actionName) {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/automations/thread.js

@@ -19,6 +19,7 @@ const { doInTenant } = require("@budibase/auth/tenancy");
 const env = require("../environment");
 const usage = require("../utilities/usageQuota");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
+const STOPPED_STATUS = { success: false, status: "STOPPED" };
 /**
  * The automation orchestrator is a class responsible for executing automations.
  * It handles the context of the automation and makes sure each step gets the correct
@@ -77,7 +78,13 @@ class Orchestrator {
         return __awaiter(this, void 0, void 0, function* () {
             let automation = this._automation;
             const app = yield this.getApp();
+            let stopped = false;
             for (let step of automation.definition.steps) {
+                // execution stopped, record state for that
+                if (stopped) {
+                    this.updateExecutionOutput(step.id, step.stepId, {}, STOPPED_STATUS);
+                    continue;
+                }
                 let stepFn = yield this.getStepFunctionality(step.stepId);
                 step.inputs = yield processObject(step.inputs, this._context);
                 step.inputs = automationUtils.cleanInputValues(step.inputs, step.schema.inputs);
@@ -92,10 +99,14 @@ class Orchestrator {
                             context: this._context,
                         });
                     });
+                    this._context.steps.push(outputs);
+                    // if filter causes us to stop execution don't break the loop, set a var
+                    // so that we can finish iterating through the steps and record that it stopped
                     if (step.stepId === FILTER_STEP_ID && !outputs.success) {
-                        break;
+                        stopped = true;
+                        this.updateExecutionOutput(step.id, step.stepId, step.inputs, Object.assign(Object.assign({}, outputs), STOPPED_STATUS));
+                        continue;
                     }
-                    this._context.steps.push(outputs);
                     this.updateExecutionOutput(step.id, step.stepId, step.inputs, outputs);
                 }
                 catch (err) {
@@ -105,7 +116,7 @@ class Orchestrator {
             }
             // Increment quota for automation runs
             if (!env.SELF_HOSTED && !isDevAppID(this._appId)) {
-                usage.update(usage.Properties.AUTOMATION, 1);
+                yield usage.update(usage.Properties.AUTOMATION, 1);
             }
             return this.executionOutput;
         });

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.167-alpha.3",
+    "version": "0.9.167-alpha.7",
     "description": "Budibase Web Server",
     "main": "src/index.js",
     "repository": {
@@ -68,9 +68,9 @@
     "author": "Budibase",
     "license": "AGPL-3.0-or-later",
     "dependencies": {
-        "@budibase/auth": "^0.9.167-alpha.3",
-        "@budibase/client": "^0.9.167-alpha.3",
-        "@budibase/string-templates": "^0.9.167-alpha.3",
+        "@budibase/auth": "^0.9.167-alpha.7",
+        "@budibase/client": "^0.9.167-alpha.7",
+        "@budibase/string-templates": "^0.9.167-alpha.7",
         "@elastic/elasticsearch": "7.10.0",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
@@ -119,6 +119,7 @@
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",
         "validate.js": "0.13.1",
+        "vm2": "^3.9.3",
         "yargs": "13.2.4",
         "zlib": "1.0.5"
     },