@salesforce/analytics 1.3.18 → 1.4.0

package/lib/commands/analytics/lens/history/list.js

@@ -1,48 +1,47 @@
-"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 lens_1 = __importDefault(require("../../../../lib/analytics/lens/lens"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'history');
-class List extends command_1.SfdxCommand {
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import Lens from '../../../../lib/analytics/lens/lens.js';
+import { generateTableColumns } from '../../../../lib/analytics/utils.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'history');
+export default class List extends SfCommand {
+    static summary = messages.getMessage('listLensHistoryCommandDescription');
+    static description = messages.getMessage('listLensHistoryCommandLongDescription');
+    static examples = ['$ sfdx analytics:lens:history:list --lensid <lensid> '];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        lensid: Flags.salesforceId({
+            char: 'i',
+            required: true,
+            summary: messages.getMessage('lensidFlagDescription'),
+            description: messages.getMessage('lensidFlagLongDescription'),
+        }),
+    };
     async run() {
-        const lens = new lens_1.default(this.org);
-        const lensId = this.flags.lensid;
-        const histories = ((await lens.getHistories(lensId)) || []).map(history => ({
+        const { flags } = await this.parse(List);
+        const lens = new Lens(flags['target-org'].getConnection(flags['api-version']));
+        const lensId = flags.lensid;
+        const histories = ((await lens.getHistories(lensId)) || []).map((history) => ({
             historyid: history.id,
             lensid: lensId,
             name: history.name,
-            label: history.label
+            label: history.label,
         }));
-        if (histories.length) {
-            this.ux.styledHeader(messages.getMessage('lensHistoriesFound', [histories.length]));
+        if (histories.length > 0) {
+            this.styledHeader(messages.getMessage('lensHistoriesFound', [histories.length]));
+            this.table(histories, generateTableColumns(['historyid', 'lensid', 'name', 'label']));
+        }
+        else {
+            this.log(messages.getMessage('noResultsFound'));
         }
         return histories;
     }
 }
-exports.default = List;
-List.description = messages.getMessage('listLensHistoryCommandDescription');
-List.longDescription = messages.getMessage('listLensHistoryCommandLongDescription');
-List.examples = ['$ sfdx analytics:lens:history:list --lensid <lensid> '];
-List.flagsConfig = {
-    lensid: command_1.flags.id({
-        char: 'i',
-        required: true,
-        description: messages.getMessage('lensidFlagDescription'),
-        longDescription: messages.getMessage('lensidFlagLongDescription')
-    })
-};
-List.requiresUsername = true;
-List.requiresProject = false;
-List.tableColumnData = ['historyid', 'lensid', 'name', 'label'];
 //# sourceMappingURL=list.js.map

package/lib/commands/analytics/lens/history/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/commands/analytics/lens/history/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAEH,iDAAyD;AACzD,2CAAiD;AAEjD,+EAAuD;AAEvD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;AAE3E,MAAqB,IAAK,SAAQ,qBAAW;IAoBpC,KAAK,CAAC,GAAG;QACd,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,IAAI,CAAC,GAAU,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAgB,CAAC;QAC3C,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC1E,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC,CAAC;QACJ,IAAI,SAAS,CAAC,MAAM,EAAE;YACpB,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACrF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;;AAjCH,uBAkCC;AAjCe,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,mCAAmC,CAAC,CAAC;AACvE,oBAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,uCAAuC,CAAC,CAAC;AAE/E,aAAQ,GAAG,CAAC,uDAAuD,CAAC,CAAC;AAElE,gBAAW,GAAG;IAC7B,MAAM,EAAE,eAAK,CAAC,EAAE,CAAC;QACf,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACzD,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;KAClE,CAAC;CACH,CAAC;AAEe,qBAAgB,GAAG,IAAI,CAAC;AACxB,oBAAe,GAAG,KAAK,CAAC;AAExB,oBAAe,GAAG,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/commands/analytics/lens/history/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,IAAI,MAAM,wCAAwC,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAE1E,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,SAEjC;IACQ,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,mCAAmC,CAAC,CAAC;IACnF,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,uCAAuC,CAAC,CAAC;IAE3F,MAAM,CAAU,QAAQ,GAAG,CAAC,uDAAuD,CAAC,CAAC;IAErF,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,+BAA+B;QAC7C,aAAa,EAAE,iCAAiC;QAChD,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC;YACzB,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;YACrD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;SAC9D,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAC/E,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC5E,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;SACrB,CAAC,CAAC,CAAC;QACJ,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjF,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACxF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC"}

package/lib/commands/analytics/lens/history/revert.d.ts

@@ -1,14 +1,14 @@
-import { flags, SfdxCommand } from '@salesforce/command';
-export default class Revert extends SfdxCommand {
-    static description: string;
-    static longDescription: string;
-    static examples: string[];
-    protected static flagsConfig: {
-        lensid: flags.Discriminated<flags.String>;
-        historyid: flags.Discriminated<flags.String>;
-        label: flags.Discriminated<flags.String>;
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export default class Revert extends SfCommand<string | undefined> {
+    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>;
+        lensid: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        historyid: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        label: 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;
     run(): Promise<string | undefined>;
 }

package/lib/commands/analytics/lens/history/revert.js

@@ -1,56 +1,51 @@
-"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 lens_1 = __importDefault(require("../../../../lib/analytics/lens/lens"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'history');
-class Revert extends command_1.SfdxCommand {
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import Lens from '../../../../lib/analytics/lens/lens.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'history');
+export default class Revert extends SfCommand {
+    static summary = messages.getMessage('revertCommandDescription');
+    static description = messages.getMessage('revertCommandLongDescription');
+    static examples = [
+        '$ sfdx analytics:dashboard:history:revert -i <dashboardid> -y <historyid> -l <historyLabel> ',
+    ];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        lensid: Flags.salesforceId({
+            char: 'i',
+            required: true,
+            summary: messages.getMessage('dashboardidFlagDescription'),
+            description: messages.getMessage('dashboardidFlagLongDescription'),
+        }),
+        historyid: Flags.salesforceId({
+            char: 'y',
+            required: true,
+            summary: messages.getMessage('dashboardHistoryidFlagDescription'),
+            description: messages.getMessage('dashboardHistoryidFlagLongDescription'),
+        }),
+        label: Flags.string({
+            char: 'l',
+            summary: messages.getMessage('revertLabelFlagDescription'),
+            description: messages.getMessage('revertLabelFlagLongDescription'),
+        }),
+    };
     async run() {
-        const lensId = this.flags.lensid;
-        const lensHistoryId = this.flags.historyid;
-        const lensHistoryLabel = this.flags.label;
-        const lens = new lens_1.default(this.org);
+        const { flags } = await this.parse(Revert);
+        const lensId = flags.lensid;
+        const lensHistoryId = flags.historyid;
+        const lensHistoryLabel = flags.label;
+        const lens = new Lens(flags['target-org'].getConnection(flags['api-version']));
         const id = await lens.revertToHistory(lensId, lensHistoryId, lensHistoryLabel);
         const message = messages.getMessage('revertSuccess', [id, lensHistoryId]);
-        this.ux.log(message);
+        this.log(message);
         return id;
     }
 }
-exports.default = Revert;
-Revert.description = messages.getMessage('revertCommandDescription');
-Revert.longDescription = messages.getMessage('revertCommandLongDescription');
-Revert.examples = [
-    '$ sfdx analytics:dashboard:history:revert -i <dashboardid> -y <historyid> -l <historyLabel> '
-];
-Revert.flagsConfig = {
-    lensid: command_1.flags.id({
-        char: 'i',
-        required: true,
-        description: messages.getMessage('dashboardidFlagDescription'),
-        longDescription: messages.getMessage('dashboardidFlagLongDescription')
-    }),
-    historyid: command_1.flags.id({
-        char: 'y',
-        required: true,
-        description: messages.getMessage('dashboardHistoryidFlagDescription'),
-        longDescription: messages.getMessage('dashboardHistoryidFlagLongDescription')
-    }),
-    label: command_1.flags.string({
-        char: 'l',
-        description: messages.getMessage('revertLabelFlagDescription'),
-        longDescription: messages.getMessage('revertLabelFlagLongDescription')
-    })
-};
-Revert.requiresUsername = true;
-Revert.requiresProject = false;
 //# sourceMappingURL=revert.js.map

package/lib/commands/analytics/lens/history/revert.js.map

@@ -1 +1 @@
-{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../../../src/commands/analytics/lens/history/revert.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAEH,iDAAyD;AACzD,2CAAiD;AACjD,+EAAuD;AAEvD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;AAE3E,MAAqB,MAAO,SAAQ,qBAAW;IA+BtC,KAAK,CAAC,GAAG;QACd,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAgB,CAAC;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,SAAmB,CAAC;QACrD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,KAA2B,CAAC;QAChE,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,IAAI,CAAC,GAAU,CAAC,CAAC;QAEvC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;;AAzCH,yBA0CC;AAzCe,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC,CAAC;AAC9D,sBAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC;AAEtE,eAAQ,GAAG;IACvB,8FAA8F;CAC/F,CAAC;AAEe,kBAAW,GAAG;IAC7B,MAAM,EAAE,eAAK,CAAC,EAAE,CAAC;QACf,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;QAC9D,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC;KACvE,CAAC;IACF,SAAS,EAAE,eAAK,CAAC,EAAE,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,mCAAmC,CAAC;QACrE,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,uCAAuC,CAAC;KAC9E,CAAC;IACF,KAAK,EAAE,eAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;QAC9D,eAAe,EAAE,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC;KACvE,CAAC;CACH,CAAC;AAEe,uBAAgB,GAAG,IAAI,CAAC;AACxB,sBAAe,GAAG,KAAK,CAAC"}
+{"version":3,"file":"revert.js","sourceRoot":"","sources":["../../../../../src/commands/analytics/lens/history/revert.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;AAC5C,OAAO,IAAI,MAAM,wCAAwC,CAAC;AAE1D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,SAA6B;IACxD,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;QAChC,8FAA8F;KAC/F,CAAC;IAEK,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,+BAA+B;QAC7C,aAAa,EAAE,iCAAiC;QAChD,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC;YACzB,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;YAC1D,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC;SACnE,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC;YAC5B,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,mCAAmC,CAAC;YACjE,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,uCAAuC,CAAC;SAC1E,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;YAClB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;YAC1D,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC;SACnE,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC;QACtC,MAAM,gBAAgB,GAAG,KAAK,CAAC,KAAK,CAAC;QACrC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAE/E,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC"}

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

@@ -1,12 +1,17 @@
-import { SfdxCommand } from '@salesforce/command';
-export default class List extends SfdxCommand {
-    static description: string;
-    static longDescription: string;
-    static examples: string[];
-    protected static flagsConfig: {};
-    protected static requiresUsername: boolean;
-    protected static requiresProject: boolean;
-    protected static tableColumnData: string[];
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export default class List extends SfCommand<Array<{
+    lensid?: string;
+    name?: string;
+    namespace?: string;
+    label?: 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>;
+    };
     run(): Promise<{
         lensid: string | undefined;
         name: string | undefined;

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

@@ -1,40 +1,40 @@
-"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 lens_1 = __importDefault(require("../../../lib/analytics/lens/lens"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'lens');
-class List extends command_1.SfdxCommand {
+import { SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import Lens from '../../../lib/analytics/lens/lens.js';
+import { generateTableColumns } from '../../../lib/analytics/utils.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'lens');
+export default class List extends SfCommand {
+    static summary = messages.getMessage('listCommandDescription');
+    static description = messages.getMessage('listCommandLongDescription');
+    static examples = ['$ sfdx analytics:lens:list'];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+    };
     async run() {
-        const lensSvc = new lens_1.default(this.org);
-        const lenses = ((await lensSvc.list()) || []).map(lens => ({
+        const { flags } = await this.parse(List);
+        const lensSvc = new Lens(flags['target-org'].getConnection(flags['api-version']));
+        const lenses = ((await lensSvc.list()) || []).map((lens) => ({
             lensid: lens.id,
             name: lens.name,
             namespace: lens.namespace,
-            label: lens.label
+            label: lens.label,
         }));
-        if (lenses.length) {
-            this.ux.styledHeader(messages.getMessage('lensesFound', [lenses.length]));
+        if (lenses.length > 0) {
+            this.styledHeader(messages.getMessage('lensesFound', [lenses.length]));
+            this.table(lenses, generateTableColumns(['lensid', 'name', 'namespace', 'label']));
+        }
+        else {
+            this.log(messages.getMessage('noResultsFound'));
         }
         return lenses;
     }
 }
-exports.default = List;
-List.description = messages.getMessage('listCommandDescription');
-List.longDescription = messages.getMessage('listCommandLongDescription');
-List.examples = ['$ sfdx analytics:lens:list'];
-List.flagsConfig = {};
-List.requiresUsername = true;
-List.requiresProject = false;
-List.tableColumnData = ['lensid', 'name', 'label', 'namespace'];
 //# sourceMappingURL=list.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/analytics/lens/list.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAEH,iDAAkD;AAClD,2CAAiD;AAEjD,4EAAoD;AAEpD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AAExE,MAAqB,IAAK,SAAQ,qBAAW;IAapC,KAAK,CAAC,GAAG;QACd,MAAM,OAAO,GAAG,IAAI,cAAI,CAAC,IAAI,CAAC,GAAU,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzD,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC,CAAC;QACJ,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAC3E;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;;AAzBH,uBA0BC;AAzBe,gBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAC;AAC5D,oBAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC,CAAC;AAEpE,aAAQ,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAEvC,gBAAW,GAAG,EAAE,CAAC;AAEjB,qBAAgB,GAAG,IAAI,CAAC;AACxB,oBAAe,GAAG,KAAK,CAAC;AAExB,oBAAe,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/analytics/lens/list.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,SAAS,EACT,iCAAiC,EACjC,+BAA+B,GAChC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,IAAI,MAAM,qCAAqC,CAAC;AACvD,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,MAAM,CAAC,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,SAEjC;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,4BAA4B,CAAC,CAAC;IAE1D,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,+BAA+B;QAC7C,aAAa,EAAE,iCAAiC;KACjD,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAClF,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC3D,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC,CAAC;QACJ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACrF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC"}

package/lib/commands/analytics/query.d.ts

@@ -1,20 +1,21 @@
-import { flags, SfdxCommand } from '@salesforce/command';
-export default class Query extends SfdxCommand {
-    static description: string;
-    static longDescription: string;
-    static examples: string[];
-    protected static requiresUsername: boolean;
-    protected static requiresProject: boolean;
-    protected static flagsConfig: {
-        queryfile: flags.Discriminated<flags.String>;
-        query: flags.Discriminated<flags.String>;
-        nomapnames: flags.Discriminated<flags.Boolean<boolean>>;
-        sql: flags.Discriminated<flags.Boolean<boolean>>;
-        timezone: flags.Discriminated<flags.String>;
-        connector: flags.Discriminated<flags.String>;
-        dryrun: flags.Discriminated<flags.Boolean<boolean>>;
-        limit: flags.Discriminated<flags.Number>;
-        resultformat: flags.Discriminated<flags.Enum<string>>;
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { QueryResponse } from '../../lib/analytics/query/query.js';
+export default class Query extends SfCommand<QueryResponse | undefined> {
+    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>;
+        queryfile: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        query: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        nomapnames: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        sql: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        timezone: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        connector: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        dryrun: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        limit: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        resultformat: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
-    run(): Promise<import("../../lib/analytics/query/query").QueryResponse | undefined>;
+    run(): Promise<QueryResponse | undefined>;
 }

package/lib/commands/analytics/query.js

@@ -1,130 +1,104 @@
-"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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
-const path = __importStar(require("path"));
-const command_1 = require("@salesforce/command");
-const core_1 = require("@salesforce/core");
-const query_1 = __importStar(require("../../lib/analytics/query/query"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'query');
-class Query extends command_1.SfdxCommand {
+import * as path from 'node:path';
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages, SfError } from '@salesforce/core';
+import QuerySvc, { DRYRUN_FLAG, LIMIT_FLAG, RESULT_FORMAT_FLAG, } from '../../lib/analytics/query/query.js';
+import { commandUx, fs } from '../../lib/analytics/utils.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'query');
+export default class Query extends SfCommand {
+    static summary = messages.getMessage('queryCommandDescription');
+    static description = messages.getMessage('queryCommandLongDescription');
+    static examples = [
+        'sfdx analytics:query -f query.saql',
+        'sfdx analytics:query -f query.sql -t America/Denver',
+        'sfdx analytics:query -q "..." --sql --limit 10 -r csv',
+    ];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        queryfile: Flags.file({
+            char: 'f',
+            summary: messages.getMessage('queryfileDescription'),
+            description: messages.getMessage('queryfileLongDescription'),
+            exclusive: ['query'],
+        }),
+        query: Flags.string({
+            char: 'q',
+            summary: messages.getMessage('queryDescription'),
+            description: messages.getMessage('queryLongDescription'),
+            exclusive: ['queryfile'],
+        }),
+        nomapnames: Flags.boolean({
+            summary: messages.getMessage('nomapnamesDescription'),
+            description: messages.getMessage('nomapnamesLongDescription'),
+            default: false,
+        }),
+        sql: Flags.boolean({
+            summary: messages.getMessage('sqlDescription'),
+            description: messages.getMessage('sqlLongDescription'),
+            default: false,
+        }),
+        timezone: Flags.string({
+            char: 't',
+            summary: messages.getMessage('timezoneDescription'),
+            description: messages.getMessage('timezoneLongDescription'),
+        }),
+        connector: Flags.string({
+            summary: messages.getMessage('connectorDescription'),
+            description: messages.getMessage('connectorLongDescription'),
+        }),
+        dryrun: DRYRUN_FLAG,
+        limit: LIMIT_FLAG,
+        resultformat: RESULT_FORMAT_FLAG,
+    };
     async run() {
-        if (!this.flags.queryfile && !this.flags.query) {
-            throw new core_1.SfdxError(messages.getMessage('missingRequiredField'));
+        const { flags } = await this.parse(Query);
+        if (!flags.queryfile && !flags.query) {
+            throw new SfError(messages.getMessage('missingRequiredField'));
         }
-        let queryStr = this.flags.queryfile
-            ? await fs_1.promises.readFile(this.flags.queryfile, 'utf8')
-            : this.flags.query;
-        const querySvc = new query_1.default(this.org.getConnection());
+        let queryStr = flags.queryfile ? await fs.readFile(flags.queryfile) : flags.query;
+        const querySvc = new QuerySvc(flags['target-org'].getConnection(flags['api-version']));
+        const ux = commandUx(this);
         const options = {
-            ux: !this.flags.json ? this.ux : undefined,
-            limit: this.flags.limit,
-            resultformat: this.flags.resultformat,
-            dryrun: !!this.flags.dryrun
+            ux,
+            limit: flags.limit,
+            resultformat: flags.resultformat,
+            dryrun: !!flags.dryrun,
         };
-        if (this.flags.connector) {
+        if (flags.connector) {
             // Live Dataset query
-            this.debug(`POSTING query to connector ${this.flags.connector}: ${queryStr}`);
-            return querySvc.runExternalQueryCommand({ query: queryStr, connectorIdOrApiName: this.flags.connector }, options);
+            this.debug(`POSTING query to connector ${flags.connector}: ${queryStr}`);
+            return querySvc.runExternalQueryCommand({ query: queryStr, connectorIdOrApiName: flags.connector }, options);
         }
         else {
             // guess queryLanguage from file extension (assume saql) if --sql not specified
             let queryLanguage = 'Saql';
-            if (this.flags.sql) {
+            if (flags.sql) {
                 queryLanguage = 'Sql';
             }
-            else if (this.flags.queryfile) {
-                const ext = path.extname(this.flags.queryfile);
+            else if (flags.queryfile) {
+                const ext = path.extname(flags.queryfile);
                 if (ext.toLocaleLowerCase() === '.sql') {
                     queryLanguage = 'Sql';
                 }
             }
-            if (queryLanguage === 'Saql' && !this.flags.nomapnames) {
+            if (queryLanguage === 'Saql' && !flags.nomapnames) {
                 queryStr = await querySvc.mapDatasetNames(queryStr);
             }
             const query = {
                 query: queryStr,
                 queryLanguage,
-                timezone: this.flags.timezone
+                timezone: flags.timezone,
             };
             this.debug('POSTing query: ' + JSON.stringify(query, undefined, 2));
             return querySvc.runQueryCommand(query, options);
         }
     }
 }
-exports.default = Query;
-Query.description = messages.getMessage('queryCommandDescription');
-Query.longDescription = messages.getMessage('queryCommandLongDescription');
-Query.examples = [
-    'sfdx analytics:query -f query.saql',
-    'sfdx analytics:query -f query.sql -t America/Denver',
-    'sfdx analytics:query -q "..." --sql --limit 10 -r csv'
-];
-Query.requiresUsername = true;
-Query.requiresProject = false;
-Query.flagsConfig = {
-    queryfile: command_1.flags.filepath({
-        char: 'f',
-        description: messages.getMessage('queryfileDescription'),
-        longDescription: messages.getMessage('queryfileLongDescription'),
-        exclusive: ['query']
-    }),
-    query: command_1.flags.string({
-        char: 'q',
-        description: messages.getMessage('queryDescription'),
-        longDescription: messages.getMessage('queryLongDescription'),
-        exclusive: ['queryfile']
-    }),
-    nomapnames: command_1.flags.boolean({
-        description: messages.getMessage('nomapnamesDescription'),
-        longDescription: messages.getMessage('nomapnamesLongDescription'),
-        default: false
-    }),
-    sql: command_1.flags.boolean({
-        description: messages.getMessage('sqlDescription'),
-        longDescription: messages.getMessage('sqlLongDescription'),
-        default: false
-    }),
-    timezone: command_1.flags.string({
-        char: 't',
-        description: messages.getMessage('timezoneDescription'),
-        longDescription: messages.getMessage('timezoneLongDescription')
-    }),
-    connector: command_1.flags.string({
-        description: messages.getMessage('connectorDescription'),
-        longDescription: messages.getMessage('connectorLongDescription')
-    }),
-    dryrun: query_1.DRYRUN_FLAG,
-    limit: query_1.LIMIT_FLAG,
-    resultformat: query_1.RESULT_FORMAT_FLAG
-};
 //# sourceMappingURL=query.js.map