@budibase/server 2.2.12-alpha.5 → 2.2.12-alpha.50

package/dist/utilities/fileSystem/filesystem.js

@@ -13,23 +13,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteFolderFileSystem = exports.findFileRec = exports.extractTarball = exports.createTempFolder = exports.readFileSync = exports.sendTempFile = exports.stringToFileStream = exports.storeTempFile = exports.streamFile = exports.apiFileReturn = exports.loadHandlebarsFile = exports.checkDevelopmentEnvironment = exports.init = exports.TOP_LEVEL_PATH = void 0;
-const { budibaseTempDir } = require("../budibaseDir");
-const fs = require("fs");
-const { join } = require("path");
-const uuid = require("uuid/v4");
-const env = require("../../environment");
+const fs_1 = __importDefault(require("fs"));
+const budibaseDir_1 = require("../budibaseDir");
+const path_1 = require("path");
+const environment_1 = __importDefault(require("../../environment"));
 const tar_1 = __importDefault(require("tar"));
-exports.TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
+const uuid = require("uuid/v4");
+exports.TOP_LEVEL_PATH = (0, path_1.join)(__dirname, "..", "..", "..");
 /**
  * Upon first startup of instance there may not be everything we need in tmp directory, set it up.
  */
 const init = () => {
-    const tempDir = budibaseTempDir();
-    if (!fs.existsSync(tempDir)) {
+    const tempDir = (0, budibaseDir_1.budibaseTempDir)();
+    if (!fs_1.default.existsSync(tempDir)) {
         // some test cases fire this quickly enough that
         // synchronous cases can end up here at the same time
         try {
-            fs.mkdirSync(tempDir);
+            fs_1.default.mkdirSync(tempDir);
         }
         catch (err) {
             if (!err || err.code !== "EEXIST") {
@@ -37,9 +37,9 @@ const init = () => {
             }
         }
     }
-    const clientLibPath = join(budibaseTempDir(), "budibase-client.js");
-    if (env.isTest() && !fs.existsSync(clientLibPath)) {
-        fs.copyFileSync(require.resolve("@budibase/client"), clientLibPath);
+    const clientLibPath = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "budibase-client.js");
+    if (environment_1.default.isTest() && !fs_1.default.existsSync(clientLibPath)) {
+        fs_1.default.copyFileSync(require.resolve("@budibase/client"), clientLibPath);
     }
 };
 exports.init = init;
@@ -48,14 +48,14 @@ exports.init = init;
  * everything required to function is ready.
  */
 const checkDevelopmentEnvironment = () => {
-    if (!env.isDev() || env.isTest()) {
+    if (!environment_1.default.isDev() || environment_1.default.isTest()) {
         return;
     }
-    if (!fs.existsSync(budibaseTempDir())) {
-        fs.mkdirSync(budibaseTempDir());
+    if (!fs_1.default.existsSync((0, budibaseDir_1.budibaseTempDir)())) {
+        fs_1.default.mkdirSync((0, budibaseDir_1.budibaseTempDir)());
     }
     let error;
-    if (!fs.existsSync(join(process.cwd(), ".env"))) {
+    if (!fs_1.default.existsSync((0, path_1.join)(process.cwd(), ".env"))) {
         error = "Must run via yarn once to generate environment.";
     }
     if (error) {
@@ -72,7 +72,7 @@ exports.checkDevelopmentEnvironment = checkDevelopmentEnvironment;
  * @returns {string} The loaded handlebars file as a string - loaded as utf8.
  */
 const loadHandlebarsFile = (path) => {
-    return fs.readFileSync(path, "utf8");
+    return fs_1.default.readFileSync(path, "utf8");
 };
 exports.loadHandlebarsFile = loadHandlebarsFile;
 /**
@@ -82,13 +82,13 @@ exports.loadHandlebarsFile = loadHandlebarsFile;
  * @return {Object} the read stream which can be put into the koa context body.
  */
 const apiFileReturn = (contents) => {
-    const path = join(budibaseTempDir(), uuid());
-    fs.writeFileSync(path, contents);
-    return fs.createReadStream(path);
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), uuid());
+    fs_1.default.writeFileSync(path, contents);
+    return fs_1.default.createReadStream(path);
 };
 exports.apiFileReturn = apiFileReturn;
 const streamFile = (path) => {
-    return fs.createReadStream(path);
+    return fs_1.default.createReadStream(path);
 };
 exports.streamFile = streamFile;
 /**
@@ -97,8 +97,8 @@ exports.streamFile = streamFile;
  * @return {string} the path to the temp file.
  */
 const storeTempFile = (fileContents) => {
-    const path = join(budibaseTempDir(), uuid());
-    fs.writeFileSync(path, fileContents);
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), uuid());
+    fs_1.default.writeFileSync(path, fileContents);
     return path;
 };
 exports.storeTempFile = storeTempFile;
@@ -108,7 +108,7 @@ exports.storeTempFile = storeTempFile;
  */
 const stringToFileStream = (contents) => {
     const path = (0, exports.storeTempFile)(contents);
-    return fs.createReadStream(path);
+    return fs_1.default.createReadStream(path);
 };
 exports.stringToFileStream = stringToFileStream;
 /**
@@ -117,7 +117,7 @@ exports.stringToFileStream = stringToFileStream;
  */
 const sendTempFile = (fileContents) => {
     const path = (0, exports.storeTempFile)(fileContents);
-    return fs.createReadStream(path);
+    return fs_1.default.createReadStream(path);
 };
 exports.sendTempFile = sendTempFile;
 /**
@@ -125,17 +125,18 @@ exports.sendTempFile = sendTempFile;
  * allows a centralised location to check logic is all good.
  */
 const readFileSync = (filepath, options = "utf8") => {
-    return fs.readFileSync(filepath, options);
+    // @ts-ignore
+    return fs_1.default.readFileSync(filepath, options);
 };
 exports.readFileSync = readFileSync;
 const createTempFolder = (item) => {
-    const path = join(budibaseTempDir(), item);
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), item);
     try {
         // remove old tmp directories automatically - don't combine
-        if (fs.existsSync(path)) {
-            fs.rmSync(path, { recursive: true, force: true });
+        if (fs_1.default.existsSync(path)) {
+            fs_1.default.rmSync(path, { recursive: true, force: true });
         }
-        fs.mkdirSync(path);
+        fs_1.default.mkdirSync(path);
     }
     catch (err) {
         throw new Error(`Path cannot be created: ${err.message}`);
@@ -154,13 +155,14 @@ exports.extractTarball = extractTarball;
  * Find for a file recursively from start path applying filter, return first match
  */
 const findFileRec = (startPath, filter) => {
-    if (!fs.existsSync(startPath)) {
+    if (!fs_1.default.existsSync(startPath)) {
         return;
     }
-    const files = fs.readdirSync(startPath);
+    const files = fs_1.default.readdirSync(startPath);
     for (let i = 0, len = files.length; i < len; i++) {
-        const filename = join(startPath, files[i]);
-        const stat = fs.lstatSync(filename);
+        // @ts-ignore
+        const filename = (0, path_1.join)(startPath, files[i]);
+        const stat = fs_1.default.lstatSync(filename);
         if (stat.isDirectory()) {
             return (0, exports.findFileRec)(filename, filter);
         }
@@ -174,9 +176,9 @@ exports.findFileRec = findFileRec;
  * Remove a folder which is not empty from the file system
  */
 const deleteFolderFileSystem = (path) => {
-    if (!fs.existsSync(path)) {
+    if (!fs_1.default.existsSync(path)) {
         return;
     }
-    fs.rmSync(path, { recursive: true, force: true });
+    fs_1.default.rmSync(path, { recursive: true, force: true });
 };
 exports.deleteFolderFileSystem = deleteFolderFileSystem;

package/dist/utilities/fileSystem/plugin.js

@@ -8,18 +8,21 @@ 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.getDatasourcePlugin = exports.getPluginMetadata = void 0;
-const { budibaseTempDir } = require("../budibaseDir");
-const fs = require("fs");
-const { join } = require("path");
+const budibaseDir_1 = require("../budibaseDir");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
 const backend_core_1 = require("@budibase/backend-core");
-const DATASOURCE_PATH = join(budibaseTempDir(), "datasource");
+const DATASOURCE_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "datasource");
 const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function* () {
     let metadata = {};
     try {
-        const pkg = fs.readFileSync(join(path, "package.json"), "utf8");
-        const schema = fs.readFileSync(join(path, "schema.json"), "utf8");
+        const pkg = fs_1.default.readFileSync((0, path_1.join)(path, "package.json"), "utf8");
+        const schema = fs_1.default.readFileSync((0, path_1.join)(path, "schema.json"), "utf8");
         metadata.schema = JSON.parse(schema);
         metadata.package = JSON.parse(pkg);
         if (!metadata.package.name ||
@@ -37,13 +40,13 @@ exports.getPluginMetadata = getPluginMetadata;
 const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const hash = (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash;
-    if (!fs.existsSync(DATASOURCE_PATH)) {
-        fs.mkdirSync(DATASOURCE_PATH);
+    if (!fs_1.default.existsSync(DATASOURCE_PATH)) {
+        fs_1.default.mkdirSync(DATASOURCE_PATH);
     }
-    const filename = join(DATASOURCE_PATH, plugin.name);
+    const filename = (0, path_1.join)(DATASOURCE_PATH, plugin.name);
     const metadataName = `${filename}.bbmetadata`;
-    if (fs.existsSync(filename)) {
-        const currentHash = fs.readFileSync(metadataName, "utf8");
+    if (fs_1.default.existsSync(filename)) {
+        const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
         // if hash is the same return the file, otherwise remove it and re-download
         if (currentHash === hash) {
             return require(filename);
@@ -51,13 +54,13 @@ const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, functi
         else {
             console.log(`Updating plugin: ${plugin.name}`);
             delete require.cache[require.resolve(filename)];
-            fs.unlinkSync(filename);
+            fs_1.default.unlinkSync(filename);
         }
     }
     const pluginKey = backend_core_1.objectStore.getPluginJSKey(plugin);
     const pluginJs = yield backend_core_1.objectStore.retrieve(backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS, pluginKey);
-    fs.writeFileSync(filename, pluginJs);
-    fs.writeFileSync(metadataName, hash);
+    fs_1.default.writeFileSync(filename, pluginJs);
+    fs_1.default.writeFileSync(metadataName, hash);
     return require(filename);
 });
 exports.getDatasourcePlugin = getDatasourcePlugin;

package/dist/utilities/fileSystem/template.js

@@ -8,10 +8,13 @@ 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.downloadTemplate = exports.getTemplateStream = void 0;
-const fs = require("fs");
-const { join } = require("path");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
 const constants_1 = require("../../constants");
 const backend_core_1 = require("@budibase/backend-core");
 /**
@@ -21,12 +24,12 @@ const backend_core_1 = require("@budibase/backend-core");
  */
 const getTemplateStream = (template) => __awaiter(void 0, void 0, void 0, function* () {
     if (template.file) {
-        return fs.createReadStream(template.file.path);
+        return fs_1.default.createReadStream(template.file.path);
     }
     else {
         const [type, name] = template.key.split("/");
         const tmpPath = yield (0, exports.downloadTemplate)(type, name);
-        return fs.createReadStream(join(tmpPath, name, "db", "dump.txt"));
+        return fs_1.default.createReadStream((0, path_1.join)(tmpPath, name, "db", "dump.txt"));
     }
 });
 exports.getTemplateStream = getTemplateStream;

package/dist/utilities/schema.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parse = exports.validate = exports.isRows = exports.isSchema = void 0;
+const constants_1 = require("../constants");
+const PARSERS = {
+    [constants_1.FieldTypes.NUMBER]: (attribute) => {
+        if (!attribute) {
+            return attribute;
+        }
+        return Number(attribute);
+    },
+    [constants_1.FieldTypes.DATETIME]: (attribute) => {
+        if (!attribute) {
+            return attribute;
+        }
+        return new Date(attribute).toISOString();
+    },
+};
+function isSchema(schema) {
+    return (typeof schema === "object" &&
+        Object.values(schema).every(rawColumn => {
+            const column = rawColumn;
+            return (column !== null &&
+                typeof column === "object" &&
+                typeof column.type === "string" &&
+                Object.values(constants_1.FieldTypes).includes(column.type));
+        }));
+}
+exports.isSchema = isSchema;
+function isRows(rows) {
+    return Array.isArray(rows) && rows.every(row => typeof row === "object");
+}
+exports.isRows = isRows;
+function validate(rows, schema) {
+    const results = {
+        schemaValidation: {},
+        allValid: false,
+        invalidColumns: [],
+    };
+    rows.forEach(row => {
+        Object.entries(row).forEach(([columnName, columnData]) => {
+            var _a, _b;
+            const columnType = (_a = schema[columnName]) === null || _a === void 0 ? void 0 : _a.type;
+            const isAutoColumn = (_b = schema[columnName]) === null || _b === void 0 ? void 0 : _b.autocolumn;
+            // If the columnType is not a string, then it's not present in the schema, and should be added to the invalid columns array
+            if (typeof columnType !== "string") {
+                results.invalidColumns.push(columnName);
+            }
+            else if (
+            // If there's no data for this field don't bother with further checks
+            // If the field is already marked as invalid there's no need for further checks
+            results.schemaValidation[columnName] === false ||
+                columnData == null ||
+                isAutoColumn) {
+                return;
+            }
+            else if (columnType === constants_1.FieldTypes.NUMBER &&
+                isNaN(Number(columnData))) {
+                // If provided must be a valid number
+                results.schemaValidation[columnName] = false;
+            }
+            else if (
+            // If provided must be a valid date
+            columnType === constants_1.FieldTypes.DATETIME &&
+                isNaN(new Date(columnData).getTime())) {
+                results.schemaValidation[columnName] = false;
+            }
+            else {
+                results.schemaValidation[columnName] = true;
+            }
+        });
+    });
+    results.allValid =
+        Object.values(results.schemaValidation).length > 0 &&
+            Object.values(results.schemaValidation).every(column => column);
+    // Select unique values
+    results.invalidColumns = [...new Set(results.invalidColumns)];
+    return results;
+}
+exports.validate = validate;
+function parse(rows, schema) {
+    return rows.map(row => {
+        const parsedRow = {};
+        Object.entries(row).forEach(([columnName, columnData]) => {
+            var _a;
+            if (!(columnName in schema) || ((_a = schema[columnName]) === null || _a === void 0 ? void 0 : _a.autocolumn)) {
+                // Objects can be present in the row data but not in the schema, so make sure we don't proceed in such a case
+                return;
+            }
+            const columnType = schema[columnName].type;
+            if (columnType === constants_1.FieldTypes.NUMBER) {
+                // If provided must be a valid number
+                parsedRow[columnName] = columnData ? Number(columnData) : columnData;
+            }
+            else if (columnType === constants_1.FieldTypes.DATETIME) {
+                // If provided must be a valid date
+                parsedRow[columnName] = columnData
+                    ? new Date(columnData).toISOString()
+                    : columnData;
+            }
+            else {
+                parsedRow[columnName] = columnData;
+            }
+        });
+        return parsedRow;
+    });
+}
+exports.parse = parse;

package/dist/utilities/scriptRunner.js

@@ -2,6 +2,7 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const vm2_1 = require("vm2");
 const JS_TIMEOUT_MS = 1000;
@@ -22,4 +23,4 @@ class ScriptRunner {
         return this.results.out;
     }
 }
-module.exports = ScriptRunner;
+exports.default = ScriptRunner;

package/dist/utilities/statusCodes.js

@@ -1,5 +1,6 @@
 "use strict";
-module.exports = {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
     OK: 200,
     UNAUTHORIZED: 401,
     FORBIDDEN: 403,

package/dist/utilities/workerRequests.js

@@ -41,6 +41,8 @@ function request(ctx, request) {
     if (ctx && ctx.headers) {
         request.headers = ctx.headers;
     }
+    // add x-budibase-correlation-id header
+    backend_core_1.logging.correlation.setHeader(request.headers);
     return request;
 }
 exports.request = request;

package/dist/watch.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) {
@@ -37,13 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watch = void 0;
 const path_1 = __importDefault(require("path"));
-const env = __importStar(require("./environment"));
+const environment_1 = __importDefault(require("./environment"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const fs_1 = __importDefault(require("fs"));
 const backend_core_1 = require("@budibase/backend-core");
 const plugin_1 = require("./api/controllers/plugin");
 function watch() {
-    const watchPath = path_1.default.join(env.PLUGINS_DIR, "./**/*.tar.gz");
+    const watchPath = path_1.default.join(environment_1.default.PLUGINS_DIR, "./**/*.tar.gz");
     chokidar_1.default
         .watch(watchPath, {
         ignored: "**/node_modules",

package/jest.config.ts

@@ -2,15 +2,18 @@ import { Config } from "@jest/types"
 import * as fs from "fs"
 
 const config: Config.InitialOptions = {
-  preset: "ts-jest",
   testEnvironment: "node",
-  setupFiles: ["./src/tests/jestSetup.ts"],
+  setupFiles: ["./src/tests/jestEnv.ts"],
+  setupFilesAfterEnv: ["./src/tests/jestSetup.ts"],
   collectCoverageFrom: [
     "src/**/*.{js,ts}",
     // The use of coverage with couchdb view functions breaks tests
     "!src/db/views/staticViews.*",
   ],
   coverageReporters: ["lcov", "json", "clover"],
+  transform: {
+    "^.+\\.ts?$": "@swc/jest",
+  },
 }
 
 if (!process.env.CI) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.5",
+  "version": "2.2.12-alpha.50",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.2.12-alpha.5",
-    "@budibase/client": "2.2.12-alpha.5",
-    "@budibase/pro": "2.2.12-alpha.4",
-    "@budibase/string-templates": "2.2.12-alpha.5",
-    "@budibase/types": "2.2.12-alpha.5",
+    "@budibase/backend-core": "2.2.12-alpha.50",
+    "@budibase/client": "2.2.12-alpha.50",
+    "@budibase/pro": "2.2.12-alpha.49",
+    "@budibase/string-templates": "2.2.12-alpha.50",
+    "@budibase/types": "2.2.12-alpha.50",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -77,7 +77,7 @@
     "joi": "17.6.0",
     "js-yaml": "4.1.0",
     "jsonschema": "1.4.0",
-    "knex": "0.95.15",
+    "knex": "2.4.0",
     "koa": "2.13.4",
     "koa-body": "4.2.0",
     "koa-compress": "4.0.1",
@@ -123,6 +123,8 @@
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
     "@jest/test-sequencer": "24.9.0",
+    "@swc/core": "^1.3.25",
+    "@swc/jest": "^0.2.24",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
     "@types/global-agent": "2.1.1",
@@ -167,5 +169,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "1641ca6eacbaa560598d76801c2d4af1c3301f54"
+  "gitHead": "b6ca342ed964e28404648db0dc2ff63b82347a2a"
 }

package/scripts/dev/manage.js

@@ -29,6 +29,7 @@ async function init() {
       ACCOUNT_PORTAL_URL: "http://localhost:10001",
       ACCOUNT_PORTAL_API_KEY: "budibase",
       JWT_SECRET: "testsecret",
+      ENCRYPTION_KEY: "testsecret",
       REDIS_PASSWORD: "budibase",
       MINIO_ACCESS_KEY: "budibase",
       MINIO_SECRET_KEY: "budibase",