sfdx-hardis 6.7.3 → 6.7.4

package/lib/commands/hardis/work/new.js

@@ -76,8 +76,8 @@ The command's logic orchestrates various underlying processes:
     async run() {
         const { flags } = await this.parse(NewTask);
         this.debugMode = flags.debug || false;
-        uxLog("action", this, c.cyan('This tool will assist you to create a new User Story (dev or config) with SFDX Hardis CI/CD'));
-        uxLog("log", this, c.grey("When you don't know what to answer, you can let the default value and push ENTER"));
+        uxLog("action", this, c.cyan('Creating a new User Story (dev or config) with SFDX Hardis CI/CD'));
+        uxLog("log", this, c.grey("When unsure, press ENTER to use the default value"));
         // Make sure the git status is clean, to not delete uncommitted updates
         await checkGitClean({ allowStash: true });
         const config = await getConfig('project');
@@ -119,7 +119,7 @@ The command's logic orchestrates various underlying processes:
             {
                 type: 'select',
                 name: 'branch',
-                message: c.cyanBright('What is the type of the User Story you want to do ?'),
+                message: c.cyanBright('What type of User Story do you want to create?'),
                 description: 'Select the category of work that best describes your User Story',
                 placeholder: 'Select User Story type',
                 initial: 0,
@@ -131,19 +131,19 @@ The command's logic orchestrates various underlying processes:
         // Checkout development main branch
         const branchName = `${projectBranchPart}${response.branch || 'feature'}/${taskName}`;
         const repoUrl = await getGitRepoUrl();
-        uxLog("action", this, c.cyan(`Checking out the most recent version of git branch ${c.bold(this.targetBranch)} from ${repoUrl} ...`));
+        uxLog("action", this, c.cyan(`Checking out latest version of branch ${c.bold(this.targetBranch)} from ${repoUrl}...`));
         await gitCheckOutRemote(this.targetBranch);
         // Pull latest version of target branch
         await gitPull();
         // Create new branch
-        uxLog("action", this, c.cyan(`Creating new local git branch ${c.green(branchName)}...`));
+        uxLog("action", this, c.cyan(`Creating new branch ${c.green(branchName)}...`));
         await ensureGitBranch(branchName);
         // Update config if necessary
         if (config.developmentBranch !== this.targetBranch && (config.availableTargetBranches || null) == null) {
             const updateDefaultBranchRes = await prompts({
                 type: 'confirm',
                 name: 'value',
-                message: c.cyanBright(`Do you want to update your default target git branch to ${c.green(this.targetBranch)} ?`),
+                message: c.cyanBright(`Do you want to update your default target branch to ${c.green(this.targetBranch)}?`),
                 description: 'Set this branch as your default target for future work items',
                 default: false,
             });
@@ -165,7 +165,7 @@ The command's logic orchestrates various underlying processes:
             orgTypeChoices.push({
                 title: '🌎 Sandbox org with source tracking',
                 value: 'sandbox',
-                description: "Release manager told me that I can work on Sandboxes on my project so let's use fresh dedicated one",
+                description: "Work in a developer sandbox provided by your Release Manager",
             });
         }
         if (allowedOrgTypes.includes('scratch') || allowedOrgTypes.length === 0) {
@@ -179,18 +179,18 @@ The command's logic orchestrates various underlying processes:
             orgTypeChoices.push({
                 title: `😎 Current org ${flags['target-org']?.getConnection().instanceUrl.replace("https://", "")}`,
                 value: 'currentOrg',
-                description: `Your default org with username ${flags['target-org']?.getUsername()} is already the org you want to use to work :)`,
+                description: `Use your default org with username ${flags['target-org']?.getUsername()}`,
             });
         }
         orgTypeChoices.push({
             title: "🤠 I'm hardcore, I don't need an org !",
             value: 'noOrg',
-            description: 'You just want to play with XML and sfdx-hardis configuration, and you know what you are doing !',
+            description: 'Work with XML and sfdx-hardis configuration only, without a connected org',
         });
         const orgTypeResponse = await prompts({
             type: 'select',
             name: 'value',
-            message: c.cyanBright(`In which Salesforce org do you want to work in ?`),
+            message: c.cyanBright(`Which Salesforce org do you want to work in?`),
             description: 'Choose the type of Salesforce org to use for your development work',
             placeholder: 'Select org type',
             initial: 0,
@@ -207,9 +207,9 @@ The command's logic orchestrates various underlying processes:
             await this.selectOrCreateSandbox(branchName, config, flags, selectedOrgType);
         }
         else {
-            uxLog("warning", this, c.yellow(`No org selected... I hope you know what you are doing, don't break anything :)`));
+            uxLog("warning", this, c.yellow(`No org selected. Ensure you know what you're doing.`));
         }
-        uxLog("action", this, c.cyan(`You are now ready to work in branch ${c.green(branchName)} :)`));
+        uxLog("action", this, c.cyan(`Ready to work in branch ${c.green(branchName)}`));
         // Return an object to be displayed with --json
         return { outputString: 'Created new User Story' };
     }
@@ -220,7 +220,7 @@ The command's logic orchestrates various underlying processes:
         const taskResponse = await prompts({
             type: 'text',
             name: 'taskName',
-            message: c.cyanBright(`What is the name of your new User Story ? Please avoid accents or special characters`),
+            message: c.cyanBright(`What is the name of your new User Story? Please avoid accents and special characters.`),
             description: 'Enter a descriptive name for your User Story that will be used in the git branch name',
             placeholder: `Ex: ${taskNameExample}`,
         });
@@ -240,20 +240,20 @@ The command's logic orchestrates various underlying processes:
             {
                 title: c.yellow('🆕 Create new scratch org'),
                 value: 'newScratchOrg',
-                description: "This will generate a new scratch org, and in a few minutes you'll be ready to work",
+                description: "Generate a new scratch org; you'll be ready to work in a few minutes",
             },
         ];
         if (currentOrg) {
             baseChoices.push({
                 title: c.yellow(`♻️ Reuse current org`),
                 value: currentOrg,
-                description: `This will reuse current org ${currentOrg.instanceUrl}. Beware of conflicts if others merged merge requests :)`,
+                description: `Reuse current org ${currentOrg.instanceUrl}. Beware of conflicts if others have merged changes.`,
             });
         }
         const scratchResponse = await prompts({
             type: 'select',
             name: 'value',
-            message: c.cyanBright(`Please select a scratch org to use for your branch ${c.green(branchName)}`),
+            message: c.cyanBright(`Select a scratch org for branch ${c.green(branchName)}`),
             description: 'Choose whether to create a new scratch org or reuse an existing one',
             placeholder: 'Select scratch org option',
             initial: 0,
@@ -292,7 +292,7 @@ The command's logic orchestrates various underlying processes:
                 output: true,
                 fail: true,
             });
-            uxLog("action", this, c.cyan(`Selected and opening scratch org ${c.green(scratchResponse.value.instanceUrl)} with user ${c.green(scratchResponse.value.username)}`));
+            uxLog("action", this, c.cyan(`Selected scratch org ${c.green(scratchResponse.value.instanceUrl)} with user ${c.green(scratchResponse.value.username)}`));
             // Open selected org
             uxLog("action", this, c.cyan('Opening scratch org in browser...'));
             await execSfdxJson('sf org open', this, {
@@ -300,7 +300,7 @@ The command's logic orchestrates various underlying processes:
                 output: false,
                 debug: this.debugMode,
             });
-            // Trigger a status refresh on VsCode WebSocket Client
+            // Trigger a status refresh on VS Code WebSocket Client
             WebSocketClient.sendRefreshStatusMessage();
         }
     }
