@salesforce/plugin-packaging 1.9.5 → 1.9.7

package/lib/commands/force/package/beta/convert.js

@@ -27,14 +27,21 @@ class PackageConvert extends command_1.SfdxCommand {
         core_1.Lifecycle.getInstance().on(packaging_1.PackageEvents.convert.success, async () => {
             this.ux.log('SUCCESS');
         });
-        const pkg = new packaging_1.Package({ connection: this.hubOrg.getConnection() });
-        const result = await pkg.convert(this.flags.package, {
+        // initialize the project instance if in a project
+        let project;
+        try {
+            project = await core_1.SfProject.resolve();
+        }
+        catch (err) {
+            // ignore project is optional
+        }
+        const result = await packaging_1.Package.convert(this.flags.package, this.hubOrg.getConnection(), {
             wait: this.flags.wait,
             installationKey: this.flags.installationkey,
             installationKeyBypass: this.flags.installationkeybypass,
-            buildInstance: this.flags.buildinstance,
             definitionfile: undefined,
-        }, core_1.SfProject.getInstance());
+            buildInstance: this.flags.buildinstance,
+        }, project);
         switch (result.Status) {
             case 'Error':
                 throw new core_1.SfError((_b = (_a = result.Error) === null || _a === void 0 ? void 0 : _a.join('\n')) !== null && _b !== void 0 ? _b : pvcMessages.getMessage('unknownError'));

package/lib/commands/force/package/beta/convert.js.map

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

package/lib/commands/force/package/beta/create.js

@@ -25,10 +25,7 @@ class PackageCreateCommand extends command_1.SfdxCommand {
             packageType: this.flags.packagetype,
             path: this.flags.path,
         };
-        const result = await (0, packaging_1.createPackage)(this.hubOrg.getConnection(), this.project, options).catch((err) => {
-            // TODO: until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, packaging_1.applyErrorAction)(err);
-        });
+        const result = await packaging_1.Package.create(this.hubOrg.getConnection(), this.project, options);
         this.display(result);
         return result;
     }

package/lib/commands/force/package/beta/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/commands/force/package/beta/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/commands/force/package/beta/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAAmF;AAEnF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,CAAC;AACzF,MAAM,oBAAoB,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,wBAAwB,CAAC,CAAC;AAE7G,MAAa,oBAAqB,SAAQ,qBAAW;IA8C5C,KAAK,CAAC,GAAG;QACd,MAAM,OAAO,GAAyB;YACpC,WAAW,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAW;YACrD,yBAAyB,EAAE,IAAI,CAAC,KAAK,CAAC,yBAAmC;YACzE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAc;YAC/B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAsB;YAC9C,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,YAAuB;YAChD,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAA0B;YAClD,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAc;SAChC,CAAC;QACF,MAAM,MAAM,GAAmB,MAAM,mBAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,OAAO,CAAC,MAAsB;QACpC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACtH,CAAC;;AAhEH,oDAiEC;AAhEwB,gCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,6BAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,2CAAsB,GAAG,IAAI,CAAC;AAC9B,oCAAe,GAAG,IAAI,CAAC;AACvB,gCAAW,GAAgB;IAChD,IAAI,EAAE,eAAK,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QACxC,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;QAChD,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,WAAW,EAAE,eAAK,CAAC,IAAI,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAC/C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC;QACvD,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC;KACjC,CAAC;IACF,WAAW,EAAE,eAAK,CAAC,MAAM,CAAC;QACxB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAC/C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC;KACxD,CAAC;IACF,WAAW,EAAE,eAAK,CAAC,OAAO,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAC/C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC;KACxD,CAAC;IACF,IAAI,EAAE,eAAK,CAAC,SAAS,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,oBAAoB,CAAC,UAAU,CAAC,MAAM,CAAC;QACpD,eAAe,EAAE,oBAAoB,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5D,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,YAAY,EAAE,eAAK,CAAC,OAAO,CAAC;QAC1B,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;QAChD,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC;KACzD,CAAC;IACF,yBAAyB,EAAE,eAAK,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;QAC7D,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;KACtE,CAAC;CACH,CAAC"}

package/lib/commands/force/package/beta/delete.js

@@ -20,10 +20,12 @@ class PackageDeleteCommand extends command_1.SfdxCommand {
         if (!accepted) {
             throw messages.createError('promptDeleteDeny');
         }
-        const result = await (0, packaging_1.deletePackage)(this.flags.package, this.project, this.hubOrg.getConnection(), !!this.flags.undelete).catch((err) => {
-            // TODO: until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, packaging_1.applyErrorAction)(err);
+        const pkg = new packaging_1.Package({
+            connection: this.hubOrg.getConnection(),
+            project: this.project,
+            packageAliasOrId: this.flags.package,
         });
+        const result = this.flags.undelete ? await pkg.undelete() : await pkg.delete();
         this.display(result);
         return result;
     }
@@ -54,6 +56,7 @@ PackageDeleteCommand.flagsConfig = {
         description: messages.getMessage('undelete'),
         longDescription: messages.getMessage('undeleteLong'),
         hidden: true,
+        default: false,
     }),
 };
 //# sourceMappingURL=delete.js.map

package/lib/commands/force/package/beta/delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/commands/force/package/beta/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAA2F;AAE3F,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,CAAC;AAEzF,MAAa,oBAAqB,SAAQ,qBAAW;IAwB5C,KAAK,CAAC,GAAG;QACd,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CAAC;QAC1E,MAAM,QAAQ,GACZ,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;SAChD;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAa,EAChC,IAAI,CAAC,KAAK,CAAC,OAAO,EAClB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,EAC3B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CACtB,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACd,6GAA6G;YAC7G,MAAM,IAAA,4BAAgB,EAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,OAAO,CAAC,MAAyB;QACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QAChH,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;;AAjDH,oDAkDC;AAjDwB,gCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,6BAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,2CAAsB,GAAG,IAAI,CAAC;AAC9B,oCAAe,GAAG,IAAI,CAAC;AACvB,gCAAW,GAAgB;IAChD,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;KACrD,CAAC;IACF,OAAO,EAAE,eAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QAC3C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QACnD,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;QACpD,MAAM,EAAE,IAAI;KACb,CAAC;CACH,CAAC"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/commands/force/package/beta/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAAmE;AAEnE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,CAAC;AAEzF,MAAa,oBAAqB,SAAQ,qBAAW;IAyB5C,KAAK,CAAC,GAAG;QACd,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CAAC;QAC1E,MAAM,QAAQ,GACZ,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;SAChD;QAED,MAAM,GAAG,GAAG,IAAI,mBAAO,CAAC;YACtB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACvC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAiB;SAC/C,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;QAC/E,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,OAAO,CAAC,MAAyB;QACvC,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QAChH,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;;AA/CH,oDAgDC;AA/CwB,gCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,6BAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,2CAAsB,GAAG,IAAI,CAAC;AAC9B,oCAAe,GAAG,IAAI,CAAC;AACvB,gCAAW,GAAgB;IAChD,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;KACrD,CAAC;IACF,OAAO,EAAE,eAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QAC3C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QACnD,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC;QACpD,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK;KACf,CAAC;CACH,CAAC"}

