@salesforce/core-bundle 7.4.0 → 7.5.0

package/lib/index.d.ts

@@ -1675,7 +1675,7 @@ declare module '@salesforce/core-bundle/index' {
   export { Messages, StructuredMessage } from '@salesforce/core-bundle/messages';
   export { Org, SandboxProcessObject, StatusEvent, SandboxInfo, SandboxEvents, SandboxUserAuthResponse, SandboxUserAuthRequest, SandboxRequest, ResumeSandboxRequest, OrgTypes, ResultEvent, ScratchOrgRequest, } from '@salesforce/core-bundle/org/org';
   export { OrgConfigProperties, ORG_CONFIG_ALLOWED_PROPERTIES } from '@salesforce/core-bundle/org/orgConfigProperties';
-  export { PackageDir, NamedPackageDir, PackageDirDependency, SfProject, SfProjectJson } from '@salesforce/core-bundle/sfProject';
+  export { NamedPackageDir, SfProject, SfProjectJson } from '@salesforce/core-bundle/sfProject';
   export { SchemaValidator } from '@salesforce/core-bundle/schema/validator';
   export { SfError } from '@salesforce/core-bundle/sfError';
   export { PollingClient } from '@salesforce/core-bundle/status/pollingClient';
@@ -3942,6 +3942,7 @@ declare module '@salesforce/core-bundle/org/scratchOrgInfoApi' {
    */
   export const deploySettings: (scratchOrg: Org, orgSettings: SettingsGenerator, apiVersion: string, timeout?: Duration) => Promise<void>;
   /**
+   * Makes sure the scratch org's instanceUrl is resolvable (that is, DNS is ready)
    *
    * @param scratchOrgAuthInfo an AuthInfo class from the scratch org
    * @returns AuthInfo
@@ -4518,42 +4519,10 @@ declare module '@salesforce/core-bundle/sfError' {
 }
 declare module '@salesforce/core-bundle/sfProject' {
   import { Dictionary, JsonMap, Nullable, Optional } from '@salesforce/ts-types';
+  import { PackageDir, ProjectJson as ProjectJsonSchema, PackagePackageDir } from '@salesforce/schemas';
   import { ConfigFile } from '@salesforce/core-bundle/config/configFile';
   import { ConfigContents } from '@salesforce/core-bundle/config/configStackTypes';
-  export type PackageDirDependency = {
-      [k: string]: unknown;
-      package: string;
-      versionNumber?: string;
-  };
-  export type PackageDir = {
-      ancestorId?: string;
-      ancestorVersion?: string;
-      default?: boolean;
-      definitionFile?: string;
-      dependencies?: PackageDirDependency[];
-      includeProfileUserLicenses?: boolean;
-      package?: string;
-      packageMetadataAccess?: {
-          permissionSets: string | string[];
-          permissionSetLicenses: string | string[];
-      };
-      path: string;
-      postInstallScript?: string;
-      postInstallUrl?: string;
-      releaseNotesUrl?: string;
-      scopeProfiles?: boolean;
-      uninstallScript?: string;
-      versionDescription?: string;
-      versionName?: string;
-      versionNumber?: string;
-      unpackagedMetadata?: {
-          path: string;
-      };
-      seedMetadata?: {
-          path: string;
-      };
-  };
-  export type NamedPackageDir = PackageDir & {
+  type NameAndFullPath = {
       /**
        * The [normalized](https://nodejs.org/api/path.html#path_path_normalize_path) path used as the package name.
        */
@@ -4563,20 +4532,9 @@ declare module '@salesforce/core-bundle/sfProject' {
        */
       fullPath: string;
   };
-  export type ProjectJson = ConfigContents & {
-      packageDirectories: PackageDir[];
-      namespace?: string;
-      sourceApiVersion?: string;
-      sfdcLoginUrl?: string;
-      signupTargetLoginUrl?: string;
-      oauthLocalPort?: number;
-      plugins?: {
-          [k: string]: unknown;
-      };
-      packageAliases?: {
-          [k: string]: string;
-      };
-  };
+  export type NamedPackagingDir = PackagePackageDir & NameAndFullPath;
+  export type NamedPackageDir = PackageDir & NameAndFullPath;
+  export type ProjectJson = ConfigContents & ProjectJsonSchema;
   /**
    * The sfdx-project.json config object. This file determines if a folder is a valid sfdx project.
    *
@@ -4595,6 +4553,7 @@ declare module '@salesforce/core-bundle/sfProject' {
    * **See** [force:project:create](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_create_new.htm)
    */
   export class SfProjectJson extends ConfigFile<ConfigFile.Options, ProjectJson> {
+      /** json properties that are uppercase, or allow uppercase keys inside them */
       static BLOCKLIST: string[];
       static getFileName(): string;
       static getDefaultOptions(isGlobal?: boolean): ConfigFile.Options;
@@ -4679,7 +4638,7 @@ declare module '@salesforce/core-bundle/sfProject' {
        *
        * @param packageDir
        */
-      addPackageDirectory(packageDir: NamedPackageDir): void;
+      addPackageDirectory(packageDir: PackageDir): void;
       private doesPackageExist;
       private validateKeys;
   }
@@ -4877,6 +4836,11 @@ declare module '@salesforce/core-bundle/sfProject' {
       getPackageIdFromAlias(alias: string): Optional<string>;
       getAliasesFromPackageId(id: string): string[];
   }
+  /** differentiate between the Base PackageDir (path, maybe default) and the Packaging version (package and maybe a LOT of other fields) by whether is has the `package` property */
+  export const isPackagingDirectory: (packageDir: PackageDir) => packageDir is PackagePackageDir;
+  /** differentiate between the Base PackageDir (path, maybe default) and the Packaging version (package and maybe a LOT of other fields) by whether is has the `package` property */
+  export const isNamedPackagingDirectory: (packageDir: NamedPackageDir) => packageDir is NamedPackagingDir;
+  export {};
 
 }
 declare module '@salesforce/core-bundle/stateAggregator/accessors/aliasAccessor' {
@@ -6193,8 +6157,9 @@ declare module '@salesforce/core-bundle/util/findSuggestion' {
 
 }
 declare module '@salesforce/core-bundle/util/findUppercaseKeys' {
-  import { JsonMap, Optional } from '@salesforce/ts-types';
-  export const findUpperCaseKeys: (data?: JsonMap, sectionBlocklist?: string[]) => Optional<string>;
+  import { JsonMap } from '@salesforce/ts-types';
+  /** will throw on any upperCase unless they are present in the allowList.  Recursively searches the object, returning valid keys */
+  export const ensureNoUppercaseKeys: (path: string) => (allowList?: string[]) => (data: JsonMap) => string[];
 
 }
 declare module '@salesforce/core-bundle/util/getJwtAudienceUrl' {

package/lib/index.js

@@ -952,13 +952,7 @@ var require_duration = __commonJS({
        * The string representation of this `Duration`. e.g. "645 seconds"
        */
       toString() {
-        return this.pluralize();
-      }
-      pluralize(num = this.quantity, unit = this.unit) {
-        const name = _Duration.Unit[unit].toLowerCase();
-        if (num === 1)
-          return `${num} ${name.slice(0, name.length - 1)}`;
-        return `${num} ${name}`;
+        return pluralize(this.quantity, this.unit);
       }
     };
     exports2.Duration = Duration;
@@ -996,6 +990,10 @@ var require_duration = __commonJS({
       return Object.assign(promise, { interrupt: wake });
     }
     exports2.sleep = sleep;
+    var pluralize = (num, unit) => {
+      const name = Duration.Unit[unit].toLowerCase();
+      return `${num} ${num === 1 ? name.slice(0, name.length - 1) : name}`;
+    };
   }
 });
 
@@ -5426,7 +5424,7 @@ var require_package = __commonJS({
   "node_modules/thread-stream/package.json"(exports2, module2) {
     module2.exports = {
       name: "thread-stream",
-      version: "2.7.0",
+      version: "3.1.0",
       description: "A streaming way to send data to a Node.js Worker Thread",
       main: "index.js",
       types: "index.d.ts",
@@ -5441,7 +5439,7 @@ var require_package = __commonJS({
         fastbench: "^1.0.1",
         husky: "^9.0.6",
         "pino-elasticsearch": "^8.0.0",
-        "sonic-boom": "^3.0.0",
+        "sonic-boom": "^4.0.1",
         standard: "^17.0.0",
         tap: "^16.2.0",
         "ts-node": "^10.8.0",
@@ -5449,7 +5447,8 @@ var require_package = __commonJS({
         "why-is-node-running": "^2.2.2"
       },
       scripts: {
-        test: 'standard && npm run transpile && tap "test/**/*.test.*js" && tap --ts test/*.test.*ts',
+        build: "tsc --noEmit",
+        test: 'standard && npm run build && npm run transpile && tap "test/**/*.test.*js" && tap --ts test/*.test.*ts',
         "test:ci": "standard && npm run transpile && npm run test:ci:js && npm run test:ci:ts",
         "test:ci:js": 'tap --no-check-coverage --timeout=120 --coverage-report=lcovonly "test/**/*.test.*js"',
         "test:ci:ts": 'tap --ts --no-check-coverage --coverage-report=lcovonly "test/**/*.test.*ts"',
@@ -5459,7 +5458,8 @@ var require_package = __commonJS({
       },
       standard: {
         ignore: [
-          "test/ts/**/*"
+          "test/ts/**/*",
+          "test/syntax-error.mjs"
         ]
       },
       repository: {
@@ -6035,7 +6035,10 @@ var require_transport = __commonJS({
       stream.flushSync();
     }
     function transport(fullOptions) {
-      const { pipeline, targets, levels, dedupe, options = {}, worker = {}, caller = getCallers() } = fullOptions;
+      const { pipeline, targets, levels, dedupe, worker = {}, caller = getCallers() } = fullOptions;
+      const options = {
+        ...fullOptions.options
+      };
       const callers = typeof caller === "string" ? [caller] : caller;
       const bundlerOverrides = "__bundlerPathsOverrides" in globalThis ? globalThis.__bundlerPathsOverrides : {};
       let target = fullOptions.target;
@@ -6044,20 +6047,30 @@ var require_transport = __commonJS({
       }
       if (targets) {
         target = bundlerOverrides["pino-worker"] || join(__dirname, "worker.js");
-        options.targets = targets.map((dest) => {
+        options.targets = targets.filter((dest) => dest.target).map((dest) => {
           return {
             ...dest,
             target: fixTarget(dest.target)
           };
         });
+        options.pipelines = targets.filter((dest) => dest.pipeline).map((dest) => {
+          return dest.pipeline.map((t) => {
+            return {
+              ...t,
+              level: dest.level,
+              // duplicate the pipeline `level` property defined in the upper level
+              target: fixTarget(t.target)
+            };
+          });
+        });
       } else if (pipeline) {
-        target = bundlerOverrides["pino-pipeline-worker"] || join(__dirname, "worker-pipeline.js");
-        options.targets = pipeline.map((dest) => {
+        target = bundlerOverrides["pino-worker"] || join(__dirname, "worker.js");
+        options.pipelines = [pipeline.map((dest) => {
           return {
             ...dest,
             target: fixTarget(dest.target)
           };
-        });
+        })];
       }
       if (levels) {
         options.levels = levels;
@@ -6640,7 +6653,7 @@ var require_levels = __commonJS({
 var require_meta = __commonJS({
   "node_modules/pino/lib/meta.js"(exports2, module2) {
     "use strict";
-    module2.exports = { version: "8.21.0" };
+    module2.exports = { version: "9.2.0" };
   }
 });
 
@@ -7604,7 +7617,7 @@ var require_pino = __commonJS({
         return f(p);
       }
     }
-    globalThis.__bundlerPathsOverrides = { ...globalThis.__bundlerPathsOverrides || {}, "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-pipeline-worker": pinoBundlerAbsolutePath("./pino-pipeline-worker.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") };
+    globalThis.__bundlerPathsOverrides = { ...globalThis.__bundlerPathsOverrides || {}, "thread-stream-worker": pinoBundlerAbsolutePath("./thread-stream-worker.js"), "pino-worker": pinoBundlerAbsolutePath("./pino-worker.js"), "pino/file": pinoBundlerAbsolutePath("./pino-file.js"), "pino-pretty": pinoBundlerAbsolutePath("./pino-pretty.js") };
     var os = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
@@ -12075,7 +12088,7 @@ var require_package2 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@salesforce/core-bundle",
-      version: "7.4.0",
+      version: "7.5.0",
       description: "Core libraries to interact with SFDX projects, orgs, and APIs.",
       main: "lib/index",
       types: "lib/index.d.ts",
@@ -12112,9 +12125,9 @@ var require_package2 = __commonJS({
       ],
       dependencies: {
         "@jsforce/jsforce-node": "^3.2.0",
-        "@salesforce/kit": "^3.1.2",
+        "@salesforce/kit": "^3.1.6",
         "@salesforce/schemas": "^1.9.0",
-        "@salesforce/ts-types": "^2.0.9",
+        "@salesforce/ts-types": "^2.0.10",
         ajv: "^8.15.0",
         "change-case": "^4.1.2",
         "fast-levenshtein": "^3.0.0",
@@ -12123,16 +12136,16 @@ var require_package2 = __commonJS({
         js2xmlparser: "^4.0.1",
         jsonwebtoken: "9.0.2",
         jszip: "3.10.1",
-        pino: "^8.21.0",
+        pino: "^9.2.0",
         "pino-abstract-transport": "^1.2.0",
-        "pino-pretty": "^10.3.1",
+        "pino-pretty": "^11.2.1",
         "proper-lockfile": "^4.1.2",
         semver: "^7.6.2",
         "ts-retry-promise": "^0.8.1"
       },
       devDependencies: {
-        "@salesforce/dev-scripts": "^8.5.0",
-        "@salesforce/ts-sinon": "^1.4.19",
+        "@salesforce/dev-scripts": "^10.1.1",
+        "@salesforce/ts-sinon": "^1.4.22",
         "@types/benchmark": "^2.1.5",
         "@types/chai-string": "^1.4.5",
         "@types/fast-levenshtein": "^0.0.4",
@@ -14538,16 +14551,24 @@ function __asyncGenerator(thisArg, _arguments, generator) {
   if (!Symbol.asyncIterator)
     throw new TypeError("Symbol.asyncIterator is not defined.");
   var g = generator.apply(thisArg, _arguments || []), i, q = [];
-  return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function() {
+  return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function() {
     return this;
   }, i;
-  function verb(n) {
-    if (g[n])
+  function awaitReturn(f) {
+    return function(v) {
+      return Promise.resolve(v).then(f, reject);
+    };
+  }
+  function verb(n, f) {
+    if (g[n]) {
       i[n] = function(v) {
         return new Promise(function(a, b) {
           q.push([n, v, a, b]) > 1 || resume(n, v);
         });
       };
+      if (f)
+        i[n] = f(i[n]);
+    }
   }
   function resume(n, v) {
     try {
@@ -14651,7 +14672,7 @@ function __addDisposableResource(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function")
       throw new TypeError("Object expected.");
-    var dispose;
+    var dispose, inner;
     if (async) {
       if (!Symbol.asyncDispose)
         throw new TypeError("Symbol.asyncDispose is not defined.");
@@ -14661,9 +14682,19 @@ function __addDisposableResource(env, value, async) {
       if (!Symbol.dispose)
         throw new TypeError("Symbol.dispose is not defined.");
       dispose = value[Symbol.dispose];
+      if (async)
+        inner = dispose;
     }
     if (typeof dispose !== "function")
       throw new TypeError("Object not disposable.");
+    if (inner)
+      dispose = function() {
+        try {
+          inner.call(this);
+        } catch (e) {
+          return Promise.reject(e);
+        }
+      };
     env.stack.push({ value, dispose, async });
   } else if (async) {
     env.stack.push({ async: true });
@@ -92184,25 +92215,19 @@ var require_findUppercaseKeys = __commonJS({
   "lib/util/findUppercaseKeys.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.findUpperCaseKeys = void 0;
+    exports2.ensureNoUppercaseKeys = void 0;
+    var strict_1 = require("node:assert/strict");
     var ts_types_1 = require_lib();
-    var kit_1 = require_lib2();
-    var findUpperCaseKeys = (data, sectionBlocklist = []) => {
-      let key;
-      (0, kit_1.findKey)(data, (val, k) => {
-        if (/^[A-Z]/.test(k)) {
-          key = k;
-        } else if ((0, ts_types_1.isJsonMap)(val)) {
-          if (sectionBlocklist.includes(k)) {
-            return key;
-          }
-          key = (0, exports2.findUpperCaseKeys)((0, ts_types_1.asJsonMap)(val));
-        }
-        return key;
-      });
-      return key;
+    var messages_12 = require_messages();
+    var coreMessages = new messages_12.Messages("@salesforce/core-bundle", "core", /* @__PURE__ */ new Map([["authInfoCreationError", "Must pass a username and/or OAuth options when creating an AuthInfo instance."], ["authInfoOverwriteError", "Cannot create an AuthInfo instance that will overwrite existing auth data."], ["authInfoOverwriteError.actions", ["Create the AuthInfo instance using existing auth data by just passing the username. E.g., `AuthInfo.create({ username: 'my@user.org' });`."]], ["authCodeExchangeError", "Error authenticating with auth code due to: %s"], ["authCodeUsernameRetrievalError", "Could not retrieve the username after successful auth code exchange.\n\nDue to: %s"], ["jwtAuthError", "Error authenticating with JWT config due to: %s"], ["jwtAuthErrors", "Error authenticating with JWT.\nErrors encountered:\n%s"], ["refreshTokenAuthError", "Error authenticating with the refresh token due to: %s"], ["orgDataNotAvailableError", "An attempt to refresh the authentication token failed with a 'Data Not Found Error'. The org identified by username %s does not appear to exist. Likely cause is that the org was deleted by another user or has expired."], ["orgDataNotAvailableError.actions", ["Run `sfdx force:org:list --clean` to remove stale org authentications.", "Use `sfdx force:config:set` to update the defaultusername.", "Use `sfdx force:org:create` to create a new org.", "Use `sfdx auth` to authenticate an existing org."]], ["namedOrgNotFound", "No authorization information found for %s."], ["noAliasesFound", "Nothing to set."], ["invalidFormat", "Setting aliases must be in the format <key>=<value> but found: [%s]."], ["invalidJsonCasing", 'All JSON input must have heads down camelcase keys. E.g., `{ sfdcLoginUrl: "https://login.salesforce.com" }`\nFound "%s" at %s'], ["missingClientId", "Client ID is required for JWT authentication."]]));
+    var ensureNoUppercaseKeys = (path) => (allowList = []) => (data) => {
+      const keys2 = getKeys(data, allowList);
+      const upperCaseKeys = keys2.filter((key) => /^[A-Z]/.test(key)).join(", ");
+      (0, strict_1.strictEqual)(upperCaseKeys.length, 0, coreMessages.getMessage("invalidJsonCasing", [upperCaseKeys, path]));
+      return keys2;
     };
-    exports2.findUpperCaseKeys = findUpperCaseKeys;
+    exports2.ensureNoUppercaseKeys = ensureNoUppercaseKeys;
+    var getKeys = (data, allowList) => Object.entries(data).filter(([k]) => !allowList.includes(k)).flatMap(([key, value]) => (0, ts_types_1.isJsonMap)(value) ? [key, ...getKeys(value, allowList)] : [key]);
   }
 });
 
@@ -93232,7 +93257,7 @@ var require_sfProject = __commonJS({
       return result;
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SfProject = exports2.SfProjectJson = void 0;
+    exports2.isNamedPackagingDirectory = exports2.isPackagingDirectory = exports2.SfProject = exports2.SfProjectJson = void 0;
     var node_path_1 = require("node:path");
     var fs = __importStar2(require("node:fs"));
     var kit_1 = require_lib2();
@@ -93246,8 +93271,8 @@ var require_sfProject = __commonJS({
     var messages_12 = require_messages();
     var findUppercaseKeys_1 = require_findUppercaseKeys();
     var messages = new messages_12.Messages("@salesforce/core-bundle", "config", /* @__PURE__ */ new Map([["unknownConfigKey", "Unknown config name: %s."], ["deprecatedConfigKey", "Deprecated config name: %s. Please use %s instead."], ["invalidWrite", "The writeSync method is not allowed on SfdxConfig. Use the async write method instead."], ["invalidConfigValue", "Invalid config value: %s."], ["invalidInstanceUrl", "Specify a valid Salesforce instance URL."], ["invalidApiVersion", "Specify a valid Salesforce API version, for example, 42.0."], ["invalidCustomOrgMetadataTemplates", "Specify a valid repository URL or directory for the custom org metadata templates."], ["invalidIsvDebuggerSid", "Specify a valid Debugger SID."], ["invalidIsvDebuggerUrl", "Specify a valid Debugger URL."], ["invalidNumberConfigValue", "Specify a valid positive integer, for example, 150000."], ["invalidBooleanConfigValue", "The config value can only be set to true or false."], ["invalidProjectWorkspace", "This directory does not contain a valid Salesforce DX project."], ["schemaValidationError", 'The config file "%s" is not schema valid.\nDue to: %s'], ["schemaValidationError.actions", ["Fix the invalid entries at %s."]], ["missingDefaultPath", 'In sfdx-project.json, be sure to specify which package directory (path) is the default. Example: `[{ "path": "packageDirectory1", "default": true }, { "path": "packageDirectory2" }]`'], ["missingPackageDirectory", 'The path "%s", specified in sfdx-project.json, does not exist. Be sure this directory is included in your project root.'], ["invalidPackageDirectory", 'The path "%s", specified in sfdx-project.json, must be indicated as a relative path to the project root.'], ["multipleDefaultPaths", "In sfdx-project.json, indicate only one package directory (path) as the default."], ["singleNonDefaultPackage", 'The sfdx-project.json file must include one, and only one, default package directory (path). Because your sfdx-project.json file contains only one package directory, it must be the default. Remove the `"default": false` key and try again.'], ["target-org", "Username or alias of the org that all commands run against by default. (sf only)"], ["target-dev-hub", "Username or alias of your default Dev Hub org. (sf only)"], ["defaultUsername", "Username or alias of the org that all commands run against by default. (sfdx only)"], ["defaultDevHubUsername", "Username or alias of your default Dev Hub org. (sfdx only)"], ["isvDebuggerSid", "ISV debugger SID (sfdx only)"], ["isvDebuggerUrl", "ISV debugger URL (sfdx only)"], ["org-isv-debugger-sid", "ISV debugger SID."], ["org-isv-debugger-url", "ISV debugger URL."], ["apiVersion", "API version of your project. Default: API version of your Dev Hub org. (sfdx only)"], ["org-api-version", "API version of your project. Default: API version of your Dev Hub org."], ["disableTelemetry", "Disables the collection of usage and user environment information, etc. Default: false. (sfdx only)"], ["disable-telemetry", "Disables the collection of usage and user environment information, etc. Default: false."], ["maxQueryLimit", "Maximum number of Salesforce records returned by a CLI command. Default: 10,000. (sfdx only)"], ["org-max-query-limit", "Maximum number of Salesforce records returned by a CLI command. Default: 10,000."], ["restDeploy", "Whether deployments use the Metadata REST API (true) or SOAP API (false, default value). (sfdx only)"], ["instanceUrl", "URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com. (sfdx only)"], ["org-instance-url", "URL of the Salesforce instance hosting your org. Default: https://login.salesforce.com."], ["customOrgMetadataTemplates", "A valid repository URL or directory for the custom org metadata templates."], ["org-custom-metadata-templates", "A valid repository URL or directory for the custom org metadata templates."], ["org-capitalize-record-types", "Whether record types are capitalized on scratch org creation."], ["invalidId", "The given id %s is not a valid 15 or 18 character Salesforce ID."]]));
-    var coreMessages = new messages_12.Messages("@salesforce/core-bundle", "core", /* @__PURE__ */ new Map([["authInfoCreationError", "Must pass a username and/or OAuth options when creating an AuthInfo instance."], ["authInfoOverwriteError", "Cannot create an AuthInfo instance that will overwrite existing auth data."], ["authInfoOverwriteError.actions", ["Create the AuthInfo instance using existing auth data by just passing the username. E.g., `AuthInfo.create({ username: 'my@user.org' });`."]], ["authCodeExchangeError", "Error authenticating with auth code due to: %s"], ["authCodeUsernameRetrievalError", "Could not retrieve the username after successful auth code exchange.\n\nDue to: %s"], ["jwtAuthError", "Error authenticating with JWT config due to: %s"], ["jwtAuthErrors", "Error authenticating with JWT.\nErrors encountered:\n%s"], ["refreshTokenAuthError", "Error authenticating with the refresh token due to: %s"], ["orgDataNotAvailableError", "An attempt to refresh the authentication token failed with a 'Data Not Found Error'. The org identified by username %s does not appear to exist. Likely cause is that the org was deleted by another user or has expired."], ["orgDataNotAvailableError.actions", ["Run `sfdx force:org:list --clean` to remove stale org authentications.", "Use `sfdx force:config:set` to update the defaultusername.", "Use `sfdx force:org:create` to create a new org.", "Use `sfdx auth` to authenticate an existing org."]], ["namedOrgNotFound", "No authorization information found for %s."], ["noAliasesFound", "Nothing to set."], ["invalidFormat", "Setting aliases must be in the format <key>=<value> but found: [%s]."], ["invalidJsonCasing", 'All JSON input must have heads down camelcase keys. E.g., `{ sfdcLoginUrl: "https://login.salesforce.com" }`\nFound "%s" at %s'], ["missingClientId", "Client ID is required for JWT authentication."]]));
     var SfProjectJson = class _SfProjectJson extends configFile_12.ConfigFile {
+      /** json properties that are uppercase, or allow uppercase keys inside them */
       static BLOCKLIST = ["packageAliases"];
       static getFileName() {
         return internal_1.SFDX_PROJECT_JSON;
@@ -93446,10 +93471,7 @@ var require_sfProject = __commonJS({
        * @param packageDir
        */
       addPackageDirectory(packageDir) {
-        const dirIndex = this.getContents().packageDirectories.findIndex((pd) => {
-          const withId = pd;
-          return withId.path === packageDir.path && !withId.id && !withId.package || !!packageDir.package && packageDir.package === withId.package;
-        });
+        const dirIndex = this.getContents().packageDirectories.findIndex(findPackageDir(packageDir));
         const packageDirEntry = Object.assign({}, dirIndex > -1 ? this.getContents().packageDirectories[dirIndex] : packageDir, packageDir);
         const modifiedPackagesDirs = dirIndex > -1 ? (
           // replace the matching entry with the new entry
@@ -93460,15 +93482,13 @@ var require_sfProject = __commonJS({
         );
         this.set("packageDirectories", modifiedPackagesDirs);
       }
+      // keep it because testSetup stubs it!
       // eslint-disable-next-line class-methods-use-this
       doesPackageExist(packagePath) {
         return fs.existsSync(packagePath);
       }
       validateKeys() {
-        const upperCaseKey = (0, findUppercaseKeys_1.findUpperCaseKeys)(this.toObject(), _SfProjectJson.BLOCKLIST);
-        if (upperCaseKey) {
-          throw coreMessages.createError("invalidJsonCasing", [upperCaseKey, this.getPath()]);
-        }
+        (0, findUppercaseKeys_1.ensureNoUppercaseKeys)(this.getPath())(_SfProjectJson.BLOCKLIST)(this.toObject());
       }
     };
     exports2.SfProjectJson = SfProjectJson;
@@ -93661,7 +93681,9 @@ var require_sfProject = __commonJS({
        */
       getPackageNameFromPath(path) {
         const packageDir = this.getPackageFromPath(path);
-        return packageDir ? packageDir.package ?? packageDir.path : void 0;
+        if (!packageDir)
+          return void 0;
+        return (0, exports2.isNamedPackagingDirectory)(packageDir) ? packageDir.package : packageDir.path;
       }
       /**
        * Returns the package directory.
@@ -93794,6 +93816,17 @@ var require_sfProject = __commonJS({
       }
     };
     exports2.SfProject = SfProject;
+    var isPackagingDirectory = (packageDir) => isPackagingDir(packageDir);
+    exports2.isPackagingDirectory = isPackagingDirectory;
+    var isNamedPackagingDirectory = (packageDir) => isPackagingDir(packageDir);
+    exports2.isNamedPackagingDirectory = isNamedPackagingDirectory;
+    var isPackagingDir = (packageDir) => "package" in packageDir && typeof packageDir.package === "string";
+    var findPackageDir = (target) => (potentialMatch) => (
+      // an entry w/o a package or id is considered a directory entry for which a package has yet to be created
+      //  find a matching dir entry that where path is the same and id and package are not present
+      potentialMatch.path === target.path && !("id" in potentialMatch) && !(0, exports2.isPackagingDirectory)(potentialMatch) || // if that fails, then find a matching dir entry package is present and is same as the new entry
+      (0, exports2.isPackagingDirectory)(target) && (0, exports2.isPackagingDirectory)(potentialMatch) && target.package === potentialMatch.package
+    );
   }
 });
 
@@ -94672,13 +94705,14 @@ var require_scratchOrgInfoApi = __commonJS({
       const logger = await logger_12.Logger.child("scratchOrgInfoApi-resolveUrl");
       const { instanceUrl } = scratchOrgAuthInfo.getFields();
       if (!instanceUrl) {
-        const sfError = new sfError_12.SfError("Org does not have instanceUrl");
-        sfError.setData({
-          orgId: scratchOrgAuthInfo.getFields().orgId,
-          username: scratchOrgAuthInfo.getFields().username,
-          instanceUrl
+        throw sfError_12.SfError.create({
+          message: "Org does not have instanceUrl",
+          data: {
+            orgId: scratchOrgAuthInfo.getFields().orgId,
+            username: scratchOrgAuthInfo.getFields().username,
+            instanceUrl
+          }
         });
-        throw sfError;
       }
       logger.debug(`processScratchOrgInfoResult - resultData.instanceUrl: ${instanceUrl}`);
       const options = {
@@ -107099,10 +107133,12 @@ var require_scratchOrgSettingsGenerator = __commonJS({
         if (status !== RequestStatus.Succeeded.toString()) {
           const componentFailures = (0, ts_types_1.ensureObject)(result.details).componentFailures;
           const failures = (Array.isArray(componentFailures) ? componentFailures : [componentFailures]).map((failure) => `[${failure.problemType}] ${failure.fullName} : ${failure.problem} `).join("\n");
-          const error = new sfError_12.SfError(`A scratch org was created with username ${username}, but the settings failed to deploy due to: 
-${failures}`, "ProblemDeployingSettings");
-          error.setData(result);
-          throw error;
+          throw sfError_12.SfError.create({
+            message: `A scratch org was created with username ${username}, but the settings failed to deploy due to: 
+${failures}`,
+            name: "ProblemDeployingSettings",
+            data: { ...result, username }
+          });
         }
       }
       async createDeployPackageContents(apiVersion) {
@@ -107283,7 +107319,7 @@ var require_scratchOrgInfoGenerator = __commonJS({
       if (Reflect.has(scratchOrgInfo, "package2AncestorIds")) {
         throw new sfError_12.SfError(messages.getMessage("Package2AncestorsIdsKeyNotSupportedError"), "DeprecationError");
       }
-      const packagesWithAncestors = (await projectJson.getPackageDirectories()).filter((packageDir) => packageDir.ancestorId ?? packageDir.ancestorVersion);
+      const packagesWithAncestors = (await projectJson.getPackageDirectories()).filter(sfProject_12.isPackagingDirectory).filter((packageDir) => packageDir.ancestorId ?? packageDir.ancestorVersion);
       if (packagesWithAncestors.length === 0) {
         return "";
       }
@@ -107426,6 +107462,7 @@ var require_scratchOrgCreate = __commonJS({
     var orgConfigProperties_12 = require_orgConfigProperties();
     var sfProject_12 = require_sfProject();
     var stateAggregator_12 = require_stateAggregator();
+    var sfError_12 = require_sfError();
     var org_12 = require_org();
     var scratchOrgInfoApi_1 = require_scratchOrgInfoApi();
     var scratchOrgSettingsGenerator_12 = __importDefault3(require_scratchOrgSettingsGenerator());
@@ -107479,6 +107516,12 @@ var require_scratchOrgCreate = __commonJS({
         signupTargetLoginUrlConfig,
         retry: 0
       });
+      await setExitCodeIfError(68)(scratchOrgAuthInfo.handleAliasAndDefaultSettings({
+        alias,
+        setDefault: setDefault ?? false,
+        setDefaultDevHub: false,
+        setTracksSource: tracksSource ?? true
+      }));
       const scratchOrg = await org_12.Org.create({ aliasOrUsername: username });
       const configAggregator = await configAggregator_12.ConfigAggregator.create();
       await (0, scratchOrgLifecycleEvents_12.emit)({ stage: "deploy settings", scratchOrgInfo: soi });
@@ -107487,16 +107530,10 @@ var require_scratchOrgCreate = __commonJS({
         capitalizeRecordTypes
       });
       await settingsGenerator.extract({ ...soi, ...definitionjson });
-      const [authInfo] = await Promise.all([
+      const [authInfo] = await setExitCodeIfError(68)(Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(scratchOrg, settingsGenerator, apiVersion ?? configAggregator.getPropertyValue(orgConfigProperties_12.OrgConfigProperties.ORG_API_VERSION) ?? await scratchOrg.retrieveMaxApiVersion())
-      ]);
-      await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
-        alias,
-        setDefault: setDefault ?? false,
-        setDefaultDevHub: false,
-        setTracksSource: tracksSource ?? true
-      });
+      ]));
       cache.unset(soi.Id ?? jobId);
       const authFields = authInfo.getFields();
       await Promise.all([(0, scratchOrgLifecycleEvents_12.emit)({ stage: "done", scratchOrgInfo: soi }), cache.write(), (0, scratchOrgLifecycleEvents_12.emitPostOrgCreate)(authFields)]);
@@ -107573,14 +107610,20 @@ var require_scratchOrgCreate = __commonJS({
         signupTargetLoginUrlConfig,
         retry: retry || 0
       });
-      const scratchOrg = await org_12.Org.create({
-        aliasOrUsername: soi.Username ?? soi.SignupUsername
-      });
+      await setExitCodeIfError(68)(scratchOrgAuthInfo.handleAliasAndDefaultSettings({
+        ...{
+          alias,
+          setDefault,
+          setDefaultDevHub: false,
+          setTracksSource: tracksSource === false ? false : true
+        }
+      }));
+      const scratchOrg = await org_12.Org.create({ aliasOrUsername: soi.Username ?? soi.SignupUsername });
       const username = scratchOrg.getUsername();
       logger.debug(`scratch org username ${username}`);
       await (0, scratchOrgLifecycleEvents_12.emit)({ stage: "deploy settings", scratchOrgInfo: soi });
       const configAggregator = await configAggregator_12.ConfigAggregator.create();
-      const [authInfo] = await Promise.all([
+      const [authInfo] = await setExitCodeIfError(68)(Promise.all([
         (0, scratchOrgInfoApi_1.resolveUrl)(scratchOrgAuthInfo),
         (0, scratchOrgInfoApi_1.deploySettings)(
           scratchOrg,
@@ -107589,15 +107632,7 @@ var require_scratchOrgCreate = __commonJS({
           // some of our "wait" time has already been used.  Calculate how much remains that we can spend on the deployment.
           kit_1.Duration.milliseconds(wait.milliseconds - (Date.now() - startTimestamp))
         )
-      ]);
-      await scratchOrgAuthInfo.handleAliasAndDefaultSettings({
-        ...{
-          alias,
-          setDefault,
-          setDefaultDevHub: false,
-          setTracksSource: tracksSource === false ? false : true
-        }
-      });
+      ]));
       cache.unset(scratchOrgInfoId);
       const authFields = authInfo.getFields();
       await Promise.all([(0, scratchOrgLifecycleEvents_12.emit)({ stage: "done", scratchOrgInfo: soi }), cache.write(), (0, scratchOrgLifecycleEvents_12.emitPostOrgCreate)(authFields)]);
@@ -107621,10 +107656,17 @@ var require_scratchOrgCreate = __commonJS({
     async function getCapitalizeRecordTypesConfig() {
       const configAgg = await configAggregator_12.ConfigAggregator.create();
       const value = configAgg.getInfo("org-capitalize-record-types").value;
-      if (value !== void 0)
-        return (0, kit_1.toBoolean)(value);
-      return value;
+      return value !== void 0 ? (0, kit_1.toBoolean)(value) : void 0;
     }
+    var setExitCodeIfError = (exitCode) => async (p) => {
+      try {
+        return await p;
+      } catch (e) {
+        const sfError = sfError_12.SfError.wrap(e);
+        sfError.exitCode = exitCode;
+        throw sfError;
+      }
+    };
   }
 });