@salesforce/plugin-data 3.1.11 → 3.2.1

package/lib/reporters/csvReporter.js

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2023, 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
+ */
+import { EOL } from 'node:os';
+import { ux } from '@oclif/core';
+import { get, getNumber, isString } from '@salesforce/ts-types';
+import { getAggregateAliasOrName, maybeMassageAggregates } from './reporters.js';
+import { QueryReporter, logFields, isSubquery, isAggregate } from './reporters.js';
+export class CsvReporter extends QueryReporter {
+    constructor(data, columns) {
+        super(data, columns);
+    }
+    display() {
+        const fields = logFields(this.logger)(this.data.query)(this.columns);
+        const aggregates = fields.filter(isAggregate);
+        const preppedData = this.data.result.records.map(maybeMassageAggregates(aggregates));
+        const attributeNames = getColumns(preppedData)(fields);
+        [
+            // header row
+            attributeNames.map(escape).join(SEPARATOR),
+            // data
+            ...preppedData.map((row) => attributeNames.map(getFieldValue(row)).join(SEPARATOR)),
+        ].map((line) => ux.log(line));
+    }
+}
+const getFieldValue = (row) => (fieldName) => {
+    // try get(row, name) first, then if it fails, default to row[name]. The default will happen in bulk cases.
+    // the standard case returns {field:{nested: 'value'}}, while the bulk will return {field.nested: 'value'}
+    const value = get(row, fieldName, row[fieldName]);
+    if (isString(value)) {
+        return escape(value);
+        // if value is null, then typeof value === 'object' so check before typeof to avoid illegal csv
+    }
+    else if (value === null) {
+        return;
+    }
+    else if (typeof value === 'object') {
+        return escape(JSON.stringify(value));
+    }
+    return value;
+};
+export const getMaxRecord = (allRecords) => (fieldName) => allRecords.reduce((max, record) => Math.max(max, getNumber(get(record, fieldName), 'totalSize', 0)), 0);
+export const getColumns = (records) => (fields) => {
+    // If there are subqueries, we need to get the max child length for each subquery.
+    // For function fields, like avg(total).
+    const maxRecordsPerField = new Map(fields.filter(isSubquery).map((field) => [field.name, getMaxRecord(records)(field.name)]));
+    return [...maxRecordsPerField.values()].some((n) => n > 0)
+        ? fields.flatMap(csvAttributeNamesFromField(maxRecordsPerField)) // flatten nested objects from the query down to a flat file
+        : fields.map((field) => field.name); // simple case, no aggregates or subqueries
+};
+/**
+ * Escape a value to be placed in a CSV row. We follow rfc 4180
+ * https://tools.ietf.org/html/rfc4180#section-2 and will not surround the
+ * value in quotes if it doesn't contain the separator, double quote, or EOL.
+ *
+ * @param value The escaped value
+ */
+export const escape = (value) => {
+    if (value && SHOULD_QUOTE_REGEXP.test(value)) {
+        return `"${value.replace(/"/gi, '""')}"`;
+    }
+    return value;
+};
+const SEPARATOR = ',';
+const DOUBLE_QUOTE = '"';
+const SHOULD_QUOTE_REGEXP = new RegExp(`[${SEPARATOR}${DOUBLE_QUOTE}${EOL}]`);
+const csvAttributeNamesFromField = (typeLengths) => (field) => typeLengths.has(field.name)
+    ? subQueryAttributeNames(typeLengths.get(field.name) ?? 0)(field)
+    : [getAggregateAliasOrName(field)];
+// to flatten nested objects from the query down to a flat file, we need to construct column names
+const subQueryAttributeNames = (length) => (field) => Array.from({ length }).flatMap((v, index) => [
+    `${field.name}.totalSize`,
+    ...(field.fields ?? []).map((subfield) => `${field.name}.records.${index}.${subfield.name}`),
+]);
+//# sourceMappingURL=csvReporter.js.map

package/lib/reporters/csvReporter.js.map

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

package/lib/reporters/humanReporter.js

