@salesforce/core 6.7.7-qa.1 → 7.1.0

package/lib/index.d.ts

@@ -35,4 +35,5 @@ export { ScratchOrgCreateOptions, ScratchOrgCreateResult, scratchOrgCreate, scra
 export { ScratchOrgInfo } from './org/scratchOrgTypes';
 export { ScratchOrgLifecycleEvent, scratchOrgLifecycleEventName, scratchOrgLifecycleStages, } from './org/scratchOrgLifecycleEvents';
 export { ScratchOrgCache } from './org/scratchOrgCache';
+export { default as ScratchOrgSettingsGenerator } from './org/scratchOrgSettingsGenerator';
 export * from './util/sfdc';

package/lib/index.js

@@ -19,9 +19,12 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scratchOrgLifecycleEventName = exports.scratchOrgResume = exports.scratchOrgCreate = exports.lockInit = exports.PermissionSetAssignment = exports.User = exports.REQUIRED_FIELDS = exports.DefaultUserFields = exports.MyDomainResolver = exports.StreamingClient = exports.CometClient = exports.PollingClient = exports.SfError = exports.SchemaValidator = exports.SfProjectJson = exports.SfProject = exports.ORG_CONFIG_ALLOWED_PROPERTIES = exports.OrgConfigProperties = exports.OrgTypes = exports.SandboxEvents = exports.Org = exports.Messages = exports.Logger = exports.LoggerLevel = exports.getJwtAudienceUrl = exports.SfdcUrl = exports.WebOAuthServer = exports.Lifecycle = exports.Global = exports.Mode = exports.SFDX_HTTP_HEADERS = exports.Connection = exports.AuthRemover = exports.AuthInfo = exports.ConfigAggregator = exports.SandboxRequestCache = exports.SF_ALLOWED_PROPERTIES = exports.SFDX_ALLOWED_PROPERTIES = exports.SfConfigProperties = exports.SfdxPropertyKeys = exports.Config = exports.OrgUsersConfig = exports.DeviceOauthService = exports.StateAggregator = exports.EnvVars = exports.SUPPORTED_ENV_VARS = exports.EnvironmentVariable = exports.envVars = exports.TTLConfig = exports.ConfigFile = void 0;
-exports.ScratchOrgCache = exports.scratchOrgLifecycleStages = void 0;
+exports.ScratchOrgSettingsGenerator = exports.ScratchOrgCache = exports.scratchOrgLifecycleStages = void 0;
 const messages_1 = require("./messages");
 ;
 var configFile_1 = require("./config/configFile");
@@ -109,6 +112,8 @@ Object.defineProperty(exports, "scratchOrgLifecycleEventName", { enumerable: tru
 Object.defineProperty(exports, "scratchOrgLifecycleStages", { enumerable: true, get: function () { return scratchOrgLifecycleEvents_1.scratchOrgLifecycleStages; } });
 var scratchOrgCache_1 = require("./org/scratchOrgCache");
 Object.defineProperty(exports, "ScratchOrgCache", { enumerable: true, get: function () { return scratchOrgCache_1.ScratchOrgCache; } });
+var scratchOrgSettingsGenerator_1 = require("./org/scratchOrgSettingsGenerator");
+Object.defineProperty(exports, "ScratchOrgSettingsGenerator", { enumerable: true, get: function () { return __importDefault(scratchOrgSettingsGenerator_1).default; } });
 // Utility sub-modules
 __exportStar(require("./util/sfdc"), exports);
 //# sourceMappingURL=index.js.map

package/lib/org/authInfo.js

@@ -647,22 +647,22 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
         // If options were passed, use those before checking cache and reading an auth file.
         let authConfig;
         if (options) {
-            const clonedOptions = structuredClone(options);
-            if (this.isTokenOptions(clonedOptions)) {
-                authConfig = clonedOptions;
-                const userInfo = await this.retrieveUserInfo((0, ts_types_1.ensureString)(clonedOptions.instanceUrl), (0, ts_types_1.ensureString)(clonedOptions.accessToken));
+            options = structuredClone(options);
+            if (this.isTokenOptions(options)) {
+                authConfig = options;
+                const userInfo = await this.retrieveUserInfo((0, ts_types_1.ensureString)(options.instanceUrl), (0, ts_types_1.ensureString)(options.accessToken));
                 this.update({ username: userInfo?.username, orgId: userInfo?.organizationId });
             }
             else {
                 if (this.options.parentUsername) {
                     const parentFields = await this.loadDecryptedAuthFromConfig(this.options.parentUsername);
-                    clonedOptions.clientId = parentFields.clientId;
+                    options.clientId = parentFields.clientId;
                     if (process.env.SFDX_CLIENT_SECRET) {
-                        clonedOptions.clientSecret = process.env.SFDX_CLIENT_SECRET;
+                        options.clientSecret = process.env.SFDX_CLIENT_SECRET;
                     }
                     else {
                         // Grab whatever flow is defined
-                        Object.assign(clonedOptions, {
+                        Object.assign(options, {
                             clientSecret: parentFields.clientSecret,
                             privateKey: parentFields.privateKey ? (0, node_path_1.resolve)(parentFields.privateKey) : parentFields.privateKey,
                         });
@@ -670,22 +670,22 @@ class AuthInfo extends kit_1.AsyncOptionalCreatable {
                 }
                 // jwt flow
                 // Support both sfdx and jsforce private key values
-                if (!clonedOptions.privateKey && clonedOptions.privateKeyFile) {
-                    clonedOptions.privateKey = (0, node_path_1.resolve)(clonedOptions.privateKeyFile);
+                if (!options.privateKey && options.privateKeyFile) {
+                    options.privateKey = (0, node_path_1.resolve)(options.privateKeyFile);
                 }
-                if (clonedOptions.privateKey) {
-                    authConfig = await this.authJwt(clonedOptions);
+                if (options.privateKey) {
+                    authConfig = await this.authJwt(options);
                 }
-                else if (!clonedOptions.authCode && clonedOptions.refreshToken) {
+                else if (!options.authCode && options.refreshToken) {
                     // refresh token flow (from sfdxUrl or OAuth refreshFn)
-                    authConfig = await this.buildRefreshTokenConfig(clonedOptions);
+                    authConfig = await this.buildRefreshTokenConfig(options);
                 }
                 else if (this.options.oauth2 instanceof jsforce_node_1.OAuth2) {
                     // authcode exchange / web auth flow
-                    authConfig = await this.exchangeToken(clonedOptions, this.options.oauth2);
+                    authConfig = await this.exchangeToken(options, this.options.oauth2);
                 }
                 else {
-                    authConfig = await this.exchangeToken(clonedOptions);
+                    authConfig = await this.exchangeToken(options);
                 }
             }
             authConfig.isDevHub = await this.determineIfDevHub((0, ts_types_1.ensureString)(authConfig.instanceUrl), (0, ts_types_1.ensureString)(authConfig.accessToken));

package/lib/sfError.d.ts

@@ -1,4 +1,4 @@
-import { AnyJson, JsonMap } from '@salesforce/ts-types';
+import { AnyJson } from '@salesforce/ts-types';
 export type SfErrorOptions<T extends ErrorDataProperties = ErrorDataProperties> = {
     message: string;
     exitCode?: number;
@@ -10,6 +10,14 @@ export type SfErrorOptions<T extends ErrorDataProperties = ErrorDataProperties>
     actions?: string[];
 };
 type ErrorDataProperties = AnyJson;
+type SfErrorToObjectResult = {
+    name: string;
+    message: string;
+    exitCode: number;
+    actions?: string[];
+    context?: string;
+    data?: ErrorDataProperties;
+};
 /**
  * A generalized sfdx error which also contains an action. The action is used in the
  * CLI to help guide users past the error.
@@ -77,6 +85,6 @@ export declare class SfError<T extends ErrorDataProperties = ErrorDataProperties
     /**
      * Convert an {@link SfError} state to an object. Returns a plain object representing the state of this error.
      */
-    toObject(): JsonMap;
+    toObject(): SfErrorToObjectResult;
 }
 export {};

package/lib/sfError.js

@@ -60,7 +60,9 @@ class SfError extends Error {
         super(message);
         this.name = name;
         this.cause = exitCodeOrCause instanceof Error ? exitCodeOrCause : cause;
-        this.actions = actions;
+        if (actions?.length) {
+            this.actions = actions;
+        }
         if (typeof exitCodeOrCause === 'number') {
             this.exitCode = exitCodeOrCause;
         }
@@ -77,8 +79,12 @@ class SfError extends Error {
     /** like the constructor, but takes an typed object and let you also set context and data properties */
     static create(inputs) {
         const error = new SfError(inputs.message, inputs.name, inputs.actions, inputs.exitCode, inputs.cause);
-        error.data = inputs.data;
-        error.context = inputs.context;
+        if (inputs.data) {
+            error.data = inputs.data;
+        }
+        if (inputs.context) {
+            error.context = inputs.context;
+        }
         return error;
     }
     /**
@@ -134,7 +140,7 @@ class SfError extends Error {
             name: this.name,
             message: this.message ?? this.name,
             exitCode: this.exitCode,
-            actions: this.actions,
+            ...(this.actions?.length ? { actions: this.actions } : {}),
             ...(this.context ? { context: this.context } : {}),
             ...(this.data ? { data: this.data } : {}),
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "6.7.7-qa.1",
+  "version": "7.1.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",