@salesforce/core 7.4.0 → 7.5.0

package/lib/index.d.ts

@@ -22,7 +22,7 @@ export { Fields, FieldValue, LoggerLevel, LoggerLevelValue, LogLine, LoggerOptio
 export { Messages, StructuredMessage } from './messages';
 export { Org, SandboxProcessObject, StatusEvent, SandboxInfo, SandboxEvents, SandboxUserAuthResponse, SandboxUserAuthRequest, SandboxRequest, ResumeSandboxRequest, OrgTypes, ResultEvent, ScratchOrgRequest, } from './org/org';
 export { OrgConfigProperties, ORG_CONFIG_ALLOWED_PROPERTIES } from './org/orgConfigProperties';
-export { PackageDir, NamedPackageDir, PackageDirDependency, SfProject, SfProjectJson } from './sfProject';
+export { NamedPackageDir, SfProject, SfProjectJson } from './sfProject';
 export { SchemaValidator } from './schema/validator';
 export { SfError } from './sfError';
 export { PollingClient } from './status/pollingClient';

package/lib/org/scratchOrgCreate.js

@@ -18,6 +18,7 @@ const configAggregator_1 = require("../config/configAggregator");
 const orgConfigProperties_1 = require("../org/orgConfigProperties");
 const sfProject_1 = require("../sfProject");
 const stateAggregator_1 = require("../stateAggregator/stateAggregator");
+const sfError_1 = require("../sfError");
 const org_1 = require("./org");
 const scratchOrgInfoApi_1 = require("./scratchOrgInfoApi");
 const scratchOrgSettingsGenerator_1 = __importDefault(require("./scratchOrgSettingsGenerator"));
@@ -77,6 +78,12 @@ const scratchOrgResume = async (jobId) => {
             signupTargetLoginUrlConfig,
             retry: 0,
         });
+    await setExitCodeIfError(68)(scratchOrgAuthInfo.handleAliasAndDefaultSettings({
+        alias,
+        setDefault: setDefault ?? false,
+        setDefaultDevHub: false,
+        setTracksSource: tracksSource ?? true,
+    }));
     const scratchOrg = await org_1.Org.create({ aliasOrUsername: username });
     const configAggregator = await configAggregator_1.ConfigAggregator.create();
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
@@ -85,18 +92,12 @@ const scratchOrgResume = async (jobId) => {
         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_1.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_1.emit)({ stage: 'done', scratchOrgInfo: soi }), cache.write(), (0, scratchOrgLifecycleEvents_1.emitPostOrgCreate)(authFields)]);
@@ -176,30 +177,29 @@ const scratchOrgCreate = async (options) => {
         signupTargetLoginUrlConfig,
         retry: retry || 0,
     });
+    // anything after this point (org is created and auth'd) is potentially recoverable with the resume scratch command.
+    await setExitCodeIfError(68)(scratchOrgAuthInfo.handleAliasAndDefaultSettings({
+        ...{
+            alias,
+            setDefault,
+            setDefaultDevHub: false,
+            setTracksSource: tracksSource === false ? false : true,
+        },
+    }));
     // we'll need this scratch org connection later;
-    const scratchOrg = await org_1.Org.create({
-        aliasOrUsername: soi.Username ?? soi.SignupUsername,
-    });
+    const scratchOrg = await org_1.Org.create({ aliasOrUsername: soi.Username ?? soi.SignupUsername });
     const username = scratchOrg.getUsername();
     logger.debug(`scratch org username ${username}`);
     await (0, scratchOrgLifecycleEvents_1.emit)({ stage: 'deploy settings', scratchOrgInfo: soi });
     const configAggregator = await configAggregator_1.ConfigAggregator.create();
-    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_1.OrgConfigProperties.ORG_API_VERSION) ??
             (await scratchOrg.retrieveMaxApiVersion()), 
         // 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_1.emit)({ stage: 'done', scratchOrgInfo: soi }), cache.write(), (0, scratchOrgLifecycleEvents_1.emitPostOrgCreate)(authFields)]);
