npm - sfdx-hardis - Versions diffs - 2.76.2 → 2.77.0 - Mend

sfdx-hardis 2.76.2 → 2.77.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (24) hide show

package/CHANGELOG.md +13 -1
package/README.md +93 -85
package/lib/commands/hardis/mdapi/deploy.d.ts +1 -1
package/lib/commands/hardis/mdapi/deploy.js +1 -1
package/lib/commands/hardis/org/user/activateinvalid.d.ts +2 -0
package/lib/commands/hardis/org/user/activateinvalid.js +15 -3
package/lib/commands/hardis/org/user/activateinvalid.js.map +1 -1
package/lib/commands/hardis/project/deploy/sources/dx.js +30 -7
package/lib/commands/hardis/project/deploy/sources/dx.js.map +1 -1
package/lib/commands/hardis/source/deploy.d.ts +1 -1
package/lib/commands/hardis/source/deploy.js +1 -1
package/lib/commands/hardis/source/push.d.ts +1 -1
package/lib/commands/hardis/source/push.js +1 -1
package/lib/common/metadata-utils/index.js +1 -1
package/lib/common/metadata-utils/index.js.map +1 -1
package/lib/common/utils/deployTipsList.d.ts +0 -7
package/lib/common/utils/deployTipsList.js +0 -1
package/lib/common/utils/deployTipsList.js.map +1 -1
package/lib/common/utils/notifUtils.js +17 -8
package/lib/common/utils/notifUtils.js.map +1 -1
package/lib/common/utils/orgUtils.js +7 -3
package/lib/common/utils/orgUtils.js.map +1 -1
package/oclif.manifest.json +1 -1
package/package.json +3 -2

