@salesforce/plugin-deploy-retrieve 1.8.4 → 1.8.5-beta.2

package/lib/commands/project/manifest/create.js

@@ -0,0 +1,133 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Create = void 0;
+/*
+ * Copyright (c) 2020, 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 path_1 = require("path");
+const fs = require("fs");
+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 project_1 = require("../../../utils/project");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'manifest.create');
+const manifestTypes = {
+    pre: 'destructiveChangesPre.xml',
+    post: 'destructiveChangesPost.xml',
+    destroy: 'destructiveChanges.xml',
+    package: 'package.xml',
+};
+const packageTypes = {
+    managed: ['beta', 'deleted', 'deprecated', 'installed', 'released'],
+    unlocked: ['deprecatedEditable', 'installedEditable'],
+};
+const xorFlags = ['metadata', 'source-path', 'from-org'];
+class Create extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(Create);
+        // convert the manifesttype into one of the "official" manifest names
+        // if no manifesttype flag passed, use the manifestname?flag
+        // if no manifestname flag, default to 'package.xml'
+        const manifestTypeFromFlag = flags['manifest-type'];
+        const manifestName = ensureFileEnding(typeof manifestTypeFromFlag === 'string'
+            ? manifestTypes[manifestTypeFromFlag]
+            : flags['manifest-name'] ?? 'package.xml', '.xml');
+        const componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
+            apiversion: flags['api-version'] ?? (await (0, project_1.getSourceApiVersion)()),
+            sourcepath: flags['source-path'],
+            metadata: flags.metadata
+                ? {
+                    metadataEntries: flags.metadata,
+                    directoryPaths: await (0, project_1.getPackageDirs)(),
+                }
+                : undefined,
+            org: flags['from-org']
+                ? {
+                    username: flags['from-org'].getUsername(),
+                    exclude: exclude(flags['include-packages']),
+                }
+                : undefined,
+        });
+        const outputDir = flags['output-dir'];
+        if (outputDir) {
+            await fs.promises.mkdir(outputDir, { recursive: true });
+        }
+        const outputPath = outputDir ? (0, path_1.join)(outputDir, manifestName) : manifestName;
+        await fs.promises.writeFile(outputPath, await componentSet.getPackageXml());
+        this.log(outputDir
+            ? messages.getMessage('successOutputDir', [manifestName, outputDir])
+            : messages.getMessage('success', [manifestName]));
+        return { path: outputPath, name: manifestName };
+    }
+}
+exports.Create = Create;
+_a = Create;
+Create.summary = messages.getMessage('description');
+Create.description = messages.getMessage('description');
+Create.examples = messages.getMessages('examples');
+Create.aliases = ['force:source:manifest:create'];
+Create.deprecateAliases = true;
+Create.requiresProject = true;
+Create.flags = {
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    metadata: (0, sf_plugins_core_1.arrayWithDeprecation)({
+        char: 'm',
+        description: messages.getMessage('flags.metadata'),
+        exactlyOne: xorFlags,
+    }),
+    'source-path': (0, sf_plugins_core_1.arrayWithDeprecation)({
+        char: 'p',
+        aliases: ['sourcepath'],
+        deprecateAliases: true,
+        description: messages.getMessage('flags.source-path'),
+        exactlyOne: xorFlags,
+    }),
+    'manifest-name': sf_plugins_core_1.Flags.string({
+        char: 'n',
+        aliases: ['manifestname'],
+        deprecateAliases: true,
+        summary: messages.getMessage('flags.manifest-name'),
+        exclusive: ['manifest-type'],
+    }),
+    'manifest-type': sf_plugins_core_1.Flags.string({
+        aliases: ['manifesttype'],
+        deprecateAliases: true,
+        summary: messages.getMessage('flags.manifest-type'),
+        options: Object.keys(manifestTypes),
+        char: 't',
+    }),
+    'include-packages': (0, sf_plugins_core_1.arrayWithDeprecation)({
+        aliases: ['includepackages'],
+        deprecateAliases: true,
+        description: messages.getMessage('flags.include-packages'),
+        options: Object.keys(packageTypes),
+        char: 'c',
+        dependsOn: ['fromorg'],
+    }),
+    'from-org': sf_plugins_core_1.Flags.custom({
+        summary: messages.getMessage('flags.from-org'),
+        exactlyOne: xorFlags,
+        aliases: ['fromorg'],
+        deprecateAliases: true,
+        parse: async (input) => (input ? core_1.Org.create({ aliasOrUsername: input }) : undefined),
+    })(),
+    'output-dir': sf_plugins_core_1.Flags.string({
+        char: 'd',
+        aliases: ['outputdir', 'o'],
+        deprecateAliases: true,
+        summary: messages.getMessage('flags.output-dir'),
+    }),
+};
+const ensureFileEnding = (fileName, fileEnding) => fileName.endsWith(fileEnding) ? fileName : `${fileName}${fileEnding}`;
+const exclude = (includedPackages) => includedPackages
+    ? Object.entries(packageTypes)
+        .filter(([type]) => !includedPackages.includes(type))
+        .flatMap(([, types]) => types)
+    : Object.values(packageTypes).flat();
+//# sourceMappingURL=create.js.map

package/lib/commands/project/manifest/create.js.map

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

package/lib/commands/project/reset/tracking.d.ts

@@ -0,0 +1,21 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export type ResetTrackingResult = {
+    sourceMembersSynced: number;
+    localPathsSynced: number;
+};
+export declare class ResetTracking extends SfCommand<ResetTrackingResult> {
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly requiresProject = true;
+    static readonly examples: never[];
+    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 | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        revision: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'no-prompt': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<ResetTrackingResult>;
+}

package/lib/commands/project/reset/tracking.js

@@ -0,0 +1,64 @@
+"use strict";
+/*
+ * Copyright (c) 2020, 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResetTracking = void 0;
+const core_1 = require("@salesforce/core");
+const chalk = require("chalk");
+const source_tracking_1 = require("@salesforce/source-tracking");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'delete.tracking');
+class ResetTracking extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(ResetTracking);
+        if (flags['no-prompt'] || (await this.confirm(chalk.dim(messages.getMessage('promptMessage'))))) {
+            const sourceTracking = await source_tracking_1.SourceTracking.create({
+                project: this.project,
+                org: flags['target-org'],
+            });
+            const [remoteResets, localResets] = await Promise.all([
+                sourceTracking.resetRemoteTracking(flags.revision),
+                sourceTracking.resetLocalTracking(),
+            ]);
+            this.logSuccess(`Reset local tracking files${flags.revision ? ` to revision ${flags.revision}` : ''}.`);
+            return {
+                sourceMembersSynced: remoteResets,
+                localPathsSynced: localResets.length,
+            };
+        }
+        return {
+            sourceMembersSynced: 0,
+            localPathsSynced: 0,
+        };
+    }
+}
+exports.ResetTracking = ResetTracking;
+ResetTracking.deprecateAliases = true;
+ResetTracking.aliases = ['force:source:beta:tracking:reset', 'force:source:tracking:reset'];
+ResetTracking.summary = messages.getMessage('resetDescription');
+ResetTracking.description = messages.getMessage('resetDescription');
+ResetTracking.requiresProject = true;
+ResetTracking.examples = [];
+ResetTracking.flags = {
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    // eslint-disable-next-line sf-plugin/flag-min-max-default
+    revision: sf_plugins_core_1.Flags.integer({
+        char: 'r',
+        summary: messages.getMessage('revisionDescription'),
+        min: 0,
+    }),
+    'no-prompt': sf_plugins_core_1.Flags.boolean({
+        char: 'p',
+        summary: messages.getMessage('no-promptDescription'),
+        aliases: ['noprompt'],
+        deprecateAliases: true,
+    }),
+};
+//# sourceMappingURL=tracking.js.map

package/lib/commands/project/reset/tracking.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tracking.js","sourceRoot":"","sources":["../../../../src/commands/project/reset/tracking.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAA4C;AAC5C,+BAA+B;AAC/B,iEAA6D;AAC7D,iEAMqC;AAErC,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,iBAAiB,CAAC,CAAC;AAOhG,MAAa,aAAc,SAAQ,2BAA8B;IA0BxD,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAElD,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/F,MAAM,cAAc,GAAG,MAAM,gCAAc,CAAC,MAAM,CAAC;gBACjD,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,GAAG,EAAE,KAAK,CAAC,YAAY,CAAC;aACzB,CAAC,CAAC;YAEH,MAAM,CAAC,YAAY,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACpD,cAAc,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC;gBAClD,cAAc,CAAC,kBAAkB,EAAE;aACpC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,CAAC,6BAA6B,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YAExG,OAAO;gBACL,mBAAmB,EAAE,YAAY;gBACjC,gBAAgB,EAAE,WAAW,CAAC,MAAM;aACrC,CAAC;SACH;QAED,OAAO;YACL,mBAAmB,EAAE,CAAC;YACtB,gBAAgB,EAAE,CAAC;SACpB,CAAC;IACJ,CAAC;;AApDH,sCAqDC;AApDwB,8BAAgB,GAAG,IAAI,CAAC;AACxB,qBAAO,GAAG,CAAC,kCAAkC,EAAE,6BAA6B,CAAC,CAAC;AAC9E,qBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;AAClD,yBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;AACtD,6BAAe,GAAG,IAAI,CAAC;AACvB,sBAAQ,GAAG,EAAE,CAAC;AAEd,mBAAK,GAAG;IAC7B,YAAY,EAAE,iDAA+B;IAC7C,aAAa,EAAE,mDAAiC;IAChD,QAAQ,EAAR,0BAAQ;IACR,0DAA0D;IAC1D,QAAQ,EAAE,uBAAK,CAAC,OAAO,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;QACnD,GAAG,EAAE,CAAC;KACP,CAAC;IACF,WAAW,EAAE,uBAAK,CAAC,OAAO,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;QACpD,OAAO,EAAE,CAAC,UAAU,CAAC;QACrB,gBAAgB,EAAE,IAAI;KACvB,CAAC;CACH,CAAC"}

package/lib/commands/{retrieve/metadata → project/retrieve}/preview.d.ts

@@ -6,6 +6,8 @@ export default class RetrieveMetadataPreview extends SfCommand<PreviewResult> {
     static readonly examples: string[];
     static readonly requiresProject = true;
     static readonly state = "beta";
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
     static readonly flags: {
         'ignore-conflicts': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;

package/lib/commands/{retrieve/metadata → project/retrieve}/preview.js

@@ -47,6 +47,8 @@ RetrieveMetadataPreview.summary = messages.getMessage('summary');
 RetrieveMetadataPreview.examples = messages.getMessages('examples');
 RetrieveMetadataPreview.requiresProject = true;
 RetrieveMetadataPreview.state = 'beta';
+RetrieveMetadataPreview.aliases = ['retrieve:metadata:preview'];
+RetrieveMetadataPreview.deprecateAliases = true;
 RetrieveMetadataPreview.flags = {
     'ignore-conflicts': sf_plugins_core_1.Flags.boolean({
         char: 'c',

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

@@ -0,0 +1 @@
+{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../../../src/commands/project/retrieve/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;IAwBpE,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;;AAtDH,0CAuDC;AAtDwB,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;AACf,+BAAO,GAAG,CAAC,2BAA2B,CAAC,CAAC;AACxC,wCAAgB,GAAG,IAAI,CAAC;AAExB,6BAAK,GAAG;IAC7B,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;QACxD,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC"}

package/lib/commands/{retrieve/metadata.d.ts → project/retrieve/start.d.ts}

@@ -2,13 +2,15 @@ import { SfError } from '@salesforce/core';
 import { RetrieveResult } from '@salesforce/source-deploy-retrieve';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 import { Duration } from '@salesforce/kit';
-import { RetrieveResultJson } from '../../utils/types';
+import { RetrieveResultJson } from '../../../utils/types';
 export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
     static readonly summary: string;
     static readonly description: string;
     static readonly examples: string[];
     static readonly requiresProject = true;
     static readonly state = "beta";
+    static readonly aliases: string[];
+    static readonly deprecateAliases = true;
     static readonly flags: {
         'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
         'ignore-conflicts': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;

package/lib/commands/{retrieve/metadata.js → project/retrieve/start.js}

@@ -14,10 +14,10 @@ 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 kit_1 = require("@salesforce/kit");
-const flags_1 = require("../../utils/flags");
-const output_1 = require("../../utils/output");
-const project_1 = require("../../utils/project");
-const conflicts_1 = require("../../utils/conflicts");
+const flags_1 = require("../../../utils/flags");
+const output_1 = require("../../../utils/output");
+const project_1 = require("../../../utils/project");
+const conflicts_1 = require("../../../utils/conflicts");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.metadata');
 const mdTransferMessages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
@@ -93,7 +93,7 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
         await retrieve.start();
         const result = await retrieve.pollStatus(500, flags.wait.seconds);
         this.spinner.stop();
-        // reference the flag instead of `foramt` so we get correct type
+        // reference the flag instead of `format` so we get correct type
         const formatter = flags['target-metadata-dir']
             ? new output_1.MetadataRetrieveResultFormatter(result, {
                 'target-metadata-dir': flags['target-metadata-dir'],
@@ -142,6 +142,8 @@ RetrieveMetadata.description = messages.getMessage('description');
 RetrieveMetadata.examples = messages.getMessages('examples');
 RetrieveMetadata.requiresProject = true;
 RetrieveMetadata.state = 'beta';
+RetrieveMetadata.aliases = ['retrieve:metadata'];
+RetrieveMetadata.deprecateAliases = true;
 RetrieveMetadata.flags = {
     'api-version': sf_plugins_core_1.Flags.orgApiVersion({
         char: 'a',
@@ -223,4 +225,4 @@ RetrieveMetadata.flags = {
 };
 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);
-//# sourceMappingURL=metadata.js.map
+//# sourceMappingURL=start.js.map

package/lib/commands/project/retrieve/start.js.map

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

package/lib/utils/coverage.d.ts

@@ -0,0 +1,9 @@
+import { ApexTestResultData, CoverageReporterOptions, ApexCodeCoverageAggregate } from '@salesforce/apex-node';
+import { Successes, Failures, CodeCoverage } from '@salesforce/source-deploy-retrieve';
+export declare const mapTestResults: (testResults: Failures[] | Successes[]) => ApexTestResultData[];
+export declare const generateCoveredLines: (cov: CodeCoverage) => [number[], number[]];
+export declare const getCoverageFormattersOptions: (formatters?: string[]) => CoverageReporterOptions;
+export declare const transformCoverageToApexCoverage: (mdCoverage: CodeCoverage[]) => ApexCodeCoverageAggregate;
+export declare const coverageOutput: (cov: CodeCoverage) => Pick<CodeCoverage, 'name' | 'numLocations'> & {
+    lineNotCovered: string;
+};

package/lib/utils/coverage.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.coverageOutput = exports.transformCoverageToApexCoverage = exports.getCoverageFormattersOptions = exports.generateCoveredLines = exports.mapTestResults = void 0;
+/*
+ * Copyright (c) 2020, 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 path = require("path");
+const apex_node_1 = require("@salesforce/apex-node");
+const kit_1 = require("@salesforce/kit");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const mapTestResults = (testResults) => testResults.map((successOrFailure) => {
+    const testResult = successOrFailure;
+    return {
+        apexClass: { fullName: testResult.name, id: testResult.id, name: testResult.name, namespacePrefix: '' },
+        apexLogId: '',
+        asyncApexJobId: '',
+        fullName: testResult.name,
+        id: testResult.id,
+        message: testResult.message ?? '',
+        methodName: testResult.methodName,
+        outcome: !testResult.message ? "Pass" /* ApexTestResultOutcome.Pass */ : "Fail" /* ApexTestResultOutcome.Fail */,
+        queueItemId: '',
+        runTime: parseInt(testResult.time, 10),
+        stackTrace: testResult.stackTrace || '',
+        testTimestamp: '',
+    };
+});
+exports.mapTestResults = mapTestResults;
+const generateCoveredLines = (cov) => {
+    const numCovered = parseInt(cov.numLocations, 10);
+    const numUncovered = parseInt(cov.numLocationsNotCovered, 10);
+    const uncoveredLines = (0, kit_1.ensureArray)(cov.locationsNotCovered).map((location) => parseInt(location.line, 10));
+    const minLineNumber = uncoveredLines.length ? Math.min(...uncoveredLines) : 1;
+    const lines = [...Array(numCovered + numUncovered).keys()].map((i) => i + minLineNumber);
+    const coveredLines = lines.filter((line) => !uncoveredLines.includes(line));
+    return [uncoveredLines, coveredLines];
+};
+exports.generateCoveredLines = generateCoveredLines;
+const getCoverageFormattersOptions = (formatters = []) => {
+    const reportFormats = formatters;
+    const reportOptions = Object.fromEntries(reportFormats.map((format) => {
+        const formatDefaults = apex_node_1.DefaultReportOptions[format];
+        return [
+            format,
+            {
+                ...formatDefaults,
+                // always join any subdir from the defaults with our custom coverage dir
+                ...('subdir' in formatDefaults ? { subdir: path.join('coverage', formatDefaults.subdir) } : {}),
+                // if there is no subdir, we also put the file in the coverage dir, otherwise leave it alone
+                ...('file' in formatDefaults && !('subdir' in formatDefaults)
+                    ? { file: path.join('coverage', formatDefaults.file) }
+                    : {}),
+            },
+        ];
+    }));
+    return {
+        reportFormats,
+        reportOptions,
+    };
+};
+exports.getCoverageFormattersOptions = getCoverageFormattersOptions;
+const transformCoverageToApexCoverage = (mdCoverage) => {
+    const apexCoverage = mdCoverage.map((cov) => {
+        const numCovered = parseInt(cov.numLocations, 10);
+        const numUncovered = parseInt(cov.numLocationsNotCovered, 10);
+        const [uncoveredLines, coveredLines] = (0, exports.generateCoveredLines)(cov);
+        const ac = {
+            ApexClassOrTrigger: {
+                Id: cov.id,
+                Name: cov.name,
+            },
+            NumLinesCovered: numCovered,
+            NumLinesUncovered: numUncovered,
+            Coverage: {
+                coveredLines,
+                uncoveredLines,
+            },
+        };
+        return ac;
+    });
+    return { done: true, totalSize: apexCoverage.length, records: apexCoverage };
+};
+exports.transformCoverageToApexCoverage = transformCoverageToApexCoverage;
+const coverageOutput = (cov) => {
+    const numLocationsNum = parseInt(cov.numLocations, 10);
+    const numLocationsNotCovered = parseInt(cov.numLocationsNotCovered, 10);
+    const color = numLocationsNotCovered > 0 ? sf_plugins_core_1.StandardColors.error : sf_plugins_core_1.StandardColors.success;
+    let pctCovered = 100;
+    const coverageDecimal = parseFloat(((numLocationsNum - numLocationsNotCovered) / numLocationsNum).toFixed(2));
+    if (numLocationsNum > 0) {
+        pctCovered = coverageDecimal * 100;
+    }
+    // cov.numLocations = color(`${pctCovered}%`);
+    const base = {
+        name: cov.name,
+        numLocations: color(`${pctCovered}%`),
+    };
+    if (!cov.locationsNotCovered) {
+        return { ...base, lineNotCovered: '' };
+    }
+    const locations = (0, kit_1.ensureArray)(cov.locationsNotCovered);
+    return {
+        ...base,
+        lineNotCovered: locations.map((location) => location.line).join(','),
+    };
+};
+exports.coverageOutput = coverageOutput;
+//# sourceMappingURL=coverage.js.map

