@salesforce/plugin-deploy-retrieve 1.8.5-beta.5 → 1.8.6

package/package.json

@@ -1,15 +1,14 @@
 {
     "name": "@salesforce/plugin-deploy-retrieve",
     "description": "deploy and retrieve commands for sf",
-    "version": "1.8.5-beta.5",
+    "version": "1.8.6",
     "author": "Salesforce",
     "bugs": "https://github.com/forcedotcom/cli/issues",
     "dependencies": {
         "@oclif/core": "^2.6.4",
-        "@salesforce/apex-node": "^1.6.0",
-        "@salesforce/core": "^3.34.3",
-        "@salesforce/kit": "^1.9.2",
-        "@salesforce/sf-plugins-core": "^2.2.5",
+        "@salesforce/core": "^3.33.6",
+        "@salesforce/kit": "^1.9.0",
+        "@salesforce/sf-plugins-core": "^2.2.3",
         "@salesforce/source-deploy-retrieve": "^7.13.0",
         "@salesforce/source-tracking": "^2.2.22",
         "chalk": "^4.1.2",
@@ -18,25 +17,27 @@
         "tslib": "^2"
     },
     "devDependencies": {
-        "@oclif/plugin-command-snapshot": "^3.3.9",
-        "@salesforce/cli-plugins-testkit": "^3.2.26",
+        "@oclif/plugin-command-snapshot": "^3.2.16",
+        "@salesforce/cli-plugins-testkit": "^3.3.0",
         "@salesforce/dev-config": "^3.1.0",
-        "@salesforce/dev-scripts": "^4.1.3",
+        "@salesforce/dev-scripts": "^4.1.2",
         "@salesforce/plugin-command-reference": "^2.4.1",
-        "@salesforce/plugin-functions": "^1.17.4",
-        "@salesforce/plugin-settings": "^1.4.2",
-        "@salesforce/plugin-source": "^2.8.0",
+        "@salesforce/plugin-config": "^2.3.3",
+        "@salesforce/plugin-functions": "^1.21.6",
+        "@salesforce/plugin-source": "^2.6.0",
         "@salesforce/plugin-templates": "^55.4.4",
         "@salesforce/plugin-user": "^2.3.3",
         "@salesforce/prettier-config": "^0.0.2",
-        "@salesforce/source-testkit": "^2.0.43",
+        "@salesforce/source-testkit": "^2.0.42",
         "@salesforce/ts-sinon": "1.4.4",
         "@salesforce/ts-types": "^1.5.20",
         "@swc/core": "^1.3.37",
+        "@types/archiver": "^5.3.1",
         "@types/fs-extra": "^9.0.13",
         "@types/shelljs": "^0.8.11",
-        "@typescript-eslint/eslint-plugin": "^5.55.0",
-        "@typescript-eslint/parser": "^5.55.0",
+        "@typescript-eslint/eslint-plugin": "^5.56.0",
+        "@typescript-eslint/parser": "^5.54.0",
+        "archiver": "^5.3.1",
         "chai": "^4.3.7",
         "cross-env": "^7.0.3",
         "eslint": "^8.35.0",
@@ -45,11 +46,10 @@
         "eslint-config-salesforce-license": "^0.1.6",
         "eslint-config-salesforce-typescript": "^1.1.1",
         "eslint-plugin-header": "^3.1.1",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-jsdoc": "^39.6.7",
-        "eslint-plugin-sf-plugin": "^1.14.0",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jsdoc": "^39.9.1",
+        "eslint-plugin-sf-plugin": "^1.9.2",
         "husky": "^7.0.4",
-        "jsforce": "^2.0.0-beta.20",
         "mocha": "^10.1.0",
         "nyc": "^15.1.0",
         "oclif": "^3.7.0",
@@ -93,36 +93,26 @@
             "@oclif/plugin-command-snapshot",
             "@oclif/plugin-help",
             "@salesforce/plugin-command-reference",
-            "@salesforce/plugin-settings",
+            "@salesforce/plugin-config",
             "@salesforce/plugin-functions",
             "@salesforce/plugin-source",
             "@salesforce/plugin-user",
             "@salesforce/plugin-templates"
         ],
         "topics": {
-            "project": {
-                "description": "Commands to deploy and retrieve metadata.",
+            "deploy": {
+                "description": "Commands to deploy artifacts to an environment.",
                 "subtopics": {
-                    "deploy": {
+                    "metadata": {
                         "description": "Commands to deploy metadata to a Salesforce org."
-                    },
-                    "list": {
-                        "description": "Commands to list metadata in a Salesforce project."
-                    },
-                    "retrieve": {
-                        "description": "Commands to retrieve metadata from a Salesforce org"
-                    },
-                    "convert": {
-                        "description": "Commands to convert metadata from one format to another."
-                    },
-                    "delete": {
-                        "description": "Commands to delete metadata from a Salesforce org."
-                    },
-                    "manifest": {
-                        "description": "Commands to create a manifest file."
-                    },
-                    "reset": {
-                        "description": "Commands to reset the source tracking state."
+                    }
+                }
+            },
+            "retrieve": {
+                "description": "Commands to retrieve artifacts from an environment.",
+                "subtopics": {
+                    "metadata": {
+                        "description": "Commands to retrieve metadata from a Salesforce org."
                     }
                 }
             }
@@ -143,18 +133,12 @@
         "prepare": "sf-install",
         "test": "wireit",
         "test:nuts": "ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 10",
-        "test:nuts:convert": "nyc mocha \"test/nuts/convert/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
-        "test:nuts:delete": "nyc mocha \"test/nuts/delete/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:deploy:metadata:manifest": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.manifest ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:deploy:metadata:metadata": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.metadata ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:deploy:metadata:metadata-dir": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.metadata-dir ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:deploy:metadata:source-dir": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.source-dir ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:deploy:metadata:test-level": "cross-env PLUGIN_DEPLOY_RETRIEVE_SEED_FILTER=deploy.metadata.test-level ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
-        "test:nuts:destructive": "nyc mocha \"test/nuts/destructive/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
-        "test:nuts:manifest": "nyc mocha \"test/nuts/manifest/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
-        "test:nuts:retrieve": "nyc mocha \"test/nuts/retrieve/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
-        "test:nuts:specialTypes": "nyc mocha \"test/nuts/specialTypes/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
-        "test:nuts:static": "nyc mocha \"test/commands/**/*.nut.ts\" \"test/nuts/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
+        "test:nuts:static": "nyc mocha \"test/commands/**/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:nuts:tracking": "nyc mocha \"test/nuts/tracking/*.nut.ts\"  --slow 4500 --timeout 1200000 --parallel --retries 0 --jobs 20",
         "test:only": "wireit",
         "version": "oclif readme"
@@ -174,7 +158,7 @@
             "command": "tsc -p . --pretty --incremental",
             "files": [
                 "src/**/*.ts",
-                "**/tsconfig.json",
+                "tsconfig.json",
                 "messages/**"
             ],
             "output": [
@@ -200,8 +184,7 @@
                 "src/**/*.ts",
                 "test/**/*.ts",
                 "messages/**",
-                "**/.eslint*",
-                "**/tsconfig.json"
+                ".eslint*"
             ],
             "output": []
         },
@@ -209,7 +192,8 @@
             "command": "tsc -p \"./test\" --pretty",
             "files": [
                 "test/**/*.ts",
-                "**/tsconfig.json"
+                "tsconfig.json",
+                "test/tsconfig.json"
             ],
             "output": []
         },
@@ -231,8 +215,9 @@
             "files": [
                 "test/**/*.ts",
                 "src/**/*.ts",
-                "**/tsconfig.json",
+                "tsconfig.json",
                 ".mocha*",
+                "test/tsconfig.json",
                 "!*.nut.ts",
                 ".nycrc"
             ],
@@ -269,7 +254,7 @@
         }
     },
     "sfdx": {
-        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.8.5-beta.5.crt",
-        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.8.5-beta.5.sig"
+        "publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.8.6.crt",
+        "signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.8.6.sig"
     }
 }

