@budibase/server 1.0.200-alpha.5 → 1.0.200

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.200-alpha.4",
+    "version": "1.0.199",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -9,9 +9,7 @@
         "url": "https://github.com/Budibase/budibase.git"
     },
     "scripts": {
-        "prebuild": "rimraf dist/",
-        "build": "tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/",
-        "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
+        "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/ && yarn postbuild",
         "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",
@@ -39,11 +37,6 @@
     "jest": {
         "preset": "ts-jest",
         "testEnvironment": "node",
-        "moduleNameMapper": {
-            "@budibase/backend-core/(.*)": "<rootDir>/../backend-core/$1",
-            "@budibase/backend-core": "<rootDir>/../backend-core/src",
-            "@budibase/types": "<rootDir>/../types/src"
-        },
         "setupFiles": [
             "./scripts/jestSetup.js"
         ],
@@ -76,123 +69,120 @@
     "author": "Budibase",
     "license": "GPL-3.0",
     "dependencies": {
-        "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.0.200-alpha.4",
-        "@budibase/client": "^1.0.200-alpha.4",
-        "@budibase/pro": "1.0.200-alpha.4",
-        "@budibase/string-templates": "^1.0.200-alpha.4",
-        "@bull-board/api": "3.7.0",
-        "@bull-board/koa": "3.9.4",
+        "@apidevtools/swagger-parser": "^10.0.3",
+        "@budibase/backend-core": "^1.0.199",
+        "@budibase/client": "^1.0.199",
+        "@budibase/pro": "1.0.199",
+        "@budibase/string-templates": "^1.0.199",
+        "@bull-board/api": "^3.7.0",
+        "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
-        "@google-cloud/firestore": "5.0.2",
+        "@google-cloud/firestore": "^5.0.2",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
         "@sentry/node": "6.17.7",
+        "@types/global-agent": "^2.1.1",
+        "@types/koa__router": "^8.0.11",
         "airtable": "0.10.1",
         "arangojs": "7.2.0",
-        "aws-sdk": "2.1030.0",
+        "aws-sdk": "^2.767.0",
         "bcryptjs": "2.4.3",
-        "bull": "3.29.3",
+        "bull": "^3.22.4",
         "chmodr": "1.2.0",
         "csvtojson": "2.0.10",
-        "curlconverter": "3.21.0",
+        "curlconverter": "^3.21.0",
         "dotenv": "8.2.0",
         "download": "8.0.0",
         "fix-path": "3.0.0",
-        "form-data": "4.0.0",
+        "form-data": "^4.0.0",
         "fs-extra": "8.1.0",
-        "global-agent": "3.0.0",
-        "google-auth-library": "7.12.0",
-        "google-spreadsheet": "3.2.0",
+        "global-agent": "^3.0.0",
+        "google-auth-library": "^7.11.0",
+        "google-spreadsheet": "^3.2.0",
         "jimp": "0.16.1",
         "joi": "17.2.1",
-        "js-yaml": "4.1.0",
+        "js-yaml": "^4.1.0",
         "jsonschema": "1.4.0",
-        "knex": "0.95.15",
+        "knex": "^0.95.6",
         "koa": "2.7.0",
         "koa-body": "4.2.0",
         "koa-compress": "4.0.1",
-        "koa-connect": "2.1.0",
+        "koa-connect": "^2.1.0",
         "koa-pino-logger": "3.0.0",
         "koa-send": "5.0.0",
         "koa-session": "5.12.0",
         "koa-static": "5.0.0",
-        "koa2-ratelimit": "1.1.0",
+        "koa2-ratelimit": "^1.1.0",
         "lodash": "4.17.21",
-        "memorystream": "0.3.1",
+        "memorystream": "^0.3.1",
         "mongodb": "3.6.3",
         "mssql": "6.2.3",
-        "mysql2": "2.3.3",
+        "mysql2": "^2.3.1",
         "node-fetch": "2.6.7",
-        "open": "8.4.0",
+        "open": "^8.4.0",
         "pg": "8.5.1",
         "pino-pretty": "4.0.0",
-        "posthog-node": "1.3.0",
+        "posthog-node": "^1.1.4",
         "pouchdb": "7.3.0",
-        "pouchdb-adapter-memory": "7.2.2",
+        "pouchdb-adapter-memory": "^7.2.1",
         "pouchdb-all-dbs": "1.0.2",
-        "pouchdb-find": "7.2.2",
+        "pouchdb-find": "^7.2.2",
         "pouchdb-replication-stream": "1.2.9",
         "redis": "4",
         "server-destroy": "1.0.1",
-        "svelte": "3.44.1",
-        "swagger-parser": "10.0.3",
+        "svelte": "^3.38.2",
+        "swagger-parser": "^10.0.3",
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",
         "validate.js": "0.13.1",
-        "vm2": "3.9.6",
-        "worker-farm": "1.7.0",
-        "xml2js": "0.4.23",
+        "vm2": "^3.9.3",
+        "worker-farm": "^1.7.0",
+        "xml2js": "^0.4.23",
         "yargs": "13.2.4",
         "zlib": "1.0.5"
     },
     "devDependencies": {
-        "@babel/core": "7.17.4",
-        "@babel/preset-env": "7.16.11",
+        "@babel/core": "^7.14.3",
+        "@babel/preset-env": "^7.14.4",
         "@budibase/standard-components": "^0.9.139",
-        "@budibase/types": "^1.0.200-alpha.4",
-        "@jest/test-sequencer": "24.9.0",
-        "@types/apidoc": "0.50.0",
-        "@types/bson": "4.2.0",
-        "@types/bull": "3.15.8",
-        "@types/global-agent": "2.1.1",
-        "@types/google-spreadsheet": "3.1.5",
-        "@types/jest": "27.5.1",
-        "@types/koa": "2.13.4",
-        "@types/koa__router": "8.0.0",
+        "@jest/test-sequencer": "^24.8.0",
+        "@types/apidoc": "^0.50.0",
+        "@types/bson": "^4.2.0",
+        "@types/bull": "^3.15.1",
+        "@types/google-spreadsheet": "^3.1.5",
+        "@types/jest": "^27.4.1",
+        "@types/koa": "^2.13.3",
+        "@types/koa-router": "^7.4.2",
         "@types/lodash": "4.14.180",
         "@types/mongodb": "3.6.3",
-        "@types/node": "14.18.20",
-        "@types/node-fetch": "2.6.1",
-        "@types/oracledb": "5.2.2",
-        "@types/redis": "4.0.11",
+        "@types/node": "^15.12.4",
+        "@types/oracledb": "^5.2.1",
+        "@types/redis": "^4.0.11",
         "@typescript-eslint/parser": "5.12.0",
-        "apidoc": "0.50.4",
-        "babel-jest": "27.5.1",
-        "copyfiles": "2.4.1",
-        "docker-compose": "0.23.17",
-        "eslint": "6.8.0",
-        "ioredis-mock": "7.2.0",
-        "is-wsl": "2.2.0",
-        "jest": "27.5.1",
-        "jest-openapi": "0.14.2",
-        "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",
-        "swagger-jsdoc": "6.1.0",
-        "timekeeper": "2.2.0",
-        "ts-jest": "27.1.3",
-        "ts-node": "10.5.0",
-        "tsconfig-paths": "4.0.0",
-        "typescript": "4.6.2",
-        "update-dotenv": "1.1.1"
+        "apidoc": "^0.50.2",
+        "babel-jest": "^27.0.2",
+        "copyfiles": "^2.4.1",
+        "docker-compose": "^0.23.6",
+        "eslint": "^6.8.0",
+        "ioredis-mock": "^7.2.0",
+        "is-wsl": "^2.2.0",
+        "jest": "^27.0.5",
+        "jest-openapi": "^0.14.2",
+        "nodemon": "^2.0.4",
+        "openapi-types": "^9.3.1",
+        "openapi-typescript": "^5.2.0",
+        "path-to-regexp": "^6.2.0",
+        "prettier": "^2.3.1",
+        "rimraf": "^3.0.2",
+        "supertest": "^4.0.2",
+        "swagger-jsdoc": "^6.1.0",
+        "ts-jest": "^27.0.3",
+        "ts-node": "^10.0.0",
+        "typescript": "^4.5.5",
+        "update-dotenv": "^1.1.1"
     },
     "optionalDependencies": {
-        "oracledb": "5.3.0"
+        "oracledb": "^5.3.0"
     },
     "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
 }

package/dist/tests/utilities/TestConfiguration.js

@@ -48,9 +48,6 @@ class TestConfiguration {
     getAppId() {
         return this.appId;
     }
-    getProdAppId() {
-        return this.prodAppId;
-    }
     doInContext(appId, task) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!appId) {
@@ -69,24 +66,6 @@ class TestConfiguration {
             });
         });
     }
