feat(schema): add mapObjects option

Author: juanrgm

.changeset/honest-dolls-punch.md

@@ -0,0 +1,5 @@
+---
+"@dreamkit/schema": patch
+---
+
+Add `mapObjects` option

packages/schema/src/types/ObjectType.ts

@@ -127,9 +127,11 @@ type ObjectTypeCreatorOptions = ObjectTypeIteratorOptions & {
       pathName: string;
     },
   ) => boolean;
+  mapObjects?: boolean;
   map?: (
     data: ObjectTypeIteratorItem & {
       pathName: string;
+      nextValue: () => any;
     },
   ) => any;
   output?: Record<string, any>;
@@ -246,21 +248,29 @@ export class ObjectType<
         get pathName() {
           return pathName || (pathName = item.path.join("."));
         },
+        nextValue: item.objectType
+          ? () =>
+              item.objectType!.createWith({
+                ...options,
+                data: item.value,
+                output: undefined,
+                parentPath: item.path,
+              })
+          : () => item.value,
       };
       if (options.filter && !options.filter(subItem)) continue;
+
       if (
+        !options.mapObjects &&
         item.objectType &&
         (!!item.value ||
           (!item.type.options.nullable && !item.type.options.optional))
       ) {
-        output[item.name] = item.objectType.createWith({
-          ...options,
-          data: item.value,
-          output: undefined,
-          parentPath: item.path,
-        });
+        output[item.name] = subItem.nextValue();
       } else {
-        const newValue = options.map ? options.map(subItem) : item.value;
+        const newValue = options.map
+          ? options.map(subItem)
+          : subItem.nextValue();
         if (newValue !== undefined) output[item.name] = newValue;
       }
     }
@@ -277,22 +287,28 @@ export class ObjectType<
         get pathName() {
           return pathName || (pathName = item.path.join("."));
         },
+        nextValue: item.objectType
+          ? () =>
+              item.objectType!.createWithAsync({
+                ...options,
+                data: item.value,
+                output: undefined,
+                parentPath: item.path,
+              })
+          : () => item.value,
       };
       if (options.filter && !options.filter(subItem)) continue;
-
       if (
+        !options.mapObjects &&
         item.objectType &&
         (!!item.value ||
           (!item.type.options.nullable && !item.type.options.optional))
       ) {
-        output[item.name] = await item.objectType.createWithAsync({
-          ...options,
-          data: item.value,
-          output: undefined,
-          parentPath: item.path,
-        });
+        output[item.name] = await subItem.nextValue();
       } else {
-        const newValue = options.map ? await options.map(subItem) : item.value;
+        const newValue = options.map
+          ? await options.map(subItem)
+          : await subItem.nextValue();
         if (newValue !== undefined) output[item.name] = newValue;
       }
     }

packages/schema/test/types/ObjectType.test.ts

@@ -1,5 +1,12 @@
-import { InferType, NumberType, StringType, s } from "../../src/index.js";
+import {
+  InferType,
+  NumberType,
+  StringType,
+  ObjectType,
+  s,
+} from "../../src/index.js";
 import "./../override.js";
+import { kindOf } from "@dreamkit/kind";
 import { describe, expect, expectTypeOf, it } from "vitest";
 
 describe("object.type", () => {
@@ -185,6 +192,42 @@ describe("object.createWith", () => {
       },
     });
   });
+  it("with mapObjects", () => {
+    const $ = s.object({
+      a: s.string(),
+      b: s
+        .object({
+          c: s.bool(),
+        })
+        .flags({ internal: true }),
+      d: s.object({
+        e: s.bool(),
+      }),
+    });
+
+    const o = $.createWith({
+      mapObjects: true,
+      map: ({ type, pathName, nextValue }) => {
+        if (kindOf(type, ObjectType)) {
+          return (type.flagsValue as any).internal
+            ? JSON.stringify(nextValue())
+            : nextValue();
+        } else {
+          return pathName;
+        }
+      },
+    });
+
+    expect(o).toEqual({
+      a: "a",
+      b: JSON.stringify({
+        c: "b.c",
+      }),
+      d: {
+        e: "d.e",
+      },
+    });
+  });
 });
 
 describe("object.partial", () => {