@budibase/server 2.1.43-alpha.1 → 2.1.43

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

@@ -1,27 +1,4 @@
 "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;
-};
 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) {
@@ -31,17 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validate = exports.findRow = exports.getDatasourceAndQuery = exports.removeKeyNumbering = void 0;
-const utils_1 = require("../../../db/utils");
-const userController = __importStar(require("../user"));
-const constants_1 = require("../../../constants");
-const backend_core_1 = require("@budibase/backend-core");
-const query_1 = require("../../../integrations/base/query");
-var utils_2 = require("../../../integrations/base/utils");
-Object.defineProperty(exports, "removeKeyNumbering", { enumerable: true, get: function () { return utils_2.removeKeyNumbering; } });
 const validateJs = require("validate.js");
 const { cloneDeep } = require("lodash/fp");
+const { InternalTables } = require("../../../db/utils");
+const userController = require("../user");
+const { FieldTypes } = require("../../../constants");
+const { getAppDB } = require("@budibase/backend-core/context");
+const { makeExternalQuery } = require("../../../integrations/base/query");
+const { removeKeyNumbering } = require("../../../integrations/base/utils");
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
         return new Date(value).getTime();
@@ -51,103 +25,91 @@ validateJs.extend(validateJs.validators.datetime, {
         return new Date(value).toISOString();
     },
 });
