spice-js 2.7.13 → 2.7.15

package/build/models/SpiceModel.js

@@ -791,7 +791,7 @@ class SpiceModel {
               if ((cached_results == null ? void 0 : cached_results.value) === undefined || (yield _this6.shouldForceRefresh(cached_results))) {
                 results = yield _this6.database.multi_get(args.ids, {
                   keep_type: true,
-                  columns: args.columns && args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
+                  columns: args.columns && args.columns.length > 0 && args.columns != "" ? [..._this6.extractBaseColumns(args.columns), 'type'] : []
                 });
 
                 _this6.getCacheProviderObject(_this6.type).set(key, {
@@ -802,7 +802,7 @@ class SpiceModel {
             } else {
               results = yield _this6.database.multi_get(args.ids, {
                 keep_type: true,
-                columns: args.columns && args.columns.length > 0 && args.columns != "" ? [...args.columns, 'type'] : []
+                columns: args.columns && args.columns.length > 0 && args.columns != "" ? [..._this6.extractBaseColumns(args.columns), 'type'] : []
               });
             }
           }
@@ -1290,34 +1290,42 @@ class SpiceModel {
   }
 
   extractNestings(string, localType) {
-    var returnVal = []; // First, extract loop variables and embedded arrays from ANY/EVERY expressions
-    // These should be EXCLUDED from join candidates
+    var returnVal = []; // Extract loop variables from ANY/EVERY expressions
+    // Loop variables (e.g., "vote" in "EVERY vote IN committee_votes") should be excluded
+    // But the collection being iterated (e.g., "committee_votes") should be INCLUDED
+    // if it's a joinable mapped property - buildJoinMetadata will filter non-joinables
 
     var anyEveryRegex = /(ANY|EVERY)\s+(\w+)\s+IN\s+`?(\w+)`?/gi;
     var anyEveryMatch;
     var loopVariables = new Set();
-    var embeddedArrayFields = new Set();
+    var anyEveryCollections = new Set();
 
     while ((anyEveryMatch = anyEveryRegex.exec(string)) !== null) {
-      loopVariables.add(anyEveryMatch[2]); // e.g., "p"
+      loopVariables.add(anyEveryMatch[2]); // e.g., "vote" - exclude from nestings
 
-      embeddedArrayFields.add(anyEveryMatch[3]); // e.g., "permissions"
-    } // Now extract dot notation patterns, but skip loop variables and embedded arrays
+      anyEveryCollections.add(anyEveryMatch[3]); // e.g., "committee_votes" - include in nestings
+    } // Now extract dot notation patterns, but skip loop variables
 
 
     var regex = /(`?\w+`?)\.(`?\w+`?)/g;
     var match;
 
     while ((match = regex.exec(string)) !== null) {
-      var first = match[1].replace(/`/g, ""); // Skip if it's the local type, a loop variable from ANY/EVERY, or an embedded array field
+      var first = match[1].replace(/`/g, ""); // Skip if it's the local type or a loop variable from ANY/EVERY
 
-      if (first !== localType && !loopVariables.has(first) && !embeddedArrayFields.has(first)) {
+      if (first !== localType && !loopVariables.has(first)) {
         returnVal.push(first);
       }
-    } // DO NOT add embedded array fields from ANY/EVERY expressions
-    // They iterate over document's embedded array, not join to another collection
+    } // Add collections from ANY/EVERY expressions as potential nestings
+    // buildJoinMetadata will filter out non-joinable ones (embedded arrays vs mapped collections)
 
 
+    for (var collection of anyEveryCollections) {
+      if (collection !== localType) {
+        returnVal.push(collection);
+      }
+    }
+
     return [...new Set(returnVal)];
   }
 
@@ -1460,6 +1468,11 @@ class SpiceModel {
 
       if (tableName === this.type && match) {
         return col;
+      } // If column is already backtick-quoted, return as-is
+
+
+      if (col.startsWith("`") && col.endsWith("`")) {
+        return col;
       }
 
       return "`" + col + "`";
@@ -1989,6 +2002,21 @@ class SpiceModel {
       that.addModifier(modifier);
     });
   }
+  /**
+   * Extracts the first segment of each column path for database queries.
+   * e.g., ["name", "permissions.permission"] → ["name", "permissions"]
+   * @param {string[]} columns - Array of column paths
+   * @returns {string[]} - Array of base column names (deduplicated)
+   */
+
+
+  extractBaseColumns(columns) {
+    if (!columns || !Array.isArray(columns)) return columns;
+    return [...new Set(columns.map(col => {
+      var firstDot = col.indexOf('.');
+      return firstDot > -1 ? col.substring(0, firstDot) : col;
+    }))];
+  }
   /**
    * Checks if a field is present in the columns string.
    * Used to skip modifier execution when the field isn't requested.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.7.13",
+  "version": "2.7.15",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -684,7 +684,7 @@ export default class SpiceModel {
             cached_results?.value === undefined ||
             (await this.shouldForceRefresh(cached_results))
           ) {
-            results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...args.columns, 'type']:[]});
+            results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...this.extractBaseColumns(args.columns), 'type']:[]});
             this.getCacheProviderObject(this.type).set(
               key,
               { value: results, time: new Date().getTime() },
@@ -692,7 +692,7 @@ export default class SpiceModel {
             );
           }
         } else {
-          results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...args.columns, 'type']:[]});
+          results = await this.database.multi_get(args.ids, {keep_type:true, columns:args.columns && args.columns.length > 0 && args.columns != ""?[...this.extractBaseColumns(args.columns), 'type']:[]});
         }
       }
       _.remove(results, (o) => o.type != this.type);
@@ -1110,32 +1110,39 @@ export default class SpiceModel {
   extractNestings(string, localType) {
     let returnVal = [];
 
-    // First, extract loop variables and embedded arrays from ANY/EVERY expressions
-    // These should be EXCLUDED from join candidates
+    // Extract loop variables from ANY/EVERY expressions
+    // Loop variables (e.g., "vote" in "EVERY vote IN committee_votes") should be excluded
+    // But the collection being iterated (e.g., "committee_votes") should be INCLUDED
+    // if it's a joinable mapped property - buildJoinMetadata will filter non-joinables
     let anyEveryRegex = /(ANY|EVERY)\s+(\w+)\s+IN\s+`?(\w+)`?/gi;
     let anyEveryMatch;
     const loopVariables = new Set();
-    const embeddedArrayFields = new Set();
+    const anyEveryCollections = new Set();
 
     while ((anyEveryMatch = anyEveryRegex.exec(string)) !== null) {
-      loopVariables.add(anyEveryMatch[2]); // e.g., "p"
-      embeddedArrayFields.add(anyEveryMatch[3]); // e.g., "permissions"
+      loopVariables.add(anyEveryMatch[2]); // e.g., "vote" - exclude from nestings
+      anyEveryCollections.add(anyEveryMatch[3]); // e.g., "committee_votes" - include in nestings
     }
 
-    // Now extract dot notation patterns, but skip loop variables and embedded arrays
+    // Now extract dot notation patterns, but skip loop variables
     let regex = /(`?\w+`?)\.(`?\w+`?)/g;
     let match;
 
     while ((match = regex.exec(string)) !== null) {
       let first = match[1].replace(/`/g, "");
-      // Skip if it's the local type, a loop variable from ANY/EVERY, or an embedded array field
-      if (first !== localType && !loopVariables.has(first) && !embeddedArrayFields.has(first)) {
+      // Skip if it's the local type or a loop variable from ANY/EVERY
+      if (first !== localType && !loopVariables.has(first)) {
         returnVal.push(first);
       }
     }
 
-    // DO NOT add embedded array fields from ANY/EVERY expressions
-    // They iterate over document's embedded array, not join to another collection
+    // Add collections from ANY/EVERY expressions as potential nestings
+    // buildJoinMetadata will filter out non-joinable ones (embedded arrays vs mapped collections)
+    for (const collection of anyEveryCollections) {
+      if (collection !== localType) {
+        returnVal.push(collection);
+      }
+    }
 
     return [...new Set(returnVal)];
   }
@@ -1292,6 +1299,10 @@ export default class SpiceModel {
         return col;
       }
 
+      // If column is already backtick-quoted, return as-is
+      if (col.startsWith("`") && col.endsWith("`")) {
+        return col;
+      }
       return `\`${col}\``;
     });
 
@@ -1813,6 +1824,20 @@ export default class SpiceModel {
     });
   }
 
+  /**
+   * Extracts the first segment of each column path for database queries.
+   * e.g., ["name", "permissions.permission"] → ["name", "permissions"]
+   * @param {string[]} columns - Array of column paths
+   * @returns {string[]} - Array of base column names (deduplicated)
+   */
+  extractBaseColumns(columns) {
+    if (!columns || !Array.isArray(columns)) return columns;
+    return [...new Set(columns.map(col => {
+      const firstDot = col.indexOf('.');
+      return firstDot > -1 ? col.substring(0, firstDot) : col;
+    }))];
+  }
+
   /**
    * Checks if a field is present in the columns string.
    * Used to skip modifier execution when the field isn't requested.