package/lib/utils/coverage.js.map

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

package/lib/utils/deploy.d.ts

@@ -1,10 +1,10 @@
-import { Messages, Org, SfProject } from '@salesforce/core';
+import { ConfigAggregator, Messages, Org, SfProject } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
 import { Nullable } from '@salesforce/ts-types';
 import { ComponentSet, DeployResult, MetadataApiDeploy, RequestStatus } from '@salesforce/source-deploy-retrieve';
 import { SourceTracking } from '@salesforce/source-tracking';
 import { API, PathInfo, TestLevel } from './types';
-export declare const cacheMessages: Messages<"error.NoRecentJobId" | "error.InvalidJobId">;
+export declare const cacheMessages: Messages<string>;
 export type DeployOptions = {
     api: API;
     'target-org': string;
@@ -25,12 +25,16 @@ export type DeployOptions = {
     concise?: boolean;
     'single-package'?: boolean;
     status?: RequestStatus;
+    'pre-destructive-changes'?: string;
+    'post-destructive-changes'?: string;
+    'purge-on-delete'?: boolean;
 };
-export type CachedOptions = Omit<DeployOptions, 'wait'> & {
+/** Manifest is expected.  You cannot pass metadata and source-dir array--use those to get a manifest */
+export type CachedOptions = Omit<DeployOptions, 'wait' | 'metadata' | 'source-dir'> & {
     wait: number;
-};
+} & Partial<Pick<DeployOptions, 'manifest'>>;
 export declare function validateTests(testLevel: TestLevel, tests: Nullable<string[]>): boolean;
-export declare function resolveApi(): Promise<API>;
+export declare function resolveApi(existingConfigAggregator?: ConfigAggregator): Promise<API>;
 export declare function buildComponentSet(opts: Partial<DeployOptions>, stl?: SourceTracking): Promise<ComponentSet>;
 export declare function executeDeploy(opts: Partial<DeployOptions>, project?: SfProject, id?: string): Promise<{
     deploy: MetadataApiDeploy;

package/lib/utils/deploy.js

@@ -16,23 +16,16 @@ const project_1 = require("./project");
 const types_1 = require("./types");
 const errorCodes_1 = require("./errorCodes");
 const deployCache_1 = require("./deployCache");
+const manifestCache_1 = require("./manifestCache");
 core_1.Messages.importMessagesDirectory(__dirname);
-exports.cacheMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve', 'cache', [
-    'error.NoRecentJobId',
-    'error.InvalidJobId',
-]);
-const deployMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve', 'deploy.metadata', [
-    'error.nothingToDeploy',
-    'error.nothingToDeploy.Actions',
-]);
+exports.cacheMessages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'cache');
+const deployMessages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata');
 function validateTests(testLevel, tests) {
-    if (testLevel === types_1.TestLevel.RunSpecifiedTests && (tests ?? []).length === 0)
-        return false;
-    return true;
+    return !(testLevel === types_1.TestLevel.RunSpecifiedTests && (tests ?? []).length === 0);
 }
 exports.validateTests = validateTests;
