adorn-api 1.1.1 → 1.1.2

package/dist/adapter/express/response-serializer.js

@@ -121,7 +121,15 @@ function isPlainObject(value) {
         !(value instanceof Date));
 }
 function toPlainObject(value) {
-    // 1. Handle lazy-load wrappers (BelongsToReference)
+    // 1. Check if value has custom toJSON method (e.g., metal-orm entities)
+    if (value !== null &&
+        typeof value === "object" &&
+        typeof value.toJSON === "function") {
+        // Use the custom toJSON which handles circular refs and includes properly
+        const jsonResult = value.toJSON();
+        return jsonResult;
+    }
+    // 2. Handle lazy-load wrappers (BelongsToReference)
     if (typeof value === "object" && typeof value.load === "function") {
         const wrapper = value;
         if (wrapper.current !== undefined && wrapper.current !== null) {
@@ -132,11 +140,11 @@ function toPlainObject(value) {
         }
         return null;
     }
-    // 2. Handle plain objects
+    // 3. Handle plain objects
     if (isPlainObject(value)) {
         return value;
     }
-    // 3. Convert class instances to plain objects
+    // 4. Convert class instances to plain objects
     if (typeof value === "object") {
         const result = {};
         for (const key of Object.getOwnPropertyNames(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adorn-api",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Decorator-first web framework with OpenAPI 3.1 schema generation.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/adapter/express/response-serializer.ts

@@ -138,7 +138,16 @@ function isPlainObject(value: unknown): value is Record<string, unknown> {
 }
 
 function toPlainObject(value: unknown): Record<string, unknown> | null {
-  // 1. Handle lazy-load wrappers (BelongsToReference)
+  // 1. Check if value has custom toJSON method (e.g., metal-orm entities)
+  if (value !== null &&
+      typeof value === "object" &&
+      typeof (value as { toJSON?: () => unknown }).toJSON === "function") {
+    // Use the custom toJSON which handles circular refs and includes properly
+    const jsonResult = (value as { toJSON: () => unknown }).toJSON();
+    return jsonResult as Record<string, unknown>;
+  }
+
+  // 2. Handle lazy-load wrappers (BelongsToReference)
   if (typeof value === "object" && typeof (value as Record<string, unknown>).load === "function") {
     const wrapper = value as { current: unknown; loaded: boolean; load: () => unknown };
     if (wrapper.current !== undefined && wrapper.current !== null) {
@@ -149,11 +158,11 @@ function toPlainObject(value: unknown): Record<string, unknown> | null {
     }
     return null;
   }
-  // 2. Handle plain objects
+  // 3. Handle plain objects
   if (isPlainObject(value)) {
     return value;
   }
-  // 3. Convert class instances to plain objects
+  // 4. Convert class instances to plain objects
   if (typeof value === "object") {
     const result: Record<string, unknown> = {};
     for (const key of Object.getOwnPropertyNames(value)) {

package/tests/unit/response-serializer.test.ts

@@ -1,6 +1,7 @@
 import { describe, it, expect } from "vitest";
 import { serializeResponse } from "../../src/adapter/express/response-serializer";
 import { t } from "../../src/core/schema";
+import { Dto, Field } from "../../src/core/decorators";
 
 describe("serializeResponse", () => {
   describe("Buffer with format: byte", () => {
@@ -145,3 +146,49 @@ describe("t.bytes() helper", () => {
     });
   });
 });
+
+describe("serializeResponse with toJSON", () => {
+  it("should use toJSON method when available", () => {
+    // Create an object with non-enumerable properties and custom toJSON
+    const entity = {
+      id: 1,
+      name: "Test",
+      // toJSON is the standard way to customize JSON serialization
+      toJSON() {
+        return {
+          id: this.id,
+          name: this.name,
+          nested: { value: "included" } // This is non-enumerable in real entity
+        };
+      }
+    };
+
+    // Make nested non-enumerable to simulate metal-orm
+    Object.defineProperty(entity, 'nested', {
+      value: { value: "included" },
+      enumerable: false,
+      writable: true,
+      configurable: true
+    });
+
+    @Dto({})
+    class TestDto {
+      @Field(t.integer())
+      id!: number;
+
+      @Field(t.string())
+      name!: string;
+
+      @Field(t.object({}))
+      nested!: { value: string };
+    }
+
+    const result = serializeResponse(entity, TestDto);
+
+    expect(result).toEqual({
+      id: 1,
+      name: "Test",
+      nested: { value: "included" }
+    });
+  });
+});