@salesforce/plugin-data 2.2.0 → 2.3.0

package/lib/commands/data/delete/bulk.js

@@ -6,73 +6,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * 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
  */
-const fs = require("fs");
 const core_1 = require("@salesforce/core");
-const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
-const kit_1 = require("@salesforce/kit");
-const flags_1 = require("../../../flags");
-const batcher_1 = require("../../../batcher");
+const bulkDataRequestCache_1 = require("../../../bulkDataRequestCache");
+const bulkOperationCommand_1 = require("../../../bulkOperationCommand");
+const bulkUtils_1 = require("../../../bulkUtils");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.load('@salesforce/plugin-data', 'bulk.delete', [
-    'examples',
-    'summary',
-    'description',
-    'flags.csvfile',
-    'flags.sobjecttype',
-    'flags.wait',
-]);
-class Delete extends sf_plugins_core_1.SfCommand {
+const messages = core_1.Messages.load('@salesforce/plugin-data', 'bulkv2.delete', ['examples', 'summary', 'description']);
+class Delete extends bulkOperationCommand_1.BulkOperationCommand {
     async run() {
         const { flags } = await this.parse(Delete);
-        let result;
-        try {
-            const conn = flags['target-org'].getConnection(flags['api-version']);
-            this.spinner.start('Bulk Delete');
-            const csvRecords = fs.createReadStream(flags.file, { encoding: 'utf-8' });
-            const job = conn.bulk.createJob(flags.sobject, 'delete');
-            const batcher = new batcher_1.Batcher(conn, new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }));
-            result = await batcher.createAndExecuteBatches(job, csvRecords, flags.sobject, flags.wait?.minutes);
-            this.spinner.stop();
-            return result;
-        }
-        catch (e) {
-            this.spinner.stop('error');
-            if (!(e instanceof Error)) {
-                throw e;
-            }
-            throw core_1.SfError.wrap(e);
-        }
+        const conn = flags['target-org'].getConnection(flags['api-version']);
+        await (0, bulkUtils_1.validateSobjectType)(flags.sobject, conn);
+        return this.runBulkOperation(flags.sobject, flags.file, conn, flags.async ? 0 : flags.wait?.minutes, 'delete');
+    }
+    // eslint-disable-next-line class-methods-use-this
+    async getCache() {
+        return bulkDataRequestCache_1.BulkDeleteRequestCache.create();
     }
 }
 exports.default = Delete;
 Delete.examples = messages.getMessages('examples');
 Delete.summary = messages.getMessage('summary');
 Delete.description = messages.getMessage('description');
-Delete.aliases = ['force:data:bulk:delete'];
-Delete.deprecateAliases = true;
-Delete.flags = {
-    ...flags_1.orgFlags,
-    file: sf_plugins_core_1.Flags.file({
-        char: 'f',
-        summary: messages.getMessage('flags.csvfile'),
-        required: true,
-        exists: true,
-        aliases: ['csvfile'],
-        deprecateAliases: true,
-    }),
-    sobject: sf_plugins_core_1.Flags.string({
-        char: 's',
-        summary: messages.getMessage('flags.sobjecttype'),
-        required: true,
-        aliases: ['sobjecttype'],
-        deprecateAliases: true,
-    }),
-    wait: sf_plugins_core_1.Flags.duration({
-        char: 'w',
-        unit: 'minutes',
-        summary: messages.getMessage('flags.wait'),
-        min: 0,
-        default: kit_1.Duration.minutes(0),
-    }),
-};
 //# sourceMappingURL=bulk.js.map

package/lib/commands/data/delete/bulk.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulk.js","sourceRoot":"","sources":["../../../../src/commands/data/delete/bulk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bulk.js","sourceRoot":"","sources":["../../../../src/commands/data/delete/bulk.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,2CAA4C;AAC5C,wEAAuE;AACvE,wEAAqE;AAErE,kDAAyD;AAEzD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,yBAAyB,EAAE,eAAe,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;AAEnH,MAAqB,MAAO,SAAQ,2CAAoB;IAK/C,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE3C,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAErE,MAAM,IAAA,+BAAmB,EAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE/C,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjH,CAAC;IAED,kDAAkD;IACxC,KAAK,CAAC,QAAQ;QACtB,OAAO,6CAAsB,CAAC,MAAM,EAAE,CAAC;IACzC,CAAC;;AAlBH,yBAmBC;AAlBwB,eAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,cAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC"}

