@budibase/server 1.0.27-alpha.1 → 1.0.27-alpha.13

package/dist/api/controllers/apikeys.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { StaticDatabases } = require("@budibase/auth/db");
-const { getGlobalDB } = require("@budibase/auth/tenancy");
+const { StaticDatabases } = require("@budibase/backend-core/db");
+const { getGlobalDB } = require("@budibase/backend-core/tenancy");
 const KEYS_DOC = StaticDatabases.GLOBAL.docs.apiKeys;
 function getBuilderMainDoc() {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/api/controllers/application.js

@@ -14,19 +14,19 @@ const packageJson = require("../../../package.json");
 const { createLinkView, createRoutingView, createAllSearchIndex, } = require("../../db/views/staticViews");
 const { getTemplateStream, createApp, deleteApp, } = require("../../utilities/fileSystem");
 const { generateAppID, getLayoutParams, getScreenParams, generateDevAppID, DocumentTypes, AppStatus, } = require("../../db/utils");
-const { BUILTIN_ROLE_IDS, AccessController } = require("@budibase/auth/roles");
+const { BUILTIN_ROLE_IDS, AccessController, } = require("@budibase/backend-core/roles");
 const { BASE_LAYOUTS } = require("../../constants/layouts");
 const { cloneDeep } = require("lodash/fp");
 const { processObject } = require("@budibase/string-templates");
-const { getAllApps, isDevAppID, getDeployedAppID, Replication, } = require("@budibase/auth/db");
+const { getAllApps, isDevAppID, getDeployedAppID, Replication, } = require("@budibase/backend-core/db");
 const { USERS_TABLE_SCHEMA } = require("../../constants");
 const { getDeployedApps, removeAppFromUserRoles, } = require("../../utilities/workerRequests");
 const { clientLibraryPath, stringToReadStream } = require("../../utilities");
 const { getAllLocks } = require("../../utilities/redis");
 const { updateClientLibrary, backupClientLibrary, revertClientLibrary, } = require("../../utilities/fileSystem/clientLibrary");
-const { getTenantId, isMultiTenant } = require("@budibase/auth/tenancy");
+const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy");
 const { syncGlobalUsers } = require("./user");
-const { app: appCache } = require("@budibase/auth/cache");
+const { app: appCache } = require("@budibase/backend-core/cache");
 const { cleanupAutomations } = require("../../automations/utils");
 const URL_REGEX_SLASH = /\/|\\/g;
 // utility function, need to do away with this

package/dist/api/controllers/auth.js

@@ -12,7 +12,7 @@ const CouchDB = require("../../db");
 const { outputProcessing } = require("../../utilities/rowProcessor");
 const { InternalTables } = require("../../db/utils");
 const { getFullUser } = require("../../utilities/users");
-const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 exports.fetchSelf = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const appId = ctx.appId;
     let userId = ctx.user.userId || ctx.user._id;

package/dist/api/controllers/cloud.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const env = require("../../environment");
-const { getAllApps } = require("@budibase/auth/db");
+const { getAllApps } = require("@budibase/backend-core/db");
 const CouchDB = require("../../db");
 const { exportDB, sendTempFile, readFileSync, } = require("../../utilities/fileSystem");
 const { stringToReadStream } = require("../../utilities");
-const { getGlobalDBName, getGlobalDB } = require("@budibase/auth/tenancy");
+const { getGlobalDBName, getGlobalDB, } = require("@budibase/backend-core/tenancy");
 const { create } = require("./application");
 const { getDocParams, DocumentTypes, isDevAppID } = require("../../db/utils");
 function createApp(appName, appImport) {

package/dist/api/controllers/datasource.js

@@ -13,6 +13,7 @@ const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentTypes
 const { BuildSchemaErrors, InvalidColumns } = require("../../constants");
 const { integrations } = require("../../integrations");
 const { getDatasourceAndQuery } = require("./row/utils");
+const { invalidateDynamicVariables } = require("../../threads/utils");
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const database = new CouchDB(ctx.appId);
@@ -45,11 +46,39 @@ exports.buildSchemaFromDb = function (ctx) {
         ctx.body = response;
     });
 };
