chore(release): 1.45.0 (#3189)

See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.45.0/CHANGELOG.md)
aws · Nov 19, 2021 · 251f56d · 251f56d
2 parents d848ef8 + f9708b7
commit 251f56d
Show file tree

Hide file tree

Showing 45 changed files with 1,920 additions and 580 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1233,6 +1233,73 @@
         "code",
         "bug"
       ]
+    },
+    {
+      "login": "otaviomacedo",
+      "name": "Otavio Macedo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/288203?v=4",
+      "profile": "https://otaviomacedo.github.io/",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "kaizen3031593",
+      "name": "kaizen3031593",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36202692?v=4",
+      "profile": "https://github.com/kaizen3031593",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "madeline-k",
+      "name": "Madeline Kusters",
+      "avatar_url": "https://avatars.githubusercontent.com/u/80541297?v=4",
+      "profile": "https://github.com/madeline-k",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "comcalvi",
+      "name": "Calvin Combs",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66279577?v=4",
+      "profile": "https://github.com/comcalvi",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "peterwoodworth",
+      "name": "Peter Woodworth",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44349620?v=4",
+      "profile": "https://github.com/peterwoodworth",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "mergify",
+      "name": "mergify",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18240476?v=4",
+      "profile": "https://github.com/mergify",
+      "contributions": [
+        "maintenance"
+      ]
+    },
+    {
+      "login": "oieduardorabelo",
+      "name": "Eduardo Rabelo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/829902?v=4",
+      "profile": "https://eduardorabelo.me/",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "repoType": "github",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.45.0](https://github.com/aws/jsii/compare/v1.44.1...v1.45.0) (2021-11-18)
+
+
+### Bug Fixes
+
+* C# NamespaceDoc emitted to wrong location ([#3183](https://github.com/aws/jsii/issues/3183)) ([0f5f349](https://github.com/aws/jsii/commit/0f5f349d2f6d7d916c59e4f13e0c5195cc0f80c9))
+* **jsii:** require statement for the warning file is generated when it's not used ([#3184](https://github.com/aws/jsii/issues/3184)) ([3d90ae6](https://github.com/aws/jsii/commit/3d90ae699fdcf6730d9b5559c55e78ec5f9c1260))
+* **pacmak:** dotnet code docs loses indentation ([#3180](https://github.com/aws/jsii/issues/3180)) ([ace0b83](https://github.com/aws/jsii/commit/ace0b83a0c951052349b102c3af34e92cae76767))
+* **pacmak:** Generate Relative Module Imports in Python ([#3181](https://github.com/aws/jsii/issues/3181)) ([b0afe51](https://github.com/aws/jsii/commit/b0afe51a8cb36a9ebdd39bd19a842285c58ee2c1))
+* **rosetta:** diagnostics not showing ([#3182](https://github.com/aws/jsii/issues/3182)) ([92a7d5e](https://github.com/aws/jsii/commit/92a7d5e3b10dc7c881ef70c12730f1f0cdcf9b63))
+* **rosetta:** Rosetta is not submodule-aware ([#3176](https://github.com/aws/jsii/issues/3176)) ([5c7d148](https://github.com/aws/jsii/commit/5c7d148104f6cfb54573a73a76efb288dd2f346b))
+* **rosetta:** types from submodules not recognized properly ([#3174](https://github.com/aws/jsii/issues/3174)) ([b009d07](https://github.com/aws/jsii/commit/b009d07c2ae34248d1e7beea3c66121b8deef957))
+
 ## [1.44.2](https://github.com/aws/jsii/compare/v1.44.1...v1.44.2) (2021-11-18)
 
 

diff --git a/README.md b/README.md
diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
       "rejectCycles": true
     }
   },
-  "version": "1.44.2"
+  "version": "1.45.0"
 }
diff --git a/packages/@jsii/spec/lib/assembly.ts b/packages/@jsii/spec/lib/assembly.ts
@@ -3,7 +3,10 @@ export const SPEC_FILE_NAME = '.jsii';
 /**
  * A JSII assembly specification.
  */
-export interface Assembly extends AssemblyConfiguration, Documentable {
+export interface Assembly
+  extends AssemblyConfiguration,
+    Documentable,
+    ReadMeContainer {
   /**
    * The version of the spec schema
    */
@@ -120,7 +123,7 @@ export interface Assembly extends AssemblyConfiguration, Documentable {
    *
    * @default none
    */
-  dependencyClosure?: { [assembly: string]: AssemblyConfiguration };
+  dependencyClosure?: { [assembly: string]: DependencyConfiguration };
 
   /**
    * List if bundled dependencies (these are not expected to be jsii
@@ -157,6 +160,10 @@ export interface AssemblyConfiguration extends Targetable {
   submodules?: { [fqn: string]: Submodule };
 }
 
+export interface DependencyConfiguration extends Targetable {
+  submodules?: { [fqn: string]: Targetable };
+}
+
 /**
  * A targetable module-like thing
  *
@@ -170,7 +177,12 @@ export interface Targetable {
    * @default none
    */
   targets?: AssemblyTargets;
+}
 
+/**
+ * Elements that can contain a `readme` property.
+ */
+export interface ReadMeContainer {
   /**
    * The readme document for this module (if any).
    *
@@ -192,7 +204,10 @@ export interface ReadMe {
  * The difference between a top-level module (the assembly) and a submodule is
  * that the submodule is annotated with its location in the repository.
  */
-export type Submodule = SourceLocatable & Targetable;
+export type Submodule = ReadMeContainer &
+  SourceLocatable &
+  Targetable &
+  TypeScriptLocatable;
 
 /**
  * Versions of the JSII Assembly Specification.
@@ -428,6 +443,26 @@ export interface SourceLocatable {
   locationInModule?: SourceLocation;
 }
 
+/**
+ * Indicates that a jsii entity's origin can be traced to TypeScript code
+ *
+ * This is interface is not the same as `SourceLocatable`. SourceLocatable
+ * identifies lines in source files in a source repository (in a `.ts` file,
+ * with respect to a git root).
+ *
+ * On the other hand, `TypeScriptLocatable` identifies a symbol name inside a
+ * potentially distributed TypeScript file (in either a `.d.ts` or `.ts`
+ * file, with respect to the package root).
+ */
+export interface TypeScriptLocatable {
+  /**
+   * Unique string representation of the corresponding Typescript symbol
+   *
+   * Used to map from TypeScript code back into the assembly.
+   */
+  symbolId?: string;
+}
+
 /**
  * Kinds of collections.
  */
@@ -767,7 +802,10 @@ export type Type = TypeBase & (ClassType | EnumType | InterfaceType);
 /**
  * Common attributes of a type definition.
  */
-export interface TypeBase extends Documentable, SourceLocatable {
+export interface TypeBase
+  extends Documentable,
+    SourceLocatable,
+    TypeScriptLocatable {
   /**
    * The fully qualified name of the type (``<assembly>.<namespace>.<name>``)
    *
@@ -811,11 +849,6 @@ export interface TypeBase extends Documentable, SourceLocatable {
    * The kind of the type.
    */
   kind: TypeKind;
-
-  /**
-   * Unique string representation of the corresponding Typescript symbol
-   */
-  symbolId?: string;
 }
 
 /**

diff --git a/packages/@scope/jsii-calc-lib/lib/submodule/README.md b/packages/@scope/jsii-calc-lib/lib/submodule/README.md
@@ -0,0 +1,3 @@
+# Submodule Readme
+
+This is a submodule readme.
diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii
@@ -95,6 +95,10 @@
         "filename": "lib/index.ts",
         "line": 130
       },
+      "readme": {
+        "markdown": "# Submodule Readme\n\nThis is a submodule readme.\n"
+      },
+      "symbolId": "lib/submodule/index:",
       "targets": {
         "dotnet": {
           "namespace": "Amazon.JSII.Tests.CustomSubmoduleName"
@@ -811,7 +815,7 @@
           }
         }
       ],
-      "symbolId": "lib/submodule/index:NestedClass"
+      "symbolId": "lib/submodule/index:NestingClass.NestedClass"
     },
     "@scope/jsii-calc-lib.submodule.NestingClass.NestedStruct": {
       "assembly": "@scope/jsii-calc-lib",
@@ -846,7 +850,7 @@
           }
         }
       ],
-      "symbolId": "lib/submodule/index:NestedStruct"
+      "symbolId": "lib/submodule/index:NestingClass.NestedStruct"
     },
     "@scope/jsii-calc-lib.submodule.ReflectableEntry": {
       "assembly": "@scope/jsii-calc-lib",
@@ -948,5 +952,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "BXEo4aMVmNYUV0dd8hK2zOYLM8iFbpxQbUzGyGagFu8="
+  "fingerprint": "BJ528BPiptJdqvxyoh4Ax2l2Knaz2KcuNYBYhVpyTw8="
 }