-    // SETUP /  TEARDOWN
-    // use a new id as the name to avoid name collisions
-    init(appName = newid()) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.globalUser();
-            return this.createApp(appName);
-        });
-    }
-    end() {
-        if (!this) {
-            return;
-        }
-        if (this.server) {
-            this.server.close();
-        }
-        cleanup(this.allApps.map(app => app.appId));
-    }
-    // UTILS
     _req(config, params, controlFunc) {
         return __awaiter(this, void 0, void 0, function* () {
             const request = {};
@@ -108,8 +87,24 @@ class TestConfiguration {
             }));
         });
     }
-    // USER / AUTH
-    globalUser({ id = GLOBAL_USER_ID, builder = true, admin = false, email = EMAIL, roles, } = {}) {
+    generateApiKey(userId = GLOBAL_USER_ID) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
+                const id = generateDevInfoID(userId);
+                let devInfo;
+                try {
+                    devInfo = yield db.get(id);
+                }
+                catch (err) {
+                    devInfo = { _id: id, userId };
+                }
+                devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
+                yield db.put(devInfo);
+                return devInfo.apiKey;
+            }));
+        });
+    }
+    globalUser({ id = GLOBAL_USER_ID, builder = true, email = EMAIL, roles, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
                 let existing;
@@ -131,75 +126,26 @@ class TestConfiguration {
                 else {
                     user.builder = { global: false };
                 }
-                if (admin) {
-                    user.admin = { global: true };
-                }
-                else {
-                    user.admin = { global: false };
-                }
                 const resp = yield db.put(user);
                 return Object.assign({ _rev: resp._rev }, user);
             }));
         });
     }
