@budibase/server 1.2.37 → 1.2.39-alpha.1

package/dist/integrations/postgres.js

@@ -8,13 +8,16 @@ 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 });
-const datasource_1 = require("../definitions/datasource");
+const types_1 = require("@budibase/types");
 const utils_1 = require("./utils");
+const sql_1 = __importDefault(require("./base/sql"));
 var PostgresModule;
 (function (PostgresModule) {
     const { Client, types } = require("pg");
-    const Sql = require("./base/sql");
     const { escapeDangerousCharacters } = require("../utilities");
     // Return "date" and "timestamp" types as plain strings.
     // This lets us reference the original stored timezone.
@@ -33,69 +36,69 @@ var PostgresModule;
         description: "PostgreSQL, also known as Postgres, is a free and open-source relational database management system emphasizing extensibility and SQL compliance.",
         datasource: {
             host: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "localhost",
                 required: true,
             },
             port: {
-                type: datasource_1.DatasourceFieldTypes.NUMBER,
+                type: types_1.DatasourceFieldType.NUMBER,
                 required: true,
                 default: 5432,
             },
             database: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "postgres",
                 required: true,
             },
             user: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "root",
                 required: true,
             },
             password: {
-                type: datasource_1.DatasourceFieldTypes.PASSWORD,
+                type: types_1.DatasourceFieldType.PASSWORD,
                 default: "root",
                 required: true,
             },
             schema: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "public",
                 required: true,
             },
             ssl: {
-                type: datasource_1.DatasourceFieldTypes.BOOLEAN,
+                type: types_1.DatasourceFieldType.BOOLEAN,
                 default: false,
                 required: false,
             },
             rejectUnauthorized: {
-                type: datasource_1.DatasourceFieldTypes.BOOLEAN,
+                type: types_1.DatasourceFieldType.BOOLEAN,
                 default: false,
                 required: false,
             },
             ca: {
-                type: datasource_1.DatasourceFieldTypes.LONGFORM,
+                type: types_1.DatasourceFieldType.LONGFORM,
                 default: false,
                 required: false,
             },
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             read: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             update: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             delete: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
         },
     };
-    class PostgresIntegration extends Sql {
+    class PostgresIntegration extends sql_1.default {
         constructor(config) {
-            super(utils_1.SqlClients.POSTGRES);
+            super(utils_1.SqlClient.POSTGRES);
             this.index = 1;
             this.tables = {};
             this.schemaErrors = {};

package/dist/integrations/redis.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const datasource_1 = require("../definitions/datasource");
+const types_1 = require("@budibase/types");
 const ioredis_1 = __importDefault(require("ioredis"));
 var RedisModule;
 (function (RedisModule) {
@@ -43,36 +43,36 @@ var RedisModule;
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     key: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     value: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                     ttl: {
-                        type: datasource_1.DatasourceFieldTypes.NUMBER,
+                        type: types_1.DatasourceFieldType.NUMBER,
                     },
                 },
             },
             read: {
                 readable: true,
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     key: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
             },
             delete: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     key: {
-                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        type: types_1.DatasourceFieldType.STRING,
                         required: true,
                     },
                 },
@@ -80,7 +80,7 @@ var RedisModule;
             command: {
                 readable: true,
                 displayName: "Redis Command",
-                type: datasource_1.QueryTypes.JSON,
+                type: types_1.QueryType.JSON,
             },
         },
     };

