@salesforce/plugin-deploy-retrieve 1.5.3 → 1.6.0

package/lib/commands/retrieve/metadata/preview.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * Copyright (c) 2022, salesforce.com, inc.
+ * 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 core_1 = require("@salesforce/core");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const source_tracking_1 = require("@salesforce/source-tracking");
+const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
+const previewOutput_1 = require("../../../utils/previewOutput");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.metadata.preview');
+class RetrieveMetadataPreview extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(RetrieveMetadataPreview);
+        const stl = await source_tracking_1.SourceTracking.create({
+            org: flags['target-org'],
+            project: this.project,
+            ignoreConflicts: flags['ignore-conflicts'],
+        });
+        const forceIgnore = source_deploy_retrieve_1.ForceIgnore.findAndCreate(this.project.getDefaultPackage().path);
+        const [componentSet, filesWithConflicts, remoteDeletes] = await Promise.all([
+            stl.remoteNonDeletesAsComponentSet(),
+            (0, previewOutput_1.getConflictFiles)(stl, flags['ignore-conflicts']),
+            stl.getChanges({ origin: 'remote', state: 'delete', format: 'SourceComponent' }),
+        ]);
+        const output = (0, previewOutput_1.compileResults)({
+            componentSet,
+            projectPath: this.project.getPath(),
+            filesWithConflicts,
+            forceIgnore,
+            baseOperation: 'retrieve',
+            remoteDeletes,
+        });
+        if (!this.jsonEnabled()) {
+            (0, previewOutput_1.printTables)(output, 'retrieve');
+        }
+        return output;
+    }
+}
+exports.default = RetrieveMetadataPreview;
+RetrieveMetadataPreview.description = messages.getMessage('description');
+RetrieveMetadataPreview.summary = messages.getMessage('summary');
+RetrieveMetadataPreview.examples = messages.getMessages('examples');
+RetrieveMetadataPreview.requiresProject = true;
+RetrieveMetadataPreview.state = 'beta';
+RetrieveMetadataPreview.flags = {
+    'ignore-conflicts': sf_plugins_core_1.Flags.boolean({
+        char: 'c',
+        summary: messages.getMessage('flags.ignore-conflicts.summary'),
+        description: messages.getMessage('flags.ignore-conflicts.description'),
+        default: false,
+    }),
+    'target-org': sf_plugins_core_1.Flags.requiredOrg({
+        char: 'o',
+        description: messages.getMessage('flags.target-org.description'),
+        summary: messages.getMessage('flags.target-org.summary'),
+    }),
+};
+//# sourceMappingURL=preview.js.map

package/lib/commands/retrieve/metadata/preview.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../../../src/commands/retrieve/metadata/preview.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,2CAA4C;AAC5C,iEAA+D;AAC/D,iEAA6D;AAC7D,+EAAiE;AACjE,gEAA4G;AAE5G,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,2BAA2B,CAAC,CAAC;AAE1G,MAAqB,uBAAwB,SAAQ,2BAAwB;IAqBpE,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAE5D,MAAM,GAAG,GAAG,MAAM,gCAAc,CAAC,MAAM,CAAC;YACtC,GAAG,EAAE,KAAK,CAAC,YAAY,CAAC;YACxB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,eAAe,EAAE,KAAK,CAAC,kBAAkB,CAAC;SAC3C,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,oCAAW,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC;QAErF,MAAM,CAAC,YAAY,EAAE,kBAAkB,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC1E,GAAG,CAAC,8BAA8B,EAAE;YACpC,IAAA,gCAAgB,EAAC,GAAG,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAChD,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;SACjF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAA,8BAAc,EAAC;YAC5B,YAAY;YACZ,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACnC,kBAAkB;YAClB,WAAW;YACX,aAAa,EAAE,UAAU;YACzB,aAAa;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACvB,IAAA,2BAAW,EAAC,MAAM,EAAE,UAAU,CAAC,CAAC;SACjC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAnDH,0CAoDC;AAnDwB,mCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,+BAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,gCAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,uCAAe,GAAG,IAAI,CAAC;AACvB,6BAAK,GAAG,MAAM,CAAC;AAExB,6BAAK,GAAG;IACpB,kBAAkB,EAAE,uBAAK,CAAC,OAAO,CAAC;QAChC,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC;QAC9D,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,oCAAoC,CAAC;QACtE,OAAO,EAAE,KAAK;KACf,CAAC;IACF,YAAY,EAAE,uBAAK,CAAC,WAAW,CAAC;QAC9B,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;KACzD,CAAC;CACH,CAAC"}

