spice-js 2.6.66 → 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/build/utility/RestHelper.js

@@ -11,6 +11,8 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -66,55 +68,154 @@ class RestHelper {
 
   static send_download(ctx, next) {
     return _asyncToGenerator(function* () {
-      function makeDirectory(dir) {
-        if (!fs.existsSync(dir)) {
-          fs.mkdirSync(dir);
+      var makeDirectory = dir => {
+        if (!fs.existsSync(dir)) fs.mkdirSync(dir, {
+          recursive: true
+        });
+      };
+
+      var deepTrimStrings = val => {
+        if (Array.isArray(val)) return val.map(deepTrimStrings);
+
+        if (val && typeof val === "object") {
+          var out = {};
+
+          for (var [k, v] of Object.entries(val)) {
+            out[k] = deepTrimStrings(v);
+          }
+
+          return out;
         }
-      }
 
-      try {
-        var download_type = ctx.request.query.format || "csv";
-        var include_id = ctx.request.query.include_id;
-        var content;
+        return typeof val === "string" ? val.trim() : val;
+      };
 
-        if (download_type == "csv") {
-          var {
-            flatten
-          } = yield Promise.resolve().then(() => _interopRequireWildcard(require("flat")));
+      var stripTopLevel = (obj, _ref) => {
+        var {
+          removeId
+        } = _ref;
+        if (Array.isArray(obj)) return obj.map(i => stripTopLevel(i, {
+          removeId
+        }));
 
-          var items = _lodash.default.map(ctx.data, item => {
-            if (!include_id || include_id == "false") {
-              delete item.id;
-            }
+        if (obj && typeof obj === "object") {
+          var copy = _extends({}, obj);
 
-            delete item._permissions_;
-            return flatten(item);
-          });
+          if (removeId) delete copy.id;
+          delete copy._permissions_;
+          return copy;
+        }
 
-          var fields = _lodash.default.union(_lodash.default.keys(_lodash.default.first(items)), _lodash.default.keys(_lodash.default.last(items)), _lodash.default.keys(_lodash.default.nth(items.length / 2)));
+        return obj;
+      };
 
-          var opts = {
-            fields
-          };
-          content = parse(items, opts);
-          ctx.set("content-type", "text/csv");
-        } else {
-          content = JSON.stringify(ctx.data);
-          ctx.set("content-type", "application/json");
+      var normalizeEmptyArraysForCsv = val => {
+        if (Array.isArray(val)) {
+          if (val.length === 0) return undefined;
+          return val.map(v => normalizeEmptyArraysForCsv(v));
         }
 
-        makeDirectory("./storage/exports");
-        makeDirectory("./storage/exports/" + download_type + "/");
-        var file = path.resolve("./storage/exports/" + download_type + "/" + RestHelper.makeid(9) + "." + download_type);
-        yield fs.writeFile(file, content, function (err) {
-          if (err) throw err;
+        if (val && typeof val === "object") {
+          var out = {};
+
+          for (var [k, v] of Object.entries(val)) {
+            var nv = normalizeEmptyArraysForCsv(v);
+            if (nv !== undefined) out[k] = nv;
+          }
+
+          return out;
+        }
+
+        return val;
+      };
+
+      var safeJSONStringify = function safeJSONStringify(value, space) {
+        if (space === void 0) {
+          space = 2;
+        }
+
+        var seen = new WeakSet();
+
+        var replacer = (_k, v) => {
+          if (typeof v === "bigint") return v.toString();
+          if (v instanceof Date) return v.toISOString();
+
+          if (v && typeof v === "object") {
+            if (seen.has(v)) return "[Circular]";
+            seen.add(v);
+          }
+
+          return v;
+        };
+
+        return JSON.stringify(value, replacer, space);
+      };
+
+      try {
+        var download_type = (ctx.request.query.format || "csv").toLowerCase();
+        var include_id = ctx.request.query.include_id;
+
+        var original = _lodash.default.cloneDeep(ctx.data);
+
+        var trimmed = deepTrimStrings(original);
+        var cleaned = stripTopLevel(trimmed, {
+          removeId: !include_id || include_id === "false"
         });
-        ctx.set("content-disposition", "attachment");
-        ctx.response.attachment(file);
+        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 fieldSet = new Set();
+
+            for (var r of flatRows) {
+              Object.keys(r).forEach(k => fieldSet.add(k));
+            }
+
+            var fields = Array.from(fieldSet).sort((a, b) => a.localeCompare(b, undefined, {
+              numeric: true,
+              sensitivity: "base"
+            }));
+            var csv = parse(flatRows, {
+              fields,
+              defaultValue: "",
+              excelStrings: true
+            });
+            makeDirectory("./storage/exports/csv");
+            filename = RestHelper.makeid(9) + ".csv";
+            filePath = path.resolve("./storage/exports/csv/" + filename);
+            yield 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);
+            return {
+              v: void 0
+            };
+          }();
+
+          if (typeof _ret === "object") return _ret.v;
+        }
+
+        var jsonText = safeJSONStringify(cleaned, 2);
+        makeDirectory("./storage/exports/json");
+        filename = RestHelper.makeid(9) + ".json";
+        filePath = path.resolve("./storage/exports/json/" + filename);
+        yield fs.promises.writeFile(filePath, jsonText, "utf8");
+        ctx.set("Content-Disposition", "attachment; filename=\"" + filename + "\"");
+        ctx.type = "application/json; charset=utf-8";
         ctx.status = 200;
-        ctx.body = fs.createReadStream(file);
+        ctx.body = fs.createReadStream(filePath);
       } catch (e) {
-        console.log(e.stack);
+        console.error(e.stack);
         ctx.status = 400;
         ctx.body = RestHelper.prepare_response(RestHelper.FAILURE, e);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.6.66",
+  "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) {

package/src/utility/RestHelper.js

@@ -41,57 +41,112 @@ export default class RestHelper {
   }
 
   static async send_download(ctx, next) {
-    function makeDirectory(dir) {
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir);
+    const makeDirectory = (dir) => {
+      if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+    };
+  
+    const deepTrimStrings = (val) => {
+      if (Array.isArray(val)) return val.map(deepTrimStrings);
+      if (val && typeof val === "object") {
+        const out = {};
+        for (const [k, v] of Object.entries(val)) out[k] = deepTrimStrings(v);
+        return out;
       }
-    }
+      return typeof val === "string" ? val.trim() : val;
+    };
+  
+    const stripTopLevel = (obj, { removeId }) => {
+      if (Array.isArray(obj)) return obj.map((i) => stripTopLevel(i, { removeId }));
+      if (obj && typeof obj === "object") {
+        const copy = { ...obj };
+        if (removeId) delete copy.id;
+        delete copy._permissions_;
+        return copy;
+      }
+      return obj;
+    };
+  
+    const normalizeEmptyArraysForCsv = (val) => {
+      if (Array.isArray(val)) {
+        if (val.length === 0) return undefined;
+        return val.map((v) => normalizeEmptyArraysForCsv(v));
+      }
+      if (val && typeof val === "object") {
+        const out = {};
+        for (const [k, v] of Object.entries(val)) {
+          const nv = normalizeEmptyArraysForCsv(v);
+          if (nv !== undefined) out[k] = nv;
+        }
+        return out;
+      }
+      return val;
+    };
+  
+    const safeJSONStringify = (value, space = 2) => {
+      const seen = new WeakSet();
+      const replacer = (_k, v) => {
+        if (typeof v === "bigint") return v.toString();
+        if (v instanceof Date) return v.toISOString();
+        if (v && typeof v === "object") {
+          if (seen.has(v)) return "[Circular]";
+          seen.add(v);
+        }
+        return v;
+      };
+      return JSON.stringify(value, replacer, space);
+    };
+  
     try {
-      let download_type = ctx.request.query.format || "csv";
-      let include_id = ctx.request.query.include_id;
-      let content;
-      if (download_type == "csv") {
+      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, { removeId: !include_id || include_id === "false" });
+  
+      let filename, filePath;
+  
+      if (download_type === "csv") {
         const { flatten } = await import("flat");
-
-        let items = _.map(ctx.data, (item) => {
-          if (!include_id || include_id == "false") {
-            delete item.id;
-          }
-          delete item._permissions_;
-          return flatten(item);
-        });
-        let fields = _.union(
-          _.keys(_.first(items)),
-          _.keys(_.last(items)),
-          _.keys(_.nth(items.length / 2))
+        const rows = Array.isArray(cleaned) ? cleaned : [cleaned];
+  
+        const csvReady = rows.map(normalizeEmptyArraysForCsv);
+        const flatRows = csvReady.map((row) => flatten(row, { safe: false, delimiter: "." }));
+  
+        const fieldSet = new Set();
+        for (const r of flatRows) Object.keys(r).forEach((k) => fieldSet.add(k));
+        const fields = Array.from(fieldSet).sort((a, b) =>
+          a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" })
         );
-        const opts = {
-          fields,
-        };
-        content = parse(items, opts);
-        ctx.set("content-type", "text/csv");
-      } else {
-        content = JSON.stringify(ctx.data);
-        ctx.set("content-type", "application/json");
+  
+        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);
+        return;
       }
 
-      makeDirectory(`./storage/exports`);
-      makeDirectory(`./storage/exports/${download_type}/`);
-      let file = path.resolve(
-        `./storage/exports/${download_type}/${RestHelper.makeid(
-          9
-        )}.${download_type}`
-      );
-      await fs.writeFile(file, content, function (err) {
-        if (err) throw err;
-      });
-
-      ctx.set("content-disposition", "attachment");
-      ctx.response.attachment(file);
+      const jsonText = safeJSONStringify(cleaned, 2);
+  
+      makeDirectory(`./storage/exports/json`);
+      filename = `${RestHelper.makeid(9)}.json`;
+      filePath = path.resolve(`./storage/exports/json/${filename}`);
+      await fs.promises.writeFile(filePath, jsonText, "utf8");
+      ctx.set("Content-Disposition", `attachment; filename="${filename}"`);
+      ctx.type = "application/json; charset=utf-8";
       ctx.status = 200;
-      ctx.body = fs.createReadStream(file);
+      ctx.body = fs.createReadStream(filePath);
+  
     } catch (e) {
-      console.log(e.stack);
+      console.error(e.stack);
       ctx.status = 400;
       ctx.body = RestHelper.prepare_response(RestHelper.FAILURE, e);
     }
@@ -203,3 +258,4 @@ export default class RestHelper {
     return false;
   }
 }
+