metal-orm 1.0.107 → 1.0.108

package/dist/index.cjs

@@ -5123,7 +5123,7 @@ var hydrateRows = (rows, plan) => {
     const rootId = row[plan.rootPrimaryKey];
     if (rootId === void 0 || rootId === null) {
       if (!hasRelations) {
-        rootMap.set(Symbol(), createBaseRow(row, plan));
+        rootMap.set(/* @__PURE__ */ Symbol(), createBaseRow(row, plan));
       }
       continue;
     }
@@ -5183,7 +5183,7 @@ var buildPivot = (row, rel) => {
 };
 
 // src/orm/entity-meta.ts
-var ENTITY_META = Symbol("EntityMeta");
+var ENTITY_META = /* @__PURE__ */ Symbol("EntityMeta");
 var toKey = (value) => value === null || value === void 0 ? "" : String(value);
 var getHydrationRows = (meta, relationName, key) => {
   const map = meta.relationHydration.get(relationName);
@@ -5422,7 +5422,10 @@ var DefaultHasManyCollection = class {
    * @returns Array of child entities
    */
   toJSON() {
-    return this.items;
+    return this.items.map((item) => {
+      const entityWithToJSON = item;
+      return typeof entityWithToJSON.toJSON === "function" ? entityWithToJSON.toJSON() : item;
+    });
   }
 };
 
@@ -5532,7 +5535,9 @@ var DefaultHasOneReference = class {
     return entity;
   }
   toJSON() {
-    return this.current;
+    if (!this.current) return null;
+    const entityWithToJSON = this.current;
+    return typeof entityWithToJSON.toJSON === "function" ? entityWithToJSON.toJSON() : this.current;
   }
   detachCurrent() {
     const previous = this.current;
@@ -5676,7 +5681,9 @@ var DefaultBelongsToReference = class {
     this.loaded = true;
   }
   toJSON() {
-    return this.current;
+    if (!this.current) return null;
+    const entityWithToJSON = this.current;
+    return typeof entityWithToJSON.toJSON === "function" ? entityWithToJSON.toJSON() : this.current;
   }
 };
 
@@ -5871,7 +5878,10 @@ var DefaultManyToManyCollection = class {
     this.loaded = true;
   }
   toJSON() {
-    return this.items;
+    return this.items.map((item) => {
+      const entityWithToJSON = item;
+      return typeof entityWithToJSON.toJSON === "function" ? entityWithToJSON.toJSON() : item;
+    });
   }
 };
 
@@ -6375,17 +6385,38 @@ var createEntityProxy = (ctx, table, row, lazyRelations = [], lazyRelationOption
     relationWrappers: /* @__PURE__ */ new Map()
   };
   const createRelationEntity = (relationTable, relationRow) => createEntityFromRow(meta.ctx, relationTable, relationRow);
-  const buildJson = (self) => {
+  const isCollectionRelation = (relationName) => {
+    const rel = table.relations[relationName];
+    if (!rel) return false;
+    return rel.type === RelationKinds.HasMany || rel.type === RelationKinds.BelongsToMany;
+  };
+  const buildJson = (self, options) => {
     const json = {};
+    const includeAll = options?.includeAllRelations ?? true;
     for (const key of Object.keys(target)) {
-      if (table.relations[key]) continue;
-      json[key] = self[key];
+      if (!table.relations[key]) {
+        json[key] = self[key];
+      }
     }
-    for (const relationName of Object.keys(table.relations)) {
-      const wrapper = self[relationName];
-      if (wrapper && isRelationWrapperLoaded(wrapper)) {
-        const wrapperWithToJSON = wrapper;
-        json[relationName] = typeof wrapperWithToJSON.toJSON === "function" ? wrapperWithToJSON.toJSON() : wrapper;
+    if (includeAll) {
+      for (const relationName of Object.keys(table.relations)) {
+        const wrapper = self[relationName];
+        if (wrapper && isRelationWrapperLoaded(wrapper)) {
+          const wrapperWithToJSON = wrapper;
+          json[relationName] = typeof wrapperWithToJSON.toJSON === "function" ? wrapperWithToJSON.toJSON() : wrapper;
+        } else {
+          json[relationName] = isCollectionRelation(relationName) ? [] : null;
+        }
+      }
+    } else {
+      for (const key of Object.keys(target)) {
+        if (table.relations[key]) {
+          const wrapper = self[key];
+          if (wrapper && isRelationWrapperLoaded(wrapper)) {
+            const wrapperWithToJSON = wrapper;
+            json[key] = typeof wrapperWithToJSON.toJSON === "function" ? wrapperWithToJSON.toJSON() : wrapper;
+          }
+        }
       }
     }
     return json;
@@ -6413,7 +6444,7 @@ var createEntityProxy = (ctx, table, row, lazyRelations = [], lazyRelationOption
         if (prop in targetObj) {
           return Reflect.get(targetObj, prop, receiver);
         }
-        return () => buildJson(receiver);
+        return (options) => buildJson(receiver, options);
       }
       if (typeof prop === "string" && table.relations[prop]) {
         return getRelationWrapper(meta, prop, receiver, createRelationEntity);