@webiny/app-admin 6.5.0-beta.5 → 6.5.0-beta.6

package/features/formModel/FieldBuilder.test.js

@@ -166,6 +166,19 @@ describe("DateTimeFieldBuilder", ()=>{
             expect(subtype(new DateTimeFieldBuilder()).build("d").renderer).toBe("dateTimeInput");
         }
     });
+    it("normalizes withTimezone values", ()=>{
+        const builder = new DateTimeFieldBuilder().withTimezone();
+        expect(builder.normalizeValue("2026-05-01T14:30:00+02:00")).toBe("2026-05-01T14:30:00+02:00");
+        expect(builder.normalizeValue("2026-05-01T14:30-05:30")).toBe("2026-05-01T14:30:00-05:30");
+        expect(builder.normalizeValue("2026-05-01T09:00:00.000Z")).toBe("2026-05-01T09:00:00.000+00:00");
+        expect(builder.normalizeValue("2026-05-01T14:30:00")).toBe("2026-05-01T14:30:00");
+    });
+    it("normalizes withoutTimezone values to a stable UTC instant", ()=>{
+        const builder = new DateTimeFieldBuilder().withoutTimezone();
+        const value = "2026-05-01T12:30:00.000Z";
+        expect(builder.normalizeValue(value)).toBe(value);
+        expect(builder.normalizeValue(builder.normalizeValue(value))).toBe(value);
+    });
 });
 describe("FieldBuilderRegistry", ()=>{
     it("should create text builders via registry.text()", ()=>{

package/features/formModel/FieldBuilder.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/formModel/FieldBuilder.test.js","sources":["../../../src/features/formModel/FieldBuilder.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { z } from \"zod\";\nimport { Container } from \"@webiny/di\";\nimport { FormModelFeature } from \"./feature.js\";\nimport { IdentityContextFeature } from \"~/features/security/IdentityContext/feature.js\";\nimport { FieldBuilderRegistry, type IFieldBuilderRegistry } from \"./abstractions.js\";\nimport { TextFieldBuilder } from \"./fieldTypes/TextFieldType.js\";\nimport { NumberFieldBuilder } from \"./fieldTypes/NumberFieldType.js\";\nimport { BooleanFieldBuilder } from \"./fieldTypes/BooleanFieldType.js\";\nimport { DateTimeFieldBuilder } from \"./fieldTypes/DateTimeFieldType.js\";\n\nfunction createRegistry(): IFieldBuilderRegistry {\n    const container = new Container();\n    IdentityContextFeature.register(container);\n    FormModelFeature.register(container);\n    return container.resolve(FieldBuilderRegistry);\n}\n\ndescribe(\"TextFieldBuilder\", () => {\n    it(\"should build a text field config with all fluent methods\", () => {\n        const builder = new TextFieldBuilder()\n            .label(\"Title\")\n            .placeholder(\"Enter title\")\n            .required(\"Title is required\")\n            .defaultValue(\"Untitled\")\n            .renderer(\"custom-text\")\n            .schema(z.string().min(1));\n\n        const config = builder.build(\"title\");\n\n        expect(config.name).toBe(\"title\");\n        expect(config.type).toBe(\"text\");\n        expect(config.label).toBe(\"Title\");\n        expect(config.placeholder).toBe(\"Enter title\");\n        expect(config.required).toBe(true);\n        expect(config.requiredMessage).toBe(\"Title is required\");\n        expect(config.defaultValue).toBe(\"Untitled\");\n        expect(config.renderer).toBe(\"custom-text\");\n        expect(config.hidden).toBe(false);\n        expect(config.disabled).toBe(false);\n        expect(config.schema).toBeDefined();\n    });\n\n    it(\"should support hidden() method\", () => {\n        const config = new TextFieldBuilder().hidden().build(\"secret\");\n        expect(config.hidden).toBe(true);\n    });\n\n    it(\"should support disabled() method\", () => {\n        const config = new TextFieldBuilder().disabled().build(\"readonly\");\n        expect(config.disabled).toBe(true);\n    });\n\n    it(\"should default disabled to false\", () => {\n        const config = new TextFieldBuilder().build(\"field\");\n        expect(config.disabled).toBe(false);\n    });\n});\n\ndescribe(\"TextFieldBuilder - beforeChange / afterChange\", () => {\n    it(\"should store beforeChange callbacks in config\", () => {\n        const cb1 = (value: unknown) => value;\n        const cb2 = (value: unknown) => value;\n\n        const config = new TextFieldBuilder().beforeChange(cb1).beforeChange(cb2).build(\"field\");\n\n        expect(config.beforeChangeCallbacks).toHaveLength(2);\n        expect(config.beforeChangeCallbacks![0]).toBe(cb1);\n        expect(config.beforeChangeCallbacks![1]).toBe(cb2);\n    });\n\n    it(\"should store afterChange callbacks in config\", () => {\n        const cb = () => {};\n        const config = new TextFieldBuilder().afterChange(cb).build(\"field\");\n\n        expect(config.afterChangeCallbacks).toHaveLength(1);\n        expect(config.afterChangeCallbacks![0]).toBe(cb);\n    });\n\n    it(\"should not have callback arrays when none are added\", () => {\n        const config = new TextFieldBuilder().build(\"field\");\n        expect(config.beforeChangeCallbacks).toBeUndefined();\n        expect(config.afterChangeCallbacks).toBeUndefined();\n    });\n\n    it(\"should support chaining callbacks with other builder methods\", () => {\n        const config = new TextFieldBuilder()\n            .label(\"Title\")\n            .beforeChange(value => value)\n            .required(\"Required\")\n            .afterChange(() => {})\n            .build(\"title\");\n\n        expect(config.label).toBe(\"Title\");\n        expect(config.required).toBe(true);\n        expect(config.beforeChangeCallbacks).toHaveLength(1);\n        expect(config.afterChangeCallbacks).toHaveLength(1);\n    });\n});\n\ndescribe(\"TextFieldBuilder - options\", () => {\n    it(\"should build a text field config with static options\", () => {\n        const options = [\n            { label: \"English\", value: \"en\" },\n            { label: \"German\", value: \"de\" }\n        ];\n\n        const config = new TextFieldBuilder()\n            .label(\"Language\")\n            .options(options)\n            .required()\n            .build(\"language\");\n\n        expect(config.name).toBe(\"language\");\n        expect(config.type).toBe(\"text\");\n        expect(config.label).toBe(\"Language\");\n        expect(config.required).toBe(true);\n        expect(config.options).toEqual(options);\n        expect(config.renderer).toBe(\"select\");\n    });\n\n    it(\"should support reactive options function\", () => {\n        const optionsFn = () => [{ label: \"A\", value: \"a\" }];\n        const config = new TextFieldBuilder().options(optionsFn).build(\"dynamic\");\n        expect(typeof config.options).toBe(\"function\");\n    });\n\n    it(\"should auto-switch renderer to dropdown when options are set\", () => {\n        const config = new TextFieldBuilder().options([{ label: \"A\", value: \"a\" }]).build(\"field\");\n        expect(config.renderer).toBe(\"select\");\n    });\n\n    it(\"should not override an explicitly set renderer\", () => {\n        const config = new TextFieldBuilder()\n            .renderer(\"radioButtons\")\n            .options([{ label: \"A\", value: \"a\" }])\n            .build(\"field\");\n        expect(config.renderer).toBe(\"radioButtons\");\n    });\n});\n\ndescribe(\"NumberFieldBuilder - options\", () => {\n    it(\"should build a number field config with options\", () => {\n        const options = [\n            { label: \"One\", value: \"1\" },\n            { label: \"Two\", value: \"2\" }\n        ];\n\n        const config = new NumberFieldBuilder().label(\"Count\").options(options).build(\"count\");\n\n        expect(config.type).toBe(\"number\");\n        expect(config.options).toEqual(options);\n        expect(config.renderer).toBe(\"select\");\n    });\n\n    it(\"should not override an explicitly set renderer\", () => {\n        const config = new NumberFieldBuilder()\n            .renderer(\"radioButtons\")\n            .options([{ label: \"1\", value: \"1\" }])\n            .build(\"field\");\n        expect(config.renderer).toBe(\"radioButtons\");\n    });\n});\n\ndescribe(\"DateTimeFieldBuilder\", () => {\n    it(\"should build a datetime field with default renderer\", () => {\n        const config = new DateTimeFieldBuilder().label(\"Created\").build(\"created\");\n        expect(config.type).toBe(\"datetime\");\n        expect(config.renderer).toBe(\"dateTimeInput\");\n        expect(config.label).toBe(\"Created\");\n    });\n\n    it(\"keeps the list renderer when a subtype is set after list()\", () => {\n        const subtypes = [\n            (b: DateTimeFieldBuilder) => b.dateOnly(),\n            (b: DateTimeFieldBuilder) => b.timeOnly(),\n            (b: DateTimeFieldBuilder) => b.withTimezone(),\n            (b: DateTimeFieldBuilder) => b.withoutTimezone()\n        ];\n        for (const subtype of subtypes) {\n            expect(subtype(new DateTimeFieldBuilder().list()).build(\"d\").renderer).toBe(\n                \"dateTimeInputs\"\n            );\n            expect(subtype(new DateTimeFieldBuilder()).build(\"d\").renderer).toBe(\"dateTimeInput\");\n        }\n    });\n});\n\ndescribe(\"FieldBuilderRegistry\", () => {\n    it(\"should create text builders via registry.text()\", () => {\n        const registry = createRegistry();\n        const builder = registry.text();\n        expect(builder).toBeInstanceOf(TextFieldBuilder);\n    });\n\n    it(\"should create number builders via registry.number()\", () => {\n        const registry = createRegistry();\n        const builder = registry.number();\n        expect(builder).toBeInstanceOf(NumberFieldBuilder);\n    });\n\n    it(\"should create boolean builders via registry.boolean()\", () => {\n        const registry = createRegistry();\n        const builder = registry.boolean();\n        expect(builder).toBeInstanceOf(BooleanFieldBuilder);\n    });\n\n    it(\"should create datetime builders via registry.datetime()\", () => {\n        const registry = createRegistry();\n        const builder = registry.datetime();\n        expect(builder).toBeInstanceOf(DateTimeFieldBuilder);\n    });\n\n    it(\"should support chaining on registry-created builders\", () => {\n        const registry = createRegistry();\n        const config = registry.text().label(\"Name\").required().build(\"name\");\n        expect(config.label).toBe(\"Name\");\n        expect(config.required).toBe(true);\n    });\n\n    it(\"should support options on text builders from registry\", () => {\n        const registry = createRegistry();\n        const config = registry\n            .text()\n            .options([{ label: \"A\", value: \"a\" }])\n            .build(\"field\");\n        expect(config.options).toHaveLength(1);\n        expect(config.renderer).toBe(\"select\");\n    });\n});\n\ndescribe(\"normalizeValue\", () => {\n    it(\"should be identity for TextFieldBuilder\", () => {\n        const builder = new TextFieldBuilder();\n        expect(builder.normalizeValue(\"hello\")).toBe(\"hello\");\n        expect(builder.normalizeValue(42)).toBe(42);\n        expect(builder.normalizeValue(null)).toBe(null);\n    });\n\n    it(\"should coerce string to number for NumberFieldBuilder\", () => {\n        const builder = new NumberFieldBuilder();\n        expect(builder.normalizeValue(\"42\")).toBe(42);\n        expect(builder.normalizeValue(\"3.14\")).toBe(3.14);\n        expect(builder.normalizeValue(\"0\")).toBe(0);\n    });\n\n    it(\"should return null for non-numeric values in NumberFieldBuilder\", () => {\n        const builder = new NumberFieldBuilder();\n        expect(builder.normalizeValue(null)).toBe(null);\n        expect(builder.normalizeValue(undefined)).toBe(null);\n        expect(builder.normalizeValue(\"\")).toBe(null);\n        expect(builder.normalizeValue(\"abc\")).toBe(null);\n    });\n\n    it(\"should coerce to boolean for BooleanFieldBuilder\", () => {\n        const builder = new BooleanFieldBuilder();\n        expect(builder.normalizeValue(1)).toBe(true);\n        expect(builder.normalizeValue(0)).toBe(false);\n        expect(builder.normalizeValue(\"\")).toBe(false);\n        expect(builder.normalizeValue(\"yes\")).toBe(true);\n        expect(builder.normalizeValue(null)).toBe(false);\n    });\n\n    it(\"should be identity for DateTimeFieldBuilder\", () => {\n        const builder = new DateTimeFieldBuilder();\n        expect(builder.normalizeValue(\"2024-01-01\")).toBe(\"2024-01-01\");\n        expect(builder.normalizeValue(null)).toBe(null);\n    });\n\n    it(\"should capture normalizeValue into config at build time\", () => {\n        const config = new NumberFieldBuilder().label(\"Count\").build(\"count\");\n        expect(config.normalizeValue).toBeDefined();\n        expect(config.normalizeValue!(\"42\")).toBe(42);\n        expect(config.normalizeValue!(null)).toBe(null);\n    });\n});\n"],"names":["createRegistry","container","Container","IdentityContextFeature","FormModelFeature","FieldBuilderRegistry","describe","it","builder","TextFieldBuilder","z","config","expect","cb1","value","cb2","cb","options","optionsFn","NumberFieldBuilder","DateTimeFieldBuilder","subtypes","b","subtype","registry","BooleanFieldBuilder","undefined"],"mappings":"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"}
+{"version":3,"file":"features/formModel/FieldBuilder.test.js","sources":["../../../src/features/formModel/FieldBuilder.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { z } from \"zod\";\nimport { Container } from \"@webiny/di\";\nimport { FormModelFeature } from \"./feature.js\";\nimport { IdentityContextFeature } from \"~/features/security/IdentityContext/feature.js\";\nimport { FieldBuilderRegistry, type IFieldBuilderRegistry } from \"./abstractions.js\";\nimport { TextFieldBuilder } from \"./fieldTypes/TextFieldType.js\";\nimport { NumberFieldBuilder } from \"./fieldTypes/NumberFieldType.js\";\nimport { BooleanFieldBuilder } from \"./fieldTypes/BooleanFieldType.js\";\nimport { DateTimeFieldBuilder } from \"./fieldTypes/DateTimeFieldType.js\";\n\nfunction createRegistry(): IFieldBuilderRegistry {\n    const container = new Container();\n    IdentityContextFeature.register(container);\n    FormModelFeature.register(container);\n    return container.resolve(FieldBuilderRegistry);\n}\n\ndescribe(\"TextFieldBuilder\", () => {\n    it(\"should build a text field config with all fluent methods\", () => {\n        const builder = new TextFieldBuilder()\n            .label(\"Title\")\n            .placeholder(\"Enter title\")\n            .required(\"Title is required\")\n            .defaultValue(\"Untitled\")\n            .renderer(\"custom-text\")\n            .schema(z.string().min(1));\n\n        const config = builder.build(\"title\");\n\n        expect(config.name).toBe(\"title\");\n        expect(config.type).toBe(\"text\");\n        expect(config.label).toBe(\"Title\");\n        expect(config.placeholder).toBe(\"Enter title\");\n        expect(config.required).toBe(true);\n        expect(config.requiredMessage).toBe(\"Title is required\");\n        expect(config.defaultValue).toBe(\"Untitled\");\n        expect(config.renderer).toBe(\"custom-text\");\n        expect(config.hidden).toBe(false);\n        expect(config.disabled).toBe(false);\n        expect(config.schema).toBeDefined();\n    });\n\n    it(\"should support hidden() method\", () => {\n        const config = new TextFieldBuilder().hidden().build(\"secret\");\n        expect(config.hidden).toBe(true);\n    });\n\n    it(\"should support disabled() method\", () => {\n        const config = new TextFieldBuilder().disabled().build(\"readonly\");\n        expect(config.disabled).toBe(true);\n    });\n\n    it(\"should default disabled to false\", () => {\n        const config = new TextFieldBuilder().build(\"field\");\n        expect(config.disabled).toBe(false);\n    });\n});\n\ndescribe(\"TextFieldBuilder - beforeChange / afterChange\", () => {\n    it(\"should store beforeChange callbacks in config\", () => {\n        const cb1 = (value: unknown) => value;\n        const cb2 = (value: unknown) => value;\n\n        const config = new TextFieldBuilder().beforeChange(cb1).beforeChange(cb2).build(\"field\");\n\n        expect(config.beforeChangeCallbacks).toHaveLength(2);\n        expect(config.beforeChangeCallbacks![0]).toBe(cb1);\n        expect(config.beforeChangeCallbacks![1]).toBe(cb2);\n    });\n\n    it(\"should store afterChange callbacks in config\", () => {\n        const cb = () => {};\n        const config = new TextFieldBuilder().afterChange(cb).build(\"field\");\n\n        expect(config.afterChangeCallbacks).toHaveLength(1);\n        expect(config.afterChangeCallbacks![0]).toBe(cb);\n    });\n\n    it(\"should not have callback arrays when none are added\", () => {\n        const config = new TextFieldBuilder().build(\"field\");\n        expect(config.beforeChangeCallbacks).toBeUndefined();\n        expect(config.afterChangeCallbacks).toBeUndefined();\n    });\n\n    it(\"should support chaining callbacks with other builder methods\", () => {\n        const config = new TextFieldBuilder()\n            .label(\"Title\")\n            .beforeChange(value => value)\n            .required(\"Required\")\n            .afterChange(() => {})\n            .build(\"title\");\n\n        expect(config.label).toBe(\"Title\");\n        expect(config.required).toBe(true);\n        expect(config.beforeChangeCallbacks).toHaveLength(1);\n        expect(config.afterChangeCallbacks).toHaveLength(1);\n    });\n});\n\ndescribe(\"TextFieldBuilder - options\", () => {\n    it(\"should build a text field config with static options\", () => {\n        const options = [\n            { label: \"English\", value: \"en\" },\n            { label: \"German\", value: \"de\" }\n        ];\n\n        const config = new TextFieldBuilder()\n            .label(\"Language\")\n            .options(options)\n            .required()\n            .build(\"language\");\n\n        expect(config.name).toBe(\"language\");\n        expect(config.type).toBe(\"text\");\n        expect(config.label).toBe(\"Language\");\n        expect(config.required).toBe(true);\n        expect(config.options).toEqual(options);\n        expect(config.renderer).toBe(\"select\");\n    });\n\n    it(\"should support reactive options function\", () => {\n        const optionsFn = () => [{ label: \"A\", value: \"a\" }];\n        const config = new TextFieldBuilder().options(optionsFn).build(\"dynamic\");\n        expect(typeof config.options).toBe(\"function\");\n    });\n\n    it(\"should auto-switch renderer to dropdown when options are set\", () => {\n        const config = new TextFieldBuilder().options([{ label: \"A\", value: \"a\" }]).build(\"field\");\n        expect(config.renderer).toBe(\"select\");\n    });\n\n    it(\"should not override an explicitly set renderer\", () => {\n        const config = new TextFieldBuilder()\n            .renderer(\"radioButtons\")\n            .options([{ label: \"A\", value: \"a\" }])\n            .build(\"field\");\n        expect(config.renderer).toBe(\"radioButtons\");\n    });\n});\n\ndescribe(\"NumberFieldBuilder - options\", () => {\n    it(\"should build a number field config with options\", () => {\n        const options = [\n            { label: \"One\", value: \"1\" },\n            { label: \"Two\", value: \"2\" }\n        ];\n\n        const config = new NumberFieldBuilder().label(\"Count\").options(options).build(\"count\");\n\n        expect(config.type).toBe(\"number\");\n        expect(config.options).toEqual(options);\n        expect(config.renderer).toBe(\"select\");\n    });\n\n    it(\"should not override an explicitly set renderer\", () => {\n        const config = new NumberFieldBuilder()\n            .renderer(\"radioButtons\")\n            .options([{ label: \"1\", value: \"1\" }])\n            .build(\"field\");\n        expect(config.renderer).toBe(\"radioButtons\");\n    });\n});\n\ndescribe(\"DateTimeFieldBuilder\", () => {\n    it(\"should build a datetime field with default renderer\", () => {\n        const config = new DateTimeFieldBuilder().label(\"Created\").build(\"created\");\n        expect(config.type).toBe(\"datetime\");\n        expect(config.renderer).toBe(\"dateTimeInput\");\n        expect(config.label).toBe(\"Created\");\n    });\n\n    it(\"keeps the list renderer when a subtype is set after list()\", () => {\n        const subtypes = [\n            (b: DateTimeFieldBuilder) => b.dateOnly(),\n            (b: DateTimeFieldBuilder) => b.timeOnly(),\n            (b: DateTimeFieldBuilder) => b.withTimezone(),\n            (b: DateTimeFieldBuilder) => b.withoutTimezone()\n        ];\n        for (const subtype of subtypes) {\n            expect(subtype(new DateTimeFieldBuilder().list()).build(\"d\").renderer).toBe(\n                \"dateTimeInputs\"\n            );\n            expect(subtype(new DateTimeFieldBuilder()).build(\"d\").renderer).toBe(\"dateTimeInput\");\n        }\n    });\n\n    it(\"normalizes withTimezone values\", () => {\n        const builder = new DateTimeFieldBuilder().withTimezone();\n        expect(builder.normalizeValue(\"2026-05-01T14:30:00+02:00\")).toBe(\n            \"2026-05-01T14:30:00+02:00\"\n        );\n        expect(builder.normalizeValue(\"2026-05-01T14:30-05:30\")).toBe(\"2026-05-01T14:30:00-05:30\");\n        expect(builder.normalizeValue(\"2026-05-01T09:00:00.000Z\")).toBe(\n            \"2026-05-01T09:00:00.000+00:00\"\n        );\n        expect(builder.normalizeValue(\"2026-05-01T14:30:00\")).toBe(\"2026-05-01T14:30:00\");\n    });\n\n    it(\"normalizes withoutTimezone values to a stable UTC instant\", () => {\n        const builder = new DateTimeFieldBuilder().withoutTimezone();\n        const value = \"2026-05-01T12:30:00.000Z\";\n        expect(builder.normalizeValue(value)).toBe(value);\n        expect(builder.normalizeValue(builder.normalizeValue(value))).toBe(value);\n    });\n});\n\ndescribe(\"FieldBuilderRegistry\", () => {\n    it(\"should create text builders via registry.text()\", () => {\n        const registry = createRegistry();\n        const builder = registry.text();\n        expect(builder).toBeInstanceOf(TextFieldBuilder);\n    });\n\n    it(\"should create number builders via registry.number()\", () => {\n        const registry = createRegistry();\n        const builder = registry.number();\n        expect(builder).toBeInstanceOf(NumberFieldBuilder);\n    });\n\n    it(\"should create boolean builders via registry.boolean()\", () => {\n        const registry = createRegistry();\n        const builder = registry.boolean();\n        expect(builder).toBeInstanceOf(BooleanFieldBuilder);\n    });\n\n    it(\"should create datetime builders via registry.datetime()\", () => {\n        const registry = createRegistry();\n        const builder = registry.datetime();\n        expect(builder).toBeInstanceOf(DateTimeFieldBuilder);\n    });\n\n    it(\"should support chaining on registry-created builders\", () => {\n        const registry = createRegistry();\n        const config = registry.text().label(\"Name\").required().build(\"name\");\n        expect(config.label).toBe(\"Name\");\n        expect(config.required).toBe(true);\n    });\n\n    it(\"should support options on text builders from registry\", () => {\n        const registry = createRegistry();\n        const config = registry\n            .text()\n            .options([{ label: \"A\", value: \"a\" }])\n            .build(\"field\");\n        expect(config.options).toHaveLength(1);\n        expect(config.renderer).toBe(\"select\");\n    });\n});\n\ndescribe(\"normalizeValue\", () => {\n    it(\"should be identity for TextFieldBuilder\", () => {\n        const builder = new TextFieldBuilder();\n        expect(builder.normalizeValue(\"hello\")).toBe(\"hello\");\n        expect(builder.normalizeValue(42)).toBe(42);\n        expect(builder.normalizeValue(null)).toBe(null);\n    });\n\n    it(\"should coerce string to number for NumberFieldBuilder\", () => {\n        const builder = new NumberFieldBuilder();\n        expect(builder.normalizeValue(\"42\")).toBe(42);\n        expect(builder.normalizeValue(\"3.14\")).toBe(3.14);\n        expect(builder.normalizeValue(\"0\")).toBe(0);\n    });\n\n    it(\"should return null for non-numeric values in NumberFieldBuilder\", () => {\n        const builder = new NumberFieldBuilder();\n        expect(builder.normalizeValue(null)).toBe(null);\n        expect(builder.normalizeValue(undefined)).toBe(null);\n        expect(builder.normalizeValue(\"\")).toBe(null);\n        expect(builder.normalizeValue(\"abc\")).toBe(null);\n    });\n\n    it(\"should coerce to boolean for BooleanFieldBuilder\", () => {\n        const builder = new BooleanFieldBuilder();\n        expect(builder.normalizeValue(1)).toBe(true);\n        expect(builder.normalizeValue(0)).toBe(false);\n        expect(builder.normalizeValue(\"\")).toBe(false);\n        expect(builder.normalizeValue(\"yes\")).toBe(true);\n        expect(builder.normalizeValue(null)).toBe(false);\n    });\n\n    it(\"should be identity for DateTimeFieldBuilder\", () => {\n        const builder = new DateTimeFieldBuilder();\n        expect(builder.normalizeValue(\"2024-01-01\")).toBe(\"2024-01-01\");\n        expect(builder.normalizeValue(null)).toBe(null);\n    });\n\n    it(\"should capture normalizeValue into config at build time\", () => {\n        const config = new NumberFieldBuilder().label(\"Count\").build(\"count\");\n        expect(config.normalizeValue).toBeDefined();\n        expect(config.normalizeValue!(\"42\")).toBe(42);\n        expect(config.normalizeValue!(null)).toBe(null);\n    });\n});\n"],"names":["createRegistry","container","Container","IdentityContextFeature","FormModelFeature","FieldBuilderRegistry","describe","it","builder","TextFieldBuilder","z","config","expect","cb1","value","cb2","cb","options","optionsFn","NumberFieldBuilder","DateTimeFieldBuilder","subtypes","b","subtype","registry","BooleanFieldBuilder","undefined"],"mappings":"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"}

package/features/formModel/FormModel.test.js

@@ -2733,6 +2733,190 @@ describe("FormModel", ()=>{
             });
         });
     });