@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2023, 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
+ */
+import { ux } from '@oclif/core';
+import chalk from 'chalk';
+import { get, getArray, isPlainObject, isString } from '@salesforce/ts-types';
+import { Messages } from '@salesforce/core';
+import { FieldType } from '../dataSoqlQueryTypes.js';
+import { QueryReporter, logFields, isSubquery, isAggregate, getAggregateAliasOrName } from './reporters.js';
+import { maybeMassageAggregates } from './reporters.js';
+export const nullString = chalk.bold('null');
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+export const messages = Messages.loadMessages('@salesforce/plugin-data', 'soql.query');
+export class HumanReporter extends QueryReporter {
+    constructor(data, columns) {
+        super(data, columns);
+    }
+    display() {
+        logFields(this.logger)(this.data.query)(this.columns);
+        const { attributeNames: columnNames, children, aggregates } = parseFields(this.columns);
+        const fieldMap = mapFieldsByName(this.columns);
+        // in case of count() there are no records, but there is a totalSize
+        const totalCount = this.data.result.records.length ? this.data.result.records.length : this.data.result.totalSize;
+        const preppedData = this.data.result.records
+            .map(removeAttributesFromObject)
+            .map(maybeMassageAggregates(aggregates))
+            .flatMap(maybeMassageSubqueries(children))
+            .map(massageJson(fieldMap));
+        printTable(preppedData, columnNames, totalCount);
+    }
+}
+export const parseFields = (fields) => ({
+    attributeNames: fields.flatMap(humanNamesFromField),
+    children: fields.filter(isSubquery).map((field) => field.name),
+    aggregates: fields.filter(isAggregate),
+});
+export const prepColumns = (columns) => {
+    const formattedColumns = {};
+    columns.filter(isString).map((field) => (formattedColumns[field] = {
+        header: field.toUpperCase(),
+        get: (row) => {
+            // first test if key exists, if so, return value
+            if (Reflect.has(row, field)) {
+                return Reflect.get(row, field) ?? '';
+            }
+            else {
+                // if not, try to find it query
+                return get(row, field) ?? '';
+            }
+        },
+    }));
+    return formattedColumns;
+};
+/** find null/undefined and replace it with a styled string */
+export const prepNullValues = (record) => isPlainObject(record)
+    ? Object.fromEntries(Object.entries(record).map(([key, value]) => [key, maybeReplaceNulls(maybeRecurseNestedObjects(value))]))
+    : record;
+const maybeReplaceNulls = (value) => value ?? nullString;
+const maybeRecurseNestedObjects = (value) => (isPlainObject(value) ? prepNullValues(value) : value);
+const printTable = (records, columns, totalCount) => {
+    ux.table(records.map(prepNullValues), prepColumns(columns));
+    ux.log(chalk.bold(messages.getMessage('displayQueryRecordsRetrieved', [totalCount])));
+};
+const humanNamesFromField = (field) => isSubquery(field)
+    ? (field.fields ?? [])?.map((subfield) => `${field.name}.${subfield.name}`)
+    : [getAggregateAliasOrName(field)];
+/**
+ * some fields will return a JSON object that isn't accessible via the query (SELECT Metadata FROM RemoteProxy)
+ * some will return a JSON that IS accessible via the query (SELECT owner.Profile.Name FROM Lead)
+ * querying (SELECT Metadata.isActive FROM RemoteProxy) throws a SOQL validation error, so we have to display the entire Metadata object
+ */
+export const massageJson = (fieldMap) => (queryRow) => Object.fromEntries(Object.entries(queryRow).flatMap(([k, v]) => maybeReplaceJson(fieldMap.get(k))([k, v])));
+const maybeReplaceJson = (field) => ([key, value]) => {
+    if (isPlainObject(value) && field?.fieldType === FieldType.field) {
+        return [[key, JSON.stringify(value, null, 2)]];
+    }
+    if (isPlainObject(value) && field?.fields?.length && value) {
+        return field.fields.map((subfield) => [`${key}.${subfield.name}`, get(value, `records[0].${subfield.name}`)]);
+    }
+    return [[key, value]];
+};
+export const mapFieldsByName = (fields) => new Map(fields.map((field) => [field.name, field]));
+export const maybeMassageSubqueries = (children) => (queryRow) => children.length ? massageSubqueries(children)(queryRow) : [queryRow];
+const prependWithDot = (parent) => ([k, v]) => [`${parent}.${k}`, v];
+const replaceNullValue = ([k, v]) => [k, maybeReplaceNulls(v)];
+const massageSubqueries = (children) => (queryRow) => {
+    const childrenRows = children.map(getChildRecords(queryRow));
+    const childrenSet = new Set(children);
+    // the first (0-index) child's keys are renamed and transferred onto the parent
+    const childEntriesForParent = childrenRows
+        .flatMap(([childFieldName, childRecords]) => Object.entries(childRecords[0] ?? {})
+        .map(prependWithDot(childFieldName))
+        .flatMap(resolveObjects)
+        .map(replaceNullValue))
+        .filter(removeAttributesfromEntry);
+    // all other children, if any, are added to a new array of Objects
+    const subResults = childrenRows.flatMap(([childFieldName, childRecords]) => childRecords
+        .slice(1)
+        .map((r) => Object.entries(r).map(prependWithDot(childFieldName)).flatMap(resolveObjects).map(replaceNullValue))
+        .map((entries) => Object.fromEntries(entries))
+        .filter(removeEmptyObjects));
+    const parentEntries = Object.entries(queryRow)
+        // remove known children from the original object
+        .filter(([key]) => !childrenSet.has(key))
+        .concat(childEntriesForParent);
+    return [Object.fromEntries(parentEntries), ...subResults];
+};
+/** query has subQueries that result in arrays of records */
+const getChildRecords = (queryRow) => (child) => [child, getArray(get(queryRow, child), 'records', []).map(removeAttributesFromObject)];
+/** Query has foo.bar.baz (upward references to parents).  This recursively flattens those object fields to match the query columns */
+const resolveObjects = ([k, v]) => isPlainObject(v)
+    ? Object.entries(v).filter(removeAttributesfromEntry).map(prependWithDot(k)).flatMap(resolveObjects)
+    : [[k, v]];
+const removeAttributesfromEntry = ([k]) => k !== 'attributes';
+const removeAttributesFromObject = (record) => Object.fromEntries(Object.entries(record).filter(removeAttributesfromEntry));
+const removeEmptyObjects = (record) => Object.keys(record).length > 0;
+//# sourceMappingURL=humanReporter.js.map

