@squiz/dxp-cli-next 5.31.0 → 5.32.0-develop.2

package/lib/page/layouts/validation/validateLayoutFormat.spec.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const validateLayoutFormat_1 = require("./validateLayoutFormat");
+const definitions_1 = require("../../utils/definitions");
+describe('validateLayoutFormat', () => {
+    let mockLogger;
+    beforeEach(() => {
+        mockLogger = {
+            warn: jest.fn(),
+        };
+    });
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+    it('should not log a warning when file is manifest.json', () => {
+        const layoutFile = `/some/path/${definitions_1.LAYOUT_MANIFEST_FILE}`;
+        (0, validateLayoutFormat_1.validateLayoutFormat)(mockLogger, layoutFile);
+        expect(mockLogger.warn).not.toHaveBeenCalled();
+    });
+    it('should log a deprecation warning when file is not manifest.json', () => {
+        const layoutFile = '/some/path/page-layout.yaml';
+        (0, validateLayoutFormat_1.validateLayoutFormat)(mockLogger, layoutFile);
+        expect(mockLogger.warn).toHaveBeenCalledTimes(1);
+        expect(mockLogger.warn).toHaveBeenCalledWith('⚠️  DEPRECATED: The file name "page-layout.yaml" is deprecated. ' +
+            `Please migrate to "${definitions_1.LAYOUT_MANIFEST_FILE}" using the new layout definition format. ` +
+            `Support for files other than "${definitions_1.LAYOUT_MANIFEST_FILE}" will be removed in a future version. ` +
+            'For more information, visit https://docs.squiz.net/component-service/latest/layouts/layout-files.html');
+    });
+    it('should extract filename correctly from full path', () => {
+        const layoutFile = '/very/deep/nested/path/to/layout/page-layout.yaml';
+        (0, validateLayoutFormat_1.validateLayoutFormat)(mockLogger, layoutFile);
+        expect(mockLogger.warn).toHaveBeenCalledWith(expect.stringContaining('"page-layout.yaml"'));
+    });
+    it('should log a default config file warning when file is not provided', () => {
+        (0, validateLayoutFormat_1.validateLayoutFormat)(mockLogger);
+        expect(mockLogger.warn).toHaveBeenCalledTimes(1);
+        expect(mockLogger.warn).toHaveBeenCalledWith('⚠️  DEFAULT CONFIG FILE: "manifest.json" has replaced "page-layout.yaml" as the default config file. ' +
+            `Please migrate to "${definitions_1.LAYOUT_MANIFEST_FILE}" using the new layout definition format. ` +
+            `Support for files other than "${definitions_1.LAYOUT_MANIFEST_FILE}" will be removed in a future version. ` +
+            'For more information, visit https://docs.squiz.net/component-service/latest/layouts/layout-files.html');
+    });
+});

package/lib/page/layouts/validation/zone-consistency.d.ts

@@ -1,6 +1,6 @@
 import { LayoutDefinition } from '../../utils/definitions';
 /**
- * Validates that zones defined in YAML match zones used in the Handlebars template
+ * Validates that zones defined in layout definition match zones used in the Handlebars template
  * @param layout The layout definition containing zones and template
  * @returns Error message if validation fails, null if validation passes
  */

