@budibase/backend-core 2.32.0 → 2.32.1

package/dist/index.js

@@ -55068,6 +55068,12 @@ function decodeNonAscii(str) {
 // ../shared-core/src/filters.ts
 var import_lodash = require("lodash");
 var HBS_REGEX = /{{([^{].*?)}}/g;
+var LOGICAL_OPERATORS = Object.values(LogicalOperator);
+var SEARCH_OPERATORS = [
+  ...Object.values(BasicOperator),
+  ...Object.values(ArrayOperator),
+  ...Object.values(RangeOperator)
+];
 var getValidOperatorsForType = (fieldType, field, datasource2) => {
   const Op = OperatorOptions;
   const stringOps = [
@@ -55128,7 +55134,7 @@ var NoEmptyFilterStrings = [
   OperatorOptions.In.value
 ];
 function recurseLogicalOperators(filters, fn) {
-  for (const logical of Object.values(LogicalOperator)) {
+  for (const logical of LOGICAL_OPERATORS) {
     if (filters[logical]) {
       filters[logical].conditions = filters[logical].conditions.map(
         (condition) => fn(condition)
@@ -55139,7 +55145,7 @@ function recurseLogicalOperators(filters, fn) {
 }
 function recurseSearchFilters(filters, processFn) {
   filters = processFn(filters);
-  for (const logical of Object.values(LogicalOperator)) {
+  for (const logical of LOGICAL_OPERATORS) {
     if (filters[logical]) {
       filters[logical].conditions = filters[logical].conditions.map(
         (condition) => recurseSearchFilters(condition, processFn)
@@ -55602,7 +55608,9 @@ function runQuery(docs, query) {
     ).map(([key]) => {
       return filterFunctions[key]?.(doc) ?? false;
     });
-    if (query.allOr) {
+    if (!hasFilters(query)) {
+      return true;
+    } else if (query.allOr) {
       return results.some((result) => result === true);
     } else {
       return results.every((result) => result === true);
@@ -55644,16 +55652,33 @@ var hasFilters = (query) => {
   if (!query) {
     return false;
   }
-  const skipped = ["allOr", "onEmptyFilter"];
-  for (let [key, value] of Object.entries(query)) {
-    if (skipped.includes(key) || typeof value !== "object") {
-      continue;
+  const check = (filters) => {
+    for (const logical of LOGICAL_OPERATORS) {
+      if (filters[logical]) {
+        for (const condition of filters[logical]?.conditions || []) {
+          const result = check(condition);
+          if (result) {
+            return result;
+          }
+        }
+      }
     }
-    if (Object.keys(value || {}).length !== 0) {
-      return true;
+    for (const search2 of SEARCH_OPERATORS) {
+      const searchValue = filters[search2];
+      if (!searchValue || typeof searchValue !== "object") {
+        continue;
+      }
+      const filtered2 = Object.entries(searchValue).filter((entry2) => {
+        const valueDefined = entry2[1] !== void 0 || entry2[1] !== null || entry2[1] !== "";
+        return search2 === "notEmpty" /* NOT_EMPTY */ || valueDefined;
+      });
+      if (filtered2.length !== 0) {
+        return true;
+      }
     }
-  }
-  return false;
+    return false;
+  };
+  return check(query);
 };
 
 // ../shared-core/src/utils.ts
@@ -62344,6 +62369,7 @@ __export(events_exports, {
   org: () => org_default,
   plugin: () => plugin_default,
   processors: () => processors_exports,
+  publishEvent: () => publishEvent,
   query: () => query_default,
   role: () => role_default,
   rows: () => rows_default,
@@ -65708,7 +65734,12 @@ async function populateUsersFromDB(userIds) {
   }
   return { users };
 }
-async function getUser(userId, tenantId, populateUser) {
+async function getUser({
+  userId,
+  tenantId,
+  email,
+  populateUser
+}) {
   if (!populateUser) {
     populateUser = populateFromDB2;
   }
@@ -65722,7 +65753,7 @@ async function getUser(userId, tenantId, populateUser) {
   const client = await getUserClient();
   let user = await client.get(userId);
   if (!user) {
-    user = await populateUser(userId, tenantId);
+    user = await populateUser(userId, tenantId, email);
     await client.store(userId, user, EXPIRY_SECONDS3);
   }
   if (user && !user.tenantId && tenantId) {
@@ -66953,7 +66984,11 @@ async function checkApiKey(apiKey, populateUser) {
     if (userId) {
       return {
         valid: true,
-        user: await getUser(userId, tenantId, populateUser)
+        user: await getUser({
+          userId,
+          tenantId,
+          populateUser
+        })
       };
     } else {
       throw new InvalidAPIKeyError();
@@ -66987,13 +67022,18 @@ function authenticated_default(noAuthPatterns = [], opts = {
         try {
           session = await getSession(userId, sessionId);
           if (opts && opts.populateUser) {
-            user = await getUser(
+            user = await getUser({
               userId,
-              session.tenantId,
-              opts.populateUser(ctx)
-            );
+              tenantId: session.tenantId,
+              email: session.email,
+              populateUser: opts.populateUser(ctx)
+            });
           } else {
-            user = await getUser(userId, session.tenantId);
+            user = await getUser({
+              userId,
+              tenantId: session.tenantId,
+              email: session.email
+            });
           }
           user.csrfToken = session.csrfToken;
           if (session?.lastAccessedAt < timeMinusOneMinute()) {
@@ -68619,32 +68659,25 @@ var InternalBuilder = class {
     }
     return withSchema;
   }
+  buildJsonField(field) {
+    const parts = field.split(".");
+    let tableField, unaliased;
+    if (parts.length > 1) {
+      const alias = parts.shift();
+      unaliased = parts.join(".");
+      tableField = `${this.quote(alias)}.${this.quote(unaliased)}`;
+    } else {
+      unaliased = parts.join(".");
+      tableField = this.quote(unaliased);
+    }
+    const separator = this.client === "oracledb" /* ORACLE */ ? " VALUE " : ",";
+    return `'${unaliased}'${separator}${tableField}`;
+  }
   addJsonRelationships(query, fromTable, relationships) {
     const sqlClient = this.client;
     const knex3 = this.knex;
     const { resource, tableAliases: aliases, endpoint } = this.query;
     const fields = resource?.fields || [];
-    const jsonField = (field) => {
-      const parts = field.split(".");
-      let tableField, unaliased;
-      if (parts.length > 1) {
-        const alias = parts.shift();
-        unaliased = parts.join(".");
-        tableField = `${this.quote(alias)}.${this.quote(unaliased)}`;
-      } else {
-        unaliased = parts.join(".");
-        tableField = this.quote(unaliased);
-      }
-      let separator = ",";
-      switch (sqlClient) {
-        case "oracledb" /* ORACLE */:
-          separator = " VALUE ";
-          break;
-        case "mssql" /* MS_SQL */:
-          separator = ":";
-      }
-      return `'${unaliased}'${separator}${tableField}`;
-    };
     for (let relationship of relationships) {
       const {
         tableName: toTable,
@@ -68671,7 +68704,7 @@ var InternalBuilder = class {
           MAX_SQS_RELATIONSHIP_FIELDS
         );
       }
-      const fieldList = relationshipFields.map((field) => jsonField(field)).join(",");
+      const fieldList = relationshipFields.map((field) => this.buildJsonField(field)).join(",");
       const primaryKey = `${toAlias}.${toPrimary || toKey}`;
       let subQuery = knex3.from(toTableWithSchema).limit(getRelationshipLimit()).orderBy(primaryKey);
       if (throughTable && toPrimary && fromPrimary) {
@@ -68778,37 +68811,6 @@ var InternalBuilder = class {
     }
     return query;
   }
-  addRelationships(query, fromTable, relationships) {
-    const tableSets = {};
-    for (let relationship of relationships) {
-      const keyObj = {
-        toTable: relationship.tableName,
-        throughTable: void 0
-      };
-      if (relationship.through) {
-        keyObj.throughTable = relationship.through;
-      }
-      const key = JSON.stringify(keyObj);
-      if (tableSets[key]) {
-        tableSets[key].push(relationship);
-      } else {
-        tableSets[key] = [relationship];
-      }
-    }
-    for (let [key, relationships2] of Object.entries(tableSets)) {
-      const { toTable, throughTable } = JSON.parse(key);
-      query = this.addJoin(
-        query,
-        {
-          from: fromTable,
-          to: toTable,
-          through: throughTable
-        },
-        relationships2
-      );
-    }
-    return query;
-  }
   qualifiedKnex(opts) {
     let alias = this.query.tableAliases?.[this.query.endpoint.entityId];
     if (opts?.alias === false) {
@@ -68873,8 +68875,7 @@ var InternalBuilder = class {
       if (!primary) {
         throw new Error("Primary key is required for upsert");
       }
-      const ret = query.insert(parsedBody).onConflict(primary).merge();
-      return ret;
+      return query.insert(parsedBody).onConflict(primary).merge();
     } else if (this.client === "mssql" /* MS_SQL */ || this.client === "oracledb" /* ORACLE */) {
       return query.insert(parsedBody);
     }
@@ -68911,10 +68912,18 @@ var InternalBuilder = class {
     if (!counting) {
       query = this.addSorting(query);
     }
-    if (relationships) {
-      query = this.addJsonRelationships(query, tableName, relationships);
+    query = this.addFilters(query, filters, { relationship: true });
+    if (relationships?.length) {
+      const mainTable = this.query.tableAliases?.[this.query.endpoint.entityId] || this.query.endpoint.entityId;
+      const cte = this.addSorting(
+        this.knex.with("paginated", query).select(this.generateSelectStatement()).from({
+          [mainTable]: "paginated"
+        })
+      );
+      return this.addJsonRelationships(cte, tableName, relationships);
+    } else {
+      return query;
     }
-    return this.addFilters(query, filters, { relationship: true });
   }
   update(opts) {
     const { body: body2, filters } = this.query;