refactor(ngcc): add packageName property to EntryPoint interface (angular#37040)

This commit adds a `packageName` property to the `EntryPoint` interface.
In a subsequent commit this will be used to retrieve the correct ngcc
configuration for each package, regardless of its path.

PR Close angular#37040

Author: gkalpak

packages/compiler-cli/ngcc/src/packages/entry_point.ts

@@ -28,6 +28,11 @@ export interface EntryPoint extends JsonObject {
   name: string;
   /** The path to this entry point. */
   path: AbsoluteFsPath;
+  /**
+   * The name of the package that contains this entry-point (e.g. `@angular/core` or
+   * `@angular/common`).
+   */
+  packageName: string;
   /** The path to the package that contains this entry-point. */
   packagePath: AbsoluteFsPath;
   /** The parsed package.json file for this entry-point. */
@@ -131,7 +136,8 @@ export function getEntryPointInfo(
   const loadedEntryPointPackageJson = (packagePackageJsonPath === entryPointPackageJsonPath) ?
       loadedPackagePackageJson :
       loadPackageJson(fs, entryPointPackageJsonPath);
-  const packageVersion = getPackageVersion(loadedPackagePackageJson);
+  const {packageName, packageVersion} = getPackageNameAndVersion(
+      fs, packagePath, loadedPackagePackageJson, loadedEntryPointPackageJson);
   const entryPointConfig =
       config.getPackageConfig(packagePath, packageVersion).entryPoints[entryPointPath];
   let entryPointPackageJson: EntryPointPackageJson;
@@ -173,6 +179,7 @@ export function getEntryPointInfo(
   const entryPointInfo: EntryPoint = {
     name: entryPointPackageJson.name,
     path: entryPointPath,
+    packageName,
     packagePath,
     packageJson: entryPointPackageJson,
     typings: resolve(entryPointPath, typings),
@@ -304,15 +311,44 @@ function guessTypingsFromPackageJson(
 }
 
 /**
- * Find the version of the package at `packageJsonPath`.
+ * Find or infer the name and version of a package.
  *
- * The version is read off of the `version` property of the package's `package.json` file (if
- * available).
+ * - The name is computed based on the `name` property of the package's or the entry-point's
+ *   `package.json` file (if available) or inferred from the package's path.
+ * - The version is read off of the `version` property of the package's `package.json` file (if
+ *   available).
  *
- * @param packageJson the parsed `package.json` of the package (if available).
- * @returns the version string or `null` if the `pckage.json` file is missing or doesn't contain a
- *     version.
+ * @param fs The `FileSystem` instance to use for parsing `packagePath` (if needed).
+ * @param packagePath the absolute path to the package.
+ * @param packagePackageJson the parsed `package.json` of the package (if available).
+ * @param entryPointPackageJson the parsed `package.json` of an entry-point (if available).
+ * @returns the computed name and version of the package.
  */
-function getPackageVersion(packageJson: EntryPointPackageJson|null): string|null {
-  return packageJson?.version ?? null;
+function getPackageNameAndVersion(
+    fs: FileSystem, packagePath: AbsoluteFsPath, packagePackageJson: EntryPointPackageJson|null,
+    entryPointPackageJson: EntryPointPackageJson|
+    null): {packageName: string, packageVersion: string|null} {
+  let packageName: string;
+
+  if (packagePackageJson !== null) {
+    // We have a valid `package.json` for the package: Get the package name from that.
+    packageName = packagePackageJson.name;
+  } else if (entryPointPackageJson !== null) {
+    // We have a valid `package.json` for the entry-point: Get the package name from that.
+    // This might be a secondary entry-point, so make sure we only keep the main package's name
+    // (e.g. only keep `@angular/common` from `@angular/common/http`).
+    packageName = /^(?:@[^/]+\/)?[^/]*/.exec(entryPointPackageJson.name)![0];
+  } else {
+    // We don't have a valid `package.json`: Infer the package name from the package's path.
+    const lastSegment = fs.basename(packagePath);
+    const secondLastSegment = fs.basename(fs.dirname(packagePath));
+
+    packageName =
+        secondLastSegment.startsWith('@') ? `${secondLastSegment}/${lastSegment}` : lastSegment;
+  }
+
+  return {
+    packageName,
+    packageVersion: packagePackageJson?.version ?? null,
+  };
 }

packages/compiler-cli/ngcc/test/dependencies/dependency_resolver_spec.ts

@@ -60,38 +60,47 @@ runInEachFileSystem(() => {
         first = {
           name: 'first',
           path: _('/first'),
+          packageName: 'first',
           packagePath: _('/first'),
           packageJson: {esm5: './index.js'},
           typings: _('/first/index.d.ts'),
           compiledByAngular: true,
           ignoreMissingDependencies: false,
         } as EntryPoint;
         second = {
+          name: 'second',
           path: _('/second'),
+          packageName: 'second',
           packagePath: _('/second'),
           packageJson: {esm2015: './sub/index.js'},
           typings: _('/second/sub/index.d.ts'),
           compiledByAngular: true,
           ignoreMissingDependencies: false,
         } as EntryPoint;
         third = {
+          name: 'third',
           path: _('/third'),
+          packageName: 'third',
           packagePath: _('/third'),
           packageJson: {fesm5: './index.js'},
           typings: _('/third/index.d.ts'),
           compiledByAngular: true,
           ignoreMissingDependencies: false,
         } as EntryPoint;
         fourth = {
+          name: 'fourth',
           path: _('/fourth'),
+          packageName: 'fourth',
           packagePath: _('/fourth'),
           packageJson: {fesm2015: './sub2/index.js'},
           typings: _('/fourth/sub2/index.d.ts'),
           compiledByAngular: true,
           ignoreMissingDependencies: false,
         } as EntryPoint;
         fifth = {
+          name: 'fifth',
           path: _('/fifth'),
+          packageName: 'fifth',
           packagePath: _('/fifth'),
           packageJson: {module: './index.js'},
           typings: _('/fifth/index.d.ts'),
@@ -100,7 +109,9 @@ runInEachFileSystem(() => {
         } as EntryPoint;
 
         sixthIgnoreMissing = {
+          name: 'sixth',
           path: _('/sixth'),
+          packageName: 'sixth',
           packagePath: _('/sixth'),
           packageJson: {module: './index.js'},
           typings: _('/sixth/index.d.ts'),
@@ -291,6 +302,7 @@ runInEachFileSystem(() => {
         const testEntryPoint = {
           name: 'test-package',
           path: _('/project/node_modules/test-package'),
+          packageName: 'test-package',
           packagePath: _('/project/node_modules/test-package'),
           packageJson: {esm5: './index.js'},
           typings: _('/project/node_modules/test-package/index.d.ts'),

packages/compiler-cli/ngcc/test/helpers/utils.ts

@@ -22,6 +22,7 @@ export function makeTestEntryPoint(
   return {
     name: entryPointName,
     path: absoluteFrom(`/node_modules/${entryPointName}`),
+    packageName,
     packagePath: absoluteFrom(`/node_modules/${packageName}`),
     packageJson: {name: entryPointName},
     typings: absoluteFrom(`/node_modules/${entryPointName}/index.d.ts`),

packages/compiler-cli/ngcc/test/integration/ngcc_spec.ts

@@ -1572,7 +1572,7 @@ runInEachFileSystem(() => {
           },
           {
             name: _('/node_modules/deep_import/package.json'),
-            contents: '{"name": "deep-import", "es2015": "./index.js", "typings": "./index.d.ts"}',
+            contents: '{"name": "deep_import", "es2015": "./index.js", "typings": "./index.d.ts"}',
           },
           {
             name: _('/node_modules/deep_import/entry_point.js'),

packages/compiler-cli/ngcc/test/packages/entry_point_bundle_spec.ts

@@ -168,6 +168,7 @@ runInEachFileSystem(() => {
          const entryPoint: EntryPoint = {
            name: 'test',
            path: absoluteFrom('/node_modules/test'),
+           packageName: 'test',
            packagePath: absoluteFrom('/node_modules/test'),
            packageJson: {name: 'test'},
            typings: absoluteFrom('/node_modules/test/index.d.ts'),
@@ -218,6 +219,7 @@ runInEachFileSystem(() => {
             const entryPoint: EntryPoint = {
               name: 'test',
               path: absoluteFrom('/node_modules/test'),
+              packageName: 'test',
               packagePath: absoluteFrom('/node_modules/test'),
               packageJson: {name: 'test'},
               typings: absoluteFrom('/node_modules/test/index.d.ts'),
@@ -240,6 +242,7 @@ runInEachFileSystem(() => {
             const entryPoint: EntryPoint = {
               name: 'internal',
               path: absoluteFrom('/node_modules/internal'),
+              packageName: 'internal',
               packagePath: absoluteFrom('/node_modules/internal'),
               packageJson: {name: 'internal'},
               typings: absoluteFrom('/node_modules/internal/index.d.ts'),
@@ -262,6 +265,7 @@ runInEachFileSystem(() => {
             const entryPoint: EntryPoint = {
               name: 'test',
               path: absoluteFrom('/node_modules/test'),
+              packageName: 'test',
               packagePath: absoluteFrom('/node_modules/test'),
               packageJson: {name: 'test'},
               typings: absoluteFrom('/node_modules/test/index.d.ts'),
@@ -285,6 +289,7 @@ runInEachFileSystem(() => {
       const entryPoint: EntryPoint = {
         name: 'secondary',
         path: absoluteFrom('/node_modules/primary/secondary'),
+        packageName: 'primary',
         packagePath: absoluteFrom('/node_modules/primary'),
         packageJson: {name: 'secondary'},
         typings: absoluteFrom('/node_modules/primary/secondary/index.d.ts'),

packages/compiler-cli/ngcc/test/packages/entry_point_manifest_spec.ts

@@ -149,6 +149,7 @@ runInEachFileSystem(() => {
           entryPoint: {
             name: 'some_package/valid_entry_point',
             path: _Abs('/project/node_modules/some_package/valid_entry_point'),
+            packageName: 'some_package',
             packagePath: _Abs('/project/node_modules/some_package'),
             packageJson: jasmine.any(Object),
             typings: