@salesforce/core 3.7.3 → 3.7.4

package/lib/logger.js

@@ -204,7 +204,7 @@ class Logger {
      */
     static getLevelByName(levelName) {
         levelName = levelName.toUpperCase();
-        if (!ts_types_1.isKeyOf(LoggerLevel, levelName)) {
+        if (!(0, ts_types_1.isKeyOf)(LoggerLevel, levelName)) {
             throw new sfdxError_1.SfdxError(`Invalid log level "${levelName}".`, 'UnrecognizedLoggerLevelNameError');
         }
         return LoggerLevel[levelName];
@@ -434,7 +434,7 @@ class Logger {
                     }
                     // close file streams, flush buffer to disk
                     // eslint-disable-next-line @typescript-eslint/unbound-method
-                    if (entry.type === 'file' && entry.stream && ts_types_1.isFunction(entry.stream.end)) {
+                    if (entry.type === 'file' && entry.stream && (0, ts_types_1.isFunction)(entry.stream.end)) {
                         entry.stream.end();
                     }
                 });
@@ -501,7 +501,7 @@ class Logger {
     debugCallback(cb) {
         if (this.getLevel() === LoggerLevel.DEBUG || process.env.DEBUG) {
             const result = cb();
-            if (ts_types_1.isArray(result)) {
+            if ((0, ts_types_1.isArray)(result)) {
                 this.bunyan.debug(this.applyFilters(LoggerLevel.DEBUG, ...result));
             }
             else {
@@ -562,18 +562,18 @@ class Logger {
                 stream: new stream_1.Writable({
                     write: (chunk, encoding, next) => {
                         try {
-                            const json = kit_1.parseJsonMap(chunk.toString());
-                            const logLevel = ts_types_1.ensureNumber(json.level);
+                            const json = (0, kit_1.parseJsonMap)(chunk.toString());
+                            const logLevel = (0, ts_types_1.ensureNumber)(json.level);
                             if (this.getLevel() <= logLevel) {
                                 let debuggerName = 'core';
-                                if (ts_types_1.isString(json.log)) {
+                                if ((0, ts_types_1.isString)(json.log)) {
                                     debuggerName = json.log;
                                     if (!debuggers[debuggerName]) {
                                         debuggers[debuggerName] = Debug(`${this.getName()}:${debuggerName}`);
                                     }
                                 }
                                 const level = LoggerLevel[logLevel];
-                                ts_types_1.ensure(debuggers[debuggerName])(`${level} ${json.msg}`);
+                                (0, ts_types_1.ensure)(debuggers[debuggerName])(`${level} ${json.msg}`);
                             }
                         }
                         catch (err) {
@@ -665,7 +665,7 @@ const FILTERED_KEYS = [
 // SFDX code and plugins should never show tokens or connect app information in the logs
 const _filter = (...args) => {
     return args.map((arg) => {
-        if (ts_types_1.isArray(arg)) {
+        if ((0, ts_types_1.isArray)(arg)) {
             return _filter(...arg);
         }
         if (arg) {
@@ -674,10 +674,10 @@ const _filter = (...args) => {
             if (arg instanceof Buffer) {
                 _arg = '<Buffer>';
             }
-            else if (ts_types_1.isObject(arg)) {
+            else if ((0, ts_types_1.isObject)(arg)) {
                 _arg = JSON.stringify(arg);
             }
-            else if (ts_types_1.isString(arg)) {
+            else if ((0, ts_types_1.isString)(arg)) {
                 _arg = arg;
             }
             else {
@@ -688,7 +688,7 @@ const _filter = (...args) => {
                 let expElement = key;
                 let expName = key;
                 // Filtered keys can be strings or objects containing regular expression components.
-                if (ts_types_1.isPlainObject(key)) {
+                if ((0, ts_types_1.isPlainObject)(key)) {
                     expElement = key.regex;
                     expName = key.name;
                 }
@@ -702,7 +702,7 @@ const _filter = (...args) => {
             });
             _arg = _arg.replace(/(00D\w{12,15})![.\w]*/, `<${HIDDEN}>`);
             // return an object if an object was logged; otherwise return the filtered string.
-            return ts_types_1.isObject(arg) ? kit_1.parseJson(_arg) : _arg;
+            return (0, ts_types_1.isObject)(arg) ? (0, kit_1.parseJson)(_arg) : _arg;
         }
         else {
             return arg;

package/lib/messages.js

@@ -67,16 +67,17 @@ const jsAndJsonLoader = (filePath, fileContents) => {
     let json;
     try {
         json = JSON.parse(fileContents);
-        if (!ts_types_1.isObject(json)) {
+        if (!(0, ts_types_1.isObject)(json)) {
             // Bubble up
             throw new Error(`Unexpected token. Found returned content type '${typeof json}'.`);
         }
     }
     catch (err) {
         // Provide a nicer error message for a common JSON parse error; Unexpected token
-        if (err.message.startsWith('Unexpected token')) {
-            const parseError = new Error(`Invalid JSON content in message file: ${filePath}\n${err.message}`);
-            parseError.name = err.name;
+        const error = err;
+        if (error.message.startsWith('Unexpected token')) {
+            const parseError = new Error(`Invalid JSON content in message file: ${filePath}\n${error.message}`);
+            parseError.name = error.name;
             throw parseError;
         }
         throw err;
@@ -275,7 +276,7 @@ class Messages {
         if (!packageName) {
             const errMessage = `Invalid or missing package.json file at '${moduleMessagesDirPath}'. If not using a package.json, pass in a packageName.`;
             try {
-                packageName = ts_types_1.asString(ts_types_1.ensureJsonMap(Messages.readFile(path.join(moduleMessagesDirPath, 'package.json'))).name);
+                packageName = (0, ts_types_1.asString)((0, ts_types_1.ensureJsonMap)(Messages.readFile(path.join(moduleMessagesDirPath, 'package.json'))).name);
                 if (!packageName) {
                     throw new kit_1.NamedError('MissingPackageName', errMessage);
                 }
@@ -446,7 +447,7 @@ class Messages {
         //     'myMessageError' -> `MyMessageError`
         //     'error.myMessage' -> `MyMessageError`
         //     'errors.myMessage' -> `MyMessageError`
-        const errName = `${kit_1.upperFirst(key.replace(/^errors*\./, ''))}${/Error$/.exec(key) ? '' : 'Error'}`;
+        const errName = `${(0, kit_1.upperFirst)(key.replace(/^errors*\./, ''))}${/Error$/.exec(key) ? '' : 'Error'}`;
         const errMessage = this.getMessage(key, tokens);
         let errActions;
         try {
@@ -464,7 +465,7 @@ class Messages {
             const parentKey = group[1];
             const childKey = group[2];
             const childObject = map.get(parentKey);
-            if (childObject && ts_types_1.isJsonMap(childObject)) {
+            if (childObject && (0, ts_types_1.isJsonMap)(childObject)) {
                 const childMap = new Map(Object.entries(childObject));
                 return this.getMessageWithMap(childKey, tokens, childMap);
             }
@@ -474,9 +475,9 @@ class Messages {
             throw new kit_1.NamedError('MissingMessageError', `Missing message ${this.bundleName}:${key} for locale ${Messages.getLocale()}.`);
         }
         const msg = map.get(key);
-        const messages = (ts_types_1.isArray(msg) ? msg : [msg]);
+        const messages = ((0, ts_types_1.isArray)(msg) ? msg : [msg]);
         return messages.map((message) => {
-            ts_types_1.ensureString(message);
+            (0, ts_types_1.ensureString)(message);
             return util.format(message, ...tokens);
         });
     }

package/lib/org/authInfo.js

@@ -149,7 +149,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const orgs = Object.values(globalInfo.orgs.getAll());
         const final = [];
         for (const org of orgs) {
-            const username = ts_types_1.ensureString(org.username);
+            const username = (0, ts_types_1.ensureString)(org.username);
             const aliases = (_a = globalInfo.aliases.getAll(username)) !== null && _a !== void 0 ? _a : undefined;
             // Get a list of configuration values that are set to either the username or one
             // of the aliases
@@ -170,7 +170,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                     accessToken: authInfo.getConnectionOptions().accessToken,
                     oauthMethod: authInfo.isJwt() ? 'jwt' : authInfo.isOauth() ? 'web' : 'token',
                     isExpired: Boolean(devHubUsername) && expirationDate
-                        ? new Date(ts_types_1.ensureString(expirationDate)).getTime() < new Date().getTime()
+                        ? new Date((0, ts_types_1.ensureString)(expirationDate)).getTime() < new Date().getTime()
                         : 'unknown',
                 });
             }
@@ -196,13 +196,14 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     static async hasAuthentications() {
         try {
             const auths = (await globalInfo_1.GlobalInfo.getInstance()).orgs.getAll();
-            return !kit_1.isEmpty(auths);
+            return !(0, kit_1.isEmpty)(auths);
         }
         catch (err) {
-            if (err.name === 'OrgDataNotAvailableError' || err.code === 'ENOENT') {
+            const error = err;
+            if (error.name === 'OrgDataNotAvailableError' || error.code === 'ENOENT') {
                 return false;
             }
-            throw err;
+            throw error;
         }
     }
     /**
@@ -217,7 +218,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // The state parameter allows the redirectUri callback listener to ignore request
         // that don't contain the state value.
         const params = {
-            state: crypto_1.randomBytes(Math.ceil(6)).toString('hex'),
+            state: (0, crypto_1.randomBytes)(Math.ceil(6)).toString('hex'),
             prompt: 'login',
             // Default connected app is 'refresh_token api web'
             scope: options.scope || kit_1.env.getString('SFDX_AUTH_SCOPES', 'refresh_token api web'),
@@ -286,7 +287,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      */
     async save(authData) {
         this.update(authData);
-        const username = ts_types_1.ensure(this.getUsername());
+        const username = (0, ts_types_1.ensure)(this.getUsername());
         if (sfdc_1.sfdc.matchesAccessToken(username)) {
             this.logger.debug('Username is an accesstoken. Skip saving authinfo to disk.');
             return this;
@@ -303,7 +304,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      */
     update(authData) {
         // todo move into configstore
-        if (authData && ts_types_1.isPlainObject(authData)) {
+        if (authData && (0, ts_types_1.isPlainObject)(authData)) {
             this.username = authData.username || this.username;
             const existingFields = this.globalInfo.orgs.get(this.getUsername());
             const mergedFields = Object.assign({}, existingFields || {}, authData);
@@ -373,8 +374,8 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      */
     getOrgFrontDoorUrl() {
         const authFields = this.getFields(true);
-        const base = ts_types_1.ensureString(authFields.instanceUrl).replace(/\/+$/, '');
-        const accessToken = ts_types_1.ensureString(authFields.accessToken);
+        const base = (0, ts_types_1.ensureString)(authFields.instanceUrl).replace(/\/+$/, '');
+        const accessToken = (0, ts_types_1.ensureString)(authFields.accessToken);
         return `${base}/secur/frontdoor.jsp?sid=${accessToken}`;
     }
     /**
@@ -390,12 +391,12 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
      */
     getSfdxAuthUrl() {
         const decryptedFields = this.getFields(true);
-        const instanceUrl = ts_types_1.ensure(decryptedFields.instanceUrl, 'undefined instanceUrl').replace(/^https?:\/\//, '');
+        const instanceUrl = (0, ts_types_1.ensure)(decryptedFields.instanceUrl, 'undefined instanceUrl').replace(/^https?:\/\//, '');
         let sfdxAuthUrl = 'force://';
         if (decryptedFields.clientId) {
             sfdxAuthUrl += `${decryptedFields.clientId}:${decryptedFields.clientSecret || ''}:`;
         }
-        sfdxAuthUrl += `${ts_types_1.ensure(decryptedFields.refreshToken, 'undefined refreshToken')}@${instanceUrl}`;
+        sfdxAuthUrl += `${(0, ts_types_1.ensure)(decryptedFields.refreshToken, 'undefined refreshToken')}@${instanceUrl}`;
         return sfdxAuthUrl;
     }
     /**
@@ -414,7 +415,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         catch {
             config = await config_1.Config.create({ isGlobal: true });
         }
-        const username = ts_types_1.ensureString(this.getUsername());
+        const username = (0, ts_types_1.ensureString)(this.getUsername());
         const alias = this.globalInfo.aliases.get(username);
         const value = alias !== null && alias !== void 0 ? alias : username;
         if (options.org) {
@@ -453,12 +454,12 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 throw messages.createError('authInfoOverwriteError');
             }
         }
-        const oauthUsername = username || ts_types_1.getString(authOptions, 'username');
+        const oauthUsername = username || (0, ts_types_1.getString)(authOptions, 'username');
         if (oauthUsername) {
             this.username = oauthUsername;
         } // Else it will be set in initAuthOptions below.
         // If the username is an access token, use that for auth and don't persist
-        if (ts_types_1.isString(oauthUsername) && sfdc_1.sfdc.matchesAccessToken(oauthUsername)) {
+        if ((0, ts_types_1.isString)(oauthUsername) && sfdc_1.sfdc.matchesAccessToken(oauthUsername)) {
             // Need to initAuthOptions the logger and authInfoCrypto since we don't call init()
             this.logger = await logger_1.Logger.child('AuthInfo');
             const aggregator = await configAggregator_1.ConfigAggregator.create();
@@ -480,7 +481,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         }
     }
     getInstanceUrl(options, aggregator) {
-        const instanceUrl = ts_types_1.getString(options, 'instanceUrl') || aggregator.getPropertyValue('instanceUrl');
+        const instanceUrl = (0, ts_types_1.getString)(options, 'instanceUrl') || aggregator.getPropertyValue('instanceUrl');
         return instanceUrl || sfdcUrl_1.SfdcUrl.PRODUCTION;
     }
     /**
@@ -497,10 +498,10 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // If options were passed, use those before checking cache and reading an auth file.
         let authConfig;
         if (options) {
-            options = kit_1.cloneJson(options);
+            options = (0, kit_1.cloneJson)(options);
             if (this.isTokenOptions(options)) {
                 authConfig = options;
-                const userInfo = await this.retrieveUserInfo(ts_types_1.ensureString(options.instanceUrl), ts_types_1.ensureString(options.accessToken));
+                const userInfo = await this.retrieveUserInfo((0, ts_types_1.ensureString)(options.instanceUrl), (0, ts_types_1.ensureString)(options.accessToken));
                 this.update({ username: userInfo === null || userInfo === void 0 ? void 0 : userInfo.username, orgId: userInfo === null || userInfo === void 0 ? void 0 : userInfo.organizationId });
             }
             else {
@@ -514,14 +515,14 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                         // Grab whatever flow is defined
                         Object.assign(options, {
                             clientSecret: parentFields.clientSecret,
-                            privateKey: parentFields.privateKey ? path_1.resolve(parentFields.privateKey) : parentFields.privateKey,
+                            privateKey: parentFields.privateKey ? (0, path_1.resolve)(parentFields.privateKey) : parentFields.privateKey,
                         });
                     }
                 }
                 // jwt flow
                 // Support both sfdx and jsforce private key values
                 if (!options.privateKey && options.privateKeyFile) {
-                    options.privateKey = path_1.resolve(options.privateKeyFile);
+                    options.privateKey = (0, path_1.resolve)(options.privateKeyFile);
                 }
                 if (options.privateKey) {
                     authConfig = await this.buildJwtConfig(options);
@@ -565,6 +566,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     // A callback function for a connection to refresh an access token.  This is used
     // both for a JWT connection and an OAuth connection.
     async refreshFn(conn, callback) {
+        var _a;
         this.logger.info('Access token has expired. Updating...');
         try {
             const fields = this.getFields(true);
@@ -573,19 +575,20 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
             return await callback(null, fields.accessToken);
         }
         catch (err) {
-            if (err.message && err.message.includes('Data Not Available')) {
+            const error = err;
+            if ((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('Data Not Available')) {
                 // Set cause to keep original stacktrace
-                return await callback(messages.createError('orgDataNotAvailableError', [this.getUsername()], [], err));
+                return await callback(messages.createError('orgDataNotAvailableError', [this.getUsername()], [], error));
             }
-            return await callback(err);
+            return await callback(error);
         }
     }
     // Build OAuth config for a JWT auth flow
     async buildJwtConfig(options) {
-        const privateKeyContents = await fs_1.fs.readFile(ts_types_1.ensure(options.privateKey), 'utf8');
+        const privateKeyContents = await fs_1.fs.readFile((0, ts_types_1.ensure)(options.privateKey), 'utf8');
         const { loginUrl = sfdcUrl_1.SfdcUrl.PRODUCTION } = options;
         const url = new sfdcUrl_1.SfdcUrl(loginUrl);
-        const createdOrgInstance = ts_types_1.getString(options, 'createdOrgInstance', '').trim().toLowerCase();
+        const createdOrgInstance = (0, ts_types_1.getString)(options, 'createdOrgInstance', '').trim().toLowerCase();
         const audienceUrl = await url.getJwtAudienceUrl(createdOrgInstance);
         const jwtToken = jwt.sign({
             iss: options.clientId,
@@ -598,19 +601,19 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const oauth2 = new JwtOAuth2({ loginUrl: options.loginUrl });
         let authFieldsBuilder;
         try {
-            authFieldsBuilder = ts_types_1.ensureJsonMap(await oauth2.jwtAuthorize(jwtToken));
+            authFieldsBuilder = (0, ts_types_1.ensureJsonMap)(await oauth2.jwtAuthorize(jwtToken));
         }
         catch (err) {
             throw messages.createError('jwtAuthError', [err.message]);
         }
         const authFields = {
-            accessToken: ts_types_1.asString(authFieldsBuilder.access_token),
-            orgId: parseIdUrl(ts_types_1.ensureString(authFieldsBuilder.id)).orgId,
+            accessToken: (0, ts_types_1.asString)(authFieldsBuilder.access_token),
+            orgId: parseIdUrl((0, ts_types_1.ensureString)(authFieldsBuilder.id)).orgId,
             loginUrl: options.loginUrl,
             privateKey: options.privateKey,
             clientId: options.clientId,
         };
-        const instanceUrl = ts_types_1.ensureString(authFieldsBuilder.instance_url);
+        const instanceUrl = (0, ts_types_1.ensureString)(authFieldsBuilder.instance_url);
         const sfdcUrl = new sfdcUrl_1.SfdcUrl(instanceUrl);
         try {
             // Check if the url is resolvable. This can fail when my-domains have not been replicated.
@@ -637,7 +640,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         const oauth2 = new jsforce_1.OAuth2(options);
         let authFieldsBuilder;
         try {
-            authFieldsBuilder = await oauth2.refreshToken(ts_types_1.ensure(options.refreshToken));
+            authFieldsBuilder = await oauth2.refreshToken((0, ts_types_1.ensure)(options.refreshToken));
         }
         catch (err) {
             throw messages.createError('refreshTokenAuthError', [err.message]);
@@ -648,7 +651,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         if (!username) {
             // @ts-ignore
             const userInfo = await this.retrieveUserInfo(authFieldsBuilder.instance_url, authFieldsBuilder.access_token);
-            username = ts_types_1.ensureString(userInfo === null || userInfo === void 0 ? void 0 : userInfo.username);
+            username = (0, ts_types_1.ensureString)(userInfo === null || userInfo === void 0 ? void 0 : userInfo.username);
         }
         return {
             orgId,
@@ -680,7 +683,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         let authFields;
         try {
             this.logger.info(`Exchanging auth code for access token using loginUrl: ${options.loginUrl}`);
-            authFields = await oauth2.requestToken(ts_types_1.ensure(options.authCode));
+            authFields = await oauth2.requestToken((0, ts_types_1.ensure)(options.authCode));
         }
         catch (err) {
             throw messages.createError('authCodeExchangeError', [err.message]);
@@ -713,7 +716,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // but we don't want to create circular dependencies or lots of snowflakes
         // within this file to support it.
         const apiVersion = 'v51.0'; // hardcoding to v51.0 just for this call is okay.
-        const instance = ts_types_1.ensure(instanceUrl);
+        const instance = (0, ts_types_1.ensure)(instanceUrl);
         const baseUrl = new sfdcUrl_1.SfdcUrl(instance);
         const userInfoUrl = `${baseUrl}services/oauth2/userinfo`;
         const headers = Object.assign({ Authorization: `Bearer ${accessToken}` }, connection_1.SFDX_HTTP_HEADERS);
@@ -724,7 +727,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 this.throwUserGetException(response);
             }
             else {
-                const userInfoJson = kit_1.parseJsonMap(response.body);
+                const userInfoJson = (0, 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_1.default().httpRequest({ url, method: 'GET', headers });
@@ -733,7 +736,7 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 }
                 else {
                     // eslint-disable-next-line camelcase
-                    userInfoJson.preferred_username = kit_1.parseJsonMap(response.body).Username;
+                    userInfoJson.preferred_username = (0, kit_1.parseJsonMap)(response.body).Username;
                 }
                 return { username: userInfoJson.preferred_username, organizationId: userInfoJson.organization_id };
             }
@@ -751,16 +754,16 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
     throwUserGetException(response) {
         var _a;
         let errorMsg = '';
-        const bodyAsString = ts_types_1.getString(response, 'body', JSON.stringify({ message: 'UNKNOWN', errorCode: 'UNKNOWN' }));
+        const bodyAsString = (0, ts_types_1.getString)(response, 'body', JSON.stringify({ message: 'UNKNOWN', errorCode: 'UNKNOWN' }));
         try {
-            const body = kit_1.parseJson(bodyAsString);
-            if (ts_types_1.isArray(body)) {
+            const body = (0, kit_1.parseJson)(bodyAsString);
+            if ((0, ts_types_1.isArray)(body)) {
                 errorMsg = body
-                    .map((line) => { var _a; return (_a = ts_types_1.getString(line, 'message')) !== null && _a !== void 0 ? _a : ts_types_1.getString(line, 'errorCode', 'UNKNOWN'); })
+                    .map((line) => { var _a; return (_a = (0, ts_types_1.getString)(line, 'message')) !== null && _a !== void 0 ? _a : (0, ts_types_1.getString)(line, 'errorCode', 'UNKNOWN'); })
                     .join(os.EOL);
             }
             else {
-                errorMsg = (_a = ts_types_1.getString(body, 'message')) !== null && _a !== void 0 ? _a : ts_types_1.getString(body, 'errorCode', 'UNKNOWN');
+                errorMsg = (_a = (0, ts_types_1.getString)(body, 'message')) !== null && _a !== void 0 ? _a : (0, ts_types_1.getString)(body, 'errorCode', 'UNKNOWN');
             }
         }
         catch (err) {

package/lib/org/connection.js

@@ -86,7 +86,7 @@ class Connection extends jsforce_1.Connection {
         if (!baseOptions.version) {
             // Set the API version obtained from the config aggregator.
             const configAggregator = options.configAggregator || (await configAggregator_1.ConfigAggregator.create());
-            baseOptions.version = ts_types_1.asString(configAggregator.getInfo('apiVersion').value);
+            baseOptions.version = (0, 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
@@ -173,7 +173,7 @@ class Connection extends jsforce_1.Connection {
      * @param options HTTP API request options.
      */
     request(request, options) {
-        const httpRequest = ts_types_1.isString(request) ? { method: 'GET', url: request } : request;
+        const httpRequest = (0, 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.
@@ -226,7 +226,7 @@ class Connection extends jsforce_1.Connection {
         await this.isResolvable();
         const versions = await this.request(`${this.instanceUrl}/services/data`);
         this.logger.debug(`response for org versions: ${versions.map((item) => item.version).join(',')}`);
-        const max = ts_types_1.ensure(kit_1.maxBy(versions, (version) => version.version));
+        const max = (0, ts_types_1.ensure)((0, kit_1.maxBy)(versions, (version) => version.version));
         return max.version;
     }
     /**
@@ -237,11 +237,12 @@ class Connection extends jsforce_1.Connection {
             this.setApiVersion(await this.retrieveMaxApiVersion());
         }
         catch (err) {
-            if (err.name === exports.DNS_ERROR_NAME) {
-                throw err; // throws on DNS connection errors
+            const error = err;
+            if (error.name === exports.DNS_ERROR_NAME) {
+                throw error; // throws on DNS connection errors
             }
             // Don't fail if we can't use the latest, just use the default
-            this.logger.warn('Failed to set the latest API version:', err);
+            this.logger.warn('Failed to set the latest API version:', error);
         }
     }
     /**
@@ -367,10 +368,10 @@ class Connection extends jsforce_1.Connection {
     async loadInstanceApiVersion() {
         const authFileFields = this.options.authInfo.getFields();
         const lastCheckedDateString = authFileFields.instanceApiVersionLastRetrieved;
-        let version = ts_types_1.getString(authFileFields, 'instanceApiVersion');
+        let version = (0, ts_types_1.getString)(authFileFields, 'instanceApiVersion');
         let lastChecked;
         try {
-            if (lastCheckedDateString && ts_types_1.isString(lastCheckedDateString)) {
+            if (lastCheckedDateString && (0, ts_types_1.isString)(lastCheckedDateString)) {
                 lastChecked = Date.parse(lastCheckedDateString);
             }
         }

package/lib/org/org.js

@@ -124,7 +124,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         let dataPath;
         try {
             const rootFolder = await config_1.Config.resolveRootFolder(false);
-            dataPath = path_1.join(rootFolder, global_1.Global.SFDX_STATE_FOLDER, orgDataPath ? orgDataPath : 'orgs');
+            dataPath = (0, path_1.join)(rootFolder, global_1.Global.SFDX_STATE_FOLDER, orgDataPath ? orgDataPath : 'orgs');
             this.logger.debug(`cleaning data for path: ${dataPath}`);
         }
         catch (err) {
@@ -193,7 +193,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         const DEV_HUB_SOQL = `SELECT CreatedDate,Edition,ExpirationDate FROM ActiveScratchOrg WHERE ScratchOrg='${trimmedId}'`;
         try {
             const results = await devHubConnection.query(DEV_HUB_SOQL);
-            if (ts_types_1.getNumber(results, 'records.length') !== 1) {
+            if ((0, ts_types_1.getNumber)(results, 'records.length') !== 1) {
                 throw new sfdxError_1.SfdxError('No results', 'NoResultsError');
             }
         }
@@ -213,7 +213,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             return this;
         }
         else if (this.getField(Org.Fields.DEV_HUB_USERNAME)) {
-            const devHubUsername = ts_types_1.ensureString(this.getField(Org.Fields.DEV_HUB_USERNAME));
+            const devHubUsername = (0, ts_types_1.ensureString)(this.getField(Org.Fields.DEV_HUB_USERNAME));
             return Org.create({
                 connection: await connection_1.Connection.create({
                     authInfo: await authInfo_1.AuthInfo.create({ username: devHubUsername }),
@@ -230,7 +230,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     isDevHubOrg() {
         const isDevHub = this.getField(Org.Fields.IS_DEV_HUB);
-        if (ts_types_1.isBoolean(isDevHub)) {
+        if ((0, ts_types_1.isBoolean)(isDevHub)) {
             return isDevHub;
         }
         else {
@@ -279,7 +279,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async determineIfDevHubOrg(forceServerCheck = false) {
         const cachedIsDevHub = this.getField(Org.Fields.IS_DEV_HUB);
-        if (!forceServerCheck && ts_types_1.isBoolean(cachedIsDevHub)) {
+        if (!forceServerCheck && (0, ts_types_1.isBoolean)(cachedIsDevHub)) {
             return cachedIsDevHub;
         }
         if (this.isDevHubOrg()) {
@@ -295,7 +295,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         catch (err) {
             /* Not a dev hub */
         }
-        const username = ts_types_1.ensure(this.getUsername());
+        const username = (0, ts_types_1.ensure)(this.getUsername());
         const authInfo = await authInfo_1.AuthInfo.create({ username });
         await authInfo.save({ isDevHub });
         // Reset the connection with the updated auth file
@@ -311,7 +311,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     isScratch() {
         const isScratch = this.getField(Org.Fields.IS_SCRATCH);
-        if (ts_types_1.isBoolean(isScratch)) {
+        if ((0, ts_types_1.isBoolean)(isScratch)) {
             return isScratch;
         }
         else {
@@ -397,8 +397,8 @@ class Org extends kit_1.AsyncOptionalCreatable {
     async readUserAuthFiles() {
         const config = await this.retrieveOrgUsersConfig();
         const contents = await config.read();
-        const thisUsername = ts_types_1.ensure(this.getUsername());
-        const usernames = ts_types_1.ensureJsonArray(contents.usernames || [thisUsername]);
+        const thisUsername = (0, ts_types_1.ensure)(this.getUsername());
+        const usernames = (0, ts_types_1.ensureJsonArray)(contents.usernames || [thisUsername]);
         return Promise.all(usernames.map((username) => {
             if (username === thisUsername) {
                 return authInfo_1.AuthInfo.create({
@@ -406,7 +406,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 });
             }
             else {
-                return authInfo_1.AuthInfo.create({ username: ts_types_1.ensureString(username) });
+                return authInfo_1.AuthInfo.create({ username: (0, ts_types_1.ensureString)(username) });
             }
         }));
     }
@@ -431,18 +431,18 @@ class Org extends kit_1.AsyncOptionalCreatable {
         if (!auth) {
             throw new sfdxError_1.SfdxError('Missing auth info', 'MissingAuthInfo');
         }
-        const authInfo = ts_types_1.isString(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
+        const authInfo = (0, ts_types_1.isString)(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
         this.logger.debug(`adding username ${authInfo.getFields().username}`);
         const orgConfig = await this.retrieveOrgUsersConfig();
         const contents = await orgConfig.read();
         // TODO: This is kind of screwy because contents values can be `AnyJson | object`...
         // needs config refactoring to improve
         const usernames = contents.usernames || [];
-        if (!ts_types_1.isArray(usernames)) {
+        if (!(0, ts_types_1.isArray)(usernames)) {
             throw new sfdxError_1.SfdxError('Usernames is not an array', 'UnexpectedDataFormat');
         }
         let shouldUpdate = false;
-        const thisUsername = ts_types_1.ensure(this.getUsername());
+        const thisUsername = (0, ts_types_1.ensure)(this.getUsername());
         if (!usernames.includes(thisUsername)) {
             usernames.push(thisUsername);
             shouldUpdate = true;
@@ -469,7 +469,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         if (!auth) {
             throw new sfdxError_1.SfdxError('Missing auth info', 'MissingAuthInfoError');
         }
-        const authInfo = ts_types_1.isString(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
+        const authInfo = (0, ts_types_1.isString)(auth) ? await authInfo_1.AuthInfo.create({ username: auth }) : auth;
         this.logger.debug(`removing username ${authInfo.getFields().username}`);
         const orgConfig = await this.retrieveOrgUsersConfig();
         const contents = await orgConfig.read();
@@ -830,6 +830,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      *  pollInterval: Duration to sleep between poll events, default 30 seconds
      */
     async pollStatusAndAuth(options) {
+        var _a;
         const { sandboxProcessObj, retries, shouldPoll, pollInterval } = options;
         this.logger.debug('PollStatusAndAuth called with SandboxProcessObject%s, retries %s', sandboxProcessObj, retries);
         const lifecycle = lifecycleEvents_1.Lifecycle.getInstance();
@@ -844,12 +845,13 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 pollFinished = true;
             }
             catch (err) {
+                const error = err;
                 this.logger.debug('Exception while calling writeSandboxAuthFile %s', err);
-                if ((err === null || err === void 0 ? void 0 : err.name) === 'JWTAuthError' && (err === null || err === void 0 ? void 0 : err.stack.includes("user hasn't approved"))) {
+                if ((error === null || error === void 0 ? void 0 : error.name) === 'JWTAuthError' && ((_a = error === null || error === void 0 ? void 0 : error.stack) === null || _a === void 0 ? void 0 : _a.includes("user hasn't approved"))) {
                     waitingOnAuth = true;
                 }
                 else {
-                    throw sfdxError_1.SfdxError.wrap(err);
+                    throw sfdxError_1.SfdxError.wrap(error);
                 }
             }
         }
@@ -863,7 +865,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                         retries,
                         waitingOnAuth,
                     }),
-                    await kit_1.sleep(pollInterval),
+                    await (0, kit_1.sleep)(pollInterval),
                 ]);
                 const polledSandboxProcessObj = await this.querySandboxProcess(sandboxProcessObj.SandboxInfoId);
                 return this.pollStatusAndAuth({
@@ -933,14 +935,15 @@ class Org extends kit_1.AsyncOptionalCreatable {
             return result;
         }
         catch (err) {
+            const error = err;
             // There are cases where the endDate is set before the sandbox has actually completed.
             // In that case, the sandboxAuth call will throw a specific exception.
-            if ((err === null || err === void 0 ? void 0 : err.name) === 'INVALID_STATUS') {
-                this.logger.debug('Error while authenticating the user %s', err === null || err === void 0 ? void 0 : err.toString());
+            if ((error === null || error === void 0 ? void 0 : error.name) === 'INVALID_STATUS') {
+                this.logger.debug('Error while authenticating the user %s', error === null || error === void 0 ? void 0 : error.toString());
             }
             else {
                 // If it fails for any unexpected reason, just pass that through
-                throw sfdxError_1.SfdxError.wrap(err);
+                throw sfdxError_1.SfdxError.wrap(error);
             }
         }
     }