package/lib/commands/force/package/beta/install/report.js

@@ -18,10 +18,7 @@ const installMsgs = core_1.Messages.loadMessages('@salesforce/plugin-packaging',
 class Report extends command_1.SfdxCommand {
     async run() {
         const connection = this.org.getConnection();
-        const pkg = new packaging_1.Package({ connection });
-        const installRequestId = this.flags.requestid;
-        packaging_1.Package.validateId(installRequestId, 'PackageInstallRequestId');
-        const pkgInstallRequest = await pkg.getInstallStatus(installRequestId);
+        const pkgInstallRequest = await packaging_1.SubscriberPackageVersion.getInstallRequest(this.flags.requestid, connection);
         install_1.Install.parseStatus(pkgInstallRequest, this.ux, installMsgs, this.org.getUsername());
         return pkgInstallRequest;
     }

package/lib/commands/force/package/beta/install/report.js.map

@@ -1 +1 @@
-{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../../../src/commands/force/package/beta/install/report.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAAmE;AACnE,wCAAuD;AAIvD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,wBAAwB,CAAC,CAAC;AACjG,MAAM,WAAW,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,iBAAiB,CAAC,CAAC;AAE7F,MAAa,MAAO,SAAQ,qBAAW;IAa9B,KAAK,CAAC,GAAG;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAI,mBAAO,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;QACxC,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,SAAmB,CAAC;QACxD,mBAAO,CAAC,UAAU,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,CAAC;QAChE,MAAM,iBAAiB,GAAG,MAAM,GAAG,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QACvE,iBAAc,CAAC,WAAW,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAE5F,OAAO,iBAAiB,CAAC;IAC3B,CAAC;;AAtBH,wBAuBC;AAtBwB,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,eAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,uBAAgB,GAAG,IAAI,CAAC;AACxB,kBAAW,GAAgB;IAChD,SAAS,EAAE,eAAK,CAAC,EAAE,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;QAC7C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QACrD,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC"}
+{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../../../src/commands/force/package/beta/install/report.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAAoF;AACpF,wCAAuD;AAIvD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,wBAAwB,CAAC,CAAC;AACjG,MAAM,WAAW,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,iBAAiB,CAAC,CAAC;AAE7F,MAAa,MAAO,SAAQ,qBAAW;IAa9B,KAAK,CAAC,GAAG;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;QAC5C,MAAM,iBAAiB,GAAG,MAAM,oCAAwB,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC7G,iBAAc,CAAC,WAAW,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAE5F,OAAO,iBAAiB,CAAC;IAC3B,CAAC;;AAnBH,wBAoBC;AAnBwB,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,eAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,uBAAgB,GAAG,IAAI,CAAC;AACxB,kBAAW,GAAgB;IAChD,SAAS,EAAE,eAAK,CAAC,EAAE,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;QAC7C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QACrD,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC"}

package/lib/commands/force/package/beta/install.d.ts

@@ -9,13 +9,11 @@ export declare class Install extends SfdxCommand {
     static readonly requiresUsername = true;
     static readonly flagsConfig: FlagsConfig;
     private connection;
-    private pkg;
+    private subscriberPackageVersion;
     static parseStatus(request: PackageInstallRequest, ux: UX, installMsgs: Messages<string>, username: string, alias?: string): void;
     run(): Promise<PackageInstallRequest>;
     protected finally(err: Optional<Error>): Promise<void>;
     private confirmUpgradeType;
     private confirmExternalSites;
-    private waitForPublish;
-    private resolveSubscriberPackageVersionKey;
 }
 export {};

package/lib/commands/force/package/beta/install.js

@@ -17,18 +17,6 @@ const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'p
 // maps of command flag values to PackageInstallRequest values
 const securityType = { AllUsers: 'full', AdminsOnly: 'none' };
 const upgradeType = { Delete: 'delete-only', DeprecateOnly: 'deprecate-only', Mixed: 'mixed-mode' };
-async function getPackageTypeBy04t(packageVersionId, connection, installKey) {
-    let query = `SELECT Package2ContainerOptions FROM SubscriberPackageVersion WHERE id ='${packageVersionId}'`;
-    if (installKey) {
-        const escapedInstallationKey = installKey.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
-        query += ` AND InstallationKey ='${escapedInstallationKey}'`;
-    }
-    const queryResult = await connection.tooling.query(query);
-    if (!queryResult || queryResult.records === null || queryResult.records.length === 0) {
-        throw messages.createError('errorInvalidPackageId', [packageVersionId]);
-    }
-    return queryResult.records[0].Package2ContainerOptions;
-}
 class Install extends command_1.SfdxCommand {
     static parseStatus(request, ux, installMsgs, username, alias) {
         var _a;
@@ -55,13 +43,17 @@ class Install extends command_1.SfdxCommand {
     async run() {
         const noPrompt = this.flags.noprompt;
         this.connection = this.org.getConnection();
-        this.pkg = new packaging_1.Package({ connection: this.connection });
         const apiVersion = parseInt(this.connection.getApiVersion(), 10);
         if (apiVersion < 36) {
             throw messages.createError('apiVersionTooLow');
         }
+        this.subscriberPackageVersion = new packaging_1.SubscriberPackageVersion({
+            connection: this.connection,
+            aliasOrId: this.flags.package,
+            password: this.flags.installationkey,
+        });
         const request = {
-            SubscriberPackageVersionKey: this.resolveSubscriberPackageVersionKey(this.flags.package),
+            SubscriberPackageVersionKey: await this.subscriberPackageVersion.getId(),
             Password: this.flags.installationkey,
             ApexCompileType: this.flags.apexcompile,
             SecurityType: securityType[this.flags.securitytype],
@@ -74,31 +66,43 @@ class Install extends command_1.SfdxCommand {
         // If the user has specified --upgradetype Delete, then prompt for confirmation
         // unless the noprompt option has been included.
         if (this.flags.upgradetype === 'Delete') {
-            await this.confirmUpgradeType(request, noPrompt);
+            await this.confirmUpgradeType(noPrompt);
         }
         // If the package has external sites, ask the user for permission to enable them
         // unless the noprompt option has been included.
         await this.confirmExternalSites(request, noPrompt);
-        if (this.flags.publishwait) {
-            await this.waitForPublish(request);
-        }
         let installOptions;
         if (this.flags.wait) {
             installOptions = {
+                publishTimeout: this.flags.publishwait,
                 pollingTimeout: this.flags.wait,
             };
             let remainingTime = this.flags.wait;
             let timeThen = Date.now();
             this.ux.startSpinner(messages.getMessage('packageInstallWaiting', [remainingTime.minutes]));
+            // waiting for publish to finish
+            core_1.Lifecycle.getInstance().on(packaging_1.PackageEvents.install['subscriber-status'], 
             // eslint-disable-next-line @typescript-eslint/require-await
-            core_1.Lifecycle.getInstance().on(packaging_1.PackageEvents.install.status, async (piRequest) => {
+            async (publishStatus) => {
+                const elapsedTime = kit_1.Duration.milliseconds(Date.now() - timeThen);
+                timeThen = Date.now();
+                remainingTime = kit_1.Duration.milliseconds(remainingTime.milliseconds - elapsedTime.milliseconds);
+                const status = publishStatus === 'NO_ERRORS_DETECTED'
+                    ? messages.getMessage('availableForInstallation')
+                    : messages.getMessage('unavailableForInstallation');
+                this.ux.setSpinnerStatus(messages.getMessage('packagePublishWaitingStatus', [remainingTime.minutes, status]));
+            });
+            // waiting for package install to finish
+            core_1.Lifecycle.getInstance().on(packaging_1.PackageEvents.install.status, 
+            // eslint-disable-next-line @typescript-eslint/require-await
+            async (piRequest) => {
                 const elapsedTime = kit_1.Duration.milliseconds(Date.now() - timeThen);
                 timeThen = Date.now();
                 remainingTime = kit_1.Duration.milliseconds(remainingTime.milliseconds - elapsedTime.milliseconds);
                 this.ux.setSpinnerStatus(messages.getMessage('packageInstallWaitingStatus', [remainingTime.minutes, piRequest.Status]));
             });
         }
-        const pkgInstallRequest = await this.pkg.install(request, installOptions);
+        const pkgInstallRequest = await this.subscriberPackageVersion.install(request, installOptions);
         this.ux.stopSpinner();
         Install.parseStatus(pkgInstallRequest, this.ux, messages, this.org.getUsername(), this.flags.package);
         return pkgInstallRequest;
@@ -110,9 +114,8 @@ class Install extends command_1.SfdxCommand {
         core_1.Lifecycle.getInstance().removeAllListeners(packaging_1.PackageEvents.install['subscriber-status']);
         await super.finally(err);
     }
-    async confirmUpgradeType(request, noPrompt) {
-        const pkgType = await getPackageTypeBy04t(request.SubscriberPackageVersionKey, this.connection, request.Password);
-        if (pkgType === 'Unlocked' && !noPrompt) {
+    async confirmUpgradeType(noPrompt) {
+        if ((await this.subscriberPackageVersion.getPackageType()) === 'Unlocked' && !noPrompt) {
             const promptMsg = messages.getMessage('promptUpgradeType');
             if (!(await this.ux.confirm(promptMsg))) {
                 throw messages.createError('promptUpgradeTypeDeny');
@@ -120,7 +123,7 @@ class Install extends command_1.SfdxCommand {
         }
     }
     async confirmExternalSites(request, noPrompt) {
-        const extSites = await this.pkg.getExternalSites(request.SubscriberPackageVersionKey, request.Password);
+        const extSites = await this.subscriberPackageVersion.getExternalSites();
         if (extSites) {
             let enableRss = true;
             if (!noPrompt) {
@@ -132,58 +135,6 @@ class Install extends command_1.SfdxCommand {
             }
         }
     }
-    async waitForPublish(request) {
-        // eslint-disable-next-line @typescript-eslint/require-await
-        core_1.Lifecycle.getInstance().on(packaging_1.PackageEvents.install['subscriber-status'], async (status) => {
-            const tokens = status ? [` Status = ${status}`] : [];
-            this.ux.log(messages.getMessage('publishWaitProgress', tokens));
-        });
-        // wait for the Subscriber Package Version ID to become available in the target org
-        try {
-            await this.pkg.waitForPublish(request.SubscriberPackageVersionKey, this.flags.publishwait);
-        }
-        catch (err) {
-            const error = err instanceof core_1.SfError ? err : core_1.SfError.wrap(err);
-            // If an uninstall is in progress, allow install to proceed which will result in an
-            // appropriate UninstallInProgressProblem error message being displayed.
-            const queryResult = error.data;
-            if (queryResult) {
-                const pkgVersion = queryResult.records[0];
-                if (pkgVersion.InstallValidationStatus !== 'UNINSTALL_IN_PROGRESS') {
-                    throw error;
-                }
-            }
-            else {
-                throw error;
-            }
-        }
-    }
-    // Given a package version ID (04t) or an alias for the package, validate and
-    // return the package version ID (aka SubscriberPackageVersionKey).
-    resolveSubscriberPackageVersionKey(idOrAlias) {
-        var _a;
-        let resolvedId;
-        if (idOrAlias.startsWith('04t')) {
-            packaging_1.Package.validateId(idOrAlias, 'SubscriberPackageVersionId');
-            resolvedId = idOrAlias;
-        }
-        else {
-            let packageAliases;
-            try {
-                const projectJson = core_1.SfProject.getInstance().getSfProjectJson();
-                packageAliases = (_a = projectJson.getContents().packageAliases) !== null && _a !== void 0 ? _a : {};
-            }
-            catch (e) {
-                throw messages.createError('projectNotFound', [idOrAlias]);
-            }
-            resolvedId = packageAliases[idOrAlias];
-            if (!resolvedId) {
-                throw messages.createError('packageAliasNotFound', [idOrAlias]);
-            }
-            packaging_1.Package.validateId(resolvedId, 'SubscriberPackageVersionId');
-        }
-        return resolvedId;
-    }
 }
 exports.Install = Install;
 Install.description = messages.getMessage('cliDescription');
@@ -194,6 +145,7 @@ Install.flagsConfig = {
         char: 'w',
         description: messages.getMessage('wait'),
         longDescription: messages.getMessage('waitLong'),
+        default: kit_1.Duration.minutes(0),
     }),
     installationkey: command_1.flags.string({
         char: 'k',
@@ -204,6 +156,7 @@ Install.flagsConfig = {
         char: 'b',
         description: messages.getMessage('publishWait'),
         longDescription: messages.getMessage('publishWaitLong'),
+        default: kit_1.Duration.minutes(0),
     }),
     noprompt: command_1.flags.boolean({
         char: 'r',

package/lib/commands/force/package/beta/install.js.map

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

package/lib/commands/force/package/beta/list.js

@@ -21,16 +21,12 @@ class PackageListCommand extends command_1.SfdxCommand {
     }
     async run() {
         this.logger = this.logger.child('package:list');
-        const queryResult = await (0, packaging_1.listPackages)(this.hubOrg.getConnection()).catch((err) => {
-            // TODO: until package2 is GA, wrap perm-based errors w/ 'contact sfdc' action (REMOVE once package2 is GA'd)
-            throw (0, packaging_1.applyErrorAction)(err);
-        });
+        const queryResult = await packaging_1.Package.list(this.hubOrg.getConnection());
         this.mapRecordsToResults(queryResult);
         this.displayResults();
         return this.results;
     }
-    mapRecordsToResults(queryResult) {
-        const { records } = queryResult;
+    mapRecordsToResults(records) {
         if (records && records.length > 0) {
             this.results = records.map(({ Id, SubscriberPackageId, Name, Description, NamespacePrefix, ContainerOptions, ConvertedFromPackageId, IsOrgDependent, PackageErrorUsername, CreatedById, }) => {
                 return {

package/lib/commands/force/package/beta/list.js.map

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

package/lib/commands/force/package/beta/uninstall/report.js

@@ -16,8 +16,7 @@ const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'p
 class PackageUninstallReportCommand extends command_1.SfdxCommand {
     async run() {
         const requestId = this.flags.requestid;
-        const pkg = new packaging_1.Package({ connection: this.org.getConnection() });
-        const result = await pkg.uninstallReport(requestId);
+        const result = await packaging_1.SubscriberPackageVersion.uninstallStatus(requestId, this.org.getConnection());
         const arg = result.Status === 'Success' ? [result.SubscriberPackageVersionId] : [result.Id, this.org.getUsername()];
         this.ux.log(messages.getMessage(result.Status, arg));
         return result;

package/lib/commands/force/package/beta/uninstall/report.js.map

@@ -1 +1 @@
-{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../../../src/commands/force/package/beta/uninstall/report.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAAmE;AAEnE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,0BAA0B,CAAC,CAAC;AAEnG,MAAa,6BAA8B,SAAQ,qBAAW;IAmBrD,KAAK,CAAC,GAAG;QACd,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAmB,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,mBAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAEpD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QACpH,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAErD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA5BH,sEA6BC;AA5BwB,yCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,sCAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,8CAAgB,GAAG,IAAI,CAAC;AACxB,yCAAW,GAAgB;IAChD,SAAS,EAAE,eAAK,CAAC,EAAE,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;QAC7C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QACrD,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE;YACf,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC;aACb;YACD,MAAM,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;CACH,CAAC"}
+{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../../../src/commands/force/package/beta/uninstall/report.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAAoF;AAEpF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,0BAA0B,CAAC,CAAC;AAEnG,MAAa,6BAA8B,SAAQ,qBAAW;IAmBrD,KAAK,CAAC,GAAG;QACd,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAmB,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,oCAAwB,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC;QAEnG,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QACpH,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAErD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA3BH,sEA4BC;AA3BwB,yCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,sCAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,8CAAgB,GAAG,IAAI,CAAC;AACxB,yCAAW,GAAgB;IAChD,SAAS,EAAE,eAAK,CAAC,EAAE,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;QAC7C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QACrD,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE;YACf,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBAC5B,OAAO,IAAI,CAAC;aACb;YACD,MAAM,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;CACH,CAAC"}

package/lib/commands/force/package/beta/uninstall.d.ts

@@ -7,6 +7,5 @@ export declare class PackageUninstallCommand extends SfdxCommand {
     static readonly requiresUsername = true;
     static readonly flagsConfig: FlagsConfig;
     run(): Promise<UninstallResult>;
-    private resolveSubscriberPackageVersionKey;
 }
 export {};

package/lib/commands/force/package/beta/uninstall.js

@@ -14,7 +14,6 @@ const packaging_1 = require("@salesforce/packaging");
 const kit_1 = require("@salesforce/kit");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'package_uninstall');
-const installMsgs = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'package_install');
 class PackageUninstallCommand extends command_1.SfdxCommand {
     async run() {
         // no awaits in async method
@@ -23,38 +22,16 @@ class PackageUninstallCommand extends command_1.SfdxCommand {
             // Request still in progress.  Just print a console message and move on. Server will be polled again.
             this.ux.log(`Waiting for the package uninstall request to get processed. Status = ${data.Status}`);
         });
-        const packageId = this.resolveSubscriberPackageVersionKey(this.flags.package);
-        const result = await (0, packaging_1.uninstallPackage)(packageId, this.org.getConnection(), this.flags.wait);
+        const packageVersion = new packaging_1.SubscriberPackageVersion({
+            aliasOrId: this.flags.package,
+            connection: this.org.getConnection(),
+            password: undefined,
+        });
+        const result = await packageVersion.uninstall(this.flags.wait);
         const arg = result.Status === 'Success' ? [result.SubscriberPackageVersionId] : [result.Id, this.org.getUsername()];
         this.ux.log(messages.getMessage(result.Status, arg));
         return result;
     }
-    // Given a package version ID (04t) or an alias for the package, validate and
-    // return the package version ID (aka SubscriberPackageVersionKey).
-    resolveSubscriberPackageVersionKey(idOrAlias) {
-        var _a;
-        let resolvedId;
-        if (idOrAlias.startsWith('04t')) {
-            packaging_1.Package.validateId(idOrAlias, 'SubscriberPackageVersionId');
-            resolvedId = idOrAlias;
-        }
-        else {
-            let packageAliases;
-            try {
-                const projectJson = core_1.SfProject.getInstance().getSfProjectJson();
-                packageAliases = (_a = projectJson.getContents().packageAliases) !== null && _a !== void 0 ? _a : {};
-            }
-            catch (e) {
-                throw installMsgs.createError('projectNotFound', [idOrAlias]);
-            }
-            resolvedId = packageAliases[idOrAlias];
-            if (!resolvedId) {
-                throw installMsgs.createError('packageAliasNotFound', [idOrAlias]);
-            }
-            packaging_1.Package.validateId(resolvedId, 'SubscriberPackageVersionId');
-        }
-        return resolvedId;
-    }
 }
 exports.PackageUninstallCommand = PackageUninstallCommand;
 PackageUninstallCommand.description = messages.getMessage('cliDescription');

package/lib/commands/force/package/beta/uninstall.js.map

@@ -1 +1 @@
-{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../../src/commands/force/package/beta/uninstall.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../../../../src/commands/force/package/beta/uninstall.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAAuD;AACvD,qDAAmG;AACnG,yCAA2C;AAI3C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,mBAAmB,CAAC,CAAC;AAE5F,MAAa,uBAAwB,SAAQ,qBAAW;IAmB/C,KAAK,CAAC,GAAG;QACd,4BAA4B;QAC5B,4DAA4D;QAC5D,gBAAS,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,yBAAa,CAAC,SAAS,EAAE,KAAK,EAAE,IAAqB,EAAE,EAAE;YAClF,qGAAqG;YACrG,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,wEAAwE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACrG,CAAC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAI,oCAAwB,CAAC;YAClD,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,OAAiB;YACvC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;YACpC,QAAQ,EAAE,SAAS;SACpB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE/D,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QACpH,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAErD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAvCH,0DAwCC;AAvCwB,mCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,gCAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,wCAAgB,GAAG,IAAI,CAAC;AACxB,mCAAW,GAAgB;IAChD,IAAI,EAAE,eAAK,CAAC,OAAO,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QACxC,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;QAChD,OAAO,EAAE,cAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;KAC7B,CAAC;IACF,OAAO,EAAE,eAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QAC3C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QACnD,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC"}

package/lib/commands/force/package/beta/update.js

@@ -16,16 +16,18 @@ const messages = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'p
 const packageCreate = core_1.Messages.loadMessages('@salesforce/plugin-packaging', 'package_create');
 class PackageUpdateCommand extends command_1.SfdxCommand {
     async run() {
-        const pkg = new packaging_1.Package({ connection: this.hubOrg.getConnection() });
-        const id = (0, packaging_1.getPackageIdFromAlias)(this.flags.package, this.project);
-        (0, packaging_1.validateId)(packaging_1.BY_LABEL.PACKAGE_ID, id);
+        const pkg = new packaging_1.Package({
+            packageAliasOrId: this.flags.package,
+            connection: this.hubOrg.getConnection(),
+            project: this.project,
+        });
         const result = await pkg.update({
-            Id: id,
+            Id: pkg.getId(),
             Name: this.flags.name,
             Description: this.flags.description,
             PackageErrorUsername: this.flags.errornotificationusername,
         });
-        this.ux.log(messages.getMessage('success', [id]));
+        this.ux.log(messages.getMessage('success', [pkg.getId()]));
         return result;
     }
 }

package/lib/commands/force/package/beta/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/commands/force/package/beta/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAAgH;AAEhH,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,CAAC;AACzF,MAAM,aAAa,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,CAAC;AAE9F,MAAa,oBAAqB,SAAQ,qBAAW;IA6B5C,KAAK,CAAC,GAAG;QACd,MAAM,GAAG,GAAG,IAAI,mBAAO,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACrE,MAAM,EAAE,GAAG,IAAA,iCAAqB,EAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACnE,IAAA,sBAAU,EAAC,oBAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAEpC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;YAC9B,EAAE,EAAE,EAAE;YACN,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAc;YAC/B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAqB;YAC7C,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,yBAAmC;SACrE,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAElD,OAAO,MAAM,CAAC;IAChB,CAAC;;AA5CH,oDA6CC;AA5CwB,gCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,6BAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,2CAAsB,GAAG,IAAI,CAAC;AAC9B,oCAAe,GAAG,IAAI,CAAC;AACvB,gCAAW,GAAgB;IAChD,OAAO,EAAE,eAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QAC3C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QACnD,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,IAAI,EAAE,eAAK,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QACxC,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;KACjD,CAAC;IACF,WAAW,EAAE,eAAK,CAAC,MAAM,CAAC;QACxB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAC/C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC;KACxD,CAAC;IACF,yBAAyB,EAAE,eAAK,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,2BAA2B,CAAC;QAClE,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,+BAA+B,CAAC;KAC3E,CAAC;CACH,CAAC"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/commands/force/package/beta/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAAmE;AAEnE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,CAAC;AACzF,MAAM,aAAa,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,gBAAgB,CAAC,CAAC;AAE9F,MAAa,oBAAqB,SAAQ,qBAAW;IA6B5C,KAAK,CAAC,GAAG;QACd,MAAM,GAAG,GAAG,IAAI,mBAAO,CAAC;YACtB,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,OAAiB;YAC9C,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACvC,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;YAC9B,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAc;YAC/B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAqB;YAC7C,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,yBAAmC;SACrE,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC;IAChB,CAAC;;AA9CH,oDA+CC;AA9CwB,gCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,6BAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,2CAAsB,GAAG,IAAI,CAAC;AAC9B,oCAAe,GAAG,IAAI,CAAC;AACvB,gCAAW,GAAgB;IAChD,OAAO,EAAE,eAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC;QAC3C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QACnD,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,IAAI,EAAE,eAAK,CAAC,MAAM,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QACxC,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;KACjD,CAAC;IACF,WAAW,EAAE,eAAK,CAAC,MAAM,CAAC;QACxB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAC/C,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC;KACxD,CAAC;IACF,yBAAyB,EAAE,eAAK,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,2BAA2B,CAAC;QAClE,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,+BAA+B,CAAC;KAC3E,CAAC;CACH,CAAC"}

package/lib/commands/force/package/beta/version/create/list.js

@@ -18,7 +18,7 @@ const packaging = core_1.Messages.loadMessages('@salesforce/plugin-packaging', '
 class PackageVersionCreateListCommand extends command_1.SfdxCommand {
     async run() {
         const connection = this.hubOrg.getConnection();
-        const results = await packaging_1.PackageVersion.createdList(connection, { ...this.flags });
+        const results = await packaging_1.PackageVersion.getPackageVersionCreateRequests(connection, { ...this.flags });
         if (results.length === 0) {
             this.ux.log('No results found');
         }

package/lib/commands/force/package/beta/version/create/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../../../src/commands/force/package/beta/version/create/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAA0F;AAC1F,+BAA+B;AAE/B,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,6BAA6B,CAAC,CAAC;AACtG,MAAM,SAAS,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,WAAW,CAAC,CAAC;AAErF,MAAa,+BAAgC,SAAQ,qBAAW;IAkBvD,KAAK,CAAC,GAAG;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,0BAAc,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEhF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;SACjC;aAAM;YACL,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,qCAAqC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACzF,MAAM,UAAU,GAAG;gBACjB,EAAE,EAAE,EAAE;gBACN,MAAM,EAAE;oBACN,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC;iBACtC;gBACD,UAAU,EAAE;oBACV,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;iBACzC;gBACD,iBAAiB,EAAE;oBACjB,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC;iBAChD;gBACD,0BAA0B,EAAE;oBAC1B,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;iBAC1D;gBACD,GAAG,EAAE;oBACH,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;iBACnC;gBACD,MAAM,EAAE;oBACN,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC;iBACtC;gBACD,WAAW,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE;gBACvC,SAAS,EAAE;oBACT,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;iBACzC;aACF,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SAC7D;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;;AAvDH,0EAwDC;AAvDwB,2CAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,wCAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,sDAAsB,GAAG,IAAI,CAAC;AAC9B,2CAAW,GAAgB;IAChD,eAAe,EAAE,eAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,4BAA4B,CAAC;QAC/D,eAAe,EAAE,SAAS,CAAC,UAAU,CAAC,gCAAgC,CAAC;KACxE,CAAC;IACF,MAAM,EAAE,eAAK,CAAC,IAAI,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACrD,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QAC7D,OAAO,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC;KACtD,CAAC;CACH,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../../../src/commands/force/package/beta/version/create/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAA4C;AAC5C,qDAA0F;AAC1F,+BAA+B;AAE/B,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,6BAA6B,CAAC,CAAC;AACtG,MAAM,SAAS,GAAG,eAAQ,CAAC,YAAY,CAAC,8BAA8B,EAAE,WAAW,CAAC,CAAC;AAErF,MAAa,+BAAgC,SAAQ,qBAAW;IAkBvD,KAAK,CAAC,GAAG;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,0BAAc,CAAC,+BAA+B,CAAC,UAAU,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEpG,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;SACjC;aAAM;YACL,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,qCAAqC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACzF,MAAM,UAAU,GAAG;gBACjB,EAAE,EAAE,EAAE;gBACN,MAAM,EAAE;oBACN,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC;iBACtC;gBACD,UAAU,EAAE;oBACV,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;iBACzC;gBACD,iBAAiB,EAAE;oBACjB,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC;iBAChD;gBACD,0BAA0B,EAAE;oBAC1B,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;iBAC1D;gBACD,GAAG,EAAE;oBACH,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC;iBACnC;gBACD,MAAM,EAAE;oBACN,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC;iBACtC;gBACD,WAAW,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE;gBACvC,SAAS,EAAE;oBACT,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;iBACzC;aACF,CAAC;YACF,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SAC7D;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;;AAvDH,0EAwDC;AAvDwB,2CAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;AACpD,wCAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;AACzD,sDAAsB,GAAG,IAAI,CAAC;AAC9B,2CAAW,GAAgB;IAChD,eAAe,EAAE,eAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,4BAA4B,CAAC;QAC/D,eAAe,EAAE,SAAS,CAAC,UAAU,CAAC,gCAAgC,CAAC;KACxE,CAAC;IACF,MAAM,EAAE,eAAK,CAAC,IAAI,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACrD,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QAC7D,OAAO,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC;KACtD,CAAC;CACH,CAAC"}

package/lib/commands/force/package/beta/version/list.js

@@ -19,7 +19,7 @@ class PackageVersionListCommand extends command_1.SfdxCommand {
         var _a;
         const connection = this.hubOrg.getConnection();
         const project = core_1.SfProject.getInstance();
-        const records = await packaging_1.PackageVersion.list(connection, project, {
+        const records = await packaging_1.Package.listVersions(connection, project, {
             createdLastDays: this.flags.createdlastdays,
             concise: this.flags.concise,
             modifiedLastDays: this.flags.modifiedlastdays,