spice-js 2.6.67 → 2.6.68

package/build/models/SpiceModel.js

@@ -932,6 +932,17 @@ class SpiceModel {
     }
 
     if (!columns || columns === "") return columns;
+
+    var q = function q(s) {
+      if (s === void 0) {
+        s = "";
+      }
+
+      var t = (s || "").trim();
+      if (t.startsWith("`") && t.endsWith("`")) return t;
+      return "`" + t.replace(/`/g, "``") + "`";
+    };
+
     var protectedSet = new Set(protectedAliases);
     var arraySet = new Set(arrayAliases);
     var tokens = columns.split(",");
@@ -950,37 +961,40 @@ class SpiceModel {
           var proj = this.buildArrayProjection(alias, field);
 
           if (explicitAs && explicitAs !== alias + "_" + field) {
-            proj = proj.replace(/AS\s+`[^`]+`$/i, "AS `" + explicitAs + "`");
+            proj = proj.replace(/AS\s+`[^`]+`$/i, "AS " + q(explicitAs));
           }
 
           return proj;
         }
 
         if (protectedSet.has(alias)) {
-          var aliased = "`" + alias + "`." + (field.startsWith("`") ? field : "`" + field + "`");
-          return explicitAs ? aliased + " AS `" + explicitAs + "`" : aliased;
+          var aliased = q(alias) + "." + (field.startsWith("`") ? field : q(field));
+          return explicitAs ? aliased + " AS " + q(explicitAs) : aliased;
         }
 
-        var bare = col.replace(/`/g, "");
-        return "`" + this.type + "`." + bare;
+        var qualified = q(this.type) + "." + q(alias) + "." + q(field);
+        return explicitAs ? qualified + " AS " + q(explicitAs) : qualified;
       }
 
-      var looksProtected = [...protectedSet].some(a => col === a || col === "`" + a + "`" || col.startsWith(a + ".") || col.startsWith("`" + a + "`."));
+      var looksProtected = [...protectedSet].some(a => col === a || col === q(a) || col.startsWith(a + ".") || col.startsWith(q(a) + "."));
 
       if (!looksProtected) {
-        if (!col.startsWith("`") && !col.endsWith("`") && !col.includes("(")) {
-          col = "`" + col + "`";
+        if (!col.includes(".")) {
+          var fieldQuoted = col.startsWith("`") ? col : q(col);
+          return q(this.type) + "." + fieldQuoted;
         }
 
-        if (col && !col.includes(".") && !col.startsWith(this.type)) {
-          col = "`" + this.type + "`." + col.replace(/`/g, "");
-        }
-
-        return col;
+        var parts = col.split(".");
+        var safeParts = parts.map(p => {
+          var t = p.trim();
+          if (t === "" || /\w+\s*\(/.test(t)) return t;
+          return t.startsWith("`") ? t : q(t);
+        });
+        return q(this.type) + "." + safeParts.join(".");
       }
 
       if (!col.includes(".") && !col.startsWith("`")) {
-        return "`" + col + "`";
+        return q(col);
       }
 
       return col;

package/package.json

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

package/src/models/SpiceModel.js

@@ -825,66 +825,85 @@ export default class SpiceModel {
   }
 
 
