@squiz/dxp-cli-next 5.29.0 → 5.29.1-develop.2

package/lib/page/utils/definitions.d.ts

@@ -23,7 +23,7 @@ export declare const BaseLayoutDefinition: z.ZodObject<{
     zones: z.ZodRecord<z.ZodString, z.ZodObject<{
         displayName: z.ZodString;
         description: z.ZodString;
-        minNodes: z.ZodNumber;
+        minNodes: z.ZodDefault<z.ZodNumber>;
         maxNodes: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         description: string;
@@ -33,7 +33,7 @@ export declare const BaseLayoutDefinition: z.ZodObject<{
     }, {
         description: string;
         displayName: string;
-        minNodes: number;
+        minNodes?: number | undefined;
         maxNodes?: number | undefined;
     }>>;
     /**
@@ -41,7 +41,7 @@ export declare const BaseLayoutDefinition: z.ZodObject<{
      *
      * Declares any configurable options that can be provided by a Content Editor
      */
-    options: z.ZodRecord<z.ZodString, z.ZodObject<{
+    options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         displayName: z.ZodString;
         description: z.ZodString;
         values: z.ZodArray<z.ZodString, "many">;
@@ -53,14 +53,9 @@ export declare const BaseLayoutDefinition: z.ZodObject<{
         values: string[];
         description: string;
         displayName: string;
-    }>>;
+    }>>>;
 }, "strip", z.ZodTypeAny, {
     name: string;
-    options: Record<string, {
-        values: string[];
-        description: string;
-        displayName: string;
-    }>;
     description: string;
     displayName: string;
     zones: Record<string, {
@@ -69,21 +64,26 @@ export declare const BaseLayoutDefinition: z.ZodObject<{
         minNodes: number;
         maxNodes?: number | undefined;
     }>;
-}, {
-    name: string;
-    options: Record<string, {
+    options?: Record<string, {
         values: string[];
         description: string;
         displayName: string;
-    }>;
+    }> | undefined;
+}, {
+    name: string;
     description: string;
     displayName: string;
     zones: Record<string, {
         description: string;
         displayName: string;
-        minNodes: number;
+        minNodes?: number | undefined;
         maxNodes?: number | undefined;
     }>;
+    options?: Record<string, {
+        values: string[];
+        description: string;
+        displayName: string;
+    }> | undefined;
 }>;
 export declare const InputLayoutDefinition: z.ZodObject<z.objectUtil.extendShape<{
     /**
@@ -107,7 +107,7 @@ export declare const InputLayoutDefinition: z.ZodObject<z.objectUtil.extendShape
     zones: z.ZodRecord<z.ZodString, z.ZodObject<{
         displayName: z.ZodString;
         description: z.ZodString;
-        minNodes: z.ZodNumber;
+        minNodes: z.ZodDefault<z.ZodNumber>;
         maxNodes: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         description: string;
@@ -117,7 +117,7 @@ export declare const InputLayoutDefinition: z.ZodObject<z.objectUtil.extendShape
     }, {
         description: string;
         displayName: string;
-        minNodes: number;
+        minNodes?: number | undefined;
         maxNodes?: number | undefined;
     }>>;
     /**
@@ -125,7 +125,7 @@ export declare const InputLayoutDefinition: z.ZodObject<z.objectUtil.extendShape
      *
      * Declares any configurable options that can be provided by a Content Editor
      */
-    options: z.ZodRecord<z.ZodString, z.ZodObject<{
+    options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         displayName: z.ZodString;
         description: z.ZodString;
         values: z.ZodArray<z.ZodString, "many">;
@@ -137,16 +137,11 @@ export declare const InputLayoutDefinition: z.ZodObject<z.objectUtil.extendShape
         values: string[];
         description: string;
         displayName: string;
-    }>>;
+    }>>>;
 }, {
     entry: z.ZodString;
 }>, "strip", z.ZodTypeAny, {
     name: string;
-    options: Record<string, {
-        values: string[];
-        description: string;
-        displayName: string;
-    }>;
     entry: string;
     description: string;
     displayName: string;
@@ -156,22 +151,27 @@ export declare const InputLayoutDefinition: z.ZodObject<z.objectUtil.extendShape
         minNodes: number;
         maxNodes?: number | undefined;
     }>;
-}, {
-    name: string;
-    options: Record<string, {
+    options?: Record<string, {
         values: string[];
         description: string;
         displayName: string;
-    }>;
+    }> | undefined;
+}, {
+    name: string;
     entry: string;
     description: string;
     displayName: string;
     zones: Record<string, {
         description: string;
         displayName: string;
-        minNodes: number;
+        minNodes?: number | undefined;
         maxNodes?: number | undefined;
     }>;
+    options?: Record<string, {
+        values: string[];
+        description: string;
+        displayName: string;
+    }> | undefined;
 }>;
 export declare const LayoutDefinition: z.ZodObject<z.objectUtil.extendShape<{
     /**
@@ -195,7 +195,7 @@ export declare const LayoutDefinition: z.ZodObject<z.objectUtil.extendShape<{
     zones: z.ZodRecord<z.ZodString, z.ZodObject<{
         displayName: z.ZodString;
         description: z.ZodString;
-        minNodes: z.ZodNumber;
+        minNodes: z.ZodDefault<z.ZodNumber>;
         maxNodes: z.ZodOptional<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
         description: string;
@@ -205,7 +205,7 @@ export declare const LayoutDefinition: z.ZodObject<z.objectUtil.extendShape<{
     }, {
         description: string;
         displayName: string;
-        minNodes: number;
+        minNodes?: number | undefined;
         maxNodes?: number | undefined;
     }>>;
     /**
@@ -213,7 +213,7 @@ export declare const LayoutDefinition: z.ZodObject<z.objectUtil.extendShape<{
      *
      * Declares any configurable options that can be provided by a Content Editor
      */
-    options: z.ZodRecord<z.ZodString, z.ZodObject<{
+    options: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
         displayName: z.ZodString;
         description: z.ZodString;
         values: z.ZodArray<z.ZodString, "many">;
@@ -225,16 +225,11 @@ export declare const LayoutDefinition: z.ZodObject<z.objectUtil.extendShape<{
         values: string[];
         description: string;
         displayName: string;
-    }>>;
+    }>>>;
 }, {
     template: z.ZodString;
 }>, "strip", z.ZodTypeAny, {
     name: string;
-    options: Record<string, {
-        values: string[];
-        description: string;
-        displayName: string;
-    }>;
     description: string;
     displayName: string;
     zones: Record<string, {
@@ -244,22 +239,27 @@ export declare const LayoutDefinition: z.ZodObject<z.objectUtil.extendShape<{
         maxNodes?: number | undefined;
     }>;
     template: string;
-}, {
-    name: string;
-    options: Record<string, {
+    options?: Record<string, {
         values: string[];
         description: string;
         displayName: string;
-    }>;
+    }> | undefined;
+}, {
+    name: string;
     description: string;
     displayName: string;
     zones: Record<string, {
         description: string;
         displayName: string;
-        minNodes: number;
+        minNodes?: number | undefined;
         maxNodes?: number | undefined;
     }>;
     template: string;
+    options?: Record<string, {
+        values: string[];
+        description: string;
+        displayName: string;
+    }> | undefined;
 }>;
 export declare type InputLayoutDefinition = z.infer<typeof InputLayoutDefinition>;
 export declare type LayoutDefinition = z.infer<typeof LayoutDefinition>;

package/lib/page/utils/definitions.js

@@ -117,7 +117,7 @@ exports.BaseLayoutDefinition = zod_1.z.object({
     zones: zod_1.z.record(zod_1.z.string(), zod_1.z.object({
         displayName: zod_1.z.string(),
         description: zod_1.z.string(),
-        minNodes: zod_1.z.number().min(0),
+        minNodes: zod_1.z.number().min(0).default(0),
         maxNodes: zod_1.z.number().min(1).optional(),
     })),
     /**
@@ -125,11 +125,13 @@ exports.BaseLayoutDefinition = zod_1.z.object({
      *
      * Declares any configurable options that can be provided by a Content Editor
      */
-    options: zod_1.z.record(zod_1.z.string(), zod_1.z.object({
+    options: zod_1.z
+        .record(zod_1.z.string(), zod_1.z.object({
         displayName: zod_1.z.string(),
         description: zod_1.z.string(),
         values: zod_1.z.array(zod_1.z.string()),
-    })),
+    }))
+        .optional(),
 });
 exports.InputLayoutDefinition = exports.BaseLayoutDefinition.extend({
     entry: zod_1.z.string(),

package/lib/page/utils/definitions.spec.js

@@ -287,4 +287,152 @@ entry: template.hbs
         });
         yield expect((0, definitions_1.loadLayoutDefinition)(paintLayoutFileYaml)).rejects.toThrow('Failed loading layout definition: Failed loading template file "template.hbs": File not found');
     }));
