@salesforce/analytics 1.3.18 → 1.4.0

package/lib/lib/analytics/publisher/publisher.js

@@ -1,50 +1,50 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../request");
-const utils_1 = require("../utils");
-class Publisher {
-    constructor(organization) {
-        this.connection = organization.getConnection();
+import { connectRequest } from '../request.js';
+import { throwError } from '../utils.js';
+export default class Publisher {
+    connection;
+    publishersUrl;
+    endpointName;
+    constructor(connection) {
+        this.connection = connection;
         this.publishersUrl = `${this.connection.baseUrl()}/wave/dashboards/`;
         this.endpointName = 'publishers';
     }
     async create(dashboardId) {
-        const response = await (0, request_1.connectRequest)(this.connection, {
+        const response = await connectRequest(this.connection, {
             method: 'POST',
             url: this.publishersUrl + encodeURIComponent(dashboardId) + '/' + this.endpointName,
-            body: '{}'
+            body: '{}',
         });
         if (response) {
             return response.id;
         }
         else {
-            (0, utils_1.throwError)(response);
+            throwError(response);
         }
     }
     async list(assetId) {
-        const response = await (0, request_1.connectRequest)(this.connection, {
+        const response = await connectRequest(this.connection, {
             method: 'GET',
-            url: this.publishersUrl + encodeURIComponent(assetId) + '/' + this.endpointName
+            url: this.publishersUrl + encodeURIComponent(assetId) + '/' + this.endpointName,
         });
         if (response) {
             return response.publishers;
         }
         else {
-            (0, utils_1.throwError)(response);
+            throwError(response);
         }
     }
     deleteAll(assetId) {
-        return (0, request_1.connectRequest)(this.connection, {
+        return connectRequest(this.connection, {
             method: 'DELETE',
-            url: this.publishersUrl + assetId + '/' + this.endpointName
+            url: this.publishersUrl + assetId + '/' + this.endpointName,
         });
     }
     delete(assetId, id) {
-        return (0, request_1.connectRequest)(this.connection, {
+        return connectRequest(this.connection, {
             method: 'DELETE',
-            url: this.publishersUrl + encodeURIComponent(assetId) + '/' + this.endpointName + '/' + encodeURIComponent(id)
+            url: this.publishersUrl + encodeURIComponent(assetId) + '/' + this.endpointName + '/' + encodeURIComponent(id),
         });
     }
 }
-exports.default = Publisher;
 //# sourceMappingURL=publisher.js.map

package/lib/lib/analytics/publisher/publisher.js.map

@@ -1 +1 @@
-{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/lib/analytics/publisher/publisher.ts"],"names":[],"mappings":";;AAOA,wCAA4C;AAC5C,oCAAsC;AAQtC,MAAqB,SAAS;IAK5B,YAAmB,YAAiB;QAClC,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;QAC/C,IAAI,CAAC,aAAa,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC;QACrE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,WAAmB;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAc,EAAgB,IAAI,CAAC,UAAU,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY;YACnF,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC,EAAE,CAAC;SACpB;aAAM;YACL,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAC;SACtB;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAe;QAC/B,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAc,EAAmC,IAAI,CAAC,UAAU,EAAE;YACvF,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY;SAChF,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC,UAAU,CAAC;SAC5B;aAAM;YACL,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAC;SACtB;IACH,CAAC;IAEM,SAAS,CAAC,OAAe;QAC9B,OAAO,IAAA,wBAAc,EAAC,IAAI,CAAC,UAAU,EAAE;YACrC,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY;SAC5D,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,OAAe,EAAE,EAAU;QACvC,OAAO,IAAA,wBAAc,EAAC,IAAI,CAAC,UAAU,EAAE;YACrC,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,GAAG,GAAG,kBAAkB,CAAC,EAAE,CAAC;SAC/G,CAAC,CAAC;IACL,CAAC;CACF;AAjDD,4BAiDC"}
+{"version":3,"file":"publisher.js","sourceRoot":"","sources":["../../../../src/lib/analytics/publisher/publisher.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAQzC,MAAM,CAAC,OAAO,OAAO,SAAS;IAIQ;IAHnB,aAAa,CAAS;IACtB,YAAY,CAAS;IAEtC,YAAoC,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QACxD,IAAI,CAAC,aAAa,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC;QACrE,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,WAAmB;QACrC,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAgB,IAAI,CAAC,UAAU,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY;YACnF,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,EAAE,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAe;QAC/B,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAmC,IAAI,CAAC,UAAU,EAAE;YACvF,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY;SAChF,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,UAAU,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAEM,SAAS,CAAC,OAAe;QAC9B,OAAO,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE;YACrC,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY;SAC5D,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,OAAe,EAAE,EAAU;QACvC,OAAO,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE;YACrC,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,GAAG,GAAG,kBAAkB,CAAC,EAAE,CAAC;SAC/G,CAAC,CAAC;IACL,CAAC;CACF"}

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

@@ -1,8 +1,8 @@
-import { flags, UX } from '@salesforce/command';
 import { Connection } from '@salesforce/core';
-export declare const LIMIT_FLAG: flags.Discriminated<flags.Number>;
-export declare const RESULT_FORMAT_FLAG: flags.Discriminated<flags.Enum<string>>;
-export declare const DRYRUN_FLAG: flags.Discriminated<flags.Boolean<boolean>>;
+import { CommandUx } from '../utils.js';
+export declare const LIMIT_FLAG: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+export declare const RESULT_FORMAT_FLAG: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+export declare const DRYRUN_FLAG: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
 export type QueryLanguage = 'Saql' | 'Sql';
 export type QueryRequest = {
     query: string;
@@ -93,25 +93,25 @@ export default class QuerySvc {
     /** Run a query-ish sfdx command and possibly do some output
      *
      * @param query the query request
-     * @param ux the command UX, or undefined to do no output
+     * @param ux the command Ux, or undefined to do no output
      * @param limit the max number of rows to output and return (undefined for all)
      * @param resultforamt 'json', 'csv', or anything else for an sfdx table
      * @return the query response
      */
     runQueryCommand(query: QueryRequest, params: {
-        ux?: UX;
+        ux?: CommandUx;
         limit?: number;
         resultformat?: string;
         dryrun?: false;
     }): Promise<QueryResponse>;
     runQueryCommand(query: QueryRequest, params: {
-        ux?: UX;
+        ux?: CommandUx;
         limit?: number;
         resultformat?: string;
         dryrun: true;
     }): Promise<undefined>;
     runQueryCommand(query: QueryRequest, { ux, limit, resultformat, dryrun }: {
-        ux?: UX;
+        ux?: CommandUx;
         limit?: number;
         resultformat?: string;
         dryrun: boolean;
@@ -119,25 +119,25 @@ export default class QuerySvc {
     /** Run an external query-ish sfdx command and possibly do some output
      *
      * @param query the query request
-     * @param ux the command UX, or undefined to do no output
+     * @param ux the command Ux, or undefined to do no output
      * @param limit the max number of rows to output and return (undefined for all)
      * @param resultforamt 'json', 'csv', or anything else for an sfdx table
      * @return the query response
      */
     runExternalQueryCommand(query: ExternalQueryRequest, params: {
-        ux?: UX;
+        ux?: CommandUx;
         limit?: number;
         resultformat?: string;
         dryrun?: false;
     }): Promise<QueryResponse>;
     runExternalQueryCommand(query: ExternalQueryRequest, params: {
-        ux?: UX;
+        ux?: CommandUx;
         limit?: number;
         resultformat?: string;
         dryrun: true;
     }): Promise<undefined>;
     runExternalQueryCommand(query: ExternalQueryRequest, { ux, limit, resultformat, dryrun }: {
-        ux?: UX;
+        ux?: CommandUx;
         limit?: number;
         resultformat?: string;
         dryrun: boolean;
@@ -145,7 +145,7 @@ export default class QuerySvc {
     /** Process a query response, possibly doing some output.
      *
      * @param query the query request
-     * @param ux the command UX, or undefined to do no output
+     * @param ux the command Ux, or undefined to do no output
      * @param limit the max number of rows to output and return (undefined for all)
      * @param resultforamt 'json', 'csv', or anything else for an sfdx table
      * @return the query response

package/lib/lib/analytics/query/query.js

@@ -1,75 +1,71 @@
-"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 });
-exports.computeColumnNames = exports.mapDatasetNames = exports.convertRowValue = exports.DRYRUN_FLAG = exports.RESULT_FORMAT_FLAG = exports.LIMIT_FLAG = void 0;
-const command_1 = require("@salesforce/command");
-const core_1 = require("@salesforce/core");
-const dataset_1 = __importDefault(require("../dataset/dataset"));
-const request_1 = require("../request");
-core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/analytics', 'query');
-exports.LIMIT_FLAG = command_1.flags.number({
-    description: messages.getMessage('limitDescription'),
-    longDescription: messages.getMessage('limitLongDescription'),
-    min: 0
+import { Flags } from '@salesforce/sf-plugins-core';
+import { Messages, SfError } from '@salesforce/core';
+import DatasetSvc from '../dataset/dataset.js';
+import { connectRequest } from '../request.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('@salesforce/analytics', 'query');
+export const LIMIT_FLAG = Flags.integer({
+    summary: messages.getMessage('limitDescription'),
+    description: messages.getMessage('limitLongDescription'),
+    min: 0,
 });
-exports.RESULT_FORMAT_FLAG = command_1.flags.enum({
+export const RESULT_FORMAT_FLAG = Flags.string({
     char: 'r',
-    description: messages.getMessage('resultformatDescription'),
-    longDescription: messages.getMessage('resultformatLongDescription'),
+    summary: messages.getMessage('resultformatDescription'),
+    description: messages.getMessage('resultformatLongDescription'),
     options: ['human', 'csv', 'json'],
-    default: 'human'
+    default: 'human',
 });
-exports.DRYRUN_FLAG = command_1.flags.boolean({
+export const DRYRUN_FLAG = Flags.boolean({
     hidden: true,
     description: "Show the resulting query that would be executed, but don't run it",
-    default: false
+    default: false,
 });
-class QuerySvc {
+export default class QuerySvc {
+    connection;
+    queryUrl;
     constructor(connection) {
         this.connection = connection;
         this.queryUrl = `${this.connection.baseUrl()}/wave/query`;
     }
     async execute(query) {
-        const response = await (0, request_1.connectRequest)(this.connection, {
+        const response = await connectRequest(this.connection, {
             method: 'POST',
             url: this.queryUrl,
-            body: JSON.stringify(query)
+            body: JSON.stringify(query),
         });
         if (response) {
             return response;
         }
         else {
-            throw new core_1.SfdxError('Empty http response');
+            throw new SfError('Empty http response');
         }
     }
     /** Make a query against an external data connector (i.e. Live Dataset). */
     async executeExternal(query) {
-        const response = await (0, request_1.connectRequest)(this.connection, {
+        const response = await connectRequest(this.connection, {
             method: 'POST',
             url: `${this.connection.baseUrl()}/wave/dataConnectors/${encodeURIComponent(query.connectorIdOrApiName)}/query`,
-            body: JSON.stringify({ query: query.query })
+            body: JSON.stringify({ query: query.query }),
         });
         if (response) {
             return response;
         }
         else {
-            throw new core_1.SfdxError('Empty http response');
+            throw new SfError('Empty http response');
         }
     }
     /** Convert any datanames names in the SAQL query to the dataset id/currentVersionId format, using
      * a {@link DatasetSvc} to fetch the datasets.
      */
     async mapDatasetNames(query) {
-        const dsSvc = new dataset_1.default(this.connection);
+        const dsSvc = new DatasetSvc(this.connection);
         return mapDatasetNames(query, async (name) => {
             let dataset;
             try {
@@ -77,29 +73,30 @@ class QuerySvc {
             }
             catch (error) {
                 const msg = error instanceof Error ? error.message : String(error);
-                throw new core_1.SfdxError(`Unable to fetch dataset ${name}: ${msg}`);
+                throw new SfError(`Unable to fetch dataset ${name}: ${msg}`);
             }
             if (!dataset.currentVersionId) {
-                throw new core_1.SfdxError(`Dataset ${name} (${dataset.id}) does not have a current version id`);
+                throw new SfError(`Dataset ${name} (${dataset.id}) does not have a current version id`);
             }
             return `${dataset.id}/${dataset.currentVersionId}`;
         });
     }
+    // eslint-disable-next-line class-methods-use-this
     computeColumnNames(response) {
         return computeColumnNames(response);
     }
-    async runQueryCommand(query, { ux, limit, resultformat, dryrun = false }) {
+    async runQueryCommand(query, { ux, limit, resultformat, dryrun = false, }) {
         if (dryrun) {
-            ux === null || ux === void 0 ? void 0 : ux.log(messages.getMessage('dryrunHeader'));
-            ux === null || ux === void 0 ? void 0 : ux.logJson(query);
+            ux?.log(messages.getMessage('dryrunHeader'));
+            ux?.styledJSON(query);
             return undefined;
         }
         return this.processQueryCommandResponse(await this.execute(query), { ux, limit, resultformat });
     }
-    async runExternalQueryCommand(query, { ux, limit, resultformat, dryrun = false }) {
+    async runExternalQueryCommand(query, { ux, limit, resultformat, dryrun = false, }) {
         if (dryrun) {
-            ux === null || ux === void 0 ? void 0 : ux.log(messages.getMessage('dryrunHeader'));
-            ux === null || ux === void 0 ? void 0 : ux.log(query.query);
+            ux?.log(messages.getMessage('dryrunHeader'));
+            ux?.log(query.query);
             return undefined;
         }
         return this.processQueryCommandResponse(await this.executeExternal(query), { ux, limit, resultformat });
@@ -107,58 +104,58 @@ class QuerySvc {
     /** Process a query response, possibly doing some output.
      *
      * @param query the query request
-     * @param ux the command UX, or undefined to do no output
+     * @param ux the command Ux, or undefined to do no output
      * @param limit the max number of rows to output and return (undefined for all)
      * @param resultforamt 'json', 'csv', or anything else for an sfdx table
      * @return the query response
      */
     processQueryCommandResponse(response, { ux, limit, resultformat }) {
         const results = getQueryResults(response);
-        const records = results && Array.isArray(results === null || results === void 0 ? void 0 : results.records) ? results.records : [];
+        const records = results && Array.isArray(results?.records) ? results.records : [];
         if (typeof limit === 'number' && limit >= 0 && records.length > limit) {
             records.length = limit;
         }
-        if (ux) {
+        if (ux && !ux.jsonEnabled) {
             if (resultformat === 'json') {
-                ux.logJson(response);
+                ux.styledJSON(response);
             }
             else {
                 const columnNames = this.computeColumnNames(response);
                 if (resultformat === 'csv') {
                     writeCsvLine(ux, columnNames);
-                    records.forEach(record => {
-                        const values = columnNames.map(columnName => record[columnName]);
+                    records.forEach((record) => {
+                        const values = columnNames.map((columnName) => record[columnName]);
                         writeCsvLine(ux, values);
                     });
                 }
-                else {
+                else if (columnNames.length <= 0) {
                     // resultformat === 'human', do a table
-                    if (columnNames.length <= 0) {
-                        ux.log(messages.getMessage('noResultsMesg'));
-                    }
-                    else {
-                        ux.table(records, {
-                            columns: columnNames.map(name => {
-                                return {
-                                    key: name,
-                                    label: name,
-                                    format: convertRowValue
-                                };
-                            })
-                        });
-                        ux.styledHeader(messages.getMessage('rowsFound', [records.length]));
-                    }
+                    ux.log(messages.getMessage('noResultsMesg'));
+                }
+                else {
+                    ux.table(records, columnNames.reduce((all, name) => {
+                        all[name] = { header: name, get: (row) => convertRowValue(row[name]) };
+                        return all;
+                    }, {}));
+                    ux.styledHeader(messages.getMessage('rowsFound', [records.length]));
                 }
             }
         }
         return response;
     }
 }
-exports.default = QuerySvc;
-function convertRowValue(value) {
-    return Array.isArray(value) ? '[' + value.join(',') + ']' : typeof value === 'string' ? value : String(value);
+export function convertRowValue(value) {
+    // use empty string for undefined/null
+    if (typeof value === 'undefined' || value === 'null') {
+        return '';
+    }
+    // handle array values
+    if (Array.isArray(value)) {
+        return '[' + value.join(',') + ']';
+    }
+    // otherwise do our best to convert to string
+    return typeof value === 'string' ? value : String(value);
 }
-exports.convertRowValue = convertRowValue;
 function writeCsvLine(ux, values, delim = ',') {
     let line = '';
     for (let i = 0; i < values.length; i++) {
@@ -167,7 +164,7 @@ function writeCsvLine(ux, values, delim = ',') {
         }
         if (values[i]) {
             const value = convertRowValue(values[i]).replace(/"/g, '""');
-            if (value.indexOf(delim) >= 0 || value.indexOf('\n') >= 0) {
+            if (value.includes(delim) || value.includes('\n')) {
                 line += `"${value}"`;
             }
             else {
@@ -184,51 +181,49 @@ const LOAD_RE = /load(\s+)"([^"]+)"/;
  * @param nameToRef function to map dataset name to "id/versionId" ref format, should throw an error if
  *                  the dataset is unavailable.
  */
-async function mapDatasetNames(query, nameToRef) {
+export async function mapDatasetNames(query, nameToRef) {
     // go through each expression in the saql
     const lines = query.split(';');
     for (let i = 0, len = lines.length; i < len; i++) {
         // see if it's a '... load "DatasetName"'
         const matches = LOAD_RE.exec(lines[i]);
-        if (!matches || !matches[2]) {
+        if (!matches?.[2]) {
             continue;
         }
         // pull the dataset name from that
         const name = matches[2];
         // if it's not already of the "id/versionid" form, fetch the dataset and string sub
-        if (name.indexOf('/') < 0) {
+        if (!name.includes('/')) {
+            // eslint-disable-next-line no-await-in-loop
             const ref = await nameToRef(name);
             lines[i] = lines[i].replace(matches[0], `load${matches[1]}"${ref}"`);
         }
     }
     return lines.join(';');
 }
-exports.mapDatasetNames = mapDatasetNames;
 function getQueryResults(response) {
     return typeof response.metadata === 'object' || typeof response.records === 'object'
         ? response
         : response.results;
 }
 /** Compute the set of columns names from the query response metadata. */
-function computeColumnNames(response) {
+export function computeColumnNames(response) {
     const names = new Set();
     const results = getQueryResults(response);
-    if (results && Array.isArray(results === null || results === void 0 ? void 0 : results.metadata)) {
+    if (results && Array.isArray(results?.metadata)) {
         results.metadata.forEach((md) => {
-            var _a;
             // SqlMetadata
-            if (Array.isArray(md === null || md === void 0 ? void 0 : md.columns)) {
+            if (Array.isArray(md?.columns)) {
                 md.columns.forEach((c) => {
                     if (c.columnLabel) {
                         names.add(c.columnLabel);
                     }
                 });
             }
-            else if (Array.isArray((_a = md === null || md === void 0 ? void 0 : md.lineage) === null || _a === void 0 ? void 0 : _a.projections)) {
+            else if (Array.isArray(md?.lineage?.projections)) {
                 // SaqlMetadata
                 md.lineage.projections.forEach((p) => {
-                    var _a;
-                    if ((_a = p.field) === null || _a === void 0 ? void 0 : _a.id) {
+                    if (p.field?.id) {
                         let name = p.field.id;
                         const index = name.indexOf('.');
                         if (index >= 0) {
@@ -240,7 +235,7 @@ function computeColumnNames(response) {
             }
         });
     }
-    else if (typeof (results === null || results === void 0 ? void 0 : results.metadata) === 'object' && Array.isArray(results.metadata.columns)) {
+    else if (typeof results?.metadata === 'object' && Array.isArray(results.metadata.columns)) {
         // SqlLiveMetadata
         results.metadata.columns.forEach((col) => {
             if (col.label) {
@@ -254,5 +249,4 @@ function computeColumnNames(response) {
     }
     return Array.from(names);
 }
-exports.computeColumnNames = computeColumnNames;
 //# sourceMappingURL=query.js.map

package/lib/lib/analytics/query/query.js.map

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

package/lib/lib/analytics/recipe/recipe.d.ts

@@ -1,4 +1,4 @@
-import { Org } from '@salesforce/core';
+import { Connection } from '@salesforce/core';
 export type RecipeType = Record<string, unknown> & {
     conversionDetails: [];
     createdBy?: {
@@ -28,6 +28,7 @@ export type RecipeType = Record<string, unknown> & {
         type?: string;
     };
     name?: string;
+    namespace?: string;
     publishingTarget?: string;
     recipeDefinition?: {
         name?: string;
@@ -50,7 +51,7 @@ export default class Recipe {
     private readonly connection;
     private readonly recipesUrl;
     private readonly dataflowsJobsUrl;
-    constructor(organization: Org);
+    constructor(connection: Connection);
     list(): Promise<RecipeType[]>;
     startRecipe(recipeId: string): Promise<RecipeType | undefined>;
 }

package/lib/lib/analytics/recipe/recipe.js

@@ -1,46 +1,46 @@
-"use strict";
 /*
  * Copyright (c) 2016, salesforce.com, inc.
  * All rights reserved.
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../request");
-const utils_1 = require("../utils");
-class Recipe {
-    constructor(organization) {
-        this.connection = organization.getConnection();
+import { connectRequest, fetchAllPages } from '../request.js';
+import { throwError } from '../utils.js';
+export default class Recipe {
+    connection;
+    recipesUrl;
+    dataflowsJobsUrl;
+    constructor(connection) {
+        this.connection = connection;
         this.recipesUrl = `${this.connection.baseUrl()}/wave/recipes/`;
         this.dataflowsJobsUrl = `${this.connection.baseUrl()}/wave/dataflowjobs/`;
     }
     list() {
-        return (0, request_1.fetchAllPages)(this.connection, this.recipesUrl, 'recipes');
+        return fetchAllPages(this.connection, this.recipesUrl, 'recipes');
     }
     async startRecipe(recipeId) {
         const startRecipeUrl = this.dataflowsJobsUrl;
         const targetDataflowIdUrl = this.recipesUrl + recipeId + '?format=R3';
         const command = 'start';
-        const recipeDetails = await (0, request_1.connectRequest)(this.connection, {
+        const recipeDetails = await connectRequest(this.connection, {
             method: 'GET',
-            url: targetDataflowIdUrl
+            url: targetDataflowIdUrl,
         });
         const dataflowId = recipeDetails.targetDataflowId;
-        const response = await (0, request_1.connectRequest)(this.connection, {
+        const response = await connectRequest(this.connection, {
             method: 'POST',
             url: startRecipeUrl,
             body: JSON.stringify({
                 dataflowId,
-                command
-            })
+                command,
+            }),
         });
         if (response) {
             return response;
         }
         else {
-            (0, utils_1.throwError)(response);
+            throwError(response);
         }
     }
 }
-exports.default = Recipe;
 //# sourceMappingURL=recipe.js.map

package/lib/lib/analytics/recipe/recipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../../../../src/lib/analytics/recipe/recipe.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAGH,wCAA2D;AAC3D,oCAAsC;AA4BtC,MAAqB,MAAM;IAKzB,YAAmB,YAAiB;QAClC,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,aAAa,EAAE,CAAC;QAC/C,IAAI,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,CAAC;QAC/D,IAAI,CAAC,gBAAgB,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,qBAAqB,CAAC;IAC5E,CAAC;IAEM,IAAI;QACT,OAAO,IAAA,uBAAa,EAAa,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,QAAgB;QACvC,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC7C,MAAM,mBAAmB,GAAG,IAAI,CAAC,UAAU,GAAG,QAAQ,GAAG,YAAY,CAAC;QACtE,MAAM,OAAO,GAAG,OAAO,CAAC;QAExB,MAAM,aAAa,GAAG,MAAM,IAAA,wBAAc,EAAa,IAAI,CAAC,UAAU,EAAE;YACtE,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,mBAAmB;SACzB,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,aAAa,CAAC,gBAAgB,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAc,EAAa,IAAI,CAAC,UAAU,EAAE;YACjE,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,cAAc;YACnB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,UAAU;gBACV,OAAO;aACR,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAC;SACjB;aAAM;YACL,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAC;SACtB;IACH,CAAC;CACF;AAxCD,yBAwCC"}
+{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../../../../src/lib/analytics/recipe/recipe.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AA6BzC,MAAM,CAAC,OAAO,OAAO,MAAM;IAIW;IAHnB,UAAU,CAAS;IACnB,gBAAgB,CAAS;IAE1C,YAAoC,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QACxD,IAAI,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,CAAC;QAC/D,IAAI,CAAC,gBAAgB,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,qBAAqB,CAAC;IAC5E,CAAC;IAEM,IAAI;QACT,OAAO,aAAa,CAAa,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAChF,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,QAAgB;QACvC,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC7C,MAAM,mBAAmB,GAAG,IAAI,CAAC,UAAU,GAAG,QAAQ,GAAG,YAAY,CAAC;QACtE,MAAM,OAAO,GAAG,OAAO,CAAC;QAExB,MAAM,aAAa,GAAG,MAAM,cAAc,CAAa,IAAI,CAAC,UAAU,EAAE;YACtE,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,mBAAmB;SACzB,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,aAAa,CAAC,gBAAgB,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAa,IAAI,CAAC,UAAU,EAAE;YACjE,MAAM,EAAE,MAAM;YACd,GAAG,EAAE,cAAc;YACnB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,UAAU;gBACV,OAAO;aACR,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;CACF"}