pinia-orm-edge 1.8.1-28576565.35880c8 → 1.9.0-28577554.c800a89

package/dist/helpers.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const Utils = require('./shared/pinia-orm.2be56be4.cjs');
+const Utils = require('./shared/pinia-orm.9bb2aea1.cjs');
 
 function useSum(models, field) {
   return models.reduce((sum, item) => {

package/dist/helpers.mjs

@@ -1,4 +1,4 @@
-import { k as getValue, o as orderBy } from './shared/pinia-orm.000eebbf.mjs';
+import { k as getValue, o as orderBy } from './shared/pinia-orm.07af123e.mjs';
 
 function useSum(models, field) {
   return models.reduce((sum, item) => {

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const Utils = require('./shared/pinia-orm.2be56be4.cjs');
+const Utils = require('./shared/pinia-orm.9bb2aea1.cjs');
 const pinia = require('pinia');
 const normalizr = require('@pinia-orm/normalizr');
 const CastAttribute = require('./shared/pinia-orm.a7e3e0f3.cjs');
@@ -667,11 +667,12 @@ class BelongsToMany extends Relation {
       const relationResults = [];
       relatedModels.forEach((relatedModel) => {
         const pivot = pivotModels[`[${parentModel[this.parentKey]},${relatedModel[this.relatedKey]}]`]?.[0] ?? null;
+        if (!pivot) {
+          return;
+        }
         const relatedModelCopy = relatedModel.$newInstance(relatedModel.$toJson());
         relatedModelCopy.$setRelation("pivot", pivot);
-        if (pivot) {
-          relationResults.push(relatedModelCopy);
-        }
+        relationResults.push(relatedModelCopy);
       });
       parentModel.$setRelation(relation, relationResults);
     });
@@ -1050,10 +1051,17 @@ class Query {
     if (this.model.$entity() !== this.model.$baseEntity()) {
       this.where(this.model.$typeKey(), this.model.$fields()[this.model.$typeKey()].make());
     }
-    const models = this.select();
+    let models = this.select();
+    if (!this.orders) {
+      models = this.filterLimit(models);
+    }
     if (!Utils.isEmpty(models)) {
       this.eagerLoadRelations(models);
     }
+    if (this.orders) {
+      models = this.filterOrder(models);
+      models = this.filterLimit(models);
+    }
     if (triggerHook) {
       models.forEach((model) => model.$self().retrieved(model));
     }
@@ -1087,8 +1095,6 @@ class Query {
     }
     let models = this.storeFind(ids);
     models = this.filterWhere(models);
-    models = this.filterOrder(models);
-    models = this.filterLimit(models);
     this.wheres = originalWheres;
     return models;
   }

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as isArray, t as throwError, a as assert, g as generateId, b as isNullish, c as compareWithOperator, d as generateKey, e as isEmpty, f as isFunction, h as groupBy, o as orderBy, j as equals } from './shared/pinia-orm.000eebbf.mjs';
+import { i as isArray, t as throwError, a as assert, g as generateId, b as isNullish, c as compareWithOperator, d as generateKey, e as isEmpty, f as isFunction, h as groupBy, o as orderBy, j as equals } from './shared/pinia-orm.07af123e.mjs';
 import { defineStore, acceptHMRUpdate } from 'pinia';
 import { schema, normalize } from '@pinia-orm/normalizr';
 export { C as CastAttribute } from './shared/pinia-orm.4ff2e12f.mjs';
@@ -665,11 +665,12 @@ class BelongsToMany extends Relation {
       const relationResults = [];
       relatedModels.forEach((relatedModel) => {
         const pivot = pivotModels[`[${parentModel[this.parentKey]},${relatedModel[this.relatedKey]}]`]?.[0] ?? null;
+        if (!pivot) {
+          return;
+        }
         const relatedModelCopy = relatedModel.$newInstance(relatedModel.$toJson());
         relatedModelCopy.$setRelation("pivot", pivot);
-        if (pivot) {
-          relationResults.push(relatedModelCopy);
-        }
+        relationResults.push(relatedModelCopy);
       });
       parentModel.$setRelation(relation, relationResults);
     });
@@ -1048,10 +1049,17 @@ class Query {
     if (this.model.$entity() !== this.model.$baseEntity()) {
       this.where(this.model.$typeKey(), this.model.$fields()[this.model.$typeKey()].make());
     }
-    const models = this.select();
+    let models = this.select();
+    if (!this.orders) {
+      models = this.filterLimit(models);
+    }
     if (!isEmpty(models)) {
       this.eagerLoadRelations(models);
     }
+    if (this.orders) {
+      models = this.filterOrder(models);
+      models = this.filterLimit(models);
+    }
     if (triggerHook) {
       models.forEach((model) => model.$self().retrieved(model));
     }
@@ -1085,8 +1093,6 @@ class Query {
     }
     let models = this.storeFind(ids);
     models = this.filterWhere(models);
-    models = this.filterOrder(models);
-    models = this.filterLimit(models);
     this.wheres = originalWheres;
     return models;
   }

package/dist/shared/{pinia-orm.000eebbf.mjs → pinia-orm.07af123e.mjs}

@@ -35,7 +35,7 @@ function orderBy(collection, iteratees, directions, flags = "SORT_REGULAR") {
   let index = -1;
   const result = collection.map((value) => {
     const criteria = iteratees.map((iteratee) => {
-      return typeof iteratee === "function" ? iteratee(value) : value[iteratee];
+      return typeof iteratee === "function" ? iteratee(value) : getValue(value, iteratee, false);
     });
     return { criteria, index: ++index, value };
   });
@@ -119,13 +119,13 @@ function generateKey(key, params) {
   const stringifiedKey = JSON.stringify(keyValues);
   return typeof process === "undefined" ? btoa(stringifiedKey) : stringifiedKey;
 }
-function getValue(obj, keys) {
+function getValue(obj, keys, ifNotFoundReturnObject = true) {
   keys = typeof keys === "string" ? keys.split(".") : keys;
   const key = keys.shift();
   if (obj && Object.prototype.hasOwnProperty.call(obj, key) && keys.length === 0) {
     return obj[key];
   } else if (!obj || !Object.prototype.hasOwnProperty.call(obj, key)) {
-    return obj;
+    return ifNotFoundReturnObject ? obj : void 0;
   } else {
     return getValue(obj[key], keys);
   }

package/dist/shared/{pinia-orm.2be56be4.cjs → pinia-orm.9bb2aea1.cjs}

@@ -37,7 +37,7 @@ function orderBy(collection, iteratees, directions, flags = "SORT_REGULAR") {
   let index = -1;
   const result = collection.map((value) => {
     const criteria = iteratees.map((iteratee) => {
-      return typeof iteratee === "function" ? iteratee(value) : value[iteratee];
+      return typeof iteratee === "function" ? iteratee(value) : getValue(value, iteratee, false);
     });
     return { criteria, index: ++index, value };
   });
@@ -121,13 +121,13 @@ function generateKey(key, params) {
   const stringifiedKey = JSON.stringify(keyValues);
   return typeof process === "undefined" ? btoa(stringifiedKey) : stringifiedKey;
 }
-function getValue(obj, keys) {
+function getValue(obj, keys, ifNotFoundReturnObject = true) {
   keys = typeof keys === "string" ? keys.split(".") : keys;
   const key = keys.shift();
   if (obj && Object.prototype.hasOwnProperty.call(obj, key) && keys.length === 0) {
     return obj[key];
   } else if (!obj || !Object.prototype.hasOwnProperty.call(obj, key)) {
-    return obj;
+    return ifNotFoundReturnObject ? obj : void 0;
   } else {
     return getValue(obj[key], keys);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinia-orm-edge",
-  "version": "1.8.1-28576565.35880c8",
+  "version": "1.9.0-28577554.c800a89",
   "description": "The Pinia plugin to enable Object-Relational Mapping access to the Pinia Store.",
   "keywords": [
     "vue",
@@ -46,14 +46,14 @@
     "pinia": "^2.1.7"
   },
   "dependencies": {
-    "@pinia-orm/normalizr": "npm:@pinia-orm/normalizr-edge@1.8.1-28576565.35880c8"
+    "@pinia-orm/normalizr": "npm:@pinia-orm/normalizr-edge@1.9.0-28577554.c800a89"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.3.10",
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
     "@pinia/testing": "^0.1.3",
     "@size-limit/preset-small-lib": "^11.1.2",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.12.8",
     "@types/prettier": "^3.0.0",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/parser": "^7.8.0",
@@ -75,7 +75,7 @@
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0",
     "uuid": "^9.0.1",
-    "vite": "^5.2.10",
+    "vite": "^5.2.11",
     "vitest": "^1.5.3",
     "vue": "^3.4.26",
     "vue-demi": "^0.14.7",