+/**
+ * Check for variables that have been updated or removed and invalidate them.
+ */
+const invalidateVariables = (existingDatasource, updatedDatasource) => __awaiter(void 0, void 0, void 0, function* () {
+    const existingVariables = existingDatasource.config.dynamicVariables;
+    const updatedVariables = updatedDatasource.config.dynamicVariables;
+    const toInvalidate = [];
+    if (!existingVariables) {
+        return;
+    }
+    if (!updatedVariables) {
+        // invalidate all
+        toInvalidate.push(...existingVariables);
+    }
+    else {
+        // invaldate changed / removed
+        existingVariables.forEach(existing => {
+            const unchanged = updatedVariables.find(updated => existing.name === updated.name &&
+                existing.queryId === updated.queryId &&
+                existing.value === updated.value);
+            if (!unchanged) {
+                toInvalidate.push(existing);
+            }
+        });
+    }
+    yield invalidateDynamicVariables(toInvalidate);
+});
 exports.update = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
         const datasourceId = ctx.params.datasourceId;
         let datasource = yield db.get(datasourceId);
+        yield invalidateVariables(datasource, ctx.request.body);
         datasource = Object.assign(Object.assign({}, datasource), ctx.request.body);
         const response = yield db.put(datasource);
         datasource._rev = response.rev;

package/dist/api/controllers/deploy/index.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const CouchDB = require("../../../db");
 const Deployment = require("./Deployment");
-const { Replication, getDeployedAppID } = require("@budibase/auth/db");
+const { Replication, getDeployedAppID } = require("@budibase/backend-core/db");
 const { DocumentTypes, getAutomationParams } = require("../../../db/utils");
 const { disableAllCrons, enableCronTrigger, } = require("../../../automations/utils");
