@salesforce/plugin-omnistudio-migration-tool 2.0.0-rc.2 → 2.0.0-rc.20

package/lib/utils/lwcparser/fileutils/FileDiffUtil.js

@@ -47,18 +47,18 @@ class FileDiffUtil {
         let linecount = 0;
         for (const { old: original, new: modified } of diffArray) {
             if (original === modified) {
-                result += `<div style="color: black;">• Line ${modifiedLine}: ${this.escapeHtml(original)}</div>`;
+                result += `<div style="color: black;">• Line ${modifiedLine}: ${this.escapeHtml(original).replace(/ /g, '&nbsp;')}</div>`;
                 modifiedLine++;
                 originalLine++;
                 linecount++;
             }
             else if (original !== null && modified === null) {
-                result += `<div style="color: red;">- Line ${originalLine}: ${this.escapeHtml(original)}</div>`;
+                result += `<div style="color: red;">- Line ${originalLine}: ${this.escapeHtml(original).replace(/ /g, '&nbsp;')}</div>`;
                 originalLine++;
                 linecount++;
             }
             else if (original === null && modified !== null) {
-                result += `<div style="color: green;">+ Line ${modifiedLine}: ${this.escapeHtml(modified)}</div>`;
+                result += `<div style="color: green;">+ Line ${modifiedLine}: ${this.escapeHtml(modified).replace(/ /g, '&nbsp;')}</div>`;
                 modifiedLine++;
                 linecount++;
             }
@@ -73,82 +73,99 @@ class FileDiffUtil {
         return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/"/g, '&quot;').replace(/'/g, '&#039;');
     }
     getFileDiff(filename, originalFileContent, modifiedFileContent) {
-        const patch = (0, diff_1.createPatch)('', originalFileContent, modifiedFileContent);
         try {
-            // Split the patch into lines
+            const originalLines = originalFileContent.split('\n');
+            const modifiedLines = modifiedFileContent.split('\n');
+            const patch = (0, diff_1.createPatch)('', originalFileContent, modifiedFileContent);
             const patchLines = patch.split('\n');
-            // Initialize variables to track line numbers
-            let oldLineNumber = 1;
-            let newLineNumber = 1;
-            let firstPlusAlreadySkipped = false;
-            let firstMinusAlreadySkipped = false;
-            const diff = [];
-            // Initialize result as HTML string
-            patchLines.forEach((line) => {
-                // Parse the hunk header (e.g., @@ -2,3 +2,3 @@)
-                const hunkHeader = /^@@ -(\d+),\d+ \+(\d+),\d+ @@/;
+            let origIdx = 0;
+            let modIdx = 0;
+            const result = [];
+            // Skip the first line of the patch (the file header)
+            let i = 0;
+            while (i < patchLines.length) {
+                const line = patchLines[i];
+                const hunkHeader = /^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@/;
                 const match = hunkHeader.exec(line);
                 if (match) {
-                    oldLineNumber = parseInt(match[1], 10);
-                    newLineNumber = parseInt(match[2], 10);
-                }
-                else if (line.startsWith('-')) {
-                    // Skip the first line difference
-                    if (oldLineNumber === 1 && !firstMinusAlreadySkipped) {
-                        firstMinusAlreadySkipped = true;
-                        // Skip the first line difference
-                        oldLineNumber++;
-                        return;
+                    // Move to the start of the hunk
+                    const origStart = parseInt(match[1], 10) - 1;
+                    const modStart = parseInt(match[3], 10) - 1;
+                    // Emit unchanged lines before the hunk
+                    while (origIdx < origStart && modIdx < modStart) {
+                        result.push({ old: originalLines[origIdx], new: modifiedLines[modIdx] });
+                        origIdx++;
+                        modIdx++;
                     }
-                    diff.push({ old: line.slice(1), new: null });
-                    oldLineNumber++;
-                }
-                else if (line.startsWith('+')) {
-                    // Skip the first line difference
-                    if (newLineNumber === 1 && !firstPlusAlreadySkipped) {
-                        firstPlusAlreadySkipped = true;
-                        newLineNumber++;
-                        return;
+                    i++;
+                    // Now process the hunk lines
+                    while (i < patchLines.length && !patchLines[i].startsWith('@@')) {
+                        const hunkLine = patchLines[i];
+                        if (hunkLine.startsWith('-')) {
+                            result.push({ old: originalLines[origIdx], new: null });
+                            origIdx++;
+                        }
+                        else if (hunkLine.startsWith('+')) {
+                            result.push({ old: null, new: modifiedLines[modIdx] });
+                            modIdx++;
+                        }
+                        else if (hunkLine.startsWith(' ')) {
+                            result.push({ old: originalLines[origIdx], new: modifiedLines[modIdx] });
+                            origIdx++;
+                            modIdx++;
+                        }
+                        i++;
                     }
-                    diff.push({ old: null, new: line.slice(1) });
-                    newLineNumber++;
                 }
-                else if (line.startsWith(' ')) {
-                    diff.push({ old: line.slice(1), new: line.slice(1) });
-                    // Unchanged line, skip it
-                    oldLineNumber++;
-                    newLineNumber++;
+                else {
+                    i++;
                 }
-            });
-            // Return the diff array
-            return diff;
+            }
+            // Emit any remaining unchanged lines at the end
+            while (origIdx < originalLines.length && modIdx < modifiedLines.length) {
+                result.push({ old: originalLines[origIdx], new: modifiedLines[modIdx] });
+                origIdx++;
+                modIdx++;
+            }
+            // If there are trailing additions or deletions
+            while (origIdx < originalLines.length) {
+                result.push({ old: originalLines[origIdx], new: null });
+                origIdx++;
+            }
+            while (modIdx < modifiedLines.length) {
+                result.push({ old: null, new: modifiedLines[modIdx] });
+                modIdx++;
+            }
+            // Only return if there are any changes
+            const hasChanges = result.some((diff) => diff.old !== diff.new);
+            return hasChanges ? result : [];
         }
         catch (error) {
             logger_1.Logger.error(`Error in FileDiffUtil: ${String(error)}`);
+            return [];
         }
     }
     getXMLDiff(originalFileContent, modifiedFileContent) {
-        const diff = (0, diff_1.diffLines)(originalFileContent, modifiedFileContent, { newlineIsToken: true });
-        return diff.map((line) => {
-            if (line.added) {
-                return {
-                    old: null,
-                    new: line.value,
-                };
+        const diff = (0, diff_1.diffLines)(originalFileContent, modifiedFileContent, { stripTrailingCr: true });
+        const result = [];
+        for (const block of diff) {
+            if (block.added) {
+                block.value.split('\n').forEach((line) => {
+                    result.push({ old: null, new: line });
+                });
             }
-            else if (line.removed) {
-                return {
-                    old: line.value,
-                    new: null,
-                };
+            else if (block.removed) {
+                block.value.split('\n').forEach((line) => {
+                    result.push({ old: line, new: null });
+                });
             }
             else {
-                return {
-                    old: line.value,
-                    new: line.value,
-                };
+                block.value.split('\n').forEach((line) => {
+                    result.push({ old: line, new: line });
+                });
             }
-        });
+        }
+        return result;
     }
 }
 exports.FileDiffUtil = FileDiffUtil;

package/lib/utils/lwcparser/fileutils/FileDiffUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileDiffUtil.js","sourceRoot":"","sources":["../../../../src/utils/lwcparser/fileutils/FileDiffUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileDiffUtil.js","sourceRoot":"","sources":["../../../../src/utils/lwcparser/fileutils/FileDiffUtil.ts"],"names":[],"mappings":"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"}

package/lib/utils/lwcparser/jsParser/JavaScriptParser.js

@@ -86,7 +86,7 @@ class JavaScriptParser {
             logger_1.Logger.info(`Replaced import in file: ${filePath}`);
         }
         catch (error) {
-            logger_1.Logger.error(`Error writing file to disk: ${error}`);
+            logger_1.Logger.error('Error writing file to disk', error);
             throw error;
         }
     }

package/lib/utils/lwcparser/jsParser/JavaScriptParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"JavaScriptParser.js","sourceRoot":"","sources":["../../../../src/utils/lwcparser/jsParser/JavaScriptParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAAqE;AACrE,sDAAsD;AACtD,wDAAwD;AACxD,+DAA+D;AAC/D,+BAA+B;AAC/B,uCAAyB;AACzB,0CAAsC;AACtC,+DAAuC;AACvC,4DAAyD;AACzD,yCAAsC;AAEtC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAE9B,MAAa,gBAAgB;IAC3B,4EAA4E;IACrE,mBAAmB,CAAC,QAAgB,EAAE,SAAiB;QAC5D,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE/C,2BAA2B;QAC3B,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEhD,oFAAoF;QACpF,IAAI,IAAI,CAAC,QAAQ,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,EAAE;YACrF,OAAO,IAAI,CAAC;SACb;QAED,kCAAkC;QAClC,YAAY,CAAC,GAAG,CAAC,2BAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAElD,6BAA6B;QAC7B,MAAM,GAAG,GAAG,IAAA,cAAK,EAAC,IAAI,EAAE;YACtB,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,4CAA4C;SACtE,CAAC,CAAC;QAEH,wCAAwC;QACxC,MAAM,YAAY,GAAiD,EAAE,CAAC;QAEtE,oDAAoD;QACpD,IAAA,kBAAQ,EAAC,GAAG,EAAE;YACZ,iBAAiB,CAAC,IAAI;gBACpB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAE5C,wDAAwD;gBACxD,IAAI,YAAY,CAAC,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,EAAE;oBAC1C,mDAAmD;oBACnD,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;oBACzE,YAAY,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;iBACvE;YACH,CAAC;SACF,CAAC,CAAC;QAEH,mDAAmD;QACnD,IAAI,YAAY,GAAG,IAAI,CAAC;QACxB,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;YAC7C,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,SAAS,QAAQ,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,sCAAsC;YACtG,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,IAAI,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,6BAA6B;QAC7B,YAAY,CAAC,GAAG,CAAC,2BAAY,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAC9D,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,8CAA8C;IACvC,UAAU,CAAC,QAAgB,EAAE,MAAc;QAChD,IAAI;YACF,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAC5C,eAAM,CAAC,IAAI,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;SACrD;QAAC,OAAO,KAAK,EAAE;YACd,eAAM,CAAC,KAAK,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAC;YACrD,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CACF;AA7DD,4CA6DC"}
+{"version":3,"file":"JavaScriptParser.js","sourceRoot":"","sources":["../../../../src/utils/lwcparser/jsParser/JavaScriptParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAAqE;AACrE,sDAAsD;AACtD,wDAAwD;AACxD,+DAA+D;AAC/D,+BAA+B;AAC/B,uCAAyB;AACzB,0CAAsC;AACtC,+DAAuC;AACvC,4DAAyD;AACzD,yCAAsC;AAEtC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAE9B,MAAa,gBAAgB;IAC3B,4EAA4E;IACrE,mBAAmB,CAAC,QAAgB,EAAE,SAAiB;QAC5D,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;QAE/C,2BAA2B;QAC3B,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEhD,oFAAoF;QACpF,IAAI,IAAI,CAAC,QAAQ,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,EAAE;YACrF,OAAO,IAAI,CAAC;SACb;QAED,kCAAkC;QAClC,YAAY,CAAC,GAAG,CAAC,2BAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAElD,6BAA6B;QAC7B,MAAM,GAAG,GAAG,IAAA,cAAK,EAAC,IAAI,EAAE;YACtB,UAAU,EAAE,QAAQ;YACpB,OAAO,EAAE,CAAC,YAAY,CAAC,EAAE,4CAA4C;SACtE,CAAC,CAAC;QAEH,wCAAwC;QACxC,MAAM,YAAY,GAAiD,EAAE,CAAC;QAEtE,oDAAoD;QACpD,IAAA,kBAAQ,EAAC,GAAG,EAAE;YACZ,iBAAiB,CAAC,IAAI;gBACpB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;gBAE5C,wDAAwD;gBACxD,IAAI,YAAY,CAAC,QAAQ,CAAC,SAAS,GAAG,GAAG,CAAC,EAAE;oBAC1C,mDAAmD;oBACnD,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;oBACzE,YAAY,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;iBACvE;YACH,CAAC;SACF,CAAC,CAAC;QAEH,mDAAmD;QACnD,IAAI,YAAY,GAAG,IAAI,CAAC;QACxB,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAAE;YAC7C,MAAM,WAAW,GAAG,IAAI,MAAM,CAAC,SAAS,QAAQ,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,sCAAsC;YACtG,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,OAAO,IAAI,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,6BAA6B;QAC7B,YAAY,CAAC,GAAG,CAAC,2BAAY,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAC9D,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,8CAA8C;IACvC,UAAU,CAAC,QAAgB,EAAE,MAAc;QAChD,IAAI;YACF,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAC5C,eAAM,CAAC,IAAI,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC;SACrD;QAAC,OAAO,KAAK,EAAE;YACd,eAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YAClD,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CACF;AA7DD,4CA6DC"}

package/lib/utils/lwcparser/xmlParser/XmlParser.js

@@ -79,7 +79,7 @@ class XmlParser {
             logger_1.Logger.info(`Modified HTML saved to ${outputFilePath}`);
         }
         catch (error) {
-            logger_1.Logger.error(`Error writing file to disk: ${error}`);
+            logger_1.Logger.error('Error writing file to disk', error);
             throw error;
         }
     }

package/lib/utils/lwcparser/xmlParser/XmlParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"XmlParser.js","sourceRoot":"","sources":["../../../../src/utils/lwcparser/xmlParser/XmlParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,qEAAqE;AACrE,sDAAsD;AACtD,uDAAuD;AACvD,+DAA+D;AAC/D,4DAA4D;AAC5D,qEAAqE;AACrE,uCAAyB;AACzB,mCAAkD;AAClD,4DAAyD;AACzD,yCAAsC;AAEtC,MAAa,SAAS;IAIpB,YAAoB,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;QAH5B,WAAM,GAAoB,IAAI,CAAC;QAIrC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;IAEO,QAAQ,CAAC,WAAW;QAC1B,MAAM,MAAM,GAAG,IAAI,kBAAS,EAAE,CAAC;QAC/B,IAAI;YACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;SACtE;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;IACH,CAAC;IAEM,UAAU,CAAC,OAAe,EAAE,SAAiB,EAAE,KAAK,GAAG,CAAC;;QAC7D,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;QAChD,aAAa,CAAC,GAAG,CAAC,2BAAY,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;QACnG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;SACtD;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExD,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,EAAE;YACxB,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,IACE,YAAY,CAAC,UAAU,IAAI,IAAI;gBAC/B,YAAY,CAAC,UAAU,CAAC,SAAS,IAAI,IAAI;gBACzC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EACrD;gBACA,MAAA,YAAY,CAAC,UAAU,0CAAE,WAAW,CAAC,YAAY,CAAC,CAAC;aACpD;YACD,MAAM,UAAU,GAAG,IAAI,sBAAa,EAAE,CAAC;YACvC,MAAM,SAAS,GAAW,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpE,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC5C,aAAa,CAAC,GAAG,CAAC,2BAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;YAC5D,OAAO,aAAa,CAAC;SACtB;IACH,CAAC;IAEM,UAAU,CAAC,cAAsB,EAAE,SAAiB;QACzD,IAAI;YACF,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YAC5C,eAAM,CAAC,IAAI,CAAC,0BAA0B,cAAc,EAAE,CAAC,CAAC;SACzD;QAAC,OAAO,KAAK,EAAE;YACd,eAAM,CAAC,KAAK,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAC;YACrD,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CAMF;AAzDD,8BAyDC"}
+{"version":3,"file":"XmlParser.js","sourceRoot":"","sources":["../../../../src/utils/lwcparser/xmlParser/XmlParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA+B;AAC/B,qEAAqE;AACrE,sDAAsD;AACtD,uDAAuD;AACvD,+DAA+D;AAC/D,4DAA4D;AAC5D,qEAAqE;AACrE,uCAAyB;AACzB,mCAAkD;AAClD,4DAAyD;AACzD,yCAAsC;AAEtC,MAAa,SAAS;IAIpB,YAAoB,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;QAH5B,WAAM,GAAoB,IAAI,CAAC;QAIrC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;IAEO,QAAQ,CAAC,WAAW;QAC1B,MAAM,MAAM,GAAG,IAAI,kBAAS,EAAE,CAAC;QAC/B,IAAI;YACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;SACtE;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACzC;IACH,CAAC;IAEM,UAAU,CAAC,OAAe,EAAE,SAAiB,EAAE,KAAK,GAAG,CAAC;;QAC7D,MAAM,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAC;QAChD,aAAa,CAAC,GAAG,CAAC,2BAAY,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;QACnG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;SACtD;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExD,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,EAAE;YACxB,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,IACE,YAAY,CAAC,UAAU,IAAI,IAAI;gBAC/B,YAAY,CAAC,UAAU,CAAC,SAAS,IAAI,IAAI;gBACzC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EACrD;gBACA,MAAA,YAAY,CAAC,UAAU,0CAAE,WAAW,CAAC,YAAY,CAAC,CAAC;aACpD;YACD,MAAM,UAAU,GAAG,IAAI,sBAAa,EAAE,CAAC;YACvC,MAAM,SAAS,GAAW,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpE,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC5C,aAAa,CAAC,GAAG,CAAC,2BAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;YAC5D,OAAO,aAAa,CAAC;SACtB;IACH,CAAC;IAEM,UAAU,CAAC,cAAsB,EAAE,SAAiB;QACzD,IAAI;YACF,EAAE,CAAC,aAAa,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YAC5C,eAAM,CAAC,IAAI,CAAC,0BAA0B,cAAc,EAAE,CAAC,CAAC;SACzD;QAAC,OAAO,KAAK,EAAE;YACd,eAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YAClD,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CAMF;AAzDD,8BAyDC"}

package/lib/utils/orgPreferences.d.ts

@@ -48,6 +48,7 @@ export declare class OrgPreferences {
      * @returns {Promise<boolean>} True if the ExperienceBundle Metadata API is enabled, false otherwise
      */
     static isExperienceBundleMetadataAPIEnabled(connection: Connection): Promise<boolean>;
+    static toggleExperienceBundleMetadataAPI(connection: Connection, enable: boolean): Promise<void>;
     /**
      * Sets the ExperienceBundle Metadata API setting in Digital Experience Settings
      *

package/lib/utils/orgPreferences.js

@@ -99,6 +99,14 @@ class OrgPreferences {
             return false;
         }
     }
+    static async toggleExperienceBundleMetadataAPI(connection, enable) {
+        await connection.metadata.update('ExperienceBundleSettings', [
+            {
+                fullName: 'ExperienceBundle',
+                enableExperienceBundleMetadata: enable,
+            },
+        ]);
+    }
     /**
      * Sets the ExperienceBundle Metadata API setting in Digital Experience Settings
      *
@@ -112,12 +120,7 @@ class OrgPreferences {
     static async setExperienceBundleMetadataAPI(connection, enable) {
         try {
             // Enable the setting
-            await connection.metadata.update('ExperienceBundleSettings', [
-                {
-                    fullName: 'ExperienceBundle',
-                    enableExperienceBundleMetadata: enable,
-                },
-            ]);
+            await OrgPreferences.toggleExperienceBundleMetadataAPI(connection, enable);
             logger_1.Logger.logVerbose(`Successfully set the experienceBundleMetadata API to ${enable}`);
             return true;
         }

package/lib/utils/orgPreferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"orgPreferences.js","sourceRoot":"","sources":["../../src/utils/orgPreferences.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orgPreferences.js","sourceRoot":"","sources":["../../src/utils/orgPreferences.ts"],"names":[],"mappings":"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"}

package/lib/utils/orgUtils/index.d.ts

@@ -33,7 +33,7 @@ export declare class OrgUtils {
      * @param connection - Salesforce connection object
      * @returns Promise resolving to an array of PackageDetail objects
      */
-    static getOrgDetails(connection: Connection, namespace: string): Promise<OmnistudioOrgDetails>;
+    static getOrgDetails(connection: Connection): Promise<OmnistudioOrgDetails>;
     /**     *
      * @param connection  Salesforce connection object
      * @param namespace namespace of the org which is required to hit the apex rest resource.

package/lib/utils/orgUtils/index.js

@@ -14,7 +14,7 @@ class OrgUtils {
      * @param connection - Salesforce connection object
      * @returns Promise resolving to an array of PackageDetail objects
      */
-    static async getOrgDetails(connection, namespace) {
+    static async getOrgDetails(connection) {
         // Query all installed packages and cast the result to InstalledPackage[]
         const allInstalledPackages = (await query_1.QueryTools.queryAll(connection, '', this.objectName, this.fields));
         let hasValidNamespace = true;
@@ -23,20 +23,10 @@ class OrgUtils {
             version: '',
             namespace: '',
         };
-        for (const pkg of allInstalledPackages) {
-            if (namespace && namespace === pkg.NamespacePrefix) {
-                packageDetails.version = `${pkg.MajorVersion}.${pkg.MinorVersion}`;
-                packageDetails.namespace = pkg.NamespacePrefix;
-                break;
-            }
-        }
         const installedOmniPackages = [];
-        if (packageDetails.namespace === '') {
-            hasValidNamespace = false;
-            for (const pkg of allInstalledPackages) {
-                if ((namespace && namespace === pkg.NamespacePrefix) || this.namespaces.has(pkg.NamespacePrefix)) {
-                    installedOmniPackages.push(pkg);
-                }
+        for (const pkg of allInstalledPackages) {
+            if (this.namespaces.has(pkg.NamespacePrefix)) {
+                installedOmniPackages.push(pkg);
             }
         }
         // Handle multiple packages by prompting user to select one

package/lib/utils/orgUtils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/orgUtils/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/orgUtils/index.ts"],"names":[],"mappings":"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"}

package/lib/utils/promptUtil.d.ts

@@ -1,4 +1,6 @@
 import { Messages } from '@salesforce/core';
+export declare function askStringWithTimeout(promptFn: (message: string) => Promise<string>, question: string, timeoutMsg: string, timeoutMs?: number): Promise<string>;
+export declare function askPromptWithTimeout<T>(promptFn: (message: string) => Promise<T>, question: string, timeoutMsg: string, timeoutMs?: number): Promise<T>;
 export declare class PromptUtil {
     static askWithTimeOut(messages: Messages): (promptFn: (...args: unknown[]) => Promise<unknown>, ...args: unknown[]) => Promise<string>;
 }

package/lib/utils/promptUtil.js

@@ -1,6 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PromptUtil = void 0;
+exports.PromptUtil = exports.askPromptWithTimeout = exports.askStringWithTimeout = void 0;
+async function askStringWithTimeout(promptFn, question, timeoutMsg, timeoutMs = 5 * 60 * 1000) {
+    return askPromptWithTimeout(promptFn, question, timeoutMsg, timeoutMs);
+}
+exports.askStringWithTimeout = askStringWithTimeout;
+async function askPromptWithTimeout(promptFn, question, timeoutMsg, timeoutMs = 5 * 60 * 1000) {
+    return askUserWithTimeout(() => promptFn(question), timeoutMsg, timeoutMs);
+}
+exports.askPromptWithTimeout = askPromptWithTimeout;
+async function askUserWithTimeout(asyncFn, timeoutMsg, timeoutMs = 5 * 60 * 1000) {
+    let timeoutHandle;
+    const timeoutPromise = new Promise((_, reject) => {
+        timeoutHandle = setTimeout(() => {
+            reject(new Error(timeoutMsg));
+        }, timeoutMs);
+    });
+    try {
+        const result = await Promise.race([asyncFn(), timeoutPromise]);
+        clearTimeout(timeoutHandle);
+        return result;
+    }
+    catch (error) {
+        clearTimeout(timeoutHandle);
+        throw error;
+    }
+}
 class PromptUtil {
     static askWithTimeOut(messages) {
         return async (promptFn, ...args) => {

package/lib/utils/promptUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"promptUtil.js","sourceRoot":"","sources":["../../src/utils/promptUtil.ts"],"names":[],"mappings":";;;AAEA,MAAa,UAAU;IACd,MAAM,CAAC,cAAc,CAC1B,QAAkB;QAElB,OAAO,KAAK,EAAE,QAAkD,EAAE,GAAG,IAAe,EAAmB,EAAE;YACvG,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;YAC9C,IAAI,aAA6B,CAAC;YAClC,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBAC/C,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC9B,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAC5D,CAAC,EAAE,UAAU,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;YACH,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;gBACvE,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC5B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,OAAO,MAAM,CAAC;iBACf;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;iBACnD;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC5B,MAAM,GAAG,CAAC;aACX;QACH,CAAC,CAAC;IACJ,CAAC;CACF;AA1BD,gCA0BC"}
+{"version":3,"file":"promptUtil.js","sourceRoot":"","sources":["../../src/utils/promptUtil.ts"],"names":[],"mappings":";;;AAEO,KAAK,UAAU,oBAAoB,CACxC,QAA8C,EAC9C,QAAgB,EAChB,UAAkB,EAClB,YAAoB,CAAC,GAAG,EAAE,GAAG,IAAI;IAEjC,OAAO,oBAAoB,CAAS,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AACjF,CAAC;AAPD,oDAOC;AAEM,KAAK,UAAU,oBAAoB,CACxC,QAAyC,EACzC,QAAgB,EAChB,UAAkB,EAClB,YAAoB,CAAC,GAAG,EAAE,GAAG,IAAI;IAEjC,OAAO,kBAAkB,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AAC7E,CAAC;AAPD,oDAOC;AAED,KAAK,UAAU,kBAAkB,CAC/B,OAAyB,EACzB,UAAkB,EAClB,YAAoB,CAAC,GAAG,EAAE,GAAG,IAAI;IAEjC,IAAI,aAA6B,CAAC;IAClC,MAAM,cAAc,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QACtD,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,MAAM,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;QAChC,CAAC,EAAE,SAAS,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC;QAC/D,YAAY,CAAC,aAAa,CAAC,CAAC;QAC5B,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,YAAY,CAAC,aAAa,CAAC,CAAC;QAC5B,MAAM,KAAK,CAAC;KACb;AACH,CAAC;AAED,MAAa,UAAU;IACd,MAAM,CAAC,cAAc,CAC1B,QAAkB;QAElB,OAAO,KAAK,EAAE,QAAkD,EAAE,GAAG,IAAe,EAAmB,EAAE;YACvG,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;YAC9C,IAAI,aAA6B,CAAC;YAClC,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBAC/C,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC9B,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAC5D,CAAC,EAAE,UAAU,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;YACH,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;gBACvE,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC5B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,OAAO,MAAM,CAAC;iBACf;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;iBACnD;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,YAAY,CAAC,aAAa,CAAC,CAAC;gBAC5B,MAAM,GAAG,CAAC;aACX;QACH,CAAC,CAAC;IACJ,CAAC;CACF;AA1BD,gCA0BC"}

package/lib/utils/reportGenerator/reportInterfaces.d.ts

@@ -21,11 +21,13 @@ export interface SummaryItemDetailParam {
     cssClass: string;
 }
 export interface DashboardParam {
+    mode: 'assess' | 'migrate';
     title: string;
     heading: string;
     org: OrgParam;
     assessmentDate: string;
     summaryItems: SummaryItemParam[];
+    actionItems?: string[];
 }
 export interface ReportDataParam {
     title: string | string[];

package/lib/utils/resultsbuilder/ApexAssessmentReporter.js

@@ -9,10 +9,10 @@ class ApexAssessmentReporter {
     static getApexAssessmentData(apexAssessmentInfos, omnistudioOrgDetails) {
         logger_1.Logger.captureVerboseData('apex data:', apexAssessmentInfos);
         return {
-            title: 'Apex Migration Assessment',
-            heading: 'Apex',
+            title: 'Apex File Assessment Report',
+            heading: 'Apex File Assessment Report',
             org: (0, reportUtil_1.getOrgDetailsForReport)(omnistudioOrgDetails),
-            assessmentDate: new Date().toString(),
+            assessmentDate: new Date().toLocaleString(),
             total: (apexAssessmentInfos === null || apexAssessmentInfos === void 0 ? void 0 : apexAssessmentInfos.length) || 0,
             filterGroups: this.getFilterGroupsForReport(apexAssessmentInfos),
             headerGroups: this.getHeaderGroupsForReport(),
@@ -23,15 +23,20 @@ class ApexAssessmentReporter {
     static getSummaryData(apexAssessmentInfos) {
         return [
             {
-                name: 'Can be Automated',
+                name: 'Ready for migration',
                 count: apexAssessmentInfos.filter((apexAssessmentInfo) => !apexAssessmentInfo.warnings || apexAssessmentInfo.warnings.length === 0).length,
                 cssClass: 'text-success',
             },
             {
-                name: 'Has Warnings',
+                name: 'Warnings',
                 count: apexAssessmentInfos.filter((info) => info.warnings && info.warnings.length > 0).length,
                 cssClass: 'text-warning',
             },
+            {
+                name: 'Has Errrors',
+                count: apexAssessmentInfos.filter((info) => info.errors && info.errors.length > 0).length,
+                cssClass: 'text-error',
+            },
         ];
     }
     static getRowsForReport(apexAssessmentInfos) {
@@ -39,7 +44,8 @@ class ApexAssessmentReporter {
             rowId: `${this.rowIdPrefix}${this.rowId++}`,
             data: [
                 (0, reportUtil_1.createRowDataParam)('name', apexAssessmentInfo.name, true, 1, 1, false),
-                (0, reportUtil_1.createRowDataParam)('fileReference', apexAssessmentInfo.path, false, 1, 1, false),
+                (0, reportUtil_1.createRowDataParam)('fileReference', apexAssessmentInfo.name, false, 1, 1, true, apexAssessmentInfo.path, apexAssessmentInfo.name + '.cls'),
+                (0, reportUtil_1.createRowDataParam)('status', apexAssessmentInfo.warnings.length > 0 ? 'Warnings' : 'Ready for migration', false, 1, 1, false, undefined, apexAssessmentInfo.warnings.length > 0 ? 'Has Warnings' : 'Can be Automated', apexAssessmentInfo.warnings.length > 0 ? 'text-error' : 'text-success'),
                 (0, reportUtil_1.createRowDataParam)('diff', apexAssessmentInfo.name + 'diff', false, 1, 1, false, undefined, FileDiffUtil_1.FileDiffUtil.getDiffHTML(apexAssessmentInfo.diff, apexAssessmentInfo.name)),
                 (0, reportUtil_1.createRowDataParam)('comments', apexAssessmentInfo.infos ? apexAssessmentInfo.infos.join(', ') : '', false, 1, 1, false, undefined, apexAssessmentInfo.infos ? reportingHelper_1.reportingHelper.decorateErrors(apexAssessmentInfo.infos) : []),
                 (0, reportUtil_1.createRowDataParam)('errors', apexAssessmentInfo.warnings ? apexAssessmentInfo.warnings.join(', ') : '', false, 1, 1, false, undefined, apexAssessmentInfo.warnings ? reportingHelper_1.reportingHelper.decorateErrors(apexAssessmentInfo.warnings) : []),
@@ -47,9 +53,15 @@ class ApexAssessmentReporter {
         }));
     }
     static getFilterGroupsForReport(apexAssessmentInfos) {
+        if (!apexAssessmentInfos || apexAssessmentInfos.length === 0) {
+            return [];
+        }
         return [
-            (0, reportUtil_1.createFilterGroupParam)('Filter By Comments', 'comments', Array.from(new Set(apexAssessmentInfos.map((row) => row.infos.join(', '))))),
-            (0, reportUtil_1.createFilterGroupParam)('Filter By Errors', 'errors', Array.from(new Set(apexAssessmentInfos.map((row) => row.warnings.join(', '))))),
+            (0, reportUtil_1.createFilterGroupParam)('Filter By Assessment Status', 'status', [
+                'Can be Automated',
+                'Has Warnings',
+                'Has Errors',
+            ]),
         ];
     }
     static getHeaderGroupsForReport() {
@@ -67,12 +79,17 @@ class ApexAssessmentReporter {
                         rowspan: 1,
                     },
                     {
-                        name: 'Diff',
+                        name: 'Assessment Status',
+                        colspan: 1,
+                        rowspan: 2,
+                    },
+                    {
+                        name: 'Code Difference',
                         colspan: 1,
                         rowspan: 1,
                     },
                     {
-                        name: 'Comments',
+                        name: 'Summary',
                         colspan: 1,
                         rowspan: 1,
                     },

package/lib/utils/resultsbuilder/ApexAssessmentReporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApexAssessmentReporter.js","sourceRoot":"","sources":["../../../src/utils/resultsbuilder/ApexAssessmentReporter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ApexAssessmentReporter.js","sourceRoot":"","sources":["../../../src/utils/resultsbuilder/ApexAssessmentReporter.ts"],"names":[],"mappings":"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"}