@@ -323,14 +323,14 @@ The command's logic orchestrates various underlying processes:
             const initSandboxResponse = await prompts({
                 type: 'select',
                 name: 'value',
-                message: c.cyanBright(`Do you want to update the sandbox according to git branch "${this.targetBranch}" current state ?`),
+                message: c.cyanBright(`Do you want to update the sandbox to match branch "${this.targetBranch}" current state?`),
                 description: 'Choose whether to sync your sandbox with the latest changes from the target branch (packages, sources, permission sets, apex scripts, initial data)',
                 placeholder: 'Select sync option',
                 choices: [
                     {
                         title: '🧑‍🤝‍🧑 No, continue working on my current sandbox state',
                         value: 'no',
-                        description: 'Use if you are multiple users in the same SB, or have have uncommitted changes in your sandbox',
+                        description: 'Use if multiple users share the same sandbox, or if you have uncommitted changes',
                     },
                     {
                         title: '☢️ Yes, please try to update my sandbox !',
@@ -344,7 +344,7 @@ The command's logic orchestrates various underlying processes:
             if (initSandbox) {
                 const promptConfirm = await prompts({
                     type: 'confirm',
-                    message: c.cyanBright(`Are you really sure you want to update the dev sandbox with the state of git branch ${this.targetBranch} ? This will overwrite setup updates that you or other users have not committed yet`),
+                    message: c.cyanBright(`Confirm: Update dev sandbox with branch ${this.targetBranch} state? This will overwrite uncommitted changes by you or other users.`),
                     description: 'Confirm that you want to reset your sandbox to match the target branch state',
                 });
                 initSandbox = promptConfirm.value === true;
@@ -357,7 +357,7 @@ The command's logic orchestrates various underlying processes:
                         await installPackages(config.installedPackages || [], orgUsername);
                     }
                     try {
-                        // Continue initialization even if push did not work... it could work and be not such a problem :)
+                        // Continue initialization even if push did not work... it could work and be not such a problem 😊
                         uxLog("action", this, c.cyan('Resetting local SF Cli tracking...'));
                         await execCommand(`sf project delete tracking --no-prompt -o ${orgUsername}`, this, {
                             fail: false,
@@ -377,14 +377,14 @@ The command's logic orchestrates various underlying processes:
                 }
                 if (initSandboxErr) {
                     uxLog("log", this, c.grey('Error(s) while initializing sandbox: ' + initSandboxErr.message + '\n' + initSandboxErr.stack));
-                    uxLog("warning", this, c.yellow('Your sandbox may not be completely initialized from git. You can send the error above to your release manager'));
+                    uxLog("warning", this, c.yellow('Sandbox may not be fully initialized from git. Share the error above with your release manager.'));
                 }
                 if (initSourcesErr) {
                     uxLog("log", this, c.grey('Error(s) while pushing sources to sandbox: ' + initSourcesErr.message + '\n' + initSourcesErr.stack));
-                    uxLog("warning", this, c.yellow(`If you really want your sandbox to be up to date with branch ${c.bold(this.targetBranch)}, you may:
-  - ${c.bold('Fix the errors')} (probably by manually updating the target sandbox in setup), then run "New User Story" again and select again the same sandbox
-  - ${c.bold('Refresh your sandbox')} (ask your release manager if you don't know how)
-  Else, you can start working now (but beware of conflicts ^^):)
+                    uxLog("warning", this, c.yellow(`To sync sandbox with branch ${c.bold(this.targetBranch)}:
+  - ${c.bold('Fix the errors')} (manually update target sandbox in setup), then run "New User Story" again with same sandbox
+  - ${c.bold('Refresh your sandbox')} (contact release manager if needed)
+  Otherwise, start working now (beware of potential conflicts)
         `));
                 }
             }
@@ -394,12 +394,12 @@ The command's logic orchestrates various underlying processes:
             const openOrgRes = await prompts({
                 type: 'confirm',
                 name: 'value',
-                message: c.cyanBright(`Do you want to open org ${c.green(orgUsername)} in your browser ?`),
+                message: c.cyanBright(`Do you want to open org ${c.green(orgUsername)} in your browser?`),
                 description: 'Open the sandbox org in your web browser to start working on it',
                 initial: true
             });
             if (openOrgRes.value === true) {
-                uxLog("action", this, c.cyan(`Opening org ${c.green(orgUsername)} so you can work in it...`));
+                uxLog("action", this, c.cyan(`Opening org ${c.green(orgUsername)}...`));
                 await execSfdxJson('sf org open', this, {
                     fail: true,
                     output: false,
@@ -407,7 +407,7 @@ The command's logic orchestrates various underlying processes:
                 });
             }
         }
-        // Trigger a status refresh on VsCode WebSocket Client
+        // Trigger a status refresh on VS Code WebSocket Client
         WebSocketClient.sendRefreshStatusMessage();
     }
     async promptSandbox(flags, branchName) {
@@ -419,15 +419,15 @@ The command's logic orchestrates various underlying processes:
         const sandboxResponse = await prompts({
             type: 'select',
             name: 'value',
-            message: c.cyanBright(`Please select a sandbox org to use for your branch ${c.green(branchName)} (if you want to avoid conflicts, you should often refresh your sandbox)`),
+            message: c.cyanBright(`Select a sandbox org to work in branch ${c.green(branchName)}`),
             description: 'Choose an existing sandbox or connect to a new one for this branch',
             placeholder: 'Select sandbox',
             default: defaultSandbox ? defaultSandbox : undefined,
             choices: [
                 ...[
                     {
-                        title: c.yellow('🌐 Connect to a sandbox not appearing in this list'),
-                        description: 'Login in web browser to your source-tracked sandbox',
+                        title: c.yellow('🌐 Connect to a sandbox not in this list'),
+                        description: 'Login via web browser to your source-tracked sandbox',
                         value: 'connectSandbox',
                     },
                     /* {
@@ -470,7 +470,7 @@ The command's logic orchestrates various underlying processes:
         // Selected sandbox from list
         else {
             await makeSureOrgIsConnected(sandboxResponse.value);
-            uxLog("action", this, c.cyan(`Setting sandbox org ${c.green(sandboxResponse.value.instanceUrl)} (${sandboxResponse.value.username}) as default org...`));
+            uxLog("action", this, c.cyan(`Setting ${c.green(sandboxResponse.value.instanceUrl)} (${sandboxResponse.value.username}) as default org...`));
             await execCommand(`sf config set target-org=${sandboxResponse.value.username}`, this, {
                 output: true,
                 fail: true,

package/lib/commands/hardis/work/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/new.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/new.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AACjI,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EACL,aAAa,EACb,eAAe,EACf,WAAW,EACX,YAAY,EACZ,aAAa,EACb,iBAAiB,EACjB,OAAO,EACP,KAAK,GACN,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EACL,eAAe,EACf,WAAW,EACX,gBAAgB,EAChB,4BAA4B,EAC5B,eAAe,EACf,sBAAsB,EACtB,SAAS,GACV,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,aAAa,MAAM,sBAAsB,CAAC;AAEjD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,SAAc;IAC1C,MAAM,CAAC,KAAK,GAAG,gBAAgB,CAAC;IAEhC,MAAM,CAAC,WAAW,GAAG;;;;;;;;;;;;;;;;;;;mFAmBqD,SAAS,CAAC,YAAY;;;;;;;;;;;;;;;CAexG,CAAC;IAEO,MAAM,CAAC,QAAQ,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAElD,yCAAyC;IAElC,MAAM,CAAC,KAAK,GAAQ;QACzB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;YACtB,WAAW,EAAE,+DAA+D;SAC7E,CAAC;QACF,gBAAgB,EAAE,+BAA+B;QACjD,YAAY,EAAE,+BAA+B;KAC9C,CAAC;IAEF,uGAAuG;IAChG,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;IAE3B,YAAY,CAAS;IACrB,SAAS,GAAG,KAAK,CAAC;IAE5B,sBAAsB;IAEf,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;QAEtC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC,CAAC;QAClG,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC,CAAC;QAEhF,uEAAuE;QACvE,MAAM,aAAa,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,CAAC;QAE1C,IAAI,CAAC,YAAY,GAAG,MAAM,kBAAkB,EAAE,CAAC;QAE/C,MAAM,0BAA0B,GAAG;YACjC;gBACE,KAAK,EAAE,aAAa;gBACpB,KAAK,EAAE,SAAS;gBAChB,WAAW,EAAE,yFAAyF;aACvG;YACD;gBACE,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,KAAK;gBACZ,WAAW,EAAE,sEAAsE;aACpF;SACF,CAAC;QACF,MAAM,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,IAAI,0BAA0B,CAAC;QAErF,iGAAiG;QACjG,IAAI,iBAAiB,GAAG,EAAE,CAAC;QAC3B,MAAM,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC;QACzD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC;gBACpC,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,kDAAkD,CAAC;gBACzE,WAAW,EAAE,oDAAoD;gBACjE,WAAW,EAAE,kBAAkB;gBAC/B,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,OAAe,EAAE,EAAE;oBACjD,OAAO;wBACL,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO;wBACvE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO;qBAC/D,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,CAAC;YACH,iBAAiB,GAAG,eAAe,CAAC,OAAO,GAAG,GAAG,CAAC;QACpD,CAAC;QAED,+DAA+D;QAC/D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;YAC7B;gBACE,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,gDAAgD,CAAC;gBACvE,WAAW,EAAE,iEAAiE;gBAC9E,WAAW,EAAE,wBAAwB;gBACrC,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,mBAAmB;aAC7B;SACF,CAAC,CAAC;QAEH,oBAAoB;QACpB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,gBAAgB,IAAI,IAAI,EAAE,MAAM,CAAC,uBAAuB,IAAI,IAAI,CAAC,CAAC;QAEpH,mCAAmC;QACnC,MAAM,UAAU,GAAG,GAAG,iBAAiB,GAAG,QAAQ,CAAC,MAAM,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;QACrF,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;QACtC,KAAK,CACH,QAAQ,EACR,IAAI,EACJ,CAAC,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,OAAO,KAAK,CAAC,CAChG,CAAC;QACF,MAAM,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3C,uCAAuC;QACvC,MAAM,OAAO,EAAE,CAAC;QAChB,oBAAoB;QACpB,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAC/E,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;QAClC,6BAA6B;QAC7B,IAAI,MAAM,CAAC,iBAAiB,KAAK,IAAI,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,uBAAuB,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YACvG,MAAM,sBAAsB,GAAG,MAAM,OAAO,CAAC;gBAC3C,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,CAAC,CAAC,UAAU,CACnB,uDAAuD,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CACrF;gBACD,WAAW,EAAE,8DAA8D;gBAC3E,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,IAAI,sBAAsB,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC1C,MAAM,SAAS,CAAC,MAAM,EAAE,EAAE,iBAAiB,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;YACpE,CAAC;QACH,CAAC;QACD,gFAAgF;QAChF,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,yBAAyB,IAAI,EAAE,CAAC;QACpF,yBAAyB,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;QAC1D,MAAM,SAAS,CAAC,MAAM,EAAE,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC,CAAC;QAElF,qDAAqD;QACrD,MAAM,eAAe,GAAG,MAAM,EAAE,eAAe,IAAI,EAAE,CAAC;QACtD,IAAI,eAAe,GAAG,eAAe,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9E,4FAA4F;QAC5F,MAAM,cAAc,GAAU,EAAE,CAAC;QACjC,IAAI,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxE,cAAc,CAAC,IAAI,CAAC;gBAClB,KAAK,EAAE,qCAAqC;gBAC5C,KAAK,EAAE,SAAS;gBAChB,WAAW,EACT,8DAA8D;aACjE,CAAC,CAAC;QACL,CAAC;QACD,IAAI,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxE,cAAc,CAAC,IAAI,CAAC;gBAClB,KAAK,EAAE,gBAAgB;gBACvB,KAAK,EAAE,SAAS;gBAChB,WAAW,EAAE,4EAA4E;aAC1F,CAAC,CAAC;QACL,CAAC;QACD,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,CAAC;YAChE,cAAc,CAAC,IAAI,CAAC;gBAClB,KAAK,EAAE,kBAAkB,KAAK,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE;gBACnG,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,sCAAsC,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,EAAE;aACxF,CAAC,CAAC;QACL,CAAC;QACD,cAAc,CAAC,IAAI,CAAC;YAClB,KAAK,EAAE,wCAAwC;YAC/C,KAAK,EAAE,OAAO;YACd,WAAW,EAAE,2EAA2E;SACzF,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC;YACpC,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,8CAA8C,CAAC;YACrE,WAAW,EAAE,oEAAoE;YACjF,WAAW,EAAE,iBAAiB;YAC9B,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,cAAc;SACxB,CAAC,CAAC;QACH,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC;QAExC,8CAA8C;QAC9C,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,cAAc;YACd,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,KAAK,YAAY,EAAE,CAAC;YAC7E,yBAAyB;YACzB,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,qDAAqD,CAAC,CAAC,CAAC;QAC1F,CAAC;QAED,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QAChF,+CAA+C;QAC/C,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,eAA8B,EAAE,eAA8B;QACjF,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;YAC5B,eAAe,GAAG,qDAAqD,CAAC;QAC1E,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC;YACjC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,CAAC,CAAC,UAAU,CACnB,uFAAuF,CACxF;YACD,WAAW,EAAE,uFAAuF;YACpG,WAAW,EAAE,OAAO,eAAe,EAAE;SACtC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;QAC1E,IAAI,eAAe,IAAI,IAAI,IAAI,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3E,KAAK,CACH,SAAS,EACT,IAAI,EACJ,CAAC,CAAC,MAAM,CACN,uBAAuB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,wCAAwC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAC3H,CACF,CAAC;YACF,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,4BAA4B;IAC5B,KAAK,CAAC,wBAAwB,CAAC,UAAU,EAAE,KAAK;QAC9C,MAAM,cAAc,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7D,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,SAAS,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC,CAAC;QACxG,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,aAAa,EAAE,CAAC;QACvD,MAAM,WAAW,GAAG;YAClB;gBACE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,2BAA2B,CAAC;gBAC5C,KAAK,EAAE,eAAe;gBACtB,WAAW,EAAE,sEAAsE;aACpF;SACF,CAAC;QACF,IAAI,UAAU,EAAE,CAAC;YACf,WAAW,CAAC,IAAI,CAAC;gBACf,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC;gBACvC,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,qBAAqB,UAAU,CAAC,WAAW,sDAAsD;aAC/G,CAAC,CAAC;QACL,CAAC;QACD,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC;YACpC,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,mCAAmC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/E,WAAW,EAAE,qEAAqE;YAClF,WAAW,EAAE,2BAA2B;YACxC,OAAO,EAAE,CAAC;YACV,OAAO,EAAE;gBACP,GAAG,WAAW;gBACd,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,UAAe,EAAE,EAAE;oBACxC,OAAO;wBACL,KAAK,EAAE,wBAAwB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;wBAC3D,WAAW,EAAE,UAAU,CAAC,WAAW;wBACnC,KAAK,EAAE,UAAU;qBAClB,CAAC;gBACJ,CAAC,CAAC;aACH;SACF,CAAC,CAAC;QACH,IAAI,eAAe,CAAC,KAAK,KAAK,eAAe,EAAE,CAAC;YAC9C,MAAM,SAAS,CAAC,MAAM,EAAE;gBACtB,eAAe,EAAE,IAAI;gBACrB,kBAAkB,EAAE,IAAI;aACzB,CAAC,CAAC;YACH,+BAA+B;YAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;gBAChC,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YACH,qBAAqB;YACrB,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;YACjC,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,wBAAwB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;YAC3G,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,OAAO,CAAC,8BAA8B,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,kCAAkC;YAClC,MAAM,WAAW,CAAC,4BAA4B,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE;gBACpF,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YACH,KAAK,CACH,QAAQ,EACR,IAAI,EACJ,CAAC,CAAC,IAAI,CACJ,wBAAwB,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,KAAK,CACrF,eAAe,CAAC,KAAK,CAAC,QAAQ,CAC/B,EAAE,CACJ,CACF,CAAC;YACF,oBAAoB;YACpB,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC,CAAC;YACnE,MAAM,YAAY,CAAC,aAAa,EAAE,IAAI,EAAE;gBACtC,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE,IAAI,CAAC,SAAS;aACtB,CAAC,CAAC;YACH,uDAAuD;YACvD,eAAe,CAAC,wBAAwB,EAAE,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,2BAA2B;IAC3B,KAAK,CAAC,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,eAAyC;QAC9F,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,eAAe,KAAK,YAAY,EAAE,CAAC;YACrC,OAAO,GAAG,IAAI,CAAC;YACf,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;YAChD,MAAM,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAC5C,CAAC;aACI,CAAC;YACJ,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;YAC9D,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;YACpC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QAC9B,CAAC;QAED,oDAAoD;QACpD,IAAI,CAAC,CAAC,MAAM,CAAC,kBAAkB,KAAK,IAAI,CAAC,EAAE,CAAC;YAC1C,MAAM,mBAAmB,GAAG,MAAM,OAAO,CAAC;gBACxC,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,CAAC,CAAC,UAAU,CACnB,sDAAsD,IAAI,CAAC,YAAY,kBAAkB,CAC1F;gBACD,WAAW,EAAE,qJAAqJ;gBAClK,WAAW,EAAE,oBAAoB;gBACjC,OAAO,EAAE;oBACP;wBACE,KAAK,EAAE,2DAA2D;wBAClE,KAAK,EAAE,IAAI;wBACX,WAAW,EAAE,kFAAkF;qBAChG;oBACD;wBACE,KAAK,EAAE,2CAA2C;wBAClD,KAAK,EAAE,MAAM;wBACb,WAAW,EAAE,iDAAiD,IAAI,CAAC,YAAY,oGAAoG;qBACpL;iBACF;aACF,CAAC,CAAC;YACH,IAAI,WAAW,GAAG,mBAAmB,CAAC,KAAK,KAAK,MAAM,CAAC;YACvD,wDAAwD;YACxD,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC;oBAClC,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,CAAC,CAAC,UAAU,CACnB,2CAA2C,IAAI,CAAC,YAAY,wEAAwE,CACrI;oBACD,WAAW,EAAE,8EAA8E;iBAC5F,CAAC,CAAC;gBACH,WAAW,GAAG,aAAa,CAAC,KAAK,KAAK,IAAI,CAAC;YAC7C,CAAC;YACD,IAAI,WAAW,EAAE,CAAC;gBAChB,IAAI,cAAc,GAAQ,IAAI,CAAC;gBAC/B,IAAI,cAAc,GAAQ,IAAI,CAAC;gBAC/B,IAAI,CAAC;oBACH,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;wBAC7B,MAAM,eAAe,CAAC,MAAM,CAAC,iBAAiB,IAAI,EAAE,EAAE,WAAW,CAAC,CAAC;oBACrE,CAAC;oBACD,IAAI,CAAC;wBACH,kGAAkG;wBAClG,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC,CAAC;wBACpE,MAAM,WAAW,CAAC,6CAA6C,WAAW,EAAE,EAAE,IAAI,EAAE;4BAClF,IAAI,EAAE,KAAK;4BACX,MAAM,EAAE,IAAI;yBACb,CAAC,CAAC;wBACH,MAAM,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;oBACnG,CAAC;oBAAC,OAAO,EAAE,EAAE,CAAC;wBACZ,cAAc,GAAG,EAAE,CAAC;oBACtB,CAAC;oBACD,MAAM,4BAA4B,CAAC,MAAM,CAAC,kBAAkB,IAAI,EAAE,EAAE,WAAW,CAAC,CAAC;oBACjF,MAAM,eAAe,CAAC,MAAM,CAAC,yBAAyB,IAAI,EAAE,EAAE,WAAW,CAAC,CAAC;oBAC3E,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,WAAW,CAAC,CAAC;gBACnF,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,cAAc,GAAG,CAAC,CAAC;gBACrB,CAAC;gBACD,IAAI,cAAc,EAAE,CAAC;oBACnB,KAAK,CACH,KAAK,EACL,IAAI,EACJ,CAAC,CAAC,IAAI,CAAC,uCAAuC,GAAG,cAAc,CAAC,OAAO,GAAG,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CACvG,CAAC;oBACF,KAAK,CACH,SAAS,EACT,IAAI,EACJ,CAAC,CAAC,MAAM,CACN,iGAAiG,CAClG,CACF,CAAC;gBACJ,CAAC;gBACD,IAAI,cAAc,EAAE,CAAC;oBACnB,KAAK,CACH,KAAK,EACL,IAAI,EACJ,CAAC,CAAC,IAAI,CAAC,6CAA6C,GAAG,cAAc,CAAC,OAAO,GAAG,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,CAC7G,CAAC;oBACF,KAAK,CACH,SAAS,EACT,IAAI,EACJ,CAAC,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;MACvE,CAAC,CAAC,IAAI,CACE,gBAAgB,CACjB;MACP,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;;SAE3B,CAAC,CACC,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,8BAA8B;QAC9B,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC;gBAC/B,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,mBAAmB,CAAC;gBACzF,WAAW,EAAE,iEAAiE;gBAC9E,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YACH,IAAI,UAAU,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC9B,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;gBACxE,MAAM,YAAY,CAAC,aAAa,EAAE,IAAI,EAAE;oBACtC,IAAI,EAAE,IAAI;oBACV,MAAM,EAAE,KAAK;oBACb,KAAK,EAAE,IAAI,CAAC,SAAS;iBACtB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,uDAAuD;QACvD,eAAe,CAAC,wBAAwB,EAAE,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,KAAU,EAAE,UAAe;QACrD,MAAM,cAAc,GAAG,KAAK,CAAC,gBAAgB,CAAC,EAAE,WAAW,EAAE,CAAC;QAC9D,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,YAAY,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC,CAAC;QAC3G,MAAM,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,GAAQ,EAAE,EAAE;YACtD,OAAO,GAAG,CAAC,QAAQ,KAAK,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC;YACpC,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,CAAC,CAAC,UAAU,CACnB,0CAA0C,CAAC,CAAC,KAAK,CAC/C,UAAU,CACX,EAAE,CACJ;YACD,WAAW,EAAE,oEAAoE;YACjF,WAAW,EAAE,gBAAgB;YAC7B,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;YACpD,OAAO,EAAE;gBACP,GAAG;oBACD;wBACE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,0CAA0C,CAAC;wBAC3D,WAAW,EAAE,sDAAsD;wBACnE,KAAK,EAAE,gBAAgB;qBACxB;oBACD;;;yBAGK;iBACN;gBACD,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,UAAe,EAAE,EAAE;oBACxC,OAAO;wBACL,KAAK,EAAE,UAAU,CAAC,WAAW;wBAC7B,WAAW,EAAE,sBAAsB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;wBACtF,KAAK,EAAE,UAAU;qBAClB,CAAC;gBACJ,CAAC,CAAC;aACH;SACF,CAAC,CAAC;QACH,sDAAsD;QACtD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,eAAe,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACxD,MAAM,SAAS,CAAC,MAAM,EAAE;gBACtB,eAAe,EAAE,IAAI;gBACrB,kBAAkB,EAAE,IAAI;aACzB,CAAC,CAAC;QACL,CAAC;QAED,uBAAuB;QACvB,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,eAAe,CAAC,KAAK,KAAK,gBAAgB,EAAE,CAAC;YAC/C,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/E,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAClC,CAAC;QAED,sDAAsD;aACjD,IAAI,eAAe,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;YAChD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,CAAC;YAC/C,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,OAAO,CAAC,8BAA8B,CAAC,CAAC;YACpD,CAAC;YACD,WAAW,GAAI,YAAoB,CAAC,QAAQ,CAAC;QAC/C,CAAC;QAED,6BAA6B;aACxB,CAAC;YACJ,MAAM,sBAAsB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACpD,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,eAAe,CAAC,KAAK,CAAC,QAAQ,qBAAqB,CAAC,CAAC,CAAC;YAC7I,MAAM,WAAW,CAAC,4BAA4B,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE;gBACpF,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YACH,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC7C,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC"}

package/lib/commands/hardis/work/refresh.js

@@ -175,7 +175,7 @@ The command's technical implementation involves:
                 const mergeResult = await prompts({
                     type: 'select',
                     name: 'value',
-                    message: c.cyanBright('There are merge conflicts, please solve them, then select YES here. Otherwise, exit the script and call a developer for help :)'),
+                    message: c.cyanBright('There are merge conflicts, please solve them, then select YES here. Otherwise, exit the script and call a developer for help 😊'),
                     description: 'Choose your next action after attempting to resolve merge conflicts',
                     placeholder: 'Select an option',
                     choices: [

package/lib/commands/hardis/work/resetselection.js

@@ -77,7 +77,7 @@ The command's technical implementation involves:
             description: 'Confirm that you want to perform a soft git reset on your current branch',
         });
         if (confirm.value === false) {
-            throw new SfError(c.red('[sfdx-hardis] Cancelled by user'));
+            throw new SfError(c.red('[sfdx-hardis] Cancelled by user.'));
         }
         // List all commits since the branch creation
         const logResult = await git().log([`${targetBranch}..${currentGitBranch}`]);

package/lib/commands/hardis/work/resetselection.js.map

@@ -1 +1 @@
-{"version":3,"file":"resetselection.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/resetselection.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,SAAc;IACnD,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC;IAE9B,MAAM,CAAC,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6B7B,CAAC;IAEO,MAAM,CAAC,QAAQ,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAExD,yCAAyC;IAElC,MAAM,CAAC,KAAK,GAAQ;QACzB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;YACtB,WAAW,EAAE,+DAA+D;SAC7E,CAAC;QACF,YAAY,EAAE,+BAA+B;KAC9C,CAAC,CAAC,uGAAuG;IACnG,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;IAE3B,SAAS,GAAG,KAAK,CAAC;IAE5B,sBAAsB;IAEf,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;QAEtC,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC;YAC5C,OAAO,EAAE,yEAAyE;SACnF,CAAC,CAAC;QAEH,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;QAE9H,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,EAAE,CAAC;QACrD,IAAI,gBAAgB,KAAK,YAAY,EAAE,CAAC;YACtC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC,CAAC;QAC/F,CAAC;QAED,sBAAsB;QACtB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC;YAC5B,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,kDAAkD,gBAAgB,uEAAuE;YAClJ,WAAW,EAAE,0EAA0E;SACxF,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAC5B,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,6CAA6C;QAC7C,MAAM,SAAS,GAAG,MAAM,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,YAAY,KAAK,gBAAgB,EAAE,CAAC,CAAC,CAAC;QAC5E,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC;QACrC,MAAM,oBAAoB,GAAG,cAAc,CAAC,MAAM,CAAC;QACnD,gBAAgB;QAChB,MAAM,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,QAAQ,oBAAoB,EAAE,CAAC,CAAC,CAAC;QAC9E,MAAM,SAAS,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,gBAAgB;QAChB,MAAM,WAAW,CAAC,WAAW,EAAE,IAAI,EAAE;YACnC,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,IAAI,CAAC,SAAS;SACtB,CAAC,CAAC,CAAC,4EAA4E;QAChF,MAAM,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC;QACrE,MAAM,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,iCAAiC,CAAC,CAAC,CAAC;QAChF,MAAM,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;QACrC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC,CAAC;QACrF,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,CAAC;QAC1D,+CAA+C;QAC/C,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,CAAC;IACtD,CAAC"}
+{"version":3,"file":"resetselection.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/resetselection.ts"],"names":[],"mappings":"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"}

package/lib/commands/hardis/work/save.js

@@ -5,7 +5,7 @@ import c from 'chalk';
 import fs from 'fs-extra';
 import open from 'open';
 import * as path from 'path';
-import { createTempDir, execCommand, getCurrentGitBranch, getGitRepoUrl, git, gitHasLocalUpdates, gitPush, normalizeFileStatusPath, uxLog, } from '../../../common/utils/index.js';
+import { createTempDir, execCommand, getCurrentGitBranch, getGitRepoUrl, git, gitHasLocalUpdates, gitPush, normalizeFileStatusPath, uxLog, uxLogTable, } from '../../../common/utils/index.js';
 import { exportData } from '../../../common/utils/dataUtils.js';
 import { forceSourcePull } from '../../../common/utils/deployUtils.js';
 import { callSfdxGitDelta, getGitDeltaScope, selectTargetBranch } from '../../../common/utils/gitUtils.js';
@@ -152,7 +152,7 @@ The command's technical implementation involves a series of orchestrated steps:
             });
         }
         // User log info
-        uxLog("action", this, c.cyan(`This command will help to prepare the ${GitProvider.getMergeRequestName(this.gitUrl)} from your branch ${c.green(localBranch)} to major branch ${c.green(this.targetBranch)}`));
+        uxLog("action", this, c.cyan(`Preparing ${GitProvider.getMergeRequestName(this.gitUrl)} from branch ${c.green(localBranch)} to ${c.green(this.targetBranch)}`));
         // Make sure git is clean before starting operations
         await this.cleanGitStatus();
         // Make sure commit is ready before starting operations
@@ -171,7 +171,7 @@ The command's technical implementation involves a series of orchestrated steps:
         let mergeRequestUrl = GitProvider.getMergeRequestCreateUrl(this.gitUrl, this.targetBranch || '', this.currentBranch);
         mergeRequestUrl = mergeRequestUrl || this.gitUrl.replace('.git', '');
         // Merge request
-        uxLog("action", this, c.cyan(`If your work is ${c.bold('completed')}, you can create a ${c.bold(GitProvider.getMergeRequestName(this.gitUrl))}, otherwise you can push new commits on ${c.green(this.currentBranch)} branch.`));
+        uxLog("action", this, c.cyan(`If your work is ${c.bold('completed')}, create a ${c.bold(GitProvider.getMergeRequestName(this.gitUrl))}, otherwise push new commits to the ${c.green(this.currentBranch)} branch.`));
         let summaryMsg = c.grey("");
         if (WebSocketClient.isAliveWithLwcUI()) {
             WebSocketClient.sendReportFileMessage(mergeRequestUrl, `Create ${GitProvider.getMergeRequestName(this.gitUrl)}`, 'actionUrl');
@@ -184,19 +184,19 @@ The command's technical implementation involves a series of orchestrated steps:
         summaryMsg += c.grey(`- Source branch: ${c.green(this.currentBranch)}\n`);
         summaryMsg += c.grey(`- Target branch: ${c.green(this.targetBranch)}`);
         uxLog("log", this, summaryMsg);
-        uxLog("log", this, `${c.yellow(`When your ${GitProvider.getMergeRequestName(this.gitUrl)} will have been merged:`)}
+        uxLog("log", this, `${c.yellow(`When your ${GitProvider.getMergeRequestName(this.gitUrl)} has been merged:`)}
 - ${c.yellow('DO NOT REUSE THE SAME BRANCH')}
-- Use New User Story menu (sf hardis:work:new), even if you work in the same sandbox or scratch org :)`);
+- Use New User Story menu (sf hardis:work:new), even if you work in the same sandbox or scratch org 😊`);
         // Manual actions file
         const config = await getConfig('project');
         if (config.manualActionsFileUrl && config.manualActionsFileUrl !== '') {
-            uxLog("warning", this, c.yellow(`If you have pre-deployment or post-deployment manual actions, make sure to write them in the file ${c.green(config.manualActionsFileUrl)}`));
+            uxLog("warning", this, c.yellow(`If you have pre-deployment or post-deployment manual actions, record them in ${c.green(config.manualActionsFileUrl)}`));
             if (WebSocketClient.isAliveWithLwcUI()) {
                 WebSocketClient.sendReportFileMessage(config.manualActionsFileUrl, `Update Manual Actions file`, 'actionUrl');
             }
         }
         else {
-            uxLog("warning", this, c.yellow(`You should have a manual actions file defined. Ask your release manager to create one for the project and set its link in your .sfdx-hardis.yml file under manualActionsFileUrl property.`));
+            uxLog("warning", this, c.yellow(`Define a manual actions file. Ask your release manager to create one and set its URL in .sfdx-hardis.yml under manualActionsFileUrl.`));
         }
         if (!WebSocketClient.isAliveWithLwcUI()) {
             uxLog("log", this, c.grey(`${GitProvider.getMergeRequestName(this.gitUrl)} documentation is available here -> ${c.bold(mergeRequestDoc)}`));
@@ -234,24 +234,24 @@ The command's technical implementation involves a series of orchestrated steps:
         const commitReadyRes = await prompts({
             type: 'select',
             name: 'value',
-            message: c.cyanBright('Have you already committed the updated metadata you want to deploy ?'),
+            message: c.cyanBright('Have you already committed the updated metadata you want to deploy?'),
             description: 'Select your current state regarding git commits and metadata updates',
             placeholder: 'Select commit status',
             choices: [
                 {
-                    title: '😎 Yes, my commit(s) is ready ! I staged my files then created one or multiple commits !',
+                    title: '😎 Yes, my commit(s) are ready! I staged my files and created one or multiple commits.',
                     value: 'commitReady',
-                    description: "You have already pulled updates from your org (or locally updated the files if you're a nerd) then staged your files and created a commit",
+                    description: "You have already pulled updates from your org (or locally updated the files if you're a nerd), staged your files, and created a commit",
                 },
                 {
-                    title: '😐 No, please pull my latest updates from my org so I can commit my metadatas',
+                    title: '😐 No, please pull my latest updates from my org so I can commit my metadata',
                     value: 'pleasePull',
-                    description: 'Pull latest updates from org so then you can stage files and create your commit',
+                    description: 'Pull latest updates from org so you can stage files and create your commit',
                 },
                 {
-                    title: '😱 What is a commit ? What does mean pull ? Help !',
+                    title: '😱 What is a commit? What does pull mean? Help!',
                     value: 'help',
-                    description: "Don't panic, just click on the link that will appear in the console (CTRL + Click) and then you will know :)",
+                    description: "Don't panic, just click on the link that will appear in the console (CTRL + Click) and you'll learn!",
                 },
             ],
         });
@@ -259,7 +259,7 @@ The command's technical implementation involves a series of orchestrated steps:
             // Process sf project retrieve start
             uxLog("action", this, c.cyan(`Pulling sources from scratch org ${flags['target-org'].getUsername()}...`));
             await forceSourcePull(flags['target-org'].getUsername(), this.debugMode);
-            uxLog("action", this, c.cyan(`Sources has been pulled from ${flags['target-org'].getUsername()}, now you can stage and commit your updates !`));
+            uxLog("action", this, c.cyan(`Sources have been pulled from ${flags['target-org'].getUsername()}, now you can stage and commit your updates!`));
             WebSocketClient.sendReportFileMessage("workbench.view.scm", "Commit your retrieved files", "actionCommand");
             WebSocketClient.sendReportFileMessage(`${CONSTANTS.DOC_URL_ROOT}/salesforce-ci-cd-publish-task/#commit-your-updates`, "Retrieve and Commit documentation", 'docUrl');
             return { outputString: 'Pull performed' };
@@ -344,12 +344,23 @@ The command's technical implementation involves a series of orchestrated steps:
         // Commit updates
         let gitStatusWithConfig = await git().status();
         if (gitStatusWithConfig.staged.length > 0 && !this.noGit) {
-            uxLog("log", this, c.grey(`Committing updated files in local git branch ${c.green(this.currentBranch)}...`));
+            const commitMessage = '[sfdx-hardis] Update package content';
+            uxLog("action", this, c.cyan(`🌿Adding new commit: ${commitMessage}\n- Contains package.xml and destructiveChanges.xml updates based on your metadata changes.`));
+            // Build files list for table
+            const filesTable = gitStatusWithConfig.staged.map((file) => {
+                const status = gitStatusWithConfig.files.find(f => f.path === file);
+                const statusLabel = status?.working_dir === 'D' ? 'deleted' : status?.index === 'A' ? 'created' : 'modified';
+                return {
+                    Status: statusLabel,
+                    File: file
+                };
+            });
+            uxLogTable(this, filesTable, ['Status', 'File']);
             try {
-                await git({ output: true }).commit('[sfdx-hardis] Update package content');
+                await git({ output: true }).commit(commitMessage);
             }
             catch (e) {
-                uxLog("warning", this, c.yellow(`There may be an issue while committing files but it can be ok to ignore it\n${c.grey(e.message)}`));
+                uxLog("warning", this, c.yellow(`There may be an issue while committing files, but it can be safely ignored\n${c.grey(e.message)}`));
                 gitStatusWithConfig = await git().status();
             }
         }
@@ -364,11 +375,11 @@ The command's technical implementation involves a series of orchestrated steps:
             // References cleaning
             await CleanReferences.run(['--type', 'all']);
             if (globalThis?.displayProfilesWarning === true) {
-                uxLog("warning", this, c.yellow(c.bold('Please make sure the attributes removed from Profiles are defined on Permission Sets :)')));
+                uxLog("warning", this, c.yellow(c.bold('Please make sure the attributes removed from Profiles are defined on Permission Sets 😊')));
             }
             // Xml cleaning
             if (config.cleanXmlPatterns && config.cleanXmlPatterns.length > 0) {
-                uxLog("action", this, c.cyan('Cleaning sfdx project using patterns and xpaths defined in cleanXmlPatterns...'));
+                uxLog("action", this, c.cyan('Cleaning project using patterns defined in cleanXmlPatterns...'));
                 await CleanXml.run([]);
             }
             // Manage git after cleaning
@@ -378,11 +389,18 @@ The command's technical implementation involves a series of orchestrated steps:
                 .filter((file) => !gitStatusFilesBeforeClean.includes(file.path))
                 .map((file) => normalizeFileStatusPath(file.path, config));
             if (cleanedFiles.length > 0) {
-                uxLog("log", this, c.grey(`Cleaned the following list of files:\n${cleanedFiles.join('\n')}`));
                 if (!this.noGit) {
                     try {
                         await git().add(cleanedFiles);
-                        await git({ output: true }).commit('[sfdx-hardis] Clean sfdx project');
+                        const commitMessage = '[sfdx-hardis] Clean sfdx project';
+                        uxLog("action", this, c.cyan(`🌿Adding new commit: ${commitMessage}\n- Contains files that have been automatically cleaned per your configuration.`));
+                        // Build files list for table
+                        const filesTable = cleanedFiles.map((file) => ({
+                            Status: 'modified',
+                            File: file
+                        }));
+                        uxLogTable(this, filesTable, ['Status', 'File']);
+                        await git({ output: true }).commit(commitMessage);
                     }
                     catch (e) {
                         uxLog("warning", this, c.yellow(`There may be an issue while adding cleaned files but it can be ok to ignore it\n${c.grey(e.message)}`));
@@ -484,11 +502,23 @@ The command's technical implementation involves a series of orchestrated steps:
         }
         let gitStatusAfterDeployPlan = await git().status();
         if (gitStatusAfterDeployPlan.staged.length > 0 && !this.noGit) {
+            const commitMessage = '[sfdx-hardis] Update deployment plan';
+            uxLog("action", this, c.cyan(`🌿Adding new commit: ${commitMessage}\n- Contains deployment plan updates (legacy feature).`));
+            // Build files list for table
+            const filesTable = gitStatusAfterDeployPlan.staged.map((file) => {
+                const status = gitStatusAfterDeployPlan.files.find(f => f.path === file);
+                const statusLabel = status?.working_dir === 'D' ? 'deleted' : status?.index === 'A' ? 'created' : 'modified';
+                return {
+                    Status: statusLabel,
+                    File: file
+                };
+            });
+            uxLogTable(this, filesTable, ['Status', 'File']);
             try {
-                await git({ output: true }).commit('[sfdx-hardis] Update deployment plan');
+                await git({ output: true }).commit(commitMessage);
             }
             catch (e) {
-                uxLog("warning", this, c.yellow(`There may be an issue while committing files but it can be ok to ignore it\n${c.grey(e.message)}`));
+                uxLog("warning", this, c.yellow(`There may be an issue while committing files, but it can be safely ignored\n${c.grey(e.message)}`));
                 gitStatusAfterDeployPlan = await git().status();
             }
         }
@@ -510,7 +540,7 @@ The command's technical implementation involves a series of orchestrated steps:
                 description: 'Choose whether to push your commits to the remote git repository',
             });
             if (pushResponse.push === true) {
-                uxLog("action", this, c.cyan(`Pushing new commit(s) in remote git branch ${c.green(`origin/${this.currentBranch}`)}...`));
+                uxLog("action", this, c.cyan(`Pushing commit(s) to remote branch ${c.green(`origin/${this.currentBranch}`)}...`));
                 const configUSer = await getConfig('user');
                 let pushResult;
                 if (configUSer.canForcePush === true) {