-    createUser(id = null, email = EMAIL, builder = true, admin = false, roles = {}) {
+    // use a new id as the name to avoid name collisions
+    init(appName = newid()) {
         return __awaiter(this, void 0, void 0, function* () {
-            const globalId = !id ? `us_${Math.random()}` : `us_${id}`;
-            const resp = yield this.globalUser({
-                id: globalId,
-                email,
-                builder,
-                admin,
-                roles,
-            });
-            yield userCache.invalidateUser(globalId);
-            return Object.assign(Object.assign({}, resp), { globalId });
+            yield this.globalUser();
+            return this.createApp(appName);
         });
     }
-    login({ roleId, userId, builder, prodApp = false } = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const appId = prodApp ? this.prodAppId : this.appId;
-            return context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
-                userId = !userId ? `us_uuid1` : userId;
-                if (!this.request) {
-                    throw "Server has not been opened, cannot login.";
-                }
-                // make sure the user exists in the global DB
-                if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
-                    yield this.globalUser({
-                        id: userId,
-                        builder,
-                        roles: { [this.prodAppId]: roleId },
-                    });
-                }
-                yield createASession(userId, {
-                    sessionId: "sessionid",
-                    tenantId: TENANT_ID,
-                });
-                // have to fake this
-                const auth = {
-                    userId,
-                    sessionId: "sessionid",
-                    tenantId: TENANT_ID,
-                };
-                const app = {
-                    roleId: roleId,
-                    appId,
-                };
-                const authToken = jwt.sign(auth, env.JWT_SECRET);
-                const appToken = jwt.sign(app, env.JWT_SECRET);
-                // returning necessary request headers
-                yield userCache.invalidateUser(userId);
-                return {
-                    Accept: "application/json",
-                    Cookie: [
-                        `${Cookies.Auth}=${authToken}`,
-                        `${Cookies.CurrentApp}=${appToken}`,
-                    ],
-                    [Headers.APP_ID]: appId,
-                };
-            }));
-        });
+    end() {
+        if (!this) {
+            return;
+        }
+        if (this.server) {
+            this.server.close();
+        }
+        cleanup(this.allApps.map(app => app.appId));
     }
     defaultHeaders(extras = {}) {
         const auth = {
@@ -237,25 +183,6 @@ class TestConfiguration {
             return this.login({ email, roleId, builder, prodApp });
         });
     }
