spice-js 2.7.33 → 2.7.34

package/build/utility/RestHelper.js

@@ -4,7 +4,6 @@ exports.__esModule = true;
 exports.default = void 0;
 var _lodash = _interopRequireDefault(require("lodash"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) { "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); } return f; })(e, t); }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) { ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } } return n; }, _extends.apply(null, arguments); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
@@ -123,47 +122,65 @@ class RestHelper {
         var filename, filePath;
         if (download_type === "csv") {
           var _ret = yield* function* () {
-            var {
-              flatten
-            } = yield Promise.resolve().then(() => _interopRequireWildcard(require("flat")));
             var rows = Array.isArray(cleaned) ? cleaned : [cleaned];
             var csvReady = rows.map(normalizeEmptyArraysForCsv);
-            var flatRows = csvReady.map(row => flatten(row, {
-              safe: false,
-              delimiter: "."
-            }));
+            var flattenToLeaves = function flattenToLeaves(value, prefix, output) {
+              if (prefix === void 0) {
+                prefix = "";
+              }
+              if (output === void 0) {
+                output = {};
+              }
+              if (Array.isArray(value)) {
+                if (value.length === 0 && prefix) {
+                  output[prefix] = "";
+                  return output;
+                }
+                value.forEach((item, index) => {
+                  var path = prefix ? prefix + "." + index : "" + index;
+                  flattenToLeaves(item, path, output);
+                });
+                return output;
+              }
+              if (value && typeof value === "object") {
+                var entries = Object.entries(value);
+                if (entries.length === 0 && prefix) {
+                  output[prefix] = "";
+                  return output;
+                }
+                for (var [key, item] of entries) {
+                  var _path = prefix ? prefix + "." + key : key;
+                  flattenToLeaves(item, _path, output);
+                }
+                return output;
+              }
+              if (prefix) {
+                output[prefix] = value;
+              }
+              return output;
+            };
+            var flatRows = csvReady.map(row => flattenToLeaves(row));
             var fieldSet = new Set();
-            for (var r of flatRows) {
-              Object.keys(r).forEach(k => fieldSet.add(k));
+            for (var row of flatRows) {
+              Object.keys(row).forEach(field => fieldSet.add(field));
             }
             var fields = Array.from(fieldSet).sort((a, b) => a.localeCompare(b, undefined, {
               numeric: true,
               sensitivity: "base"
             }));
-
-            // Filter flattened fields to only include requested columns
             var rawUrl = ctx.originalUrl || ctx.request.url || "";
             var urlColumnsMatch = rawUrl.match(/[?&]columns=([^&]*)/);
-            var requestedColumns = urlColumnsMatch ? decodeURIComponent(urlColumnsMatch[1]) : null;
+            var requestedColumns = urlColumnsMatch ? decodeURIComponent(urlColumnsMatch[1].replace(/\+/g, " ")) : null;
             if (requestedColumns) {
-              var specs = requestedColumns.split(",").map(c => c.trim().replace(/`/g, "")).filter(c => c !== "");
-              var filtered = [];
-              for (var spec of specs) {
-                if (!spec.includes(".")) {
-                  // Simple field: exact match
-                  if (fields.includes(spec)) filtered.push(spec);
-                } else {
-                  // Nested field: build regex that allows numeric array indices between segments
-                  // and optionally matches all descendant fields.
-                  var segments = spec.split(".");
-                  var pattern = segments.map(s => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("(\\.\\d+)?\\.");
-                  var re = new RegExp("^" + pattern + "(\\..+)?$");
-                  for (var f of fields) {
-                    if (re.test(f)) filtered.push(f);
-                  }
-                }
-              }
-              fields = filtered.length > 0 ? filtered : fields;
+              var requestedSpecs = requestedColumns.split(",").map(column => column.trim().replace(/`/g, "")).filter(Boolean);
+              var normalizePath = field => field.split(".").filter(segment => !/^\d+$/.test(segment)).join(".");
+              fields = fields.filter(field => {
+                var normalizedField = normalizePath(field);
+                return requestedSpecs.some(requestedField => {
+                  var normalizedRequestedField = normalizePath(requestedField);
+                  return normalizedField === normalizedRequestedField || normalizedField.startsWith(normalizedRequestedField + ".");
+                });
+              });
             }
             var csv = parse(flatRows, {
               fields,
@@ -178,7 +195,6 @@ class RestHelper {
             ctx.type = "text/csv; charset=utf-8";
             ctx.status = 200;
             var csvStream = fs.createReadStream(filePath);
-            // Delete file after stream is finished
             csvStream.on("close", () => {
               fs.promises.unlink(filePath).catch(() => {});
             });

package/package.json

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

package/src/utility/RestHelper.js

@@ -100,7 +100,6 @@ export default class RestHelper {
     try {
       const download_type = (ctx.request.query.format || "csv").toLowerCase();
       const include_id = ctx.request.query.include_id;
-
       const original = _.cloneDeep(ctx.data);
       const trimmed = deepTrimStrings(original);
       const cleaned = stripTopLevel(trimmed, {
@@ -108,78 +107,126 @@ export default class RestHelper {
       });
 
       let filename, filePath;
-
       if (download_type === "csv") {
-        const { flatten } = await import("flat");
         const rows = Array.isArray(cleaned) ? cleaned : [cleaned];
-
+      
         const csvReady = rows.map(normalizeEmptyArraysForCsv);
-        const flatRows = csvReady.map((row) =>
-          flatten(row, { safe: false, delimiter: "." }),
-        );
-
+      
+        const flattenToLeaves = (value, prefix = "", output = {}) => {
+          if (Array.isArray(value)) {
+            if (value.length === 0 && prefix) {
+              output[prefix] = "";
+              return output;
+            }
+      
+            value.forEach((item, index) => {
+              const path = prefix ? `${prefix}.${index}` : `${index}`;
+              flattenToLeaves(item, path, output);
+            });
+      
+            return output;
+          }
+      
+          if (value && typeof value === "object") {
+            const entries = Object.entries(value);
+      
+            if (entries.length === 0 && prefix) {
+              output[prefix] = "";
+              return output;
+            }
+      
+            for (const [key, item] of entries) {
+              const path = prefix ? `${prefix}.${key}` : key;
+              flattenToLeaves(item, path, output);
+            }
+      
+            return output;
+          }
+      
+          if (prefix) {
+            output[prefix] = value;
+          }
+      
+          return output;
+        };
+      
+        const flatRows = csvReady.map((row) => flattenToLeaves(row));
+      
         const fieldSet = new Set();
-        for (const r of flatRows)
-          Object.keys(r).forEach((k) => fieldSet.add(k));
+      
+        for (const row of flatRows) {
+          Object.keys(row).forEach((field) => fieldSet.add(field));
+        }
+      
         let fields = Array.from(fieldSet).sort((a, b) =>
-          a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+          a.localeCompare(b, undefined, {
+            numeric: true,
+            sensitivity: "base",
+          }),
         );
-
-        // Filter flattened fields to only include requested columns
+      
         const rawUrl = ctx.originalUrl || ctx.request.url || "";
         const urlColumnsMatch = rawUrl.match(/[?&]columns=([^&]*)/);
+      
         const requestedColumns = urlColumnsMatch
-          ? decodeURIComponent(urlColumnsMatch[1])
+          ? decodeURIComponent(urlColumnsMatch[1].replace(/\+/g, " "))
           : null;
+      
         if (requestedColumns) {
-          const specs = requestedColumns
+          const requestedSpecs = requestedColumns
             .split(",")
-            .map((c) => c.trim().replace(/`/g, ""))
-            .filter((c) => c !== "");
-          const filtered = [];
-          for (const spec of specs) {
-            if (!spec.includes(".")) {
-              // Simple field: exact match
-              if (fields.includes(spec)) filtered.push(spec);
-            } else {
-              // Nested field: build regex that allows numeric array indices between segments
-              // and optionally matches all descendant fields.
-              const segments = spec.split(".");
-              const pattern = segments
-                .map((s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
-                .join("(\\.\\d+)?\\.");
-              const re = new RegExp("^" + pattern + "(\\..+)?$");
-              for (const f of fields) {
-                if (re.test(f)) filtered.push(f);
-              }
-            }
-          }
-          fields = filtered.length > 0 ? filtered : fields;
+            .map((column) => column.trim().replace(/`/g, ""))
+            .filter(Boolean);
+      
+          const normalizePath = (field) =>
+            field
+              .split(".")
+              .filter((segment) => !/^\d+$/.test(segment))
+              .join(".");
+      
+          fields = fields.filter((field) => {
+            const normalizedField = normalizePath(field);
+      
+            return requestedSpecs.some((requestedField) => {
+              const normalizedRequestedField = normalizePath(requestedField);
+      
+              return (
+                normalizedField === normalizedRequestedField ||
+                normalizedField.startsWith(`${normalizedRequestedField}.`)
+              );
+            });
+          });
         }
-
+      
         const csv = parse(flatRows, {
           fields,
           defaultValue: "",
           excelStrings: true,
         });
-
-        makeDirectory(`./storage/exports/csv`);
+      
+        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.set(
+          "Content-Disposition",
+          `attachment; filename="${filename}"`,
+        );
         ctx.type = "text/csv; charset=utf-8";
         ctx.status = 200;
+      
         const csvStream = fs.createReadStream(filePath);
-        // Delete file after stream is finished
+      
         csvStream.on("close", () => {
           fs.promises.unlink(filePath).catch(() => {});
         });
+      
         ctx.body = csvStream;
         return;
       }
-
       const jsonText = safeJSONStringify(cleaned, 2);
 
       makeDirectory(`./storage/exports/json`);
@@ -202,6 +249,7 @@ export default class RestHelper {
     }
   }
 
+
   static makeid(length) {
     var result = "";
     var characters =