package/lib/reporters/humanReporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"humanReporter.js","sourceRoot":"","sources":["../../src/reporters/humanReporter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAY,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAS,SAAS,EAAmB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC5G,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAYxD,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAE7C,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;AAEvF,MAAM,OAAO,aAAc,SAAQ,aAAa;IAC9C,YAAmB,IAAqB,EAAE,OAAgB;QACxD,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvB,CAAC;IAEM,OAAO;QACZ,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxF,MAAM,QAAQ,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,oEAAoE;QACpE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QAClH,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO;aACzC,GAAG,CAAC,0BAA0B,CAAC;aAC/B,GAAG,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;aACvC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;aACzC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE9B,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;IACnD,CAAC;CACF;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAe,EAAgB,EAAE,CAAC,CAAC;IAC7D,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC;IACnD,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;IAC9D,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;CACvC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAgC,EAAyC,EAAE;IACrG,MAAM,gBAAgB,GAA0C,EAAE,CAAC;IACnE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAC1B,CAAC,KAAK,EAAE,EAAE,CACR,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG;QACzB,MAAM,EAAE,KAAK,CAAC,WAAW,EAAE;QAC3B,GAAG,EAAE,CAAC,GAAG,EAAU,EAAE;YACnB,gDAAgD;YAChD,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC5B,OAAQ,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAY,IAAI,EAAE,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,+BAA+B;gBAC/B,OAAQ,GAAG,CAAC,GAAG,EAAE,KAAK,CAAY,IAAI,EAAE,CAAC;YAC3C,CAAC;QACH,CAAC;KACF,CAAC,CACL,CAAC;IACF,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAEF,8DAA8D;AAC9D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAI,MAAS,EAAK,EAAE,CAChD,aAAa,CAAC,MAAM,CAAC;IACnB,CAAC,CAAE,MAAM,CAAC,WAAW,CACjB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACnG;IACT,CAAC,CAAC,MAAM,CAAC;AAEb,MAAM,iBAAiB,GAAG,CAAI,KAAQ,EAAc,EAAE,CAAC,KAAK,IAAI,UAAU,CAAC;AAC3E,MAAM,yBAAyB,GAAG,CAAI,KAAQ,EAAK,EAAE,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAE7G,MAAM,UAAU,GAAG,CAAC,OAAwB,EAAE,OAAgC,EAAE,UAAkB,EAAQ,EAAE;IAC1G,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5D,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,8BAA8B,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,KAAY,EAAY,EAAE,CACrD,UAAU,CAAC,KAAK,CAAC;IACf,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC3E,CAAC,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;AAEvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GACtB,CAAC,QAA4B,EAAE,EAAE,CACjC,CAAC,QAAuB,EAAiB,EAAE,CACzC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEhH,MAAM,gBAAgB,GACpB,CAAC,KAAa,EAAE,EAAE,CAClB,CAAC,CAAC,GAAG,EAAE,KAAK,CAAe,EAAkB,EAAE;IAC7C,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,EAAE,SAAS,KAAK,SAAS,CAAC,KAAK,EAAE,CAAC;QACjE,OAAO,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,KAAK,EAAE,CAAC;QAC3D,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,KAAK,EAAE,cAAc,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAChH,CAAC;IACD,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAe,EAAsB,EAAE,CACrE,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;AAEtD,MAAM,CAAC,MAAM,sBAAsB,GACjC,CAAC,QAAkB,EAAE,EAAE,CACvB,CAAC,QAAuB,EAAmB,EAAE,CAC3C,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AAEzE,MAAM,cAAc,GAClB,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAe,EAAgB,EAAE,CACrC,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAE1B,MAAM,gBAAgB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAe,EAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;AAE3F,MAAM,iBAAiB,GACrB,CAAC,QAAkB,EAAE,EAAE,CACvB,CAAC,QAAuB,EAAmB,EAAE;IAC3C,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAEtC,+EAA+E;IAC/E,MAAM,qBAAqB,GAAG,YAAY;SACvC,OAAO,CAAC,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,EAAE,EAAE,CAC1C,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SAClC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;SACnC,OAAO,CAAC,cAAc,CAAC;SACvB,GAAG,CAAC,gBAAgB,CAAC,CACzB;SACA,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAErC,kEAAkE;IAClE,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,EAAE,EAAE,CACzE,YAAY;SACT,KAAK,CAAC,CAAC,CAAC;SACR,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;SAC/G,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SAC7C,MAAM,CAAC,kBAAkB,CAAC,CAC9B,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC5C,iDAAiD;SAChD,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SACxC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAEjC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEJ,4DAA4D;AAC5D,MAAM,eAAe,GACnB,CAAC,QAAuB,EAAE,EAAE,CAC5B,CAAC,KAAa,EAA2C,EAAE,CACzD,CAAC,KAAK,EAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,EAAE,CAAqB,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC;AAEhH,sIAAsI;AACtI,MAAM,cAAc,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAe,EAAkB,EAAE,CAC9D,aAAa,CAAC,CAAC,CAAC;IACd,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC;IACpG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEf,MAAM,yBAAyB,GAAG,CAAC,CAAC,CAAC,CAAe,EAAW,EAAE,CAAC,CAAC,KAAK,YAAY,CAAC;AACrF,MAAM,0BAA0B,GAAG,CAAC,MAAqB,EAAiB,EAAE,CAC1E,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC,CAAC;AAC/E,MAAM,kBAAkB,GAAG,CAAC,MAAqB,EAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC"}