-    // API
-    generateApiKey(userId = GLOBAL_USER_ID) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return doWithGlobalDB(TENANT_ID, (db) => __awaiter(this, void 0, void 0, function* () {
-                const id = generateDevInfoID(userId);
-                let devInfo;
-                try {
-                    devInfo = yield db.get(id);
-                }
-                catch (err) {
-                    devInfo = { _id: id, userId };
-                }
-                devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`);
-                yield db.put(devInfo);
-                return devInfo.apiKey;
-            }));
-        });
-    }
-    // APP
     createApp(appName) {
         return __awaiter(this, void 0, void 0, function* () {
             // create dev app
@@ -283,7 +210,6 @@ class TestConfiguration {
             }));
         });
     }
-    // TABLE
     updateTable(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicTable();
@@ -337,7 +263,6 @@ class TestConfiguration {
             return this.createTable(table);
         });
     }
-    // ROW
     createRow(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.table) {
@@ -361,7 +286,6 @@ class TestConfiguration {
             return this._req(null, { tableId }, controllers.row.fetch);
         });
     }
-    // ROLE
     createRole(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicRole();
@@ -377,20 +301,19 @@ class TestConfiguration {
             }, controllers.perms.addPermission);
         });
     }
-    // VIEW
     createView(config) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.table) {
                 throw "Test requires table to be configured.";
             }
             const view = config || {
+                map: "function(doc) { emit(doc[doc.key], doc._id); } ",
                 tableId: this.table._id,
                 name: "ViewTest",
             };
             return this._req(view, null, controllers.view.save);
         });
     }
-    // AUTOMATION
     createAutomation(config) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicAutomation();
@@ -415,16 +338,6 @@ class TestConfiguration {
             return this._req(null, { id: automation._id, rev: automation._rev }, controllers.automation.destroy);
         });
     }
-    createWebhook(config = null) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.automation) {
-                throw "Must create an automation before creating webhook.";
-            }
-            config = config || basicWebhook(this.automation._id);
-            return (yield this._req(config, null, controllers.webhook.save)).webhook;
-        });
-    }
-    // DATASOURCE
     createDatasource(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicDatasource();
@@ -465,7 +378,6 @@ class TestConfiguration {
             return { datasource, query: basedOnQuery };
         });
     }
-    // QUERY
     previewQuery(request, config, datasource, fields) {
         return __awaiter(this, void 0, void 0, function* () {
             return request
@@ -491,19 +403,79 @@ class TestConfiguration {
             return this._req(config, null, controllers.query.save);
         });
     }
-    // SCREEN
     createScreen(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicScreen();
             return this._req(config, null, controllers.screen.save);
         });
     }
-    // LAYOUT
+    createWebhook(config = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.automation) {
+                throw "Must create an automation before creating webhook.";
+            }
+            config = config || basicWebhook(this.automation._id);
+            return (yield this._req(config, null, controllers.webhook.save)).webhook;
+        });
+    }
     createLayout(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             config = config || basicLayout();
             return yield this._req(config, null, controllers.layout.save);
         });
     }
+    createUser(id = null, email = EMAIL) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const globalId = !id ? `us_${Math.random()}` : `us_${id}`;
+            const resp = yield this.globalUser({ id: globalId, email });
+            yield userCache.invalidateUser(globalId);
+            return Object.assign(Object.assign({}, resp), { globalId });
+        });
+    }
+    login({ roleId, userId, builder, prodApp = false } = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const appId = prodApp ? this.prodAppId : this.appId;
+            return context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+                userId = !userId ? `us_uuid1` : userId;
+                if (!this.request) {
+                    throw "Server has not been opened, cannot login.";
+                }
+                // make sure the user exists in the global DB
+                if (roleId !== BUILTIN_ROLE_IDS.PUBLIC) {
+                    yield this.globalUser({
+                        id: userId,
+                        builder,
+                        roles: { [this.prodAppId]: roleId },
+                    });
+                }
+                yield createASession(userId, {
+                    sessionId: "sessionid",
+                    tenantId: TENANT_ID,
+                });
+                // have to fake this
+                const auth = {
+                    userId,
+                    sessionId: "sessionid",
+                    tenantId: TENANT_ID,
+                };
+                const app = {
+                    roleId: roleId,
+                    appId,
+                };
+                const authToken = jwt.sign(auth, env.JWT_SECRET);
+                const appToken = jwt.sign(app, env.JWT_SECRET);
+                // returning necessary request headers
+                yield userCache.invalidateUser(userId);
+                return {
+                    Accept: "application/json",
+                    Cookie: [
+                        `${Cookies.Auth}=${authToken}`,
+                        `${Cookies.CurrentApp}=${appToken}`,
+                    ],
+                    [Headers.APP_ID]: appId,
+                };
+            }));
+        });
+    }
 }
 module.exports = TestConfiguration;

package/dist/tests/utilities/structures.js

@@ -4,8 +4,6 @@ const { BUILTIN_PERMISSION_IDS } = require("@budibase/backend-core/permissions")
 const { createHomeScreen } = require("../../constants/screens");
 const { EMPTY_LAYOUT } = require("../../constants/layouts");
 const { cloneDeep } = require("lodash/fp");
-const { v4: uuidv4 } = require("uuid");
-const { TRIGGER_DEFINITIONS, ACTION_DEFINITIONS } = require("../../automations");
 exports.TENANT_ID = "default";
 exports.basicTable = () => {
     return {
@@ -28,49 +26,6 @@ exports.basicTable = () => {
         },
     };
 };
-exports.basicView = tableId => {
-    return {
-        tableId,
-        name: "ViewTest",
-    };
-};
-exports.filterView = tableId => {
-    return Object.assign(Object.assign({}, this.basicView(tableId)), { filters: [
-            {
-                value: 0,
-                condition: "MT",
-                key: "count",
-            },
-        ] });
-};
-exports.calculationView = tableId => {
-    return Object.assign(Object.assign({}, this.basicView(tableId)), { field: "count", calculation: "sum" });
-};
-exports.view = tableId => {
-    return Object.assign(Object.assign({}, this.filterView(tableId)), this.calculationView(tableId));
-};
-exports.automationStep = (actionDefinition = ACTION_DEFINITIONS.CREATE_ROW) => {
-    return Object.assign({ id: uuidv4() }, actionDefinition);
-};
-exports.automationTrigger = (triggerDefinition = TRIGGER_DEFINITIONS.ROW_SAVED) => {
-    return Object.assign({ id: uuidv4() }, triggerDefinition);
-};
-exports.newAutomation = ({ steps, trigger } = {}) => {
-    const automation = exports.basicAutomation();
-    if (trigger) {
-        automation.definition.trigger = trigger;
-    }
-    else {
-        automation.definition.trigger = exports.automationTrigger();
-    }
-    if (steps) {
-        automation.definition.steps = steps;
-    }
-    else {
-        automation.definition.steps = [exports.automationStep()];
-    }
-    return automation;
-};
 exports.basicAutomation = () => {
     return {
         name: "My Automation",