package/lib/page/layouts/validation/zone-consistency.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateZoneConsistency = void 0;
 /**
- * Validates that zones defined in YAML match zones used in the Handlebars template
+ * Validates that zones defined in layout definition match zones used in the Handlebars template
  * @param layout The layout definition containing zones and template
  * @returns Error message if validation fails, null if validation passes
  */
 function validateZoneConsistency(layout) {
-    const yamlZones = Object.keys(layout.zones || {});
+    var _a, _b;
+    const layoutZones = (_b = (_a = layout.zones) === null || _a === void 0 ? void 0 : _a.map(zone => zone.key)) !== null && _b !== void 0 ? _b : [];
     const template = layout.template;
     // If no template is provided, skip validation
     if (!template) {
@@ -24,19 +25,19 @@ function validateZoneConsistency(layout) {
     }
     // Convert the set to an array
     const templateZoneArray = Array.from(templateZones);
-    // Find zones defined in YAML but not used in template
-    const unusedYamlZones = yamlZones.filter(zone => !templateZones.has(zone));
-    // Find zones used in template but not defined in YAML
-    const undefinedTemplateZones = templateZoneArray.filter(zone => !yamlZones.includes(zone));
+    // Find zones defined in layout definition but not used in template
+    const unusedLayoutZones = layoutZones.filter(zone => !templateZones.has(zone));
+    // Find zones used in template but not defined in layout definition
+    const undefinedTemplateZones = templateZoneArray.filter(zone => !layoutZones.includes(zone));
     // Create an array of errors
     const errors = [];
     // Add the unused zones to the errors
-    if (unusedYamlZones.length > 0) {
-        errors.push(`Zones defined in YAML but not used in template: ${unusedYamlZones.join(', ')}`);
+    if (unusedLayoutZones.length > 0) {
+        errors.push(`Zones defined in layout definition but not used in template: ${unusedLayoutZones.join(', ')}`);
     }
     // Add the undefined zones to the errors
     if (undefinedTemplateZones.length > 0) {
-        errors.push(`Zones used in template but not defined in YAML: ${undefinedTemplateZones.join(', ')}`);
+        errors.push(`Zones used in template but not defined in layout definition: ${undefinedTemplateZones.join(', ')}`);
     }
     // If there are errors, return the errors
     if (errors.length > 0) {

package/lib/page/layouts/validation/zone-consistency.spec.js

@@ -10,67 +10,65 @@ describe('validateZoneConsistency', () => {
         template,
     });
     it('should return null for valid zone consistency', () => {
-        const layout = createMockLayout({
-            header: { displayName: 'Header', description: 'Header zone' },
-            content: { displayName: 'Content', description: 'Content zone' },
-        }, '<div>{{zones.header}}</div><div>{{zones.content}}</div>');
+        const layout = createMockLayout([
+            { key: 'header', displayName: 'Header', description: 'Header zone' },
+            { key: 'content', displayName: 'Content', description: 'Content zone' },
+        ], '<div>{{zones.header}}</div><div>{{zones.content}}</div>');
         const result = (0, zone_consistency_1.validateZoneConsistency)(layout);
         expect(result).toBeNull();
     });
     it('should return null when no template is provided', () => {
-        const layout = createMockLayout({
-            header: { displayName: 'Header', description: 'Header zone' },
-        }, '');
+        const layout = createMockLayout([{ key: 'header', displayName: 'Header', description: 'Header zone' }], '');
         const result = (0, zone_consistency_1.validateZoneConsistency)(layout);
         expect(result).toBeNull();
     });
     it('should detect zones defined in YAML but not used in template', () => {
-        const layout = createMockLayout({
-            header: { displayName: 'Header', description: 'Header zone' },
-            sidebar: { displayName: 'Sidebar', description: 'Sidebar zone' },
-        }, '<div>{{zones.header}}</div>');
+        const layout = createMockLayout([
+            { key: 'header', displayName: 'Header', description: 'Header zone' },
+            { key: 'sidebar', displayName: 'Sidebar', description: 'Sidebar zone' },
+        ], '<div>{{zones.header}}</div>');
         const result = (0, zone_consistency_1.validateZoneConsistency)(layout);
         expect(result).toContain('Zone consistency validation failed');
-        expect(result).toContain('Zones defined in YAML but not used in template: sidebar');
+        expect(result).toContain('Zones defined in layout definition but not used in template: sidebar');
     });
     it('should detect zones used in template but not defined in YAML', () => {
-        const layout = createMockLayout({
-            header: { displayName: 'Header', description: 'Header zone' },
-        }, '<div>{{zones.header}}</div><div>{{zones.footer}}</div>');
+        const layout = createMockLayout([{ key: 'header', displayName: 'Header', description: 'Header zone' }], '<div>{{zones.header}}</div><div>{{zones.footer}}</div>');
         const result = (0, zone_consistency_1.validateZoneConsistency)(layout);
         expect(result).toContain('Zone consistency validation failed');
-        expect(result).toContain('Zones used in template but not defined in YAML: footer');
+        expect(result).toContain('Zones used in template but not defined in layout definition: footer');
     });
     it('should detect both unused and undefined zones', () => {
-        const layout = createMockLayout({
-            header: { displayName: 'Header', description: 'Header zone' },
-            sidebar: { displayName: 'Sidebar', description: 'Sidebar zone' },
-        }, '<div>{{zones.header}}</div><div>{{zones.footer}}</div>');
+        const layout = createMockLayout([
+            { key: 'header', displayName: 'Header', description: 'Header zone' },
+            { key: 'sidebar', displayName: 'Sidebar', description: 'Sidebar zone' },
+        ], '<div>{{zones.header}}</div><div>{{zones.footer}}</div>');
         const result = (0, zone_consistency_1.validateZoneConsistency)(layout);
         expect(result).toContain('Zone consistency validation failed');
-        expect(result).toContain('Zones defined in YAML but not used in template: sidebar');
-        expect(result).toContain('Zones used in template but not defined in YAML: footer');
+        expect(result).toContain('Zones defined in layout definition but not used in template: sidebar');
+        expect(result).toContain('Zones used in template but not defined in layout definition: footer');
     });
     it('should handle Handlebars each loops', () => {
-        const layout = createMockLayout({
-            items: { displayName: 'Items', description: 'Items zone' },
-        }, '<div>{{#each zones.items}}<p>{{this}}</p>{{/each}}</div>');
+        const layout = createMockLayout([{ key: 'items', displayName: 'Items', description: 'Items zone' }], '<div>{{#each zones.items}}<p>{{this}}</p>{{/each}}</div>');
         const result = (0, zone_consistency_1.validateZoneConsistency)(layout);
         expect(result).toBeNull();
     });
     it('should handle Handlebars if conditions', () => {
-        const layout = createMockLayout({
-            optional: { displayName: 'Optional', description: 'Optional zone' },
-        }, '<div>{{#if zones.optional}}{{zones.optional}}{{/if}}</div>');
+        const layout = createMockLayout([
+            {
+                key: 'optional',
+                displayName: 'Optional',
+                description: 'Optional zone',
+            },
+        ], '<div>{{#if zones.optional}}{{zones.optional}}{{/if}}</div>');
         const result = (0, zone_consistency_1.validateZoneConsistency)(layout);
         expect(result).toBeNull();
     });
     it('should handle complex Handlebars patterns', () => {
-        const layout = createMockLayout({
-            header: { displayName: 'Header', description: 'Header zone' },
-            content: { displayName: 'Content', description: 'Content zone' },
-            sidebar: { displayName: 'Sidebar', description: 'Sidebar zone' },
-        }, `
+        const layout = createMockLayout([
+            { key: 'header', displayName: 'Header', description: 'Header zone' },
+            { key: 'content', displayName: 'Content', description: 'Content zone' },
+            { key: 'sidebar', displayName: 'Sidebar', description: 'Sidebar zone' },
+        ], `
         <div>{{zones.header}}</div>
         <div>
           {{#if zones.sidebar}}
@@ -83,7 +81,7 @@ describe('validateZoneConsistency', () => {
         expect(result).toBeNull();
     });
     it('should handle empty zones object', () => {
-        const layout = createMockLayout({}, '<div>Static content only</div>');
+        const layout = createMockLayout([], '<div>Static content only</div>');
         const result = (0, zone_consistency_1.validateZoneConsistency)(layout);
         expect(result).toBeNull();
     });