-const { app: appCache } = require("@budibase/auth/cache");
+const { app: appCache } = require("@budibase/backend-core/cache");
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000;
 const DeploymentStatus = {

package/dist/api/controllers/dev.js

@@ -14,9 +14,9 @@ const env = require("../../environment");
 const { checkSlashesInUrl } = require("../../utilities");
 const { request } = require("../../utilities/workerRequests");
 const { clearLock } = require("../../utilities/redis");
-const { Replication } = require("@budibase/auth").db;
+const { Replication } = require("@budibase/backend-core/db");
 const { DocumentTypes } = require("../../db/utils");
-const { app: appCache } = require("@budibase/auth/cache");
+const { app: appCache } = require("@budibase/backend-core/cache");
 function redirect(ctx, method, path = "global") {
     return __awaiter(this, void 0, void 0, function* () {
         const { devPath } = ctx.params;

package/dist/api/controllers/hosting.js

@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const CouchDB = require("../../db");
 const { getDeployedApps } = require("../../utilities/workerRequests");
-const { getScopedConfig } = require("@budibase/auth/db");
-const { Configs } = require("@budibase/auth").constants;
+const { getScopedConfig } = require("@budibase/backend-core/db");
+const { Configs } = require("@budibase/backend-core/constants");
 const { checkSlashesInUrl } = require("../../utilities");
 exports.fetchUrls = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const appId = ctx.appId;

package/dist/api/controllers/permission.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getBuiltinPermissions } = require("@budibase/auth/permissions");
-const { isBuiltin, getDBRoleID, getExternalRoleID, getBuiltinRoles, } = require("@budibase/auth/roles");
+const { getBuiltinPermissions } = require("@budibase/backend-core/permissions");
+const { isBuiltin, getDBRoleID, getExternalRoleID, getBuiltinRoles, } = require("@budibase/backend-core/roles");
 const { getRoleParams } = require("../../db/utils");
 const CouchDB = require("../../db");
 const { CURRENTLY_SUPPORTED_LEVELS, getBasePermissions, } = require("../../utilities/security");

package/dist/api/controllers/query/import/sources/base/index.js

@@ -11,12 +11,13 @@ var MethodToVerb;
 })(MethodToVerb || (MethodToVerb = {}));
 class ImportSource {
     constructor() {
-        this.constructQuery = (datasourceId, name, method, path, queryString, headers = {}, parameters = [], body = undefined) => {
+        this.constructQuery = (datasourceId, name, method, path, url, queryString, headers = {}, parameters = [], body = undefined) => {
             const readable = true;
             const queryVerb = this.verbFromMethod(method);
             const transformer = "return data";
             const schema = {};
             path = this.processPath(path);
+            path = `${url.origin}/${path}`;
             queryString = this.processQuery(queryString);
             const requestBody = JSON.stringify(body, null, 2);
             const query = {

package/dist/api/controllers/query/import/sources/curl.js

@@ -26,8 +26,12 @@ const parseBody = (curl) => {
     if (curl.data) {
         const keys = Object.keys(curl.data);
         if (keys.length) {
-            const key = keys[0];
+            let key = keys[0];
             try {
+                // filter out the dollar syntax used by curl for shell support
+                if (key.startsWith("$")) {
+                    key = key.substring(1);
+                }
                 return JSON.parse(key);
             }
             catch (e) {
@@ -63,15 +67,17 @@ class Curl extends base_1.ImportSource {
             }
             return true;
         });
+        this.getUrl = () => {
+            return new url_1.URL(this.curl.raw_url);
+        };
         this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
-            const url = new url_1.URL(this.curl.url);
+            const url = this.getUrl();
             return {
-                url: url.origin,
                 name: url.hostname,
             };
         });
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
-            const url = new url_1.URL(this.curl.raw_url);
+            const url = this.getUrl();
             const name = url.pathname;
             const path = url.pathname;
             const method = this.curl.method;
@@ -82,7 +88,7 @@ class Curl extends base_1.ImportSource {
             if (cookieHeader) {
                 headers["Cookie"] = cookieHeader;
             }
-            const query = this.constructQuery(datasourceId, name, method, path, queryString, headers, [], requestBody);
+            const query = this.constructQuery(datasourceId, name, method, path, url, queryString, headers, [], requestBody);
             return [query];
         });
     }

package/dist/api/controllers/query/import/sources/openapi2.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAPI2 = void 0;
 const openapi_types_1 = require("openapi-types");
 const openapi_1 = require("./base/openapi");
+const url_1 = require("url");
 const parameterNotRef = (param) => {
     // all refs are deferenced by parser library
     return true;
@@ -53,19 +54,21 @@ class OpenAPI2 extends openapi_1.OpenAPISource {
                 return false;
             }
         });
-        this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
+        this.getUrl = () => {
             var _a;
             const scheme = ((_a = this.document.schemes) === null || _a === void 0 ? void 0 : _a.includes("https")) ? "https" : "http";
             const basePath = this.document.basePath || "";
             const host = this.document.host || "<host>";
-            const url = `${scheme}://${host}${basePath}`;
+            return new url_1.URL(`${scheme}://${host}${basePath}`);
+        };
+        this.getInfo = () => __awaiter(this, void 0, void 0, function* () {
             const name = this.document.info.title || "Swagger Import";
             return {
-                url: url,
-                name: name,
+                name,
             };
         });
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
+            const url = this.getUrl();
             const queries = [];
             for (let [path, pathItem] of Object.entries(this.document.paths)) {
                 // parameters that apply to every operation in the path
@@ -128,7 +131,7 @@ class OpenAPI2 extends openapi_1.OpenAPISource {
                             }
                         }
                     }
-                    const query = this.constructQuery(datasourceId, name, methodName, path, queryString, headers, parameters, requestBody);
+                    const query = this.constructQuery(datasourceId, name, methodName, path, url, queryString, headers, parameters, requestBody);
                     queries.push(query);
                 }
             }

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

@@ -8,13 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { processString } = require("@budibase/string-templates");
 const CouchDB = require("../../../db");
 const { generateQueryID, getQueryParams, isProdAppID, } = require("../../../db/utils");
 const { BaseQueryVerbs } = require("../../../constants");
 const { Thread, ThreadType } = require("../../../threads");
 const { save: saveDatasource } = require("../datasource");
 const { RestImporter } = require("./import");
+const { invalidateDynamicVariables } = require("../../../threads/utils");
 const Runner = new Thread(ThreadType.QUERY, { timeoutMs: 10000 });
 // simple function to append "readable" to all read queries
 function enrichQueries(input) {
@@ -81,44 +81,6 @@ exports.save = function (ctx) {
         ctx.message = `Query ${query.name} saved successfully.`;
     });
 };
