@webiny/app-headless-cms 6.5.0-beta.9 → 6.5.1-beta.0

package/features/formModel/CmsFormModelBuilder.test.js

@@ -7,6 +7,7 @@ import { CmsFormModelBuilder } from "./abstractions.js";
 import { CmsFormModelFeature } from "./feature.js";
 import { DateTimeInputRenderer } from "../../presentation/fieldTypes/renderers/dateTime/DateTimeInputRenderer.js";
 import { DateTimeInputsRenderer } from "../../presentation/fieldTypes/renderers/dateTime/DateTimeInputsRenderer.js";
+import { BirthdayInputRenderer } from "../../presentation/fieldTypes/renderers/dateTime/BirthdayInputRenderer.js";
 import { TextInputRenderer } from "../../presentation/fieldTypes/renderers/text/TextInputRenderer.js";
 import { TextInputsRenderer } from "../../presentation/fieldTypes/renderers/text/TextInputsRenderer.js";
 const field = (fieldId, type, list, renderer, extra = {})=>({
@@ -36,6 +37,7 @@ function createCmsForm(fields) {
     CmsFormModelFeature.register(container);
     container.register(DateTimeInputRenderer);
     container.register(DateTimeInputsRenderer);
+    container.register(BirthdayInputRenderer);
     container.register(TextInputRenderer);
     container.register(TextInputsRenderer);
     const model = {
@@ -107,6 +109,217 @@ describe("CmsFormModelBuilder renderer cardinality", ()=>{
         expect(item.children.get("openTime").vm.renderer).toBe("dateTimeInput");
     });
 });
+describe("CmsFormModelBuilder birthday picker", ()=>{
+    it("renders a date-only field with the birthday picker and keeps its value", ()=>{
+        const form = createCmsForm([
+            field("dob", "datetime", false, "birthday-input", {
+                settings: {
+                    type: "date"
+                },
+                renderer: {
+                    name: "birthday-input",
+                    settings: null
+                }
+            })
+        ]);
+        form.setData({
+            dob: "1990-02-09"
+        });
+        const vm = form.field("dob").vm;
+        expect(vm.renderer).toBe("birthdayInput");
+        expect(vm.rendererSettings).toEqual({
+            type: "date"
+        });
+        expect(vm.value).toBe("1990-02-09");
+    });
+    it("hands the field's date limits to the birthday picker", ()=>{
+        const form = createCmsForm([
+            field("dob", "datetime", false, "birthday-input", {
+                settings: {
+                    type: "date"
+                },
+                validation: [
+                    {
+                        name: "dateGte",
+                        message: "Too old.",
+                        settings: {
+                            value: "1950-01-01"
+                        }
+                    },
+                    {
+                        name: "dateLte",
+                        message: "You must be 18 or older.",
+                        settings: {
+                            expression: "today-18y",
+                            type: "date"
+                        }
+                    }
+                ]
+            })
+        ]);
+        expect(form.field("dob").vm.rendererSettings).toEqual({
+            type: "date",
+            dateLimits: {
+                gte: [
+                    "1950-01-01"
+                ],
+                lte: [
+                    {
+                        expression: "today-18y"
+                    }
+                ]
+            }
+        });
+    });
+    it("falls back to the date/time input when the field is no longer date-only", ()=>{
+        const form = createCmsForm([
+            field("openTime", "datetime", false, "birthday-input", {
+                settings: {
+                    type: "time"
+                }
+            })
+        ]);
+        expect(form.field("openTime").vm.renderer).toBe("dateTimeInput");
+    });
+});
+describe("CmsFormModelBuilder validators", ()=>{
+    const validate = async (form, name)=>{
+        const valid = await form.field(name).validate({
+            force: true
+        });
+        return {
+            valid,
+            message: form.field(name).vm.validation.message
+        };
+    };
+    it("checks both date limits on a field that has two", async ()=>{
+        const form = createCmsForm([
+            field("bornOn", "datetime", false, "date-time-input", {
+                settings: {
+                    type: "date"
+                },
+                validation: [
+                    {
+                        name: "dateGte",
+                        message: "Too early.",
+                        settings: {
+                            value: "1950-01-01"
+                        }
+                    },
+                    {
+                        name: "dateLte",
+                        message: "Too late.",
+                        settings: {
+                            value: "2000-12-31"
+                        }
+                    }
+                ]
+            })
+        ]);
+        form.setData({
+            bornOn: "2005-01-01"
+        });
+        expect(await validate(form, "bornOn")).toEqual({
+            valid: false,
+            message: "Too late."
+        });
+        form.setData({
+            bornOn: "1949-01-01"
+        });
+        expect(await validate(form, "bornOn")).toEqual({
+            valid: false,
+            message: "Too early."
+        });
+        form.setData({
+            bornOn: "1975-06-15"
+        });
+        expect((await validate(form, "bornOn")).valid).toBe(true);
+    });
+    it("works out a relative limit from today", async ()=>{
+        const form = createCmsForm([
+            field("bornOn", "datetime", false, "birthday-input", {
+                settings: {
+                    type: "date"
+                },
+                validation: [
+                    {
+                        name: "dateLte",
+                        message: "You must be 18 or older.",
+                        settings: {
+                            expression: "today-18y",
+                            type: "date"
+                        }
+                    }
+                ]
+            })
+        ]);
+        form.setData({
+            bornOn: `${new Date().getFullYear() - 10}-01-01`
+        });
+        expect(await validate(form, "bornOn")).toEqual({
+            valid: false,
+            message: "You must be 18 or older."
+        });
+        form.setData({
+            bornOn: `${new Date().getFullYear() - 30}-01-01`
+        });
+        expect((await validate(form, "bornOn")).valid).toBe(true);
+    });
+    it("checks every validator on a text field that has several", async ()=>{
+        const form = createCmsForm([
+            field("code", "text", false, "text-input", {
+                validation: [
+                    {
+                        name: "minLength",
+                        message: "Too short.",
+                        settings: {
+                            value: 3
+                        }
+                    },
+                    {
+                        name: "maxLength",
+                        message: "Too long.",
+                        settings: {
+                            value: 5
+                        }
+                    },
+                    {
+                        name: "pattern",
+                        message: "Letters only.",
+                        settings: {
+                            regex: "^[a-z]+$"
+                        }
+                    }
+                ]
+            })
+        ]);
+        form.setData({
+            code: "ab"
+        });
+        expect(await validate(form, "code")).toEqual({
+            valid: false,
+            message: "Too short."
+        });
+        form.setData({
+            code: "abcdef"
+        });
+        expect(await validate(form, "code")).toEqual({
+            valid: false,
+            message: "Too long."
+        });
+        form.setData({
+            code: "ab1"
+        });
+        expect(await validate(form, "code")).toEqual({
+            valid: false,
+            message: "Letters only."
+        });
+        form.setData({
+            code: "abcd"
+        });
+        expect((await validate(form, "code")).valid).toBe(true);
+    });
+});
 const rowNames = (layout)=>layout.map((row)=>row.fields.map((f)=>f.name));
 describe("CmsFormModelBuilder nested layouts", ()=>{
     it("lays out a single object with the layout stored on the field", ()=>{

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

@@ -1 +1 @@
-{"version":3,"file":"features/formModel/CmsFormModelBuilder.test.js","sources":["../../../src/features/formModel/CmsFormModelBuilder.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { FormModelFeature } from \"@webiny/app-admin/features/formModel/feature.js\";\nimport { IdentityContextFeature } from \"@webiny/app-admin/features/security/IdentityContext/feature.js\";\nimport { FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsFormModelFeature } from \"~/features/formModel/feature.js\";\nimport { DateTimeInputRenderer } from \"~/presentation/fieldTypes/renderers/dateTime/DateTimeInputRenderer.js\";\nimport { DateTimeInputsRenderer } from \"~/presentation/fieldTypes/renderers/dateTime/DateTimeInputsRenderer.js\";\nimport { TextInputRenderer } from \"~/presentation/fieldTypes/renderers/text/TextInputRenderer.js\";\nimport { TextInputsRenderer } from \"~/presentation/fieldTypes/renderers/text/TextInputsRenderer.js\";\n\nconst field = (fieldId: string, type: string, list: boolean, renderer: string, extra = {}) => ({\n    id: fieldId,\n    fieldId,\n    type,\n    label: fieldId,\n    tags: [],\n    list,\n    renderer: { name: renderer, settings: {} },\n    validation: [],\n    listValidation: [],\n    settings: {},\n    predefinedValues: { enabled: false, values: [] },\n    ...extra\n});\n\nfunction createCmsForm(fields: any[]) {\n    const container = new Container();\n    IdentityContextFeature.register(container);\n    FormModelFeature.register(container);\n    CmsFormModelFeature.register(container);\n    container.register(DateTimeInputRenderer);\n    container.register(DateTimeInputsRenderer);\n    container.register(TextInputRenderer);\n    container.register(TextInputsRenderer);\n\n    const model = {\n        modelId: \"test\",\n        fields,\n        layout: fields.map(f => [f.fieldId])\n    } as any;\n    const config = container.resolve(CmsFormModelBuilder).build(model);\n    return container.resolve(FormModelFactory).create(config);\n}\n\ndescribe(\"CmsFormModelBuilder renderer cardinality\", () => {\n    it(\"keeps renderers that match the field's cardinality\", () => {\n        const form = createCmsForm([\n            field(\"single\", \"datetime\", false, \"date-time-input\"),\n            field(\"many\", \"datetime\", true, \"date-time-inputs\")\n        ]);\n\n        expect(form.field(\"single\").vm.renderer).toBe(\"dateTimeInput\");\n        expect(form.field(\"many\").vm.renderer).toBe(\"dateTimeInputs\");\n    });\n\n    it(\"falls back to the single-value renderer when a list renderer is set on a non-list field\", () => {\n        const form = createCmsForm([\n            field(\"openTime\", \"datetime\", false, \"date-time-inputs\"),\n            field(\"name\", \"text\", false, \"text-inputs\")\n        ]);\n\n        expect(form.field(\"openTime\").vm.renderer).toBe(\"dateTimeInput\");\n        expect(form.field(\"name\").vm.renderer).toBe(\"textInput\");\n    });\n\n    it(\"keeps the list renderer for list datetime fields with a subtype\", () => {\n        const form = createCmsForm(\n            [\"date\", \"time\", \"dateTimeWithTimezone\", \"dateTimeWithoutTimezone\"].map(type =>\n                field(type, \"datetime\", true, \"date-time-inputs\", { settings: { type } })\n            )\n        );\n\n        expect(form.field(\"date\").vm.renderer).toBe(\"dateTimeInputs\");\n        expect(form.field(\"time\").vm.renderer).toBe(\"dateTimeInputs\");\n        expect(form.field(\"dateTimeWithTimezone\").vm.renderer).toBe(\"dateTimeInputs\");\n        expect(form.field(\"dateTimeWithoutTimezone\").vm.renderer).toBe(\"dateTimeInputs\");\n    });\n\n    it(\"applies the fallback to fields nested in object lists\", () => {\n        const form = createCmsForm([\n            field(\"holidayHours\", \"object\", true, \"objects-accordion\", {\n                settings: {\n                    fields: [field(\"openTime\", \"datetime\", false, \"date-time-inputs\")],\n                    layout: [[\"openTime\"]]\n                }\n            })\n        ]);\n\n        form.setData({ holidayHours: [{ openTime: \"2026-12-24T09:00:00.000Z\" }] });\n        const item = (form.field(\"holidayHours\") as any).items[0];\n\n        expect(item.children.get(\"openTime\").vm.renderer).toBe(\"dateTimeInput\");\n    });\n});\n\nconst rowNames = (layout: any[]) => layout.map(row => row.fields.map((f: any) => f.name));\n\ndescribe(\"CmsFormModelBuilder nested layouts\", () => {\n    it(\"lays out a single object with the layout stored on the field\", () => {\n        const form = createCmsForm([\n            field(\"address\", \"object\", false, \"object-accordion\", {\n                settings: {\n                    fields: [\n                        field(\"street\", \"text\", false, \"text-input\"),\n                        // Fields created in the model editor have an `id` that differs from `fieldId`.\n                        field(\"city\", \"text\", false, \"text-input\", { id: \"c1ty\" }),\n                        field(\"zipCode\", \"text\", false, \"text-input\")\n                    ],\n                    layout: [[\"street\"], [\"c1ty\", \"zipCode\"]]\n                }\n            })\n        ]);\n\n        expect(rowNames((form.field(\"address\").vm as any).layout)).toEqual([\n            [\"street\"],\n            [\"city\", \"zipCode\"]\n        ]);\n    });\n\n    it(\"lays out every item of an object list\", () => {\n        const form = createCmsForm([\n            field(\"facilityStats\", \"object\", true, \"objects-accordion\", {\n                settings: {\n                    fields: [\n                        field(\"statValue\", \"text\", false, \"text-input\"),\n                        field(\"statLabel\", \"text\", false, \"text-input\")\n                    ],\n                    layout: [[\"statValue\", \"statLabel\"]]\n                }\n            })\n        ]);\n\n        form.setData({ facilityStats: [{ statValue: \"1\", statLabel: \"a\" }] });\n        const vm = form.field(\"facilityStats\").vm as any;\n\n        expect(rowNames(vm.items[0].layout)).toEqual([[\"statValue\", \"statLabel\"]]);\n    });\n\n    it(\"gives children missing from the stored layout a row of their own\", () => {\n        const form = createCmsForm([\n            field(\"address\", \"object\", false, \"object-accordion\", {\n                settings: {\n                    fields: [\n                        field(\"street\", \"text\", false, \"text-input\"),\n                        field(\"city\", \"text\", false, \"text-input\"),\n                        field(\"state\", \"text\", false, \"text-input\")\n                    ],\n                    layout: [[\"street\", \"city\"]]\n                }\n            })\n        ]);\n\n        expect(rowNames((form.field(\"address\").vm as any).layout)).toEqual([\n            [\"street\", \"city\"],\n            [\"state\"]\n        ]);\n    });\n\n    it(\"lays out a dynamic zone template with the template's layout\", () => {\n        const form = createCmsForm([\n            field(\"blocks\", \"dynamicZone\", true, \"dynamicZone\", {\n                settings: {\n                    templates: [\n                        {\n                            id: \"hero\",\n                            name: \"Hero\",\n                            gqlTypeName: \"Hero\",\n                            description: \"\",\n                            icon: null,\n                            fields: [\n                                field(\"title\", \"text\", false, \"text-input\"),\n                                field(\"subtitle\", \"text\", false, \"text-input\")\n                            ],\n                            layout: [[\"title\", \"subtitle\"]],\n                            validation: []\n                        }\n                    ]\n                }\n            })\n        ]);\n\n        form.setData({ blocks: [{ _templateId: \"hero\", title: \"T\", subtitle: \"S\" }] });\n        const vm = form.field(\"blocks\").vm as any;\n\n        expect(rowNames(vm.items[0].layout)).toEqual([[\"title\", \"subtitle\"]]);\n    });\n});\n"],"names":["field","fieldId","type","list","renderer","extra","createCmsForm","fields","container","Container","IdentityContextFeature","FormModelFeature","CmsFormModelFeature","DateTimeInputRenderer","DateTimeInputsRenderer","TextInputRenderer","TextInputsRenderer","model","f","config","CmsFormModelBuilder","FormModelFactory","describe","it","form","expect","item","rowNames","layout","row","vm"],"mappings":"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"}
+{"version":3,"file":"features/formModel/CmsFormModelBuilder.test.js","sources":["../../../src/features/formModel/CmsFormModelBuilder.test.ts"],"sourcesContent":["import { describe, it, expect } from \"vitest\";\nimport { Container } from \"@webiny/di\";\nimport { FormModelFeature } from \"@webiny/app-admin/features/formModel/feature.js\";\nimport { IdentityContextFeature } from \"@webiny/app-admin/features/security/IdentityContext/feature.js\";\nimport { FormModelFactory } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { CmsFormModelBuilder } from \"~/features/formModel/abstractions.js\";\nimport { CmsFormModelFeature } from \"~/features/formModel/feature.js\";\nimport { DateTimeInputRenderer } from \"~/presentation/fieldTypes/renderers/dateTime/DateTimeInputRenderer.js\";\nimport { DateTimeInputsRenderer } from \"~/presentation/fieldTypes/renderers/dateTime/DateTimeInputsRenderer.js\";\nimport { BirthdayInputRenderer } from \"~/presentation/fieldTypes/renderers/dateTime/BirthdayInputRenderer.js\";\nimport { TextInputRenderer } from \"~/presentation/fieldTypes/renderers/text/TextInputRenderer.js\";\nimport { TextInputsRenderer } from \"~/presentation/fieldTypes/renderers/text/TextInputsRenderer.js\";\n\nconst field = (fieldId: string, type: string, list: boolean, renderer: string, extra = {}) => ({\n    id: fieldId,\n    fieldId,\n    type,\n    label: fieldId,\n    tags: [],\n    list,\n    renderer: { name: renderer, settings: {} },\n    validation: [],\n    listValidation: [],\n    settings: {},\n    predefinedValues: { enabled: false, values: [] },\n    ...extra\n});\n\nfunction createCmsForm(fields: any[]) {\n    const container = new Container();\n    IdentityContextFeature.register(container);\n    FormModelFeature.register(container);\n    CmsFormModelFeature.register(container);\n    container.register(DateTimeInputRenderer);\n    container.register(DateTimeInputsRenderer);\n    container.register(BirthdayInputRenderer);\n    container.register(TextInputRenderer);\n    container.register(TextInputsRenderer);\n\n    const model = {\n        modelId: \"test\",\n        fields,\n        layout: fields.map(f => [f.fieldId])\n    } as any;\n    const config = container.resolve(CmsFormModelBuilder).build(model);\n    return container.resolve(FormModelFactory).create(config);\n}\n\ndescribe(\"CmsFormModelBuilder renderer cardinality\", () => {\n    it(\"keeps renderers that match the field's cardinality\", () => {\n        const form = createCmsForm([\n            field(\"single\", \"datetime\", false, \"date-time-input\"),\n            field(\"many\", \"datetime\", true, \"date-time-inputs\")\n        ]);\n\n        expect(form.field(\"single\").vm.renderer).toBe(\"dateTimeInput\");\n        expect(form.field(\"many\").vm.renderer).toBe(\"dateTimeInputs\");\n    });\n\n    it(\"falls back to the single-value renderer when a list renderer is set on a non-list field\", () => {\n        const form = createCmsForm([\n            field(\"openTime\", \"datetime\", false, \"date-time-inputs\"),\n            field(\"name\", \"text\", false, \"text-inputs\")\n        ]);\n\n        expect(form.field(\"openTime\").vm.renderer).toBe(\"dateTimeInput\");\n        expect(form.field(\"name\").vm.renderer).toBe(\"textInput\");\n    });\n\n    it(\"keeps the list renderer for list datetime fields with a subtype\", () => {\n        const form = createCmsForm(\n            [\"date\", \"time\", \"dateTimeWithTimezone\", \"dateTimeWithoutTimezone\"].map(type =>\n                field(type, \"datetime\", true, \"date-time-inputs\", { settings: { type } })\n            )\n        );\n\n        expect(form.field(\"date\").vm.renderer).toBe(\"dateTimeInputs\");\n        expect(form.field(\"time\").vm.renderer).toBe(\"dateTimeInputs\");\n        expect(form.field(\"dateTimeWithTimezone\").vm.renderer).toBe(\"dateTimeInputs\");\n        expect(form.field(\"dateTimeWithoutTimezone\").vm.renderer).toBe(\"dateTimeInputs\");\n    });\n\n    it(\"applies the fallback to fields nested in object lists\", () => {\n        const form = createCmsForm([\n            field(\"holidayHours\", \"object\", true, \"objects-accordion\", {\n                settings: {\n                    fields: [field(\"openTime\", \"datetime\", false, \"date-time-inputs\")],\n                    layout: [[\"openTime\"]]\n                }\n            })\n        ]);\n\n        form.setData({ holidayHours: [{ openTime: \"2026-12-24T09:00:00.000Z\" }] });\n        const item = (form.field(\"holidayHours\") as any).items[0];\n\n        expect(item.children.get(\"openTime\").vm.renderer).toBe(\"dateTimeInput\");\n    });\n});\n\ndescribe(\"CmsFormModelBuilder birthday picker\", () => {\n    it(\"renders a date-only field with the birthday picker and keeps its value\", () => {\n        const form = createCmsForm([\n            field(\"dob\", \"datetime\", false, \"birthday-input\", {\n                settings: { type: \"date\" },\n                renderer: { name: \"birthday-input\", settings: null }\n            })\n        ]);\n        form.setData({ dob: \"1990-02-09\" });\n\n        const vm = form.field(\"dob\").vm as any;\n        expect(vm.renderer).toBe(\"birthdayInput\");\n        expect(vm.rendererSettings).toEqual({ type: \"date\" });\n        expect(vm.value).toBe(\"1990-02-09\");\n    });\n\n    it(\"hands the field's date limits to the birthday picker\", () => {\n        const form = createCmsForm([\n            field(\"dob\", \"datetime\", false, \"birthday-input\", {\n                settings: { type: \"date\" },\n                validation: [\n                    { name: \"dateGte\", message: \"Too old.\", settings: { value: \"1950-01-01\" } },\n                    {\n                        name: \"dateLte\",\n                        message: \"You must be 18 or older.\",\n                        settings: { expression: \"today-18y\", type: \"date\" }\n                    }\n                ]\n            })\n        ]);\n\n        expect((form.field(\"dob\").vm as any).rendererSettings).toEqual({\n            type: \"date\",\n            dateLimits: { gte: [\"1950-01-01\"], lte: [{ expression: \"today-18y\" }] }\n        });\n    });\n\n    it(\"falls back to the date/time input when the field is no longer date-only\", () => {\n        const form = createCmsForm([\n            field(\"openTime\", \"datetime\", false, \"birthday-input\", { settings: { type: \"time\" } })\n        ]);\n\n        expect(form.field(\"openTime\").vm.renderer).toBe(\"dateTimeInput\");\n    });\n});\n\ndescribe(\"CmsFormModelBuilder validators\", () => {\n    const validate = async (form: ReturnType<typeof createCmsForm>, name: string) => {\n        const valid = await form.field(name).validate({ force: true });\n        return { valid, message: form.field(name).vm.validation.message };\n    };\n\n    it(\"checks both date limits on a field that has two\", async () => {\n        const form = createCmsForm([\n            field(\"bornOn\", \"datetime\", false, \"date-time-input\", {\n                settings: { type: \"date\" },\n                validation: [\n                    { name: \"dateGte\", message: \"Too early.\", settings: { value: \"1950-01-01\" } },\n                    { name: \"dateLte\", message: \"Too late.\", settings: { value: \"2000-12-31\" } }\n                ]\n            })\n        ]);\n\n        form.setData({ bornOn: \"2005-01-01\" });\n        expect(await validate(form, \"bornOn\")).toEqual({ valid: false, message: \"Too late.\" });\n\n        form.setData({ bornOn: \"1949-01-01\" });\n        expect(await validate(form, \"bornOn\")).toEqual({ valid: false, message: \"Too early.\" });\n\n        form.setData({ bornOn: \"1975-06-15\" });\n        expect((await validate(form, \"bornOn\")).valid).toBe(true);\n    });\n\n    it(\"works out a relative limit from today\", async () => {\n        const form = createCmsForm([\n            field(\"bornOn\", \"datetime\", false, \"birthday-input\", {\n                settings: { type: \"date\" },\n                validation: [\n                    {\n                        name: \"dateLte\",\n                        message: \"You must be 18 or older.\",\n                        settings: { expression: \"today-18y\", type: \"date\" }\n                    }\n                ]\n            })\n        ]);\n\n        form.setData({ bornOn: `${new Date().getFullYear() - 10}-01-01` });\n        expect(await validate(form, \"bornOn\")).toEqual({\n            valid: false,\n            message: \"You must be 18 or older.\"\n        });\n\n        form.setData({ bornOn: `${new Date().getFullYear() - 30}-01-01` });\n        expect((await validate(form, \"bornOn\")).valid).toBe(true);\n    });\n\n    it(\"checks every validator on a text field that has several\", async () => {\n        const form = createCmsForm([\n            field(\"code\", \"text\", false, \"text-input\", {\n                validation: [\n                    { name: \"minLength\", message: \"Too short.\", settings: { value: 3 } },\n                    { name: \"maxLength\", message: \"Too long.\", settings: { value: 5 } },\n                    { name: \"pattern\", message: \"Letters only.\", settings: { regex: \"^[a-z]+$\" } }\n                ]\n            })\n        ]);\n\n        form.setData({ code: \"ab\" });\n        expect(await validate(form, \"code\")).toEqual({ valid: false, message: \"Too short.\" });\n\n        form.setData({ code: \"abcdef\" });\n        expect(await validate(form, \"code\")).toEqual({ valid: false, message: \"Too long.\" });\n\n        form.setData({ code: \"ab1\" });\n        expect(await validate(form, \"code\")).toEqual({ valid: false, message: \"Letters only.\" });\n\n        form.setData({ code: \"abcd\" });\n        expect((await validate(form, \"code\")).valid).toBe(true);\n    });\n});\n\nconst rowNames = (layout: any[]) => layout.map(row => row.fields.map((f: any) => f.name));\n\ndescribe(\"CmsFormModelBuilder nested layouts\", () => {\n    it(\"lays out a single object with the layout stored on the field\", () => {\n        const form = createCmsForm([\n            field(\"address\", \"object\", false, \"object-accordion\", {\n                settings: {\n                    fields: [\n                        field(\"street\", \"text\", false, \"text-input\"),\n                        // Fields created in the model editor have an `id` that differs from `fieldId`.\n                        field(\"city\", \"text\", false, \"text-input\", { id: \"c1ty\" }),\n                        field(\"zipCode\", \"text\", false, \"text-input\")\n                    ],\n                    layout: [[\"street\"], [\"c1ty\", \"zipCode\"]]\n                }\n            })\n        ]);\n\n        expect(rowNames((form.field(\"address\").vm as any).layout)).toEqual([\n            [\"street\"],\n            [\"city\", \"zipCode\"]\n        ]);\n    });\n\n    it(\"lays out every item of an object list\", () => {\n        const form = createCmsForm([\n            field(\"facilityStats\", \"object\", true, \"objects-accordion\", {\n                settings: {\n                    fields: [\n                        field(\"statValue\", \"text\", false, \"text-input\"),\n                        field(\"statLabel\", \"text\", false, \"text-input\")\n                    ],\n                    layout: [[\"statValue\", \"statLabel\"]]\n                }\n            })\n        ]);\n\n        form.setData({ facilityStats: [{ statValue: \"1\", statLabel: \"a\" }] });\n        const vm = form.field(\"facilityStats\").vm as any;\n\n        expect(rowNames(vm.items[0].layout)).toEqual([[\"statValue\", \"statLabel\"]]);\n    });\n\n    it(\"gives children missing from the stored layout a row of their own\", () => {\n        const form = createCmsForm([\n            field(\"address\", \"object\", false, \"object-accordion\", {\n                settings: {\n                    fields: [\n                        field(\"street\", \"text\", false, \"text-input\"),\n                        field(\"city\", \"text\", false, \"text-input\"),\n                        field(\"state\", \"text\", false, \"text-input\")\n                    ],\n                    layout: [[\"street\", \"city\"]]\n                }\n            })\n        ]);\n\n        expect(rowNames((form.field(\"address\").vm as any).layout)).toEqual([\n            [\"street\", \"city\"],\n            [\"state\"]\n        ]);\n    });\n\n    it(\"lays out a dynamic zone template with the template's layout\", () => {\n        const form = createCmsForm([\n            field(\"blocks\", \"dynamicZone\", true, \"dynamicZone\", {\n                settings: {\n                    templates: [\n                        {\n                            id: \"hero\",\n                            name: \"Hero\",\n                            gqlTypeName: \"Hero\",\n                            description: \"\",\n                            icon: null,\n                            fields: [\n                                field(\"title\", \"text\", false, \"text-input\"),\n                                field(\"subtitle\", \"text\", false, \"text-input\")\n                            ],\n                            layout: [[\"title\", \"subtitle\"]],\n                            validation: []\n                        }\n                    ]\n                }\n            })\n        ]);\n\n        form.setData({ blocks: [{ _templateId: \"hero\", title: \"T\", subtitle: \"S\" }] });\n        const vm = form.field(\"blocks\").vm as any;\n\n        expect(rowNames(vm.items[0].layout)).toEqual([[\"title\", \"subtitle\"]]);\n    });\n});\n"],"names":["field","fieldId","type","list","renderer","extra","createCmsForm","fields","container","Container","IdentityContextFeature","FormModelFeature","CmsFormModelFeature","DateTimeInputRenderer","DateTimeInputsRenderer","BirthdayInputRenderer","TextInputRenderer","TextInputsRenderer","model","f","config","CmsFormModelBuilder","FormModelFactory","describe","it","form","expect","item","vm","validate","name","valid","Date","rowNames","layout","row"],"mappings":"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"}

package/features/formModel/CmsRefFieldValueFormatter.d.ts

@@ -0,0 +1,12 @@
+import { FieldValueFormatter, type IFieldVM } from "@webiny/app-admin/features/formModel/abstractions.js";
+import { ReferenceTitles } from "../../features/contentEntry/referenceTitles/abstractions.js";
+declare class CmsRefFieldValueFormatterImpl implements FieldValueFormatter.Interface {
+    private titles;
+    readonly type = "ref";
+    constructor(titles: ReferenceTitles.Interface);
+    format(field: IFieldVM): string | undefined;
+}
+export declare const CmsRefFieldValueFormatter: typeof CmsRefFieldValueFormatterImpl & {
+    __abstraction: import("@webiny/di").Abstraction<import("@webiny/app-admin/features/formModel").IFieldValueFormatter>;
+};
+export {};

package/features/formModel/CmsRefFieldValueFormatter.js

@@ -0,0 +1,29 @@
+import { FieldValueFormatter } from "@webiny/app-admin/features/formModel/abstractions.js";
+import { ReferenceTitles } from "../contentEntry/referenceTitles/abstractions.js";
+function isReference(value) {
+    const ref = value;
+    return "string" == typeof ref?.id && "string" == typeof ref?.modelId;
+}
+class CmsRefFieldValueFormatterImpl {
+    constructor(titles){
+        this.titles = titles;
+        this.type = "ref";
+    }
+    format(field) {
+        const values = Array.isArray(field.value) ? field.value : [
+            field.value
+        ];
+        const titles = values.filter(isReference).map((ref)=>this.titles.getTitle(ref));
+        if (titles.some((title)=>void 0 === title)) return;
+        return titles.filter(Boolean).join(", ");
+    }
+}
+const CmsRefFieldValueFormatter = FieldValueFormatter.createImplementation({
+    implementation: CmsRefFieldValueFormatterImpl,
+    dependencies: [
+        ReferenceTitles
+    ]
+});
+export { CmsRefFieldValueFormatter };
+
+//# sourceMappingURL=CmsRefFieldValueFormatter.js.map

package/features/formModel/CmsRefFieldValueFormatter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"features/formModel/CmsRefFieldValueFormatter.js","sources":["../../../src/features/formModel/CmsRefFieldValueFormatter.ts"],"sourcesContent":["import {\n    FieldValueFormatter,\n    type IFieldVM\n} from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport { ReferenceTitles } from \"~/features/contentEntry/referenceTitles/abstractions.js\";\nimport type { CmsReferenceValue } from \"~/features/contentEntry/refTypes.js\";\n\nfunction isReference(value: unknown): value is CmsReferenceValue {\n    const ref = value as CmsReferenceValue | null;\n    return typeof ref?.id === \"string\" && typeof ref?.modelId === \"string\";\n}\n\nclass CmsRefFieldValueFormatterImpl implements FieldValueFormatter.Interface {\n    readonly type = \"ref\";\n\n    constructor(private titles: ReferenceTitles.Interface) {}\n\n    format(field: IFieldVM): string | undefined {\n        const values = Array.isArray(field.value) ? field.value : [field.value];\n        const titles = values.filter(isReference).map(ref => this.titles.getTitle(ref));\n        // Show nothing until every title is in, rather than a list that fills in one at a time.\n        if (titles.some(title => title === undefined)) {\n            return undefined;\n        }\n        return titles.filter(Boolean).join(\", \");\n    }\n}\n\nexport const CmsRefFieldValueFormatter = FieldValueFormatter.createImplementation({\n    implementation: CmsRefFieldValueFormatterImpl,\n    dependencies: [ReferenceTitles]\n});\n"],"names":["isReference","value","ref","CmsRefFieldValueFormatterImpl","titles","field","values","Array","title","undefined","Boolean","CmsRefFieldValueFormatter","FieldValueFormatter","ReferenceTitles"],"mappings":";;AAOA,SAASA,YAAYC,KAAc;IAC/B,MAAMC,MAAMD;IACZ,OAAO,AAAmB,YAAnB,OAAOC,KAAK,MAAmB,AAAwB,YAAxB,OAAOA,KAAK;AACtD;AAEA,MAAMC;IAGF,YAAoBC,MAAiC,CAAE;aAAnCA,MAAM,GAANA;aAFX,IAAI,GAAG;IAEwC;IAExD,OAAOC,KAAe,EAAsB;QACxC,MAAMC,SAASC,MAAM,OAAO,CAACF,MAAM,KAAK,IAAIA,MAAM,KAAK,GAAG;YAACA,MAAM,KAAK;SAAC;QACvE,MAAMD,SAASE,OAAO,MAAM,CAACN,aAAa,GAAG,CAACE,CAAAA,MAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAACA;QAE1E,IAAIE,OAAO,IAAI,CAACI,CAAAA,QAASA,AAAUC,WAAVD,QACrB;QAEJ,OAAOJ,OAAO,MAAM,CAACM,SAAS,IAAI,CAAC;IACvC;AACJ;AAEO,MAAMC,4BAA4BC,oBAAoB,oBAAoB,CAAC;IAC9E,gBAAgBT;IAChB,cAAc;QAACU;KAAgB;AACnC"}

package/features/formModel/CmsValidationMapper.d.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import type { DateBound } from "@webiny/utils";
 import type { CmsModelFieldValidator } from "../../types.js";
 export declare function mapCmsValidators(validators: (CmsModelFieldValidator | {
     name: string;
@@ -7,6 +8,14 @@ export declare function mapCmsValidators(validators: (CmsModelFieldValidator | {
     requiredMessage?: string;
     schema: z.ZodTypeAny | undefined;
 };
+/** The `dateGte`/`dateLte` validators, as limits for the `datetime()` builder. */
+export declare function mapCmsDateLimits(validators: (CmsModelFieldValidator | {
+    name: string;
+})[] | undefined): {
+    name: "dateGte" | "dateLte";
+    bound: DateBound;
+    message?: string;
+}[];
 export declare function mapCmsListValidators(validators: (CmsModelFieldValidator | {
     name: string;
 })[] | undefined): {

package/features/formModel/CmsValidationMapper.js

@@ -44,31 +44,37 @@ function mapCmsValidators(validators) {
             case "in":
                 if (Array.isArray(settings.values) && settings.values.length > 0) schemas.push(z["enum"](settings.values));
                 break;
-            case "dateGte":
-                if (null != settings.value) {
-                    const minDate = settings.value;
-                    schemas.push(z.string().refine((val)=>val >= minDate, {
-                        message: msg || `Must be on or after ${minDate}`
-                    }));
-                }
-                break;
-            case "dateLte":
-                if (null != settings.value) {
-                    const maxDate = settings.value;
-                    schemas.push(z.string().refine((val)=>val <= maxDate, {
-                        message: msg || `Must be on or before ${maxDate}`
-                    }));
-                }
-                break;
         }
     }
-    const schema = 0 === schemas.length ? void 0 : 1 === schemas.length ? schemas[0] : z.intersection(schemas[0], schemas.slice(1).reduce((acc, s)=>z.intersection(acc, s), schemas[0]));
+    const schema = 0 === schemas.length ? void 0 : schemas.slice(1).reduce((acc, s)=>z.intersection(acc, s), schemas[0]);
     return {
         required,
         requiredMessage,
-        schema: schemas.length <= 1 ? schema : void 0
+        schema
     };
 }
+function mapCmsDateLimits(validators) {
+    const limits = [];
+    for (const v of validators || []){
+        const validator = v;
+        if ("dateGte" !== validator.name && "dateLte" !== validator.name) continue;
+        const settings = validator.settings || {};
+        const message = interpolateMessage(validator.message, settings);
+        if ("string" == typeof settings.expression) limits.push({
+            name: validator.name,
+            bound: {
+                expression: settings.expression
+            },
+            message
+        });
+        else if (null != settings.value) limits.push({
+            name: validator.name,
+            bound: String(settings.value),
+            message
+        });
+    }
+    return limits;
+}
 function mapCmsListValidators(validators) {
     if (!validators || 0 === validators.length) return {
         required: false,
@@ -101,6 +107,6 @@ function mapCmsListValidators(validators) {
         schema: hasConstraints ? arraySchema : void 0
     };
 }
-export { mapCmsListValidators, mapCmsValidators };
+export { mapCmsDateLimits, mapCmsListValidators, mapCmsValidators };
 
 //# sourceMappingURL=CmsValidationMapper.js.map

package/features/formModel/CmsValidationMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/formModel/CmsValidationMapper.js","sources":["../../../src/features/formModel/CmsValidationMapper.ts"],"sourcesContent":["import { z } from \"zod\";\nimport type { CmsModelFieldValidator } from \"~/types.js\";\n\nfunction interpolateMessage(\n    message: string | undefined,\n    settings: Record<string, unknown>\n): string | undefined {\n    if (!message) {\n        return undefined;\n    }\n    return message.replace(/\\{(\\w+)}/g, (match, key) => {\n        const val = settings[key];\n        return val != null ? String(val) : match;\n    });\n}\n\nexport function mapCmsValidators(\n    validators: (CmsModelFieldValidator | { name: string })[] | undefined\n): { required: boolean; requiredMessage?: string; schema: z.ZodTypeAny | undefined } {\n    if (!validators || validators.length === 0) {\n        return { required: false, schema: undefined };\n    }\n\n    let required = false;\n    let requiredMessage: string | undefined;\n    const schemas: z.ZodTypeAny[] = [];\n\n    for (const v of validators) {\n        const validator = v as CmsModelFieldValidator;\n        const settings = validator.settings || {};\n\n        const msg = interpolateMessage(validator.message, settings);\n\n        switch (validator.name) {\n            case \"required\":\n                required = true;\n                requiredMessage = msg;\n                break;\n\n            case \"minLength\":\n                if (settings.value != null) {\n                    schemas.push(z.string().min(Number(settings.value), msg || undefined));\n                }\n                break;\n\n            case \"maxLength\":\n                if (settings.value != null) {\n                    schemas.push(z.string().max(Number(settings.value), msg || undefined));\n                }\n                break;\n\n            case \"pattern\":\n                if (settings.regex) {\n                    const flags = settings.flags || \"\";\n                    schemas.push(\n                        z.string().regex(new RegExp(settings.regex, flags), msg || undefined)\n                    );\n                }\n                break;\n\n            case \"gte\":\n                if (settings.value != null) {\n                    schemas.push(z.number().gte(Number(settings.value), msg || undefined));\n                }\n                break;\n\n            case \"lte\":\n                if (settings.value != null) {\n                    schemas.push(z.number().lte(Number(settings.value), msg || undefined));\n                }\n                break;\n\n            case \"in\":\n                if (Array.isArray(settings.values) && settings.values.length > 0) {\n                    schemas.push(z.enum(settings.values as [string, ...string[]]));\n                }\n                break;\n\n            case \"dateGte\":\n                if (settings.value != null) {\n                    const minDate = settings.value;\n                    schemas.push(\n                        z.string().refine(val => val >= minDate, {\n                            message: msg || `Must be on or after ${minDate}`\n                        })\n                    );\n                }\n                break;\n\n            case \"dateLte\":\n                if (settings.value != null) {\n                    const maxDate = settings.value;\n                    schemas.push(\n                        z.string().refine(val => val <= maxDate, {\n                            message: msg || `Must be on or before ${maxDate}`\n                        })\n                    );\n                }\n                break;\n        }\n    }\n\n    const schema =\n        schemas.length === 0\n            ? undefined\n            : schemas.length === 1\n              ? schemas[0]\n              : z.intersection(\n                    schemas[0],\n                    schemas.slice(1).reduce((acc, s) => z.intersection(acc, s), schemas[0])\n                );\n\n    return { required, requiredMessage, schema: schemas.length <= 1 ? schema : undefined };\n}\n\nexport function mapCmsListValidators(\n    validators: (CmsModelFieldValidator | { name: string })[] | undefined\n): { required: boolean; requiredMessage?: string; schema: z.ZodTypeAny | undefined } {\n    if (!validators || validators.length === 0) {\n        return { required: false, schema: undefined };\n    }\n\n    let required = false;\n    let requiredMessage: string | undefined;\n    let arraySchema = z.array(z.unknown());\n\n    for (const v of validators) {\n        const validator = v as CmsModelFieldValidator;\n        const settings = validator.settings || {};\n        const msg = interpolateMessage(validator.message, settings);\n\n        switch (validator.name) {\n            case \"required\":\n                required = true;\n                requiredMessage = msg;\n                break;\n\n            case \"minLength\":\n                if (settings.value != null) {\n                    arraySchema = arraySchema.min(\n                        Number(settings.value),\n                        msg || undefined\n                    ) as typeof arraySchema;\n                }\n                break;\n\n            case \"maxLength\":\n                if (settings.value != null) {\n                    arraySchema = arraySchema.max(\n                        Number(settings.value),\n                        msg || undefined\n                    ) as typeof arraySchema;\n                }\n                break;\n        }\n    }\n\n    const hasConstraints = validators.some(\n        v =>\n            (v as CmsModelFieldValidator).name === \"minLength\" ||\n            (v as CmsModelFieldValidator).name === \"maxLength\"\n    );\n\n    return {\n        required,\n        requiredMessage,\n        schema: hasConstraints ? arraySchema : undefined\n    };\n}\n"],"names":["interpolateMessage","message","settings","match","key","val","String","mapCmsValidators","validators","undefined","required","requiredMessage","schemas","v","validator","msg","z","Number","flags","RegExp","Array","minDate","maxDate","schema","acc","s","mapCmsListValidators","arraySchema","hasConstraints"],"mappings":"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"}
+{"version":3,"file":"features/formModel/CmsValidationMapper.js","sources":["../../../src/features/formModel/CmsValidationMapper.ts"],"sourcesContent":["import { z } from \"zod\";\nimport type { DateBound } from \"@webiny/utils\";\nimport type { CmsModelFieldValidator } from \"~/types.js\";\n\nfunction interpolateMessage(\n    message: string | undefined,\n    settings: Record<string, unknown>\n): string | undefined {\n    if (!message) {\n        return undefined;\n    }\n    return message.replace(/\\{(\\w+)}/g, (match, key) => {\n        const val = settings[key];\n        return val != null ? String(val) : match;\n    });\n}\n\nexport function mapCmsValidators(\n    validators: (CmsModelFieldValidator | { name: string })[] | undefined\n): { required: boolean; requiredMessage?: string; schema: z.ZodTypeAny | undefined } {\n    if (!validators || validators.length === 0) {\n        return { required: false, schema: undefined };\n    }\n\n    let required = false;\n    let requiredMessage: string | undefined;\n    const schemas: z.ZodTypeAny[] = [];\n\n    for (const v of validators) {\n        const validator = v as CmsModelFieldValidator;\n        const settings = validator.settings || {};\n\n        const msg = interpolateMessage(validator.message, settings);\n\n        switch (validator.name) {\n            case \"required\":\n                required = true;\n                requiredMessage = msg;\n                break;\n\n            case \"minLength\":\n                if (settings.value != null) {\n                    schemas.push(z.string().min(Number(settings.value), msg || undefined));\n                }\n                break;\n\n            case \"maxLength\":\n                if (settings.value != null) {\n                    schemas.push(z.string().max(Number(settings.value), msg || undefined));\n                }\n                break;\n\n            case \"pattern\":\n                if (settings.regex) {\n                    const flags = settings.flags || \"\";\n                    schemas.push(\n                        z.string().regex(new RegExp(settings.regex, flags), msg || undefined)\n                    );\n                }\n                break;\n\n            case \"gte\":\n                if (settings.value != null) {\n                    schemas.push(z.number().gte(Number(settings.value), msg || undefined));\n                }\n                break;\n\n            case \"lte\":\n                if (settings.value != null) {\n                    schemas.push(z.number().lte(Number(settings.value), msg || undefined));\n                }\n                break;\n\n            case \"in\":\n                if (Array.isArray(settings.values) && settings.values.length > 0) {\n                    schemas.push(z.enum(settings.values as [string, ...string[]]));\n                }\n                break;\n\n            // \"dateGte\" and \"dateLte\" are applied by `DateTimeFieldMapper`, through the\n            // `datetime()` builder, which also hands the limits to the field's picker.\n        }\n    }\n\n    const schema =\n        schemas.length === 0\n            ? undefined\n            : schemas.slice(1).reduce<z.ZodTypeAny>((acc, s) => z.intersection(acc, s), schemas[0]);\n\n    return { required, requiredMessage, schema };\n}\n\n/** The `dateGte`/`dateLte` validators, as limits for the `datetime()` builder. */\nexport function mapCmsDateLimits(\n    validators: (CmsModelFieldValidator | { name: string })[] | undefined\n): { name: \"dateGte\" | \"dateLte\"; bound: DateBound; message?: string }[] {\n    const limits: { name: \"dateGte\" | \"dateLte\"; bound: DateBound; message?: string }[] = [];\n    for (const v of validators || []) {\n        const validator = v as CmsModelFieldValidator;\n        if (validator.name !== \"dateGte\" && validator.name !== \"dateLte\") {\n            continue;\n        }\n        const settings = validator.settings || {};\n        const message = interpolateMessage(validator.message, settings);\n        if (typeof settings.expression === \"string\") {\n            limits.push({\n                name: validator.name,\n                bound: { expression: settings.expression },\n                message\n            });\n        } else if (settings.value != null) {\n            limits.push({ name: validator.name, bound: String(settings.value), message });\n        }\n    }\n    return limits;\n}\n\nexport function mapCmsListValidators(\n    validators: (CmsModelFieldValidator | { name: string })[] | undefined\n): { required: boolean; requiredMessage?: string; schema: z.ZodTypeAny | undefined } {\n    if (!validators || validators.length === 0) {\n        return { required: false, schema: undefined };\n    }\n\n    let required = false;\n    let requiredMessage: string | undefined;\n    let arraySchema = z.array(z.unknown());\n\n    for (const v of validators) {\n        const validator = v as CmsModelFieldValidator;\n        const settings = validator.settings || {};\n        const msg = interpolateMessage(validator.message, settings);\n\n        switch (validator.name) {\n            case \"required\":\n                required = true;\n                requiredMessage = msg;\n                break;\n\n            case \"minLength\":\n                if (settings.value != null) {\n                    arraySchema = arraySchema.min(\n                        Number(settings.value),\n                        msg || undefined\n                    ) as typeof arraySchema;\n                }\n                break;\n\n            case \"maxLength\":\n                if (settings.value != null) {\n                    arraySchema = arraySchema.max(\n                        Number(settings.value),\n                        msg || undefined\n                    ) as typeof arraySchema;\n                }\n                break;\n        }\n    }\n\n    const hasConstraints = validators.some(\n        v =>\n            (v as CmsModelFieldValidator).name === \"minLength\" ||\n            (v as CmsModelFieldValidator).name === \"maxLength\"\n    );\n\n    return {\n        required,\n        requiredMessage,\n        schema: hasConstraints ? arraySchema : undefined\n    };\n}\n"],"names":["interpolateMessage","message","settings","match","key","val","String","mapCmsValidators","validators","undefined","required","requiredMessage","schemas","v","validator","msg","z","Number","flags","RegExp","Array","schema","acc","s","mapCmsDateLimits","limits","mapCmsListValidators","arraySchema","hasConstraints"],"mappings":"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"}

package/features/formModel/feature.js

@@ -2,11 +2,13 @@ import { createFeature } from "@webiny/feature/admin";
 import { CmsFormModelBuilder } from "./abstractions.js";
 import { CmsFormModelBuilder as external_CmsFormModelBuilder_js_CmsFormModelBuilder } from "./CmsFormModelBuilder.js";
 import { CmsRefFieldType } from "./CmsRefFieldType.js";
+import { CmsRefFieldValueFormatter } from "./CmsRefFieldValueFormatter.js";
 const CmsFormModelFeature = createFeature({
     name: "CmsFormModel",
     register (container) {
         container.register(external_CmsFormModelBuilder_js_CmsFormModelBuilder).inSingletonScope();
         container.register(CmsRefFieldType);
+        container.register(CmsRefFieldValueFormatter);
     },
     resolve (container) {
         return {

package/features/formModel/feature.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/formModel/feature.js","sources":["../../../src/features/formModel/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/admin\";\nimport { CmsFormModelBuilder as CmsFormModelBuilderAbstraction } from \"./abstractions.js\";\nimport { CmsFormModelBuilder } from \"./CmsFormModelBuilder.js\";\nimport { CmsRefFieldType } from \"./CmsRefFieldType.js\";\n\nexport const CmsFormModelFeature = createFeature({\n    name: \"CmsFormModel\",\n    register(container) {\n        container.register(CmsFormModelBuilder).inSingletonScope();\n        container.register(CmsRefFieldType);\n    },\n    resolve(container) {\n        return {\n            builder: container.resolve(CmsFormModelBuilderAbstraction)\n        };\n    }\n});\n"],"names":["CmsFormModelFeature","createFeature","container","CmsFormModelBuilder","CmsRefFieldType","CmsFormModelBuilderAbstraction"],"mappings":";;;;AAKO,MAAMA,sBAAsBC,cAAc;IAC7C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,qDAAqB,gBAAgB;QACxDD,UAAU,QAAQ,CAACE;IACvB;IACA,SAAQF,SAAS;QACb,OAAO;YACH,SAASA,UAAU,OAAO,CAACG;QAC/B;IACJ;AACJ"}
+{"version":3,"file":"features/formModel/feature.js","sources":["../../../src/features/formModel/feature.ts"],"sourcesContent":["import { createFeature } from \"@webiny/feature/admin\";\nimport { CmsFormModelBuilder as CmsFormModelBuilderAbstraction } from \"./abstractions.js\";\nimport { CmsFormModelBuilder } from \"./CmsFormModelBuilder.js\";\nimport { CmsRefFieldType } from \"./CmsRefFieldType.js\";\nimport { CmsRefFieldValueFormatter } from \"./CmsRefFieldValueFormatter.js\";\n\nexport const CmsFormModelFeature = createFeature({\n    name: \"CmsFormModel\",\n    register(container) {\n        container.register(CmsFormModelBuilder).inSingletonScope();\n        container.register(CmsRefFieldType);\n        container.register(CmsRefFieldValueFormatter);\n    },\n    resolve(container) {\n        return {\n            builder: container.resolve(CmsFormModelBuilderAbstraction)\n        };\n    }\n});\n"],"names":["CmsFormModelFeature","createFeature","container","CmsFormModelBuilder","CmsRefFieldType","CmsRefFieldValueFormatter","CmsFormModelBuilderAbstraction"],"mappings":";;;;;AAMO,MAAMA,sBAAsBC,cAAc;IAC7C,MAAM;IACN,UAASC,SAAS;QACdA,UAAU,QAAQ,CAACC,qDAAqB,gBAAgB;QACxDD,UAAU,QAAQ,CAACE;QACnBF,UAAU,QAAQ,CAACG;IACvB;IACA,SAAQH,SAAS;QACb,OAAO;YACH,SAASA,UAAU,OAAO,CAACI;QAC/B;IACJ;AACJ"}

package/features/formModel/mappers/DateTimeFieldMapper.js

@@ -1,4 +1,5 @@
 import { applyFieldProps } from "./applyFieldProps.js";
+import { mapCmsDateLimits } from "../CmsValidationMapper.js";
 class DateTimeFieldMapper {
     map(field, registry, context) {
         const builder = registry.datetime();
@@ -18,6 +19,8 @@ class DateTimeFieldMapper {
                 builder.withoutTimezone();
                 break;
         }
+        for (const limit of mapCmsDateLimits(field.validation))if ("dateGte" === limit.name) builder.dateGte(limit.bound, limit.message);
+        else builder.dateLte(limit.bound, limit.message);
         return builder;
     }
     constructor(){

package/features/formModel/mappers/DateTimeFieldMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/formModel/mappers/DateTimeFieldMapper.js","sources":["../../../../src/features/formModel/mappers/DateTimeFieldMapper.ts"],"sourcesContent":["import type { ICmsFieldTypeMapper, ICmsFieldMapperContext } from \"../abstractions.js\";\nimport type { IFieldBuilderRegistry } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport type { CmsModelField } from \"~/types.js\";\nimport { applyFieldProps } from \"./applyFieldProps.js\";\n\nexport class DateTimeFieldMapper implements ICmsFieldTypeMapper {\n    readonly type = \"datetime\";\n\n    map(field: CmsModelField, registry: IFieldBuilderRegistry, context: ICmsFieldMapperContext) {\n        const builder = registry.datetime();\n        applyFieldProps(builder, field, context.rendererMap);\n\n        const subtype = field.settings?.type as string | undefined;\n        switch (subtype) {\n            case \"date\":\n                builder.dateOnly();\n                break;\n            case \"time\":\n                builder.timeOnly();\n                break;\n            case \"dateTimeWithTimezone\":\n                builder.withTimezone();\n                break;\n            case \"dateTimeWithoutTimezone\":\n                builder.withoutTimezone();\n                break;\n        }\n\n        return builder;\n    }\n}\n"],"names":["DateTimeFieldMapper","field","registry","context","builder","applyFieldProps","subtype"],"mappings":";AAKO,MAAMA;IAGT,IAAIC,KAAoB,EAAEC,QAA+B,EAAEC,OAA+B,EAAE;QACxF,MAAMC,UAAUF,SAAS,QAAQ;QACjCG,gBAAgBD,SAASH,OAAOE,QAAQ,WAAW;QAEnD,MAAMG,UAAUL,MAAM,QAAQ,EAAE;QAChC,OAAQK;YACJ,KAAK;gBACDF,QAAQ,QAAQ;gBAChB;YACJ,KAAK;gBACDA,QAAQ,QAAQ;gBAChB;YACJ,KAAK;gBACDA,QAAQ,YAAY;gBACpB;YACJ,KAAK;gBACDA,QAAQ,eAAe;gBACvB;QACR;QAEA,OAAOA;IACX;;aAvBS,IAAI,GAAG;;AAwBpB"}
+{"version":3,"file":"features/formModel/mappers/DateTimeFieldMapper.js","sources":["../../../../src/features/formModel/mappers/DateTimeFieldMapper.ts"],"sourcesContent":["import type { ICmsFieldTypeMapper, ICmsFieldMapperContext } from \"../abstractions.js\";\nimport type { IFieldBuilderRegistry } from \"@webiny/app-admin/features/formModel/abstractions.js\";\nimport type { CmsModelField } from \"~/types.js\";\nimport { applyFieldProps } from \"./applyFieldProps.js\";\nimport { mapCmsDateLimits } from \"../CmsValidationMapper.js\";\n\nexport class DateTimeFieldMapper implements ICmsFieldTypeMapper {\n    readonly type = \"datetime\";\n\n    map(field: CmsModelField, registry: IFieldBuilderRegistry, context: ICmsFieldMapperContext) {\n        const builder = registry.datetime();\n        applyFieldProps(builder, field, context.rendererMap);\n\n        const subtype = field.settings?.type as string | undefined;\n        switch (subtype) {\n            case \"date\":\n                builder.dateOnly();\n                break;\n            case \"time\":\n                builder.timeOnly();\n                break;\n            case \"dateTimeWithTimezone\":\n                builder.withTimezone();\n                break;\n            case \"dateTimeWithoutTimezone\":\n                builder.withoutTimezone();\n                break;\n        }\n\n        for (const limit of mapCmsDateLimits(field.validation)) {\n            if (limit.name === \"dateGte\") {\n                builder.dateGte(limit.bound, limit.message);\n            } else {\n                builder.dateLte(limit.bound, limit.message);\n            }\n        }\n\n        return builder;\n    }\n}\n"],"names":["DateTimeFieldMapper","field","registry","context","builder","applyFieldProps","subtype","limit","mapCmsDateLimits"],"mappings":";;AAMO,MAAMA;IAGT,IAAIC,KAAoB,EAAEC,QAA+B,EAAEC,OAA+B,EAAE;QACxF,MAAMC,UAAUF,SAAS,QAAQ;QACjCG,gBAAgBD,SAASH,OAAOE,QAAQ,WAAW;QAEnD,MAAMG,UAAUL,MAAM,QAAQ,EAAE;QAChC,OAAQK;YACJ,KAAK;gBACDF,QAAQ,QAAQ;gBAChB;YACJ,KAAK;gBACDA,QAAQ,QAAQ;gBAChB;YACJ,KAAK;gBACDA,QAAQ,YAAY;gBACpB;YACJ,KAAK;gBACDA,QAAQ,eAAe;gBACvB;QACR;QAEA,KAAK,MAAMG,SAASC,iBAAiBP,MAAM,UAAU,EACjD,IAAIM,AAAe,cAAfA,MAAM,IAAI,EACVH,QAAQ,OAAO,CAACG,MAAM,KAAK,EAAEA,MAAM,OAAO;aAE1CH,QAAQ,OAAO,CAACG,MAAM,KAAK,EAAEA,MAAM,OAAO;QAIlD,OAAOH;IACX;;aA/BS,IAAI,GAAG;;AAgCpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-headless-cms",
-	"version": "6.5.0-beta.9",
+	"version": "6.5.1-beta.0",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -28,25 +28,25 @@
 		"@fortawesome/react-fontawesome": "3.5.0",
 		"@lexical/utils": "0.52.0",
 		"@types/react": "18.3.31",
-		"@webiny/admin-ui": "6.5.0-beta.9",
-		"@webiny/app": "6.5.0-beta.9",
-		"@webiny/app-aco": "6.5.0-beta.9",
-		"@webiny/app-admin": "6.5.0-beta.9",
-		"@webiny/app-graphql-playground": "6.5.0-beta.9",
-		"@webiny/app-headless-cms-common": "6.5.0-beta.9",
-		"@webiny/cms-sdk": "6.5.0-beta.9",
+		"@webiny/admin-ui": "6.5.1-beta.0",
+		"@webiny/app": "6.5.1-beta.0",
+		"@webiny/app-aco": "6.5.1-beta.0",
+		"@webiny/app-admin": "6.5.1-beta.0",
+		"@webiny/app-graphql-playground": "6.5.1-beta.0",
+		"@webiny/app-headless-cms-common": "6.5.1-beta.0",
+		"@webiny/cms-sdk": "6.5.1-beta.0",
 		"@webiny/di": "1.1.0",
-		"@webiny/feature": "6.5.0-beta.9",
-		"@webiny/form": "6.5.0-beta.9",
-		"@webiny/frontend-settings": "6.5.0-beta.9",
-		"@webiny/icons": "6.5.0-beta.9",
-		"@webiny/lexical-editor": "6.5.0-beta.9",
-		"@webiny/lexical-nodes": "6.5.0-beta.9",
-		"@webiny/plugins": "6.5.0-beta.9",
-		"@webiny/react-composition": "6.5.0-beta.9",
-		"@webiny/react-properties": "6.5.0-beta.9",
-		"@webiny/utils": "6.5.0-beta.9",
-		"@webiny/validation": "6.5.0-beta.9",
+		"@webiny/feature": "6.5.1-beta.0",
+		"@webiny/form": "6.5.1-beta.0",
+		"@webiny/frontend-settings": "6.5.1-beta.0",
+		"@webiny/icons": "6.5.1-beta.0",
+		"@webiny/lexical-editor": "6.5.1-beta.0",
+		"@webiny/lexical-nodes": "6.5.1-beta.0",
+		"@webiny/plugins": "6.5.1-beta.0",
+		"@webiny/react-composition": "6.5.1-beta.0",
+		"@webiny/react-properties": "6.5.1-beta.0",
+		"@webiny/utils": "6.5.1-beta.0",
+		"@webiny/validation": "6.5.1-beta.0",
 		"dot-prop-immutable": "2.1.1",
 		"graphql": "16.14.2",
 		"graphql-tag": "2.12.7",
@@ -60,13 +60,13 @@
 		"react-helmet": "6.1.0",
 		"slugify": "1.6.9",
 		"use-deep-compare-effect": "1.8.1",
-		"zod": "4.6.5"
+		"zod": "4.6.7"
 	},
 	"devDependencies": {
-		"@webiny/build-tools": "6.5.0-beta.9",
+		"@webiny/build-tools": "6.5.1-beta.0",
 		"rimraf": "6.1.3",
 		"typescript": "7.0.2",
-		"vitest": "5.0.3"
+		"vitest": "5.0.5"
 	},
 	"publishConfig": {
 		"access": "public"