package/lib/reporters/reporters.js

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2020, 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
+ */
+import { Logger, Messages } from '@salesforce/core';
+import { ux } from '@oclif/core';
+import { capitalCase } from 'change-case';
+import { FieldType } from '../dataSoqlQueryTypes.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const reporterMessages = Messages.loadMessages('@salesforce/plugin-data', 'reporter');
+export class QueryReporter {
+    logger;
+    columns = [];
+    data;
+    constructor(data, columns) {
+        this.logger = Logger.childFromRoot('reporter');
+        this.columns = columns;
+        this.data = data;
+    }
+}
+export class JsonReporter extends QueryReporter {
+    constructor(data, columns) {
+        super(data, columns);
+    }
+    display() {
+        ux.styledJSON({ status: 0, result: this.data.result });
+    }
+}
+export const formatTypes = ['human', 'csv', 'json'];
+export const getResultMessage = (jobInfo) => reporterMessages.getMessage('bulkV2Result', [
+    jobInfo.id,
+    capitalCase(jobInfo.state),
+    jobInfo.numberRecordsProcessed,
+    jobInfo.numberRecordsFailed,
+]);
+export const isAggregate = (field) => field.fieldType === FieldType.functionField;
+export const isSubquery = (field) => field.fieldType === FieldType.subqueryField;
+const getAggregateFieldName = (field) => field.alias ?? field.name;
+export const getAggregateAliasOrName = (field) => isAggregate(field) ? getAggregateFieldName(field) : field.name;
+/** if there are fields, log them by type/name; otherwise, log that there are no fields for the query  */
+export const logFields = (logger) => (query) => (fields) => {
+    if (fields?.length) {
+        logger?.info(`Found fields ${JSON.stringify(fields.map((field) => `${typeof field}.${field.name}`))}`);
+    }
+    else {
+        logger?.info(`No fields found for query "${query}"`);
+    }
+    return fields ?? [];
+};
+export const maybeMassageAggregates = (aggregates) => (queryRow) => aggregates.length ? renameAggregates(aggregates)(queryRow) : queryRow;
+/**
+ * replace ex: expr0 with the alias (if there is one) or name
+ *
+ * Aggregates are soql functions that aggregate data, like "SELECT avg(total)" and
+ * are returned in the data as exprX. Aggregates can have aliases, like "avg(total) totalAverage"
+ * and are returned in the data as the alias.
+ *
+ */
+export const renameAggregates = (aggregates) => (queryRow) => Object.fromEntries(Object.entries(queryRow).map(([k, v]) => {
+    const index = typeof k === 'string' ? k.match(/expr(\d+)/)?.[1] : undefined;
+    if (typeof index === 'string') {
+        const matchingAgg = aggregates.at(parseInt(index, 10));
+        return matchingAgg ? [getAggregateAliasOrName(matchingAgg), v] : [k, v];
+    }
+    return [k, v];
+}));
+//# sourceMappingURL=reporters.js.map

