@jsforce/jsforce-node 3.1.0 → 3.2.1

package/README.md

@@ -24,12 +24,22 @@ Supported Salesforce APIs are the following:
 
 ## Documentation
 
-See documentation in <http://jsforce.github.io/> .
+See documentation in https://jsforce.github.io/
+
+v3 API reference:
+https://jsforce.github.io/jsforce/
+
+v1 API reference:
+https://jsforce.github.io/jsforce/doc/
 
 ## Releases
 
 See [Releases](https://github.com/jsforce/jsforce/releases).
 
+## Node-specific release
+
+See [jsforce-node](./JSFORCE-NODE.md).
+
 ## License
 
 See [license](LICENSE) (MIT License).
@@ -45,6 +55,7 @@ If you have any questions first file it on [issues](https://github.com/jsforce/j
 ## How to build/run tests:
 See [DEVELOPING.md](./DEVELOPING.md)
 
+
 ## Contributions
 
 Your contributions are welcome: both by reporting issues on [GitHub issues](https://github.com/jsforce/jsforce/issues) or pull-requesting patches.

package/lib/VERSION.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "2.0.0-beta.8";
+declare const _default: "3.2.1";
 export default _default;

package/lib/VERSION.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '2.0.0-beta.8';
+exports.default = '3.2.1';

package/lib/api/bulk.d.ts

@@ -17,7 +17,7 @@ export type BulkOptions = {
     concurrencyMode?: 'Serial' | 'Parallel';
     assignmentRuleId?: string;
 };
-export type JobState = 'Open' | 'Closed' | 'Aborted' | 'Failed' | 'Unknown';
+export type JobState = 'Open' | 'Closed' | 'Aborted' | 'Failed' | 'Unknown' | 'NotProcessed';
 export type JobInfo = {
     id: string;
     object: string;
@@ -42,6 +42,7 @@ export type BulkQueryBatchResult = Array<{
 export type BulkIngestBatchResult = Array<{
     id: string | null;
     success: boolean;
+    created: boolean;
     errors: string[];
 }>;
 export type BatchResult<Opr extends BulkOperation> = Opr extends 'query' | 'queryAll' ? BulkQueryBatchResult : BulkIngestBatchResult;

package/lib/api/bulk.js

@@ -472,6 +472,9 @@ class Batch extends stream_1.Writable {
             else if (res.state === 'Completed') {
                 this.retrieve();
             }
+            else if (res.state === 'NotProcessed') {
+                this.emit('error', new Error('Job has been aborted'));
+            }
             else {
                 this.emit('inProgress', res);
                 setTimeout(poll, interval);
@@ -508,6 +511,7 @@ class Batch extends stream_1.Writable {
                 results = res.map((ret) => ({
                     id: ret.Id || null,
                     success: ret.Success === 'true',
+                    created: ret.Created === 'true',
                     errors: ret.Error ? [ret.Error] : [],
                 }));
             }
@@ -558,7 +562,7 @@ class BulkApi extends http_api_1.default {
     }
     isSessionExpired(response) {
         return (response.statusCode === 400 &&
-            /<exceptionCode>InvalidSessionId<\/exceptionCode>/.test(response.body));
+            response.body.includes('<exceptionCode>InvalidSessionId</exceptionCode>'));
     }
     hasErrorInResponseBody(body) {
         return !!body.error;

package/lib/api/bulk2.d.ts

@@ -47,7 +47,7 @@ export type IngestJobV2FailedResults<S extends Schema> = Array<{
     sf__Error: string;
     sf__Id: string;
 } & S>;
-export type IngestJobV2UnprocessedRecords<S extends Schema> = Array<S> | string;
+export type IngestJobV2UnprocessedRecords<S extends Schema> = S[] | string;
 export type IngestJobV2Results<S extends Schema> = {
     successfulResults: IngestJobV2SuccessfulResults<S>;
     failedResults: IngestJobV2FailedResults<S>;
@@ -137,7 +137,7 @@ export declare class BulkV2<S extends Schema> {
      * Default timeout: 10000ms
      *
      * @param soql SOQL query
-     * @param BulkV2PollingOptions options object
+     * @param options
      *
      * @returns {RecordStream} - Record stream, convertible to a CSV data stream
      */
@@ -156,8 +156,7 @@ export declare class QueryJobV2<S extends Schema> extends EventEmitter {
     private error;
     private jobInfo?;
     private locator?;
-    constructor(conn: Connection<S>, options: ExistingQueryJobV2Options);
-    constructor(conn: Connection<S>, options: CreateQueryJobV2Options);
+    constructor(conn: Connection<S>, options: ExistingQueryJobV2Options | CreateQueryJobV2Options);
     /**
      * Get the query job ID.
      *
@@ -228,8 +227,7 @@ export declare class IngestJobV2<S extends Schema> extends EventEmitter {
     /**
      *
      */
-    constructor(conn: Connection<S>, options: ExistingIngestJobOptions);
-    constructor(conn: Connection<S>, options: CreateIngestJobV2Options);
+    constructor(conn: Connection<S>, options: CreateIngestJobV2Options | ExistingIngestJobOptions);
     /**
      * Get the query job ID.
      *

package/lib/api/bulk2.js

@@ -30,7 +30,8 @@ class BulkApiV2 extends http_api_1.default {
             'errorCode' in body[0]);
     }
     isSessionExpired(response) {
-        return (response.statusCode === 401 && /INVALID_SESSION_ID/.test(response.body));
+        return (response.statusCode === 401 &&
+            response.body.includes('INVALID_SESSION_ID'));
     }
     parseError(body) {
         return {
@@ -110,20 +111,18 @@ class BulkV2 {
             options.pollTimeout = this.pollTimeout;
         if (!options.pollInterval)
             options.pollInterval = this.pollInterval;
-        const job = this.createJob({
-            object: options.object,
-            operation: options.operation,
-        });
+        const { pollInterval, pollTimeout, input, ...createJobOpts } = options;
+        const job = this.createJob(createJobOpts);
         try {
             await job.open();
-            await job.uploadData(options.input);
+            await job.uploadData(input);
             await job.close();
-            await job.poll(options.pollInterval, options.pollTimeout);
+            await job.poll(pollInterval, pollTimeout);
             return await job.getAllResults();
         }
         catch (error) {
             const err = error;
-            this.logger.error(`bulk load failed due to: ${err}`);
+            this.logger.error(`bulk load failed due to: ${err.message}`);
             if (err.name !== 'JobPollingTimeoutError') {
                 // fires off one last attempt to clean up and ignores the result | error
                 job.delete().catch((ignored) => ignored);
@@ -137,7 +136,7 @@ class BulkV2 {
      * Default timeout: 10000ms
      *
      * @param soql SOQL query
-     * @param BulkV2PollingOptions options object
+     * @param options
      *
      * @returns {RecordStream} - Record stream, convertible to a CSV data stream
      */
@@ -163,7 +162,7 @@ class BulkV2 {
         }
         catch (error) {
             const err = error;
-            this.logger.error(`bulk query failed due to: ${err}`);
+            this.logger.error(`bulk query failed due to: ${err.message}`);
             if (err.name !== 'JobPollingTimeoutError') {
                 // fires off one last attempt to clean up and ignores the result | error
                 queryJob.delete().catch((ignored) => ignored);
@@ -280,7 +279,7 @@ class QueryJobV2 extends events_1.EventEmitter {
         const jobId = this.id;
         const startTime = Date.now();
         const endTime = startTime + timeout;
-        this.logger.debug(`Start polling for job status`);
+        this.logger.debug('Start polling for job status');
         this.logger.debug(`Polling options: timeout:${timeout}ms | interval: ${interval}ms.`);
         if (timeout === 0) {
             throw new JobPollingTimeoutError(`Skipping polling because of timeout = 0ms. Job Id = ${jobId}`, jobId);
@@ -401,6 +400,9 @@ class IngestJobV2 extends events_1.EventEmitter {
     bulkJobUnprocessedRecords;
     error;
     jobInfo;
+    /**
+     *
+     */
     constructor(conn, options) {
         super();
         this.connection = conn;
@@ -540,7 +542,7 @@ class IngestJobV2 extends events_1.EventEmitter {
         if (timeout === 0) {
             throw new JobPollingTimeoutError(`Skipping polling because of timeout = 0ms. Job Id = ${jobId}`, jobId);
         }
-        this.logger.debug(`Start polling for job status`);
+        this.logger.debug('Start polling for job status');
         this.logger.debug(`Polling options: timeout:${timeout}ms | interval: ${interval}ms.`);
         while (endTime > Date.now()) {
             try {

package/lib/api/chatter.js

@@ -173,13 +173,13 @@ class Chatter {
      * @private
      */
     _normalizeUrl(url) {
-        if (url.indexOf('/chatter/') === 0 || url.indexOf('/connect/') === 0) {
+        if (url.startsWith('/chatter/') || url.startsWith('/connect/')) {
             return '/services/data/v' + this._conn.version + url;
         }
         else if (/^\/v[\d]+\.[\d]+\//.test(url)) {
             return '/services/data' + url;
         }
-        else if (url.indexOf('/services/') !== 0 && url[0] === '/') {
+        else if (!url.startsWith('/services/') && url.startsWith('/')) {
             return '/services/data/v' + this._conn.version + '/chatter' + url;
         }
         else {

package/lib/api/metadata.d.ts

@@ -17,7 +17,7 @@ export * from './metadata/schema';
 type MetadataType_<K extends keyof ApiSchemaTypes = keyof ApiSchemaTypes> = K extends keyof ApiSchemaTypes ? ApiSchemaTypes[K] extends Metadata ? K : never : never;
 export type MetadataType = MetadataType_;
 export type MetadataDefinition<T extends string, M extends Metadata = Metadata> = Metadata extends M ? T extends keyof ApiSchemaTypes & MetadataType ? ApiSchemaTypes[T] extends Metadata ? ApiSchemaTypes[T] : Metadata : Metadata : M;
-type DeepPartial<T> = T extends any[] ? DeepPartial<T[number]>[] : T extends object ? {
+type DeepPartial<T> = T extends any[] ? Array<DeepPartial<T[number]>> : T extends object ? {
     [K in keyof T]?: DeepPartial<T[K]>;
 } : T;
 export type InputMetadataDefinition<T extends string, M extends Metadata = Metadata> = DeepPartial<MetadataDefinition<T, M>>;
@@ -59,9 +59,9 @@ export declare class MetadataApi<S extends Schema> {
     /**
      * Update one or more metadata components in the organization.
      */
-    update<M extends Metadata = Metadata, T extends string = string, MD extends InputMetadataDefinition<T, M> = InputMetadataDefinition<T, M>>(type: T, metadata: Partial<MD>[]): Promise<SaveResult[]>;
+    update<M extends Metadata = Metadata, T extends string = string, MD extends InputMetadataDefinition<T, M> = InputMetadataDefinition<T, M>>(type: T, metadata: Array<Partial<MD>>): Promise<SaveResult[]>;
     update<M extends Metadata = Metadata, T extends string = string, MD extends InputMetadataDefinition<T, M> = InputMetadataDefinition<T, M>>(type: T, metadata: Partial<MD>): Promise<SaveResult>;
-    update<M extends Metadata = Metadata, T extends string = string, MD extends InputMetadataDefinition<T, M> = InputMetadataDefinition<T, M>>(type: T, metadata: Partial<MD> | Partial<MD>[]): Promise<SaveResult | SaveResult[]>;
+    update<M extends Metadata = Metadata, T extends string = string, MD extends InputMetadataDefinition<T, M> = InputMetadataDefinition<T, M>>(type: T, metadata: Partial<MD> | Array<Partial<MD>>): Promise<SaveResult | SaveResult[]>;
     /**
      * Upsert one or more components in your organization's data.
      */

package/lib/api/metadata.js

@@ -295,7 +295,7 @@ class AsyncResultLocator extends events_1.EventEmitter {
     async check() {
         const result = await this._promise;
         this._id = result.id;
-        return await this._meta.checkStatus(result.id);
+        return this._meta.checkStatus(result.id);
     }
     /**
      * Polling until async call status becomes complete or error

package/lib/api/soap.d.ts

@@ -15,15 +15,15 @@ export declare class SoapApi<S extends Schema> {
     /**
      * Converts a Lead into an Account, Contact, or (optionally) an Opportunity.
      */
-    convertLead(leadConverts: Partial<LeadConvert>[]): Promise<LeadConvertResult[]>;
+    convertLead(leadConverts: Array<Partial<LeadConvert>>): Promise<LeadConvertResult[]>;
     convertLead(leadConvert: Partial<LeadConvert>): Promise<LeadConvertResult>;
-    convertLead(leadConvert: Partial<LeadConvert> | Partial<LeadConvert>[]): Promise<LeadConvertResult | LeadConvertResult[]>;
+    convertLead(leadConvert: Partial<LeadConvert> | Array<Partial<LeadConvert>>): Promise<LeadConvertResult | LeadConvertResult[]>;
     /**
      * Merge up to three records into one
      */
-    merge(mergeRequests: Partial<MergeRequest>[]): Promise<MergeResult[]>;
+    merge(mergeRequests: Array<Partial<MergeRequest>>): Promise<MergeResult[]>;
     merge(mergeRequest: Partial<MergeRequest>): Promise<MergeResult>;
-    merge(mergeRequest: Partial<MergeRequest> | Partial<MergeRequest>[]): Promise<MergeResult | MergeResult[]>;
+    merge(mergeRequest: Partial<MergeRequest> | Array<Partial<MergeRequest>>): Promise<MergeResult | MergeResult[]>;
     /**
      * Delete records from the recycle bin immediately
      */

package/lib/api/streaming/extension.js

@@ -125,9 +125,7 @@ class Replay {
             }
         }
         else if (message.channel === this._channel &&
-            message.data &&
-            message.data.event &&
-            message.data.event.replayId) {
+            message.data?.event?.replayId) {
             this._replay = message.data.event.replayId;
         }
         callback(message);

package/lib/api/streaming.js

@@ -121,13 +121,13 @@ class Streaming extends events_1.EventEmitter {
     /* @private */
     _createClient(forChannelName, extensions) {
         // forChannelName is advisory, for an API workaround. It does not restrict or select the channel.
-        const needsReplayFix = typeof forChannelName === 'string' && forChannelName.indexOf('/u/') === 0;
+        const needsReplayFix = typeof forChannelName === 'string' && forChannelName.startsWith('/u/');
         const endpointUrl = [
             this._conn.instanceUrl,
             // special endpoint "/cometd/replay/xx.x" is only available in 36.0.
             // See https://releasenotes.docs.salesforce.com/en-us/summer16/release-notes/rn_api_streaming_classic_replay.htm
             'cometd' +
-                (needsReplayFix === true && this._conn.version === '36.0'
+                (needsReplayFix && this._conn.version === '36.0'
                     ? '/replay'
                     : ''),
             this._conn.version,
@@ -149,7 +149,7 @@ class Streaming extends events_1.EventEmitter {
     }
     /** @private **/
     _getFayeClient(channelName) {
-        const isGeneric = channelName.indexOf('/u/') === 0;
+        const isGeneric = channelName.startsWith('/u/');
         const clientType = isGeneric ? 'generic' : 'pushTopic';
         if (!this._fayeClients[clientType]) {
             this._fayeClients[clientType] = this._createClient(channelName);
@@ -175,7 +175,7 @@ class Streaming extends events_1.EventEmitter {
      * Subscribe topic/channel
      */
     subscribe(name, listener) {
-        const channelName = name.indexOf('/') === 0 ? name : '/topic/' + name;
+        const channelName = name.startsWith('/') ? name : '/topic/' + name;
         const fayeClient = this._getFayeClient(channelName);
         return fayeClient.subscribe(channelName, listener);
     }
@@ -183,7 +183,7 @@ class Streaming extends events_1.EventEmitter {
      * Unsubscribe topic
      */
     unsubscribe(name, subscription) {
-        const channelName = name.indexOf('/') === 0 ? name : '/topic/' + name;
+        const channelName = name.startsWith('/') ? name : '/topic/' + name;
         const fayeClient = this._getFayeClient(channelName);
         fayeClient.unsubscribe(channelName, subscription);
         return this;

package/lib/api/wsdl/wsdl2schema.js

@@ -297,7 +297,7 @@ async function dumpSchema(schemas, outFile) {
                             value = value['?'];
                         }
                     }
-                    if (typeof value === 'string' && value[0] === '?') {
+                    if (typeof value === 'string' && value.startsWith('?')) {
                         nillable = true;
                         value = value.substring(1);
                     }

package/lib/browser/request.js

@@ -83,7 +83,7 @@ async function startFetchRequest(request, options, input, output, emitter, count
         ...{ allowHTTP1ForStreamingUpload: true }, // Chrome allows request stream only in HTTP2/QUIC unless this opt-in flag
     }), options.timeout, () => controller?.abort());
     const headers = {};
-    // @ts-expect-error
+    // @ts-expect-error no .keys()?
     for (const headerName of res.headers.keys()) {
         headers[headerName.toLowerCase()] = res.headers.get(headerName);
     }

package/lib/cache.js

@@ -91,7 +91,7 @@ class Cache {
      */
     clear(key) {
         for (const k of Object.keys(this._entries)) {
-            if (!key || k.indexOf(key) === 0) {
+            if (!key || k.startsWith(key)) {
                 this._entries[k].clear();
             }
         }

package/lib/connection.d.ts

@@ -306,8 +306,7 @@ export declare class Connection<S extends Schema = Schema> extends EventEmitter
     /**
      * Get SObject instance
      */
-    sobject<N extends SObjectNames<S>>(type: N): SObject<S, N>;
-    sobject<N extends SObjectNames<S>>(type: string): SObject<S, N>;
+    sobject<N extends SObjectNames<S>>(type: string | N): SObject<S, N>;
     /**
      * Get identity information of current user
      */
@@ -352,5 +351,6 @@ export declare class Connection<S extends Schema = Schema> extends EventEmitter
      * Module which manages process rules and approval processes
      */
     process: Process<S>;
+    private isLightningInstance;
 }
 export default Connection;

package/lib/connection.js

@@ -69,7 +69,7 @@ function esc(str) {
  */
 function parseSignedRequest(sr) {
     if (typeof sr === 'string') {
-        if (sr[0] === '{') {
+        if (sr.startsWith('{')) {
             // might be JSON
             return JSON.parse(sr);
         } // might be original base64-encoded signed request
@@ -224,6 +224,9 @@ class Connection extends events_1.EventEmitter {
         const { loginUrl, instanceUrl, version, oauth2, maxRequest, logLevel, proxyUrl, httpProxy, } = config;
         this.loginUrl = loginUrl || defaultConnectionConfig.loginUrl;
         this.instanceUrl = instanceUrl || defaultConnectionConfig.instanceUrl;
+        if (this.isLightningInstance()) {
+            throw new Error('lightning URLs are not valid as instance URLs');
+        }
         this.version = version || defaultConnectionConfig.version;
         this.oauth2 =
             oauth2 instanceof oauth2_1.default
@@ -360,7 +363,7 @@ class Connection extends events_1.EventEmitter {
      */
     async login(username, password) {
         this._refreshDelegate = new session_refresh_delegate_1.default(this, createUsernamePasswordRefreshFn(username, password));
-        if (this.oauth2 && this.oauth2.clientId && this.oauth2.clientSecret) {
+        if (this.oauth2?.clientId && this.oauth2.clientSecret) {
             return this.loginByOAuth2(username, password);
         }
         return this.loginBySoap(username, password);
@@ -417,6 +420,17 @@ class Connection extends events_1.EventEmitter {
             const faultstring = m && m[1];
             throw new Error(faultstring || response.body);
         }
+        // the API will return 200 and a restriced token when using an expired password:
+        // https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_calls_login_loginresult.htm
+        //
+        // we need to throw here to avoid a possible infinite loop with session refresh where:
+        //  1. login happens, `this.accessToken` is set to the restricted token
+        //  2. requests happen, get back 401
+        //  3. trigger session-refresh (username/password login has a default session refresh delegate function)
+        //  4. gets stuck refreshing a restricted token
+        if (response.body.match(/<passwordExpired>true<\/passwordExpired>/g)) {
+            throw new Error('Unable to login because the used password has expired.');
+        }
         this._logger.debug(`SOAP response = ${response.body}`);
         m = response.body.match(/<serverUrl>([^<]+)<\/serverUrl>/);
         const serverUrl = m && m[1];
@@ -607,11 +621,11 @@ class Connection extends events_1.EventEmitter {
      * @private
      */
     _normalizeUrl(url) {
-        if (url[0] === '/') {
-            if (url.indexOf(this.instanceUrl + '/services/') === 0) {
+        if (url.startsWith('/')) {
+            if (url.startsWith(this.instanceUrl + '/services/')) {
                 return url;
             }
-            if (url.indexOf('/services/') === 0) {
+            if (url.startsWith('/services/')) {
                 return this.instanceUrl + url;
             }
             return this._baseUrl() + url;
@@ -722,13 +736,13 @@ class Connection extends events_1.EventEmitter {
     /** @private */
     async _createSingle(type, record, options) {
         const { Id, type: rtype, attributes, ...rec } = record;
-        const sobjectType = type || (attributes && attributes.type) || rtype;
+        const sobjectType = type || attributes?.type || rtype;
         if (!sobjectType) {
             throw new Error('No SObject Type defined in record');
         }
         const url = [this._baseUrl(), 'sobjects', sobjectType].join('/');
         let contentType, body;
-        if (options && options.multipartFileFields) {
+        if (options?.multipartFileFields) {
             // Send the record as a multipart/form-data request. Useful for fields containing large binary blobs.
             const form = new form_data_1.default();
             // Extract the fields requested to be sent separately from the JSON
@@ -785,7 +799,7 @@ class Connection extends events_1.EventEmitter {
         }
         const _records = records.map((record) => {
             const { Id, type: rtype, attributes, ...rec } = record;
-            const sobjectType = type || (attributes && attributes.type) || rtype;
+            const sobjectType = type || attributes?.type || rtype;
             if (!sobjectType) {
                 throw new Error('No SObject Type defined in record');
             }
@@ -828,7 +842,7 @@ class Connection extends events_1.EventEmitter {
         if (!id) {
             throw new Error('Record id is not found in record.');
         }
-        const sobjectType = type || (attributes && attributes.type) || rtype;
+        const sobjectType = type || attributes?.type || rtype;
         if (!sobjectType) {
             throw new Error('No SObject Type defined in record');
         }
@@ -875,7 +889,7 @@ class Connection extends events_1.EventEmitter {
             if (!id) {
                 throw new Error('Record id is not found in record.');
             }
-            const sobjectType = type || (attributes && attributes.type) || rtype;
+            const sobjectType = type || attributes?.type || rtype;
             if (!sobjectType) {
                 throw new Error('No SObject Type defined in record');
             }
@@ -1018,8 +1032,7 @@ class Connection extends events_1.EventEmitter {
         return body;
     }
     sobject(type) {
-        const so = this.sobjects[type] ||
-            new sobject_1.default(this, type);
+        const so = this.sobjects[type] || new sobject_1.default(this, type);
         this.sobjects[type] = so;
         return so;
     }
@@ -1027,7 +1040,7 @@ class Connection extends events_1.EventEmitter {
      * Get identity information of current user
      */
     async identity(options = {}) {
-        let url = this.userInfo && this.userInfo.url;
+        let url = this.userInfo?.url;
         if (!url) {
             const res = await this.request({
                 method: 'GET',
@@ -1148,6 +1161,11 @@ class Connection extends events_1.EventEmitter {
      * Module which manages process rules and approval processes
      */
     process = new process_1.default(this);
+    isLightningInstance() {
+        return (this.instanceUrl.includes('.lightning.force.com') ||
+            this.instanceUrl.includes('.lightning.crmforce.mil') ||
+            this.instanceUrl.includes('.lightning.sfcrmapps.cn'));
+    }
 }
 exports.Connection = Connection;
 exports.default = Connection;

package/lib/http-api.js

@@ -178,6 +178,7 @@ class HttpApi extends events_1.EventEmitter {
     /**
      * @private
      */
+    // eslint-disable-next-line @typescript-eslint/require-await
     async parseResponseBody(response) {
         const contentType = this.getResponseContentType(response) || '';
         const parseBody = /^(text|application)\/xml(;|$)/.test(contentType)

package/lib/oauth2.js

@@ -101,8 +101,7 @@ class OAuth2 {
         if (this.codeVerifier) {
             // 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((0, crypto_1.createHash)('sha256').update(this.codeVerifier).digest('base64'));
-            params.code_challenge = codeChallenge;
+            params.code_challenge = base64UrlEscape((0, crypto_1.createHash)('sha256').update(this.codeVerifier).digest('base64'));
         }
         const _params = {
             ...params,
@@ -111,7 +110,7 @@ class OAuth2 {
             redirect_uri: this.redirectUri,
         };
         return (this.authzServiceUrl +
-            (this.authzServiceUrl.indexOf('?') >= 0 ? '&' : '?') +
+            (this.authzServiceUrl.includes('?') ? '&' : '?') +
             querystring_1.default.stringify(_params));
     }
     /**

package/lib/query.d.ts

@@ -32,9 +32,9 @@ type ConditionSet<R extends Record> = {
     [K in keyof R]?: CondValue<R[K]>;
 };
 export type QueryCondition<S extends Schema, N extends SObjectNames<S>> = {
-    $or: QueryCondition<S, N>[];
+    $or: Array<QueryCondition<S, N>>;
 } | {
-    $and: QueryCondition<S, N>[];
+    $and: Array<QueryCondition<S, N>>;
 } | ConditionSet<SObjectRecord<S, N>>;
 export type QuerySort<S extends Schema, N extends SObjectNames<S>, R extends SObjectRecord<S, N> = SObjectRecord<S, N>> = {
     [K in keyof R]?: SortDir;
@@ -110,7 +110,7 @@ export declare class Query<S extends Schema, N extends SObjectNames<S>, R extend
     _soql: Optional<string>;
     _locator: Optional<string>;
     _config: SOQLQueryConfig;
-    _children: SubQuery<S, N, R, QRT, any, any, any>[];
+    _children: Array<SubQuery<S, N, R, QRT, any, any, any>>;
     _options: QueryOptions;
     _executed: boolean;
     _finished: boolean;
@@ -149,10 +149,8 @@ export declare class Query<S extends Schema, N extends SObjectNames<S>, R extend
     /**
      * Set query sort with direction
      */
-    sort(sort: QuerySort<S, N>): this;
-    sort(sort: string): this;
-    sort(sort: SObjectFieldNames<S, N>, dir: SortDir): this;
-    sort(sort: string, dir: SortDir): this;
+    sort(sort: QuerySort<S, N> | string): this;
+    sort(sort: SObjectFieldNames<S, N> | string, dir: SortDir): this;
     /**
      * Synonym of Query#sort()
      */
@@ -322,9 +320,7 @@ export declare class SubQuery<S extends Schema, PN extends SObjectNames<S>, PR e
      * Set query sort with direction
      */
     sort(sort: QuerySort<S, CN>): this;
-    sort(sort: string): this;
-    sort(sort: SObjectFieldNames<S, CN>, dir: SortDir): this;
-    sort(sort: string, dir: SortDir): this;
+    sort(sort: string | SObjectFieldNames<S, CN>, dir: SortDir): this;
     /**
      * Synonym of SubQuery#sort()
      */

package/lib/query.js

@@ -85,7 +85,7 @@ class Query extends events_1.EventEmitter {
                 : locator;
         }
         else {
-            this._logger.debug(`config is QueryConfig: ${config}`);
+            this._logger.debug(`config is QueryConfig: ${JSON.stringify(config)}`);
             const { fields, includes, sort, ..._config } = config;
             this._config = _config;
             this.select(fields);
@@ -383,6 +383,7 @@ class Query extends events_1.EventEmitter {
             this._finished ||
                 data.done ||
                 !autoFetch ||
+                this.records.length === maxFetch ||
                 // this is what the response looks like when there are no results
                 (data.records.length === 0 && data.done === undefined);
         // streaming record instances

package/lib/registry/base.js

@@ -20,6 +20,7 @@ class BaseRegistry {
         return (this._registryConfig.connections ||
             (this._registryConfig.connections = {}));
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async getConnectionNames() {
         return Object.keys(this._getConnections());
     }
@@ -45,6 +46,7 @@ class BaseRegistry {
         }
         return connConfig_;
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async saveConnectionConfig(name, connConfig) {
         const connections = this._getConnections();
         const { oauth2, ...connConfig_ } = connConfig;
@@ -70,23 +72,28 @@ class BaseRegistry {
         }
         return null;
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async setDefaultConnection(name) {
         this._registryConfig['default'] = name;
         this._saveConfig();
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async removeConnectionConfig(name) {
         const connections = this._getConnections();
         delete connections[name];
         this._saveConfig();
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async getClientConfig(name) {
         const clients = this._getClients();
         const clientConfig = clients[name];
         return clientConfig && { ...clientConfig };
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async getClientNames() {
         return Object.keys(this._getClients());
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async registerClientConfig(name, clientConfig) {
         const clients = this._getClients();
         clients[name] = clientConfig;