+    describe("inner layouts declared on the field builder", ()=>{
+        it("lays out a single object's children with .layout()", ()=>{
+            const form = createForm({
+                fields: (fields)=>({
+                        address: fields.object().fields((f)=>({
+                                street: f.text().label("Street"),
+                                city: f.text().label("City"),
+                                zip: f.text().label("Zip")
+                            })).layout((l)=>[
+                                l.row("street"),
+                                l.row("city", "zip")
+                            ])
+                    })
+            });
+            const vm = form.field("address").vm;
+            expect(vm.layout.map((node)=>asRow(node).fields.map((f)=>f.name))).toEqual([
+                [
+                    "street"
+                ],
+                [
+                    "city",
+                    "zip"
+                ]
+            ]);
+        });
+        it("applies .layout() to every list item", ()=>{
+            const form = createForm({
+                fields: (fields)=>({
+                        stats: fields.object().list().fields((f)=>({
+                                value: f.number().label("Value"),
+                                label: f.text().label("Label")
+                            })).layout((l)=>[
+                                l.row("value", "label")
+                            ])
+                    })
+            });
+            form.setData({
+                stats: [
+                    {
+                        value: 1,
+                        label: "A"
+                    },
+                    {
+                        value: 2,
+                        label: "B"
+                    }
+                ]
+            });
+            const vm = form.field("stats").vm;
+            expect(vm.items).toHaveLength(2);
+            for (const item of vm.items)expect(item.layout.map((node)=>asRow(node).fields.map((f)=>f.name))).toEqual([
+                [
+                    "value",
+                    "label"
+                ]
+            ]);
+        });
+        it("lays out an object nested in another object with its own .layout()", ()=>{
+            const form = createForm({
+                fields: (fields)=>({
+                        subMenu: fields.object().fields((f)=>({
+                                climbing: f.object().list().fields((c)=>({
+                                        label: c.text().label("Label"),
+                                        url: c.text().label("URL")
+                                    })).layout((l)=>[
+                                        l.row("label", "url")
+                                    ]),
+                                yoga: f.text().label("Yoga")
+                            })).layout((l)=>[
+                                l.row("climbing", "yoga")
+                            ])
+                    })
+            });
+            form.setData({
+                subMenu: {
+                    climbing: [
+                        {
+                            label: "Classes",
+                            url: "/c"
+                        }
+                    ],
+                    yoga: ""
+                }
+            });
+            const outer = form.field("subMenu").vm;
+            expect(asRow(outer.layout[0]).fields.map((f)=>f.name)).toEqual([
+                "climbing",
+                "yoga"
+            ]);
+            const inner = form.field("subMenu.climbing").vm;
+            expect(asRow(inner.items[0].layout[0]).fields.map((f)=>f.name)).toEqual([
+                "label",
+                "url"
+            ]);
+        });
+        it("lets a layout.object() node override the field's .layout()", ()=>{
+            const form = createForm({
+                fields: (fields)=>({
+                        meta: fields.object().fields((f)=>({
+                                a: f.text().label("A"),
+                                b: f.text().label("B")
+                            })).layout((l)=>[
+                                l.row("a", "b")
+                            ])
+                    }),
+                layout: (layout)=>[
+                        layout.object("meta", (l)=>[
+                                l.row("b"),
+                                l.row("a")
+                            ])
+                    ]
+            });
+            const vm = form.field("meta").vm;
+            expect(vm.layout.map((node)=>asRow(node).fields.map((f)=>f.name))).toEqual([
+                [
+                    "b"
+                ],
+                [
+                    "a"
+                ]
+            ]);
+        });
+        it("uses the layout declared on each template", ()=>{
+            const form = createForm({
+                fields: (fields)=>({
+                        content: fields.object().template("hero", (t)=>{
+                            t.label("Hero").fields((f)=>({
+                                    heading: f.text().label("Heading"),
+                                    subheading: f.text().label("Subheading")
+                                })).layout((l)=>[
+                                    l.row("heading", "subheading")
+                                ]);
+                        }).template("cta", (t)=>{
+                            t.label("CTA").fields((f)=>({
+                                    text: f.text().label("Text"),
+                                    url: f.text().label("URL")
+                                })).layout((l)=>[
+                                    l.row("url", "text")
+                                ]);
+                        })
+                    }),
+                layout: (layout)=>[
+                        layout.object("content", {
+                            hero: (l)=>[
+                                    l.row("subheading"),
+                                    l.row("heading")
+                                ]
+                        })
+                    ]
+            });
+            const field = form.field("content");
+            field.setTemplate("hero");
+            let vm = form.field("content").vm;
+            expect(vm.layout.map((node)=>asRow(node).fields.map((f)=>f.name))).toEqual([
+                [
+                    "subheading"
+                ],
+                [
+                    "heading"
+                ]
+            ]);
+            field.setTemplate("cta");
+            vm = form.field("content").vm;
+            expect(vm.layout.map((node)=>asRow(node).fields.map((f)=>f.name))).toEqual([
+                [
+                    "url",
+                    "text"
+                ]
+            ]);
+        });
+        it("throws when an object has both .layout() and .template()", ()=>{
+            expect(()=>createForm({
+                    fields: (fields)=>({
+                            content: fields.object().template("hero", (t)=>{
+                                t.fields((f)=>({
+                                        heading: f.text()
+                                    }));
+                            }).layout((l)=>[
+                                    l.row("heading")
+                                ])
+                        })
+                })).toThrow(/both .layout\(\) and .template\(\)/);
+        });
+    });
     describe("nested object layouts (Phase 8c.1)", ()=>{
         it("registers layout.object() nested inside another object's inner layout (non-templated)", ()=>{
             const form = createForm({
@@ -3050,6 +3234,24 @@ describe("FormModel", ()=>{
                 "text"
             ]);
         });
+        it("templates.add keeps the layout declared on the added template", ()=>{
+            const form = createSingleTemplatedForm();
+            const field = form.field("content").as("object");
+            field.templates.add("cta", (t)=>{
+                t.label("CTA").fields((f)=>({
+                        text: f.text(),
+                        url: f.text()
+                    })).layout((l)=>[
+                        l.row("text", "url")
+                    ]);
+            });
+            form.field("content").setTemplate("cta");
+            const vm = form.field("content").vm;
+            expect(asRow(vm.layout[0]).fields.map((f)=>f.name)).toEqual([
+                "text",
+                "url"
+            ]);
+        });
         it("templates.add throws on duplicate id", ()=>{
             const form = createSingleTemplatedForm();
             const field = form.field("content").as("object");