+    it('should load layout definition without options field from YAML file', () => __awaiter(void 0, void 0, void 0, function* () {
+        const yamlContentWithoutOptions = `
+name: test-layout
+displayName: Test Layout
+description: A test layout
+zones:
+  main:
+    displayName: Main Zone
+    description: Main content area
+    minNodes: 1
+entry: template.hbs
+    `;
+        fs.readFile.mockImplementation((filePath) => {
+            if (filePath.endsWith('page-layout.yaml')) {
+                return yamlContentWithoutOptions;
+            }
+            if (filePath.endsWith('template.hbs')) {
+                return templateContent;
+            }
+            throw new Error('File not found');
+        });
+        const layoutDefinition = yield (0, definitions_1.loadLayoutDefinition)(paintLayoutFileYaml);
+        expect(layoutDefinition).toEqual({
+            name: 'test-layout',
+            displayName: 'Test Layout',
+            description: 'A test layout',
+            zones: {
+                main: {
+                    displayName: 'Main Zone',
+                    description: 'Main content area',
+                    minNodes: 1,
+                },
+            },
+            template: templateContent,
+        });
+    }));
+    it('should load layout definition without maxNodes in zones from YAML file', () => __awaiter(void 0, void 0, void 0, function* () {
+        const yamlContentWithoutMaxNodes = `
+name: test-layout
+displayName: Test Layout
+description: A test layout
+zones:
+  main:
+    displayName: Main Zone
+    description: Main content area
+    minNodes: 1
+  sidebar:
+    displayName: Sidebar Zone
+    description: Sidebar content area
+    minNodes: 0
+entry: template.hbs
+    `;
+        fs.readFile.mockImplementation((filePath) => {
+            if (filePath.endsWith('page-layout.yaml')) {
+                return yamlContentWithoutMaxNodes;
+            }
+            if (filePath.endsWith('template.hbs')) {
+                return templateContent;
+            }
+            throw new Error('File not found');
+        });
+        const layoutDefinition = yield (0, definitions_1.loadLayoutDefinition)(paintLayoutFileYaml);
+        expect(layoutDefinition).toEqual({
+            name: 'test-layout',
+            displayName: 'Test Layout',
+            description: 'A test layout',
+            zones: {
+                main: {
+                    displayName: 'Main Zone',
+                    description: 'Main content area',
+                    minNodes: 1,
+                },
+                sidebar: {
+                    displayName: 'Sidebar Zone',
+                    description: 'Sidebar content area',
+                    minNodes: 0,
+                },
+            },
+            template: templateContent,
+        });
+    }));
+    it('should load layout definition without options and maxNodes from JSON file', () => __awaiter(void 0, void 0, void 0, function* () {
+        const jsonContentWithoutOptionsAndMaxNodes = JSON.stringify({
+            name: 'test-layout',
+            displayName: 'Test Layout',
+            description: 'A test layout',
+            zones: {
+                main: {
+                    displayName: 'Main Zone',
+                    description: 'Main content area',
+                    minNodes: 1,
+                },
+                sidebar: {
+                    displayName: 'Sidebar Zone',
+                    description: 'Sidebar content area',
+                    minNodes: 0,
+                },
+            },
+            entry: 'template.hbs',
+        });
+        fs.readFile.mockImplementation((filePath) => {
+            if (filePath.endsWith('page-layout.yaml')) {
+                throw { code: 'ENOENT' };
+            }
+            if (filePath.endsWith('page-layout.json')) {
+                return jsonContentWithoutOptionsAndMaxNodes;
+            }
+            if (filePath.endsWith('template.hbs')) {
+                return templateContent;
+            }
+            throw new Error('File not found');
+        });
+        const layoutDefinition = yield (0, definitions_1.loadLayoutDefinition)(paintLayoutFileJson);
+        expect(layoutDefinition).toEqual({
+            name: 'test-layout',
+            displayName: 'Test Layout',
+            description: 'A test layout',
+            zones: {
+                main: {
+                    displayName: 'Main Zone',
+                    description: 'Main content area',
+                    minNodes: 1,
+                },
+                sidebar: {
+                    displayName: 'Sidebar Zone',
+                    description: 'Sidebar content area',
+                    minNodes: 0,
+                },
+            },
+            template: templateContent,
+        });
+    }));
+});
+describe('LayoutDefinitionParse', () => {
+    it('should allow zone.minNodes to be undefined', () => {
+        const layoutDefinition = definitions_1.BaseLayoutDefinition.parse({
+            name: 'test-layout',
+            displayName: 'Test Layout',
+            description: 'A test layout',
+            zones: {
+                main: {
+                    displayName: 'Main Zone',
+                    description: 'Main content area',
+                },
+            },
+        });
+        expect(layoutDefinition.zones.main.minNodes).toBe(0);
+    });
 });

package/lib/page/utils/render.d.ts

@@ -13,7 +13,7 @@ export interface ExtendedLayoutDefinition extends LayoutDefinition {
 export interface ZoneDefinition {
     displayName: string;
     description: string;
-    minNodes: number;
+    minNodes?: number;
     maxNodes?: number;
 }
 export interface OptionDefinition {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.29.0",
+  "version": "5.29.1-develop.2",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },