@salesforce/plugin-data 3.1.11 → 3.2.1

package/lib/bulkOperationCommand.js

@@ -7,136 +7,143 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import { Flags } from '@salesforce/sf-plugins-core';
-import { Duration } from '@salesforce/kit';
 import { Messages } from '@salesforce/core';
 import { ux } from '@oclif/core';
+import { BulkV2, } from '@jsforce/jsforce-node/lib/api/bulk2.js';
 import { orgFlags } from './flags.js';
-import { isBulkV2RequestDone, transformResults, waitOrTimeout } from './bulkUtils.js';
-import { BulkBaseCommand } from './BulkBaseCommand.js';
+import { BulkDeleteRequestCache, BulkUpsertRequestCache } from './bulkDataRequestCache.js';
+import { POLL_FREQUENCY_MS, isBulkV2RequestDone, transformResults, validateSobjectType, remainingTime, } from './bulkUtils.js';
+import { displayBulkV2Result, getRemainingTimeStatus, setupLifecycleListeners } from './BulkBaseCommand.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-data', 'bulk.operation.command');
-export class BulkOperationCommand extends BulkBaseCommand {
-    static baseFlags = {
-        ...orgFlags,
-        file: Flags.file({
-            char: 'f',
-            summary: messages.getMessage('flags.csvfile.summary'),
-            required: true,
-            exists: true,
-            aliases: ['csvfile'],
-            deprecateAliases: true,
-        }),
-        sobject: Flags.string({
-            char: 's',
-            summary: messages.getMessage('flags.sobject.summary'),
-            required: true,
-            aliases: ['sobjecttype'],
-            deprecateAliases: true,
-        }),
-        wait: Flags.duration({
-            char: 'w',
-            unit: 'minutes',
-            summary: messages.getMessage('flags.wait.summary'),
-            min: 0,
-            defaultValue: 0,
-            exclusive: ['async'],
-        }),
-        async: Flags.boolean({
-            char: 'a',
-            summary: messages.getMessage('flags.async.summary'),
-            exclusive: ['wait'],
-        }),
-        verbose: Flags.boolean({
-            summary: messages.getMessage('flags.verbose.summary'),
-        }),
-    };
-    /**
-     * create and execute batches based on the record arrays; wait for completion response if -w flag is set with > 0 minutes
-     * to get proper logging/printing to console pass the instance of UX that called this method
-     *
-     * @param job {IngestJobV2}
-     * @param input
-     * @param sobjectType {string}
-     * @param wait {number}
-     */
-    static async executeBulkV2DataRequest(job, input, sobjectType, wait) {
-        await job.open();
-        const timeNow = Date.now();
-        let remainingTime = wait ? Duration.minutes(wait).milliseconds : 0;
-        job.emit('jobProgress', { remainingTime, stage: 'uploading' });
-        await job.uploadData(input);
-        remainingTime = remainingTime - (Date.now() - timeNow);
-        job.emit('jobProgress', { remainingTime, stage: 'uploadComplete' });
-        await job.close();
-        if (remainingTime > 0) {
-            job.emit('startPolling');
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-            await waitOrTimeout(job, remainingTime);
-        }
-        return job.check();
-    }
-    static printBulkErrors(failedResults) {
-        const columns = {
-            id: { header: 'Id' },
-            sfId: { header: 'Sf_Id' },
-            error: { header: 'Error' },
+export const baseFlags = {
+    ...orgFlags,
+    file: Flags.file({
+        char: 'f',
+        summary: messages.getMessage('flags.csvfile.summary'),
+        required: true,
+        exists: true,
+        aliases: ['csvfile'],
+        deprecateAliases: true,
+    }),
+    sobject: Flags.string({
+        char: 's',
+        summary: messages.getMessage('flags.sobject.summary'),
+        required: true,
+        aliases: ['sobjecttype'],
+        deprecateAliases: true,
+    }),
+    wait: Flags.duration({
+        char: 'w',
+        unit: 'minutes',
+        summary: messages.getMessage('flags.wait.summary'),
+        min: 0,
+        defaultValue: 0,
+        exclusive: ['async'],
+    }),
+    async: Flags.boolean({
+        char: 'a',
+        summary: messages.getMessage('flags.async.summary'),
+        exclusive: ['wait'],
+    }),
+    verbose: Flags.boolean({
+        summary: messages.getMessage('flags.verbose.summary'),
+    }),
+};
+export const runBulkOperation = async ({ sobject, csvFileName, connection, wait, verbose, operation, options, cmd, }) => {
+    const isAsync = !wait;
+    try {
+        const [cache] = await Promise.all([getCache(operation), validateSobjectType(sobject, connection)]);
+        const csvRecords = fs.createReadStream(csvFileName, { encoding: 'utf-8' });
+        cmd.spinner.start(`Running ${isAsync ? 'async ' : ''}bulk ${operation} request`);
+        const endWaitTime = Date.now() + wait.milliseconds;
+        cmd.spinner.status = getRemainingTimeStatus({ isAsync, endWaitTime });
+        const createJobOptions = {
+            object: sobject,
+            operation,
+            externalIdFieldName: options?.extIdField,
+            ...(os.platform() === 'win32' ? { lineEnding: 'CRLF' } : {}),
         };
-        const options = { title: `Bulk Failures [${failedResults.length}]` };
-        ux.log();
-        ux.table(failedResults.map((f) => ({ id: 'Id' in f ? f.Id : '', sfId: f.sf__Id, error: f.sf__Error })), columns, options);
-    }
-    async runBulkOperation(sobject, csvFileName, connection, wait, verbose, operation, options) {
-        this.cache = await this.getCache();
-        this.isAsync = !wait;
-        this.operation = operation;
-        this.wait = wait;
+        // @ts-expect-error jsforce 2 vs 3 differences in private stuff inside Connection
+        const bulk2 = new BulkV2(connection);
+        const job = bulk2.createJob(createJobOptions);
+        setupLifecycleListeners({
+            job,
+            cache,
+            username: connection.getUsername(),
+            apiVersion: connection.getApiVersion(),
+            isAsync,
+            cmd,
+            endWaitTime,
+        });
         try {
-            const csvRecords = fs.createReadStream(csvFileName, { encoding: 'utf-8' });
-            this.spinner.start(`Running ${this.isAsync ? 'async ' : ''}bulk ${operation} request`);
-            this.endWaitTime = Date.now() + Duration.minutes(this.wait).milliseconds;
-            this.spinner.status = this.getRemainingTimeStatus();
-            const createJobOptions = {
-                object: sobject,
-                operation,
-                externalIdFieldName: options?.extIdField,
-            };
-            if (os.platform() === 'win32') {
-                createJobOptions.lineEnding = 'CRLF';
+            const jobInfo = await executeBulkV2DataRequest(job, csvRecords, endWaitTime);
+            if (isAsync) {
+                await cache?.createCacheEntryForRequest(job.id ?? '', connection?.getUsername(), connection?.getApiVersion());
             }
-            this.job = connection.bulk2.createJob(createJobOptions);
-            this.connection = connection;
-            this.setupLifecycleListeners();
-            try {
-                const jobInfo = await BulkOperationCommand.executeBulkV2DataRequest(this.job, csvRecords, sobject, this.wait);
-                if (this.isAsync) {
-                    await this.cache?.createCacheEntryForRequest(this.job.id ?? '', this.connection?.getUsername(), this.connection?.getApiVersion());
-                }
-                this.displayBulkV2Result(jobInfo);
-                const result = { jobInfo };
-                if (!isBulkV2RequestDone(jobInfo)) {
-                    return result;
-                }
-                if (this.jsonEnabled()) {
-                    result.records = transformResults(await this.job.getAllResults());
-                }
-                // We only print human readable error outputs if --json is not specified.
-                // The JSON result itself will already contain the error information (see above).
-                else if (verbose) {
-                    const records = await this.job.getAllResults();
-                    if (records?.failedResults?.length > 0) {
-                        BulkOperationCommand.printBulkErrors(records.failedResults);
-                    }
-                }
+            displayBulkV2Result({ jobInfo, isAsync, cmd, username: connection.getUsername() });
+            const result = { jobInfo };
+            if (!isBulkV2RequestDone(jobInfo)) {
                 return result;
             }
-            catch (err) {
-                this.spinner.stop();
-                throw err;
+            if (cmd.jsonEnabled()) {
+                result.records = transformResults(await job.getAllResults());
             }
+            // We only print human readable error outputs if --json is not specified.
+            // The JSON result itself will already contain the error information (see above).
+            else if (verbose) {
+                const records = await job.getAllResults();
+                if (records?.failedResults?.length > 0) {
+                    printBulkErrors(records.failedResults);
+                }
+            }
+            return result;
         }
-        finally {
-            this.spinner.stop();
+        catch (err) {
+            cmd.spinner.stop();
+            throw err;
         }
     }
-}
+    finally {
+        cmd.spinner.stop();
+    }
+};
+const getCache = async (operation) => {
+    switch (operation) {
+        case 'delete':
+            return BulkDeleteRequestCache.create();
+        case 'upsert':
+            return BulkUpsertRequestCache.create();
+    }
+};
+/**
+ * create and execute batches based on the record arrays; wait for completion response if -w flag is set with > 0 minutes
+ * to get proper logging/printing to console pass the instance of UX that called this method
+ *
+ * @param job {IngestJobV2}
+ * @param input
+ * @param sobjectType {string}
+ * @param wait {number}
+ */
+const executeBulkV2DataRequest = async (job, input, endWaitTime) => {
+    await job.open();
+    job.emit('jobProgress', { remainingTime: remainingTime(Date.now())(endWaitTime), stage: 'uploading' });
+    await job.uploadData(input);
+    job.emit('jobProgress', { remainingTime: remainingTime(Date.now())(endWaitTime), stage: 'uploadComplete' });
+    await job.close();
+    if (endWaitTime && Date.now() < endWaitTime) {
+        await job.poll(POLL_FREQUENCY_MS, remainingTime(Date.now())(endWaitTime));
+    }
+    return job.check();
+};
+const printBulkErrors = (failedResults) => {
+    const columns = {
+        id: { header: 'Id' },
+        sfId: { header: 'Sf_Id' },
+        error: { header: 'Error' },
+    };
+    const options = { title: `Bulk Failures [${failedResults.length}]` };
+    ux.log();
+    ux.table(failedResults.map((f) => ({ id: 'Id' in f ? f.Id : '', sfId: f.sf__Id, error: f.sf__Error })), columns, options);
+};
 //# sourceMappingURL=bulkOperationCommand.js.map

package/lib/bulkOperationCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulkOperationCommand.js","sourceRoot":"","sources":["../src/bulkOperationCommand.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,MAAM,SAAS,CAAC;AAGzB,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAc,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AASjC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,wBAAwB,CAAC,CAAC;AAS5F,MAAM,OAAgB,oBAAqB,SAAQ,eAAe;IACzD,MAAM,CAAU,SAAS,GAAG;QACjC,GAAG,QAAQ;QACX,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;YACf,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;YACrD,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,CAAC,SAAS,CAAC;YACpB,gBAAgB,EAAE,IAAI;SACvB,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;YACpB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;YACrD,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,CAAC,aAAa,CAAC;YACxB,gBAAgB,EAAE,IAAI;SACvB,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;YAClD,GAAG,EAAE,CAAC;YACN,YAAY,EAAE,CAAC;YACf,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACnD,SAAS,EAAE,CAAC,MAAM,CAAC;SACpB,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;SACtD,CAAC;KACH,CAAC;IAEF;;;;;;;;OAQG;IACK,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAC3C,GAAsB,EACtB,KAAiB,EACjB,WAAmB,EACnB,IAAa;QAEb,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,IAAI,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAC/D,MAAM,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC5B,aAAa,GAAG,aAAa,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC;QACvD,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAC;QACpE,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;QAClB,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACzB,6DAA6D;YAC7D,MAAM,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,GAAG,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,aAA+C;QAC5E,MAAM,OAAO,GAAG;YACd,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACpB,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;YACzB,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;SAC3B,CAAC;QACF,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,kBAAkB,aAAa,CAAC,MAAM,GAAG,EAAE,CAAC;QACrE,EAAE,CAAC,GAAG,EAAE,CAAC;QACT,EAAE,CAAC,KAAK,CACN,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,EAC7F,OAAO,EACP,OAAO,CACR,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAC3B,OAAe,EACf,WAAmB,EACnB,UAAsB,EACtB,IAAY,EACZ,OAAgB,EAChB,SAAwB,EACxB,OAAgC;QAEhC,IAAI,CAAC,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC;YACH,MAAM,UAAU,GAAe,EAAE,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YACvF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,SAAS,UAAU,CAAC,CAAC;YACvF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC;YACzE,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACpD,MAAM,gBAAgB,GAAqB;gBACzC,MAAM,EAAE,OAAO;gBACf,SAAS;gBACT,mBAAmB,EAAE,OAAO,EAAE,UAAU;aACzC,CAAC;YACF,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,EAAE,CAAC;gBAC9B,gBAAgB,CAAC,UAAU,GAAG,MAAM,CAAC;YACvC,CAAC;YACD,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YACxD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAE7B,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC/B,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,wBAAwB,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9G,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;oBACjB,MAAM,IAAI,CAAC,KAAK,EAAE,0BAA0B,CAC1C,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,EACjB,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,EAC9B,IAAI,CAAC,UAAU,EAAE,aAAa,EAAE,CACjC,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;gBAClC,MAAM,MAAM,GAAG,EAAE,OAAO,EAAkB,CAAC;gBAC3C,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;oBAClC,OAAO,MAAM,CAAC;gBAChB,CAAC;gBACD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;oBACvB,MAAM,CAAC,OAAO,GAAG,gBAAgB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC;gBACpE,CAAC;gBACD,yEAAyE;gBACzE,iFAAiF;qBAC5E,IAAI,OAAO,EAAE,CAAC;oBACjB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;oBAC/C,IAAI,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;wBACvC,oBAAoB,CAAC,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;oBAC9D,CAAC;gBACH,CAAC;gBACD,OAAO,MAAM,CAAC;YAChB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBACpB,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;IACH,CAAC"}
+{"version":3,"file":"bulkOperationCommand.js","sourceRoot":"","sources":["../src/bulkOperationCommand.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,KAAK,EAAa,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAc,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,OAAO,EACL,MAAM,GAKP,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAwB,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEjH,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,GACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE5G,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,wBAAwB,CAAC,CAAC;AAS5F,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,GAAG,QAAQ;IACX,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;QACf,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACrD,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,CAAC,SAAS,CAAC;QACpB,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACrD,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,CAAC,aAAa,CAAC;QACxB,gBAAgB,EAAE,IAAI;KACvB,CAAC;IACF,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;QAClD,GAAG,EAAE,CAAC;QACN,YAAY,EAAE,CAAC;QACf,SAAS,EAAE,CAAC,OAAO,CAAC;KACrB,CAAC;IACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;QACnD,SAAS,EAAE,CAAC,MAAM,CAAC;KACpB,CAAC;IACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;KACtD,CAAC;CACH,CAAC;AAIF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACrC,OAAO,EACP,WAAW,EACX,UAAU,EACV,IAAI,EACJ,OAAO,EACP,SAAS,EACT,OAAO,EACP,GAAG,GAUJ,EAAyB,EAAE;IAC1B,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QACnG,MAAM,UAAU,GAAe,EAAE,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACvF,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,SAAS,UAAU,CAAC,CAAC;QACjF,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACnD,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,sBAAsB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;QACtE,MAAM,gBAAgB,GAAqB;YACzC,MAAM,EAAE,OAAO;YACf,SAAS;YACT,mBAAmB,EAAE,OAAO,EAAE,UAAU;YACxC,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7D,CAAC;QACF,iFAAiF;QACjF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAS,UAAU,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAE9C,uBAAuB,CAAC;YACtB,GAAG;YACH,KAAK;YACL,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE;YAClC,UAAU,EAAE,UAAU,CAAC,aAAa,EAAE;YACtC,OAAO;YACP,GAAG;YACH,WAAW;SACZ,CAAC,CAAC;QACH,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAC7E,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,KAAK,EAAE,0BAA0B,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,CAAC;YAChH,CAAC;YACD,mBAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YACnF,MAAM,MAAM,GAAG,EAAE,OAAO,EAAkB,CAAC;YAC3C,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,IAAI,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC;gBACtB,MAAM,CAAC,OAAO,GAAG,gBAAgB,CAAC,MAAM,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC;YAC/D,CAAC;YACD,yEAAyE;YACzE,iFAAiF;iBAC5E,IAAI,OAAO,EAAE,CAAC;gBACjB,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,aAAa,EAAE,CAAC;gBAC1C,IAAI,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvC,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACnB,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;YAAS,CAAC;QACT,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;AACH,CAAC,CAAC;AACF,MAAM,QAAQ,GAAG,KAAK,EAAE,SAA8B,EAAiC,EAAE;IACvF,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,QAAQ;YACX,OAAO,sBAAsB,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,QAAQ;YACX,OAAO,sBAAsB,CAAC,MAAM,EAAE,CAAC;IAC3C,CAAC;AACH,CAAC,CAAC;AACF;;;;;;;;GAQG;AACH,MAAM,wBAAwB,GAAG,KAAK,EACpC,GAAmB,EACnB,KAAiB,EACjB,WAAoB,EACA,EAAE;IACtB,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IACjB,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;IACvG,MAAM,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC5B,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC5G,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;IAClB,IAAI,WAAW,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;QAC5C,MAAM,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,EAAE,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,aAA+C,EAAQ,EAAE;IAChF,MAAM,OAAO,GAAG;QACd,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;QACpB,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;QACzB,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;KAC3B,CAAC;IACF,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,kBAAkB,aAAa,CAAC,MAAM,GAAG,EAAE,CAAC;IACrE,EAAE,CAAC,GAAG,EAAE,CAAC;IACT,EAAE,CAAC,KAAK,CACN,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,EAC7F,OAAO,EACP,OAAO,CACR,CAAC;AACJ,CAAC,CAAC"}

package/lib/bulkUtils.js

@@ -7,39 +7,28 @@
 import { Messages } from '@salesforce/core';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-data', 'messages');
-const POLL_FREQUENCY_MS = 5000;
+export const POLL_FREQUENCY_MS = 5000;
 export const isBulkV2RequestDone = (jobInfo) => ['Aborted', 'Failed', 'JobComplete'].includes(jobInfo.state);
 export const transformResults = (results) => ({
-    successfulResults: results.successfulResults.map((record) => record),
-    failedResults: results.failedResults.map((record) => record),
-    unprocessedRecords: results.unprocessedRecords.map((record) => record),
+    // ensureArray is used to handle the undefined or non-array case
+    successfulResults: results.successfulResults.map(anyRecordToBulkProcessedRecordV2),
+    failedResults: results.failedResults.map(anyRecordToBulkProcessedRecordV2),
+    // if the csv can't be read, it returns a string that is the csv body
+    ...(typeof results.unprocessedRecords === 'string'
+        ? { unprocessedRecords: [], unparsed: results.unprocessedRecords }
+        : { unprocessedRecords: results.unprocessedRecords.map(anyRecordToBulkProcessedRecordV2) }),
 });
+const anyRecordToBulkProcessedRecordV2 = (record) => record;
+/** call the describe to verify the object exists in the org  */
 export const validateSobjectType = async (sobjectType, connection) => {
     try {
         await connection.sobject(sobjectType).describe();
+        return sobjectType;
     }
     catch (e) {
         throw new Error(messages.getMessage('invalidSobject', [sobjectType, e.message]));
     }
 };
-export const waitOrTimeout = async (job, wait) => {
-    if (wait > 0) {
-        let waitCountDown = wait;
-        const progress = setInterval(() => {
-            const remainingTime = (waitCountDown -= POLL_FREQUENCY_MS);
-            job.emit('jobProgress', { remainingTime, stage: 'polling' });
-        }, POLL_FREQUENCY_MS);
-        const timeout = setTimeout(() => {
-            clearInterval(progress);
-            job.emit('jobTimeout');
-        }, wait ?? 0);
-        try {
-            await job.poll(POLL_FREQUENCY_MS, wait);
-        }
-        finally {
-            clearInterval(progress);
-            clearTimeout(timeout);
-        }
-    }
-};
+/** calculate ms between the "now" time and the endWaitTime */
+export const remainingTime = (now) => (endWaitTime) => Math.max((endWaitTime ?? now) - now, 0);
 //# sourceMappingURL=bulkUtils.js.map

package/lib/bulkUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulkUtils.js","sourceRoot":"","sources":["../src/bulkUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAc,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGxD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAE9E,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAE/B,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAkB,EAAW,EAAE,CACjE,CAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAE/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAmC,EAAiB,EAAE,CAAC,CAAC;IACvF,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAA0C,CAAC;IACxG,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAA0C,CAAC;IAChG,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAA0C,CAAC;CAC3G,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,WAAmB,EAAE,UAAsB,EAAiB,EAAE;IACtG,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;IACnD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,WAAW,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,GAAyC,EAAE,IAAY,EAAiB,EAAE;IAC5G,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACb,IAAI,aAAa,GAAG,IAAI,CAAC;QACzB,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;YAChC,MAAM,aAAa,GAAG,CAAC,aAAa,IAAI,iBAAiB,CAAC,CAAC;YAC3D,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAC/D,CAAC,EAAE,iBAAiB,CAAC,CAAC;QACtB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxB,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzB,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC;QACd,IAAI,CAAC;YACH,MAAM,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QAC1C,CAAC;gBAAS,CAAC;YACT,aAAa,CAAC,QAAQ,CAAC,CAAC;YACxB,YAAY,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"bulkUtils.js","sourceRoot":"","sources":["../src/bulkUtils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,OAAO,EAAc,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGxD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAC;AAE9E,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAEtC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAkB,EAAW,EAAE,CACjE,CAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAE/D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAmC,EAAiB,EAAE,CAAC,CAAC;IACvF,gEAAgE;IAChE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,gCAAgC,CAAC;IAClF,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,gCAAgC,CAAC;IAC1E,qEAAqE;IACrE,GAAG,CAAC,OAAO,OAAO,CAAC,kBAAkB,KAAK,QAAQ;QAChD,CAAC,CAAC,EAAE,kBAAkB,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAClE,CAAC,CAAC,EAAE,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,gCAAgC,CAAC,EAAE,CAAC;CAC9F,CAAC,CAAC;AAEH,MAAM,gCAAgC,GAAG,CACvC,MAG4C,EACrB,EAAE,CAAC,MAA0C,CAAC;AAEvE,gEAAgE;AAChE,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,WAAmB,EAAE,UAAsB,EAAmB,EAAE;IACxG,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC;QACjD,OAAO,WAAW,CAAC;IACrB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,WAAW,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;AACH,CAAC,CAAC;AAEF,8DAA8D;AAC9D,MAAM,CAAC,MAAM,aAAa,GACxB,CAAC,GAAW,EAAE,EAAE,CAChB,CAAC,WAAoB,EAAU,EAAE,CAC/B,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,IAAI,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC"}

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

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

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

@@ -5,24 +5,27 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Messages } from '@salesforce/core';
-import { BulkDeleteRequestCache } from '../../../bulkDataRequestCache.js';
-import { BulkOperationCommand } from '../../../bulkOperationCommand.js';
-import { validateSobjectType } from '../../../bulkUtils.js';
+import { Duration } from '@salesforce/kit';
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { baseFlags, runBulkOperation } from '../../../bulkOperationCommand.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-data', 'bulkv2.delete');
-export default class Delete extends BulkOperationCommand {
+export default class Delete extends SfCommand {
     static examples = messages.getMessages('examples');
     static summary = messages.getMessage('summary');
     static description = messages.getMessage('description');
+    static flags = baseFlags;
     async run() {
         const { flags } = await this.parse(Delete);
-        const conn = flags['target-org'].getConnection(flags['api-version']);
-        await validateSobjectType(flags.sobject, conn);
-        return this.runBulkOperation(flags.sobject, flags.file, conn, flags.async ? 0 : flags.wait?.minutes, flags.verbose, 'delete');
-    }
-    // eslint-disable-next-line class-methods-use-this
-    async getCache() {
-        return BulkDeleteRequestCache.create();
+        return runBulkOperation({
+            cmd: this,
+            sobject: flags.sobject,
+            csvFileName: flags.file,
+            connection: flags['target-org'].getConnection(flags['api-version']),
+            wait: flags.async ? Duration.minutes(0) : flags.wait,
+            verbose: flags.verbose,
+            operation: 'delete',
+        });
     }
 }
 //# 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":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;AAEnF,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,oBAAoB;IAC/C,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAEjE,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,mBAAmB,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE/C,OAAO,IAAI,CAAC,gBAAgB,CAC1B,KAAK,CAAC,OAAO,EACb,KAAK,CAAC,IAAI,EACV,IAAI,EACJ,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,EACrC,KAAK,CAAC,OAAO,EACb,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,kDAAkD;IACxC,KAAK,CAAC,QAAQ;QACtB,OAAO,sBAAsB,CAAC,MAAM,EAAE,CAAC;IACzC,CAAC"}
+{"version":3,"file":"bulk.js","sourceRoot":"","sources":["../../../../src/commands/data/delete/bulk.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAG/E,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;AAEnF,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,SAAuB;IAClD,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAEjE,MAAM,CAAU,KAAK,GAAG,SAAS,CAAC;IAElC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,OAAO,gBAAgB,CAAC;YACtB,GAAG,EAAE,IAAI;YACT,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,WAAW,EAAE,KAAK,CAAC,IAAI;YACvB,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YACnE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI;YACpD,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;IACL,CAAC"}

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":"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"}
+{"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

@@ -16,11 +16,8 @@ export default class DeleteResume extends ResumeBulkCommand {
     static examples = messages.getMessages('examples');
     static deprecateAliases = true;
     async run() {
-        const { flags } = await this.parse(DeleteResume);
-        const cache = await BulkDeleteRequestCache.create();
+        const [{ flags }, cache] = await Promise.all([this.parse(DeleteResume), 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 (isBulkV2RequestDone(resumeResults.jobInfo)) {

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

@@ -1 +1 @@
-{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/data/delete/resume.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,oBAAoB,CAAC,CAAC;AAExF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IAClD,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IAExC,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,sBAAsB,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,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,MAAM,sBAAsB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC"}
+{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/data/delete/resume.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,yBAAyB,EAAE,oBAAoB,CAAC,CAAC;AAExF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,iBAAiB;IAClD,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IAExC,KAAK,CAAC,GAAG;QACd,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,sBAAsB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC1G,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,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,mBAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,MAAM,sBAAsB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC"}

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":"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"}

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

@@ -53,7 +53,7 @@ export default class Import extends SfCommand {
     };
     async run() {
         const { flags } = await this.parse(Import);
-        const importApi = new ImportApi(flags['target-org'], this.config.bin, this.config.pjson.oclif.topicSeparator ?? ':');
+        const importApi = new ImportApi(flags['target-org']);
         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":"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"}
+{"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

@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { Messages } from '@salesforce/core';
-import { QueryJobV2 } from 'jsforce/lib/api/bulk.js';
+import { QueryJobV2 } from '@jsforce/jsforce-node/lib/api/bulk2.js';
 import { Flags, loglevel, optionalOrgFlagWithDeprecations, orgApiVersionFlagWithDeprecations, SfCommand, } from '@salesforce/sf-plugins-core';
 import { resultFormatFlag } from '../../../flags.js';
 import { displayResults, transformBulkResults } from '../../../queryUtils.js';
@@ -13,7 +13,6 @@ import { BulkQueryRequestCache } from '../../../bulkDataRequestCache.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const reportMessages = Messages.loadMessages('@salesforce/plugin-data', 'bulk.report');
 // needed by the flags loaded from the other command
-const queryMessages = Messages.loadMessages('@salesforce/plugin-data', 'soql.query');
 export class BulkQueryReport extends SfCommand {
     static summary = reportMessages.getMessage('summary');
     static description = reportMessages.getMessage('description');
@@ -21,7 +20,7 @@ export class BulkQueryReport extends SfCommand {
     static aliases = ['force:data:soql:bulk:report'];
     static deprecateAliases = true;
     static flags = {
-        'target-org': { ...optionalOrgFlagWithDeprecations, summary: queryMessages.getMessage('flags.targetOrg.summary') },
+        'target-org': optionalOrgFlagWithDeprecations,
         'api-version': orgApiVersionFlagWithDeprecations,
         loglevel,
         'result-format': resultFormatFlag,
@@ -31,21 +30,25 @@ export class BulkQueryReport extends SfCommand {
             startsWith: '750',
             summary: reportMessages.getMessage('flags.bulkQueryId.summary'),
             aliases: ['bulkqueryid'],
+            exactlyOne: ['bulk-query-id', 'use-most-recent'],
             deprecateAliases: true,
         }),
         'use-most-recent': Flags.boolean({
             summary: reportMessages.getMessage('flags.useMostRecent.summary'),
-            exclusive: ['bulk-query-id'],
+            exactlyOne: ['bulk-query-id', 'use-most-recent'],
         }),
     };
     async run() {
-        const { flags } = await this.parse(BulkQueryReport);
-        const cache = await BulkQueryRequestCache.create();
+        const [{ flags }, cache] = await Promise.all([this.parse(BulkQueryReport), BulkQueryRequestCache.create()]);
         const resumeOptions = await cache.resolveResumeOptionsFromCache(flags['bulk-query-id'], flags['use-most-recent'], flags['target-org'], flags['api-version']);
-        const job = new QueryJobV2({ ...resumeOptions.options, operation: 'query' });
-        job.jobInfo = resumeOptions.jobInfo;
-        const results = await job.getResults();
-        const queryResult = transformBulkResults(results, '');
+        // @ts-expect-error jsforce 2 vs 3 differences in private stuff inside Connection
+        const job = new QueryJobV2(resumeOptions.options.connection, {
+            id: resumeOptions.jobInfo.id,
+            pollingOptions: getNonZeroTimeoutPollingOptions(resumeOptions.options.pollingOptions),
+        });
+        await job.poll();
+        const results = await job.result();
+        const queryResult = transformBulkResults((await results.toArray()), resumeOptions.options.query);
         if (!this.jsonEnabled()) {
             displayResults({ ...queryResult }, flags['result-format']);
         }
@@ -55,4 +58,12 @@ export class BulkQueryReport extends SfCommand {
         return queryResult.result;
     }
 }
+/**
+ * polling options are retrieved from the cache.
+ * If the data:query used `--async` or `--wait` 0, we'd be passing that to the jsforce poll method,
+ * which means it would never check the actual result, and always throw a timeout error */
+const getNonZeroTimeoutPollingOptions = (pollingOptions) => ({
+    ...pollingOptions,
+    pollTimeout: Math.max(pollingOptions.pollTimeout, 1000),
+});
 //# 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":"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"}
+{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/data/query/resume.ts"],"names":[],"mappings":"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"}