package/dist/integrations/rest.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const types_1 = require("@budibase/types");
 const datasource_1 = require("../definitions/datasource");
 const lodash_1 = require("lodash");
 const BodyTypes = {
@@ -21,27 +22,27 @@ const BodyTypes = {
 };
 const coreFields = {
     path: {
-        type: datasource_1.DatasourceFieldTypes.STRING,
+        type: types_1.DatasourceFieldType.STRING,
         display: "URL",
     },
     queryString: {
-        type: datasource_1.DatasourceFieldTypes.STRING,
+        type: types_1.DatasourceFieldType.STRING,
     },
     headers: {
-        type: datasource_1.DatasourceFieldTypes.OBJECT,
+        type: types_1.DatasourceFieldType.OBJECT,
     },
     enabledHeaders: {
-        type: datasource_1.DatasourceFieldTypes.OBJECT,
+        type: types_1.DatasourceFieldType.OBJECT,
     },
     requestBody: {
-        type: datasource_1.DatasourceFieldTypes.JSON,
+        type: types_1.DatasourceFieldType.JSON,
     },
     bodyType: {
-        type: datasource_1.DatasourceFieldTypes.STRING,
+        type: types_1.DatasourceFieldType.STRING,
         enum: Object.values(BodyTypes),
     },
     pagination: {
-        type: datasource_1.DatasourceFieldTypes.OBJECT,
+        type: types_1.DatasourceFieldType.OBJECT,
     },
 };
 var RestModule;
@@ -59,13 +60,13 @@ var RestModule;
         type: "API",
         datasource: {
             url: {
-                type: datasource_1.DatasourceFieldTypes.STRING,
+                type: types_1.DatasourceFieldType.STRING,
                 default: "",
                 required: false,
                 deprecated: true,
             },
             defaultHeaders: {
-                type: datasource_1.DatasourceFieldTypes.OBJECT,
+                type: types_1.DatasourceFieldType.OBJECT,
                 required: false,
                 default: {},
             },
@@ -74,30 +75,30 @@ var RestModule;
             create: {
                 readable: true,
                 displayName: "POST",
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: coreFields,
             },
             read: {
                 displayName: "GET",
                 readable: true,
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: coreFields,
             },
             update: {
                 displayName: "PUT",
                 readable: true,
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: coreFields,
             },
             patch: {
                 displayName: "PATCH",
                 readable: true,
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: coreFields,
             },
             delete: {
                 displayName: "DELETE",
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: coreFields,
             },
         },

package/dist/integrations/s3.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const datasource_1 = require("../definitions/datasource");
+const types_1 = require("@budibase/types");
 var S3Module;
 (function (S3Module) {
     const AWS = require("aws-sdk");
@@ -44,7 +44,7 @@ var S3Module;
         },
         query: {
             read: {
-                type: datasource_1.QueryTypes.FIELDS,
+                type: types_1.QueryType.FIELDS,
                 fields: {
                     bucket: {
                         type: "string",

package/dist/integrations/snowflake.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const datasource_1 = require("../definitions/datasource");
+const types_1 = require("@budibase/types");
 const snowflake_promise_1 = require("snowflake-promise");
 var SnowflakeModule;
 (function (SnowflakeModule) {
@@ -46,16 +46,16 @@ var SnowflakeModule;
         },
         query: {
             create: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             read: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             update: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
             delete: {
-                type: datasource_1.QueryTypes.SQL,
+                type: types_1.QueryType.SQL,
             },
         },
     };

package/dist/integrations/utils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.finaliseExternalTables = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertSqlType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = exports.SqlClients = void 0;
-const datasource_1 = require("../definitions/datasource");
+exports.finaliseExternalTables = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertSqlType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = exports.SqlClient = void 0;
+const types_1 = require("@budibase/types");
 const utils_1 = require("../db/utils");
 const constants_1 = require("../constants");
 const DOUBLE_SEPARATOR = `${utils_1.SEPARATOR}${utils_1.SEPARATOR}`;
@@ -55,15 +55,15 @@ const SQL_MISC_TYPE_MAP = {
     json: constants_1.FieldTypes.JSON,
 };
 const SQL_TYPE_MAP = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, SQL_NUMBER_TYPE_MAP), SQL_DATE_TYPE_MAP), SQL_STRING_TYPE_MAP), SQL_BOOLEAN_TYPE_MAP), SQL_MISC_TYPE_MAP);
-var SqlClients;
-(function (SqlClients) {
-    SqlClients["MS_SQL"] = "mssql";
-    SqlClients["POSTGRES"] = "pg";
-    SqlClients["MY_SQL"] = "mysql2";
-    SqlClients["ORACLE"] = "oracledb";
-})(SqlClients = exports.SqlClients || (exports.SqlClients = {}));
+var SqlClient;
+(function (SqlClient) {
+    SqlClient["MS_SQL"] = "mssql";
+    SqlClient["POSTGRES"] = "pg";
+    SqlClient["MY_SQL"] = "mysql2";
+    SqlClient["ORACLE"] = "oracledb";
+})(SqlClient = exports.SqlClient || (exports.SqlClient = {}));
 function isExternalTable(tableId) {
-    return tableId.includes(utils_1.DocumentTypes.DATASOURCE);
+    return tableId.includes(utils_1.DocumentType.DATASOURCE);
 }
 exports.isExternalTable = isExternalTable;
 function buildExternalTableId(datasourceId, tableName) {
@@ -156,10 +156,10 @@ function isSQL(datasource) {
         return false;
     }
     const SQL = [
-        datasource_1.SourceNames.POSTGRES,
-        datasource_1.SourceNames.SQL_SERVER,
-        datasource_1.SourceNames.MYSQL,
-        datasource_1.SourceNames.ORACLE,
+        types_1.SourceName.POSTGRES,
+        types_1.SourceName.SQL_SERVER,
+        types_1.SourceName.MYSQL,
+        types_1.SourceName.ORACLE,
     ];
     return SQL.indexOf(datasource.source) !== -1;
 }

package/dist/middleware/builder.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const { APP_DEV_PREFIX } = require("../db/utils");
 const { doesUserHaveLock, updateLock, checkDebounce, setDebounce, } = require("../utilities/redis");
 const { doWithDB } = require("@budibase/backend-core/db");
-const { DocumentTypes, getGlobalIDFromUserMetadataID } = require("../db/utils");
+const { DocumentType, getGlobalIDFromUserMetadataID } = require("../db/utils");
 const { PermissionTypes } = require("@budibase/backend-core/permissions");
 const { app: appCache } = require("@budibase/backend-core/cache");
 const DEBOUNCE_TIME_SEC = 30;
@@ -50,7 +50,7 @@ function updateAppUpdatedAt(ctx) {
             return;
         }
         yield doWithDB(appId, (db) => __awaiter(this, void 0, void 0, function* () {
-            const metadata = yield db.get(DocumentTypes.APP_METADATA);
+            const metadata = yield db.get(DocumentType.APP_METADATA);
             metadata.updatedAt = new Date().toISOString();
             metadata.updatedBy = getGlobalIDFromUserMetadataID(ctx.user.userId);
             const response = yield db.put(metadata);

package/dist/migrations/functions/appUrls.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
-const { DocumentTypes } = require("@budibase/backend-core/db");
+const { DocumentType } = require("@budibase/backend-core/db");
 const application_1 = require("../../api/controllers/application");
 /**
  * Date:
@@ -22,7 +22,7 @@ const application_1 = require("../../api/controllers/application");
 const run = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
     let metadata;
     try {
-        metadata = yield appDb.get(DocumentTypes.APP_METADATA);
+        metadata = yield appDb.get(DocumentType.APP_METADATA);
     }
     catch (e) {
         // sometimes the metadata document doesn't exist

package/dist/migrations/functions/backfill/app/queries.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.backfill = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../../db/utils");
+const types_1 = require("@budibase/types");
 const getQueries = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield appDb.allDocs((0, utils_1.getQueryParams)(null, {
         include_docs: true,
@@ -33,8 +34,9 @@ const backfill = (appDb, timestamp) => __awaiter(void 0, void 0, void 0, functio
             // and the query has not
             if (e.status === 404) {
                 datasource = {
+                    type: "unknown",
                     _id: query.datasourceId,
-                    source: "unknown",
+                    source: types_1.SourceName.UNKNOWN,
                 };
             }
             else {

package/dist/migrations/functions/backfill/app.js

@@ -93,7 +93,7 @@ const run = (appDb) => __awaiter(void 0, void 0, void 0, function* () {
         // events for this tenant
         yield backend_core_1.events.backfillCache.start(EVENTS);
         let timestamp = _1.DEFAULT_TIMESTAMP;
-        const app = yield appDb.get(backend_core_1.db.DocumentTypes.APP_METADATA);
+        const app = yield appDb.get(backend_core_1.db.DocumentType.APP_METADATA);
         if (app.createdAt) {
             timestamp = app.createdAt;
         }

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

@@ -14,7 +14,7 @@ const backend_core_1 = require("@budibase/backend-core");
 const __1 = require("..");
 // manually define user doc params - normally server doesn't read users from the db
 const getUserParams = (props) => {
-    return backend_core_1.db.getDocParams(backend_core_1.db.DocumentTypes.USER, null, props);
+    return backend_core_1.db.getDocParams(backend_core_1.db.DocumentType.USER, null, props);
 };
 const getUsers = (globalDb) => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield globalDb.allDocs(getUserParams({

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.2.36",
+    "version": "1.2.39-alpha.0",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^1.2.36",
-        "@budibase/client": "^1.2.36",
-        "@budibase/pro": "1.2.36",
-        "@budibase/string-templates": "^1.2.36",
-        "@budibase/types": "^1.2.36",
+        "@budibase/backend-core": "1.2.39-alpha.0",
+        "@budibase/client": "1.2.39-alpha.0",
+        "@budibase/pro": "1.2.39-alpha.0",
+        "@budibase/string-templates": "1.2.39-alpha.0",
+        "@budibase/types": "1.2.39-alpha.0",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -106,7 +106,7 @@
         "google-auth-library": "7.12.0",
         "google-spreadsheet": "3.2.0",
         "jimp": "0.16.1",
-        "joi": "17.2.1",
+        "joi": "17.6.0",
         "js-yaml": "4.1.0",
         "jsonschema": "1.4.0",
         "knex": "0.95.15",

package/dist/tests/utilities/TestConfiguration.js

@@ -24,7 +24,7 @@ const newid = require("../../db/newid");
 const context = require("@budibase/backend-core/context");
 const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db");
 const { encrypt } = require("@budibase/backend-core/encryption");
-const { DocumentTypes } = require("../../db/utils");
+const { DocumentType } = require("../../db/utils");
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
 const FIRSTNAME = "Barbara";
@@ -298,7 +298,7 @@ class TestConfiguration {
             this.prodAppId = prodAppId;
             return context.doInAppContext(prodAppId, () => __awaiter(this, void 0, void 0, function* () {
                 const db = context.getProdAppDB();
-                return yield db.get(DocumentTypes.APP_METADATA);
+                return yield db.get(DocumentType.APP_METADATA);
             }));
         });
     }

package/dist/threads/automation.js

@@ -40,12 +40,12 @@ function typecastForLooping(loopStep, input) {
     }
     try {
         switch (loopStep.inputs.option) {
-            case automations_1.LoopStepTypes.ARRAY:
+            case automations_1.LoopStepType.ARRAY:
                 if (typeof input.binding === "string") {
                     return JSON.parse(input.binding);
                 }
                 break;
-            case automations_1.LoopStepTypes.STRING:
+            case automations_1.LoopStepType.STRING:
                 if (Array.isArray(input.binding)) {
                     return input.binding.join(",");
                 }