chore(release): 1.32.0 (#2920)

See CHANGELOG

.all-contributorsrc

@@ -1168,6 +1168,15 @@
       "contributions": [
         "maintenance"
       ]
+    },
+    {
+      "login": "johannes-weber",
+      "name": "Johannes Weber",
+      "avatar_url": "https://avatars.githubusercontent.com/u/569011?v=4",
+      "profile": "https://twitter.com/jowe",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "repoType": "github",

.github/workflows/main.yml

@@ -38,7 +38,7 @@ jobs:
           java-version: '8'
           distribution: 'zulu'
       - name: Set up Node 12
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.3.0
         with:
           node-version: '12'
       - name: Set up Python 3.6
@@ -132,7 +132,7 @@ jobs:
           java-version: '8'
           distribution: 'zulu'
       - name: Set up Node 12
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.3.0
         with:
           node-version: '12'
       - name: Set up Python 3.6
@@ -239,6 +239,13 @@ jobs:
             node: '10'
             os: ubuntu-latest
             python: '3.6'
+          - java: '8'
+            dotnet: '6.0.x'
+            dotnet-prerelease: true
+            go: '1.16'
+            node: '10'
+            os: ubuntu-latest
+            python: '3.6'
           # Test alternate Javas
           - java: '11'
             dotnet: '3.1.x'
@@ -274,6 +281,7 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: ${{ matrix.dotnet }}
+          include-prerelease: ${{ matrix.dotnet-prerelease }}
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v2
         with:
@@ -284,7 +292,7 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'zulu'
       - name: Set up Node ${{ matrix.node }}
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.3.0
         with:
           node-version: ${{ matrix.node }}
       - name: Set up Python ${{ matrix.python }}

.github/workflows/yarn-upgrade.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v2.3.4
 
       - name: Set up Node
-        uses: actions/setup-node@v2.1.5
+        uses: actions/setup-node@v2.3.0
         with:
           node-version: 10
 

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 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.32.0](https://github.com/aws/jsii/compare/v1.30.0...v1.32.0) (2021-07-22)
+
+
+### Features
+
+* **jsii-rosetta transliterate:** transliterate a jsii assembly ([#2869](https://github.com/aws/jsii/issues/2869)) ([d9028c8](https://github.com/aws/jsii/commit/d9028c8cf91297a44cd4b1f128f769716bf0e74e))
+* **rosetta:** hoist declare statements to top-level of document ([#2897](https://github.com/aws/jsii/issues/2897)) ([7b2ec05](https://github.com/aws/jsii/commit/7b2ec05b2ec247de83901e8504f7ba711d6027bb))
+* **rosetta:** transliterate loose mode ([#2892](https://github.com/aws/jsii/issues/2892)) ([43e6dfd](https://github.com/aws/jsii/commit/43e6dfd0591b0f38a8c636edd3896400c96676e3))
+
+
+### Bug Fixes
+
+* crash when assembly originator key file is missing ([#2899](https://github.com/aws/jsii/issues/2899)) ([e05ce62](https://github.com/aws/jsii/commit/e05ce625ba4760fa8196a5944cc9089a1aaefcfb))
+* **dotnet:** strong-name sign assemblies ([#2894](https://github.com/aws/jsii/issues/2894)) ([7b90f27](https://github.com/aws/jsii/commit/7b90f27c7819209f6485c28eabefb328a0304ab5))
+* **pacmak/go:** missing go.sum entry ([#2893](https://github.com/aws/jsii/issues/2893)) ([6e6ad69](https://github.com/aws/jsii/commit/6e6ad693230e18f36990e8feaf3734da7c01dbd5))
+* **rosetta:** extract does not respect strict metadata entry ([#2863](https://github.com/aws/jsii/issues/2863)) ([5d2392b](https://github.com/aws/jsii/commit/5d2392b7713cb6dfea6092c4ac3ee45360a5d28a)), closes [#2861](https://github.com/aws/jsii/issues/2861)
+* **rosetta:** fails on "Debug Failure" ([#2917](https://github.com/aws/jsii/issues/2917)) ([f6078ef](https://github.com/aws/jsii/commit/f6078ef08a144ea86623f331c60ac15ca5f91219)), closes [cdklabs/jsii-docgen#369](https://github.com/cdklabs/jsii-docgen/issues/369)
+* **rosetta:** hangs on 'markdown' command when a file is provided ([#2871](https://github.com/aws/jsii/issues/2871)) ([e538b36](https://github.com/aws/jsii/commit/e538b36c6ccf53ace908ff4c342dc9a4435ce353))
+
 ## [1.31.0](https://github.com/aws/jsii/compare/v1.30.0...v1.31.0) (2021-07-09)
 
 

gh-pages/content/index.md

@@ -100,7 +100,7 @@ header bar:
 ## How to contribute
 
 The [*jsii project*](https://github.com/aws/jsii) welcomes all kind of contributions. You can refer to the
-[Contribution Guide](https://github.com/aws/jsii/trees/main/CONTRIBUTING.md) on GitHub to get more information about how
+[Contribution Guide](https://github.com/aws/jsii/blob/main/CONTRIBUTING.md) on GitHub to get more information about how
 to contribute to the project in general.
 
 !!! tip

gh-pages/requirements-dev.txt

@@ -1,4 +1,4 @@
-mkdocs~=1.2.1
+mkdocs~=1.2.2
 mkdocs-awesome-pages-plugin~=2.5.0
-mkdocs-material~=7.1.9
+mkdocs-material~=7.2.0
 mkdocs-git-revision-date-plugin~=0.3.1

lerna.json

@@ -10,5 +10,5 @@
       "rejectCycles": true
     }
   },
-  "version": "1.31.0"
+  "version": "1.32.0"
 }

packages/@jsii/Directory.Build.targets

@@ -2,7 +2,7 @@
   <ItemGroup>
     <!-- Central configuration of dependency versions for all DotNet packages -->
 
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
     <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 

packages/@jsii/go-runtime/go.mod

@@ -4,5 +4,5 @@ go 1.15
 
 require (
 	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5
-	golang.org/x/tools v0.1.4
+	golang.org/x/tools v0.1.5
 )

packages/@jsii/go-runtime/go.sum

@@ -25,8 +25,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.4 h1:cVngSRcfgyZCzys3KYOpCFa+4dqX/Oub9tAq00ttGVs=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=

packages/@jsii/python-runtime/requirements.txt

@@ -1,9 +1,9 @@
-black~=21.6b0
+black~=21.7b0
 mypy==0.812
 pip~=21.1
 pytest~=6.2
 pytest-mypy~=0.8
-setuptools~=57.0
+setuptools~=57.4
 wheel~=0.36
 
 -e .

packages/@jsii/python-runtime/setup.py

@@ -32,7 +32,7 @@
     install_requires=[
         "attrs~=20.1",
         "cattrs~=1.0.0 ; python_version < '3.7'",
-        "cattrs~=1.5.0 ; python_version >= '3.7'",
+        "cattrs~=1.6.0 ; python_version >= '3.7'",
         "importlib_resources ; python_version < '3.7'",
         "python-dateutil",
         "typing_extensions~=3.7",

packages/jsii-pacmak/lib/targets/python/requirements-dev.txt

@@ -3,7 +3,7 @@
 # be installed in the virtual environment used for building the distribution
 # package (wheel, sdist), but not declared as build-system dependencies.
 
-setuptools~=56.0.0 # build-system
+setuptools~=56.1.0 # build-system
 wheel~=0.36.2      # build-system
 
-twine~=3.4.1
+twine~=3.4.2

packages/jsii-rosetta/lib/commands/transliterate.ts

@@ -137,10 +137,17 @@ type Mutable<T> = { -readonly [K in keyof T]: Mutable<T[K]> };
 type AssemblyLoader = () => Promise<Mutable<Assembly>>;
 
 function prefixDisclaimer(translation: Translation): string {
-  const message = translation.didCompile
-    ? 'Example automatically generated. See https://github.com/aws/jsii/issues/826'
-    : 'Example automatically generated without compilation. See https://github.com/aws/jsii/issues/826';
-  return `${commentToken()} ${message}\n${translation.source}`;
+  const comment = commentToken();
+  const disclaimer = translation.didCompile
+    ? 'This example was automatically transliterated.'
+    : 'This example was automatically transliterated with incomplete type information. It may not work as-is.';
+
+  return [
+    `${comment} ${disclaimer}`,
+    `${comment} See https://github.com/aws/jsii/issues/826 for more information.`,
+    '',
+    translation.source,
+  ].join('\n');
 
   function commentToken() {
     // This is future-proofed a bit, but don't read too much in this...

packages/jsii-rosetta/lib/fixtures.ts

@@ -28,7 +28,14 @@ export function fixturize(
   if (literateSource) {
     // Compatibility with the "old school" example inclusion mechanism.
     // Completely load this file and attach a parameter with its directory.
-    source = loadLiterateSource(directory, literateSource, loose);
+    try {
+      source = loadLiterateSource(directory, literateSource);
+    } catch (ex) {
+      // In loose mode, we ignore this failure and stick to the visible source.
+      if (!loose) {
+        throw ex;
+      }
+    }
     parameters[SnippetParameters.$COMPILATION_DIRECTORY] = path.join(
       directory,
       path.dirname(literateSource),
@@ -48,22 +55,10 @@ export function fixturize(
   };
 }
 
-function loadLiterateSource(
-  directory: string,
-  literateFileName: string,
-  loose = false,
-) {
+function loadLiterateSource(directory: string, literateFileName: string) {
   const fullPath = path.join(directory, literateFileName);
   const exists = fs.existsSync(fullPath);
   if (!exists) {
-    if (loose) {
-      // In loose mode, we'll fall back to the `.js` file if it exists...
-      const jsFile = fullPath.replace(/\.ts(x?)$/, '.js$1');
-      if (fs.existsSync(jsFile)) {
-        return fs.readFileSync(jsFile, { encoding: 'utf-8' });
-      }
-      return `Missing literate source file ${literateFileName}`;
-    }
     // This couldn't really happen in practice, but do the check anyway
     throw new Error(
       `Sample uses literate source ${literateFileName}, but not found: ${fullPath}`,
@@ -152,13 +147,16 @@ function sidelineImports(source: string): {
     ScriptKind.TS,
   );
   for (const statement of sourceFile.statements) {
-    switch (statement.kind) {
-      case SyntaxKind.ImportDeclaration:
-      case SyntaxKind.ImportEqualsDeclaration:
-        imports += statement.getFullText(sourceFile);
-        break;
-      default:
-        statements += statement.getFullText(sourceFile);
+    if (
+      statement.kind === SyntaxKind.ImportDeclaration ||
+      statement.kind === SyntaxKind.ImportEqualsDeclaration ||
+      (statement.kind === SyntaxKind.VariableStatement &&
+        statement.getChildAt(0).getChildAt(0).kind ===
+          SyntaxKind.DeclareKeyword)
+    ) {
+      imports += statement.getFullText(sourceFile);
+    } else {
+      statements += statement.getFullText(sourceFile);
     }
   }