-prepColumns(columns, protectedAliases = [], arrayAliases = []) {
-  if (!columns || columns === "") return columns;
-
-  const protectedSet = new Set(protectedAliases);
-  const arraySet = new Set(arrayAliases);
-
-  const tokens = columns.split(",");
-
-  const out = tokens.map((raw) => {
-    let col = (raw || "").trim();
-    if (col === "" || col === "meta().id") return undefined;
-
-
-    if (/^\s*ARRAY\s+/i.test(col) || /\w+\s*\(/.test(col)) return col;
-
-    const m = col.match(/^\s*`?(\w+)`?\.`?(\w+)`?(?:\s+AS\s+`?([\w]+)`?)?\s*$/i);
-    if (m) {
-      const alias = m[1];
-      const field = m[2];
-      const explicitAs = m[3];
-
-      if (arraySet.has(alias)) {
-        let proj = this.buildArrayProjection(alias, field);
-        if (explicitAs && explicitAs !== `${alias}_${field}`) {
-          proj = proj.replace(/AS\s+`[^`]+`$/i, `AS \`${explicitAs}\``);
+  prepColumns(columns, protectedAliases = [], arrayAliases = []) {
+    if (!columns || columns === "") return columns;
+  
+    const q = (s = "") => {
+      const t = (s || "").trim();
+      if (t.startsWith("`") && t.endsWith("`")) return t; 
+      return "`" + t.replace(/`/g, "``") + "`";
+    };
+  
+    const protectedSet = new Set(protectedAliases);
+    const arraySet = new Set(arrayAliases);
+  
+    const tokens = columns.split(",");
+  
+    const out = tokens.map((raw) => {
+      let col = (raw || "").trim();
+      if (col === "" || col === "meta().id") return undefined;
+  
+      
+      if (/^\s*ARRAY\s+/i.test(col) || /\w+\s*\(/.test(col)) return col;
+  
+     
+      const m = col.match(/^\s*`?(\w+)`?\.`?(\w+)`?(?:\s+AS\s+`?([\w]+)`?)?\s*$/i);
+      if (m) {
+        const alias = m[1];
+        const field = m[2];
+        const explicitAs = m[3];
+  
+        if (arraySet.has(alias)) {
+          let proj = this.buildArrayProjection(alias, field);
+          if (explicitAs && explicitAs !== `${alias}_${field}`) {
+            proj = proj.replace(/AS\s+`[^`]+`$/i, `AS ${q(explicitAs)}`);
+          }
+          return proj;
         }
-        return proj;
-      }
-
-      if (protectedSet.has(alias)) {
-        const aliased = `\`${alias}\`.${field.startsWith("`") ? field : `\`${field}\``}`;
-        return explicitAs ? `${aliased} AS \`${explicitAs}\`` : aliased;
+  
+        if (protectedSet.has(alias)) {
+          const aliased = `${q(alias)}.${field.startsWith("`") ? field : q(field)}`;
+          return explicitAs ? `${aliased} AS ${q(explicitAs)}` : aliased;
+        }
+  
+        
+        const qualified = `${q(this.type)}.${q(alias)}.${q(field)}`;
+        return explicitAs ? `${qualified} AS ${q(explicitAs)}` : qualified;
       }
-
-      const bare = col.replace(/`/g, "");
-      return `\`${this.type}\`.${bare}`;
-    }
-
-    const looksProtected = [...protectedSet].some(
-      (a) => col === a || col === `\`${a}\`` || col.startsWith(`${a}.`) || col.startsWith(`\`${a}\`.`)
-    );
-
-    if (!looksProtected) {
-      if (!col.startsWith("`") && !col.endsWith("`") && !col.includes("(")) {
-        col = `\`${col}\``;
+  
+     
+      const looksProtected = [...protectedSet].some(
+        (a) =>
+          col === a ||
+          col === q(a) ||
+          col.startsWith(`${a}.`) ||
+          col.startsWith(`${q(a)}.`)
+      );
+  
+      if (!looksProtected) {
+       
+        if (!col.includes(".")) {
+          const fieldQuoted = col.startsWith("`") ? col : q(col);
+          return `${q(this.type)}.${fieldQuoted}`;
+        }
+  
+        const parts = col.split(".");
+        const safeParts = parts.map((p) => {
+          const t = p.trim();
+          if (t === "" || /\w+\s*\(/.test(t)) return t; 
+          return t.startsWith("`") ? t : q(t);
+        });
+        return `${q(this.type)}.${safeParts.join(".")}`;
       }
-      if (col && !col.includes(".") && !col.startsWith(this.type)) {
-        col = `\`${this.type}\`.${col.replace(/`/g, "")}`;
+  
+      if (!col.includes(".") && !col.startsWith("`")) {
+        return q(col);
       }
       return col;
-    }
-
-    if (!col.includes(".") && !col.startsWith("`")) {
-      return `\`${col}\``;
-    }
-    return col;
-  });
-
-  return _.join(_.compact(out), ",");
-}
+    });
+  
+    return _.join(_.compact(out), ",");
+  }
 
 
   filterResultsByColumns(data, columns) {