@salesforce/analytics 1.3.19 → 1.4.0

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

@@ -1,19 +1,22 @@
-import { flags, SfdxCommand, SfdxResult } 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>;
-        templatename: flags.Discriminated<flags.String>;
-        folderid: flags.Discriminated<flags.String>;
-        recipeids: flags.Discriminated<flags.Array<string>>;
-        datatransformids: flags.Discriminated<flags.Array<string>>;
-        assetversion: flags.Discriminated<flags.Number>;
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export default class Update extends SfCommand<Array<{
+    name?: string;
+    label?: string;
+    folderid: string;
+}> | 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>;
+        templateid: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        templatename: 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>;
+        recipeids: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        datatransformids: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        assetversion: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
-    protected static requiresUsername: boolean;
-    protected static requiresProject: boolean;
-    protected static result: SfdxResult;
     run(): Promise<string | {
         name: string | undefined;
         label: string | undefined;

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

@@ -1,124 +1,112 @@
-"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 folder_1 = __importDefault(require("../../../lib/analytics/app/folder"));
-const wavetemplate_1 = __importDefault(require("../../../lib/analytics/template/wavetemplate"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'template');
-class Update extends command_1.SfdxCommand {
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages, SfError } from '@salesforce/core';
+import Folder from '../../../lib/analytics/app/folder.js';
+import WaveTemplate from '../../../lib/analytics/template/wavetemplate.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'template');
+export default class Update extends SfCommand {
+    static summary = messages.getMessage('updateCommandDescription');
+    static description = messages.getMessage('updateCommandLongDescription');
+    static examples = [
+        '$ sfdx analytics:template:update -t templateid -f folderid',
+        '$ sfdx analytics:template:update -t templateid -f folderid -r "recipeid1, recipeid2"',
+        '$ sfdx analytics:template:update -f templateid -f folderid -d "datatransformid1, datatransformid2"',
+    ];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        templateid: Flags.salesforceId({
+            char: 't',
+            summary: messages.getMessage('templateidFlagDescription'),
+            description: messages.getMessage('templateidFlagLongDescription'),
+            exclusive: ['templatename'],
+        }),
+        templatename: Flags.string({
+            char: 'n',
+            summary: messages.getMessage('templatenameFlagDescription'),
+            description: messages.getMessage('templatenameFlagLongDescription'),
+            exclusive: ['templateid'],
+        }),
+        folderid: Flags.salesforceId({
+            char: 'f',
+            summary: messages.getMessage('folderidFlagDescription'),
+            description: messages.getMessage('folderidFlagLongDescription'),
+        }),
+        // recipeids only work in 238+, they are silently ignored on the server in 236-
+        recipeids: Flags.salesforceId({
+            char: 'r',
+            required: false,
+            multiple: true,
+            delimiter: ',',
+            summary: messages.getMessage('recipeidsFlagDescription'),
+            description: messages.getMessage('recipeidsFlagLongDescription'),
+        }),
+        // datatransformids only work in 246+, they are silently ignored on the server in 244-
+        datatransformids: Flags.salesforceId({
+            char: 'd',
+            required: false,
+            multiple: true,
+            delimiter: ',',
+            summary: messages.getMessage('datatransformidsFlagDescription'),
+            description: messages.getMessage('datatransformidsFlagLongDescription'),
+        }),
+        assetversion: Flags.integer({
+            char: 'v',
+            summary: messages.getMessage('assetVersionFlagDescription'),
+            description: messages.getMessage('assetVersionFlagLongDescription'),
+        }),
+    };
     async run() {
-        var _a, _b;
-        const templateInput = ((_a = this.flags.templateid) !== null && _a !== void 0 ? _a : this.flags.templatename);
+        const { flags } = await this.parse(Update);
+        const templateInput = (flags.templateid ?? flags.templatename);
         if (!templateInput) {
-            throw new core_1.SfdxError(messages.getMessage('missingRequiredField'));
+            throw new SfError(messages.getMessage('missingRequiredField'));
         }
-        let folderid = this.flags.folderid;
-        const assetversion = this.flags.assetversion;
-        const recipeIds = this.flags.recipeids;
-        const datatransformIds = this.flags.datatransformids;
-        const template = new wavetemplate_1.default(this.org);
+        let folderid = flags.folderid;
+        const assetversion = flags.assetversion;
+        const recipeIds = flags.recipeids;
+        const datatransformIds = flags.datatransformids;
+        const template = new WaveTemplate(flags['target-org'].getConnection(flags['api-version']));
         // no folder id provided, first see if we can find in on the folderSource of the template
         if (!folderid) {
             const found = await template.fetch(templateInput);
-            folderid = (_b = found === null || found === void 0 ? void 0 : found.folderSource) === null || _b === void 0 ? void 0 : _b.id;
+            folderid = found?.folderSource?.id;
         }
         // template name provided and no folder id.  In this scenario there is no master app so folder id must be provided
-        if (typeof this.flags.templatename === 'string' && folderid == null) {
-            this.ux.log(messages.getMessage('errorNoFolderFound', [templateInput]));
+        if (typeof flags.templatename === 'string' && folderid == null) {
+            this.log(messages.getMessage('errorNoFolderFound', [templateInput]));
             return;
         }
         // if we can't get the folder id from the folderSource, throw error and search for options to show in error message
         if (!folderid) {
-            const folderSvc = new folder_1.default(this.org);
+            const folderSvc = new Folder(flags['target-org'].getConnection(flags['api-version']));
             // calling list first because PUT with a wrong id doens't fail correctly
             const folders = ((await folderSvc.list()) || [])
-                .filter(folder => folder.templateSourceId === templateInput)
-                .map(folder => ({
+                .filter((folder) => folder.templateSourceId === templateInput)
+                .map((folder) => ({
                 name: folder.name,
                 label: folder.label,
-                folderid: folder.id
+                folderid: folder.id,
             }));
             if (folders.length) {
-                this.ux.styledHeader(messages.getMessage('errorNoFolderFound', [templateInput]));
-                this.ux.styledHeader(messages.getMessage('updateFolderIdNeeded2', [folders.length]));
+                this.styledHeader(messages.getMessage('errorNoFolderFound', [templateInput]));
+                this.styledHeader(messages.getMessage('updateFolderIdNeeded2', [folders.length]));
                 return folders;
             }
             else {
-                this.ux.log(messages.getMessage('errorNoFolderFound', [templateInput]));
+                this.log(messages.getMessage('errorNoFolderFound', [templateInput]));
                 return;
             }
         }
         const result = await template.update(folderid, templateInput, assetversion, recipeIds, datatransformIds);
-        this.ux.log(messages.getMessage('updateSuccess', [result === null || result === void 0 ? void 0 : result.name, result === null || result === void 0 ? void 0 : result.id, folderid]));
+        this.log(messages.getMessage('updateSuccess', [result?.name, result?.id, folderid]));
         return templateInput;
     }
 }
-exports.default = Update;
-Update.description = messages.getMessage('updateCommandDescription');
-Update.longDescription = messages.getMessage('updateCommandLongDescription');
-Update.examples = [
-    '$ sfdx analytics:template:update -t templateid -f folderid',
-    '$ sfdx analytics:template:update -t templateid -f folderid -r "recipeid1, recipeid2"',
-    '$ sfdx analytics:template:update -f templateid -f folderid -d "datatransformid1, datatransformid2"'
-];
-Update.flagsConfig = {
-    templateid: command_1.flags.id({
-        char: 't',
-        description: messages.getMessage('templateidFlagDescription'),
-        longDescription: messages.getMessage('templateidFlagLongDescription'),
-        exclusive: ['templatename']
-    }),
-    templatename: command_1.flags.string({
-        char: 'n',
-        description: messages.getMessage('templatenameFlagDescription'),
-        longDescription: messages.getMessage('templatenameFlagLongDescription'),
-        exclusive: ['templateid']
-    }),
-    folderid: command_1.flags.id({
-        char: 'f',
-        description: messages.getMessage('folderidFlagDescription'),
-        longDescription: messages.getMessage('folderidFlagLongDescription')
-    }),
-    // recipeids only work in 238+, they are silently ignored on the server in 236-
-    recipeids: command_1.flags.array({
-        char: 'r',
-        required: false,
-        description: messages.getMessage('recipeidsFlagDescription'),
-        longDescription: messages.getMessage('recipeidsFlagLongDescription')
-    }),
-    // datatransformids only work in 246+, they are silently ignored on the server in 244-
-    datatransformids: command_1.flags.array({
-        char: 'd',
-        required: false,
-        description: messages.getMessage('datatransformidsFlagDescription'),
-        longDescription: messages.getMessage('datatransformidsFlagLongDescription')
-    }),
-    assetversion: command_1.flags.integer({
-        char: 'v',
-        description: messages.getMessage('assetVersionFlagDescription'),
-        longDescription: messages.getMessage('assetVersionFlagLongDescription')
-    })
-};
-Update.requiresUsername = true;
-Update.requiresProject = false;
-Update.result = {
-    tableColumnData: ['name', 'label', 'folderid'],
-    display() {
-        if (this.tableColumnData) {
-            if (Array.isArray(this.data) && this.data.length) {
-                this.ux.table(this.data, this.tableColumnData);
-            }
-        }
-    }
-};
 //# sourceMappingURL=update.js.map

package/lib/commands/analytics/template/update.js.map

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

package/lib/commands/analytics/template/validate.d.ts

@@ -1,14 +1,15 @@
-import { flags, SfdxCommand } from '@salesforce/command';
-export default class Validate extends SfdxCommand {
-    static description: string;
-    static longDescription: string;
-    static examples: string[];
-    protected static flagsConfig: {
-        templateid: flags.Discriminated<flags.String>;
-        templatename: flags.Discriminated<flags.String>;
-        valuesfile: flags.Discriminated<flags.String>;
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { ValidateType } from '../../../lib/analytics/template/validate.js';
+export default class Validate extends SfCommand<ValidateType | 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>;
+        templateid: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        templatename: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        valuesfile: 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<"Command only available in api version 58.0 or later" | import("../../../lib/analytics/template/validate").ValidateType>;
+    run(): Promise<"Command only available in api version 58.0 or later" | ValidateType>;
 }

package/lib/commands/analytics/template/validate.js

@@ -1,98 +1,90 @@
-"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 fs_1 = require("fs");
-const command_1 = require("@salesforce/command");
-const core_1 = require("@salesforce/core");
-const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = require("../../../lib/analytics/utils");
-const validate_1 = __importDefault(require("../../../lib/analytics/template/validate"));
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'validate');
-class Validate extends command_1.SfdxCommand {
+import { Flags, SfCommand, orgApiVersionFlagWithDeprecations, requiredOrgFlagWithDeprecations, } from '@salesforce/sf-plugins-core';
+import { Messages, SfError } from '@salesforce/core';
+import chalk from 'chalk';
+import { colorize, getStatusIcon, COLORS, fs } from '../../../lib/analytics/utils.js';
+import TemplateValidate from '../../../lib/analytics/template/validate.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'validate');
+export default class Validate extends SfCommand {
+    static summary = messages.getMessage('validateCommandDescription');
+    static description = messages.getMessage('validateCommandLongDescription');
+    static examples = [
+        '$ sfdx analytics:template:validate -t templateId',
+        'sfdx analytics:template:validate -n templateApiName',
+    ];
+    static flags = {
+        'target-org': requiredOrgFlagWithDeprecations,
+        'api-version': orgApiVersionFlagWithDeprecations,
+        templateid: Flags.string({
+            char: 't',
+            summary: messages.getMessage('templateidFlagDescription'),
+            description: messages.getMessage('templateidFlagLongDescription'),
+            exclusive: ['templatename'],
+        }),
+        templatename: Flags.string({
+            char: 'n',
+            summary: messages.getMessage('templatenameFlagDescription'),
+            description: messages.getMessage('templatenameFlagLongDescription'),
+            exclusive: ['templateid'],
+        }),
+        valuesfile: Flags.file({
+            char: 'f',
+            summary: messages.getMessage('valuesfileFlagDescription'),
+            description: messages.getMessage('valuesfileFlagLongDescription'),
+        }),
+    };
     async run() {
-        const templateName = this.flags.templatename;
-        const templateId = this.flags.templateid;
-        const validate = new validate_1.default(this.org);
+        const { flags } = await this.parse(Validate);
+        const templateName = flags.templatename;
+        const templateId = flags.templateid;
+        if (!templateName && !templateId) {
+            throw new SfError(messages.getMessage('missingRequiredField'));
+        }
+        const validate = new TemplateValidate(flags['target-org'].getConnection(flags['api-version']));
         if (!validate.appliesToThisServerVersion()) {
             const commandNotAvailable = 'Command only available in api version 58.0 or later';
-            this.ux.log(commandNotAvailable);
+            this.log(commandNotAvailable);
             return commandNotAvailable;
         }
         let json;
-        if (this.flags.valuesfile) {
-            const path = String(this.flags.valuesfile);
+        if (flags.valuesfile) {
+            const path = String(flags.valuesfile);
             try {
-                json = JSON.parse(await fs_1.promises.readFile(path, 'utf8'));
+                json = JSON.parse(await fs.readFile(path));
             }
             catch (e) {
-                throw new core_1.SfdxError(`Error parsing ${path}`, undefined, undefined, undefined, e instanceof Error ? e : new Error(e ? String(e) : '<unknown>'));
+                throw new SfError(`Error parsing ${path}`, undefined, undefined, undefined, e instanceof Error ? e : new Error(e ? String(e) : '<unknown>'));
             }
         }
         const result = await validate.run(templateName ? templateName : templateId, json);
-        const tasks = result.tasks || [];
+        const tasks = result.tasks ?? [];
         if (tasks.length > 0) {
-            this.ux.styledHeader((0, utils_1.colorize)(messages.getMessage('tasksFound', [result.id]), chalk_1.default.blue));
+            this.styledHeader(colorize(messages.getMessage('tasksFound', [result.id]), chalk.blue));
         }
-        this.ux.table(tasks.map(task => {
-            return {
-                label: task.label || '',
-                readinessStatus: task.readinessStatus || '',
-                message: task.message || ''
-            };
-        }), {
-            columns: [
-                { key: 'label', label: 'Task', format: v => v },
-                {
-                    key: 'readinessStatus',
-                    label: 'Status',
-                    format: v => (0, utils_1.colorize)((0, utils_1.getStatusIcon)(v) + ' ' + v, utils_1.COLORS.readinessStatus(v))
-                },
-                { key: 'message', label: 'Message', format: v => v }
-            ]
+        this.table(tasks.map((task) => ({
+            label: task.label ?? '',
+            readinessStatus: task.readinessStatus ?? '',
+            message: task.message ?? '',
+        })), {
+            label: { header: 'Task' },
+            readinessStatus: {
+                header: 'Status',
+                get: (row) => colorize(getStatusIcon(row.readinessStatus) + ' ' + row.readinessStatus, COLORS.readinessStatus(row.readinessStatus)),
+            },
+            message: { header: 'Message' },
         });
         // check if there is any readiness failure
-        const didAnyReadinessTasksFail = tasks.some(task => task.readinessStatus === 'Failed');
+        const didAnyReadinessTasksFail = tasks.some((task) => task.readinessStatus === 'Failed');
         if (didAnyReadinessTasksFail) {
-            throw new core_1.SfdxError('Template validation failed', undefined, undefined, 1, undefined).setData(result);
+            throw new SfError(messages.getMessage('validateFailed'), undefined, undefined, 1, undefined).setData(result);
         }
         return result;
     }
 }
-exports.default = Validate;
-Validate.description = messages.getMessage('validateCommandDescription');
-Validate.longDescription = messages.getMessage('validateCommandLongDescription');
-Validate.examples = [
-    '$ sfdx analytics:template:validate -t templateId',
-    'sfdx analytics:template:validate -n templateApiName'
-];
-Validate.flagsConfig = {
-    templateid: command_1.flags.string({
-        char: 't',
-        description: messages.getMessage('templateidFlagDescription'),
-        longDescription: messages.getMessage('templateidFlagLongDescription'),
-        exclusive: ['templatename']
-    }),
-    templatename: command_1.flags.string({
-        char: 'n',
-        description: messages.getMessage('templatenameFlagDescription'),
-        longDescription: messages.getMessage('templatenameFlagLongDescription'),
-        exclusive: ['templateid']
-    }),
-    valuesfile: command_1.flags.filepath({
-        char: 'f',
-        description: messages.getMessage('valuesfileFlagDescription'),
-        longDescription: messages.getMessage('valuesfileFlagLongDescription')
-    })
-};
-Validate.requiresUsername = true;
-Validate.requiresProject = false;
 //# sourceMappingURL=validate.js.map

package/lib/commands/analytics/template/validate.js.map

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

package/lib/commands/analytics.d.ts

@@ -1,5 +1,7 @@
-import { SfdxCommand } from '@salesforce/command';
-export declare class AnalyticsCommand extends SfdxCommand {
+import { SfCommand } from '@salesforce/sf-plugins-core';
+export default class Analytics extends SfCommand<{
+    adxVersion: string;
+}> {
     static readonly hidden = true;
     private static cachedVersion;
     static get version(): string;

package/lib/commands/analytics.js

@@ -1,4 +1,3 @@
-"use strict";
 /*
  * Copyright (c) 2019, salesforce.com, inc.
  * All rights reserved.
@@ -10,9 +9,8 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnalyticsCommand = void 0;
-const command_1 = require("@salesforce/command");
+import { createRequire } from 'node:module';
+import { SfCommand } from '@salesforce/sf-plugins-core';
 const asciiSignature = (version) => `
                  DX DX DX
              DX DX DX DX DX DX          DX DX DX
@@ -48,12 +46,20 @@ Salesforce Analytics CLI Plugin v${version}
 * Analytics Sample Templates: https://github.com/forcedotcom/sfdx-analytics
 * Analytics Extensions for VS Code: https://marketplace.visualstudio.com/items?itemName=salesforce.analyticsdx-vscode
 `;
-class AnalyticsCommand extends command_1.SfdxCommand {
+// This command is a little funky in that it's really masking the default operation for hitting an oclif topic, so
+// we don't really want a summary nor examples.
+// eslint-disable-next-line sf-plugin/command-example, sf-plugin/command-summary
+export default class Analytics extends SfCommand {
+    static hidden = true;
+    static cachedVersion;
     static get version() {
         if (!this.cachedVersion) {
             try {
+                // no more direct require() in node 18+ w/ type: module, and an import with { type: 'json' } doesn't work
+                // with the way the tests build either, so do it manually
+                const require = createRequire(import.meta.url);
                 const pkg = require('../../package.json');
-                AnalyticsCommand.cachedVersion = (pkg && typeof pkg.version === 'string' && pkg.version.trim()) || '<unknown>';
+                Analytics.cachedVersion = (pkg && typeof pkg.version === 'string' && pkg.version.trim()) || '<unknown>';
             }
             catch (e) {
                 // eslint-disable-next-line no-console
@@ -66,10 +72,8 @@ class AnalyticsCommand extends command_1.SfdxCommand {
         return this.cachedVersion;
     }
     run() {
-        this.ux.log(asciiSignature(AnalyticsCommand.version));
-        return Promise.resolve({ adxVersion: AnalyticsCommand.version });
+        this.log(asciiSignature(Analytics.version));
+        return Promise.resolve({ adxVersion: Analytics.version });
     }
 }
-exports.AnalyticsCommand = AnalyticsCommand;
-AnalyticsCommand.hidden = true;
 //# sourceMappingURL=analytics.js.map

package/lib/commands/analytics.js.map

@@ -1 +1 @@
-{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/commands/analytics.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AACH,0DAA0D;AAC1D,4DAA4D;AAC5D,uDAAuD;AACvD,+DAA+D;AAC/D,sDAAsD;;;AAEtD,iDAAkD;AAElD,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA6BT,OAAO;;;;;CAKzC,CAAC;AAEF,MAAa,gBAAiB,SAAQ,qBAAW;IAIxC,MAAM,KAAK,OAAO;QACvB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,IAAI;gBACF,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAA4B,CAAC;gBACrE,gBAAgB,CAAC,aAAa,GAAG,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,WAAW,CAAC;aAChH;YAAC,OAAO,CAAC,EAAE;gBACV,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,mDAAmD,EAAE,CAAC,CAAC,CAAC;aACtE;YACD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACvB,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC;aAClC;SACF;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEM,GAAG;QACR,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;QACtD,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;IACnE,CAAC;;AAvBH,4CAwBC;AAvBwB,uBAAM,GAAG,IAAI,CAAC"}
+{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/commands/analytics.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,0DAA0D;AAC1D,4DAA4D;AAC5D,uDAAuD;AACvD,+DAA+D;AAC/D,sDAAsD;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,MAAM,cAAc,GAAG,CAAC,OAAe,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCA6BT,OAAO;;;;;CAKzC,CAAC;AAEF,kHAAkH;AAClH,+CAA+C;AAC/C,gFAAgF;AAChF,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAiC;IAC/D,MAAM,CAAU,MAAM,GAAG,IAAI,CAAC;IAE7B,MAAM,CAAC,aAAa,CAAS;IAC9B,MAAM,KAAK,OAAO;QACvB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CAAC;gBACH,yGAAyG;gBACzG,yDAAyD;gBACzD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC/C,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAA4B,CAAC;gBACrE,SAAS,CAAC,aAAa,GAAG,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,WAAW,CAAC;YAC1G,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,sCAAsC;gBACtC,OAAO,CAAC,IAAI,CAAC,mDAAmD,EAAE,CAAC,CAAC,CAAC;YACvE,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBACxB,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC;YACnC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEM,GAAG;QACR,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5C,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC"}

package/lib/index.d.ts

@@ -1,2 +1,2 @@
 declare const _default: {};
-export = _default;
+export default _default;

package/lib/index.js

@@ -1,9 +1,8 @@
-"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
  */
-module.exports = {};
+export default {};
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AAEH,iBAAS,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAe,EAAE,CAAC"}

package/lib/lib/analytics/app/folder.d.ts

@@ -1,8 +1,9 @@
-import { Org } from '@salesforce/core';
+import { Connection } from '@salesforce/core';
 export type AppStatus = 'newstatus' | 'inprogressstatus' | 'failedstatus' | 'cancelledstatus' | 'dataflowinprogressstatus' | 'completedstatus';
 export type AppFolder = Record<string, unknown> & {
     id: string;
     name?: string;
+    namespace?: string;
     label?: string;
     applicationStatus?: AppStatus;
     appLog?: Array<{
@@ -37,10 +38,10 @@ export type CreateAppBody = {
     };
 };
 export default class Folder {
-    readonly serverVersion: number;
     private readonly connection;
+    readonly serverVersion: number;
     private readonly foldersUrl;
-    constructor(organization: Org);
+    constructor(connection: Connection);
     fetch(folderid: string, includeLog?: boolean): Promise<AppFolder>;
     create(body: CreateAppBody): Promise<string | undefined>;
     update(folderid: string, templateid: string): Promise<string | undefined>;