sfdx-jayree 4.5.1 → 4.6.0

package/lib/commands/jayree/org/settings.js

@@ -7,7 +7,7 @@
 import os from 'os';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { flags, SfdxCommand } from '@salesforce/command';
+import { Flags, SfCommand, requiredOrgFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { Messages, SfProject } from '@salesforce/core';
 import createDebug from 'debug';
 import fs from 'fs-extra';
@@ -27,9 +27,10 @@ function camelize(str) {
         return index === 0 ? match.toLowerCase() : match.toUpperCase();
     });
 }
-class ScratchOrgSettings extends SfdxCommand {
+class ScratchOrgSettings extends SfCommand {
     // eslint-disable-next-line complexity
     async run() {
+        const { flags } = await this.parse(ScratchOrgSettings);
         const debug = createDebug('jayree:scratchorg:settings');
         const removeEmpty = (obj) => {
             Object.entries(obj).forEach(([key, val]) => {
@@ -66,11 +67,11 @@ class ScratchOrgSettings extends SfdxCommand {
                 // eslint-disable-next-line no-empty
             }
             catch (error) { }
-            const apiVersion = this.flags.apiversion || sfdxProjectVersion || (await this.org.retrieveMaxApiVersion());
-            this.ux.log(`Using ${destRoot} and apiVersion=${apiVersion}`);
+            const apiVersion = flags.apiversion || sfdxProjectVersion || (await flags['target-org'].retrieveMaxApiVersion());
+            this.log(`Using ${destRoot} and apiVersion=${apiVersion}`);
             const componentSet = new ComponentSet([{ fullName: '*', type: 'Settings' }]);
             const mdapiRetrieve = await componentSet.retrieve({
-                usernameOrConnection: this.org.getUsername(),
+                usernameOrConnection: flags['target-org'].getUsername(),
                 output: destRoot,
                 apiVersion,
             });
@@ -104,7 +105,7 @@ class ScratchOrgSettings extends SfdxCommand {
                 if (typeof settings['activitiesSettings']['allowUsersToRelateMultipleContactsToTasksAndEvents'] !== 'undefined') {
                     delete settings['activitiesSettings']['allowUsersToRelateMultipleContactsToTasksAndEvents'];
                     debug('delete ' + 'activitiesSettings:allowUsersToRelateMultipleContactsToTasksAndEvents');
-                    this.ux.warn("You can't use the Tooling API or Metadata API to enable or disable Shared Activities.To enable this feature, visit the Activity Settings page in Setup.To disable this feature, contact Salesforce.");
+                    this.warn("You can't use the Tooling API or Metadata API to enable or disable Shared Activities.To enable this feature, visit the Activity Settings page in Setup.To disable this feature, contact Salesforce.");
                 }
             }
             if (typeof settings['territory2Settings'] !== 'undefined') {
@@ -139,10 +140,10 @@ class ScratchOrgSettings extends SfdxCommand {
             }
             settings = removeEmpty(settings);
             settings = sortKeys(settings);
-            if (this.flags.writetoprojectscratchdeffile) {
+            if (flags.writetoprojectscratchdeffile) {
                 const deffilepath = 
                 // eslint-disable-next-line @typescript-eslint/await-thenable
-                this.flags.file || join(await this.project.getPath(), 'config', 'project-scratch-def.json');
+                flags.file || join(await this.project.getPath(), 'config', 'project-scratch-def.json');
                 let deffile = {};
                 await fs
                     .readFile(deffilepath, 'utf8')
@@ -155,7 +156,7 @@ class ScratchOrgSettings extends SfdxCommand {
                                     if (settings['liveAgentSettings']['enableLiveAgent'] === 'false') {
                                         delete settings['liveAgentSettings'];
                                         debug('delete ' + 'liveAgentSettings');
-                                        this.ux.warn('liveAgentSettings: Not available for deploy for this organization');
+                                        this.warn('liveAgentSettings: Not available for deploy for this organization');
                                     }
                                 }
                             }
@@ -165,7 +166,7 @@ class ScratchOrgSettings extends SfdxCommand {
                                 if (settings['knowledgeSettings']['enableKnowledge'] === 'false') {
                                     delete settings['knowledgeSettings'];
                                     debug('delete ' + 'knowledgeSettings');
-                                    this.ux.warn("knowledgeSettings: Once enabled, Salesforce Knowledge can't be disabled.");
+                                    this.warn("knowledgeSettings: Once enabled, Salesforce Knowledge can't be disabled.");
                                 }
                             }
                         }
@@ -175,7 +176,7 @@ class ScratchOrgSettings extends SfdxCommand {
                                     if (settings['caseSettings']['emailToCase']['enableEmailToCase'] === 'false') {
                                         delete settings['caseSettings']['emailToCase'];
                                         debug('delete ' + 'caseSettings:emailToCase');
-                                        this.ux.warn('EmailToCaseSettings: Email to case cannot be disabled once it has been enabled.');
+                                        this.warn('EmailToCaseSettings: Email to case cannot be disabled once it has been enabled.');
                                     }
                                 }
                             }
@@ -184,7 +185,7 @@ class ScratchOrgSettings extends SfdxCommand {
                     deffile['settings'] = settings;
                 })
                     .catch((err) => {
-                    if (err.code === 'ENOENT' && !this.flags.file) {
+                    if (err.code === 'ENOENT' && !flags.file) {
                         throw Error("default file 'project-scratch-def.json' not found, please use --file flag");
                     }
                     else {
@@ -196,13 +197,17 @@ class ScratchOrgSettings extends SfdxCommand {
                 });
             }
             else {
-                this.ux.styledHeader('received settings from Org: ' + this.org.getUsername() + ' (' + this.org.getOrgId() + ')');
-                this.ux.styledJSON(settings);
+                this.styledHeader('received settings from Org: ' +
+                    flags['target-org'].getUsername() +
+                    ' (' +
+                    flags['target-org'].getOrgId() +
+                    ')');
+                this.styledJSON(settings);
             }
             return {
                 settings,
-                orgId: this.org.getOrgId(),
-                username: this.org.getUsername(),
+                orgId: flags['target-org'].getOrgId(),
+                username: flags['target-org'].getUsername(),
             };
         }
         catch (error) {
@@ -214,7 +219,7 @@ class ScratchOrgSettings extends SfdxCommand {
             }
         }
         finally {
-            if (!this.flags.keepcache) {
+            if (!flags.keepcache) {
                 process.once('exit', () => {
                     fs.removeSync(destRoot);
                 });
@@ -222,28 +227,27 @@ class ScratchOrgSettings extends SfdxCommand {
         }
     }
     throwError(err) {
-        this.ux.stopSpinner();
+        this.spinner.stop();
         throw err;
     }
 }
-ScratchOrgSettings.description = messages.getMessage('commandDescription');
+ScratchOrgSettings.summary = messages.getMessage('commandDescription');
 ScratchOrgSettings.examples = [
     `$ sfdx jayree:org:settings
 $ sfdx jayree:org:settings -u me@my.org
 $ sfdx jayree:org:settings -u MyTestOrg1 -w`,
 ];
-ScratchOrgSettings.flagsConfig = {
-    writetoprojectscratchdeffile: flags.boolean({
+ScratchOrgSettings.flags = {
+    'target-org': requiredOrgFlagWithDeprecations,
+    writetoprojectscratchdeffile: Flags.boolean({
         char: 'w',
-        description: messages.getMessage('writetoprojectscratchdeffile'),
+        summary: messages.getMessage('writetoprojectscratchdeffile'),
     }),
-    file: flags.string({
+    file: Flags.string({
         char: 'f',
-        description: messages.getMessage('fileFlagDescription'),
+        summary: messages.getMessage('fileFlagDescription'),
     }),
 };
-ScratchOrgSettings.requiresUsername = true;
-ScratchOrgSettings.supportsDevhubUsername = false;
 ScratchOrgSettings.requiresProject = true;
 export default ScratchOrgSettings;
 //# sourceMappingURL=settings.js.map

package/lib/commands/jayree/org/settings.js.map

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

package/lib/commands/jayree/org/streaming.d.ts

@@ -1,13 +1,12 @@
-import { flags, SfdxCommand } from '@salesforce/command';
+import { SfCommand } from '@salesforce/sf-plugins-core';
 import { AnyJson } from '@salesforce/ts-types';
-export default class Streaming extends SfdxCommand {
-    static description: string;
-    static examples: string[];
-    protected static flagsConfig: {
-        topic: flags.Discriminated<flags.String>;
+export default class Streaming extends SfCommand<AnyJson> {
+    static readonly summary: string;
+    static readonly examples: string[];
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        topic: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
-    protected static requiresUsername: boolean;
-    protected static supportsDevhubUsername: boolean;
-    protected static requiresProject: boolean;
     run(): Promise<AnyJson>;
 }

package/lib/commands/jayree/org/streaming.js

@@ -6,7 +6,7 @@
  */
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { flags, SfdxCommand } from '@salesforce/command';
+import { Flags, SfCommand, requiredOrgFlagWithDeprecations, orgApiVersionFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 // eslint-disable-next-line no-underscore-dangle
 const __filename = fileURLToPath(import.meta.url);
@@ -14,35 +14,35 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('sfdx-jayree', 'streaming');
-class Streaming extends SfdxCommand {
+class Streaming extends SfCommand {
     // eslint-disable-next-line @typescript-eslint/require-await
     async run() {
-        await this.org.refreshAuth();
-        const conn = this.org.getConnection();
+        const { flags } = await this.parse(Streaming);
+        await flags['target-org'].refreshAuth();
+        const conn = flags['target-org'].getConnection(flags['api-version']);
         // '/event/SAPAccountRequest__e'
-        await conn.streaming.topic(this.flags.topic).subscribe((event) => {
-            this.ux.logJson(event);
+        await conn.streaming.topic(flags.topic).subscribe((event) => {
+            this.styledJSON(event);
         });
         return {
-            orgId: this.org.getOrgId(),
+            orgId: flags['target-org'].getOrgId(),
         };
     }
 }
-Streaming.description = messages.getMessage('commandDescription');
+Streaming.summary = messages.getMessage('commandDescription');
 Streaming.examples = [
     `$ sfdx jayree:org:streaming --topic=/event/eventName__e
 ...
 `,
 ];
-Streaming.flagsConfig = {
-    topic: flags.string({
+Streaming.flags = {
+    'target-org': requiredOrgFlagWithDeprecations,
+    'api-version': orgApiVersionFlagWithDeprecations,
+    topic: Flags.string({
         char: 'p',
         required: true,
-        description: messages.getMessage('topicFlagDescription'),
+        summary: messages.getMessage('topicFlagDescription'),
     }),
 };
-Streaming.requiresUsername = true;
-Streaming.supportsDevhubUsername = false;
-Streaming.requiresProject = false;
 export default Streaming;
 //# sourceMappingURL=streaming.js.map

package/lib/commands/jayree/org/streaming.js.map

@@ -1 +1 @@
-{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../../src/commands/jayree/org/streaming.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,QAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AAEnE,MAAqB,SAAU,SAAQ,WAAW;IAqBhD,4DAA4D;IACrD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QACtC,gCAAgC;QAChC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/D,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;SAC3B,CAAC;IACJ,CAAC;;AAhCa,qBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAExD,kBAAQ,GAAG;IACvB;;CAEH;CACE,CAAC;AAEe,qBAAW,GAAG;IAC7B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;KACzD,CAAC;CACH,CAAC;AAEe,0BAAgB,GAAG,IAAI,CAAC;AACxB,gCAAsB,GAAG,KAAK,CAAC;AAC/B,yBAAe,GAAG,KAAK,CAAC;eAnBtB,SAAS"}
+{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../../../src/commands/jayree/org/streaming.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,KAAK,EACL,SAAS,EACT,+BAA+B,EAC/B,iCAAiC,GAClC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,QAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;AAEnE,MAAqB,SAAU,SAAQ,SAAkB;IAmBvD,4DAA4D;IACrD,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QACrE,gCAAgC;QAChC,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1D,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE;SACtC,CAAC;IACJ,CAAC;;AA/BsB,iBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAEpD,kBAAQ,GAAG;IAChC;;CAEH;CACE,CAAC;AAEqB,eAAK,GAAG;IAC7B,YAAY,EAAE,+BAA+B;IAC7C,aAAa,EAAE,iCAAiC;IAChD,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;KACrD,CAAC;CACH,CAAC;eAjBiB,SAAS"}

package/lib/commands/jayree/source/fix.d.ts

@@ -1,13 +1,12 @@
-import { flags, SfdxCommand } from '@salesforce/command';
+import { SfCommand } from '@salesforce/sf-plugins-core';
 import { AnyJson } from '@salesforce/ts-types';
-export default class FixMetadata extends SfdxCommand {
-    static description: string;
-    protected static flagsConfig: {
-        tag: flags.Discriminated<flags.Array<string>>;
-        verbose: flags.Builtin;
+export default class FixMetadata extends SfCommand<AnyJson> {
+    static readonly summary: string;
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        tag: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        verbose: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
-    protected static supportsUsername: boolean;
-    protected static supportsDevhubUsername: boolean;
-    protected static requiresProject: boolean;
+    static readonly requiresProject = true;
     run(): Promise<AnyJson>;
 }

package/lib/commands/jayree/source/fix.js

@@ -6,7 +6,7 @@
  */
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { flags, SfdxCommand } from '@salesforce/command';
+import { Flags, SfCommand, optionalOrgFlagWithDeprecations, arrayWithDeprecation } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import { applyFixes, logFixes } from '../../../utils/souceUtils.js';
 // eslint-disable-next-line no-underscore-dangle
@@ -15,11 +15,13 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 Messages.importMessagesDirectory(__dirname);
 const messages = Messages.loadMessages('sfdx-jayree', 'sourceretrievefix');
-class FixMetadata extends SfdxCommand {
+// eslint-disable-next-line sf-plugin/command-example
+class FixMetadata extends SfCommand {
     async run() {
+        const { flags } = await this.parse(FixMetadata);
         let updatedfiles = {};
         try {
-            updatedfiles = await applyFixes(this.flags.tag);
+            updatedfiles = await applyFixes(flags.tag);
             // eslint-disable-next-line no-empty
         }
         finally {
@@ -33,7 +35,7 @@ class FixMetadata extends SfdxCommand {
         };
     }
 }
-FixMetadata.description = messages.getMessage('commandDescription');
+FixMetadata.summary = messages.getMessage('commandDescription');
 /*   public static examples = [
   `$ sfdx jayree:flowtestcoverage
 === Flow Test Coverage
@@ -41,18 +43,17 @@ Coverage: 82%
 ...
 `
 ]; */
-FixMetadata.flagsConfig = {
-    tag: flags.array({
+FixMetadata.flags = {
+    'target-org': optionalOrgFlagWithDeprecations,
+    tag: arrayWithDeprecation({
         char: 't',
-        description: messages.getMessage('tag'),
+        summary: messages.getMessage('tag'),
     }),
-    verbose: flags.builtin({
+    verbose: Flags.boolean({
+        summary: messages.getMessage('log'),
         description: messages.getMessage('log'),
-        longDescription: messages.getMessage('log'),
     }),
 };
-FixMetadata.supportsUsername = true;
-FixMetadata.supportsDevhubUsername = false;
 FixMetadata.requiresProject = true;
 export default FixMetadata;
 //# sourceMappingURL=fix.js.map

package/lib/commands/jayree/source/fix.js.map

@@ -1 +1 @@
-{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../../../src/commands/jayree/source/fix.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAwB,MAAM,8BAA8B,CAAC;AAE1F,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,QAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAC;AAE3E,MAAqB,WAAY,SAAQ,WAAW;IA0B3C,KAAK,CAAC,GAAG;QACd,IAAI,YAAY,GAAyB,EAAE,CAAC;QAE5C,IAAI;YACF,YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChD,oCAAoC;SACrC;gBAAS;SACT;QAED,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;QAE7B,OAAO;YACL,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;iBACpC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;iBACnC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YAC5C,OAAO,EAAE,YAAY;SACtB,CAAC;IACJ,CAAC;;AA1Ca,uBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAEtE;;;;;;KAMK;AAEY,uBAAW,GAAG;IAC7B,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC;QACf,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;KACxC,CAAC;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;QACvC,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;KAC5C,CAAC;CACH,CAAC;AAEe,4BAAgB,GAAG,IAAI,CAAC;AACxB,kCAAsB,GAAG,KAAK,CAAC;AAC/B,2BAAe,GAAG,IAAI,CAAC;eAxBrB,WAAW"}
+{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../../../src/commands/jayree/source/fix.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,+BAA+B,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACtH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAwB,MAAM,8BAA8B,CAAC;AAE1F,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,QAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,mBAAmB,CAAC,CAAC;AAE3E,qDAAqD;AACrD,MAAqB,WAAY,SAAQ,SAAkB;IAyBlD,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,YAAY,GAAyB,EAAE,CAAC;QAE5C,IAAI;YACF,YAAY,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,oCAAoC;SACrC;gBAAS;SACT;QAED,MAAM,QAAQ,CAAC,YAAY,CAAC,CAAC;QAE7B,OAAO;YACL,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;iBACpC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;iBACnC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YAC5C,OAAO,EAAE,YAAY;SACtB,CAAC;IACJ,CAAC;;AA1CsB,mBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;AAE3E;;;;;;KAMK;AAEkB,iBAAK,GAAG;IAC7B,YAAY,EAAE,+BAA+B;IAC7C,GAAG,EAAE,oBAAoB,CAAC;QACxB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;KACpC,CAAC;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;QACnC,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;KACxC,CAAC;CACH,CAAC;AAEqB,2BAAe,GAAG,IAAI,CAAC;eAvB3B,WAAW"}

package/lib/commands/jayree/version.d.ts

@@ -1,6 +1,6 @@
-import { SfdxCommand } from '@salesforce/command';
+import { SfCommand } from '@salesforce/sf-plugins-core';
 import { AnyJson } from '@salesforce/ts-types';
-export default class Version extends SfdxCommand {
-    static hidden: boolean;
+export default class Version extends SfCommand<AnyJson> {
+    static readonly hidden = true;
     run(): Promise<AnyJson>;
 }

package/lib/commands/jayree/version.js

@@ -7,12 +7,13 @@
 import { accessSync, readFileSync } from 'fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { SfdxCommand } from '@salesforce/command';
+import { SfCommand } from '@salesforce/sf-plugins-core';
 // eslint-disable-next-line no-underscore-dangle
 const __filename = fileURLToPath(import.meta.url);
 // eslint-disable-next-line no-underscore-dangle
 const __dirname = dirname(__filename);
-class Version extends SfdxCommand {
+// eslint-disable-next-line sf-plugin/command-example, sf-plugin/command-summary
+class Version extends SfCommand {
     // eslint-disable-next-line @typescript-eslint/require-await
     async run() {
         const root = () => {
@@ -30,7 +31,7 @@ class Version extends SfdxCommand {
             return rootpath;
         };
         const packageJsonData = JSON.parse(readFileSync(join(root(), 'package.json'), 'utf-8'));
-        this.ux.log(packageJsonData.version);
+        this.log(packageJsonData.version);
         return {
             version: packageJsonData.version,
         };

package/lib/commands/jayree/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/commands/jayree/version.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGlD,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,MAAqB,OAAQ,SAAQ,WAAW;IAG9C,4DAA4D;IACrD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAG,GAAG,EAAE;YAChB,IAAI,WAAW,GAAG,SAAS,CAAC;YAC5B,IAAI,QAAQ,CAAC;YACb,OAAO,CAAC,QAAQ,EAAE;gBAChB,IAAI;oBACF,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;oBAC9C,QAAQ,GAAG,WAAW,CAAC;iBACxB;gBAAC,MAAM;oBACN,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;iBACpC;aACF;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACrC,OAAO;YACL,OAAO,EAAE,eAAe,CAAC,OAAO;SACjC,CAAC;IACJ,CAAC;;AAvBa,cAAM,GAAG,IAAI,CAAC;eADT,OAAO"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/commands/jayree/version.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAGxD,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,gFAAgF;AAChF,MAAqB,OAAQ,SAAQ,SAAkB;IAGrD,4DAA4D;IACrD,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAG,GAAG,EAAE;YAChB,IAAI,WAAW,GAAG,SAAS,CAAC;YAC5B,IAAI,QAAQ,CAAC;YACb,OAAO,CAAC,QAAQ,EAAE;gBAChB,IAAI;oBACF,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;oBAC9C,QAAQ,GAAG,WAAW,CAAC;iBACxB;gBAAC,MAAM;oBACN,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;iBACpC;aACF;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAClC,OAAO;YACL,OAAO,EAAE,eAAe,CAAC,OAAO;SACjC,CAAC;IACJ,CAAC;;AAvBsB,cAAM,GAAG,IAAI,CAAC;eADlB,OAAO"}

package/lib/utils/config.js

@@ -7,26 +7,12 @@
 /* istanbul ignore file */
 import { join } from 'path';
 import fs from 'fs-extra';
-import isDocker from 'is-docker';
-import isWsl from 'is-wsl';
 import { SfProject } from '@salesforce/core';
 const CONFIG_DEFAULTS = {
     ensureUserPermissions: [],
     ensureObjectPermissions: [],
-    moveSourceFolders: [],
     applySourceFixes: ['source:retrieve:full', 'source:retrieve:all'],
     runHooks: false,
-    puppeteerDocker: {
-        headless: true,
-        args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-features=site-per-process'],
-    },
-    puppeteerWSL: {
-        headless: true,
-        executablePath: '/bin/google-chrome',
-    },
-    puppeteer: {
-        headless: true,
-    },
 };
 const resolvedConfigs = {};
 export default (path = SfProject.resolveProjectPathSync()) => {
@@ -46,23 +32,12 @@ export default (path = SfProject.resolveProjectPathSync()) => {
             throw error;
         }
     }
-    if (configFromFile.puppeteer && isDocker()) {
-        configFromFile.puppeteer = { ...defaults.puppeteerDocker, ...configFromFile.puppeteer };
-    }
-    if (configFromFile.puppeteer && isWsl) {
-        configFromFile.puppeteer = { ...defaults.puppeteerWSL, ...configFromFile.puppeteer };
-    }
     const config = {
         ...configFromFile,
         ensureUserPermissions: configFromFile.ensureUserPermissions || defaults.ensureUserPermissions,
         ensureObjectPermissions: configFromFile.ensureObjectPermissions || defaults.ensureObjectPermissions,
-        moveSourceFolders: configFromFile.moveSourceFolders || defaults.moveSourceFolders,
         applySourceFixes: configFromFile.applySourceFixes || defaults.applySourceFixes,
         runHooks: configFromFile.runHooks || defaults.runHooks,
-        puppeteer: configFromFile.puppeteer ||
-            (isWsl && defaults.puppeteerWSL) ||
-            (isDocker() && defaults.puppeteerDocker) ||
-            defaults.puppeteer,
     };
     resolvedConfigs[path] = config;
     return config;

package/lib/utils/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,0BAA0B;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,KAAK,MAAM,QAAQ,CAAC;AAE3B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,MAAM,eAAe,GAAG;IACtB,qBAAqB,EAAE,EAAE;IACzB,uBAAuB,EAAE,EAAE;IAC3B,iBAAiB,EAAE,EAAE;IACrB,gBAAgB,EAAE,CAAC,sBAAsB,EAAE,qBAAqB,CAAC;IACjE,QAAQ,EAAE,KAAK;IACf,eAAe,EAAE;QACf,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,CAAC,cAAc,EAAE,0BAA0B,EAAE,qCAAqC,CAAC;KAC1F;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,IAAI;QACd,cAAc,EAAE,oBAAoB;KACrC;IACD,SAAS,EAAE;QACT,QAAQ,EAAE,IAAI;KACf;CACF,CAAC;AAEF,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,eAAe,CAAC,IAAI,GAAG,SAAS,CAAC,sBAAsB,EAAE,EAAE,EAAE;IAC3D,IAAI,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;QACjC,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;KAC9B;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC;IACjC,IAAI,cAAc,CAAC;IACnB,IAAI;QACF,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,CAAC;KACnE;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,cAAc,GAAG,EAAE,CAAC;SACrB;aAAM;YACL,MAAM,KAAK,CAAC;SACb;KACF;IAED,IAAI,cAAc,CAAC,SAAS,IAAI,QAAQ,EAAE,EAAE;QAC1C,cAAc,CAAC,SAAS,GAAG,EAAE,GAAG,QAAQ,CAAC,eAAe,EAAE,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC;KACzF;IAED,IAAI,cAAc,CAAC,SAAS,IAAI,KAAK,EAAE;QACrC,cAAc,CAAC,SAAS,GAAG,EAAE,GAAG,QAAQ,CAAC,YAAY,EAAE,GAAG,cAAc,CAAC,SAAS,EAAE,CAAC;KACtF;IAED,MAAM,MAAM,GAAG;QACb,GAAG,cAAc;QACjB,qBAAqB,EAAE,cAAc,CAAC,qBAAqB,IAAI,QAAQ,CAAC,qBAAqB;QAC7F,uBAAuB,EAAE,cAAc,CAAC,uBAAuB,IAAI,QAAQ,CAAC,uBAAuB;QACnG,iBAAiB,EAAE,cAAc,CAAC,iBAAiB,IAAI,QAAQ,CAAC,iBAAiB;QACjF,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,IAAI,QAAQ,CAAC,gBAAgB;QAC9E,QAAQ,EAAE,cAAc,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ;QACtD,SAAS,EACP,cAAc,CAAC,SAAS;YACxB,CAAC,KAAK,IAAI,QAAQ,CAAC,YAAY,CAAC;YAChC,CAAC,QAAQ,EAAE,IAAI,QAAQ,CAAC,eAAe,CAAC;YACxC,QAAQ,CAAC,SAAS;KACrB,CAAC;IAEF,eAAe,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IAC/B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,0BAA0B;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,MAAM,eAAe,GAAG;IACtB,qBAAqB,EAAE,EAAE;IACzB,uBAAuB,EAAE,EAAE;IAC3B,gBAAgB,EAAE,CAAC,sBAAsB,EAAE,qBAAqB,CAAC;IACjE,QAAQ,EAAE,KAAK;CAChB,CAAC;AAEF,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,eAAe,CAAC,IAAI,GAAG,SAAS,CAAC,sBAAsB,EAAE,EAAE,EAAE;IAC3D,IAAI,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;QACjC,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;KAC9B;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC;IACjC,IAAI,cAAc,CAAC;IACnB,IAAI;QACF,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,CAAC;KACnE;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,cAAc,GAAG,EAAE,CAAC;SACrB;aAAM;YACL,MAAM,KAAK,CAAC;SACb;KACF;IAED,MAAM,MAAM,GAAG;QACb,GAAG,cAAc;QACjB,qBAAqB,EAAE,cAAc,CAAC,qBAAqB,IAAI,QAAQ,CAAC,qBAAqB;QAC7F,uBAAuB,EAAE,cAAc,CAAC,uBAAuB,IAAI,QAAQ,CAAC,uBAAuB;QACnG,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,IAAI,QAAQ,CAAC,gBAAgB;QAC9E,QAAQ,EAAE,cAAc,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ;KACvD,CAAC;IAEF,eAAe,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IAC/B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/lib/utils/stateFolderHandler.js

@@ -7,8 +7,7 @@
 import path from 'path';
 import fs from 'fs-extra';
 import Debug from 'debug';
-import factory from 'ignore';
-const ignore = factory.default;
+import ignore from 'ignore';
 const debug = Debug('jayree:state:folder');
 export async function getCurrentStateFolderFilePath(projectPath, file, migrate) {
     const sfdxPath = path.join(projectPath, '.sfdx', file);

package/lib/utils/stateFolderHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"stateFolderHandler.js","sourceRoot":"","sources":["../../src/utils/stateFolderHandler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,OAAO,MAAM,QAAQ,CAAC;AAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;AAE/B,MAAM,KAAK,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,WAAmB,EACnB,IAAY,EACZ,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE;QAClC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,EAAE;YAC7D,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChH,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE;gBAC9C,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE;oBAC/C,KAAK,CAAC,uBAAuB,CAAC,CAAC;oBAC/B,OAAO,QAAQ,CAAC;iBACjB;aACF;SACF;QAED,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI,OAAO,EAAE;gBACX,KAAK,CAAC,YAAY,IAAI,yBAAyB,CAAC,CAAC;gBACjD,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACjC;iBAAM;gBACL,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAC/B,OAAO,QAAQ,CAAC;aACjB;SACF;KACF;IAED,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"stateFolderHandler.js","sourceRoot":"","sources":["../../src/utils/stateFolderHandler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,KAAK,GAAG,KAAK,CAAC,qBAAqB,CAAC,CAAC;AAE3C,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,WAAmB,EACnB,IAAY,EACZ,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE;QAClC,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,EAAE;YAC7D,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChH,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EAAE;gBAC9C,IAAI,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE;oBAC/C,KAAK,CAAC,uBAAuB,CAAC,CAAC;oBAC/B,OAAO,QAAQ,CAAC;iBACjB;aACF;SACF;QAED,IAAI,MAAM,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YACjC,IAAI,OAAO,EAAE;gBACX,KAAK,CAAC,YAAY,IAAI,yBAAyB,CAAC,CAAC;gBACjD,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACjC;iBAAM;gBACL,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAC/B,OAAO,QAAQ,CAAC;aACjB;SACF;KACF;IAED,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC;AAChB,CAAC"}