@salesforce/plugin-packaging 1.12.3 → 1.12.4

package/lib/commands/package/version/update.js

@@ -0,0 +1,77 @@
+"use strict";
+/*
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PackageVersionUpdateCommand = void 0;
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+const packaging_1 = require("@salesforce/packaging");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'package_version_update');
+class PackageVersionUpdateCommand extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(PackageVersionUpdateCommand);
+        const pv = new packaging_1.PackageVersion({
+            connection: flags['target-hub-org'].getConnection(flags['api-version']),
+            project: this.project,
+            idOrAlias: flags.package,
+        });
+        const result = await pv.update({
+            VersionDescription: flags['version-description'],
+            Branch: flags.branch,
+            InstallKey: flags['installation-key'],
+            VersionName: flags['version-name'],
+            Tag: flags.tag,
+        });
+        this.logSuccess(messages.getMessage('success', [result.id]));
+        return result;
+    }
+}
+exports.PackageVersionUpdateCommand = PackageVersionUpdateCommand;
+PackageVersionUpdateCommand.summary = messages.getMessage('summary');
+PackageVersionUpdateCommand.description = messages.getMessage('description');
+PackageVersionUpdateCommand.examples = messages.getMessages('examples');
+PackageVersionUpdateCommand.deprecateAliases = true;
+PackageVersionUpdateCommand.aliases = ['force:package:beta:version:update', 'force:package:version:update'];
+PackageVersionUpdateCommand.requiresProject = true;
+PackageVersionUpdateCommand.flags = {
+    loglevel: sf_plugins_core_1.loglevel,
+    'target-hub-org': sf_plugins_core_1.requiredHubFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    package: sf_plugins_core_1.Flags.string({
+        char: 'p',
+        summary: messages.getMessage('flags.package.summary'),
+        required: true,
+    }),
+    'version-name': sf_plugins_core_1.Flags.string({
+        aliases: ['versionname'],
+        deprecateAliases: true,
+        char: 'a',
+        summary: messages.getMessage('flags.version-name.summary'),
+    }),
+    'version-description': sf_plugins_core_1.Flags.string({
+        aliases: ['versiondescription'],
+        deprecateAliases: true,
+        char: 'e',
+        summary: messages.getMessage('flags.version-description.summary'),
+    }),
+    branch: sf_plugins_core_1.Flags.string({
+        char: 'b',
+        summary: messages.getMessage('flags.branch.summary'),
+    }),
+    tag: sf_plugins_core_1.Flags.string({
+        char: 't',
+        summary: messages.getMessage('flags.tag.summary'),
+    }),
+    'installation-key': sf_plugins_core_1.Flags.string({
+        aliases: ['installationkey'],
+        deprecateAliases: true,
+        char: 'k',
+        summary: messages.getMessage('flags.installation-key.summary'),
+    }),
+};
+//# sourceMappingURL=update.js.map

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

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

package/lib/commands/package1/version/create/get.d.ts

@@ -0,0 +1,15 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { PackagingSObjects } from '@salesforce/packaging';
+export declare class Package1VersionCreateGetCommand extends SfCommand<PackagingSObjects.PackageUploadRequest> {
+    static readonly summary: string;
+    static readonly examples: string[];
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly flags: {
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'request-id': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+    };
+    run(): Promise<PackagingSObjects.PackageUploadRequest>;
+}

package/lib/commands/{force/package1 → package1}/version/create/get.js

@@ -7,15 +7,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Package1VersionCreateGetCommand = void 0;
-const os = require("os");
-const command_1 = require("@salesforce/command");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 const packaging_1 = require("@salesforce/packaging");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'package1_version_create_get');
-class Package1VersionCreateGetCommand extends command_1.SfdxCommand {
+class Package1VersionCreateGetCommand extends sf_plugins_core_1.SfCommand {
     async run() {
-        const result = await packaging_1.Package1Version.getCreateStatus(this.org.getConnection(), this.flags.requestid);
+        const { flags } = await this.parse(Package1VersionCreateGetCommand);
+        const result = await packaging_1.Package1Version.getCreateStatus(flags['target-org'].getConnection(flags['api-version']), flags['request-id']);
         if (result.Status === 'ERROR') {
             // toolbelt was accessing request.Errors.errors, I'm unsure about this type, but was unable to reproduce an error
             // in the wild, and decided to trust how it was working
@@ -23,22 +23,30 @@ class Package1VersionCreateGetCommand extends command_1.SfdxCommand {
             throw messages.createError('uploadFailure', [errors ?? 'Package version creation failed with unknown error']);
         }
         else {
-            const arg = result.Status === 'SUCCESS' ? [result.MetadataPackageVersionId] : [result.Id, this.org.getUsername()];
-            this.ux.log(messages.getMessage(result.Status, arg));
+            const arg = result.Status === 'SUCCESS'
+                ? [result.MetadataPackageVersionId]
+                : [this.config.bin, result.Id, flags['target-org'].getUsername()];
+            this.log(messages.getMessage(result.Status, arg));
         }
         return result;
     }
 }
 exports.Package1VersionCreateGetCommand = Package1VersionCreateGetCommand;
-Package1VersionCreateGetCommand.aliases = ['force:package1:beta:version:create:get'];
-Package1VersionCreateGetCommand.description = messages.getMessage('cliDescription');
-Package1VersionCreateGetCommand.examples = messages.getMessage('examples').split(os.EOL);
-Package1VersionCreateGetCommand.requiresUsername = true;
-Package1VersionCreateGetCommand.flagsConfig = {
-    requestid: command_1.flags.id({
+Package1VersionCreateGetCommand.summary = messages.getMessage('summary');
+Package1VersionCreateGetCommand.examples = messages.getMessages('examples');
+Package1VersionCreateGetCommand.deprecateAliases = true;
+Package1VersionCreateGetCommand.aliases = ['force:package1:beta:version:create:get', 'force:package1:version:create:get'];
+Package1VersionCreateGetCommand.flags = {
+    loglevel: sf_plugins_core_1.loglevel,
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    'request-id': sf_plugins_core_1.Flags.salesforceId({
+        startsWith: '0HD',
+        length: 'both',
+        deprecateAliases: true,
+        aliases: ['requestid'],
         char: 'i',
-        description: messages.getMessage('requestId'),
-        longDescription: messages.getMessage('requestIdLong'),
+        summary: messages.getMessage('flags.request-id.summary'),
         required: true,
     }),
 };

package/lib/commands/package1/version/create/get.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../src/commands/package1/version/create/get.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iEAMqC;AACrC,2CAA4C;AAC5C,qDAA2E;AAE3E,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,6BAA6B,CAAC,CAAC;AAEtG,MAAa,+BAAgC,SAAQ,2BAAiD;IAoB7F,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,2BAAe,CAAC,eAAe,CAClD,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,EACvD,KAAK,CAAC,YAAY,CAAC,CACpB,CAAC;QAEF,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE;YAC7B,iHAAiH;YACjH,uDAAuD;YACvD,MAAM,MAAM,GAAI,MAAM,CAAC,MAAyC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3G,MAAM,QAAQ,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,MAAM,IAAI,oDAAoD,CAAC,CAAC,CAAC;SAC/G;aAAM;YACL,MAAM,GAAG,GACP,MAAM,CAAC,MAAM,KAAK,SAAS;gBACzB,CAAC,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC;gBACnC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;YACtE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;SACnD;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;;AAzCH,0EA0CC;AAzCwB,uCAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,wCAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,gDAAgB,GAAG,IAAI,CAAC;AACxB,uCAAO,GAAG,CAAC,wCAAwC,EAAE,mCAAmC,CAAC,CAAC;AAC1F,qCAAK,GAAG;IAC7B,QAAQ,EAAR,0BAAQ;IACR,YAAY,EAAE,iDAA+B;IAC7C,aAAa,EAAE,mDAAiC;IAChD,YAAY,EAAE,uBAAK,CAAC,YAAY,CAAC;QAC/B,UAAU,EAAE,KAAK;QACjB,MAAM,EAAE,MAAM;QACd,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,WAAW,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;QACxD,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC"}

package/lib/commands/package1/version/create.d.ts

@@ -0,0 +1,28 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { Duration } from '@salesforce/kit';
+import { PackagingSObjects } from '@salesforce/packaging';
+export type PackageUploadRequest = PackagingSObjects.PackageUploadRequest;
+export declare class Package1VersionCreateCommand extends SfCommand<PackageUploadRequest> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly requiresProject = true;
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly flags: {
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'package-id': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        name: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        description: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        version: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'managed-released': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'release-notes-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'post-install-url': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'installation-key': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        wait: import("@oclif/core/lib/interfaces").OptionFlag<Duration | undefined>;
+    };
+    run(): Promise<PackageUploadRequest>;
+    private parseVersion;
+}

package/lib/commands/package1/version/create.js

@@ -0,0 +1,130 @@
+"use strict";
+/*
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Package1VersionCreateCommand = void 0;
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
+const core_1 = require("@salesforce/core");
+const kit_1 = require("@salesforce/kit");
+const packaging_1 = require("@salesforce/packaging");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'package1_version_create');
+class Package1VersionCreateCommand extends sf_plugins_core_1.SfCommand {
+    async run() {
+        const { flags } = await this.parse(Package1VersionCreateCommand);
+        const version = this.parseVersion(flags.version);
+        if (flags.wait) {
+            // if we're waiting for the request, set up the listener
+            core_1.Lifecycle.getInstance().on(packaging_1.PackageVersionEvents.create.progress, 
+            // the 'on' method requires an async method, but we don't have any async calls
+            // eslint-disable-next-line @typescript-eslint/require-await
+            async (data) => {
+                this.log(`Package upload is ${data.pollingResult.Status === 'QUEUED' ? 'enqueued' : 'in progress'}. Waiting ${data.timeout} more seconds`);
+            });
+        }
+        const result = await packaging_1.Package1Version.create(flags['target-org'].getConnection(flags['api-version']), {
+            MetadataPackageId: flags['package-id'],
+            VersionName: flags.name,
+            Description: flags.description,
+            MajorVersion: version.major,
+            MinorVersion: version.minor,
+            IsReleaseVersion: flags['managed-released'],
+            ReleaseNotesUrl: flags['release-notes-url'],
+            PostInstallUrl: flags['post-install-url'],
+            Password: flags['installation-key'],
+        }, { frequency: kit_1.Duration.seconds(5), timeout: flags.wait ?? kit_1.Duration.seconds(0) });
+        const arg = result.Status === 'SUCCESS'
+            ? [result.MetadataPackageVersionId]
+            : [this.config.bin, result.Id, flags['target-org'].getUsername()];
+        this.log(messages.getMessage(result.Status, arg));
+        return result;
+    }
+    // eslint-disable-next-line class-methods-use-this
+    parseVersion(versionString) {
+        const versions = versionString?.split('.');
+        if (!versions) {
+            // return nulls so when no version flag is provided, the server can infer the correct version
+            return { major: undefined, minor: undefined };
+        }
+        if (versions.length === 2) {
+            return {
+                major: Number(versions[0]),
+                minor: Number(versions[1]),
+            };
+        }
+        else {
+            throw messages.createError('package1VersionCreateCommandInvalidVersion', [versionString]);
+        }
+    }
+}
+exports.Package1VersionCreateCommand = Package1VersionCreateCommand;
+Package1VersionCreateCommand.summary = messages.getMessage('summary');
+Package1VersionCreateCommand.description = messages.getMessage('description');
+Package1VersionCreateCommand.examples = messages.getMessages('examples');
+Package1VersionCreateCommand.requiresProject = true;
+Package1VersionCreateCommand.deprecateAliases = true;
+Package1VersionCreateCommand.aliases = ['force:package1:beta:version:create', 'force:package1:version:create'];
+Package1VersionCreateCommand.flags = {
+    loglevel: sf_plugins_core_1.loglevel,
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    'package-id': sf_plugins_core_1.Flags.salesforceId({
+        length: 'both',
+        deprecateAliases: true,
+        aliases: ['packageid'],
+        char: 'i',
+        summary: messages.getMessage('flags.package-id.summary'),
+        required: true,
+        startsWith: '033',
+    }),
+    name: sf_plugins_core_1.Flags.string({
+        char: 'n',
+        summary: messages.getMessage('flags.name.summary'),
+        required: true,
+    }),
+    description: sf_plugins_core_1.Flags.string({
+        char: 'd',
+        summary: messages.getMessage('flags.description.summary'),
+    }),
+    version: sf_plugins_core_1.Flags.string({
+        char: 'v',
+        summary: messages.getMessage('flags.version.summary'),
+    }),
+    'managed-released': sf_plugins_core_1.Flags.boolean({
+        char: 'm',
+        deprecateAliases: true,
+        aliases: ['managedrelease'],
+        summary: messages.getMessage('flags.managed-release.summary'),
+        description: messages.getMessage('flags.managed-release.description'),
+    }),
+    'release-notes-url': sf_plugins_core_1.Flags.string({
+        char: 'r',
+        deprecateAliases: true,
+        aliases: ['releasenotesurl'],
+        summary: messages.getMessage('flags.release-notes-url.summary'),
+        description: messages.getMessage('flags.release-notes-url.description'),
+    }),
+    'post-install-url': sf_plugins_core_1.Flags.string({
+        char: 'p',
+        deprecateAliases: true,
+        aliases: ['postinstallurl'],
+        summary: messages.getMessage('flags.post-install-url.summary'),
+        description: messages.getMessage('flags.post-install-url.description'),
+    }),
+    'installation-key': sf_plugins_core_1.Flags.string({
+        char: 'k',
+        deprecateAliases: true,
+        aliases: ['installationkey'],
+        summary: messages.getMessage('flags.installation-key.summary'),
+    }),
+    wait: sf_plugins_core_1.Flags.duration({
+        unit: 'minutes',
+        char: 'w',
+        summary: messages.getMessage('flags.wait.summary'),
+    }),
+};
+//# sourceMappingURL=create.js.map

package/lib/commands/package1/version/create.js.map

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

package/lib/commands/package1/version/display.d.ts

@@ -0,0 +1,16 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { Package1Display } from '@salesforce/packaging';
+export type Package1DisplayCommandResult = Package1Display[];
+export declare class Package1VersionDisplayCommand extends SfCommand<Package1DisplayCommandResult> {
+    static readonly summary: string;
+    static readonly examples: string[];
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly flags: {
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'package-version-id': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+    };
+    run(): Promise<Package1DisplayCommandResult>;
+}

package/lib/commands/{force/package1 → package1}/version/display.js

@@ -7,14 +7,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Package1VersionDisplayCommand = void 0;
-const command_1 = require("@salesforce/command");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 const packaging_1 = require("@salesforce/packaging");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'package1_version_display');
-class Package1VersionDisplayCommand extends command_1.SfdxCommand {
+class Package1VersionDisplayCommand extends sf_plugins_core_1.SfCommand {
     async run() {
-        const pv1 = new packaging_1.Package1Version(this.org.getConnection(), this.flags.packageversionid);
+        const { flags } = await this.parse(Package1VersionDisplayCommand);
+        const pv1 = new packaging_1.Package1Version(flags['target-org'].getConnection(flags['api-version']), flags['package-version-id']);
         const results = (await pv1.getPackageVersion()).map((result) => ({
             MetadataPackageVersionId: result.Id,
             MetadataPackageId: result.MetadataPackageId,
@@ -24,10 +25,10 @@ class Package1VersionDisplayCommand extends command_1.SfdxCommand {
             BuildNumber: result.BuildNumber,
         }));
         if (results.length === 0) {
-            this.ux.log('No results found');
+            this.warn('No results found');
         }
         else {
-            this.ux.table(results, {
+            this.table(results, {
                 MetadataPackageVersionId: { header: 'MetadataPackageVersionId' },
                 MetadataPackageId: { header: 'MetadataPackageId' },
                 Name: { header: 'Name' },
@@ -40,21 +41,22 @@ class Package1VersionDisplayCommand extends command_1.SfdxCommand {
     }
 }
 exports.Package1VersionDisplayCommand = Package1VersionDisplayCommand;
-Package1VersionDisplayCommand.aliases = ['force:package1:beta:version:display'];
-Package1VersionDisplayCommand.description = messages.getMessage('description');
-Package1VersionDisplayCommand.requiresUsername = true;
-Package1VersionDisplayCommand.flagsConfig = {
-    packageversionid: command_1.flags.id({
+Package1VersionDisplayCommand.summary = messages.getMessage('summary');
+Package1VersionDisplayCommand.examples = messages.getMessages('examples');
+Package1VersionDisplayCommand.deprecateAliases = true;
+Package1VersionDisplayCommand.aliases = ['force:package1:beta:version:display', 'force:package1:version:display'];
+Package1VersionDisplayCommand.flags = {
+    loglevel: sf_plugins_core_1.loglevel,
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    'package-version-id': sf_plugins_core_1.Flags.salesforceId({
+        length: 'both',
         char: 'i',
-        description: messages.getMessage('packageId'),
-        longDescription: messages.getMessage('packageIdLong'),
+        deprecateAliases: true,
+        aliases: ['packageversionid'],
+        summary: messages.getMessage('flags.package-version-id.summary'),
         required: true,
-        validate: (id) => {
-            if (/^04t.{12,15}$/.test(id)) {
-                return true;
-            }
-            throw messages.createError('packageIdInvalid');
-        },
+        startsWith: '04t',
     }),
 };
 //# sourceMappingURL=display.js.map

package/lib/commands/package1/version/display.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../src/commands/package1/version/display.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iEAMqC;AACrC,2CAA4C;AAC5C,qDAAyE;AAEzE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,0BAA0B,CAAC,CAAC;AAGnG,MAAa,6BAA8B,SAAQ,2BAAuC;IAqBjF,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,IAAI,2BAAe,CAC7B,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,EACvD,KAAK,CAAC,oBAAoB,CAAC,CAC5B,CAAC;QACF,MAAM,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,iBAAiB,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC/D,wBAAwB,EAAE,MAAM,CAAC,EAAE;YACnC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;YAC3C,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,EAAE;YAC/E,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC,CAAC;QAEJ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAC/B;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;gBAClB,wBAAwB,EAAE,EAAE,MAAM,EAAE,0BAA0B,EAAE;gBAChE,iBAAiB,EAAE,EAAE,MAAM,EAAE,mBAAmB,EAAE;gBAClD,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;gBACxB,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;gBAC9B,YAAY,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE;gBACxC,WAAW,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;aACvC,CAAC,CAAC;SACJ;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;;AAlDH,sEAmDC;AAlDwB,qCAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,sCAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,8CAAgB,GAAG,IAAI,CAAC;AACxB,qCAAO,GAAG,CAAC,qCAAqC,EAAE,gCAAgC,CAAC,CAAC;AAEpF,mCAAK,GAAG;IAC7B,QAAQ,EAAR,0BAAQ;IACR,YAAY,EAAE,iDAA+B;IAC7C,aAAa,EAAE,mDAAiC;IAChD,oBAAoB,EAAE,uBAAK,CAAC,YAAY,CAAC;QACvC,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,GAAG;QACT,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,kBAAkB,CAAC;QAC7B,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,kCAAkC,CAAC;QAChE,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,KAAK;KAClB,CAAC;CACH,CAAC"}

package/lib/commands/package1/version/list.d.ts

@@ -0,0 +1,16 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { Package1Display } from '@salesforce/packaging';
+export type Package1ListCommandResult = Package1Display[];
+export declare class Package1VersionListCommand extends SfCommand<Package1ListCommandResult> {
+    static readonly summary: string;
+    static readonly examples: string[];
+    static readonly deprecateAliases = true;
+    static readonly aliases: string[];
+    static readonly flags: {
+        loglevel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org>;
+        'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'package-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+    };
+    run(): Promise<Package1ListCommandResult>;
+}

package/lib/commands/{force/package1 → package1}/version/list.js

@@ -7,14 +7,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Package1VersionListCommand = void 0;
-const command_1 = require("@salesforce/command");
+const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const core_1 = require("@salesforce/core");
 const packaging_1 = require("@salesforce/packaging");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'package1_version_list');
-class Package1VersionListCommand extends command_1.SfdxCommand {
+class Package1VersionListCommand extends sf_plugins_core_1.SfCommand {
     async run() {
-        const result = (await packaging_1.Package1Version.list(this.org.getConnection(), this.flags.packageid)).map((record) => ({
+        const { flags } = await this.parse(Package1VersionListCommand);
+        const result = (await packaging_1.Package1Version.list(flags['target-org'].getConnection(flags['api-version']), flags['package-id'])).map((record) => ({
             MetadataPackageVersionId: record.Id,
             MetadataPackageId: record.MetadataPackageId,
             Name: record.Name,
@@ -23,7 +24,7 @@ class Package1VersionListCommand extends command_1.SfdxCommand {
             BuildNumber: record.BuildNumber,
         }));
         if (result.length) {
-            this.ux.table(result, {
+            this.table(result, {
                 MetadataPackageVersionId: { header: 'MetadataPackageVersionId' },
                 MetadataPackageId: { header: 'MetadataPackageId' },
                 Name: { header: 'Name' },
@@ -33,28 +34,28 @@ class Package1VersionListCommand extends command_1.SfdxCommand {
             });
         }
         else {
-            this.ux.log('No Results Found');
+            this.warn('No Results Found');
         }
         return result;
     }
 }
 exports.Package1VersionListCommand = Package1VersionListCommand;
-Package1VersionListCommand.aliases = ['force:package1:beta:version:list'];
-Package1VersionListCommand.description = messages.getMessage('cliDescription');
-Package1VersionListCommand.requiresUsername = true;
-Package1VersionListCommand.flagsConfig = {
-    packageid: command_1.flags.id({
+Package1VersionListCommand.summary = messages.getMessage('summary');
+Package1VersionListCommand.examples = messages.getMessages('examples');
+Package1VersionListCommand.deprecateAliases = true;
+Package1VersionListCommand.aliases = ['force:package1:beta:version:list', 'force:package1:version:list'];
+Package1VersionListCommand.flags = {
+    loglevel: sf_plugins_core_1.loglevel,
+    'target-org': sf_plugins_core_1.requiredOrgFlagWithDeprecations,
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    'package-id': sf_plugins_core_1.Flags.salesforceId({
+        length: 18,
+        deprecateAliases: true,
+        aliases: ['packageid'],
         char: 'i',
-        description: messages.getMessage('packageId'),
-        longDescription: messages.getMessage('packageIdLong'),
-        validate: (id) => {
-            if (/^033.{12,15}$/.test(id)) {
-                return true;
-            }
-            else {
-                throw messages.createError('packageIdInvalid');
-            }
-        },
+        summary: messages.getMessage('flags.package-id.summary'),
+        description: messages.getMessage('flags.package-id.description'),
+        startsWith: '033',
     }),
 };
 //# sourceMappingURL=list.js.map

package/lib/commands/package1/version/list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/package1/version/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iEAMqC;AACrC,2CAA4C;AAC5C,qDAAyE;AAEzE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,uBAAuB,CAAC,CAAC;AAEhG,MAAa,0BAA2B,SAAQ,2BAAoC;IAoB3E,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,CACb,MAAM,2BAAe,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,CAAW,CAAC,CACnH,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACjB,wBAAwB,EAAE,MAAM,CAAC,EAAE;YACnC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;YAC3C,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,OAAO,EAAE,GAAG,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,EAAE;YAC/E,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC,CAAC;QAEJ,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACjB,wBAAwB,EAAE,EAAE,MAAM,EAAE,0BAA0B,EAAE;gBAChE,iBAAiB,EAAE,EAAE,MAAM,EAAE,mBAAmB,EAAE;gBAClD,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;gBACxB,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;gBAC9B,YAAY,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE;gBACxC,WAAW,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;aACvC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAC/B;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA9CH,gEA+CC;AA9CwB,kCAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,mCAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,2CAAgB,GAAG,IAAI,CAAC;AACxB,kCAAO,GAAG,CAAC,kCAAkC,EAAE,6BAA6B,CAAC,CAAC;AAC9E,gCAAK,GAAG;IAC7B,QAAQ,EAAR,0BAAQ;IACR,YAAY,EAAE,iDAA+B;IAC7C,aAAa,EAAE,mDAAiC;IAChD,YAAY,EAAE,uBAAK,CAAC,YAAY,CAAC;QAC/B,MAAM,EAAE,EAAE;QACV,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,CAAC,WAAW,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;QACxD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,UAAU,EAAE,KAAK;KAClB,CAAC;CACH,CAAC"}