package/lib/commands/project/convert/mdapi.d.ts

@@ -1,32 +0,0 @@
-import { SfCommand } from '@salesforce/sf-plugins-core';
-import { Interfaces } from '@oclif/core';
-import { ConvertMdapiJson } from '../../../utils/types';
-export interface EnsureFsFlagOptions {
-    flagName: string;
-    path: string;
-    type: 'dir' | 'file' | 'any';
-    throwOnENOENT?: boolean;
-}
-export declare class Mdapi extends SfCommand<ConvertMdapiJson> {
-    static readonly aliases: string[];
-    static readonly deprecateAliases = true;
-    static readonly summary: string;
-    static readonly description: string;
-    static readonly examples: string[];
-    static readonly requiresProject = true;
-    static readonly flags: {
-        'api-version': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'root-dir': Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'output-dir': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        manifest: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'metadata-dir': Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        metadata: Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    private flags;
-    private componentSet?;
-    private convertResult?;
-    run(): Promise<ConvertMdapiJson>;
-    protected convert(): Promise<void>;
-    protected formatResult(): ConvertMdapiJson;
-}

package/lib/commands/project/convert/mdapi.js

@@ -1,170 +0,0 @@
-"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.Mdapi = void 0;
-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 metadataConvertResultFormatter_1 = require("../../../formatters/metadataConvertResultFormatter");
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'convert.mdapi');
-class Mdapi extends sf_plugins_core_1.SfCommand {
-    async run() {
-        this.flags = (await this.parse(Mdapi)).flags;
-        await this.convert();
-        return this.formatResult();
-    }
-    async convert() {
-        const [outputDir] = await Promise.all([
-            resolveOutputDir(this.flags['output-dir'] ?? this.project.getDefaultPackage().path),
-            resolveMetadataPaths(this.flags['metadata-dir'] ?? []),
-        ]);
-        let paths = [];
-        if (this.flags['metadata-dir']) {
-            paths = this.flags['metadata-dir'];
-        }
-        else if (!this.flags.manifest && !this.flags.metadata) {
-            paths = [this.flags['root-dir']];
-        }
-        this.componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
-            sourcepath: paths,
-            manifest: this.flags.manifest
-                ? {
-                    manifestPath: this.flags.manifest,
-                    directoryPaths: [this.flags['root-dir']],
-                }
-                : undefined,
-            metadata: this.flags.metadata
-                ? {
-                    metadataEntries: this.flags.metadata,
-                    directoryPaths: [this.flags['root-dir']],
-                }
-                : undefined,
-        });
-        const numOfComponents = this.componentSet.getSourceComponents().toArray().length;
-        if (numOfComponents > 0) {
-            this.spinner.start(`Converting ${numOfComponents} metadata components`);
-            const converter = new source_deploy_retrieve_1.MetadataConverter();
-            this.convertResult = await converter.convert(this.componentSet, 'source', {
-                type: 'directory',
-                outputDirectory: outputDir,
-                genUniqueDir: false,
-            });
-            this.spinner.stop();
-        }
-    }
-    formatResult() {
-        if (!this.convertResult) {
-            throw new core_1.SfError('No results to format');
-        }
-        const formatter = new metadataConvertResultFormatter_1.MetadataConvertResultFormatter(this.convertResult);
-        if (!this.jsonEnabled()) {
-            formatter.display();
-        }
-        return formatter.getJson();
-    }
-}
-exports.Mdapi = Mdapi;
-Mdapi.aliases = ['force:mdapi:beta:convert', 'force:mdapi:convert'];
-Mdapi.deprecateAliases = true;
-Mdapi.summary = messages.getMessage('summary');
-Mdapi.description = messages.getMessage('description');
-Mdapi.examples = messages.getMessages('examples');
-Mdapi.requiresProject = true;
-Mdapi.flags = {
-    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
-    loglevel: sf_plugins_core_1.loglevel,
-    'root-dir': sf_plugins_core_1.Flags.directory({
-        aliases: ['rootdir'],
-        deprecateAliases: true,
-        char: 'r',
-        summary: messages.getMessage('flags.root-dir.summary'),
-        required: true,
-        exists: true,
-    }),
-    'output-dir': sf_plugins_core_1.Flags.directory({
-        aliases: ['outputdir'],
-        deprecateAliases: true,
-        char: 'd',
-        summary: messages.getMessage('flags.output-dir.summary'),
-    }),
-    manifest: sf_plugins_core_1.Flags.file({
-        char: 'x',
-        description: messages.getMessage('flags.manifest.description'),
-        summary: messages.getMessage('flags.manifest.summary'),
-        exists: true,
-    }),
-    'metadata-dir': (0, sf_plugins_core_1.arrayWithDeprecation)({
-        char: 'p',
-        aliases: ['metadatapath'],
-        deprecateAliases: true,
-        description: messages.getMessage('flags.metadata-dir.description'),
-        summary: messages.getMessage('flags.metadata-dir.summary'),
-        exclusive: ['manifest', 'metadata'],
-    }),
-    metadata: (0, sf_plugins_core_1.arrayWithDeprecation)({
-        char: 'm',
-        summary: messages.getMessage('flags.metadata.summary'),
-        exclusive: ['manifest', 'metadatapath'],
-    }),
-};
-const resolveOutputDir = async (outputDir) => ensureFlagPath({
-    flagName: 'outputdir',
-    path: outputDir,
-    type: 'dir',
-});
-const resolveMetadataPaths = async (metadataPaths) => Promise.all(metadataPaths
-    .filter((mdPath) => mdPath?.length)
-    .map((mdPath) => ensureFlagPath({
-    flagName: 'metadatapath',
-    path: mdPath,
-    type: 'any',
-    throwOnENOENT: true,
-})));
-/**
- * Ensures command flags that are file system paths are set properly before
- * continuing command execution.  Can also create directories that don't yet
- * exist in the path.
- *
- * @param options defines the path to resolve and the expectations
- * @returns the resolved flag path
- */
-const ensureFlagPath = async (options) => {
-    const { flagName, path, type, throwOnENOENT } = options;
-    const resolvedPath = (0, path_1.resolve)(path?.trim());
-    try {
-        const stats = await fs.promises.stat(resolvedPath);
-        if (type !== 'any') {
-            const isDir = stats.isDirectory();
-            if (type === 'dir' && !isDir) {
-                throw messages.createError('InvalidFlagPath', [flagName, path, messages.getMessage('expectedDirectory')]);
-            }
-            else if (type === 'file' && isDir) {
-                throw messages.createError(messages.getMessage('InvalidFlagPath', [flagName, path, messages.getMessage('expectedFile')]));
-            }
-        }
-        return resolvedPath;
-    }
-    catch (error) {
-        if (error instanceof Error && 'code' in error && error.code !== 'ENOENT') {
-            throw error;
-        }
-        else {
-            if (throwOnENOENT) {
-                const enoent = messages.getMessage('notFound');
-                throw new core_1.SfError(messages.getMessage('InvalidFlagPath', [flagName, path, enoent]), 'InvalidFlagPath');
-            }
-            const dir = type === 'dir' ? resolvedPath : (0, path_1.dirname)(resolvedPath);
-            // using as because fs promises always returns a string when recursive is true
-            return fs.promises.mkdir(dir, { recursive: true });
-        }
-    }
-};
-//# sourceMappingURL=mdapi.js.map

