@budibase/backend-core 2.9.19 → 2.9.21-alpha.0

package/dist/index.js

@@ -29,28 +29,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var __privateSet = (obj, member, value, setter) => {
-  __accessCheck(obj, member, "write to private field");
-  setter ? setter.call(obj, value) : member.set(obj, value);
-  return value;
-};
-var __privateMethod = (obj, member, method) => {
-  __accessCheck(obj, member, "access private method");
-  return method;
-};
 
 // ../types/src/sdk/automations/index.ts
 var init_automations = __esm({
@@ -712,6 +690,13 @@ var init_permissions = __esm({
   }
 });
 
+// ../types/src/sdk/row.ts
+var init_row = __esm({
+  "../types/src/sdk/row.ts"() {
+    "use strict";
+  }
+});
+
 // ../types/src/sdk/index.ts
 var init_sdk = __esm({
   "../types/src/sdk/index.ts"() {
@@ -737,6 +722,7 @@ var init_sdk = __esm({
     init_cli();
     init_websocket();
     init_permissions();
+    init_row();
   }
 });
 
@@ -966,7 +952,7 @@ var init_document = __esm({
 });
 
 // ../types/src/documents/app/row.ts
-var init_row = __esm({
+var init_row2 = __esm({
   "../types/src/documents/app/row.ts"() {
     "use strict";
   }
@@ -1021,7 +1007,7 @@ var init_app3 = __esm({
     init_screen2();
     init_view2();
     init_document();
-    init_row();
+    init_row2();
     init_user4();
     init_backup2();
     init_webhook();
@@ -1301,7 +1287,7 @@ var init_datasource3 = __esm({
 });
 
 // ../types/src/api/web/app/row.ts
-var init_row2 = __esm({
+var init_row3 = __esm({
   "../types/src/api/web/app/row.ts"() {
     "use strict";
   }
@@ -1334,7 +1320,7 @@ var init_app4 = __esm({
     "use strict";
     init_backup3();
     init_datasource3();
-    init_row2();
+    init_row3();
     init_view3();
     init_rows2();
     init_table4();
@@ -1427,6 +1413,13 @@ var init_pagination = __esm({
   }
 });
 
+// ../types/src/api/web/searchFilter.ts
+var init_searchFilter = __esm({
+  "../types/src/api/web/searchFilter.ts"() {
+    "use strict";
+  }
+});
+
 // ../types/src/api/web/index.ts
 var init_web = __esm({
   "../types/src/api/web/index.ts"() {
@@ -1441,6 +1434,7 @@ var init_web = __esm({
     init_app4();
     init_global2();
     init_pagination();
+    init_searchFilter();
   }
 });
 
@@ -1872,12 +1866,15 @@ var init_environment2 = __esm({
 });
 
 // src/context/Context.ts
-var import_async_hooks, _Context, Context;
+var import_async_hooks, Context;
 var init_Context = __esm({
   "src/context/Context.ts"() {
     "use strict";
     import_async_hooks = require("async_hooks");
-    _Context = class _Context {
+    Context = class _Context {
+      static {
+        this.storage = new import_async_hooks.AsyncLocalStorage();
+      }
       static run(context, func) {
         return _Context.storage.run(context, () => func());
       }
@@ -1885,8 +1882,6 @@ var init_Context = __esm({
         return _Context.storage.getStore();
       }
     };
-    _Context.storage = new import_async_hooks.AsyncLocalStorage();
-    Context = _Context;
   }
 });
 
@@ -1928,7 +1923,7 @@ function getProdAppID(appId) {
   return `${APP_PREFIX}${rest}`;
 }
 function extractAppUUID(id) {
-  const split = (id == null ? void 0 : id.split("_")) || [];
+  const split = id?.split("_") || [];
   return split.length ? split[split.length - 1] : null;
 }
 var NO_APP_ERROR, getDevAppID;
@@ -1948,18 +1943,17 @@ var init_connections = __esm({
     "use strict";
     init_environment2();
     getCouchInfo = (connection) => {
-      var _a, _b;
       const urlInfo = getUrlInfo(connection);
       let username;
       let password;
-      if ((_a = urlInfo.auth) == null ? void 0 : _a.username) {
+      if (urlInfo.auth?.username) {
         username = urlInfo.auth.username;
       } else if (environment_default.COUCH_DB_USERNAME) {
         username = environment_default.COUCH_DB_USERNAME;
       } else if (!environment_default.isTest()) {
         throw new Error("CouchDB username not set");
       }
-      if ((_b = urlInfo.auth) == null ? void 0 : _b.password) {
+      if (urlInfo.auth?.password) {
         password = urlInfo.auth.password;
       } else if (environment_default.COUCH_DB_PASSWORD) {
         password = environment_default.COUCH_DB_PASSWORD;
@@ -2218,8 +2212,7 @@ var init_DatabaseImpl = __esm({
         return this.instanceNano || _DatabaseImpl.nano;
       }
       async checkSetup() {
-        var _a;
-        let shouldCreate = !((_a = this.pouchOpts) == null ? void 0 : _a.skip_setup);
+        let shouldCreate = !this.pouchOpts?.skip_setup;
         let exists2 = await this.exists();
         if (!shouldCreate && !exists2) {
           throw new Error("DB does not exist");
@@ -2283,7 +2276,7 @@ var init_DatabaseImpl = __esm({
           document.createdAt = (/* @__PURE__ */ new Date()).toISOString();
         }
         document.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-        if ((opts == null ? void 0 : opts.force) && document._id) {
+        if (opts?.force && document._id) {
           try {
             const existing = await this.get(document._id);
             if (existing) {
@@ -2447,7 +2440,7 @@ function isMultiTenant() {
 }
 function isTenantIdSet() {
   const context = Context.get();
-  return !!(context == null ? void 0 : context.tenantId);
+  return !!context?.tenantId;
 }
 function isTenancyEnabled() {
   return environment_default.MULTI_TENANCY;
@@ -2546,7 +2539,7 @@ async function doInIdentityContext(identity, task) {
 function getIdentity() {
   try {
     const context = Context.get();
-    return context == null ? void 0 : context.identity;
+    return context?.identity;
   } catch (e) {
   }
 }
@@ -2555,7 +2548,7 @@ function getTenantId() {
     return DEFAULT_TENANT_ID;
   }
   const context = Context.get();
-  const tenantId = context == null ? void 0 : context.tenantId;
+  const tenantId = context?.tenantId;
   if (!tenantId) {
     throw new Error("Tenant id not found");
   }
@@ -2563,11 +2556,11 @@ function getTenantId() {
 }
 function getAutomationId() {
   const context = Context.get();
-  return context == null ? void 0 : context.automationId;
+  return context?.automationId;
 }
 function getAppId() {
   const context = Context.get();
-  const foundId = context == null ? void 0 : context.appId;
+  const foundId = context?.appId;
   if (!foundId && environment_default.isTest() && TEST_APP_ID) {
     return TEST_APP_ID;
   } else {
@@ -2602,7 +2595,7 @@ function getGlobalDB() {
   if (!context || environment_default.MULTI_TENANCY && !context.tenantId) {
     throw new Error("Global DB not found");
   }
-  return getDB(baseGlobalDBName(context == null ? void 0 : context.tenantId));
+  return getDB(baseGlobalDBName(context?.tenantId));
 }
 function getAuditLogsDB() {
   if (!getTenantId()) {
@@ -2630,7 +2623,7 @@ function getDevAppDB(opts) {
 }
 function isScim() {
   const context = Context.get();
-  const scimCall = context == null ? void 0 : context.isScim;
+  const scimCall = context?.isScim;
   return !!scimCall;
 }
 var TEST_APP_ID, getProdAppId;
@@ -3481,7 +3474,7 @@ function getGlobalUserParams(globalId, otherProps = {}) {
   if (!globalId) {
     globalId = "";
   }
-  const startkey = otherProps == null ? void 0 : otherProps.startkey;
+  const startkey = otherProps?.startkey;
   return {
     ...otherProps,
     // need to include this incase pagination
@@ -3614,10 +3607,7 @@ async function getAllApps({
   } else {
     const response = await Promise.allSettled(appPromises);
     const apps = response.filter(
-      (result) => {
-        var _a;
-        return result.status === "fulfilled" && ((_a = result.value) == null ? void 0 : _a.state) !== "invalid" /* INVALID */;
-      }
+      (result) => result.status === "fulfilled" && result.value?.state !== "invalid" /* INVALID */
     ).map(({ value }) => value);
     if (!all) {
       return apps.filter((app) => {
@@ -3679,7 +3669,7 @@ function pagination(data, pageSize, {
   const hasNextPage = data.length > pageSize;
   let nextPage = void 0;
   if (!getKey) {
-    getKey = (doc) => property ? doc == null ? void 0 : doc[property] : doc == null ? void 0 : doc._id;
+    getKey = (doc) => property ? doc?.[property] : doc?._id;
   }
   if (hasNextPage) {
     nextPage = getKey(data[pageSize]);
@@ -3830,7 +3820,7 @@ var init_views = __esm({
       const docs = rows.map(
         (row) => params2.include_docs ? row.doc : row.value
       );
-      if (opts == null ? void 0 : opts.arrayResponse) {
+      if (opts?.arrayResponse) {
         return docs;
       } else {
         return docs.length <= 1 ? docs[0] : docs;
@@ -4053,38 +4043,34 @@ async function fullSearch(dbName, index2, query, params2) {
   const rows = await recursiveSearch(dbName, index2, query, params2);
   return { rows };
 }
-var import_node_fetch2, QUERY_START_REGEX, _dbName, _index, _query, _limit, _sort, _bookmark, _sortOrder, _sortType, _includeDocs, _version, _indexBuilder, _noEscaping, _skip, _skipItems, skipItems_fn, _execute, execute_fn, _QueryBuilder, QueryBuilder;
+var import_node_fetch2, QUERY_START_REGEX, QueryBuilder;
 var init_lucene = __esm({
   "src/db/lucene.ts"() {
     "use strict";
     import_node_fetch2 = __toESM(require("node-fetch"));
     init_couch();
     QUERY_START_REGEX = /\d[0-9]*:/g;
-    _QueryBuilder = class _QueryBuilder {
+    QueryBuilder = class _QueryBuilder {
+      #dbName;
+      #index;
+      #query;
+      #limit;
+      #sort;
+      #bookmark;
+      #sortOrder;
+      #sortType;
+      #includeDocs;
+      #version;
+      #indexBuilder;
+      #noEscaping = false;
+      #skip;
+      static {
+        this.maxLimit = 200;
+      }
       constructor(dbName, index2, base) {
-        /**
-         * Lucene queries do not support pagination and use bookmarks instead.
-         * For the given builder, walk through pages using bookmarks until the desired
-         * page has been met.
-         */
-        __privateAdd(this, _skipItems);
-        __privateAdd(this, _execute);
-        __privateAdd(this, _dbName, void 0);
-        __privateAdd(this, _index, void 0);
-        __privateAdd(this, _query, void 0);
-        __privateAdd(this, _limit, void 0);
-        __privateAdd(this, _sort, void 0);
-        __privateAdd(this, _bookmark, void 0);
-        __privateAdd(this, _sortOrder, void 0);
-        __privateAdd(this, _sortType, void 0);
-        __privateAdd(this, _includeDocs, void 0);
-        __privateAdd(this, _version, void 0);
-        __privateAdd(this, _indexBuilder, void 0);
-        __privateAdd(this, _noEscaping, false);
-        __privateAdd(this, _skip, void 0);
-        __privateSet(this, _dbName, dbName);
-        __privateSet(this, _index, index2);
-        __privateSet(this, _query, {
+        this.#dbName = dbName;
+        this.#index = index2;
+        this.#query = {
           allOr: false,
           string: {},
           fuzzy: {},
@@ -4098,124 +4084,124 @@ var init_lucene = __esm({
           notContains: {},
           containsAny: {},
           ...base
-        });
-        __privateSet(this, _limit, 50);
-        __privateSet(this, _sortOrder, "ascending");
-        __privateSet(this, _sortType, "string");
-        __privateSet(this, _includeDocs, true);
+        };
+        this.#limit = 50;
+        this.#sortOrder = "ascending";
+        this.#sortType = "string";
+        this.#includeDocs = true;
       }
       disableEscaping() {
-        __privateSet(this, _noEscaping, true);
+        this.#noEscaping = true;
         return this;
       }
       setIndexBuilder(builderFn) {
-        __privateSet(this, _indexBuilder, builderFn);
+        this.#indexBuilder = builderFn;
         return this;
       }
       setVersion(version) {
         if (version != null) {
-          __privateSet(this, _version, version);
+          this.#version = version;
         }
         return this;
       }
       setTable(tableId) {
-        __privateGet(this, _query).equal.tableId = tableId;
+        this.#query.equal.tableId = tableId;
         return this;
       }
       setLimit(limit) {
         if (limit != null) {
-          __privateSet(this, _limit, limit);
+          this.#limit = limit;
         }
         return this;
       }
       setSort(sort) {
         if (sort != null) {
-          __privateSet(this, _sort, sort);
+          this.#sort = sort;
         }
         return this;
       }
       setSortOrder(sortOrder) {
         if (sortOrder != null) {
-          __privateSet(this, _sortOrder, sortOrder);
+          this.#sortOrder = sortOrder;
         }
         return this;
       }
       setSortType(sortType) {
         if (sortType != null) {
-          __privateSet(this, _sortType, sortType);
+          this.#sortType = sortType;
         }
         return this;
       }
       setBookmark(bookmark) {
         if (bookmark != null) {
-          __privateSet(this, _bookmark, bookmark);
+          this.#bookmark = bookmark;
         }
         return this;
       }
       setSkip(skip) {
-        __privateSet(this, _skip, skip);
+        this.#skip = skip;
         return this;
       }
       excludeDocs() {
-        __privateSet(this, _includeDocs, false);
+        this.#includeDocs = false;
         return this;
       }
       includeDocs() {
-        __privateSet(this, _includeDocs, true);
+        this.#includeDocs = true;
         return this;
       }
       addString(key, partial) {
-        __privateGet(this, _query).string[key] = partial;
+        this.#query.string[key] = partial;
         return this;
       }
       addFuzzy(key, fuzzy) {
-        __privateGet(this, _query).fuzzy[key] = fuzzy;
+        this.#query.fuzzy[key] = fuzzy;
         return this;
       }
       addRange(key, low, high) {
-        __privateGet(this, _query).range[key] = {
+        this.#query.range[key] = {
           low,
           high
         };
         return this;
       }
       addEqual(key, value) {
-        __privateGet(this, _query).equal[key] = value;
+        this.#query.equal[key] = value;
         return this;
       }
       addNotEqual(key, value) {
-        __privateGet(this, _query).notEqual[key] = value;
+        this.#query.notEqual[key] = value;
         return this;
       }
       addEmpty(key, value) {
-        __privateGet(this, _query).empty[key] = value;
+        this.#query.empty[key] = value;
         return this;
       }
       addNotEmpty(key, value) {
-        __privateGet(this, _query).notEmpty[key] = value;
+        this.#query.notEmpty[key] = value;
         return this;
       }
       addOneOf(key, value) {
-        __privateGet(this, _query).oneOf[key] = value;
+        this.#query.oneOf[key] = value;
         return this;
       }
       addContains(key, value) {
-        __privateGet(this, _query).contains[key] = value;
+        this.#query.contains[key] = value;
         return this;
       }
       addNotContains(key, value) {
-        __privateGet(this, _query).notContains[key] = value;
+        this.#query.notContains[key] = value;
         return this;
       }
       addContainsAny(key, value) {
-        __privateGet(this, _query).containsAny[key] = value;
+        this.#query.containsAny[key] = value;
         return this;
       }
       setAllOr() {
-        __privateGet(this, _query).allOr = true;
+        this.#query.allOr = true;
       }
       handleSpaces(input) {
-        if (__privateGet(this, _noEscaping)) {
+        if (this.#noEscaping) {
           return input;
         } else {
           return input.replace(/ /g, "_");
@@ -4229,12 +4215,12 @@ var init_lucene = __esm({
        * @returns {string|*}
        */
       preprocess(value, { escape, lowercase, wrap, type } = {}) {
-        const hasVersion = !!__privateGet(this, _version);
+        const hasVersion = !!this.#version;
         const originalType = typeof value;
         if (value && lowercase) {
           value = value.toLowerCase ? value.toLowerCase() : value;
         }
-        if (!__privateGet(this, _noEscaping) && escape && originalType === "string") {
+        if (!this.#noEscaping && escape && originalType === "string") {
           value = `${value}`.replace(/[ \/#+\-&|!(){}\]^"~*?:\\]/g, "\\$&");
         }
         if (originalType === "string" && !isNaN(value) && !type) {
@@ -4246,7 +4232,7 @@ var init_lucene = __esm({
       }
       isMultiCondition() {
         let count = 0;
-        for (let filters of Object.values(__privateGet(this, _query))) {
+        for (let filters of Object.values(this.#query)) {
           if (typeof filters === "object") {
             count += Object.keys(filters).length;
           }
@@ -4272,13 +4258,13 @@ var init_lucene = __esm({
       }
       buildSearchQuery() {
         const builder = this;
-        let allOr = __privateGet(this, _query) && __privateGet(this, _query).allOr;
+        let allOr = this.#query && this.#query.allOr;
         let query = allOr ? "" : "*:*";
         const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true };
         let tableId;
-        if (__privateGet(this, _query).equal.tableId) {
-          tableId = __privateGet(this, _query).equal.tableId;
-          delete __privateGet(this, _query).equal.tableId;
+        if (this.#query.equal.tableId) {
+          tableId = this.#query.equal.tableId;
+          delete this.#query.equal.tableId;
         }
         const equal = (key, value) => {
           if (!value && value !== 0) {
@@ -4352,19 +4338,19 @@ var init_lucene = __esm({
               continue;
             }
             if (built.length > 0 || query.length > 0) {
-              const mode = (opts == null ? void 0 : opts.mode) ? opts.mode : allOr ? "OR" : "AND";
+              const mode = opts?.mode ? opts.mode : allOr ? "OR" : "AND";
               built += ` ${mode} `;
             }
             built += expression;
           }
-          if (opts == null ? void 0 : opts.returnBuilt) {
+          if (opts?.returnBuilt) {
             return built;
           } else {
             query += built;
           }
         }
-        if (__privateGet(this, _query).string) {
-          build(__privateGet(this, _query).string, (key, value) => {
+        if (this.#query.string) {
+          build(this.#query.string, (key, value) => {
             if (!value) {
               return null;
             }
@@ -4376,8 +4362,8 @@ var init_lucene = __esm({
             return `${key}:${value}*`;
           });
         }
-        if (__privateGet(this, _query).range) {
-          build(__privateGet(this, _query).range, (key, value) => {
+        if (this.#query.range) {
+          build(this.#query.range, (key, value) => {
             if (!value) {
               return null;
             }
@@ -4392,14 +4378,14 @@ var init_lucene = __esm({
             return `${key}:[${low} TO ${high}]`;
           });
         }
-        if (__privateGet(this, _query).fuzzy) {
-          build(__privateGet(this, _query).fuzzy, fuzzy);
+        if (this.#query.fuzzy) {
+          build(this.#query.fuzzy, fuzzy);
         }
-        if (__privateGet(this, _query).equal) {
-          build(__privateGet(this, _query).equal, equal);
+        if (this.#query.equal) {
+          build(this.#query.equal, equal);
         }
-        if (__privateGet(this, _query).notEqual) {
-          build(__privateGet(this, _query).notEqual, (key, value) => {
+        if (this.#query.notEqual) {
+          build(this.#query.notEqual, (key, value) => {
             if (!value) {
               return null;
             }
@@ -4409,23 +4395,23 @@ var init_lucene = __esm({
             return `!${key}:${builder.preprocess(value, allPreProcessingOpts)}`;
           });
         }
-        if (__privateGet(this, _query).empty) {
-          build(__privateGet(this, _query).empty, (key) => `(*:* -${key}:["" TO *])`);
+        if (this.#query.empty) {
+          build(this.#query.empty, (key) => `(*:* -${key}:["" TO *])`);
         }
-        if (__privateGet(this, _query).notEmpty) {
-          build(__privateGet(this, _query).notEmpty, (key) => `${key}:["" TO *]`);
+        if (this.#query.notEmpty) {
+          build(this.#query.notEmpty, (key) => `${key}:["" TO *]`);
         }
-        if (__privateGet(this, _query).oneOf) {
-          build(__privateGet(this, _query).oneOf, oneOf);
+        if (this.#query.oneOf) {
+          build(this.#query.oneOf, oneOf);
         }
-        if (__privateGet(this, _query).contains) {
-          build(__privateGet(this, _query).contains, contains);
+        if (this.#query.contains) {
+          build(this.#query.contains, contains);
         }
-        if (__privateGet(this, _query).notContains) {
-          build(this.compressFilters(__privateGet(this, _query).notContains), notContains);
+        if (this.#query.notContains) {
+          build(this.compressFilters(this.#query.notContains), notContains);
         }
-        if (__privateGet(this, _query).containsAny) {
-          build(__privateGet(this, _query).containsAny, containsAny);
+        if (this.#query.containsAny) {
+          build(this.#query.containsAny, containsAny);
         }
         if (tableId) {
           query = this.isMultiCondition() ? `(${query})` : query;
@@ -4437,75 +4423,63 @@ var init_lucene = __esm({
       buildSearchBody() {
         let body2 = {
           q: this.buildSearchQuery(),
-          limit: Math.min(__privateGet(this, _limit), _QueryBuilder.maxLimit),
-          include_docs: __privateGet(this, _includeDocs)
+          limit: Math.min(this.#limit, _QueryBuilder.maxLimit),
+          include_docs: this.#includeDocs
         };
-        if (__privateGet(this, _bookmark)) {
-          body2.bookmark = __privateGet(this, _bookmark);
+        if (this.#bookmark) {
+          body2.bookmark = this.#bookmark;
         }
-        if (__privateGet(this, _sort)) {
-          const order = __privateGet(this, _sortOrder) === "descending" ? "-" : "";
-          const type = `<${__privateGet(this, _sortType)}>`;
-          body2.sort = `${order}${this.handleSpaces(__privateGet(this, _sort))}${type}`;
+        if (this.#sort) {
+          const order = this.#sortOrder === "descending" ? "-" : "";
+          const type = `<${this.#sortType}>`;
+          body2.sort = `${order}${this.handleSpaces(this.#sort)}${type}`;
         }
         return body2;
       }
       async run() {
-        if (__privateGet(this, _skip)) {
-          await __privateMethod(this, _skipItems, skipItems_fn).call(this, __privateGet(this, _skip));
+        if (this.#skip) {
+          await this.#skipItems(this.#skip);
         }
-        return await __privateMethod(this, _execute, execute_fn).call(this);
+        return await this.#execute();
       }
-    };
-    _dbName = new WeakMap();
-    _index = new WeakMap();
-    _query = new WeakMap();
-    _limit = new WeakMap();
-    _sort = new WeakMap();
-    _bookmark = new WeakMap();
-    _sortOrder = new WeakMap();
-    _sortType = new WeakMap();
-    _includeDocs = new WeakMap();
-    _version = new WeakMap();
-    _indexBuilder = new WeakMap();
-    _noEscaping = new WeakMap();
-    _skip = new WeakMap();
-    _skipItems = new WeakSet();
-    skipItems_fn = async function(skip) {
-      const prevIncludeDocs = __privateGet(this, _includeDocs);
-      const prevLimit = __privateGet(this, _limit);
-      this.excludeDocs();
-      let skipRemaining = skip;
-      let iterationFetched = 0;
-      do {
-        const toSkip = Math.min(_QueryBuilder.maxLimit, skipRemaining);
-        this.setLimit(toSkip);
-        const { bookmark, rows } = await __privateMethod(this, _execute, execute_fn).call(this);
-        this.setBookmark(bookmark);
-        iterationFetched = rows.length;
-        skipRemaining -= rows.length;
-      } while (skipRemaining > 0 && iterationFetched > 0);
-      __privateSet(this, _includeDocs, prevIncludeDocs);
-      __privateSet(this, _limit, prevLimit);
-    };
-    _execute = new WeakSet();
-    execute_fn = async function() {
-      const { url, cookie } = getCouchInfo();
-      const fullPath = `${url}/${__privateGet(this, _dbName)}/_design/database/_search/${__privateGet(this, _index)}`;
-      const body2 = this.buildSearchBody();
-      try {
-        return await runQuery(fullPath, body2, cookie);
-      } catch (err) {
-        if (err.status === 404 && __privateGet(this, _indexBuilder)) {
-          await __privateGet(this, _indexBuilder).call(this);
+      /**
+       * Lucene queries do not support pagination and use bookmarks instead.
+       * For the given builder, walk through pages using bookmarks until the desired
+       * page has been met.
+       */
+      async #skipItems(skip) {
+        const prevIncludeDocs = this.#includeDocs;
+        const prevLimit = this.#limit;
+        this.excludeDocs();
+        let skipRemaining = skip;
+        let iterationFetched = 0;
+        do {
+          const toSkip = Math.min(_QueryBuilder.maxLimit, skipRemaining);
+          this.setLimit(toSkip);
+          const { bookmark, rows } = await this.#execute();
+          this.setBookmark(bookmark);
+          iterationFetched = rows.length;
+          skipRemaining -= rows.length;
+        } while (skipRemaining > 0 && iterationFetched > 0);
+        this.#includeDocs = prevIncludeDocs;
+        this.#limit = prevLimit;
+      }
+      async #execute() {
+        const { url, cookie } = getCouchInfo();
+        const fullPath = `${url}/${this.#dbName}/_design/database/_search/${this.#index}`;
+        const body2 = this.buildSearchBody();
+        try {
           return await runQuery(fullPath, body2, cookie);
-        } else {
-          throw err;
+        } catch (err) {
+          if (err.status === 404 && this.#indexBuilder) {
+            await this.#indexBuilder();
+            return await runQuery(fullPath, body2, cookie);
+          } else {
+            throw err;
+          }
         }
       }
     };
-    _QueryBuilder.maxLimit = 200;
-    QueryBuilder = _QueryBuilder;
   }
 });
 
@@ -4584,10 +4558,9 @@ var init_searchIndexes2 = __esm({
 
 // src/db/errors.ts
 function checkErrorCode(error, code) {
-  var _a;
   const stringCode = code.toString();
   if (typeof error === "object") {
-    return error.status === code || ((_a = error.message) == null ? void 0 : _a.includes(stringCode));
+    return error.status === code || error.message?.includes(stringCode);
   } else if (typeof error === "number") {
     return error === code;
   } else if (typeof error === "string") {
@@ -4838,12 +4811,12 @@ var init_objectStore = __esm({
     streamUpload = async (bucketName, filename, stream2, extra = {}) => {
       const objectStore = ObjectStore(bucketName);
       await makeSureBucketExists(objectStore, bucketName);
-      if (filename == null ? void 0 : filename.endsWith(".js")) {
+      if (filename?.endsWith(".js")) {
         extra = {
           ...extra,
           ContentType: "application/javascript"
         };
-      } else if (filename == null ? void 0 : filename.endsWith(".svg")) {
+      } else if (filename?.endsWith(".svg")) {
         extra = {
           ...extra,
           ContentType: "image"
@@ -4959,7 +4932,6 @@ var init_objectStore = __esm({
       return objectStore.deleteObjects(params2).promise();
     };
     deleteFolder = async (bucketName, folder) => {
-      var _a, _b, _c;
       bucketName = sanitizeBucket(bucketName);
       folder = sanitizeKey(folder);
       const client = ObjectStore(bucketName);
@@ -4968,7 +4940,7 @@ var init_objectStore = __esm({
         Prefix: folder
       };
       const existingObjectsResponse = await client.listObjects(listParams).promise();
-      if (((_a = existingObjectsResponse.Contents) == null ? void 0 : _a.length) === 0) {
+      if (existingObjectsResponse.Contents?.length === 0) {
         return;
       }
       const deleteParams = {
@@ -4977,11 +4949,11 @@ var init_objectStore = __esm({
           Objects: []
         }
       };
-      (_b = existingObjectsResponse.Contents) == null ? void 0 : _b.forEach((content) => {
+      existingObjectsResponse.Contents?.forEach((content) => {
         deleteParams.Delete.Objects.push({ Key: content.Key });
       });
       const deleteResponse = await client.deleteObjects(deleteParams).promise();
-      if (((_c = deleteResponse.Deleted) == null ? void 0 : _c.length) === 1e3) {
+      if (deleteResponse.Deleted?.length === 1e3) {
         return deleteFolder(bucketName, folder);
       }
     };
@@ -5258,7 +5230,7 @@ function getFullPath(fileName) {
 }
 function getSingleFileMaxSizeInfo(totalMaxSize) {
   const regex = /(\d+)([A-Za-z])/;
-  const match = totalMaxSize == null ? void 0 : totalMaxSize.match(regex);
+  const match = totalMaxSize?.match(regex);
   if (!match) {
     console.warn(`totalMaxSize does not have a valid value`, {
       totalMaxSize
@@ -5290,9 +5262,9 @@ function localFileDestination() {
   const fileInfo = getSingleFileMaxSizeInfo(environment_default.ROLLING_LOG_MAX_SIZE);
   const outFile = rfs.createStream(logsFileName, {
     // As we have a rolling size, we want to half the max size
-    size: fileInfo == null ? void 0 : fileInfo.size,
+    size: fileInfo?.size,
     path: logsPath,
-    maxFiles: (fileInfo == null ? void 0 : fileInfo.totalHistoryFiles) || 1,
+    maxFiles: fileInfo?.totalHistoryFiles || 1,
     immutable: true,
     history: budibaseLogsHistoryFileName,
     initialRotation: false
@@ -5367,8 +5339,8 @@ var init_logger = __esm({
           tenantId: getTenantId2(),
           appId: getAppId2(),
           automationId: getAutomationId2(),
-          identityId: identity == null ? void 0 : identity._id,
-          identityType: identity == null ? void 0 : identity.type,
+          identityId: identity?._id,
+          identityType: identity?.type,
           correlationId: getId()
         };
         const mergingObject = {
@@ -5432,30 +5404,30 @@ var init_logger = __esm({
       pinoInstance = destinations.length ? (0, import_pino.default)(pinoOptions, import_pino.default.multistream(destinations)) : (0, import_pino.default)(pinoOptions);
       console.log = (...arg) => {
         const [obj, msg] = getLogParams2(arg);
-        pinoInstance == null ? void 0 : pinoInstance.info(obj, msg);
+        pinoInstance?.info(obj, msg);
       };
       console.info = (...arg) => {
         const [obj, msg] = getLogParams2(arg);
-        pinoInstance == null ? void 0 : pinoInstance.info(obj, msg);
+        pinoInstance?.info(obj, msg);
       };
       console.warn = (...arg) => {
         const [obj, msg] = getLogParams2(arg);
-        pinoInstance == null ? void 0 : pinoInstance.warn(obj, msg);
+        pinoInstance?.warn(obj, msg);
       };
       console.error = (...arg) => {
         const [obj, msg] = getLogParams2(arg);
-        pinoInstance == null ? void 0 : pinoInstance.error(obj, msg);
+        pinoInstance?.error(obj, msg);
       };
       console.trace = (...arg) => {
         const [obj, msg] = getLogParams2(arg);
         if (!obj.err) {
           obj.err = new Error();
         }
-        pinoInstance == null ? void 0 : pinoInstance.trace(obj, msg);
+        pinoInstance?.trace(obj, msg);
       };
       console.debug = (...arg) => {
         const [obj, msg] = getLogParams2(arg);
-        pinoInstance == null ? void 0 : pinoInstance.debug(obj, msg);
+        pinoInstance?.debug(obj, msg);
       };
       const getTenantId2 = () => {
         let tenantId;
@@ -5738,7 +5710,6 @@ var isUserInAppTenant = (appId, user) => {
 };
 var ALL_STRATEGIES = Object.values(TenantResolutionStrategy);
 var getTenantIDFromCtx = (ctx, opts) => {
-  var _a;
   if (!isMultiTenant()) {
     return DEFAULT_TENANT_ID;
   }
@@ -5752,16 +5723,15 @@ var getTenantIDFromCtx = (ctx, opts) => {
     opts.excludeStrategies = [];
   }
   const isAllowed = (strategy) => {
-    var _a2, _b;
-    if ((_a2 = opts.excludeStrategies) == null ? void 0 : _a2.includes(strategy)) {
+    if (opts.excludeStrategies?.includes(strategy)) {
       return false;
     }
-    if ((_b = opts.includeStrategies) == null ? void 0 : _b.includes(strategy)) {
+    if (opts.includeStrategies?.includes(strategy)) {
       return true;
     }
   };
   if (isAllowed("user" /* USER */)) {
-    const userTenantId = (_a = ctx.user) == null ? void 0 : _a.tenantId;
+    const userTenantId = ctx.user?.tenantId;
     if (userTenantId) {
       return userTenantId;
     }
@@ -6329,7 +6299,7 @@ async function put(db, doc, writeRateMs = DEFAULT_WRITE_RATE_MS) {
       logWarn(`Ignoring redlock conflict in write-through cache`);
     }
   }
-  cacheItem = makeCacheItem(output, updateDb ? null : cacheItem == null ? void 0 : cacheItem.lastWrite);
+  cacheItem = makeCacheItem(output, updateDb ? null : cacheItem?.lastWrite);
   if (output._id) {
     await cache.store(makeCacheKey(db, output._id), cacheItem);
   }
@@ -6421,7 +6391,6 @@ async function getSettingsConfig() {
 async function getPlatformUrl(opts = {
   tenantAware: true
 }) {
-  var _a;
   let platformUrl = environment_default.PLATFORM_URL || "http://localhost:10000";
   if (!environment_default.SELF_HOSTED && environment_default.MULTI_TENANCY && opts.tenantAware) {
     const tenantId = getTenantId();
@@ -6429,11 +6398,11 @@ async function getPlatformUrl(opts = {
       platformUrl = platformUrl.replace("://", `://${tenantId}.`);
     }
   } else if (environment_default.SELF_HOSTED) {
-    const config = (opts == null ? void 0 : opts.config) ? opts.config : (
+    const config = opts?.config ? opts.config : (
       // direct to db to prevent infinite loop
-      (_a = await getConfig("settings" /* SETTINGS */)) == null ? void 0 : _a.config
+      (await getConfig("settings" /* SETTINGS */))?.config
     );
-    if (config == null ? void 0 : config.platformUrl) {
+    if (config?.platformUrl) {
       platformUrl = config.platformUrl;
     }
   }
@@ -6447,14 +6416,13 @@ var analyticsEnabled = async (opts) => {
     "analyticsEnabled" /* ANALYTICS_ENABLED */,
     86400 /* ONE_DAY */,
     async () => {
-      var _a;
-      const config = (opts == null ? void 0 : opts.config) ? opts.config : (
+      const config = opts?.config ? opts.config : (
         // direct to db to prevent infinite loop
-        (_a = await getConfig("settings" /* SETTINGS */)) == null ? void 0 : _a.config
+        (await getConfig("settings" /* SETTINGS */))?.config
       );
-      if ((config == null ? void 0 : config.analyticsEnabled) === false) {
+      if (config?.analyticsEnabled === false) {
         return false;
-      } else if ((config == null ? void 0 : config.analyticsEnabled) === true) {
+      } else if (config?.analyticsEnabled === true) {
         return true;
       }
     }
@@ -6474,7 +6442,7 @@ async function getGoogleConfigDoc() {
 }
 async function getGoogleConfig() {
   const config = await getGoogleConfigDoc();
-  return config == null ? void 0 : config.config;
+  return config?.config;
 }
 async function getGoogleDatasourceConfig() {
   if (!environment_default.SELF_HOSTED) {
@@ -6502,13 +6470,11 @@ async function getOIDCConfigDoc() {
   return getConfig("oidc" /* OIDC */);
 }
 async function getOIDCConfig() {
-  var _a;
-  const config = (_a = await getOIDCConfigDoc()) == null ? void 0 : _a.config;
-  return (config == null ? void 0 : config.configs) && config.configs[0];
+  const config = (await getOIDCConfigDoc())?.config;
+  return config?.configs && config.configs[0];
 }
 async function getOIDCConfigById(configId) {
-  var _a;
-  const config = (_a = await getConfig("oidc" /* OIDC */)) == null ? void 0 : _a.config;
+  const config = (await getConfig("oidc" /* OIDC */))?.config;
   return config && config.configs.filter((c) => c.uuid === configId)[0];
 }
 async function getSMTPConfigDoc() {
@@ -6535,7 +6501,7 @@ async function getSMTPConfig(isAutomation) {
 }
 async function getSCIMConfig() {
   const config = await getConfig("scim" /* SCIM */);
-  return config == null ? void 0 : config.config;
+  return config?.config;
 }
 
 // src/events/index.ts
@@ -6950,7 +6916,7 @@ async function getAppIdFromCtx(ctx) {
     appId = confirmAppId(await resolveAppUrl(ctx));
   }
   const referer = ctx.request.headers.referer;
-  if (!appId && (referer == null ? void 0 : referer.includes(BUILDER_APP_PREFIX))) {
+  if (!appId && referer?.includes(BUILDER_APP_PREFIX)) {
     const refererId = parseAppIdFromUrl(ctx.request.headers.referer);
     appId = confirmAppId(refererId);
   }
@@ -7169,7 +7135,6 @@ function handleStalled(queue, removeStalledCb) {
   });
 }
 function getLogParams(eventType, event, opts = {}, extra = {}) {
-  var _a, _b, _c;
   const message = `[BULL] ${eventType}=${event}`;
   const err = opts.error;
   const bullLog = {
@@ -7177,11 +7142,11 @@ function getLogParams(eventType, event, opts = {}, extra = {}) {
     eventType,
     event,
     job: opts.job,
-    jobId: opts.jobId || ((_a = opts.job) == null ? void 0 : _a.id),
+    jobId: opts.jobId || opts.job?.id,
     ...extra
   };
   let automationLog;
-  if ((_c = (_b = opts.job) == null ? void 0 : _b.data) == null ? void 0 : _c.automation) {
+  if (opts.job?.data?.automation) {
     automationLog = {
       _logKey: "automation",
       trigger: opts.job ? opts.job.data.automation.definition.trigger.event : void 0
@@ -7196,11 +7161,9 @@ var EventTypeMap = {
   ["systemEventQueue" /* SYSTEM_EVENT_QUEUE */]: "system-event" /* SYSTEM_EVENT */
 };
 function logging(queue, jobQueue) {
-  var _a;
   const eventType = EventTypeMap[jobQueue];
   function doInJobContext(job, task) {
-    var _a2;
-    const appId = (_a2 = job.data.event) == null ? void 0 : _a2.appId;
+    const appId = job.data.event?.appId;
     if (appId) {
       return doInContext(appId, task);
     } else {
@@ -7214,7 +7177,7 @@ function logging(queue, jobQueue) {
   }).on("error" /* ERROR */, (error) => {
     console.error(...getLogParams(eventType, "error" /* ERROR */, { error }));
   });
-  if ((_a = process.env.NODE_DEBUG) == null ? void 0 : _a.includes("bull")) {
+  if (process.env.NODE_DEBUG?.includes("bull")) {
     queue.on("waiting" /* WAITING */, (jobId) => {
       console.info(...getLogParams(eventType, "waiting" /* WAITING */, { jobId }));
     }).on("active" /* ACTIVE */, async (job, jobPromise) => {
@@ -7284,7 +7247,7 @@ function createQueue(jobQueue, opts = {}) {
   } else {
     queue = new inMemoryQueue_default(jobQueue, queueConfig);
   }
-  addListeners(queue, jobQueue, opts == null ? void 0 : opts.removeStalledCb);
+  addListeners(queue, jobQueue, opts?.removeStalledCb);
   QUEUES.push(queue);
   if (!cleanupInterval && !environment_default.isTest()) {
     cleanupInterval = set(cleanup2, CLEANUP_PERIOD_MS);
@@ -7309,7 +7272,10 @@ async function shutdown2() {
 
 // src/events/processors/AuditLogsProcessor.ts
 init_environment2();
-var _AuditLogsProcessor = class _AuditLogsProcessor {
+var AuditLogsProcessor = class _AuditLogsProcessor {
+  static {
+    this.auditLogsEnabled = false;
+  }
   // can't use constructor as need to return promise
   static init(fn) {
     _AuditLogsProcessor.auditLogsEnabled = true;
@@ -7361,12 +7327,9 @@ var _AuditLogsProcessor = class _AuditLogsProcessor {
   async identifyGroup(group, timestamp) {
   }
   shutdown() {
-    var _a;
-    (_a = _AuditLogsProcessor.auditLogQueue) == null ? void 0 : _a.close();
+    _AuditLogsProcessor.auditLogQueue?.close();
   }
 };
-_AuditLogsProcessor.auditLogsEnabled = false;
-var AuditLogsProcessor = _AuditLogsProcessor;
 
 // src/events/processors/Processors.ts
 var Processor = class {
@@ -7581,7 +7544,7 @@ var bulkGetGlobalUsersById = async (userIds, opts) => {
     keys: userIds,
     include_docs: true
   })).rows.map((row) => row.doc);
-  if (opts == null ? void 0 : opts.cleanup) {
+  if (opts?.cleanup) {
     users = removeUserPassword(users);
   }
   return users;
@@ -7602,7 +7565,7 @@ var bulkUpdateGlobalUsers = async (users) => {
 async function getById(id, opts) {
   const db = getGlobalDB();
   let user = await db.get(id);
-  if (opts == null ? void 0 : opts.cleanup) {
+  if (opts?.cleanup) {
     user = removeUserPassword(user);
   }
   return user;
@@ -7619,7 +7582,7 @@ var getGlobalUserByEmail = async (email, opts) => {
     throw new Error(`Multiple users found with email address: ${email}`);
   }
   let user = response;
-  if (opts == null ? void 0 : opts.cleanup) {
+  if (opts?.cleanup) {
     user = removeUserPassword(user);
   }
   return user;
@@ -7637,7 +7600,7 @@ var searchGlobalUsersByApp = async (appId, opts, getOpts) => {
     response = [];
   }
   let users = Array.isArray(response) ? response : [response];
-  if (getOpts == null ? void 0 : getOpts.cleanup) {
+  if (getOpts?.cleanup) {
     users = removeUserPassword(users);
   }
   return users;
@@ -7667,10 +7630,10 @@ var searchGlobalUsersByAppAccess = async (appId, opts) => {
         $regex: "^us_"
       }
     },
-    limit: (opts == null ? void 0 : opts.limit) || 50
+    limit: opts?.limit || 50
   };
   const resp = await directCouchFind(getGlobalDBName(), searchOptions);
-  return resp == null ? void 0 : resp.rows;
+  return resp?.rows;
 };
 var getGlobalUserByAppPage = (appId, user) => {
   if (!user) {
@@ -7693,7 +7656,7 @@ var searchGlobalUsersByEmail = async (email, opts, getOpts) => {
     response = [];
   }
   let users = Array.isArray(response) ? response : [response];
-  if (getOpts == null ? void 0 : getOpts.cleanup) {
+  if (getOpts?.cleanup) {
     users = removeUserPassword(users);
   }
   return users;
@@ -8044,13 +8007,12 @@ __export(users_exports2, {
   isGlobalBuilder: () => isGlobalBuilder
 });
 function isBuilder(user, appId) {
-  var _a, _b, _c;
   if (!user) {
     return false;
   }
-  if ((_a = user.builder) == null ? void 0 : _a.global) {
+  if (user.builder?.global) {
     return true;
-  } else if (appId && ((_c = (_b = user.builder) == null ? void 0 : _b.apps) == null ? void 0 : _c.includes(getProdAppID2(appId)))) {
+  } else if (appId && user.builder?.apps?.includes(getProdAppID2(appId))) {
     return true;
   }
   return false;
@@ -8068,27 +8030,24 @@ function isAdminOrBuilder(user, appId) {
   return isBuilder(user, appId) || isAdmin(user);
 }
 function hasAppBuilderPermissions(user) {
-  var _a, _b, _c;
   if (!user) {
     return false;
   }
-  const appLength = (_b = (_a = user.builder) == null ? void 0 : _a.apps) == null ? void 0 : _b.length;
-  const isGlobalBuilder3 = !!((_c = user.builder) == null ? void 0 : _c.global);
+  const appLength = user.builder?.apps?.length;
+  const isGlobalBuilder3 = !!user.builder?.global;
   return !isGlobalBuilder3 && appLength != null && appLength > 0;
 }
 function hasBuilderPermissions(user) {
-  var _a;
   if (!user) {
     return false;
   }
-  return ((_a = user.builder) == null ? void 0 : _a.global) || hasAppBuilderPermissions(user);
+  return user.builder?.global || hasAppBuilderPermissions(user);
 }
 function hasAdminPermissions(user) {
-  var _a;
   if (!user) {
     return false;
   }
-  return !!((_a = user.admin) == null ? void 0 : _a.global);
+  return !!user.admin?.global;
 }
 
 // src/users/utils.ts
@@ -8161,7 +8120,7 @@ var unassignAppRoleEvents = async (user, roles, existingRoles) => {
 };
 var handleAppRoleEvents = async (user, existingUser) => {
   const roles = user.roles;
-  const existingRoles = existingUser == null ? void 0 : existingUser.roles;
+  const existingRoles = existingUser?.roles;
   await assignAppRoleEvents(user, roles, existingRoles);
   await unassignAppRoleEvents(user, roles, existingRoles);
 };
@@ -8213,7 +8172,7 @@ var isRemovingAdmin = (user, existingUser) => {
   return isRemovingPermission(user, existingUser, hasAdminPermissions2);
 };
 var isOnboardingComplete = (user, existingUser) => {
-  return !(existingUser == null ? void 0 : existingUser.onboardedAt) && typeof user.onboardedAt === "string";
+  return !existingUser?.onboardedAt && typeof user.onboardedAt === "string";
 };
 var isAddingPermission = (user, existingUser, hasPermission) => {
   if (!hasPermission(user)) {
@@ -8270,7 +8229,7 @@ async function getSessionsForUser(userId) {
 }
 async function invalidateSessions(userId, opts = {}) {
   try {
-    const reason = (opts == null ? void 0 : opts.reason) || "unknown";
+    const reason = opts?.reason || "unknown";
     let sessionIds = opts.sessionIds || [];
     let sessionKeys;
     if (sessionIds.length === 0) {
@@ -8447,7 +8406,6 @@ var UserDB = class _UserDB {
     return user;
   }
   static async save(user, opts = {}) {
-    var _a, _b;
     if (opts.hashPassword == null) {
       opts.hashPassword = true;
     }
@@ -8460,7 +8418,7 @@ var UserDB = class _UserDB {
     if (!email && !_id) {
       throw new Error("_id or email is required");
     }
-    if (((_b = (_a = user.builder) == null ? void 0 : _a.apps) == null ? void 0 : _b.length) && !await _UserDB.features.isAppBuildersEnabled()) {
+    if (user.builder?.apps?.length && !await _UserDB.features.isAppBuildersEnabled()) {
       throw new Error("Unable to update app builders, please check license");
     }
     let dbUser;
@@ -8488,10 +8446,10 @@ var UserDB = class _UserDB {
     return _UserDB.quotas.addUsers(change, async () => {
       await validateUniqueUser(email, tenantId);
       let builtUser = await _UserDB.buildUser(user, opts, tenantId, dbUser);
-      if (opts.currentUserId && opts.currentUserId === (dbUser == null ? void 0 : dbUser._id)) {
+      if (opts.currentUserId && opts.currentUserId === dbUser?._id) {
         builtUser = cleanseUserObject(builtUser, dbUser);
       }
-      if (!dbUser && (roles == null ? void 0 : roles.length)) {
+      if (!dbUser && roles?.length) {
         builtUser.roles = { ...roles };
       }
       let groupPromises = [];
@@ -8770,8 +8728,8 @@ var identifyUser = async (user, account, timestamp) => {
   if (isSSOUser(user)) {
     providerType = user.providerType;
   }
-  const accountHolder = (account == null ? void 0 : account.budibaseUserId) === user._id || false;
-  const verified2 = account && (account == null ? void 0 : account.budibaseUserId) === user._id ? account.verified : false;
+  const accountHolder = account?.budibaseUserId === user._id || false;
+  const verified2 = account && account?.budibaseUserId === user._id ? account.verified : false;
   const installationId = await getInstallationId();
   const hosting = account ? account.hosting : getHostingFromEnv();
   const environment2 = getDeploymentEnvironment();
@@ -8930,7 +8888,7 @@ var clearEvents = async () => {
 };
 var isBackfillingEvent = async (event) => {
   const backfill = await getBackfillMetadata();
-  const events2 = backfill == null ? void 0 : backfill.eventWhitelist;
+  const events2 = backfill?.eventWhitelist;
   if (events2 && events2.includes(event)) {
     return true;
   } else {
@@ -9274,12 +9232,11 @@ var auth_default = {
 // src/events/publishers/automation.ts
 init_src();
 async function created3(automation, timestamp) {
-  var _a, _b, _c, _d;
   const properties = {
     appId: automation.appId,
     automationId: automation._id,
-    triggerId: (_b = (_a = automation.definition) == null ? void 0 : _a.trigger) == null ? void 0 : _b.id,
-    triggerType: (_d = (_c = automation.definition) == null ? void 0 : _c.trigger) == null ? void 0 : _d.stepId,
+    triggerId: automation.definition?.trigger?.id,
+    triggerType: automation.definition?.trigger?.stepId,
     audited: {
       name: automation.name
     }
@@ -9287,22 +9244,20 @@ async function created3(automation, timestamp) {
   await publishEvent("automation:created" /* AUTOMATION_CREATED */, properties, timestamp);
 }
 async function triggerUpdated(automation) {
-  var _a, _b, _c, _d;
   const properties = {
     appId: automation.appId,
     automationId: automation._id,
-    triggerId: (_b = (_a = automation.definition) == null ? void 0 : _a.trigger) == null ? void 0 : _b.id,
-    triggerType: (_d = (_c = automation.definition) == null ? void 0 : _c.trigger) == null ? void 0 : _d.stepId
+    triggerId: automation.definition?.trigger?.id,
+    triggerType: automation.definition?.trigger?.stepId
   };
   await publishEvent("automation:trigger:updated" /* AUTOMATION_TRIGGER_UPDATED */, properties);
 }
 async function deleted3(automation) {
-  var _a, _b, _c, _d;
   const properties = {
     appId: automation.appId,
     automationId: automation._id,
-    triggerId: (_b = (_a = automation.definition) == null ? void 0 : _a.trigger) == null ? void 0 : _b.id,
-    triggerType: (_d = (_c = automation.definition) == null ? void 0 : _c.trigger) == null ? void 0 : _d.stepId,
+    triggerId: automation.definition?.trigger?.id,
+    triggerType: automation.definition?.trigger?.stepId,
     audited: {
       name: automation.name
     }
@@ -9310,12 +9265,11 @@ async function deleted3(automation) {
   await publishEvent("automation:deleted" /* AUTOMATION_DELETED */, properties);
 }
 async function tested(automation) {
-  var _a, _b, _c, _d;
   const properties = {
     appId: automation.appId,
     automationId: automation._id,
-    triggerId: (_b = (_a = automation.definition) == null ? void 0 : _a.trigger) == null ? void 0 : _b.id,
-    triggerType: (_d = (_c = automation.definition) == null ? void 0 : _c.trigger) == null ? void 0 : _d.stepId
+    triggerId: automation.definition?.trigger?.id,
+    triggerType: automation.definition?.trigger?.stepId
   };
   await publishEvent("automation:tested" /* AUTOMATION_TESTED */, properties);
 }
@@ -9326,12 +9280,11 @@ var run = async (count, timestamp) => {
   await publishEvent("automations:run" /* AUTOMATIONS_RUN */, properties, timestamp);
 };
 async function stepCreated(automation, step, timestamp) {
-  var _a, _b, _c, _d;
   const properties = {
     appId: automation.appId,
     automationId: automation._id,
-    triggerId: (_b = (_a = automation.definition) == null ? void 0 : _a.trigger) == null ? void 0 : _b.id,
-    triggerType: (_d = (_c = automation.definition) == null ? void 0 : _c.trigger) == null ? void 0 : _d.stepId,
+    triggerId: automation.definition?.trigger?.id,
+    triggerType: automation.definition?.trigger?.stepId,
     stepId: step.id,
     stepType: step.stepId,
     audited: {
@@ -9341,12 +9294,11 @@ async function stepCreated(automation, step, timestamp) {
   await publishEvent("automation:step:created" /* AUTOMATION_STEP_CREATED */, properties, timestamp);
 }
 async function stepDeleted(automation, step) {
-  var _a, _b, _c, _d;
   const properties = {
     appId: automation.appId,
     automationId: automation._id,
-    triggerId: (_b = (_a = automation.definition) == null ? void 0 : _a.trigger) == null ? void 0 : _b.id,
-    triggerType: (_d = (_c = automation.definition) == null ? void 0 : _c.trigger) == null ? void 0 : _d.stepId,
+    triggerId: automation.definition?.trigger?.id,
+    triggerType: automation.definition?.trigger?.stepId,
     stepId: step.id,
     stepType: step.stepId,
     audited: {
@@ -9633,25 +9585,23 @@ var role_default = {
 // src/events/publishers/screen.ts
 init_src();
 async function created8(screen, timestamp) {
-  var _a;
   const properties = {
     layoutId: screen.layoutId,
     screenId: screen._id,
     roleId: screen.routing.roleId,
     audited: {
-      name: (_a = screen.routing) == null ? void 0 : _a.route
+      name: screen.routing?.route
     }
   };
   await publishEvent("screen:created" /* SCREEN_CREATED */, properties, timestamp);
 }
 async function deleted8(screen) {
-  var _a;
   const properties = {
     layoutId: screen.layoutId,
     screenId: screen._id,
     roleId: screen.routing.roleId,
     audited: {
-      name: (_a = screen.routing) == null ? void 0 : _a.route
+      name: screen.routing?.route
     }
   };
   await publishEvent("screen:deleted" /* SCREEN_DELETED */, properties);
@@ -10722,7 +10672,7 @@ var BUILTIN_ROLE_NAME_ARRAY = Object.values(BUILTIN_ROLES).map(
   (role) => role.name
 );
 function isBuiltin(role) {
-  return BUILTIN_ROLE_ID_ARRAY.some((builtin) => role == null ? void 0 : role.includes(builtin));
+  return BUILTIN_ROLE_ID_ARRAY.some((builtin) => role?.includes(builtin));
 }
 function builtinRoleToNumber(id) {
   if (!id) {
@@ -10749,7 +10699,7 @@ async function roleToNumber(id) {
   }
   const hierarchy = await getUserRoleHierarchy(id);
   for (let role of hierarchy) {
-    if (isBuiltin(role == null ? void 0 : role.inherits)) {
+    if (isBuiltin(role?.inherits)) {
       return builtinRoleToNumber(role.inherits) + 1;
     }
   }
@@ -10782,7 +10732,7 @@ async function getRole(roleId, opts) {
     role = Object.assign(role, dbRole);
     role._id = getExternalRoleID(role._id, role.version);
   } catch (err) {
-    if (!isBuiltin(roleId) && (opts == null ? void 0 : opts.defaultPublic)) {
+    if (!isBuiltin(roleId) && opts?.defaultPublic) {
       return (0, import_cloneDeep2.default)(BUILTIN_ROLES.PUBLIC);
     }
     if (Object.keys(role).length === 0) {
@@ -10905,7 +10855,7 @@ var AccessController = class {
       });
       this.userHierarchies[userRoleId] = roleIds;
     }
-    return (roleIds == null ? void 0 : roleIds.indexOf(tryingRoleId)) !== -1;
+    return roleIds?.indexOf(tryingRoleId) !== -1;
   }
   async checkScreensAccess(screens, userRoleId) {
     let accessibleScreens = [];
@@ -10926,7 +10876,7 @@ var AccessController = class {
   }
 };
 function getDBRoleID(roleName) {
-  if (roleName == null ? void 0 : roleName.startsWith("role" /* ROLE */)) {
+  if (roleName?.startsWith("role" /* ROLE */)) {
     return roleName;
   }
   return prefixRoleID(roleName);
@@ -11185,8 +11135,7 @@ async function authenticate2(details, requireLocalAccount = true, done, saveUser
   return done(null, ssoUser);
 }
 async function getProfilePictureUrl(user, details) {
-  var _a;
-  const pictureUrl = (_a = details.profile) == null ? void 0 : _a._json.picture;
+  const pictureUrl = details.profile?._json.picture;
   if (pictureUrl) {
     const response = await (0, import_node_fetch5.default)(pictureUrl);
     if (response.status === 200) {
@@ -11717,7 +11666,7 @@ function authenticated_default(noAuthPatterns = [], opts = {
             user = await getUser(userId, session.tenantId);
           }
           user.csrfToken = session.csrfToken;
-          if ((session == null ? void 0 : session.lastAccessedAt) < timeMinusOneMinute()) {
+          if (session?.lastAccessedAt < timeMinusOneMinute()) {
             await updateSessionTTL(session);
           }
           authenticated = true;
@@ -11759,9 +11708,9 @@ function authenticated_default(noAuthPatterns = [], opts = {
     } catch (err) {
       console.error(`Auth Error: ${err.message}`);
       console.error(err);
-      if ((err == null ? void 0 : err.name) === "JsonWebTokenError") {
+      if (err?.name === "JsonWebTokenError") {
         clearCookie(ctx, "budibase:auth" /* Auth */);
-      } else if ((err == null ? void 0 : err.code) === "invalid_api_key" /* INVALID_API_KEY */) {
+      } else if (err?.code === "invalid_api_key" /* INVALID_API_KEY */) {
         ctx.throw(403, err.message);
       }
       if (opts && opts.publicAllowed || publicEndpoint) {
@@ -11828,7 +11777,6 @@ var INCLUDED_CONTENT_TYPES = [
 function csrf_default(opts = { noCsrfPatterns: [] }) {
   const noCsrfOptions = buildMatcherRegex(opts.noCsrfPatterns);
   return async (ctx, next) => {
-    var _a;
     const found = matches(ctx, noCsrfOptions);
     if (found) {
       return next();
@@ -11843,7 +11791,7 @@ function csrf_default(opts = { noCsrfPatterns: [] }) {
     if (ctx.internal) {
       return next();
     }
-    const userToken = (_a = ctx.user) == null ? void 0 : _a.csrfToken;
+    const userToken = ctx.user?.csrfToken;
     if (!userToken) {
       return next();
     }
@@ -11903,10 +11851,7 @@ function pinoSettings() {
     logger,
     genReqId: correlator2.getId,
     autoLogging: {
-      ignore: (req) => {
-        var _a;
-        return !!((_a = req.url) == null ? void 0 : _a.includes("/health"));
-      }
+      ignore: (req) => !!req.url?.includes("/health")
     },
     serializers: {
       req: (req) => {
@@ -11977,8 +11922,7 @@ var errorHandling_default = errorHandling;
 
 // src/middleware/querystringToBody.ts
 function querystringToBody_default(ctx, next) {
-  var _a;
-  const queryString = (_a = ctx.request.query) == null ? void 0 : _a.query;
+  const queryString = ctx.request.query?.query;
   if (ctx.request.method.toLowerCase() !== "get") {
     ctx.throw(
       500,
@@ -12008,12 +11952,11 @@ __export(joi_validator_exports, {
 var import_joi = __toESM(require("joi"));
 function validate(schema, property) {
   return (ctx, next) => {
-    var _a;
     if (!schema) {
       return next();
     }
     let params2 = null;
-    let reqProp = (_a = ctx.request) == null ? void 0 : _a[property];
+    let reqProp = ctx.request?.[property];
     if (ctx[property] != null) {
       params2 = ctx[property];
     } else if (reqProp != null) {
@@ -12152,7 +12095,6 @@ async function updateUserOAuth(userId, oAuthConfig) {
   }
 }
 async function platformLogout(opts) {
-  var _a;
   const ctx = opts.ctx;
   const userId = opts.userId;
   const keepActiveSession = opts.keepActiveSession;
@@ -12169,7 +12111,7 @@ async function platformLogout(opts) {
   }
   const sessionIds = sessions.map(({ sessionId }) => sessionId);
   await invalidateSessions(userId, { sessionIds, reason: "logout" });
-  await auth_default.logout((_a = ctx.user) == null ? void 0 : _a.email);
+  await auth_default.logout(ctx.user?.email);
   await invalidateUser(userId);
 }
 
@@ -12285,7 +12227,7 @@ function validateAutomation(schema) {
   runJoi(validator, schema);
 }
 function validate2(schema) {
-  switch (schema == null ? void 0 : schema.type) {
+  switch (schema?.type) {
     case "component" /* COMPONENT */:
       validateComponent(schema);
       break;
@@ -12349,7 +12291,7 @@ async function lookup(address) {
 }
 async function refreshBlacklist() {
   const blacklist = environment_default.BLACKLIST_IPS;
-  const list = (blacklist == null ? void 0 : blacklist.split(",")) || [];
+  const list = blacklist?.split(",") || [];
   let final = [];
   for (let addr of list) {
     const trimmed = addr.trim();
@@ -12366,7 +12308,7 @@ async function isBlacklisted(address) {
   if (!blackListArray) {
     await refreshBlacklist();
   }
-  if ((blackListArray == null ? void 0 : blackListArray.length) === 0) {
+  if (blackListArray?.length === 0) {
     return false;
   }
   let ips;
@@ -12375,7 +12317,7 @@ async function isBlacklisted(address) {
   } else {
     ips = [address];
   }
-  return !!(blackListArray == null ? void 0 : blackListArray.find((addr) => ips.includes(addr)));
+  return !!blackListArray?.find((addr) => ips.includes(addr));
 }
 
 // src/docUpdates/index.ts