pinia-orm-edge 1.9.0-28582911.bbf7a93 → 1.9.0-28583486.807fa36

package/dist/casts.d.cts

@@ -1,4 +1,4 @@
-import { $ as CastAttribute, m as ModelFields } from './shared/pinia-orm.677cd0bd.cjs';
+import { a0 as CastAttribute, m as ModelFields } from './shared/pinia-orm.b5d0a9df.cjs';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';

package/dist/casts.d.mts

@@ -1,4 +1,4 @@
-import { $ as CastAttribute, m as ModelFields } from './shared/pinia-orm.677cd0bd.mjs';
+import { a0 as CastAttribute, m as ModelFields } from './shared/pinia-orm.b5d0a9df.mjs';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';

package/dist/casts.d.ts

@@ -1,4 +1,4 @@
-import { $ as CastAttribute, m as ModelFields } from './shared/pinia-orm.677cd0bd.js';
+import { a0 as CastAttribute, m as ModelFields } from './shared/pinia-orm.b5d0a9df.js';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';

package/dist/decorators.d.cts

@@ -1,5 +1,5 @@
-import { a0 as TypeDefault, af as PropertyDecorator, ag as TypeOptions, ah as UidOptions, M as Model, s as PrimaryKey, z as deleteModes, $ as CastAttribute, ai as Mutator } from './shared/pinia-orm.677cd0bd.cjs';
-export { aj as NanoidOptions } from './shared/pinia-orm.677cd0bd.cjs';
+import { a1 as TypeDefault, an as PropertyDecorator, ao as TypeOptions, ap as UidOptions, M as Model, s as PrimaryKey, H as deleteModes, a0 as CastAttribute, aj as Mutator } from './shared/pinia-orm.b5d0a9df.cjs';
+export { aq as NanoidOptions } from './shared/pinia-orm.b5d0a9df.cjs';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';

package/dist/decorators.d.mts

@@ -1,5 +1,5 @@
-import { a0 as TypeDefault, af as PropertyDecorator, ag as TypeOptions, ah as UidOptions, M as Model, s as PrimaryKey, z as deleteModes, $ as CastAttribute, ai as Mutator } from './shared/pinia-orm.677cd0bd.mjs';
-export { aj as NanoidOptions } from './shared/pinia-orm.677cd0bd.mjs';
+import { a1 as TypeDefault, an as PropertyDecorator, ao as TypeOptions, ap as UidOptions, M as Model, s as PrimaryKey, H as deleteModes, a0 as CastAttribute, aj as Mutator } from './shared/pinia-orm.b5d0a9df.mjs';
+export { aq as NanoidOptions } from './shared/pinia-orm.b5d0a9df.mjs';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';

package/dist/decorators.d.ts

@@ -1,5 +1,5 @@
-import { a0 as TypeDefault, af as PropertyDecorator, ag as TypeOptions, ah as UidOptions, M as Model, s as PrimaryKey, z as deleteModes, $ as CastAttribute, ai as Mutator } from './shared/pinia-orm.677cd0bd.js';
-export { aj as NanoidOptions } from './shared/pinia-orm.677cd0bd.js';
+import { a1 as TypeDefault, an as PropertyDecorator, ao as TypeOptions, ap as UidOptions, M as Model, s as PrimaryKey, H as deleteModes, a0 as CastAttribute, aj as Mutator } from './shared/pinia-orm.b5d0a9df.js';
+export { aq as NanoidOptions } from './shared/pinia-orm.b5d0a9df.js';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';

package/dist/helpers.d.cts

@@ -1,4 +1,4 @@
-import { M as Model, b as Collection } from './shared/pinia-orm.677cd0bd.cjs';
+import { M as Model, b as Collection } from './shared/pinia-orm.b5d0a9df.cjs';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';
@@ -24,7 +24,7 @@ declare function useCollect<M extends Model = Model>(models: Collection<M>): Use
 /**
  * Get the sum value of the specified filed.
  */
-declare function useSum(models: Collection, field: string): number;
+declare function useSum(models: Collection<any>, field: string): number;
 
 /**
  * The useGroupBy method groups the collection's items by a given key.
@@ -34,7 +34,7 @@ declare function useGroupBy<T extends Record<string, any>>(models: T[], fields:
 /**
  * The keys method returns all of the collection's primary keys
  */
-declare function useKeys(models: Collection): string[];
+declare function useKeys(models: Collection<any>): string[];
 
 /**
  * Get the min value of the specified filed.

package/dist/helpers.d.mts

@@ -1,4 +1,4 @@
-import { M as Model, b as Collection } from './shared/pinia-orm.677cd0bd.mjs';
+import { M as Model, b as Collection } from './shared/pinia-orm.b5d0a9df.mjs';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';
@@ -24,7 +24,7 @@ declare function useCollect<M extends Model = Model>(models: Collection<M>): Use
 /**
  * Get the sum value of the specified filed.
  */