-function getDatasourceAndQuery(json) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const datasourceId = json.endpoint.datasourceId;
-        const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(datasourceId);
-        return (0, query_1.makeExternalQuery)(datasource, json);
-    });
-}
-exports.getDatasourceAndQuery = getDatasourceAndQuery;
-function findRow(ctx, tableId, rowId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        let row;
-        // TODO remove special user case in future
-        if (tableId === utils_1.InternalTables.USER_METADATA) {
-            ctx.params = {
-                id: rowId,
-            };
-            yield userController.findMetadata(ctx);
-            row = ctx.body;
-        }
-        else {
-            row = yield db.get(rowId);
-        }
-        if (row.tableId !== tableId) {
-            throw "Supplied tableId does not match the rows tableId";
-        }
-        return row;
-    });
-}
-exports.findRow = findRow;
-function validate({ tableId, row, table, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let fetchedTable;
-        if (!table) {
-            const db = backend_core_1.context.getAppDB();
-            fetchedTable = yield db.get(tableId);
+exports.removeKeyNumbering = removeKeyNumbering;
+exports.getDatasourceAndQuery = (json) => __awaiter(void 0, void 0, void 0, function* () {
+    const datasourceId = json.endpoint.datasourceId;
+    const db = getAppDB();
+    const datasource = yield db.get(datasourceId);
+    return makeExternalQuery(datasource, json);
+});
+exports.findRow = (ctx, tableId, rowId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
+    let row;
+    // TODO remove special user case in future
+    if (tableId === InternalTables.USER_METADATA) {
+        ctx.params = {
+            id: rowId,
+        };
+        yield userController.findMetadata(ctx);
+        row = ctx.body;
+    }
+    else {
+        row = yield db.get(rowId);
+    }
+    if (row.tableId !== tableId) {
+        throw "Supplied tableId does not match the rows tableId";
+    }
+    return row;
+});
+exports.validate = ({ tableId, row, table }) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!table) {
+        const db = getAppDB();
+        table = yield db.get(tableId);
+    }
+    const errors = {};
+    for (let fieldName of Object.keys(table.schema)) {
+        const constraints = cloneDeep(table.schema[fieldName].constraints);
+        const type = table.schema[fieldName].type;
+        // formulas shouldn't validated, data will be deleted anyway
+        if (type === FieldTypes.FORMULA) {
+            continue;
         }
-        else {
-            fetchedTable = table;
+        // special case for options, need to always allow unselected (null)
+        if (type === FieldTypes.OPTIONS && constraints.inclusion) {
+            constraints.inclusion.push(null);
         }
-        const errors = {};
-        for (let fieldName of Object.keys(fetchedTable.schema)) {
-            const constraints = cloneDeep(fetchedTable.schema[fieldName].constraints);
-            const type = fetchedTable.schema[fieldName].type;
-            // formulas shouldn't validated, data will be deleted anyway
-            if (type === constants_1.FieldTypes.FORMULA) {
-                continue;
+        let res;
+        // Validate.js doesn't seem to handle array
+        if (type === FieldTypes.ARRAY && row[fieldName]) {
+            if (row[fieldName].length) {
+                if (!Array.isArray(row[fieldName])) {
+                    row[fieldName] = row[fieldName].split(",");
+                }
+                row[fieldName].map(val => {
+                    if (!constraints.inclusion.includes(val) &&
+                        constraints.inclusion.length !== 0) {
+                        errors[fieldName] = "Field not in list";
+                    }
+                });
             }
-            // special case for options, need to always allow unselected (null)
-            if (type === constants_1.FieldTypes.OPTIONS && constraints.inclusion) {
-                constraints.inclusion.push(null);
+            else if (constraints.presence && row[fieldName].length === 0) {
+                // non required MultiSelect creates an empty array, which should not throw errors
+                errors[fieldName] = [`${fieldName} is required`];
             }
-            let res;
-            // Validate.js doesn't seem to handle array
-            if (type === constants_1.FieldTypes.ARRAY && row[fieldName]) {
-                if (row[fieldName].length) {
-                    if (!Array.isArray(row[fieldName])) {
-                        row[fieldName] = row[fieldName].split(",");
+        }
+        else if ((type === FieldTypes.ATTACHMENT || type === FieldTypes.JSON) &&
+            typeof row[fieldName] === "string") {
+            // this should only happen if there is an error
+            try {
+                const json = JSON.parse(row[fieldName]);
+                if (type === FieldTypes.ATTACHMENT) {
+                    if (Array.isArray(json)) {
+                        row[fieldName] = json;
                     }
-                    row[fieldName].map((val) => {
-                        if (!constraints.inclusion.includes(val) &&
-                            constraints.inclusion.length !== 0) {
-                            errors[fieldName] = "Field not in list";
-                        }
-                    });
-                }
-                else if (constraints.presence && row[fieldName].length === 0) {
-                    // non required MultiSelect creates an empty array, which should not throw errors
-                    errors[fieldName] = [`${fieldName} is required`];
-                }
-            }
-            else if ((type === constants_1.FieldTypes.ATTACHMENT || type === constants_1.FieldTypes.JSON) &&
-                typeof row[fieldName] === "string") {
-                // this should only happen if there is an error
-                try {
-                    const json = JSON.parse(row[fieldName]);
-                    if (type === constants_1.FieldTypes.ATTACHMENT) {
-                        if (Array.isArray(json)) {
-                            row[fieldName] = json;
-                        }
-                        else {
-                            errors[fieldName] = [`Must be an array`];
-                        }
+                    else {
+                        errors[fieldName] = [`Must be an array`];
                     }
                 }
-                catch (err) {
-                    errors[fieldName] = [`Contains invalid JSON`];
-                }
             }
-            else {
-                res = validateJs.single(row[fieldName], constraints);
+            catch (err) {
+                errors[fieldName] = [`Contains invalid JSON`];
             }
-            if (res)
-                errors[fieldName] = res;
         }
-        return { valid: Object.keys(errors).length === 0, errors };
-    });
-}
-exports.validate = validate;
+        else {
+            res = validateJs.single(row[fieldName], constraints);
+        }
+        if (res)
+            errors[fieldName] = res;
+    }
+    return { valid: Object.keys(errors).length === 0, errors };
+});

package/dist/api/controllers/screen.js

@@ -9,92 +9,77 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.destroy = exports.save = exports.fetch = void 0;
 const utils_1 = require("../../db/utils");
 const backend_core_1 = require("@budibase/backend-core");
 const application_1 = require("./application");
-function fetch(ctx) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const screens = (yield db.allDocs((0, utils_1.getScreenParams)(null, {
+exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = backend_core_1.context.getAppDB();
+    const screens = (yield db.allDocs((0, utils_1.getScreenParams)(null, {
+        include_docs: true,
+    }))).rows.map((el) => el.doc);
+    ctx.body = yield new backend_core_1.roles.AccessController().checkScreensAccess(screens, ctx.user.role._id);
+});
+exports.save = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = backend_core_1.context.getAppDB();
+    let screen = ctx.request.body;
+    let eventFn;
+    if (!screen._id) {
+        screen._id = (0, utils_1.generateScreenID)();
+        eventFn = backend_core_1.events.screen.created;
+    }
+    const response = yield db.put(screen);
+    // Find any custom components being used
+    let pluginNames = [];
+    let pluginAdded = false;
+    findPlugins(screen.props, pluginNames);
+    if (pluginNames.length) {
+        const globalDB = backend_core_1.tenancy.getGlobalDB();
+        const pluginsResponse = yield globalDB.allDocs(backend_core_1.db.getPluginParams(null, {
             include_docs: true,
-        }))).rows.map((el) => el.doc);
-        const roleId = (_b = (_a = ctx.user) === null || _a === void 0 ? void 0 : _a.role) === null || _b === void 0 ? void 0 : _b._id;
-        if (!roleId) {
-            ctx.throw("Unable to retrieve users role ID.");
-        }
-        ctx.body = yield new backend_core_1.roles.AccessController().checkScreensAccess(screens, roleId);
-    });
-}
-exports.fetch = fetch;
-function save(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        let screen = ctx.request.body;
-        let eventFn;
-        if (!screen._id) {
-            screen._id = (0, utils_1.generateScreenID)();
-            eventFn = backend_core_1.events.screen.created;
-        }
-        const response = yield db.put(screen);
-        // Find any custom components being used
-        let pluginNames = [];
-        let pluginAdded = false;
-        findPlugins(screen.props, pluginNames);
-        if (pluginNames.length) {
-            const globalDB = backend_core_1.tenancy.getGlobalDB();
-            const pluginsResponse = yield globalDB.allDocs(backend_core_1.db.getPluginParams(null, {
-                include_docs: true,
-            }));
-            const requiredPlugins = pluginsResponse.rows
-                .map((row) => row.doc)
-                .filter((plugin) => {
-                return (plugin.schema.type === "component" &&
-                    pluginNames.includes(`plugin/${plugin.name}`));
-            });
-            // Update the app metadata
-            const application = yield db.get(utils_1.DocumentType.APP_METADATA);
-            let usedPlugins = application.usedPlugins || [];
-            requiredPlugins.forEach((plugin) => {
-                if (!usedPlugins.find((x) => x._id === plugin._id)) {
-                    pluginAdded = true;
-                    usedPlugins.push({
-                        _id: plugin._id,
-                        name: plugin.name,
-                        version: plugin.version,
-                        jsUrl: plugin.jsUrl,
-                        hash: plugin.hash,
-                    });
-                }
-            });
-            if (pluginAdded) {
-                yield (0, application_1.updateAppPackage)({ usedPlugins }, ctx.appId);
+        }));
+        const requiredPlugins = pluginsResponse.rows
+            .map((row) => row.doc)
+            .filter((plugin) => {
+            return (plugin.schema.type === "component" &&
+                pluginNames.includes(`plugin/${plugin.name}`));
+        });
+        // Update the app metadata
+        const application = yield db.get(utils_1.DocumentType.APP_METADATA);
+        let usedPlugins = application.usedPlugins || [];
+        requiredPlugins.forEach((plugin) => {
+            if (!usedPlugins.find((x) => x._id === plugin._id)) {
+                pluginAdded = true;
+                usedPlugins.push({
+                    _id: plugin._id,
+                    name: plugin.name,
+                    version: plugin.version,
+                    jsUrl: plugin.jsUrl,
+                    hash: plugin.hash,
+                });
             }
+        });
+        if (pluginAdded) {
+            yield (0, application_1.updateAppPackage)({ usedPlugins }, ctx.appId);
         }
-        if (eventFn) {
-            yield eventFn(screen);
-        }
-        ctx.message = `Screen ${screen.name} saved.`;
-        ctx.body = Object.assign(Object.assign({}, screen), { _id: response.id, _rev: response.rev, pluginAdded });
-    });
-}
-exports.save = save;
-function destroy(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const id = ctx.params.screenId;
-        const screen = yield db.get(id);
-        yield db.remove(id, ctx.params.screenRev);
-        yield backend_core_1.events.screen.deleted(screen);
-        ctx.body = {
-            message: "Screen deleted successfully",
-        };
-        ctx.status = 200;
-    });
-}
-exports.destroy = destroy;
-function findPlugins(component, foundPlugins) {
+    }
+    if (eventFn) {
+        yield eventFn(screen);
+    }
+    ctx.message = `Screen ${screen.name} saved.`;
+    ctx.body = Object.assign(Object.assign({}, screen), { _id: response.id, _rev: response.rev, pluginAdded });
+});
+exports.destroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = backend_core_1.context.getAppDB();
+    const id = ctx.params.screenId;
+    const screen = yield db.get(id);
+    yield db.remove(id, ctx.params.screenRev);
+    yield backend_core_1.events.screen.deleted(screen);
+    ctx.body = {
+        message: "Screen deleted successfully",
+    };
+    ctx.status = 200;
+});
+const findPlugins = (component, foundPlugins) => {
     if (!component) {
         return;
     }
@@ -107,4 +92,4 @@ function findPlugins(component, foundPlugins) {
         return;
     }
     component._children.forEach(child => findPlugins(child, foundPlugins));
-}
+};

