@budibase/server 2.2.3 → 2.2.4-alpha.0

package/dist/api/controllers/application.js

@@ -24,14 +24,13 @@ const datasource_bb_default_1 = require("../../db/defaultData/datasource_bb_defa
 const workerRequests_1 = require("../../utilities/workerRequests");
 const utilities_1 = require("../../utilities");
 const redis_1 = require("../../utilities/redis");
-const clientLibrary_1 = require("../../utilities/fileSystem/clientLibrary");
+const fileSystem_2 = require("../../utilities/fileSystem");
 const utils_2 = require("../../automations/utils");
 const logging_1 = require("../../automations/logging");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const layouts_1 = require("../../constants/layouts");
-const plugins_1 = require("../../utilities/plugins");
 const sdk_1 = __importDefault(require("../../sdk"));
 // utility function, need to do away with this
 function getLayouts() {
@@ -164,25 +163,25 @@ function fetchAppDefinition(ctx) {
 }
 exports.fetchAppDefinition = fetchAppDefinition;
 function fetchAppPackage(ctx) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         let application = yield db.get(utils_1.DocumentType.APP_METADATA);
         const layouts = yield getLayouts();
         let screens = yield getScreens();
         // Enrich plugin URLs
-        application.usedPlugins = (0, plugins_1.enrichPluginURLs)(application.usedPlugins);
+        application.usedPlugins = backend_core_1.objectStore.enrichPluginURLs(application.usedPlugins);
         // Only filter screens if the user is not a builder
-        if (!(((_a = ctx.user) === null || _a === void 0 ? void 0 : _a.builder) && ctx.user.builder.global)) {
+        if (!(ctx.user.builder && ctx.user.builder.global)) {
             const userRoleId = getUserRoleId(ctx);
             const accessController = new backend_core_1.roles.AccessController();
             screens = yield accessController.checkScreensAccess(screens, userRoleId);
         }
+        const clientLibPath = backend_core_1.objectStore.clientLibraryUrl(ctx.params.appId, application.version);
         ctx.body = {
             application,
             screens,
             layouts,
-            clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version),
+            clientLibPath,
         };
     });
 }
