@salesforce/core 4.3.11 → 5.0.1-v5-beta.1

package/lib/org/org.js

@@ -17,7 +17,7 @@ const configAggregator_1 = require("../config/configAggregator");
 const orgUsersConfig_1 = require("../config/orgUsersConfig");
 const global_1 = require("../global");
 const lifecycleEvents_1 = require("../lifecycleEvents");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const sfError_1 = require("../sfError");
 const sfdc_1 = require("../util/sfdc");
 const webOAuthServer_1 = require("../webOAuthServer");
@@ -94,14 +94,14 @@ class Org extends kit_1.AsyncOptionalCreatable {
         async: false,
         interval: kit_1.Duration.seconds(30),
     }) {
-        this.logger.debug(`CreateSandbox called with SandboxRequest: ${JSON.stringify(sandboxReq, undefined, 2)}`);
+        this.logger.debug(sandboxReq, 'CreateSandbox called with SandboxRequest');
         const createResult = await this.connection.tooling.create('SandboxInfo', sandboxReq);
-        this.logger.debug(`Return from calling tooling.create: ${JSON.stringify(createResult, undefined, 2)}`);
+        this.logger.debug(createResult, 'Return from calling tooling.create');
         if (Array.isArray(createResult) || !createResult.success) {
             throw messages.createError('sandboxInfoCreateFailed', [JSON.stringify(createResult)]);
         }
         const sandboxCreationProgress = await this.querySandboxProcessBySandboxInfoId(createResult.id);
-        this.logger.debug(`Return from calling singleRecordQuery with tooling: ${JSON.stringify(sandboxCreationProgress, undefined, 2)}`);
+        this.logger.debug(sandboxCreationProgress, 'Return from calling singleRecordQuery with tooling');
         const isAsync = !!options.async;
         if (isAsync) {
             // The user didn't want us to poll, so simply return the status
@@ -109,7 +109,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             return sandboxCreationProgress;
         }
         const [wait, pollInterval] = this.validateWaitOptions(options);
-        this.logger.debug(`create - pollStatusAndAuth sandboxProcessObj ${JSON.stringify(sandboxCreationProgress, undefined, 2)}, max wait time of ${wait.minutes} minutes`);
+        this.logger.debug(sandboxCreationProgress, `create - pollStatusAndAuth sandboxProcessObj, max wait time of ${wait.minutes} minutes`);
         return this.pollStatusAndAuth({
             sandboxProcessObj: sandboxCreationProgress,
             wait,
@@ -125,7 +125,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async cloneSandbox(sandboxReq, sourceSandboxName, options) {
         sandboxReq.SourceId = (await this.querySandboxProcessBySandboxName(sourceSandboxName)).SandboxInfoId;
-        this.logger.debug('Clone sandbox sourceId %s', sandboxReq.SourceId);
+        this.logger.debug(`Clone sandbox sourceId ${sandboxReq.SourceId}`);
         return this.createSandbox(sandboxReq, options);
     }
     /**
@@ -141,7 +141,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         async: false,
         interval: kit_1.Duration.seconds(30),
     }) {
-        this.logger.debug(`ResumeSandbox called with ResumeSandboxRequest: ${JSON.stringify(resumeSandboxRequest, undefined, 2)}`);
+        this.logger.debug(resumeSandboxRequest, 'ResumeSandbox called with ResumeSandboxRequest');
         let sandboxCreationProgress;
         // seed the sandboxCreationProgress via the resumeSandboxRequest options
         if (resumeSandboxRequest.SandboxName) {
@@ -155,7 +155,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 resumeSandboxRequest.SandboxName ?? resumeSandboxRequest.SandboxProcessObjId,
             ]);
         }
-        this.logger.debug(`Return from calling singleRecordQuery with tooling: ${JSON.stringify(sandboxCreationProgress, undefined, 2)}`);
+        this.logger.debug(sandboxCreationProgress, 'Return from calling singleRecordQuery with tooling');
         if (!sandboxIsResumable(sandboxCreationProgress.Status)) {
             throw messages.createError('sandboxNotResumable', [
                 sandboxCreationProgress.SandboxName,
@@ -172,7 +172,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 if (sandboxInfo) {
                     await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_AUTH, sandboxInfo);
                     try {
-                        this.logger.debug(`sandbox signup complete with ${JSON.stringify(sandboxInfo, undefined, 2)}`);
+                        this.logger.debug(sandboxInfo, 'sandbox signup complete');
                         await this.writeSandboxAuthFile(sandboxCreationProgress, sandboxInfo);
                         return sandboxCreationProgress;
                     }
@@ -184,7 +184,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
             await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_ASYNC_RESULT, sandboxCreationProgress);
             throw messages.createError('sandboxCreateNotComplete');
         }
-        this.logger.debug(`resume - pollStatusAndAuth sandboxProcessObj ${JSON.stringify(sandboxCreationProgress, undefined, 2)}, max wait time of ${wait.minutes} minutes`);
+        this.logger.debug(sandboxCreationProgress, `resume - pollStatusAndAuth sandboxProcessObj, max wait time of ${wait.minutes} minutes`);
         return this.pollStatusAndAuth({
             sandboxProcessObj: sandboxCreationProgress,
             wait,
@@ -752,7 +752,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async init() {
         const stateAggregator = await stateAggregator_1.StateAggregator.getInstance();
-        this.logger = await logger_1.Logger.child('Org');
+        this.logger = (await logger_1.Logger.child('Org')).getRawLogger();
         this.configAggregator = this.options.aggregator ? this.options.aggregator : await configAggregator_1.ConfigAggregator.create();
         if (!this.options.connection) {
             if (this.options.aliasOrUsername == null) {
@@ -809,7 +809,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         interval: kit_1.Duration.seconds(30),
     }) {
         const [wait, pollInterval] = this.validateWaitOptions(options);
-        this.logger.debug(`AuthWithRetries sandboxProcessObj ${JSON.stringify(sandboxProcessObj, undefined, 2)}, max wait time of ${wait.minutes} minutes`);
+        this.logger.debug(sandboxProcessObj, `AuthWithRetries sandboxProcessObj, max wait time of ${wait.minutes} minutes`);
         return this.pollStatusAndAuth({
             sandboxProcessObj,
             wait,
@@ -824,10 +824,10 @@ class Org extends kit_1.AsyncOptionalCreatable {
      */
     async queryLatestSandboxProcessBySandboxName(sandboxNameIn) {
         const { tooling } = this.getConnection();
-        this.logger.debug('QueryLatestSandboxProcessBySandboxName called with SandboxName: %s ', sandboxNameIn);
+        this.logger.debug(`QueryLatestSandboxProcessBySandboxName called with SandboxName: ${sandboxNameIn}`);
         const queryStr = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE SandboxName='${sandboxNameIn}' AND Status != 'D' ORDER BY CreatedDate DESC LIMIT 1`;
         const queryResult = await tooling.query(queryStr);
-        this.logger.debug('Return from calling queryToolingApi: %s ', queryResult);
+        this.logger.debug(queryResult, 'Return from calling queryToolingApi');
         if (queryResult?.records?.length === 1) {
             return queryResult.records[0];
         }
@@ -898,7 +898,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         }
         if (sandboxInfoId) {
             const deleteResult = await this.destroySandbox(prodOrg, sandboxInfoId);
-            this.logger.debug('Return from calling tooling.delete: ', deleteResult);
+            this.logger.debug(deleteResult, 'Return from calling tooling.delete');
         }
         // cleanup remaining artifacts
         await this.remove();
@@ -1015,10 +1015,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
         await stateAggregator.sandboxes.remove(this.getOrgId());
     }
     async writeSandboxAuthFile(sandboxProcessObj, sandboxRes) {
-        this.logger.debug(`writeSandboxAuthFile sandboxProcessObj: ${JSON.stringify(sandboxProcessObj)}, sandboxRes: ${JSON.stringify(sandboxRes)}`);
+        this.logger.debug(sandboxProcessObj, 'writeSandboxAuthFile sandboxProcessObj');
+        this.logger.debug(sandboxRes, 'writeSandboxAuthFile sandboxRes');
         if (sandboxRes.authUserName) {
             const productionAuthFields = this.connection.getAuthInfoFields();
-            this.logger.debug('Result from getAuthInfoFields: AuthFields', productionAuthFields);
+            this.logger.debug(productionAuthFields, 'Result from getAuthInfoFields: AuthFields');
             // let's do headless auth via jwt (if we have privateKey) or web auth
             const oauth2Options = {
                 loginUrl: sandboxRes.loginUrl,
@@ -1039,7 +1040,11 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 oauth2Options,
                 parentUsername: productionAuthFields.username,
             });
-            this.logger.debug('Creating AuthInfo for sandbox', sandboxRes.authUserName, productionAuthFields.username, oauth2Options);
+            this.logger.debug({
+                sandboxResAuthUsername: sandboxRes.authUserName,
+                productionAuthFieldsUsername: productionAuthFields.username,
+                ...oauth2Options,
+            }, 'Creating AuthInfo for sandbox');
             // save auth info for new sandbox
             await authInfo.save();
             const sandboxOrgId = authInfo.getFields().orgId;
@@ -1069,7 +1074,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
         }
     }
     async pollStatusAndAuth(options) {
-        this.logger.debug('PollStatusAndAuth called with SandboxProcessObject', options.sandboxProcessObj, options.wait.minutes, options.pollInterval.seconds);
+        this.logger.debug(options, 'PollStatusAndAuth called with SandboxProcessObject');
         let remainingWait = options.wait;
         let waitingOnAuth = false;
         const pollingClient = await pollingClient_1.PollingClient.create({
@@ -1080,7 +1085,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 if (sandboxInfo) {
                     await lifecycleEvents_1.Lifecycle.getInstance().emit(SandboxEvents.EVENT_AUTH, sandboxInfo);
                     try {
-                        this.logger.debug('sandbox signup complete with', sandboxInfo);
+                        this.logger.debug(sandboxInfo, 'sandbox signup complete with');
                         await this.writeSandboxAuthFile(sandboxProcessObj, sandboxInfo);
                         return { completed: true, payload: sandboxProcessObj };
                     }
@@ -1142,7 +1147,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 sandboxName: sandboxProcessObj.SandboxName,
                 callbackUrl,
             };
-            this.logger.debug('Calling sandboxAuth with SandboxUserAuthRequest', sandboxReq);
+            this.logger.debug(sandboxReq, 'Calling sandboxAuth with SandboxUserAuthRequest');
             // eslint-disable-next-line no-underscore-dangle
             const url = `${this.connection.tooling._baseUrl()}/sandboxAuth`;
             const params = {
@@ -1152,7 +1157,7 @@ class Org extends kit_1.AsyncOptionalCreatable {
                 body: JSON.stringify(sandboxReq),
             };
             const result = await this.connection.tooling.request(params);
-            this.logger.debug('Result of calling sandboxAuth', result);
+            this.logger.debug(result, 'Result of calling sandboxAuth');
             return result;
         }
         catch (err) {

package/lib/org/permissionSetAssignment.js

@@ -10,7 +10,7 @@ exports.PermissionSetAssignment = void 0;
 const os_1 = require("os");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const messages_1 = require("../messages");
 const sfError_1 = require("../sfError");
 const messages = new messages_1.Messages('@salesforce/core', 'permissionSetAssignment', new Map([["orgRequired", "An Org instance is required."], ["userIdRequired", "A Salesforce id for the user is required."], ["permSetRequired", "The name of a permission set is required."], ["unexpectedType", "An unexpected response was returned from the permission set assignment."], ["assignCommandPermissionSetNotFoundError", "Permission set \"%s\" not found in target org. Do you need to push source?"], ["assignCommandPermissionSetNotFoundForNSError", "Permission set \"%s\" for namespace \"%s\" not found in target org. Do you need to push source or install the package?"], ["errorsEncounteredCreatingAssignment", "Error(s) were reported."], ["notSuccessfulButNoErrorsReported", "The permission set assignment failed but no errors were reported."]]));

package/lib/org/scratchOrgCreate.js

@@ -10,7 +10,7 @@ exports.scratchOrgCreate = exports.scratchOrgResume = exports.DEFAULT_STREAM_TIM
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const messages_1 = require("../messages");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const configAggregator_1 = require("../config/configAggregator");
 const orgConfigProperties_1 = require("../org/orgConfigProperties");
 const sfProject_1 = require("../sfProject");

package/lib/org/scratchOrgErrorCodes.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkScratchOrgInfoForErrors = exports.validateScratchOrgInfoForResume = void 0;
 const messages_1 = require("../messages");
 const sfError_1 = require("../sfError");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const scratchOrgCache_1 = require("./scratchOrgCache");
 const scratchOrgLifecycleEvents_1 = require("./scratchOrgLifecycleEvents");
 const WORKSPACE_CONFIG_FILENAME = 'sfdx-project.json';

package/lib/org/scratchOrgInfoApi.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateRevisionCounterToZero = exports.resolveUrl = exports.deploySettings = exports.pollForScratchOrgInfo = exports.requestScratchOrgCreation = exports.authorizeScratchOrg = exports.queryScratchOrgInfo = void 0;
 const kit_1 = require("@salesforce/kit");
 const ts_retry_promise_1 = require("ts-retry-promise");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const messages_1 = require("../messages");
 const sfError_1 = require("../sfError");
 const sfdcUrl_1 = require("../util/sfdcUrl");

package/lib/org/scratchOrgLifecycleEvents.js

@@ -8,7 +8,6 @@ exports.emitPostOrgCreate = exports.emit = exports.scratchOrgLifecycleStages = e
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const lifecycleEvents_1 = require("../lifecycleEvents");
-const emitter = lifecycleEvents_1.Lifecycle.getInstance();
 exports.scratchOrgLifecycleEventName = 'scratchOrgLifecycleEvent';
 exports.scratchOrgLifecycleStages = [
     'prepare request',
@@ -19,7 +18,7 @@ exports.scratchOrgLifecycleStages = [
     'deploy settings',
     'done',
 ];
-const emit = async (event) => emitter.emit(exports.scratchOrgLifecycleEventName, event);
+const emit = async (event) => lifecycleEvents_1.Lifecycle.getInstance().emit(exports.scratchOrgLifecycleEventName, event);
 exports.emit = emit;
 const postOrgCreateHookFields = [
     'accessToken',
@@ -35,7 +34,7 @@ const postOrgCreateHookFields = [
 ];
 const isHookField = (key) => postOrgCreateHookFields.includes(key);
 const emitPostOrgCreate = async (authFields) => {
-    await emitter.emit('postorgcreate', Object.fromEntries(Object.entries(authFields).filter(([key]) => isHookField(key))));
+    await lifecycleEvents_1.Lifecycle.getInstance().emit('postorgcreate', Object.fromEntries(Object.entries(authFields).filter(([key]) => isHookField(key))));
 };
 exports.emitPostOrgCreate = emitPostOrgCreate;
 //# sourceMappingURL=scratchOrgLifecycleEvents.js.map

package/lib/org/scratchOrgSettingsGenerator.js

@@ -11,7 +11,7 @@ const path = require("path");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const js2xmlparser = require("js2xmlparser");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const sfError_1 = require("../sfError");
 const pollingClient_1 = require("../status/pollingClient");
 const zipWriter_1 = require("../util/zipWriter");

package/lib/org/user.js

@@ -11,7 +11,7 @@ const os_1 = require("os");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const http_api_1 = require("jsforce/lib/http-api");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const messages_1 = require("../messages");
 const secureBuffer_1 = require("../crypto/secureBuffer");
 const sfError_1 = require("../sfError");

package/lib/schema/printer.d.ts

@@ -1,5 +1,5 @@
 import { JsonMap } from '@salesforce/ts-types';
-import { Logger } from '../logger';
+import { Logger } from '../logger/logger';
 /**
  * Renders schema properties.  By default, this is simply an identity transform.  Subclasses may provide more
  * interesting decorations of each values, such as ANSI coloring.

package/lib/schema/validator.d.ts

@@ -1,5 +1,5 @@
 import { AnyJson, JsonMap } from '@salesforce/ts-types';
-import { Logger } from '../logger';
+import { Logger } from '../logger/logger';
 /**
  * Loads a JSON schema and performs validations against JSON objects.
  */

package/lib/stateAggregator/accessors/orgAccessor.js

@@ -12,7 +12,7 @@ const path = require("path");
 const kit_1 = require("@salesforce/kit");
 const authInfoConfig_1 = require("../../config/authInfoConfig");
 const global_1 = require("../../global");
-const logger_1 = require("../../logger");
+const logger_1 = require("../../logger/logger");
 const messages_1 = require("../../messages");
 const lifecycleEvents_1 = require("../../lifecycleEvents");
 function chunk(array, chunkSize) {

package/lib/status/myDomainResolver.js

@@ -12,7 +12,7 @@ const url_1 = require("url");
 const util_1 = require("util");
 const ts_types_1 = require("@salesforce/ts-types");
 const kit_1 = require("@salesforce/kit");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const sfdcUrl_1 = require("../util/sfdcUrl");
 const pollingClient_1 = require("./pollingClient");
 // Timeout for DNS lookup polling defaults to 3 seconds and should always be at least 3 seconds

package/lib/status/pollingClient.d.ts

@@ -1,6 +1,6 @@
 import { AsyncOptionalCreatable, Duration } from '@salesforce/kit';
 import { AnyJson } from '@salesforce/ts-types';
-import { Logger } from '../logger';
+import { Logger } from '../logger/logger';
 import { StatusResult } from './types';
 /**
  * This is a polling client that can be used to poll the status of long running tasks. It can be used as a replacement

package/lib/status/pollingClient.js

@@ -10,7 +10,7 @@ exports.PollingClient = void 0;
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const ts_retry_promise_1 = require("ts-retry-promise");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const sfError_1 = require("../sfError");
 const lifecycleEvents_1 = require("../lifecycleEvents");
 /**

package/lib/status/streamingClient.js

@@ -12,7 +12,7 @@ const url_1 = require("url");
 const lib_1 = require("@salesforce/kit/lib");
 const lib_2 = require("@salesforce/ts-types/lib");
 const Faye = require("faye");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const sfError_1 = require("../sfError");
 const messages_1 = require("../messages");
 const types_1 = require("./types");

package/lib/testSetup.d.ts

@@ -4,7 +4,7 @@ import { SinonSandbox, SinonStatic, SinonStub } from 'sinon';
 import { AnyJson, JsonMap, Optional } from '@salesforce/ts-types';
 import { ConfigContents } from './config/configStore';
 import { Connection } from './org/connection';
-import { Logger } from './logger';
+import { Logger } from './logger/logger';
 import { SfError } from './sfError';
 import { CometClient, CometSubscription, Message, StreamingExtension } from './status/streamingClient';
 import { AuthFields, SandboxFields } from './org';

package/lib/testSetup.js

@@ -24,7 +24,7 @@ const configAggregator_1 = require("./config/configAggregator");
 const configFile_1 = require("./config/configFile");
 const connection_1 = require("./org/connection");
 const crypto_2 = require("./crypto/crypto");
-const logger_1 = require("./logger");
+const logger_1 = require("./logger/logger");
 const messages_1 = require("./messages");
 const sfError_1 = require("./sfError");
 const sfProject_1 = require("./sfProject");
@@ -64,7 +64,7 @@ class TestContext {
             FS: sinon.createSandbox(),
             ORGS: sinon.createSandbox(),
         };
-        this.TEST_LOGGER = new logger_1.Logger({ name: 'SFDX_Core_Test_Logger' }).useMemoryLogging();
+        this.TEST_LOGGER = new logger_1.Logger({ name: 'SFDX_Core_Test_Logger', useMemoryLogger: true });
         if (opts.setup) {
             this.setup();
         }

package/lib/util/sfdc.d.ts

@@ -44,6 +44,8 @@ export declare const validatePathDoesNotContainInvalidChars: (value: string) =>
  * @param sectionBlocklist properties in the object to exclude from the search. e.g. a blocklist of `["a"]` and data of `{ "a": { "B" : "b"}}` would ignore `B` because it is in the object value under `a`.
  */
 export declare const findUpperCaseKeys: (data?: JsonMap, sectionBlocklist?: string[]) => Optional<string>;
+export declare const accessTokenRegex: RegExp;
+export declare const sfdxAuthUrlRegex: RegExp;
 /**
  * Tests whether a given string is an access token
  *

package/lib/util/sfdc.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.matchesAccessToken = exports.findUpperCaseKeys = exports.validatePathDoesNotContainInvalidChars = exports.validateSalesforceId = exports.isInternalUrl = exports.validateEmail = exports.validateApiVersion = exports.trimTo15 = void 0;
+exports.matchesAccessToken = exports.sfdxAuthUrlRegex = exports.accessTokenRegex = exports.findUpperCaseKeys = exports.validatePathDoesNotContainInvalidChars = exports.validateSalesforceId = exports.isInternalUrl = exports.validateEmail = exports.validateApiVersion = exports.trimTo15 = void 0;
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const sfdcUrl_1 = require("./sfdcUrl");
@@ -80,11 +80,13 @@ const findUpperCaseKeys = (data, sectionBlocklist = []) => {
     return key;
 };
 exports.findUpperCaseKeys = findUpperCaseKeys;
+exports.accessTokenRegex = /(00D\w{12,15})![.\w]*/;
+exports.sfdxAuthUrlRegex = /force:\/\/([a-zA-Z0-9._-]+):([a-zA-Z0-9._-]*):([a-zA-Z0-9._-]+={0,2})@([a-zA-Z0-9._-]+)/;
 /**
  * Tests whether a given string is an access token
  *
  * @param value
  */
-const matchesAccessToken = (value) => /^(00D\w{12,15})![.\w]*$/.test(value);
+const matchesAccessToken = (value) => exports.accessTokenRegex.test(value);
 exports.matchesAccessToken = matchesAccessToken;
 //# sourceMappingURL=sfdc.js.map

package/lib/util/sfdcUrl.js

@@ -11,7 +11,7 @@ const url_1 = require("url");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const myDomainResolver_1 = require("../status/myDomainResolver");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const lifecycleEvents_1 = require("../lifecycleEvents");
 function getLoginAudienceCombos(audienceUrl, loginUrl) {
     const filtered = [

package/lib/util/unwrapArray.d.ts

@@ -0,0 +1 @@
+export declare const unwrapArray: (args: unknown) => unknown;

package/lib/util/unwrapArray.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unwrapArray = void 0;
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const unwrapArray = (args) => {
+    if (Array.isArray(args) && args.length === 1) {
+        return Array.isArray(args[0]) ? (0, exports.unwrapArray)(args[0]) : args[0];
+    }
+    return args;
+};
+exports.unwrapArray = unwrapArray;
+//# sourceMappingURL=unwrapArray.js.map

package/lib/util/zipWriter.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZipWriter = void 0;
 const stream_1 = require("stream");
 const JSZip = require("jszip");
-const logger_1 = require("../logger");
+const logger_1 = require("../logger/logger");
 const sfError_1 = require("../sfError");
 class ZipWriter extends stream_1.Writable {
     constructor(rootDestination) {

package/lib/webOAuthServer.js

@@ -17,7 +17,7 @@ const events_1 = require("events");
 const jsforce_1 = require("jsforce");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
-const logger_1 = require("./logger");
+const logger_1 = require("./logger/logger");
 const org_1 = require("./org");
 const sfError_1 = require("./sfError");
 const messages_1 = require("./messages");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "4.3.11",
+  "version": "5.0.1-v5-beta.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -39,20 +39,21 @@
     "messageTransformer/messageTransformer.ts"
   ],
   "dependencies": {
-    "@salesforce/bunyan": "^2.0.0",
     "@salesforce/kit": "^3.0.4",
     "@salesforce/schemas": "^1.6.0",
     "@salesforce/ts-types": "^2.0.2",
     "@types/semver": "^7.5.0",
     "ajv": "^8.12.0",
     "change-case": "^4.1.2",
-    "debug": "^3.2.7",
     "faye": "^1.4.0",
     "form-data": "^4.0.0",
     "js2xmlparser": "^4.0.1",
     "jsforce": "^2.0.0-beta.27",
     "jsonwebtoken": "9.0.1",
     "jszip": "3.10.1",
+    "pino": "^8.14.1",
+    "pino-abstract-transport": "^1.0.0",
+    "pino-pretty": "^10.0.0",
     "proper-lockfile": "^4.1.2",
     "ts-retry-promise": "^0.7.0"
   },
@@ -63,7 +64,6 @@
     "@salesforce/ts-sinon": "^1.4.9",
     "@types/benchmark": "^2.1.2",
     "@types/chai-string": "^1.4.2",
-    "@types/debug": "0.0.31",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash": "^4.14.195",
     "@types/proper-lockfile": "^4.1.2",
@@ -174,4 +174,4 @@
       ]
     }
   }
-}
+}