@@ -225,9 +225,17 @@ const getSignupTargetLoginUrl = async () => {
 async function getCapitalizeRecordTypesConfig() {
     const configAgg = await configAggregator_1.ConfigAggregator.create();
     const value = configAgg.getInfo('org-capitalize-record-types').value;
-    if (value !== undefined)
-        return (0, kit_1.toBoolean)(value);
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-    return value;
+    return value !== undefined ? (0, kit_1.toBoolean)(value) : undefined;
 }
+/** wrap an async function, intercept error and set the given exit code   */
+const setExitCodeIfError = (exitCode) => async (p) => {
+    try {
+        return await p;
+    }
+    catch (e) {
+        const sfError = sfError_1.SfError.wrap(e);
+        sfError.exitCode = exitCode;
+        throw sfError;
+    }
+};
 //# sourceMappingURL=scratchOrgCreate.js.map

package/lib/org/scratchOrgInfoApi.d.ts

@@ -60,6 +60,7 @@ export declare const pollForScratchOrgInfo: (hubOrg: Org, scratchOrgInfoId: stri
  */
 export declare 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

package/lib/org/scratchOrgInfoApi.js

@@ -352,6 +352,7 @@ const deploySettings = async (scratchOrg, orgSettings, apiVersion, timeout = kit
 };
 exports.deploySettings = deploySettings;
 /**
+ * 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
@@ -360,13 +361,14 @@ const resolveUrl = async (scratchOrgAuthInfo) => {
     const logger = await logger_1.Logger.child('scratchOrgInfoApi-resolveUrl');
     const { instanceUrl } = scratchOrgAuthInfo.getFields();
     if (!instanceUrl) {
-        const sfError = new sfError_1.SfError('Org does not have instanceUrl');
-        sfError.setData({
-            orgId: scratchOrgAuthInfo.getFields().orgId,
-            username: scratchOrgAuthInfo.getFields().username,
-            instanceUrl,
+        throw sfError_1.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 = {

package/lib/org/scratchOrgInfoGenerator.js

@@ -53,6 +53,7 @@ const getAncestorIds = async (scratchOrgInfo, projectJson, hubOrg) => {
         throw new sfError_1.SfError(messages.getMessage('Package2AncestorsIdsKeyNotSupportedError'), 'DeprecationError');
     }
     const packagesWithAncestors = (await projectJson.getPackageDirectories())
+        .filter(sfProject_1.isPackagingDirectory)
         // check that the package has any ancestor types (id or version)
         .filter((packageDir) => packageDir.ancestorId ?? packageDir.ancestorVersion);
     if (packagesWithAncestors.length === 0) {

package/lib/org/scratchOrgSettingsGenerator.js

@@ -271,9 +271,11 @@ class SettingsGenerator {
             const failures = (Array.isArray(componentFailures) ? componentFailures : [componentFailures])
                 .map((failure) => `[${failure.problemType}] ${failure.fullName} : ${failure.problem} `)
                 .join('\n');
-            const error = new sfError_1.SfError(`A scratch org was created with username ${username}, but the settings failed to deploy due to: \n${failures}`, 'ProblemDeployingSettings');
-            error.setData(result);
-            throw error;
+            throw sfError_1.SfError.create({
+                message: `A scratch org was created with username ${username}, but the settings failed to deploy due to: \n${failures}`,
+                name: 'ProblemDeployingSettings',
+                data: { ...result, username },
+            });
         }
     }
     async createDeployPackageContents(apiVersion) {

package/lib/sfProject.d.ts

@@ -1,40 +1,8 @@
 import { Dictionary, JsonMap, Nullable, Optional } from '@salesforce/ts-types';
+import { PackageDir, ProjectJson as ProjectJsonSchema, PackagePackageDir } from '@salesforce/schemas';
 import { ConfigFile } from './config/configFile';
 import { ConfigContents } from './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.
      */
@@ -44,20 +12,9 @@ export type NamedPackageDir = PackageDir & {
      */
     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.
  *
@@ -76,6 +33,7 @@ export type ProjectJson = ConfigContents & {
  * **See** [force:project:create](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_create_new.htm)
  */
 export declare 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;
@@ -160,7 +118,7 @@ export declare class SfProjectJson extends ConfigFile<ConfigFile.Options, Projec
      *
      * @param packageDir
      */
-    addPackageDirectory(packageDir: NamedPackageDir): void;
+    addPackageDirectory(packageDir: PackageDir): void;
     private doesPackageExist;
     private validateKeys;
 }
@@ -358,3 +316,8 @@ export declare class 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 declare 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 declare const isNamedPackagingDirectory: (packageDir: NamedPackageDir) => packageDir is NamedPackagingDir;
+export {};

package/lib/sfProject.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SfProject = exports.SfProjectJson = void 0;
+exports.isNamedPackagingDirectory = exports.isPackagingDirectory = exports.SfProject = exports.SfProjectJson = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -44,7 +44,6 @@ const messages_1 = require("./messages");
 const findUppercaseKeys_1 = require("./util/findUppercaseKeys");
 ;
 const messages = new messages_1.Messages('@salesforce/core', 'config', 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."]]));
-const coreMessages = new messages_1.Messages('@salesforce/core', 'core', 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."]]));
 /**
  * The sfdx-project.json config object. This file determines if a folder is a valid sfdx project.
  *
@@ -63,6 +62,7 @@ const coreMessages = new messages_1.Messages('@salesforce/core', 'core', new Map
  * **See** [force:project:create](https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_ws_create_new.htm)
  */
 class SfProjectJson extends configFile_1.ConfigFile {
+    /** json properties that are uppercase, or allow uppercase keys inside them */
     static BLOCKLIST = ['packageAliases'];
     static getFileName() {
         return internal_1.SFDX_PROJECT_JSON;
@@ -282,16 +282,7 @@ class SfProjectJson extends configFile_1.ConfigFile {
      * @param packageDir
      */
     addPackageDirectory(packageDir) {
-        // there is no notion of uniqueness in package directory entries
-        // so an attempt of matching an existing entry is a bit convoluted
-        // an entry w/o a package or id is considered a directory entry for which a package has yet to be created
-        // so first attempt is to find a matching dir entry that where path is the same and id and package are not present
-        // if that fails, then find a matching dir entry package is present and is same as the new entry
-        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));
         // merge new package dir with existing entry, if present
         const packageDirEntry = Object.assign({}, dirIndex > -1 ? this.getContents().packageDirectories[dirIndex] : packageDir, packageDir);
         const modifiedPackagesDirs = dirIndex > -1
@@ -301,16 +292,13 @@ class SfProjectJson extends configFile_1.ConfigFile {
                 [...(this.getContents()?.packageDirectories ?? []), packageDirEntry];
         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() {
-        // Verify that the configObject does not have upper case keys; throw if it does.  Must be heads down camel case.
-        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());
     }
 }
 exports.SfProjectJson = SfProjectJson;
@@ -520,7 +508,9 @@ class SfProject {
      */
     getPackageNameFromPath(path) {
         const packageDir = this.getPackageFromPath(path);
-        return packageDir ? packageDir.package ?? packageDir.path : undefined;
+        if (!packageDir)
+            return undefined;
+        return (0, exports.isNamedPackagingDirectory)(packageDir) ? packageDir.package : packageDir.path;
     }
     /**
      * Returns the package directory.
@@ -666,4 +656,21 @@ class SfProject {
     }
 }
 exports.SfProject = SfProject;
+/** 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 */
+const isPackagingDirectory = (packageDir) => isPackagingDir(packageDir);
+exports.isPackagingDirectory = isPackagingDirectory;
+/** 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 */
+const isNamedPackagingDirectory = (packageDir) => isPackagingDir(packageDir);
+exports.isNamedPackagingDirectory = isNamedPackagingDirectory;
+const isPackagingDir = (packageDir) => 'package' in packageDir && typeof packageDir.package === 'string';
+/**
+ * there is no notion of uniqueness in package directory entries
+ * so an attempt of matching an existing entry is a bit convoluted
+ */
+const 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, exports.isPackagingDirectory)(potentialMatch)) ||
+    // if that fails, then find a matching dir entry package is present and is same as the new entry
+    ((0, exports.isPackagingDirectory)(target) && (0, exports.isPackagingDirectory)(potentialMatch) && target.package === potentialMatch.package);
 //# sourceMappingURL=sfProject.js.map

package/lib/util/findUppercaseKeys.d.ts

@@ -1,2 +1,3 @@
-import { JsonMap, Optional } from '@salesforce/ts-types';
-export declare 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 declare const ensureNoUppercaseKeys: (path: string) => (allowList?: string[]) => (data: JsonMap) => string[];

package/lib/util/findUppercaseKeys.js

@@ -6,24 +6,21 @@
  * 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.findUpperCaseKeys = void 0;
+exports.ensureNoUppercaseKeys = void 0;
+const strict_1 = require("node:assert/strict");
 const ts_types_1 = require("@salesforce/ts-types");
-const kit_1 = require("@salesforce/kit");
-const 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, exports.findUpperCaseKeys)((0, ts_types_1.asJsonMap)(val));
-        }
-        return key;
-    });
-    return key;
+const messages_1 = require("../messages");
+;
+const coreMessages = new messages_1.Messages('@salesforce/core', 'core', 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."]]));
+/** will throw on any upperCase unless they are present in the allowList.  Recursively searches the object, returning valid keys */
+const ensureNoUppercaseKeys = (path) => (allowList = []) => (data) => {
+    const keys = getKeys(data, allowList);
+    const upperCaseKeys = keys.filter((key) => /^[A-Z]/.test(key)).join(', ');
+    (0, strict_1.strictEqual)(upperCaseKeys.length, 0, coreMessages.getMessage('invalidJsonCasing', [upperCaseKeys, path]));
+    return keys;
 };
-exports.findUpperCaseKeys = findUpperCaseKeys;
+exports.ensureNoUppercaseKeys = ensureNoUppercaseKeys;
+const 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]));
 //# sourceMappingURL=findUppercaseKeys.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "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",
@@ -53,9 +53,9 @@
   ],
   "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",
@@ -64,16 +64,16 @@
     "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",