@salesforce/core 7.3.11 → 7.3.12-qa.1

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/sfProject.d.ts

@@ -1,40 +1,9 @@
 import { Dictionary, JsonMap, Nullable, Optional } from '@salesforce/ts-types';
+import { PackageDir as PackageDirSchema, PackageDirDependency as PackageDirDependencySchema, 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 & {
+export type PackageDirDependency = PackageDirDependencySchema;
+type NamedDirAdditions = {
     /**
      * The [normalized](https://nodejs.org/api/path.html#path_path_normalize_path) path used as the package name.
      */
@@ -44,20 +13,10 @@ 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 PackageDir = PackageDirSchema;
+export type NamedPackagingDir = PackagePackageDir & NamedDirAdditions;
+export type NamedPackageDir = PackageDir & NamedDirAdditions;
+export type ProjectJson = ConfigContents & ProjectJsonSchema;
 /**
  * The sfdx-project.json config object. This file determines if a folder is a valid sfdx project.
  *
@@ -160,7 +119,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 +317,7 @@ 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;
+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.
@@ -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,6 +292,7 @@ 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);
@@ -520,7 +512,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.
@@ -664,4 +658,19 @@ 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) => 'package' in packageDir && typeof packageDir.package === 'string';
+exports.isPackagingDirectory = isPackagingDirectory;
+const isNamedPackagingDirectory = (packageDir) => 'package' in packageDir && typeof packageDir.package === 'string';
+exports.isNamedPackagingDirectory = isNamedPackagingDirectory;
+/**
+ * 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/package.json

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