sfdx-jayree 4.3.10 → 4.3.13

package/lib/src/hooks/changelog.js

@@ -37,7 +37,7 @@ const debug_1 = require("debug");
 const TerminalRenderer = require("marked-terminal");
 const marked_1 = require("marked");
 const semver = __importStar(require("semver"));
-const cli_ux_1 = require("cli-ux");
+const core_1 = require("@oclif/core");
 const debug = (0, debug_1.debug)('jayree:hooks');
 // original from https://github.com/salesforcecli/plugin-info/blob/main/src/shared/parseReleaseNotes.ts
 const parseReleaseNotes = (notes, version) => {
@@ -78,7 +78,8 @@ const parseReleaseNotes = (notes, version) => {
     }
     return tokens;
 };
-const changelog = function () {
+// eslint-disable-next-line @typescript-eslint/require-await
+const changelog = async function () {
     process.once('exit', () => {
         try {
             const pluginRootPath = (0, path_1.join)(__dirname, '..', '..', '..');
@@ -105,7 +106,7 @@ const changelog = function () {
                         renderer: new TerminalRenderer({ emoji: false }),
                     });
                     tokens.unshift(marked_1.marked.lexer(`# Changelog for '${name}':`)[0]);
-                    cli_ux_1.cli.log(marked_1.marked.parser(tokens));
+                    core_1.CliUx.ux.log(marked_1.marked.parser(tokens));
                     fs.writeJsonSync(versionFile, { version });
                 }
             }

package/lib/src/hooks/changelog.js.map

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

package/lib/src/hooks/postretrieve.d.ts

@@ -1,12 +1,12 @@
-import { Command, Hook, IConfig } from '@oclif/config';
+import { Hook, Config } from '@oclif/core';
 import { FileResponse } from '@salesforce/source-deploy-retrieve';
 declare type HookFunction = (this: Hook.Context, options: HookOptions) => any;
 declare type HookOptions = {
-    Command: Command.Class;
+    Command: any;
     argv: string[];
     commandId: string;
     result: FileResponse[];
-    config: IConfig;
+    config: Config;
 };
 export declare const postretrieve: HookFunction;
 export {};

package/lib/src/hooks/postretrieve.js

@@ -31,9 +31,9 @@ exports.postretrieve = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const path = __importStar(require("path"));
-const cli_ux_1 = require("cli-ux");
+const core_1 = require("@oclif/core");
 const kit_1 = require("@salesforce/kit");
-const core_1 = require("@salesforce/core");
+const core_2 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const souceUtils_1 = require("../utils/souceUtils");
 const hookUtils_1 = require("../utils/hookUtils");
@@ -83,7 +83,7 @@ const postretrieve = async function (options) {
             toUpdate[value.filePath] = value.message;
         });
         debug({ toUpdate });
-        const projectPath = await core_1.SfdxProject.resolveProjectPath();
+        const projectPath = await core_2.SfProject.resolveProjectPath();
         const inboundFiles = [];
         result.forEach((element) => {
             if (!toRemove.includes(element.filePath)) {
@@ -101,8 +101,8 @@ const postretrieve = async function (options) {
         }
         else {
             if (kit_1.env.getBoolean('SFDX_ENABLE_JAYREE_HOOKS_JSON_OUTPUT', false)) {
-                cli_ux_1.cli.log(',');
-                cli_ux_1.cli.styledJSON({
+                core_1.CliUx.ux.log(',');
+                core_1.CliUx.ux.styledJSON({
                     result: {
                         [options.Command.id === 'force:source:pull' ? 'pulledSource' : 'inboundFiles']: inboundFiles,
                         fixedFiles: Object.values(updatedfiles)

package/lib/src/hooks/postretrieve.js.map

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

package/lib/src/hooks/preretrieve.d.ts

@@ -1,11 +1,11 @@
-import { Command, Hook, IConfig } from '@oclif/config';
+import { Hook, Config } from '@oclif/core';
 declare type HookFunction = (this: Hook.Context, options: HookOptions) => any;
 declare type HookOptions = {
-    Command: Command.Class;
+    Command: any;
     argv: string[];
     commandId: string;
     result?: PreRetrieveResult;
-    config: IConfig;
+    config: Config;
 };
 declare type PreRetrieveResult = {
     packageXmlPath: string;

package/lib/src/hooks/prerun.d.ts

@@ -1,2 +1,2 @@
-import { Hook } from '@oclif/config';
+import { Hook } from '@oclif/core';
 export declare const prerun: Hook<'prerun'>;

package/lib/src/hooks/prerun.js

@@ -35,33 +35,29 @@ exports.prerun = void 0;
  */
 /* istanbul ignore file */
 const path = __importStar(require("path"));
-const cli_ux_1 = require("cli-ux");
+const core_1 = require("@oclif/core");
 const kit_1 = require("@salesforce/kit");
 const fs = __importStar(require("fs-extra"));
 const chalk_1 = __importDefault(require("chalk"));
 const source_tracking_1 = require("@salesforce/source-tracking");
-const core_1 = require("@salesforce/core");
-const hookUtils_1 = require("../utils/hookUtils");
+const core_2 = require("@salesforce/core");
 const souceUtils_1 = require("../utils/souceUtils");
+const stateFolderHandler_1 = require("../utils/stateFolderHandler");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const debug = require('debug')('jayree:hooks');
 const prerun = async function (options) {
     debug(`called 'jayree:prerun' by: ${options.Command.id}`);
-    if (!hookUtils_1.runHooks) {
-        debug('hooks disabled');
-        return;
-    }
     if (options.Command.id === 'force:source:pull') {
         if (kit_1.env.getBoolean('SFDX_ENABLE_JAYREE_HOOKS_RESET_BEFORE_PULL', false)) {
             debug('force:source:pull detected');
             let storedServerMaxRevisionCounter;
             let storedServerMaxRevisionCounterPath;
             const projectPath = await (0, souceUtils_1.getProjectPath)();
-            const project = core_1.SfdxProject.getInstance(projectPath);
+            const project = core_2.SfProject.getInstance(projectPath);
             const userName = (await (0, souceUtils_1.getConnectionFromArgv)()).username;
-            const org = await core_1.Org.create({ aliasOrUsername: userName });
+            const org = await core_2.Org.create({ aliasOrUsername: userName });
             try {
-                storedServerMaxRevisionCounterPath = path.join(projectPath, '.sfdx', 'orgs', org.getOrgId(), 'jayreeStoredMaxRevision.json');
+                storedServerMaxRevisionCounterPath = await (0, stateFolderHandler_1.getCurrentStateFolderFilePath)(projectPath, path.join('orgs', org.getOrgId(), 'jayreeStoredMaxRevision.json'), true);
                 const { serverMaxRevisionCounter } = await fs.readJSON(storedServerMaxRevisionCounterPath, { throws: false });
                 storedServerMaxRevisionCounter = serverMaxRevisionCounter;
                 // eslint-disable-next-line no-empty
@@ -74,7 +70,7 @@ const prerun = async function (options) {
                         sourceTracking.resetRemoteTracking(storedServerMaxRevisionCounter),
                         sourceTracking.resetLocalTracking(),
                     ]);
-                    cli_ux_1.cli.log(`Reset local tracking files to revision ${storedServerMaxRevisionCounter}.`);
+                    core_1.CliUx.ux.log(`Reset local tracking files to revision ${storedServerMaxRevisionCounter}.`);
                     // eslint-disable-next-line no-empty
                 }
                 catch (error) { }
@@ -82,12 +78,12 @@ const prerun = async function (options) {
             else {
                 let localServerMaxRevisionCounter = 0;
                 try {
-                    const { serverMaxRevisionCounter } = await fs.readJSON(path.join(projectPath, '.sfdx', 'orgs', (await core_1.Org.create({ aliasOrUsername: userName })).getOrgId(), 'maxRevision.json'), { throws: false });
+                    const { serverMaxRevisionCounter } = await fs.readJSON(await (0, stateFolderHandler_1.getCurrentStateFolderFilePath)(projectPath, path.join('orgs', (await core_2.Org.create({ aliasOrUsername: userName })).getOrgId(), 'maxRevision.json'), false), { throws: false });
                     localServerMaxRevisionCounter = serverMaxRevisionCounter;
                     // eslint-disable-next-line no-empty
                 }
                 catch (error) { }
-                const answer = await cli_ux_1.cli.confirm(chalk_1.default.dim(`WARNING: No stored revision found for scratch org with name: ${userName}.
+                const answer = await core_1.CliUx.ux.confirm(chalk_1.default.dim(`WARNING: No stored revision found for scratch org with name: ${userName}.
 Store current local revision: ${localServerMaxRevisionCounter}? (y/n)`));
                 if (answer) {
                     await fs.ensureFile(storedServerMaxRevisionCounterPath);

package/lib/src/hooks/prerun.js.map

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

package/lib/src/utils/config.js

@@ -57,7 +57,7 @@ const CONFIG_DEFAULTS = {
     },
 };
 const resolvedConfigs = {};
-exports.default = (path = core_1.SfdxProject.resolveProjectPathSync()) => {
+exports.default = (path = core_1.SfProject.resolveProjectPathSync()) => {
     if (path && resolvedConfigs[path]) {
         return resolvedConfigs[path];
     }

package/lib/src/utils/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,0BAA0B;AAC1B,+BAA4B;AAC5B,6CAA+B;AAC/B,0DAAiC;AACjC,oDAA2B;AAE3B,2CAA+C;AAE/C,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,kBAAe,CAAC,IAAI,GAAG,kBAAW,CAAC,sBAAsB,EAAE,EAAE,EAAE;IAC7D,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,IAAA,WAAI,EAAC,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,IAAA,mBAAQ,GAAE,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,gBAAK,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,gBAAK,IAAI,QAAQ,CAAC,YAAY,CAAC;YAChC,CAAC,IAAA,mBAAQ,GAAE,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,+BAA4B;AAC5B,6CAA+B;AAC/B,0DAAiC;AACjC,oDAA2B;AAE3B,2CAA6C;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,kBAAe,CAAC,IAAI,GAAG,gBAAS,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,IAAA,WAAI,EAAC,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,IAAA,mBAAQ,GAAE,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,gBAAK,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,gBAAK,IAAI,QAAQ,CAAC,YAAY,CAAC;YAChC,CAAC,IAAA,mBAAQ,GAAE,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"}

package/lib/src/utils/hookUtils.js

@@ -39,7 +39,7 @@ const kit = __importStar(require("@salesforce/kit"));
 const config_1 = __importDefault(require("../utils/config"));
 exports.runHooks = (() => {
     try {
-        return (Boolean((0, config_1.default)(core_1.SfdxProject.resolveProjectPathSync()).runHooks) &&
+        return (Boolean((0, config_1.default)(core_1.SfProject.resolveProjectPathSync()).runHooks) &&
             !kit.env.getBoolean('SFDX_DISABLE_JAYREE_HOOKS', false));
     }
     catch (error) {

package/lib/src/utils/hookUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"hookUtils.js","sourceRoot":"","sources":["../../../src/utils/hookUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,0BAA0B;AAC1B,2CAA+C;AAC/C,qDAAuC;AACvC,6DAAqC;AAExB,QAAA,QAAQ,GAAG,CAAC,GAAG,EAAE;IAC5B,IAAI;QACF,OAAO,CACL,OAAO,CAAC,IAAA,gBAAM,EAAC,kBAAW,CAAC,sBAAsB,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC9D,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,2BAA2B,EAAE,KAAK,CAAC,CACxD,CAAC;KACH;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC,EAAE,CAAC"}
+{"version":3,"file":"hookUtils.js","sourceRoot":"","sources":["../../../src/utils/hookUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,0BAA0B;AAC1B,2CAA6C;AAC7C,qDAAuC;AACvC,6DAAqC;AAExB,QAAA,QAAQ,GAAG,CAAC,GAAG,EAAE;IAC5B,IAAI;QACF,OAAO,CACL,OAAO,CAAC,IAAA,gBAAM,EAAC,gBAAS,CAAC,sBAAsB,EAAE,CAAC,CAAC,QAAQ,CAAC;YAC5D,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,2BAA2B,EAAE,KAAK,CAAC,CACxD,CAAC;KACH;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC,EAAE,CAAC"}

package/lib/src/utils/souceUtils.js

@@ -38,10 +38,11 @@ const path = __importStar(require("path"));
 const os_1 = __importDefault(require("os"));
 const fs = __importStar(require("fs-extra"));
 const core_1 = require("@salesforce/core");
+const internal_1 = require("@salesforce/core/lib/util/internal");
 const kit = __importStar(require("@salesforce/kit"));
-const cli_ux_1 = __importDefault(require("cli-ux"));
+const core_2 = require("@oclif/core");
 const globby_1 = __importDefault(require("globby"));
-const core_2 = require("@salesforce/core");
+const core_3 = require("@salesforce/core");
 const chalk_1 = __importDefault(require("chalk"));
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const xml_1 = require("../utils/xml");
@@ -63,7 +64,7 @@ async function getProjectPath() {
         return projectPath;
     }
     try {
-        projectPath = (await core_1.SfdxProject.resolveProjectPath()).split(path.sep).join(path.posix.sep);
+        projectPath = (await core_1.SfProject.resolveProjectPath()).split(path.sep).join(path.posix.sep);
         return projectPath;
     }
     catch (error) {
@@ -97,7 +98,7 @@ async function profileElementInjection(profiles, customObjectsFilter = []) {
     }
     if (ensureObjectPermissions.length === 0) {
         process.once('exit', () => {
-            cli_ux_1.default.warn('no ensureObjectPermissions list configured');
+            core_2.CliUx.ux.warn('no ensureObjectPermissions list configured');
         });
     }
     for (const file of profiles) {
@@ -156,8 +157,8 @@ async function logFixes(updatedfiles) {
         const root = await getProjectPath();
         Object.keys(updatedfiles).forEach((workaround) => {
             if (updatedfiles[workaround].length > 0) {
-                cli_ux_1.default.styledHeader(chalk_1.default.blue(`Fixed Source: ${workaround}`));
-                cli_ux_1.default.table(updatedfiles[workaround], {
+                core_2.CliUx.ux.styledHeader(chalk_1.default.blue(`Fixed Source: ${workaround}`));
+                core_2.CliUx.ux.table(updatedfiles[workaround], {
                     filePath: {
                         header: 'FILEPATH',
                         get: (row) => path.relative(root, row.filePath),
@@ -236,7 +237,10 @@ async function getConnectionFromArgv() {
     let aliasOrUsername = '';
     while (argv.length && aliasOrUsername.length === 0) {
         const input = argv.shift();
-        if (input.startsWith('-u') || input.startsWith('--targetusername')) {
+        if (input.startsWith('-u') ||
+            input.startsWith('--targetusername') ||
+            input.startsWith('-o') ||
+            input.startsWith('--target-org')) {
             const i = input.indexOf('=');
             if (i !== -1) {
                 aliasOrUsername = input.slice(i + 1, input.length);
@@ -248,14 +252,14 @@ async function getConnectionFromArgv() {
     }
     if (aliasOrUsername.length === 0) {
         try {
-            const aggregator = await core_2.ConfigAggregator.create();
-            aliasOrUsername = aggregator.getPropertyValue('defaultusername').toString();
+            const aggregator = await core_3.ConfigAggregator.create();
+            aliasOrUsername = aggregator.getPropertyValue('target-org').toString();
         }
         catch {
-            throw new Error('This command requires a username to apply <mydomain> or <username>. Specify it with the -u parameter or with the "sfdx config:set defaultusername=<username>" command.');
+            throw new Error('This command requires a username to apply <mydomain> or <username>. Specify it with the -u (-o) parameter or with the "sfdx config:set defaultusername=<username>" command.');
         }
     }
-    const org = await core_2.Org.create({ aliasOrUsername });
+    const org = await core_3.Org.create({ aliasOrUsername });
     argvConnection = { instanceUrl: org.getConnection().instanceUrl, username: org.getConnection().getUsername() };
     return argvConnection;
 }
@@ -496,7 +500,7 @@ async function applyFixes(tags, root, filter = []) {
     if (!root) {
         root = await getProjectPath();
     }
-    const configPath = await core_1.fs.traverseForFile(process.cwd(), '.sfdx-jayree.json');
+    const configPath = await internal_1.traverse.forFile(process.cwd(), '.sfdx-jayree.json');
     const updatedfiles = {};
     for (const tag of tags) {
         const fix = (0, config_1.default)(configPath)[tag];
@@ -592,6 +596,7 @@ async function updateProfiles(profiles, customObjects, forceSourcePull) {
         const componentSet = new source_deploy_retrieve_1.ComponentSet(ComponentSetArray);
         const mdapiRetrieve = await componentSet.retrieve({
             usernameOrConnection: (await getConnectionFromArgv()).username,
+            merge: true,
             output: destRoot,
         });
         const retrieveResult = await mdapiRetrieve.pollStatus(1000);

package/lib/src/utils/souceUtils.js.map

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

package/lib/src/utils/stateFolderHandler.d.ts

@@ -0,0 +1 @@
+export declare function getCurrentStateFolderFilePath(projectPath: string, file: string, migrate: boolean): Promise<string>;

package/lib/src/utils/stateFolderHandler.js

@@ -0,0 +1,69 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCurrentStateFolderFilePath = void 0;
+/*
+ * Copyright (c) 2021, jayree
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs-extra"));
+const ignore_1 = __importDefault(require("ignore"));
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const debug = require('debug')('jayree:state:folder');
+async function getCurrentStateFolderFilePath(projectPath, file, migrate) {
+    const sfdxPath = path.join(projectPath, '.sfdx', file);
+    const sfPath = path.join(projectPath, '.sf', file);
+    if (!(await fs.pathExists(sfPath))) {
+        if (await fs.pathExists(path.join(projectPath, '.gitignore'))) {
+            const gitIgnore = (0, ignore_1.default)().add(Buffer.from(await fs.readFile(path.join(projectPath, '.gitignore'))).toString());
+            if (!gitIgnore.ignores(path.join('.sf', file))) {
+                if (gitIgnore.ignores(path.join('.sfdx', file))) {
+                    debug('use sfdx state folder');
+                    return sfdxPath;
+                }
+            }
+        }
+        if (await fs.pathExists(sfdxPath)) {
+            if (migrate) {
+                debug(`migrate '${file}' to '.sf' state folder`);
+                await fs.copy(sfdxPath, sfPath);
+            }
+            else {
+                debug('use sfdx state folder');
+                return sfdxPath;
+            }
+        }
+    }
+    debug('use sf state folder');
+    return sfPath;
+}
+exports.getCurrentStateFolderFilePath = getCurrentStateFolderFilePath;
+//# sourceMappingURL=stateFolderHandler.js.map

package/lib/src/utils/stateFolderHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stateFolderHandler.js","sourceRoot":"","sources":["../../../src/utils/stateFolderHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;GAKG;AACH,2CAA6B;AAC7B,6CAA+B;AAC/B,oDAA4B;AAE5B,8DAA8D;AAC9D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC,CAAC;AAE/C,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,IAAA,gBAAM,GAAE,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;AAhCD,sEAgCC"}