@budibase/server 2.2.12-alpha.7 → 2.2.12-alpha.71

package/dist/integrations/queries/sql.js

@@ -1,111 +1,84 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.interpolateSQL = exports.enrichQueryFields = void 0;
+exports.interpolateSQL = void 0;
 const string_templates_1 = require("@budibase/string-templates");
+const sdk_1 = __importDefault(require("../../sdk"));
 const CONST_CHAR_REGEX = new RegExp("'[^']*'", "g");
-function enrichQueryFields(fields, parameters = {}) {
-    const enrichedQuery = Array.isArray(fields) ? [] : {};
-    if (!fields || !parameters) {
-        return enrichedQuery;
-    }
-    // enrich the fields with dynamic parameters
-    for (let key of Object.keys(fields)) {
-        if (fields[key] == null) {
-            continue;
-        }
-        if (typeof fields[key] === "object") {
-            // enrich nested fields object
-            enrichedQuery[key] = enrichQueryFields(fields[key], parameters);
-        }
-        else if (typeof fields[key] === "string") {
-            // enrich string value as normal
-            enrichedQuery[key] = (0, string_templates_1.processStringSync)(fields[key], parameters, {
-                noEscaping: true,
-                noHelpers: true,
-                escapeNewlines: true,
-            });
-        }
-        else {
-            enrichedQuery[key] = fields[key];
-        }
-    }
-    if (enrichedQuery.json ||
-        enrichedQuery.customData ||
-        enrichedQuery.requestBody) {
-        try {
-            enrichedQuery.json = JSON.parse(enrichedQuery.json ||
-                enrichedQuery.customData ||
-                enrichedQuery.requestBody);
-        }
-        catch (err) {
-            // no json found, ignore
-        }
-        delete enrichedQuery.customData;
-    }
-    return enrichedQuery;
-}
-exports.enrichQueryFields = enrichQueryFields;
 function interpolateSQL(fields, parameters, integration) {
-    let sql = fields.sql;
-    if (!sql || typeof sql !== "string") {
-        return fields;
-    }
-    const bindings = (0, string_templates_1.findHBSBlocks)(sql);
-    let variables = [], arrays = [];
-    for (let binding of bindings) {
-        // look for array/list operations in the SQL statement, which will need handled later
-        const listRegexMatch = sql.match(new RegExp(`(in|IN|In|iN)( )+[(]?${binding}[)]?`));
-        // check if the variable was used as part of a string concat e.g. 'Hello {{binding}}'
-        // start by finding all the instances of const character strings
-        const charConstMatch = sql.match(CONST_CHAR_REGEX) || [];
-        // now look within them to see if a binding is used
-        const charConstBindingMatch = charConstMatch.find((string) => string.match(new RegExp(`'[^']*${binding}[^']*'`)));
-        if (charConstBindingMatch) {
-            let [part1, part2] = charConstBindingMatch.split(binding);
-            part1 = `'${part1.substring(1)}'`;
-            part2 = `'${part2.substring(0, part2.length - 1)}'`;
-            sql = sql.replace(charConstBindingMatch, integration.getStringConcat([
-                part1,
-                integration.getBindingIdentifier(),
-                part2,
-            ]));
+    return __awaiter(this, void 0, void 0, function* () {
+        let sql = fields.sql;
+        if (!sql || typeof sql !== "string") {
+            return fields;
         }
-        // generate SQL parameterised array
-        else if (listRegexMatch) {
-            arrays.push(binding);
-            // determine the length of the array
-            const value = enrichQueryFields([binding], parameters)[0]
-                .split(",")
-                .map((val) => val.trim());
-            // build a string like ($1, $2, $3)
-            let replacement = `${Array.apply(null, Array(value.length))
-                .map(() => integration.getBindingIdentifier())
-                .join(",")}`;
-            // check if parentheses are needed
-            if (!listRegexMatch[0].includes(`(${binding})`)) {
-                replacement = `(${replacement})`;
+        const bindings = (0, string_templates_1.findHBSBlocks)(sql);
+        let variables = [], arrays = [];
+        for (let binding of bindings) {
+            // look for array/list operations in the SQL statement, which will need handled later
+            const listRegexMatch = sql.match(new RegExp(`(in|IN|In|iN)( )+[(]?${binding}[)]?`));
+            // check if the variable was used as part of a string concat e.g. 'Hello {{binding}}'
+            // start by finding all the instances of const character strings
+            const charConstMatch = sql.match(CONST_CHAR_REGEX) || [];
+            // now look within them to see if a binding is used
+            const charConstBindingMatch = charConstMatch.find((string) => string.match(new RegExp(`'[^']*${binding}[^']*'`)));
+            if (charConstBindingMatch) {
+                let [part1, part2] = charConstBindingMatch.split(binding);
+                part1 = `'${part1.substring(1)}'`;
+                part2 = `'${part2.substring(0, part2.length - 1)}'`;
+                sql = sql.replace(charConstBindingMatch, integration.getStringConcat([
+                    part1,
+                    integration.getBindingIdentifier(),
+                    part2,
+                ]));
             }
-            sql = sql.replace(binding, replacement);
-        }
-        else {
-            sql = sql.replace(binding, integration.getBindingIdentifier());
-        }
-        variables.push(binding);
-    }
-    // replicate the knex structure
-    fields.sql = sql;
-    fields.bindings = enrichQueryFields(variables, parameters);
-    // check for arrays in the data
-    let updated = [];
-    for (let i = 0; i < variables.length; i++) {
-        if (arrays.includes(variables[i])) {
-            updated = updated.concat(fields.bindings[i].split(",").map((val) => val.trim()));
+            // generate SQL parameterised array
+            else if (listRegexMatch) {
+                arrays.push(binding);
+                // determine the length of the array
+                const value = (yield sdk_1.default.queries.enrichContext([binding], parameters))[0]
+                    .split(",")
+                    .map((val) => val.trim());
+                // build a string like ($1, $2, $3)
+                let replacement = `${Array.apply(null, Array(value.length))
+                    .map(() => integration.getBindingIdentifier())
+                    .join(",")}`;
+                // check if parentheses are needed
+                if (!listRegexMatch[0].includes(`(${binding})`)) {
+                    replacement = `(${replacement})`;
+                }
+                sql = sql.replace(binding, replacement);
+            }
+            else {
+                sql = sql.replace(binding, integration.getBindingIdentifier());
+            }
+            variables.push(binding);
         }
-        else {
-            updated.push(fields.bindings[i]);
+        // replicate the knex structure
+        fields.sql = sql;
+        fields.bindings = yield sdk_1.default.queries.enrichContext(variables, parameters);
+        // check for arrays in the data
+        let updated = [];
+        for (let i = 0; i < variables.length; i++) {
+            if (arrays.includes(variables[i])) {
+                updated = updated.concat(fields.bindings[i].split(",").map((val) => val.trim()));
+            }
+            else {
+                updated.push(fields.bindings[i]);
+            }
         }
-    }
-    fields.bindings = updated;
-    return fields;
+        fields.bindings = updated;
+        return fields;
+    });
 }
 exports.interpolateSQL = interpolateSQL;

package/dist/integrations/rest.js

@@ -36,15 +36,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const datasource_1 = require("../definitions/datasource");
 const lodash_1 = require("lodash");
 const https = __importStar(require("https"));
 const querystring_1 = __importDefault(require("querystring"));
-const fetch = require("node-fetch");
-const { formatBytes } = require("../utilities");
-const { performance } = require("perf_hooks");
-const FormData = require("form-data");
-const { URLSearchParams } = require("url");
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const utilities_1 = require("../utilities");
+const perf_hooks_1 = require("perf_hooks");
+const form_data_1 = __importDefault(require("form-data"));
+const url_1 = require("url");
 const BodyTypes = {
     NONE: "none",
     FORM_DATA: "form",
@@ -138,7 +137,7 @@ const SCHEMA = {
 class RestIntegration {
     constructor(config) {
         this.headers = {};
-        this.startTimeMs = performance.now();
+        this.startTimeMs = perf_hooks_1.performance.now();
         this.config = config;
     }
     parseResponse(response, pagination) {
@@ -174,8 +173,8 @@ class RestIntegration {
             catch (err) {
                 throw "Failed to parse response body.";
             }
-            const size = formatBytes(response.headers.get("content-length") || Buffer.byteLength(raw, "utf8"));
-            const time = `${Math.round(performance.now() - this.startTimeMs)}ms`;
+            const size = (0, utilities_1.formatBytes)(response.headers.get("content-length") || Buffer.byteLength(raw, "utf8"));
+            const time = `${Math.round(perf_hooks_1.performance.now() - this.startTimeMs)}ms`;
             headers = response.headers.raw();
             for (let [key, value] of Object.entries(headers)) {
                 headers[key] = Array.isArray(value) ? value[0] : value;
@@ -206,14 +205,14 @@ class RestIntegration {
         // Add pagination params to query string if required
         if ((pagination === null || pagination === void 0 ? void 0 : pagination.location) === "query" && paginationValues) {
             const { pageParam, sizeParam } = pagination;
-            const params = new URLSearchParams();
+            const params = new url_1.URLSearchParams();
             // Append page number or cursor param if configured
             if (pageParam && paginationValues.page != null) {
                 params.append(pageParam, paginationValues.page);
             }
             // Append page size param if configured
             if (sizeParam && paginationValues.limit != null) {
-                params.append(sizeParam, paginationValues.limit);
+                params.append(sizeParam, String(paginationValues.limit));
             }
             // Prepend query string with pagination params
             let paginationString = params.toString();
@@ -269,7 +268,7 @@ class RestIntegration {
                 input.body = string;
                 break;
             case BodyTypes.ENCODED:
-                const params = new URLSearchParams();
+                const params = new url_1.URLSearchParams();
                 for (let [key, value] of Object.entries(object)) {
                     params.append(key, value);
                 }
@@ -279,7 +278,7 @@ class RestIntegration {
                 input.body = params;
                 break;
             case BodyTypes.FORM_DATA:
-                const form = new FormData();
+                const form = new form_data_1.default();
                 for (let [key, value] of Object.entries(object)) {
                     form.append(key, value);
                 }
@@ -318,11 +317,11 @@ class RestIntegration {
             if (authConfig) {
                 let config;
                 switch (authConfig.type) {
-                    case datasource_1.AuthType.BASIC:
+                    case types_1.RestAuthType.BASIC:
                         config = authConfig.config;
                         headers.Authorization = `Basic ${Buffer.from(`${config.username}:${config.password}`).toString("base64")}`;
                         break;
-                    case datasource_1.AuthType.BEARER:
+                    case types_1.RestAuthType.BEARER:
                         config = authConfig.config;
                         headers.Authorization = `Bearer ${config.token}`;
                         break;
@@ -355,9 +354,9 @@ class RestIntegration {
                 // https://github.com/nodejs/node/issues/43798
                 input.extraHttpOptions = { insecureHTTPParser: true };
             }
-            this.startTimeMs = performance.now();
+            this.startTimeMs = perf_hooks_1.performance.now();
             const url = this.getUrl(path, queryString, pagination, paginationValues);
-            const response = yield fetch(url, input);
+            const response = yield (0, node_fetch_1.default)(url, input);
             return yield this.parseResponse(response, pagination);
         });
     }
@@ -390,5 +389,4 @@ class RestIntegration {
 exports.default = {
     schema: SCHEMA,
     integration: RestIntegration,
-    AuthType: datasource_1.AuthType,
 };

package/dist/middleware/currentapp.js

@@ -18,6 +18,7 @@ const global_1 = require("../utilities/global");
 const environment_1 = __importDefault(require("../environment"));
 const utils_2 = require("./utils");
 exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     // try to get the appID from the request
     let requestAppId = yield backend_core_1.utils.getAppIdFromCtx(ctx);
     // get app cookie if it exists
@@ -52,7 +53,7 @@ exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* ()
         }
     }
     let appId, roleId = backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC;
-    if (!ctx.user) {
+    if (!((_a = ctx.user) === null || _a === void 0 ? void 0 : _a._id)) {
         // not logged in, try to set a cookie for public apps
         appId = requestAppId;
     }
@@ -88,11 +89,12 @@ exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* ()
         return next();
     }
     return backend_core_1.context.doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        var _b;
         let skipCookie = false;
         // if the user not in the right tenant then make sure they have no permissions
         // need to judge this only based on the request app ID,
         if (environment_1.default.MULTI_TENANCY &&
-            ctx.user &&
+            ((_b = ctx.user) === null || _b === void 0 ? void 0 : _b._id) &&
             requestAppId &&
             !backend_core_1.tenancy.isUserInAppTenant(requestAppId, ctx.user)) {
             // don't error, simply remove the users rights (they are a public user)

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.12-alpha.6",
+    "version": "2.2.12-alpha.70",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.2.12-alpha.6",
-        "@budibase/client": "2.2.12-alpha.6",
-        "@budibase/pro": "2.2.12-alpha.6",
-        "@budibase/string-templates": "2.2.12-alpha.6",
-        "@budibase/types": "2.2.12-alpha.6",
+        "@budibase/backend-core": "2.2.12-alpha.70",
+        "@budibase/client": "2.2.12-alpha.70",
+        "@budibase/pro": "2.2.12-alpha.70",
+        "@budibase/string-templates": "2.2.12-alpha.70",
+        "@budibase/types": "2.2.12-alpha.70",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -77,7 +77,7 @@
         "joi": "17.6.0",
         "js-yaml": "4.1.0",
         "jsonschema": "1.4.0",
-        "knex": "0.95.15",
+        "knex": "2.4.0",
         "koa": "2.13.4",
         "koa-body": "4.2.0",
         "koa-compress": "4.0.1",

package/dist/sdk/app/datasources/datasources.js

@@ -0,0 +1,147 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeConfigs = exports.removeSecretSingle = exports.removeSecrets = exports.getWithEnvVars = exports.get = exports.enrich = void 0;
+const backend_core_1 = require("@budibase/backend-core");
+const string_templates_1 = require("@budibase/string-templates");
+const types_1 = require("@budibase/types");
+const fp_1 = require("lodash/fp");
+const utils_1 = require("../../utils");
+const integrations_1 = require("../../../integrations");
+const ENV_VAR_PREFIX = "env.";
+function enrichDatasourceWithValues(datasource) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cloned = (0, fp_1.cloneDeep)(datasource);
+        const env = yield (0, utils_1.getEnvironmentVariables)();
+        const processed = (0, string_templates_1.processObjectSync)(cloned, { env }, { onlyFound: true });
+        return {
+            datasource: processed,
+            envVars: env,
+        };
+    });
+}
+function enrich(datasource) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { datasource: response } = yield enrichDatasourceWithValues(datasource);
+        return response;
+    });
+}
+exports.enrich = enrich;
+function get(datasourceId, opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appDb = backend_core_1.context.getAppDB();
+        const datasource = yield appDb.get(datasourceId);
+        if (opts === null || opts === void 0 ? void 0 : opts.enriched) {
+            return (yield enrichDatasourceWithValues(datasource)).datasource;
+        }
+        else {
+            return datasource;
+        }
+    });
+}
+exports.get = get;
+function getWithEnvVars(datasourceId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appDb = backend_core_1.context.getAppDB();
+        const datasource = yield appDb.get(datasourceId);
+        return enrichDatasourceWithValues(datasource);
+    });
+}
+exports.getWithEnvVars = getWithEnvVars;
+function hasAuthConfigs(datasource) {
+    var _a;
+    return datasource.source === types_1.SourceName.REST && ((_a = datasource.config) === null || _a === void 0 ? void 0 : _a.authConfigs);
+}
+function useEnvVars(str) {
+    if (typeof str !== "string") {
+        return false;
+    }
+    const blocks = (0, string_templates_1.findHBSBlocks)(str);
+    return blocks.find(block => block.includes(ENV_VAR_PREFIX)) != null;
+}
+function removeSecrets(datasources) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        const definitions = yield (0, integrations_1.getDefinitions)();
+        for (let datasource of datasources) {
+            const schema = definitions[datasource.source];
+            if (datasource.config) {
+                // strip secrets from response, so they don't show in the network request
+                if (datasource.config.auth) {
+                    delete datasource.config.auth;
+                }
+                // specific to REST datasources, contains passwords
+                if (hasAuthConfigs(datasource)) {
+                    const configs = datasource.config.authConfigs;
+                    for (let config of configs) {
+                        if (config.type !== types_1.RestAuthType.BASIC) {
+                            continue;
+                        }
+                        const basic = config.config;
+                        if (!useEnvVars(basic.password)) {
+                            basic.password = types_1.PASSWORD_REPLACEMENT;
+                        }
+                    }
+                }
+                // remove general passwords
+                for (let key of Object.keys(datasource.config)) {
+                    if (((_b = (_a = schema.datasource) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.type) === types_1.DatasourceFieldType.PASSWORD &&
+                        !useEnvVars(datasource.config[key])) {
+                        datasource.config[key] = types_1.PASSWORD_REPLACEMENT;
+                    }
+                }
+            }
+        }
+        return datasources;
+    });
+}
+exports.removeSecrets = removeSecrets;
+function removeSecretSingle(datasource) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (yield removeSecrets([datasource]))[0];
+    });
+}
+exports.removeSecretSingle = removeSecretSingle;
+function mergeConfigs(update, old) {
+    var _a, _b, _c, _d;
+    if (!update.config) {
+        return update;
+    }
+    // specific to REST datasources, fix the auth configs again if required
+    if (hasAuthConfigs(update)) {
+        const configs = update.config.authConfigs;
+        const oldConfigs = (_a = old.config) === null || _a === void 0 ? void 0 : _a.authConfigs;
+        for (let config of configs) {
+            if (config.type !== types_1.RestAuthType.BASIC) {
+                continue;
+            }
+            const basic = config.config;
+            const oldBasic = (_b = oldConfigs.find(old => old.name === config.name)) === null || _b === void 0 ? void 0 : _b.config;
+            if (basic.password === types_1.PASSWORD_REPLACEMENT) {
+                basic.password = oldBasic.password;
+            }
+        }
+    }
+    // update back to actual passwords for everything else
+    for (let [key, value] of Object.entries(update.config)) {
+        if (value !== types_1.PASSWORD_REPLACEMENT) {
+            continue;
+        }
+        if ((_c = old.config) === null || _c === void 0 ? void 0 : _c[key]) {
+            update.config[key] = (_d = old.config) === null || _d === void 0 ? void 0 : _d[key];
+        }
+        else {
+            delete update.config[key];
+        }
+    }
+    return update;
+}
+exports.mergeConfigs = mergeConfigs;

