Merge branch 'main' into rmuller/hide-deprecated

aws · Jan 26, 2021 · a598334 · a598334
2 parents d4645e0 + 2630a80
commit a598334
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
@@ -177,12 +177,6 @@
   },
   "schema": "jsii/0.10.0",
   "submodules": {
-    "@scope/jsii-calc-lib.submodule": {
-      "locationInModule": {
-        "filename": "../@scope/jsii-calc-lib/build/index.d.ts",
-        "line": 157
-      }
-    },
     "jsii-calc.DerivedClassHasNoProperties": {
       "locationInModule": {
         "filename": "lib/compliance.ts",
@@ -14441,5 +14435,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "4fJXgLfvFXFeZPUflIUswNxZKtt1vgIANXs/lWot+qg="
+  "fingerprint": "2KFlnOkWR5oOwLlri+7JlkA0BsYvnRkpBrk4nPWnJfw="
 }
diff --git a/packages/jsii/lib/assembler.ts b/packages/jsii/lib/assembler.ts
@@ -47,6 +47,15 @@ export class Assembler implements Emitter {
 
   /** Map of Symbol to namespace export Symbol */
   private readonly _submoduleMap = new Map<ts.Symbol, ts.Symbol>();
+
+  /**
+   * Submodule information
+   *
+   * Contains submodule information for all namespaces that have been seen
+   * across all assemblies (this and dependencies).
+   *
+   * Filtered to local submodules only at time of writing the assembly out to disk.
+   */
   private readonly _submodules = new Map<ts.Symbol, SubmoduleSpec>();
 
   /**
@@ -208,9 +217,7 @@ export class Assembler implements Emitter {
       ),
       bundled: this.projectInfo.bundleDependencies,
       types: this._types,
-      submodules: noEmptyDict(
-        toSubmoduleDeclarations(this._submodules.values()),
-      ),
+      submodules: noEmptyDict(toSubmoduleDeclarations(this.mySubmodules())),
       targets: this.projectInfo.targets,
       metadata: this.projectInfo.metadata,
       docs,
@@ -2596,6 +2603,16 @@ export class Assembler implements Emitter {
     }
     return docs;
   }
+
+  /**
+   * Return only those submodules from the submodules list that are submodules inside this
+   * assembly.
+   */
+  private mySubmodules() {
+    return Array.from(this._submodules.values()).filter((m) =>
+      m.fqn.startsWith(`${this.projectInfo.name}.`),
+    );
+  }
 }
 
 export interface AssemblerOptions {
@@ -2925,7 +2942,7 @@ function toDependencyClosure(
 }
 
 function toSubmoduleDeclarations(
-  submodules: IterableIterator<SubmoduleSpec>,
+  submodules: Iterable<SubmoduleSpec>,
 ): spec.Assembly['submodules'] {
   const result: spec.Assembly['submodules'] = {};