@jsforce/jsforce-node 3.2.0 → 3.2.2

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;

package/lib/registry/sfdx.js

@@ -120,9 +120,11 @@ class SfdxRegistry {
     async removeConnectionConfig(name) {
         await this._execCommand('force:org:delete', { u: name });
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async getClientConfig(_name) {
         return null;
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     async getClientNames() {
         return [];
     }

package/lib/registry/types.d.ts

@@ -34,7 +34,7 @@ export type RegistryConfig = {
 /**
  *
  */
-export interface Registry {
+export type Registry = {
     getConnectionNames(): Promise<string[]>;
     getConnection<S extends Schema = Schema>(name?: string): Promise<Connection<S> | null>;
     getConnectionConfig(name?: string): Promise<ConnectionConfig | null>;
@@ -44,4 +44,4 @@ export interface Registry {
     getClientConfig(name: string): Promise<ClientConfig | null>;
     getClientNames(): Promise<string[]>;
     registerClientConfig(name: string, clientConfig: ClientConfig): Promise<void>;
-}
+};

package/lib/request.js

@@ -56,7 +56,7 @@ async function startFetchRequest(request, options, input, output, emitter, count
     const controller = new abort_controller_1.default();
     let retryCount = 0;
     const retryOpts = {
-        statusCodes: options.retry?.statusCodes ?? [429, 500, 502, 503, 504],
+        statusCodes: options.retry?.statusCodes ?? [420, 429, 500, 502, 503, 504],
         maxRetries: options.retry?.maxRetries ?? 5,
         minTimeout: options.retry?.minTimeout ?? 500,
         timeoutFactor: options.retry?.timeoutFactor ?? 2,
@@ -120,6 +120,7 @@ async function startFetchRequest(request, options, input, output, emitter, count
                 ? { body: input }
                 : {}),
             redirect: 'manual',
+            // @ts-expect-error - differing types of signal? this started abruptly
             signal: controller.signal,
             agent,
         };
@@ -127,7 +128,7 @@ async function startFetchRequest(request, options, input, output, emitter, count
             const res = await (0, node_fetch_1.default)(url, fetchOpts);
             if (shouldRetryRequest(retryOpts.maxRetries, res)) {
                 logger.debug(`retrying for the ${retryCount + 1} time`);
-                logger.debug(`reason: statusCode match`);
+                logger.debug('reason: statusCode match');
                 await sleep(retryCount === 0
                     ? retryOpts.minTimeout
                     : retryOpts.minTimeout * retryOpts.timeoutFactor ** retryCount);
@@ -141,7 +142,7 @@ async function startFetchRequest(request, options, input, output, emitter, count
             return res;
         }
         catch (err) {
-            logger.debug(`Request failed`);
+            logger.debug('Request failed');
             const error = err;
             // request was canceled by consumer (AbortController), skip retry and rethrow.
             if (error.name === 'AbortError') {
@@ -149,7 +150,7 @@ async function startFetchRequest(request, options, input, output, emitter, count
             }
             if (shouldRetryRequest(retryOpts.maxRetries, error)) {
                 logger.debug(`retrying for the ${retryCount + 1} time`);
-                logger.debug(`Error: ${error}`);
+                logger.debug(`Error: ${err.message}`);
                 await sleep(retryCount === 0
                     ? retryOpts.minTimeout
                     : retryOpts.minTimeout * retryOpts.timeoutFactor ** retryCount);
@@ -157,7 +158,7 @@ async function startFetchRequest(request, options, input, output, emitter, count
                 // jsforce may switch to node's fetch which doesn't emit this event on retries.
                 emitter.emit('retry', retryCount);
                 retryCount++;
-                return await fetchWithRetries(maxRetry);
+                return fetchWithRetries(maxRetry);
             }
             logger.debug('Skipping retry...');
             if (maxRetry === retryCount) {

package/lib/session-refresh-delegate.js

@@ -53,6 +53,9 @@ class SessionRefreshDelegate {
             await this._refreshPromise;
             this._logger.info('<refresh complete>');
         }
+        catch (err) {
+            throw new Error(`Unable to refresh session due to: ${err.message}`);
+        }
         finally {
             this._refreshPromise = undefined;
             this._lastRefreshedAt = Date.now();

package/lib/soap.js

@@ -59,7 +59,7 @@ function castTypeUsingSchema(value, schema, schemaDict = {}) {
             const v = obj[k];
             const nillable = (Array.isArray(s) && s.length === 2 && s[0] === '?') ||
                 ((0, function_1.isMapObject)(s) && '?' in s) ||
-                (typeof s === 'string' && s[0] === '?');
+                (typeof s === 'string' && s.startsWith('?'));
             if (typeof v === 'undefined' && nillable) {
                 return o;
             }
@@ -70,7 +70,7 @@ function castTypeUsingSchema(value, schema, schemaDict = {}) {
         }, obj);
     }
     else {
-        const nillable = typeof schema === 'string' && schema[0] === '?';
+        const nillable = typeof schema === 'string' && schema.startsWith('?');
         const type = typeof schema === 'string'
             ? nillable
                 ? schema.substring(1)
@@ -135,9 +135,9 @@ function toXML(name, value) {
         if ((0, function_1.isMapObject)(value)) {
             for (const k of Object.keys(value)) {
                 const v = value[k];
-                if (k[0] === '@') {
+                if (k.startsWith('@')) {
                     const kk = k.substring(1);
-                    attrs.push(kk + '="' + v + '"');
+                    attrs.push(`${kk}="${v}"`);
                 }
                 else {
                     elems.push(toXML(k, v));

package/lib/soql-builder.js

@@ -75,7 +75,7 @@ function createFieldExpression(field, value) {
     else if (typeof value === 'object' && value !== null) {
         // Otherwise, if an object was passed then process the supplied ops.
         for (const k of Object.keys(value)) {
-            if (k[0] === '$') {
+            if (k.startsWith('$')) {
                 op = k;
                 _value = value[k];
                 break;

package/lib/transport.js

@@ -146,7 +146,7 @@ class XdProxyTransport extends Transport {
     httpRequest(req, _options = {}) {
         const xdProxyUrl = this._xdProxyUrl;
         const { url, body, ...rreq } = req;
-        const canonicalUrl = url.indexOf('/') === 0 ? baseUrl + url : url;
+        const canonicalUrl = url.startsWith('/') ? baseUrl + url : url;
         const xdProxyReq = createXdProxyRequest({ ...rreq, url: canonicalUrl, body }, xdProxyUrl);
         return super.httpRequest(xdProxyReq, {
             followRedirect: (redirectUrl) => createXdProxyRequest({ ...rreq, method: 'GET', url: redirectUrl }, xdProxyUrl),

package/lib/types/projection.d.ts

@@ -3,15 +3,15 @@ import { StringKeys } from './util';
 /**
  *
  */
-type FieldPath_3<SO extends SObjectDefinition> = '*' | StringKeys<SO['Fields']>[];
+type FieldPath_3<SO extends SObjectDefinition> = '*' | Array<StringKeys<SO['Fields']>>;
 type FieldPath_2<SO extends SObjectDefinition, PSOR extends SO['ParentReferences'] = SO['ParentReferences']> = '*' | StringKeys<SO['Fields']> | {
-    [K in StringKeys<PSOR>]?: '*' | FieldPath_3<Extract<PSOR[K], SObjectDefinition>>[];
+    [K in StringKeys<PSOR>]?: '*' | Array<FieldPath_3<Extract<PSOR[K], SObjectDefinition>>>;
 };
 type FieldPath_1<SO extends SObjectDefinition, PSOR extends SO['ParentReferences'] = SO['ParentReferences']> = '*' | StringKeys<SO['Fields']> | {
-    [K in StringKeys<PSOR>]?: '*' | FieldPath_2<Extract<PSOR[K], SObjectDefinition>>[];
+    [K in StringKeys<PSOR>]?: '*' | Array<FieldPath_2<Extract<PSOR[K], SObjectDefinition>>>;
 };
 type FieldPathSpecifier_<S extends Schema, N extends string, SO extends SObjectDefinition = S['SObjects'][N], PSOR extends SO['ParentReferences'] = SO['ParentReferences']> = '*' | StringKeys<SO['Fields']> | {
-    [K in StringKeys<PSOR>]?: '*' | FieldPath_1<Extract<PSOR[K], SObjectDefinition>>[];
+    [K in StringKeys<PSOR>]?: '*' | Array<FieldPath_1<Extract<PSOR[K], SObjectDefinition>>>;
 };
 export type FieldPathSpecifier<S extends Schema, N extends string> = FieldPathSpecifier_<S, N>;
 export type FieldProjectionConfigObject = {

package/lib/types/schema.d.ts

@@ -19,7 +19,7 @@ export type Address = {
     street: string | null;
 };
 export type SObjectFieldType = number | boolean | DateString | BlobString | string | Address;
-export interface SObjectDefinition<N extends string = string> {
+export type SObjectDefinition<N extends string = string> = {
     Name: N;
     Fields: {
         [name: string]: SObjectFieldType | null;
@@ -30,12 +30,12 @@ export interface SObjectDefinition<N extends string = string> {
     ChildRelationships: {
         [name: string]: SObjectDefinition;
     };
-}
-export interface Schema {
+};
+export type Schema = {
     SObjects: {
         [name: string]: SObjectDefinition;
     };
-}
+};
 /**
  *
  */