package/lib/commands/retrieve/metadata.d.ts

@@ -14,9 +14,13 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
         manifest: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
         'package-name': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        'single-package': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
+        'target-metadata-dir': import("@oclif/core/lib/interfaces").OptionFlag<string>;
         'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org>;
         wait: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/kit").Duration>;
+        unzip: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'zip-file-name': import("@oclif/core/lib/interfaces").OptionFlag<string>;
     };
     static configurationVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
     static envVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;

package/lib/commands/retrieve/metadata.js

@@ -6,11 +6,14 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
 const core_1 = require("@salesforce/core");
 const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const ts_types_1 = require("@salesforce/ts-types");
 const source_tracking_1 = require("@salesforce/source-tracking");
+const flags_1 = require("../../utils/flags");
 const output_1 = require("../../utils/output");
 const project_1 = require("../../utils/project");
 const conflicts_1 = require("../../utils/conflicts");
@@ -21,41 +24,54 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
     async run() {
         const { flags } = await this.parse(RetrieveMetadata);
         this.spinner.start(messages.getMessage('spinner.start'));
+        const format = flags['target-metadata-dir'] ? 'metadata' : 'source';
         const stl = await source_tracking_1.SourceTracking.create({
             org: flags['target-org'],
             project: this.project,
             subscribeSDREvents: true,
-            ignoreConflicts: flags['ignore-conflicts'],
+            ignoreConflicts: format === 'metadata' || flags['ignore-conflicts'],
         });
         const isChanges = !flags['source-dir'] && !flags['manifest'] && !flags['metadata'];
-        const componentSet = isChanges
-            ? await stl.maybeApplyRemoteDeletesToLocal()
-            : await source_deploy_retrieve_1.ComponentSetBuilder.build({
-                apiversion: flags['api-version'],
-                sourcepath: flags['source-dir'],
-                packagenames: flags['package-name'],
-                manifest: flags.manifest && {
-                    manifestPath: flags.manifest,
-                    directoryPaths: await (0, project_1.getPackageDirs)(),
-                },
-                metadata: flags.metadata && {
-                    metadataEntries: flags.metadata,
-                    directoryPaths: await (0, project_1.getPackageDirs)(),
-                },
-            });
+        const { componentSetFromNonDeletes, fileResponsesFromDelete } = isChanges
+            ? await stl.maybeApplyRemoteDeletesToLocal(true)
+            : {
+                componentSetFromNonDeletes: await source_deploy_retrieve_1.ComponentSetBuilder.build({
+                    apiversion: flags['api-version'],
+                    sourcepath: flags['source-dir'],
+                    packagenames: flags['package-name'],
+                    manifest: flags.manifest && {
+                        manifestPath: flags.manifest,
+                        directoryPaths: await (0, project_1.getPackageDirs)(),
+                    },
+                    metadata: flags.metadata && {
+                        metadataEntries: flags.metadata,
+                        directoryPaths: await (0, project_1.getPackageDirs)(),
+                    },
+                }),
+                fileResponsesFromDelete: [],
+            };
         // stl sets version based on config/files--if the command overrides it, we need to update
         if (isChanges && flags['api-version']) {
-            componentSet.apiVersion = flags['api-version'];
+            componentSetFromNonDeletes.apiVersion = flags['api-version'];
         }
         this.spinner.status = messages.getMessage('spinner.sending', [
-            componentSet.sourceApiVersion || componentSet.apiVersion,
+            componentSetFromNonDeletes.sourceApiVersion ?? componentSetFromNonDeletes.apiVersion,
         ]);
-        const retrieve = await componentSet.retrieve({
+        const retrieveOpts = {
             usernameOrConnection: flags['target-org'].getUsername(),
             merge: true,
             output: this.project.getDefaultPackage().fullPath,
             packageOptions: flags['package-name'],
-        });
+            format,
+        };
+        const zipFileName = flags['zip-file-name'] ?? 'unpackaged.zip';
+        if (format === 'metadata') {
+            retrieveOpts.singlePackage = flags['single-package'];
+            retrieveOpts.unzip = flags.unzip;
+            retrieveOpts.zipFileName = zipFileName;
+            retrieveOpts.output = flags['target-metadata-dir'];
+        }
+        const retrieve = await componentSetFromNonDeletes.retrieve(retrieveOpts);
         this.spinner.status = messages.getMessage('spinner.polling');
         retrieve.onUpdate((data) => {
             this.spinner.status = mdTransferMessages.getMessage(data.status);
@@ -70,7 +86,9 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
         await retrieve.start();
         const result = await retrieve.pollStatus(500, flags.wait.seconds);
         this.spinner.stop();
-        const formatter = new output_1.RetrieveResultFormatter(result, flags['package-name']);
+        const formatter = format === 'source'
+            ? new output_1.RetrieveResultFormatter(result, flags['package-name'], fileResponsesFromDelete)
+            : new output_1.MetadataRetrieveResultFormatter(result, { ...flags, 'zip-file-name': zipFileName });
         if (!this.jsonEnabled()) {
             if (result.response.status === 'Succeeded') {
                 await formatter.display();
@@ -79,6 +97,14 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
                 throw new core_1.SfError((0, ts_types_1.getString)(result.response, 'errorMessage', result.response.status), (0, ts_types_1.getString)(result.response, 'errorStatusCode', 'unknown'));
             }
         }
+        if (format === 'metadata' && flags.unzip) {
+            try {
+                await (0, promises_1.rm)((0, path_1.resolve)((0, path_1.join)(flags['target-metadata-dir'], zipFileName)), { recursive: true });
+            }
+            catch (e) {
+                // do nothing
+            }
+        }
         return formatter.getJson();
     }
     catch(error) {
@@ -132,6 +158,11 @@ RetrieveMetadata.flags = {
         summary: messages.getMessage('flags.package-name.summary'),
         multiple: true,
     }),
+    'single-package': sf_plugins_core_1.Flags.boolean({
+        summary: messages.getMessage('flags.single-package.summary'),
+        dependsOn: ['target-metadata-dir'],
+        exclusive: ['ignore-conflicts'],
+    }),
     'source-dir': sf_plugins_core_1.Flags.string({
         char: 'd',
         summary: messages.getMessage('flags.source-dir.summary'),
@@ -139,6 +170,17 @@ RetrieveMetadata.flags = {
         multiple: true,
         exclusive: ['manifest', 'metadata'],
     }),
+    'target-metadata-dir': (0, flags_1.ensuredDirFlag)({
+        char: 't',
+        summary: messages.getMessage('flags.target-metadata-dir.summary'),
+        relationships: [
+            {
+                type: 'some',
+                flags: ['manifest', 'metadata', 'source-dir', 'package-name'],
+            },
+        ],
+        exclusive: ['ignore-conflicts'],
+    }),
     'target-org': sf_plugins_core_1.Flags.requiredOrg({
         char: 'o',
         summary: messages.getMessage('flags.target-org.summary'),
@@ -151,6 +193,17 @@ RetrieveMetadata.flags = {
         summary: messages.getMessage('flags.wait.summary'),
         description: messages.getMessage('flags.wait.description'),
     }),
+    unzip: sf_plugins_core_1.Flags.boolean({
+        char: 'z',
+        summary: messages.getMessage('flags.unzip.summary'),
+        dependsOn: ['target-metadata-dir'],
+        exclusive: ['ignore-conflicts'],
+    }),
+    'zip-file-name': (0, flags_1.zipFileFlag)({
+        summary: messages.getMessage('flags.zip-file-name.summary'),
+        dependsOn: ['target-metadata-dir'],
+        exclusive: ['ignore-conflicts'],
+    }),
 };
 RetrieveMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_1.OrgConfigProperties.TARGET_ORG, core_1.OrgConfigProperties.ORG_API_VERSION);
 RetrieveMetadata.envVariablesSection = (0, sf_plugins_core_1.toHelpSection)('ENVIRONMENT VARIABLES', core_1.EnvironmentVariable.SF_TARGET_ORG, core_1.EnvironmentVariable.SF_USE_PROGRESS_BAR);

package/lib/commands/retrieve/metadata.js.map

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

package/lib/utils/deploy.js

@@ -20,30 +20,29 @@ const cacheMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve',
     'error.NoRecentJobId',
     'error.InvalidJobId',
 ]);
