spice-js 2.7.10 → 2.7.12

package/build/models/SpiceModel.js

@@ -1355,7 +1355,12 @@ class SpiceModel {
   buildJoinMetadata(nestings, args) {
     var _args$columns;
 
-    // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+    // Normalize any double backticks to single backticks early (handles URL encoding issues)
+    if (args.columns && typeof args.columns === "string") {
+      args.columns = args.columns.replace(/``/g, "`");
+    } // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
+
+
     var mappedNestings = _.compact(_.uniq(nestings).map(alias => {
       var prop = this.props[alias];
       if (!(prop == null ? void 0 : prop.map) || prop.map.type !== _2.MapType.MODEL) return null;
@@ -1547,7 +1552,8 @@ class SpiceModel {
             yield _this12.run_hook(results.data, "list", "after");
           }
 
-          results.data = _this12.filterResultsByColumns(results.data, args.columns);
+          results.data = _this12.filterResultsByColumns(results.data, args.columns); //console.log("results.data", results.data);
+
           return results;
         });
 

package/build/utility/RestHelper.js

@@ -196,7 +196,12 @@ class RestHelper {
             ctx.set("Content-Disposition", "attachment; filename=\"" + filename + "\"");
             ctx.type = "text/csv; charset=utf-8";
             ctx.status = 200;
-            ctx.body = fs.createReadStream(filePath);
+            var csvStream = fs.createReadStream(filePath); // Delete file after stream is finished
+
+            csvStream.on('close', () => {
+              fs.promises.unlink(filePath).catch(() => {});
+            });
+            ctx.body = csvStream;
             return {
               v: void 0
             };
@@ -213,7 +218,12 @@ class RestHelper {
         ctx.set("Content-Disposition", "attachment; filename=\"" + filename + "\"");
         ctx.type = "application/json; charset=utf-8";
         ctx.status = 200;
-        ctx.body = fs.createReadStream(filePath);
+        var jsonStream = fs.createReadStream(filePath); // Delete file after stream is finished
+
+        jsonStream.on('close', () => {
+          fs.promises.unlink(filePath).catch(() => {});
+        });
+        ctx.body = jsonStream;
       } catch (e) {
         console.error(e.stack);
         ctx.status = 400;

package/package.json

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

package/src/models/SpiceModel.js

@@ -1168,6 +1168,11 @@ export default class SpiceModel {
    * @returns {Object} - { mappedNestings, protectedAliases, arrayAliases }
    */
   buildJoinMetadata(nestings, args) {
+    // Normalize any double backticks to single backticks early (handles URL encoding issues)
+    if (args.columns && typeof args.columns === "string") {
+      args.columns = args.columns.replace(/``/g, "`");
+    }
+    
     // Decide which aliases we can join: only when map.type===MODEL AND reference is a STRING keyspace.
     const mappedNestings = _.compact(
       _.uniq(nestings).map((alias) => {
@@ -1204,7 +1209,10 @@ export default class SpiceModel {
     // Columns: first prepare (prefix base table, rewrite array alias.field → ARRAY proj),
     // then normalize names and add default aliases
     //console.log("Columns in BuildJoinMetadata", args.columns);
+    
     this[_columns] = args.columns ?? '';
+
+   
     args.columns = this.prepColumns(
       args.columns,
       protectedAliases,
@@ -1384,6 +1392,7 @@ export default class SpiceModel {
       }
 
       results.data = this.filterResultsByColumns(results.data, args.columns);
+      //console.log("results.data", results.data);
       return results;
     };
 
@@ -1573,8 +1582,8 @@ export default class SpiceModel {
       const childPath =
         this[_current_path] ?
           `${this[_current_path]}.${source_property}`
-        : source_property;
-
+          : source_property;
+      
       // ⚡ Wrap in profiler track() to ensure proper async context for child operations
       const fetchRelated = async () => {
         return await Promise.allSettled(

package/src/utility/RestHelper.js

@@ -119,18 +119,22 @@ export default class RestHelper {
           a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" })
         );
   
-        const csv = parse(flatRows, { fields, defaultValue: "", excelStrings: true });
-  
+      const csv = parse(flatRows, { fields, defaultValue: "", excelStrings: true });
+
         makeDirectory(`./storage/exports/csv`);
         filename = `${RestHelper.makeid(9)}.csv`;
         filePath = path.resolve(`./storage/exports/csv/${filename}`);
         await fs.promises.writeFile(filePath, csv, "utf8");
-    
- 
+
         ctx.set("Content-Disposition", `attachment; filename="${filename}"`);
         ctx.type = "text/csv; charset=utf-8";
         ctx.status = 200;
-        ctx.body = fs.createReadStream(filePath);
+        const csvStream = fs.createReadStream(filePath);
+        // Delete file after stream is finished
+        csvStream.on('close', () => {
+          fs.promises.unlink(filePath).catch(() => {});
+        });
+        ctx.body = csvStream;
         return;
       }
 
@@ -143,7 +147,12 @@ export default class RestHelper {
       ctx.set("Content-Disposition", `attachment; filename="${filename}"`);
       ctx.type = "application/json; charset=utf-8";
       ctx.status = 200;
-      ctx.body = fs.createReadStream(filePath);
+      const jsonStream = fs.createReadStream(filePath);
+      // Delete file after stream is finished
+      jsonStream.on('close', () => {
+        fs.promises.unlink(filePath).catch(() => {});
+      });
+      ctx.body = jsonStream;
   
     } catch (e) {
       console.error(e.stack);