metal-orm 1.0.70 → 1.0.72

package/dist/index.cjs

@@ -6106,6 +6106,10 @@ 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);
+};
 var createEntityProxy = (ctx, table, row, lazyRelations = [], lazyRelationOptions = /* @__PURE__ */ new Map()) => {
   const target = { ...row };
   const meta = {
@@ -6118,6 +6122,19 @@ var createEntityProxy = (ctx, table, row, lazyRelations = [], lazyRelationOption
     relationWrappers: /* @__PURE__ */ new Map()
   };
   const createRelationEntity = (relationTable, relationRow) => createEntityFromRow(meta.ctx, relationTable, relationRow);
+  const buildJson = (self) => {
+    const json = {};
+    for (const key of Object.keys(target)) {
+      json[key] = self[key];
+    }
+    for (const [relationName, wrapper] of meta.relationWrappers) {
+      if (Object.prototype.hasOwnProperty.call(json, relationName)) continue;
+      if (isRelationWrapperLoaded(wrapper)) {
+        json[relationName] = wrapper;
+      }
+    }
+    return json;
+  };
   Object.defineProperty(target, ENTITY_META, {
     value: meta,
     enumerable: false,
@@ -6137,6 +6154,12 @@ var createEntityProxy = (ctx, table, row, lazyRelations = [], lazyRelationOption
           return void 0;
         };
       }
+      if (prop === "toJSON") {
+        if (prop in targetObj) {
+          return Reflect.get(targetObj, prop, receiver);
+        }
+        return () => buildJson(receiver);
+      }
       if (typeof prop === "string" && table.relations[prop]) {
         return getRelationWrapper(meta, prop, receiver, createRelationEntity);
       }