revert: "fix: dependency submodules may not be discovered (#3151)" (#…

…3170)

This reverts commit 5768bb9.

The commit breaks the build of CDKv2 alpha modules.
see aws/aws-cdk#17502



---

By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license].

[Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0

lerna.json

@@ -3,8 +3,7 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [
-    "packages/*",
-    "regression-tests/@*/*"
+    "packages/*"
   ],
   "command": {
     "bootstrap": {

package.json

@@ -43,7 +43,6 @@
       "packages/*",
       "packages/@jsii/*",
       "packages/@scope/*",
-      "regression-tests/@*/*",
       "tools/*"
     ],
     "nohoist": [

packages/jsii/lib/assembler.ts

@@ -3213,13 +3213,7 @@ function inferRootDir(program: ts.Program): string | undefined {
     .map((fileName) =>
       path.relative(program.getCurrentDirectory(), path.dirname(fileName)),
     )
-    .map(segmentPath)
-    // Dependency entry points are in this path, and they MAY resolve from the
-    // same mono-repo, in which case they won't appear to be external libraries,
-    // as there may not be a `/node_modules/` segment in their canonical path.
-    // They well however come from a parent directory, so their path segments
-    // will start with "..".
-    .filter(([head]) => head !== '..');
+    .map(segmentPath);
 
   const maxPrefix = Math.min(
     ...directories.map((segments) => segments.length - 1),

packages/jsii/lib/compiler.ts

@@ -133,15 +133,11 @@ export class Compiler implements Emitter {
     const pi = this.options.projectInfo;
     const projectRoot = pi.projectRoot;
     const host = ts.createWatchCompilerHost(
-      this.rootFiles,
+      this.configPath,
       {
         ...pi.tsc,
         ...BASE_COMPILER_OPTIONS,
         noEmitOnError: false,
-        tsBuildInfoFile: path.join(
-          pi.tsc?.outDir ?? pi.tsc?.rootDir ?? pi.projectRoot,
-          'tsconfig.tsbuildinfo',
-        ),
       },
       {
         ...ts.sys,
@@ -152,7 +148,6 @@ export class Compiler implements Emitter {
       ts.createEmitAndSemanticDiagnosticsBuilderProgram,
       opts?.reportDiagnostics,
       opts?.reportWatchStatus,
-      this.typescriptConfig?.references,
     );
     if (!host.getDefaultLibLocation) {
       throw new Error(
@@ -500,47 +495,23 @@ export class Compiler implements Emitter {
    * This makes it so that running 'tsc' and running 'jsii' has the same behavior.
    */
   private determineSources(files: string[]): string[] {
-    const ret = new Set<string>();
+    const ret = new Array<string>();
 
     if (files.length > 0) {
-      for (const file of files) {
-        ret.add(path.resolve(this.options.projectInfo.projectRoot, file));
-      }
+      ret.push(...files);
     } else {
       const parseConfigHost = parseConfigHostFromCompilerHost(
         this.compilerHost,
       );
-      // Note: the fileNames here are resolved by the parseConfigHost.
-      const { fileNames } = ts.parseJsonConfigFileContent(
+      const parsed = ts.parseJsonConfigFileContent(
         this.typescriptConfig,
         parseConfigHost,
         this.options.projectInfo.projectRoot,
       );
-      for (const file of fileNames) {
-        ret.add(file);
-      }
+      ret.push(...parsed.fileNames);
     }
 
-    // Bonus: ensure all dependencies' entry points are included in the compiler
-    // input path. This guarantees we have symbols for all types, from the
-    // module root, which is necessary in order to properly detect submodules.
-    for (const assm of this.options.projectInfo.dependencyClosure) {
-      const { resolvedModule } = ts.resolveModuleName(
-        assm.name,
-        path.join(
-          this.options.projectInfo.projectRoot,
-          this.options.projectInfo.types,
-        ),
-        this.typescriptConfig?.compilerOptions ?? {},
-        ts.sys,
-      );
-      if (!resolvedModule) {
-        continue;
-      }
-      ret.add(resolvedModule.resolvedFileName);
-    }
-
-    return Array.from(ret);
+    return ret;
   }
 
   /**