-async function resolveApi() {
-    const agg = await core_1.ConfigAggregator.create({ customConfigMeta: configMeta_1.default });
+async function resolveApi(existingConfigAggregator) {
+    const agg = existingConfigAggregator ?? (await core_1.ConfigAggregator.create({ customConfigMeta: configMeta_1.default }));
     const restDeployConfig = agg.getInfo(configMeta_1.ConfigVars.ORG_METADATA_REST_DEPLOY)?.value;
     return restDeployConfig === 'true' ? types_1.API.REST : types_1.API.SOAP;
 }
@@ -60,6 +53,8 @@ async function buildComponentSet(opts, stl) {
                 manifest: {
                     manifestPath: opts.manifest,
                     directoryPaths: await (0, project_1.getPackageDirs)(),
+                    destructiveChangesPre: opts['pre-destructive-changes'],
+                    destructiveChangesPost: opts['post-destructive-changes'],
                 },
             }
             : {}),
@@ -76,19 +71,12 @@ async function executeDeploy(opts, project, id) {
         rollbackOnError: !opts['ignore-errors'] || false,
         runTests: opts.tests ?? [],
         testLevel: opts['test-level'],
+        purgeOnDelete: opts['purge-on-delete'] ?? false,
     };
     let deploy;
     let componentSet;
     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 needs to be done