-function enrichQueryFields(fields, parameters = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const enrichedQuery = {};
-        // enrich the fields with dynamic parameters
-        for (let key of Object.keys(fields)) {
-            if (fields[key] == null) {
-                continue;
-            }
-            if (typeof fields[key] === "object") {
-                // enrich nested fields object
-                enrichedQuery[key] = yield enrichQueryFields(fields[key], parameters);
-            }
-            else if (typeof fields[key] === "string") {
-                // enrich string value as normal
-                enrichedQuery[key] = yield processString(fields[key], parameters, {
-                    noHelpers: true,
-                });
-            }
-            else {
-                enrichedQuery[key] = fields[key];
-            }
-        }
-        if (enrichedQuery.json ||
-            enrichedQuery.customData ||
-            enrichedQuery.requestBody) {
-            try {
-                enrichedQuery.json = JSON.parse(enrichedQuery.json ||
-                    enrichedQuery.customData ||
-                    enrichedQuery.requestBody);
-            }
-            catch (err) {
-                // no json found, ignore
-            }
-            delete enrichedQuery.customData;
-        }
-        return enrichedQuery;
-    });
-}
 exports.find = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
@@ -135,14 +97,18 @@ exports.preview = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
         const datasource = yield db.get(ctx.request.body.datasourceId);
-        const { fields, parameters, queryVerb, transformer } = ctx.request.body;
-        const enrichedQuery = yield enrichQueryFields(fields, parameters);
+        // preview may not have a queryId as it hasn't been saved, but if it does
+        // this stops dynamic variables from calling the same query
+        const { fields, parameters, queryVerb, transformer, queryId } = ctx.request.body;
         try {
             const { rows, keys, info, extra } = yield Runner.run({
+                appId: ctx.appId,
                 datasource,
                 queryVerb,
-                query: enrichedQuery,
+                fields,
+                parameters,
                 transformer,
+                queryId,
             });
             ctx.body = {
                 rows,
@@ -156,30 +122,62 @@ exports.preview = function (ctx) {
         }
     });
 };
-exports.execute = function (ctx) {
+function execute(ctx, opts = { rowsOnly: false }) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
         const query = yield db.get(ctx.params.queryId);
         const datasource = yield db.get(query.datasourceId);
-        const enrichedQuery = yield enrichQueryFields(query.fields, ctx.request.body.parameters);
         // call the relevant CRUD method on the integration class
         try {
-            const { rows } = yield Runner.run({
+            const { rows, extra } = yield Runner.run({
+                appId: ctx.appId,
                 datasource,
                 queryVerb: query.queryVerb,
-                query: enrichedQuery,
+                fields: query.fields,
+                parameters: ctx.request.body.parameters,
                 transformer: query.transformer,
+                queryId: ctx.params.queryId,
             });
-            ctx.body = rows;
+            if (opts && opts.rowsOnly) {
+                ctx.body = rows;
+            }
+            else {
+                ctx.body = Object.assign({ data: rows }, extra);
+            }
         }
         catch (err) {
             ctx.throw(400, err);
         }
     });
+}
+exports.executeV1 = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return execute(ctx, { rowsOnly: true });
+    });
 };
+exports.executeV2 = function (ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return execute(ctx, { rowsOnly: false });
+    });
+};
+const removeDynamicVariables = (db, queryId) => __awaiter(void 0, void 0, void 0, function* () {
+    const query = yield db.get(queryId);
+    const datasource = yield db.get(query.datasourceId);
+    const dynamicVariables = datasource.config.dynamicVariables;
+    if (dynamicVariables) {
+        // delete dynamic variables from the datasource
+        const newVariables = dynamicVariables.filter(dv => dv.queryId !== queryId);
+        datasource.config.dynamicVariables = newVariables;
+        yield db.put(datasource);
+        // invalidate the deleted variables
+        const variablesToDelete = dynamicVariables.filter(dv => dv.queryId === queryId);
+        yield invalidateDynamicVariables(variablesToDelete);
+    }
+});
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = new CouchDB(ctx.appId);
+        yield removeDynamicVariables(db, ctx.params.queryId);
         yield db.remove(ctx.params.queryId, ctx.params.revId);
         ctx.message = `Query deleted.`;
         ctx.status = 200;

package/dist/api/controllers/query/validation.js

@@ -32,6 +32,7 @@ exports.generateQueryPreviewValidation = () => {
         extra: Joi.object().optional(),
         datasourceId: Joi.string().required(),
         transformer: Joi.string().optional(),
-        parameters: Joi.object({}).required().unknown(true)
+        parameters: Joi.object({}).required().unknown(true),
+        queryId: Joi.string().optional(),
     }));
 };

