npm - @budibase/server - Versions diffs - 2.3.17 → 2.3.18-alpha.1 - Mend

@budibase/server 2.3.17 → 2.3.18-alpha.1

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

Files changed (467) hide show

package/builder/index.html CHANGED Viewed

@@ -10,8 +10,8 @@
 		href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet"
 	/>
-  <script type="module" crossorigin src="/builder/assets/index.06e34d35.js"></script>
-  <link rel="stylesheet" href="/builder/assets/index.4488f38d.css">
+  <script type="module" crossorigin src="/builder/assets/index.7089444f.js"></script>
+  <link rel="stylesheet" href="/builder/assets/index.7e76c039.css">
 </head>
 <body id="app">

package/dist/api/controllers/query/index.js CHANGED Viewed

@@ -184,6 +184,8 @@ function preview(ctx) {
                     schemaFields[key] = fieldType;
                 }
             }
+            // remove configuration before sending event
+            delete datasource.config;
             yield backend_core_1.events.query.previewed(datasource, query);
             ctx.body = {
                 rows,

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

@@ -439,7 +439,7 @@ class ExternalRequest {
                     isOneSide(field)) {
                     continue;
                 }
-                const isMany = field.relationshipType === constants_1.RelationshipTypes.MANY_TO_MANY;
+                const isMany = field.relationshipType === types_1.RelationshipTypes.MANY_TO_MANY;
                 const tableId = isMany ? field.through : field.tableId;
                 const { tableName: relatedTableName } = (0, utils_3.breakExternalTableId)(tableId);
                 // @ts-ignore
@@ -609,7 +609,9 @@ class ExternalRequest {
                 },
                 resource: {
                     // have to specify the fields to avoid column overlap (for SQL)
-                    fields: isSql ? this.buildFields(table) : [],
+                    fields: isSql
+                        ? this.buildFields(table, config.includeSqlRelationships)
+                        : [],
                 },
                 filters,
                 sort,

package/dist/api/controllers/row/external.js CHANGED Viewed

@@ -86,6 +86,7 @@ function patch(ctx) {
         return handleRequest(types_1.Operation.UPDATE, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
             row: inputs,
+            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         });
     });
 }
@@ -96,6 +97,7 @@ function save(ctx) {
         const tableId = ctx.params.tableId;
         return handleRequest(types_1.Operation.CREATE, tableId, {
             row: inputs,
+            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         });
     });
 }
@@ -113,7 +115,9 @@ exports.fetchView = fetchView;
 function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = ctx.params.tableId;
-        return handleRequest(types_1.Operation.READ, tableId);
+        return handleRequest(types_1.Operation.READ, tableId, {
+            includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
+        });
     });
 }
 exports.fetch = fetch;
@@ -123,6 +127,7 @@ function find(ctx) {
         const tableId = ctx.params.tableId;
         const response = (yield handleRequest(types_1.Operation.READ, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
+            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         }));
         return response ? response[0] : response;
     });
@@ -134,6 +139,7 @@ function destroy(ctx) {
         const id = ctx.request.body._id;
         const { row } = (yield handleRequest(types_1.Operation.DELETE, tableId, {
             id: (0, utils_1.breakRowIdField)(id),
+            includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
         }));
         return { response: { ok: true }, row };
     });
@@ -147,6 +153,7 @@ function bulkDestroy(ctx) {
         for (let row of rows) {
             promises.push(handleRequest(types_1.Operation.DELETE, tableId, {
                 id: (0, utils_1.breakRowIdField)(row._id),
+                includeSqlRelationships: types_1.IncludeRelationship.EXCLUDE,
             }));
         }
         const responses = (yield Promise.all(promises));
@@ -189,6 +196,7 @@ function search(ctx) {
                 filters: query,
                 sort,
                 paginate: paginateObj,
+                includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
             }));
             let hasNextPage = false;
             if (paginate && rows.length === limit) {
@@ -199,6 +207,7 @@ function search(ctx) {
                         limit: 1,
                         page: bookmark * limit + 1,
                     },
+                    includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
                 }));
                 hasNextPage = nextRows.length > 0;
             }
