@budibase/server 2.1.43-alpha.6 → 2.1.44

package/dist/db/views/staticViews.js

@@ -8,11 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAllSearchIndex = exports.createRoutingView = exports.createLinkView = void 0;
-const backend_core_1 = require("@budibase/backend-core");
-const utils_1 = require("../utils");
-const SCREEN_PREFIX = utils_1.DocumentType.SCREEN + utils_1.SEPARATOR;
+const { getAppDB } = require("@budibase/backend-core/context");
+const { DocumentType, SEPARATOR, ViewName, SearchIndexes } = require("../utils");
+const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR;
 /**************************************************
  *                  INFORMATION                   *
  * This file exists purely to keep views separate *
@@ -29,48 +27,42 @@ const SCREEN_PREFIX = utils_1.DocumentType.SCREEN + utils_1.SEPARATOR;
  * @returns {Promise<void>} The view now exists, please note that the next view of this query will actually build it,
  * so it may be slow.
  */
-function createLinkView() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const designDoc = yield db.get("_design/database");
-        const view = {
-            map: function (doc) {
-                // everything in this must remain constant as its going to Pouch, no external variables
-                if (doc.type === "link") {
-                    let doc1 = doc.doc1;
-                    let doc2 = doc.doc2;
+exports.createLinkView = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
+    const designDoc = yield db.get("_design/database");
+    const view = {
+        map: function (doc) {
+            // everything in this must remain constant as its going to Pouch, no external variables
+            if (doc.type === "link") {
+                let doc1 = doc.doc1;
+                let doc2 = doc.doc2;
+                // eslint-disable-next-line no-undef
+                emit([doc1.tableId, doc1.rowId], {
+                    id: doc2.rowId,
+                    thisId: doc1.rowId,
+                    fieldName: doc1.fieldName,
+                });
+                // if linking to same table can't emit twice
+                if (doc1.tableId !== doc2.tableId) {
                     // eslint-disable-next-line no-undef
-                    // @ts-ignore
-                    emit([doc1.tableId, doc1.rowId], {
-                        id: doc2.rowId,
-                        thisId: doc1.rowId,
-                        fieldName: doc1.fieldName,
+                    emit([doc2.tableId, doc2.rowId], {
+                        id: doc1.rowId,
+                        thisId: doc2.rowId,
+                        fieldName: doc2.fieldName,
                     });
-                    // if linking to same table can't emit twice
-                    if (doc1.tableId !== doc2.tableId) {
-                        // eslint-disable-next-line no-undef
-                        // @ts-ignore
-                        emit([doc2.tableId, doc2.rowId], {
-                            id: doc1.rowId,
-                            thisId: doc2.rowId,
-                            fieldName: doc2.fieldName,
-                        });
-                    }
                 }
-            }.toString(),
-        };
-        designDoc.views = Object.assign(Object.assign({}, designDoc.views), { [utils_1.ViewName.LINK]: view });
-        yield db.put(designDoc);
-    });
-}
-exports.createLinkView = createLinkView;
-function createRoutingView() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
-        const designDoc = yield db.get("_design/database");
-        const view = {
-            // if using variables in a map function need to inject them before use
-            map: `function(doc) {
+            }
+        }.toString(),
+    };
+    designDoc.views = Object.assign(Object.assign({}, designDoc.views), { [ViewName.LINK]: view });
+    yield db.put(designDoc);
+});
+exports.createRoutingView = () => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
+    const designDoc = yield db.get("_design/database");
+    const view = {
+        // if using variables in a map function need to inject them before use
+        map: `function(doc) {
       if (doc._id.startsWith("${SCREEN_PREFIX}")) {
         emit(doc._id, {
           id: doc._id,
@@ -78,15 +70,13 @@ function createRoutingView() {
         })
       }
     }`,
-        };
-        designDoc.views = Object.assign(Object.assign({}, designDoc.views), { [utils_1.ViewName.ROUTING]: view });
-        yield db.put(designDoc);
-    });
-}
-exports.createRoutingView = createRoutingView;
+    };
+    designDoc.views = Object.assign(Object.assign({}, designDoc.views), { [ViewName.ROUTING]: view });
+    yield db.put(designDoc);
+});
 function searchIndex(indexName, fnString) {
     return __awaiter(this, void 0, void 0, function* () {
-        const db = backend_core_1.context.getAppDB();
+        const db = getAppDB();
         const designDoc = yield db.get("_design/database");
         designDoc.indexes = {
             [indexName]: {
@@ -97,47 +87,40 @@ function searchIndex(indexName, fnString) {
         yield db.put(designDoc);
     });
 }
-function createAllSearchIndex() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield searchIndex(utils_1.SearchIndexes.ROWS, function (doc) {
-            function idx(input, prev) {
-                for (let key of Object.keys(input)) {
-                    let idxKey = prev != null ? `${prev}.${key}` : key;
-                    idxKey = idxKey.replace(/ /g, "_");
-                    if (Array.isArray(input[key])) {
-                        for (let val of input[key]) {
-                            if (typeof val !== "object") {
-                                // eslint-disable-next-line no-undef
-                                // @ts-ignore
-                                index(idxKey, val, { store: true });
-                            }
+exports.createAllSearchIndex = () => __awaiter(void 0, void 0, void 0, function* () {
+    yield searchIndex(SearchIndexes.ROWS, function (doc) {
+        function idx(input, prev) {
+            for (let key of Object.keys(input)) {
+                let idxKey = prev != null ? `${prev}.${key}` : key;
+                idxKey = idxKey.replace(/ /g, "_");
+                if (Array.isArray(input[key])) {
+                    for (let val of input[key]) {
+                        if (typeof val !== "object") {
+                            // eslint-disable-next-line no-undef
+                            index(idxKey, val, { store: true });
                         }
                     }
-                    else if (key === "_id" || key === "_rev" || input[key] == null) {
-                        continue;
-                    }
-                    if (typeof input[key] === "string") {
-                        // eslint-disable-next-line no-undef
-                        // @ts-ignore
-                        index(idxKey, input[key].toLowerCase(), { store: true });
-                    }
-                    else if (typeof input[key] !== "object") {
-                        // eslint-disable-next-line no-undef
-                        // @ts-ignore
-                        index(idxKey, input[key], { store: true });
-                    }
-                    else {
-                        idx(input[key], idxKey);
-                    }
+                }
+                else if (key === "_id" || key === "_rev" || input[key] == null) {
+                    continue;
+                }
+                if (typeof input[key] === "string") {
+                    // eslint-disable-next-line no-undef
+                    index(idxKey, input[key].toLowerCase(), { store: true });
+                }
+                else if (typeof input[key] !== "object") {
+                    // eslint-disable-next-line no-undef
+                    index(idxKey, input[key], { store: true });
+                }
+                else {
+                    idx(input[key], idxKey);
                 }
             }
-            if (doc._id.startsWith("ro_")) {
-                // eslint-disable-next-line no-undef
-                // @ts-ignore
-                index("default", doc._id);
-                idx(doc);
-            }
-        }.toString());
-    });
-}
-exports.createAllSearchIndex = createAllSearchIndex;
+        }
+        if (doc._id.startsWith("ro_")) {
+            // eslint-disable-next-line no-undef
+            index("default", doc._id);
+            idx(doc);
+        }
+    }.toString());
+});

package/dist/environment.js

@@ -1,5 +1,5 @@
 "use strict";
-const path_1 = require("path");
+const { join } = require("path");
 function isTest() {
     return isCypress() || isJest();
 }
@@ -17,7 +17,7 @@ function isCypress() {
 let LOADED = false;
 if (!LOADED && isDev() && !isTest()) {
     require("dotenv").config({
-        path: (0, path_1.join)(__dirname, "..", ".env"),
+        path: join(__dirname, "..", ".env"),
     });
     LOADED = true;
 }
@@ -27,7 +27,7 @@ function parseIntSafe(number) {
     }
 }
 let inThread = false;
-const environment = {
+module.exports = {
     // important - prefer app port to generic port
     PORT: process.env.APP_PORT || process.env.PORT,
     JWT_SECRET: process.env.JWT_SECRET,
@@ -78,8 +78,7 @@ const environment = {
     CLIENT_ID: process.env.CLIENT_ID,
     _set(key, value) {
         process.env[key] = value;
-        // @ts-ignore
-        environment[key] = value;
+        module.exports[key] = value;
     },
     isTest,
     isJest,
@@ -98,14 +97,12 @@ const environment = {
 };
 // threading can cause memory issues with node-ts in development
 if (isDev() && module.exports.DISABLE_THREADING == null) {
-    environment._set("DISABLE_THREADING", "1");
+    module.exports._set("DISABLE_THREADING", "1");
 }
 // clean up any environment variable edge cases
 for (let [key, value] of Object.entries(module.exports)) {
     // handle the edge case of "0" to disable an environment variable
     if (value === "0") {
-        // @ts-ignore
-        environment[key] = 0;
+        module.exports[key] = 0;
     }
 }
-module.exports = environment;

package/dist/events/AutomationEmitter.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const utils_1 = require("./utils");
-const index_1 = __importDefault(require("./index"));
-const environment_1 = __importDefault(require("../environment"));
+const { rowEmission, tableEmission } = require("./utils");
+const mainEmitter = require("./index");
+const env = require("../environment");
 // max number of automations that can chain on top of each other
 // TODO: in future make this configurable at the automation level
-const MAX_AUTOMATION_CHAIN = environment_1.default.SELF_HOSTED ? 5 : 0;
+const MAX_AUTOMATION_CHAIN = env.SELF_HOSTED ? 5 : 0;
 /**
  * Special emitter which takes the count of automation runs which have occurred and blocks an
  * automation from running if it has reached the maximum number of chained automations runs.
@@ -21,13 +18,13 @@ class AutomationEmitter {
             automationChainCount: chainCount,
         };
     }
-    emitRow(eventName, appId, row, table) {
+    emitRow(eventName, appId, row, table = null) {
         // don't emit even if we've reached max automation chain
         if (this.chainCount >= MAX_AUTOMATION_CHAIN) {
             return;
         }
-        (0, utils_1.rowEmission)({
-            emitter: index_1.default,
+        rowEmission({
+            emitter: mainEmitter,
             eventName,
             appId,
             row,
@@ -35,13 +32,13 @@ class AutomationEmitter {
             metadata: this.metadata,
         });
     }
-    emitTable(eventName, appId, table) {
+    emitTable(eventName, appId, table = null) {
         // don't emit even if we've reached max automation chain
         if (this.chainCount > MAX_AUTOMATION_CHAIN) {
             return;
         }
-        (0, utils_1.tableEmission)({
-            emitter: index_1.default,
+        tableEmission({
+            emitter: mainEmitter,
             eventName,
             appId,
             table,

package/dist/events/index.js

@@ -1,7 +1,25 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const BudibaseEmitter_1 = __importDefault(require("./BudibaseEmitter"));
-const emitter = new BudibaseEmitter_1.default();
+const EventEmitter = require("events").EventEmitter;
+const { rowEmission, tableEmission } = require("./utils");
+/**
+ * keeping event emitter in one central location as it might be used for things other than
+ * automations (what it was for originally) - having a central emitter will be useful in the
+ * future.
+ */
+/**
+ * Extending the standard emitter to some syntactic sugar and standardisation to the emitted event.
+ * This is specifically quite important for template strings used in automations.
+ */
+class BudibaseEmitter extends EventEmitter {
+    emitRow(eventName, appId, row, table = null) {
+        rowEmission({ emitter: this, eventName, appId, row, table });
+    }
+    emitTable(eventName, appId, table = null) {
+        tableEmission({ emitter: this, eventName, appId, table });
+    }
+    emitPort(portNumber) {
+        this.emit("internal:port", portNumber);
+    }
+}
+const emitter = new BudibaseEmitter();
 module.exports = emitter;

package/dist/events/utils.js

@@ -1,43 +1,35 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableEmission = exports.rowEmission = void 0;
-function rowEmission({ emitter, eventName, appId, row, table, metadata, }) {
+exports.rowEmission = ({ emitter, eventName, appId, row, table, metadata }) => {
     let event = {
         row,
         appId,
-        tableId: row === null || row === void 0 ? void 0 : row.tableId,
+        tableId: row.tableId,
     };
     if (table) {
         event.table = table;
     }
-    event.id = row === null || row === void 0 ? void 0 : row._id;
-    if (row === null || row === void 0 ? void 0 : row._rev) {
+    event.id = row._id;
+    if (row._rev) {
         event.revision = row._rev;
     }
     if (metadata) {
         event.metadata = metadata;
     }
     emitter.emit(eventName, event);
-}
-exports.rowEmission = rowEmission;
-function tableEmission({ emitter, eventName, appId, table, metadata, }) {
-    const tableId = table === null || table === void 0 ? void 0 : table._id;
-    const inputTable = table;
-    if (inputTable) {
-        inputTable.tableId = tableId;
-    }
+};
+exports.tableEmission = ({ emitter, eventName, appId, table, metadata }) => {
+    const tableId = table._id;
     let event = {
-        table: inputTable,
+        table: Object.assign(Object.assign({}, table), { tableId: tableId }),
         appId,
         tableId: tableId,
     };
     event.id = tableId;
-    if (table === null || table === void 0 ? void 0 : table._rev) {
+    if (table._rev) {
         event.revision = table._rev;
     }
     if (metadata) {
         event.metadata = metadata;
     }
     emitter.emit(eventName, event);
-}
-exports.tableEmission = tableEmission;
+};

package/dist/integrations/elasticsearch.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const elasticsearch_1 = require("@elastic/elasticsearch");
+const { Client } = require("@elastic/elasticsearch");
 const SCHEMA = {
     docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
     description: "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
@@ -22,21 +22,6 @@ const SCHEMA = {
             required: true,
             default: "http://localhost:9200",
         },
-        ssl: {
-            type: types_1.DatasourceFieldType.BOOLEAN,
-            default: false,
-            required: false,
-        },
-        rejectUnauthorized: {
-            type: types_1.DatasourceFieldType.BOOLEAN,
-            default: true,
-            required: false,
-        },
-        ca: {
-            type: types_1.DatasourceFieldType.LONGFORM,
-            default: false,
-            required: false,
-        },
     },
     query: {
         create: {
@@ -91,16 +76,7 @@ const SCHEMA = {
 class ElasticSearchIntegration {
     constructor(config) {
         this.config = config;
-        const clientConfig = {
-            node: this.config.url,
-        };
-        if (this.config.ssl) {
-            clientConfig.ssl = {
-                rejectUnauthorized: this.config.rejectUnauthorized,
-                ca: this.config.ca || undefined,
-            };
-        }
-        this.client = new elasticsearch_1.Client(clientConfig);
+        this.client = new Client({ node: config.url });
     }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/integrations/googlesheets.js

@@ -18,7 +18,9 @@ const utils_1 = require("./utils");
 const constants_1 = require("../constants");
 const google_spreadsheet_1 = require("google-spreadsheet");
 const environment_1 = __importDefault(require("../environment"));
-const backend_core_1 = require("@budibase/backend-core");
+const { getGlobalDB } = require("@budibase/backend-core/tenancy");
+const { getScopedConfig } = require("@budibase/backend-core/db");
+const { Configs } = require("@budibase/backend-core/constants");
 const fetch = require("node-fetch");
 const SCHEMA = {
     plus: true,
@@ -138,9 +140,9 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Initialise oAuth client
-                const db = backend_core_1.tenancy.getGlobalDB();
-                let googleConfig = yield backend_core_1.db.getScopedConfig(db, {
-                    type: backend_core_1.constants.Config.GOOGLE,
+                const db = getGlobalDB();
+                let googleConfig = yield getScopedConfig(db, {
+                    type: Configs.GOOGLE,
                 });
                 if (!googleConfig) {
                     googleConfig = {
@@ -225,7 +227,6 @@ class GoogleSheetsIntegration {
                 [constants_1.DataSourceOperation.UPDATE_TABLE]: () => this.updateTable(json.table),
                 [constants_1.DataSourceOperation.DELETE_TABLE]: () => { var _a; return this.deleteTable((_a = json === null || json === void 0 ? void 0 : json.table) === null || _a === void 0 ? void 0 : _a.name); },
             };
-            // @ts-ignore
             const internalQueryMethod = handlers[json.endpoint.operation];
             return yield internalQueryMethod();
         });

package/dist/integrations/index.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIntegration = exports.getDefinitions = void 0;
 const postgres_1 = __importDefault(require("./postgres"));
 const dynamodb_1 = __importDefault(require("./dynamodb"));
 const mongodb_1 = __importDefault(require("./mongodb"));
@@ -76,8 +75,8 @@ if (process.arch &&
     DEFINITIONS[types_1.SourceName.ORACLE] = oracle_1.default.schema;
     INTEGRATIONS[types_1.SourceName.ORACLE] = oracle_1.default.integration;
 }
-function getDefinitions() {
-    return __awaiter(this, void 0, void 0, function* () {
+module.exports = {
+    getDefinitions: () => __awaiter(void 0, void 0, void 0, function* () {
         const pluginSchemas = {};
         if (environment.SELF_HOSTED) {
             const plugins = yield (0, plugin_1.getPlugins)(types_1.PluginType.DATASOURCE);
@@ -91,12 +90,9 @@ function getDefinitions() {
             }
         }
         return Object.assign(Object.assign({}, cloneDeep(DEFINITIONS)), pluginSchemas);
-    });
-}
-exports.getDefinitions = getDefinitions;
-function getIntegration(integration) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
+    }),
+    getIntegration: (integration) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         if (INTEGRATIONS[integration]) {
             return INTEGRATIONS[integration];
         }
@@ -116,10 +112,5 @@ function getIntegration(integration) {
             }
         }
         throw new Error("No datasource implementation found.");
-    });
-}
-exports.getIntegration = getIntegration;
-exports.default = {
-    getDefinitions,
-    getIntegration,
+    }),
 };

package/dist/integrations/microsoftSqlServer.js

@@ -195,20 +195,15 @@ class SqlServerIntegration extends sql_1.default {
                     .filter((constraint) => constraint.CONSTRAINT_TYPE === "PRIMARY KEY")
                     .map((constraint) => constraint.COLUMN_NAME);
                 const autoColumns = columns
-                    .filter(col => col.IS_COMPUTED || col.IS_IDENTITY)
-                    .map(col => col.COLUMN_NAME);
-                const requiredColumns = columns
-                    .filter(col => col.IS_NULLABLE === "NO")
-                    .map(col => col.COLUMN_NAME);
+                    .filter((col) => col.IS_COMPUTED || col.IS_IDENTITY)
+                    .map((col) => col.COLUMN_NAME);
                 let schema = {};
                 for (let def of definition) {
                     const name = def.COLUMN_NAME;
                     if (typeof name !== "string") {
                         continue;
                     }
-                    schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find(col => col === name), name: name, constraints: {
-                            presence: requiredColumns.find(col => col === name),
-                        } }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
+                    schema[name] = Object.assign(Object.assign({ autocolumn: !!autoColumns.find((col) => col === name), name: name }, (0, utils_1.convertSqlType)(def.DATA_TYPE)), { externalType: def.DATA_TYPE });
                 }
                 tables[tableName] = {
                     _id: (0, utils_1.buildExternalTableId)(datasourceId, tableName),

package/dist/integrations/oracle.js

@@ -247,9 +247,7 @@ class OracleIntegration extends sql_1.default {
                     const columnName = oracleColumn.name;
                     let fieldSchema = table.schema[columnName];
                     if (!fieldSchema) {
-                        fieldSchema = Object.assign({ autocolumn: OracleIntegration.isAutoColumn(oracleColumn), name: columnName, constraints: {
-                                presence: false,
-                            } }, this.internalConvertType(oracleColumn));
+                        fieldSchema = Object.assign({ autocolumn: OracleIntegration.isAutoColumn(oracleColumn), name: columnName }, this.internalConvertType(oracleColumn));
                         table.schema[columnName] = fieldSchema;
                     }
                     // iterate each constraint on the column
@@ -257,11 +255,6 @@ class OracleIntegration extends sql_1.default {
                         if (oracleConstraint.type === OracleContraintTypes.PRIMARY) {
                             table.primary.push(columnName);
                         }
-                        else if (oracleConstraint.type === OracleContraintTypes.NOT_NULL_OR_CHECK) {
-                            table.schema[columnName].constraints = {
-                                presence: true,
-                            };
-                        }
                     });
                 });
             });

package/dist/integrations/postgres.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
 const sql_1 = __importDefault(require("./base/sql"));
-const utilities_1 = require("../utilities");
 const { Client, types } = require("pg");
+const { escapeDangerousCharacters } = require("../utilities");
 // Return "date" and "timestamp" types as plain strings.
 // This lets us reference the original stored timezone.
 // types is undefined when running in a test env for some reason.
@@ -163,7 +163,7 @@ class PostgresIntegration extends sql_1.default {
                 const matches = query.sql.match(JSON_REGEX);
                 if (matches && matches.length > 0) {
                     for (let match of matches) {
-                        const escaped = (0, utilities_1.escapeDangerousCharacters)(match);
+                        const escaped = escapeDangerousCharacters(match);
                         query.sql = query.sql.replace(match, escaped);
                     }
                 }
@@ -227,14 +227,11 @@ class PostgresIntegration extends sql_1.default {
                     const identity = !!(column.identity_generation ||
                         column.identity_start ||
                         column.identity_increment);
-                    const constraints = {
-                        presence: column.is_nullable === "NO",
-                    };
                     const hasDefault = typeof column.column_default === "string" &&
                         column.column_default.startsWith("nextval");
                     const isGenerated = column.is_generated && column.is_generated !== "NEVER";
                     const isAuto = hasDefault || identity || isGenerated;
-                    tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName, constraints }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
+                    tables[tableName].schema[columnName] = Object.assign(Object.assign({ autocolumn: isAuto, name: columnName }, (0, utils_1.convertSqlType)(column.data_type)), { externalType: column.data_type });
                 }
                 const final = (0, utils_1.finaliseExternalTables)(tables, entities);
                 this.tables = final.tables;