package/lib/reporters/reporters.js.map

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

package/lib/resumeBulkCommand.js

@@ -4,15 +4,17 @@
  * 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
  */
-import { Flags, loglevel, optionalOrgFlagWithDeprecations } from '@salesforce/sf-plugins-core';
+import { Flags, SfCommand, loglevel, optionalOrgFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
-import { isBulkV2RequestDone, transformResults, waitOrTimeout } from './bulkUtils.js';
-import { BulkBaseCommand } from './BulkBaseCommand.js';
+import { BulkV2 } from '@jsforce/jsforce-node/lib/api/bulk2.js';
+import { POLL_FREQUENCY_MS, isBulkV2RequestDone, remainingTime, transformResults } from './bulkUtils.js';
+import { displayBulkV2Result, getRemainingTimeStatus, setupLifecycleListeners } from './BulkBaseCommand.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-data', 'bulk.resume.command');
-export class ResumeBulkCommand extends BulkBaseCommand {
+export class ResumeBulkCommand extends SfCommand {
     static baseFlags = {
-        'target-org': { ...optionalOrgFlagWithDeprecations, summary: messages.getMessage('flags.targetOrg.summary') },
+        ...SfCommand.baseFlags,
+        'target-org': optionalOrgFlagWithDeprecations,
         'job-id': Flags.salesforceId({
             length: 18,
             char: 'i',
@@ -23,6 +25,7 @@ export class ResumeBulkCommand extends BulkBaseCommand {
         }),
         'use-most-recent': Flags.boolean({
             summary: messages.getMessage('flags.useMostRecent.summary'),
+            // don't use `exactlyOne` because this defaults to true
             default: true,
             exclusive: ['job-id'],
         }),
@@ -36,22 +39,33 @@ export class ResumeBulkCommand extends BulkBaseCommand {
         loglevel,
     };
     async resume(resumeOptions, wait) {
+        const endWaitTime = Date.now() + wait.milliseconds;
         this.spinner.start('Getting status');
         const conn = resumeOptions.options.connection;
-        this.job = conn.bulk2.job({ id: resumeOptions.jobInfo.id });
-        this.wait = wait.milliseconds;
-        this.endWaitTime = Date.now() + wait.milliseconds;
-        this.spinner.status = this.getRemainingTimeStatus();
-        this.setupLifecycleListeners();
-        await waitOrTimeout(this.job, wait.milliseconds);
-        const jobInfo = await this.job.check();
+        const isAsync = wait.milliseconds === 0;
+        // @ts-expect-error jsforce 2 vs 3 differences.
+        const bulk2 = new BulkV2(conn);
+        const job = bulk2.job('ingest', { id: resumeOptions.jobInfo.id });
+        this.spinner.status = getRemainingTimeStatus({ isAsync, endWaitTime });
+        setupLifecycleListeners({
+            job,
+            cmd: this,
+            isAsync,
+            apiVersion: conn.getApiVersion(),
+            username: conn.getUsername(),
+            endWaitTime,
+        });
+        if (Date.now() < endWaitTime) {
+            await job.poll(POLL_FREQUENCY_MS, remainingTime(Date.now())(endWaitTime));
+        }
+        const jobInfo = await job.check();
         this.spinner.stop();
-        this.displayBulkV2Result(jobInfo);
+        displayBulkV2Result({ jobInfo, username: conn.getUsername(), isAsync, cmd: this });
         const result = { jobInfo };
         if (!isBulkV2RequestDone(jobInfo) || !this.jsonEnabled()) {
             return result;
         }
-        result.records = transformResults(await this.job.getAllResults());
+        result.records = transformResults(await job.getAllResults());
         return result;
     }
 }

package/lib/resumeBulkCommand.js.map

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

package/messages/batcher.md

@@ -18,7 +18,7 @@ Batch Status
 
 Will poll the batch statuses every %s seconds.
 To fetch the status on your own, press CTRL+C and use the command:
-%s force%sdata%sbulk%sstatus -i %s -b [<batchId>]
+sf force data bulk status -i %s -b [<batchId>]
 
 # ExternalIdRequired
 
@@ -27,12 +27,12 @@ An External ID is required on %s to perform an upsert.
 # TimeOut
 
 The operation timed out. Check the status with command:
-%s force%sdata%sbulk%sstatus -i %s -b %s
+sf force data bulk status -i %s -b %s
 
 # CheckStatusCommand
 
 Check batch #%s’s status with the command:
-%s force%sdata%sbulk%sstatus -i %s -b %s
+sf force data bulk status -i %s -b %s
 
 # BatchQueued
 

package/messages/bulk.base.command.md

@@ -4,20 +4,20 @@ Bulk %s request %s started successfully
 
 # checkStatus
 
-Run command %s data %s resume -i %s -o %s to check status.
+Run command sf data %s resume -i %s -o %s to check status.
 
 # checkJobViaUi
 
 To review the details of this job, run:
-%s org open --target-org %s --path "/lightning/setup/AsyncApiJobStatus/page?address=%2F%s"
+sf org open --target-org %s --path "/lightning/setup/AsyncApiJobStatus/page?address=%2F%s"
 
 # remainingTimeStatus
 
-Remaining time: %d minutes.
+Remaining time: %d minutes
 
 # remainingRecordsStatus
 
-%d/%d/%d records successful/failed/processed.
+Processed %d | Success %d | Fail %d
 
 # bulkJobFailed
 

package/messages/bulk.resume.command.md

@@ -6,10 +6,6 @@ ID of the job you want to resume.
 
 Use the ID of the most recently-run bulk job.
 
-# flags.targetOrg.summary
-
-Org alias or username to use for the target org.
-
 # flags.wait.summary
 
 Number of minutes to wait for the command to complete before displaying the results.

package/messages/importApi.md

@@ -40,11 +40,11 @@ Data plan file %s did not validate against the schema. Errors: %s.
 
 # dataPlanValidationErrorActions
 
-- Did you run the "%s data%sexport%stree" command with the --plan flag?
+- Did you run the "sf data export tree" command with the --plan flag?
 
 - Make sure you're importing a plan definition file.
 
-- Get help with the import plan schema by running "%s data%simport%stree --config-help".
+- Get help with the import plan schema by running "sf data import tree --config-help".
 
 # FlsError
 

package/messages/reporter.md

@@ -1,3 +1,3 @@
 # bulkV2Result
 
-Job %s Status %s Records processed %d. Records failed %d.
+Job %s | Status %s | Records processed %d | Records failed %d

package/messages/soql.query.md

@@ -56,10 +56,6 @@ Include deleted records. By default, deleted records are not returned.
 
 Time to wait for the command to finish, in minutes.
 
-# flags.targetOrg.summary
-
-Org alias or username to use for the target org.
-
 # displayQueryRecordsRetrieved
 
 Total number of records retrieved: %s.