@salesforce/analytics 1.3.19 → 1.4.1

package/lib/commands/analytics/app/delete.js

@@ -1,56 +1,41 @@
-"use strict";
 /*
  * Copyright (c) 2021, 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
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@salesforce/command");
-const core_1 = require("@salesforce/core");
-const cli_ux_1 = require("cli-ux");
-const folder_1 = __importDefault(require("../../../lib/analytics/app/folder"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'app');
-class Delete extends command_1.SfdxCommand {
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import Folder from '../../../lib/analytics/app/folder.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'app');
+export default class Delete extends SfCommand {
+    static summary = messages.getMessage('deleteCommandDescription');
+    static description = messages.getMessage('deleteCommandLongDescription');
+    static examples = ['$ sfdx analytics:app:delete -f folderid'];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        folderid: Flags.salesforceId({
+            char: 'f',
+            required: true,
+            summary: messages.getMessage('folderidFlagDescription'),
+            description: messages.getMessage('folderidFlagLongDescription'),
+        }),
+        noprompt: Flags.boolean({
+            char: 'p',
+            summary: messages.getMessage('nopromptFlagDescription'),
+            description: messages.getMessage('nopromptFlagLongDescription'),
+        }),
+    };
     async run() {
-        if (this.flags.noprompt) {
-            await this.executeCommand();
+        const { flags } = await this.parse(Delete);
+        if (flags.noprompt || (await this.confirm({ message: messages.getMessage('confirmDeleteYesNo') }))) {
+            const folder = new Folder(flags['target-org'].getConnection(flags['api-version']));
+            await folder.deleteFolder(flags.folderid);
+            this.log(messages.getMessage('deleteAppSuccess', [flags.folderid]));
         }
-        else {
-            const answer = (await cli_ux_1.cli.prompt(messages.getMessage('confirmDeleteYesNo')));
-            if (answer.toUpperCase() === 'YES' || answer.toUpperCase() === 'Y') {
-                await this.executeCommand();
-            }
-        }
-        return this.flags.folderid;
-    }
-    async executeCommand() {
-        const folder = new folder_1.default(this.org);
-        await folder.deleteFolder(this.flags.folderid);
-        this.ux.log(messages.getMessage('deleteAppSuccess', [this.flags.folderid]));
+        return flags.folderid;
     }
 }
-exports.default = Delete;
-Delete.description = messages.getMessage('deleteCommandDescription');
-Delete.longDescription = messages.getMessage('deleteCommandLongDescription');
-Delete.examples = ['$ sfdx analytics:app:delete -f folderid'];
-Delete.flagsConfig = {
-    folderid: command_1.flags.id({
-        char: 'f',
-        required: true,
-        description: messages.getMessage('folderidFlagDescription'),
-        longDescription: messages.getMessage('folderidFlagLongDescription')
-    }),
-    noprompt: command_1.flags.boolean({
-        char: 'p',
-        description: messages.getMessage('nopromptFlagDescription'),
-        longDescription: messages.getMessage('nopromptFlagLongDescription')
-    })
-};
-Delete.requiresUsername = true;
-Delete.requiresProject = false;
 //# sourceMappingURL=delete.js.map

package/lib/commands/analytics/app/delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/commands/analytics/app/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAEH,iDAAyD;AACzD,2CAAiD;AACjD,mCAA6B;AAE7B,+EAAuD;AAEvD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;AAEvE,MAAqB,MAAO,SAAQ,qBAAW;IAuBtC,KAAK,CAAC,GAAG;QACd,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACvB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;SAC7B;aAAM;YACL,MAAM,MAAM,GAAG,CAAC,MAAM,YAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,CAAW,CAAC;YACvF,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,GAAG,EAAE;gBAClE,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;aAC7B;SACF;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAkB,CAAC;IACvC,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,IAAI,CAAC,GAAU,CAAC,CAAC;QAC3C,MAAM,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,QAAkB,CAAC,CAAC;QACzD,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC;;AAvCH,yBAwCC;AAvCe,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC;AAC9D,sBAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC;AAEtE,eAAQ,GAAG,CAAC,yCAAyC,CAAC,CAAC;AAEpD,kBAAW,GAAG;IAC7B,QAAQ,EAAE,eAAK,CAAC,EAAE,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAC3D,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;KACpE,CAAC;IACF,QAAQ,EAAE,eAAK,CAAC,OAAO,CAAC;QACtB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAC3D,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;KACpE,CAAC;CACH,CAAC;AAEe,uBAAgB,GAAG,IAAI,CAAC;AACxB,sBAAe,GAAG,KAAK,CAAC"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/commands/analytics/app/delete.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,EACL,SAAS,EACT,iCAAiC,EACjC,+BAA+B,GAChC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,MAAM,MAAM,sCAAsC,CAAC;AAE1D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;AAEvE,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,SAAiB;IAC5C,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC;IAC1E,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC;IAElF,MAAM,CAAU,QAAQ,GAAG,CAAC,yCAAyC,CAAC,CAAC;IAEvE,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,+BAA+B;QAC7C,aAAa,EAAE,iCAAiC;QAChD,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;YAC3B,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;YACvD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;SAChE,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;YACtB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;YACvD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;SAChE,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACnG,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YACnF,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC;IACxB,CAAC"}

package/lib/commands/analytics/app/display.d.ts

@@ -1,13 +1,14 @@
-import { flags, SfdxCommand } from '@salesforce/command';
-export default class Display extends SfdxCommand {
-    static description: string;
-    static longDescription: string;
-    static examples: string[];
-    protected static flagsConfig: {
-        folderid: flags.Discriminated<flags.String>;
-        applog: flags.Discriminated<flags.Boolean<boolean>>;
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { type AppFolder } from '../../../lib/analytics/app/folder.js';
+export default class Display extends SfCommand<AppFolder> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        folderid: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        applog: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
-    protected static requiresUsername: boolean;
-    protected static requiresProject: boolean;
-    run(): Promise<import("../../../lib/analytics/app/folder").AppFolder>;
+    run(): Promise<AppFolder>;
 }

package/lib/commands/analytics/app/display.js

@@ -1,21 +1,17 @@
-"use strict";
 /*
  * Copyright (c) 2019, 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
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@salesforce/command");
-const core_1 = require("@salesforce/core");
-const chalk_1 = __importDefault(require("chalk"));
-const moment = require("moment");
-const folder_1 = __importDefault(require("../../../lib/analytics/app/folder"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'app');
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import chalk from 'chalk';
+import moment from 'moment';
+import Folder from '../../../lib/analytics/app/folder.js';
+import { generateTableColumns } from '../../../lib/analytics/utils.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'app');
 function formatDate(s) {
     try {
         if (s) {
@@ -28,80 +24,70 @@ function formatDate(s) {
     return undefined;
 }
 function blue(s) {
-    return process.platform !== 'win32' ? chalk_1.default.blue(s) : s;
+    return process.platform !== 'win32' ? chalk.blue(s) : s;
 }
 function colorStatus(s) {
     if (s && process.platform !== 'win32') {
         if (s === 'failedstatus' || s === 'cancelledstatus') {
-            return chalk_1.default.red(s);
+            return chalk.red(s);
         }
         else if (s === 'completedstatus' || s === 'newstatus') {
-            return chalk_1.default.green(s);
+            return chalk.green(s);
         }
     }
     return s;
 }
-class Display extends command_1.SfdxCommand {
+export default class Display extends SfCommand {
+    static summary = messages.getMessage('displayCommandDescription');
+    static description = messages.getMessage('displayCommandLongDescription');
+    static examples = ['$ sfdx analytics:app:display -f folderId -a'];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        folderid: Flags.salesforceId({
+            char: 'f',
+            required: true,
+            summary: messages.getMessage('folderidFlagDescription'),
+            description: messages.getMessage('folderidFlagLongDescription'),
+        }),
+        applog: Flags.boolean({
+            char: 'a',
+            required: false,
+            default: false,
+            summary: messages.getMessage('applogFlagDescription'),
+            description: messages.getMessage('applogFlagLongDescription'),
+        }),
+    };
     async run() {
-        var _a, _b, _c;
-        const folder = new folder_1.default(this.org);
-        const app = await folder.fetch(this.flags.folderid, !!this.flags.applog);
+        const { flags } = await this.parse(Display);
+        const folder = new Folder(flags['target-org'].getConnection(flags['api-version']));
+        const app = await folder.fetch(flags.folderid, flags.applog);
         // force:org:display does a blue chalk on the headers, so do it here, too
-        this.ux.styledHeader(blue(messages.getMessage('displayDetailHeader')));
-        this.ux.table([
+        this.styledHeader(blue(messages.getMessage('displayDetailHeader')));
+        this.table([
             { key: 'Name', value: app.name },
             { key: 'Label', value: app.label },
             { key: 'Status', value: colorStatus(app.applicationStatus) },
             { key: 'Id', value: app.id },
-            { key: 'Created By', value: (_a = app.createdBy) === null || _a === void 0 ? void 0 : _a.name },
+            { key: 'Created By', value: app.createdBy?.name },
             { key: 'Created Date', value: formatDate(app.createdDate) },
-            { key: 'Last Modified By', value: (_b = app.lastModifiedBy) === null || _b === void 0 ? void 0 : _b.name },
+            { key: 'Last Modified By', value: app.lastModifiedBy?.name },
             { key: 'Last Modified Date', value: formatDate(app.lastModifiedDate) },
             { key: 'Template Source Id', value: app.templateSourceId },
             { key: 'Template Version', value: app.templateVersion },
-            { key: 'Namespace', value: app.namespace }
-        ], {
-            columns: [
-                { key: 'key', label: 'Key' },
-                { key: 'value', label: 'Value' }
-            ]
-        });
-        if (this.flags.applog) {
-            this.ux.styledHeader(blue(messages.getMessage('displayLogHeader')));
+            { key: 'Namespace', value: app.namespace },
+        ], generateTableColumns(['key', 'value']));
+        if (flags.applog) {
+            this.styledHeader(blue(messages.getMessage('displayLogHeader')));
             if (!app.appLog || !Array.isArray(app.appLog) || app.appLog.length <= 0) {
-                this.ux.log(messages.getMessage('displayNoLogAvailable'));
+                this.log(messages.getMessage('displayNoLogAvailable'));
             }
             else {
-                const data = (_c = app.appLog) === null || _c === void 0 ? void 0 : _c.map(line => {
-                    return { message: (line === null || line === void 0 ? void 0 : line.message) || line || '' };
-                });
-                this.ux.table(data, {
-                    columns: [{ key: 'message', label: 'Message' }]
-                });
+                const data = app.appLog?.map((line) => ({ message: (line?.message ?? line) || '' }));
+                this.table(data, generateTableColumns(['message']));
             }
         }
         return app;
     }
 }
-exports.default = Display;
-Display.description = messages.getMessage('displayCommandDescription');
-Display.longDescription = messages.getMessage('displayCommandLongDescription');
-Display.examples = ['$ sfdx analytics:app:display -f folderId -a'];
-Display.flagsConfig = {
-    folderid: command_1.flags.id({
-        char: 'f',
-        required: true,
-        description: messages.getMessage('folderidFlagDescription'),
-        longDescription: messages.getMessage('folderidFlagLongDescription')
-    }),
-    applog: command_1.flags.boolean({
-        char: 'a',
-        required: false,
-        default: false,
-        description: messages.getMessage('applogFlagDescription'),
-        longDescription: messages.getMessage('applogFlagLongDescription')
-    })
-};
-Display.requiresUsername = true;
-Display.requiresProject = false;
 //# sourceMappingURL=display.js.map

package/lib/commands/analytics/app/display.js.map

@@ -1 +1 @@
-{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../src/commands/analytics/app/display.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAEH,iDAAyD;AACzD,2CAAiD;AACjD,kDAA0B;AAC1B,iCAAkC;AAElC,+EAAsE;AAEtE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;AAEvE,SAAS,UAAU,CAAC,CAAqB;IACvC,IAAI;QACF,IAAI,CAAC,EAAE;YACL,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC;SACnE;KACF;IAAC,OAAO,CAAC,EAAE;QACV,kCAAkC;KACnC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,IAAI,CAAC,CAAS;IACrB,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,eAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,WAAW,CAAC,CAAwB;IAC3C,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;QACrC,IAAI,CAAC,KAAK,cAAc,IAAI,CAAC,KAAK,iBAAiB,EAAE;YACnD,OAAO,eAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACrB;aAAM,IAAI,CAAC,KAAK,iBAAiB,IAAI,CAAC,KAAK,WAAW,EAAE;YACvD,OAAO,eAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACvB;KACF;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAqB,OAAQ,SAAQ,qBAAW;IAyBvC,KAAK,CAAC,GAAG;;QACd,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,IAAI,CAAC,GAAU,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEnF,yEAAyE;QACzE,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,EAAE,CAAC,KAAK,CACX;YACE,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE;YAChC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE;YAClC,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;YAC5D,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE;YAC5B,EAAE,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAA,GAAG,CAAC,SAAS,0CAAE,IAAI,EAAE;YACjD,EAAE,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YAC3D,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAA,GAAG,CAAC,cAAc,0CAAE,IAAI,EAAE;YAC5D,EAAE,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;YACtE,EAAE,GAAG,EAAE,oBAAoB,EAAE,KAAK,EAAE,GAAG,CAAC,gBAAgB,EAAE;YAC1D,EAAE,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE;YACvD,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE;SAC3C,EACD;YACE,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE;gBAC5B,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;aACjC;SACF,CACF,CAAC;QAEF,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACrB,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC;YACpE,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;gBACvE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC;aAC3D;iBAAM;gBACL,MAAM,IAAI,GAAG,MAAA,GAAG,CAAC,MAAM,0CAAE,GAAG,CAAC,IAAI,CAAC,EAAE;oBAClC,OAAO,EAAE,OAAO,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,KAAI,IAAI,IAAI,EAAE,EAAE,CAAC;gBAClD,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE;oBAClB,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;iBAChD,CAAC,CAAC;aACJ;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC;;AAnEH,0BAoEC;AAnEe,mBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC;AAC/D,uBAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC,CAAC;AAEvE,gBAAQ,GAAG,CAAC,6CAA6C,CAAC,CAAC;AAExD,mBAAW,GAAG;IAC7B,QAAQ,EAAE,eAAK,CAAC,EAAE,CAAC;QACjB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAC3D,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;KACpE,CAAC;IACF,MAAM,EAAE,eAAK,CAAC,OAAO,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACzD,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;KAClE,CAAC;CACH,CAAC;AAEe,wBAAgB,GAAG,IAAI,CAAC;AACxB,uBAAe,GAAG,KAAK,CAAC"}
+{"version":3,"file":"display.js","sourceRoot":"","sources":["../../../../src/commands/analytics/app/display.ts"],"names":[],"mappings":"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"}

package/lib/commands/analytics/app/list.d.ts

@@ -1,20 +1,27 @@
-import { flags, SfdxCommand } from '@salesforce/command';
-export default class List extends SfdxCommand {
-    static description: string;
-    static longDescription: string;
-    static examples: string[];
-    protected static flagsConfig: {
-        folderid: flags.Discriminated<flags.String>;
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { type AppStatus } from '../../../lib/analytics/app/folder.js';
+export default class List extends SfCommand<Array<{
+    name?: string;
+    label?: string;
+    folderid?: string;
+    status?: AppStatus | string;
+    templateSourceId?: string;
+    namespace?: string;
+}>> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        folderid: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
-    protected static requiresUsername: boolean;
-    protected static requiresProject: boolean;
-    protected static tableColumnData: string[];
     run(): Promise<{
         name: string | undefined;
         label: string | undefined;
         folderid: string;
-        status: import("../../../lib/analytics/app/folder").AppStatus | undefined;
-        templateSourceId: string | null | undefined;
-        namespace: unknown;
+        status: AppStatus | undefined;
+        templateSourceId: string | undefined;
+        namespace: string | undefined;
     }[]>;
 }

package/lib/commands/analytics/app/list.js

@@ -1,52 +1,50 @@
-"use strict";
 /*
  * Copyright (c) 2021, 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
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
-const command_1 = require("@salesforce/command");
-const core_1 = require("@salesforce/core");
-const folder_1 = __importDefault(require("../../../lib/analytics/app/folder"));
-core_1.Messages.importMessagesDirectory((0, path_1.join)(__dirname, '..', '..', '..', '..'));
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'app');
-class List extends command_1.SfdxCommand {
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import Folder from '../../../lib/analytics/app/folder.js';
+import { generateTableColumns } from '../../../lib/analytics/utils.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'app');
+export default class List extends SfCommand {
+    static summary = messages.getMessage('listCommandDescription');
+    static description = messages.getMessage('listCommandLongDescription');
+    static examples = ['$ sfdx analytics:app:list'];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        folderid: Flags.string({
+            char: 'f',
+            summary: messages.getMessage('folderidFlagDescription'),
+            description: messages.getMessage('folderidFlagLongDescription'),
+        }),
+    };
     async run() {
-        const folderSvc = new folder_1.default(this.org);
-        const folderid = this.flags.folderid;
+        const { flags } = await this.parse(List);
+        const folderSvc = new Folder(flags['target-org'].getConnection(flags['api-version']));
+        const folderid = flags.folderid;
         const folders = ((await folderSvc.list()) || [])
-            .filter(folder => !folderid || folder.id === folderid)
-            .map(folder => ({
+            .filter((folder) => !folderid || folder.id === folderid)
+            .map((folder) => ({
             name: folder.name,
             label: folder.label,
             folderid: folder.id,
             status: folder.applicationStatus,
-            templateSourceId: folder.templateSourceId !== null ? folder.templateSourceId : null,
-            namespace: folder.namespace
+            templateSourceId: folder.templateSourceId,
+            namespace: folder.namespace,
         }));
         if (folders.length > 0) {
-            this.ux.styledHeader(messages.getMessage('appsFound', [folders.length]));
+            this.styledHeader(messages.getMessage('appsFound', [folders.length]));
+            this.table(folders, generateTableColumns(['name', 'label', 'folderid', 'status', 'templateSourceId', 'namespace']));
+        }
+        else {
+            this.log(messages.getMessage('noResultsFound'));
         }
         return folders;
     }
 }
-exports.default = List;
-List.description = messages.getMessage('listCommandDescription');
-List.longDescription = messages.getMessage('listCommandLongDescription');
-List.examples = ['$ sfdx analytics:app:list'];
-List.flagsConfig = {
-    folderid: command_1.flags.string({
-        char: 'f',
-        description: messages.getMessage('folderidFlagDescription'),
-        longDescription: messages.getMessage('folderidFlagLongDescription')
-    })
-};
-List.requiresUsername = true;
-List.requiresProject = false;
-List.tableColumnData = ['name', 'label', 'folderid', 'status', 'templateSourceId', 'namespace'];
 //# sourceMappingURL=list.js.map

package/lib/commands/analytics/app/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/analytics/app/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAEH,+BAA4B;AAC5B,iDAAyD;AACzD,2CAAiD;AAEjD,+EAAuD;AAEvD,eAAQ,CAAC,uBAAuB,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAC1E,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;AAEvE,MAAqB,IAAK,SAAQ,qBAAW;IAmBpC,KAAK,CAAC,GAAG;QACd,MAAM,SAAS,GAAG,IAAI,gBAAM,CAAC,IAAI,CAAC,GAAU,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAkB,CAAC;QAC/C,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;aAC7C,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC;aACrD,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACd,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,MAAM,EAAE,MAAM,CAAC,iBAAiB;YAChC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI;YACnF,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC,CAAC;QACN,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAC1E;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;;AApCH,uBAqCC;AApCe,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;AAC5D,oBAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;AAEpE,aAAQ,GAAG,CAAC,2BAA2B,CAAC,CAAC;AAEtC,gBAAW,GAAG;IAC7B,QAAQ,EAAE,eAAK,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;QAC3D,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;KACpE,CAAC;CACH,CAAC;AAEe,qBAAgB,GAAG,IAAI,CAAC;AACxB,oBAAe,GAAG,KAAK,CAAC;AAExB,oBAAe,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/analytics/app/list.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,KAAK,EACL,SAAS,EACT,iCAAiC,EACjC,+BAA+B,GAChC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,MAA0B,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;AAEvE,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,SAUjC;IACQ,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;IACxE,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;IAEhF,MAAM,CAAU,QAAQ,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAEzD,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,+BAA+B;QAC7C,aAAa,EAAE,iCAAiC;QAChD,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC;YACrB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;YACvD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,6BAA6B,CAAC;SAChE,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtF,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAChC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;aAC7C,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,QAAQ,IAAI,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC;aACvD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,MAAM,EAAE,MAAM,CAAC,iBAAiB;YAChC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC,CAAC,CAAC;QACN,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACtE,IAAI,CAAC,KAAK,CACR,OAAO,EACP,oBAAoB,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,CAAC,CAAC,CAC/F,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC"}

package/lib/commands/analytics/app/update.d.ts

@@ -1,22 +1,26 @@
-import { flags, SfdxCommand } from '@salesforce/command';
-export default class Update extends SfdxCommand {
-    static description: string;
-    static longDescription: string;
-    static examples: string[];
-    protected static flagsConfig: {
-        templateid: flags.Discriminated<flags.String>;
-        folderid: flags.Discriminated<flags.String>;
-        async: flags.Discriminated<flags.Boolean<boolean>>;
-        allevents: flags.Discriminated<flags.Boolean<boolean>>;
-        wait: flags.Discriminated<flags.Number>;
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { type StreamingResult } from '../../../lib/analytics/event/appStreaming.js';
+export default class Update extends SfCommand<{
+    id?: string;
+    events?: StreamingResult[];
+}> {
+    static readonly summary: string;
+    static readonly description: string;
+    static readonly examples: string[];
+    static readonly flags: {
+        'target-org': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        'api-version': import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        templateid: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        folderid: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        async: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        allevents: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        wait: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
-    protected static requiresUsername: boolean;
-    protected static requiresProject: boolean;
     run(): Promise<{
         id: string | undefined;
         events?: undefined;
     } | {
         id: string;
-        events: import("../../../lib/analytics/event/appStreaming").StreamingResult[];
+        events: StreamingResult[];
     }>;
 }

package/lib/commands/analytics/app/update.js

@@ -1,72 +1,69 @@
-"use strict";
 /*
  * Copyright (c) 2021, 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
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@salesforce/command");
-const core_1 = require("@salesforce/core");
-const constants_1 = require("../../../lib/analytics/constants");
-const appStreaming_1 = __importDefault(require("../../../lib/analytics/event/appStreaming"));
-const folder_1 = __importDefault(require("../../../lib/analytics/app/folder"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'app');
-class Update extends command_1.SfdxCommand {
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import { DEF_APP_CREATE_UPDATE_TIMEOUT } from '../../../lib/analytics/constants.js';
+import AppStreaming from '../../../lib/analytics/event/appStreaming.js';
+import Folder from '../../../lib/analytics/app/folder.js';
+import { commandUx } from '../../../lib/analytics/utils.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'app');
+export default class Update extends SfCommand {
+    static summary = messages.getMessage('updateCommandDescription');
+    static description = messages.getMessage('updateCommandLongDescription');
+    static examples = ['$ sfdx analytics:app:update -f folderId -t templateId'];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        templateid: Flags.string({
+            char: 't',
+            required: true,
+            summary: messages.getMessage('templateidForUpdateFlagDescription'),
+            description: messages.getMessage('templateidForUpdateFlagLongDescription'),
+        }),
+        folderid: Flags.salesforceId({
+            char: 'f',
+            required: true,
+            summary: messages.getMessage('folderidFlagDescription'),
+            description: messages.getMessage('folderidFlagLongDescription'),
+        }),
+        async: Flags.boolean({
+            char: 'a',
+            summary: messages.getMessage('appUpdateAsyncDescription'),
+            description: messages.getMessage('appUpdateAsyncLongDescription'),
+        }),
+        allevents: Flags.boolean({
+            char: 'v',
+            summary: messages.getMessage('appCreateAllEventsDescription'),
+            description: messages.getMessage('appCreateAllEventsLongDescription'),
+        }),
+        wait: Flags.integer({
+            char: 'w',
+            summary: messages.getMessage('streamingWaitDescription'),
+            description: messages.getMessage('streamingWaitLongDescription', [DEF_APP_CREATE_UPDATE_TIMEOUT]),
+            min: 0,
+            default: DEF_APP_CREATE_UPDATE_TIMEOUT,
+        }),
+    };
     async run() {
-        const folder = new folder_1.default(this.org);
-        const appStreaming = new appStreaming_1.default(this.org, this.flags.allEvents, this.flags.wait, this.ux);
-        if (this.flags.async || this.flags.wait <= 0) {
-            const waveAppId = await folder.update(this.flags.folderid, this.flags.templateid);
+        const { flags } = await this.parse(Update);
+        const folder = new Folder(flags['target-org'].getConnection(flags['api-version']));
+        if (flags.async || flags.wait <= 0) {
+            const waveAppId = await folder.update(flags.folderid, flags.templateid);
             // If error occurs here fails out in the update call and reports back, otherwise success
-            this.ux.log(messages.getMessage('updateSuccess', [waveAppId]));
+            this.log(messages.getMessage('updateSuccess', [waveAppId]));
             return { id: waveAppId };
         }
         else {
-            const waveAppId = await appStreaming.streamUpdateEvent(folder, this.flags.folderid, this.flags.templateid);
+            const ux = commandUx(this);
+            const appStreaming = new AppStreaming(flags['target-org'], flags.allevents, flags.wait, ux);
+            const waveAppId = await appStreaming.streamUpdateEvent(folder, flags.folderid, flags.templateid);
             return { id: waveAppId, events: appStreaming.getStreamingResults() };
         }
     }
 }
-exports.default = Update;
-Update.description = messages.getMessage('updateCommandDescription');
-Update.longDescription = messages.getMessage('updateCommandLongDescription');
-Update.examples = ['$ sfdx analytics:app:update -f folderId -t templateId'];
-Update.flagsConfig = {
-    templateid: command_1.flags.string({
-        char: 't',
-        required: true,
-        description: messages.getMessage('templateidForUpdateFlagDescription'),
-        longDescription: messages.getMessage('templateidForUpdateFlagLongDescription')
-    }),
-    folderid: command_1.flags.id({
-        char: 'f',
-        required: true,
-        description: messages.getMessage('folderidFlagDescription'),
-        longDescription: messages.getMessage('folderidFlagLongDescription')
-    }),
-    async: command_1.flags.boolean({
-        char: 'a',
-        description: messages.getMessage('appUpdateAsyncDescription'),
-        longDescription: messages.getMessage('appUpdateAsyncLongDescription')
-    }),
-    allevents: command_1.flags.boolean({
-        char: 'v',
-        description: messages.getMessage('appCreateAllEventsDescription'),
-        longDescription: messages.getMessage('appCreateAllEventsLongDescription')
-    }),
-    wait: command_1.flags.number({
-        char: 'w',
-        description: messages.getMessage('streamingWaitDescription'),
-        longDescription: messages.getMessage('streamingWaitLongDescription', [constants_1.DEF_APP_CREATE_UPDATE_TIMEOUT]),
-        min: 0,
-        default: constants_1.DEF_APP_CREATE_UPDATE_TIMEOUT
-    })
-};
-Update.requiresUsername = true;
-Update.requiresProject = false;
 //# sourceMappingURL=update.js.map