@budibase/backend-core 2.29.0 → 2.29.2

package/dist/index.js

@@ -54131,8 +54131,8 @@ var require_lib9 = __commonJS({
 var src_exports = {};
 __export(src_exports, {
   APP_DEV: () => APP_DEV,
-  APP_DEV_PREFIX: () => APP_DEV_PREFIX,
-  APP_PREFIX: () => APP_PREFIX,
+  APP_DEV_PREFIX: () => APP_DEV_PREFIX2,
+  APP_PREFIX: () => APP_PREFIX2,
   AutomationViewMode: () => AutomationViewMode,
   BUDIBASE_DATASOURCE_TYPE: () => BUDIBASE_DATASOURCE_TYPE,
   BadRequestError: () => BadRequestError,
@@ -54659,8 +54659,8 @@ var BREAKDOWN_QUOTA_NAMES = [
 var constants_exports2 = {};
 __export(constants_exports2, {
   APP_DEV: () => APP_DEV,
-  APP_DEV_PREFIX: () => APP_DEV_PREFIX,
-  APP_PREFIX: () => APP_PREFIX,
+  APP_DEV_PREFIX: () => APP_DEV_PREFIX2,
+  APP_PREFIX: () => APP_PREFIX2,
   AutomationViewMode: () => AutomationViewMode,
   BUDIBASE_DATASOURCE_TYPE: () => BUDIBASE_DATASOURCE_TYPE,
   Config: () => Config,
@@ -54687,69 +54687,6 @@ __export(constants_exports2, {
   ViewName: () => ViewName
 });
 
-// src/constants/db.ts
-var AutomationViewMode = /* @__PURE__ */ ((AutomationViewMode2) => {
-  AutomationViewMode2["ALL"] = "all";
-  AutomationViewMode2["AUTOMATION"] = "automation";
-  AutomationViewMode2["STATUS"] = "status";
-  return AutomationViewMode2;
-})(AutomationViewMode || {});
-var ViewName = /* @__PURE__ */ ((ViewName3) => {
-  ViewName3["USER_BY_APP"] = "by_app";
-  ViewName3["USER_BY_EMAIL"] = "by_email2";
-  ViewName3["BY_API_KEY"] = "by_api_key";
-  ViewName3["LINK"] = "by_link";
-  ViewName3["ROUTING"] = "screen_routes";
-  ViewName3["AUTOMATION_LOGS"] = "automation_logs";
-  ViewName3["ACCOUNT_BY_EMAIL"] = "account_by_email";
-  ViewName3["PLATFORM_USERS_LOWERCASE"] = "platform_users_lowercase_2";
-  ViewName3["USER_BY_GROUP"] = "user_by_group";
-  ViewName3["APP_BACKUP_BY_TRIGGER"] = "by_trigger";
-  return ViewName3;
-})(ViewName || {});
-var DeprecatedViews = {
-  ["by_email2" /* USER_BY_EMAIL */]: [
-    // removed due to inaccuracy in view doc filter logic
-    "by_email"
-  ]
-};
-var StaticDatabases = {
-  GLOBAL: {
-    name: "global-db",
-    docs: {
-      apiKeys: "apikeys",
-      usageQuota: "usage_quota",
-      licenseInfo: "license_info",
-      environmentVariables: "environmentvariables"
-    }
-  },
-  // contains information about tenancy and so on
-  PLATFORM_INFO: {
-    name: "global-info",
-    docs: {
-      tenants: "tenants",
-      install: "install"
-    }
-  },
-  AUDIT_LOGS: {
-    name: "audit-logs"
-  },
-  SCIM_LOGS: {
-    name: "scim-logs"
-  }
-};
-var APP_PREFIX = prefixed("app" /* APP */);
-var APP_DEV = prefixed("app_dev" /* APP_DEV */);
-var APP_DEV_PREFIX = APP_DEV;
-var SQS_DATASOURCE_INTERNAL = "internal";
-var BUDIBASE_DATASOURCE_TYPE = "budibase";
-var SQLITE_DESIGN_DOC_ID = "_design/sqlite";
-var DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs";
-var DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory";
-var DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses";
-var DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee";
-var DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default";
-
 // ../shared-core/src/constants/api.ts
 var Header = /* @__PURE__ */ ((Header2) => {
   Header2["API_KEY"] = "x-budibase-api-key";
@@ -54802,6 +54739,20 @@ var SWITCHABLE_TYPES = {
   ["number" /* NUMBER */]: ["number" /* NUMBER */, "boolean" /* BOOLEAN */]
 };
 
+// ../shared-core/src/constants/rows.ts
+var CONSTANT_INTERNAL_ROW_COLS = [
+  "_id",
+  "_rev",
+  "type",
+  "createdAt",
+  "updatedAt",
+  "tableId"
+];
+var CONSTANT_EXTERNAL_ROW_COLS = ["_id", "_rev", "tableId"];
+function isInternalColumnName(name) {
+  return CONSTANT_INTERNAL_ROW_COLS.includes(name);
+}
+
 // ../shared-core/src/constants/index.ts
 var OperatorOptions = {
   Equals: {
@@ -54871,6 +54822,7 @@ var SqlNumberTypeRangeMap = {
     min: -8388608
   }
 };
+var DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default";
 
 // ../shared-core/src/filters.ts
 var filters_exports = {};
@@ -55217,10 +55169,15 @@ var search = (docs, query) => {
   if (query.sort) {
     result = sort(result, query.sort, query.sortOrder || "ascending" /* ASCENDING */);
   }
+  let totalRows = result.length;
   if (query.limit) {
     result = limit(result, query.limit.toString());
   }
-  return result;
+  const response = { rows: result };
+  if (query.countRows) {
+    response.totalRows = totalRows;
+  }
+  return response;
 };
 var runQuery = (docs, query) => {
   if (!docs || !Array.isArray(docs)) {
@@ -55545,31 +55502,31 @@ __export(applications_exports, {
   getDevAppID: () => getDevAppID,
   getProdAppID: () => getProdAppID
 });
-var APP_PREFIX2 = prefixed("app" /* APP */);
-var APP_DEV_PREFIX2 = prefixed("app_dev" /* APP_DEV */);
+var APP_PREFIX = prefixed("app" /* APP */);
+var APP_DEV_PREFIX = prefixed("app_dev" /* APP_DEV */);
 function getDevAppID(appId) {
   if (!appId) {
     throw new Error("No app ID provided");
   }
-  if (appId.startsWith(APP_DEV_PREFIX2)) {
+  if (appId.startsWith(APP_DEV_PREFIX)) {
     return appId;
   }
-  const split = appId.split(APP_PREFIX2);
+  const split = appId.split(APP_PREFIX);
   split.shift();
-  const rest = split.join(APP_PREFIX2);
-  return `${APP_DEV_PREFIX2}${rest}`;
+  const rest = split.join(APP_PREFIX);
+  return `${APP_DEV_PREFIX}${rest}`;
 }
 function getProdAppID(appId) {
   if (!appId) {
     throw new Error("No app ID provided");
   }
-  if (!appId.startsWith(APP_DEV_PREFIX2)) {
+  if (!appId.startsWith(APP_DEV_PREFIX)) {
     return appId;
   }
-  const split = appId.split(APP_DEV_PREFIX2);
+  const split = appId.split(APP_DEV_PREFIX);
   split.shift();
-  const rest = split.join(APP_DEV_PREFIX2);
-  return `${APP_PREFIX2}${rest}`;
+  const rest = split.join(APP_DEV_PREFIX);
+  return `${APP_PREFIX}${rest}`;
 }
 
 // ../shared-core/src/sdk/documents/users.ts
@@ -55724,6 +55681,68 @@ var allowSortColumnByType = {
   ["bb_reference_single" /* BB_REFERENCE_SINGLE */]: false
 };
 
+// src/constants/db.ts
+var AutomationViewMode = /* @__PURE__ */ ((AutomationViewMode2) => {
+  AutomationViewMode2["ALL"] = "all";
+  AutomationViewMode2["AUTOMATION"] = "automation";
+  AutomationViewMode2["STATUS"] = "status";
+  return AutomationViewMode2;
+})(AutomationViewMode || {});
+var ViewName = /* @__PURE__ */ ((ViewName3) => {
+  ViewName3["USER_BY_APP"] = "by_app";
+  ViewName3["USER_BY_EMAIL"] = "by_email2";
+  ViewName3["BY_API_KEY"] = "by_api_key";
+  ViewName3["LINK"] = "by_link";
+  ViewName3["ROUTING"] = "screen_routes";
+  ViewName3["AUTOMATION_LOGS"] = "automation_logs";
+  ViewName3["ACCOUNT_BY_EMAIL"] = "account_by_email";
+  ViewName3["PLATFORM_USERS_LOWERCASE"] = "platform_users_lowercase_2";
+  ViewName3["USER_BY_GROUP"] = "user_by_group";
+  ViewName3["APP_BACKUP_BY_TRIGGER"] = "by_trigger";
+  return ViewName3;
+})(ViewName || {});
+var DeprecatedViews = {
+  ["by_email2" /* USER_BY_EMAIL */]: [
+    // removed due to inaccuracy in view doc filter logic
+    "by_email"
+  ]
+};
+var StaticDatabases = {
+  GLOBAL: {
+    name: "global-db",
+    docs: {
+      apiKeys: "apikeys",
+      usageQuota: "usage_quota",
+      licenseInfo: "license_info",
+      environmentVariables: "environmentvariables"
+    }
+  },
+  // contains information about tenancy and so on
+  PLATFORM_INFO: {
+    name: "global-info",
+    docs: {
+      tenants: "tenants",
+      install: "install"
+    }
+  },
+  AUDIT_LOGS: {
+    name: "audit-logs"
+  },
+  SCIM_LOGS: {
+    name: "scim-logs"
+  }
+};
+var APP_PREFIX2 = prefixed("app" /* APP */);
+var APP_DEV = prefixed("app_dev" /* APP_DEV */);
+var APP_DEV_PREFIX2 = APP_DEV;
+var SQS_DATASOURCE_INTERNAL = "internal";
+var BUDIBASE_DATASOURCE_TYPE = "budibase";
+var SQLITE_DESIGN_DOC_ID = "_design/sqlite";
+var DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs";
+var DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory";
+var DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses";
+var DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee";
+
 // src/constants/misc.ts
 var UserStatus = /* @__PURE__ */ ((UserStatus3) => {
   UserStatus3["ACTIVE"] = "active";
@@ -56071,13 +56090,13 @@ function isDevAppID(appId) {
   if (!appId) {
     throw NO_APP_ERROR;
   }
-  return appId.startsWith(APP_DEV_PREFIX);
+  return appId.startsWith(APP_DEV_PREFIX2);
 }
 function isProdAppID(appId) {
   if (!appId) {
     throw NO_APP_ERROR;
   }
-  return appId.startsWith(APP_PREFIX) && !isDevAppID(appId);
+  return appId.startsWith(APP_PREFIX2) && !isDevAppID(appId);
 }
 function isDevApp(app) {
   if (!app) {
@@ -56086,23 +56105,23 @@ function isDevApp(app) {
   return isDevAppID(app.appId);
 }
 function getDevelopmentAppID(appId) {
-  if (!appId || appId.startsWith(APP_DEV_PREFIX)) {
+  if (!appId || appId.startsWith(APP_DEV_PREFIX2)) {
     return appId;
   }
-  const split = appId.split(APP_PREFIX);
+  const split = appId.split(APP_PREFIX2);
   split.shift();
-  const rest = split.join(APP_PREFIX);
-  return `${APP_DEV_PREFIX}${rest}`;
+  const rest = split.join(APP_PREFIX2);
+  return `${APP_DEV_PREFIX2}${rest}`;
 }
 var getDevAppID2 = getDevelopmentAppID;
 function getProdAppID2(appId) {
-  if (!appId || !appId.startsWith(APP_DEV_PREFIX)) {
+  if (!appId || !appId.startsWith(APP_DEV_PREFIX2)) {
     return appId;
   }
-  const split = appId.split(APP_DEV_PREFIX);
+  const split = appId.split(APP_DEV_PREFIX2);
   split.shift();
-  const rest = split.join(APP_DEV_PREFIX);
-  return `${APP_PREFIX}${rest}`;
+  const rest = split.join(APP_DEV_PREFIX2);
+  return `${APP_PREFIX2}${rest}`;
 }
 function extractAppUUID(id) {
   const split = id?.split("_") || [];
@@ -56728,20 +56747,6 @@ var DatabaseImpl = class _DatabaseImpl {
   }
 };
 
-// src/db/constants.ts
-var CONSTANT_INTERNAL_ROW_COLS = [
-  "_id",
-  "_rev",
-  "type",
-  "createdAt",
-  "updatedAt",
-  "tableId"
-];
-var CONSTANT_EXTERNAL_ROW_COLS = ["_id", "_rev", "tableId"];
-function isInternalColumnName(name) {
-  return CONSTANT_INTERNAL_ROW_COLS.includes(name);
-}
-
 // src/db/db.ts
 function getDB(dbName, opts) {
   return new DDInstrumentedDatabase(new DatabaseImpl(dbName, opts));
@@ -57348,8 +57353,8 @@ var import_uuid2 = require("uuid");
 var db_exports = {};
 __export(db_exports, {
   APP_DEV: () => APP_DEV,
-  APP_DEV_PREFIX: () => APP_DEV_PREFIX,
-  APP_PREFIX: () => APP_PREFIX,
+  APP_DEV_PREFIX: () => APP_DEV_PREFIX2,
+  APP_PREFIX: () => APP_PREFIX2,
   AutomationViewMode: () => AutomationViewMode,
   BUDIBASE_DATASOURCE_TYPE: () => BUDIBASE_DATASOURCE_TYPE,
   CONSTANT_EXTERNAL_ROW_COLS: () => CONSTANT_EXTERNAL_ROW_COLS,
@@ -57543,7 +57548,7 @@ __export(docIds_exports, {
 
 // src/docIds/ids.ts
 var generateAppID = (tenantId) => {
-  let id = APP_PREFIX;
+  let id = APP_PREFIX2;
   if (tenantId) {
     id += `${tenantId}${SEPARATOR}`;
   }
@@ -58703,7 +58708,7 @@ function sanitizeKey(input) {
   return sanitize(sanitizeBucket(input)).replace(/\\/g, "/");
 }
 function sanitizeBucket(input) {
-  return input.replace(new RegExp(APP_DEV_PREFIX, "g"), APP_PREFIX);
+  return input.replace(new RegExp(APP_DEV_PREFIX2, "g"), APP_PREFIX2);
 }
 function ObjectStore(bucket, opts = { presigning: false }) {
   const config = {
@@ -67107,15 +67112,15 @@ function buildExternalTableId(datasourceId, tableName) {
   return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}`;
 }
 function breakExternalTableId(tableId) {
-  if (!tableId) {
-    return {};
-  }
   const parts = tableId.split(DOUBLE_SEPARATOR);
   let datasourceId = parts.shift();
   let tableName = parts.join(DOUBLE_SEPARATOR);
   if (tableName.includes(ENCODED_SPACE)) {
     tableName = decodeURIComponent(tableName);
   }
+  if (!datasourceId || !tableName) {
+    throw new Error("Unable to get datasource/table name from table ID");
+  }
   return { datasourceId, tableName };
 }
 function generateRowIdField(keyProps = []) {
@@ -67291,8 +67296,10 @@ function generateSchema(schema, table, tables, oldTable = null, renamed) {
           }
           const { tableName } = breakExternalTableId(column.tableId);
           const relatedTable = tables[tableName];
-          if (!relatedTable) {
-            throw new Error("Referenced table doesn't exist");
+          if (!relatedTable || !relatedTable.primary) {
+            throw new Error(
+              "Referenced table doesn't exist or has no primary keys"
+            );
           }
           const relatedPrimary = relatedTable.primary[0];
           const externalType = relatedTable.schema[relatedPrimary].externalType;
@@ -67496,7 +67503,7 @@ function parseFilters(filters) {
 }
 function generateSelectStatement(json, knex3) {
   const { resource, meta } = json;
-  if (!resource) {
+  if (!resource || !resource.fields || resource.fields.length === 0) {
     return "*";
   }
   const schema = meta?.table?.schema;
@@ -67743,12 +67750,26 @@ var InternalBuilder = class {
     }
     return query;
   }
+  addDistinctCount(query, json) {
+    const table = json.meta.table;
+    const primary = table.primary;
+    const aliases = json.tableAliases;
+    const aliased = table.name && aliases?.[table.name] ? aliases[table.name] : table.name;
+    if (!primary) {
+      throw new Error("SQL counting requires primary key to be supplied");
+    }
+    return query.countDistinct(`${aliased}.${primary[0]} as total`);
+  }
   addSorting(query, json) {
-    let { sort: sort2, paginate } = json;
+    let { sort: sort2 } = json;
     const table = json.meta.table;
+    const primaryKey = table.primary;
     const tableName = getTableName(table);
     const aliases = json.tableAliases;
     const aliased = tableName && aliases?.[tableName] ? aliases[tableName] : table?.name;
+    if (!Array.isArray(primaryKey)) {
+      throw new Error("Sorting requires primary key to be specified for table");
+    }
     if (sort2 && Object.keys(sort2 || {}).length > 0) {
       for (let [key, value] of Object.entries(sort2)) {
         const direction = value.direction === "ascending" /* ASCENDING */ ? "asc" : "desc";
@@ -67758,8 +67779,9 @@ var InternalBuilder = class {
         }
         query = query.orderBy(`${aliased}.${key}`, direction, nulls);
       }
-    } else if (this.client === "mssql" /* MS_SQL */ && paginate?.limit) {
-      query = query.orderBy(`${aliased}.${table?.primary[0]}`);
+    }
+    if (!sort2 || sort2[primaryKey[0]] === void 0) {
+      query = query.orderBy(`${aliased}.${primaryKey[0]}`);
     }
     return query;
   }
@@ -67828,18 +67850,17 @@ var InternalBuilder = class {
         });
       }
     }
-    return query.limit(BASE_LIMIT);
+    return query;
   }
   knexWithAlias(knex3, endpoint, aliases) {
     const tableName = endpoint.entityId;
     const tableAlias = aliases?.[tableName];
-    const query = knex3(
+    return knex3(
       this.tableNameWithSchema(tableName, {
         alias: tableAlias,
         schema: endpoint.schema
       })
     );
-    return query;
   }
   create(knex3, json, opts) {
     const { endpoint, body: body2 } = json;
@@ -67877,24 +67898,21 @@ var InternalBuilder = class {
       if (!primary) {
         throw new Error("Primary key is required for upsert");
       }
-      return query.insert(parsedBody).onConflict(primary).merge();
+      const ret = query.insert(parsedBody).onConflict(primary).merge();
+      return ret;
     } else if (this.client === "mssql" /* MS_SQL */) {
       return query.insert(parsedBody);
     }
     return query.upsert(parsedBody);
   }
-  read(knex3, json, limit2) {
-    let { endpoint, resource, filters, paginate, relationships, tableAliases } = json;
+  read(knex3, json, opts = {}) {
+    let { endpoint, filters, paginate, relationships, tableAliases } = json;
+    const { limits } = opts;
+    const counting = endpoint.operation === "COUNT" /* COUNT */;
     const tableName = endpoint.entityId;
-    if (!resource) {
-      resource = { fields: [] };
-    }
-    let selectStatement = "*";
-    if (resource.fields && resource.fields.length > 0) {
-      selectStatement = generateSelectStatement(json, knex3);
-    }
-    let foundLimit = limit2 || BASE_LIMIT;
+    let query = this.knexWithAlias(knex3, endpoint, tableAliases);
     let foundOffset = null;
+    let foundLimit = limits?.query || limits?.base;
     if (paginate && paginate.page && paginate.limit) {
       const page = paginate.page <= 1 ? 0 : paginate.page - 1;
       const offset = page * paginate.limit;
@@ -67906,20 +67924,28 @@ var InternalBuilder = class {
     } else if (paginate && paginate.limit) {
       foundLimit = paginate.limit;
     }
-    let query = this.knexWithAlias(knex3, endpoint, tableAliases);
-    query = query.limit(foundLimit);
-    if (foundOffset) {
-      query = query.offset(foundOffset);
+    if (!counting) {
+      if (foundLimit != null) {
+        query = query.limit(foundLimit);
+      }
+      if (foundOffset != null) {
+        query = query.offset(foundOffset);
+      }
+      query = this.addSorting(query, json);
     }
     query = this.addFilters(query, filters, json.meta.table, {
       aliases: tableAliases
     });
-    query = this.addSorting(query, json);
     const alias = tableAliases?.[tableName] || tableName;
     let preQuery = knex3({
+      // the typescript definition for the knex constructor doesn't support this
+      // syntax, but it is the only way to alias a pre-query result as part of
+      // a query - there is an alias dictionary type, but it assumes it can only
+      // be a table name, not a pre-query
       [alias]: query
-    }).select(selectStatement);
-    if (this.client !== "mssql" /* MS_SQL */) {
+    });
+    preQuery = !counting ? preQuery.select(generateSelectStatement(json, knex3)) : this.addDistinctCount(preQuery, json);
+    if (this.client !== "mssql" /* MS_SQL */ && !counting) {
       preQuery = this.addSorting(preQuery, json);
     }
     query = this.addRelationships(
@@ -67929,6 +67955,9 @@ var InternalBuilder = class {
       endpoint.schema,
       tableAliases
     );
+    if (limits?.base) {
+      query = query.limit(limits.base);
+    }
     return this.addFilters(query, filters, json.meta.table, {
       relationship: true,
       aliases: tableAliases
@@ -67966,6 +67995,18 @@ var SqlQueryBuilder = class extends sqlTable_default {
     super(client);
     this.limit = limit2;
   }
+  convertToNative(query, opts = {}) {
+    const sqlClient = this.getSqlClient();
+    if (opts?.disableBindings) {
+      return { sql: query.toString() };
+    } else {
+      let native = getNativeSql(query);
+      if (sqlClient === "sqlite3" /* SQL_LITE */) {
+        native = convertBooleans(native);
+      }
+      return native;
+    }
+  }
   /**
    * @param json The JSON query DSL which is to be converted to SQL.
    * @param opts extra options which are to be passed into the query builder, e.g. disableReturning
@@ -67988,7 +68029,15 @@ var SqlQueryBuilder = class extends sqlTable_default {
         query = builder.create(client, json, opts);
         break;
       case "READ" /* READ */:
-        query = builder.read(client, json, this.limit);
+        query = builder.read(client, json, {
+          limits: {
+            query: this.limit,
+            base: BASE_LIMIT
+          }
+        });
+        break;
+      case "COUNT" /* COUNT */:
+        query = builder.read(client, json);
         break;
       case "UPDATE" /* UPDATE */:
         query = builder.update(client, json, opts);
@@ -68009,15 +68058,7 @@ var SqlQueryBuilder = class extends sqlTable_default {
       default:
         throw `Operation type is not supported by SQL query builder`;
     }
-    if (opts?.disableBindings) {
-      return { sql: query.toString() };
-    } else {
-      let native = getNativeSql(query);
-      if (sqlClient === "sqlite3" /* SQL_LITE */) {
-        native = convertBooleans(native);
-      }
-      return native;
-    }
+    return this.convertToNative(query, opts);
   }
   async getReturningRow(queryFn, json) {
     if (!json.extra || !json.extra.idFilter) {
@@ -68084,6 +68125,9 @@ var SqlQueryBuilder = class extends sqlTable_default {
         await this.getReturningRow(queryFn, this.checkLookupKeys(id, json))
       );
     }
+    if (operation === "COUNT" /* COUNT */) {
+      return results;
+    }
     if (operation !== "READ" /* READ */) {
       return row;
     }