package/lib/commands/hardis/mdapi/deploy.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { FlagsConfig, SfdxCommand } from "@salesforce/command";
 import { AnyJson } from "@salesforce/ts-types";
 export declare class Deploy extends SfdxCommand {
-    static readonly description = "sfdx-hardis wrapper for sfdx force:mdapi:deploy that displays tips to solve deployment errors.\n\nSee documentation at https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_mdapi.htm#cli_reference_force_mdapi_deploy\n";
+    static readonly description = "sfdx-hardis wrapper for sfdx force:mdapi:deploy that displays tips to solve deployment errors.\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_mdapi.htm#cli_reference_force_mdapi_deploy)\n";
     static readonly examples: any[];
     static readonly requiresUsername = true;
     static readonly flagsConfig: FlagsConfig;

package/lib/commands/hardis/mdapi/deploy.js CHANGED Viewed

@@ -15,7 +15,7 @@ class Deploy extends command_1.SfdxCommand {
 exports.Deploy = Deploy;
 Deploy.description = `sfdx-hardis wrapper for sfdx force:mdapi:deploy that displays tips to solve deployment errors.
-See documentation at https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_mdapi.htm#cli_reference_force_mdapi_deploy
+[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_mdapi.htm#cli_reference_force_mdapi_deploy)
 `;
 Deploy.examples = [];
 Deploy.requiresUsername = true;

package/lib/commands/hardis/org/user/activateinvalid.d.ts CHANGED Viewed

@@ -5,11 +5,13 @@ export default class OrgUserActiveInvalid extends SfdxCommand {
     static description: string;
     static examples: string[];
     protected static flagsConfig: {
+        profiles: flags.Discriminated<flags.String>;
         debug: flags.Discriminated<flags.Boolean<boolean>>;
         websocket: flags.Discriminated<flags.String>;
     };
     protected static requiresUsername: boolean;
     protected static requiresProject: boolean;
+    protected profiles: any[];
     protected maxUsersDisplay: number;
     protected debugMode: boolean;
     run(): Promise<AnyJson>;

package/lib/commands/hardis/org/user/activateinvalid.js CHANGED Viewed

@@ -18,16 +18,25 @@ const messages = core_1.Messages.loadMessages("sfdx-hardis", "org");
 class OrgUserActiveInvalid extends command_1.SfdxCommand {
     constructor() {
         super(...arguments);
+        this.profiles = [];
         this.maxUsersDisplay = 100;
         this.debugMode = false;
     }
     /* jscpd:ignore-end */
     async run() {
+        this.profiles = this.flags.profiles ? this.flags.profiles.split(",") : null;
+        const hasProfileConstraint = this.profiles !== null;
         this.debugMode = this.flags.debug || false;
         const conn = this.org.getConnection();
         // Query users that we want to freeze
         utils_1.uxLog(this, c.cyan(`Querying User records with email ending with .invalid...`));
-        const userQuery = `SELECT Id,Name,Username,Email,ProfileId FROM User WHERE Email LIKE '%.invalid' and IsActive=true`;
+        let userQuery = `SELECT Id,Name,Username,Email,ProfileId FROM User WHERE Email LIKE '%.invalid' and IsActive=true`;
+        if (hasProfileConstraint) {
+            const profilesQuery = `SELECT Id FROM Profile WHERE Name IN ('${this.profiles.join("','")}')`;
+            const profilesQueryRes = await apiUtils_1.soqlQuery(profilesQuery, conn);
+            const profileIds = profilesQueryRes.records.map((profile) => profile.Id);
+            userQuery += ` and ProfileId IN ('${profileIds.join("','")}')`;
+        }
         const userQueryRes = await apiUtils_1.bulkQuery(userQuery, conn);
         const usersToActivate = userQueryRes.records;
         // Check empty result
@@ -38,7 +47,7 @@ class OrgUserActiveInvalid extends command_1.SfdxCommand {
         }
         let usersToActivateFinal = [...usersToActivate];
         // Request confirmation or selection from user
-        if (!utils_1.isCI) {
+        if (!utils_1.isCI && !hasProfileConstraint) {
             const confirmSelect = await prompts_1.prompts({
                 type: "select",
                 name: "value",
@@ -113,7 +122,10 @@ OrgUserActiveInvalid.description = `Update sandbox users so their email is valid
 OrgUserActiveInvalid.examples = [`$ sfdx hardis:org:user:activateinvalid`, `$ sfdx hardis:org:user:activateinvalid --targetusername myuser@myorg.com`];
 // public static args = [{name: 'file'}];
 OrgUserActiveInvalid.flagsConfig = {
-    // flag with a value (-n, --name=VALUE)
+    profiles: command_1.flags.string({
+        char: "p",
+        description: "Comma-separated list of profiles names that you want to reactive users assigned to and with a .invalid email",
+    }),
     debug: command_1.flags.boolean({
         char: "d",
         default: false,

package/lib/commands/hardis/org/user/activateinvalid.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"activateinvalid.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/user/activateinvalid.ts"],"names":[],"mappings":";;AAAA,wBAAwB;AACxB,iDAAyD;AACzD,2CAA4C;AAE5C,2BAA2B;AAC3B,uCAAuC;AACvC,wCAAwC;AACxC,oDAAuD;AACvD,8DAA2D;AAC3D,~~gEAA0E~~;~~AAC1E~~,gEAAmE;AAEnE,wDAAwD;AACxD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,iGAAiG;AACjG,mFAAmF;AACnF,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAqB,oBAAqB,SAAQ,qBAAW;IAA7D;;~~QAiCY~~,oBAAe,GAAG,GAAG,CAAC;QACtB,cAAS,GAAG,KAAK,CAAC;~~IAiG9B~~,CAAC;~~IA/FC~~,sBAAsB;IAEf,KAAK,CAAC,GAAG;QACd,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;QAE3C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QAEtC,qCAAqC;QACrC,aAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC,CAAC;QAChF,~~MAAM~~,SAAS,GAAG,kGAAkG,CAAC;~~QACrH~~,MAAM,YAAY,GAAG,MAAM,oBAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACtD,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC;QAE7C,qBAAqB;QACrB,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YAChC,MAAM,YAAY,GAAG,gEAAgE,CAAC;YACtF,aAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;YACpC,OAAO,EAAE,YAAY,EAAE,CAAC;SACzB;QAED,IAAI,oBAAoB,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;QAChD,8CAA8C;QAC9C,IAAI,CAAC,YAAI,EAAE;~~YACT~~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~~AAlIH~~,~~uCAmIC~~;~~AAlIe~~,0BAAK,GAAG,kCAAkC,CAAC;AAE3C,gCAAW,GAAG;;;CAG7B,CAAC;AAEc,6BAAQ,GAAG,CAAC,wCAAwC,EAAE,0EAA0E,CAAC,CAAC;AAEhJ,yCAAyC;AAExB,gCAAW,GAAG;IAC7B,~~uCAAuC~~;~~IACvC~~,KAAK,EAAE,eAAK,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;KAC9C,CAAC;IACF,SAAS,EAAE,eAAK,CAAC,MAAM,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;KAC9C,CAAC;CACH,CAAC;AAEF,oEAAoE;AACnD,qCAAgB,GAAG,IAAI,CAAC;AAEzC,uEAAuE;AACvE,kDAAkD;AAElD,uGAAuG;AACtF,oCAAe,GAAG,KAAK,CAAC"}
1	+ {"version":3,"file":"activateinvalid.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/user/activateinvalid.ts"],"names":[],"mappings":"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"}

package/lib/commands/hardis/project/deploy/sources/dx.js CHANGED Viewed

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@salesforce/command");
 const core_1 = require("@salesforce/core");
+const c = require("chalk");
 const fs = require("fs-extra");
 const metadata_utils_1 = require("../../../../../common/metadata-utils");
 const utils_1 = require("../../../../../common/utils");
@@ -28,17 +29,31 @@ class DxSources extends command_1.SfdxCommand {
         const testlevel = this.flags.testlevel || this.configInfo.testLevel || "RunLocalTests";
         const packageXml = this.flags.packagexml || null;
         this.debugMode = this.flags.debug || false;
-        // Install packages
-        const packages = this.configInfo.installedPackages || [];
-        if (packages.length > 0 && !check) {
-            // Install package only if we are in real deployment mode
-            await metadata_utils_1.MetadataUtils.installPackagesOnOrg(packages, null, this, "deploy");
-        }
+        // Get target org
         let targetUsername = this.org.getUsername();
         if (!utils_1.isCI) {
             const targetOrg = await orgUtils_1.promptOrg(this, { devHub: false, setDefault: false, scratch: false });
             targetUsername = targetOrg.username;
         }
+        // Install packages
+        const packages = this.configInfo.installedPackages || [];
+        const missingPackages = [];
+        const installPackages = check === false || process.env.INSTALL_PACKAGES_DURING_CHECK_DEPLOY === "true" || this.configInfo.installPackagesDuringCheckDeploy === true;
+        if (packages.length > 0 && installPackages) {
+            // Install packages only if we are in real deployment mode
+            await metadata_utils_1.MetadataUtils.installPackagesOnOrg(packages, targetUsername, this, "deploy");
+        }
+        else if (packages.length > 0 && check === true) {
+            // If check mode, warn if there are missing packages
+            const alreadyInstalled = await metadata_utils_1.MetadataUtils.listInstalledPackages(targetUsername, this);
+            for (const package1 of packages) {
+                if (alreadyInstalled.filter((installedPackage) => package1.SubscriberPackageVersionId === installedPackage.SubscriberPackageVersionId)
+                    .length === 0 &&
+                    package1.installDuringDeployments === true) {
+                    missingPackages.push(package1);
+                }
+            }
+        }
         // Get package.xml
         const packageXmlFile = packageXml || process.env.PACKAGE_XML_TO_DEPLOY || this.configInfo.packageXmlToDeploy || fs.existsSync("./manifest/package.xml")
             ? "./manifest/package.xml"
@@ -54,6 +69,14 @@ class DxSources extends command_1.SfdxCommand {
         if (fs.existsSync(packageDeletedXmlFile)) {
             forceSourceDeployOptions.postDestructiveChanges = packageDeletedXmlFile;
         }
+        // Display missing packages message
+        if (missingPackages.length > 0) {
+            for (const package1 of missingPackages) {
+                utils_1.uxLog(this, c.yellow(`You may need to install package ${c.bold(package1.SubscriberPackageName)} ${c.bold(package1.SubscriberPackageVersionId)} in target org to validate the deployment check`));
+            }
+            utils_1.uxLog(this, "");
+            utils_1.uxLog(this, c.yellow(c.italic(`If you want deployment checks to automatically install packages, please define ${c.bold("INSTALL_PACKAGES_DURING_CHECK_DEPLOY=true")} in ENV vars, or property ${c.bold("installPackagesDuringCheckDeploy: true")} in .sfdx-hardis.yml`)));
+        }
         // Process deployment (or deployment check)
         const { messages } = await deployUtils_1.forceSourceDeploy(packageXmlFile, check, testlevel, this.debugMode, this, forceSourceDeployOptions);
         return { orgId: this.org.getOrgId(), outputString: messages.join("\n") };
@@ -71,7 +94,7 @@ If necessary,You can define the following files (that supports wildcards <member
 Env vars override:
 - SFDX_HARDIS_DEPLOY_IGNORE_SPLIT_PACKAGES: define "true" to ignore split of package.xml into several deployments
+- INSTALL_PACKAGES_DURING_CHECK_DEPLOY: define "true" so packages are installed during deployment check
   `;
 DxSources.examples = ["$ sfdx hardis:project:deploy:sources:dx"];
 DxSources.flagsConfig = {

package/lib/commands/hardis/project/deploy/sources/dx.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dx.js","sourceRoot":"","sources":["../../../../../../src/commands/hardis/project/deploy/sources/dx.ts"],"names":[],"mappings":";AAAA,wBAAwB;;AAExB,iDAAyD;AACzD,2CAA4C;AAE5C,+BAA+B;AAC/B,yEAAqE;AACrE,~~uDAAmD~~;~~AACnD~~,kDAAkD;AAClD,yEAA4E;AAC5E,mEAAiE;AAEjE,wDAAwD;AACxD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,iGAAiG;AACjG,mFAAmF;AACnF,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAqB,SAAU,SAAQ,qBAAW;IAAlD;;QAkDY,eAAU,GAAQ,EAAE,CAAC;QACrB,cAAS,GAAG,KAAK,CAAC;~~IA8C9B~~,CAAC;~~IA5CC~~,sBAAsB;IAEf,KAAK,CAAC,GAAG;;QACd,IAAI,CAAC,UAAU,GAAG,MAAM,kBAAS,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,IAAI,eAAe,CAAC;QACvF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC;QACjD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;QAE3C,mBAAmB;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,iBAAiB,IAAI,EAAE,CAAC;QACzD,~~IAAI~~,~~QAAQ~~,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE;~~YACjC~~,~~yDAAyD~~;~~YACzD~~,MAAM,8BAAa,CAAC,oBAAoB,CAAC,QAAQ,EAAE,~~IAAI~~,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;~~SAC1E~~;~~QAED~~,IAAI,~~cAAc~~,GAAG,IAAI,~~CAAC~~,GAAG,CAAC,~~WAAW~~,EAAE,CAAC;~~QAC5C~~,IAAI,~~CAAC~~,~~YAAI,~~EAAE;~~YACT~~,~~MAAM~~,~~SAAS~~,~~GAAG~~,MAAM,~~oBAAS~~,CAAC,~~IAAI~~,EAAE,EAAE,~~MAAM~~,~~EAAE~~,KAAK,~~EAAE~~,~~UAAU~~,~~EAAE~~,KAAK,~~EAAE~~,~~OAAO~~,~~EAAE~~,KAAK,~~EAAE~~,~~CAAC,CAAC~~;~~YAC9F~~,~~cAAc~~,~~GAAG~~,~~SAAS~~,CAAC,QAAQ,CAAC;~~SACrC~~;QAED,kBAAkB;QAClB,MAAM,cAAc,GAClB,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,IAAI,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC;YAC9H,CAAC,CAAC,wBAAwB;YAC1B,CAAC,CAAC,sBAAsB,CAAC;QAC7B,MAAM,wBAAwB,GAAQ;YACpC,cAAc,EAAE,cAAc;YAC9B,IAAI,EAAE,MAAA,IAAI,CAAC,GAAG,0CAAE,aAAa,EAAE;SAChC,CAAC;QACF,+DAA+D;QAC/D,MAAM,qBAAqB,GACzB,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,IAAI,EAAE,CAAC,UAAU,CAAC,mCAAmC,CAAC;YAC3H,CAAC,CAAC,mCAAmC;YACrC,CAAC,CAAC,iCAAiC,CAAC;QACxC,IAAI,EAAE,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE;YACxC,wBAAwB,CAAC,sBAAsB,GAAG,qBAAqB,CAAC;SACzE;~~QACD~~,2CAA2C;QAC3C,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,+BAAiB,CAAC,cAAc,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,wBAAwB,CAAC,CAAC;QAE/H,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IAC3E,CAAC;;~~AAhGH~~,~~4BAiGC~~;~~AAhGe~~,eAAK,GAAG,4BAA4B,CAAC;AAErC,qBAAW,GAAG;;;;;;;;;;;GAW3B,CAAC;AAEY,kBAAQ,GAAG,CAAC,yCAAyC,CAAC,CAAC;AAEpD,qBAAW,GAAG;IAC7B,KAAK,EAAE,eAAK,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;KAC9C,CAAC;IACF,SAAS,EAAE,eAAK,CAAC,IAAI,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,eAAe;QACxB,OAAO,EAAE,CAAC,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAAE,kBAAkB,CAAC;QAChF,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;KAC9C,CAAC;IACF,UAAU,EAAE,eAAK,CAAC,MAAM,CAAC;QACvB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,sEAAsE;KACpF,CAAC;IACF,KAAK,EAAE,eAAK,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;KAC9C,CAAC;IACF,SAAS,EAAE,eAAK,CAAC,MAAM,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;KAC9C,CAAC;CACH,CAAC;AAEF,oEAAoE;AACnD,0BAAgB,GAAG,IAAI,CAAC;AAEzC,uGAAuG;AACtF,yBAAe,GAAG,IAAI,CAAC"}
1	+ {"version":3,"file":"dx.js","sourceRoot":"","sources":["../../../../../../src/commands/hardis/project/deploy/sources/dx.ts"],"names":[],"mappings":"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"}

package/lib/commands/hardis/source/deploy.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { FlagsConfig, SfdxCommand } from "@salesforce/command";
 import { AnyJson } from "@salesforce/ts-types";
 export declare class Deploy extends SfdxCommand {
-    static readonly description = "sfdx-hardis wrapper for sfdx force:source:deploy that displays tips to solve deployment errors.\n\nSee documentation at https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_deploy\n";
+    static readonly description = "sfdx-hardis wrapper for sfdx force:source:deploy that displays tips to solve deployment errors.\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_deploy)\n";
     static readonly examples: any[];
     static readonly requiresProject = true;
     static readonly requiresUsername = true;

package/lib/commands/hardis/source/deploy.js CHANGED Viewed

@@ -17,7 +17,7 @@ class Deploy extends command_1.SfdxCommand {
 exports.Deploy = Deploy;
 Deploy.description = `sfdx-hardis wrapper for sfdx force:source:deploy that displays tips to solve deployment errors.
-See documentation at https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_deploy
+[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_deploy)
 `;
 Deploy.examples = [];
 Deploy.requiresProject = true;

package/lib/commands/hardis/source/push.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { FlagsConfig, SfdxCommand } from "@salesforce/command";
 import { AnyJson } from "@salesforce/ts-types";
 export default class Push extends SfdxCommand {
-    static readonly description = "sfdx-hardis wrapper for sfdx force:source:push that displays tips to solve deployment errors.\n\nSee documentation at https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_push\n";
+    static readonly description = "sfdx-hardis wrapper for sfdx force:source:push that displays tips to solve deployment errors.\n\n[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_push)\n";
     protected static readonly flagsConfig: FlagsConfig;
     protected static requiresUsername: boolean;
     protected static requiresProject: boolean;

package/lib/commands/hardis/source/push.js CHANGED Viewed

@@ -11,7 +11,7 @@ class Push extends command_1.SfdxCommand {
 exports.default = Push;
 Push.description = `sfdx-hardis wrapper for sfdx force:source:push that displays tips to solve deployment errors.
-See documentation at https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_push
+[See documentation of Salesforce command](https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_force_source.htm#cli_reference_force_source_push)
 `;
 Push.flagsConfig = {
     forceoverwrite: command_1.flags.boolean({

package/lib/common/metadata-utils/index.js CHANGED Viewed

@@ -425,7 +425,7 @@ class MetadataUtils {
     }
     // Install package on existing org
     static async installPackagesOnOrg(packages, orgAlias = null, commandThis = null, context = "none") {
-        const alreadyInstalled = await MetadataUtils.listInstalledPackages(null, this);
+        const alreadyInstalled = await MetadataUtils.listInstalledPackages(orgAlias, this);
         for (const package1 of packages) {
             if (alreadyInstalled.filter((installedPackage) => package1.SubscriberPackageVersionId === installedPackage.SubscriberPackageVersionId)
                 .length === 0) {

package/lib/common/metadata-utils/index.js.map CHANGED Viewed

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

package/lib/common/utils/deployTipsList.d.ts CHANGED Viewed

@@ -19,13 +19,6 @@ export declare function getAllTips(): ({
     expressionString: string[];
     tip: string;
     expressionRegex?: undefined;
-} | {
-    name?: undefined;
-    label?: undefined;
-    expressionRegex?: undefined;
-    tip?: undefined;
-    context?: undefined;
-    expressionString?: undefined;
 } | {
     name: string;
     label: string;

package/lib/common/utils/deployTipsList.js CHANGED Viewed

@@ -37,7 +37,6 @@ THIS MAY BE A FALSE POSITIVE if you are just testing the deployment, as destruct
 - If the folder is existing in sources, add it in related package.xml
 - If the folder is not existing in DX sources, please use sfdx hardis:project:clean:retrievefolders -u YOURSOURCEORG`,
         },
-        {},
         {
             name: "custom-object-not-found",
             label: "Custom object not found",

package/lib/common/utils/deployTipsList.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deployTipsList.js","sourceRoot":"","sources":["../../../src/common/utils/deployTipsList.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU;IACxB,OAAO;QACL;YACE,IAAI,EAAE,iCAAiC;YACvC,KAAK,EAAE,8CAA8C;YACrD,eAAe,EAAE,CAAC,qEAAqE,CAAC;YACxF,GAAG,EAAE;;qGAE0F;SAChG;QACD;YACE,IAAI,EAAE,6BAA6B;YACnC,KAAK,EAAE,6BAA6B;YACpC,OAAO,EAAE,mBAAmB;YAC5B,eAAe,EAAE,CAAC,uDAAuD,EAAE,oDAAoD,CAAC;YAChI,GAAG,EAAE;uJAC4I;SAClJ;QACD;YACE,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,4BAA4B;YACnC,OAAO,EAAE,mBAAmB;YAC5B,eAAe,EAAE,CAAC,oDAAoD,CAAC;YACvE,GAAG,EAAE;;yBAEc;SACpB;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,qBAAqB;YAC5B,OAAO,EAAE,mBAAmB;YAC5B,gBAAgB,EAAE,CAAC,oBAAoB,CAAC;YACxC,GAAG,EAAE;;qHAE0G;SAChH;QACD~~,EAAE~~;~~QACF;~~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~~AArdD~~,~~gCAqdC~~"}
1	+ {"version":3,"file":"deployTipsList.js","sourceRoot":"","sources":["../../../src/common/utils/deployTipsList.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU;IACxB,OAAO;QACL;YACE,IAAI,EAAE,iCAAiC;YACvC,KAAK,EAAE,8CAA8C;YACrD,eAAe,EAAE,CAAC,qEAAqE,CAAC;YACxF,GAAG,EAAE;;qGAE0F;SAChG;QACD;YACE,IAAI,EAAE,6BAA6B;YACnC,KAAK,EAAE,6BAA6B;YACpC,OAAO,EAAE,mBAAmB;YAC5B,eAAe,EAAE,CAAC,uDAAuD,EAAE,oDAAoD,CAAC;YAChI,GAAG,EAAE;uJAC4I;SAClJ;QACD;YACE,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,4BAA4B;YACnC,OAAO,EAAE,mBAAmB;YAC5B,eAAe,EAAE,CAAC,oDAAoD,CAAC;YACvE,GAAG,EAAE;;yBAEc;SACpB;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,qBAAqB;YAC5B,OAAO,EAAE,mBAAmB;YAC5B,gBAAgB,EAAE,CAAC,oBAAoB,CAAC;YACxC,GAAG,EAAE;;qHAE0G;SAChH;QACD;YACE,IAAI,EAAE,yBAAyB;YAC/B,KAAK,EAAE,yBAAyB;YAChC,eAAe,EAAE,CAAC,iEAAiE,CAAC;YACpF,GAAG,EAAE;;;;;CAKV;SACI;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,wBAAwB;YAC/B,eAAe,EAAE,CAAC,gEAAgE,CAAC;YACnF,GAAG,EAAE;;;;;;;CAOV;SACI;QACD;YACE,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,+DAA+D;YACtE,gBAAgB,EAAE,CAAC,uCAAuC,EAAE,kDAAkD,CAAC;YAC/G,GAAG,EAAE;;;;;;;;CAQV;SACI;QACD;YACE,IAAI,EAAE,yCAAyC;YAC/C,KAAK,EAAE,yCAAyC;YAChD,gBAAgB,EAAE,CAAC,gFAAgF,CAAC;YACpG,GAAG,EAAE,qKAAqK;SAC3K;QACD;YACE,IAAI,EAAE,iBAAiB;YACvB,KAAK,EAAE,iBAAiB;YACxB,eAAe,EAAE,CAAC,oCAAoC,CAAC;YACvD,GAAG,EAAE,kJAAkJ;SACxJ;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,yBAAyB;YAChC,eAAe,EAAE,CAAC,0DAA0D,CAAC;YAC7E,GAAG,EAAE;;;;;;;;;;;;4BAYiB;SACvB;QACD;YACE,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,oBAAoB;YAC3B,gBAAgB,EAAE;gBAChB,8CAA8C;gBAC9C,0CAA0C;gBAC1C,6CAA6C;aAC9C;YACD,GAAG,EAAE;gEACqD;SAC3D;QACD;YACE,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,8BAA8B;YACrC,eAAe,EAAE,CAAC,mCAAmC,CAAC;YACtD,GAAG,EAAE;2EACgE;SACtE;QACD;YACE,IAAI,EAAE,iCAAiC;YACvC,KAAK,EAAE,iCAAiC;YACxC,eAAe,EAAE,CAAC,mCAAmC,CAAC;YACtD,GAAG,EAAE;kEACuD;SAC7D;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,8BAA8B;YACrC,gBAAgB,EAAE,CAAC,2FAA2F,CAAC;YAC/G,GAAG,EAAE;;mGAEwF;SAC9F;QACD;YACE,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,+BAA+B;YACtC,eAAe,EAAE,CAAC,+DAA+D,CAAC;YAClF,GAAG,EAAE,sHAAsH;SAC5H;QACD;YACE,IAAI,EAAE,oBAAoB;YAC1B,KAAK,EAAE,iCAAiC;YACxC,gBAAgB,EAAE,CAAC,iCAAiC,CAAC;YACrD,GAAG,EAAE,6DAA6D;SACnE;QACD;YACE,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,cAAc;YACrB,eAAe,EAAE,CAAC,0CAA0C,CAAC;YAC7D,GAAG,EAAE,yJAAyJ;SAC/J;QACD;YACE,IAAI,EAAE,sBAAsB;YAC5B,KAAK,EAAE,6BAA6B;YACpC,gBAAgB,EAAE,CAAC,wCAAwC,CAAC;YAC5D,GAAG,EAAE;4FACiF;SACvF;QACD;YACE,IAAI,EAAE,2BAA2B;YACjC,KAAK,EAAE,0BAA0B;YACjC,gBAAgB,EAAE,CAAC,kBAAkB,EAAE,qCAAqC,CAAC;YAC7E,GAAG,EAAE;;;;;EAKT;SACG;QACD;YACE,IAAI,EAAE,sBAAsB;YAC5B,KAAK,EAAE,sBAAsB;YAC7B,gBAAgB,EAAE,CAAC,cAAc,CAAC;YAClC,GAAG,EAAE;;;;;GAKR;SACE;QACD;YACE,IAAI,EAAE,+BAA+B;YACrC,KAAK,EAAE,6BAA6B;YACpC,gBAAgB,EAAE;gBAChB,qBAAqB;gBACrB,mEAAmE;gBACnE,uFAAuF;aACxF;YACD,GAAG,EAAE;;;;;EAKT;SACG;QACD;YACE,IAAI,EAAE,0CAA0C;YAChD,KAAK,EAAE,2CAA2C;YAClD,gBAAgB,EAAE,CAAC,oDAAoD,CAAC;YACxE,GAAG,EAAE;;;2CAGgC;SACtC;QACD;YACE,IAAI,EAAE,8CAA8C;YACpD,KAAK,EAAE,6CAA6C;YACpD,gBAAgB,EAAE,CAAC,oBAAoB,CAAC;YACxC,GAAG,EAAE;;;;;GAKR;SACE;QACD;YACE,IAAI,EAAE,gCAAgC;YACtC,KAAK,EAAE,gCAAgC;YACvC,gBAAgB,EAAE,CAAC,sBAAsB,CAAC;YAC1C,GAAG,EAAE;;;;;GAKR;SACE;QACD;YACE,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,6BAA6B;YACpC,gBAAgB,EAAE,CAAC,kCAAkC,CAAC;YACtD,GAAG,EAAE;;;;;EAKT;SACG;QACD;YACE,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,4BAA4B;YACnC,gBAAgB,EAAE,CAAC,sBAAsB,CAAC;YAC1C,GAAG,EAAE;;iCAEsB;SAC5B;QACD;YACE,IAAI,EAAE,iCAAiC;YACvC,KAAK,EAAE,iCAAiC;YACxC,gBAAgB,EAAE,CAAC,gBAAgB,CAAC;YACpC,GAAG,EAAE;;+EAEoE;SAC1E;QACD;YACE,IAAI,EAAE,yCAAyC;YAC/C,KAAK,EAAE,yCAAyC;YAChD,gBAAgB,EAAE,CAAC,8BAA8B,CAAC;YAClD,GAAG,EAAE;;6CAEkC;SACxC;QACD;YACE,IAAI,EAAE,uCAAuC;YAC7C,KAAK,EAAE,uCAAuC;YAC9C,eAAe,EAAE,CAAC,qCAAqC,CAAC;YACxD,GAAG,EAAE;;;;;;EAMT;SACG;QACD;YACE,IAAI,EAAE,6BAA6B;YACnC,KAAK,EAAE,mCAAmC;YAC1C,gBAAgB,EAAE,CAAC,iBAAiB,CAAC;YACrC,GAAG,EAAE;;;;;EAKT;SACG;QACD;YACE,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,0BAA0B;YACjC,gBAAgB,EAAE,CAAC,qBAAqB,CAAC;YACzC,GAAG,EAAE;2IACgI;SACtI;QACD;YACE,IAAI,EAAE,4BAA4B;YAClC,KAAK,EAAE,0CAA0C;YACjD,eAAe,EAAE,CAAC,+FAA+F,CAAC;YAClH,GAAG,EAAE;;uDAE4C;SAClD;QACD;YACE,IAAI,EAAE,oBAAoB;YAC1B,KAAK,EAAE,oBAAoB;YAC3B,gBAAgB,EAAE,CAAC,sCAAsC,CAAC;YAC1D,GAAG,EAAE;;;;;;EAMT;SACG;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,uCAAuC;YAC9C,gBAAgB,EAAE,CAAC,uCAAuC,CAAC;YAC3D,GAAG,EAAE;;;;CAIV;SACI;QACD;YACE,IAAI,EAAE,gCAAgC;YACtC,KAAK,EAAE,mCAAmC;YAC1C,gBAAgB,EAAE,CAAC,mCAAmC,CAAC;YACvD,GAAG,EAAE;;CAEV;SACI;QACD;YACE,IAAI,EAAE,0BAA0B;YAChC,KAAK,EAAE,0BAA0B;YACjC,eAAe,EAAE,CAAC,oDAAoD,CAAC;YACvE,GAAG,EAAE;;;CAGV;SACI;QACD;YACE,IAAI,EAAE,gCAAgC;YACtC,KAAK,EAAE,gCAAgC;YACvC,eAAe,EAAE,CAAC,sGAAsG,CAAC;YACzH,GAAG,EAAE;;CAEV;SACI;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,qCAAqC;YAC5C,gBAAgB,EAAE,CAAC,yDAAyD,CAAC;YAC7E,GAAG,EAAE;;;;;;;;2BAQgB;SACtB;QACD;YACE,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,uBAAuB;YAC9B,eAAe,EAAE,CAAC,oEAAoE,CAAC;YACvF,GAAG,EAAE;;;CAGV;SACI;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,+CAA+C;YACtD,gBAAgB,EAAE,CAAC,yCAAyC,CAAC;YAC7D,GAAG,EAAE;;;aAGE;SACR;QACD;YACE,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,mCAAmC;YAC1C,eAAe,EAAE,CAAC,yDAAyD,CAAC;YAC5E,GAAG,EAAE;;yDAE8C;SACpD;QACD;YACE,IAAI,EAAE,wBAAwB;YAC9B,KAAK,EAAE,+BAA+B;YACtC,gBAAgB,EAAE,CAAC,iDAAiD,CAAC;YACrE,GAAG,EAAE,mFAAmF;SACzF;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE,4BAA4B;YACnC,gBAAgB,EAAE;gBAChB,kEAAkE;gBAClE,gHAAgH;aACjH;YACD,GAAG,EAAE,2HAA2H;SACjI;QACD;YACE,IAAI,EAAE,2BAA2B;YACjC,KAAK,EAAE,+BAA+B;YACtC,eAAe,EAAE,CAAC,oCAAoC,CAAC;YACvD,GAAG,EAAE;4EACiE;SACvE;QACD;YACE,IAAI,EAAE,yBAAyB;YAC/B,KAAK,EAAE,+BAA+B;YACtC,eAAe,EAAE,CAAC,OAAO,CAAC;YAC1B,GAAG,EAAE,+DAA+D;SACrE;QACD;YACE,IAAI,EAAE,uBAAuB;YAC7B,KAAK,EAAE,iDAAiD;YACxD,eAAe,EAAE,CAAC,sCAAsC,CAAC;YACzD,GAAG,EAAE;sDAC2C;SACjD;QACD;YACE,IAAI,EAAE,kCAAkC;YACxC,KAAK,EAAE,4CAA4C;YACnD,gBAAgB,EAAE,CAAC,4CAA4C,CAAC;YAChE,GAAG,EAAE;gFACqE;SAC3E;QACD;YACE,IAAI,EAAE,mCAAmC;YACzC,KAAK,EAAE,6CAA6C;YACpD,gBAAgB,EAAE,CAAC,6CAA6C,CAAC;YACjE,GAAG,EAAE;gFACqE;SAC3E;QACD;YACE,IAAI,EAAE,yBAAyB;YAC/B,KAAK,EAAE,yBAAyB;YAChC,gBAAgB,EAAE,CAAC,0BAA0B,CAAC;YAC9C,GAAG,EAAE;;sGAE2F;SACjG;QACD;YACE,IAAI,EAAE,yBAAyB;YAC/B,KAAK,EAAE,yBAAyB;YAChC,eAAe,EAAE,CAAC,qDAAqD,CAAC;YACxE,GAAG,EAAE,6JAA6J;SACnK;QACD;YACE,IAAI,EAAE,mBAAmB;YACzB,KAAK,EAAE,iCAAiC;YACxC,gBAAgB,EAAE,CAAC,+DAA+D,CAAC;YACnF,GAAG,EAAE,yHAAyH;SAC/H;QACD;YACE,IAAI,EAAE,iCAAiC;YACvC,KAAK,EAAE,iCAAiC;YACxC,eAAe,EAAE,CAAC,4DAA4D,CAAC;YAC/E,GAAG,EAAE;;kGAEuF;SAC7F;KACF,CAAC;AACJ,CAAC;AApdD,gCAodC"}

package/lib/common/utils/notifUtils.js CHANGED Viewed

@@ -9,9 +9,10 @@ const config_1 = require("../../config");
 async function canSendNotifications() {
     const config = await config_1.getConfig("user");
     return (process.env.MS_TEAMS_WEBHOOK_URL ||
-        process.env.CRITICAL_MS_TEAMS_WEBHOOK_URL ||
-        process.env.SEVERE_MS_TEAMS_WEBHOOK_URL ||
-        process.env.WARNING_MS_TEAMS_WEBHOOK_URL ||
+        process.env.MS_TEAMS_WEBHOOK_URL_CRITICAL ||
+        process.env.MS_TEAMS_WEBHOOK_URL_SEVERE ||
+        process.env.MS_TEAMS_WEBHOOK_URL_WARNING ||
+        process.env.MS_TEAMS_WEBHOOK_URL_INFO ||
         config.msTeamsWebhookUrl);
 }
 exports.canSendNotifications = canSendNotifications;
@@ -50,24 +51,32 @@ async function sendMsTeamsNotification(title, text, summary, buttons, severity)
     }
     // Critical hook URL
     if (severity === "critical") {
-        const msTeamsCriticalHookUrl = process.env.CRITICAL_MS_TEAMS_WEBHOOK_URL || config.criticalMsTeamsWebhookUrl;
+        const msTeamsCriticalHookUrl = process.env.MS_TEAMS_WEBHOOK_URL_CRITICAL || config.msTeamsWebhookUrlCritical;
         if (msTeamsCriticalHookUrl) {
             hooksUrls.push(msTeamsCriticalHookUrl);
         }
     }
-    // Critical hook URL
+    // Severe hook URL
     if (severity === "severe") {
-        const msTeamsSevereHookUrl = process.env.SEVERE_MS_TEAMS_WEBHOOK_URL || config.severeMsTeamsWebhookUrl;
+        const msTeamsSevereHookUrl = process.env.MS_TEAMS_WEBHOOK_URL_SEVERE || config.msTeamsWebhookUrlSevere;
         if (msTeamsSevereHookUrl) {
             hooksUrls.push(msTeamsSevereHookUrl);
         }
-    } // Critical hook URL
+    }
+    // Warning hook URL
     if (severity === "warning") {
-        const msTeamsWarningHookUrl = process.env.WARNING_MS_TEAMS_WEBHOOK_URL || config.warningMsTeamsWebhookUrl;
+        const msTeamsWarningHookUrl = process.env.MS_TEAMS_WEBHOOK_URL_WARNING || config.msTeamsWebhookUrlWarning;
         if (msTeamsWarningHookUrl) {
             hooksUrls.push(msTeamsWarningHookUrl);
         }
     }
+    // Info hook URL
+    if (severity === "info") {
+        const msTeamsInfoHookUrl = process.env.MS_TEAMS_WEBHOOK_URL_INFO || config.msTeamsWebhookUrlInfo;
+        if (msTeamsInfoHookUrl) {
+            hooksUrls.push(msTeamsInfoHookUrl);
+        }
+    }
     // Call MsTeams hooks
     for (const hookUrl of hooksUrls) {
         await sendMsTeamsHook(hookUrl, title, text, summary, buttons);

package/lib/common/utils/notifUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"notifUtils.js","sourceRoot":"","sources":["../../../src/common/utils/notifUtils.ts"],"names":[],"mappings":";;;AAAA,wBAA0B;AAC1B,2BAA2B;AAC3B,uDAAmD;AACnD,yCAAyC;AAEzC,kDAAkD;AAC3C,KAAK,UAAU,oBAAoB;IACxC,MAAM,MAAM,GAAG,MAAM,kBAAS,CAAC,MAAM,CAAC,CAAC;IACvC,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,oBAAoB;QAChC,OAAO,CAAC,GAAG,CAAC,6BAA6B;QACzC,OAAO,CAAC,GAAG,CAAC,2BAA2B;QACvC,OAAO,CAAC,GAAG,CAAC,4BAA4B;QACxC,MAAM,CAAC,iBAAiB,CACzB,CAAC;AACJ,CAAC;~~AATD~~,~~oDASC~~;AAED,wDAAwD;AACjD,KAAK,UAAU,gBAAgB,CAAC,OAMtC;IACC,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,mCAAmC,CAAC;IACjE,wEAAwE;IACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI,CAAC;IACrD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC;IACxD,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACzC,QAAQ,IAAI,IAAI,QAAQ,EAAE,CAAC;KAC5B;IACD,IAAI,UAAU,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC7C,QAAQ,IAAI,IAAI,UAAU,EAAE,CAAC;KAC9B;IACD,IAAI,QAAQ,KAAK,EAAE,EAAE;QACnB,KAAK,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC;KAClC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;IAChC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC;IAC5C,MAAM,UAAU,GAAG,uBAAuB,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACpF,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AACzC,CAAC;AA3BD,4CA2BC;AAED,oFAAoF;AACpF,KAAK,UAAU,uBAAuB,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ;IAC5E,MAAM,MAAM,GAAG,MAAM,kBAAS,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,EAAE,CAAC;IACrB,mBAAmB;IACnB,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,MAAM,CAAC,iBAAiB,CAAC;IACvF,IAAI,iBAAiB,EAAE;QACrB,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KACnC;IACD,oBAAoB;IACpB,IAAI,QAAQ,KAAK,UAAU,EAAE;QAC3B,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,CAAC,6BAA6B,IAAI,MAAM,CAAC,yBAAyB,CAAC;QAC7G,IAAI,sBAAsB,EAAE;YAC1B,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;SACxC;KACF;IACD,~~oBAAoB~~;~~IACpB~~,IAAI,QAAQ,KAAK,QAAQ,EAAE;QACzB,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,MAAM,CAAC,uBAAuB,CAAC;QACvG,IAAI,oBAAoB,EAAE;YACxB,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACtC;KACF,~~CAAC,oBAAoB~~;~~IACtB~~,IAAI,QAAQ,KAAK,SAAS,EAAE;QAC1B,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,4BAA4B,IAAI,MAAM,CAAC,wBAAwB,CAAC;QAC1G,IAAI,qBAAqB,EAAE;YACzB,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACvC;KACF;IACD,qBAAqB;IACrB,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;QAC/B,MAAM,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;KAC/D;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO;IAC7E,MAAM,OAAO,GAAG,IAAI,kCAAe,CAAC,iBAAiB,CAAC,CAAC;IACvD,MAAM,aAAa,GAAG;QACpB,OAAO,EAAE,aAAa;QACtB,UAAU,EAAE,+BAA+B;QAC3C,OAAO,EAAE,OAAO;QAChB,UAAU,EAAE,QAAQ;QACpB,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,IAAI;QACV,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG;gBACf,OAAO,EAAE,SAAS;gBAClB,IAAI,EAAE,OAAO,CAAC,KAAK;gBACnB,OAAO,EAAE;oBACP;wBACE,EAAE,EAAE,SAAS;wBACb,GAAG,EAAE,OAAO,CAAC,GAAG;qBACjB;iBACF;aACF,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC;KACH,CAAC;IAEF,kCAAkC;IAClC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;QAC1B,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC;YACjC,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE;gBACP;oBACE,EAAE,EAAE,SAAS;oBACb,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;iBAC5B;aACF;SACF,CAAC,CAAC;KACJ;IACD,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;IAClD,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,gCAAgC,GAAG,iBAAiB,GAAG,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1G,CAAC"}
1	+ {"version":3,"file":"notifUtils.js","sourceRoot":"","sources":["../../../src/common/utils/notifUtils.ts"],"names":[],"mappings":"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"}

package/lib/common/utils/orgUtils.js CHANGED Viewed

@@ -105,8 +105,12 @@ async function promptOrg(commandThis, options = { devHub: false, setDefault: tru
     let orgList = [
         ...sortArray((orgListResult === null || orgListResult === void 0 ? void 0 : orgListResult.scratchOrgs) || [], { by: ["devHubUsername", "username", "alias", "instanceUrl"], order: ["asc", "asc", "asc"] }),
         ...sortArray((orgListResult === null || orgListResult === void 0 ? void 0 : orgListResult.nonScratchOrgs) || [], { by: ["username", "alias", "instanceUrl"], order: ["asc", "asc", "asc"] }),
-        { username: "Connect to another org", otherOrg: true },
-        { username: "Cancel", cancel: true },
+        {
+            username: "Connect to another org",
+            otherOrg: true,
+            descriptionForUi: "Connect in Web Browser to a Sandbox, a Production Org, a Dev Org or a Scratch Org",
+        },
+        { username: "Cancel", cancel: true, descriptionForUi: "Get out of here :)" },
     ];
     // Filter if we want to list only the scratch attached to current devhub
     if (options.scratch === true) {
@@ -127,7 +131,7 @@ async function promptOrg(commandThis, options = { devHub: false, setDefault: tru
             const description = (title !== org.instanceUrl ? org.instanceUrl : "") + (org.devHubUsername ? ` (Hub: ${org.devHubUsername})` : "-");
             return {
                 title: c.cyan(title),
-                description: description || "-",
+                description: org.descriptionForUi ? org.descriptionForUi : description || "-",
                 value: org,
             };
         }),

package/lib/common/utils/orgUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"orgUtils.js","sourceRoot":"","sources":["../../../src/common/utils/orgUtils.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"orgUtils.js","sourceRoot":"","sources":["../../../src/common/utils/orgUtils.ts"],"names":[],"mappings":";;;AAAA,sDAAkD;AAClD,uCAAoC;AACpC,2BAA2B;AAC3B,+BAA+B;AAC/B,qCAAqC;AACrC,6BAA6B;AAC7B,wBAAoE;AACpE,wDAAqD;AACrD,yCAAoD;AACpD,wCAAwC;AACxC,2CAAyD;AACzD,2CAAyC;AACzC,yCAAuC;AAEhC,KAAK,UAAU,YAAY,CAAC,IAAS;IAC1C,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;QAC7B,OAAO,EAAE,CAAC;KACX;IACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,2CAA2C,CAAC,CAAC;IACpF,OAAO,UAAU,CAAC,OAAO,CAAC;AAC5B,CAAC;AAND,oCAMC;AAED,4CAA4C;AAC5C,MAAM,iBAAiB,GAAQ,EAAE,CAAC;AAC3B,KAAK,UAAU,eAAe,CAAC,cAA8D,EAAE,IAAS;IAC7G,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAChD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,EAAE;QAC/B,OAAO,iBAAiB,CAAC,QAAQ,CAAC,CAAC;KACpC;IACD,MAAM,kBAAkB,GAAG,MAAM,oBAAS,CACxC,gDAAgD,cAAc,CAAC,WAAW,OAAO;QAC/E,mBAAmB,cAAc,CAAC,aAAa,GAAG;QAClD,UAAU,EACZ,IAAI,CACL,CAAC;IACF,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;QACpC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACzC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAhBD,0CAgBC;AAED,kCAAkC;AAClC;;;;EAIE;AACK,KAAK,UAAU,cAAc,CAClC,IAAgB,EAChB,UAAe;IACb,WAAW,EAAE,KAAK;IAClB,gBAAgB,EAAE,EAAE;IACpB,WAAW,EAAE,MAAM;IACnB,OAAO,EAAE,0BAA0B;IACnC,cAAc,EAAE,IAAI;IACpB,0BAA0B,EAAE,iCAAiC;IAC7D,eAAe,EAAE,IAAI;IACrB,2BAA2B,EAAE,yDAAyD;CACvF;IAED,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1C,yCAAyC;IACzC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,iBAAiB,GAAG,MAAM,iBAAO,CAAC;YACtC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ;YACpD,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,0BAA0B;YACtD,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAY,EAAE,EAAE;gBACrC,OAAO;oBACL,KAAK,EAAE,OAAO,CAAC,IAAI;oBACnB,KAAK,EAAE,OAAO,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI;iBAC7G,CAAC;YACJ,CAAC,CAAC;SACH,CAAC,CAAC;QACH,wEAAwE;QACxE,IAAI,OAAO,CAAC,cAAc,KAAK,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;YAC1F,MAAM,IAAI,gBAAS,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;SACzD;QACD,mDAAmD;QACnD,IAAI,OAAO,CAAC,eAAe,KAAK,KAAK,EAAE;YACrC,IAAI,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBACnD,MAAM,IAAI,gBAAS,CAAC,4FAA4F,CAAC,CAAC;aACnH;YACD,MAAM,OAAO,GAAG,MAAM,oBAAS,CAAC,wCAAwC,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,WAAW,EAAE,IAAI,CAAC,CAAC;YAC1H,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAClD,IAAI,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,KAAK,SAAS,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,EAAE,MAAK,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtI,MAAM,IAAI,gBAAS,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;aAC1D;SACF;QACD,OAAO,iBAAiB,CAAC,KAAK,IAAI,IAAI,CAAC;KACxC;SAAM;QACL,2CAA2C;QAC3C,MAAM,iBAAiB,GAAG,MAAM,iBAAO,CAAC;YACtC,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,2BAA2B;YACvD,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB,CAAC,CAAC,CAAC,KAAI,IAAI;SAC9C,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC;KAC3F;AACH,CAAC;AArDD,wCAqDC;AAEM,KAAK,UAAU,SAAS,CAAC,WAAgB,EAAE,UAAe,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE;;IACrI,0CAA0C;IAC1C,MAAM,aAAa,GAAG,MAAM,8BAAa,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACzG,IAAI,OAAO,GAAG;QACZ,GAAG,SAAS,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,WAAW,KAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;QAC5I,GAAG,SAAS,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,cAAc,KAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC;QAC7H;YACE,QAAQ,EAAE,wBAAwB;YAClC,QAAQ,EAAE,IAAI;YACd,gBAAgB,EAAE,mFAAmF;SACtG;QACD,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,oBAAoB,EAAE;KAC7E,CAAC;IAEF,wEAAwE;IACxE,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE;QAC5B,MAAM,YAAY,GAAG,MAAM,eAAY,CAAC,uCAAuC,EAAE,IAAI,EAAE;YACrF,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAC,CAAC,CAAC,0CAAE,KAAK,KAAI,EAAE,CAAC;QAC5D,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,QAAQ,IAAI,GAAG,CAAC,cAAc,KAAK,cAAc,CAAC,CAAC;KAC1G;IAED,cAAc;IACd,MAAM,WAAW,GAAG,MAAM,iBAAO,CAAC;QAChC,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,KAAK;QACX,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,sBAAsB,CAAC;QAC7C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE;YAChC,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,WAAW,CAAC;YAC3D,MAAM,WAAW,GAAG,CAAC,KAAK,KAAK,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACtI,OAAO;gBACL,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;gBACpB,WAAW,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW,IAAI,GAAG;gBAC7E,KAAK,EAAE,GAAG;aACX,CAAC;QACJ,CAAC,CAAC;KACH,CAAC,CAAC;IAEH,IAAI,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC;IAE1B,SAAS;IACT,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,EAAE;QACvB,QAAK,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,qBAAqB;IACrB,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI,EAAE;QACzB,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE;YACvC,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM,KAAK,IAAI;YAC/B,UAAU,EAAE,OAAO,CAAC,UAAU,KAAK,KAAK;SACzC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,8BAAa,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChF;IAED,8CAA8C;IAC9C,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,eAAe,MAAK,uBAAuB,EAAE;QACpD,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,uEAAuE,CAAC,CAAC,CAAC;QAC/F,MAAM,YAAY,GAAG,qBAAqB,GAAG,kBAAkB,GAAG,CAAC,WAAW,EAAE,CAAC;QACjF,MAAM,WAAW,GAAG,MAAM,eAAY,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QACzF,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC;KAC1B;IAED,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;QAC/B,uBAAuB;QACvB,MAAM,yBAAyB,GAC7B,kBAAkB;YAClB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,iBAAiB,IAAI,GAAG,CAAC,QAAQ,EAAE;YACjF,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACrF,MAAM,eAAY,CAAC,yBAAyB,EAAE,WAAW,EAAE;YACzD,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,2DAA2D;QAC3D,MAAM,MAAM,GAAG,MAAM,kBAAS,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE;YACxC,MAAM,eAAe,GAAG,kBAAkB,MAAM,CAAC,WAAW,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC/E,MAAM,eAAY,CAAC,eAAe,EAAE,WAAW,EAAE;gBAC/C,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;SACJ;aAAM;YACL,qCAAqC;YACrC,MAAM,eAAe,GAAG,yBAAyB,GAAG,CAAC,QAAQ,EAAE,CAAC;YAChE,MAAM,eAAY,CAAC,eAAe,EAAE,WAAW,EAAE;gBAC/C,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;SACJ;QAED,iCAAe,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;QACxD,qFAAqF;QACrF,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACpC,MAAM,kBAAS,CAAC,MAAM,EAAE;gBACtB,eAAe,EAAE,GAAG,CAAC,KAAK,IAAI,IAAI;gBAClC,kBAAkB,EAAE,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,KAAK;aAC9C,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,kBAAS,CAAC,MAAM,EAAE;gBACtB,eAAe,EAAE,IAAI;gBACrB,kBAAkB,EAAE,IAAI;aACzB,CAAC,CAAC;SACJ;KACF;IACD,QAAK,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACzD,QAAK,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IACzF,OAAO,WAAW,CAAC,GAAG,CAAC;AACzB,CAAC;AAhHD,8BAgHC;AAEM,KAAK,UAAU,wBAAwB,CAAC,WAAgB,EAAE,UAAkB,EAAE,UAAe,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE;IACrI,MAAM,aAAa,GAAG,MAAM,iBAAO,CAAC;QAClC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,0BAA0B,UAAU,EAAE;KAChD,CAAC,CAAC;IACH,IAAI,aAAa,CAAC,KAAK,KAAK,IAAI,EAAE;QAChC,OAAO,UAAU,CAAC;KACnB;SAAM;QACL,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,WAAW,CAAC,QAAQ,CAAC;KAC7B;AACH,CAAC;AAXD,4DAWC;AAED,iCAAiC;AAC1B,KAAK,UAAU,4BAA4B,CAAC,GAAQ;IACzD,wCAAwC;IACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,gBAAa,EAAE,EAAE,qBAAqB,CAAC,CAAC;IACzE,MAAM,eAAe,GAAG,GAAG,CAAC,qBAAqB,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAClH,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,WAAW,GAAG,8BAA8B,QAAQ,EAAE,CAAC;IAC7D,MAAM,cAAW,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;AACtE,CAAC;AAPD,oEAOC;AAED,uDAAuD;AAChD,KAAK,UAAU,mBAAmB,CAAC,iBAAiB,EAAE,0BAA0B;IACrF,MAAM,MAAM,GAAG,MAAM,kBAAS,CAAC,SAAS,CAAC,CAAC;IAC1C,IAAI,eAAe,GAAG,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC;IACrD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;QAChD,MAAM,cAAc,GAAG,0BAA0B,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,KAAK,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QACtI,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,gBAAgB,CAAC,mBAAmB,KAAK,cAAc,CAAC,mBAAmB,CAAC,CAAC;QAC3I,+CAA+C;QAC/C,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACtD,eAAe,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE;gBACvD,IAAI,gBAAgB,CAAC,mBAAmB,KAAK,cAAc,CAAC,mBAAmB,EAAE;oBAC/E,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;iBAClE;gBACD,OAAO,cAAc,CAAC;YACxB,CAAC,CAAC,CAAC;YACH,QAAK,CACH,IAAI,EACJ,CAAC,CAAC,IAAI,CACJ,mBAAmB,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,EAAE,CAC7I,CACF,CAAC;YACF,OAAO,GAAG,IAAI,CAAC;SAChB;aAAM,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/D,gFAAgF;YAChF,MAAM,eAAe,GAAG,MAAM,iBAAO,CAAC;gBACpC,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,CAAC,CAAC,UAAU,CAAC,+CAA+C,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE,CAAC;gBACtH,OAAO,EAAE;oBACP;wBACE,KAAK,EAAE,yBAAyB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,uBAAuB;wBACrG,KAAK,EAAE,SAAS;qBACjB;oBACD;wBACE,KAAK,EAAE,wBAAwB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,sCAAsC;wBACnH,KAAK,EAAE,QAAQ;qBAChB;oBACD;wBACE,KAAK,EAAE,wCAAwC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE;wBAC/F,KAAK,EAAE,gBAAgB;qBACxB;oBACD;wBACE,KAAK,EAAE,oBAAoB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,4BAA4B;wBACrG,KAAK,EAAE,MAAM;qBACd;iBACF;aACF,CAAC,CAAC;YACH,gBAAgB,CAAC,oBAAoB,GAAG,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAClF,gBAAgB,CAAC,wBAAwB,GAAG,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACrF,IAAI,eAAe,CAAC,KAAK,KAAK,MAAM,IAAI,eAAe,CAAC,KAAK,IAAI,IAAI,EAAE;gBACrE,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBACvC,OAAO,GAAG,IAAI,CAAC;aAChB;SACF;KACF;IACD,IAAI,OAAO,EAAE;QACX,QAAK,CAAC,IAAI,EAAE,qDAAqD,CAAC,CAAC;QACnE,MAAM,kBAAS,CAAC,SAAS,EAAE,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC,CAAC;KACpE;AACH,CAAC;AA3DD,kDA2DC;AAED,iCAAiC;AAC1B,KAAK,UAAU,4BAA4B,CAAC,QAAoB,EAAE,WAAmB;;IAC1F,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,CAAC;IACpD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACxF,MAAM,aAAa,GAAG,qCAAqC,OAAO,CAAC,IAAI,IAAI,OAAO,OAAO,WAAW,EAAE,CAAC;QACvG,MAAM,YAAY,GAAG,MAAM,eAAY,CAAC,aAAa,EAAE,IAAI,EAAE;YAC3D,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QACH,IAAI,CAAA,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,0CAAE,QAAQ,0CAAE,MAAM,IAAG,CAAC,IAAI,CAAC,CAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,0CAAE,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA,EAAE;YAClH,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,0CAAE,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;SAC3H;KACF;AACH,CAAC;AAbD,oEAaC;AAED,kCAAkC;AAC3B,KAAK,UAAU,eAAe,CAAC,kBAA8B,EAAE,QAAgB;IACpF,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC,CAAC;IAC9D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC1D,qCAAqC;IACrC,MAAM,eAAe,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,UAAkB,EAAE,EAAE;QACpE,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,UAAU,CAAC,CAAC;QAChH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YAChC,MAAM,IAAI,gBAAS,CAAC,CAAC,CAAC,GAAG,CAAC,8CAA8C,UAAU,OAAO,CAAC,CAAC,CAAC;SAC7F;QACD,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,uBAAuB;IACvB,KAAK,MAAM,UAAU,IAAI,eAAe,EAAE;QACxC,MAAM,iBAAiB,GAAG,+BAA+B,UAAU,QAAQ,QAAQ,EAAE,CAAC;QACtF,MAAM,cAAW,CAAC,iBAAiB,EAAE,IAAI,EAAE;YACzC,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;KACJ;AACH,CAAC;AAnBD,0CAmBC;AAED,wBAAwB;AACjB,KAAK,UAAU,WAAW,CAAC,cAAsB,EAAE,WAAmB;IAC3E,iCAAiC;IACjC,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;QACjC,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC,CAAC;QAClE,MAAM,sBAAU,CAAC,cAAc,EAAE,IAAI,EAAE;YACrC,cAAc,EAAE,WAAW;SAC5B,CAAC,CAAC;KACJ;SAAM;QACL,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,uDAAuD,cAAc,4CAA4C,CAAC,CAAC,CAAC;KACxI;IACD,uBAAuB;IACvB,MAAM,MAAM,GAAG,MAAM,kBAAS,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;IAC/C,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;QACtC,IAAI,WAAW,CAAC,mBAAmB,KAAK,IAAI,EAAE;YAC5C,MAAM,sBAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE;gBAC3C,cAAc,EAAE,WAAW;aAC5B,CAAC,CAAC;SACJ;aAAM;YACL,QAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,qBAAqB,WAAW,CAAC,QAAQ,oEAAoE,CAAC,CAAC,CAAC;SACpI;KACF;AACH,CAAC;AAtBD,kCAsBC"}