package/dist/api/controllers/role.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const CouchDB = require("../../db");
-const { Role, getRole, isBuiltin, getAllRoles, } = require("@budibase/auth/roles");
+const { Role, getRole, isBuiltin, getAllRoles, } = require("@budibase/backend-core/roles");
 const { generateRoleID, getUserMetadataParams, InternalTables, } = require("../../db/utils");
 const UpdateRolesOptions = {
     CREATED: "created",

package/dist/api/controllers/routing.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { getRoutingInfo } = require("../../utilities/routing");
-const { getUserRoleHierarchy, BUILTIN_ROLE_IDS, } = require("@budibase/auth/roles");
+const { getUserRoleHierarchy, BUILTIN_ROLE_IDS, } = require("@budibase/backend-core/roles");
 const URL_SEPARATOR = "/";
 function Routing() {
     this.json = {};

package/dist/api/controllers/row/internal.js

@@ -23,7 +23,7 @@ const CouchDB = require("../../../db");
 const linkRows = require("../../../db/linkedRows");
 const { getRowParams, generateRowID, DocumentTypes, InternalTables, } = require("../../../db/utils");
 const userController = require("../user");
-const { inputProcessing, outputProcessing, processAutoColumn, } = require("../../../utilities/rowProcessor");
+const { inputProcessing, outputProcessing, processAutoColumn, cleanupAttachments, } = require("../../../utilities/rowProcessor");
 const { FieldTypes } = require("../../../constants");
 const { isEqual } = require("lodash");
 const { validate, findRow } = require("./utils");
@@ -32,6 +32,7 @@ const { getGlobalUsersFromMetadata } = require("../../../utilities/global");
 const inMemoryViews = require("../../../db/inMemoryView");
 const env = require("../../../environment");
 const { migrateToInMemoryView, migrateToDesignView, getFromDesignDoc, getFromMemoryDoc, } = require("../view/utils");
+const { cloneDeep } = require("lodash/fp");
 const CALCULATION_TYPES = {
     SUM: "sum",
     COUNT: "count",
@@ -119,15 +120,15 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const inputs = ctx.request.body;
     const tableId = inputs.tableId;
     const isUserTable = tableId === InternalTables.USER_METADATA;
-    let dbRow;
+    let oldRow;
     try {
-        dbRow = yield db.get(inputs._id);
+        oldRow = yield db.get(inputs._id);
     }
     catch (err) {
         if (isUserTable) {
             // don't include the rev, it'll be the global rev
             // this time
-            dbRow = {
+            oldRow = {
                 _id: inputs._id,
             };
         }
@@ -137,13 +138,14 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     }
     let dbTable = yield db.get(tableId);
     // need to build up full patch fields before coerce
+    let combinedRow = cloneDeep(oldRow);
     for (let key of Object.keys(inputs)) {
         if (!dbTable.schema[key])
             continue;
-        dbRow[key] = inputs[key];
+        combinedRow[key] = inputs[key];
     }
     // this returns the table and row incase they have been updated
-    let { table, row } = inputProcessing(ctx.user, dbTable, dbRow);
+    let { table, row } = inputProcessing(ctx.user, dbTable, combinedRow);
     const validateResult = yield validate({
         row,
         table,
@@ -159,6 +161,8 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
         tableId: row.tableId,
         table,
     });
+    // check if any attachments removed
+    yield cleanupAttachments(appId, table, { oldRow, row });
     if (isUserTable) {
         // the row has been updated, need to put it into the ctx
         ctx.request.body = row;
@@ -284,6 +288,8 @@ exports.destroy = function (ctx) {
             row,
             tableId: row.tableId,
         });
+        // remove any attachments that were on the row from object storage
+        yield cleanupAttachments(appId, table, { row });
         let response;
         if (ctx.params.tableId === InternalTables.USER_METADATA) {
             ctx.params = {
@@ -325,6 +331,8 @@ exports.bulkDestroy = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     else {
         yield db.bulkDocs(rows.map(row => (Object.assign(Object.assign({}, row), { _deleted: true }))));
     }
+    // remove any attachments that were on the rows from object storage
+    yield cleanupAttachments(appId, table, { rows });
     yield Promise.all(updates);
     return { response: { ok: true }, rows };
 });

package/dist/api/controllers/row/internalSearch.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const { SearchIndexes } = require("../../../db/utils");
 const fetch = require("node-fetch");
-const { getCouchUrl } = require("@budibase/auth/db");
+const { getCouchUrl } = require("@budibase/backend-core/db");
 /**
  * Class to build lucene query URLs.
  * Optionally takes a base lucene query object.
@@ -172,7 +172,8 @@ class QueryBuilder {
         }
         if (this.query.equal) {
             build(this.query.equal, (key, value) => {
-                if (!value) {
+                // 0 evaluates to false, which means we would return all rows if we don't check it
+                if (!value && value !== 0) {
                     return null;
                 }
                 return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`;

package/dist/api/controllers/row/utils.js

@@ -57,24 +57,31 @@ exports.validate = ({ appId, tableId, row, table }) => __awaiter(void 0, void 0,
     const errors = {};
     for (let fieldName of Object.keys(table.schema)) {
         const constraints = cloneDeep(table.schema[fieldName].constraints);
+        const type = table.schema[fieldName].type;
         // special case for options, need to always allow unselected (null)
-        if (table.schema[fieldName].type ===
-            (FieldTypes.OPTIONS || FieldTypes.ARRAY) &&
+        if ((type === FieldTypes.OPTIONS || type === FieldTypes.ARRAY) &&
             constraints.inclusion) {
             constraints.inclusion.push(null);
         }
         let res;
         // Validate.js doesn't seem to handle array
-        if (table.schema[fieldName].type === FieldTypes.ARRAY &&
-            row[fieldName] &&
-            row[fieldName].length) {
+        if (type === FieldTypes.ARRAY && row[fieldName] && row[fieldName].length) {
             row[fieldName].map(val => {
                 if (!constraints.inclusion.includes(val)) {
                     errors[fieldName] = "Field not in list";
                 }
             });
         }
-        else if (table.schema[fieldName].type === FieldTypes.FORMULA) {
+        else if (type === FieldTypes.JSON && typeof row[fieldName] === "string") {
+            // this should only happen if there is an error
+            try {
+                JSON.parse(row[fieldName]);
+            }
+            catch (err) {
+                errors[fieldName] = [`Contains invalid JSON`];
+            }
+        }
+        else if (type === FieldTypes.FORMULA) {
             res = validateJs.single(processStringSync(table.schema[fieldName].formula, row), constraints);
         }
         else {

package/dist/api/controllers/screen.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const CouchDB = require("../../db");
 const { getScreenParams, generateScreenID } = require("../../db/utils");
-const { AccessController } = require("@budibase/auth/roles");
+const { AccessController } = require("@budibase/backend-core/roles");
 exports.fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const appId = ctx.appId;
     const db = new CouchDB(appId);

package/dist/api/controllers/user.js

@@ -14,10 +14,10 @@ const { InternalTables } = require("../../db/utils");
 const { getGlobalUsers, getRawGlobalUser } = require("../../utilities/global");
 const { getFullUser } = require("../../utilities/users");
 const { isEqual } = require("lodash");
-const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
-const { getDevelopmentAppID, getDeployedAppIDs } = require("@budibase/auth/db");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { getDevelopmentAppID, getDeployedAppIDs, } = require("@budibase/backend-core/db");
 const { doesDatabaseExist } = require("../../utilities");
-const { UserStatus } = require("@budibase/auth/constants");
+const { UserStatus } = require("@budibase/backend-core/constants");
 function rawMetadata(db) {
     return __awaiter(this, void 0, void 0, function* () {
         return (yield db.allDocs(getUserMetadataParams(null, {

package/dist/api/controllers/webhook.js

@@ -13,7 +13,7 @@ const { generateWebhookID, getWebhookParams } = require("../../db/utils");
 const toJsonSchema = require("to-json-schema");
 const validate = require("jsonschema").validate;
 const triggers = require("../../automations/triggers");
-const { getDeployedAppID } = require("@budibase/auth/db");
+const { getDeployedAppID } = require("@budibase/backend-core/db");
 const AUTOMATION_DESCRIPTION = "Generated from Webhook Schema";
 function Webhook(name, type, target) {
     this.live = true;

package/dist/api/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const Router = require("@koa/router");
-const { buildAuthMiddleware, auditLog, buildTenancyMiddleware, buildAppTenancyMiddleware, } = require("@budibase/auth").auth;
+const { buildAuthMiddleware, auditLog, buildTenancyMiddleware, buildAppTenancyMiddleware, } = require("@budibase/backend-core/auth");
 const currentApp = require("../middleware/currentapp");
 const compress = require("koa-compress");
 const zlib = require("zlib");

package/dist/api/routes/apikeys.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/apikeys");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .get("/api/keys", authorized(BUILDER), controller.fetch)