package/dist/sdk/app/datasources/index.js

@@ -0,0 +1,27 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const datasources = __importStar(require("./datasources"));
+exports.default = Object.assign({}, datasources);

package/dist/sdk/app/queries/index.js

@@ -0,0 +1,27 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const queries = __importStar(require("./queries"));
+exports.default = Object.assign({}, queries);

package/dist/sdk/app/queries/queries.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enrichContext = void 0;
+const utils_1 = require("../../utils");
+const string_templates_1 = require("@budibase/string-templates");
+function enrichContext(fields, inputs = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const enrichedQuery = Array.isArray(fields) ? [] : {};
+        if (!fields || !inputs) {
+            return enrichedQuery;
+        }
+        const env = yield (0, utils_1.getEnvironmentVariables)();
+        const parameters = Object.assign(Object.assign({}, inputs), { env });
+        // enrich the fields with dynamic parameters
+        for (let key of Object.keys(fields)) {
+            if (fields[key] == null) {
+                continue;
+            }
+            if (typeof fields[key] === "object") {
+                // enrich nested fields object
+                enrichedQuery[key] = yield enrichContext(fields[key], parameters);
+            }
+            else if (typeof fields[key] === "string") {
+                // enrich string value as normal
+                enrichedQuery[key] = (0, string_templates_1.processStringSync)(fields[key], parameters, {
+                    noEscaping: true,
+                    noHelpers: true,
+                    escapeNewlines: true,
+                });
+            }
+            else {
+                enrichedQuery[key] = fields[key];
+            }
+        }
+        if (enrichedQuery.json ||
+            enrichedQuery.customData ||
+            enrichedQuery.requestBody) {
+            try {
+                enrichedQuery.json = JSON.parse(enrichedQuery.json ||
+                    enrichedQuery.customData ||
+                    enrichedQuery.requestBody);
+            }
+            catch (err) {
+                // no json found, ignore
+            }
+            delete enrichedQuery.customData;
+        }
+        return enrichedQuery;
+    });
+}
+exports.enrichContext = enrichContext;

package/dist/sdk/app/tables/index.js

@@ -8,10 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
 const utils_2 = require("../../../integrations/utils");
+const datasources_1 = __importDefault(require("../datasources"));
 function getAllInternalTables(db) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!db) {
@@ -26,7 +30,7 @@ function getAllInternalTables(db) {
 function getAllExternalTables(datasourceId) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield datasources_1.default.get(datasourceId, { enriched: true });
         if (!datasource || !datasource.entities) {
             throw "Datasource is not configured fully.";
         }
@@ -44,7 +48,7 @@ function getTable(tableId) {
         const db = backend_core_1.context.getAppDB();
         if ((0, utils_2.isExternalTable)(tableId)) {
             let { datasourceId, tableName } = (0, utils_2.breakExternalTableId)(tableId);
-            const datasource = yield db.get(datasourceId);
+            const datasource = yield datasources_1.default.get(datasourceId);
             const table = yield getExternalTable(datasourceId, tableName);
             return Object.assign(Object.assign({}, table), { sql: (0, utils_2.isSQL)(datasource) });
         }