package/dist/api/controllers/script.js

@@ -8,23 +8,16 @@ 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 });
-exports.save = exports.execute = void 0;
-const scriptRunner_1 = __importDefault(require("../../utilities/scriptRunner"));
-function execute(ctx) {
+const ScriptRunner = require("../../utilities/scriptRunner");
+exports.execute = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { script, context } = ctx.request.body;
-        const runner = new scriptRunner_1.default(script, context);
+        const runner = new ScriptRunner(script, context);
         ctx.body = runner.execute();
     });
-}
-exports.execute = execute;
-function save(ctx) {
+};
+exports.save = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         ctx.throw(501, "Not currently implemented");
     });
-}
-exports.save = save;
+};

package/dist/api/controllers/static/index.js

@@ -20,14 +20,17 @@ const { processString } = require("@budibase/string-templates");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
 const { clientLibraryPath } = require("../../../utilities");
+const { upload, deleteFiles } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentType } = require("../../../db/utils");
-const { context, objectStore, utils } = require("@budibase/backend-core");
+const { getAppDB, getAppId } = require("@budibase/backend-core/context");
+const { setCookie, clearCookie } = require("@budibase/backend-core/utils");
 const AWS = require("aws-sdk");
 const fs = require("fs");
+const { downloadTarballDirect, } = require("../../../utilities/fileSystem/utilities");
 function prepareUpload({ s3Key, bucket, metadata, file }) {
     return __awaiter(this, void 0, void 0, function* () {
-        const response = yield objectStore.upload({
+        const response = yield upload({
             bucket,
             metadata,
             filename: s3Key,
@@ -48,7 +51,7 @@ const toggleBetaUiFeature = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const cookieName = `beta:${ctx.params.feature}`;
         if (ctx.cookies.get(cookieName)) {
-            utils.clearCookie(ctx, cookieName);
+            clearCookie(ctx, cookieName);
             ctx.body = {
                 message: `${ctx.params.feature} disabled`,
             };
@@ -59,8 +62,8 @@ const toggleBetaUiFeature = function (ctx) {
         if (!fs.existsSync(builderPath)) {
             fs.mkdirSync(builderPath);
         }
-        yield objectStore.downloadTarballDirect("https://cdn.budi.live/beta:design_ui/new_ui.tar.gz", builderPath);
-        utils.setCookie(ctx, {}, cookieName);
+        yield downloadTarballDirect("https://cdn.budi.live/beta:design_ui/new_ui.tar.gz", builderPath);
+        setCookie(ctx, {}, cookieName);
         ctx.body = {
             message: `${ctx.params.feature} enabled`,
         };
@@ -95,15 +98,15 @@ const uploadFile = function (ctx) {
 exports.uploadFile = uploadFile;
 const deleteObjects = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        ctx.body = yield objectStore.deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys);
+        ctx.body = yield deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys);
     });
 };
 exports.deleteObjects = deleteObjects;
 const serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = context.getAppDB({ skip_setup: true });
+        const db = getAppDB({ skip_setup: true });
         const appInfo = yield db.get(DocumentType.APP_METADATA);
-        let appId = context.getAppId();
+        let appId = getAppId();
         if (!env.isJest()) {
             const App = require("./templates/BudibaseApp.svelte").default;
             const plugins = (0, plugins_1.enrichPluginURLs)(appInfo.usedPlugins);
@@ -132,10 +135,10 @@ const serveApp = function (ctx) {
 exports.serveApp = serveApp;
 const serveBuilderPreview = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = context.getAppDB({ skip_setup: true });
+        const db = getAppDB({ skip_setup: true });
         const appInfo = yield db.get(DocumentType.APP_METADATA);
         if (!env.isJest()) {
-            let appId = context.getAppId();
+            let appId = getAppId();
             const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`);
             ctx.body = yield processString(previewHbs, {
                 clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
@@ -159,7 +162,7 @@ exports.serveClientLibrary = serveClientLibrary;
 const getSignedUploadURL = function (ctx) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        const database = context.getAppDB();
+        const database = getAppDB();
         // Ensure datasource is valid
         let datasource;
         try {