package/lib/commands/data/delete/record.js

@@ -60,7 +60,9 @@ Delete.flags = {
         aliases: ['sobjecttype'],
         deprecateAliases: true,
     }),
+    // eslint-disable-next-line sf-plugin/id-flag-suggestions
     'record-id': sf_plugins_core_1.Flags.salesforceId({
+        length: 'both',
         char: 'i',
         summary: messages.getMessage('flags.recordId'),
         exactlyOne: ['where', 'record-id'],

package/lib/commands/data/delete/record.js.map

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../../src/commands/data/delete/record.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2CAAqD;AAErD,iEAA+D;AAC/D,0CAAuD;AACvD,sDAAmE;AAEnE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;AAEnF,MAAqB,MAAO,SAAQ,2BAAqB;IAqChD,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACtC,IAAI,MAAM,GAAG,SAAS,CAAC;QAEvB,IAAI;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,iBAAiB,CAAC;gBACnC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO;gBACjE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;YAC5D,mDAAmD;YACnD,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,IAAK,CAAC,MAAM,IAAA,mBAAK,EAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAe,CAAC,CAAC,CAAC,EAAa,CAAC;YACjH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACpE,IAAI,MAAM,CAAC,OAAO,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;aAC7D;iBAAM;gBACL,MAAM,GAAG,QAAQ,CAAC;gBAClB,MAAM,MAAM,GAAG,IAAA,kCAAoB,EAAC,MAAM,CAAC,CAAC;gBAC5C,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;aAC5D;YACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,QAAQ,CAAC;YAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,EAAE;gBAC3B,MAAM,GAAG,CAAC;aACX;YACD,MAAM,IAAI,cAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;SAC1C;IACH,CAAC;;AAlEH,yBAmEC;AAlEwB,cAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,eAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACrD,cAAO,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAC9B,uBAAgB,GAAG,IAAI,CAAC;AAExB,YAAK,GAAG;IAC7B,GAAG,gBAAQ;IACX,OAAO,EAAE,uBAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QAC7C,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,WAAW,EAAE,uBAAK,CAAC,YAAY,CAAC;QAC9B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC;QAC9C,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC;QAClC,OAAO,EAAE,CAAC,WAAW,CAAC;QACtB,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,KAAK,EAAE,uBAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAC3C,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC;KACnC,CAAC;IACF,iBAAiB,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC/B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;QACnD,OAAO,EAAE,CAAC,eAAe,CAAC;QAC1B,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,OAAO,EAAE,mBAAW;CACrB,CAAC"}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../../src/commands/data/delete/record.ts"],"names":[],"mappings":"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"}

package/lib/commands/data/delete/resume.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * 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
+ */
+const core_1 = require("@salesforce/core");
+const bulkDataRequestCache_1 = require("../../../bulkDataRequestCache");
+const resumeBulkCommand_1 = require("../../../resumeBulkCommand");
+const bulkUtils_1 = require("../../../bulkUtils");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-data', 'bulk.delete.resume');
+class DeleteResume extends resumeBulkCommand_1.ResumeBulkCommand {
+    async run() {
+        const { flags } = await this.parse(DeleteResume);
+        const cache = await bulkDataRequestCache_1.BulkDeleteRequestCache.create();
+        const resumeOptions = await cache.resolveResumeOptionsFromCache(flags['job-id'], flags['use-most-recent'], flags['target-org'], flags['api-version']);
+        this.connection = resumeOptions.options.connection;
+        this.operation = 'delete';
+        resumeOptions.options.operation = 'delete';
+        const resumeResults = await this.resume(resumeOptions, flags.wait);
+        if ((0, bulkUtils_1.isBulkV2RequestDone)(resumeResults.jobInfo)) {
+            await bulkDataRequestCache_1.BulkDeleteRequestCache.unset(resumeOptions.jobInfo.id);
+        }
+        return resumeResults;
+    }
+}
+exports.default = DeleteResume;
+DeleteResume.summary = messages.getMessage('summary');
+DeleteResume.description = messages.getMessage('description');
+DeleteResume.examples = messages.getMessages('examples');
+DeleteResume.deprecateAliases = true;
+//# sourceMappingURL=resume.js.map