-    const stl = await source_tracking_1.SourceTracking.create({
-        org,
-        project,
-        subscribeSDREvents: true,
-        ignoreConflicts: opts['ignore-conflicts'],
-    });
     if (opts['metadata-dir']) {
         if (id) {
             deploy = new source_deploy_retrieve_1.MetadataApiDeploy({ id, usernameOrConnection });
@@ -104,6 +92,14 @@ async function executeDeploy(opts, project, id) {
         }
     }
     else {
+        // instantiate source tracking
+        // stl will decide, based on the org's properties, what needs to be done
+        const stl = await source_tracking_1.SourceTracking.create({
+            org,
+            project,
+            subscribeSDREvents: true,
+            ignoreConflicts: opts['ignore-conflicts'],
+        });
         componentSet = await buildComponentSet(opts, stl);
         if (componentSet.size === 0) {
             throw new core_1.SfError(deployMessages.getMessage('error.nothingToDeploy'), 'NothingToDeploy', deployMessages.getMessages('error.nothingToDeploy.Actions'));
@@ -114,9 +110,10 @@ async function executeDeploy(opts, project, id) {
                 usernameOrConnection,
                 apiOptions,
             });
-        await deployCache_1.DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
     }
-    await deployCache_1.DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
+    // does not apply to mdapi deploys
+    const manifestPath = componentSet ? await (0, manifestCache_1.writeManifest)(deploy.id, componentSet) : undefined;
+    await deployCache_1.DeployCache.set(deploy.id, { ...opts, manifest: manifestPath });
     return { deploy, componentSet };
 }
 exports.executeDeploy = executeDeploy;
@@ -125,7 +122,7 @@ async function cancelDeploy(opts, id) {
     const usernameOrConnection = org.getUsername() ?? org.getConnection();
     const deploy = new source_deploy_retrieve_1.MetadataApiDeploy({ usernameOrConnection, id });
     const componentSet = await buildComponentSet({ ...opts });
-    await deployCache_1.DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
+    await deployCache_1.DeployCache.set(deploy.id, { ...opts });
     await deploy.cancel();
     return poll(org, deploy.id, opts.wait ?? kit_1.Duration.minutes(33), componentSet);
 }