@salesforce/core 3.6.6 → 3.7.3

package/lib/org/authInfo.js

@@ -6,7 +6,7 @@
  * 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.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = exports.OAuth2WithVerifier = void 0;
+exports.AuthInfo = exports.DEFAULT_CONNECTED_APP_INFO = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const crypto_1 = require("crypto");
 const path_1 = require("path");
@@ -14,9 +14,7 @@ const os = require("os");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const jsforce_1 = require("jsforce");
-// No typings directly available for jsforce/lib/transport
-// @ts-ignore
-const Transport = require("jsforce/lib/transport");
+const transport_1 = require("jsforce/lib/transport");
 const jwt = require("jsonwebtoken");
 const config_1 = require("../config/config");
 const configAggregator_1 = require("../config/configAggregator");
@@ -46,65 +44,15 @@ class JwtOAuth2 extends jsforce_1.OAuth2 {
     constructor(options) {
         super(options);
     }
-    jwtAuthorize(innerToken, callback) {
+    jwtAuthorize(innerToken) {
         // @ts-ignore
         return super._postParams({
             // eslint-disable-next-line camelcase
             grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
             assertion: innerToken,
-        }, callback);
-    }
-}
-/**
- * Extend OAuth2 to add code verifier support for the auth code (web auth) flow
- * const oauth2 = new OAuth2WithVerifier({ loginUrl, clientSecret, clientId, redirectUri });
- *
- * const authUrl = oauth2.getAuthorizationUrl({
- *    state: 'foo',
- *    prompt: 'login',
- *    scope: 'api web'
- * });
- * console.log(authUrl);
- * const authCode = await retrieveCode();
- * const authInfo = await AuthInfo.create({ oauth2Options: { clientId, clientSecret, loginUrl, authCode }, oauth2});
- * console.log(`access token: ${authInfo.getFields(true).accessToken}`);
- */
-class OAuth2WithVerifier extends jsforce_1.OAuth2 {
-    constructor(options) {
-        super(options);
-        // Set a code verifier string for OAuth authorization
-        this.codeVerifier = base64UrlEscape(crypto_1.randomBytes(Math.ceil(128)).toString('base64'));
-    }
-    /**
-     * Overrides jsforce.OAuth2.getAuthorizationUrl.  Get Salesforce OAuth2 authorization page
-     * URL to redirect user agent, adding a verification code for added security.
-     *
-     * @param params
-     */
-    getAuthorizationUrl(params) {
-        // code verifier must be a base 64 url encoded hash of 128 bytes of random data. Our random data is also
-        // base 64 url encoded. See Connection.create();
-        const codeChallenge = base64UrlEscape(crypto_1.createHash('sha256').update(this.codeVerifier).digest('base64'));
-        kit_1.set(params, 'code_challenge', codeChallenge);
-        return super.getAuthorizationUrl(params);
-    }
-    async requestToken(code, callback) {
-        return super.requestToken(code, callback);
-    }
-    /**
-     * Overrides jsforce.OAuth2._postParams because jsforce's oauth impl doesn't support
-     * coder_verifier and code_challenge. This enables the server to disallow trading a one-time auth code
-     * for an access/refresh token when the verifier and challenge are out of alignment.
-     *
-     * See https://github.com/jsforce/jsforce/issues/665
-     */
-    async _postParams(params, callback) {
-        kit_1.set(params, 'code_verifier', this.codeVerifier);
-        // @ts-ignore TODO: need better typings for jsforce
-        return super._postParams(params, callback);
+        });
     }
 }