-declare function useSum(models: Collection, field: string): number;
+declare function useSum(models: Collection<any>, field: string): number;
 
 /**
  * The useGroupBy method groups the collection's items by a given key.
@@ -34,7 +34,7 @@ declare function useGroupBy<T extends Record<string, any>>(models: T[], fields:
 /**
  * The keys method returns all of the collection's primary keys
  */
-declare function useKeys(models: Collection): string[];
+declare function useKeys(models: Collection<any>): string[];
 
 /**
  * Get the min value of the specified filed.

package/dist/helpers.d.ts

@@ -1,4 +1,4 @@
-import { M as Model, b as Collection } from './shared/pinia-orm.677cd0bd.js';
+import { M as Model, b as Collection } from './shared/pinia-orm.b5d0a9df.js';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';
@@ -24,7 +24,7 @@ declare function useCollect<M extends Model = Model>(models: Collection<M>): Use
 /**
  * Get the sum value of the specified filed.
  */
-declare function useSum(models: Collection, field: string): number;
+declare function useSum(models: Collection<any>, field: string): number;
 
 /**
  * The useGroupBy method groups the collection's items by a given key.
@@ -34,7 +34,7 @@ declare function useGroupBy<T extends Record<string, any>>(models: T[], fields:
 /**
  * The keys method returns all of the collection's primary keys
  */