-const trackingMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve', 'tracking', ['error.noChanges']);
+const deployMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve', 'deploy.metadata', [
+    'error.nothingToDeploy',
+    'error.nothingToDeploy.Actions',
+]);
 function validateTests(testLevel, tests) {
-    if (testLevel === types_1.TestLevel.RunSpecifiedTests && (tests !== null && tests !== void 0 ? tests : []).length === 0)
+    if (testLevel === types_1.TestLevel.RunSpecifiedTests && (tests ?? []).length === 0)
         return false;
     return true;
 }
 exports.validateTests = validateTests;
 async function resolveApi() {
-    var _a;
     const agg = await core_1.ConfigAggregator.create({ customConfigMeta: configMeta_1.default });
-    const restDeployConfig = (_a = agg.getInfo(configMeta_1.ConfigVars.ORG_METADATA_REST_DEPLOY)) === null || _a === void 0 ? void 0 : _a.value;
+    const restDeployConfig = agg.getInfo(configMeta_1.ConfigVars.ORG_METADATA_REST_DEPLOY)?.value;
     return restDeployConfig === 'true' ? types_1.API.REST : types_1.API.SOAP;
 }
 exports.resolveApi = resolveApi;
 async function buildComponentSet(opts, stl) {
-    // if you specify nothing, you'll get the changes, like sfdx push
-    if (!opts['source-dir'] && !opts.manifest && !opts.metadata) {
+    // if you specify nothing, you'll get the changes, like sfdx push, as long as there's an stl
+    if (!opts['source-dir'] && !opts.manifest && !opts.metadata && stl) {
         /** localChangesAsComponentSet returned an array to support multiple sequential deploys.
-         * `sf` does not support this so we force one ComponentSet
+         * `sf` chooses not to support this so we force one ComponentSet
          */
-        const [cs] = await stl.localChangesAsComponentSet(false);
-        if (!cs) {
-            throw new core_1.SfError(trackingMessages.getMessage('error.noChanges'));
-        }
+        const cs = (await stl.localChangesAsComponentSet(false))?.[0] ?? new source_deploy_retrieve_1.ComponentSet();
         // stl produces a cs with api version already set.  command might have specified a version.
         if (opts['api-version']) {
             cs.apiVersion = opts['api-version'];
@@ -67,8 +66,7 @@ async function buildComponentSet(opts, stl) {
 }
 exports.buildComponentSet = buildComponentSet;
 async function executeDeploy(opts, project, id) {
-    var _a, _b;
-    project !== null && project !== void 0 ? project : (project = await core_1.SfProject.resolve());
+    project ?? (project = await core_1.SfProject.resolve());
     const apiOptions = {
         checkOnly: opts['dry-run'] || false,
         ignoreWarnings: opts['ignore-warnings'] || false,
@@ -82,7 +80,7 @@ async function executeDeploy(opts, project, id) {
     const org = await core_1.Org.create({ aliasOrUsername: opts['target-org'] });
     const usernameOrConnection = org.getConnection();
     // instantiate source tracking
-    // stl will decide, based on the org's properties, what to do
+    // stl will decide, based on the org's properties, what needs to be done
     const stl = await source_tracking_1.SourceTracking.create({
         org,
         project,
@@ -105,6 +103,9 @@ async function executeDeploy(opts, project, id) {
     }
     else {
         componentSet = await buildComponentSet(opts, stl);
+        if (componentSet.size === 0) {
+            throw new core_1.SfError(deployMessages.getMessage('error.nothingToDeploy'), 'NothingToDeploy', deployMessages.getMessages('error.nothingToDeploy.Actions'));
+        }
         deploy = id
             ? new source_deploy_retrieve_1.MetadataApiDeploy({ id, usernameOrConnection, components: componentSet })
             : await componentSet.deploy({
@@ -112,16 +113,15 @@ async function executeDeploy(opts, project, id) {
                 apiOptions,
             });
     }
-    await DeployCache.set(deploy.id, { ...opts, wait: (_b = (_a = opts.wait) === null || _a === void 0 ? void 0 : _a.minutes) !== null && _b !== void 0 ? _b : 33 });
+    await DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
     return { deploy, componentSet };
 }
 exports.executeDeploy = executeDeploy;
 async function cancelDeploy(opts, id) {
-    var _a, _b;
     const org = await core_1.Org.create({ aliasOrUsername: opts['target-org'] });
     const deploy = new source_deploy_retrieve_1.MetadataApiDeploy({ usernameOrConnection: org.getUsername(), id });
     const componentSet = await buildComponentSet({ ...opts });
-    await DeployCache.set(deploy.id, { ...opts, wait: (_b = (_a = opts.wait) === null || _a === void 0 ? void 0 : _a.minutes) !== null && _b !== void 0 ? _b : 33 });
+    await DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
     await deploy.cancel();
     return poll(org, deploy.id, opts.wait, componentSet);
 }

package/lib/utils/deploy.js.map

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

package/lib/utils/flags.d.ts

@@ -1,6 +1,16 @@
-import { Interfaces } from '@oclif/core';
 import { PathInfo, TestLevel } from './types';
-export declare const testLevelFlag: (opts?: Partial<Interfaces.OptionFlag<TestLevel | undefined>>) => Interfaces.OptionFlag<TestLevel | undefined>;
-export declare const fileOrDirFlag: (opts?: {
+/**
+ * Flag value is a directory path that may or may not exist. If it doesn't exist, then it will be created.
+ */
+export declare const ensuredDirFlag: import("@oclif/core/lib/interfaces").Definition<string, Record<string, unknown>>;
+export declare const testLevelFlag: import("@oclif/core/lib/interfaces").Definition<TestLevel, Record<string, unknown>>;
+/**
+ * Flag value could either be a file path or a directory path.
+ */
+export declare const fileOrDirFlag: import("@oclif/core/lib/interfaces").Definition<PathInfo, {
     exists?: boolean;
-} & Partial<Interfaces.OptionFlag<PathInfo | undefined>>) => Interfaces.OptionFlag<PathInfo | undefined>;
+}>;
+/**
+ * Flag value is the name of a zip file that defaults to 'unpackaged.zip'.
+ */
+export declare const zipFileFlag: import("@oclif/core/lib/interfaces").Definition<string, Record<string, unknown>>;

package/lib/utils/flags.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileOrDirFlag = exports.testLevelFlag = void 0;
+exports.zipFileFlag = exports.fileOrDirFlag = exports.testLevelFlag = exports.ensuredDirFlag = void 0;
 /*
  * Copyright (c) 2022, salesforce.com, inc.
  * All rights reserved.
@@ -8,20 +8,19 @@ exports.fileOrDirFlag = exports.testLevelFlag = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const fs = require("fs");
+const path_1 = require("path");
 const core_1 = require("@oclif/core");
+const core_2 = require("@salesforce/core");
 const types_1 = require("./types");
-const testLevelFlag = (opts = {}) => {
-    return core_1.Flags.build({
-        char: 'l',
-        parse: (input) => Promise.resolve(input),
-        options: Object.values(types_1.TestLevel),
-        ...opts,
-    })();
-};
-exports.testLevelFlag = testLevelFlag;
-const parsePathInfo = async (input, exists) => {
-    if (exists && !fs.existsSync(input)) {
-        throw new Error(`No file or directory found at ${input}`);
+core_2.Messages.importMessagesDirectory(__dirname);
+const messages = core_2.Messages.load('@salesforce/plugin-deploy-retrieve', 'validation', [
+    'error.InvalidFlagPath',
+    'error.ExpectedDirectory',
+    'error.ExpectedFileOrDirToExist',
+]);
+const parsePathInfo = async (input, opts) => {
+    if (opts.exists && !fs.existsSync(input)) {
+        throw messages.createError('error.InvalidFlagPath', [input, messages.getMessage('error.ExpectedFileOrDirToExist')]);
     }
     const stat = await fs.promises.stat(input);
     if (stat.isDirectory()) {
@@ -29,11 +28,58 @@ const parsePathInfo = async (input, exists) => {
     }
     return { type: 'file', path: input };
 };
-const fileOrDirFlag = (opts = {}) => {
-    return core_1.Flags.build({
-        parse: async (input) => parsePathInfo(input, opts.exists),
-        ...opts,
-    })();
-};
-exports.fileOrDirFlag = fileOrDirFlag;
+/**
+ * Ensures that the specified directory exists. If it does not, it is created.
+ */
+async function ensureDirectoryPath(path) {
+    const trimmedPath = path?.trim();
+    const resolvedPath = trimmedPath?.length ? (0, path_1.resolve)(trimmedPath) : null;
+    try {
+        const stats = await fs.promises.stat(resolvedPath);
+        const isDir = stats.isDirectory();
+        if (!isDir) {
+            throw messages.createError('error.InvalidFlagPath', [path, messages.getMessage('error.ExpectedDirectory')]);
+        }
+    }
+    catch (error) {
+        const err = error;
+        if (err.code !== 'ENOENT') {
+            throw err;
+        }
+        else {
+            await fs.promises.mkdir(resolvedPath, { recursive: true });
+        }
+    }
+    return resolvedPath;
+}
+function resolveZipFileName(zipFileName) {
+    // If no file extension was provided append, '.zip'
+    if (zipFileName && !(0, path_1.extname)(zipFileName)) {
+        zipFileName += '.zip';
+    }
+    return zipFileName || 'unpackaged.zip';
+}
+/**
+ * Flag value is a directory path that may or may not exist. If it doesn't exist, then it will be created.
+ */
+exports.ensuredDirFlag = core_1.Flags.custom({
+    parse: async (input) => ensureDirectoryPath(input),
+});
+exports.testLevelFlag = core_1.Flags.custom({
+    char: 'l',
+    parse: (input) => Promise.resolve(input),
+    options: Object.values(types_1.TestLevel),
+});
+/**
+ * Flag value could either be a file path or a directory path.
+ */
+exports.fileOrDirFlag = core_1.Flags.custom({
+    parse: async (input, _, opts) => parsePathInfo(input, opts),
+});
+/**
+ * Flag value is the name of a zip file that defaults to 'unpackaged.zip'.
+ */
+exports.zipFileFlag = core_1.Flags.custom({
+    parse: async (input) => Promise.resolve(resolveZipFileName(input)),
+});
 //# sourceMappingURL=flags.js.map

package/lib/utils/flags.js.map

@@ -1 +1 @@
-{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/utils/flags.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,sCAAgD;AAChD,mCAA8C;AAEvC,MAAM,aAAa,GAAG,CAC3B,OAA8D,EAAE,EAClB,EAAE;IAChD,OAAO,YAAK,CAAC,KAAK,CAAwB;QACxC,IAAI,EAAE,GAAG;QACT,KAAK,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,KAAkB,CAAC;QAC7D,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAS,CAAC;QACjC,GAAG,IAAI;KACR,CAAC,EAAE,CAAC;AACP,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAEF,MAAM,aAAa,GAAG,KAAK,EAAE,KAAa,EAAE,MAAe,EAAqB,EAAE;IAChF,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;QACnC,MAAM,IAAI,KAAK,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAC;KAC3D;IAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAE3C,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;QACtB,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;KAC3C;IAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACvC,CAAC,CAAC;AAEK,MAAM,aAAa,GAAG,CAC3B,OAAoF,EAAE,EACzC,EAAE;IAC/C,OAAO,YAAK,CAAC,KAAK,CAAuB;QACvC,KAAK,EAAE,KAAK,EAAE,KAAa,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;QACjE,GAAG,IAAI;KACR,CAAC,EAAE,CAAC;AACP,CAAC,CAAC;AAPW,QAAA,aAAa,iBAOxB"}
+{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/utils/flags.ts"],"names":[],"mappings":"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"}

package/lib/utils/metadataDeployer.d.ts

@@ -1,5 +1,5 @@
 import { NamedPackageDir } from '@salesforce/core';
-import { Deployable, Deployer } from '@salesforce/sf-plugins-core';
+import { Deployable, Deployer, DeployerResult } from '@salesforce/sf-plugins-core';
 import { TestLevel } from './types';
 export interface MetadataDeployOptions extends Deployer.Options {
     testLevel?: TestLevel;
@@ -24,7 +24,7 @@ export declare class MetadataDeployer extends Deployer {
     constructor(packages: NamedPackageDir[]);
     getName(): string;
     setup(flags: Deployer.Flags, options: MetadataDeployOptions): Promise<MetadataDeployOptions>;
-    deploy(): Promise<void>;
+    deploy<R extends DeployerResult>(): Promise<void | R>;
     promptForUsername(): Promise<string>;
     promptForTestLevel(): Promise<TestLevel>;
 }

package/lib/utils/metadataDeployer.js

@@ -75,13 +75,12 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
         return MetadataDeployer.NAME;
     }
     async setup(flags, options) {
-        var _a;
         if (flags.interactive) {
             this.testLevel = await this.promptForTestLevel();
             this.username = await this.promptForUsername();
         }
         else {
-            if ((_a = options.directories) === null || _a === void 0 ? void 0 : _a.length) {
+            if (options.directories?.length) {
                 const directories = options.directories || [];
                 const selected = this.deployables.filter((d) => directories.includes(d.getPath()));
                 this.selectDeployables(selected);
@@ -114,10 +113,13 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
             concise: false,
         });
         formatter.display();
+        const deployerResult = {
+            exitCode: (0, deploy_1.determineExitCode)(result),
+        };
+        return deployerResult;
     }
     async promptForUsername() {
-        var _a;
-        const aliasOrUsername = (_a = core_1.ConfigAggregator.getValue(core_1.OrgConfigProperties.TARGET_ORG)) === null || _a === void 0 ? void 0 : _a.value;
+        const aliasOrUsername = core_1.ConfigAggregator.getValue(core_1.OrgConfigProperties.TARGET_ORG)?.value;
         const stateAggregator = await core_1.StateAggregator.getInstance();
         await stateAggregator.orgs.readAll();
         const allAliases = stateAggregator.aliases.getAll();
@@ -126,7 +128,7 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
         if (aliasOrUsername) {
             targetOrgAuth = (await core_1.AuthInfo.listAllAuthorizations((a) => a.username === aliasOrUsername || a.aliases.some((alias) => alias === aliasOrUsername))).find((a) => a);
             if (targetOrgAuth) {
-                if (targetOrgAuth === null || targetOrgAuth === void 0 ? void 0 : targetOrgAuth.isExpired) {
+                if (targetOrgAuth?.isExpired) {
                     const continueAnswer = await this.prompt([
                         {
                             name: 'continue',
@@ -143,7 +145,7 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
                 }
             }
         }
-        if (!aliasOrUsername || (targetOrgAuth === null || targetOrgAuth === void 0 ? void 0 : targetOrgAuth.isExpired)) {
+        if (!aliasOrUsername || targetOrgAuth?.isExpired) {
             const promises = (await core_1.AuthInfo.listAllAuthorizations((orgAuth) => !orgAuth.error && orgAuth.isExpired !== true)).map(async (orgAuth) => {
                 const stat = await stateAggregator.orgs.stat(orgAuth.username);
                 const timestamp = stat ? new Date(stat.mtimeMs) : new Date();
@@ -170,7 +172,7 @@ class MetadataDeployer extends sf_plugins_core_1.Deployer {
                         choices: (0, sf_plugins_core_1.generateTableChoices)(columns, options, false),
                     },
                 ]);
-                if (targetOrgAuth === null || targetOrgAuth === void 0 ? void 0 : targetOrgAuth.isExpired) {
+                if (targetOrgAuth?.isExpired) {
                     const setTargetOrg = await this.prompt([
                         {
                             name: 'save',