build: add secondary entrypoint package.json files to packages

The new public API tooling searches for nested package.json files to determine the location of secondary entrypoints. All secondary entrypoints for the CLI related packages now contain a secondary entrypoint package.json file.
The internal monorepo package discovery script was also updated to support the presence of the nested package.json files.

Author: clydin

lib/packages.ts

@@ -100,23 +100,32 @@ function loadPackageJson(p: string) {
   return pkg;
 }
 
-function _findAllPackageJson(dir: string, exclude: RegExp): string[] {
-  const result: string[] = [];
-  fs.readdirSync(dir).forEach((fileName) => {
-    const p = path.join(dir, fileName);
+function* _findPrimaryPackageJsonFiles(dir: string, exclude: RegExp): Iterable<string> {
+  const subdirectories = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const p = path.join(dir, entry.name);
 
     if (exclude.test(p)) {
+      continue;
+    }
+
+    if (entry.isDirectory() && entry.name !== 'node_modules') {
+      subdirectories.push(p);
+      continue;
+    }
+
+    if (entry.name === 'package.json') {
+      yield p;
+
+      // First package.json found will be the package's root package.json
+      // Secondary entrypoint package.json files should not be found here
       return;
-    } else if (/[\/\\]node_modules[\/\\]/.test(p)) {
-      return;
-    } else if (fileName == 'package.json') {
-      result.push(p);
-    } else if (fs.statSync(p).isDirectory() && fileName != 'node_modules') {
-      result.push(..._findAllPackageJson(p, exclude));
     }
-  });
+  }
 
-  return result;
+  for (const directory of subdirectories) {
+    yield* _findPrimaryPackageJsonFiles(directory, exclude);
+  }
 }
 
 const tsConfigPath = path.join(__dirname, '../tsconfig.json');
@@ -139,9 +148,9 @@ const pattern =
 const excludeRe = new RegExp(pattern);
 
 // Find all the package.json that aren't excluded from tsconfig.
-const packageJsonPaths = _findAllPackageJson(path.join(__dirname, '..'), excludeRe)
-  // Remove the root package.json.
-  .filter((p) => p != path.join(__dirname, '../package.json'));
+const packageJsonPaths = [
+  ..._findPrimaryPackageJsonFiles(path.join(__dirname, '..', 'packages'), excludeRe),
+];
 
 function _exec(cmd: string) {
   return execSync(cmd).toString().trim();

packages/angular_devkit/core/node/BUILD.bazel

@@ -20,6 +20,7 @@ ts_library(
             "**/*_benchmark.ts",
         ],
     ),
+    data = ["package.json"],
     module_name = "@angular-devkit/core/node",
     module_root = "index.d.ts",
     # The attribute below is needed in g3 to turn off strict typechecking

packages/angular_devkit/core/node/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@angular-devkit/core/node",
+  "main": "index.js",
+  "typings": "index.d.ts"
+}

packages/angular_devkit/schematics/tasks/BUILD.bazel

@@ -20,6 +20,7 @@ ts_library(
             "tslint-fix/test/**/*",
         ],
     ),
+    data = ["package.json"],
     module_name = "@angular-devkit/schematics/tasks",
     module_root = "index.d.ts",
     # The attribute below is needed in g3 to turn off strict typechecking

packages/angular_devkit/schematics/tasks/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@angular-devkit/schematics/tasks",
+  "main": "index.js",
+  "typings": "index.d.ts"
+}

packages/angular_devkit/schematics/testing/BUILD.bazel

@@ -13,6 +13,7 @@ ts_library(
     srcs = glob(
         include = ["**/*.ts"],
     ),
+    data = ["package.json"],
     module_name = "@angular-devkit/schematics/testing",
     module_root = "index.d.ts",
     deps = [

packages/angular_devkit/schematics/testing/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@angular-devkit/schematics/testing",
+  "main": "index.js",
+  "typings": "index.d.ts"
+}

packages/angular_devkit/schematics/tools/BUILD.bazel

@@ -19,6 +19,7 @@ ts_library(
             "test/**/*.ts",
         ],
     ),
+    data = ["package.json"],
     module_name = "@angular-devkit/schematics/tools",
     module_root = "index.d.ts",
     # The attribute below is needed in g3 to turn off strict typechecking

packages/angular_devkit/schematics/tools/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@angular-devkit/schematics/tools",
+  "main": "index.js",
+  "typings": "index.d.ts"
+}