@adobe/aem-cs-source-migration-repository-modernizer 1.2.2 → 1.2.3

package/src/restructure-config.js

@@ -21,6 +21,7 @@ const constants = require("./util/constants");
 const fs = require("fs");
 const path = require("path");
 const xmljs = require("xml-js");
+const dJSON = require("dirty-json");
 
 var RestructureContent = {
     /**
@@ -504,10 +505,11 @@ async function formatConfig(osgiConfigFilePath, conversionStep) {
  */
 function removeUnwantedChars(key, val, filePath) {
     //replace \ with empty space
-    val = val.replace(/\\/g, "");
     let str = "";
     if (filePath.endsWith(constants.XML_EXTENSION)) {
         if (val.charAt(0) == "{") {
+            //json element logic
+            val = val.replace(/\\/g, "");
             let type;
             if (
                 constants.ALL_CONFIGS_TYPES.includes(
@@ -529,20 +531,50 @@ function removeUnwantedChars(key, val, filePath) {
                 str = '"' + key + ":" + type + '"' + ":" + val;
             }
         } else if (val.charAt(0) == "[") {
+            //json array logic
             str = '"' + key + '"' + ":" + "[";
             let tokens = val.substring(1, val.indexOf("]"));
+
             if (tokens.length > 0) {
                 tokens = tokens.split(",");
                 for (let i = 0; i < tokens.length; i++) {
                     if (i == tokens.length - 1) {
-                        str = str + '"' + tokens[i] + '"';
+                        if (
+                            tokens[i].trim().charAt(0) == "{" ||
+                            tokens[i].trim().charAt(0) == "["
+                        ) {
+                            //remove \\ and \u002c which is encoded ','
+                            const modifiedStr = tokens[i]
+                                .trim()
+                                .replace(/\\u002c/g, "")
+                                .replace(/\\/g, "");
+                            //remove errors from dirty json
+                            const json = dJSON.parse(modifiedStr);
+                            str = str + JSON.stringify(json);
+                        } else {
+                            str = str + '"' + tokens[i] + '"';
+                        }
                     } else {
-                        str = str + '"' + tokens[i] + '"' + ",";
+                        if (
+                            tokens[i].trim().charAt(0) == "{" ||
+                            tokens[i].trim().charAt(0) == "["
+                        ) {
+                            const modifiedStr = tokens[i]
+                                .trim()
+                                .replace(/\\u002c/g, "")
+                                .replace(/\\/g, "");
+                            const json = dJSON.parse(modifiedStr);
+                            str = str + JSON.stringify(json) + ",";
+                        } else {
+                            str = str + '"' + tokens[i] + '"' + ",";
+                        }
                     }
                 }
             }
+
             str = str + "]";
         } else {
+            val = val.replace(/\\/g, "");
             val = val.replace(/[^\x20-\x7E]/gim, "");
             str = '"' + key + '"' + ":" + '"' + val + '"';
         }

package/target/result.log

@@ -1,2 +1,2 @@
-Wed, 06 Oct 2021 10:04:58 | info: RestructureConfig: Formatted OSGi config file 'com.adobe.config.test.xml' to 'com.adobe.config.test.cfg.json'.
-Wed, 06 Oct 2021 10:04:58 | info: RestructureConfig: Formatted OSGi config file 'com.adobe.test.config' to 'com.adobe.test.cfg.json'.
+Fri, 23 Jan 2026 09:37:03 | info: RestructureConfig: Formatted OSGi config file 'com.adobe.config.test.xml' to 'com.adobe.config.test.cfg.json'.
+Fri, 23 Jan 2026 09:37:03 | info: RestructureConfig: Formatted OSGi config file 'com.adobe.test.config' to 'com.adobe.test.cfg.json'.

package/test/create-base-project-structure.test.js

@@ -13,12 +13,15 @@ jest.mock("@adobe/aem-cs-source-migration-commons");
 jest.mock("../src/util/pom-manipulation-util");
 jest.mock("fs");
 jest.mock("fs-extra");
-jest.mock("node-pom-parser", () => {
-    const pomObj = {
-        artifactId: "test.artifactId",
-        version: "1.0.0",
+jest.mock("xml-js", () => {
+    return {
+        xml2js: jest.fn(() => ({
+            project: {
+                artifactId: { _text: "test.artifactId" },
+                version: { _text: "1.0.0" },
+            },
+        })),
     };
-    return { parsePom: jest.fn(() => pomObj) };
 });
 
 const {

package/test/resources/com.adobe.config.test.cfg.json

@@ -1,4 +1,5 @@
 {
+"localeLangSettings":[{"localeLanguage":"us-en_us","destinationPath":"/content/hbtbt/us/en/products","byCategoryPath":"/content/hbtbt/us/en/products/by-category","categoryFragmentPath":"/content/experience-fragments/hbtbt/us/en/products","alternativeProductsTitle":"Related Products","productDocumentType":"Product","navigationTitle":"","heroTitleField":"longLabel"},{"localeLanguage":"in-en","destinationPath":"/content/hbtbt/in/en/products","byCategoryPath":"/content/hbtbt/in/en/products/by-category","categoryFragmentPath":"/content/experience-fragments/hbtbt/in/en/products","alternativeProductsTitle":"Related Products","productDocumentType":"Product","navigationTitle":"","heroTitleField":"longLabel"},{"localeLanguage":"gb-en_gb","destinationPath":"/content/hbtbt/gb/en/products","byCategoryPath":"/content/hbtbt/gb/en/products/by-category","categoryFragmentPath":"/content/experience-fragments/hbtbt/gb/en/products","alternativeProductsTitle":"Related Products","productDocumentType":"Product","navigationTitle":"","heroTitleField":"longLabel"},{"localeLanguage":"de-de_de","destinationPath":"/content/hbtbt/de/de/products","byCategoryPath":"/content/hbtbt/de/de/products/by-category","categoryFragmentPath":"/content/experience-fragments/hbtbt/de/de/products","alternativeProductsTitle":"Related Products","productDocumentType":"Product","navigationTitle":"","heroTitleField":"longLabel"}],
 "enabled:Boolean":true,
 "error-page.system-path":"/content/404",
 "serve-authenticated-from-cache:Boolean":true,

package/test/resources/com.adobe.config.test.xml

@@ -1,6 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="sling:OsgiConfig"
+    localeLangSettings="[
+	{
+		localeLanguage:'us-en_us'\u002c
+		destinationPath:'/content/hbtbt/us/en/products'\u002c
+		byCategoryPath:'/content/hbtbt/us/en/products/by-category'\u002c
+		categoryFragmentPath:'/content/experience-fragments/hbtbt/us/en/products'\u002c
+		alternativeProductsTitle:'Related Products'\u002c
+		productDocumentType:'Product'\u002c
+		navigationTitle:''\u002c
+		heroTitleField:'longLabel'
+	},
+	{
+		localeLanguage:'in-en'\u002c
+		destinationPath:'/content/hbtbt/in/en/products'\u002c
+		byCategoryPath:'/content/hbtbt/in/en/products/by-category'\u002c
+		categoryFragmentPath:'/content/experience-fragments/hbtbt/in/en/products'\u002c
+		alternativeProductsTitle:'Related Products'\u002c
+		productDocumentType:'Product'\u002c
+		navigationTitle:''\u002c
+		heroTitleField:'longLabel'
+	},
+	{
+		localeLanguage:'gb-en_gb'\u002c
+		destinationPath:'/content/hbtbt/gb/en/products'\u002c
+		byCategoryPath:'/content/hbtbt/gb/en/products/by-category'\u002c
+		categoryFragmentPath:'/content/experience-fragments/hbtbt/gb/en/products'\u002c
+		alternativeProductsTitle:'Related Products'\u002c
+		productDocumentType:'Product'\u002c
+		navigationTitle:''\u002c
+		heroTitleField:'longLabel'
+	},
+	{
+		localeLanguage:'de-de_de'\u002c
+		destinationPath:'/content/hbtbt/de/de/products'\u002c
+		byCategoryPath:'/content/hbtbt/de/de/products/by-category'\u002c
+		categoryFragmentPath:'/content/experience-fragments/hbtbt/de/de/products'\u002c
+		alternativeProductsTitle:'Related Products'\u002c
+		productDocumentType:'Product'\u002c
+		navigationTitle:''\u002c
+		heroTitleField:'longLabel'
+	}
+]"
     enabled="{Boolean}true"
     error-page.system-path="{String}/content/404"
     serve-authenticated-from-cache="{Boolean}true"