@@ -325,7 +324,7 @@ function appPostCreate(ctx, app) {
                     if (err.code && err.code === backend_core_1.errors.codes.USAGE_LIMIT_EXCEEDED) {
                         // this import resulted in row usage exceeding the quota
                         // delete the app
-                        // skip pre- and post-steps as no rows have been added to quotas yet
+                        // skip pre and post-steps as no rows have been added to quotas yet
                         ctx.params.appId = app.appId;
                         yield destroyApp(ctx);
                     }
@@ -375,8 +374,8 @@ function updateClient(ctx) {
         const currentVersion = application.version;
         // Update client library and manifest
         if (!environment_1.default.isTest()) {
-            yield (0, clientLibrary_1.backupClientLibrary)(ctx.params.appId);
-            yield (0, clientLibrary_1.updateClientLibrary)(ctx.params.appId);
+            yield (0, fileSystem_2.backupClientLibrary)(ctx.params.appId);
+            yield (0, fileSystem_2.updateClientLibrary)(ctx.params.appId);
         }
         // Update versions in app package
         const updatedToVersion = package_json_1.default.version;
@@ -401,7 +400,7 @@ function revertClient(ctx) {
         }
         // Update client library and manifest
         if (!environment_1.default.isTest()) {
-            yield (0, clientLibrary_1.revertClientLibrary)(ctx.params.appId);
+            yield (0, fileSystem_2.revertClientLibrary)(ctx.params.appId);
         }
         // Update versions in app package
         const currentVersion = application.version;

package/dist/api/controllers/cloud.js

@@ -95,11 +95,15 @@ function importApps(ctx) {
         if (beenImported || !ctx.request.files || !ctx.request.files.importFile) {
             ctx.throw(400, "Import file is required and environment must be fresh to import apps.");
         }
-        if (ctx.request.files.importFile.type !== "application/gzip") {
+        const file = ctx.request.files.importFile;
+        if (Array.isArray(file)) {
+            ctx.throw(400, "Single file is required");
+        }
+        if (file.type !== "application/gzip") {
             ctx.throw(400, "Import file must be a gzipped tarball.");
         }
         // initially get all the app databases out of the tarball
-        const tmpPath = sdk_1.default.backups.untarFile(ctx.request.files.importFile);
+        const tmpPath = sdk_1.default.backups.untarFile(file);
         const globalDbImport = sdk_1.default.backups.getGlobalDBFile(tmpPath);
         const appNames = sdk_1.default.backups.getListOfAppsInMulti(tmpPath);
         const globalDb = backend_core_1.tenancy.getGlobalDB();

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

@@ -18,15 +18,15 @@ const backend_core_1 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../../../environment"));
 const websocket_1 = require("../../../websocket");
-const backend_core_2 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 function getPlugins(type) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.tenancy.getGlobalDB();
-        const response = yield db.allDocs(backend_core_2.db.getPluginParams(null, {
+        const response = yield db.allDocs(backend_core_1.db.getPluginParams(null, {
             include_docs: true,
         }));
-        const plugins = response.rows.map((row) => row.doc);
+        let plugins = response.rows.map((row) => row.doc);
+        plugins = backend_core_1.objectStore.enrichPluginURLs(plugins);
         if (type) {
             return plugins.filter((plugin) => { var _a; return ((_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.type) === type; });
         }
@@ -92,7 +92,7 @@ function create(ctx) {
             if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
                 throw new Error("Only component plugins are supported outside of self-host");
             }
-            const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
+            const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
             websocket_1.ClientAppSocket.emit("plugins-update", { name, hash: doc.hash });
             ctx.body = {
                 message: "Plugin uploaded successfully",
@@ -117,7 +117,7 @@ function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { pluginId } = ctx.params;
         try {
-            yield pro_1.plugins.deletePlugin(pluginId);
+            yield pro_1.sdk.plugins.deletePlugin(pluginId);
             ctx.body = { message: `Plugin ${ctx.params.pluginId} deleted.` };
         }
         catch (err) {
@@ -135,7 +135,7 @@ function processUploadedPlugin(plugin, source) {
         if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
             throw new Error("Only component plugins are supported outside of self-host");
         }
-        const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
+        const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
         websocket_1.ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash });
         return doc;
     });

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

@@ -27,25 +27,31 @@ const utils_2 = require("./utils");
 const constants_1 = require("../../../constants");
 const utils_3 = require("../../../integrations/utils");
 const string_templates_1 = require("@budibase/string-templates");
-// @ts-ignore
 const fp_1 = require("lodash/fp");
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const backend_core_1 = require("@budibase/backend-core");
+const utils_4 = require("./utils");
 function buildFilters(id, filters, table) {
     const primary = table.primary;
     // if passed in array need to copy for shifting etc
     let idCopy = (0, fp_1.cloneDeep)(id);
     if (filters) {
         // need to map over the filters and make sure the _id field isn't present
-        for (let filter of Object.values(filters)) {
-            if (filter._id && primary) {
-                const parts = (0, utils_1.breakRowIdField)(filter._id);
-                for (let field of primary) {
-                    filter[field] = parts.shift();
+        let prefix = 1;
+        for (let operator of Object.values(filters)) {
+            for (let field of Object.keys(operator || {})) {
+                if ((0, utils_4.removeKeyNumbering)(field) === "_id") {
+                    if (primary) {
+                        const parts = (0, utils_1.breakRowIdField)(operator[field]);
+                        for (let field of primary) {
+                            operator[`${prefix}:${field}`] = parts.shift();
+                        }
+                        prefix++;
+                    }
+                    // make sure this field doesn't exist on any filter
+                    delete operator[field];
                 }
             }
-            // make sure this field doesn't exist on any filter
-            delete filter._id;
         }
     }
     // there is no id, just use the user provided filters

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

@@ -52,12 +52,12 @@ const utils_1 = require("../../../db/utils");
 const userController = __importStar(require("../user"));
 const rowProcessor_1 = require("../../../utilities/rowProcessor");
 const constants_1 = require("../../../constants");
-const utils_2 = require("./utils");
+const utils = __importStar(require("./utils"));
 const internalSearch_1 = require("./internalSearch");
 const global_1 = require("../../../utilities/global");
 const inMemoryViews = __importStar(require("../../../db/inMemoryView"));
 const environment_1 = __importDefault(require("../../../environment"));
-const utils_3 = require("../view/utils");
+const utils_2 = require("../view/utils");
 const fp_1 = require("lodash/fp");
 const backend_core_1 = require("@budibase/backend-core");
 const staticFormula_1 = require("./staticFormula");
@@ -70,9 +70,9 @@ const CALCULATION_TYPES = {
 };
 function getView(db, viewName) {
     return __awaiter(this, void 0, void 0, function* () {
-        let mainGetter = environment_1.default.SELF_HOSTED ? utils_3.getFromDesignDoc : utils_3.getFromMemoryDoc;
-        let secondaryGetter = environment_1.default.SELF_HOSTED ? utils_3.getFromMemoryDoc : utils_3.getFromDesignDoc;
-        let migration = environment_1.default.SELF_HOSTED ? utils_3.migrateToDesignView : utils_3.migrateToInMemoryView;
+        let mainGetter = environment_1.default.SELF_HOSTED ? utils_2.getFromDesignDoc : utils_2.getFromMemoryDoc;
+        let secondaryGetter = environment_1.default.SELF_HOSTED ? utils_2.getFromMemoryDoc : utils_2.getFromDesignDoc;
+        let migration = environment_1.default.SELF_HOSTED ? utils_2.migrateToDesignView : utils_2.migrateToInMemoryView;
         let viewInfo, migrate = false;
         try {
             viewInfo = yield mainGetter(db, viewName);
@@ -121,7 +121,7 @@ function patch(ctx) {
         let oldRow;
         try {
             let dbTable = yield db.get(tableId);
-            oldRow = yield (0, rowProcessor_1.outputProcessing)(dbTable, yield (0, utils_2.findRow)(ctx, tableId, inputs._id));
+            oldRow = yield (0, rowProcessor_1.outputProcessing)(dbTable, yield utils.findRow(ctx, tableId, inputs._id));
         }
         catch (err) {
             if (isUserTable) {
@@ -145,7 +145,7 @@ function patch(ctx) {
         }
         // this returns the table and row incase they have been updated
         let { table, row } = (0, rowProcessor_1.inputProcessing)(ctx.user, dbTable, combinedRow);
-        const validateResult = yield (0, utils_2.validate)({
+        const validateResult = yield utils.validate({
             row,
             table,
         });
@@ -185,7 +185,7 @@ function save(ctx) {
         // this returns the table and row incase they have been updated
         const dbTable = yield db.get(inputs.tableId);
         let { table, row } = (0, rowProcessor_1.inputProcessing)(ctx.user, dbTable, inputs);
-        const validateResult = yield (0, utils_2.validate)({
+        const validateResult = yield utils.validate({
             row,
             table,
         });
@@ -274,7 +274,7 @@ function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.db.getDB(ctx.appId);
         const table = yield db.get(ctx.params.tableId);
-        let row = yield (0, utils_2.findRow)(ctx, ctx.params.tableId, ctx.params.rowId);
+        let row = yield utils.findRow(ctx, ctx.params.tableId, ctx.params.rowId);
         row = yield (0, rowProcessor_1.outputProcessing)(table, row);
         return row;
     });
@@ -386,7 +386,7 @@ function search(ctx) {
 exports.search = search;
 function validate(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (0, utils_2.validate)({
+        return utils.validate({
             tableId: ctx.params.tableId,
             row: ctx.request.body,
         });
@@ -436,7 +436,7 @@ function fetchEnrichedRow(ctx) {
         // need table to work out where links go in row
         let [table, row] = yield Promise.all([
             db.get(tableId),
-            (0, utils_2.findRow)(ctx, tableId, rowId),
+            utils.findRow(ctx, tableId, rowId),
         ]);
         // get the link docs
         const linkVals = (yield linkRows.getLinkDocuments({

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

@@ -153,7 +153,7 @@ function finaliseRow(table, row, { oldTable, updateFormula } = {
         enrichedRow = yield (0, rowProcessor_1.processFormulas)(table, enrichedRow, { dynamic: false });
         // this updates the related formulas in other rows based on the relations to this row
         if (updateFormula) {
-            yield exports.updateRelatedFormula(table, enrichedRow);
+            yield updateRelatedFormula(table, enrichedRow);
         }
         return { row: enrichedRow, table };
     });

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

@@ -10,17 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSignedUploadURL = exports.serveClientLibrary = exports.serveBuilderPreview = exports.serveApp = exports.deleteObjects = exports.uploadFile = exports.serveBuilder = exports.toggleBetaUiFeature = void 0;
-const plugins_1 = require("../../../utilities/plugins");
 require("svelte/register");
 const send = require("koa-send");
 const { resolve, join } = require("../../../utilities/centralPath");
 const uuid = require("uuid");
-const { ObjectStoreBuckets } = require("../../../constants");
+const constants_1 = require("../../../constants");
 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 { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentType } = require("../../../db/utils");
 const { context, objectStore, utils } = require("@budibase/backend-core");
 const AWS = require("aws-sdk");
@@ -38,7 +35,7 @@ function prepareUpload({ s3Key, bucket, metadata, file }) {
         return {
             size: file.size,
             name: file.name,
-            url: attachmentsRelativeURL(response.Key),
+            url: objectStore.getAppFileUrl(s3Key),
             extension: [...file.name.split(".")].pop(),
             key: response.Key,
         };
@@ -85,8 +82,8 @@ const uploadFile = function (ctx) {
             const processedFileName = `${uuid.v4()}.${fileExtension}`;
             return prepareUpload({
                 file,
-                s3Key: `${ctx.appId}/attachments/${processedFileName}`,
-                bucket: ObjectStoreBuckets.APPS,
+                s3Key: `${context.getProdAppId()}/attachments/${processedFileName}`,
+                bucket: constants_1.ObjectStoreBuckets.APPS,
             });
         }));
         ctx.body = yield Promise.all(uploads);
@@ -95,7 +92,7 @@ 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 objectStore.deleteFiles(constants_1.ObjectStoreBuckets.APPS, ctx.request.body.keys);
     });
 };
 exports.deleteObjects = deleteObjects;
@@ -106,13 +103,13 @@ const serveApp = function (ctx) {
         let appId = context.getAppId();
         if (!env.isJest()) {
             const App = require("./templates/BudibaseApp.svelte").default;
-            const plugins = (0, plugins_1.enrichPluginURLs)(appInfo.usedPlugins);
+            const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins);
             const { head, html, css } = App.render({
                 metaImage: "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
                 title: appInfo.name,
                 production: env.isProd(),
                 appId,
-                clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
+                clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
                 usedPlugins: plugins,
             });
             const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`);
@@ -138,7 +135,7 @@ const serveBuilderPreview = function (ctx) {
             let appId = context.getAppId();
             const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`);
             ctx.body = yield processString(previewHbs, {
-                clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
+                clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
             });
         }
         else {

package/dist/automations/automationUtils.js

@@ -12,9 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringSplit = exports.substituteLoopStep = exports.getError = exports.cleanUpRow = exports.cleanInputValues = void 0;
+exports.typecastForLooping = exports.stringSplit = exports.substituteLoopStep = exports.getError = exports.cleanUpRow = exports.cleanInputValues = void 0;
 const string_templates_1 = require("@budibase/string-templates");
 const sdk_1 = __importDefault(require("../sdk"));
+const automations_1 = require("../definitions/automations");
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -132,3 +133,27 @@ function stringSplit(value) {
     return value;
 }
 exports.stringSplit = stringSplit;
+function typecastForLooping(loopStep, input) {
+    if (!input || !input.binding) {
+        return null;
+    }
+    try {
+        switch (loopStep.inputs.option) {
+            case automations_1.LoopStepType.ARRAY:
+                if (typeof input.binding === "string") {
+                    return JSON.parse(input.binding);
+                }
+                break;
+            case automations_1.LoopStepType.STRING:
+                if (Array.isArray(input.binding)) {
+                    return input.binding.join(",");
+                }
+                break;
+        }
+    }
+    catch (err) {
+        throw new Error("Unable to cast to correct type");
+    }
+    return input.binding;
+}
+exports.typecastForLooping = typecastForLooping;

package/dist/environment.js

@@ -69,7 +69,6 @@ const environment = {
     // flags
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
-    DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
     DISABLE_AUTOMATION_LOGS: process.env.DISABLE_AUTOMATION_LOGS,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
     ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
@@ -101,11 +100,16 @@ if (isDev() && module.exports.DISABLE_THREADING == null) {
     environment._set("DISABLE_THREADING", "1");
 }
 // clean up any environment variable edge cases
-for (let [key, value] of Object.entries(module.exports)) {
+for (let [key, value] of Object.entries(environment)) {
     // handle the edge case of "0" to disable an environment variable
     if (value === "0") {
         // @ts-ignore
         environment[key] = 0;
     }
+    // handle the edge case of "false" to disable an environment variable
+    if (value === "false") {
+        // @ts-ignore
+        environment[key] = 0;
+    }
 }
 module.exports = environment;

package/dist/integrations/index.js

@@ -95,7 +95,6 @@ function getDefinitions() {
 }
 exports.getDefinitions = getDefinitions;
 function getIntegration(integration) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (INTEGRATIONS[integration]) {
             return INTEGRATIONS[integration];
@@ -105,7 +104,7 @@ function getIntegration(integration) {
             for (let plugin of plugins) {
                 if (plugin.name === integration) {
                     // need to use commonJS require due to its dynamic runtime nature
-                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin.name, plugin.jsUrl, (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash);
+                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin);
                     if (retrieved.integration) {
                         return retrieved.integration;
                     }

package/dist/migrations/functions/backfill/global/configs.js

@@ -29,15 +29,15 @@ const backfill = (globalDb, timestamp) => __awaiter(void 0, void 0, void 0, func
             yield backend_core_1.events.email.SMTPCreated(timestamp);
         }
         if ((0, types_1.isGoogleConfig)(config)) {
-            yield backend_core_1.events.auth.SSOCreated("google", timestamp);
+            yield backend_core_1.events.auth.SSOCreated(types_1.ConfigType.GOOGLE, timestamp);
             if (config.config.activated) {
-                yield backend_core_1.events.auth.SSOActivated("google", timestamp);
+                yield backend_core_1.events.auth.SSOActivated(types_1.ConfigType.GOOGLE, timestamp);
             }
         }
         if ((0, types_1.isOIDCConfig)(config)) {
-            yield backend_core_1.events.auth.SSOCreated("oidc", timestamp);
+            yield backend_core_1.events.auth.SSOCreated(types_1.ConfigType.OIDC, timestamp);
             if (config.config.configs[0].activated) {
-                yield backend_core_1.events.auth.SSOActivated("oidc", timestamp);
+                yield backend_core_1.events.auth.SSOActivated(types_1.ConfigType.OIDC, timestamp);
             }
         }
         if ((0, types_1.isSettingsConfig)(config)) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "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.2",
-        "@budibase/client": "^2.2.2",
-        "@budibase/pro": "2.2.2",
-        "@budibase/string-templates": "^2.2.2",
-        "@budibase/types": "^2.2.2",
+        "@budibase/backend-core": "^2.2.3",
+        "@budibase/client": "^2.2.3",
+        "@budibase/pro": "2.2.3",
+        "@budibase/string-templates": "^2.2.3",
+        "@budibase/types": "^2.2.3",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -130,13 +130,15 @@
         "@types/ioredis": "4.28.10",
         "@types/jest": "27.5.1",
         "@types/koa": "2.13.4",
-        "@types/koa__router": "8.0.11",
+        "@types/koa__router": "8.0.8",
         "@types/lodash": "4.14.180",
         "@types/node": "14.18.20",
         "@types/node-fetch": "2.6.1",
         "@types/oracledb": "5.2.2",
         "@types/pouchdb": "6.4.0",
         "@types/redis": "4.0.11",
+        "@types/server-destroy": "1.0.1",
+        "@types/tar": "6.1.3",
         "@typescript-eslint/parser": "5.45.0",
         "apidoc": "0.50.4",
         "babel-jest": "27.5.1",

package/dist/sdk/app/backups/imports.js

@@ -56,18 +56,14 @@ function updateAttachmentColumns(prodAppId, db) {
                         continue;
                     }
                     row[column] = row[column].map((attachment) => {
-                        // URL looks like: /prod-budi-app-assets/appId/attachments/file.csv
-                        const urlParts = attachment.url.split("/");
-                        // drop the first empty element
-                        urlParts.shift();
-                        // get the prefix
-                        const prefix = urlParts.shift();
+                        // Key looks like: appId/attachments/file.csv
+                        const urlParts = attachment.key.split("/");
                         // remove the app ID
                         urlParts.shift();
                         // add new app ID
                         urlParts.unshift(prodAppId);
                         const key = urlParts.join("/");
-                        return Object.assign(Object.assign({}, attachment), { key, url: `/${prefix}/${key}` });
+                        return Object.assign(Object.assign({}, attachment), { key, url: "" });
                     });
                 }
             }

package/dist/threads/automation.js

@@ -47,7 +47,6 @@ const triggerInfo_1 = require("../automations/triggerInfo");
 const constants_1 = require("../constants");
 const logging_1 = require("../automations/logging");
 const types_1 = require("@budibase/types");
-const automations_1 = require("../definitions/automations");
 const backend_core_1 = require("@budibase/backend-core");
 const string_templates_1 = require("@budibase/string-templates");
 const fp_1 = require("lodash/fp");
@@ -56,31 +55,8 @@ const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
-function typecastForLooping(loopStep, input) {
-    if (!input || !input.binding) {
-        return null;
-    }
-    try {
-        switch (loopStep.inputs.option) {
-            case automations_1.LoopStepType.ARRAY:
-                if (typeof input.binding === "string") {
-                    return JSON.parse(input.binding);
-                }
-                break;
-            case automations_1.LoopStepType.STRING:
-                if (Array.isArray(input.binding)) {
-                    return input.binding.join(",");
-                }
-                break;
-        }
-    }
-    catch (err) {
-        throw new Error("Unable to cast to correct type");
-    }
-    return input.binding;
-}
 function getLoopIterations(loopStep, input) {
-    const binding = typecastForLooping(loopStep, input);
+    const binding = automationUtils.typecastForLooping(loopStep, input);
     if (!loopStep || !binding) {
         return 1;
     }
@@ -269,7 +245,7 @@ class Orchestrator {
                         let newInput = yield (0, string_templates_1.processObject)(loopStep.inputs, (0, fp_1.cloneDeep)(this._context));
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
                         try {
-                            newInput.binding = typecastForLooping(loopStep, newInput);
+                            newInput.binding = automationUtils.typecastForLooping(loopStep, newInput);
                         }
                         catch (err) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {