spice-js 2.7.14 → 2.7.16

package/build/models/SpiceModel.js

@@ -1248,6 +1248,15 @@ class SpiceModel {
           return t.startsWith("`") ? t : q(t);
         });
         return q(this.type) + "." + safeParts.join(".");
+      } // For protected aliases (joined resources), return the base table's column (IDs)
+      // instead of the joined resource itself. The JOIN is only for WHERE filtering,
+      // and the serializer will map the IDs later.
+
+
+      var unquotedCol = col.replace(/`/g, "");
+
+      if (protectedSet.has(unquotedCol)) {
+        return q(this.type) + "." + q(unquotedCol);
       }
 
       if (!col.includes(".") && !col.startsWith("`")) {
@@ -1290,34 +1299,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 +1477,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 + "`";

package/package.json

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

package/src/models/SpiceModel.js

@@ -1064,6 +1064,14 @@ export default class SpiceModel {
         return `${q(this.type)}.${safeParts.join(".")}`;
       }
 
+      // For protected aliases (joined resources), return the base table's column (IDs)
+      // instead of the joined resource itself. The JOIN is only for WHERE filtering,
+      // and the serializer will map the IDs later.
+      const unquotedCol = col.replace(/`/g, "");
+      if (protectedSet.has(unquotedCol)) {
+        return `${q(this.type)}.${q(unquotedCol)}`;
+      }
+
       if (!col.includes(".") && !col.startsWith("`")) {
         return q(col);
       }
@@ -1110,32 +1118,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 +1307,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}\``;
     });