package/lib/commands/data/delete/resume.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/data/delete/resume.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,2CAA4C;AAE5C,wEAAuE;AACvE,kEAA+D;AAC/D,kDAAyD;AAEzD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,oBAAoB,CAAC,CAAC;AAExF,MAAqB,YAAa,SAAQ,qCAAiB;IAMlD,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,6CAAsB,CAAC,MAAM,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,6BAA6B,CAC7D,KAAK,CAAC,QAAQ,CAAC,EACf,KAAK,CAAC,iBAAiB,CAAC,EACxB,KAAK,CAAC,YAAY,CAAC,EACnB,KAAK,CAAC,aAAa,CAAC,CACrB,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC;QACnD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,aAAa,CAAC,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC3C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACnE,IAAI,IAAA,+BAAmB,EAAC,aAAa,CAAC,OAAO,CAAC,EAAE;YAC9C,MAAM,6CAAsB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC9D;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;;AAvBH,+BAwBC;AAvBwB,oBAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,wBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,qBAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,6BAAgB,GAAG,IAAI,CAAC"}

package/lib/commands/data/get/record.js

@@ -50,7 +50,9 @@ Get.flags = {
         aliases: ['sobjecttype'],
         deprecateAliases: true,
     }),
+    // eslint-disable-next-line sf-plugin/id-flag-suggestions
     'record-id': sf_plugins_core_1.Flags.salesforceId({
+        length: 'both',
         char: 'i',
         summary: messages.getMessage('flags.recordId'),
         exactlyOne: ['where', 'record-id'],

package/lib/commands/data/get/record.js.map

@@ -1 +1 @@
-{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../../src/commands/data/get/record.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"record.js","sourceRoot":"","sources":["../../../../src/commands/data/get/record.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2CAAqD;AAErD,mDAAiD;AACjD,iEAA+D;AAC/D,0CAAuD;AACvD,sDAA8D;AAE9D,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;AAEhF,MAAqB,GAAI,SAAQ,2BAAiB;IAuCzC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,KAAK,CAAC,iBAAiB,CAAC;YACnC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO;YACjE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAC5D,IAAI;YACF,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,IAAK,CAAC,MAAM,IAAA,mBAAK,EAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAe,CAAC,CAAC,CAAC,EAAa,CAAC;YACjH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACrE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;gBACvB,IAAA,6BAAe,EAAC,MAAe,CAAC,CAAC;aAClC;YACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACpB,OAAO,IAAA,oBAAS,EAAC,MAAM,CAAW,CAAC;SACpC;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5B,MAAM,IAAI,cAAO,CAAE,GAAa,CAAC,OAAO,EAAG,GAAa,CAAC,IAAI,CAAC,CAAC;SAChE;IACH,CAAC;;AAzDH,sBA0DC;AAzDwB,WAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,eAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,YAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AACrD,WAAO,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAC3B,oBAAgB,GAAG,IAAI,CAAC;AAExB,SAAK,GAAG;IAC7B,GAAG,gBAAQ;IACX,OAAO,EAAE,uBAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QAC7C,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,yDAAyD;IACzD,WAAW,EAAE,uBAAK,CAAC,YAAY,CAAC;QAC9B,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC;QAC9C,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC;QAClC,OAAO,EAAE,CAAC,WAAW,CAAC;QACtB,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,KAAK,EAAE,uBAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAC3C,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC;KACnC,CAAC;IACF,iBAAiB,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC/B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;QACnD,OAAO,EAAE,CAAC,eAAe,CAAC;QAC1B,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,OAAO,EAAE,mBAAW;CACrB,CAAC"}

package/lib/commands/data/import/tree.js

@@ -20,7 +20,7 @@ class Import extends sf_plugins_core_1.SfCommand {
     async run() {
         const { flags } = await this.parse(Import);
         const logger = await core_1.Logger.child('Import');
-        const importApi = new importApi_1.ImportApi(flags['target-org']);
+        const importApi = new importApi_1.ImportApi(flags['target-org'], this.config.bin, this.config.pjson.oclif.topicSeparator ?? ':');
         if (flags['config-help']) {
             // Display config help and return
             const schema = importApi.getSchema();

package/lib/commands/data/import/tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../src/commands/data/import/tree.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,2CAAmE;AACnE,mDAA0D;AAC1D,iEAAqF;AACrF,gEAA2E;AAC3E,0CAA0C;AAE1C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,aAAa,CAAC,CAAC;AAQjF;;GAEG;AACH,MAAqB,MAAO,SAAQ,2BAAmC;IAoC9D,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,aAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAErD,IAAI,KAAK,CAAC,aAAa,CAAC,EAAE;YACxB,iCAAiC;YACjC,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;YACrC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;gBACvB,IAAI,oBAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;aAChF;YAED,OAAO,MAAM,CAAC;SACf;QAED,MAAM,YAAY,GAAiB;YACjC,gBAAgB,EAAE,KAAK,CAAC,KAAK;YAC7B,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;YAClC,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAE3D,MAAM,eAAe,GAAmB,CAAC,aAAa,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACrF,MAAM,IAAI,GAAG,IAAA,oBAAS,EAAC,aAAa,CAAC,YAAY,EAAE,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YAC/E,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE;YAC1B,KAAK,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE;YACjC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;YACxB,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACrB,CAAC,CAAC;QACH,OAAO,eAAe,CAAC;IACzB,CAAC;;AAvEH,yBAwEC;AAvEwB,cAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,kBAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,eAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,cAAO,GAAG,CAAC,wBAAwB,CAAC,CAAC;AACrC,uBAAgB,GAAG,IAAI,CAAC;AAExB,YAAK,GAAG;IAC7B,GAAG,gBAAQ;IACX,KAAK,EAAE,IAAA,sCAAoB,EAAC;QAC1B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAC3C,SAAS,EAAE,CAAC,MAAM,CAAC;QACnB,OAAO,EAAE,CAAC,kBAAkB,CAAC;QAC7B,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,IAAI,EAAE,uBAAK,CAAC,IAAI,CAAC;QACf,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;QAC1C,MAAM,EAAE,IAAI;KACb,CAAC;IACF,cAAc,EAAE,uBAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACjD,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,6CAA6C;IAC7C,aAAa,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC3B,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAChD,OAAO,EAAE,CAAC,YAAY,CAAC;QACvB,gBAAgB,EAAE,IAAI;KACvB,CAAC;CACH,CAAC"}
+{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../../src/commands/data/import/tree.ts"],"names":[],"mappings":"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"}

package/lib/commands/data/query/resume.js

@@ -11,25 +11,26 @@ const core_1 = require("@salesforce/core");
 const bulk_1 = require("jsforce/lib/api/bulk");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const flags_1 = require("../../../flags");
-const query_1 = require("../query");
+const queryUtils_1 = require("../../../queryUtils");
+const bulkDataRequestCache_1 = require("../../../bulkDataRequestCache");
 core_1.Messages.importMessagesDirectory(__dirname);
 const reportMessages = core_1.Messages.loadMessages('@salesforce/plugin-data', 'bulk.report');
 // needed by the flags loaded from the other command
-core_1.Messages.loadMessages('@salesforce/plugin-data', 'soql.query');
+const queryMessages = core_1.Messages.loadMessages('@salesforce/plugin-data', 'soql.query');
 class BulkQueryReport extends sf_plugins_core_1.SfCommand {
     async run() {
         const { flags } = await this.parse(BulkQueryReport);
-        const job = new bulk_1.QueryJobV2({
-            operation: 'query',
-            pollingOptions: { pollTimeout: 0, pollInterval: 0 },
-            query: '',
-            connection: flags['target-org'].getConnection(flags['api-version']),
-        });
-        job.jobInfo = { id: flags['bulk-query-id'] };
+        const cache = await bulkDataRequestCache_1.BulkQueryRequestCache.create();
+        const resumeOptions = await cache.resolveResumeOptionsFromCache(flags['bulk-query-id'], flags['use-most-recent'], flags['target-org'], flags['api-version']);
+        const job = new bulk_1.QueryJobV2({ ...resumeOptions.options, operation: 'query' });
+        job.jobInfo = resumeOptions.jobInfo;
         const results = await job.getResults();
-        const queryResult = (0, query_1.transformBulkResults)(results, '');
+        const queryResult = (0, queryUtils_1.transformBulkResults)(results, '');
         if (!this.jsonEnabled()) {
-            (0, query_1.displayResults)({ ...queryResult }, flags['result-format']);
+            (0, queryUtils_1.displayResults)({ ...queryResult }, flags['result-format']);
+        }
+        if (queryResult.result.done) {
+            await bulkDataRequestCache_1.BulkQueryRequestCache.unset(resumeOptions.jobInfo.id);
         }
         return queryResult.result;
     }
@@ -41,15 +42,22 @@ BulkQueryReport.examples = reportMessages.getMessages('examples');
 BulkQueryReport.aliases = ['force:data:soql:bulk:report'];
 BulkQueryReport.deprecateAliases = true;
 BulkQueryReport.flags = {
-    ...flags_1.orgFlags,
-    'result-format': query_1.DataSoqlQueryCommand.flags['result-format'],
+    'target-org': { ...sf_plugins_core_1.optionalOrgFlagWithDeprecations, summary: queryMessages.getMessage('flags.targetOrg.summary') },
+    'api-version': sf_plugins_core_1.orgApiVersionFlagWithDeprecations,
+    loglevel: sf_plugins_core_1.loglevel,
+    'result-format': flags_1.resultFormatFlag,
     'bulk-query-id': sf_plugins_core_1.Flags.salesforceId({
+        length: 18,
         char: 'i',
-        required: true,
         startsWith: '750',
         summary: reportMessages.getMessage('flags.bulkQueryId'),
         aliases: ['bulkqueryid'],
         deprecateAliases: true,
     }),
+    'use-most-recent': sf_plugins_core_1.Flags.boolean({
+        char: 'r',
+        summary: reportMessages.getMessage('flags.useMostRecent.summary'),
+        exclusive: ['bulk-query-id'],
+    }),
 };
 //# sourceMappingURL=resume.js.map

package/lib/commands/data/query/resume.js.map

@@ -1 +1 @@
-{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/data/query/resume.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA4C;AAC5C,+CAAkD;AAClD,iEAA+D;AAC/D,0CAA0C;AAC1C,oCAAsF;AAGtF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,cAAc,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,aAAa,CAAC,CAAC;AACvF,oDAAoD;AACpD,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;AAE/D,MAAa,eAAgB,SAAQ,2BAAkB;IAoB9C,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,GAAG,GAAG,IAAI,iBAAU,CAAC;YACzB,SAAS,EAAE,OAAO;YAClB,cAAc,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE;YACnD,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;SACpE,CAAC,CAAC;QACH,GAAG,CAAC,OAAO,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEtD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACvB,IAAA,sBAAc,EAAC,EAAE,GAAG,WAAW,EAAE,EAAE,KAAK,CAAC,eAAe,CAA6B,CAAC,CAAC;SACxF;QACD,OAAO,WAAW,CAAC,MAAM,CAAC;IAC5B,CAAC;;AApCH,0CAqCC;AApCwB,uBAAO,GAAG,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AAC/C,2BAAW,GAAG,cAAc,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACvD,wBAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAClD,uBAAO,GAAG,CAAC,6BAA6B,CAAC,CAAC;AAC1C,gCAAgB,GAAG,IAAI,CAAC;AAExB,qBAAK,GAAG;IAC7B,GAAG,gBAAQ;IACX,eAAe,EAAE,4BAAoB,CAAC,KAAK,CAAC,eAAe,CAAC;IAC5D,eAAe,EAAE,uBAAK,CAAC,YAAY,CAAC;QAClC,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACvD,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,gBAAgB,EAAE,IAAI;KACvB,CAAC;CACH,CAAC"}
+{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/data/query/resume.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA4C;AAC5C,+CAAkD;AAClD,iEAMqC;AACrC,0CAAkD;AAClD,oDAA2E;AAE3E,wEAAsE;AAEtE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,cAAc,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,aAAa,CAAC,CAAC;AACvF,oDAAoD;AACpD,MAAM,aAAa,GAAG,eAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,YAAY,CAAC,CAAC;AAErF,MAAa,eAAgB,SAAQ,2BAAkB;IA2B9C,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,4CAAqB,CAAC,MAAM,EAAE,CAAC;QACnD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,6BAA6B,CAC7D,KAAK,CAAC,eAAe,CAAC,EACtB,KAAK,CAAC,iBAAiB,CAAC,EACxB,KAAK,CAAC,YAAY,CAAC,EACnB,KAAK,CAAC,aAAa,CAAC,CACrB,CAAC;QACF,MAAM,GAAG,GAAG,IAAI,iBAAU,CAAC,EAAE,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;QAC7E,GAAG,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,UAAU,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,IAAA,iCAAoB,EAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAEtD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACvB,IAAA,2BAAc,EAAC,EAAE,GAAG,WAAW,EAAE,EAAE,KAAK,CAAC,eAAe,CAAgB,CAAC,CAAC;SAC3E;QAED,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE;YAC3B,MAAM,4CAAqB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC7D;QAED,OAAO,WAAW,CAAC,MAAM,CAAC;IAC5B,CAAC;;AAlDH,0CAmDC;AAlDwB,uBAAO,GAAG,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AAC/C,2BAAW,GAAG,cAAc,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACvD,wBAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAClD,uBAAO,GAAG,CAAC,6BAA6B,CAAC,CAAC;AAC1C,gCAAgB,GAAG,IAAI,CAAC;AAExB,qBAAK,GAAG;IAC7B,YAAY,EAAE,EAAE,GAAG,iDAA+B,EAAE,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAAE;IAClH,aAAa,EAAE,mDAAiC;IAChD,QAAQ,EAAR,0BAAQ;IACR,eAAe,EAAE,wBAAgB;IACjC,eAAe,EAAE,uBAAK,CAAC,YAAY,CAAC;QAClC,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,GAAG;QACT,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,mBAAmB,CAAC;QACvD,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,iBAAiB,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC/B,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,cAAc,CAAC,UAAU,CAAC,6BAA6B,CAAC;QACjE,SAAS,EAAE,CAAC,eAAe,CAAC;KAC7B,CAAC;CACH,CAAC"}

package/lib/commands/data/query.js

@@ -6,15 +6,16 @@
  * 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 });
-exports.runSoqlQuery = exports.retrieveColumns = exports.transformBulkResults = exports.displayResults = exports.DataSoqlQueryCommand = void 0;
+exports.retrieveColumns = exports.DataSoqlQueryCommand = void 0;
 const fs = require("fs");
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
 const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const flags_1 = require("../../flags");
-const reporters_1 = require("../../reporters");
 const dataSoqlQueryTypes_1 = require("../../dataSoqlQueryTypes");
+const queryUtils_1 = require("../../queryUtils");
+const bulkDataRequestCache_1 = require("../../bulkDataRequestCache");
 core_1.Messages.importMessagesDirectory(__dirname);
 const messages = core_1.Messages.loadMessages('@salesforce/plugin-data', 'soql.query');
 class DataSoqlQueryCommand extends sf_plugins_core_1.SfCommand {
@@ -37,18 +38,16 @@ class DataSoqlQueryCommand extends sf_plugins_core_1.SfCommand {
         this.logger = await core_1.Logger.child('data:soql:query');
         const flags = (await this.parse(DataSoqlQueryCommand)).flags;
         try {
-            // soqlqueryfile will be be present if flags.query isn't. Oclif exactlyOne isn't quite that clever
+            // soqlqueryfile will be present if flags.query isn't. Oclif exactlyOne isn't quite that clever
             const queryString = flags.query ?? fs.readFileSync(flags.file, 'utf8');
             const conn = flags['target-org'].getConnection(flags['api-version']);
-            const ux = new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() });
             if (flags['result-format'] !== 'json')
                 this.spinner.start(messages.getMessage('queryRunningMessage'));
             const queryResult = flags.bulk
-                ? await runBulkSoqlQuery(conn, queryString, flags.async ? kit_1.Duration.minutes(0) : flags.wait, ux)
-                : await (0, exports.runSoqlQuery)(flags['use-tooling-api'] ? conn.tooling : conn, queryString, this.logger, ux, this.configAggregator.getInfo('org-max-query-limit').value);
+                ? await this.runBulkSoqlQuery(conn, queryString, flags.async ? kit_1.Duration.minutes(0) : flags.wait ?? kit_1.Duration.minutes(0))
+                : await this.runSoqlQuery(flags['use-tooling-api'] ? conn.tooling : conn, queryString, this.logger, this.configAggregator.getInfo('org-max-query-limit').value);
             if (!this.jsonEnabled()) {
-                // TODO: make the enum or string/options work correctly
-                (0, exports.displayResults)({ ...queryResult }, flags['result-format']);
+                (0, queryUtils_1.displayResults)({ ...queryResult }, flags['result-format']);
             }
             return queryResult.result;
         }
@@ -57,6 +56,52 @@ class DataSoqlQueryCommand extends sf_plugins_core_1.SfCommand {
                 this.spinner.stop();
         }
     }
+    /**
+     * Executes a SOQL query using the bulk 2.0 API
+     *
+     * @param connection
+     * @param query
+     * @param timeout
+     */
+    async runBulkSoqlQuery(connection, query, timeout) {
+        connection.bulk2.pollTimeout = timeout.milliseconds ?? kit_1.Duration.minutes(5).milliseconds;
+        let res;
+        try {
+            res = (await connection.bulk2.query(query)) ?? [];
+            return (0, queryUtils_1.transformBulkResults)(res, query);
+        }
+        catch (e) {
+            const err = e;
+            if (timeout.minutes === 0 && err.message.includes('Polling time out')) {
+                // async query, so we can't throw an error, suggest data:query:resume --queryid <id>
+                const cache = await bulkDataRequestCache_1.BulkQueryRequestCache.create();
+                await cache.createCacheEntryForRequest(err.jobId, connection.getUsername(), connection.getApiVersion());
+                this.log(messages.getMessage('bulkQueryTimeout', [err.jobId, err.jobId, connection.getUsername()]));
+                return { columns: [], result: { done: false, records: [], totalSize: 0, id: err.jobId }, query };
+            }
+            else {
+                throw core_1.SfError.wrap(err);
+            }
+        }
+    }
+    async runSoqlQuery(connection, query, logger, maxFetch) {
+        logger.debug('running query');
+        const options = {
+            autoFetch: true,
+            maxFetch: maxFetch ?? 50000,
+        };
+        const result = await connection.query(query, options);
+        if (result.records.length && result.totalSize > result.records.length) {
+            this.warn(`The query result is missing ${result.totalSize - result.records.length} records due to a ${maxFetch} record limit. Increase the number of records returned by setting the config value "org-max-query-limit" or the environment variable "SF_ORG_MAX_QUERY_LIMIT" to ${result.totalSize} or greater than ${maxFetch}.`);
+        }
+        logger.debug(`Query complete with ${result.totalSize} records returned`);
+        const columns = result.totalSize ? await (0, exports.retrieveColumns)(connection, query, logger) : [];
+        return {
+            query,
+            columns,
+            result,
+        };
+    }
 }
 exports.DataSoqlQueryCommand = DataSoqlQueryCommand;
 DataSoqlQueryCommand.summary = messages.getMessage('summary');
@@ -103,83 +148,9 @@ DataSoqlQueryCommand.flags = {
         dependsOn: ['bulk'],
         exclusive: ['wait'],
     }),
-    // TODO: use union type from
-    'result-format': sf_plugins_core_1.Flags.custom({
-        char: 'r',
-        summary: messages.getMessage('flags.resultFormat'),
-        options: ['human', 'json', 'csv'],
-        default: 'human',
-        aliases: ['resultformat'],
-        deprecateAliases: true,
-    })(),
+    'result-format': flags_1.resultFormatFlag,
     perflog: flags_1.perflogFlag,
 };
-const displayResults = (queryResult, resultFormat) => {
-    let reporter;
-    switch (resultFormat) {
-        case 'human':
-            reporter = new reporters_1.HumanReporter(queryResult, queryResult.columns);
-            break;
-        case 'json':
-            reporter = new reporters_1.JsonReporter(queryResult, queryResult.columns);
-            break;
-        case 'csv':
-            reporter = new reporters_1.CsvReporter(queryResult, queryResult.columns);
-            break;
-    }
-    // delegate to selected reporter
-    reporter.display();
-};
-exports.displayResults = displayResults;
-/**
- * transforms Bulk 2.0 results to match the SOQL query results
- *
- * @param results results object
- * @param query query string
- */
-const transformBulkResults = (results, query) => {
-    /*
-      bulk queries return a different payload, it's a [{column: data}, {column: data}]
-      so we just need to grab the first object, find the keys (columns) and create the columns
-       */
-    const columns = Object.keys(results[0] ?? {}).map((name) => ({
-        fieldType: dataSoqlQueryTypes_1.FieldType.field,
-        name,
-    }));
-    return {
-        columns,
-        result: { done: true, records: results, totalSize: results.length },
-        query,
-    };
-};
-exports.transformBulkResults = transformBulkResults;
-/**
- * Executs a SOQL query using the bulk 2.0 API
- *
- * @param connection
- * @param query
- * @param timeout
- * @param jsonEnabled
- */
-const runBulkSoqlQuery = async (connection, query, timeout = kit_1.Duration.seconds(10), ux) => {
-    connection.bulk2.pollTimeout = timeout.milliseconds ?? kit_1.Duration.minutes(5).milliseconds;
-    let res;
-    try {
-        res = (await connection.bulk2.query(query)) ?? [];
-        return (0, exports.transformBulkResults)(res, query);
-    }
-    catch (e) {
-        const err = e;
-        if (timeout.minutes === 0 && err.message.includes('Polling time out')) {
-            // async query, so we can't throw an error, suggest force:data:query:report --queryid <id>
-            ux.log(messages.getMessage('bulkQueryTimeout', [err.jobId, err.jobId, connection.getUsername()]));
-            return { columns: [], result: { done: false, records: [], totalSize: 0, id: err.jobId }, query };
-        }
-        else {
-            throw core_1.SfError.wrap(err);
-        }
-    }
-};
 const searchSubColumnsRecursively = (parent) => {
     const column = (0, ts_types_1.ensureJsonMap)(parent);
     const name = (0, ts_types_1.ensureString)(column.columnName);
@@ -194,6 +165,7 @@ const searchSubColumnsRecursively = (parent) => {
  *
  * @param connection
  * @param query
+ * @param logger
  */
 const retrieveColumns = async (connection, query, logger) => {
     logger?.debug('fetching columns for query');
@@ -261,23 +233,4 @@ const recursivelyFindColumns = (data) => {
     }
     return columns;
 };
-const runSoqlQuery = async (connection, query, logger, ux, maxFetch = 50000) => {
-    logger.debug('running query');
-    const options = {
-        autoFetch: true,
-        maxFetch,
-    };
-    const result = await connection.query(query, options);
-    if (result.records.length && result.totalSize > result.records.length) {
-        ux.warn(`The query result is missing ${result.totalSize - result.records.length} records due to a ${maxFetch} record limit. Increase the number of records returned by setting the config value "org-max-query-limit" or the environment variable "SF_ORG_MAX_QUERY_LIMIT" to ${result.totalSize} or greater than ${maxFetch}.`);
-    }
-    logger.debug(`Query complete with ${result.totalSize} records returned`);
-    const columns = result.totalSize ? await (0, exports.retrieveColumns)(connection, query, logger) : [];
-    return {
-        query,
-        columns,
-        result,
-    };
-};
-exports.runSoqlQuery = runSoqlQuery;
 //# sourceMappingURL=query.js.map

package/lib/commands/data/query.js.map

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

package/lib/commands/data/resume.js

@@ -5,13 +5,13 @@ const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
 const flags_1 = require("../../flags");
 const batcher_1 = require("../../batcher");
 core_1.Messages.importMessagesDirectory(__dirname);
-const messages = core_1.Messages.loadMessages('@salesforce/plugin-data', 'bulk.status');
+const messages = core_1.Messages.loadMessages('@salesforce/plugin-data', 'data.resume');
 class Status extends sf_plugins_core_1.SfCommand {
     async run() {
         const { flags } = await this.parse(Status);
         this.spinner.start('Getting Status');
         const conn = flags['target-org'].getConnection(flags['api-version']);
-        const batcher = new batcher_1.Batcher(conn, new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }));
+        const batcher = new batcher_1.Batcher(conn, new sf_plugins_core_1.Ux({ jsonEnabled: this.jsonEnabled() }), this.config.bin, this.config.pjson.oclif.topicSeparator ?? ':');
         if (flags['job-id'] && flags['batch-id']) {
             // view batch status
             const job = conn.bulk.job(flags['job-id']);
@@ -38,14 +38,18 @@ class Status extends sf_plugins_core_1.SfCommand {
     }
 }
 exports.default = Status;
+Status.state = 'deprecated';
+Status.deprecationOptions = {
+    to: 'force:data:bulk:status',
+    message: 'Use force:data:bulk:status instead',
+};
 Status.summary = messages.getMessage('summary');
 Status.description = messages.getMessage('description');
 Status.examples = messages.getMessages('examples');
-Status.aliases = ['force:data:bulk:status'];
-Status.deprecateAliases = true;
 Status.flags = {
     ...flags_1.orgFlags,
     'batch-id': sf_plugins_core_1.Flags.salesforceId({
+        length: 18,
         char: 'b',
         startsWith: '751',
         summary: messages.getMessage('flags.batchid'),
@@ -53,6 +57,7 @@ Status.flags = {
         deprecateAliases: true,
     }),
     'job-id': sf_plugins_core_1.Flags.salesforceId({
+        length: 18,
         char: 'i',
         startsWith: '750',
         summary: messages.getMessage('flags.jobid'),

package/lib/commands/data/resume.js.map

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