-declare function useKeys(models: Collection): string[];
+declare function useKeys(models: Collection<any>): string[];
 
 /**
  * Get the min value of the specified filed.

package/dist/index.cjs

@@ -380,7 +380,7 @@ class Schema {
   one(model, parent) {
     model = model || this.model;
     parent = parent || this.model;
-    const entity = `${model.$entity()}${parent.$entity()}`;
+    const entity = `${model.$self().modelEntity()}${parent.$self().modelEntity()}`;
     if (this.schemas[entity]) {
       return this.schemas[entity];
     }
@@ -401,7 +401,7 @@ class Schema {
    */
   union(models, callback) {
     const schemas = models.reduce((schemas2, model) => {
-      schemas2[model.$entity()] = this.one(model);
+      schemas2[model.$self().modelEntity()] = this.one(model);
       return schemas2;
     }, {});
     return new normalizr.schema.Union(schemas, callback);
@@ -410,7 +410,7 @@ class Schema {
    * Create a new normalizr entity.
    */
   newEntity(model, parent) {
-    const entity = model.$entity();
+    const entity = model.$self().modelEntity();
     const idAttribute = this.idAttribute(model, parent);
     return new normalizr.schema.Entity(entity, {}, { idAttribute });
   }
@@ -448,7 +448,7 @@ class Schema {
         }
       }
       if (["BelongsTo", "HasOne", "MorphOne", "MorphTo"].includes(parent.$fields()[key]?.constructor.name ?? "") && Utils.isArray(parentRecord[key])) {
-        Utils.throwError(['You are passing a list to "', `${parent.$entity()}.${key}`, `" which is a one to one Relation(${parent.$fields()[key]?.constructor.name}):`, JSON.stringify(parentRecord[key])]);
+        Utils.throwError(['You are passing a list to "', `${parent.$modelEntity()}.${key}`, `" which is a one to one Relation(${parent.$fields()[key]?.constructor.name}):`, JSON.stringify(parentRecord[key])]);
       }
       const id = model.$getIndexId(record);
       return id;
@@ -828,6 +828,8 @@ class Query {
     this.getNewHydrated = true;
     return this;
   }
+  // where(field: T, value?: WhereSecondaryClosure<M[T]> | M[T]): this;
+  // where<T extends WherePrimaryClosure<M> | keyof M>(field: T, value?: WhereSecondaryClosure<M[T]> | M[T]): this;
   /**
    * Add a basic where clause to the query.
    */
@@ -1030,11 +1032,14 @@ class Query {
    */
   getFieldWhereForRelations(relation, callback = () => {
   }, operator, count) {
-    const modelIdsByRelation = this.newQuery(this.model.$entity()).with(relation, callback).get(false).filter((model) => Utils.compareWithOperator(
-      Utils.isArray(model[relation]) ? model[relation].length : model[relation] === null ? 0 : 1,
-      typeof operator === "number" ? operator : count ?? 1,
-      typeof operator === "number" || count === void 0 ? ">=" : operator
-    )).map((model) => model.$getIndexId());
+    const modelIdsByRelation = this.newQuery(this.model.$entity()).with(relation, callback).get(false).filter((model) => {
+      const modelRelation = model[relation];
+      return Utils.compareWithOperator(
+        Utils.isArray(modelRelation) ? modelRelation.length : modelRelation === null ? 0 : 1,
+        typeof operator === "number" ? operator : count ?? 1,
+        typeof operator === "number" || count === void 0 ? ">=" : operator
+      );
+    }).map((model) => model.$getIndexId());
     return (model) => modelIdsByRelation.includes(model.$getIndexId());
   }
   /**
@@ -1177,9 +1182,6 @@ class Query {
    * Filter the given collection by the registered order conditions.
    */
   filterOrder(models) {
-    if (this.orders.length === 0) {
-      return models;
-    }
     const fields = this.orders.map((order) => order.field);
     const directions = this.orders.map((order) => order.direction);
     return Utils.orderBy(models, fields, directions);
@@ -1305,7 +1307,7 @@ class Query {
   save(records) {
     let processedData = this.newInterpreter().process(records);
     const modelTypes = this.model.$types();
-    const isChildEntity = this.model.$baseEntity() !== this.model.$entity();
+    const isChildEntity = this.model.$baseEntity() !== this.model.$entity() || this.model.$baseNamespace() !== this.model.$namespace();
     if (Object.values(modelTypes).length > 0 || isChildEntity) {
       const modelTypesKeys = Object.keys(modelTypes);
       const recordsByTypes = {};
@@ -1319,10 +1321,10 @@ class Query {
       });
       for (const entry in recordsByTypes) {
         const typeModel = modelTypes[entry];
-        if (typeModel.entity === this.model.$entity()) {
+        if (typeModel.modelEntity() === this.model.$modelEntity()) {
           processedData = this.newInterpreter().process(recordsByTypes[entry]);
         } else {
-          this.newQueryWithConstraints(typeModel.entity).save(recordsByTypes[entry]);
+          this.newQueryWithConstraints(typeModel.modelEntity()).save(recordsByTypes[entry]);
         }
       }
     }
@@ -1978,7 +1980,7 @@ class Database {
    * Register the given model.
    */
   register(model) {
-    const entity = model.$entity();
+    const entity = model.$self().modelEntity();
     if (!this.models[entity]) {
       this.models[entity] = model;
       this.registerRelatedModels(model);
@@ -2859,6 +2861,8 @@ class Model {
    * Create a new model instance.
    */
   constructor(attributes, options = { operation: "set" }) {
+    // [s: keyof ModelFields]: any
+    __publicField(this, "pivot");
     this.$boot();
     const fill = options.fill ?? true;
     fill && this.$fill(attributes, options);
@@ -2869,21 +2873,28 @@ class Model {
   static fields() {
     return {};
   }
+  static usedNamespace() {
+    return this.namespace ?? config.model.namespace;
+  }
+  static modelEntity() {
+    return (this.usedNamespace() ? this.usedNamespace() + "/" : "") + this.entity;
+  }
   /**
    * Build the schema by evaluating fields and registry.
    */
   static initializeSchema() {
-    this.schemas[this.entity] = {};
-    this.fieldsOnDelete[this.entity] = this.fieldsOnDelete[this.entity] ?? {};
+    const entity = this.modelEntity();
+    this.schemas[entity] = {};
+    this.fieldsOnDelete[entity] = this.fieldsOnDelete[entity] ?? {};
     const registry = {
       ...this.fields(),
-      ...this.registries[this.entity]
+      ...this.registries[entity]
     };
     for (const key in registry) {
       const attribute = registry[key];
-      this.schemas[this.entity][key] = typeof attribute === "function" ? attribute() : attribute;
-      if (this.fieldsOnDelete[this.entity][key]) {
-        this.schemas[this.entity][key] = this.schemas[this.entity][key].onDelete(this.fieldsOnDelete[this.entity][key]);
+      this.schemas[entity][key] = typeof attribute === "function" ? attribute() : attribute;
+      if (this.fieldsOnDelete[entity][key]) {
+        this.schemas[entity][key] = this.schemas[entity][key].onDelete(this.fieldsOnDelete[entity][key]);
       }
     }
   }
@@ -2891,18 +2902,18 @@ class Model {
    * Set the attribute to the registry.
    */
   static setRegistry(key, attribute) {
-    if (!this.registries[this.entity]) {
-      this.registries[this.entity] = {};
+    if (!this.registries[this.modelEntity()]) {
+      this.registries[this.modelEntity()] = {};
     }
-    this.registries[this.entity][key] = attribute;
+    this.registries[this.modelEntity()][key] = attribute;
     return this;
   }
   /**
    * Set delete behaviour for relation field
    */
   static setFieldDeleteMode(key, mode) {
-    this.fieldsOnDelete[this.entity] = this.fieldsOnDelete[this.entity] ?? {};
-    this.fieldsOnDelete[this.entity][key] = mode;
+    this.fieldsOnDelete[this.modelEntity()] = this.fieldsOnDelete[this.modelEntity()] ?? {};
+    this.fieldsOnDelete[this.modelEntity()][key] = mode;
     return this;
   }
   /**
@@ -3135,7 +3146,7 @@ class Model {
    * Get the namespace.
    */
   $namespace() {
-    return this.$self().namespace ?? config.model.namespace;
+    return this.$self().usedNamespace();
   }
   /**
    * Get the store name.
@@ -3149,6 +3160,18 @@ class Model {
   $baseEntity() {
     return this.$self().baseEntity ?? this.$entity();
   }
+  /**
+   * Get the base namespace for this model.
+   */
+  $baseNamespace() {
+    return this.$self().baseNamespace ?? this.$namespace();
+  }
+  /**
+   * Get the model entity for this model.
+   */
+  $modelEntity() {
+    return this.$self().modelEntity();
+  }
   /**
    * Get the type key for this model.
    */
@@ -3177,7 +3200,7 @@ class Model {
    * Get the model fields for this model.
    */
   $fields() {
-    return this.$self().schemas[this.$entity()];
+    return this.$self().schemas[this.$modelEntity()];
   }
   /**
    * Get the model hidden fields
@@ -3204,8 +3227,8 @@ class Model {
    * Bootstrap this model.
    */
   $boot() {
-    if (!this.$self().booted[this.$entity()]) {
-      this.$self().booted[this.$entity()] = true;
+    if (!this.$self().booted[this.$modelEntity()]) {
+      this.$self().booted[this.$modelEntity()] = true;
       this.$initializeSchema();
     }
   }
@@ -3522,6 +3545,10 @@ __publicField(Model, "entity");
  * The reference to the base entity name if the class extends a base entity.
  */
 __publicField(Model, "baseEntity");
+/**
+ * The reference to the base namespace if the class extends a base with a different namespace.
+ */
+__publicField(Model, "baseNamespace");
 /**
  * Define a namespace if you have multiple equal entity names.
  * Resulting in "{namespace}/{entity}"

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { R as Repository, C as Constructor, M as Model, Q as Query, D as DataStore, E as Elements, W as WeakCache, F as FilledInstallOptions } from './shared/pinia-orm.677cd0bd.cjs';
-export { A as AfterHook, x as Attribute, B as BeforeHook, J as BelongsTo, K as BelongsToMany, g as CacheConfigOptions, $ as CastAttribute, _ as Casts, b as Collection, i as CreatePiniaOrm, c as DataStoreState, k as Database, y as Dictionary, ad as EagerLoad, ae as EagerLoadConstraint, a as Element, a8 as Group, aa as GroupBy, ab as GroupByFields, G as GroupedCollection, L as HasMany, T as HasManyBy, U as HasManyThrough, O as HasOne, w as InheritanceTypes, h as InstallOptions, a2 as Interpreter, I as Item, v as MetaValues, f as ModelConfigOptions, m as ModelFields, t as ModelOptions, o as ModelRegistries, q as ModelRegistry, n as ModelSchemas, V as MorphMany, Z as MorphOne, X as MorphTo, Y as MorphToMany, N as NormalizedData, a7 as Order, a9 as OrderBy, ac as OrderDirection, d as PiniaOrmPlugin, P as PiniaOrmPluginContext, s as PrimaryKey, H as Relation, l as Schema, S as Schemas, a1 as Type, a0 as TypeDefault, a3 as Where, a6 as WhereGroup, a4 as WherePrimaryClosure, a5 as WhereSecondaryClosure, j as createORM, e as definePiniaOrmPlugin, z as deleteModes, p as plugins, r as registerPlugins, u as useDataStore } from './shared/pinia-orm.677cd0bd.cjs';
+import { R as Repository, C as Constructor, M as Model, Q as Query, D as DataStore, E as Elements, W as WeakCache, F as FilledInstallOptions } from './shared/pinia-orm.b5d0a9df.cjs';
+export { A as AfterHook, y as Attribute, B as BeforeHook, K as BelongsTo, L as BelongsToMany, am as CacheConfig, g as CacheConfigOptions, a0 as CastAttribute, $ as Casts, b as Collection, i as CreatePiniaOrm, c as DataStoreState, k as Database, z as Dictionary, ah as EagerLoad, ai as EagerLoadConstraint, a as Element, a6 as GetElementType, ac as Group, ae as GroupBy, af as GroupByFields, G as GroupedCollection, O as HasMany, U as HasManyBy, V as HasManyThrough, T as HasOne, w as InheritanceTypes, h as InstallOptions, a3 as Interpreter, I as Item, v as MetaValues, f as ModelConfigOptions, m as ModelFields, t as ModelOptions, o as ModelRegistries, q as ModelRegistry, n as ModelSchemas, X as MorphMany, _ as MorphOne, Y as MorphTo, Z as MorphToMany, aj as Mutator, ak as MutatorFunctions, al as Mutators, a5 as NonMethodKeys, N as NormalizedData, ab as Order, ad as OrderBy, ag as OrderDirection, d as PiniaOrmPlugin, P as PiniaOrmPluginContext, s as PrimaryKey, J as Relation, l as Schema, S as Schemas, a2 as Type, a1 as TypeDefault, a7 as UltimateKeys, a4 as Where, aa as WhereGroup, a8 as WherePrimaryClosure, a9 as WhereSecondaryClosure, x as WithKeys, j as createORM, e as definePiniaOrmPlugin, H as deleteModes, p as plugins, r as registerPlugins, u as useDataStore } from './shared/pinia-orm.b5d0a9df.cjs';
 import { Pinia } from 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';
@@ -46,4 +46,4 @@ declare const config: FilledInstallOptions & {
     [key: string]: any;
 };
 
-export { CONFIG_DEFAULTS, DataStore, Elements, FilledInstallOptions, type MappedRepositories, Model, type ModelOrRepository, type ModelsOrRepositories, Query, Repository, config, mapRepos, useRepo, useStoreActions };
+export { CONFIG_DEFAULTS, Constructor, DataStore, Elements, FilledInstallOptions, type MappedRepositories, Model, type ModelOrRepository, type ModelsOrRepositories, Query, Repository, config, mapRepos, useRepo, useStoreActions };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { R as Repository, C as Constructor, M as Model, Q as Query, D as DataStore, E as Elements, W as WeakCache, F as FilledInstallOptions } from './shared/pinia-orm.677cd0bd.mjs';
-export { A as AfterHook, x as Attribute, B as BeforeHook, J as BelongsTo, K as BelongsToMany, g as CacheConfigOptions, $ as CastAttribute, _ as Casts, b as Collection, i as CreatePiniaOrm, c as DataStoreState, k as Database, y as Dictionary, ad as EagerLoad, ae as EagerLoadConstraint, a as Element, a8 as Group, aa as GroupBy, ab as GroupByFields, G as GroupedCollection, L as HasMany, T as HasManyBy, U as HasManyThrough, O as HasOne, w as InheritanceTypes, h as InstallOptions, a2 as Interpreter, I as Item, v as MetaValues, f as ModelConfigOptions, m as ModelFields, t as ModelOptions, o as ModelRegistries, q as ModelRegistry, n as ModelSchemas, V as MorphMany, Z as MorphOne, X as MorphTo, Y as MorphToMany, N as NormalizedData, a7 as Order, a9 as OrderBy, ac as OrderDirection, d as PiniaOrmPlugin, P as PiniaOrmPluginContext, s as PrimaryKey, H as Relation, l as Schema, S as Schemas, a1 as Type, a0 as TypeDefault, a3 as Where, a6 as WhereGroup, a4 as WherePrimaryClosure, a5 as WhereSecondaryClosure, j as createORM, e as definePiniaOrmPlugin, z as deleteModes, p as plugins, r as registerPlugins, u as useDataStore } from './shared/pinia-orm.677cd0bd.mjs';
+import { R as Repository, C as Constructor, M as Model, Q as Query, D as DataStore, E as Elements, W as WeakCache, F as FilledInstallOptions } from './shared/pinia-orm.b5d0a9df.mjs';
+export { A as AfterHook, y as Attribute, B as BeforeHook, K as BelongsTo, L as BelongsToMany, am as CacheConfig, g as CacheConfigOptions, a0 as CastAttribute, $ as Casts, b as Collection, i as CreatePiniaOrm, c as DataStoreState, k as Database, z as Dictionary, ah as EagerLoad, ai as EagerLoadConstraint, a as Element, a6 as GetElementType, ac as Group, ae as GroupBy, af as GroupByFields, G as GroupedCollection, O as HasMany, U as HasManyBy, V as HasManyThrough, T as HasOne, w as InheritanceTypes, h as InstallOptions, a3 as Interpreter, I as Item, v as MetaValues, f as ModelConfigOptions, m as ModelFields, t as ModelOptions, o as ModelRegistries, q as ModelRegistry, n as ModelSchemas, X as MorphMany, _ as MorphOne, Y as MorphTo, Z as MorphToMany, aj as Mutator, ak as MutatorFunctions, al as Mutators, a5 as NonMethodKeys, N as NormalizedData, ab as Order, ad as OrderBy, ag as OrderDirection, d as PiniaOrmPlugin, P as PiniaOrmPluginContext, s as PrimaryKey, J as Relation, l as Schema, S as Schemas, a2 as Type, a1 as TypeDefault, a7 as UltimateKeys, a4 as Where, aa as WhereGroup, a8 as WherePrimaryClosure, a9 as WhereSecondaryClosure, x as WithKeys, j as createORM, e as definePiniaOrmPlugin, H as deleteModes, p as plugins, r as registerPlugins, u as useDataStore } from './shared/pinia-orm.b5d0a9df.mjs';
 import { Pinia } from 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';
@@ -46,4 +46,4 @@ declare const config: FilledInstallOptions & {
     [key: string]: any;
 };
 
-export { CONFIG_DEFAULTS, DataStore, Elements, FilledInstallOptions, type MappedRepositories, Model, type ModelOrRepository, type ModelsOrRepositories, Query, Repository, config, mapRepos, useRepo, useStoreActions };
+export { CONFIG_DEFAULTS, Constructor, DataStore, Elements, FilledInstallOptions, type MappedRepositories, Model, type ModelOrRepository, type ModelsOrRepositories, Query, Repository, config, mapRepos, useRepo, useStoreActions };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { R as Repository, C as Constructor, M as Model, Q as Query, D as DataStore, E as Elements, W as WeakCache, F as FilledInstallOptions } from './shared/pinia-orm.677cd0bd.js';
-export { A as AfterHook, x as Attribute, B as BeforeHook, J as BelongsTo, K as BelongsToMany, g as CacheConfigOptions, $ as CastAttribute, _ as Casts, b as Collection, i as CreatePiniaOrm, c as DataStoreState, k as Database, y as Dictionary, ad as EagerLoad, ae as EagerLoadConstraint, a as Element, a8 as Group, aa as GroupBy, ab as GroupByFields, G as GroupedCollection, L as HasMany, T as HasManyBy, U as HasManyThrough, O as HasOne, w as InheritanceTypes, h as InstallOptions, a2 as Interpreter, I as Item, v as MetaValues, f as ModelConfigOptions, m as ModelFields, t as ModelOptions, o as ModelRegistries, q as ModelRegistry, n as ModelSchemas, V as MorphMany, Z as MorphOne, X as MorphTo, Y as MorphToMany, N as NormalizedData, a7 as Order, a9 as OrderBy, ac as OrderDirection, d as PiniaOrmPlugin, P as PiniaOrmPluginContext, s as PrimaryKey, H as Relation, l as Schema, S as Schemas, a1 as Type, a0 as TypeDefault, a3 as Where, a6 as WhereGroup, a4 as WherePrimaryClosure, a5 as WhereSecondaryClosure, j as createORM, e as definePiniaOrmPlugin, z as deleteModes, p as plugins, r as registerPlugins, u as useDataStore } from './shared/pinia-orm.677cd0bd.js';
+import { R as Repository, C as Constructor, M as Model, Q as Query, D as DataStore, E as Elements, W as WeakCache, F as FilledInstallOptions } from './shared/pinia-orm.b5d0a9df.js';
+export { A as AfterHook, y as Attribute, B as BeforeHook, K as BelongsTo, L as BelongsToMany, am as CacheConfig, g as CacheConfigOptions, a0 as CastAttribute, $ as Casts, b as Collection, i as CreatePiniaOrm, c as DataStoreState, k as Database, z as Dictionary, ah as EagerLoad, ai as EagerLoadConstraint, a as Element, a6 as GetElementType, ac as Group, ae as GroupBy, af as GroupByFields, G as GroupedCollection, O as HasMany, U as HasManyBy, V as HasManyThrough, T as HasOne, w as InheritanceTypes, h as InstallOptions, a3 as Interpreter, I as Item, v as MetaValues, f as ModelConfigOptions, m as ModelFields, t as ModelOptions, o as ModelRegistries, q as ModelRegistry, n as ModelSchemas, X as MorphMany, _ as MorphOne, Y as MorphTo, Z as MorphToMany, aj as Mutator, ak as MutatorFunctions, al as Mutators, a5 as NonMethodKeys, N as NormalizedData, ab as Order, ad as OrderBy, ag as OrderDirection, d as PiniaOrmPlugin, P as PiniaOrmPluginContext, s as PrimaryKey, J as Relation, l as Schema, S as Schemas, a2 as Type, a1 as TypeDefault, a7 as UltimateKeys, a4 as Where, aa as WhereGroup, a8 as WherePrimaryClosure, a9 as WhereSecondaryClosure, x as WithKeys, j as createORM, e as definePiniaOrmPlugin, H as deleteModes, p as plugins, r as registerPlugins, u as useDataStore } from './shared/pinia-orm.b5d0a9df.js';
 import { Pinia } from 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';
@@ -46,4 +46,4 @@ declare const config: FilledInstallOptions & {
     [key: string]: any;
 };
 
-export { CONFIG_DEFAULTS, DataStore, Elements, FilledInstallOptions, type MappedRepositories, Model, type ModelOrRepository, type ModelsOrRepositories, Query, Repository, config, mapRepos, useRepo, useStoreActions };
+export { CONFIG_DEFAULTS, Constructor, DataStore, Elements, FilledInstallOptions, type MappedRepositories, Model, type ModelOrRepository, type ModelsOrRepositories, Query, Repository, config, mapRepos, useRepo, useStoreActions };

package/dist/index.mjs

@@ -378,7 +378,7 @@ class Schema {
   one(model, parent) {
     model = model || this.model;
     parent = parent || this.model;
-    const entity = `${model.$entity()}${parent.$entity()}`;
+    const entity = `${model.$self().modelEntity()}${parent.$self().modelEntity()}`;
     if (this.schemas[entity]) {
       return this.schemas[entity];
     }
@@ -399,7 +399,7 @@ class Schema {
    */
   union(models, callback) {
     const schemas = models.reduce((schemas2, model) => {
-      schemas2[model.$entity()] = this.one(model);
+      schemas2[model.$self().modelEntity()] = this.one(model);
       return schemas2;
     }, {});
     return new schema.Union(schemas, callback);
@@ -408,7 +408,7 @@ class Schema {
    * Create a new normalizr entity.
    */
   newEntity(model, parent) {
-    const entity = model.$entity();
+    const entity = model.$self().modelEntity();
     const idAttribute = this.idAttribute(model, parent);
     return new schema.Entity(entity, {}, { idAttribute });
   }
@@ -446,7 +446,7 @@ class Schema {
         }
       }
       if (["BelongsTo", "HasOne", "MorphOne", "MorphTo"].includes(parent.$fields()[key]?.constructor.name ?? "") && isArray(parentRecord[key])) {
-        throwError(['You are passing a list to "', `${parent.$entity()}.${key}`, `" which is a one to one Relation(${parent.$fields()[key]?.constructor.name}):`, JSON.stringify(parentRecord[key])]);
+        throwError(['You are passing a list to "', `${parent.$modelEntity()}.${key}`, `" which is a one to one Relation(${parent.$fields()[key]?.constructor.name}):`, JSON.stringify(parentRecord[key])]);
       }
       const id = model.$getIndexId(record);
       return id;
@@ -826,6 +826,8 @@ class Query {
     this.getNewHydrated = true;
     return this;
   }
+  // where(field: T, value?: WhereSecondaryClosure<M[T]> | M[T]): this;
+  // where<T extends WherePrimaryClosure<M> | keyof M>(field: T, value?: WhereSecondaryClosure<M[T]> | M[T]): this;
   /**
    * Add a basic where clause to the query.
    */
@@ -1028,11 +1030,14 @@ class Query {
    */
   getFieldWhereForRelations(relation, callback = () => {
   }, operator, count) {
-    const modelIdsByRelation = this.newQuery(this.model.$entity()).with(relation, callback).get(false).filter((model) => compareWithOperator(
-      isArray(model[relation]) ? model[relation].length : model[relation] === null ? 0 : 1,
-      typeof operator === "number" ? operator : count ?? 1,
-      typeof operator === "number" || count === void 0 ? ">=" : operator
-    )).map((model) => model.$getIndexId());
+    const modelIdsByRelation = this.newQuery(this.model.$entity()).with(relation, callback).get(false).filter((model) => {
+      const modelRelation = model[relation];
+      return compareWithOperator(
+        isArray(modelRelation) ? modelRelation.length : modelRelation === null ? 0 : 1,
+        typeof operator === "number" ? operator : count ?? 1,
+        typeof operator === "number" || count === void 0 ? ">=" : operator
+      );
+    }).map((model) => model.$getIndexId());
     return (model) => modelIdsByRelation.includes(model.$getIndexId());
   }
   /**
@@ -1175,9 +1180,6 @@ class Query {
    * Filter the given collection by the registered order conditions.
    */
   filterOrder(models) {
-    if (this.orders.length === 0) {
-      return models;
-    }
     const fields = this.orders.map((order) => order.field);
     const directions = this.orders.map((order) => order.direction);
     return orderBy(models, fields, directions);
@@ -1303,7 +1305,7 @@ class Query {
   save(records) {
     let processedData = this.newInterpreter().process(records);
     const modelTypes = this.model.$types();
-    const isChildEntity = this.model.$baseEntity() !== this.model.$entity();
+    const isChildEntity = this.model.$baseEntity() !== this.model.$entity() || this.model.$baseNamespace() !== this.model.$namespace();
     if (Object.values(modelTypes).length > 0 || isChildEntity) {
       const modelTypesKeys = Object.keys(modelTypes);
       const recordsByTypes = {};
@@ -1317,10 +1319,10 @@ class Query {
       });
       for (const entry in recordsByTypes) {
         const typeModel = modelTypes[entry];
-        if (typeModel.entity === this.model.$entity()) {
+        if (typeModel.modelEntity() === this.model.$modelEntity()) {
           processedData = this.newInterpreter().process(recordsByTypes[entry]);
         } else {
-          this.newQueryWithConstraints(typeModel.entity).save(recordsByTypes[entry]);
+          this.newQueryWithConstraints(typeModel.modelEntity()).save(recordsByTypes[entry]);
         }
       }
     }
@@ -1976,7 +1978,7 @@ class Database {
    * Register the given model.
    */
   register(model) {
-    const entity = model.$entity();
+    const entity = model.$self().modelEntity();
     if (!this.models[entity]) {
       this.models[entity] = model;
       this.registerRelatedModels(model);
@@ -2857,6 +2859,8 @@ class Model {
    * Create a new model instance.
    */
   constructor(attributes, options = { operation: "set" }) {
+    // [s: keyof ModelFields]: any
+    __publicField(this, "pivot");
     this.$boot();
     const fill = options.fill ?? true;
     fill && this.$fill(attributes, options);
@@ -2867,21 +2871,28 @@ class Model {
   static fields() {
     return {};
   }
+  static usedNamespace() {
+    return this.namespace ?? config.model.namespace;
+  }
+  static modelEntity() {
+    return (this.usedNamespace() ? this.usedNamespace() + "/" : "") + this.entity;
+  }
   /**
    * Build the schema by evaluating fields and registry.
    */
   static initializeSchema() {
-    this.schemas[this.entity] = {};
-    this.fieldsOnDelete[this.entity] = this.fieldsOnDelete[this.entity] ?? {};
+    const entity = this.modelEntity();
+    this.schemas[entity] = {};
+    this.fieldsOnDelete[entity] = this.fieldsOnDelete[entity] ?? {};
     const registry = {
       ...this.fields(),
-      ...this.registries[this.entity]
+      ...this.registries[entity]
     };
     for (const key in registry) {
       const attribute = registry[key];
-      this.schemas[this.entity][key] = typeof attribute === "function" ? attribute() : attribute;
-      if (this.fieldsOnDelete[this.entity][key]) {
-        this.schemas[this.entity][key] = this.schemas[this.entity][key].onDelete(this.fieldsOnDelete[this.entity][key]);
+      this.schemas[entity][key] = typeof attribute === "function" ? attribute() : attribute;
+      if (this.fieldsOnDelete[entity][key]) {
+        this.schemas[entity][key] = this.schemas[entity][key].onDelete(this.fieldsOnDelete[entity][key]);
       }
     }
   }
@@ -2889,18 +2900,18 @@ class Model {
    * Set the attribute to the registry.
    */
   static setRegistry(key, attribute) {
-    if (!this.registries[this.entity]) {
-      this.registries[this.entity] = {};
+    if (!this.registries[this.modelEntity()]) {
+      this.registries[this.modelEntity()] = {};
     }
-    this.registries[this.entity][key] = attribute;
+    this.registries[this.modelEntity()][key] = attribute;
     return this;
   }
   /**
    * Set delete behaviour for relation field
    */
   static setFieldDeleteMode(key, mode) {
-    this.fieldsOnDelete[this.entity] = this.fieldsOnDelete[this.entity] ?? {};
-    this.fieldsOnDelete[this.entity][key] = mode;
+    this.fieldsOnDelete[this.modelEntity()] = this.fieldsOnDelete[this.modelEntity()] ?? {};
+    this.fieldsOnDelete[this.modelEntity()][key] = mode;
     return this;
   }
   /**
@@ -3133,7 +3144,7 @@ class Model {
    * Get the namespace.
    */
   $namespace() {
-    return this.$self().namespace ?? config.model.namespace;
+    return this.$self().usedNamespace();
   }
   /**
    * Get the store name.
@@ -3147,6 +3158,18 @@ class Model {
   $baseEntity() {
     return this.$self().baseEntity ?? this.$entity();
   }
+  /**
+   * Get the base namespace for this model.
+   */
+  $baseNamespace() {
+    return this.$self().baseNamespace ?? this.$namespace();
+  }
+  /**
+   * Get the model entity for this model.
+   */
+  $modelEntity() {
+    return this.$self().modelEntity();
+  }
   /**
    * Get the type key for this model.
    */
@@ -3175,7 +3198,7 @@ class Model {
    * Get the model fields for this model.
    */
   $fields() {
-    return this.$self().schemas[this.$entity()];
+    return this.$self().schemas[this.$modelEntity()];
   }
   /**
    * Get the model hidden fields
@@ -3202,8 +3225,8 @@ class Model {
    * Bootstrap this model.
    */
   $boot() {
-    if (!this.$self().booted[this.$entity()]) {
-      this.$self().booted[this.$entity()] = true;
+    if (!this.$self().booted[this.$modelEntity()]) {
+      this.$self().booted[this.$modelEntity()] = true;
       this.$initializeSchema();
     }
   }
@@ -3520,6 +3543,10 @@ __publicField(Model, "entity");
  * The reference to the base entity name if the class extends a base entity.
  */
 __publicField(Model, "baseEntity");
+/**
+ * The reference to the base namespace if the class extends a base with a different namespace.
+ */
+__publicField(Model, "baseNamespace");
 /**
  * Define a namespace if you have multiple equal entity names.
  * Resulting in "{namespace}/{entity}"

package/dist/nanoid/async.d.cts

@@ -1,4 +1,4 @@
-import { $ as CastAttribute, aj as NanoidOptions, m as ModelFields, af as PropertyDecorator } from '../shared/pinia-orm.677cd0bd.cjs';
+import { a0 as CastAttribute, aq as NanoidOptions, m as ModelFields, an as PropertyDecorator } from '../shared/pinia-orm.b5d0a9df.cjs';
 import 'pinia';
 import '@pinia-orm/normalizr';
 import '@/composables';