spice-js 2.7.20 → 2.7.22

package/build/models/SpiceModel.js

@@ -494,7 +494,7 @@ class SpiceModel {
             args = {};
           }
           if (_.isString(args.id)) {
-            var _args9;
+            var _args9, _results, _results2, _results3, _results4, _results5, _results6;
             if (args.skip_hooks !== true) {
               yield _this4.run_hook(args, "get", "before");
             }
@@ -568,13 +568,16 @@ class SpiceModel {
                 });
               }
             }
-            if (results.type !== undefined && results.type !== _this4.type) {
+            if (!results) {
+              results = {};
+            }
+            if (((_results = results) == null ? void 0 : _results.type) !== undefined && ((_results2 = results) == null ? void 0 : _results2.type) !== _this4.type) {
               throw new Error(_this4.type + " does not exist type");
             }
-            if (results._type !== undefined && results._type !== _this4.type) {
+            if (((_results3 = results) == null ? void 0 : _results3._type) !== undefined && ((_results4 = results) == null ? void 0 : _results4._type) !== _this4.type) {
               throw new Error(_this4.type + " does not exist _type");
             }
-            if (results.deleted === undefined || results.deleted === false) {
+            if (((_results5 = results) == null ? void 0 : _results5.deleted) === undefined || ((_results6 = results) == null ? void 0 : _results6.deleted) === false) {
               if (args.skip_read_serialize !== true && args.skip_serialize !== true) {
                 // ⚡ Pass columns to do_serialize so it can skip irrelevant modifiers
                 results = yield _this4.do_serialize(results, "read", {}, args, yield _this4.propsToBeRemoved(results));
@@ -1033,33 +1036,65 @@ class SpiceModel {
   }
   filterResultsByColumns(data, columns) {
     if (columns && columns !== "") {
-      // Remove backticks and replace meta().id with id
       var cleanedColumns = columns.replace(/`/g, "").replace(/meta\(\)\.id/g, "id");
-
-      // Process each column by splitting on comma and trimming
-      var columnList = cleanedColumns.split(",").map(col => col.trim()).map(col => {
-        // Check for alias with AS (case-insensitive)
+      var columnPaths = cleanedColumns.split(",").map(col => col.trim()).map(col => {
         var aliasMatch = col.match(/\s+AS\s+([\w]+)/i);
         if (aliasMatch) {
-          return aliasMatch[1].trim();
-        }
-        // Otherwise, for dot-notation, keep the first segment after removing
-        // the base model prefix (e.g. user.group.name -> group).
-        if (col.includes(".")) {
-          var pathParts = col.split(".").map(part => part.trim()).filter(part => part !== "");
-          if (pathParts[0] === this.type && pathParts.length > 1) {
-            pathParts = pathParts.slice(1);
-          }
-          return pathParts[0];
+          return {
+            original: col,
+            path: col.replace(/\s+AS\s+[\w]+/i, "").trim(),
+            alias: aliasMatch[1].trim()
+          };
         }
-        return col;
+        return {
+          original: col,
+          path: col,
+          alias: null
+        };
       });
-
-      // Ensure that essential keys are always picked
       var requiredKeys = ["_permissions", "_permissions_", "id"];
-      var finalKeys = [...new Set([...columnList, ...requiredKeys])];
-      return data.map(entry => _.pick(entry, finalKeys));
+      return data.map(entry => {
+        var result = {};
+
+        // Add required keys
+        requiredKeys.forEach(key => {
+          if (entry.hasOwnProperty(key)) {
+            result[key] = entry[key];
+          }
+        });
+
+        // Process each column path
+        columnPaths.forEach(_ref10 => {
+          var {
+            path,
+            alias
+          } = _ref10;
+          var actualPath = path;
+
+          // Remove table prefix if it matches this.type
+          if (path.includes(".")) {
+            var parts = path.split(".");
+            if (parts[0] === this.type) {
+              actualPath = parts.slice(1).join(".");
+            }
+          }
+          var value = _.get(entry, actualPath);
+          if (value !== undefined) {
+            if (alias) {
+              result[alias] = value;
+            } else if (actualPath.includes(".")) {
+              // For nested paths, use the last part as the key
+              var key = actualPath.split(".").pop();
+              result[key] = value;
+            } else {
+              result[actualPath] = value;
+            }
+          }
+        });
+        return result;
+      });
     }
+    console.log("filterResultsByColumns", data);
     return data;
   }
   extractNestings(string, localType) {
@@ -1100,12 +1135,12 @@ class SpiceModel {
   }
   createJoinSection(mappedNestings) {
     if (!mappedNestings || mappedNestings.length === 0) return "";
-    return mappedNestings.map(_ref10 => {
+    return mappedNestings.map(_ref11 => {
       var {
         alias,
         reference,
         is_array
-      } = _ref10;
+      } = _ref11;
       var keyspace = (0, _fix.fixCollection)(reference);
       if (is_array === true) {
         return "LEFT NEST `" + keyspace + "` AS `" + alias + "` ON KEYS `" + this.type + "`.`" + alias + "`";
@@ -1250,8 +1285,8 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this10$_ctx = _this10[_ctx]) == null ? void 0 : _this10$_ctx.profiler;
       var doList = /*#__PURE__*/function () {
-        var _ref11 = _asyncToGenerator(function* () {
-          var _args10, _args11;
+        var _ref12 = _asyncToGenerator(function* () {
+          var _args10, _args11, _args12;
           if (args.mapping_dept) _this10[_mapping_dept] = args.mapping_dept;
           if (args.mapping_dept_exempt) _this10[_mapping_dept_exempt] = args.mapping_dept_exempt;
 
@@ -1267,15 +1302,12 @@ class SpiceModel {
           var originalColumns = args.columns;
 
           // Find alias tokens from query/columns/sort
-          var nestings = [..._this10.extractNestings(((_args10 = args) == null ? void 0 : _args10.query) || "", _this10.type),
-          //...this.extractNestings(args?.columns || "", this.type),
-          ..._this10.extractNestings(((_args11 = args) == null ? void 0 : _args11.sort) || "", _this10.type)];
+          var nestings = [..._this10.extractNestings(((_args10 = args) == null ? void 0 : _args10.query) || "", _this10.type), ..._this10.extractNestings(((_args11 = args) == null ? void 0 : _args11.columns) || "", _this10.type), ..._this10.extractNestings(((_args12 = args) == null ? void 0 : _args12.sort) || "", _this10.type)];
 
           // Build join metadata and prepare columns
           var {
             mappedNestings
           } = _this10.buildJoinMetadata(nestings, args);
-
           // Build JOIN/NEST from the mapped keyspaces
           args._join = _this10.createJoinSection(mappedNestings);
 
@@ -1325,20 +1357,20 @@ class SpiceModel {
           if (args.skip_hooks !== true) {
             yield _this10.run_hook(results.data, "list", "after");
           }
-          results.data = _this10.filterResultsByColumns(results.data, args.columns);
+          results.data = _this10.filterResultsByColumns(results.data, originalColumns);
           //console.log("results.data", results.data);
           return results;
         });
         return function doList() {
-          return _ref11.apply(this, arguments);
+          return _ref12.apply(this, arguments);
         };
       }();
       try {
         if (p) {
-          var _args12, _args13;
+          var _args13, _args14;
           return yield p.track(_this10.type + ".list", doList, {
-            limit: (_args12 = args) == null ? void 0 : _args12.limit,
-            offset: (_args13 = args) == null ? void 0 : _args13.offset
+            limit: (_args13 = args) == null ? void 0 : _args13.limit,
+            offset: (_args14 = args) == null ? void 0 : _args14.offset
           });
         }
         return yield doList();
@@ -1384,7 +1416,7 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this11$_ctx = _this11[_ctx]) == null ? void 0 : _this11$_ctx.profiler;
       var doFetch = /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator(function* () {
+        var _ref13 = _asyncToGenerator(function* () {
           if (args.is_custom_query === "true" && args.ids.length > 0) {
             return yield _this11.database.query(query);
           } else if (args.is_full_text === "true") {
@@ -1396,7 +1428,7 @@ class SpiceModel {
           }
         });
         return function doFetch() {
-          return _ref12.apply(this, arguments);
+          return _ref13.apply(this, arguments);
         };
       }();
       if (p) {
@@ -1405,12 +1437,12 @@ class SpiceModel {
       return yield doFetch();
     })();
   }
-  addHook(_ref13) {
+  addHook(_ref14) {
     var {
       operation,
       when,
       execute
-    } = _ref13;
+    } = _ref14;
     this[_hooks][operation][when].push(execute);
   }
   run_hook(data, op, when, old_data) {
@@ -1532,7 +1564,7 @@ class SpiceModel {
 
         // ⚡ Wrap in profiler track() to ensure proper async context for child operations
         var fetchRelated = /*#__PURE__*/function () {
-          var _ref14 = _asyncToGenerator(function* () {
+          var _ref15 = _asyncToGenerator(function* () {
             return yield Promise.allSettled(_.map(classes, obj => {
               var objInstance = new obj(_extends({}, _this13[_args], {
                 skip_cache: _this13[_skip_cache],
@@ -1550,7 +1582,7 @@ class SpiceModel {
             }));
           });
           return function fetchRelated() {
-            return _ref14.apply(this, arguments);
+            return _ref15.apply(this, arguments);
           };
         }();
         var returned_all;
@@ -1650,7 +1682,7 @@ class SpiceModel {
 
         // ⚡ Wrap in profiler track() to ensure proper async context for child operations
         var fetchRelated = /*#__PURE__*/function () {
-          var _ref15 = _asyncToGenerator(function* () {
+          var _ref16 = _asyncToGenerator(function* () {
             return yield Promise.allSettled(_.map(classes, obj => {
               return new obj(_extends({}, _this14[_args], {
                 skip_cache: _this14[_skip_cache],
@@ -1667,7 +1699,7 @@ class SpiceModel {
             }));
           });
           return function fetchRelated() {
-            return _ref15.apply(this, arguments);
+            return _ref16.apply(this, arguments);
           };
         }();
         var returned_all;
@@ -1715,11 +1747,11 @@ class SpiceModel {
       return original_is_array ? data : data[0];
     })();
   }
-  addModifier(_ref16) {
+  addModifier(_ref17) {
     var {
       when,
       execute
-    } = _ref16;
+    } = _ref17;
     if (this[_serializers][when]) {
       this[_serializers][when]["modifiers"].push(execute);
     }
@@ -1849,7 +1881,7 @@ class SpiceModel {
       // Profiling: use track() for proper async context forking
       var p = (_this16$_ctx = _this16[_ctx]) == null ? void 0 : _this16$_ctx.profiler;
       var doSerialize = /*#__PURE__*/function () {
-        var _ref17 = _asyncToGenerator(function* () {
+        var _ref18 = _asyncToGenerator(function* () {
           var _this16$_serializers, _this16$_serializers$;
           // Early exit if serialization should not run.
           if (!_this16.shouldSerializerRun(args, type)) {
@@ -1917,7 +1949,7 @@ class SpiceModel {
           return originalIsArray ? data : data[0];
         });
         return function doSerialize() {
-          return _ref17.apply(this, arguments);
+          return _ref18.apply(this, arguments);
         };
       }();
       try {

package/build/storage/Storage.js

@@ -20,7 +20,7 @@ function resolveDriverName(requestedDriverName, providers) {
   if (providers === void 0) {
     providers = {};
   }
-  if (requestedDriverName && requestedDriverName !== "sharepoint" && resolveStorageDriver(providers[requestedDriverName])) {
+  if (requestedDriverName && resolveStorageDriver(providers[requestedDriverName])) {
     return requestedDriverName;
   }
   var fallbackDriverName = ["firebase", "s3", "minio", "local"].find(driverName => resolveStorageDriver(providers[driverName]));

package/package.json

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

package/src/models/SpiceModel.js

@@ -619,14 +619,17 @@ export default class SpiceModel {
             });
           }
         }
+        if (!results) {
+          results = {};
+        }
 
-        if (results.type !== undefined && results.type !== this.type) {
+        if (results?.type !== undefined && results?.type !== this.type) {
           throw new Error(`${this.type} does not exist type`);
         }
-        if (results._type !== undefined && results._type !== this.type) {
+        if (results?._type !== undefined && results?._type !== this.type) {
           throw new Error(`${this.type} does not exist _type`);
         }
-        if (results.deleted === undefined || results.deleted === false) {
+        if (results?.deleted === undefined || results?.deleted === false) {
           if (
             args.skip_read_serialize !== true &&
             args.skip_serialize !== true
@@ -1125,42 +1128,68 @@ export default class SpiceModel {
 
   filterResultsByColumns(data, columns) {
     if (columns && columns !== "") {
-      // Remove backticks and replace meta().id with id
       const cleanedColumns = columns
         .replace(/`/g, "")
         .replace(/meta\(\)\.id/g, "id");
 
-      // Process each column by splitting on comma and trimming
-      const columnList = cleanedColumns
+      const columnPaths = cleanedColumns
         .split(",")
         .map((col) => col.trim())
         .map((col) => {
-          // Check for alias with AS (case-insensitive)
           const aliasMatch = col.match(/\s+AS\s+([\w]+)/i);
           if (aliasMatch) {
-            return aliasMatch[1].trim();
-          }
-          // Otherwise, for dot-notation, keep the first segment after removing
-          // the base model prefix (e.g. user.group.name -> group).
-          if (col.includes(".")) {
-            let pathParts = col
-              .split(".")
-              .map((part) => part.trim())
-              .filter((part) => part !== "");
-            if (pathParts[0] === this.type && pathParts.length > 1) {
-              pathParts = pathParts.slice(1);
-            }
-            return pathParts[0];
+            return {
+              original: col,
+              path: col.replace(/\s+AS\s+[\w]+/i, "").trim(),
+              alias: aliasMatch[1].trim(),
+            };
           }
-          return col;
+          return { original: col, path: col, alias: null };
         });
 
-      // Ensure that essential keys are always picked
       const requiredKeys = ["_permissions", "_permissions_", "id"];
-      const finalKeys = [...new Set([...columnList, ...requiredKeys])];
 
-      return data.map((entry) => _.pick(entry, finalKeys));
+      return data.map((entry) => {
+        const result = {};
+
+        // Add required keys
+        requiredKeys.forEach((key) => {
+          if (entry.hasOwnProperty(key)) {
+            result[key] = entry[key];
+          }
+        });
+
+        // Process each column path
+        columnPaths.forEach(({ path, alias }) => {
+          let actualPath = path;
+
+          // Remove table prefix if it matches this.type
+          if (path.includes(".")) {
+            const parts = path.split(".");
+            if (parts[0] === this.type) {
+              actualPath = parts.slice(1).join(".");
+            }
+          }
+
+          const value = _.get(entry, actualPath);
+
+          if (value !== undefined) {
+            if (alias) {
+              result[alias] = value;
+            } else if (actualPath.includes(".")) {
+              // For nested paths, use the last part as the key
+              const key = actualPath.split(".").pop();
+              result[key] = value;
+            } else {
+              result[actualPath] = value;
+            }
+          }
+        });
+
+        return result;
+      });
     }
+    console.log("filterResultsByColumns", data);
     return data;
   }
 
@@ -1397,13 +1426,12 @@ export default class SpiceModel {
       // Find alias tokens from query/columns/sort
       const nestings = [
         ...this.extractNestings(args?.query || "", this.type),
-        //...this.extractNestings(args?.columns || "", this.type),
+        ...this.extractNestings(args?.columns || "", this.type),
         ...this.extractNestings(args?.sort || "", this.type),
       ];
 
       // Build join metadata and prepare columns
       const { mappedNestings } = this.buildJoinMetadata(nestings, args);
-
       // Build JOIN/NEST from the mapped keyspaces
       args._join = this.createJoinSection(mappedNestings);
 
@@ -1478,7 +1506,7 @@ export default class SpiceModel {
         await this.run_hook(results.data, "list", "after");
       }
 
-      results.data = this.filterResultsByColumns(results.data, args.columns);
+      results.data = this.filterResultsByColumns(results.data, originalColumns);
       //console.log("results.data", results.data);
       return results;
     };

package/src/storage/Storage.js

@@ -16,11 +16,7 @@ function resolveStorageDriver(driver) {
 }
 
 function resolveDriverName(requestedDriverName, providers = {}) {
-  if (
-    requestedDriverName &&
-    requestedDriverName !== "sharepoint" &&
-    resolveStorageDriver(providers[requestedDriverName])
-  ) {
+  if (requestedDriverName && resolveStorageDriver(providers[requestedDriverName])) {
     return requestedDriverName;
   }