package/lib/commands/project/convert/mdapi.js.map

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

package/lib/commands/project/convert/source.d.ts

@@ -1,29 +0,0 @@
-import { ConvertResult } from '@salesforce/source-deploy-retrieve';
-import { SfCommand } from '@salesforce/sf-plugins-core';
-import { Interfaces } from '@oclif/core';
-import { ConvertResultJson } from '../../../utils/types';
-export declare class Source extends SfCommand<ConvertResultJson> {
-    static readonly summary: string;
-    static readonly description: string;
-    static readonly examples: string[];
-    static readonly requiresProject = true;
-    static readonly aliases: string[];
-    static readonly deprecateAliases = true;
-    static readonly flags: {
-        'api-version': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        loglevel: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'root-dir': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'output-dir': Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'package-name': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        manifest: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'source-dir': Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        metadata: Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    protected convertResult: ConvertResult;
-    private flags;
-    private componentSet;
-    run(): Promise<ConvertResultJson>;
-    protected convert(): Promise<void>;
-    protected resolveSuccess(): void;
-    protected formatResult(): ConvertResultJson;
-}

package/lib/commands/project/convert/source.js

@@ -1,141 +0,0 @@
-"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.Source = void 0;
-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 ts_types_1 = require("@salesforce/ts-types");
-const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
-const project_1 = require("../../../utils/project");
-const sourceConvertResultFormatter_1 = require("../../../formatters/sourceConvertResultFormatter");
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'convert.source');
-class Source extends sf_plugins_core_1.SfCommand {
-    async run() {
-        this.flags = (await this.parse(Source)).flags;
-        await this.convert();
-        this.resolveSuccess();
-        return this.formatResult();
-    }
-    async convert() {
-        const paths = [];
-        const { metadata, manifest } = this.flags;
-        const sourcepath = this.flags['source-dir'];
-        const rootdir = this.flags['root-dir'];
-        if (sourcepath) {
-            paths.push(...sourcepath);
-        }
-        // rootdir behaves exclusively to sourcepath, metadata, and manifest... to maintain backwards compatibility
-        // we will check here, instead of adding the exclusive option to the flag definition so we don't break scripts
-        if (rootdir && !sourcepath && !metadata && !manifest && typeof rootdir === 'string') {
-            // only rootdir option passed
-            paths.push(rootdir);
-        }
-        // no options passed, convert the default package (usually force-app)
-        if (!sourcepath && !metadata && !manifest && !rootdir) {
-            paths.push(this.project.getDefaultPackage().path);
-        }
-        this.componentSet = await source_deploy_retrieve_1.ComponentSetBuilder.build({
-            sourceapiversion: await (0, project_1.getSourceApiVersion)(),
-            sourcepath: paths,
-            manifest: manifest
-                ? {
-                    manifestPath: manifest,
-                    directoryPaths: await (0, project_1.getPackageDirs)(),
-                }
-                : undefined,
-            metadata: metadata
-                ? {
-                    metadataEntries: metadata,
-                    directoryPaths: await (0, project_1.getPackageDirs)(),
-                }
-                : undefined,
-        });
-        const packageName = this.flags['package-name'];
-        const outputDirectory = (0, path_1.resolve)(this.flags['output-dir']);
-        const converter = new source_deploy_retrieve_1.MetadataConverter();
-        this.convertResult = await converter.convert(this.componentSet, 'metadata', {
-            type: 'directory',
-            outputDirectory,
-            packageName,
-            genUniqueDir: false,
-        });
-        if (packageName && this.convertResult.packagePath) {
-            // SDR will build an output path like /output/directory/packageName/package.xml
-            // this was breaking from toolbelt, so to revert it we copy the directory up a level and delete the original
-            fs.cpSync(this.convertResult.packagePath, outputDirectory);
-            fs.rmSync(this.convertResult.packagePath, { recursive: true });
-            this.convertResult.packagePath = outputDirectory;
-        }
-    }
-    resolveSuccess() {
-        if (!(0, ts_types_1.getString)(this.convertResult, 'packagePath')) {
-            process.exitCode = 1;
-        }
-    }
-    formatResult() {
-        const formatter = new sourceConvertResultFormatter_1.SourceConvertResultFormatter(this.convertResult);
-        if (!this.jsonEnabled()) {
-            formatter.display();
-        }
-        return formatter.getJson();
-    }
-}
-exports.Source = Source;
-Source.summary = messages.getMessage('summary');
-Source.description = messages.getMessage('description');
-Source.examples = messages.getMessages('examples');
-Source.requiresProject = true;
-Source.aliases = ['force:source:convert'];
-Source.deprecateAliases = true;
-Source.flags = {
-    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
-    loglevel: sf_plugins_core_1.loglevel,
-    'root-dir': sf_plugins_core_1.Flags.directory({
-        aliases: ['rootdir'],
-        deprecateAliases: true,
-        char: 'r',
-        summary: messages.getMessage('flags.root-dir.summary'),
-        exists: true,
-    }),
-    'output-dir': sf_plugins_core_1.Flags.directory({
-        aliases: ['outputdir'],
-        deprecateAliases: true,
-        default: `metadataPackage_${Date.now()}`,
-        char: 'd',
-        summary: messages.getMessage('flags.output-dir.summary'),
-    }),
-    'package-name': sf_plugins_core_1.Flags.string({
-        char: 'n',
-        aliases: ['packagename'],
-        deprecateAliases: true,
-        summary: messages.getMessage('flags.package-name.summary'),
-    }),
-    manifest: sf_plugins_core_1.Flags.file({
-        char: 'x',
-        summary: messages.getMessage('flags.manifest.summary'),
-        description: messages.getMessage('flags.manifest.description'),
-        exists: true,
-    }),
-    'source-dir': (0, sf_plugins_core_1.arrayWithDeprecation)({
-        char: 'p',
-        aliases: ['sourcepath'],
-        deprecateAliases: true,
-        description: messages.getMessage('flags.source-dir.description'),
-        summary: messages.getMessage('flags.source-dir.summary'),
-        exclusive: ['manifest', 'metadata'],
-    }),
-    metadata: (0, sf_plugins_core_1.arrayWithDeprecation)({
-        char: 'm',
-        summary: messages.getMessage('flags.metadata.summary'),
-        exclusive: ['manifest', 'sourcepath'],
-    }),
-};
-//# sourceMappingURL=source.js.map

package/lib/commands/project/convert/source.js.map

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