metal-orm 1.0.103 → 1.0.105

package/dist/index.d.cts

@@ -6463,6 +6463,7 @@ type Rows$2 = Record<string, unknown>[];
  * @template TChild - The type of child entities in the collection
  */
 declare class DefaultHasManyCollection<TChild> implements HasManyCollection<TChild> {
+    #private;
     private readonly ctx;
     private readonly meta;
     private readonly root;
@@ -6472,10 +6473,6 @@ declare class DefaultHasManyCollection<TChild> implements HasManyCollection<TChi
     private readonly loader;
     private readonly createEntity;
     private readonly localKey;
-    private loaded;
-    private items;
-    private readonly added;
-    private readonly removed;
     /**
      * Creates a new DefaultHasManyCollection instance.
      * @param ctx - The entity context
@@ -6527,6 +6524,7 @@ declare class DefaultHasManyCollection<TChild> implements HasManyCollection<TChi
      * Clears all entities from the collection.
      */
     clear(): void;
+    isLoaded(): boolean;
     private get relationKey();
     private hydrateFromCache;
     /**
@@ -6544,6 +6542,7 @@ type Rows$1 = Record<string, unknown>;
  * @template TParent The type of the parent entity.
  */
 declare class DefaultBelongsToReference<TParent extends object> implements BelongsToReferenceApi<TParent> {
+    #private;
     private readonly ctx;
     private readonly meta;
     private readonly root;
@@ -6553,8 +6552,6 @@ declare class DefaultBelongsToReference<TParent extends object> implements Belon
     private readonly loader;
     private readonly createEntity;
     private readonly targetKey;
-    private loaded;
-    private current;
     /**
      * @param ctx The entity context for tracking changes.
      * @param meta Metadata for the child entity.
@@ -6570,6 +6567,7 @@ declare class DefaultBelongsToReference<TParent extends object> implements Belon
     load(): Promise<TParent | null>;
     get(): TParent | null;
     set(data: Partial<TParent> | TParent | null): TParent | null;
+    isLoaded(): boolean;
     private get relationKey();
     private populateFromHydrationCache;
     toJSON(): TParent | null;
@@ -6584,6 +6582,7 @@ type Rows = Record<string, unknown>[];
  * @template TTarget The type of the target entities in the collection.
  */
 declare class DefaultManyToManyCollection<TTarget, TPivot extends object | undefined = undefined> implements ManyToManyCollection<TTarget, TPivot> {
+    #private;
     private readonly ctx;
     private readonly meta;
     private readonly root;
@@ -6593,8 +6592,6 @@ declare class DefaultManyToManyCollection<TTarget, TPivot extends object | undef
     private readonly loader;
     private readonly createEntity;
     private readonly localKey;
-    private loaded;
-    private items;
     /**
      * @param ctx The entity context for tracking changes.
      * @param meta Metadata for the root entity.
@@ -6643,6 +6640,7 @@ declare class DefaultManyToManyCollection<TTarget, TPivot extends object | undef
      * @param ids Array of primary key values to sync with.
      */
     syncByIds(ids: (number | string)[]): Promise<void>;
+    isLoaded(): boolean;
     private ensureEntity;
     private extractId;
     private get relationKey();

package/dist/index.d.ts

@@ -6463,6 +6463,7 @@ type Rows$2 = Record<string, unknown>[];
  * @template TChild - The type of child entities in the collection
  */
 declare class DefaultHasManyCollection<TChild> implements HasManyCollection<TChild> {
+    #private;
     private readonly ctx;
     private readonly meta;
     private readonly root;
@@ -6472,10 +6473,6 @@ declare class DefaultHasManyCollection<TChild> implements HasManyCollection<TChi
     private readonly loader;
     private readonly createEntity;
     private readonly localKey;
-    private loaded;
-    private items;
-    private readonly added;
-    private readonly removed;
     /**
      * Creates a new DefaultHasManyCollection instance.
      * @param ctx - The entity context
@@ -6527,6 +6524,7 @@ declare class DefaultHasManyCollection<TChild> implements HasManyCollection<TChi
      * Clears all entities from the collection.
      */
     clear(): void;
+    isLoaded(): boolean;
     private get relationKey();
     private hydrateFromCache;
     /**
@@ -6544,6 +6542,7 @@ type Rows$1 = Record<string, unknown>;
  * @template TParent The type of the parent entity.
  */
 declare class DefaultBelongsToReference<TParent extends object> implements BelongsToReferenceApi<TParent> {
+    #private;
     private readonly ctx;
     private readonly meta;
     private readonly root;
@@ -6553,8 +6552,6 @@ declare class DefaultBelongsToReference<TParent extends object> implements Belon
     private readonly loader;
     private readonly createEntity;
     private readonly targetKey;
-    private loaded;
-    private current;
     /**
      * @param ctx The entity context for tracking changes.
      * @param meta Metadata for the child entity.
@@ -6570,6 +6567,7 @@ declare class DefaultBelongsToReference<TParent extends object> implements Belon
     load(): Promise<TParent | null>;
     get(): TParent | null;
     set(data: Partial<TParent> | TParent | null): TParent | null;
+    isLoaded(): boolean;
     private get relationKey();
     private populateFromHydrationCache;
     toJSON(): TParent | null;
@@ -6584,6 +6582,7 @@ type Rows = Record<string, unknown>[];
  * @template TTarget The type of the target entities in the collection.
  */
 declare class DefaultManyToManyCollection<TTarget, TPivot extends object | undefined = undefined> implements ManyToManyCollection<TTarget, TPivot> {
+    #private;
     private readonly ctx;
     private readonly meta;
     private readonly root;
@@ -6593,8 +6592,6 @@ declare class DefaultManyToManyCollection<TTarget, TPivot extends object | undef
     private readonly loader;
     private readonly createEntity;
     private readonly localKey;
-    private loaded;
-    private items;
     /**
      * @param ctx The entity context for tracking changes.
      * @param meta Metadata for the root entity.
@@ -6643,6 +6640,7 @@ declare class DefaultManyToManyCollection<TTarget, TPivot extends object | undef
      * @param ids Array of primary key values to sync with.
      */
     syncByIds(ids: (number | string)[]): Promise<void>;
+    isLoaded(): boolean;
     private ensureEntity;
     private extractId;
     private get relationKey();

package/dist/index.js

@@ -4902,7 +4902,8 @@ var hideInternal = (obj, keys) => {
     Object.defineProperty(obj, key, {
       value: obj[key],
       writable: false,
-      configurable: false,
+      configurable: true,
+      // Must be configurable for Proxy get trap to work properly
       enumerable: false
     });
   }
@@ -4933,41 +4934,41 @@ var DefaultHasManyCollection = class {
     hideInternal(this, ["ctx", "meta", "root", "relationName", "relation", "rootTable", "loader", "createEntity", "localKey"]);
     this.hydrateFromCache();
   }
-  loaded = false;
-  items = [];
-  added = /* @__PURE__ */ new Set();
-  removed = /* @__PURE__ */ new Set();
+  #loaded = false;
+  #items = [];
+  #added = /* @__PURE__ */ new Set();
+  #removed = /* @__PURE__ */ new Set();
   /**
    * Loads the related entities if not already loaded.
    * @returns Promise resolving to the array of child entities
    */
   async load() {
-    if (this.loaded) return this.items;
+    if (this.#loaded) return this.#items;
     const map = await this.loader();
     const key = toKey3(this.root[this.localKey]);
     const rows = map.get(key) ?? [];
-    this.items = rows.map((row) => this.createEntity(row));
-    this.loaded = true;
-    return this.items;
+    this.#items = rows.map((row) => this.createEntity(row));
+    this.#loaded = true;
+    return this.#items;
   }
   /**
    * Gets the current items in the collection.
    * @returns Array of child entities
    */
   getItems() {
-    return this.items;
+    return this.#items;
   }
   /**
    * Array-compatible length for testing frameworks.
    */
   get length() {
-    return this.items.length;
+    return this.#items.length;
   }
   /**
    * Enables iteration over the collection like an array.
    */
   [Symbol.iterator]() {
-    return this.items[Symbol.iterator]();
+    return this.#items[Symbol.iterator]();
   }
   /**
    * Adds a new child entity to the collection.
@@ -4981,8 +4982,8 @@ var DefaultHasManyCollection = class {
       [this.relation.foreignKey]: keyValue
     };
     const entity = this.createEntity(childRow);
-    this.added.add(entity);
-    this.items.push(entity);
+    this.#added.add(entity);
+    this.#items.push(entity);
     this.ctx.registerRelationChange(
       this.root,
       this.relationKey,
@@ -5001,7 +5002,7 @@ var DefaultHasManyCollection = class {
     const keyValue = this.root[this.localKey];
     entity[this.relation.foreignKey] = keyValue;
     this.ctx.markDirty(entity);
-    this.items.push(entity);
+    this.#items.push(entity);
     this.ctx.registerRelationChange(
       this.root,
       this.relationKey,
@@ -5016,8 +5017,8 @@ var DefaultHasManyCollection = class {
    * @param entity - The entity to remove
    */
   remove(entity) {
-    this.items = this.items.filter((item) => item !== entity);
-    this.removed.add(entity);
+    this.#items = this.#items.filter((item) => item !== entity);
+    this.#removed.add(entity);
     this.ctx.registerRelationChange(
       this.root,
       this.relationKey,
@@ -5031,10 +5032,13 @@ var DefaultHasManyCollection = class {
    * Clears all entities from the collection.
    */
   clear() {
-    for (const entity of [...this.items]) {
+    for (const entity of [...this.#items]) {
       this.remove(entity);
     }
   }
+  isLoaded() {
+    return this.#loaded;
+  }
   get relationKey() {
     return `${this.rootTable.name}.${this.relationName}`;
   }
@@ -5043,15 +5047,15 @@ var DefaultHasManyCollection = class {
     if (keyValue === void 0 || keyValue === null) return;
     const rows = getHydrationRows(this.meta, this.relationName, keyValue);
     if (!rows?.length) return;
-    this.items = rows.map((row) => this.createEntity(row));
-    this.loaded = true;
+    this.#items = rows.map((row) => this.createEntity(row));
+    this.#loaded = true;
   }
   /**
    * Returns the items for JSON serialization.
    * @returns Array of child entities
    */
   toJSON() {
-    return this.items;
+    return this.#items;
   }
 };
 
@@ -5062,7 +5066,8 @@ var hideInternal2 = (obj, keys) => {
     Object.defineProperty(obj, key, {
       value: obj[key],
       writable: false,
-      configurable: false,
+      configurable: true,
+      // Must be configurable for Proxy get trap to work properly
       enumerable: false
     });
   }
@@ -5102,42 +5107,42 @@ var DefaultHasOneReference = class {
     ]);
     this.populateFromHydrationCache();
   }
-  loaded = false;
-  current = null;
+  #loaded = false;
+  #current = null;
   async load() {
-    if (this.loaded) return this.current;
+    if (this.#loaded) return this.#current;
     const map = await this.loader();
     const keyValue = this.root[this.localKey];
     if (keyValue === void 0 || keyValue === null) {
-      this.loaded = true;
-      return this.current;
+      this.#loaded = true;
+      return this.#current;
     }
     const row = map.get(toKey4(keyValue));
-    this.current = row ? this.createEntity(row) : null;
-    this.loaded = true;
-    return this.current;
+    this.#current = row ? this.createEntity(row) : null;
+    this.#loaded = true;
+    return this.#current;
   }
   get() {
-    return this.current;
+    return this.#current;
   }
   set(data) {
     if (data === null) {
       return this.detachCurrent();
     }
     const entity = hasEntityMeta(data) ? data : this.createEntity(data);
-    if (this.current && this.current !== entity) {
+    if (this.#current && this.#current !== entity) {
       this.ctx.registerRelationChange(
         this.root,
         this.relationKey,
         this.rootTable,
         this.relationName,
         this.relation,
-        { kind: "remove", entity: this.current }
+        { kind: "remove", entity: this.#current }
       );
     }
     this.assignForeignKey(entity);
-    this.current = entity;
-    this.loaded = true;
+    this.#current = entity;
+    this.#loaded = true;
     this.ctx.registerRelationChange(
       this.root,
       this.relationKey,
@@ -5148,14 +5153,17 @@ var DefaultHasOneReference = class {
     );
     return entity;
   }
+  isLoaded() {
+    return this.#loaded;
+  }
   toJSON() {
-    return this.current;
+    return this.#current;
   }
   detachCurrent() {
-    const previous = this.current;
+    const previous = this.#current;
     if (!previous) return null;
-    this.current = null;
-    this.loaded = true;
+    this.#current = null;
+    this.#loaded = true;
     this.ctx.registerRelationChange(
       this.root,
       this.relationKey,
@@ -5178,8 +5186,8 @@ var DefaultHasOneReference = class {
     if (keyValue === void 0 || keyValue === null) return;
     const row = getHydrationRecord(this.meta, this.relationName, keyValue);
     if (!row) return;
-    this.current = this.createEntity(row);
-    this.loaded = true;
+    this.#current = this.createEntity(row);
+    this.#loaded = true;
   }
 };
 
@@ -5190,7 +5198,8 @@ var hideInternal3 = (obj, keys) => {
     Object.defineProperty(obj, key, {
       value: obj[key],
       writable: false,
-      configurable: false,
+      configurable: true,
+      // Must be configurable for Proxy get trap to work properly
       enumerable: false
     });
   }
@@ -5220,29 +5229,29 @@ var DefaultBelongsToReference = class {
     hideInternal3(this, ["ctx", "meta", "root", "relationName", "relation", "rootTable", "loader", "createEntity", "targetKey"]);
     this.populateFromHydrationCache();
   }
-  loaded = false;
-  current = null;
+  #loaded = false;
+  #current = null;
   async load() {
-    if (this.loaded) return this.current;
+    if (this.#loaded) return this.#current;
     const map = await this.loader();
     const fkValue = this.root[this.relation.foreignKey];
     if (fkValue === null || fkValue === void 0) {
-      this.current = null;
+      this.#current = null;
     } else {
       const row = map.get(toKey5(fkValue));
-      this.current = row ? this.createEntity(row) : null;
+      this.#current = row ? this.createEntity(row) : null;
     }
-    this.loaded = true;
-    return this.current;
+    this.#loaded = true;
+    return this.#current;
   }
   get() {
-    return this.current;
+    return this.#current;
   }
   set(data) {
     if (data === null) {
-      const previous = this.current;
+      const previous = this.#current;
       this.root[this.relation.foreignKey] = null;
-      this.current = null;
+      this.#current = null;
       this.ctx.registerRelationChange(
         this.root,
         this.relationKey,
@@ -5258,7 +5267,7 @@ var DefaultBelongsToReference = class {
     if (pkValue !== void 0) {
       this.root[this.relation.foreignKey] = pkValue;
     }
-    this.current = entity;
+    this.#current = entity;
     this.ctx.registerRelationChange(
       this.root,
       this.relationKey,
@@ -5269,6 +5278,9 @@ var DefaultBelongsToReference = class {
     );
     return entity;
   }
+  isLoaded() {
+    return this.#loaded;
+  }
   get relationKey() {
     return `${this.rootTable.name}.${this.relationName}`;
   }
@@ -5277,11 +5289,11 @@ var DefaultBelongsToReference = class {
     if (fkValue === void 0 || fkValue === null) return;
     const row = getHydrationRecord(this.meta, this.relationName, fkValue);
     if (!row) return;
-    this.current = this.createEntity(row);
-    this.loaded = true;
+    this.#current = this.createEntity(row);
+    this.#loaded = true;
   }
   toJSON() {
-    return this.current;
+    return this.#current;
   }
 };
 
@@ -5292,7 +5304,8 @@ var hideInternal4 = (obj, keys) => {
     Object.defineProperty(obj, key, {
       value: obj[key],
       writable: false,
-      configurable: false,
+      configurable: true,
+      // Must be configurable for Proxy get trap to work properly
       enumerable: false
     });
   }
@@ -5322,45 +5335,45 @@ var DefaultManyToManyCollection = class {
     hideInternal4(this, ["ctx", "meta", "root", "relationName", "relation", "rootTable", "loader", "createEntity", "localKey"]);
     this.hydrateFromCache();
   }
-  loaded = false;
-  items = [];
+  #loaded = false;
+  #items = [];
   /**
    * Loads the collection items if not already loaded.
    * @returns A promise that resolves to the array of target entities.
    */
   async load() {
-    if (this.loaded) return this.items;
+    if (this.#loaded) return this.#items;
     const map = await this.loader();
     const key = toKey6(this.root[this.localKey]);
     const rows = map.get(key) ?? [];
-    this.items = rows.map((row) => {
+    this.#items = rows.map((row) => {
       const entity = this.createEntity(row);
       if (row._pivot) {
         entity._pivot = row._pivot;
       }
       return entity;
     });
-    this.loaded = true;
-    return this.items;
+    this.#loaded = true;
+    return this.#items;
   }
   /**
    * Returns the currently loaded items.
    * @returns Array of target entities.
    */
   getItems() {
-    return this.items;
+    return this.#items;
   }
   /**
    * Array-compatible length for testing frameworks.
    */
   get length() {
-    return this.items.length;
+    return this.#items.length;
   }
   /**
    * Enables iteration over the collection like an array.
    */
   [Symbol.iterator]() {
-    return this.items[Symbol.iterator]();
+    return this.#items[Symbol.iterator]();
   }
   /**
    * Attaches an entity to the collection.
@@ -5370,13 +5383,13 @@ var DefaultManyToManyCollection = class {
   attach(target) {
     const entity = this.ensureEntity(target);
     const id = this.extractId(entity);
-    if (id != null && this.items.some((item) => this.extractId(item) === id)) {
+    if (id != null && this.#items.some((item) => this.extractId(item) === id)) {
       return;
     }
-    if (id == null && this.items.includes(entity)) {
+    if (id == null && this.#items.includes(entity)) {
       return;
     }
-    this.items.push(entity);
+    this.#items.push(entity);
     this.ctx.registerRelationChange(
       this.root,
       this.relationKey,
@@ -5394,9 +5407,9 @@ var DefaultManyToManyCollection = class {
   detach(target) {
     const id = typeof target === "number" || typeof target === "string" ? target : this.extractId(target);
     if (id == null) return;
-    const existing = this.items.find((item) => this.extractId(item) === id);
+    const existing = this.#items.find((item) => this.extractId(item) === id);
     if (!existing) return;
-    this.items = this.items.filter((item) => this.extractId(item) !== id);
+    this.#items = this.#items.filter((item) => this.extractId(item) !== id);
     this.ctx.registerRelationChange(
       this.root,
       this.relationKey,
@@ -5414,19 +5427,22 @@ var DefaultManyToManyCollection = class {
   async syncByIds(ids) {
     await this.load();
     const normalized = new Set(ids.map((id) => toKey6(id)));
-    const currentIds = new Set(this.items.map((item) => toKey6(this.extractId(item))));
+    const currentIds = new Set(this.#items.map((item) => toKey6(this.extractId(item))));
     for (const id of normalized) {
       if (!currentIds.has(id)) {
         this.attach(id);
       }
     }
-    for (const item of [...this.items]) {
+    for (const item of [...this.#items]) {
       const itemId = toKey6(this.extractId(item));
       if (!normalized.has(itemId)) {
         this.detach(item);
       }
     }
   }
+  isLoaded() {
+    return this.#loaded;
+  }
   ensureEntity(target) {
     if (typeof target === "number" || typeof target === "string") {
       const stub = {
@@ -5454,17 +5470,17 @@ var DefaultManyToManyCollection = class {
     if (keyValue === void 0 || keyValue === null) return;
     const rows = getHydrationRows(this.meta, this.relationName, keyValue);
     if (!rows?.length) return;
-    this.items = rows.map((row) => {
+    this.#items = rows.map((row) => {
       const entity = this.createEntity(row);
       if (row._pivot) {
         entity._pivot = row._pivot;
       }
       return entity;
     });
-    this.loaded = true;
+    this.#loaded = true;
   }
   toJSON() {
-    return this.items;
+    return this.#items;
   }
 };
 
@@ -5806,12 +5822,31 @@ var relationLoaderCache = (meta, relationName, factory) => {
 // src/orm/entity-relations.ts
 var proxifyRelationWrapper = (wrapper) => {
   return new Proxy(wrapper, {
-    get(target, prop, receiver) {
+    get(target, prop, _receiver) {
+      if (prop === "toJSON") {
+        return () => {
+          const wrapperToJSON = target.toJSON;
+          if (typeof wrapperToJSON === "function") {
+            return wrapperToJSON.call(target);
+          }
+          const getRef2 = target.get;
+          if (typeof getRef2 === "function") {
+            return getRef2.call(target);
+          }
+          const getItems2 = target.getItems;
+          if (typeof getItems2 === "function") {
+            return getItems2.call(target);
+          }
+          return target;
+        };
+      }
       if (typeof prop === "symbol") {
-        return Reflect.get(target, prop, receiver);
+        const value = Reflect.get(target, prop, target);
+        return typeof value === "function" ? value.bind(target) : value;
       }
       if (prop in target) {
-        return Reflect.get(target, prop, receiver);
+        const value = Reflect.get(target, prop, target);
+        return typeof value === "function" ? value.bind(target) : value;
       }
       const getItems = target.getItems;
       if (typeof getItems === "function") {
@@ -5833,12 +5868,12 @@ var proxifyRelationWrapper = (wrapper) => {
       }
       return void 0;
     },
-    set(target, prop, value, receiver) {
+    set(target, prop, value, _receiver) {
       if (typeof prop === "symbol") {
-        return Reflect.set(target, prop, value, receiver);
+        return Reflect.set(target, prop, value, target);
       }
       if (prop in target) {
-        return Reflect.set(target, prop, value, receiver);
+        return Reflect.set(target, prop, value, target);
       }
       const getRef = target.get;
       if (typeof getRef === "function") {
@@ -5852,7 +5887,7 @@ var proxifyRelationWrapper = (wrapper) => {
         const items = getItems.call(target);
         return Reflect.set(items, prop, value);
       }
-      return Reflect.set(target, prop, value, receiver);
+      return Reflect.set(target, prop, value, target);
     }
   });
 };
@@ -5954,7 +5989,15 @@ var instantiateWrapper = (meta, relationName, relation, owner, createEntity) =>
 // src/orm/entity.ts
 var isRelationWrapperLoaded = (value) => {
   if (!value || typeof value !== "object") return false;
-  return Boolean(value.loaded);
+  const wrapper = value;
+  if (typeof wrapper.isLoaded === "function") return wrapper.isLoaded();
+  return false;
+};
+var unwrapRelationForJson = (value) => {
+  if (value && typeof value === "object" && typeof value.toJSON === "function") {
+    return value.toJSON();
+  }
+  return value;
 };
 var createEntityProxy = (ctx, table, row, lazyRelations = [], lazyRelationOptions = /* @__PURE__ */ new Map()) => {
   const target = { ...row };
@@ -5971,12 +6014,13 @@ var createEntityProxy = (ctx, table, row, lazyRelations = [], lazyRelationOption
   const buildJson = (self) => {
     const json = {};
     for (const key of Object.keys(target)) {
-      json[key] = self[key];
+      const value = self[key];
+      json[key] = unwrapRelationForJson(value);
     }
     for (const [relationName, wrapper] of meta.relationWrappers) {
       if (Object.prototype.hasOwnProperty.call(json, relationName)) continue;
       if (isRelationWrapperLoaded(wrapper)) {
-        json[relationName] = wrapper;
+        json[relationName] = unwrapRelationForJson(wrapper);
       }
     }
     return json;