-exports.OAuth2WithVerifier = OAuth2WithVerifier;
 // parses the id field returned from jsForce oauth2 methods to get
 // user ID and org ID.
 function parseIdUrl(idUrl) {
@@ -129,13 +77,6 @@ exports.DEFAULT_CONNECTED_APP_INFO = {
     legacyClientId: 'SalesforceDevelopmentExperience',
     legacyClientSecret: '1384510088588713504',
 };
-// Makes a nodejs base64 encoded string compatible with rfc4648 alternative encoding for urls.
-// @param base64Encoded a nodejs base64 encoded string
-function base64UrlEscape(base64Encoded) {
-    // builtin node js base 64 encoding is not 64 url compatible.
-    // See https://toolsn.ietf.org/html/rfc4648#section-5
-    return base64Encoded.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
-}
 /**
  * Handles persistence and fetching of user authentication information using
  * JWT, OAuth, or refresh tokens. Sets up the refresh flows that jsForce will
@@ -270,7 +211,9 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param options The options to generate the URL.
      */
     static getAuthorizationUrl(options, oauth2) {
-        const oauth2Verifier = oauth2 || new OAuth2WithVerifier(options);
+        // Always use a verifier for enhanced security
+        options.useVerifier = true;
+        const oauth2Verifier = oauth2 || new jsforce_1.OAuth2(options);
         // The state parameter allows the redirectUri callback listener to ignore request
         // that don't contain the state value.
         const params = {
@@ -293,7 +236,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     static parseSfdxAuthUrl(sfdxAuthUrl) {
         const match = sfdxAuthUrl.match(/^force:\/\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]*):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/);
         if (!match) {
-            throw new sfdxError_1.SfdxError('Invalid sfdx auth url. Must be in the format `force://<clientId>:<clientSecret>:<refreshToken>@<loginUrl>`. The instanceUrl must not have the protocol set.', 'INVALID_SFDX_AUTH_URL');
+            throw new sfdxError_1.SfdxError('Invalid SFDX auth URL. Must be in the format "force://<clientId>:<clientSecret>:<refreshToken>@<instanceUrl>".  Note that the SFDX auth URL uses the "force" protocol, and not "http" or "https".  Also note that the "instanceUrl" inside the SFDX auth URL doesn\'t include the protocol ("https://").', 'INVALID_SFDX_AUTH_URL');
         }
         const [, clientId, clientSecret, refreshToken, loginUrl] = match;
         return {
@@ -399,8 +342,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             opts = {
                 oauth2: {
                     loginUrl: instanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION,
-                    clientId: decryptedCopy.clientId || exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId,
-                    redirectUri: 'http://localhost:1717/OauthRedirect',
+                    clientId: this.getClientId(),
+                    redirectUri: this.getRedirectUri(),
                 },
                 accessToken,
                 instanceUrl,
@@ -410,6 +353,13 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // decrypt the fields
         return opts;
     }
+    getClientId() {
+        var _a;
+        return ((_a = this.getFields()) === null || _a === void 0 ? void 0 : _a.clientId) || exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId;
+    }
+    getRedirectUri() {
+        return 'http://localhost:1717/OauthRedirect';
+    }
     /**
      * Get the authorization fields.
      *
@@ -581,7 +531,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                     authConfig = await this.buildRefreshTokenConfig(options);
                 }
                 else {
-                    if (this.options.oauth2 instanceof OAuth2WithVerifier) {
+                    if (this.options.oauth2 instanceof jsforce_1.OAuth2) {
                         // authcode exchange / web auth flow
                         authConfig = await this.exchangeToken(options, this.options.oauth2);
                     }
@@ -604,8 +554,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         return authInfo;
     }
     isTokenOptions(options) {
-        // Although OAuth2Options does not contain refreshToken, privateKey, or privateKeyFile, a JS consumer could still pass those in
-        // which WILL have an access token as well, but it should be considered an OAuth2Options at that point.
+        // Although OAuth2Config does not contain refreshToken, privateKey, or privateKeyFile, a JS consumer could still pass those in
+        // which WILL have an access token as well, but it should be considered an OAuth2Config at that point.
         return ('accessToken' in options &&
             !('refreshToken' in options) &&
             !('privateKey' in options) &&
@@ -681,6 +631,9 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             options.clientId = exports.DEFAULT_CONNECTED_APP_INFO.legacyClientId;
             options.clientSecret = exports.DEFAULT_CONNECTED_APP_INFO.legacyClientSecret;
         }
+        if (!options.redirectUri) {
+            options.redirectUri = this.getRedirectUri();
+        }
         const oauth2 = new jsforce_1.OAuth2(options);
         let authFieldsBuilder;
         try {
@@ -717,6 +670,12 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      * @param oauth2 The oauth2 extension that includes a code_challenge
      */
     async exchangeToken(options, oauth2 = new jsforce_1.OAuth2(options)) {
+        if (!oauth2.redirectUri) {
+            oauth2.redirectUri = this.getRedirectUri();
+        }
+        if (!oauth2.clientId) {
+            oauth2.clientId = this.getClientId();
+        }
         // Exchange the auth code for an access token and refresh token.
         let authFields;
         try {
@@ -760,7 +719,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const headers = Object.assign({ Authorization: `Bearer ${accessToken}` }, connection_1.SFDX_HTTP_HEADERS);
         try {
             this.logger.info(`Sending request for Username after successful auth code exchange to URL: ${userInfoUrl}`);
-            let response = await new Transport().httpRequest({ url: userInfoUrl, headers });
+            let response = await new transport_1.default().httpRequest({ url: userInfoUrl, method: 'GET', headers });
             if (response.statusCode >= 400) {
                 this.throwUserGetException(response);
             }
@@ -768,7 +727,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 const userInfoJson = kit_1.parseJsonMap(response.body);
                 const url = `${baseUrl}/services/data/${apiVersion}/sobjects/User/${userInfoJson.user_id}`;
                 this.logger.info(`Sending request for User SObject after successful auth code exchange to URL: ${url}`);
-                response = await new Transport().httpRequest({ url, headers });
+                response = await new transport_1.default().httpRequest({ url, method: 'GET', headers });
                 if (response.statusCode >= 400) {
                     this.throwUserGetException(response);
                 }

package/lib/org/connection.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
 import { AsyncResult, DeployOptions, DeployResultLocator } from 'jsforce/api/metadata';
-import { Callback } from 'jsforce/connection';
 import { JsonCollection, JsonMap, Optional } from '@salesforce/ts-types';
-import { Connection as JSForceConnection, ConnectionOptions, ExecuteOptions, QueryResult, RequestInfo, Tooling as JSForceTooling } from 'jsforce';
+import { Connection as JSForceConnection, ConnectionConfig, HttpRequest, QueryOptions, QueryResult, Record, Schema } from 'jsforce';
+import { Tooling as JSForceTooling } from 'jsforce/lib/api/tooling';
+import { StreamPromise } from 'jsforce/lib/util/promise';
 import { AuthFields, AuthInfo } from '../org/authInfo';
 import { ConfigAggregator } from '../config/configAggregator';
 export declare const SFDX_HTTP_HEADERS: {
@@ -14,10 +15,11 @@ declare type recentValidationOptions = {
     id: string;
     rest?: boolean;
 };
-export declare type DeployOptionsWithRest = DeployOptions & {
+export declare type DeployOptionsWithRest = Partial<DeployOptions> & {
     rest?: boolean;
 };
-export interface Tooling extends JSForceTooling {
+export interface Tooling<S extends Schema = Schema> extends JSForceTooling<S> {
+    _logger: any;
     /**
      * Executes a query and auto-fetches (i.e., "queryMore") all results.  This is especially
      * useful with large query result sizes, such as over 2000 records.  The default maximum
@@ -26,7 +28,7 @@ export interface Tooling extends JSForceTooling {
      * @param soql The SOQL string.
      * @param options The query options.  NOTE: the autoFetch option will always be true.
      */
-    autoFetchQuery<T>(soql: string, options?: ExecuteOptions): Promise<QueryResult<T>>;
+    autoFetchQuery<T extends Schema = S>(soql: string, options?: QueryOptions): Promise<QueryResult<T>>;
 }
 /**
  * Handles connections and requests to Salesforce Orgs.
@@ -43,14 +45,12 @@ export interface Tooling extends JSForceTooling {
  * connection.query('SELECT Name from Account');
  * ```
  */
-export declare class Connection extends JSForceConnection {
+export declare class Connection<S extends Schema = Schema> extends JSForceConnection<S> {
     /**
      * Tooling api reference.
      */
-    tooling: Tooling;
+    get tooling(): Tooling<S>;
     private logger;
-    private _transport;
-    private _normalizeUrl;
     private options;
     private username;
     /**
@@ -60,13 +60,13 @@ export declare class Connection extends JSForceConnection {
      * @param options The options for the class instance.
      * @ignore
      */
-    constructor(options: Connection.Options);
+    constructor(options: Connection.Options<S>);
     /**
      * Creates an instance of a Connection. Performs additional async initializations.
      *
      * @param options Constructor options.
      */
-    static create(this: new (options: Connection.Options) => Connection, options: Connection.Options): Promise<Connection>;
+    static create<S extends Schema>(this: new (options: Connection.Options<S>) => Connection<S>, options: Connection.Options<S>): Promise<Connection<S>>;
     /**
      * Async initializer.
      */
@@ -81,7 +81,7 @@ export declare class Connection extends JSForceConnection {
      * @param options JSForce deploy options + a boolean for rest
      * @param callback
      */
-    deploy(zipInput: Buffer, options: DeployOptionsWithRest, callback?: Callback<AsyncResult>): Promise<DeployResultLocator<AsyncResult>>;
+    deploy(zipInput: Buffer, options: DeployOptionsWithRest): Promise<DeployResultLocator<AsyncResult & Schema>>;
     /**
      * Send REST API request with given HTTP request info, with connected session information
      * and SFDX headers.
@@ -89,14 +89,7 @@ export declare class Connection extends JSForceConnection {
      * @param request HTTP request object or URL to GET request.
      * @param options HTTP API request options.
      */
-    request<T = JsonCollection>(request: RequestInfo | string, options?: JsonMap): Promise<T>;
-    /**
-     * Send REST API request with given HTTP request info, with connected session information
-     * and SFDX headers. This method returns a raw http response which includes a response body and statusCode.
-     *
-     * @param request HTTP request object or URL to GET request.
-     */
-    requestRaw(request: RequestInfo): Promise<JsonMap>;
+    request<R = unknown>(request: string | HttpRequest, options?: JsonMap): StreamPromise<R>;
     /**
      * The Force API base url for the instance.
      */
@@ -167,9 +160,9 @@ export declare class Connection extends JSForceConnection {
      * fetch size is 10,000 records. Modify this via the options argument.
      *
      * @param soql The SOQL string.
-     * @param executeOptions The query options. NOTE: the autoFetch option will always be true.
+     * @param queryOptions The query options. NOTE: the autoFetch option will always be true.
      */
-    autoFetchQuery<T>(soql: string, executeOptions?: ExecuteOptions): Promise<QueryResult<T>>;
+    autoFetchQuery<T extends Schema = S>(soql: string, queryOptions?: Partial<QueryOptions>): Promise<QueryResult<T>>;
     /**
      * Executes a query using either standard REST or Tooling API, returning a single record.
      * Will throw if either zero records are found OR multiple records are found.
@@ -177,7 +170,7 @@ export declare class Connection extends JSForceConnection {
      * @param soql The SOQL string.
      * @param options The query options.
      */
-    singleRecordQuery<T>(soql: string, options?: SingleRecordQueryOptions): Promise<T>;
+    singleRecordQuery<T extends Record>(soql: string, options?: SingleRecordQueryOptions): Promise<T>;
     private loadInstanceApiVersion;
 }
 export declare const SingleRecordQueryErrors: {
@@ -193,7 +186,7 @@ export declare namespace Connection {
     /**
      * Connection Options.
      */
-    interface Options {
+    interface Options<S extends Schema> {
         /**
          * AuthInfo instance.
          */
@@ -205,7 +198,7 @@ export declare namespace Connection {
         /**
          * Additional connection parameters.
          */
-        connectionOptions?: ConnectionOptions;
+        connectionOptions?: ConnectionConfig<S>;
     }
 }
 export {};

package/lib/org/connection.js

@@ -9,30 +9,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleRecordQueryErrors = exports.Connection = exports.DNS_ERROR_NAME = exports.SFDX_HTTP_HEADERS = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const url_1 = require("url");
+const FormData = require("form-data");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const jsforce_1 = require("jsforce");
-// no types for Transport
-// @ts-ignore
-const Transport = require("jsforce/lib/transport");
+const tooling_1 = require("jsforce/lib/api/tooling");
 const myDomainResolver_1 = require("../status/myDomainResolver");
 const configAggregator_1 = require("../config/configAggregator");
 const logger_1 = require("../logger");
 const sfdxError_1 = require("../sfdxError");
 const sfdc_1 = require("../util/sfdc");
 const messages_1 = require("../messages");
+const lifecycleEvents_1 = require("../lifecycleEvents");
 messages_1.Messages.importMessagesDirectory(__dirname);
 const messages = messages_1.Messages.load('@salesforce/core', 'connection', [
     'incorrectAPIVersionError',
     'domainNotFoundError',
     'noInstanceUrlError',
 ]);
-/**
- * The 'async' in our request override replaces the jsforce promise with the node promise, then returns it back to
- * jsforce which expects .thenCall. Add .thenCall to the node promise to prevent breakage.
- */
-// @ts-ignore
-Promise.prototype.thenCall = jsforce_1.Promise.prototype.thenCall;
 const clientId = `sfdx toolbelt:${process.env.SFDX_SET_CLIENT_IDS || ''}`;
 exports.SFDX_HTTP_HEADERS = {
     'content-type': 'application/json',
@@ -69,6 +63,13 @@ class Connection extends jsforce_1.Connection {
         this.options = options;
         this.username = options.authInfo.getUsername();
     }
+    // The following are all initialized in either this constructor or the super constructor, sometimes conditionally...
+    /**
+     * Tooling api reference.
+     */
+    get tooling() {
+        return super.tooling;
+    }
     /**
      * Creates an instance of a Connection. Performs additional async initializations.
      *
@@ -87,8 +88,9 @@ class Connection extends jsforce_1.Connection {
             const configAggregator = options.configAggregator || (await configAggregator_1.ConfigAggregator.create());
             baseOptions.version = ts_types_1.asString(configAggregator.getInfo('apiVersion').value);
         }
+        const providedOptions = options.authInfo.getConnectionOptions();
         // Get connection options from auth info and create a new jsForce connection
-        options.connectionOptions = Object.assign(baseOptions, options.authInfo.getConnectionOptions());
+        options.connectionOptions = Object.assign(baseOptions, providedOptions);
         const conn = new this(options);
         await conn.init();
         try {
@@ -103,7 +105,8 @@ class Connection extends jsforce_1.Connection {
                 conn.logger.debug(`The apiVersion ${baseOptions.version} was found from ${((_b = options.connectionOptions) === null || _b === void 0 ? void 0 : _b.version) ? 'passed in options' : 'config'}`);
             }
         }
-        catch (e) {
+        catch (err) {
+            const e = err;
             if (e.name === exports.DNS_ERROR_NAME) {
                 throw e;
             }
@@ -129,7 +132,7 @@ class Connection extends jsforce_1.Connection {
      * @param options JSForce deploy options + a boolean for rest
      * @param callback
      */
-    async deploy(zipInput, options, callback) {
+    async deploy(zipInput, options) {
         const rest = options.rest;
         // neither API expects this option
         delete options.rest;
@@ -137,37 +140,29 @@ class Connection extends jsforce_1.Connection {
             this.logger.debug('deploy with REST');
             const headers = {
                 Authorization: this && `OAuth ${this.accessToken}`,
-                clientId: this.oauth2 && this.oauth2.clientId,
                 'Sforce-Call-Options': 'client=sfdx-core',
             };
-            const url = `${this.baseUrl()}/metadata/deployRequest`;
-            const request = Transport.prototype._getHttpRequestModule();
-            return new Promise((resolve, reject) => {
-                const req = request.post(url, { headers }, (err, httpResponse, body) => {
-                    let res;
-                    try {
-                        res = JSON.parse(body);
-                    }
-                    catch (e) {
-                        reject(sfdxError_1.SfdxError.wrap(body));
-                    }
-                    resolve(res);
-                });
-                const form = req.form();
-                // Add the zip file
-                form.append('file', zipInput, {
-                    contentType: 'application/zip',
-                    filename: 'package.xml',
-                });
-                // Add the deploy options
-                form.append('entity_content', JSON.stringify({ deployOptions: options }), {
-                    contentType: 'application/json',
-                });
+            const client = this.oauth2 && this.oauth2.clientId;
+            if (client) {
+                headers.clientId = client;
+            }
+            const form = new FormData();
+            // Add the zip file
+            form.append('file', zipInput, {
+                contentType: 'application/zip',
+                filename: 'package.xml',
+            });
+            // Add the deploy options
+            form.append('entity_content', JSON.stringify({ deployOptions: options }), {
+                contentType: 'application/json',
             });
+            const url = `${this.baseUrl()}/metadata/deployRequest`;
+            const httpRequest = { method: 'POST', url, headers, body: form };
+            return this.request(httpRequest);
         }
         else {
             this.logger.debug('deploy with SOAP');
-            return this.metadata.deploy(zipInput, options, callback);
+            return this.metadata.deploy(zipInput, options);
         }
     }
     /**
@@ -177,27 +172,12 @@ class Connection extends jsforce_1.Connection {
      * @param request HTTP request object or URL to GET request.
      * @param options HTTP API request options.
      */
-    async request(request, options) {
-        const requestInfo = ts_types_1.isString(request) ? { method: 'GET', url: request } : request;
-        requestInfo.headers = Object.assign({}, exports.SFDX_HTTP_HEADERS, requestInfo.headers);
-        this.logger.debug(`request: ${JSON.stringify(requestInfo)}`);
-        return super.request(requestInfo, options);
-    }
-    /**
-     * Send REST API request with given HTTP request info, with connected session information
-     * and SFDX headers. This method returns a raw http response which includes a response body and statusCode.
-     *
-     * @param request HTTP request object or URL to GET request.
-     */
-    async requestRaw(request) {
-        const headers = this.accessToken ? { Authorization: `Bearer ${this.accessToken}` } : {};
-        kit_1.merge(headers, exports.SFDX_HTTP_HEADERS, request.headers);
-        return this._transport.httpRequest({
-            method: request.method,
-            url: request.url,
-            headers,
-            body: request.body,
-        });
+    request(request, options) {
+        const httpRequest = ts_types_1.isString(request) ? { method: 'GET', url: request } : request;
+        httpRequest.headers = Object.assign({}, exports.SFDX_HTTP_HEADERS, httpRequest.headers);
+        this.logger.debug(`request: ${JSON.stringify(httpRequest)}`);
+        //  The "as" is a workaround for the jsforce typings.
+        return super.request(httpRequest, options);
     }
     /**
      * The Force API base url for the instance.
@@ -347,33 +327,21 @@ class Connection extends jsforce_1.Connection {
      * fetch size is 10,000 records. Modify this via the options argument.
      *
      * @param soql The SOQL string.
-     * @param executeOptions The query options. NOTE: the autoFetch option will always be true.
+     * @param queryOptions The query options. NOTE: the autoFetch option will always be true.
      */
-    async autoFetchQuery(soql, executeOptions = {}) {
+    async autoFetchQuery(soql, queryOptions = {}) {
         const config = await configAggregator_1.ConfigAggregator.create();
         // take the limit from the calling function, then the config, then default 10,000
-        const maxFetch = config.getInfo('maxQueryLimit').value || executeOptions.maxFetch || 10000;
-        const options = Object.assign(executeOptions, {
+        const maxFetch = config.getInfo('maxQueryLimit').value || queryOptions.maxFetch || 10000;
+        const options = Object.assign(queryOptions, {
             autoFetch: true,
             maxFetch,
         });
-        const records = [];
-        return new Promise((resolve, reject) => {
-            const query = this.query(soql, options)
-                .on('record', (rec) => records.push(rec))
-                .on('error', (err) => reject(err))
-                .on('end', () => {
-                const totalSize = ts_types_1.getNumber(query, 'totalSize') || 0;
-                if (totalSize > records.length) {
-                    process.emitWarning(`The query result is missing ${totalSize - records.length} records due to a ${maxFetch} record limit. Increase the number of records returned by setting the config value "maxQueryLimit" or the environment variable "SFDX_MAX_QUERY_LIMIT" to ${totalSize} or greater than ${maxFetch}.`);
-                }
-                resolve({
-                    done: true,
-                    totalSize,
-                    records,
-                });
-            });
-        });
+        const query = await this.query(soql, options);
+        if (query.records.length && query.totalSize > query.records.length) {
+            void lifecycleEvents_1.Lifecycle.getInstance().emitWarning(`The query result is missing ${query.totalSize - query.records.length} records due to a ${maxFetch} record limit. Increase the number of records returned by setting the config value "maxQueryLimit" or the environment variable "SFDX_MAX_QUERY_LIMIT" to ${query.totalSize} or greater than ${maxFetch}.`);
+        }
+        return query;
     }
     /**
      * Executes a query using either standard REST or Tooling API, returning a single record.
@@ -445,4 +413,10 @@ exports.SingleRecordQueryErrors = {
     NoRecords: 'SingleRecordQuery_NoRecords',
     MultipleRecords: 'SingleRecordQuery_MultipleRecords',
 };
+// jsforce does some interesting proxy loading on lib classes.
+// Setting this in the Connection.tooling getter will not work, it
+// must be set on the prototype.
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+tooling_1.Tooling.prototype.autoFetchQuery = Connection.prototype.autoFetchQuery; // eslint-disable-line @typescript-eslint/unbound-method
 //# sourceMappingURL=connection.js.map