@@ -287,6 +296,7 @@ function fetchEnrichedRow(ctx) {
         const response = (yield handleRequest(types_1.Operation.READ, tableId, {
             id,
             datasource,
+            includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
         }));
         const table = tables[tableName];
         const row = response[0];
@@ -312,6 +322,7 @@ function fetchEnrichedRow(ctx) {
                         [primaryLink]: linkedIds,
                     },
                 },
+                includeSqlRelationships: types_1.IncludeRelationship.INCLUDE,
             });
         }
         return row;

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

@@ -42,7 +42,11 @@ function updateRelatedFormula(table, enrichedRows) {
                     if (!relatedRows[relatedTableId]) {
                         relatedRows[relatedTableId] = [];
                     }
-                    relatedRows[relatedTableId] = relatedRows[relatedTableId].concat(field);
+                    // filter down to the rows which are not already included in related
+                    const currentIds = relatedRows[relatedTableId].map(row => row._id);
+                    const uniqueRelatedRows = field.filter((row) => !currentIds.includes(row._id));
+                    relatedRows[relatedTableId] =
+                        relatedRows[relatedTableId].concat(uniqueRelatedRows);
                 }
             }
             for (let tableId of table.relatedFormula) {

package/dist/api/controllers/table/external.js CHANGED Viewed

@@ -75,12 +75,12 @@ function getDatasourceId(table) {
     return (0, utils_1.breakExternalTableId)(table._id).datasourceId;
 }
 function otherRelationshipType(type) {
-    if (type === constants_1.RelationshipTypes.MANY_TO_MANY) {
-        return constants_1.RelationshipTypes.MANY_TO_MANY;
+    if (type === types_1.RelationshipTypes.MANY_TO_MANY) {
+        return types_1.RelationshipTypes.MANY_TO_MANY;
     }
-    return type === constants_1.RelationshipTypes.ONE_TO_MANY
-        ? constants_1.RelationshipTypes.MANY_TO_ONE
-        : constants_1.RelationshipTypes.ONE_TO_MANY;
+    return type === types_1.RelationshipTypes.ONE_TO_MANY
+        ? types_1.RelationshipTypes.MANY_TO_ONE
+        : types_1.RelationshipTypes.ONE_TO_MANY;
 }
 function generateManyLinkSchema(datasource, column, table, relatedTable) {
     if (!table.primary || !relatedTable.primary) {
@@ -116,7 +116,7 @@ function generateLinkSchema(column, table, relatedTable, type) {
     if (!table.primary || !relatedTable.primary) {
         throw new Error("Unable to generate link schema, no primary keys");
     }
-    const isOneSide = type === constants_1.RelationshipTypes.ONE_TO_MANY;
+    const isOneSide = type === types_1.RelationshipTypes.ONE_TO_MANY;
     const primary = isOneSide ? relatedTable.primary[0] : table.primary[0];
     // generate a foreign key
     const foreignKey = (0, utils_2.generateForeignKey)(column, relatedTable);
@@ -186,7 +186,7 @@ function save(ctx) {
             }
             const relatedColumnName = schema.fieldName;
             const relationType = schema.relationshipType;
-            if (relationType === constants_1.RelationshipTypes.MANY_TO_MANY) {
+            if (relationType === types_1.RelationshipTypes.MANY_TO_MANY) {
                 const junctionTable = generateManyLinkSchema(datasource, schema, table, relatedTable);
                 if (tables[junctionTable.name]) {
                     throw "Junction table already exists, cannot create another relationship.";
@@ -195,7 +195,7 @@ function save(ctx) {
                 extraTablesToUpdate.push(junctionTable);
             }
             else {
-                const fkTable = relationType === constants_1.RelationshipTypes.ONE_TO_MANY ? table : relatedTable;
+                const fkTable = relationType === types_1.RelationshipTypes.ONE_TO_MANY ? table : relatedTable;
                 const foreignKey = generateLinkSchema(schema, table, relatedTable, relationType);
                 fkTable.schema[foreignKey] = (0, utils_2.foreignKeyStructure)(foreignKey);
                 if (fkTable.constrained == null) {

package/dist/api/index.js CHANGED Viewed

@@ -27,6 +27,7 @@ const compress = require("koa-compress");
 exports.router = new router_1.default();
 exports.router.get("/health", ctx => (ctx.status = 200));
 exports.router.get("/version", ctx => (ctx.body = package_json_1.default.version));
+exports.router.use(backend_core_1.middleware.errorHandling);
 exports.router
     .use(compress({
     threshold: 2048,
@@ -60,27 +61,6 @@ exports.router
     // @ts-ignore
     .use(currentapp_1.default)
     .use(backend_core_1.auth.auditLog);
-// error handling middleware
-exports.router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        yield next();
-    }
-    catch (err) {
-        ctx.status = err.status || err.statusCode || 500;
-        const error = backend_core_1.errors.getPublicError(err);
-        ctx.body = {
-            message: err.message,
-            status: ctx.status,
-            validationErrors: err.validation,
-            error,
-        };
-        ctx.log.error(err);
-        // unauthorised errors don't provide a useful trace
-        if (!environment_1.default.isTest()) {
-            console.trace(err);
-        }
-    }
-}));
 // authenticated routes
 for (let route of routes_1.mainRoutes) {
     exports.router.use(route.routes());

package/dist/app.js CHANGED Viewed

@@ -35,6 +35,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+if (process.env.DD_APM_ENABLED) {
+    require("./ddApm");
+}
+if (process.env.ELASTIC_APM_ENABLED) {
+    require("./elasticApm");
+}
 // need to load environment first
 const environment_1 = __importDefault(require("./environment"));
 // enable APM if configured
@@ -99,7 +105,7 @@ server.on("close", () => __awaiter(void 0, void 0, void 0, function* () {
     console.log("Server Closed");
     yield automations.shutdown();
     yield redis.shutdown();
-    yield backend_core_1.events.shutdown();
+    backend_core_1.events.shutdown();
     yield threads_1.Thread.shutdown();
     api.shutdown();
     if (!environment_1.default.isTest()) {

package/dist/constants/index.js CHANGED Viewed

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_AUTOMATION_RECURRING_ERRORS = exports.ObjectStoreBuckets = exports.AutomationErrors = exports.BuildSchemaErrors = exports.InvalidColumns = exports.MetadataTypes = exports.BaseQueryVerbs = exports.OBJ_STORE_DIRECTORY = exports.AutoFieldDefaultNames = exports.AutoFieldSubTypes = exports.USERS_TABLE_SCHEMA = exports.SortDirection = exports.DatasourceAuthTypes = exports.DataSourceOperation = exports.AuthTypes = exports.FormulaTypes = exports.RelationshipTypes = exports.SwitchableTypes = exports.CanSwitchTypes = exports.FieldTypes = exports.NoEmptyFilterStrings = exports.FilterTypes = void 0;
+exports.MAX_AUTOMATION_RECURRING_ERRORS = exports.ObjectStoreBuckets = exports.AutomationErrors = exports.BuildSchemaErrors = exports.InvalidColumns = exports.MetadataTypes = exports.BaseQueryVerbs = exports.OBJ_STORE_DIRECTORY = exports.AutoFieldDefaultNames = exports.AutoFieldSubTypes = exports.USERS_TABLE_SCHEMA = exports.SortDirection = exports.DatasourceAuthTypes = exports.DataSourceOperation = exports.AuthTypes = exports.FormulaTypes = exports.SwitchableTypes = exports.CanSwitchTypes = exports.NoEmptyFilterStrings = exports.FilterTypes = exports.RelationshipTypes = exports.FieldTypes = void 0;
 const backend_core_1 = require("@budibase/backend-core");
+var types_1 = require("@budibase/types");
+Object.defineProperty(exports, "FieldTypes", { enumerable: true, get: function () { return types_1.FieldType; } });
+Object.defineProperty(exports, "RelationshipTypes", { enumerable: true, get: function () { return types_1.RelationshipTypes; } });
 var FilterTypes;
 (function (FilterTypes) {
     FilterTypes["STRING"] = "string";
@@ -23,23 +26,6 @@ exports.NoEmptyFilterStrings = [
     FilterTypes.CONTAINS,
     FilterTypes.NOT_CONTAINS,
 ];
-var FieldTypes;
-(function (FieldTypes) {
-    FieldTypes["STRING"] = "string";
-    FieldTypes["BARCODEQR"] = "barcodeqr";
-    FieldTypes["LONGFORM"] = "longform";
-    FieldTypes["OPTIONS"] = "options";
-    FieldTypes["NUMBER"] = "number";
-    FieldTypes["BOOLEAN"] = "boolean";
-    FieldTypes["ARRAY"] = "array";
-    FieldTypes["DATETIME"] = "datetime";
-    FieldTypes["ATTACHMENT"] = "attachment";
-    FieldTypes["LINK"] = "link";
-    FieldTypes["FORMULA"] = "formula";
-    FieldTypes["AUTO"] = "auto";
-    FieldTypes["JSON"] = "json";
-    FieldTypes["INTERNAL"] = "internal";
-})(FieldTypes = exports.FieldTypes || (exports.FieldTypes = {}));
 exports.CanSwitchTypes = [
     [exports.FieldTypes.JSON, exports.FieldTypes.ARRAY],
     [
@@ -51,12 +37,6 @@ exports.CanSwitchTypes = [
     [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER],
 ];
 exports.SwitchableTypes = exports.CanSwitchTypes.reduce((prev, current) => prev ? prev.concat(current) : current);
-var RelationshipTypes;
-(function (RelationshipTypes) {
-    RelationshipTypes["ONE_TO_MANY"] = "one-to-many";
-    RelationshipTypes["MANY_TO_ONE"] = "many-to-one";
-    RelationshipTypes["MANY_TO_MANY"] = "many-to-many";
-})(RelationshipTypes = exports.RelationshipTypes || (exports.RelationshipTypes = {}));
 var FormulaTypes;
 (function (FormulaTypes) {
     FormulaTypes["STATIC"] = "static";

package/dist/db/defaultData/datasource_bb_default.js CHANGED Viewed

@@ -13,6 +13,7 @@ const employeeImport_1 = require("./employeeImport");
 const jobsImport_1 = require("./jobsImport");
 const expensesImport_1 = require("./expensesImport");
 const backend_core_1 = require("@budibase/backend-core");
+const types_1 = require("@budibase/types");
 exports.DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs";
 exports.DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory";
 exports.DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses";
@@ -260,7 +261,7 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = {
             name: "Employee Level",
             sortable: false,
         }, "Badge Photo": {
-            type: "attachment",
+            type: constants_1.FieldTypes.ATTACHMENT,
             constraints: {
                 type: constants_1.FieldTypes.ARRAY,
                 presence: false,
@@ -275,7 +276,7 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = {
             },
             fieldName: "Assigned",
             name: "Jobs",
-            relationshipType: constants_1.RelationshipTypes.MANY_TO_MANY,
+            relationshipType: types_1.RelationshipTypes.MANY_TO_MANY,
             tableId: exports.DEFAULT_JOBS_TABLE_ID,
         }, "Start Date": {
             type: constants_1.FieldTypes.DATETIME,
@@ -419,10 +420,10 @@ exports.DEFAULT_JOBS_TABLE_SCHEMA = {
             type: constants_1.FieldTypes.LINK,
             tableId: exports.DEFAULT_EMPLOYEE_TABLE_ID,
             fieldName: "Jobs",
-            relationshipType: constants_1.RelationshipTypes.MANY_TO_MANY,
+            relationshipType: types_1.RelationshipTypes.MANY_TO_MANY,
             // sortable: true,
         }, "Works End": {
-            type: "datetime",
+            type: constants_1.FieldTypes.DATETIME,
             constraints: {
                 type: "string",
                 length: {},
@@ -435,7 +436,7 @@ exports.DEFAULT_JOBS_TABLE_SCHEMA = {
             name: "Works End",
             ignoreTimezones: true,
         }, "Updated Price": {
-            type: "number",
+            type: constants_1.FieldTypes.NUMBER,
             constraints: {
                 type: "number",
                 presence: false,

package/dist/db/linkedRows/LinkController.js CHANGED Viewed

@@ -18,6 +18,7 @@ const node_1 = __importDefault(require("@sentry/node"));
 const constants_1 = require("../../constants");
 const backend_core_1 = require("@budibase/backend-core");
 const LinkDocument_1 = __importDefault(require("./LinkDocument"));
+const types_1 = require("@budibase/types");
 class LinkController {
     constructor({ tableId, row, table, oldTable }) {
         this._db = backend_core_1.context.getAppDB();
@@ -124,17 +125,17 @@ class LinkController {
      */
     handleRelationshipType(linkerField, linkedField) {
         if (!linkerField.relationshipType ||
-            linkerField.relationshipType === constants_1.RelationshipTypes.MANY_TO_MANY) {
-            linkedField.relationshipType = constants_1.RelationshipTypes.MANY_TO_MANY;
+            linkerField.relationshipType === types_1.RelationshipTypes.MANY_TO_MANY) {
+            linkedField.relationshipType = types_1.RelationshipTypes.MANY_TO_MANY;
             // make sure by default all are many to many (if not specified)
-            linkerField.relationshipType = constants_1.RelationshipTypes.MANY_TO_MANY;
+            linkerField.relationshipType = types_1.RelationshipTypes.MANY_TO_MANY;
         }
-        else if (linkerField.relationshipType === constants_1.RelationshipTypes.MANY_TO_ONE) {
+        else if (linkerField.relationshipType === types_1.RelationshipTypes.MANY_TO_ONE) {
             // Ensure that the other side of the relationship is locked to one record
-            linkedField.relationshipType = constants_1.RelationshipTypes.ONE_TO_MANY;
+            linkedField.relationshipType = types_1.RelationshipTypes.ONE_TO_MANY;
         }
-        else if (linkerField.relationshipType === constants_1.RelationshipTypes.ONE_TO_MANY) {
-            linkedField.relationshipType = constants_1.RelationshipTypes.MANY_TO_ONE;
+        else if (linkerField.relationshipType === types_1.RelationshipTypes.ONE_TO_MANY) {
+            linkedField.relationshipType = types_1.RelationshipTypes.MANY_TO_ONE;
         }
         return { linkerField, linkedField };
     }
@@ -178,7 +179,7 @@ class LinkController {
                     }
                     // iterate through the link IDs in the row field, see if any don't exist already
                     for (let linkId of rowField) {
-                        if ((linkedSchema === null || linkedSchema === void 0 ? void 0 : linkedSchema.relationshipType) === constants_1.RelationshipTypes.ONE_TO_MANY) {
+                        if ((linkedSchema === null || linkedSchema === void 0 ? void 0 : linkedSchema.relationshipType) === types_1.RelationshipTypes.ONE_TO_MANY) {
                             let links = (yield (0, linkUtils_1.getLinkDocuments)({
                                 tableId: field.tableId,
                                 rowId: linkId,

package/dist/ddApm.js ADDED Viewed

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const dd_trace_1 = __importDefault(require("dd-trace"));
+// enable APM if configured
+if (process.env.DD_APM_ENABLED) {
+    console.log("Starting dd-trace");
+    dd_trace_1.default.init();
+}

package/dist/elasticApm.js ADDED Viewed

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const elastic_apm_node_1 = __importDefault(require("elastic-apm-node"));
+// enable APM if configured
+if (process.env.ELASTIC_APM_ENABLED) {
+    console.log("Starting elastic-apm-node");
+    elastic_apm_node_1.default.start({
+        serviceName: process.env.SERVICE,
+        environment: process.env.BUDIBASE_ENVIRONMENT,
+    });
+}

package/dist/integrations/base/sql.js CHANGED Viewed

@@ -90,6 +90,9 @@ function parseFilters(filters) {
 function generateSelectStatement(json, knex) {
     var _a;
     const { resource, meta } = json;
+    if (!resource) {
+        return "*";
+    }
     const schema = (_a = meta === null || meta === void 0 ? void 0 : meta.table) === null || _a === void 0 ? void 0 : _a.schema;
     return resource.fields.map(field => {
         const fieldNames = field.split(/\./g);
@@ -379,7 +382,9 @@ class InternalBuilder {
             return query.insert(parsedBody);
         }
         else {
-            return query.insert(parsedBody).returning("*");
+            return query
+                .insert(parsedBody)
+                .returning(generateSelectStatement(json, knex));
         }
     }
     bulkCreate(knex, json) {
@@ -458,7 +463,9 @@ class InternalBuilder {
             return query.update(parsedBody);
         }
         else {
-            return query.update(parsedBody).returning("*");
+            return query
+                .update(parsedBody)
+                .returning(generateSelectStatement(json, knex));
         }
     }
     delete(knex, json, opts) {
@@ -473,7 +480,7 @@ class InternalBuilder {
             return query.delete();
         }
         else {
-            return query.delete().returning("*");
+            return query.delete().returning(generateSelectStatement(json, knex));
         }
     }
 }

package/dist/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.3.16",
+    "version": "2.3.18-alpha.0",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -14,7 +14,7 @@
         "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
         "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
         "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
-        "test": "jest --coverage --maxWorkers=2",
+        "test": "jest --coverage --runInBand",
         "test:watch": "jest --watch",
         "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
         "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^2.3.16",
-        "@budibase/client": "^2.3.16",
-        "@budibase/pro": "2.3.16",
-        "@budibase/string-templates": "^2.3.16",
-        "@budibase/types": "^2.3.16",
+        "@budibase/backend-core": "2.3.18-alpha.0",
+        "@budibase/client": "2.3.18-alpha.0",
+        "@budibase/pro": "2.3.18-alpha.0",
+        "@budibase/string-templates": "2.3.18-alpha.0",
+        "@budibase/types": "2.3.18-alpha.0",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -64,6 +64,7 @@
         "chokidar": "3.5.3",
         "csvtojson": "2.0.10",
         "curlconverter": "3.21.0",
+        "dd-trace": "3.13.2",
         "dotenv": "8.2.0",
         "download": "8.0.0",
         "elastic-apm-node": "3.38.0",
@@ -125,6 +126,7 @@
         "@jest/test-sequencer": "24.9.0",
         "@swc/core": "^1.3.25",
         "@swc/jest": "^0.2.24",
+        "@trendyol/jest-testcontainers": "^2.1.1",
         "@types/apidoc": "0.50.0",
         "@types/bson": "4.2.0",
         "@types/global-agent": "2.1.1",
@@ -140,6 +142,7 @@
         "@types/pouchdb": "6.4.0",
         "@types/redis": "4.0.11",
         "@types/server-destroy": "1.0.1",
+        "@types/supertest": "2.0.12",
         "@types/tar": "6.1.3",
         "@typescript-eslint/parser": "5.45.0",
         "apidoc": "0.50.4",
@@ -151,13 +154,14 @@
         "is-wsl": "2.2.0",
         "jest": "28.1.1",
         "jest-openapi": "0.14.2",
+        "jest-serial-runner": "^1.2.1",
         "nodemon": "2.0.15",
         "openapi-types": "9.3.1",
         "openapi-typescript": "5.2.0",
         "path-to-regexp": "6.2.0",
         "prettier": "2.5.1",
         "rimraf": "3.0.2",
-        "supertest": "4.0.2",
+        "supertest": "6.2.2",
         "swagger-jsdoc": "6.1.0",
         "timekeeper": "2.2.0",
         "ts-jest": "28.0.4",

package/dist/sdk/app/backups/exports.js CHANGED Viewed

@@ -45,12 +45,18 @@ function tarFilesToTmp(tmpDir, files) {
  */
 function exportDB(dbName, opts = {}) {
     return __awaiter(this, void 0, void 0, function* () {
+        const exportOpts = {
+            filter: opts === null || opts === void 0 ? void 0 : opts.filter,
+            batch_size: 1000,
+            batch_limit: 5,
+            style: "main_only",
+        };
         return backend_core_1.db.doWithDB(dbName, (db) => __awaiter(this, void 0, void 0, function* () {
             // Write the dump to file if required
             if (opts === null || opts === void 0 ? void 0 : opts.exportPath) {
                 const path = opts === null || opts === void 0 ? void 0 : opts.exportPath;
                 const writeStream = fs_1.default.createWriteStream(path);
-                yield db.dump(writeStream, { filter: opts === null || opts === void 0 ? void 0 : opts.filter });
+                yield db.dump(writeStream, exportOpts);
                 return path;
             }
             else {
@@ -60,7 +66,7 @@ function exportDB(dbName, opts = {}) {
                 memStream.on("data", (chunk) => {
                     appString += chunk.toString();
                 });
-                yield db.dump(memStream, { filter: opts === null || opts === void 0 ? void 0 : opts.filter });
+                yield db.dump(memStream, exportOpts);
                 return appString;
             }
         }));

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

@@ -89,6 +89,9 @@ function removeSecrets(datasources) {
         const definitions = yield (0, integrations_1.getDefinitions)();
         for (let datasource of datasources) {
             const schema = definitions[datasource.source];
+            if (!schema) {
+                continue;
+            }
             if (datasource.config) {
                 // strip secrets from response, so they don't show in the network request
                 if (datasource.config.auth) {