@squiz/dxp-cli-next 5.33.0-develop.4 → 5.33.0-develop.5

package/lib/page/utils/definitions.js

@@ -82,7 +82,13 @@ function loadLayoutFromFile(layoutFile) {
             encoding: 'utf-8',
         });
         try {
-            const layout = fileType === 'json' ? JSON.parse(content) : (0, yaml_1.parse)(content);
+            let layout;
+            if (fileType === 'json') {
+                // First validate with JSON.parse (enforces double quotes, valid JSON syntax)
+                layout = JSON.parse(content);
+            }
+            // Then parse with YAML to catch duplicate keys (which JSON.parse silently ignores)
+            layout = (0, yaml_1.parse)(content);
             const fileName = path.basename(layoutFile);
             if (fileName === exports.LAYOUT_MANIFEST_FILE) {
                 exports.InputLayoutDefinitionV2.parse(layout);

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

@@ -218,6 +218,32 @@ entry: template.hbs
         });
         yield expect((0, definitions_1.loadLayoutDefinition)(manifestJson)).rejects.toThrowErrorMatchingInlineSnapshot('"Failed loading layout definition: Failed to parse ./some-dir/manifest.json: Unexpected token \'\'\', ..."  "name": \'test-layo"... is not valid JSON"');
     }));
+    it('should throw an error if JSON layout file has duplicate keys', () => __awaiter(void 0, void 0, void 0, function* () {
+        fs.readFile.mockImplementation((filePath) => {
+            if (filePath.endsWith('manifest.json')) {
+                return `{
+        "name": "test-layout",
+        "displayName": "Test Layout",
+        "entry": "template.hbs",
+        "zones": [],
+        "name": "test-layout"
+        }`;
+            }
+            if (filePath.endsWith('template.hbs')) {
+                return templateContent;
+            }
+            throw new Error('File not found');
+        });
+        yield expect((0, definitions_1.loadLayoutDefinition)(manifestJson)).rejects
+            .toThrowErrorMatchingInlineSnapshot(`
+      "Failed loading layout definition: Failed to parse ./some-dir/manifest.json: Map keys must be unique at line 6, column 9:
+
+              "zones": [],
+              "name": "test-layout"
+              ^
+      "
+    `);
+    }));
     it('should throw an error if layout file do not have valid extension', () => __awaiter(void 0, void 0, void 0, function* () {
         yield expect((0, definitions_1.loadLayoutDefinition)('/foo/manifest.html')).rejects.toThrow('Layout file must have a valid extension: [yaml|json]');
     }));

package/package.json

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