From 47a40f15195c00368c55bb9d08eded063d970dec Mon Sep 17 00:00:00 2001
From: Romain Marcadier <rmuller@amazon.com>
Date: Thu, 22 Apr 2021 12:00:37 +0200
Subject: [PATCH 01/28] fix(docs): correct the "source version" in Python
 version mapping

The SerVer prerelease identifier uses a `-` prefix, not `.`.
---
 .../lib-author/configuration/targets/python.md         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
index 372fab2206..669ba7f4e6 100644
--- a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
+++ b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
@@ -58,11 +58,11 @@ are accepted by `jsii-pacmak`, and are translated according to the following tab
 
 | Source Version (`npm`) | Python Version ([PEP-440]) | Notes                            |
 | ---------------------- | -------------------------- | -------------------------------- |
-| `X.Y.Z.dev.N`          | `X.Y.Z.devN`               | Development, iteration `N`.      |
-| `X.Y.Z.pre.N`          | `X.Y.Z.devN`               | Development, iteration `N`       |
-| `X.Y.Z.alpha.N`        | `X.Y.Z.aN`                 | Alpha release, iteration `N`     |
-| `X.Y.Z.beta.N`         | `X.Y.Z.bN`                 | Beta release, iteration `N`      |
-| `X.Y.Z.rc.N`           | `X.Y.Z.rcN`                | Release candidate, iteration `N` |
+| `X.Y.Z-dev.N`          | `X.Y.Z.devN`               | Development, iteration `N`.      |
+| `X.Y.Z-pre.N`          | `X.Y.Z.devN`               | Development, iteration `N`       |
+| `X.Y.Z-alpha.N`        | `X.Y.Z.aN`                 | Alpha release, iteration `N`     |
+| `X.Y.Z-beta.N`         | `X.Y.Z.bN`                 | Beta release, iteration `N`      |
+| `X.Y.Z-rc.N`           | `X.Y.Z.rcN`                | Release candidate, iteration `N` |
 
 [semver]: https://semver.org/spec/v2.0.0.html
 [pep-440]: https://www.python.org/dev/peps/pep-0440/#pre-releases

From f25acab9c07536c2859ca45b56f25fd9720b21e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 08:25:05 +0000
Subject: [PATCH 02/28] chore(deps): update pip requirement in
 /packages/@jsii/python-runtime (#2812)

---
 packages/@jsii/python-runtime/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt
index 7492f7afed..26bf08872a 100644
--- a/packages/@jsii/python-runtime/requirements.txt
+++ b/packages/@jsii/python-runtime/requirements.txt
@@ -1,6 +1,6 @@
 black~=20.8b1
 mypy==0.812
-pip~=21.0
+pip~=21.1
 pytest~=6.2
 pytest-mypy~=0.8
 setuptools~=56.0

From 4da4c34038d31f0badc87b260d5e0d50ec96ccfd Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 10:57:18 +0000
Subject: [PATCH 03/28] docs: add corymhall as a contributor (#2796)

Adds @corymhall as a contributor for bug.

This was requested by RomainMuller [in this comment](https://github.com/aws/jsii/issues/2793#issuecomment-820533491)
---
 .all-contributorsrc |  9 +++++++++
 README.md           | 25 +++++++++++++------------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 4a02daade6..d1978ceaa7 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1112,6 +1112,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "corymhall",
+      "name": "Cory Hall",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43035978?v=4",
+      "profile": "https://github.com/corymhall",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "repoType": "github",
diff --git a/README.md b/README.md
index 668466e00b..e75139888e 100644
--- a/README.md
+++ b/README.md
@@ -86,110 +86,111 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/ChristopheVico"><img src="https://avatars.githubusercontent.com/u/56592817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christophe Vico</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AChristopheVico+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/christophercurrie"><img src="https://avatars0.githubusercontent.com/u/19510?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christopher Currie</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=christophercurrie" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Achristophercurrie+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://rybicki.io/"><img src="https://avatars2.githubusercontent.com/u/5008987?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christopher Rybicki</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=Chriscbr" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/corymhall"><img src="https://avatars.githubusercontent.com/u/43035978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Hall</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Acorymhall+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://mcristi.wordpress.com"><img src="https://avatars.githubusercontent.com/u/95209?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cristian Măgherușan-Stanciu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ACristim+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/CyrusNajmabadi"><img src="https://avatars3.githubusercontent.com/u/4564579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CyrusNajmabadi</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ACyrusNajmabadi+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3ACyrusNajmabadi+label%3Afeature-request" title="Feature requests">🤔</a></td>
-    <td align="center"><a href="https://danieldinu.com/"><img src="https://avatars1.githubusercontent.com/u/236187?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Dinu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Addinu+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=ddinu" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://danieldinu.com/"><img src="https://avatars1.githubusercontent.com/u/236187?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Dinu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Addinu+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=ddinu" title="Code">💻</a></td>
     <td align="center"><a href="https://www.udondan.com/"><img src="https://avatars3.githubusercontent.com/u/6443408?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Schroeder</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Audondan+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=udondan" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=udondan" title="Documentation">📖</a> <a href="https://github.com/aws/jsii/issues?q=author%3Audondan+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Audondan" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/slotnick"><img src="https://avatars3.githubusercontent.com/u/918175?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dave Slotnick</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aslotnick+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://caremad.io/"><img src="https://avatars3.githubusercontent.com/u/145979?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Donald Stufft</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adstufft+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=dstufft" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Adstufft+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Adstufft" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/dagnir"><img src="https://avatars2.githubusercontent.com/u/261310?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dongie Agnir</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=dagnir" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Adagnir" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/edsenabr"><img src="https://avatars3.githubusercontent.com/u/15689137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eduardo Sena S. Rosa</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aedsenabr+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://eladb.github.com/"><img src="https://avatars3.githubusercontent.com/u/598796?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Elad Ben-Israel</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aeladb+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=eladb" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aeladb+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Aeladb" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aeladb" title="Reviewed Pull Requests">👀</a> <a href="#talk-eladb" title="Talks">📢</a></td>
-    <td align="center"><a href="https://github.com/iliapolo"><img src="https://avatars0.githubusercontent.com/u/1428812?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eli Polonsky</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ailiapolo+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=iliapolo" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ailiapolo+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ailiapolo" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ailiapolo" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/iliapolo"><img src="https://avatars0.githubusercontent.com/u/1428812?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eli Polonsky</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ailiapolo+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=iliapolo" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ailiapolo+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ailiapolo" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ailiapolo" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="http://ericzbeard.com/"><img src="https://avatars0.githubusercontent.com/u/663183?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eric Z. Beard</b></sub></a><br /><a href="#projectManagement-ericzbeard" title="Project Management">📆</a></td>
     <td align="center"><a href="https://github.com/McDoit"><img src="https://avatars3.githubusercontent.com/u/16723686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Erik Karlsson</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AMcDoit+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kozlove-aws"><img src="https://avatars1.githubusercontent.com/u/68875428?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eugene Kozlov</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=kozlove-aws" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/FabioGentile"><img src="https://avatars2.githubusercontent.com/u/7030345?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fabio Gentile</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AFabioGentile+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/workeitel"><img src="https://avatars1.githubusercontent.com/u/7794947?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Florian Eitel</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aworkeitel+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="http://www.grahamlea.com/"><img src="https://avatars0.githubusercontent.com/u/754403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Graham Lea</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AGrahamLea+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3AGrahamLea" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/assyadh"><img src="https://avatars0.githubusercontent.com/u/4091730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hamza Assyad</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aassyadh+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=assyadh" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aassyadh+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aassyadh" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/assyadh"><img src="https://avatars0.githubusercontent.com/u/4091730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hamza Assyad</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aassyadh+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=assyadh" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aassyadh+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aassyadh" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://harimenon.com/"><img src="https://avatars2.githubusercontent.com/u/171072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hari Pachuveetil</b></sub></a><br /><a href="#blog-floydpink" title="Blogposts">📝</a> <a href="https://github.com/aws/jsii/commits?author=floydpink" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/SoManyHs"><img src="https://avatars0.githubusercontent.com/u/29964746?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hsing-Hui Hsu</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=SoManyHs" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=SoManyHs" title="Documentation">📖</a> <a href="https://github.com/aws/jsii/issues?q=author%3ASoManyHs+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ASoManyHs" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/JKCT"><img src="https://avatars.githubusercontent.com/u/24870481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Kelley</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AJKCT+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://jamesmead.org/"><img src="https://avatars2.githubusercontent.com/u/3169?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Mead</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=floehopper" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/jamesiri"><img src="https://avatars1.githubusercontent.com/u/22601145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Siri</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=jamesiri" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ajamesiri" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/jasdel"><img src="https://avatars3.githubusercontent.com/u/961963?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Del Ponte</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajasdel+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ajasdel" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="http://aws.amazon.com/"><img src="https://avatars1.githubusercontent.com/u/193449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Fulghum</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Afulghum+label%3Afeature-request" title="Feature requests">🤔</a> <a href="#projectManagement-fulghum" title="Project Management">📆</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Afulghum" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://aws.amazon.com/"><img src="https://avatars1.githubusercontent.com/u/193449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Fulghum</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Afulghum+label%3Afeature-request" title="Feature requests">🤔</a> <a href="#projectManagement-fulghum" title="Project Management">📆</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Afulghum" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/Jerry-AWS"><img src="https://avatars3.githubusercontent.com/u/52084730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jerry Kindall</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=Jerry-AWS" title="Documentation">📖</a> <a href="https://github.com/aws/jsii/issues?q=author%3AJerry-AWS+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="http://nmussy.github.io/"><img src="https://avatars0.githubusercontent.com/u/2505696?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jimmy Gaussen</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anmussy+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/jsteinich"><img src="https://avatars0.githubusercontent.com/u/3868754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jon Steinich</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajsteinich+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ajsteinich+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/commits?author=jsteinich" title="Code">💻</a></td>
     <td align="center"><a href="https://joekiller.com/"><img src="https://avatars3.githubusercontent.com/u/1022919?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Lawson</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ajoekiller" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/jpmartin2"><img src="https://avatars2.githubusercontent.com/u/2464249?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Martin</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajpmartin2+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/dxunix"><img src="https://avatars3.githubusercontent.com/u/11489831?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Junix</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adxunix+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://www.linkedin.com/in/jsdtaylor"><img src="https://avatars0.githubusercontent.com/u/15832750?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Taylor</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajsdtaylor+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://www.linkedin.com/in/jsdtaylor"><img src="https://avatars0.githubusercontent.com/u/15832750?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Taylor</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajsdtaylor+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kiiadi"><img src="https://avatars3.githubusercontent.com/u/4661536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kyle Thomson</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=kiiadi" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Akiiadi" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://stackoverflow.com/users/2116873/pedreiro"><img src="https://avatars3.githubusercontent.com/u/10764017?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leandro Padua</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aleandropadua+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/majasb"><img src="https://avatars2.githubusercontent.com/u/142510?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maja S Bratseth</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amajasb+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcosdiez"><img src="https://avatars2.githubusercontent.com/u/297498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcos Diez</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amarcosdiez+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.matthewbonig.com/"><img src="https://avatars2.githubusercontent.com/u/1559437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Bonig</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ambonig+label%3Abug" title="Bug reports">🐛</a> <a href="#blog-mbonig" title="Blogposts">📝</a></td>
     <td align="center"><a href="https://github.com/mpiroc"><img src="https://avatars2.githubusercontent.com/u/1623344?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Pirocchi</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mpiroc" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ampiroc+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ampiroc" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/mikelane"><img src="https://avatars0.githubusercontent.com/u/6543713?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike Lane</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amikelane+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mikelane"><img src="https://avatars0.githubusercontent.com/u/6543713?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike Lane</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amikelane+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://elastician.com/"><img src="https://avatars3.githubusercontent.com/u/2056?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitch Garnaat</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agarnaat+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=garnaat" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Agarnaat+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Agarnaat" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/MrArnoldPalmer"><img src="https://avatars0.githubusercontent.com/u/7221111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitchell Valine</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AMrArnoldPalmer+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=MrArnoldPalmer" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3AMrArnoldPalmer+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3AMrArnoldPalmer" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3AMrArnoldPalmer" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/MohamadSoufan"><img src="https://avatars3.githubusercontent.com/u/28849417?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mohamad Soufan</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=MohamadSoufan" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/NetaNir"><img src="https://avatars0.githubusercontent.com/u/8578043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neta Nir</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NetaNir" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ANetaNir+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANetaNir" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANetaNir" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/njlynch"><img src="https://avatars3.githubusercontent.com/u/1376292?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Lynch</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anjlynch+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=njlynch" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anjlynch" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anjlynch" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/nija-at"><img src="https://avatars2.githubusercontent.com/u/16217941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Jayakar</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=nija-at" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anija-at" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anija-at" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/NGL321"><img src="https://avatars0.githubusercontent.com/u/4944099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Litov</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NGL321" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANGL321" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANGL321" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/NGL321"><img src="https://avatars0.githubusercontent.com/u/4944099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Litov</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NGL321" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANGL321" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANGL321" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/Pidz-b"><img src="https://avatars3.githubusercontent.com/u/47750432?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PIDZ - Bart </b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3APidz-b+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/donicek"><img src="https://avatars.githubusercontent.com/u/8548012?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petr Kacer</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adonicek+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://petrabarus.net/"><img src="https://avatars3.githubusercontent.com/u/523289?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petra Barus</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=petrabarus" title="Code">💻</a></td>
     <td align="center"><a href="http://philcali.me/"><img src="https://avatars1.githubusercontent.com/u/105208?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Cali</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aphilcali+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/Kent1"><img src="https://avatars1.githubusercontent.com/u/83018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Quentin Loos</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AKent1+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/Console32"><img src="https://avatars1.githubusercontent.com/u/4870099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raphael</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AConsole32+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/richardhboyd"><img src="https://avatars0.githubusercontent.com/u/58230111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Richard H Boyd</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arichardhboyd+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/richardhboyd"><img src="https://avatars0.githubusercontent.com/u/58230111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Richard H Boyd</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arichardhboyd+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://rix0r.nl/"><img src="https://avatars2.githubusercontent.com/u/524162?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rico Huijbers</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arix0rrr+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=rix0rrr" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Arix0rrr+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Arix0rrr" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Arix0rrr" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://keybase.io/romainmuller"><img src="https://avatars2.githubusercontent.com/u/411689?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Romain Marcadier</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ARomainMuller+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=RomainMuller" title="Code">💻</a> <a href="#design-RomainMuller" title="Design">🎨</a> <a href="https://github.com/aws/jsii/issues?q=author%3ARomainMuller+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ARomainMuller" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ARomainMuller" title="Reviewed Pull Requests">👀</a> <a href="#blog-RomainMuller" title="Blogposts">📝</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sadikkuzu/"><img src="https://avatars2.githubusercontent.com/u/23168063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SADIK KUZU</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asadikkuzu" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/skarode96"><img src="https://avatars2.githubusercontent.com/u/24491216?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SK</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askarode96+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/spfink"><img src="https://avatars1.githubusercontent.com/u/20525381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Fink</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=spfink" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aspfink" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://punch.dev/"><img src="https://avatars1.githubusercontent.com/u/38672686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Goodwin</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asam-goodwin" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://skorfmann.com/"><img src="https://avatars1.githubusercontent.com/u/136789?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Korfmann</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=skorfmann" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Afeature-request" title="Feature requests">🤔</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://skorfmann.com/"><img src="https://avatars1.githubusercontent.com/u/136789?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Korfmann</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=skorfmann" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://digitalsanctum.com/"><img src="https://avatars3.githubusercontent.com/u/30923?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shane Witbeck</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adigitalsanctum+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/shivlaks"><img src="https://avatars0.githubusercontent.com/u/32604953?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shiv Lakshminarayan</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=shivlaks" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ashivlaks" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ashivlaks" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/SomayaB"><img src="https://avatars3.githubusercontent.com/u/23043132?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Somaya</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=SomayaB" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ASomayaB+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ASomayaB" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ASomayaB" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://gitter.im/"><img src="https://avatars2.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=gitter-badger" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Agitter-badger" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://medium.com/@thomaspoignant"><img src="https://avatars2.githubusercontent.com/u/17908063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Poignant</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Athomaspoignant+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ThomasSteinbach"><img src="https://avatars0.githubusercontent.com/u/1683246?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Steinbach</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AThomasSteinbach+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/hoegertn"><img src="https://avatars2.githubusercontent.com/u/1287829?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thorsten Hoeger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=hoegertn" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/hoegertn"><img src="https://avatars2.githubusercontent.com/u/1287829?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thorsten Hoeger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=hoegertn" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/serverlessunicorn"><img src="https://avatars1.githubusercontent.com/u/54867311?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim Wagner</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aserverlessunicorn+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aserverlessunicorn+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/tobli"><img src="https://avatars3.githubusercontent.com/u/540266?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Lidskog</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=tobli" title="Code">💻</a></td>
     <td align="center"><a href="https://ty.coghlan.dev/"><img src="https://avatars2.githubusercontent.com/u/15920577?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ty Coghlan</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AOphirr33+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tvanhens"><img src="https://avatars1.githubusercontent.com/u/5342795?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tyler van Hensbergen</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Atvanhens+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="http://ultidev.com/Products/"><img src="https://avatars1.githubusercontent.com/u/757185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vlad Hrybok</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avgribok+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Lanayx"><img src="https://avatars2.githubusercontent.com/u/3329606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vladimir Shchur</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ALanayx+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://yanex.org/"><img src="https://avatars2.githubusercontent.com/u/95996?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yan Zhulanow</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=yanex" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://yanex.org/"><img src="https://avatars2.githubusercontent.com/u/95996?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yan Zhulanow</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=yanex" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/yglcode"><img src="https://avatars.githubusercontent.com/u/11893614?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yigong Liu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ayglcode+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ayglcode+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/ajnarang"><img src="https://avatars3.githubusercontent.com/u/52025281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ajnarang</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aajnarang+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/aniljava"><img src="https://avatars.githubusercontent.com/u/412569?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aniljava</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=aniljava" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/deccy-mcc"><img src="https://avatars0.githubusercontent.com/u/45844893?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deccy-mcc</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adeccy-mcc+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot-preview"><img src="https://avatars3.githubusercontent.com/in/2141?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot-preview[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adependabot-preview[bot]+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot-preview[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars0.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot[bot]" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/dheffx"><img src="https://avatars0.githubusercontent.com/u/22029918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dheffx</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adheffx+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dheffx"><img src="https://avatars0.githubusercontent.com/u/22029918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dheffx</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adheffx+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gregswdl"><img src="https://avatars0.githubusercontent.com/u/47365273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gregswdl</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agregswdl+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mattBrzezinski"><img src="https://avatars.githubusercontent.com/u/4356074?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mattBrzezinski</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mattBrzezinski" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/apps/mergify"><img src="https://avatars1.githubusercontent.com/in/10562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mergify[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Amergify[bot]" title="Maintenance">🚧</a></td>

From fc16f56008f9fa222b512b86e219ec72c1857f8e Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 10:04:46 +0200
Subject: [PATCH 04/28] docs: add rectalogic as a contributor (#2814)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: 👨🏻‍💻 Romain Marcadier <rmuller@amazon.com>
---
 .all-contributorsrc | 10 ++++++++++
 README.md           | 33 ++++++++++++++++++---------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index d1978ceaa7..7d0eb19387 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1113,6 +1113,16 @@
         "bug"
       ]
     },
+    {
+      "login": "rectalogic",
+      "name": "Andrew Wason",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11581?v=4",
+      "profile": "https://github.com/rectalogic",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
     {
       "login": "corymhall",
       "name": "Cory Hall",
diff --git a/README.md b/README.md
index e75139888e..fb87807ae8 100644
--- a/README.md
+++ b/README.md
@@ -60,142 +60,145 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/ahodieb"><img src="https://avatars1.githubusercontent.com/u/835502?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Abdallah Hodieb</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aahodieb+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://endoflineblog.com/"><img src="https://avatars2.githubusercontent.com/u/460937?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adam Ruka</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askinny85+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=skinny85" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Askinny85" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Askinny85" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://softwhat.com/"><img src="https://avatars0.githubusercontent.com/u/4362270?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alex Pulver</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aalexpulver+label%3Abug" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/rectalogic"><img src="https://avatars.githubusercontent.com/u/11581?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Wason</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arectalogic+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=rectalogic" title="Code">💻</a></td>
     <td align="center"><a href="https://www.aslezak.com/"><img src="https://avatars2.githubusercontent.com/u/6944605?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andy Slezak</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=amslezak" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/anshulguleria"><img src="https://avatars3.githubusercontent.com/u/993508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anshul Guleria</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aanshulguleria+label%3Afeature-request" title="Feature requests">🤔</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/anshulguleria"><img src="https://avatars3.githubusercontent.com/u/993508?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Anshul Guleria</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aanshulguleria+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/aripalo/"><img src="https://avatars0.githubusercontent.com/u/679146?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ari Palo</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aaripalo+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://armaan.tobaccowalla.com"><img src="https://avatars.githubusercontent.com/u/13340433?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Armaan Tobaccowalla</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AArmaanT+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/BiDzej"><img src="https://avatars1.githubusercontent.com/u/26255490?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bartłomiej Jurek</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ABiDzej+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://twiiter.com/benbridts"><img src="https://avatars0.githubusercontent.com/u/1301221?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben Bridts</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=benbridts" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/benfarr"><img src="https://avatars0.githubusercontent.com/u/10361379?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben Farr</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=benfarr" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/BenWal"><img src="https://avatars0.githubusercontent.com/u/2656067?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ben Walters</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ABenWal+label%3Afeature-request" title="Feature requests">🤔</a></td>
-    <td align="center"><a href="http://macher.dev"><img src="https://avatars0.githubusercontent.com/u/32685580?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Benjamin Macher</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=bmacher" title="Documentation">📖</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://macher.dev"><img src="https://avatars0.githubusercontent.com/u/32685580?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Benjamin Macher</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=bmacher" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/bmaizels"><img src="https://avatars1.githubusercontent.com/u/36682168?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Benjamin Maizels</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=bmaizels" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Abmaizels" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="http://wcauchois.github.io/"><img src="https://avatars1.githubusercontent.com/u/300544?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Bill Cauchois</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Awcauchois+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/bverhoeve"><img src="https://avatars1.githubusercontent.com/u/46007524?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Brecht Verhoeve</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Abverhoeve+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="http://bdawg.org/"><img src="https://avatars1.githubusercontent.com/u/92937?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Breland Miley</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mindstorms6" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/CaerusKaru"><img src="https://avatars3.githubusercontent.com/u/416563?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CaerusKaru</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=CaerusKaru" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ACaerusKaru" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://camilobermudez85.github.io/"><img src="https://avatars0.githubusercontent.com/u/7834055?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Camilo Bermúdez</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Acamilobermudez85+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/campionfellin"><img src="https://avatars3.githubusercontent.com/u/11984923?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Campion Fellin</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=campionfellin" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/campionfellin"><img src="https://avatars3.githubusercontent.com/u/11984923?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Campion Fellin</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=campionfellin" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/carterv"><img src="https://avatars2.githubusercontent.com/u/1551538?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Carter Van Deuren</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Acarterv+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ChristopheVico"><img src="https://avatars.githubusercontent.com/u/56592817?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christophe Vico</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AChristopheVico+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/christophercurrie"><img src="https://avatars0.githubusercontent.com/u/19510?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christopher Currie</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=christophercurrie" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Achristophercurrie+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://rybicki.io/"><img src="https://avatars2.githubusercontent.com/u/5008987?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christopher Rybicki</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=Chriscbr" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/corymhall"><img src="https://avatars.githubusercontent.com/u/43035978?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cory Hall</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Acorymhall+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://mcristi.wordpress.com"><img src="https://avatars.githubusercontent.com/u/95209?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cristian Măgherușan-Stanciu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ACristim+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/CyrusNajmabadi"><img src="https://avatars3.githubusercontent.com/u/4564579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CyrusNajmabadi</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ACyrusNajmabadi+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3ACyrusNajmabadi+label%3Afeature-request" title="Feature requests">🤔</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/CyrusNajmabadi"><img src="https://avatars3.githubusercontent.com/u/4564579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>CyrusNajmabadi</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ACyrusNajmabadi+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3ACyrusNajmabadi+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://danieldinu.com/"><img src="https://avatars1.githubusercontent.com/u/236187?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Dinu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Addinu+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=ddinu" title="Code">💻</a></td>
     <td align="center"><a href="https://www.udondan.com/"><img src="https://avatars3.githubusercontent.com/u/6443408?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Schroeder</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Audondan+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=udondan" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=udondan" title="Documentation">📖</a> <a href="https://github.com/aws/jsii/issues?q=author%3Audondan+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Audondan" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/slotnick"><img src="https://avatars3.githubusercontent.com/u/918175?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dave Slotnick</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aslotnick+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://caremad.io/"><img src="https://avatars3.githubusercontent.com/u/145979?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Donald Stufft</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adstufft+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=dstufft" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Adstufft+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Adstufft" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/dagnir"><img src="https://avatars2.githubusercontent.com/u/261310?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dongie Agnir</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=dagnir" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Adagnir" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/edsenabr"><img src="https://avatars3.githubusercontent.com/u/15689137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eduardo Sena S. Rosa</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aedsenabr+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://eladb.github.com/"><img src="https://avatars3.githubusercontent.com/u/598796?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Elad Ben-Israel</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aeladb+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=eladb" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aeladb+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Aeladb" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aeladb" title="Reviewed Pull Requests">👀</a> <a href="#talk-eladb" title="Talks">📢</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://eladb.github.com/"><img src="https://avatars3.githubusercontent.com/u/598796?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Elad Ben-Israel</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aeladb+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=eladb" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aeladb+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Aeladb" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aeladb" title="Reviewed Pull Requests">👀</a> <a href="#talk-eladb" title="Talks">📢</a></td>
     <td align="center"><a href="https://github.com/iliapolo"><img src="https://avatars0.githubusercontent.com/u/1428812?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eli Polonsky</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ailiapolo+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=iliapolo" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ailiapolo+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ailiapolo" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ailiapolo" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="http://ericzbeard.com/"><img src="https://avatars0.githubusercontent.com/u/663183?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eric Z. Beard</b></sub></a><br /><a href="#projectManagement-ericzbeard" title="Project Management">📆</a></td>
     <td align="center"><a href="https://github.com/McDoit"><img src="https://avatars3.githubusercontent.com/u/16723686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Erik Karlsson</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AMcDoit+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kozlove-aws"><img src="https://avatars1.githubusercontent.com/u/68875428?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Eugene Kozlov</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=kozlove-aws" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/FabioGentile"><img src="https://avatars2.githubusercontent.com/u/7030345?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fabio Gentile</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AFabioGentile+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/workeitel"><img src="https://avatars1.githubusercontent.com/u/7794947?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Florian Eitel</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aworkeitel+label%3Afeature-request" title="Feature requests">🤔</a></td>
-    <td align="center"><a href="http://www.grahamlea.com/"><img src="https://avatars0.githubusercontent.com/u/754403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Graham Lea</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AGrahamLea+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3AGrahamLea" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.grahamlea.com/"><img src="https://avatars0.githubusercontent.com/u/754403?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Graham Lea</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AGrahamLea+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3AGrahamLea" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/assyadh"><img src="https://avatars0.githubusercontent.com/u/4091730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hamza Assyad</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aassyadh+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=assyadh" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aassyadh+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aassyadh" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://harimenon.com/"><img src="https://avatars2.githubusercontent.com/u/171072?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hari Pachuveetil</b></sub></a><br /><a href="#blog-floydpink" title="Blogposts">📝</a> <a href="https://github.com/aws/jsii/commits?author=floydpink" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/SoManyHs"><img src="https://avatars0.githubusercontent.com/u/29964746?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hsing-Hui Hsu</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=SoManyHs" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=SoManyHs" title="Documentation">📖</a> <a href="https://github.com/aws/jsii/issues?q=author%3ASoManyHs+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ASoManyHs" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/JKCT"><img src="https://avatars.githubusercontent.com/u/24870481?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Kelley</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AJKCT+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://jamesmead.org/"><img src="https://avatars2.githubusercontent.com/u/3169?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Mead</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=floehopper" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/jamesiri"><img src="https://avatars1.githubusercontent.com/u/22601145?v=4?s=100" width="100px;" alt=""/><br /><sub><b>James Siri</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=jamesiri" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ajamesiri" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/jasdel"><img src="https://avatars3.githubusercontent.com/u/961963?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Del Ponte</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajasdel+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ajasdel" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/jasdel"><img src="https://avatars3.githubusercontent.com/u/961963?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Del Ponte</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajasdel+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ajasdel" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="http://aws.amazon.com/"><img src="https://avatars1.githubusercontent.com/u/193449?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jason Fulghum</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Afulghum+label%3Afeature-request" title="Feature requests">🤔</a> <a href="#projectManagement-fulghum" title="Project Management">📆</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Afulghum" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/Jerry-AWS"><img src="https://avatars3.githubusercontent.com/u/52084730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jerry Kindall</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=Jerry-AWS" title="Documentation">📖</a> <a href="https://github.com/aws/jsii/issues?q=author%3AJerry-AWS+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="http://nmussy.github.io/"><img src="https://avatars0.githubusercontent.com/u/2505696?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jimmy Gaussen</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anmussy+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/jsteinich"><img src="https://avatars0.githubusercontent.com/u/3868754?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jon Steinich</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajsteinich+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ajsteinich+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/commits?author=jsteinich" title="Code">💻</a></td>
     <td align="center"><a href="https://joekiller.com/"><img src="https://avatars3.githubusercontent.com/u/1022919?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Lawson</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ajoekiller" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/jpmartin2"><img src="https://avatars2.githubusercontent.com/u/2464249?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joseph Martin</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajpmartin2+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/dxunix"><img src="https://avatars3.githubusercontent.com/u/11489831?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Junix</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adxunix+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/dxunix"><img src="https://avatars3.githubusercontent.com/u/11489831?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Junix</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adxunix+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/jsdtaylor"><img src="https://avatars0.githubusercontent.com/u/15832750?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Taylor</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajsdtaylor+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kiiadi"><img src="https://avatars3.githubusercontent.com/u/4661536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kyle Thomson</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=kiiadi" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Akiiadi" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://stackoverflow.com/users/2116873/pedreiro"><img src="https://avatars3.githubusercontent.com/u/10764017?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leandro Padua</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aleandropadua+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/majasb"><img src="https://avatars2.githubusercontent.com/u/142510?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maja S Bratseth</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amajasb+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcosdiez"><img src="https://avatars2.githubusercontent.com/u/297498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcos Diez</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amarcosdiez+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://www.matthewbonig.com/"><img src="https://avatars2.githubusercontent.com/u/1559437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Bonig</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ambonig+label%3Abug" title="Bug reports">🐛</a> <a href="#blog-mbonig" title="Blogposts">📝</a></td>
-    <td align="center"><a href="https://github.com/mpiroc"><img src="https://avatars2.githubusercontent.com/u/1623344?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Pirocchi</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mpiroc" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ampiroc+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ampiroc" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/mpiroc"><img src="https://avatars2.githubusercontent.com/u/1623344?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Pirocchi</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mpiroc" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ampiroc+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ampiroc" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/mikelane"><img src="https://avatars0.githubusercontent.com/u/6543713?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike Lane</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amikelane+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://elastician.com/"><img src="https://avatars3.githubusercontent.com/u/2056?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitch Garnaat</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agarnaat+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=garnaat" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Agarnaat+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Agarnaat" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/MrArnoldPalmer"><img src="https://avatars0.githubusercontent.com/u/7221111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitchell Valine</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AMrArnoldPalmer+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=MrArnoldPalmer" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3AMrArnoldPalmer+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3AMrArnoldPalmer" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3AMrArnoldPalmer" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/MohamadSoufan"><img src="https://avatars3.githubusercontent.com/u/28849417?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mohamad Soufan</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=MohamadSoufan" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/NetaNir"><img src="https://avatars0.githubusercontent.com/u/8578043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neta Nir</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NetaNir" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ANetaNir+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANetaNir" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANetaNir" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/njlynch"><img src="https://avatars3.githubusercontent.com/u/1376292?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Lynch</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anjlynch+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=njlynch" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anjlynch" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anjlynch" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/nija-at"><img src="https://avatars2.githubusercontent.com/u/16217941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Jayakar</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=nija-at" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anija-at" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anija-at" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/nija-at"><img src="https://avatars2.githubusercontent.com/u/16217941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Jayakar</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=nija-at" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anija-at" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anija-at" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/NGL321"><img src="https://avatars0.githubusercontent.com/u/4944099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Litov</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NGL321" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANGL321" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANGL321" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/Pidz-b"><img src="https://avatars3.githubusercontent.com/u/47750432?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PIDZ - Bart </b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3APidz-b+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/donicek"><img src="https://avatars.githubusercontent.com/u/8548012?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petr Kacer</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adonicek+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://petrabarus.net/"><img src="https://avatars3.githubusercontent.com/u/523289?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petra Barus</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=petrabarus" title="Code">💻</a></td>
     <td align="center"><a href="http://philcali.me/"><img src="https://avatars1.githubusercontent.com/u/105208?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Cali</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aphilcali+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/Kent1"><img src="https://avatars1.githubusercontent.com/u/83018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Quentin Loos</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AKent1+label%3Afeature-request" title="Feature requests">🤔</a></td>
-    <td align="center"><a href="https://github.com/Console32"><img src="https://avatars1.githubusercontent.com/u/4870099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raphael</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AConsole32+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Console32"><img src="https://avatars1.githubusercontent.com/u/4870099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raphael</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AConsole32+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/richardhboyd"><img src="https://avatars0.githubusercontent.com/u/58230111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Richard H Boyd</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arichardhboyd+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://rix0r.nl/"><img src="https://avatars2.githubusercontent.com/u/524162?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rico Huijbers</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arix0rrr+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=rix0rrr" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Arix0rrr+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Arix0rrr" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Arix0rrr" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://keybase.io/romainmuller"><img src="https://avatars2.githubusercontent.com/u/411689?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Romain Marcadier</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ARomainMuller+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=RomainMuller" title="Code">💻</a> <a href="#design-RomainMuller" title="Design">🎨</a> <a href="https://github.com/aws/jsii/issues?q=author%3ARomainMuller+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ARomainMuller" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ARomainMuller" title="Reviewed Pull Requests">👀</a> <a href="#blog-RomainMuller" title="Blogposts">📝</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sadikkuzu/"><img src="https://avatars2.githubusercontent.com/u/23168063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SADIK KUZU</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asadikkuzu" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/skarode96"><img src="https://avatars2.githubusercontent.com/u/24491216?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SK</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askarode96+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/spfink"><img src="https://avatars1.githubusercontent.com/u/20525381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Fink</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=spfink" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aspfink" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://punch.dev/"><img src="https://avatars1.githubusercontent.com/u/38672686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Goodwin</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asam-goodwin" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://punch.dev/"><img src="https://avatars1.githubusercontent.com/u/38672686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Goodwin</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asam-goodwin" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://skorfmann.com/"><img src="https://avatars1.githubusercontent.com/u/136789?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Korfmann</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=skorfmann" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://digitalsanctum.com/"><img src="https://avatars3.githubusercontent.com/u/30923?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shane Witbeck</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adigitalsanctum+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/shivlaks"><img src="https://avatars0.githubusercontent.com/u/32604953?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shiv Lakshminarayan</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=shivlaks" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ashivlaks" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ashivlaks" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/SomayaB"><img src="https://avatars3.githubusercontent.com/u/23043132?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Somaya</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=SomayaB" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ASomayaB+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ASomayaB" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ASomayaB" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://gitter.im/"><img src="https://avatars2.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=gitter-badger" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Agitter-badger" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://medium.com/@thomaspoignant"><img src="https://avatars2.githubusercontent.com/u/17908063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Poignant</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Athomaspoignant+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/ThomasSteinbach"><img src="https://avatars0.githubusercontent.com/u/1683246?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Steinbach</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AThomasSteinbach+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/ThomasSteinbach"><img src="https://avatars0.githubusercontent.com/u/1683246?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Steinbach</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AThomasSteinbach+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hoegertn"><img src="https://avatars2.githubusercontent.com/u/1287829?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thorsten Hoeger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=hoegertn" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/serverlessunicorn"><img src="https://avatars1.githubusercontent.com/u/54867311?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim Wagner</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aserverlessunicorn+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aserverlessunicorn+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/tobli"><img src="https://avatars3.githubusercontent.com/u/540266?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Lidskog</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=tobli" title="Code">💻</a></td>
     <td align="center"><a href="https://ty.coghlan.dev/"><img src="https://avatars2.githubusercontent.com/u/15920577?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ty Coghlan</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AOphirr33+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tvanhens"><img src="https://avatars1.githubusercontent.com/u/5342795?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tyler van Hensbergen</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Atvanhens+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="http://ultidev.com/Products/"><img src="https://avatars1.githubusercontent.com/u/757185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vlad Hrybok</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avgribok+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/Lanayx"><img src="https://avatars2.githubusercontent.com/u/3329606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vladimir Shchur</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ALanayx+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Lanayx"><img src="https://avatars2.githubusercontent.com/u/3329606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vladimir Shchur</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ALanayx+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://yanex.org/"><img src="https://avatars2.githubusercontent.com/u/95996?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yan Zhulanow</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=yanex" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/yglcode"><img src="https://avatars.githubusercontent.com/u/11893614?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yigong Liu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ayglcode+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ayglcode+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/ajnarang"><img src="https://avatars3.githubusercontent.com/u/52025281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ajnarang</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aajnarang+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/aniljava"><img src="https://avatars.githubusercontent.com/u/412569?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aniljava</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=aniljava" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/deccy-mcc"><img src="https://avatars0.githubusercontent.com/u/45844893?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deccy-mcc</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adeccy-mcc+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot-preview"><img src="https://avatars3.githubusercontent.com/in/2141?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot-preview[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adependabot-preview[bot]+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot-preview[bot]" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars0.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot[bot]" title="Maintenance">🚧</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars0.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/dheffx"><img src="https://avatars0.githubusercontent.com/u/22029918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dheffx</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adheffx+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gregswdl"><img src="https://avatars0.githubusercontent.com/u/47365273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gregswdl</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agregswdl+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/mattBrzezinski"><img src="https://avatars.githubusercontent.com/u/4356074?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mattBrzezinski</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mattBrzezinski" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/apps/mergify"><img src="https://avatars1.githubusercontent.com/in/10562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mergify[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Amergify[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/seiyashima"><img src="https://avatars2.githubusercontent.com/u/4947101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>seiyashima42</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aseiyashima+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/sullis"><img src="https://avatars3.githubusercontent.com/u/30938?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sullis</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=sullis" title="Code">💻</a></td>
+  </tr>
+  <tr>
     <td align="center"><a href="https://github.com/vaneek"><img src="https://avatars1.githubusercontent.com/u/8113305?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vaneek</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avaneek+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
 </table>

From e7a55d332b2059f014bd94885c264e4e5a1ad7fd Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 10:06:51 +0200
Subject: [PATCH 05/28] docs: add guyroberts21 as a contributor (#2815)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: 👨🏻‍💻 Romain Marcadier <rmuller@amazon.com>
---
 .all-contributorsrc | 9 +++++++++
 README.md           | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 7d0eb19387..eb5b09892f 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1113,6 +1113,15 @@
         "bug"
       ]
     },
+    {
+      "login": "guyroberts21",
+      "name": "guyroberts21",
+      "avatar_url": "https://avatars.githubusercontent.com/u/47118902?v=4",
+      "profile": "https://github.com/guyroberts21",
+      "contributions": [
+        "doc"
+      ]
+    },
     {
       "login": "rectalogic",
       "name": "Andrew Wason",
diff --git a/README.md b/README.md
index fb87807ae8..ac98b73323 100644
--- a/README.md
+++ b/README.md
@@ -193,12 +193,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars0.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/dheffx"><img src="https://avatars0.githubusercontent.com/u/22029918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dheffx</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adheffx+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gregswdl"><img src="https://avatars0.githubusercontent.com/u/47365273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gregswdl</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agregswdl+label%3Abug" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://github.com/guyroberts21"><img src="https://avatars.githubusercontent.com/u/47118902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guyroberts21</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=guyroberts21" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/mattBrzezinski"><img src="https://avatars.githubusercontent.com/u/4356074?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mattBrzezinski</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mattBrzezinski" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/apps/mergify"><img src="https://avatars1.githubusercontent.com/in/10562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mergify[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Amergify[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/seiyashima"><img src="https://avatars2.githubusercontent.com/u/4947101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>seiyashima42</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aseiyashima+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/sullis"><img src="https://avatars3.githubusercontent.com/u/30938?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sullis</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=sullis" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/sullis"><img src="https://avatars3.githubusercontent.com/u/30938?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sullis</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=sullis" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vaneek"><img src="https://avatars1.githubusercontent.com/u/8113305?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vaneek</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avaneek+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
 </table>

From 1cd7c8691b319da795b14fbabd338b3f93e3f237 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 09:19:09 +0000
Subject: [PATCH 06/28] chore(deps-dev): update mkdocs-material requirement in
 /gh-pages (#2813)

---
 gh-pages/requirements-dev.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt
index 447457cc9f..8901cebb10 100644
--- a/gh-pages/requirements-dev.txt
+++ b/gh-pages/requirements-dev.txt
@@ -1,4 +1,4 @@
 mkdocs~=1.1.2
 mkdocs-awesome-pages-plugin~=2.5.0
-mkdocs-material~=7.1.2
+mkdocs-material~=7.1.3
 mkdocs-git-revision-date-plugin~=0.3.1

From 3e4c47efc92dffc7ee35443324f85108e5db0b51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 10:03:18 +0000
Subject: [PATCH 07/28] chore(deps): update black requirement in
 /packages/@jsii/python-runtime (#2811)

---
 packages/@jsii/python-runtime/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt
index 26bf08872a..9b36b83164 100644
--- a/packages/@jsii/python-runtime/requirements.txt
+++ b/packages/@jsii/python-runtime/requirements.txt
@@ -1,4 +1,4 @@
-black~=20.8b1
+black~=21.4b0
 mypy==0.812
 pip~=21.1
 pytest~=6.2

From c478da482e688f763ecccf6bff52cded3758ad53 Mon Sep 17 00:00:00 2001
From: Nick Lynch <nlynch@amazon.com>
Date: Tue, 27 Apr 2021 13:28:50 +0100
Subject: [PATCH 08/28] feat(rosetta): JSII_ROSETTA_MAX_WORKER_COUNT limits max
 workers (#2816)

The current behavior of rosetta (extract) is to use a number of node worker
threads equal to half the number of CPU cores. On large CI/CD build hardware,
this may mean creating a huge number of worker threads which causes more
contention than benefit.

Introduce `JSII_ROSETTA_MAX_WORKER_COUNT` to limit the maximum number of workers
(defaults to `16`).

See https://github.com/aws/aws-cdk/pull/14389 for more motivation from the AWS CDK.

---

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
---
 packages/jsii-rosetta/README.md               | 4 ++++
 packages/jsii-rosetta/lib/commands/extract.ts | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/jsii-rosetta/README.md b/packages/jsii-rosetta/README.md
index 6c242b4864..8f925b3fa0 100644
--- a/packages/jsii-rosetta/README.md
+++ b/packages/jsii-rosetta/README.md
@@ -194,3 +194,7 @@ Worker threads are enabled by default on NodeJS 12.x, and can be enabled on Node
 ```
 $ node --experimental-worker /path/to/jsii-rosetta extract ...
 ```
+
+If worker thread support is available, `jsii-rosetta` will use a number of workers equal to half the number of CPU cores,
+up to a maximum of 16 workers. This default maximum can be overridden by setting the `JSII_ROSETTA_MAX_WORKER_COUNT`
+environment variable.
diff --git a/packages/jsii-rosetta/lib/commands/extract.ts b/packages/jsii-rosetta/lib/commands/extract.ts
index 0e767b3609..3ee8f971d2 100644
--- a/packages/jsii-rosetta/lib/commands/extract.ts
+++ b/packages/jsii-rosetta/lib/commands/extract.ts
@@ -165,7 +165,11 @@ async function workerBasedTranslateAll(
 ): Promise<TranslateAllResult> {
   // Use about half the advertised cores because hyperthreading doesn't seem to help that
   // much (on my machine, using more than half the cores actually makes it slower).
-  const N = Math.max(1, Math.ceil(os.cpus().length / 2));
+  // Cap to a reasonable top-level limit to prevent thrash on machines with many, many cores.
+  const maxWorkers = parseInt(
+    process.env.JSII_ROSETTA_MAX_WORKER_COUNT ?? '16',
+  );
+  const N = Math.min(maxWorkers, Math.max(1, Math.ceil(os.cpus().length / 2)));
   const snippetArr = Array.from(snippets);
   const groups = divideEvenly(N, snippetArr);
   logging.info(

From 49f6a4499067ee5534cad8cfeb1ebf42f55b8241 Mon Sep 17 00:00:00 2001
From: mergify <mergify@users.noreply.github.com>
Date: Wed, 28 Apr 2021 13:47:32 +0000
Subject: [PATCH 09/28] chore: npm-check-updates && yarn upgrade

Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
---
 package.json                                  |   8 +-
 .../@jsii/dotnet-runtime-test/package.json    |   2 +-
 packages/@jsii/dotnet-runtime/package.json    |   4 +-
 packages/@jsii/go-runtime/package.json        |   4 +-
 packages/@jsii/integ-test/package.json        |   8 +-
 packages/@jsii/java-runtime/package.json      |   2 +-
 packages/@jsii/kernel/package.json            |   8 +-
 packages/@jsii/runtime/package.json           |  10 +-
 packages/@jsii/spec/package.json              |   6 +-
 .../jsii-calc-base-of-base/package.json       |   2 +-
 packages/@scope/jsii-calc-base/package.json   |   2 +-
 packages/@scope/jsii-calc-lib/package.json    |   2 +-
 packages/codemaker/package.json               |   6 +-
 packages/jsii-calc/package.json               |   4 +-
 packages/jsii-config/package.json             |   6 +-
 packages/jsii-diff/package.json               |   6 +-
 packages/jsii-pacmak/package.json             |  10 +-
 packages/jsii-reflect/package.json            |   6 +-
 packages/jsii-rosetta/package.json            |  10 +-
 packages/jsii/package.json                    |  10 +-
 packages/oo-ascii-tree/package.json           |   6 +-
 tools/jsii-build-tools/package.json           |   2 +-
 tools/jsii-compliance/package.json            |   4 +-
 yarn.lock                                     | 418 +++++++++---------
 24 files changed, 278 insertions(+), 268 deletions(-)

diff --git a/package.json b/package.json
index 6d17b4ddf5..65cc4de5dc 100644
--- a/package.json
+++ b/package.json
@@ -19,19 +19,19 @@
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
     "all-contributors-cli": "^6.20.0",
-    "eslint": "^7.24.0",
-    "eslint-config-prettier": "^8.2.0",
+    "eslint": "^7.25.0",
+    "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-import-resolver-typescript": "^2.4.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-prettier": "^3.4.0",
     "jest-circus": "^26.6.3",
     "jest-config": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "lerna": "^4.0.0",
     "prettier": "^2.2.1",
     "standard-version": "^9.2.0",
-    "ts-jest": "^26.5.4",
+    "ts-jest": "^26.5.5",
     "ts-node": "^9.1.1",
     "typescript": "~3.9.9"
   },
diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json
index 3a39a01677..deb6c14214 100644
--- a/packages/@jsii/dotnet-runtime-test/package.json
+++ b/packages/@jsii/dotnet-runtime-test/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@jsii/dotnet-runtime": "^0.0.0",
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "jsii-calc": "^3.20.120",
     "jsii-pacmak": "^0.0.0",
     "typescript": "~3.9.9"
diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json
index 30b6814209..bad5818b18 100644
--- a/packages/@jsii/dotnet-runtime/package.json
+++ b/packages/@jsii/dotnet-runtime/package.json
@@ -39,8 +39,8 @@
   },
   "devDependencies": {
     "@jsii/runtime": "^0.0.0",
-    "@types/node": "^10.17.56",
-    "@types/semver": "^7.3.4",
+    "@types/node": "^10.17.59",
+    "@types/semver": "^7.3.5",
     "jsii-build-tools": "^0.0.0",
     "semver": "^7.3.5",
     "typescript": "~3.9.9"
diff --git a/packages/@jsii/go-runtime/package.json b/packages/@jsii/go-runtime/package.json
index 05efbfa0f7..fe270aefe2 100644
--- a/packages/@jsii/go-runtime/package.json
+++ b/packages/@jsii/go-runtime/package.json
@@ -24,9 +24,9 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^8.1.1",
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "codemaker": "^0.0.0",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "fs-extra": "^9.1.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json
index fcea1ad994..2d06b6a9f1 100644
--- a/packages/@jsii/integ-test/package.json
+++ b/packages/@jsii/integ-test/package.json
@@ -17,7 +17,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@octokit/rest": "^18.5.2",
+    "@octokit/rest": "^18.5.3",
     "dotenv": "^8.2.0",
     "fs-extra": "^9.1.0",
     "jest": "^26.6.3",
@@ -29,10 +29,10 @@
   "devDependencies": {
     "@types/dotenv": "^8.2.0",
     "@types/fs-extra": "^8.1.1",
-    "@types/jest": "^26.0.22",
-    "@types/node": "^10.17.56",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^10.17.59",
     "@types/tar": "^4.0.4",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "prettier": "^2.2.1",
     "typescript": "~3.9.9"
   }
diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json
index cd6a63c999..052690fcd8 100644
--- a/packages/@jsii/java-runtime/package.json
+++ b/packages/@jsii/java-runtime/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@jsii/runtime": "^0.0.0",
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "jsii-build-tools": "^0.0.0",
     "typescript": "~3.9.9"
   }
diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json
index a252eacdb8..eb5454fa6f 100644
--- a/packages/@jsii/kernel/package.json
+++ b/packages/@jsii/kernel/package.json
@@ -39,17 +39,17 @@
     "@scope/jsii-calc-base": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/fs-extra": "^8.1.1",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.23",
     "@types/jest-expect-message": "^1.0.3",
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "@types/tar": "^4.0.4",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
     "prettier": "^2.2.1",
-    "ts-jest": "^26.5.4",
+    "ts-jest": "^26.5.5",
     "typescript": "~3.9.9"
   }
 }
diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json
index 575cb1999e..5e65f2b2e7 100644
--- a/packages/@jsii/runtime/package.json
+++ b/packages/@jsii/runtime/package.json
@@ -40,17 +40,17 @@
   "devDependencies": {
     "@scope/jsii-calc-base": "^0.0.0",
     "@scope/jsii-calc-lib": "^0.0.0",
-    "@types/jest": "^26.0.22",
-    "@types/node": "^10.17.56",
-    "eslint": "^7.24.0",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^10.17.59",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
     "prettier": "^2.2.1",
     "source-map-loader": "^2.0.1",
-    "ts-jest": "^26.5.4",
+    "ts-jest": "^26.5.5",
     "typescript": "~3.9.9",
-    "webpack": "^5.32.0",
+    "webpack": "^5.36.0",
     "webpack-cli": "^4.6.0"
   }
 }
diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json
index 0cd1e776de..58341b58c8 100644
--- a/packages/@jsii/spec/package.json
+++ b/packages/@jsii/spec/package.json
@@ -34,9 +34,9 @@
     "jsonschema": "^1.4.0"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.22",
-    "@types/node": "^10.17.56",
-    "eslint": "^7.24.0",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^10.17.59",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jsii-build-tools": "^0.0.0",
     "prettier": "^2.2.1",
diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json
index 5d903506b4..022672497d 100644
--- a/packages/@scope/jsii-calc-base-of-base/package.json
+++ b/packages/@scope/jsii-calc-base-of-base/package.json
@@ -30,7 +30,7 @@
     "test:update": "npm run build && UPDATE_DIFF=1 npm run test"
   },
   "devDependencies": {
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json
index 69812aad80..e713edd88b 100644
--- a/packages/@scope/jsii-calc-base/package.json
+++ b/packages/@scope/jsii-calc-base/package.json
@@ -35,7 +35,7 @@
     "@scope/jsii-calc-base-of-base": "^2.1.1"
   },
   "devDependencies": {
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json
index d3d3925a93..355bf2ee6a 100644
--- a/packages/@scope/jsii-calc-lib/package.json
+++ b/packages/@scope/jsii-calc-lib/package.json
@@ -39,7 +39,7 @@
     "@scope/jsii-calc-base-of-base": "^2.1.1"
   },
   "devDependencies": {
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json
index 16bdf66954..9642c0a62a 100644
--- a/packages/codemaker/package.json
+++ b/packages/codemaker/package.json
@@ -37,9 +37,9 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^8.1.1",
-    "@types/jest": "^26.0.22",
-    "@types/node": "^10.17.56",
-    "eslint": "^7.24.0",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^10.17.59",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "prettier": "^2.2.1",
     "typescript": "~3.9.9"
diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json
index b97265968f..b8bf2d605a 100644
--- a/packages/jsii-calc/package.json
+++ b/packages/jsii-calc/package.json
@@ -51,8 +51,8 @@
     "@scope/jsii-calc-lib": "^0.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.17.56",
-    "eslint": "^7.24.0",
+    "@types/node": "^10.17.59",
+    "eslint": "^7.25.0",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json
index 36c9eccd52..56cb459613 100644
--- a/packages/jsii-config/package.json
+++ b/packages/jsii-config/package.json
@@ -20,11 +20,11 @@
   },
   "devDependencies": {
     "@types/inquirer": "^7.3.1",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.23",
     "@types/jest-expect-message": "^1.0.3",
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "prettier": "^2.2.1",
diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json
index 516f744779..56cfcd00fb 100644
--- a/packages/jsii-diff/package.json
+++ b/packages/jsii-diff/package.json
@@ -42,12 +42,12 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^8.1.1",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.23",
     "@types/jest-expect-message": "^1.0.3",
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "@types/tar-fs": "^2.0.0",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "jsii": "^0.0.0",
diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json
index 6d09a3e125..d018efb9e8 100644
--- a/packages/jsii-pacmak/package.json
+++ b/packages/jsii-pacmak/package.json
@@ -58,17 +58,17 @@
     "@types/clone": "^2.1.0",
     "@types/commonmark": "^0.27.4",
     "@types/fs-extra": "^8.1.1",
-    "@types/jest": "^26.0.22",
-    "@types/node": "^10.17.56",
-    "@types/semver": "^7.3.4",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^10.17.59",
+    "@types/semver": "^7.3.5",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
     "prettier": "^2.2.1",
-    "ts-jest": "^26.5.4",
+    "ts-jest": "^26.5.5",
     "typescript": "~3.9.9"
   },
   "keywords": [
diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json
index c109f75965..0461963b33 100644
--- a/packages/jsii-reflect/package.json
+++ b/packages/jsii-reflect/package.json
@@ -43,10 +43,10 @@
   "devDependencies": {
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/fs-extra": "^8.1.1",
-    "@types/jest": "^26.0.22",
-    "@types/node": "^10.17.56",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^10.17.59",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json
index 201768b31f..54885ef174 100644
--- a/packages/jsii-rosetta/package.json
+++ b/packages/jsii-rosetta/package.json
@@ -18,16 +18,16 @@
   "devDependencies": {
     "@types/commonmark": "^0.27.4",
     "@types/fs-extra": "^8.1.1",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.23",
     "@types/mock-fs": "^4.13.0",
-    "@types/node": "^10.17.56",
+    "@types/node": "^10.17.59",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "memory-streams": "^0.1.3",
-    "mock-fs": "^4.13.0",
+    "mock-fs": "^4.14.0",
     "prettier": "^2.2.1"
   },
   "dependencies": {
@@ -35,7 +35,7 @@
     "commonmark": "^0.29.3",
     "fs-extra": "^9.1.0",
     "typescript": "~3.9.9",
-    "xmldom": "^0.5.0",
+    "xmldom": "^0.6.0",
     "yargs": "^16.2.0"
   },
   "license": "Apache-2.0",
diff --git a/packages/jsii/package.json b/packages/jsii/package.json
index 602134db5e..a7a2aece83 100644
--- a/packages/jsii/package.json
+++ b/packages/jsii/package.json
@@ -51,17 +51,17 @@
     "@types/clone": "^2.1.0",
     "@types/deep-equal": "^1.0.1",
     "@types/fs-extra": "^8.1.1",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^26.0.23",
     "@types/jest-expect-message": "^1.0.3",
-    "@types/node": "^10.17.56",
-    "@types/semver": "^7.3.4",
+    "@types/node": "^10.17.59",
+    "@types/semver": "^7.3.5",
     "@types/yargs": "^16.0.1",
     "clone": "^2.1.2",
-    "eslint": "^7.24.0",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "jsii-build-tools": "^0.0.0",
     "prettier": "^2.2.1",
-    "ts-jest": "^26.5.4"
+    "ts-jest": "^26.5.5"
   }
 }
diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json
index 7ed91f7d7b..7fdded99ea 100644
--- a/packages/oo-ascii-tree/package.json
+++ b/packages/oo-ascii-tree/package.json
@@ -31,9 +31,9 @@
     "package": "package-js"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.22",
-    "@types/node": "^10.17.56",
-    "eslint": "^7.24.0",
+    "@types/jest": "^26.0.23",
+    "@types/node": "^10.17.59",
+    "eslint": "^7.25.0",
     "jest": "^26.6.3",
     "jsii-build-tools": "^0.0.0",
     "prettier": "^2.2.1",
diff --git a/tools/jsii-build-tools/package.json b/tools/jsii-build-tools/package.json
index 1b4baaa445..78d7e23168 100644
--- a/tools/jsii-build-tools/package.json
+++ b/tools/jsii-build-tools/package.json
@@ -33,7 +33,7 @@
     "build": "chmod +x bin/*"
   },
   "dependencies": {
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.1",
     "diff": "^5.0.0"
   }
 }
diff --git a/tools/jsii-compliance/package.json b/tools/jsii-compliance/package.json
index 3e369ff6b2..c082bb6ba1 100644
--- a/tools/jsii-compliance/package.json
+++ b/tools/jsii-compliance/package.json
@@ -16,8 +16,8 @@
     "tablemark": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^10.17.56",
-    "eslint": "^7.24.0",
+    "@types/node": "^10.17.59",
+    "eslint": "^7.25.0",
     "prettier": "^2.2.1",
     "ts-node": "^9.1.1",
     "typescript": "~3.9.9"
diff --git a/yarn.lock b/yarn.lock
index 40df332fbe..d33334ac6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,25 +16,25 @@
   dependencies:
     "@babel/highlight" "^7.12.13"
 
-"@babel/compat-data@^7.13.12":
+"@babel/compat-data@^7.13.15":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
   integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
 
 "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.15.tgz#a6d40917df027487b54312202a06812c4f7792d0"
-  integrity sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a"
+  integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.13"
+    "@babel/generator" "^7.13.16"
+    "@babel/helper-compilation-targets" "^7.13.16"
     "@babel/helper-module-transforms" "^7.13.14"
-    "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.15"
+    "@babel/helpers" "^7.13.16"
+    "@babel/parser" "^7.13.16"
     "@babel/template" "^7.12.13"
     "@babel/traverse" "^7.13.15"
-    "@babel/types" "^7.13.14"
+    "@babel/types" "^7.13.16"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -42,21 +42,21 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.13.9":
-  version "7.13.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
-  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+"@babel/generator@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
+  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
   dependencies:
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.13.16"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-compilation-targets@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
-  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
+"@babel/helper-compilation-targets@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
+  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
   dependencies:
-    "@babel/compat-data" "^7.13.12"
+    "@babel/compat-data" "^7.13.15"
     "@babel/helper-validator-option" "^7.12.17"
     browserslist "^4.14.5"
     semver "^6.3.0"
@@ -151,14 +151,14 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
   integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
 
-"@babel/helpers@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
-  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
+"@babel/helpers@^7.13.16":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6"
+  integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==
   dependencies:
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/traverse" "^7.13.17"
+    "@babel/types" "^7.13.17"
 
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
   version "7.13.10"
@@ -169,10 +169,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.15":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.15.tgz#8e66775fb523599acb6a289e12929fa5ab0954d8"
-  integrity sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
+  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -259,9 +259,9 @@
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/runtime@^7.12.5", "@babel/runtime@^7.7.6":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
-  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.17.tgz#8966d1fc9593bf848602f0662d6b4d0069e3a7ec"
+  integrity sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -274,27 +274,26 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7"
-  integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
+  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
+    "@babel/generator" "^7.13.16"
     "@babel/helper-function-name" "^7.12.13"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.15"
-    "@babel/types" "^7.13.14"
+    "@babel/parser" "^7.13.16"
+    "@babel/types" "^7.13.17"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
-  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
+"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
+  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
   dependencies:
     "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -1218,9 +1217,9 @@
   integrity sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q==
 
 "@npmcli/git@^2.0.1":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.7.tgz#8582a037198042a989aaa637e6d42922454c1e3c"
-  integrity sha512-HUSqNDWYsTpboc7yV1C4yPd/jbaGXfWVmGoTyB+h3QQSKMpYPzTXLrqUMpz+LEA6Dt9usUeRtjytwcrfoBMJpg==
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.8.tgz#c38b54cdeec556ab641cf6161cc7825711a88d65"
+  integrity sha512-LPnzyBZ+1p7+JzHVwwKycMF8M3lr1ze3wxGRnxn/QxJtk++Y3prSJQrdBDGCxJyRpFsup6J3lrRBVYBhJVrM8Q==
   dependencies:
     "@npmcli/promise-spawn" "^1.3.2"
     lru-cache "^6.0.0"
@@ -1260,9 +1259,9 @@
     infer-owner "^1.0.4"
 
 "@npmcli/run-script@^1.8.2":
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.4.tgz#03ced92503a6fe948cbc0975ce39210bc5e824d6"
-  integrity sha512-Yd9HXTtF1JGDXZw0+SOn+mWLYS0e7bHBHVC/2C8yqs4wUrs/k8rwBSinD7rfk+3WG/MFGRZKxjyoD34Pch2E/A==
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.5.tgz#f250a0c5e1a08a792d775a315d0ff42fc3a51e1d"
+  integrity sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A==
   dependencies:
     "@npmcli/node-gyp" "^1.0.2"
     "@npmcli/promise-spawn" "^1.3.2"
@@ -1308,10 +1307,10 @@
     "@octokit/types" "^6.0.3"
     universal-user-agent "^6.0.0"
 
-"@octokit/openapi-types@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-6.0.0.tgz#7da8d7d5a72d3282c1a3ff9f951c8133a707480d"
-  integrity sha512-CnDdK7ivHkBtJYzWzZm7gEkanA7gKH6a09Eguz7flHw//GacPJLmkHA3f3N++MJmlxD1Fl+mB7B32EEpSCwztQ==
+"@octokit/openapi-types@^6.2.0":
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-6.2.0.tgz#6ea796b20c7111b9e422a4d607f796c1179622cd"
+  integrity sha512-V2vFYuawjpP5KUb8CPYsq20bXT4qnE8sH1QKpYqUlcNOntBiRr/VzGVvY0s+YXGgrVbFUVO4EI0VnHYSVBWfBg==
 
 "@octokit/plugin-enterprise-rest@^6.0.1":
   version "6.0.1"
@@ -1330,12 +1329,12 @@
   resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz#70a62be213e1edc04bb8897ee48c311482f9700d"
   integrity sha512-4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ==
 
-"@octokit/plugin-rest-endpoint-methods@5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.0.tgz#cf2cdeb24ea829c31688216a5b165010b61f9a98"
-  integrity sha512-Jc7CLNUueIshXT+HWt6T+M0sySPjF32mSFQAK7UfAg8qGeRI6OM1GSBxDLwbXjkqy2NVdnqCedJcP1nC785JYg==
+"@octokit/plugin-rest-endpoint-methods@5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.1.tgz#631b8d4edc6798b03489911252a25f2a4e58c594"
+  integrity sha512-vvWbPtPqLyIzJ7A4IPdTl+8IeuKAwMJ4LjvmqWOOdfSuqWQYZXq2CEd0hsnkidff2YfKlguzujHs/reBdAx8Sg==
   dependencies:
-    "@octokit/types" "^6.13.0"
+    "@octokit/types" "^6.13.1"
     deprecation "^2.3.1"
 
 "@octokit/request-error@^2.0.0", "@octokit/request-error@^2.0.5":
@@ -1359,22 +1358,22 @@
     node-fetch "^2.6.1"
     universal-user-agent "^6.0.0"
 
-"@octokit/rest@^18.1.0", "@octokit/rest@^18.5.2":
-  version "18.5.2"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.5.2.tgz#0369e554b7076e3749005147be94c661c7a5a74b"
-  integrity sha512-Kz03XYfKS0yYdi61BkL9/aJ0pP2A/WK5vF/syhu9/kY30J8He3P68hv9GRpn8bULFx2K0A9MEErn4v3QEdbZcw==
+"@octokit/rest@^18.1.0", "@octokit/rest@^18.5.3":
+  version "18.5.3"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.5.3.tgz#6a2e6006a87ebbc34079c419258dd29ec9ff659d"
+  integrity sha512-KPAsUCr1DOdLVbZJgGNuE/QVLWEaVBpFQwDAz/2Cnya6uW2wJ/P5RVGk0itx7yyN1aGa8uXm2pri4umEqG1JBA==
   dependencies:
     "@octokit/core" "^3.2.3"
     "@octokit/plugin-paginate-rest" "^2.6.2"
     "@octokit/plugin-request-log" "^1.0.2"
-    "@octokit/plugin-rest-endpoint-methods" "5.0.0"
+    "@octokit/plugin-rest-endpoint-methods" "5.0.1"
 
-"@octokit/types@^6.0.3", "@octokit/types@^6.11.0", "@octokit/types@^6.13.0", "@octokit/types@^6.7.1":
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.13.0.tgz#779e5b7566c8dde68f2f6273861dd2f0409480d0"
-  integrity sha512-W2J9qlVIU11jMwKHUp5/rbVUeErqelCsO5vW5PKNb7wAXQVUz87Rc+imjlEvpvbH8yUb+KHmv8NEjVZdsdpyxA==
+"@octokit/types@^6.0.3", "@octokit/types@^6.11.0", "@octokit/types@^6.13.1", "@octokit/types@^6.7.1":
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.14.0.tgz#587529b4a461d8b7621b99845718dc5c79281f52"
+  integrity sha512-43qHvDsPsKgNt4W4al3dyU6s2XZ7ZMsiiIw8rQcM9CyEo7g9W8/6m1W4xHuRqmEjTfG1U4qsE/E4Jftw1/Ak1g==
   dependencies:
-    "@octokit/openapi-types" "^6.0.0"
+    "@octokit/openapi-types" "^6.2.0"
 
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
@@ -1459,23 +1458,18 @@
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "7.2.9"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.9.tgz#5d26eadbb6d04a225967176399a18eff622da982"
-  integrity sha512-SdAAXZNvWfhtf3X3y1cbbCZhP3xyPh7mfTvzV6CgfWc/ZhiHpyr9bVroe2/RCHIf7gczaNcprhaBLsx0CCJHQA==
+  version "7.2.10"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.10.tgz#4b7a9368d46c0f8cd5408c23288a59aa2394d917"
+  integrity sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*":
+"@types/estree@*", "@types/estree@^0.0.47":
   version "0.0.47"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
   integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
 
-"@types/estree@^0.0.46":
-  version "0.0.46"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe"
-  integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==
-
 "@types/fs-extra@^8.1.1":
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
@@ -1524,10 +1518,10 @@
   dependencies:
     "@types/jest" "*"
 
-"@types/jest@*", "@types/jest@^26.0.22":
-  version "26.0.22"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.22.tgz#8308a1debdf1b807aa47be2838acdcd91e88fbe6"
-  integrity sha512-eeWwWjlqxvBxc4oQdkueW5OF/gtfSceKk4OnOAGlUSwS/liBRtZppbJuz1YkgbrbfGOoeBHun9fOvXnjNwrSOw==
+"@types/jest@*", "@types/jest@^26.0.23":
+  version "26.0.23"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7"
+  integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA==
   dependencies:
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
@@ -1566,15 +1560,20 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^14.14.33":
-  version "14.14.37"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
-  integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==
+"@types/node@*":
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
+  integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==
 
-"@types/node@^10.17.56":
-  version "10.17.56"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.56.tgz#010c9e047c3ff09ddcd11cbb6cf5912725cdc2b3"
-  integrity sha512-LuAa6t1t0Bfw4CuSR0UITsm1hP17YL+u82kfHGrHUWdhlBtH7sa7jGY5z7glGaIj/WDYDkRtgGd+KCjCzxBW1w==
+"@types/node@^10.17.59":
+  version "10.17.59"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.59.tgz#03f440ccf746a27f7da6e141e6cbae64681dbd2f"
+  integrity sha512-7Uc8IRrL8yZz5ti45RaFxpbU8TxlzdC3HvxV+hOWo1EyLsuKv/w7y0n+TwZzwL3vdx3oZ2k3ubxPq131hNtXyg==
+
+"@types/node@^14.14.33":
+  version "14.14.43"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
+  integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1591,10 +1590,10 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
   integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==
 
-"@types/semver@^7.3.4":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
-  integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
+"@types/semver@^7.3.5":
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.5.tgz#74deebbbcb1e86634dbf10a5b5e8798626f5a597"
+  integrity sha512-iotVxtCCsPLRAvxMFFgxL8HD2l4mAZ2Oin7/VJ2ooWO0VOK4EGOGmZWZn1uCq7RofR3I/1IOSjCHlFT71eVK0Q==
 
 "@types/stack-utils@^2.0.0":
   version "2.0.0"
@@ -1909,10 +1908,10 @@ acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.1.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.1.1.tgz#fb0026885b9ac9f48bac1e185e4af472971149ff"
-  integrity sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==
+acorn@^8.1.0, acorn@^8.2.1:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb"
+  integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg==
 
 add-stream@^1.0.0:
   version "1.0.0"
@@ -1959,9 +1958,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.1.0.tgz#45d5d3d36c7cdd808930cc3e603cf6200dbeb736"
-  integrity sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
+  integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -2338,13 +2337,13 @@ browser-process-hrtime@^1.0.0:
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 browserslist@^4.14.5:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.4.tgz#7ebf913487f40caf4637b892b268069951c35d58"
-  integrity sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==
+  version "4.16.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
+  integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
   dependencies:
-    caniuse-lite "^1.0.30001208"
+    caniuse-lite "^1.0.30001214"
     colorette "^1.2.2"
-    electron-to-chromium "^1.3.712"
+    electron-to-chromium "^1.3.719"
     escalade "^3.1.1"
     node-releases "^1.1.71"
 
@@ -2465,10 +2464,10 @@ camelcase@^6.0.0, camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001208:
-  version "1.0.30001208"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz#a999014a35cebd4f98c405930a057a0d75352eb9"
-  integrity sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==
+caniuse-lite@^1.0.30001214:
+  version "1.0.30001219"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b"
+  integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2496,10 +2495,10 @@ chalk@^2.0.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -3283,10 +3282,10 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.712:
-  version "1.3.716"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.716.tgz#cadedb3d07776c56990cedff1a75488afeeac2e0"
-  integrity sha512-yUWKAfpJH5ovgwIlNbBHioedAWolzTVl6tmMaXP1RmCMyYv+U+ukvo9gwA10mLW0eFbyW4n/oC4UIN12gTMn/w==
+electron-to-chromium@^1.3.719:
+  version "1.3.723"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz#52769a75635342a4db29af5f1e40bd3dad02c877"
+  integrity sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==
 
 emittery@^0.7.1:
   version "0.7.2"
@@ -3312,10 +3311,10 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.7.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz#525c5d856680fbd5052de453ac83e32049958b5c"
-  integrity sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==
+enhanced-resolve@^5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz#d9deae58f9d3773b6a111a5a46831da5be5c9ac0"
+  integrity sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -3436,10 +3435,10 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.2.0.tgz#78de77d63bca8e9e59dae75a614b5299925bb7b3"
-  integrity sha512-dWV9EVeSo2qodOPi1iBYU/x6F6diHv8uujxbxr77xExs3zTAlNXvVZKiyLsQGNz7yPV2K49JY5WjPzNIuDc2Bw==
+eslint-config-prettier@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
+  integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
 
 eslint-import-resolver-node@^0.3.4:
   version "0.3.4"
@@ -3487,10 +3486,10 @@ eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-prettier@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
-  integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==
+eslint-plugin-prettier@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"
+  integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
@@ -3519,10 +3518,10 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@^7.24.0:
-  version "7.24.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz#2e44fa62d93892bfdb100521f17345ba54b8513a"
-  integrity sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==
+eslint@^7.25.0:
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
+  integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
   dependencies:
     "@babel/code-frame" "7.12.11"
     "@eslint/eslintrc" "^0.4.0"
@@ -4059,9 +4058,9 @@ get-stream@^5.0.0:
     pump "^3.0.0"
 
 get-stream@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718"
-  integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
@@ -4442,16 +4441,16 @@ ini@^1.3.2, ini@^1.3.4:
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 init-package-json@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.2.tgz#d81a7e6775af9b618f20bba288e440b8d1ce05f3"
-  integrity sha512-PO64kVeArePvhX7Ff0jVWkpnE1DfGRvaWcStYrPugcJz9twQGYibagKJuIMHCX7ENcp0M6LJlcjLBuLD5KeJMg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-2.0.3.tgz#c8ae4f2a4ad353bcbc089e5ffe98a8f1a314e8fd"
+  integrity sha512-tk/gAgbMMxR6fn1MgMaM1HpU1ryAmBWWitnxG5OhuNXeX0cbpbgV5jA4AIpQJVNoyOfOevTtO6WX+rPs+EFqaQ==
   dependencies:
     glob "^7.1.1"
-    npm-package-arg "^8.1.0"
+    npm-package-arg "^8.1.2"
     promzard "^0.3.0"
     read "~1.0.1"
-    read-package-json "^3.0.0"
-    semver "^7.3.2"
+    read-package-json "^3.0.1"
+    semver "^7.3.5"
     validate-npm-package-license "^3.0.4"
     validate-npm-package-name "^3.0.0"
 
@@ -4545,9 +4544,9 @@ is-ci@^2.0.0:
     ci-info "^2.0.0"
 
 is-core-module@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
+  integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
   dependencies:
     has "^1.0.3"
 
@@ -5519,25 +5518,25 @@ levn@~0.3.0:
     type-check "~0.3.2"
 
 libnpmaccess@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.1.tgz#17e842e03bef759854adf6eb6c2ede32e782639f"
-  integrity sha512-ZiAgvfUbvmkHoMTzdwmNWCrQRsDkOC+aM5BDfO0C9aOSwF3R1LdFDBD+Rer1KWtsoQYO35nXgmMR7OUHpDRxyA==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.2.tgz#781832fb7ccb867b26343a75a85ad9c43e50406e"
+  integrity sha512-avXtJibZuGap0/qADDYqb9zdpgzVu/yG5+tl2sTRa7MCkDNv2ZlGwCYI0r6/+tmqXPj0iB9fKexHz426vB326w==
   dependencies:
     aproba "^2.0.0"
     minipass "^3.1.1"
-    npm-package-arg "^8.0.0"
-    npm-registry-fetch "^9.0.0"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^10.0.0"
 
 libnpmpublish@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.0.tgz#ad6413914e0dfd78df868ce14ba3d3a4cc8b385b"
-  integrity sha512-2RwYXRfZAB1x/9udKpZmqEzSqNd7ouBRU52jyG14/xG8EF+O9A62d7/XVR3iABEQHf1iYhkm0Oq9iXjrL3tsXA==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.1.tgz#08ca2cbb5d7f6be1ce4f3f9c49b3822682bcf166"
+  integrity sha512-hZCrZ8v4G9YH3DxpIyBdob25ijD5v5LNzRbwsej4pPDopjdcLLj1Widl+BUeFa7D0ble1JYL4F3owjLJqiA8yA==
   dependencies:
-    normalize-package-data "^3.0.0"
-    npm-package-arg "^8.1.0"
-    npm-registry-fetch "^9.0.0"
+    normalize-package-data "^3.0.2"
+    npm-package-arg "^8.1.2"
+    npm-registry-fetch "^10.0.0"
     semver "^7.1.3"
-    ssri "^8.0.0"
+    ssri "^8.0.1"
 
 lines-and-columns@^1.1.6:
   version "1.1.6"
@@ -5997,10 +5996,10 @@ mkdirp@^0.5.0, mkdirp@^0.5.1:
   dependencies:
     minimist "^1.2.5"
 
-mock-fs@^4.13.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.13.0.tgz#31c02263673ec3789f90eb7b6963676aa407a598"
-  integrity sha512-DD0vOdofJdoaRNtnWcrXe6RQbpHkPPmtqGq14uRX0F8ZKJ5nv89CVTYl/BZdppDxBDaV0hl75htg3abpEWlPZA==
+mock-fs@^4.14.0:
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.14.0.tgz#ce5124d2c601421255985e6e94da80a7357b1b18"
+  integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw==
 
 modify-values@^1.0.0:
   version "1.0.1"
@@ -6167,7 +6166,7 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@^3.0.0:
+normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
   integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
@@ -6195,9 +6194,9 @@ normalize-url@^3.3.0:
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
 npm-bundled@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
@@ -6256,6 +6255,19 @@ npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
     npm-package-arg "^8.1.2"
     semver "^7.3.4"
 
+npm-registry-fetch@^10.0.0:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.1.tgz#97bc7a0fca5e8f76cc5162185b8de8caa8bea639"
+  integrity sha512-F6a3l+ffCQ7hvvN16YG5bpm1rPZntCg66PLHDQ1apWJPOCUVHoKnL2w5fqEaTVhp42dmossTyXeR7hTGirfXrg==
+  dependencies:
+    lru-cache "^6.0.0"
+    make-fetch-happen "^8.0.9"
+    minipass "^3.1.3"
+    minipass-fetch "^1.3.0"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.0.0"
+    npm-package-arg "^8.0.0"
+
 npm-registry-fetch@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661"
@@ -6329,9 +6341,9 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-inspect@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
-  integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30"
+  integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==
 
 object-is@^1.1.4:
   version "1.1.5"
@@ -6559,9 +6571,9 @@ p-waterfall@^2.1.1:
     p-reduce "^2.0.0"
 
 pacote@^11.2.6:
-  version "11.3.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.1.tgz#6ce95dd230db475cbd8789fd1f986bec51b4bf7c"
-  integrity sha512-TymtwoAG12cczsJIrwI/euOQKtjrQHlD0k0oyt9QSmZGpqa+KdlxKdWR/YUjYizkixaVyztxt/Wsfo8bL3A6Fg==
+  version "11.3.3"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.3.tgz#d7d6091464f77c09691699df2ded13ab906b3e68"
+  integrity sha512-GQxBX+UcVZrrJRYMK2HoG+gPeSUX/rQhnbPkkGrCYa4n2F/bgClFPaMm0nsdnYrxnmUy85uMHoFXZ0jTD0drew==
   dependencies:
     "@npmcli/git" "^2.0.1"
     "@npmcli/installed-package-contents" "^1.0.6"
@@ -6576,7 +6588,7 @@ pacote@^11.2.6:
     npm-package-arg "^8.0.1"
     npm-packlist "^2.1.4"
     npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^9.0.0"
+    npm-registry-fetch "^10.0.0"
     promise-retry "^2.0.1"
     read-package-json-fast "^2.0.1"
     rimraf "^3.0.2"
@@ -6958,7 +6970,7 @@ read-package-json@^2.0.0:
     normalize-package-data "^2.0.0"
     npm-normalize-package-bin "^1.0.0"
 
-read-package-json@^3.0.0:
+read-package-json@^3.0.0, read-package-json@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-3.0.1.tgz#c7108f0b9390257b08c21e3004d2404c806744b9"
   integrity sha512-aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng==
@@ -7562,9 +7574,9 @@ socks-proxy-agent@^5.0.0:
     socks "^2.3.3"
 
 socks@^2.3.3:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.0.tgz#6b984928461d39871b3666754b9000ecf39dfac2"
-  integrity sha512-mNmr9owlinMplev0Wd7UHFlqI4ofnBnNzFuzrm63PPaHgbkqCFe4T5LzwKmtQ/f2tX0NTpcdVLyD/FHxFBstYw==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
+  integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
   dependencies:
     ip "^1.1.5"
     smart-buffer "^4.1.0"
@@ -7980,19 +7992,17 @@ symbol-tree@^3.2.4:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 table@^6.0.4:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.1.0.tgz#676a0cfb206008b59e783fcd94ef8ba7d67d966c"
-  integrity sha512-T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ==
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e"
+  integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==
   dependencies:
     ajv "^8.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
     lodash.clonedeep "^4.5.0"
     lodash.flatten "^4.4.0"
     lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
+    strip-ansi "^6.0.0"
 
 tablemark@^2.0.0:
   version "2.0.0"
@@ -8069,9 +8079,9 @@ terser-webpack-plugin@^5.1.1:
     terser "^5.5.1"
 
 terser@^5.5.1:
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.1.tgz#a48eeac5300c0a09b36854bf90d9c26fb201973c"
-  integrity sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693"
+  integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==
   dependencies:
     commander "^2.20.0"
     source-map "~0.7.2"
@@ -8209,10 +8219,10 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
-ts-jest@^26.5.4:
-  version "26.5.4"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.4.tgz#207f4c114812a9c6d5746dd4d1cdf899eafc9686"
-  integrity sha512-I5Qsddo+VTm94SukBJ4cPimOoFZsYTeElR2xy6H2TOVs+NsvgYglW8KuQgKoApOKuaU/Ix/vrF9ebFZlb5D2Pg==
+ts-jest@^26.5.5:
+  version "26.5.5"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.5.tgz#e40481b6ee4dd162626ba481a2be05fa57160ea5"
+  integrity sha512-7tP4m+silwt1NHqzNRAPjW1BswnAhopTdc2K3HEkRZjF0ZG2F/e/ypVH0xiZIMfItFtD3CX0XFbwPzp9fIEUVg==
   dependencies:
     bs-logger "0.x"
     buffer-from "1.x"
@@ -8603,20 +8613,20 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@^5.32.0:
-  version "5.32.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.32.0.tgz#f013932d778dad81bd51292d0ea00865056dc22c"
-  integrity sha512-jB9PrNMFnPRiZGnm/j3qfNqJmP3ViRzkuQMIf8za0dgOYvSLi/cgA+UEEGvik9EQHX1KYyGng5PgBTTzGrH9xg==
+webpack@^5.36.0:
+  version "5.36.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.36.0.tgz#d008da31b721f8fecce88ef2adaf1b16dc2161d1"
+  integrity sha512-HdOhLXClUEwTnzQnzpSG9iL00ej23ojvfnGpF49ba0MkuAT2q+WhQilHFFJHOIVRBqbzakQ1vCWQV2K+QLX0Qw==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
-    "@types/estree" "^0.0.46"
+    "@types/estree" "^0.0.47"
     "@webassemblyjs/ast" "1.11.0"
     "@webassemblyjs/wasm-edit" "1.11.0"
     "@webassemblyjs/wasm-parser" "1.11.0"
-    acorn "^8.0.4"
+    acorn "^8.2.1"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.7.0"
+    enhanced-resolve "^5.8.0"
     es-module-lexer "^0.4.0"
     eslint-scope "^5.1.1"
     events "^3.2.0"
@@ -8804,9 +8814,9 @@ write-pkg@^4.0.0:
     write-json-file "^3.2.0"
 
 ws@^7.4.4:
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
-  integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
+  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
@@ -8823,10 +8833,10 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmldom@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e"
-  integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==
+xmldom@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
+  integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
 
 xtend@~4.0.1:
   version "4.0.2"

From 650b7cb70df3a275fceeaaed4a2de71febea1c5e Mon Sep 17 00:00:00 2001
From: Romain Marcadier <rmuller@amazon.com>
Date: Mon, 3 May 2021 10:45:19 +0200
Subject: [PATCH 10/28] refactor(go): move jsii runtime functions into separate
 module (#2802)

This makes it clearer which functions are intended for direct customer
use versus those that are meant to be used only by the generated code.

The older locations remain, but were marked as `Deprecated:`, they
will be removed in a subsequent release (before GA).

Fixes #2721



---

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
---
 .../go-runtime/jsii-runtime-go/deprecated.go  | 130 ++++++++++++++++++
 .../@jsii/go-runtime/jsii-runtime-go/doc.go   |   7 +-
 .../go-runtime/jsii-runtime-go/helpers.go     |  51 +++++++
 .../{runtime_test.go => helpers_test.go}      |   0
 .../@jsii/go-runtime/jsii-runtime-go/jsii.go  |  10 ++
 .../go-runtime/jsii-runtime-go/runtime/doc.go |   5 +
 .../{ => runtime}/overrides_reflect_test.go   |   2 +-
 .../jsii-runtime-go/{ => runtime}/runtime.go  |  67 +--------
 .../jsii-pacmak/lib/targets/go/package.ts     |   3 +-
 .../lib/targets/go/runtime/constants.ts       |   1 +
 .../__snapshots__/examples.test.ts.snap       |  12 +-
 .../prerelease-identifiers.test.ts.snap       |   8 +-
 .../__snapshots__/target-go.test.ts.snap      | 124 ++++++++---------
 13 files changed, 279 insertions(+), 141 deletions(-)
 create mode 100644 packages/@jsii/go-runtime/jsii-runtime-go/deprecated.go
 create mode 100644 packages/@jsii/go-runtime/jsii-runtime-go/helpers.go
 rename packages/@jsii/go-runtime/jsii-runtime-go/{runtime_test.go => helpers_test.go} (100%)
 create mode 100644 packages/@jsii/go-runtime/jsii-runtime-go/jsii.go
 create mode 100644 packages/@jsii/go-runtime/jsii-runtime-go/runtime/doc.go
 rename packages/@jsii/go-runtime/jsii-runtime-go/{ => runtime}/overrides_reflect_test.go (98%)
 rename packages/@jsii/go-runtime/jsii-runtime-go/{ => runtime}/runtime.go (86%)

diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/deprecated.go b/packages/@jsii/go-runtime/jsii-runtime-go/deprecated.go
new file mode 100644
index 0000000000..06feadc1e3
--- /dev/null
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/deprecated.go
@@ -0,0 +1,130 @@
+package jsii
+
+import (
+	"github.com/aws/jsii-runtime-go/internal/api"
+	"github.com/aws/jsii-runtime-go/runtime"
+	"reflect"
+)
+
+// Deprecated: FQN represents a fully-qualified type name in the jsii type system.
+type FQN api.FQN
+
+// Deprecated: Member is a runtime descriptor for a class or interface member
+type Member interface {
+	asRuntimeMember() runtime.Member
+}
+
+// Deprecated: MemberMethod is a runtime descriptor for a class method (implementation of Member)
+type MemberMethod api.MethodOverride
+
+func (m MemberMethod) asRuntimeMember() runtime.Member {
+	return runtime.MemberMethod(m)
+}
+
+// Deprecated: MemberProperty is a runtime descriptor for a class or interface property (implementation of Member)
+type MemberProperty api.PropertyOverride
+
+func (m MemberProperty) asRuntimeMember() runtime.Member {
+	return runtime.MemberProperty(m)
+}
+
+// Deprecated: Load ensures a npm package is loaded in the jsii kernel.
+func Load(name string, version string, tarball []byte) {
+	runtime.Load(name, version, tarball)
+}
+
+// Deprecated: RegisterClass associates a class fully qualified name to the specified class
+// interface, member list, and proxy maker function. Panics if class is not a go
+// interface, or if the provided fqn was already used to register a different type.
+func RegisterClass(fqn FQN, class reflect.Type, members []Member, maker func() interface{}) {
+	rm := make([]runtime.Member, len(members))
+	for i, m := range members {
+		rm[i] = m.asRuntimeMember()
+	}
+	runtime.RegisterClass(runtime.FQN(fqn), class, rm, maker)
+}
+
+// Deprecated: RegisterEnum associates an enum's fully qualified name to the specified enum
+// type, and members. Panics if enum is not a reflect.String type, any value in
+// the provided members map is of a type other than enum, or if the provided
+// fqn was already used to register a different type.
+func RegisterEnum(fqn FQN, enum reflect.Type, members map[string]interface{}) {
+	runtime.RegisterEnum(runtime.FQN(fqn), enum, members)
+}
+
+// Deprecated: RegisterInterface associates an interface's fully qualified name to the
+// specified interface type, member list, and proxy maker function. Panics if iface is not
+// an interface, or if the provided fqn was already used to register a different type.
+func RegisterInterface(fqn FQN, iface reflect.Type, members []Member, maker func() interface{}) {
+	rm := make([]runtime.Member, len(members))
+	for i, m := range members {
+		rm[i] = m.asRuntimeMember()
+	}
+	runtime.RegisterInterface(runtime.FQN(fqn), iface, rm, maker)
+}
+
+// Deprecated: RegisterStruct associates a struct's fully qualified name to the specified
+// struct type. Panics if strct is not a struct, or if the provided fqn was
+// already used to register a different type.
+func RegisterStruct(fqn FQN, strct reflect.Type) {
+	runtime.RegisterStruct(runtime.FQN(fqn), strct)
+}
+
+// Deprecated: InitJsiiProxy initializes a jsii proxy instance at the provided pointer.
+// Panics if the pointer cannot be initialized to a proxy instance (i.e: the
+// element of it is not a registered jsii interface or class type).
+func InitJsiiProxy(ptr interface{}) {
+	runtime.InitJsiiProxy(ptr)
+}
+
+// Deprecated: Create will construct a new JSII object within the kernel runtime. This is
+// called by jsii object constructors.
+func Create(fqn FQN, args []interface{}, inst interface{}) {
+	runtime.Create(runtime.FQN(fqn), args, inst)
+}
+
+// Deprecated: Invoke will call a method on a jsii class instance. The response will be
+// decoded into the expected return type for the method being called.
+func Invoke(obj interface{}, method string, args []interface{}, ret interface{}) {
+	runtime.Invoke(obj, method, args, ret)
+}
+
+// Deprecated: InvokeVoid will call a void method on a jsii class instance.
+func InvokeVoid(obj interface{}, method string, args []interface{}) {
+	runtime.InvokeVoid(obj, method, args)
+}
+
+// Deprecated: StaticInvoke will call a static method on a given jsii class. The response
+// will be decoded into the expected return type for the method being called.
+func StaticInvoke(fqn FQN, method string, args []interface{}, ret interface{}) {
+	runtime.StaticInvoke(runtime.FQN(fqn), method, args, ret)
+}
+
+// Deprecated: StaticInvokeVoid will call a static void method on a given jsii class.
+func StaticInvokeVoid(fqn FQN, method string, args []interface{}) {
+	runtime.StaticInvokeVoid(runtime.FQN(fqn), method, args)
+}
+
+// Deprecated: Get reads a property value on a given jsii class instance. The response
+// should be decoded into the expected type of the property being read.
+func Get(obj interface{}, property string, ret interface{}) {
+	runtime.Get(obj, property, ret)
+}
+
+// Deprecated: StaticGet reads a static property value on a given jsii class. The response
+// should be decoded into the expected type of the property being read.
+func StaticGet(fqn FQN, property string, ret interface{}) {
+	runtime.StaticGet(runtime.FQN(fqn), property, ret)
+}
+
+// Deprecated: Set writes a property on a given jsii class instance. The value should match
+// the type of the property being written, or the jsii kernel will crash.
+func Set(obj interface{}, property string, value interface{}) {
+	runtime.Set(obj, property, value)
+}
+
+// Deprecated: StaticSet writes a static property on a given jsii class. The value should
+// match the type of the property being written, or the jsii kernel will crash.
+func StaticSet(fqn FQN, property string, value interface{}) {
+	runtime.StaticSet(runtime.FQN(fqn), property, value)
+}
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/doc.go b/packages/@jsii/go-runtime/jsii-runtime-go/doc.go
index 8e7fcd37e6..0158937ad8 100644
--- a/packages/@jsii/go-runtime/jsii-runtime-go/doc.go
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/doc.go
@@ -1,4 +1,5 @@
-// Package jsii provides the APIs used by code generated by the jsii-pacmak tool
-// to interact with the @jsii/kernel process. It is not intended for users to
-// directly interact with, and doing so could result in incorrect behavior.
+// Package jsii provides utilities that user code can leverage to facilitate
+// working with libraries generated by the `jsii-pacmak` tool. This includes
+// type conversion helpers as well as utilities to manage the runtime process'
+// lifecycle.
 package jsii
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/helpers.go b/packages/@jsii/go-runtime/jsii-runtime-go/helpers.go
new file mode 100644
index 0000000000..8228f9a41d
--- /dev/null
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/helpers.go
@@ -0,0 +1,51 @@
+package jsii
+
+import "time"
+
+// Bool obtains a pointer to the provided bool.
+func Bool(v bool) *bool { return &v }
+
+// Bools obtains a pointer to a slice of pointers to all the provided booleans.
+func Bools(v ...bool) *[]*bool {
+	slice := make([]*bool, len(v))
+	for i := 0; i < len(v); i++ {
+		slice[i] = Bool(v[i])
+	}
+	return &slice
+}
+
+// Number obtains a pointer to the provided float64.
+func Number(v float64) *float64 { return &v }
+
+// Numbers obtains a pointer to a slice of pointers to all the provided numbers.
+func Numbers(v ...float64) *[]*float64 {
+	slice := make([]*float64, len(v))
+	for i := 0; i < len(v); i++ {
+		slice[i] = Number(v[i])
+	}
+	return &slice
+}
+
+// String obtains a pointer to the provided string.
+func String(v string) *string { return &v }
+
+// Strings obtains a pointer to a slice of pointers to all the provided strings.
+func Strings(v ...string) *[]*string {
+	slice := make([]*string, len(v))
+	for i := 0; i < len(v); i++ {
+		slice[i] = String(v[i])
+	}
+	return &slice
+}
+
+// Time obtains a pointer to the provided time.Time.
+func Time(v time.Time) *time.Time { return &v }
+
+// Times obtains a pointer to a slice of pointers to all the provided time.Time.
+func Times(v ...time.Time) *[]*time.Time {
+	slice := make([]*time.Time, len(v))
+	for i := 0; i < len(v); i++ {
+		slice[i] = Time(v[i])
+	}
+	return &slice
+}
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/runtime_test.go b/packages/@jsii/go-runtime/jsii-runtime-go/helpers_test.go
similarity index 100%
rename from packages/@jsii/go-runtime/jsii-runtime-go/runtime_test.go
rename to packages/@jsii/go-runtime/jsii-runtime-go/helpers_test.go
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/jsii.go b/packages/@jsii/go-runtime/jsii-runtime-go/jsii.go
new file mode 100644
index 0000000000..2203f069c6
--- /dev/null
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/jsii.go
@@ -0,0 +1,10 @@
+package jsii
+
+import "github.com/aws/jsii-runtime-go/internal/kernel"
+
+// Close finalizes the runtime process, signalling the end of the execution to
+// the jsii kernel process, and waiting for graceful termination. The best
+// practice is to defer call thins at the beginning of the "main" function.
+func Close() {
+	kernel.CloseClient()
+}
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/runtime/doc.go b/packages/@jsii/go-runtime/jsii-runtime-go/runtime/doc.go
new file mode 100644
index 0000000000..b261382008
--- /dev/null
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/runtime/doc.go
@@ -0,0 +1,5 @@
+// Package runtime provides the APIs used by code generated by the `jsii-pacmak`
+// tool to interact with the `@jsii/kernel` process. It is not intended for
+// users to directly interact with, and doing so could result in incorrect
+// behavior.
+package runtime
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/overrides_reflect_test.go b/packages/@jsii/go-runtime/jsii-runtime-go/runtime/overrides_reflect_test.go
similarity index 98%
rename from packages/@jsii/go-runtime/jsii-runtime-go/overrides_reflect_test.go
rename to packages/@jsii/go-runtime/jsii-runtime-go/runtime/overrides_reflect_test.go
index bfa1db7861..0a42985e6c 100644
--- a/packages/@jsii/go-runtime/jsii-runtime-go/overrides_reflect_test.go
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/runtime/overrides_reflect_test.go
@@ -1,4 +1,4 @@
-package jsii
+package runtime
 
 import (
 	"reflect"
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/runtime.go b/packages/@jsii/go-runtime/jsii-runtime-go/runtime/runtime.go
similarity index 86%
rename from packages/@jsii/go-runtime/jsii-runtime-go/runtime.go
rename to packages/@jsii/go-runtime/jsii-runtime-go/runtime/runtime.go
index 5eadf56461..94ef2c2ba2 100644
--- a/packages/@jsii/go-runtime/jsii-runtime-go/runtime.go
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/runtime/runtime.go
@@ -1,13 +1,11 @@
-package jsii
+package runtime
 
 import (
 	"fmt"
-	"reflect"
-	"strings"
-	"time"
-
 	"github.com/aws/jsii-runtime-go/internal/api"
 	"github.com/aws/jsii-runtime-go/internal/kernel"
+	"reflect"
+	"strings"
 )
 
 // FQN represents a fully-qualified type name in the jsii type system.
@@ -433,62 +431,3 @@ func getMethodOverridesRec(ptr interface{}, basePrefix string, cache map[string]
 		}
 	}
 }
-
-// Close finalizes the runtime process, signalling the end of the execution to
-// the jsii kernel process, and waiting for graceful termination. The best
-// practice is to defer call thins at the beginning of the "main" function.
-//
-// If a jsii client is used *after* Close was called, a new jsii kernel process
-// will be initialized, and Close should be called again to correctly finalize
-// that, too. This behavior is intended for use in unit/integration tests.
-func Close() {
-	kernel.CloseClient()
-}
-
-// Bool obtains a pointer to the provided bool.
-func Bool(v bool) *bool { return &v }
-
-// Bools obtains a pointer to a slice of pointers to all the provided booleans.
-func Bools(v ...bool) *[]*bool {
-	slice := make([]*bool, len(v))
-	for i := 0; i < len(v); i++ {
-		slice[i] = Bool(v[i])
-	}
-	return &slice
-}
-
-// Number obtains a pointer to the provided float64.
-func Number(v float64) *float64 { return &v }
-
-// Numbers obtains a pointer to a slice of pointers to all the provided numbers.
-func Numbers(v ...float64) *[]*float64 {
-	slice := make([]*float64, len(v))
-	for i := 0; i < len(v); i++ {
-		slice[i] = Number(v[i])
-	}
-	return &slice
-}
-
-// String obtains a pointer to the provided string.
-func String(v string) *string { return &v }
-
-// Strings obtains a pointer to a slice of pointers to all the provided strings.
-func Strings(v ...string) *[]*string {
-	slice := make([]*string, len(v))
-	for i := 0; i < len(v); i++ {
-		slice[i] = String(v[i])
-	}
-	return &slice
-}
-
-// Time obtains a pointer to the provided time.Time.
-func Time(v time.Time) *time.Time { return &v }
-
-// Times obtains a pointer to a slice of pointers to all the provided time.Time.
-func Times(v ...time.Time) *[]*time.Time {
-	slice := make([]*time.Time, len(v))
-	for i := 0; i < len(v); i++ {
-		slice[i] = Time(v[i])
-	}
-	return &slice
-}
diff --git a/packages/jsii-pacmak/lib/targets/go/package.ts b/packages/jsii-pacmak/lib/targets/go/package.ts
index 7aad56afc8..b81031e544 100644
--- a/packages/jsii-pacmak/lib/targets/go/package.ts
+++ b/packages/jsii-pacmak/lib/targets/go/package.ts
@@ -10,6 +10,7 @@ import { ReadmeFile } from './readme-file';
 import {
   JSII_RT_ALIAS,
   JSII_RT_MODULE_NAME,
+  JSII_RT_PACKAGE_NAME,
   JSII_INIT_PACKAGE,
   JSII_INIT_FUNC,
   JSII_INIT_ALIAS,
@@ -559,7 +560,7 @@ interface ImportedModule {
 
 const JSII_RT_MODULE: ImportedModule = {
   alias: JSII_RT_ALIAS,
-  module: JSII_RT_MODULE_NAME,
+  module: JSII_RT_PACKAGE_NAME,
 };
 const GO_REFLECT: ImportedModule = { module: 'reflect' };
 
diff --git a/packages/jsii-pacmak/lib/targets/go/runtime/constants.ts b/packages/jsii-pacmak/lib/targets/go/runtime/constants.ts
index 1d9b4275c6..0402ce2174 100644
--- a/packages/jsii-pacmak/lib/targets/go/runtime/constants.ts
+++ b/packages/jsii-pacmak/lib/targets/go/runtime/constants.ts
@@ -1,5 +1,6 @@
 // JSII go runtime module name
 export const JSII_RT_MODULE_NAME = 'github.com/aws/jsii-runtime-go';
+export const JSII_RT_PACKAGE_NAME = `${JSII_RT_MODULE_NAME}/runtime`;
 export const JSII_RT_ALIAS = '_jsii_';
 
 // Jsii initializer package name
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
index 9a240d6f85..aa2487761b 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
@@ -396,7 +396,7 @@ package jsii
 import (
 	_      "embed"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 //go:embed testpkg-0.0.1.tgz
@@ -417,7 +417,7 @@ package testpkg
 
 import (
 	_init_ "example.test/demo/testpkg/jsii"
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 type Baz struct {
@@ -462,7 +462,7 @@ package testpkg
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -1730,7 +1730,7 @@ package jsii
 import (
 	_      "embed"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 //go:embed testpkg-0.0.1.tgz
@@ -1751,7 +1751,7 @@ package testpkg
 
 import (
 	_init_ "example.test/demo/testpkg/jsii"
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 type Namespace1 interface {
@@ -1928,7 +1928,7 @@ package testpkg
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap
index bdcfb16e5b..d70a563e8c 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.ts.snap
@@ -149,7 +149,7 @@ import (
 	bar    "bar/v2/jsii"
 	_      "embed"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 //go:embed foo-1.2.3.tgz
@@ -658,7 +658,7 @@ import (
 	bar    "bar/v4/jsii"
 	_      "embed"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 //go:embed foo-1.2.3.tgz
@@ -1163,7 +1163,7 @@ package jsii
 import (
 	_      "embed"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 //go:embed foo-2.0.0-rc.42.tgz
@@ -1649,7 +1649,7 @@ package jsii
 import (
 	_      "embed"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 //go:embed foo-4.5.6-pre.1337.tgz
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
index a757769ea9..45e9116be6 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
@@ -254,7 +254,7 @@ exports[`Generated code for "@scope/jsii-calc-base": <outDir>/go/jcb/jcb.go 1`]
 package jcb
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jcb/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jcb/internal"
@@ -375,7 +375,7 @@ package jcb
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -428,7 +428,7 @@ package jsii
 import (
 	_                       "embed"
 
-	_jsii_                  "github.com/aws/jsii-runtime-go"
+	_jsii_                  "github.com/aws/jsii-runtime-go/runtime"
 
 	scopejsiicalcbaseofbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2/jsii"
 )
@@ -702,7 +702,7 @@ package jsii
 import (
 	_      "embed"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 //go:embed scope-jsii-calc-base-of-base-2.1.1.tgz
@@ -724,7 +724,7 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": <outDir>/go/scopejs
 package scopejsiicalcbaseofbase
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2/jsii"
 )
 
@@ -832,7 +832,7 @@ package scopejsiicalcbaseofbase
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -1112,7 +1112,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/go/scopejsiicalclib
 package customsubmodulename
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii"
 )
 
@@ -1271,7 +1271,7 @@ package customsubmodulename
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -1358,7 +1358,7 @@ package jsii
 import (
 	_                       "embed"
 
-	_jsii_                  "github.com/aws/jsii-runtime-go"
+	_jsii_                  "github.com/aws/jsii-runtime-go/runtime"
 
 	jcb                     "github.com/aws/jsii/jsii-calc/go/jcb/jsii"
 	scopejsiicalcbaseofbase "github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2/jsii"
@@ -1387,7 +1387,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": <outDir>/go/scopejsiicalclib
 package scopejsiicalclib
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jcb"
@@ -1811,7 +1811,7 @@ package scopejsiicalclib
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -2296,7 +2296,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/composition/compos
 package composition
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/composition/internal"
@@ -2453,7 +2453,7 @@ package composition
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -2500,7 +2500,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/derivedclasshasnop
 package derivedclasshasnoproperties
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -2620,7 +2620,7 @@ package derivedclasshasnoproperties
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -2668,7 +2668,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/interfaceinnamespa
 package interfaceinnamespaceincludesclasses
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -2738,7 +2738,7 @@ package interfaceinnamespaceincludesclasses
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -2777,7 +2777,7 @@ package interfaceinnamespaceonlyinterface
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -2813,7 +2813,7 @@ package jsii
 import (
 	_                "embed"
 
-	_jsii_           "github.com/aws/jsii-runtime-go"
+	_jsii_           "github.com/aws/jsii-runtime-go/runtime"
 
 	jcb              "github.com/aws/jsii/jsii-calc/go/jcb/jsii"
 	scopejsiicalclib "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii"
@@ -2844,7 +2844,7 @@ package jsiicalc
 import (
 	"time"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jcb"
@@ -14227,7 +14227,7 @@ package jsiicalc
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -16412,7 +16412,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/module2530/module2
 package module2530
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -16479,7 +16479,7 @@ package module2530
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -16501,7 +16501,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/module2617/module2
 package module2617
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -16542,7 +16542,7 @@ package module2617
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -16572,7 +16572,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/module2647/module2
 package module2647
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jcb"
@@ -16669,7 +16669,7 @@ package module2647
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -16696,7 +16696,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/module2689/methods
 package methods
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jcb"
@@ -16762,7 +16762,7 @@ package methods
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -16792,7 +16792,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/module2689/props/p
 package props
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jcb"
@@ -16863,7 +16863,7 @@ package props
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -16886,7 +16886,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/module2689/retval/
 package retval
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jcb"
@@ -16962,7 +16962,7 @@ package retval
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17003,7 +17003,7 @@ package structs
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17039,7 +17039,7 @@ package submodule1
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17074,7 +17074,7 @@ package submodule2
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17094,7 +17094,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/module2700/module2
 package module2700
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -17274,7 +17274,7 @@ package module2700
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17335,7 +17335,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/module2702/module2
 package module2702
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jcb"
@@ -17548,7 +17548,7 @@ package module2702
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17621,7 +17621,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/nodirect/sub1/sub1
 package sub1
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -17680,7 +17680,7 @@ package sub1
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17702,7 +17702,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/nodirect/sub2/sub2
 package sub2
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -17761,7 +17761,7 @@ package sub2
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17783,7 +17783,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/onlystatic/onlysta
 package onlystatic
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -17820,7 +17820,7 @@ package onlystatic
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -17840,7 +17840,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/pythonself/pythons
 package pythonself
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -17981,7 +17981,7 @@ package pythonself
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -18044,7 +18044,7 @@ package backreferences
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -18060,7 +18060,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/submodule/child/ch
 package child
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 )
 
@@ -18196,7 +18196,7 @@ package child
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -18270,7 +18270,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/submodule/isolated
 package isolated
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/child"
@@ -18309,7 +18309,7 @@ package isolated
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -18329,7 +18329,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/submodule/nestedsu
 package deeplynested
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 type INamespaced interface {
@@ -18360,7 +18360,7 @@ package deeplynested
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -18391,7 +18391,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/submodule/nestedsu
 package nestedsubmodule
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 
 	"github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/child"
 	"github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/nestedsubmodule/deeplynested"
@@ -18439,7 +18439,7 @@ package nestedsubmodule
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -18477,7 +18477,7 @@ package param
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -18493,7 +18493,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/submodule/returnsp
 package returnsparam
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/submodule/param"
@@ -18554,7 +18554,7 @@ package returnsparam
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {
@@ -18576,7 +18576,7 @@ exports[`Generated code for "jsii-calc": <outDir>/go/jsiicalc/submodule/submodul
 package submodule
 
 import (
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 	_init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii"
 
 	"github.com/aws/jsii/jsii-calc/go/jsiicalc/v3"
@@ -18714,7 +18714,7 @@ package submodule
 import (
 	"reflect"
 
-	_jsii_ "github.com/aws/jsii-runtime-go"
+	_jsii_ "github.com/aws/jsii-runtime-go/runtime"
 )
 
 func init() {

From 78492b8688a4c03e5ec9dcf88ae0726d34e60720 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 12:17:34 +0000
Subject: [PATCH 11/28] chore(deps): update black requirement in
 /packages/@jsii/python-runtime (#2818)

---
 packages/@jsii/python-runtime/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt
index 9b36b83164..4ca967d642 100644
--- a/packages/@jsii/python-runtime/requirements.txt
+++ b/packages/@jsii/python-runtime/requirements.txt
@@ -1,4 +1,4 @@
-black~=21.4b0
+black~=21.4b2
 mypy==0.812
 pip~=21.1
 pytest~=6.2

From 76dac05d940bd1d7e969c4c5cab08dc6bf24a2a7 Mon Sep 17 00:00:00 2001
From: AWS CDK Automation
 <43080478+aws-cdk-automation@users.noreply.github.com>
Date: Fri, 7 May 2021 08:54:24 +0100
Subject: [PATCH 12/28] chore: npm-check-updates && yarn upgrade (#2821)

Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
---
 package.json                           |   6 +-
 packages/@jsii/integ-test/package.json |   2 +-
 packages/@jsii/runtime/package.json    |   2 +-
 yarn.lock                              | 309 +++++++++++++------------
 4 files changed, 164 insertions(+), 155 deletions(-)

diff --git a/package.json b/package.json
index 65cc4de5dc..c4831d268f 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,8 @@
   },
   "devDependencies": {
     "@jest/types": "^26.6.2",
-    "@typescript-eslint/eslint-plugin": "^4.22.0",
-    "@typescript-eslint/parser": "^4.22.0",
+    "@typescript-eslint/eslint-plugin": "^4.22.1",
+    "@typescript-eslint/parser": "^4.22.1",
     "all-contributors-cli": "^6.20.0",
     "eslint": "^7.25.0",
     "eslint-config-prettier": "^8.3.0",
@@ -30,7 +30,7 @@
     "jest-expect-message": "^1.0.2",
     "lerna": "^4.0.0",
     "prettier": "^2.2.1",
-    "standard-version": "^9.2.0",
+    "standard-version": "^9.3.0",
     "ts-jest": "^26.5.5",
     "ts-node": "^9.1.1",
     "typescript": "~3.9.9"
diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json
index 2d06b6a9f1..a751ee6220 100644
--- a/packages/@jsii/integ-test/package.json
+++ b/packages/@jsii/integ-test/package.json
@@ -18,7 +18,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@octokit/rest": "^18.5.3",
-    "dotenv": "^8.2.0",
+    "dotenv": "^8.5.1",
     "fs-extra": "^9.1.0",
     "jest": "^26.6.3",
     "jsii": "^0.0.0",
diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json
index 5e65f2b2e7..797974bdec 100644
--- a/packages/@jsii/runtime/package.json
+++ b/packages/@jsii/runtime/package.json
@@ -50,7 +50,7 @@
     "source-map-loader": "^2.0.1",
     "ts-jest": "^26.5.5",
     "typescript": "~3.9.9",
-    "webpack": "^5.36.0",
+    "webpack": "^5.36.2",
     "webpack-cli": "^4.6.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index d33334ac6c..991967f092 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,24 +17,24 @@
     "@babel/highlight" "^7.12.13"
 
 "@babel/compat-data@^7.13.15":
-  version "7.13.15"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
-  integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919"
+  integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==
 
 "@babel/core@^7.1.0", "@babel/core@^7.7.5":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a"
-  integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q==
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88"
+  integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.16"
+    "@babel/generator" "^7.14.0"
     "@babel/helper-compilation-targets" "^7.13.16"
-    "@babel/helper-module-transforms" "^7.13.14"
-    "@babel/helpers" "^7.13.16"
-    "@babel/parser" "^7.13.16"
+    "@babel/helper-module-transforms" "^7.14.0"
+    "@babel/helpers" "^7.14.0"
+    "@babel/parser" "^7.14.0"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.15"
-    "@babel/types" "^7.13.16"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -42,12 +42,12 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.13.16":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14"
-  integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg==
+"@babel/generator@^7.14.0":
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93"
+  integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==
   dependencies:
-    "@babel/types" "^7.13.16"
+    "@babel/types" "^7.14.1"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -91,19 +91,19 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
-"@babel/helper-module-transforms@^7.13.14":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
-  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
+"@babel/helper-module-transforms@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad"
+  integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==
   dependencies:
     "@babel/helper-module-imports" "^7.13.12"
     "@babel/helper-replace-supers" "^7.13.12"
     "@babel/helper-simple-access" "^7.13.12"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.14"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
 
 "@babel/helper-optimise-call-expression@^7.12.13":
   version "7.12.13"
@@ -141,38 +141,38 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
-"@babel/helper-validator-identifier@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+"@babel/helper-validator-identifier@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
+  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
 
 "@babel/helper-validator-option@^7.12.17":
   version "7.12.17"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
   integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
 
-"@babel/helpers@^7.13.16":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6"
-  integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg==
+"@babel/helpers@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
+  integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
   dependencies:
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.17"
-    "@babel/types" "^7.13.17"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
 
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
-  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
+  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.16":
-  version "7.13.16"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
-  integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0":
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47"
+  integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -259,9 +259,9 @@
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/runtime@^7.12.5", "@babel/runtime@^7.7.6":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.17.tgz#8966d1fc9593bf848602f0662d6b4d0069e3a7ec"
-  integrity sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
+  integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -274,26 +274,26 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
-  integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"
+  integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.16"
+    "@babel/generator" "^7.14.0"
     "@babel/helper-function-name" "^7.12.13"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.16"
-    "@babel/types" "^7.13.17"
+    "@babel/parser" "^7.14.0"
+    "@babel/types" "^7.14.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.13.17"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
-  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
+"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"
+  integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
@@ -1307,10 +1307,10 @@
     "@octokit/types" "^6.0.3"
     universal-user-agent "^6.0.0"
 
-"@octokit/openapi-types@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-6.2.0.tgz#6ea796b20c7111b9e422a4d607f796c1179622cd"
-  integrity sha512-V2vFYuawjpP5KUb8CPYsq20bXT4qnE8sH1QKpYqUlcNOntBiRr/VzGVvY0s+YXGgrVbFUVO4EI0VnHYSVBWfBg==
+"@octokit/openapi-types@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-7.0.0.tgz#0f6992db9854af15eca77d71ab0ec7fad2f20411"
+  integrity sha512-gV/8DJhAL/04zjTI95a7FhQwS6jlEE0W/7xeYAzuArD0KVAVWDLP2f3vi98hs3HLTczxXdRK/mF0tRoQPpolEw==
 
 "@octokit/plugin-enterprise-rest@^6.0.1":
   version "6.0.1"
@@ -1369,11 +1369,11 @@
     "@octokit/plugin-rest-endpoint-methods" "5.0.1"
 
 "@octokit/types@^6.0.3", "@octokit/types@^6.11.0", "@octokit/types@^6.13.1", "@octokit/types@^6.7.1":
-  version "6.14.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.14.0.tgz#587529b4a461d8b7621b99845718dc5c79281f52"
-  integrity sha512-43qHvDsPsKgNt4W4al3dyU6s2XZ7ZMsiiIw8rQcM9CyEo7g9W8/6m1W4xHuRqmEjTfG1U4qsE/E4Jftw1/Ak1g==
+  version "6.14.2"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.14.2.tgz#64c9457f38fb8522bdbba3c8cc814590a2d61bf5"
+  integrity sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==
   dependencies:
-    "@octokit/openapi-types" "^6.2.0"
+    "@octokit/openapi-types" "^7.0.0"
 
 "@sinonjs/commons@^1.7.0":
   version "1.8.3"
@@ -1561,9 +1561,9 @@
     "@types/node" "*"
 
 "@types/node@*":
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
-  integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67"
+  integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==
 
 "@types/node@^10.17.59":
   version "10.17.59"
@@ -1571,9 +1571,9 @@
   integrity sha512-7Uc8IRrL8yZz5ti45RaFxpbU8TxlzdC3HvxV+hOWo1EyLsuKv/w7y0n+TwZzwL3vdx3oZ2k3ubxPq131hNtXyg==
 
 "@types/node@^14.14.33":
-  version "14.14.43"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
-  integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
+  version "14.14.44"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215"
+  integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1649,13 +1649,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^4.22.0":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz#3d5f29bb59e61a9dba1513d491b059e536e16dbc"
-  integrity sha512-U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA==
+"@typescript-eslint/eslint-plugin@^4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz#6bcdbaa4548553ab861b4e5f34936ead1349a543"
+  integrity sha512-kVTAghWDDhsvQ602tHBc6WmQkdaYbkcTwZu+7l24jtJiYvm9l+/y/b2BZANEezxPDiX5MK2ZecE+9BFi/YJryw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.22.0"
-    "@typescript-eslint/scope-manager" "4.22.0"
+    "@typescript-eslint/experimental-utils" "4.22.1"
+    "@typescript-eslint/scope-manager" "4.22.1"
     debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
     lodash "^4.17.15"
@@ -1663,60 +1663,60 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@4.22.0":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz#68765167cca531178e7b650a53456e6e0bef3b1f"
-  integrity sha512-xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg==
+"@typescript-eslint/experimental-utils@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.1.tgz#3938a5c89b27dc9a39b5de63a62ab1623ab27497"
+  integrity sha512-svYlHecSMCQGDO2qN1v477ax/IDQwWhc7PRBiwAdAMJE7GXk5stF4Z9R/8wbRkuX/5e9dHqbIWxjeOjckK3wLQ==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.22.0"
-    "@typescript-eslint/types" "4.22.0"
-    "@typescript-eslint/typescript-estree" "4.22.0"
+    "@typescript-eslint/scope-manager" "4.22.1"
+    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/typescript-estree" "4.22.1"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/parser@^4.22.0":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.0.tgz#e1637327fcf796c641fe55f73530e90b16ac8fe8"
-  integrity sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==
+"@typescript-eslint/parser@^4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.1.tgz#a95bda0fd01d994a15fc3e99dc984294f25c19cc"
+  integrity sha512-l+sUJFInWhuMxA6rtirzjooh8cM/AATAe3amvIkqKFeMzkn85V+eLzb1RyuXkHak4dLfYzOmF6DXPyflJvjQnw==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.22.0"
-    "@typescript-eslint/types" "4.22.0"
-    "@typescript-eslint/typescript-estree" "4.22.0"
+    "@typescript-eslint/scope-manager" "4.22.1"
+    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/typescript-estree" "4.22.1"
     debug "^4.1.1"
 
-"@typescript-eslint/scope-manager@4.22.0":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz#ed411545e61161a8d702e703a4b7d96ec065b09a"
-  integrity sha512-OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q==
+"@typescript-eslint/scope-manager@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
+  integrity sha512-d5bAiPBiessSmNi8Amq/RuLslvcumxLmyhf1/Xa9IuaoFJ0YtshlJKxhlbY7l2JdEk3wS0EnmnfeJWSvADOe0g==
   dependencies:
-    "@typescript-eslint/types" "4.22.0"
-    "@typescript-eslint/visitor-keys" "4.22.0"
+    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/visitor-keys" "4.22.1"
 
-"@typescript-eslint/types@4.22.0":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.0.tgz#0ca6fde5b68daf6dba133f30959cc0688c8dd0b6"
-  integrity sha512-sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA==
+"@typescript-eslint/types@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
+  integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
 
-"@typescript-eslint/typescript-estree@4.22.0":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz#b5d95d6d366ff3b72f5168c75775a3e46250d05c"
-  integrity sha512-TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg==
+"@typescript-eslint/typescript-estree@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
+  integrity sha512-p3We0pAPacT+onSGM+sPR+M9CblVqdA9F1JEdIqRVlxK5Qth4ochXQgIyb9daBomyQKAXbygxp1aXQRV0GC79A==
   dependencies:
-    "@typescript-eslint/types" "4.22.0"
-    "@typescript-eslint/visitor-keys" "4.22.0"
+    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/visitor-keys" "4.22.1"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/visitor-keys@4.22.0":
-  version "4.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz#169dae26d3c122935da7528c839f42a8a42f6e47"
-  integrity sha512-nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw==
+"@typescript-eslint/visitor-keys@4.22.1":
+  version "4.22.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"
+  integrity sha512-WPkOrIRm+WCLZxXQHCi+WG8T2MMTUFR70rWjdWYddLT7cEfb2P4a3O/J2U1FBVsSFTocXLCoXWY6MZGejeStvQ==
   dependencies:
-    "@typescript-eslint/types" "4.22.0"
+    "@typescript-eslint/types" "4.22.1"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.11.0":
@@ -1909,9 +1909,9 @@ acorn@^7.1.1, acorn@^7.4.0:
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.1.0, acorn@^8.2.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb"
-  integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg==
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0"
+  integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==
 
 add-stream@^1.0.0:
   version "1.0.0"
@@ -2337,13 +2337,13 @@ browser-process-hrtime@^1.0.0:
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 browserslist@^4.14.5:
-  version "4.16.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
-  integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30001214"
+    caniuse-lite "^1.0.30001219"
     colorette "^1.2.2"
-    electron-to-chromium "^1.3.719"
+    electron-to-chromium "^1.3.723"
     escalade "^3.1.1"
     node-releases "^1.1.71"
 
@@ -2464,10 +2464,10 @@ camelcase@^6.0.0, camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@^1.0.30001214:
-  version "1.0.30001219"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b"
-  integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==
+caniuse-lite@^1.0.30001219:
+  version "1.0.30001222"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001222.tgz#2789b8487282cbbe1700924f53951303d28086a9"
+  integrity sha512-rPmwUK0YMjfMlZVmH6nVB5U3YJ5Wnx3vmT5lnRO3nIKO8bJ+TRWMbGuuiSugDJqESy/lz+1hSrlQEagCtoOAWQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -2774,7 +2774,7 @@ conventional-changelog-config-spec@2.1.0:
   resolved "https://registry.yarnpkg.com/conventional-changelog-config-spec/-/conventional-changelog-config-spec-2.1.0.tgz#874a635287ef8b581fd8558532bf655d4fb59f2d"
   integrity sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==
 
-conventional-changelog-conventionalcommits@4.5.0, conventional-changelog-conventionalcommits@^4.5.0:
+conventional-changelog-conventionalcommits@4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.5.0.tgz#a02e0b06d11d342fdc0f00c91d78265ed0bc0a62"
   integrity sha512-buge9xDvjjOxJlyxUnar/+6i/aVEVGA7EEh4OafBCXPlLUQPGbRUBhBUveWRxzvR8TEjhKEP4BdepnpG2FSZXw==
@@ -2783,6 +2783,15 @@ conventional-changelog-conventionalcommits@4.5.0, conventional-changelog-convent
     lodash "^4.17.15"
     q "^1.5.1"
 
+conventional-changelog-conventionalcommits@^4.5.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz#7fc17211dbca160acf24687bd2fdd5fd767750eb"
+  integrity sha512-sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A==
+  dependencies:
+    compare-func "^2.0.0"
+    lodash "^4.17.15"
+    q "^1.5.1"
+
 conventional-changelog-core@^4.2.1, conventional-changelog-core@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.2.tgz#f0897df6d53b5d63dec36b9442bd45354f8b3ce5"
@@ -3256,10 +3265,10 @@ dot-prop@^6.0.1:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv@*, dotenv@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
-  integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
+dotenv@*, dotenv@^8.5.1:
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.5.1.tgz#e3a4c7862daba51b92bce0da5c349f11faa28663"
+  integrity sha512-qC1FbhCH7UH7B+BcRNUDhAk04d/n+tnGGB1ctwndZkVFeehYJOn39pRWWzmdzpFqImyX1KB8tO0DCHLf8yRaYQ==
 
 dotgitignore@^2.1.0:
   version "2.1.0"
@@ -3282,10 +3291,10 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.3.719:
-  version "1.3.723"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz#52769a75635342a4db29af5f1e40bd3dad02c877"
-  integrity sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==
+electron-to-chromium@^1.3.723:
+  version "1.3.727"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
+  integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
 
 emittery@^0.7.1:
   version "0.7.2"
@@ -3514,9 +3523,9 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint-visitor-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
 eslint@^7.25.0:
   version "7.25.0"
@@ -4515,9 +4524,9 @@ is-arrayish@^0.2.1:
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-bigint@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
-  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
+  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
 
 is-boolean-object@^1.1.0:
   version "1.1.0"
@@ -7761,10 +7770,10 @@ stack-utils@^2.0.2:
   dependencies:
     escape-string-regexp "^2.0.0"
 
-standard-version@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-9.2.0.tgz#d4e64b201ec1abb8a677b265d8755e5e8b9e33a3"
-  integrity sha512-utJcqjk/wR4sePSwDoRcc5CzJ6S+kec5Hd0+1TJI+j1TRYuuptweAnEUdkkjGf2vYoGab2ezefyVtW065HZ1Uw==
+standard-version@^9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-9.3.0.tgz#2e6ff439aa49b2ea8952262f30ae6b70c02467d3"
+  integrity sha512-cYxxKXhYfI3S9+CA84HmrJa9B88H56V5FQ302iFF2TNwJukJCNoU8FgWt+11YtwKFXRkQQFpepC2QOF7aDq2Ow==
   dependencies:
     chalk "^2.4.2"
     conventional-changelog "3.1.24"
@@ -8366,9 +8375,9 @@ typescript@~3.9.9:
   integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==
 
 uglify-js@^3.1.4:
-  version "3.13.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.4.tgz#592588bb9f47ae03b24916e2471218d914955574"
-  integrity sha512-kv7fCkIXyQIilD5/yQy8O+uagsYIOt5cZvs890W40/e/rvjMSzJw81o9Bg0tkURxzZBROtDQhW2LFjOGoK3RZw==
+  version "3.13.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
+  integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
 
 uid-number@0.0.6:
   version "0.0.6"
@@ -8613,10 +8622,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@^5.36.0:
-  version "5.36.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.36.0.tgz#d008da31b721f8fecce88ef2adaf1b16dc2161d1"
-  integrity sha512-HdOhLXClUEwTnzQnzpSG9iL00ej23ojvfnGpF49ba0MkuAT2q+WhQilHFFJHOIVRBqbzakQ1vCWQV2K+QLX0Qw==
+webpack@^5.36.2:
+  version "5.36.2"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.36.2.tgz#6ef1fb2453ad52faa61e78d486d353d07cca8a0f"
+  integrity sha512-XJumVnnGoH2dV+Pk1VwgY4YT6AiMKpVoudUFCNOXMIVrEKPUgEwdIfWPjIuGLESAiS8EdIHX5+TiJz/5JccmRg==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.47"

From ff03310e1540ddf5364ab20390e854be9b57bc17 Mon Sep 17 00:00:00 2001
From: guyroberts21 <47118902+guyroberts21@users.noreply.github.com>
Date: Fri, 7 May 2021 09:53:23 +0100
Subject: [PATCH 13/28] docs: update typescript links (#2804)

This PR adds relevant links from the TypeScript Handbook to the [jsii type system page]

[jsii type system page]: https://aws.github.io/jsii/specification/2-type-system/

---

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
---
 .../content/specification/2-type-system.md    | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/gh-pages/content/specification/2-type-system.md b/gh-pages/content/specification/2-type-system.md
index 1d774ce0b7..140566c5d9 100644
--- a/gh-pages/content/specification/2-type-system.md
+++ b/gh-pages/content/specification/2-type-system.md
@@ -44,6 +44,8 @@ array is produced each time it is passed through the process boundary.
 !!! info
     Items in the list may be passed by-reference (according to their type's specification), in which case mutating
     operations performed on those may be visible across the process boundary.
+    
+[Find out more here](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#arrays)
 
 ### Enum
 
@@ -55,10 +57,12 @@ parameter).
 !!! info
     Unlike in certain languages such as **Java**, `enum` types cannot declare new properties or methods.
 
+[Find out more here](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#enums)
+
 ### Any and Unknown
 
 **TypeScript** defines two opaque types: `any` and `unknown` that can be used to represent a value of arbitary type. The
-difference between them is that while `any` is assignable to any other type, `unknown` requires a type assertion or
+difference between them is that while `any` is [assignable to any other type][ts-any], `unknown` requires a [type assertion][ts-unknown] or
 explicit cast to be performed before it can be assigned.
 
 Both of these types map to an `Any` _primitive type_ in the _jsii_ type system, and the subtle distinction between `any`
@@ -68,10 +72,15 @@ and `unknown` is lost in the process.
     It is important to note that, contrary to the other types in the **TypeScript** type system, `any` and `unknown`
     types are inherently `null`-able.
 
+[ts-any]: https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#any
+[ts-unknown]: https://www.typescriptlang.org/docs/handbook/2/functions.html#unknown
+
 ### Void
 
 As in most languages, the `void` type is used to denote a method does not return anything.
 
+[Find out more here](https://www.typescriptlang.org/docs/handbook/2/functions.html#void)
+
 ### Null and Undefined
 
 **JavaScript** differentiates `undefined` and `null` values. While `undefined` denotes that _no value_ has been set,
@@ -84,6 +93,8 @@ are semantically equivalent.
     values unless the type signature expressedly supports that (with the exception of `any` and `unknown`, which are
     implicitly `null`-able, as was discussed earlier).
 
+[Find out more here](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#null-and-undefined)
+
 ### Object
 
 **TypeScript**'s `object` type denotes anything that is not a _primitive_ type, meaning anything other than a `number`,
@@ -98,6 +109,8 @@ boundary. As a consequence, they may not include any method.
 !!! question
     The by-value nature of `object` is problematic because **TypeScript** makes no guarantee with respects to the
     absence of methods on `object`, and properties may be dynamic.
+    
+[Find out more here](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#object-types)
 
 ### Promises
 
@@ -124,13 +137,14 @@ convenient APIs in other languages.
 
 ### Classes
 
-Exported **TypeScript** classes are represented in the _jsii_ type system, with the following restrictions from plain
+Exported **TypeScript** [classes][ts-classes] are represented in the _jsii_ type system, with the following restrictions from plain
 **TypeScript**:
 
 - Methods overloads are not supported.
 - Overridden methods or properties must retain the exact same type signature as the one declared in a parent type. The
   **jsii** type system strictly enforces the [Liskov substitution principle].
 
+[ts-classes]: https://www.typescriptlang.org/docs/handbook/2/classes.html
 [liskov substitution principle]: https://en.wikipedia.org/wiki/Liskov_substitution_principle
 
 ### Interfaces & Structs
@@ -172,6 +186,8 @@ allow for a convenient API in languages that support overloads.
 In general however, _type unions_ are discouraged and should only be used when there is no alternative way to model the
 API.
 
+[Find out more here](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types)
+
 ## Serialization Behavior
 
 When values are passed between the _host_ process and the `node` process, they are serialized as JSON documents. They
@@ -392,4 +408,4 @@ basis for the _jsii_ type system. Additionally, the **JavaScript** type system i
 [**JavaScript** Fundamentals][js-fundamentals] document.
 
 [js-fundamentals]: https://javascript.info/types
-[ts-handbook]: https://www.typescriptlang.org/docs/handbook/basic-types.html
+[ts-handbook]: https://www.typescriptlang.org/docs/handbook/2/basic-types.html

From 7a95a5be3a1d46a25710b57b7c468ec55413c9f2 Mon Sep 17 00:00:00 2001
From: Madeline Kusters <80541297+madeline-k@users.noreply.github.com>
Date: Wed, 12 May 2021 12:47:43 -0700
Subject: [PATCH 14/28] chore: add madeline-k to Mergify configuration as a
 core member (#2836)

Also remove Shiv, as he's no longer in the CDK team.
---
 .mergify/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mergify/config.yml b/.mergify/config.yml
index cab6bd1a58..0b6fccdabd 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -6,7 +6,7 @@ pull_request_rules:
       label:
         add: [contribution/core]
     conditions:
-      - author~=^(eladb|RomainMuller|garnaat|nija-at|shivlaks|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch)$
+      - author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch|madeline-k)$
       - -label~="contribution/core"
   - name: Tell them we're good now
     actions:

From c133dd2da485f7046a3def6d9cbd5762c298b06a Mon Sep 17 00:00:00 2001
From: Ben Chaimberg <chaimber@amazon.com>
Date: Wed, 12 May 2021 15:43:26 -0700
Subject: [PATCH 15/28] chore(mergify): add @BenChaimberg to team roster
 (#2828)

---
 .mergify/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mergify/config.yml b/.mergify/config.yml
index 0b6fccdabd..fde84e69a2 100644
--- a/.mergify/config.yml
+++ b/.mergify/config.yml
@@ -6,7 +6,7 @@ pull_request_rules:
       label:
         add: [contribution/core]
     conditions:
-      - author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch|madeline-k)$
+      - author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch|madeline-k|BenChaimberg)$
       - -label~="contribution/core"
   - name: Tell them we're good now
     actions:

From 43f4a819e890d44a255fee3886dd3000430a970c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 May 2021 17:07:59 +0300
Subject: [PATCH 16/28] chore(deps): bump actions/checkout from 2 to 2.3.4
 (#2831)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 2.3.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v2.3.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Elad Ben-Israel <benisrae@amazon.com>
---
 .github/workflows/docker-images.yml | 2 +-
 .github/workflows/gh-pages.yml      | 4 ++--
 .github/workflows/main.yml          | 4 ++--
 .github/workflows/yarn-upgrade.yml  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 693fbe5473..7aa3ed2a89 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -19,7 +19,7 @@ jobs:
       DEFAULT_NODE_MAJOR_VERSION: 10
     steps:
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       # Determine if we should run the validation or not
       - name: Should this run?
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 96a19e8cf9..9d3a890438 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           python-version: '3.8'
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - name: Locate Caches
         id: cache-locations
         run: |-
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
         with:
           ref: gh-pages
           token: ${{ secrets.AUTO_APPROVE_GITHUB_TOKEN }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 08824077ee..369bc64a6f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Install python3-venv
         run: sudo apt install -y python3-venv
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - name: Locate Caches
         id: cache-locations
         run: |-
@@ -138,7 +138,7 @@ jobs:
       - name: Install python3-venv
         run: sudo apt install -y python3-venv
       - name: Check out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
       - name: Locate Caches
         id: cache-locations
         run: |-
diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index 771a9d003a..65614e5a40 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
 
       - name: Check Out
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.3.4
 
       - name: Set up Node
         uses: actions/setup-node@v2.1.5

From 333e3bab11596422b24afdcc5fe566f3f074c997 Mon Sep 17 00:00:00 2001
From: Niranjan Jayakar <nija@amazon.com>
Date: Tue, 18 May 2021 17:31:52 +0100
Subject: [PATCH 17/28] chore: disable the auto upgrade workflow (#2844)

Temporarily disable.
---
 .github/workflows/yarn-upgrade.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index 65614e5a40..19101daa91 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -1,9 +1,10 @@
 name: Yarn Upgrade
 
 on:
-  schedule:
+  # Temporarily disable this workflow
+  #schedule:
     # Every wednesday at 13:37 UTC
-    - cron: 37 13 * * 3
+    #- cron: 37 13 * * 3
   workflow_dispatch: {}
 
 jobs:

From 22aeadd7f4b889e159874393d69588df1eba333e Mon Sep 17 00:00:00 2001
From: Niranjan Jayakar <nija@amazon.com>
Date: Thu, 20 May 2021 10:21:42 +0100
Subject: [PATCH 18/28] chore: permissions for github actions (#2845)

By default, all Github actions have read permissions via the standard
`GITHUB_TOKEN`. For jobs that require write permission, explicitly
add the necessary permissions.

In the case of the 'Yarn Upgrade' Github action, separated the
'upgrade' step and the 'pull request' step into separate
jobs to build a better security boundary between the two.

Inspired from: https://github.com/projen/projen/blob/a4f875d07b57f8f8247b9352e34c3c83759afe82/.github/workflows/upgrade-dependencies.yml
---
 .github/workflows/auto-approve.yml         |  2 ++
 .github/workflows/close-stale-issues.yml   |  2 ++
 .github/workflows/closed-issue-message.yml | 30 +++++++++--------
 .github/workflows/docker-images.yml        |  2 ++
 .github/workflows/gh-pages.yml             |  4 +++
 .github/workflows/main.yml                 |  4 +++
 .github/workflows/yarn-upgrade.yml         | 39 ++++++++++++++++++++--
 7 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
index 237b890dee..380993ddcd 100644
--- a/.github/workflows/auto-approve.yml
+++ b/.github/workflows/auto-approve.yml
@@ -10,6 +10,8 @@ jobs:
        (github.event.pull_request.user.login == 'aws-cdk-automation' 
         || github.event.pull_request.user.login == 'dependabot[bot]' 
         || github.event.pull_request.user.login == 'dependabot-preview[bot]')
+    permissions:
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
     - uses: hmarr/auto-approve-action@v2.1.0
diff --git a/.github/workflows/close-stale-issues.yml b/.github/workflows/close-stale-issues.yml
index 74cd626dcf..0b61064dbd 100644
--- a/.github/workflows/close-stale-issues.yml
+++ b/.github/workflows/close-stale-issues.yml
@@ -7,6 +7,8 @@ on:
 
 jobs:
   cleanup:
+    permissions:
+      issues: write
     runs-on: ubuntu-latest
     name: Stale issue job
     steps:
diff --git a/.github/workflows/closed-issue-message.yml b/.github/workflows/closed-issue-message.yml
index 3340afb1f3..669f84e899 100644
--- a/.github/workflows/closed-issue-message.yml
+++ b/.github/workflows/closed-issue-message.yml
@@ -1,17 +1,19 @@
 name: Closed Issue Message
 on:
-    issues:
-       types: [closed]
+  issues:
+    types: [closed]
 jobs:
-    auto_comment:
-        runs-on: ubuntu-latest
-        steps:
-        - uses: aws-actions/closed-issue-message@v1
-          with:
-            # These inputs are both required
-            repo-token: "${{ secrets.GITHUB_TOKEN }}"
-            message: |
-                     ### ⚠️COMMENT VISIBILITY WARNING⚠️ 
-                     Comments on closed issues are hard for our team to see. 
-                     If you need more assistance, please either tag a team member or open a new issue that references this one. 
-                     If you wish to keep having a conversation with other community members under this issue feel free to do so.
+  auto_comment:
+    permissions:
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: aws-actions/closed-issue-message@v1
+      with:
+        # These inputs are both required
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        message: |
+           ### ⚠️COMMENT VISIBILITY WARNING⚠️
+           Comments on closed issues are hard for our team to see. 
+           If you need more assistance, please either tag a team member or open a new issue that references this one.
+           If you wish to keep having a conversation with other community members under this issue feel free to do so.
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 7aa3ed2a89..adbb0278f1 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   superchain:
     name: jsii/superchain
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     strategy:
       matrix:
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 9d3a890438..d8fb97fee7 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -12,6 +12,8 @@ on:
 jobs:
   build:
     name: build
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     steps:
       - name: Set up Python
@@ -51,6 +53,8 @@ jobs:
     name: Publish
     needs: build
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - name: Check out
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 369bc64a6f..913ff06988 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,6 +19,8 @@ env:
 jobs:
   build:
     name: Build
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     steps:
       # Set up all of our standard runtimes
@@ -111,6 +113,8 @@ jobs:
 
   create-release-package:
     name: Create Release Package
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     steps:
       # Set up all of our standard runtimes
diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
index 19101daa91..549333a7b8 100644
--- a/.github/workflows/yarn-upgrade.yml
+++ b/.github/workflows/yarn-upgrade.yml
@@ -1,15 +1,16 @@
 name: Yarn Upgrade
 
 on:
-  # Temporarily disable this workflow
-  #schedule:
+  schedule:
     # Every wednesday at 13:37 UTC
-    #- cron: 37 13 * * 3
+    - cron: 37 13 * * 3
   workflow_dispatch: {}
 
 jobs:
   upgrade:
     name: Yarn Upgrade
+    permissions:
+      content: read
     runs-on: ubuntu-latest
     steps:
 
@@ -105,6 +106,38 @@ jobs:
       - name: Run "yarn upgrade"
         run: yarn upgrade
 
+      # Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
+      # Creating a pull request requires write permissions and it's best to keep write privileges isolated.
+      - name: Create Patch
+        run: |-
+          git add .
+          git diff --patch --staged > ${{ runner.temp }}/upgrade.patch
+      - name: Upload Patch
+        uses: actions/upload-artifact@v2
+        with:
+          name: upgrade.patch
+          path: ${{ runner.temp }}/upgrade.patch
+
+  pr:
+    name: Create Pull Request
+    needs: upgrade
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out
+        uses: actions/checkout@v2
+
+      - name: Download patch
+        uses: actions/download-artifact@v2
+        with:
+          name: upgrade.patch
+          path: ${{ runner.temp }}
+
+      - name: Apply patch
+        run: '[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp }}/upgrade.patch || echo "Empty patch. Skipping."'
+
       - name: Make Pull Request
         uses: peter-evans/create-pull-request@v3
         with:

From e84e70f5549a6a0382591aa7a735086fa3e65154 Mon Sep 17 00:00:00 2001
From: AWS CDK Automation
 <43080478+aws-cdk-automation@users.noreply.github.com>
Date: Fri, 21 May 2021 11:49:13 +0200
Subject: [PATCH 19/28] chore: npm-check-updates && yarn upgrade (#2835)

Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
---
 eslint-config.yaml                            |   5 -
 package.json                                  |  10 +-
 packages/@jsii/go-runtime/package.json        |   4 +-
 packages/@jsii/integ-test/package.json        |   6 +-
 packages/@jsii/kernel/lib/objects.ts          |  10 +-
 packages/@jsii/kernel/package.json            |   6 +-
 packages/@jsii/kernel/test/kernel.test.ts     |  32 +-
 packages/@jsii/runtime/package.json           |  10 +-
 packages/@jsii/spec/package.json              |   4 +-
 .../jsii-calc-base-of-base/package.json       |   2 +-
 packages/@scope/jsii-calc-base/package.json   |   2 +-
 packages/@scope/jsii-calc-lib/package.json    |   2 +-
 packages/codemaker/package.json               |   4 +-
 packages/jsii-calc/lib/calculator.ts          |   3 +-
 packages/jsii-calc/lib/compliance.ts          |  18 +-
 packages/jsii-calc/package.json               |   4 +-
 packages/jsii-calc/test/assembly.jsii         | 846 +++++++++---------
 packages/jsii-config/lib/prompt.ts            |   6 +-
 packages/jsii-config/package.json             |   4 +-
 packages/jsii-diff/lib/type-comparison.ts     |   2 +-
 packages/jsii-diff/lib/validations.ts         |  10 +-
 packages/jsii-diff/package.json               |   4 +-
 packages/jsii-diff/test/classes.test.ts       |   3 +-
 packages/jsii-pacmak/bin/jsii-pacmak.ts       |  21 +-
 packages/jsii-pacmak/lib/generator.ts         |   2 +-
 packages/jsii-pacmak/lib/targets/dotnet.ts    |   6 +-
 .../lib/targets/dotnet/dotnetgenerator.ts     |   5 +-
 .../jsii-pacmak/lib/targets/go/package.ts     |  30 +-
 packages/jsii-pacmak/lib/targets/java.ts      |  19 +-
 packages/jsii-pacmak/lib/targets/js.ts        |   6 +-
 .../lib/targets/python/type-name.ts           |   2 +-
 packages/jsii-pacmak/package.json             |   6 +-
 .../test/targets/version-utils.test.ts        |   3 +-
 packages/jsii-reflect/bin/jsii-tree.ts        |   9 +-
 packages/jsii-reflect/lib/callable.ts         |   3 +-
 packages/jsii-reflect/lib/initializer.ts      |   3 +-
 packages/jsii-reflect/lib/method.ts           |   3 +-
 packages/jsii-reflect/lib/property.ts         |   3 +-
 packages/jsii-reflect/lib/reference-type.ts   |   6 +-
 packages/jsii-reflect/package.json            |   4 +-
 packages/jsii-rosetta/bin/jsii-rosetta.ts     |   5 +-
 packages/jsii-rosetta/lib/fixtures.ts         |   7 +-
 packages/jsii-rosetta/lib/snippet.ts          |   5 +-
 .../jsii-rosetta/lib/typescript/ast-utils.ts  |   6 +-
 packages/jsii-rosetta/package.json            |   4 +-
 packages/jsii/bin/jsii.ts                     |   9 +-
 packages/jsii/lib/assembler.ts                |  35 +-
 packages/jsii/lib/jsii-diagnostic.ts          |  26 +-
 packages/jsii/lib/node-bindings.ts            |   2 +-
 packages/jsii/lib/project-info.ts             |  18 +-
 .../jsii/lib/transforms/deprecated-remover.ts |  35 +-
 packages/jsii/lib/utils.ts                    |   3 +-
 packages/jsii/lib/validator.ts                |  18 +-
 packages/jsii/package.json                    |   6 +-
 packages/oo-ascii-tree/package.json           |   4 +-
 tools/jsii-compliance/package.json            |   4 +-
 yarn.lock                                     | 298 +++---
 57 files changed, 796 insertions(+), 817 deletions(-)

diff --git a/eslint-config.yaml b/eslint-config.yaml
index 750f3a7de6..5080da3f35 100644
--- a/eslint-config.yaml
+++ b/eslint-config.yaml
@@ -50,11 +50,6 @@ rules:
   '@typescript-eslint/await-thenable':
     - error
 
-  '@typescript-eslint/brace-style':
-    - error
-    - 1tbs # One True Brace Style!
-    - allowSingleLine: true
-
   '@typescript-eslint/explicit-module-boundary-types':
     - off
 
diff --git a/package.json b/package.json
index c4831d268f..c327fdffe3 100644
--- a/package.json
+++ b/package.json
@@ -16,10 +16,10 @@
   },
   "devDependencies": {
     "@jest/types": "^26.6.2",
-    "@typescript-eslint/eslint-plugin": "^4.22.1",
-    "@typescript-eslint/parser": "^4.22.1",
+    "@typescript-eslint/eslint-plugin": "^4.23.0",
+    "@typescript-eslint/parser": "^4.23.0",
     "all-contributors-cli": "^6.20.0",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-import-resolver-typescript": "^2.4.0",
@@ -29,9 +29,9 @@
     "jest-config": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "lerna": "^4.0.0",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "standard-version": "^9.3.0",
-    "ts-jest": "^26.5.5",
+    "ts-jest": "^26.5.6",
     "ts-node": "^9.1.1",
     "typescript": "~3.9.9"
   },
diff --git a/packages/@jsii/go-runtime/package.json b/packages/@jsii/go-runtime/package.json
index fe270aefe2..ed798107e9 100644
--- a/packages/@jsii/go-runtime/package.json
+++ b/packages/@jsii/go-runtime/package.json
@@ -26,11 +26,11 @@
     "@types/fs-extra": "^8.1.1",
     "@types/node": "^10.17.59",
     "codemaker": "^0.0.0",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "fs-extra": "^9.1.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "ts-node": "^9.1.1",
     "typescript": "~3.9.9"
   }
diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json
index a751ee6220..ab09d04b32 100644
--- a/packages/@jsii/integ-test/package.json
+++ b/packages/@jsii/integ-test/package.json
@@ -18,7 +18,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@octokit/rest": "^18.5.3",
-    "dotenv": "^8.5.1",
+    "dotenv": "^8.6.0",
     "fs-extra": "^9.1.0",
     "jest": "^26.6.3",
     "jsii": "^0.0.0",
@@ -32,8 +32,8 @@
     "@types/jest": "^26.0.23",
     "@types/node": "^10.17.59",
     "@types/tar": "^4.0.4",
-    "eslint": "^7.25.0",
-    "prettier": "^2.2.1",
+    "eslint": "^7.26.0",
+    "prettier": "^2.3.0",
     "typescript": "~3.9.9"
   }
 }
diff --git a/packages/@jsii/kernel/lib/objects.ts b/packages/@jsii/kernel/lib/objects.ts
index d852761db2..305d93ccb3 100644
--- a/packages/@jsii/kernel/lib/objects.ts
+++ b/packages/@jsii/kernel/lib/objects.ts
@@ -104,11 +104,11 @@ export class ObjectTable {
         for (const iface of existingRef[api.TOKEN_INTERFACES] ?? []) {
           allIfaces.add(iface);
         }
-        this.objects[existingRef[api.TOKEN_REF]].interfaces = (obj as any)[
-          IFACES_SYMBOL
-        ] = existingRef[
-          api.TOKEN_INTERFACES
-        ] = interfaces = this.removeRedundant(Array.from(allIfaces), fqn);
+        this.objects[existingRef[api.TOKEN_REF]].interfaces =
+          (obj as any)[IFACES_SYMBOL] =
+          existingRef[api.TOKEN_INTERFACES] =
+          interfaces =
+            this.removeRedundant(Array.from(allIfaces), fqn);
       }
       return existingRef;
     }
diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json
index eb5454fa6f..ba709dc18e 100644
--- a/packages/@jsii/kernel/package.json
+++ b/packages/@jsii/kernel/package.json
@@ -43,13 +43,13 @@
     "@types/jest-expect-message": "^1.0.3",
     "@types/node": "^10.17.59",
     "@types/tar": "^4.0.4",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
-    "prettier": "^2.2.1",
-    "ts-jest": "^26.5.5",
+    "prettier": "^2.3.0",
+    "ts-jest": "^26.5.6",
     "typescript": "~3.9.9"
   }
 }
diff --git a/packages/@jsii/kernel/test/kernel.test.ts b/packages/@jsii/kernel/test/kernel.test.ts
index 0edf146052..947ce2ffee 100644
--- a/packages/@jsii/kernel/test/kernel.test.ts
+++ b/packages/@jsii/kernel/test/kernel.test.ts
@@ -20,18 +20,11 @@ import { closeRecording, recordInteraction } from './recording';
 /* eslint-disable require-atomic-updates */
 
 // extract versions of fixtures
-// eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
-const calcBaseVersion = require('@scope/jsii-calc-base/package.json').version.replace(
-  /\+.+$/,
-  '',
-);
-// eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
-const calcLibVersion = require('@scope/jsii-calc-lib/package.json').version.replace(
-  /\+.+$/,
-  '',
-);
-// eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
-const calcVersion = require('jsii-calc/package.json').version.replace(
+const calcBaseVersion =
+  require('@scope/jsii-calc-base/package.json').version.replace(/\+.+$/, ''); // eslint-disable-line
+const calcLibVersion =
+  require('@scope/jsii-calc-lib/package.json').version.replace(/\+.+$/, ''); // eslint-disable-line
+const calcVersion = require('jsii-calc/package.json').version.replace( // eslint-disable-line
   /\+.+$/,
   '',
 );
@@ -578,8 +571,10 @@ defineTest(
   'verify object literals are converted to real classes',
   (sandbox) => {
     const obj = sandbox.create({ fqn: 'jsii-calc.JSObjectLiteralToNative' });
-    const obj2 = sandbox.invoke({ objref: obj, method: 'returnLiteral' })
-      .result;
+    const obj2 = sandbox.invoke({
+      objref: obj,
+      method: 'returnLiteral',
+    }).result;
 
     expect(obj2[api.TOKEN_REF]).toBeTruthy(); // verify that we received a ref as a result;
 
@@ -1222,7 +1217,8 @@ defineTest(
       try {
         sandbox.invoke({ objref: obj, method: 'throwError' });
       } catch (error) {
-        const regexp = /^\s*at Thrower\.doThrowError \(.*jsii[-_]calc.*\/lib\/compliance\.ts:\d+:\d+\)$/m;
+        const regexp =
+          /^\s*at Thrower\.doThrowError \(.*jsii[-_]calc.*\/lib\/compliance\.ts:\d+:\d+\)$/m;
         expect(regexp.test(error.stack)).toBeTruthy(); // The stack trace includes the path to the original source file
         throw error;
       }
@@ -1640,8 +1636,10 @@ defineTest('calculator can set and retrieve union properties', (sandbox) => {
     value: mul(num(9), num(3)),
   });
 
-  const value = sandbox.invoke({ objref: calculator, method: 'readUnionValue' })
-    .result;
+  const value = sandbox.invoke({
+    objref: calculator,
+    method: 'readUnionValue',
+  }).result;
   expect(27).toBe(value);
 
   const expression = sandbox.get({
diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json
index 797974bdec..5e65047dd4 100644
--- a/packages/@jsii/runtime/package.json
+++ b/packages/@jsii/runtime/package.json
@@ -42,15 +42,15 @@
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/jest": "^26.0.23",
     "@types/node": "^10.17.59",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "source-map-loader": "^2.0.1",
-    "ts-jest": "^26.5.5",
+    "ts-jest": "^26.5.6",
     "typescript": "~3.9.9",
-    "webpack": "^5.36.2",
-    "webpack-cli": "^4.6.0"
+    "webpack": "^5.37.0",
+    "webpack-cli": "^4.7.0"
   }
 }
diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json
index 58341b58c8..ae2fc2698e 100644
--- a/packages/@jsii/spec/package.json
+++ b/packages/@jsii/spec/package.json
@@ -36,10 +36,10 @@
   "devDependencies": {
     "@types/jest": "^26.0.23",
     "@types/node": "^10.17.59",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jsii-build-tools": "^0.0.0",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "typescript": "~3.9.9",
     "typescript-json-schema": "^0.50.0"
   }
diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json
index 022672497d..57a91ecee0 100644
--- a/packages/@scope/jsii-calc-base-of-base/package.json
+++ b/packages/@scope/jsii-calc-base-of-base/package.json
@@ -34,7 +34,7 @@
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "prettier": "^2.2.1"
+    "prettier": "^2.3.0"
   },
   "jsii": {
     "outdir": "dist",
diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json
index e713edd88b..9ee565a9d9 100644
--- a/packages/@scope/jsii-calc-base/package.json
+++ b/packages/@scope/jsii-calc-base/package.json
@@ -39,7 +39,7 @@
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "prettier": "^2.2.1"
+    "prettier": "^2.3.0"
   },
   "jsii": {
     "metadata": {
diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json
index 355bf2ee6a..b8dcb668bf 100644
--- a/packages/@scope/jsii-calc-lib/package.json
+++ b/packages/@scope/jsii-calc-lib/package.json
@@ -43,7 +43,7 @@
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "prettier": "^2.2.1"
+    "prettier": "^2.3.0"
   },
   "jsii": {
     "outdir": "dist",
diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json
index 9642c0a62a..feae4ec506 100644
--- a/packages/codemaker/package.json
+++ b/packages/codemaker/package.json
@@ -39,9 +39,9 @@
     "@types/fs-extra": "^8.1.1",
     "@types/jest": "^26.0.23",
     "@types/node": "^10.17.59",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "typescript": "~3.9.9"
   }
 }
diff --git a/packages/jsii-calc/lib/calculator.ts b/packages/jsii-calc/lib/calculator.ts
index 6065eaad0b..23cea54d00 100644
--- a/packages/jsii-calc/lib/calculator.ts
+++ b/packages/jsii-calc/lib/calculator.ts
@@ -80,7 +80,8 @@ export class Add extends BinaryOperation {
  */
 export class Multiply
   extends BinaryOperation
-  implements IFriendlier, IRandomNumberGenerator {
+  implements IFriendlier, IRandomNumberGenerator
+{
   public get value() {
     return this.lhs.value * this.rhs.value;
   }
diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
index e34291f618..5e38fbc856 100644
--- a/packages/jsii-calc/lib/compliance.ts
+++ b/packages/jsii-calc/lib/compliance.ts
@@ -1249,7 +1249,8 @@ export abstract class AbstractClassBase {
 
 export abstract class AbstractClass
   extends AbstractClassBase
-  implements IInterfaceImplementedByAbstractClass {
+  implements IInterfaceImplementedByAbstractClass
+{
   public nonAbstractMethod() {
     return 42;
   }
@@ -1319,7 +1320,8 @@ export class DoNotOverridePrivates {
  * Class that implements interface properties automatically, but using a private constructor
  */
 export class ClassWithPrivateConstructorAndAutomaticProperties
-  implements IInterfaceWithProperties {
+  implements IInterfaceWithProperties
+{
   public static create(readOnlyString: string, readWriteString: string) {
     return new ClassWithPrivateConstructorAndAutomaticProperties(
       readOnlyString,
@@ -1518,7 +1520,8 @@ export class ExportedBaseClass {
 }
 class PrivateImplementation
   extends ExportedBaseClass
-  implements IPrivatelyImplemented {
+  implements IPrivatelyImplemented
+{
   public constructor() {
     super(true);
   }
@@ -1804,7 +1807,8 @@ interface IPrivateInterfaceThatExtendsTheNonInternalOne
 export class ClassThatImplementsTheInternalInterface
   implements
     IInternalInterfaceThatExtendsTheNonInternalOne,
-    INonInternalInterface {
+    INonInternalInterface
+{
   public a = 'a';
   public b = 'b';
   public c = 'c';
@@ -1812,7 +1816,8 @@ export class ClassThatImplementsTheInternalInterface
 }
 
 export class ClassThatImplementsThePrivateInterface
-  implements IPrivateInterfaceThatExtendsTheNonInternalOne {
+  implements IPrivateInterfaceThatExtendsTheNonInternalOne
+{
   public a = 'a';
   public b = 'b';
   public c = 'c';
@@ -2212,7 +2217,8 @@ export interface IAnonymousImplementationProvider {
   provideAsClass(): Implementation;
 }
 export class AnonymousImplementationProvider
-  implements IAnonymousImplementationProvider {
+  implements IAnonymousImplementationProvider
+{
   private readonly instance = new PrivateType();
 
   public provideAsClass(): Implementation {
diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json
index b8bf2d605a..6a3ecd30a5 100644
--- a/packages/jsii-calc/package.json
+++ b/packages/jsii-calc/package.json
@@ -52,11 +52,11 @@
   },
   "devDependencies": {
     "@types/node": "^10.17.59",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-rosetta": "^0.0.0",
-    "prettier": "^2.2.1"
+    "prettier": "^2.3.0"
   },
   "jsii": {
     "outdir": "dist",
diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
index 87d596d996..9ebadccc5c 100644
--- a/packages/jsii-calc/test/assembly.jsii
+++ b/packages/jsii-calc/test/assembly.jsii
@@ -208,7 +208,7 @@
     "jsii-calc.composition": {
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 142
+        "line": 143
       }
     },
     "jsii-calc.module2530": {
@@ -425,7 +425,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1257
+            "line": 1258
           },
           "name": "abstractMethod",
           "parameters": [
@@ -448,7 +448,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1253
+            "line": 1254
           },
           "name": "nonAbstractMethod",
           "returns": {
@@ -467,7 +467,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1259
+            "line": 1260
           },
           "name": "propFromInterface",
           "overrides": "jsii-calc.IInterfaceImplementedByAbstractClass",
@@ -527,7 +527,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1274
+        "line": 1275
       },
       "methods": [
         {
@@ -536,7 +536,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1275
+            "line": 1276
           },
           "name": "giveMeAbstract",
           "returns": {
@@ -551,7 +551,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1279
+            "line": 1280
           },
           "name": "giveMeInterface",
           "returns": {
@@ -570,7 +570,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1283
+            "line": 1284
           },
           "name": "returnAbstractFromProperty",
           "type": {
@@ -595,7 +595,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 422
+        "line": 423
       },
       "methods": [
         {
@@ -605,7 +605,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 424
+            "line": 425
           },
           "name": "someMethod",
           "parameters": [
@@ -630,7 +630,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 430
+            "line": 431
           },
           "name": "workItAll",
           "parameters": [
@@ -660,7 +660,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 423
+            "line": 424
           },
           "name": "property",
           "protected": true,
@@ -1325,7 +1325,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2685
+          "line": 2691
         },
         "parameters": [
           {
@@ -1345,7 +1345,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2684
+        "line": 2690
       },
       "name": "AmbiguousParameters",
       "properties": [
@@ -1356,7 +1356,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2687
+            "line": 2693
           },
           "name": "props",
           "type": {
@@ -1370,7 +1370,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2686
+            "line": 2692
           },
           "name": "scope",
           "type": {
@@ -1396,7 +1396,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2214
+        "line": 2219
       },
       "methods": [
         {
@@ -1405,7 +1405,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2218
+            "line": 2224
           },
           "name": "provideAsClass",
           "overrides": "jsii-calc.IAnonymousImplementationProvider",
@@ -1421,7 +1421,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2222
+            "line": 2228
           },
           "name": "provideAsInterface",
           "overrides": "jsii-calc.IAnonymousImplementationProvider",
@@ -1574,7 +1574,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1541
+        "line": 1544
       },
       "methods": [
         {
@@ -1583,7 +1583,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1542
+            "line": 1545
           },
           "name": "methodOne"
         },
@@ -1593,7 +1593,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1548
+            "line": 1551
           },
           "name": "methodTwo"
         }
@@ -1614,7 +1614,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2479
+        "line": 2485
       },
       "name": "BaseJsii976"
     },
@@ -1635,7 +1635,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2423
+        "line": 2429
       },
       "methods": [
         {
@@ -1644,7 +1644,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2426
+            "line": 2432
           },
           "name": "ring",
           "overrides": "jsii-calc.IBell"
@@ -1658,7 +1658,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2424
+            "line": 2430
           },
           "name": "rung",
           "type": {
@@ -1783,7 +1783,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2769
+        "line": 2775
       },
       "methods": [
         {
@@ -1792,7 +1792,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2770
+            "line": 2776
           },
           "name": "check",
           "returns": {
@@ -1810,7 +1810,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2787
+            "line": 2793
           },
           "name": "giveItBack",
           "parameters": [
@@ -1850,7 +1850,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 298
+          "line": 299
         },
         "parameters": [
           {
@@ -1868,7 +1868,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 293
+        "line": 294
       },
       "methods": [
         {
@@ -1878,7 +1878,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 331
+            "line": 332
           },
           "name": "add",
           "parameters": [
@@ -1897,7 +1897,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 338
+            "line": 339
           },
           "name": "mul",
           "parameters": [
@@ -1916,7 +1916,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 352
+            "line": 353
           },
           "name": "neg"
         },
@@ -1927,7 +1927,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 345
+            "line": 346
           },
           "name": "pow",
           "parameters": [
@@ -1946,7 +1946,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 371
+            "line": 372
           },
           "name": "readUnionValue",
           "returns": {
@@ -1966,7 +1966,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 359
+            "line": 360
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
@@ -1982,7 +1982,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 321
+            "line": 322
           },
           "name": "operationsLog",
           "type": {
@@ -2002,7 +2002,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 316
+            "line": 317
           },
           "name": "operationsMap",
           "type": {
@@ -2026,7 +2026,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 311
+            "line": 312
           },
           "name": "curr",
           "type": {
@@ -2040,7 +2040,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 326
+            "line": 327
           },
           "name": "maxValue",
           "optional": true,
@@ -2055,7 +2055,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 366
+            "line": 367
           },
           "name": "unionProperty",
           "optional": true,
@@ -2088,7 +2088,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 254
+        "line": 255
       },
       "name": "CalculatorProps",
       "properties": [
@@ -2103,7 +2103,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 262
+            "line": 263
           },
           "name": "initialValue",
           "optional": true,
@@ -2121,7 +2121,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 269
+            "line": 270
           },
           "name": "maximumValue",
           "optional": true,
@@ -2144,7 +2144,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2503
+        "line": 2509
       },
       "name": "ChildStruct982",
       "properties": [
@@ -2156,7 +2156,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2504
+            "line": 2510
           },
           "name": "bar",
           "type": {
@@ -2182,7 +2182,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1804
+        "line": 1807
       },
       "name": "ClassThatImplementsTheInternalInterface",
       "properties": [
@@ -2192,7 +2192,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1808
+            "line": 1812
           },
           "name": "a",
           "overrides": "jsii-calc.IAnotherPublicInterface",
@@ -2206,7 +2206,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1809
+            "line": 1813
           },
           "name": "b",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2220,7 +2220,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1810
+            "line": 1814
           },
           "name": "c",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2234,7 +2234,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1811
+            "line": 1815
           },
           "name": "d",
           "type": {
@@ -2260,7 +2260,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1814
+        "line": 1818
       },
       "name": "ClassThatImplementsThePrivateInterface",
       "properties": [
@@ -2270,7 +2270,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1816
+            "line": 1821
           },
           "name": "a",
           "overrides": "jsii-calc.IAnotherPublicInterface",
@@ -2284,7 +2284,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1817
+            "line": 1822
           },
           "name": "b",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2298,7 +2298,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1818
+            "line": 1823
           },
           "name": "c",
           "overrides": "jsii-calc.INonInternalInterface",
@@ -2312,7 +2312,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1819
+            "line": 1824
           },
           "name": "e",
           "type": {
@@ -2333,7 +2333,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2120
+          "line": 2125
         },
         "parameters": [
           {
@@ -2363,7 +2363,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2110
+        "line": 2115
       },
       "methods": [
         {
@@ -2372,7 +2372,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2125
+            "line": 2130
           },
           "name": "createAList",
           "returns": {
@@ -2393,7 +2393,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2129
+            "line": 2134
           },
           "name": "createAMap",
           "returns": {
@@ -2417,7 +2417,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2118
+            "line": 2123
           },
           "name": "staticArray",
           "static": true,
@@ -2436,7 +2436,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2114
+            "line": 2119
           },
           "name": "staticMap",
           "static": true,
@@ -2455,7 +2455,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2112
+            "line": 2117
           },
           "name": "array",
           "type": {
@@ -2473,7 +2473,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2111
+            "line": 2116
           },
           "name": "map",
           "type": {
@@ -2508,7 +2508,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1887
+        "line": 1892
       },
       "name": "ClassWithDocs"
     },
@@ -2524,7 +2524,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2060
+          "line": 2065
         },
         "parameters": [
           {
@@ -2538,7 +2538,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2057
+        "line": 2062
       },
       "methods": [
         {
@@ -2547,7 +2547,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2064
+            "line": 2069
           },
           "name": "import",
           "parameters": [
@@ -2574,7 +2574,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2058
+            "line": 2063
           },
           "name": "int",
           "type": {
@@ -2597,7 +2597,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1294
+        "line": 1295
       },
       "name": "ClassWithMutableObjectLiteralProperty",
       "properties": [
@@ -2607,7 +2607,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1295
+            "line": 1296
           },
           "name": "mutableObject",
           "type": {
@@ -2629,7 +2629,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1321
+        "line": 1322
       },
       "methods": [
         {
@@ -2638,7 +2638,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1323
+            "line": 1325
           },
           "name": "create",
           "parameters": [
@@ -2672,7 +2672,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1331
+            "line": 1333
           },
           "name": "readOnlyString",
           "overrides": "jsii-calc.IInterfaceWithProperties",
@@ -2686,7 +2686,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1332
+            "line": 1334
           },
           "name": "readWriteString",
           "overrides": "jsii-calc.IInterfaceWithProperties",
@@ -2707,7 +2707,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2642
+        "line": 2648
       },
       "methods": [
         {
@@ -2716,7 +2716,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2643
+            "line": 2649
           },
           "name": "makeInstance",
           "returns": {
@@ -2732,7 +2732,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2647
+            "line": 2653
           },
           "name": "makeStructInstance",
           "returns": {
@@ -2751,7 +2751,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2651
+            "line": 2657
           },
           "name": "unionProperty",
           "optional": true,
@@ -2794,7 +2794,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2655
+        "line": 2661
       },
       "name": "ConfusingToJacksonStruct",
       "properties": [
@@ -2806,7 +2806,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2656
+            "line": 2662
           },
           "name": "unionProperty",
           "optional": true,
@@ -2851,7 +2851,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1844
+          "line": 1849
         },
         "parameters": [
           {
@@ -2865,7 +2865,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1843
+        "line": 1848
       },
       "name": "ConstructorPassesThisOut"
     },
@@ -2883,7 +2883,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1589
+        "line": 1592
       },
       "methods": [
         {
@@ -2892,7 +2892,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1606
+            "line": 1609
           },
           "name": "hiddenInterface",
           "returns": {
@@ -2908,7 +2908,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1610
+            "line": 1613
           },
           "name": "hiddenInterfaces",
           "returns": {
@@ -2929,7 +2929,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1614
+            "line": 1617
           },
           "name": "hiddenSubInterfaces",
           "returns": {
@@ -2950,7 +2950,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1590
+            "line": 1593
           },
           "name": "makeClass",
           "returns": {
@@ -2966,7 +2966,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1594
+            "line": 1597
           },
           "name": "makeInterface",
           "returns": {
@@ -2982,7 +2982,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1598
+            "line": 1601
           },
           "name": "makeInterface2",
           "returns": {
@@ -2998,7 +2998,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1602
+            "line": 1605
           },
           "name": "makeInterfaces",
           "returns": {
@@ -3028,7 +3028,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2666
+          "line": 2672
         },
         "parameters": [
           {
@@ -3042,7 +3042,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2665
+        "line": 2671
       },
       "methods": [
         {
@@ -3051,7 +3051,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2668
+            "line": 2674
           },
           "name": "workItBaby",
           "returns": {
@@ -3079,7 +3079,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2308
+        "line": 2314
       },
       "methods": [
         {
@@ -3090,7 +3090,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2314
+            "line": 2320
           },
           "name": "staticImplementedByObjectLiteral",
           "parameters": [
@@ -3116,7 +3116,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2340
+            "line": 2346
           },
           "name": "staticImplementedByPrivateClass",
           "parameters": [
@@ -3142,7 +3142,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2329
+            "line": 2335
           },
           "name": "staticImplementedByPublicClass",
           "parameters": [
@@ -3168,7 +3168,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2351
+            "line": 2357
           },
           "name": "staticWhenTypedAsClass",
           "parameters": [
@@ -3194,7 +3194,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2361
+            "line": 2367
           },
           "name": "implementedByObjectLiteral",
           "parameters": [
@@ -3219,7 +3219,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2387
+            "line": 2393
           },
           "name": "implementedByPrivateClass",
           "parameters": [
@@ -3244,7 +3244,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2376
+            "line": 2382
           },
           "name": "implementedByPublicClass",
           "parameters": [
@@ -3269,7 +3269,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2398
+            "line": 2404
           },
           "name": "whenTypedAsClass",
           "parameters": [
@@ -3303,7 +3303,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1822
+        "line": 1827
       },
       "methods": [
         {
@@ -3312,7 +3312,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1823
+            "line": 1828
           },
           "name": "consumeAnotherPublicInterface",
           "parameters": [
@@ -3335,7 +3335,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1827
+            "line": 1832
           },
           "name": "consumeNonInternalInterface",
           "parameters": [
@@ -3370,7 +3370,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1983
+        "line": 1988
       },
       "methods": [
         {
@@ -3379,7 +3379,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1984
+            "line": 1989
           },
           "name": "render",
           "parameters": [
@@ -3403,7 +3403,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1990
+            "line": 1995
           },
           "name": "renderArbitrary",
           "parameters": [
@@ -3431,7 +3431,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1994
+            "line": 1999
           },
           "name": "renderMap",
           "parameters": [
@@ -3472,7 +3472,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2953
+        "line": 2959
       },
       "methods": [
         {
@@ -3481,7 +3481,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2954
+            "line": 2960
           },
           "name": "pleaseCompile"
         }
@@ -3594,7 +3594,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2510
+        "line": 2516
       },
       "methods": [
         {
@@ -3604,7 +3604,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2517
+            "line": 2523
           },
           "name": "takeThis",
           "returns": {
@@ -3621,7 +3621,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2522
+            "line": 2528
           },
           "name": "takeThisToo",
           "returns": {
@@ -4006,7 +4006,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2028
+        "line": 2033
       },
       "name": "DiamondInheritanceBaseLevelStruct",
       "properties": [
@@ -4018,7 +4018,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2029
+            "line": 2034
           },
           "name": "baseLevelProperty",
           "type": {
@@ -4040,7 +4040,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2032
+        "line": 2037
       },
       "name": "DiamondInheritanceFirstMidLevelStruct",
       "properties": [
@@ -4052,7 +4052,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2034
+            "line": 2039
           },
           "name": "firstMidLevelProperty",
           "type": {
@@ -4074,7 +4074,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2037
+        "line": 2042
       },
       "name": "DiamondInheritanceSecondMidLevelStruct",
       "properties": [
@@ -4086,7 +4086,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2039
+            "line": 2044
           },
           "name": "secondMidLevelProperty",
           "type": {
@@ -4109,7 +4109,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2042
+        "line": 2047
       },
       "name": "DiamondInheritanceTopLevelStruct",
       "properties": [
@@ -4121,7 +4121,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2045
+            "line": 2050
           },
           "name": "topLevelProperty",
           "type": {
@@ -4141,7 +4141,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2532
+        "line": 2538
       },
       "name": "DisappointingCollectionSource",
       "properties": [
@@ -4155,7 +4155,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2534
+            "line": 2540
           },
           "name": "maybeList",
           "optional": true,
@@ -4179,7 +4179,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2536
+            "line": 2542
           },
           "name": "maybeMap",
           "optional": true,
@@ -4209,7 +4209,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1298
+        "line": 1299
       },
       "methods": [
         {
@@ -4218,7 +4218,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1313
+            "line": 1314
           },
           "name": "changePrivatePropertyValue",
           "parameters": [
@@ -4236,7 +4236,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1305
+            "line": 1306
           },
           "name": "privateMethodValue",
           "returns": {
@@ -4251,7 +4251,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1309
+            "line": 1310
           },
           "name": "privatePropertyValue",
           "returns": {
@@ -4278,7 +4278,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1354
+        "line": 1356
       },
       "methods": [
         {
@@ -4287,7 +4287,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1355
+            "line": 1357
           },
           "name": "method",
           "parameters": [
@@ -4394,7 +4394,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1431
+        "line": 1433
       },
       "methods": [
         {
@@ -4403,7 +4403,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1432
+            "line": 1434
           },
           "name": "optionalAndVariadic",
           "parameters": [
@@ -4502,7 +4502,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2794
+          "line": 2800
         },
         "parameters": [
           {
@@ -4516,7 +4516,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2793
+        "line": 2799
       },
       "name": "DynamicPropertyBearer",
       "properties": [
@@ -4526,7 +4526,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2796
+            "line": 2802
           },
           "name": "dynamicProperty",
           "type": {
@@ -4539,7 +4539,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2794
+            "line": 2800
           },
           "name": "valueStore",
           "type": {
@@ -4561,7 +4561,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2805
+          "line": 2811
         },
         "parameters": [
           {
@@ -4575,7 +4575,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2804
+        "line": 2810
       },
       "methods": [
         {
@@ -4586,7 +4586,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2816
+            "line": 2822
           },
           "name": "overrideValue",
           "parameters": [
@@ -4616,7 +4616,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2805
+            "line": 2811
           },
           "name": "originalValue",
           "type": {
@@ -4770,7 +4770,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1645
+        "line": 1648
       },
       "methods": [
         {
@@ -4781,7 +4781,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1650
+            "line": 1653
           },
           "name": "doesKeyExist",
           "parameters": [
@@ -4812,7 +4812,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1670
+            "line": 1673
           },
           "name": "prop1IsNull",
           "returns": {
@@ -4834,7 +4834,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1660
+            "line": 1663
           },
           "name": "prop2IsUndefined",
           "returns": {
@@ -4862,7 +4862,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1640
+        "line": 1643
       },
       "name": "EraseUndefinedHashValuesOptions",
       "properties": [
@@ -4874,7 +4874,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1641
+            "line": 1644
           },
           "name": "option1",
           "optional": true,
@@ -4890,7 +4890,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1642
+            "line": 1645
           },
           "name": "option2",
           "optional": true,
@@ -5049,7 +5049,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1517
+          "line": 1519
         },
         "parameters": [
           {
@@ -5063,7 +5063,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1516
+        "line": 1518
       },
       "name": "ExportedBaseClass",
       "properties": [
@@ -5074,7 +5074,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1517
+            "line": 1519
           },
           "name": "success",
           "type": {
@@ -5093,7 +5093,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1759
+        "line": 1762
       },
       "name": "ExtendsInternalInterface",
       "properties": [
@@ -5105,7 +5105,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1760
+            "line": 1763
           },
           "name": "boom",
           "type": {
@@ -5120,7 +5120,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1700
+            "line": 1703
           },
           "name": "prop",
           "type": {
@@ -5492,7 +5492,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2210
+        "line": 2215
       },
       "methods": [
         {
@@ -5502,7 +5502,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2212
+            "line": 2217
           },
           "name": "provideAsClass",
           "returns": {
@@ -5518,7 +5518,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2211
+            "line": 2216
           },
           "name": "provideAsInterface",
           "returns": {
@@ -5539,7 +5539,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2229
+        "line": 2235
       },
       "methods": [
         {
@@ -5549,7 +5549,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2231
+            "line": 2237
           },
           "name": "verb",
           "returns": {
@@ -5569,7 +5569,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2230
+            "line": 2236
           },
           "name": "value",
           "type": {
@@ -5587,7 +5587,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1780
+        "line": 1783
       },
       "name": "IAnotherPublicInterface",
       "properties": [
@@ -5598,7 +5598,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1781
+            "line": 1784
           },
           "name": "a",
           "type": {
@@ -5616,7 +5616,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2419
+        "line": 2425
       },
       "methods": [
         {
@@ -5626,7 +5626,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2420
+            "line": 2426
           },
           "name": "ring"
         }
@@ -5643,7 +5643,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2408
+        "line": 2414
       },
       "methods": [
         {
@@ -5653,7 +5653,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2409
+            "line": 2415
           },
           "name": "yourTurn",
           "parameters": [
@@ -5678,7 +5678,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2415
+        "line": 2421
       },
       "methods": [
         {
@@ -5688,7 +5688,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2416
+            "line": 2422
           },
           "name": "yourTurn",
           "parameters": [
@@ -5801,7 +5801,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1771
+        "line": 1774
       },
       "name": "IExtendsPrivateInterface",
       "properties": [
@@ -5813,7 +5813,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1772
+            "line": 1775
           },
           "name": "moreThings",
           "type": {
@@ -5832,7 +5832,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1756
+            "line": 1759
           },
           "name": "private",
           "type": {
@@ -6008,7 +6008,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1346
+        "line": 1348
       },
       "name": "IInterfaceThatShouldNotBeADataType",
       "properties": [
@@ -6020,7 +6020,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1348
+            "line": 1350
           },
           "name": "otherValue",
           "type": {
@@ -6038,7 +6038,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1711
+        "line": 1714
       },
       "methods": [
         {
@@ -6048,7 +6048,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1712
+            "line": 1715
           },
           "name": "visible"
         }
@@ -6064,7 +6064,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1336
+        "line": 1338
       },
       "methods": [
         {
@@ -6074,7 +6074,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1339
+            "line": 1341
           },
           "name": "doThings"
         }
@@ -6089,7 +6089,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1337
+            "line": 1339
           },
           "name": "value",
           "type": {
@@ -6364,7 +6364,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1290
+        "line": 1291
       },
       "name": "IMutableObjectLiteral",
       "properties": [
@@ -6375,7 +6375,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1291
+            "line": 1292
           },
           "name": "value",
           "type": {
@@ -6396,7 +6396,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1789
+        "line": 1792
       },
       "name": "INonInternalInterface",
       "properties": [
@@ -6407,7 +6407,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1786
+            "line": 1789
           },
           "name": "b",
           "type": {
@@ -6421,7 +6421,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1790
+            "line": 1793
           },
           "name": "c",
           "type": {
@@ -6440,7 +6440,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2544
+        "line": 2550
       },
       "methods": [
         {
@@ -6450,7 +6450,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2546
+            "line": 2552
           },
           "name": "wasSet",
           "returns": {
@@ -6469,7 +6469,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2545
+            "line": 2551
           },
           "name": "property",
           "type": {
@@ -6488,7 +6488,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2733
+        "line": 2739
       },
       "methods": [
         {
@@ -6498,7 +6498,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2734
+            "line": 2740
           },
           "name": "optional",
           "returns": {
@@ -6520,7 +6520,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1513
+        "line": 1515
       },
       "name": "IPrivatelyImplemented",
       "properties": [
@@ -6532,7 +6532,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1514
+            "line": 1516
           },
           "name": "success",
           "type": {
@@ -6550,7 +6550,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1560
+        "line": 1563
       },
       "methods": [
         {
@@ -6560,7 +6560,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1561
+            "line": 1564
           },
           "name": "bye",
           "returns": {
@@ -6581,7 +6581,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1564
+        "line": 1567
       },
       "methods": [
         {
@@ -6591,7 +6591,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1565
+            "line": 1568
           },
           "name": "ciao",
           "returns": {
@@ -6647,7 +6647,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2475
+        "line": 2481
       },
       "name": "IReturnJsii976",
       "properties": [
@@ -6659,7 +6659,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2476
+            "line": 2482
           },
           "name": "foo",
           "type": {
@@ -6769,7 +6769,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2662
+        "line": 2668
       },
       "methods": [
         {
@@ -6779,7 +6779,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2663
+            "line": 2669
           },
           "name": "returnStruct",
           "returns": {
@@ -6838,7 +6838,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1763
+        "line": 1766
       },
       "name": "ImplementInternalInterface",
       "properties": [
@@ -6848,7 +6848,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1764
+            "line": 1767
           },
           "name": "prop",
           "type": {
@@ -6871,7 +6871,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2226
+        "line": 2232
       },
       "name": "Implementation",
       "properties": [
@@ -6882,7 +6882,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2227
+            "line": 2233
           },
           "name": "value",
           "type": {
@@ -6908,7 +6908,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1718
+        "line": 1721
       },
       "methods": [
         {
@@ -6917,7 +6917,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1719
+            "line": 1722
           },
           "name": "visible",
           "overrides": "jsii-calc.IInterfaceWithInternal"
@@ -6940,7 +6940,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1737
+        "line": 1740
       },
       "name": "ImplementsInterfaceWithInternalSubclass"
     },
@@ -6958,7 +6958,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1767
+        "line": 1770
       },
       "name": "ImplementsPrivateInterface",
       "properties": [
@@ -6968,7 +6968,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1768
+            "line": 1771
           },
           "name": "private",
           "type": {
@@ -7029,7 +7029,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1567
+        "line": 1570
       },
       "methods": [
         {
@@ -7038,7 +7038,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1568
+            "line": 1571
           },
           "name": "ciao",
           "overrides": "jsii-calc.IPublicInterface2",
@@ -7062,7 +7062,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2696
+        "line": 2702
       },
       "methods": [
         {
@@ -7071,7 +7071,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2707
+            "line": 2713
           },
           "name": "listOfInterfaces",
           "returns": {
@@ -7092,7 +7092,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2697
+            "line": 2703
           },
           "name": "listOfStructs",
           "returns": {
@@ -7113,7 +7113,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2717
+            "line": 2723
           },
           "name": "mapOfInterfaces",
           "returns": {
@@ -7134,7 +7134,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2701
+            "line": 2707
           },
           "name": "mapOfStructs",
           "returns": {
@@ -7261,7 +7261,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2098
+        "line": 2103
       },
       "methods": [
         {
@@ -7270,7 +7270,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2099
+            "line": 2104
           },
           "name": "makeInterfaces",
           "parameters": [
@@ -7313,7 +7313,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2743
+        "line": 2749
       },
       "methods": [
         {
@@ -7322,7 +7322,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2744
+            "line": 2750
           },
           "name": "myself",
           "returns": {
@@ -7350,13 +7350,13 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2937
+          "line": 2943
         }
       },
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2933
+        "line": 2939
       },
       "name": "Issue2638"
     },
@@ -7372,13 +7372,13 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2943
+          "line": 2949
         }
       },
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2942
+        "line": 2948
       },
       "name": "Issue2638B"
     },
@@ -8258,7 +8258,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1530
+        "line": 1533
       },
       "name": "JsiiAgent",
       "properties": [
@@ -8270,7 +8270,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1534
+            "line": 1537
           },
           "name": "value",
           "optional": true,
@@ -8292,7 +8292,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2577
+        "line": 2583
       },
       "methods": [
         {
@@ -8301,7 +8301,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2622
+            "line": 2628
           },
           "name": "anyArray",
           "returns": {
@@ -8317,7 +8317,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2618
+            "line": 2624
           },
           "name": "anyBooleanFalse",
           "returns": {
@@ -8333,7 +8333,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2614
+            "line": 2620
           },
           "name": "anyBooleanTrue",
           "returns": {
@@ -8349,7 +8349,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2594
+            "line": 2600
           },
           "name": "anyDate",
           "returns": {
@@ -8365,7 +8365,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2610
+            "line": 2616
           },
           "name": "anyEmptyString",
           "returns": {
@@ -8381,7 +8381,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2590
+            "line": 2596
           },
           "name": "anyFunction",
           "returns": {
@@ -8397,7 +8397,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2626
+            "line": 2632
           },
           "name": "anyHash",
           "returns": {
@@ -8413,7 +8413,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2582
+            "line": 2588
           },
           "name": "anyNull",
           "returns": {
@@ -8429,7 +8429,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2598
+            "line": 2604
           },
           "name": "anyNumber",
           "returns": {
@@ -8445,7 +8445,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2630
+            "line": 2636
           },
           "name": "anyRef",
           "returns": {
@@ -8461,7 +8461,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2606
+            "line": 2612
           },
           "name": "anyString",
           "returns": {
@@ -8477,7 +8477,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2586
+            "line": 2592
           },
           "name": "anyUndefined",
           "returns": {
@@ -8493,7 +8493,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2602
+            "line": 2608
           },
           "name": "anyZero",
           "returns": {
@@ -8509,7 +8509,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2578
+            "line": 2584
           },
           "name": "stringify",
           "parameters": [
@@ -8545,7 +8545,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2828
+          "line": 2834
         },
         "parameters": [
           {
@@ -8559,7 +8559,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2827
+        "line": 2833
       },
       "name": "LevelOne",
       "properties": [
@@ -8570,7 +8570,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2828
+            "line": 2834
           },
           "name": "props",
           "type": {
@@ -8589,7 +8589,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2838
+        "line": 2844
       },
       "name": "PropBooleanValue",
       "namespace": "LevelOne",
@@ -8602,7 +8602,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2839
+            "line": 2845
           },
           "name": "value",
           "type": {
@@ -8621,7 +8621,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2834
+        "line": 2840
       },
       "name": "PropProperty",
       "namespace": "LevelOne",
@@ -8634,7 +8634,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2835
+            "line": 2841
           },
           "name": "prop",
           "type": {
@@ -8653,7 +8653,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2830
+        "line": 2836
       },
       "name": "LevelOneProps",
       "properties": [
@@ -8665,7 +8665,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2831
+            "line": 2837
           },
           "name": "prop",
           "type": {
@@ -8685,7 +8685,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1440
+        "line": 1442
       },
       "name": "LoadBalancedFargateServiceProps",
       "properties": [
@@ -8700,7 +8700,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1483
+            "line": 1485
           },
           "name": "containerPort",
           "optional": true,
@@ -8719,7 +8719,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1454
+            "line": 1456
           },
           "name": "cpu",
           "optional": true,
@@ -8738,7 +8738,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1476
+            "line": 1478
           },
           "name": "memoryMiB",
           "optional": true,
@@ -8756,7 +8756,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1490
+            "line": 1492
           },
           "name": "publicLoadBalancer",
           "optional": true,
@@ -8774,7 +8774,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1497
+            "line": 1499
           },
           "name": "publicTasks",
           "optional": true,
@@ -8798,7 +8798,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 407
+        "line": 408
       },
       "methods": [
         {
@@ -8807,7 +8807,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 408
+            "line": 409
           },
           "name": "property",
           "returns": {
@@ -8826,7 +8826,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 412
+            "line": 413
           },
           "name": "elite",
           "type": {
@@ -8890,7 +8890,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 96
+            "line": 97
           },
           "name": "farewell",
           "overrides": "jsii-calc.IFriendlier",
@@ -8907,7 +8907,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 92
+            "line": 93
           },
           "name": "goodbye",
           "overrides": "jsii-calc.IFriendlier",
@@ -8924,7 +8924,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 100
+            "line": 101
           },
           "name": "next",
           "overrides": "jsii-calc.IRandomNumberGenerator",
@@ -8941,7 +8941,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 88
+            "line": 89
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -8962,7 +8962,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 84
+            "line": 85
           },
           "name": "value",
           "overrides": "@scope/jsii-calc-lib.NumericValue",
@@ -8986,7 +8986,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 109
+          "line": 110
         },
         "parameters": [
           {
@@ -9003,7 +9003,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 117
+        "line": 118
       },
       "methods": [
         {
@@ -9013,7 +9013,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 134
+            "line": 135
           },
           "name": "farewell",
           "overrides": "jsii-calc.IFriendlier",
@@ -9030,7 +9030,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 130
+            "line": 131
           },
           "name": "goodbye",
           "overrides": "jsii-calc.IFriendlier",
@@ -9047,7 +9047,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 126
+            "line": 127
           },
           "name": "hello",
           "overrides": "@scope/jsii-calc-lib.IFriendly",
@@ -9064,7 +9064,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 122
+            "line": 123
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -9085,7 +9085,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 118
+            "line": 119
           },
           "name": "value",
           "overrides": "@scope/jsii-calc-lib.NumericValue",
@@ -9136,7 +9136,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2451
+        "line": 2457
       },
       "name": "NestedStruct",
       "properties": [
@@ -9149,7 +9149,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2455
+            "line": 2461
           },
           "name": "numberProp",
           "type": {
@@ -9261,7 +9261,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1370
+          "line": 1372
         },
         "parameters": [
           {
@@ -9282,7 +9282,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1367
+        "line": 1369
       },
       "methods": [
         {
@@ -9291,7 +9291,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1378
+            "line": 1380
           },
           "name": "giveMeUndefined",
           "parameters": [
@@ -9310,7 +9310,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1388
+            "line": 1390
           },
           "name": "giveMeUndefinedInsideAnObject",
           "parameters": [
@@ -9328,7 +9328,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1417
+            "line": 1419
           },
           "name": "verifyPropertyIsUndefined"
         }
@@ -9341,7 +9341,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1368
+            "line": 1370
           },
           "name": "changeMeToUndefined",
           "optional": true,
@@ -9361,7 +9361,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1426
+        "line": 1428
       },
       "name": "NullShouldBeTreatedAsUndefinedData",
       "properties": [
@@ -9373,7 +9373,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1428
+            "line": 1430
           },
           "name": "arrayWithThreeElementsAndUndefinedAsSecondArgument",
           "type": {
@@ -9393,7 +9393,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1427
+            "line": 1429
           },
           "name": "thisShouldBeUndefined",
           "optional": true,
@@ -9577,7 +9577,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2548
+        "line": 2554
       },
       "methods": [
         {
@@ -9586,7 +9586,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2549
+            "line": 2555
           },
           "name": "provide",
           "returns": {
@@ -9782,7 +9782,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1869
+        "line": 1874
       },
       "name": "OptionalStruct",
       "properties": [
@@ -9794,7 +9794,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1870
+            "line": 1875
           },
           "name": "field",
           "optional": true,
@@ -9816,7 +9816,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1864
+          "line": 1869
         },
         "parameters": [
           {
@@ -9831,7 +9831,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1860
+        "line": 1865
       },
       "name": "OptionalStructConsumer",
       "properties": [
@@ -9842,7 +9842,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1861
+            "line": 1866
           },
           "name": "parameterWasUndefined",
           "type": {
@@ -9856,7 +9856,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1862
+            "line": 1867
           },
           "name": "fieldValue",
           "optional": true,
@@ -9881,7 +9881,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2137
+        "line": 2142
       },
       "methods": [
         {
@@ -9890,7 +9890,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2149
+            "line": 2154
           },
           "name": "overrideMe",
           "protected": true,
@@ -9906,7 +9906,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2145
+            "line": 2150
           },
           "name": "switchModes"
         },
@@ -9916,7 +9916,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2141
+            "line": 2146
           },
           "name": "valueFromProtected",
           "returns": {
@@ -9935,7 +9935,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2138
+            "line": 2143
           },
           "name": "overrideReadOnly",
           "protected": true,
@@ -9949,7 +9949,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2139
+            "line": 2144
           },
           "name": "overrideReadWrite",
           "protected": true,
@@ -10013,7 +10013,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2500
+        "line": 2506
       },
       "name": "ParentStruct982",
       "properties": [
@@ -10025,7 +10025,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2501
+            "line": 2507
           },
           "name": "foo",
           "type": {
@@ -10049,7 +10049,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1835
+        "line": 1840
       },
       "methods": [
         {
@@ -10059,7 +10059,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1836
+            "line": 1841
           },
           "name": "consumePartiallyInitializedThis",
           "parameters": [
@@ -10149,7 +10149,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 235
+          "line": 236
         },
         "parameters": [
           {
@@ -10175,7 +10175,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 229
+        "line": 230
       },
       "name": "Power",
       "properties": [
@@ -10187,7 +10187,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 236
+            "line": 237
           },
           "name": "base",
           "type": {
@@ -10203,7 +10203,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 242
+            "line": 243
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
@@ -10219,7 +10219,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 237
+            "line": 238
           },
           "name": "pow",
           "type": {
@@ -10243,7 +10243,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 403
+        "line": 404
       },
       "name": "PropertyNamedProperty",
       "properties": [
@@ -10254,7 +10254,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 404
+            "line": 405
           },
           "name": "property",
           "type": {
@@ -10268,7 +10268,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 405
+            "line": 406
           },
           "name": "yetAnoterOne",
           "type": {
@@ -10291,7 +10291,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1555
+        "line": 1558
       },
       "methods": [
         {
@@ -10300,7 +10300,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1556
+            "line": 1559
           },
           "name": "hello"
         }
@@ -10926,7 +10926,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1508
+        "line": 1510
       },
       "name": "ReturnsPrivateImplementationOfInterface",
       "properties": [
@@ -10937,7 +10937,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1509
+            "line": 1511
           },
           "name": "privateImplementation",
           "type": {
@@ -10958,7 +10958,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2444
+        "line": 2450
       },
       "name": "RootStruct",
       "properties": [
@@ -10971,7 +10971,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2448
+            "line": 2454
           },
           "name": "stringProp",
           "type": {
@@ -10986,7 +10986,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2449
+            "line": 2455
           },
           "name": "nestedStruct",
           "optional": true,
@@ -11005,7 +11005,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2457
+        "line": 2463
       },
       "methods": [
         {
@@ -11014,7 +11014,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2458
+            "line": 2464
           },
           "name": "validate",
           "parameters": [
@@ -11144,7 +11144,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2016
+        "line": 2021
       },
       "name": "SecondLevelStruct",
       "properties": [
@@ -11157,7 +11157,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2020
+            "line": 2025
           },
           "name": "deeperRequiredProp",
           "type": {
@@ -11173,7 +11173,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2025
+            "line": 2030
           },
           "name": "deeperOptionalProp",
           "optional": true,
@@ -11199,7 +11199,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1626
+        "line": 1629
       },
       "methods": [
         {
@@ -11208,7 +11208,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1629
+            "line": 1632
           },
           "name": "interface1",
           "returns": {
@@ -11223,7 +11223,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1633
+            "line": 1636
           },
           "name": "interface2",
           "returns": {
@@ -11246,7 +11246,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1968
+        "line": 1973
       },
       "methods": [
         {
@@ -11255,7 +11255,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1970
+            "line": 1975
           },
           "name": "isSingletonInt",
           "parameters": [
@@ -11285,7 +11285,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1975
+        "line": 1980
       },
       "members": [
         {
@@ -11309,7 +11309,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1951
+        "line": 1956
       },
       "methods": [
         {
@@ -11318,7 +11318,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1954
+            "line": 1959
           },
           "name": "isSingletonString",
           "parameters": [
@@ -11348,7 +11348,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1959
+        "line": 1964
       },
       "members": [
         {
@@ -11371,7 +11371,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 414
+        "line": 415
       },
       "name": "SmellyStruct",
       "properties": [
@@ -11383,7 +11383,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 415
+            "line": 416
           },
           "name": "property",
           "type": {
@@ -11398,7 +11398,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 416
+            "line": 417
           },
           "name": "yetAnoterOne",
           "type": {
@@ -11421,7 +11421,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2481
+        "line": 2487
       },
       "methods": [
         {
@@ -11430,7 +11430,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2490
+            "line": 2496
           },
           "name": "returnAnonymous",
           "returns": {
@@ -11446,7 +11446,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2482
+            "line": 2488
           },
           "name": "returnReturn",
           "returns": {
@@ -11607,7 +11607,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1894
+        "line": 1899
       },
       "methods": [
         {
@@ -11616,7 +11616,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1897
+            "line": 1902
           },
           "name": "canAccessStaticContext",
           "returns": {
@@ -11635,7 +11635,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1905
+            "line": 1910
           },
           "name": "staticVariable",
           "static": true,
@@ -11655,7 +11655,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2862
+        "line": 2868
       },
       "methods": [
         {
@@ -11664,7 +11664,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2867
+            "line": 2873
           },
           "name": "method",
           "overrides": "jsii-calc.StaticHelloParent",
@@ -11680,7 +11680,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2863
+            "line": 2869
           },
           "name": "property",
           "overrides": "jsii-calc.StaticHelloParent",
@@ -11707,7 +11707,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2853
+        "line": 2859
       },
       "methods": [
         {
@@ -11716,7 +11716,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2858
+            "line": 2864
           },
           "name": "method",
           "static": true
@@ -11731,7 +11731,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2854
+            "line": 2860
           },
           "name": "property",
           "static": true,
@@ -11981,7 +11981,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1679
+        "line": 1682
       },
       "name": "StripInternal",
       "properties": [
@@ -11991,7 +11991,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1680
+            "line": 1683
           },
           "name": "youSeeMe",
           "type": {
@@ -12011,7 +12011,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2242
+        "line": 2248
       },
       "name": "StructA",
       "properties": [
@@ -12023,7 +12023,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2243
+            "line": 2249
           },
           "name": "requiredString",
           "type": {
@@ -12038,7 +12038,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2245
+            "line": 2251
           },
           "name": "optionalNumber",
           "optional": true,
@@ -12054,7 +12054,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2244
+            "line": 2250
           },
           "name": "optionalString",
           "optional": true,
@@ -12075,7 +12075,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2251
+        "line": 2257
       },
       "name": "StructB",
       "properties": [
@@ -12087,7 +12087,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2252
+            "line": 2258
           },
           "name": "requiredString",
           "type": {
@@ -12102,7 +12102,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2253
+            "line": 2259
           },
           "name": "optionalBoolean",
           "optional": true,
@@ -12118,7 +12118,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2254
+            "line": 2260
           },
           "name": "optionalStructA",
           "optional": true,
@@ -12140,7 +12140,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2680
+        "line": 2686
       },
       "name": "StructParameterType",
       "properties": [
@@ -12152,7 +12152,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2681
+            "line": 2687
           },
           "name": "scope",
           "type": {
@@ -12167,7 +12167,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2682
+            "line": 2688
           },
           "name": "props",
           "optional": true,
@@ -12192,7 +12192,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2074
+        "line": 2079
       },
       "methods": [
         {
@@ -12201,7 +12201,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2086
+            "line": 2091
           },
           "name": "howManyVarArgsDidIPass",
           "parameters": [
@@ -12233,7 +12233,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2075
+            "line": 2080
           },
           "name": "roundTrip",
           "parameters": [
@@ -12269,7 +12269,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2256
+        "line": 2262
       },
       "methods": [
         {
@@ -12278,7 +12278,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2257
+            "line": 2263
           },
           "name": "isStructA",
           "parameters": [
@@ -12311,7 +12311,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2278
+            "line": 2284
           },
           "name": "isStructB",
           "parameters": [
@@ -12351,7 +12351,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2879
+        "line": 2885
       },
       "name": "StructWithEnum",
       "properties": [
@@ -12364,7 +12364,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2883
+            "line": 2889
           },
           "name": "foo",
           "type": {
@@ -12381,7 +12381,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2889
+            "line": 2895
           },
           "name": "bar",
           "optional": true,
@@ -12401,7 +12401,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2048
+        "line": 2053
       },
       "name": "StructWithJavaReservedWords",
       "properties": [
@@ -12413,7 +12413,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2049
+            "line": 2054
           },
           "name": "default",
           "type": {
@@ -12428,7 +12428,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2050
+            "line": 2055
           },
           "name": "assert",
           "optional": true,
@@ -12444,7 +12444,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2053
+            "line": 2058
           },
           "name": "result",
           "optional": true,
@@ -12460,7 +12460,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2054
+            "line": 2059
           },
           "name": "that",
           "optional": true,
@@ -12484,13 +12484,13 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 213
+          "line": 214
         }
       },
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 205
+        "line": 206
       },
       "name": "Sum",
       "properties": [
@@ -12503,7 +12503,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 217
+            "line": 218
           },
           "name": "expression",
           "overrides": "jsii-calc.composition.CompositeOperation",
@@ -12518,7 +12518,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 209
+            "line": 210
           },
           "name": "parts",
           "type": {
@@ -12545,7 +12545,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2183
+          "line": 2188
         },
         "parameters": [
           {
@@ -12593,7 +12593,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2173
+        "line": 2178
       },
       "name": "SupportsNiceJavaBuilder",
       "properties": [
@@ -12605,7 +12605,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2184
+            "line": 2189
           },
           "name": "id",
           "overrides": "jsii-calc.SupportsNiceJavaBuilderWithRequiredProps",
@@ -12620,7 +12620,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2174
+            "line": 2179
           },
           "name": "rest",
           "type": {
@@ -12644,7 +12644,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2193
+        "line": 2198
       },
       "name": "SupportsNiceJavaBuilderProps",
       "properties": [
@@ -12657,7 +12657,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2203
+            "line": 2208
           },
           "name": "bar",
           "type": {
@@ -12674,7 +12674,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2198
+            "line": 2203
           },
           "name": "id",
           "optional": true,
@@ -12697,7 +12697,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 2165
+          "line": 2170
         },
         "parameters": [
           {
@@ -12723,7 +12723,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2157
+        "line": 2162
       },
       "name": "SupportsNiceJavaBuilderWithRequiredProps",
       "properties": [
@@ -12734,7 +12734,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2159
+            "line": 2164
           },
           "name": "bar",
           "type": {
@@ -12749,7 +12749,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2166
+            "line": 2171
           },
           "name": "id",
           "type": {
@@ -12763,7 +12763,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2158
+            "line": 2163
           },
           "name": "propId",
           "optional": true,
@@ -13056,7 +13056,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2892
+        "line": 2898
       },
       "methods": [
         {
@@ -13066,7 +13066,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2896
+            "line": 2902
           },
           "name": "isStringEnumA",
           "parameters": [
@@ -13090,7 +13090,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2903
+            "line": 2909
           },
           "name": "isStringEnumB",
           "parameters": [
@@ -13118,7 +13118,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2922
+            "line": 2928
           },
           "name": "structWithFoo",
           "type": {
@@ -13133,7 +13133,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2912
+            "line": 2918
           },
           "name": "structWithFooBar",
           "type": {
@@ -13182,7 +13182,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1999
+        "line": 2004
       },
       "name": "TopLevelStruct",
       "properties": [
@@ -13195,7 +13195,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2003
+            "line": 2008
           },
           "name": "required",
           "type": {
@@ -13211,7 +13211,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2013
+            "line": 2018
           },
           "name": "secondLevel",
           "type": {
@@ -13236,7 +13236,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2008
+            "line": 2013
           },
           "name": "optional",
           "optional": true,
@@ -13262,7 +13262,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2965
+        "line": 2971
       },
       "methods": [
         {
@@ -13271,7 +13271,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2966
+            "line": 2972
           },
           "name": "toIsoString",
           "returns": {
@@ -13287,7 +13287,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2980
+            "line": 2986
           },
           "name": "toIsOString",
           "returns": {
@@ -13303,7 +13303,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2973
+            "line": 2979
           },
           "name": "toISOString",
           "returns": {
@@ -13322,7 +13322,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2984
+            "line": 2990
           },
           "name": "fooBar",
           "type": {
@@ -13337,7 +13337,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2989
+            "line": 2995
           },
           "name": "fooBAR",
           "type": {
@@ -13357,7 +13357,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 2754
+        "line": 2760
       },
       "methods": [
         {
@@ -13367,7 +13367,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 2758
+            "line": 2764
           },
           "name": "mode",
           "returns": {
@@ -13395,7 +13395,7 @@
         },
         "locationInModule": {
           "filename": "lib/calculator.ts",
-          "line": 109
+          "line": 110
         },
         "parameters": [
           {
@@ -13409,7 +13409,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 108
+        "line": 109
       },
       "name": "UnaryOperation",
       "properties": [
@@ -13420,7 +13420,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 109
+            "line": 110
           },
           "name": "operand",
           "type": {
@@ -14050,7 +14050,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1923
+        "line": 1928
       },
       "methods": [
         {
@@ -14059,7 +14059,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1928
+            "line": 1933
           },
           "name": "callMe"
         },
@@ -14070,7 +14070,7 @@
           },
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1932
+            "line": 1937
           },
           "name": "overrideMe",
           "protected": true
@@ -14085,7 +14085,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1925
+            "line": 1930
           },
           "name": "methodWasCalled",
           "type": {
@@ -14107,7 +14107,7 @@
         },
         "locationInModule": {
           "filename": "lib/compliance.ts",
-          "line": 1939
+          "line": 1944
         },
         "parameters": [
           {
@@ -14122,7 +14122,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/compliance.ts",
-        "line": 1938
+        "line": 1943
       },
       "name": "WithPrivatePropertyInConstructor",
       "properties": [
@@ -14133,7 +14133,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/compliance.ts",
-            "line": 1941
+            "line": 1946
           },
           "name": "success",
           "type": {
@@ -14155,7 +14155,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 146
+        "line": 147
       },
       "methods": [
         {
@@ -14165,7 +14165,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 172
+            "line": 173
           },
           "name": "toString",
           "overrides": "@scope/jsii-calc-lib.Operation",
@@ -14189,7 +14189,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 170
+            "line": 171
           },
           "name": "expression",
           "type": {
@@ -14204,7 +14204,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 162
+            "line": 163
           },
           "name": "value",
           "overrides": "@scope/jsii-calc-lib.NumericValue",
@@ -14219,7 +14219,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 160
+            "line": 161
           },
           "name": "decorationPostfixes",
           "type": {
@@ -14238,7 +14238,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 155
+            "line": 156
           },
           "name": "decorationPrefixes",
           "type": {
@@ -14257,7 +14257,7 @@
           },
           "locationInModule": {
             "filename": "lib/calculator.ts",
-            "line": 150
+            "line": 151
           },
           "name": "stringStyle",
           "type": {
@@ -14276,7 +14276,7 @@
       "kind": "enum",
       "locationInModule": {
         "filename": "lib/calculator.ts",
-        "line": 192
+        "line": 193
       },
       "members": [
         {
@@ -15874,5 +15874,5 @@
     }
   },
   "version": "3.20.120",
-  "fingerprint": "qsiNdf02KvRlGy6cULMMyEknbuVVEoKtzWVsTGz72OA="
+  "fingerprint": "ezY52AR44agRJClz62BLSJU4fF1Dhh+7vRL5LX9Fcgc="
 }
diff --git a/packages/jsii-config/lib/prompt.ts b/packages/jsii-config/lib/prompt.ts
index fc85bd2750..ba8d3640b3 100644
--- a/packages/jsii-config/lib/prompt.ts
+++ b/packages/jsii-config/lib/prompt.ts
@@ -9,9 +9,9 @@ interface PromptAnswers extends PackageJson {
   jsiiTargets: string[];
 }
 
-function getPassThroughValues(
-  current: BasePackageJson,
-): { readonly metadata?: any } {
+function getPassThroughValues(current: BasePackageJson): {
+  readonly metadata?: any;
+} {
   const metadata = getNestedValue(['jsii', 'metadata'], current);
   return {
     ...(metadata ? { metadata } : {}),
diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json
index 56cb459613..8d8492b124 100644
--- a/packages/jsii-config/package.json
+++ b/packages/jsii-config/package.json
@@ -24,10 +24,10 @@
     "@types/jest-expect-message": "^1.0.3",
     "@types/node": "^10.17.59",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jest-expect-message": "^1.0.2",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "typescript": "~3.9.9"
   },
   "dependencies": {
diff --git a/packages/jsii-diff/lib/type-comparison.ts b/packages/jsii-diff/lib/type-comparison.ts
index 62d52f6c54..2e8ceae719 100644
--- a/packages/jsii-diff/lib/type-comparison.ts
+++ b/packages/jsii-diff/lib/type-comparison.ts
@@ -269,7 +269,7 @@ export abstract class ComparableType<T> {
  * Contains shared code that applies to both class and interface types.
  */
 export abstract class ComparableReferenceType<
-  T extends reflect.ReferenceType
+  T extends reflect.ReferenceType,
 > extends ComparableType<T> {
   /**
    * Compare members of the reference types
diff --git a/packages/jsii-diff/lib/validations.ts b/packages/jsii-diff/lib/validations.ts
index 5dcb6d6e64..ca74f27429 100644
--- a/packages/jsii-diff/lib/validations.ts
+++ b/packages/jsii-diff/lib/validations.ts
@@ -124,7 +124,7 @@ export function validateAsyncSame(
  * Once variadic, can never be made non-variadic anymore (because I could always have been passing N+1 arguments)
  */
 export function validateNotMadeNonVariadic<
-  T extends reflect.Method | reflect.Initializer
+  T extends reflect.Method | reflect.Initializer,
 >(original: T, updated: T, mismatches: IReport) {
   if (original.variadic && !updated.variadic) {
     mismatches.report({
@@ -348,7 +348,7 @@ function describeOptionalValueMatchingFailure(
  * (All types still assignable)
  */
 export function validateExistingParams<
-  T extends reflect.Initializer | reflect.Method
+  T extends reflect.Initializer | reflect.Method,
 >(
   original: T,
   updated: T,
@@ -385,7 +385,7 @@ export function validateExistingParams<
  * (Not too few arguments)
  */
 export function validateNoNewRequiredParams<
-  T extends reflect.Initializer | reflect.Method
+  T extends reflect.Initializer | reflect.Method,
 >(original: T, updated: T, mismatches: IReport) {
   updated.parameters.forEach((param, i) => {
     if (param.optional) {
@@ -404,7 +404,7 @@ export function validateNoNewRequiredParams<
 }
 
 export function validateMethodCompatible<
-  T extends reflect.Method | reflect.Initializer
+  T extends reflect.Method | reflect.Initializer,
 >(original: T, updated: T, mismatches: IReport) {
   validateStabilities(original, updated, mismatches);
 
@@ -482,7 +482,7 @@ export function validateNotMadeImmutable(
 
 export function* memberPairs<
   T extends reflect.TypeMember,
-  U extends reflect.ReferenceType
+  U extends reflect.ReferenceType,
 >(
   origClass: U,
   xs: T[],
diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json
index 56cfcd00fb..b027d19f9d 100644
--- a/packages/jsii-diff/package.json
+++ b/packages/jsii-diff/package.json
@@ -47,11 +47,11 @@
     "@types/node": "^10.17.59",
     "@types/tar-fs": "^2.0.0",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
-    "prettier": "^2.2.1"
+    "prettier": "^2.3.0"
   }
 }
diff --git a/packages/jsii-diff/test/classes.test.ts b/packages/jsii-diff/test/classes.test.ts
index 84a13361ad..489c347a5a 100644
--- a/packages/jsii-diff/test/classes.test.ts
+++ b/packages/jsii-diff/test/classes.test.ts
@@ -363,7 +363,8 @@ test.each([
   {
     oldDecl: 'name: string',
     newDecl: 'name?: string',
-    error: /type Optional<string> \(formerly string\): output type is now optional/,
+    error:
+      /type Optional<string> \(formerly string\): output type is now optional/,
   },
   {
     oldDecl: 'name?: string',
diff --git a/packages/jsii-pacmak/bin/jsii-pacmak.ts b/packages/jsii-pacmak/bin/jsii-pacmak.ts
index 04dfb592f4..d7faf52c62 100644
--- a/packages/jsii-pacmak/bin/jsii-pacmak.ts
+++ b/packages/jsii-pacmak/bin/jsii-pacmak.ts
@@ -43,8 +43,7 @@ import { VERSION_DESC } from '../lib/version';
     })
     .option('fingerprint', {
       type: 'boolean',
-      desc:
-        'attach a fingerprint to the generated artifacts, and skip generation if outdir contains artifacts that have a matching fingerprint',
+      desc: 'attach a fingerprint to the generated artifacts, and skip generation if outdir contains artifacts that have a matching fingerprint',
       default: true,
     })
     .option('force', {
@@ -55,14 +54,12 @@ import { VERSION_DESC } from '../lib/version';
     })
     .option('force-subdirectory', {
       type: 'boolean',
-      desc:
-        'force generation into a target-named subdirectory, even in single-target mode',
+      desc: 'force generation into a target-named subdirectory, even in single-target mode',
       default: true,
     })
     .option('force-target', {
       type: 'boolean',
-      desc:
-        'force generation of the given targets, even if the source package.json doesnt declare it',
+      desc: 'force generation of the given targets, even if the source package.json doesnt declare it',
       default: false,
     })
     .option('recurse', {
@@ -85,25 +82,21 @@ import { VERSION_DESC } from '../lib/version';
     })
     .option('npmignore', {
       type: 'boolean',
-      desc:
-        'Auto-update .npmignore to exclude the output directory and include the .jsii file',
+      desc: 'Auto-update .npmignore to exclude the output directory and include the .jsii file',
       default: true,
     })
     .option('rosetta-tablet', {
       type: 'string',
-      desc:
-        "Location of a jsii-rosetta tablet with sample translations (created using 'jsii-rosetta extract')",
+      desc: "Location of a jsii-rosetta tablet with sample translations (created using 'jsii-rosetta extract')",
     })
     .option('rosetta-translate-live', {
       type: 'boolean',
-      desc:
-        "Translate code samples on-the-fly if they can't be found in the samples tablet",
+      desc: "Translate code samples on-the-fly if they can't be found in the samples tablet",
       default: true,
     })
     .option('parallel', {
       type: 'boolean',
-      desc:
-        'Generate all configured targets in parallel (disabling this might help if you encounter EMFILE errors)',
+      desc: 'Generate all configured targets in parallel (disabling this might help if you encounter EMFILE errors)',
       default: true,
     })
     .option('dotnet-nuget-global-packages-folder', {
diff --git a/packages/jsii-pacmak/lib/generator.ts b/packages/jsii-pacmak/lib/generator.ts
index 714e2be539..0e7be32f55 100644
--- a/packages/jsii-pacmak/lib/generator.ts
+++ b/packages/jsii-pacmak/lib/generator.ts
@@ -452,7 +452,7 @@ export abstract class Generator implements IGenerator {
    * Notice that the method that contains all the arguments will not be returned.
    */
   protected createOverloadsForOptionals<
-    T extends spec.Method | spec.Initializer
+    T extends spec.Method | spec.Initializer,
   >(method: T) {
     const overloads = new Array<T>();
 
diff --git a/packages/jsii-pacmak/lib/targets/dotnet.ts b/packages/jsii-pacmak/lib/targets/dotnet.ts
index 86155707f2..6bf03fc524 100644
--- a/packages/jsii-pacmak/lib/targets/dotnet.ts
+++ b/packages/jsii-pacmak/lib/targets/dotnet.ts
@@ -274,9 +274,9 @@ function projectLocation(module: JsiiModule) {
 }
 
 export default class Dotnet extends Target {
-  public static toPackageInfos(
-    assm: spec.Assembly,
-  ): { [language: string]: PackageInfo } {
+  public static toPackageInfos(assm: spec.Assembly): {
+    [language: string]: PackageInfo;
+  } {
     const packageId = assm.targets!.dotnet!.packageId;
     const version = toReleaseVersion(assm.version, TargetName.DOTNET);
     const packageInfo: PackageInfo = {
diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts
index 53a2443f1b..ca39ab6dd3 100644
--- a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts
+++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts
@@ -293,9 +293,8 @@ export class DotNetGenerator extends Generator {
     }
 
     if (cls.interfaces && cls.interfaces.length > 0) {
-      const implementations = this.typeresolver.resolveImplementedInterfaces(
-        cls,
-      );
+      const implementations =
+        this.typeresolver.resolveImplementedInterfaces(cls);
       baseTypeNames = baseTypeNames.concat(implementations);
     }
 
diff --git a/packages/jsii-pacmak/lib/targets/go/package.ts b/packages/jsii-pacmak/lib/targets/go/package.ts
index b81031e544..7cd7759a64 100644
--- a/packages/jsii-pacmak/lib/targets/go/package.ts
+++ b/packages/jsii-pacmak/lib/targets/go/package.ts
@@ -60,22 +60,20 @@ export abstract class Package {
       (sm) => new InternalPackage(this.root, this, sm),
     );
 
-    this.types = this.typeSpec.map(
-      (type: Type): GoType => {
-        if (type.isInterfaceType() && type.datatype) {
-          return new Struct(this, type);
-        } else if (type.isInterfaceType()) {
-          return new GoInterface(this, type);
-        } else if (type.isClassType()) {
-          return new GoClass(this, type);
-        } else if (type.isEnumType()) {
-          return new Enum(this, type);
-        }
-        throw new Error(
-          `Type: ${type.name} with kind ${type.kind} is not a supported type`,
-        );
-      },
-    );
+    this.types = this.typeSpec.map((type: Type): GoType => {
+      if (type.isInterfaceType() && type.datatype) {
+        return new Struct(this, type);
+      } else if (type.isInterfaceType()) {
+        return new GoInterface(this, type);
+      } else if (type.isClassType()) {
+        return new GoClass(this, type);
+      } else if (type.isEnumType()) {
+        return new Enum(this, type);
+      }
+      throw new Error(
+        `Type: ${type.name} with kind ${type.kind} is not a supported type`,
+      );
+    });
   }
 
   /*
diff --git a/packages/jsii-pacmak/lib/targets/java.ts b/packages/jsii-pacmak/lib/targets/java.ts
index 3c50313a45..b7d939165f 100644
--- a/packages/jsii-pacmak/lib/targets/java.ts
+++ b/packages/jsii-pacmak/lib/targets/java.ts
@@ -367,9 +367,9 @@ function moduleArtifactsSubdir(module: JsiiModule) {
 }
 
 export default class Java extends Target {
-  public static toPackageInfos(
-    assm: spec.Assembly,
-  ): { [language: string]: PackageInfo } {
+  public static toPackageInfos(assm: spec.Assembly): {
+    [language: string]: PackageInfo;
+  } {
     const groupId = assm.targets!.java!.maven.groupId;
     const artifactId = assm.targets!.java!.maven.artifactId;
     const releaseVersion = toReleaseVersion(assm.version, TargetName.JAVA);
@@ -2669,10 +2669,8 @@ class JavaGenerator extends Generator {
     const moduleName = mod.name;
     const moduleClass = this.makeModuleClass(moduleName);
 
-    const {
-      filePath: moduleResFile,
-      name: moduleResName,
-    } = this.toJavaResourcePath(mod, `${mod.name}.${MODULE_CLASS_NAME}`);
+    const { filePath: moduleResFile, name: moduleResName } =
+      this.toJavaResourcePath(mod, `${mod.name}.${MODULE_CLASS_NAME}`);
     this.code.openFile(moduleResFile);
     for (const fqn of Object.keys(this.assembly.types ?? {})) {
       this.code.line(`${fqn}=${this.toNativeFqn(fqn, { binaryName: true })}`);
@@ -2874,9 +2872,10 @@ class JavaGenerator extends Generator {
    * @param assm The assembly that contains the type
    * @param type The type we want the name of
    */
-  private toNativeName(
-    assm: spec.Assembly,
-  ): { packageName: string; typeName: undefined };
+  private toNativeName(assm: spec.Assembly): {
+    packageName: string;
+    typeName: undefined;
+  };
   private toNativeName(
     assm: spec.Assembly,
     type: spec.Type,
diff --git a/packages/jsii-pacmak/lib/targets/js.ts b/packages/jsii-pacmak/lib/targets/js.ts
index b30522f2d4..26ec7a8670 100644
--- a/packages/jsii-pacmak/lib/targets/js.ts
+++ b/packages/jsii-pacmak/lib/targets/js.ts
@@ -7,9 +7,9 @@ import { toReleaseVersion } from './version-utils';
 import { TargetName } from '.';
 
 export default class JavaScript extends Target {
-  public static toPackageInfos(
-    assm: spec.Assembly,
-  ): { [language: string]: PackageInfo } {
+  public static toPackageInfos(assm: spec.Assembly): {
+    [language: string]: PackageInfo;
+  } {
     const releaseVersion = toReleaseVersion(
       assm.version,
       TargetName.JAVASCRIPT,
diff --git a/packages/jsii-pacmak/lib/targets/python/type-name.ts b/packages/jsii-pacmak/lib/targets/python/type-name.ts
index 8f195fecd9..f015d5e9c2 100644
--- a/packages/jsii-pacmak/lib/targets/python/type-name.ts
+++ b/packages/jsii-pacmak/lib/targets/python/type-name.ts
@@ -138,7 +138,7 @@ export function mergePythonImports(
 function isOptionalValue(
   type: OptionalValue | TypeReference,
 ): type is OptionalValue {
-  return ((type as unknown) as OptionalValue).type != null;
+  return (type as unknown as OptionalValue).type != null;
 }
 
 class Dict implements TypeName {
diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json
index d018efb9e8..361b871d33 100644
--- a/packages/jsii-pacmak/package.json
+++ b/packages/jsii-pacmak/package.json
@@ -62,13 +62,13 @@
     "@types/node": "^10.17.59",
     "@types/semver": "^7.3.5",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
-    "prettier": "^2.2.1",
-    "ts-jest": "^26.5.5",
+    "prettier": "^2.3.0",
+    "ts-jest": "^26.5.6",
     "typescript": "~3.9.9"
   },
   "keywords": [
diff --git a/packages/jsii-pacmak/test/targets/version-utils.test.ts b/packages/jsii-pacmak/test/targets/version-utils.test.ts
index 0be8b9b615..855d13a39f 100644
--- a/packages/jsii-pacmak/test/targets/version-utils.test.ts
+++ b/packages/jsii-pacmak/test/targets/version-utils.test.ts
@@ -120,7 +120,8 @@ describe(toReleaseVersion, () => {
       go: '1.2.3-pre',
       java: '1.2.3-pre',
       js: '1.2.3-pre',
-      python: /Unable to map prerelease identifier \(in: 1\.2\.3-pre\) components to python: \[ 'pre' \]/,
+      python:
+        /Unable to map prerelease identifier \(in: 1\.2\.3-pre\) components to python: \[ 'pre' \]/,
     },
     '1.2.3-alpha.1337': {
       dotnet: '1.2.3-alpha.1337',
diff --git a/packages/jsii-reflect/bin/jsii-tree.ts b/packages/jsii-reflect/bin/jsii-tree.ts
index 8cd8fd3559..cc5c67f6ed 100644
--- a/packages/jsii-reflect/bin/jsii-tree.ts
+++ b/packages/jsii-reflect/bin/jsii-tree.ts
@@ -12,20 +12,17 @@ async function main() {
         args
           .positional('JSII-FILE', {
             type: 'string',
-            desc:
-              'path to a .jsii file to load, all dependency .jsii files must be explicitly supplied',
+            desc: 'path to a .jsii file to load, all dependency .jsii files must be explicitly supplied',
           })
           .positional('MODULE-DIR', {
             type: 'string',
-            desc:
-              'path to an jsii npm module directory, all jsii dependencies will be loaded transitively',
+            desc: 'path to an jsii npm module directory, all jsii dependencies will be loaded transitively',
           }),
     )
     .option('closure', {
       type: 'string',
       alias: 'c',
-      desc:
-        'Load dependencies of package without assuming its a JSII package itself',
+      desc: 'Load dependencies of package without assuming its a JSII package itself',
     })
     .option('all', {
       type: 'boolean',
diff --git a/packages/jsii-reflect/lib/callable.ts b/packages/jsii-reflect/lib/callable.ts
index 57ff6e13ea..bc673506ab 100644
--- a/packages/jsii-reflect/lib/callable.ts
+++ b/packages/jsii-reflect/lib/callable.ts
@@ -14,7 +14,8 @@ import { MemberKind, TypeMember } from './type-member';
 import { TypeSystem } from './type-system';
 
 export abstract class Callable
-  implements Documentable, Overridable, TypeMember, SourceLocatable {
+  implements Documentable, Overridable, TypeMember, SourceLocatable
+{
   public declare abstract readonly kind: MemberKind;
   public declare abstract readonly name: string;
   public declare abstract readonly abstract: boolean;
diff --git a/packages/jsii-reflect/lib/initializer.ts b/packages/jsii-reflect/lib/initializer.ts
index a548103df7..823ce1959f 100644
--- a/packages/jsii-reflect/lib/initializer.ts
+++ b/packages/jsii-reflect/lib/initializer.ts
@@ -6,7 +6,8 @@ import { MemberKind, TypeMember } from './type-member';
 
 export class Initializer
   extends Callable
-  implements Documentable, Overridable, TypeMember, SourceLocatable {
+  implements Documentable, Overridable, TypeMember, SourceLocatable
+{
   public static isInitializer(x: Callable): x is Initializer {
     return x instanceof Initializer;
   }
diff --git a/packages/jsii-reflect/lib/method.ts b/packages/jsii-reflect/lib/method.ts
index b3fdcbd542..88f326a0fc 100644
--- a/packages/jsii-reflect/lib/method.ts
+++ b/packages/jsii-reflect/lib/method.ts
@@ -17,7 +17,8 @@ export const INITIALIZER_NAME = '<initializer>';
 
 export class Method
   extends Callable
-  implements Documentable, Overridable, TypeMember, SourceLocatable {
+  implements Documentable, Overridable, TypeMember, SourceLocatable
+{
   public static isMethod(x: Callable): x is Method {
     return x instanceof Method;
   }
diff --git a/packages/jsii-reflect/lib/property.ts b/packages/jsii-reflect/lib/property.ts
index cb4f7ae179..484ee764cc 100644
--- a/packages/jsii-reflect/lib/property.ts
+++ b/packages/jsii-reflect/lib/property.ts
@@ -15,7 +15,8 @@ import { TypeSystem } from './type-system';
 
 export class Property
   extends OptionalValue
-  implements Documentable, Overridable, TypeMember, SourceLocatable {
+  implements Documentable, Overridable, TypeMember, SourceLocatable
+{
   public readonly kind = MemberKind.Property;
 
   public constructor(
diff --git a/packages/jsii-reflect/lib/reference-type.ts b/packages/jsii-reflect/lib/reference-type.ts
index c75db42551..bf8a48ada1 100644
--- a/packages/jsii-reflect/lib/reference-type.ts
+++ b/packages/jsii-reflect/lib/reference-type.ts
@@ -77,9 +77,9 @@ export abstract class ReferenceType extends Type {
    * Lists all properties in this class.
    * @param inherited include all properties inherited from base classes (default: false)
    */
-  public abstract getProperties(
-    inherited?: boolean,
-  ): { [name: string]: Property };
+  public abstract getProperties(inherited?: boolean): {
+    [name: string]: Property;
+  };
 
   /**
    * List all methods in this class.
diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json
index 0461963b33..3dd353d5ba 100644
--- a/packages/jsii-reflect/package.json
+++ b/packages/jsii-reflect/package.json
@@ -46,12 +46,12 @@
     "@types/jest": "^26.0.23",
     "@types/node": "^10.17.59",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "typescript": "~3.9.9"
   }
 }
diff --git a/packages/jsii-rosetta/bin/jsii-rosetta.ts b/packages/jsii-rosetta/bin/jsii-rosetta.ts
index 173585d811..89cb949e75 100644
--- a/packages/jsii-rosetta/bin/jsii-rosetta.ts
+++ b/packages/jsii-rosetta/bin/jsii-rosetta.ts
@@ -134,9 +134,8 @@ function main() {
         // chdir, since underneath the in-memory layer we're using a regular TS
         // compilerhost. Have to make all file references absolute before we chdir
         // though.
-        const absAssemblies = (args.ASSEMBLY.length > 0
-          ? args.ASSEMBLY
-          : ['.']
+        const absAssemblies = (
+          args.ASSEMBLY.length > 0 ? args.ASSEMBLY : ['.']
         ).map((x) => path.resolve(x));
         const absOutput = path.resolve(args.output);
         if (args.directory) {
diff --git a/packages/jsii-rosetta/lib/fixtures.ts b/packages/jsii-rosetta/lib/fixtures.ts
index 837e987349..b12750361d 100644
--- a/packages/jsii-rosetta/lib/fixtures.ts
+++ b/packages/jsii-rosetta/lib/fixtures.ts
@@ -123,9 +123,10 @@ function loadAndSubFixture(
  * @returns an object containing the import statements on one end, and the rest
  *          on the other hand.
  */
-function sidelineImports(
-  source: string,
-): { imports: string; statements: string } {
+function sidelineImports(source: string): {
+  imports: string;
+  statements: string;
+} {
   let imports = '';
   let statements = '';
 
diff --git a/packages/jsii-rosetta/lib/snippet.ts b/packages/jsii-rosetta/lib/snippet.ts
index e9f0951f8e..7c447d2f4b 100644
--- a/packages/jsii-rosetta/lib/snippet.ts
+++ b/packages/jsii-rosetta/lib/snippet.ts
@@ -41,9 +41,8 @@ export function typeScriptSnippetFromSource(
   strict: boolean,
   parameters: Record<string, string> = {},
 ): TypeScriptSnippet {
-  const [source, sourceParameters] = parametersFromSourceDirectives(
-    typeScriptSource,
-  );
+  const [source, sourceParameters] =
+    parametersFromSourceDirectives(typeScriptSource);
   return {
     visibleSource: source.trimRight(),
     where,
diff --git a/packages/jsii-rosetta/lib/typescript/ast-utils.ts b/packages/jsii-rosetta/lib/typescript/ast-utils.ts
index 641bcf3013..f1ef0ef4f6 100644
--- a/packages/jsii-rosetta/lib/typescript/ast-utils.ts
+++ b/packages/jsii-rosetta/lib/typescript/ast-utils.ts
@@ -114,7 +114,7 @@ export function nodeOfType<A>(
 export function nodeOfType<
   S extends keyof CapturableNodes,
   N extends string,
-  A
+  A,
 >(
   capture: N,
   capturableNodeType: S,
@@ -124,7 +124,7 @@ export function nodeOfType<
 export function nodeOfType<
   S extends keyof CapturableNodes,
   N extends string,
-  A
+  A,
 >(
   syntaxKindOrCaptureName: ts.SyntaxKind | N,
   nodeTypeOrChildren?: S | AstMatcher<A>,
@@ -509,7 +509,7 @@ export function findSuperCall(
   }
   if (ts.isCallExpression(node)) {
     if (renderer.textOf(node.expression) === 'super') {
-      return (node as unknown) as ts.SuperCall;
+      return node as unknown as ts.SuperCall;
     }
   }
   if (ts.isExpressionStatement(node)) {
diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json
index 54885ef174..e5fd3c8c42 100644
--- a/packages/jsii-rosetta/package.json
+++ b/packages/jsii-rosetta/package.json
@@ -22,13 +22,13 @@
     "@types/mock-fs": "^4.13.0",
     "@types/node": "^10.17.59",
     "@types/yargs": "^16.0.1",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "memory-streams": "^0.1.3",
     "mock-fs": "^4.14.0",
-    "prettier": "^2.2.1"
+    "prettier": "^2.3.0"
   },
   "dependencies": {
     "@jsii/spec": "^0.0.0",
diff --git a/packages/jsii/bin/jsii.ts b/packages/jsii/bin/jsii.ts
index c34d8fe6ee..a2bb8a9e0f 100644
--- a/packages/jsii/bin/jsii.ts
+++ b/packages/jsii/bin/jsii.ts
@@ -34,14 +34,12 @@ const warningTypes = Object.keys(enabledWarnings);
           .option('project-references', {
             alias: 'r',
             type: 'boolean',
-            desc:
-              'Generate TypeScript project references (also [package.json].jsii.projectReferences)',
+            desc: 'Generate TypeScript project references (also [package.json].jsii.projectReferences)',
           })
           .option('fix-peer-dependencies', {
             type: 'boolean',
             default: true,
-            desc:
-              'Automatically add missing entries in the peerDependencies section of package.json',
+            desc: 'Automatically add missing entries in the peerDependencies section of package.json',
           })
           .options('fail-on-warnings', {
             alias: 'Werr',
@@ -58,8 +56,7 @@ const warningTypes = Object.keys(enabledWarnings);
           .option('strip-deprecated', {
             type: 'boolean',
             default: false,
-            desc:
-              '[EXPERIMENTAL] Hides all @deprecated members from the API (implementations remain)',
+            desc: '[EXPERIMENTAL] Hides all @deprecated members from the API (implementations remain)',
           }),
     )
     .option('verbose', {
diff --git a/packages/jsii/lib/assembler.ts b/packages/jsii/lib/assembler.ts
index e77401eb56..26698aea5f 100644
--- a/packages/jsii/lib/assembler.ts
+++ b/packages/jsii/lib/assembler.ts
@@ -685,8 +685,9 @@ export class Assembler implements Emitter {
             : fqn,
         };
       }
-      const symbolLocation = sym.getDeclarations()?.[0]?.getSourceFile()
-        ?.fileName;
+      const symbolLocation = sym
+        .getDeclarations()?.[0]
+        ?.getSourceFile()?.fileName;
       const pkgInfo = symbolLocation && (await findPackageInfo(symbolLocation));
       const assemblyName: string = pkgInfo?.name ?? this.projectInfo.name;
       const fqn = `${assemblyName}.${sym.name}`;
@@ -870,9 +871,8 @@ export class Assembler implements Emitter {
       // This is what happens when one does `export { Symbol } from "./location";`
       //                   ExportSpecifier:           ~~~~~~
 
-      const resolvedSymbol = this._typeChecker.getExportSpecifierLocalTargetSymbol(
-        node,
-      );
+      const resolvedSymbol =
+        this._typeChecker.getExportSpecifierLocalTargetSymbol(node);
       if (!resolvedSymbol) {
         // A grammar error, compilation will already have failed
         return [];
@@ -1398,9 +1398,8 @@ export class Assembler implements Emitter {
     const ctorDeclaration =
       constructor && (constructor.declarations[0] as ts.ConstructorDeclaration);
     if (constructor && ctorDeclaration) {
-      const signature = this._typeChecker.getSignatureFromDeclaration(
-        ctorDeclaration,
-      );
+      const signature =
+        this._typeChecker.getSignatureFromDeclaration(ctorDeclaration);
 
       if (
         (ts.getCombinedModifierFlags(ctorDeclaration) &
@@ -1985,9 +1984,8 @@ export class Assembler implements Emitter {
     const declaration = symbol.valueDeclaration as
       | ts.MethodDeclaration
       | ts.MethodSignature;
-    const signature = this._typeChecker.getSignatureFromDeclaration(
-      declaration,
-    );
+    const signature =
+      this._typeChecker.getSignatureFromDeclaration(declaration);
     if (!signature) {
       this._diagnostics.push(
         JsiiDiagnostic.JSII_9004_UNABLE_TO_COMPUTE_SIGNATURE.create(
@@ -2247,7 +2245,8 @@ export class Assembler implements Emitter {
     if (LOG.isTraceEnabled()) {
       LOG.trace(`Processing parameter: ${colors.cyan(paramSymbol.name)}`);
     }
-    const paramDeclaration = paramSymbol.valueDeclaration as ts.ParameterDeclaration;
+    const paramDeclaration =
+      paramSymbol.valueDeclaration as ts.ParameterDeclaration;
 
     this._warnAboutReservedWords(paramSymbol);
 
@@ -2931,9 +2930,9 @@ function memberNames(jsiiType: spec.InterfaceType | spec.ClassType): string[] {
   return Object.keys(typeMembers(jsiiType)).filter((n) => n !== '');
 }
 
-function typeMembers(
-  jsiiType: spec.InterfaceType | spec.ClassType,
-): { [key: string]: spec.Property | spec.Method } {
+function typeMembers(jsiiType: spec.InterfaceType | spec.ClassType): {
+  [key: string]: spec.Property | spec.Method;
+} {
   const ret: { [key: string]: spec.Property | spec.Method } = {};
 
   for (const prop of jsiiType.properties ?? []) {
@@ -2982,9 +2981,9 @@ function noEmptyDict<T>(
   return xs;
 }
 
-function toDependencyClosure(
-  assemblies: readonly spec.Assembly[],
-): { [name: string]: spec.AssemblyConfiguration } {
+function toDependencyClosure(assemblies: readonly spec.Assembly[]): {
+  [name: string]: spec.AssemblyConfiguration;
+} {
   const result: { [name: string]: spec.AssemblyTargets } = {};
   for (const assembly of assemblies) {
     if (!assembly.targets) {
diff --git a/packages/jsii/lib/jsii-diagnostic.ts b/packages/jsii/lib/jsii-diagnostic.ts
index f5cbc82064..b7fbbfb0de 100644
--- a/packages/jsii/lib/jsii-diagnostic.ts
+++ b/packages/jsii/lib/jsii-diagnostic.ts
@@ -11,7 +11,7 @@ import { JSII_DIAGNOSTICS_CODE } from './utils';
  * warnings as errors, or to suppress certain undesirable warnings.
  */
 export class Code<
-  T extends DiagnosticMessageFormatter = DiagnosticMessageFormatter
+  T extends DiagnosticMessageFormatter = DiagnosticMessageFormatter,
 > {
   private static readonly byCode: { [code: number]: Code } = {};
   private static readonly byName: { [name: string]: Code } = {};
@@ -352,14 +352,13 @@ export class JsiiDiagnostic implements ts.Diagnostic {
     name: 'type-model/struct-props-must-be-readonly',
   });
 
-  public static readonly JSII_3009_OPTIONAL_PARAMETER_BEFORE_REQUIRED = Code.error(
-    {
+  public static readonly JSII_3009_OPTIONAL_PARAMETER_BEFORE_REQUIRED =
+    Code.error({
       code: 3009,
       formatter: (param: spec.Parameter, nextParam: spec.Parameter) =>
         `Parameter "${param.name}" cannot be optional, as it precedes required parameter "${nextParam.name}"`,
       name: 'type-model/optional-parameter-before-required',
-    },
-  );
+    });
 
   public static readonly JSII_3999_INCOHERENT_TYPE_MODEL = Code.error({
     code: 3999,
@@ -601,8 +600,8 @@ export class JsiiDiagnostic implements ts.Diagnostic {
     name: 'language-compatibility/member-name-conflicts-with-type-name',
   });
 
-  public static readonly JSII_5020_STATIC_MEMBER_CONFLICTS_WITH_NESTED_TYPE = Code.error(
-    {
+  public static readonly JSII_5020_STATIC_MEMBER_CONFLICTS_WITH_NESTED_TYPE =
+    Code.error({
       code: 5020,
       formatter: (
         nestingType: spec.Type,
@@ -610,10 +609,8 @@ export class JsiiDiagnostic implements ts.Diagnostic {
         nestedType: spec.Type,
       ) =>
         `The static member "${nestingType.name}.${staticMember.name}" has the same PascalCased representation as nested type "${nestingType.name}.${nestedType.name}". This would result in invalid code in Go.`,
-      name:
-        'language-compatibility/static-member-name-conflicts-with-nested-type',
-    },
-  );
+      name: 'language-compatibility/static-member-name-conflicts-with-nested-type',
+    });
 
   //////////////////////////////////////////////////////////////////////////////
   // 6000 => 6999 -- RESERVED
@@ -775,9 +772,7 @@ export class JsiiDiagnostic implements ts.Diagnostic {
    * @param diag
    */
   public static isJsiiDiagnostic(diag: ts.Diagnostic): diag is JsiiDiagnostic {
-    return (
-      ((diag as unknown) as JsiiDiagnostic).domain === JsiiDiagnostic.DOMAIN
-    );
+    return (diag as unknown as JsiiDiagnostic).domain === JsiiDiagnostic.DOMAIN;
   }
 
   private readonly domain = JsiiDiagnostic.DOMAIN;
@@ -791,7 +786,8 @@ export class JsiiDiagnostic implements ts.Diagnostic {
   public readonly start: number | undefined;
   public readonly length: number | undefined;
 
-  public readonly relatedInformation = new Array<ts.DiagnosticRelatedInformation>();
+  public readonly relatedInformation =
+    new Array<ts.DiagnosticRelatedInformation>();
 
   /**
    * Creates a new `JsiiDiagnostic` with the provided properties.
diff --git a/packages/jsii/lib/node-bindings.ts b/packages/jsii/lib/node-bindings.ts
index dbb45e3046..a92984b2f7 100644
--- a/packages/jsii/lib/node-bindings.ts
+++ b/packages/jsii/lib/node-bindings.ts
@@ -38,7 +38,7 @@ export const setInterfaceRelatedNode: (
 ) => spec.InterfaceType = setter;
 
 export const setMethodRelatedNode: <
-  T extends ts.MethodDeclaration | ts.MethodSignature
+  T extends ts.MethodDeclaration | ts.MethodSignature,
 >(
   object: spec.Method,
   node: T,
diff --git a/packages/jsii/lib/project-info.ts b/packages/jsii/lib/project-info.ts
index 6d97aa3fb5..cfbf8829a2 100644
--- a/packages/jsii/lib/project-info.ts
+++ b/packages/jsii/lib/project-info.ts
@@ -89,8 +89,10 @@ export async function loadProjectInfo(
     }
     version = _resolveVersion(version as any, projectRoot).version;
     pkg.peerDependencies = pkg.peerDependencies ?? {};
-    const peerVersion = _resolveVersion(pkg.peerDependencies[name], projectRoot)
-      .version;
+    const peerVersion = _resolveVersion(
+      pkg.peerDependencies[name],
+      projectRoot,
+    ).version;
     if (peerVersion === version) {
       return;
     }
@@ -336,9 +338,11 @@ function _toPerson(
   };
 }
 
-function _toRepository(
-  value: any,
-): { type: string; url: string; directory?: string } {
+function _toRepository(value: any): {
+  type: string;
+  url: string;
+  directory?: string;
+} {
   if (typeof value === 'string') {
     value = parseRepository(value);
   }
@@ -477,9 +481,7 @@ function mergeMetadata(
   }
 }
 
-function _loadDiagnostics(entries?: {
-  [key: string]: string;
-}):
+function _loadDiagnostics(entries?: { [key: string]: string }):
   | {
       [key: string]: ts.DiagnosticCategory;
     }
diff --git a/packages/jsii/lib/transforms/deprecated-remover.ts b/packages/jsii/lib/transforms/deprecated-remover.ts
index 82bf54f36a..3b3b0ba77d 100644
--- a/packages/jsii/lib/transforms/deprecated-remover.ts
+++ b/packages/jsii/lib/transforms/deprecated-remover.ts
@@ -345,14 +345,15 @@ export class DeprecatedRemover {
     context: Method | Initializer | Parameter | Property,
     assembly: Assembly,
   ): JsiiDiagnostic {
-    const node = bindings.getRelatedNode<
-      | ts.AccessorDeclaration
-      | ts.MethodDeclaration
-      | ts.MethodSignature
-      | ts.ParameterDeclaration
-      | ts.PropertyDeclaration
-      | ts.PropertySignature
-    >(context);
+    const node =
+      bindings.getRelatedNode<
+        | ts.AccessorDeclaration
+        | ts.MethodDeclaration
+        | ts.MethodSignature
+        | ts.ParameterDeclaration
+        | ts.PropertyDeclaration
+        | ts.PropertySignature
+      >(context);
     const diagnostic = JsiiDiagnostic.JSII_3999_INCOHERENT_TYPE_MODEL.create(
       node?.type ?? node!,
       `${messagePrefix} has @deprecated type ${fqn}, and it is erased by --strip-deprecated.`,
@@ -388,10 +389,8 @@ class Transformation {
         );
       }
 
-      const {
-        typeExpression: newInterface,
-        syntheticImport,
-      } = Transformation.typeReference(iface, declaration, typeChecker);
+      const { typeExpression: newInterface, syntheticImport } =
+        Transformation.typeReference(iface, declaration, typeChecker);
       if (ts.isClassDeclaration(declaration)) {
         return {
           node: ts.updateClassDeclaration(
@@ -457,10 +456,8 @@ class Transformation {
           }`,
         );
       }
-      const {
-        typeExpression: newBaseClass,
-        syntheticImport,
-      } = Transformation.typeReference(baseClass, declaration, typeChecker);
+      const { typeExpression: newBaseClass, syntheticImport } =
+        Transformation.typeReference(baseClass, declaration, typeChecker);
       const existingClause = declaration.heritageClauses?.find(
         (clause) => clause.token === ts.SyntaxKind.ExtendsKeyword,
       );
@@ -762,10 +759,8 @@ class DeprecationRemovalTransformer {
       for (const transformation of this.transformations) {
         // 👇 as any because the assignment below confuses type checker
         if (transformation.targets(node as any)) {
-          const {
-            node: transformedNode,
-            syntheticImport,
-          } = transformation.apply(node);
+          const { node: transformedNode, syntheticImport } =
+            transformation.apply(node);
           node = transformedNode as any;
           if (syntheticImport) {
             this.syntheticImports.push(syntheticImport);
diff --git a/packages/jsii/lib/utils.ts b/packages/jsii/lib/utils.ts
index 0ca4622e54..af08ac0750 100644
--- a/packages/jsii/lib/utils.ts
+++ b/packages/jsii/lib/utils.ts
@@ -121,7 +121,8 @@ export function parsePerson(value: string) {
   return result;
 }
 
-const REPOSITORY_REGEX = /^(?:(github|gist|bitbucket|gitlab):)?([A-Za-z\d_-]+\/[A-Za-z\d_-]+)$/;
+const REPOSITORY_REGEX =
+  /^(?:(github|gist|bitbucket|gitlab):)?([A-Za-z\d_-]+\/[A-Za-z\d_-]+)$/;
 export function parseRepository(value: string): { url: string } {
   const match = REPOSITORY_REGEX.exec(value);
   if (!match) {
diff --git a/packages/jsii/lib/validator.ts b/packages/jsii/lib/validator.ts
index e6b67de821..5658d22260 100644
--- a/packages/jsii/lib/validator.ts
+++ b/packages/jsii/lib/validator.ts
@@ -524,21 +524,21 @@ function _defaultValidations(): ValidationFunction[] {
       if (nestedType.namespace == null) {
         continue;
       }
-      const nestingType = assembly.types![
-        `${assembly.name}.${nestedType.namespace}`
-      ];
+      const nestingType =
+        assembly.types![`${assembly.name}.${nestedType.namespace}`];
       if (nestingType == null) {
         continue;
       }
       const nestedTypeName = Case.pascal(nestedType.name);
       for (const { name, member } of staticMembers(nestingType)) {
         if (name === nestedTypeName) {
-          let diag = JsiiDiagnostic.JSII_5020_STATIC_MEMBER_CONFLICTS_WITH_NESTED_TYPE.create(
-            getRelatedNode(member)!,
-            nestingType,
-            member,
-            nestedType,
-          );
+          let diag =
+            JsiiDiagnostic.JSII_5020_STATIC_MEMBER_CONFLICTS_WITH_NESTED_TYPE.create(
+              getRelatedNode(member)!,
+              nestingType,
+              member,
+              nestedType,
+            );
           const nestedTypeNode = getRelatedNode(nestedType);
           if (nestedTypeNode != null) {
             diag = diag.addRelatedInformation(
diff --git a/packages/jsii/package.json b/packages/jsii/package.json
index a7a2aece83..6bc8c89009 100644
--- a/packages/jsii/package.json
+++ b/packages/jsii/package.json
@@ -57,11 +57,11 @@
     "@types/semver": "^7.3.5",
     "@types/yargs": "^16.0.1",
     "clone": "^2.1.2",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jest-expect-message": "^1.0.2",
     "jsii-build-tools": "^0.0.0",
-    "prettier": "^2.2.1",
-    "ts-jest": "^26.5.5"
+    "prettier": "^2.3.0",
+    "ts-jest": "^26.5.6"
   }
 }
diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json
index 7fdded99ea..84420fd6c9 100644
--- a/packages/oo-ascii-tree/package.json
+++ b/packages/oo-ascii-tree/package.json
@@ -33,10 +33,10 @@
   "devDependencies": {
     "@types/jest": "^26.0.23",
     "@types/node": "^10.17.59",
-    "eslint": "^7.25.0",
+    "eslint": "^7.26.0",
     "jest": "^26.6.3",
     "jsii-build-tools": "^0.0.0",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "typescript": "~3.9.9"
   }
 }
diff --git a/tools/jsii-compliance/package.json b/tools/jsii-compliance/package.json
index c082bb6ba1..da026bfb98 100644
--- a/tools/jsii-compliance/package.json
+++ b/tools/jsii-compliance/package.json
@@ -17,8 +17,8 @@
   },
   "devDependencies": {
     "@types/node": "^10.17.59",
-    "eslint": "^7.25.0",
-    "prettier": "^2.2.1",
+    "eslint": "^7.26.0",
+    "prettier": "^2.3.0",
     "ts-node": "^9.1.1",
     "typescript": "~3.9.9"
   }
diff --git a/yarn.lock b/yarn.lock
index 991967f092..7c15155408 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -314,10 +314,10 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752"
   integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==
 
-"@eslint/eslintrc@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
-  integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+"@eslint/eslintrc@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"
+  integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
@@ -1217,9 +1217,9 @@
   integrity sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q==
 
 "@npmcli/git@^2.0.1":
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.8.tgz#c38b54cdeec556ab641cf6161cc7825711a88d65"
-  integrity sha512-LPnzyBZ+1p7+JzHVwwKycMF8M3lr1ze3wxGRnxn/QxJtk++Y3prSJQrdBDGCxJyRpFsup6J3lrRBVYBhJVrM8Q==
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.9.tgz#915bbfe66300e67b4da5ef765a4475ffb2ca5b6b"
+  integrity sha512-hTMbMryvOqGLwnmMBKs5usbPsJtyEsMsgXwJbmNrsEuQQh1LAIMDU77IoOrwkCg+NgQWl+ySlarJASwM3SutCA==
   dependencies:
     "@npmcli/promise-spawn" "^1.3.2"
     lru-cache "^6.0.0"
@@ -1649,13 +1649,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^4.22.1":
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz#6bcdbaa4548553ab861b4e5f34936ead1349a543"
-  integrity sha512-kVTAghWDDhsvQ602tHBc6WmQkdaYbkcTwZu+7l24jtJiYvm9l+/y/b2BZANEezxPDiX5MK2ZecE+9BFi/YJryw==
+"@typescript-eslint/eslint-plugin@^4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz#29d3c9c81f6200b1fd6d8454cfb007ba176cde80"
+  integrity sha512-tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.22.1"
-    "@typescript-eslint/scope-manager" "4.22.1"
+    "@typescript-eslint/experimental-utils" "4.23.0"
+    "@typescript-eslint/scope-manager" "4.23.0"
     debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
     lodash "^4.17.15"
@@ -1663,60 +1663,60 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@4.22.1":
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.1.tgz#3938a5c89b27dc9a39b5de63a62ab1623ab27497"
-  integrity sha512-svYlHecSMCQGDO2qN1v477ax/IDQwWhc7PRBiwAdAMJE7GXk5stF4Z9R/8wbRkuX/5e9dHqbIWxjeOjckK3wLQ==
+"@typescript-eslint/experimental-utils@4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.23.0.tgz#f2059434cd6e5672bfeab2fb03b7c0a20622266f"
+  integrity sha512-WAFNiTDnQfrF3Z2fQ05nmCgPsO5o790vOhmWKXbbYQTO9erE1/YsFot5/LnOUizLzU2eeuz6+U/81KV5/hFTGA==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.22.1"
-    "@typescript-eslint/types" "4.22.1"
-    "@typescript-eslint/typescript-estree" "4.22.1"
+    "@typescript-eslint/scope-manager" "4.23.0"
+    "@typescript-eslint/types" "4.23.0"
+    "@typescript-eslint/typescript-estree" "4.23.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
-"@typescript-eslint/parser@^4.22.1":
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.1.tgz#a95bda0fd01d994a15fc3e99dc984294f25c19cc"
-  integrity sha512-l+sUJFInWhuMxA6rtirzjooh8cM/AATAe3amvIkqKFeMzkn85V+eLzb1RyuXkHak4dLfYzOmF6DXPyflJvjQnw==
+"@typescript-eslint/parser@^4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.23.0.tgz#239315d38e42e852bef43a4b0b01bef78f78911c"
+  integrity sha512-wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.22.1"
-    "@typescript-eslint/types" "4.22.1"
-    "@typescript-eslint/typescript-estree" "4.22.1"
+    "@typescript-eslint/scope-manager" "4.23.0"
+    "@typescript-eslint/types" "4.23.0"
+    "@typescript-eslint/typescript-estree" "4.23.0"
     debug "^4.1.1"
 
-"@typescript-eslint/scope-manager@4.22.1":
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
-  integrity sha512-d5bAiPBiessSmNi8Amq/RuLslvcumxLmyhf1/Xa9IuaoFJ0YtshlJKxhlbY7l2JdEk3wS0EnmnfeJWSvADOe0g==
+"@typescript-eslint/scope-manager@4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.23.0.tgz#8792ef7eacac122e2ec8fa2d30a59b8d9a1f1ce4"
+  integrity sha512-ZZ21PCFxPhI3n0wuqEJK9omkw51wi2bmeKJvlRZPH5YFkcawKOuRMQMnI8mH6Vo0/DoHSeZJnHiIx84LmVQY+w==
   dependencies:
-    "@typescript-eslint/types" "4.22.1"
-    "@typescript-eslint/visitor-keys" "4.22.1"
+    "@typescript-eslint/types" "4.23.0"
+    "@typescript-eslint/visitor-keys" "4.23.0"
 
-"@typescript-eslint/types@4.22.1":
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
-  integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
+"@typescript-eslint/types@4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.23.0.tgz#da1654c8a5332f4d1645b2d9a1c64193cae3aa3b"
+  integrity sha512-oqkNWyG2SLS7uTWLZf6Sr7Dm02gA5yxiz1RP87tvsmDsguVATdpVguHr4HoGOcFOpCvx9vtCSCyQUGfzq28YCw==
 
-"@typescript-eslint/typescript-estree@4.22.1":
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
-  integrity sha512-p3We0pAPacT+onSGM+sPR+M9CblVqdA9F1JEdIqRVlxK5Qth4ochXQgIyb9daBomyQKAXbygxp1aXQRV0GC79A==
+"@typescript-eslint/typescript-estree@4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.23.0.tgz#0753b292097523852428a6f5a1aa8ccc1aae6cd9"
+  integrity sha512-5Sty6zPEVZF5fbvrZczfmLCOcby3sfrSPu30qKoY1U3mca5/jvU5cwsPb/CO6Q3ByRjixTMIVsDkqwIxCf/dMw==
   dependencies:
-    "@typescript-eslint/types" "4.22.1"
-    "@typescript-eslint/visitor-keys" "4.22.1"
+    "@typescript-eslint/types" "4.23.0"
+    "@typescript-eslint/visitor-keys" "4.23.0"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/visitor-keys@4.22.1":
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"
-  integrity sha512-WPkOrIRm+WCLZxXQHCi+WG8T2MMTUFR70rWjdWYddLT7cEfb2P4a3O/J2U1FBVsSFTocXLCoXWY6MZGejeStvQ==
+"@typescript-eslint/visitor-keys@4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.23.0.tgz#7215cc977bd3b4ef22467b9023594e32f9e4e455"
+  integrity sha512-5PNe5cmX9pSifit0H+nPoQBXdbNzi5tOEec+3riK+ku4e3er37pKxMKDH5Ct5Y4fhWxcD4spnlYjxi9vXbSpwg==
   dependencies:
-    "@typescript-eslint/types" "4.22.1"
+    "@typescript-eslint/types" "4.23.0"
     eslint-visitor-keys "^2.0.0"
 
 "@webassemblyjs/ast@1.11.0":
@@ -1840,22 +1840,22 @@
     "@webassemblyjs/ast" "1.11.0"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836"
-  integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==
+"@webpack-cli/configtest@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9"
+  integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==
 
-"@webpack-cli/info@^1.2.3":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c"
-  integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q==
+"@webpack-cli/info@^1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573"
+  integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441"
-  integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==
+"@webpack-cli/serve@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e"
+  integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -1958,9 +1958,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
-  integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz#25ee7348e32cdc4a1dbb38256bf6bdc451dd577c"
+  integrity sha512-RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -2465,9 +2465,9 @@ camelcase@^6.0.0, camelcase@^6.2.0:
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
 caniuse-lite@^1.0.30001219:
-  version "1.0.30001222"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001222.tgz#2789b8487282cbbe1700924f53951303d28086a9"
-  integrity sha512-rPmwUK0YMjfMlZVmH6nVB5U3YJ5Wnx3vmT5lnRO3nIKO8bJ+TRWMbGuuiSugDJqESy/lz+1hSrlQEagCtoOAWQ==
+  version "1.0.30001228"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
+  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3265,10 +3265,15 @@ dot-prop@^6.0.1:
   dependencies:
     is-obj "^2.0.0"
 
-dotenv@*, dotenv@^8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.5.1.tgz#e3a4c7862daba51b92bce0da5c349f11faa28663"
-  integrity sha512-qC1FbhCH7UH7B+BcRNUDhAk04d/n+tnGGB1ctwndZkVFeehYJOn39pRWWzmdzpFqImyX1KB8tO0DCHLf8yRaYQ==
+dotenv@*:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
+  integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==
+
+dotenv@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
+  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
 dotgitignore@^2.1.0:
   version "2.1.0"
@@ -3321,14 +3326,14 @@ end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enhanced-resolve@^5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz#d9deae58f9d3773b6a111a5a46831da5be5c9ac0"
-  integrity sha512-Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ==
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
+  integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5, enquirer@^2.3.6:
+enquirer@^2.3.5:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
   integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
@@ -3527,13 +3532,13 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint@^7.25.0:
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
-  integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
+eslint@^7.26.0:
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6"
+  integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==
   dependencies:
     "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.0"
+    "@eslint/eslintrc" "^0.4.1"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -4145,9 +4150,9 @@ glob-to-regexp@^0.4.1:
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
 glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4377,9 +4382,9 @@ iconv-lite@^0.6.2:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
 ignore-walk@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"
+  integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==
   dependencies:
     minimatch "^3.0.4"
 
@@ -4529,11 +4534,11 @@ is-bigint@^1.0.1:
   integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
 
 is-boolean-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
-  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
+  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
 
 is-buffer@^1.1.5:
   version "1.1.6"
@@ -4553,9 +4558,9 @@ is-ci@^2.0.0:
     ci-info "^2.0.0"
 
 is-core-module@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
-  integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
+  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
   dependencies:
     has "^1.0.3"
 
@@ -4574,9 +4579,9 @@ is-data-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1, is-date-object@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
+  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -4668,9 +4673,9 @@ is-negative-zero@^2.0.1:
   integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
 is-number-object@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
-  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
+  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -4717,12 +4722,12 @@ is-potential-custom-element-name@^1.0.0:
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
 is-regex@^1.1.1, is-regex@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
-  integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
+  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
   dependencies:
     call-bind "^1.0.2"
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.2"
 
 is-set@^2.0.1, is-set@^2.0.2:
   version "2.0.2"
@@ -4747,16 +4752,16 @@ is-stream@^2.0.0:
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
 is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
+  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.2"
 
 is-text-path@^1.0.1:
   version "1.0.1"
@@ -5638,11 +5643,6 @@ lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
-lodash.flatten@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
-
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
@@ -6245,9 +6245,9 @@ npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-pack
     validate-npm-package-name "^3.0.0"
 
 npm-packlist@^2.1.4:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.5.tgz#43ef5bbb9f59b7c0ef91e0905f1dd707b4cfb33c"
-  integrity sha512-KCfK3Vi2F+PH1klYauoQzg81GQ8/GGjQRKYY6tRnpQUPKTs/1gBZSRWtTEd7jGdSn1LZL7gpAmJT+BcS55k2XQ==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
+  integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==
   dependencies:
     glob "^7.1.6"
     ignore-walk "^3.0.3"
@@ -6350,9 +6350,9 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-inspect@^1.9.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30"
-  integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
+  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
 
 object-is@^1.1.4:
   version "1.1.5"
@@ -6826,10 +6826,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
-  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
+prettier@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18"
+  integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==
 
 pretty-format@^26.0.0, pretty-format@^26.6.2:
   version "26.6.2"
@@ -8001,13 +8001,12 @@ symbol-tree@^3.2.4:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 table@^6.0.4:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e"
-  integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg==
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz#26274751f0ee099c547f6cb91d3eff0d61d155b2"
+  integrity sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw==
   dependencies:
     ajv "^8.0.1"
     lodash.clonedeep "^4.5.0"
-    lodash.flatten "^4.4.0"
     lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
@@ -8228,10 +8227,10 @@ trim-off-newlines@^1.0.0:
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
-ts-jest@^26.5.5:
-  version "26.5.5"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.5.tgz#e40481b6ee4dd162626ba481a2be05fa57160ea5"
-  integrity sha512-7tP4m+silwt1NHqzNRAPjW1BswnAhopTdc2K3HEkRZjF0ZG2F/e/ypVH0xiZIMfItFtD3CX0XFbwPzp9fIEUVg==
+ts-jest@^26.5.6:
+  version "26.5.6"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.6.tgz#c32e0746425274e1dfe333f43cd3c800e014ec35"
+  integrity sha512-rua+rCP8DxpA8b4DQD/6X2HQS8Zy/xzViVYfEs2OQu68tkCuKLV0Md8pmX55+W24uRIyAsf/BajRfxOs+R2MKA==
   dependencies:
     bs-logger "0.x"
     buffer-from "1.x"
@@ -8375,9 +8374,9 @@ typescript@~3.9.9:
   integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==
 
 uglify-js@^3.1.4:
-  version "3.13.5"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
-  integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
+  version "3.13.6"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz#6815ac7fdd155d03c83e2362bb717e5b39b74013"
+  integrity sha512-rRprLwl8RVaS+Qvx3Wh5hPfPBn9++G6xkGlUupya0s5aDmNjI7z3lnRLB3u7sN4OmbB0pWgzhM9BEJyiWAwtAA==
 
 uid-number@0.0.6:
   version "0.0.6"
@@ -8508,9 +8507,9 @@ v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
 v8-to-istanbul@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.1.tgz#04bfd1026ba4577de5472df4f5e89af49de5edda"
-  integrity sha512-p0BB09E5FRjx0ELN6RgusIPsSPhtgexSRcKETybEs6IGOTXJSZqfwxp7r//55nnu0f1AxltY5VvdVqy2vZf9AA==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
+  integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -8586,18 +8585,17 @@ webidl-conversions@^6.1.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
-webpack-cli@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16"
-  integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA==
+webpack-cli@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35"
+  integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.0.2"
-    "@webpack-cli/info" "^1.2.3"
-    "@webpack-cli/serve" "^1.3.1"
+    "@webpack-cli/configtest" "^1.0.3"
+    "@webpack-cli/info" "^1.2.4"
+    "@webpack-cli/serve" "^1.4.0"
     colorette "^1.2.1"
     commander "^7.0.0"
-    enquirer "^2.3.6"
     execa "^5.0.0"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
@@ -8622,10 +8620,10 @@ webpack-sources@^2.1.1:
     source-list-map "^2.0.1"
     source-map "^0.6.1"
 
-webpack@^5.36.2:
-  version "5.36.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.36.2.tgz#6ef1fb2453ad52faa61e78d486d353d07cca8a0f"
-  integrity sha512-XJumVnnGoH2dV+Pk1VwgY4YT6AiMKpVoudUFCNOXMIVrEKPUgEwdIfWPjIuGLESAiS8EdIHX5+TiJz/5JccmRg==
+webpack@^5.37.0:
+  version "5.37.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.37.0.tgz#2ab00f613faf494504eb2beef278dab7493cc39d"
+  integrity sha512-yvdhgcI6QkQkDe1hINBAJ1UNevqNGTVaCkD2SSJcB8rcrNNl922RI8i2DXUAuNfANoxwsiXXEA4ZPZI9q2oGLA==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
     "@types/estree" "^0.0.47"

From be83e4357097c3214404b5061b2a10b4e0240861 Mon Sep 17 00:00:00 2001
From: Eli Polonsky <epolon@amazon.com>
Date: Wed, 26 May 2021 17:14:51 +0300
Subject: [PATCH 20/28] chore: browser compatibility for `jsii-reflect` and
 `codemaker` (#2856)

We have started using `jsii-reflect` and `codemaker` in the [construct-hub-webapp](https://github.com/cdklabs/construct-hub-webapp) to generate API references on the client side.

These are the modifications needed in order for the modules to load in a browser environment.

---

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
---
 packages/codemaker/lib/filebuff.ts       |  5 ++++-
 packages/jsii-reflect/lib/type-system.ts | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/codemaker/lib/filebuff.ts b/packages/codemaker/lib/filebuff.ts
index 133a5b9f47..ba0a406a7d 100644
--- a/packages/codemaker/lib/filebuff.ts
+++ b/packages/codemaker/lib/filebuff.ts
@@ -1,4 +1,3 @@
-import * as fs from 'fs-extra';
 import * as path from 'path';
 
 /**
@@ -17,6 +16,10 @@ export default class FileBuffer {
   }
 
   public async save(rootDir: string) {
+    // just-in-time require so that this file can be loaded in browsers as well.
+    // eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
+    const fs = require('fs-extra');
+
     const fullPath = path.join(rootDir, this.filePath);
     await fs.mkdirs(path.dirname(fullPath));
     await fs.writeFile(fullPath, this.buffer);
diff --git a/packages/jsii-reflect/lib/type-system.ts b/packages/jsii-reflect/lib/type-system.ts
index 988e3018df..302f600282 100644
--- a/packages/jsii-reflect/lib/type-system.ts
+++ b/packages/jsii-reflect/lib/type-system.ts
@@ -1,5 +1,4 @@
 import * as jsii from '@jsii/spec';
-import * as fs from 'fs';
 import * as path from 'path';
 import { promisify } from 'util';
 
@@ -12,9 +11,6 @@ import { ModuleLike } from './module-like';
 import { Property } from './property';
 import { Type } from './type';
 
-const readFile = promisify(fs.readFile);
-const stat = promisify(fs.stat);
-
 export class TypeSystem {
   /**
    * All assemblies in this type system.
@@ -345,3 +341,17 @@ function flatMap<T, R>(
     .map(mapper)
     .reduce((acc, elt) => acc.concat(elt), new Array<R>());
 }
+
+function stat(p: string) {
+  // just-in-time require so that this file can be loaded in browsers as well.
+  // eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
+  const fs = require('fs');
+  return promisify(fs.stat)(p);
+}
+
+function readFile(p: string) {
+  // just-in-time require so that this file can be loaded in browsers as well.
+  // eslint-disable-next-line @typescript-eslint/no-require-imports,@typescript-eslint/no-var-requires
+  const fs = require('fs');
+  return promisify(fs.readFile)(p);
+}

From 69c6e94cd4e16fa1ec501a21d2acd76eb4801c41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 May 2021 15:33:21 +0000
Subject: [PATCH 21/28] chore(deps): bump golang.org/x/tools in
 /packages/@jsii/go-runtime (#2855)

---
 packages/@jsii/go-runtime/go.mod |  2 +-
 packages/@jsii/go-runtime/go.sum | 30 ++++++++++++++----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/@jsii/go-runtime/go.mod b/packages/@jsii/go-runtime/go.mod
index 3fc06ea17d..73a39e3522 100644
--- a/packages/@jsii/go-runtime/go.mod
+++ b/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.0
+	golang.org/x/tools v0.1.2
 )
diff --git a/packages/@jsii/go-runtime/go.sum b/packages/@jsii/go-runtime/go.sum
index c2d920e438..053cc719ab 100644
--- a/packages/@jsii/go-runtime/go.sum
+++ b/packages/@jsii/go-runtime/go.sum
@@ -1,34 +1,32 @@
-github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5 h1:dPmz1Snjq0kmkz159iL7S6WzdahUTHnHB5M56WFVifs=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 h1:2M3HP5CCK1Si9FQhwnzYhXdG6DXeebvUHFpre8QvbyI=
 golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 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.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA=
+golang.org/x/tools v0.1.2/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=

From b7b9e5f75d09543e0e48f31bcde0ee770599fe04 Mon Sep 17 00:00:00 2001
From: Mark Nielsen <watermark.nielsen@gmail.com>
Date: Wed, 26 May 2021 09:29:00 -0700
Subject: [PATCH 22/28] fix(python): module import fails: NameError: name
 'List' is not defined (#2851)

When importing a module in Python, you can get this error:
```
NameError: name 'List' is not defined
```

JSII generated code:
```python
import abc
import builtins
import datetime
import enum
import typing

import jsii
import publication
import typing_extensions

from ._jsii import *

__all__: List[typing.Any] = []  # <--- HERE IS THE BUG

publication.publish()
```

Just need to prefix `List` with `typing.`

Related issue/pr:

- https://github.com/aws/jsii/issues/2750
- https://github.com/aws/jsii/pull/2757

---

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
---
 packages/jsii-pacmak/lib/targets/python.ts                  | 2 +-
 .../generated-code/__snapshots__/target-python.test.ts.snap | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts
index 868d3c0840..f68ae2264b 100644
--- a/packages/jsii-pacmak/lib/targets/python.ts
+++ b/packages/jsii-pacmak/lib/targets/python.ts
@@ -1607,7 +1607,7 @@ class PythonModule implements PythonType {
       }
       code.unindent(']');
     } else {
-      code.line('__all__: List[typing.Any] = []');
+      code.line('__all__: typing.List[typing.Any] = []');
     }
 
     // Finally, we'll use publication to ensure that all of the non-public names
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
index 0612a6732c..e58b7a6db6 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
@@ -10589,7 +10589,7 @@ import typing_extensions
 
 from .._jsii import *
 
-__all__: List[typing.Any] = []
+__all__: typing.List[typing.Any] = []
 
 publication.publish()
 
@@ -10806,7 +10806,7 @@ import typing_extensions
 
 from .._jsii import *
 
-__all__: List[typing.Any] = []
+__all__: typing.List[typing.Any] = []
 
 publication.publish()
 
@@ -11163,7 +11163,7 @@ import typing_extensions
 
 from .._jsii import *
 
-__all__: List[typing.Any] = []
+__all__: typing.List[typing.Any] = []
 
 publication.publish()
 

From 07693478ff85142cc79691539d72ce5a4169eb9d Mon Sep 17 00:00:00 2001
From: Andrew Wason <rectalogic@rectalogic.com>
Date: Wed, 26 May 2021 13:12:50 -0400
Subject: [PATCH 23/28] fix(python): classes do not correctly implement
 interfaces (#2809)

Fixes  aws/aws-cdk#13474

---

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
---
 .../@jsii/python-runtime/tests/test_python.py |  18 +
 packages/jsii-calc/lib/module2702/index.ts    |  42 ++
 packages/jsii-calc/test/assembly.jsii         | 263 +++++++-
 packages/jsii-pacmak/lib/targets/python.ts    |  62 +-
 .../__snapshots__/examples.test.ts.snap       |   7 +-
 .../__snapshots__/target-dotnet.test.ts.snap  | 330 +++++++++-
 .../__snapshots__/target-go.test.ts.snap      | 393 ++++++++++++
 .../__snapshots__/target-java.test.ts.snap    | 452 +++++++++++++-
 .../__snapshots__/target-python.test.ts.snap  | 571 ++++++++++--------
 .../test/__snapshots__/jsii-tree.test.ts.snap | 130 +++-
 .../test/__snapshots__/tree.test.ts.snap      |  73 ++-
 .../__snapshots__/type-system.test.ts.snap    |   4 +
 12 files changed, 2036 insertions(+), 309 deletions(-)

diff --git a/packages/@jsii/python-runtime/tests/test_python.py b/packages/@jsii/python-runtime/tests/test_python.py
index c874a78c11..51ad15fb4a 100644
--- a/packages/@jsii/python-runtime/tests/test_python.py
+++ b/packages/@jsii/python-runtime/tests/test_python.py
@@ -1,8 +1,10 @@
 import jsii
 import pytest
+from typing import Any, cast
 
 from jsii.errors import JSIIError
 import jsii_calc
+from jsii_calc.module2702 import IVpc, Vpc, IBaz, Baz
 
 
 class TestErrorHandling:
@@ -27,8 +29,24 @@ def test_descriptive_error_when_passing_function(self):
         obj = jsii_calc.Calculator()
 
         with pytest.raises(JSIIError, match="Cannot pass function as argument here.*"):
+            # types: ignore
             obj.add(self.test_descriptive_error_when_passing_function)
 
+    def test_implements_interface(self) -> None:
+        """Checks that jsii-generated classes correctly implement the relevant jsii-generated interfaces."""
+
+        def vpc_interface_func(v: IVpc) -> None:
+            assert v is not None
+
+        vpc = Vpc()
+        vpc_interface_func(vpc)
+
+        def baz_interface_func(b: IBaz) -> None:
+            assert b is not None
+
+        baz = Baz()
+        baz_interface_func(baz)
+
 
 def find_struct_bases(x):
     ret = []
diff --git a/packages/jsii-calc/lib/module2702/index.ts b/packages/jsii-calc/lib/module2702/index.ts
index 8b87aa9d9b..264db09921 100644
--- a/packages/jsii-calc/lib/module2702/index.ts
+++ b/packages/jsii-calc/lib/module2702/index.ts
@@ -30,3 +30,45 @@ export class Class3 implements IBaseInterface {
 export interface IFoo extends IBaseInterface {
   readonly iBaseInterface: string;
 }
+
+// See https://github.com/aws/aws-cdk/issues/13474
+
+export interface IConstruct {
+  constructMethod(): void;
+}
+
+export interface IResource extends IConstruct {
+  resourceMethod(): void;
+}
+
+export interface IVpc extends IResource {
+  vpcMethod(): void;
+}
+
+export class Construct implements IConstruct {
+  public constructMethod(): void {
+    return;
+  }
+}
+
+export abstract class Resource extends Construct implements IResource {
+  public resourceMethod(): void {
+    return;
+  }
+}
+
+export class Vpc extends Resource implements IVpc {
+  public vpcMethod(): void {
+    return;
+  }
+}
+
+export interface IBaz extends IBaseInterface {
+  bazMethod(): void;
+}
+
+export class Baz extends Class3 implements IBaz {
+  public bazMethod(): void {
+    return;
+  }
+}
diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
index 9ebadccc5c..92b1c24f41 100644
--- a/packages/jsii-calc/test/assembly.jsii
+++ b/packages/jsii-calc/test/assembly.jsii
@@ -14968,6 +14968,42 @@
         }
       ]
     },
+    "jsii-calc.module2702.Baz": {
+      "assembly": "jsii-calc",
+      "base": "jsii-calc.module2702.Class3",
+      "docs": {
+        "stability": "stable"
+      },
+      "fqn": "jsii-calc.module2702.Baz",
+      "initializer": {
+        "docs": {
+          "stability": "stable"
+        }
+      },
+      "interfaces": [
+        "jsii-calc.module2702.IBaz"
+      ],
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/module2702/index.ts",
+        "line": 70
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "stable"
+          },
+          "locationInModule": {
+            "filename": "lib/module2702/index.ts",
+            "line": 71
+          },
+          "name": "bazMethod",
+          "overrides": "jsii-calc.module2702.IBaz"
+        }
+      ],
+      "name": "Baz",
+      "namespace": "module2702"
+    },
     "jsii-calc.module2702.Class1": {
       "assembly": "jsii-calc",
       "base": "@scope/jsii-calc-base.Base",
@@ -15084,6 +15120,98 @@
       "name": "Class3",
       "namespace": "module2702"
     },
+    "jsii-calc.module2702.Construct": {
+      "assembly": "jsii-calc",
+      "docs": {
+        "stability": "stable"
+      },
+      "fqn": "jsii-calc.module2702.Construct",
+      "initializer": {
+        "docs": {
+          "stability": "stable"
+        }
+      },
+      "interfaces": [
+        "jsii-calc.module2702.IConstruct"
+      ],
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/module2702/index.ts",
+        "line": 48
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "stable"
+          },
+          "locationInModule": {
+            "filename": "lib/module2702/index.ts",
+            "line": 49
+          },
+          "name": "constructMethod",
+          "overrides": "jsii-calc.module2702.IConstruct"
+        }
+      ],
+      "name": "Construct",
+      "namespace": "module2702"
+    },
+    "jsii-calc.module2702.IBaz": {
+      "assembly": "jsii-calc",
+      "docs": {
+        "stability": "stable"
+      },
+      "fqn": "jsii-calc.module2702.IBaz",
+      "interfaces": [
+        "@scope/jsii-calc-base.IBaseInterface"
+      ],
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/module2702/index.ts",
+        "line": 66
+      },
+      "methods": [
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "stable"
+          },
+          "locationInModule": {
+            "filename": "lib/module2702/index.ts",
+            "line": 67
+          },
+          "name": "bazMethod"
+        }
+      ],
+      "name": "IBaz",
+      "namespace": "module2702"
+    },
+    "jsii-calc.module2702.IConstruct": {
+      "assembly": "jsii-calc",
+      "docs": {
+        "stability": "stable"
+      },
+      "fqn": "jsii-calc.module2702.IConstruct",
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/module2702/index.ts",
+        "line": 36
+      },
+      "methods": [
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "stable"
+          },
+          "locationInModule": {
+            "filename": "lib/module2702/index.ts",
+            "line": 37
+          },
+          "name": "constructMethod"
+        }
+      ],
+      "name": "IConstruct",
+      "namespace": "module2702"
+    },
     "jsii-calc.module2702.IFoo": {
       "assembly": "jsii-calc",
       "docs": {
@@ -15118,6 +15246,139 @@
         }
       ]
     },
+    "jsii-calc.module2702.IResource": {
+      "assembly": "jsii-calc",
+      "docs": {
+        "stability": "stable"
+      },
+      "fqn": "jsii-calc.module2702.IResource",
+      "interfaces": [
+        "jsii-calc.module2702.IConstruct"
+      ],
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/module2702/index.ts",
+        "line": 40
+      },
+      "methods": [
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "stable"
+          },
+          "locationInModule": {
+            "filename": "lib/module2702/index.ts",
+            "line": 41
+          },
+          "name": "resourceMethod"
+        }
+      ],
+      "name": "IResource",
+      "namespace": "module2702"
+    },
+    "jsii-calc.module2702.IVpc": {
+      "assembly": "jsii-calc",
+      "docs": {
+        "stability": "stable"
+      },
+      "fqn": "jsii-calc.module2702.IVpc",
+      "interfaces": [
+        "jsii-calc.module2702.IResource"
+      ],
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/module2702/index.ts",
+        "line": 44
+      },
+      "methods": [
+        {
+          "abstract": true,
+          "docs": {
+            "stability": "stable"
+          },
+          "locationInModule": {
+            "filename": "lib/module2702/index.ts",
+            "line": 45
+          },
+          "name": "vpcMethod"
+        }
+      ],
+      "name": "IVpc",
+      "namespace": "module2702"
+    },
+    "jsii-calc.module2702.Resource": {
+      "abstract": true,
+      "assembly": "jsii-calc",
+      "base": "jsii-calc.module2702.Construct",
+      "docs": {
+        "stability": "stable"
+      },
+      "fqn": "jsii-calc.module2702.Resource",
+      "initializer": {
+        "docs": {
+          "stability": "stable"
+        }
+      },
+      "interfaces": [
+        "jsii-calc.module2702.IResource"
+      ],
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/module2702/index.ts",
+        "line": 54
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "stable"
+          },
+          "locationInModule": {
+            "filename": "lib/module2702/index.ts",
+            "line": 55
+          },
+          "name": "resourceMethod",
+          "overrides": "jsii-calc.module2702.IResource"
+        }
+      ],
+      "name": "Resource",
+      "namespace": "module2702"
+    },
+    "jsii-calc.module2702.Vpc": {
+      "assembly": "jsii-calc",
+      "base": "jsii-calc.module2702.Resource",
+      "docs": {
+        "stability": "stable"
+      },
+      "fqn": "jsii-calc.module2702.Vpc",
+      "initializer": {
+        "docs": {
+          "stability": "stable"
+        }
+      },
+      "interfaces": [
+        "jsii-calc.module2702.IVpc"
+      ],
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/module2702/index.ts",
+        "line": 60
+      },
+      "methods": [
+        {
+          "docs": {
+            "stability": "stable"
+          },
+          "locationInModule": {
+            "filename": "lib/module2702/index.ts",
+            "line": 61
+          },
+          "name": "vpcMethod",
+          "overrides": "jsii-calc.module2702.IVpc"
+        }
+      ],
+      "name": "Vpc",
+      "namespace": "module2702"
+    },
     "jsii-calc.nodirect.sub1.TypeFromSub1": {
       "assembly": "jsii-calc",
       "docs": {
@@ -15874,5 +16135,5 @@
     }
   },
   "version": "3.20.120",
-  "fingerprint": "ezY52AR44agRJClz62BLSJU4fF1Dhh+7vRL5LX9Fcgc="
+  "fingerprint": "Ouku0wagXKUVN9v9Ud7ocXYRaRl10KuCazRDvU/7iNk="
 }
diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts
index f68ae2264b..0a27664e29 100644
--- a/packages/jsii-pacmak/lib/targets/python.ts
+++ b/packages/jsii-pacmak/lib/targets/python.ts
@@ -392,14 +392,9 @@ abstract class BasePythonClassType implements PythonType, ISortableType {
       trailingNewLine: true,
     });
 
-    const preamble = this.emitPreamble;
-    if (preamble) {
-      preamble(code, context);
-    }
-
     if (this.members.length > 0) {
       const resolver = this.boundResolver(context.resolver);
-      let shouldSeparate = preamble != null;
+      let shouldSeparate = false;
       for (const member of prepareMembers(this.members, resolver)) {
         if (shouldSeparate) {
           code.line();
@@ -407,7 +402,7 @@ abstract class BasePythonClassType implements PythonType, ISortableType {
         shouldSeparate = this.separateMembers;
         member.emit(code, { ...context, resolver });
       }
-    } else if (!preamble) {
+    } else {
       code.line('pass');
     }
 
@@ -426,11 +421,6 @@ abstract class BasePythonClassType implements PythonType, ISortableType {
   }
 
   protected abstract getClassParams(context: EmitContext): string[];
-
-  protected abstract readonly emitPreamble?: (
-    code: CodeMaker,
-    context: EmitContext,
-  ) => void;
 }
 
 interface BaseMethodOpts {
@@ -926,7 +916,7 @@ class Interface extends BasePythonClassType {
           typeAnnotation: false,
         })}) # type: ignore[misc]`,
     );
-    openSignature(code, 'class', this.getProxyClassName(), proxyBases);
+    openSignature(code, 'class', this.proxyClassName, proxyBases);
     this.generator.emitDocString(code, this.docs, {
       documentableItem: `class-${this.pythonName}`,
       trailingNewLine: true,
@@ -945,6 +935,13 @@ class Interface extends BasePythonClassType {
     }
 
     code.closeBlock();
+    code.line();
+    code.line(
+      '# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface',
+    );
+    code.line(
+      `typing.cast(typing.Any, ${this.pythonName}).__jsii_proxy_class__ = lambda : ${this.proxyClassName}`,
+    );
 
     if (this.fqn != null) {
       context.emittedTypes.add(this.fqn);
@@ -961,19 +958,7 @@ class Interface extends BasePythonClassType {
     return params;
   }
 
-  protected readonly emitPreamble = (
-    code: CodeMaker,
-    _context: EmitContext,
-  ) => {
-    code.line('@builtins.staticmethod');
-    code.openBlock(
-      `def __jsii_proxy_class__() -> typing.Type["${this.getProxyClassName()}"]`,
-    );
-    code.line(`return ${this.getProxyClassName()}`);
-    code.closeBlock();
-  };
-
-  private getProxyClassName(): string {
+  private get proxyClassName(): string {
     return `_${this.pythonName}Proxy`;
   }
 }
@@ -993,7 +978,6 @@ class InterfaceProperty extends BaseProperty {
 }
 
 class Struct extends BasePythonClassType {
-  protected readonly emitPreamble = undefined;
   protected directMembers = new Array<StructField>();
 
   public addMember(member: PythonBase): void {
@@ -1333,7 +1317,7 @@ class Class extends BasePythonClassType implements ISortableType {
 
       code.line();
       code.line();
-      openSignature(code, 'class', this.getProxyClassName(), proxyBases);
+      openSignature(code, 'class', this.proxyClassName, proxyBases);
 
       // Filter our list of members to *only* be abstract members, and not any
       // other types.
@@ -1358,19 +1342,14 @@ class Class extends BasePythonClassType implements ISortableType {
       }
 
       code.closeBlock();
-    }
-  }
-
-  protected get emitPreamble() {
-    if (!this.abstract) return undefined;
-    return (code: CodeMaker, _context: EmitContext) => {
-      code.line('@builtins.staticmethod');
-      code.openBlock(
-        `def __jsii_proxy_class__() -> typing.Type["${this.getProxyClassName()}"]`,
+      code.line();
+      code.line(
+        '# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class',
       );
-      code.line(`return ${this.getProxyClassName()}`);
-      code.closeBlock();
-    };
+      code.line(
+        `typing.cast(typing.Any, ${this.pythonName}).__jsii_proxy_class__ = lambda : ${this.proxyClassName}`,
+      );
+    }
   }
 
   protected getClassParams(context: EmitContext): string[] {
@@ -1385,7 +1364,7 @@ class Class extends BasePythonClassType implements ISortableType {
     return params;
   }
 
-  private getProxyClassName(): string {
+  private get proxyClassName(): string {
     return `_${this.pythonName}Proxy`;
   }
 }
@@ -1428,7 +1407,6 @@ class Property extends BaseProperty {
 }
 
 class Enum extends BasePythonClassType {
-  protected readonly emitPreamble = undefined;
   protected readonly separateMembers = false;
 
   public emit(code: CodeMaker, context: EmitContext) {
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
index aa2487761b..4665c9ebae 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.ts.snap
@@ -2572,10 +2572,6 @@ class Namespace1(metaclass=jsii.JSIIMeta, jsii_type="testpkg.Namespace1"):
 
     @jsii.interface(jsii_type="testpkg.Namespace1.IBar")
     class IBar(typing_extensions.Protocol):
-        @builtins.staticmethod
-        def __jsii_proxy_class__() -> typing.Type["_IBarProxy"]:
-            return _IBarProxy
-
         @builtins.property # type: ignore[misc]
         @jsii.member(jsii_name="bar")
         def bar(self) -> builtins.str:
@@ -2598,6 +2594,9 @@ class Namespace1(metaclass=jsii.JSIIMeta, jsii_type="testpkg.Namespace1"):
         def method(self) -> None:
             return typing.cast(None, jsii.invoke(self, "method", []))
 
+    # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+    typing.cast(typing.Any, IBar).__jsii_proxy_class__ = lambda : _IBarProxy
+
 
 class Namespace2(metaclass=jsii.JSIIMeta, jsii_type="testpkg.Namespace2"):
     def __init__(self) -> None:
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
index ead2b1fbbf..a0534ff380 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.ts.snap
@@ -2928,10 +2928,18 @@ exports[`Generated code for "jsii-calc": <outDir>/ 1`] = `
        ┃           ┃  ┣━ 📄 Derived.cs
        ┃           ┃  ┗━ 📄 IFoo.cs
        ┃           ┣━ 📁 Module2702
+       ┃           ┃  ┣━ 📄 Baz.cs
        ┃           ┃  ┣━ 📄 Class1.cs
        ┃           ┃  ┣━ 📄 Class2.cs
        ┃           ┃  ┣━ 📄 Class3.cs
-       ┃           ┃  ┗━ 📄 IFoo.cs
+       ┃           ┃  ┣━ 📄 Construct.cs
+       ┃           ┃  ┣━ 📄 IBaz.cs
+       ┃           ┃  ┣━ 📄 IConstruct.cs
+       ┃           ┃  ┣━ 📄 IFoo.cs
+       ┃           ┃  ┣━ 📄 IResource.cs
+       ┃           ┃  ┣━ 📄 IVpc.cs
+       ┃           ┃  ┣━ 📄 Resource.cs
+       ┃           ┃  ┗━ 📄 Vpc.cs
        ┃           ┣━ 📄 Multiply.cs
        ┃           ┣━ 📄 NamespaceDoc.cs
        ┃           ┣━ 📄 Negate.cs
@@ -12867,6 +12875,44 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2700
 
 `;
 
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/Baz.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
+{
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Module2702.Baz), fullyQualifiedName: "jsii-calc.module2702.Baz")]
+    public class Baz : Amazon.JSII.Tests.CalculatorNamespace.Module2702.Class3, Amazon.JSII.Tests.CalculatorNamespace.Module2702.IBaz
+    {
+        public Baz(): base(new DeputyProps(System.Array.Empty<object?>()))
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from a Javascript-owned object reference</summary>
+        /// <param name="reference">The Javascript-owned object reference</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected Baz(ByRefValue reference): base(reference)
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from DeputyProps</summary>
+        /// <param name="props">The deputy props</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected Baz(DeputyProps props): base(props)
+        {
+        }
+
+        [JsiiMethod(name: "bazMethod", isOverride: true)]
+        public virtual void BazMethod()
+        {
+            InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+        }
+    }
+}
+
+`;
+
 exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/Class1.cs 1`] = `
 using Amazon.JSII.Runtime.Deputy;
 
@@ -12993,6 +13039,118 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
 
 `;
 
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/Construct.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
+{
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Module2702.Construct), fullyQualifiedName: "jsii-calc.module2702.Construct")]
+    public class Construct : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Module2702.IConstruct
+    {
+        public Construct(): base(new DeputyProps(System.Array.Empty<object?>()))
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from a Javascript-owned object reference</summary>
+        /// <param name="reference">The Javascript-owned object reference</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected Construct(ByRefValue reference): base(reference)
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from DeputyProps</summary>
+        /// <param name="props">The deputy props</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected Construct(DeputyProps props): base(props)
+        {
+        }
+
+        [JsiiMethod(name: "constructMethod", isOverride: true)]
+        public virtual void ConstructMethod()
+        {
+            InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/IBaz.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
+{
+    [JsiiInterface(nativeType: typeof(IBaz), fullyQualifiedName: "jsii-calc.module2702.IBaz")]
+    public interface IBaz : Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.IBaseInterface
+    {
+        [JsiiMethod(name: "bazMethod")]
+        void BazMethod();
+
+        [JsiiTypeProxy(nativeType: typeof(IBaz), fullyQualifiedName: "jsii-calc.module2702.IBaz")]
+        internal sealed class _Proxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Module2702.IBaz
+        {
+            private _Proxy(ByRefValue reference): base(reference)
+            {
+            }
+
+            [JsiiMethod(name: "bazMethod")]
+            public void BazMethod()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+
+            [JsiiMethod(name: "bar")]
+            public void Bar()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+
+            [JsiiMethod(name: "foo")]
+            public void Foo()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/IConstruct.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
+{
+    [JsiiInterface(nativeType: typeof(IConstruct), fullyQualifiedName: "jsii-calc.module2702.IConstruct")]
+    public interface IConstruct
+    {
+        [JsiiMethod(name: "constructMethod")]
+        void ConstructMethod();
+
+        [JsiiTypeProxy(nativeType: typeof(IConstruct), fullyQualifiedName: "jsii-calc.module2702.IConstruct")]
+        internal sealed class _Proxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Module2702.IConstruct
+        {
+            private _Proxy(ByRefValue reference): base(reference)
+            {
+            }
+
+            [JsiiMethod(name: "constructMethod")]
+            public void ConstructMethod()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+        }
+    }
+}
+
+`;
+
 exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/IFoo.cs 1`] = `
 using Amazon.JSII.Runtime.Deputy;
 
@@ -13039,6 +13197,176 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
 
 `;
 
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/IResource.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
+{
+    [JsiiInterface(nativeType: typeof(IResource), fullyQualifiedName: "jsii-calc.module2702.IResource")]
+    public interface IResource : Amazon.JSII.Tests.CalculatorNamespace.Module2702.IConstruct
+    {
+        [JsiiMethod(name: "resourceMethod")]
+        void ResourceMethod();
+
+        [JsiiTypeProxy(nativeType: typeof(IResource), fullyQualifiedName: "jsii-calc.module2702.IResource")]
+        new internal sealed class _Proxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Module2702.IResource
+        {
+            private _Proxy(ByRefValue reference): base(reference)
+            {
+            }
+
+            [JsiiMethod(name: "resourceMethod")]
+            public void ResourceMethod()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+
+            [JsiiMethod(name: "constructMethod")]
+            public void ConstructMethod()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/IVpc.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
+{
+    [JsiiInterface(nativeType: typeof(IVpc), fullyQualifiedName: "jsii-calc.module2702.IVpc")]
+    public interface IVpc : Amazon.JSII.Tests.CalculatorNamespace.Module2702.IResource
+    {
+        [JsiiMethod(name: "vpcMethod")]
+        void VpcMethod();
+
+        [JsiiTypeProxy(nativeType: typeof(IVpc), fullyQualifiedName: "jsii-calc.module2702.IVpc")]
+        new internal sealed class _Proxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Module2702.IVpc
+        {
+            private _Proxy(ByRefValue reference): base(reference)
+            {
+            }
+
+            [JsiiMethod(name: "vpcMethod")]
+            public void VpcMethod()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+
+            [JsiiMethod(name: "resourceMethod")]
+            public void ResourceMethod()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+
+            [JsiiMethod(name: "constructMethod")]
+            public void ConstructMethod()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/Resource.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
+{
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Module2702.Resource), fullyQualifiedName: "jsii-calc.module2702.Resource")]
+    public abstract class Resource : Amazon.JSII.Tests.CalculatorNamespace.Module2702.Construct, Amazon.JSII.Tests.CalculatorNamespace.Module2702.IResource
+    {
+        protected Resource(): base(new DeputyProps(System.Array.Empty<object?>()))
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from a Javascript-owned object reference</summary>
+        /// <param name="reference">The Javascript-owned object reference</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected Resource(ByRefValue reference): base(reference)
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from DeputyProps</summary>
+        /// <param name="props">The deputy props</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected Resource(DeputyProps props): base(props)
+        {
+        }
+
+        [JsiiMethod(name: "resourceMethod", isOverride: true)]
+        public virtual void ResourceMethod()
+        {
+            InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+        }
+
+        [JsiiTypeProxy(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Module2702.Resource), fullyQualifiedName: "jsii-calc.module2702.Resource")]
+        internal sealed class _Proxy : Amazon.JSII.Tests.CalculatorNamespace.Module2702.Resource
+        {
+            private _Proxy(ByRefValue reference): base(reference)
+            {
+            }
+
+            [JsiiMethod(name: "constructMethod")]
+            public override void ConstructMethod()
+            {
+                InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+            }
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Module2702/Vpc.cs 1`] = `
+using Amazon.JSII.Runtime.Deputy;
+
+#pragma warning disable CS0672,CS0809,CS1591
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.Module2702
+{
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Module2702.Vpc), fullyQualifiedName: "jsii-calc.module2702.Vpc")]
+    public class Vpc : Amazon.JSII.Tests.CalculatorNamespace.Module2702.Resource, Amazon.JSII.Tests.CalculatorNamespace.Module2702.IVpc
+    {
+        public Vpc(): base(new DeputyProps(System.Array.Empty<object?>()))
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from a Javascript-owned object reference</summary>
+        /// <param name="reference">The Javascript-owned object reference</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected Vpc(ByRefValue reference): base(reference)
+        {
+        }
+
+        /// <summary>Used by jsii to construct an instance of this class from DeputyProps</summary>
+        /// <param name="props">The deputy props</param>
+        [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+        protected Vpc(DeputyProps props): base(props)
+        {
+        }
+
+        [JsiiMethod(name: "vpcMethod", isOverride: true)]
+        public virtual void VpcMethod()
+        {
+            InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+        }
+    }
+}
+
+`;
+
 exports[`Generated code for "jsii-calc": <outDir>/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Multiply.cs 1`] = `
 using Amazon.JSII.Runtime.Deputy;
 
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
index 45e9116be6..59aa86c39b 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.ts.snap
@@ -17342,6 +17342,77 @@ import (
 	"github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/module2702/internal"
 )
 
+type Baz interface {
+	Class3
+	IBaz
+	Bar()
+	BazMethod()
+	Foo()
+	IBaseInterface()
+}
+
+// The jsii proxy struct for Baz
+type jsiiProxy_Baz struct {
+	jsiiProxy_Class3
+	jsiiProxy_IBaz
+}
+
+func NewBaz() Baz {
+	_init_.Initialize()
+
+	j := jsiiProxy_Baz{}
+
+	_jsii_.Create(
+		"jsii-calc.module2702.Baz",
+		nil, // no parameters
+		&j,
+	)
+
+	return &j
+}
+
+func NewBaz_Override(b Baz) {
+	_init_.Initialize()
+
+	_jsii_.Create(
+		"jsii-calc.module2702.Baz",
+		nil, // no parameters
+		b,
+	)
+}
+
+func (b *jsiiProxy_Baz) Bar() {
+	_jsii_.InvokeVoid(
+		b,
+		"bar",
+		nil, // no parameters
+	)
+}
+
+func (b *jsiiProxy_Baz) BazMethod() {
+	_jsii_.InvokeVoid(
+		b,
+		"bazMethod",
+		nil, // no parameters
+	)
+}
+
+func (b *jsiiProxy_Baz) Foo() {
+	_jsii_.InvokeVoid(
+		b,
+		"foo",
+		nil, // no parameters
+	)
+}
+
+func (b *jsiiProxy_Baz) IBaseInterface() {
+	_jsii_.InvokeVoid(
+		b,
+		"iBaseInterface",
+		nil, // no parameters
+	)
+}
+
 type Class1 interface {
 	jcb.Base
 	Base()
@@ -17519,6 +17590,83 @@ func (c *jsiiProxy_Class3) IBaseInterface() {
 	)
 }
 
+type Construct interface {
+	IConstruct
+	ConstructMethod()
+}
+
+// The jsii proxy struct for Construct
+type jsiiProxy_Construct struct {
+	jsiiProxy_IConstruct
+}
+
+func NewConstruct() Construct {
+	_init_.Initialize()
+
+	j := jsiiProxy_Construct{}
+
+	_jsii_.Create(
+		"jsii-calc.module2702.Construct",
+		nil, // no parameters
+		&j,
+	)
+
+	return &j
+}
+
+func NewConstruct_Override(c Construct) {
+	_init_.Initialize()
+
+	_jsii_.Create(
+		"jsii-calc.module2702.Construct",
+		nil, // no parameters
+		c,
+	)
+}
+
+func (c *jsiiProxy_Construct) ConstructMethod() {
+	_jsii_.InvokeVoid(
+		c,
+		"constructMethod",
+		nil, // no parameters
+	)
+}
+
+type IBaz interface {
+	jcb.IBaseInterface
+	BazMethod()
+}
+
+// The jsii proxy for IBaz
+type jsiiProxy_IBaz struct {
+	internal.Type__jcbIBaseInterface
+}
+
+func (i *jsiiProxy_IBaz) BazMethod() {
+	_jsii_.InvokeVoid(
+		i,
+		"bazMethod",
+		nil, // no parameters
+	)
+}
+
+type IConstruct interface {
+	ConstructMethod()
+}
+
+// The jsii proxy for IConstruct
+type jsiiProxy_IConstruct struct {
+	_ byte // padding
+}
+
+func (i *jsiiProxy_IConstruct) ConstructMethod() {
+	_jsii_.InvokeVoid(
+		i,
+		"constructMethod",
+		nil, // no parameters
+	)
+}
+
 type IFoo interface {
 	jcb.IBaseInterface
 	IBaseInterface() *string
@@ -17539,6 +17687,143 @@ func (j *jsiiProxy_IFoo) IBaseInterface() *string {
 	return returns
 }
 
+type IResource interface {
+	IConstruct
+	ResourceMethod()
+}
+
+// The jsii proxy for IResource
+type jsiiProxy_IResource struct {
+	jsiiProxy_IConstruct
+}
+
+func (i *jsiiProxy_IResource) ResourceMethod() {
+	_jsii_.InvokeVoid(
+		i,
+		"resourceMethod",
+		nil, // no parameters
+	)
+}
+
+type IVpc interface {
+	IResource
+	VpcMethod()
+}
+
+// The jsii proxy for IVpc
+type jsiiProxy_IVpc struct {
+	jsiiProxy_IResource
+}
+
+func (i *jsiiProxy_IVpc) VpcMethod() {
+	_jsii_.InvokeVoid(
+		i,
+		"vpcMethod",
+		nil, // no parameters
+	)
+}
+
+type Resource interface {
+	Construct
+	IResource
+	ConstructMethod()
+	ResourceMethod()
+}
+
+// The jsii proxy struct for Resource
+type jsiiProxy_Resource struct {
+	jsiiProxy_Construct
+	jsiiProxy_IResource
+}
+
+func NewResource_Override(r Resource) {
+	_init_.Initialize()
+
+	_jsii_.Create(
+		"jsii-calc.module2702.Resource",
+		nil, // no parameters
+		r,
+	)
+}
+
+func (r *jsiiProxy_Resource) ConstructMethod() {
+	_jsii_.InvokeVoid(
+		r,
+		"constructMethod",
+		nil, // no parameters
+	)
+}
+
+func (r *jsiiProxy_Resource) ResourceMethod() {
+	_jsii_.InvokeVoid(
+		r,
+		"resourceMethod",
+		nil, // no parameters
+	)
+}
+
+type Vpc interface {
+	Resource
+	IVpc
+	ConstructMethod()
+	ResourceMethod()
+	VpcMethod()
+}
+
+// The jsii proxy struct for Vpc
+type jsiiProxy_Vpc struct {
+	jsiiProxy_Resource
+	jsiiProxy_IVpc
+}
+
+func NewVpc() Vpc {
+	_init_.Initialize()
+
+	j := jsiiProxy_Vpc{}
+
+	_jsii_.Create(
+		"jsii-calc.module2702.Vpc",
+		nil, // no parameters
+		&j,
+	)
+
+	return &j
+}
+
+func NewVpc_Override(v Vpc) {
+	_init_.Initialize()
+
+	_jsii_.Create(
+		"jsii-calc.module2702.Vpc",
+		nil, // no parameters
+		v,
+	)
+}
+
+func (v *jsiiProxy_Vpc) ConstructMethod() {
+	_jsii_.InvokeVoid(
+		v,
+		"constructMethod",
+		nil, // no parameters
+	)
+}
+
+func (v *jsiiProxy_Vpc) ResourceMethod() {
+	_jsii_.InvokeVoid(
+		v,
+		"resourceMethod",
+		nil, // no parameters
+	)
+}
+
+func (v *jsiiProxy_Vpc) VpcMethod() {
+	_jsii_.InvokeVoid(
+		v,
+		"vpcMethod",
+		nil, // no parameters
+	)
+}
+
 
 `;
 
@@ -17552,6 +17837,22 @@ import (
 )
 
 func init() {
+	_jsii_.RegisterClass(
+		"jsii-calc.module2702.Baz",
+		reflect.TypeOf((*Baz)(nil)).Elem(),
+		[]_jsii_.Member{
+			_jsii_.MemberMethod{JsiiMethod: "bar", GoMethod: "Bar"},
+			_jsii_.MemberMethod{JsiiMethod: "bazMethod", GoMethod: "BazMethod"},
+			_jsii_.MemberMethod{JsiiMethod: "foo", GoMethod: "Foo"},
+			_jsii_.MemberMethod{JsiiMethod: "iBaseInterface", GoMethod: "IBaseInterface"},
+		},
+		func() interface{} {
+			j := jsiiProxy_Baz{}
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_Class3)
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_IBaz)
+			return &j
+		},
+	)
 	_jsii_.RegisterClass(
 		"jsii-calc.module2702.Class1",
 		reflect.TypeOf((*Class1)(nil)).Elem(),
@@ -17592,6 +17893,42 @@ func init() {
 			return &j
 		},
 	)
+	_jsii_.RegisterClass(
+		"jsii-calc.module2702.Construct",
+		reflect.TypeOf((*Construct)(nil)).Elem(),
+		[]_jsii_.Member{
+			_jsii_.MemberMethod{JsiiMethod: "constructMethod", GoMethod: "ConstructMethod"},
+		},
+		func() interface{} {
+			j := jsiiProxy_Construct{}
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_IConstruct)
+			return &j
+		},
+	)
+	_jsii_.RegisterInterface(
+		"jsii-calc.module2702.IBaz",
+		reflect.TypeOf((*IBaz)(nil)).Elem(),
+		[]_jsii_.Member{
+			_jsii_.MemberMethod{JsiiMethod: "bar", GoMethod: "Bar"},
+			_jsii_.MemberMethod{JsiiMethod: "bazMethod", GoMethod: "BazMethod"},
+			_jsii_.MemberMethod{JsiiMethod: "foo", GoMethod: "Foo"},
+		},
+		func() interface{} {
+			j := jsiiProxy_IBaz{}
+			_jsii_.InitJsiiProxy(&j.Type__jcbIBaseInterface)
+			return &j
+		},
+	)
+	_jsii_.RegisterInterface(
+		"jsii-calc.module2702.IConstruct",
+		reflect.TypeOf((*IConstruct)(nil)).Elem(),
+		[]_jsii_.Member{
+			_jsii_.MemberMethod{JsiiMethod: "constructMethod", GoMethod: "ConstructMethod"},
+		},
+		func() interface{} {
+			return &jsiiProxy_IConstruct{}
+		},
+	)
 	_jsii_.RegisterInterface(
 		"jsii-calc.module2702.IFoo",
 		reflect.TypeOf((*IFoo)(nil)).Elem(),
@@ -17606,6 +17943,62 @@ func init() {
 			return &j
 		},
 	)
+	_jsii_.RegisterInterface(
+		"jsii-calc.module2702.IResource",
+		reflect.TypeOf((*IResource)(nil)).Elem(),
+		[]_jsii_.Member{
+			_jsii_.MemberMethod{JsiiMethod: "constructMethod", GoMethod: "ConstructMethod"},
+			_jsii_.MemberMethod{JsiiMethod: "resourceMethod", GoMethod: "ResourceMethod"},
+		},
+		func() interface{} {
+			j := jsiiProxy_IResource{}
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_IConstruct)
+			return &j
+		},
+	)
+	_jsii_.RegisterInterface(
+		"jsii-calc.module2702.IVpc",
+		reflect.TypeOf((*IVpc)(nil)).Elem(),
+		[]_jsii_.Member{
+			_jsii_.MemberMethod{JsiiMethod: "constructMethod", GoMethod: "ConstructMethod"},
+			_jsii_.MemberMethod{JsiiMethod: "resourceMethod", GoMethod: "ResourceMethod"},
+			_jsii_.MemberMethod{JsiiMethod: "vpcMethod", GoMethod: "VpcMethod"},
+		},
+		func() interface{} {
+			j := jsiiProxy_IVpc{}
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_IResource)
+			return &j
+		},
+	)
+	_jsii_.RegisterClass(
+		"jsii-calc.module2702.Resource",
+		reflect.TypeOf((*Resource)(nil)).Elem(),
+		[]_jsii_.Member{
+			_jsii_.MemberMethod{JsiiMethod: "constructMethod", GoMethod: "ConstructMethod"},
+			_jsii_.MemberMethod{JsiiMethod: "resourceMethod", GoMethod: "ResourceMethod"},
+		},
+		func() interface{} {
+			j := jsiiProxy_Resource{}
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_Construct)
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_IResource)
+			return &j
+		},
+	)
+	_jsii_.RegisterClass(
+		"jsii-calc.module2702.Vpc",
+		reflect.TypeOf((*Vpc)(nil)).Elem(),
+		[]_jsii_.Member{
+			_jsii_.MemberMethod{JsiiMethod: "constructMethod", GoMethod: "ConstructMethod"},
+			_jsii_.MemberMethod{JsiiMethod: "resourceMethod", GoMethod: "ResourceMethod"},
+			_jsii_.MemberMethod{JsiiMethod: "vpcMethod", GoMethod: "VpcMethod"},
+		},
+		func() interface{} {
+			j := jsiiProxy_Vpc{}
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_Resource)
+			_jsii_.InitJsiiProxy(&j.jsiiProxy_IVpc)
+			return &j
+		},
+	)
 }
 
 `;
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap
index d6c4111de9..dd7bcde99e 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.ts.snap
@@ -3736,10 +3736,18 @@ exports[`Generated code for "jsii-calc": <outDir>/ 1`] = `
           ┃                 ┃  ┣━ 📄 Derived.java
           ┃                 ┃  ┗━ 📄 IFoo.java
           ┃                 ┣━ 📁 module2702
+          ┃                 ┃  ┣━ 📄 Baz.java
           ┃                 ┃  ┣━ 📄 Class1.java
           ┃                 ┃  ┣━ 📄 Class2.java
           ┃                 ┃  ┣━ 📄 Class3.java
-          ┃                 ┃  ┗━ 📄 IFoo.java
+          ┃                 ┃  ┣━ 📄 Construct.java
+          ┃                 ┃  ┣━ 📄 IBaz.java
+          ┃                 ┃  ┣━ 📄 IConstruct.java
+          ┃                 ┃  ┣━ 📄 IFoo.java
+          ┃                 ┃  ┣━ 📄 IResource.java
+          ┃                 ┃  ┣━ 📄 IVpc.java
+          ┃                 ┃  ┣━ 📄 Resource.java
+          ┃                 ┃  ┗━ 📄 Vpc.java
           ┃                 ┣━ 📄 Multiply.java
           ┃                 ┣━ 📄 Negate.java
           ┃                 ┣━ 📄 NestedClassInstance.java
@@ -22798,6 +22806,43 @@ public interface IFoo extends software.amazon.jsii.JsiiSerializable {
 
 `;
 
+exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/Baz.java 1`] = `
+package software.amazon.jsii.tests.calculator.module2702;
+
+/**
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.module2702.Baz")
+public class Baz extends software.amazon.jsii.tests.calculator.module2702.Class3 implements software.amazon.jsii.tests.calculator.module2702.IBaz {
+
+    protected Baz(final software.amazon.jsii.JsiiObjectRef objRef) {
+        super(objRef);
+    }
+
+    protected Baz(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) {
+        super(initializationMode);
+    }
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    public Baz() {
+        super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
+        software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this);
+    }
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    @Override
+    public void bazMethod() {
+        software.amazon.jsii.Kernel.call(this, "bazMethod", software.amazon.jsii.NativeType.VOID);
+    }
+}
+
+`;
+
 exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/Class1.java 1`] = `
 package software.amazon.jsii.tests.calculator.module2702;
 
@@ -22916,6 +22961,167 @@ public class Class3 extends software.amazon.jsii.JsiiObject implements software.
 
 `;
 
+exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/Construct.java 1`] = `
+package software.amazon.jsii.tests.calculator.module2702;
+
+/**
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.module2702.Construct")
+public class Construct extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.module2702.IConstruct {
+
+    protected Construct(final software.amazon.jsii.JsiiObjectRef objRef) {
+        super(objRef);
+    }
+
+    protected Construct(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) {
+        super(initializationMode);
+    }
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    public Construct() {
+        super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
+        software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this);
+    }
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    @Override
+    public void constructMethod() {
+        software.amazon.jsii.Kernel.call(this, "constructMethod", software.amazon.jsii.NativeType.VOID);
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/IBaz.java 1`] = `
+package software.amazon.jsii.tests.calculator.module2702;
+
+/**
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.module2702.IBaz")
+@software.amazon.jsii.Jsii.Proxy(IBaz.Jsii$Proxy.class)
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+public interface IBaz extends software.amazon.jsii.JsiiSerializable, software.amazon.jsii.tests.calculator.base.IBaseInterface {
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    void bazMethod();
+
+    /**
+     * A proxy class which represents a concrete javascript instance of this type.
+     */
+    @software.amazon.jsii.Internal
+    final class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.module2702.IBaz.Jsii$Default {
+        protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) {
+            super(objRef);
+        }
+
+        @Override
+        public final void foo() {
+            software.amazon.jsii.Kernel.call(this, "foo", software.amazon.jsii.NativeType.VOID);
+        }
+
+        @Override
+        public final void bar() {
+            software.amazon.jsii.Kernel.call(this, "bar", software.amazon.jsii.NativeType.VOID);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        public final void bazMethod() {
+            software.amazon.jsii.Kernel.call(this, "bazMethod", software.amazon.jsii.NativeType.VOID);
+        }
+    }
+
+    /**
+     * Internal default implementation for {@link IBaz}.
+     */
+    @software.amazon.jsii.Internal
+    interface Jsii$Default extends IBaz, software.amazon.jsii.tests.calculator.baseofbase.IVeryBaseInterface.Jsii$Default {
+
+        @Override
+        default void foo() {
+            software.amazon.jsii.Kernel.call(this, "foo", software.amazon.jsii.NativeType.VOID);
+        }
+
+        @Override
+        default void bar() {
+            software.amazon.jsii.Kernel.call(this, "bar", software.amazon.jsii.NativeType.VOID);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        default void bazMethod() {
+            software.amazon.jsii.Kernel.call(this, "bazMethod", software.amazon.jsii.NativeType.VOID);
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/IConstruct.java 1`] = `
+package software.amazon.jsii.tests.calculator.module2702;
+
+/**
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.module2702.IConstruct")
+@software.amazon.jsii.Jsii.Proxy(IConstruct.Jsii$Proxy.class)
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+public interface IConstruct extends software.amazon.jsii.JsiiSerializable {
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    void constructMethod();
+
+    /**
+     * A proxy class which represents a concrete javascript instance of this type.
+     */
+    @software.amazon.jsii.Internal
+    final class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.module2702.IConstruct.Jsii$Default {
+        protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) {
+            super(objRef);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        public final void constructMethod() {
+            software.amazon.jsii.Kernel.call(this, "constructMethod", software.amazon.jsii.NativeType.VOID);
+        }
+    }
+
+    /**
+     * Internal default implementation for {@link IConstruct}.
+     */
+    @software.amazon.jsii.Internal
+    interface Jsii$Default extends IConstruct {
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        default void constructMethod() {
+            software.amazon.jsii.Kernel.call(this, "constructMethod", software.amazon.jsii.NativeType.VOID);
+        }
+    }
+}
+
+`;
+
 exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/IFoo.java 1`] = `
 package software.amazon.jsii.tests.calculator.module2702;
 
@@ -22988,6 +23194,242 @@ public interface IFoo extends software.amazon.jsii.JsiiSerializable, software.am
 
 `;
 
+exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/IResource.java 1`] = `
+package software.amazon.jsii.tests.calculator.module2702;
+
+/**
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.module2702.IResource")
+@software.amazon.jsii.Jsii.Proxy(IResource.Jsii$Proxy.class)
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+public interface IResource extends software.amazon.jsii.JsiiSerializable, software.amazon.jsii.tests.calculator.module2702.IConstruct {
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    void resourceMethod();
+
+    /**
+     * A proxy class which represents a concrete javascript instance of this type.
+     */
+    @software.amazon.jsii.Internal
+    final class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.module2702.IResource.Jsii$Default {
+        protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) {
+            super(objRef);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        public final void constructMethod() {
+            software.amazon.jsii.Kernel.call(this, "constructMethod", software.amazon.jsii.NativeType.VOID);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        public final void resourceMethod() {
+            software.amazon.jsii.Kernel.call(this, "resourceMethod", software.amazon.jsii.NativeType.VOID);
+        }
+    }
+
+    /**
+     * Internal default implementation for {@link IResource}.
+     */
+    @software.amazon.jsii.Internal
+    interface Jsii$Default extends IResource, software.amazon.jsii.tests.calculator.module2702.IConstruct.Jsii$Default {
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        default void constructMethod() {
+            software.amazon.jsii.Kernel.call(this, "constructMethod", software.amazon.jsii.NativeType.VOID);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        default void resourceMethod() {
+            software.amazon.jsii.Kernel.call(this, "resourceMethod", software.amazon.jsii.NativeType.VOID);
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/IVpc.java 1`] = `
+package software.amazon.jsii.tests.calculator.module2702;
+
+/**
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.module2702.IVpc")
+@software.amazon.jsii.Jsii.Proxy(IVpc.Jsii$Proxy.class)
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+public interface IVpc extends software.amazon.jsii.JsiiSerializable, software.amazon.jsii.tests.calculator.module2702.IResource {
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    void vpcMethod();
+
+    /**
+     * A proxy class which represents a concrete javascript instance of this type.
+     */
+    @software.amazon.jsii.Internal
+    final class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.module2702.IVpc.Jsii$Default {
+        protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) {
+            super(objRef);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        public final void constructMethod() {
+            software.amazon.jsii.Kernel.call(this, "constructMethod", software.amazon.jsii.NativeType.VOID);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        public final void resourceMethod() {
+            software.amazon.jsii.Kernel.call(this, "resourceMethod", software.amazon.jsii.NativeType.VOID);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        public final void vpcMethod() {
+            software.amazon.jsii.Kernel.call(this, "vpcMethod", software.amazon.jsii.NativeType.VOID);
+        }
+    }
+
+    /**
+     * Internal default implementation for {@link IVpc}.
+     */
+    @software.amazon.jsii.Internal
+    interface Jsii$Default extends IVpc, software.amazon.jsii.tests.calculator.module2702.IResource.Jsii$Default {
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        default void constructMethod() {
+            software.amazon.jsii.Kernel.call(this, "constructMethod", software.amazon.jsii.NativeType.VOID);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        default void resourceMethod() {
+            software.amazon.jsii.Kernel.call(this, "resourceMethod", software.amazon.jsii.NativeType.VOID);
+        }
+
+        /**
+         */
+        @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+        @Override
+        default void vpcMethod() {
+            software.amazon.jsii.Kernel.call(this, "vpcMethod", software.amazon.jsii.NativeType.VOID);
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/Resource.java 1`] = `
+package software.amazon.jsii.tests.calculator.module2702;
+
+/**
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.module2702.Resource")
+public abstract class Resource extends software.amazon.jsii.tests.calculator.module2702.Construct implements software.amazon.jsii.tests.calculator.module2702.IResource {
+
+    protected Resource(final software.amazon.jsii.JsiiObjectRef objRef) {
+        super(objRef);
+    }
+
+    protected Resource(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) {
+        super(initializationMode);
+    }
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    protected Resource() {
+        super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
+        software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this);
+    }
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    @Override
+    public void resourceMethod() {
+        software.amazon.jsii.Kernel.call(this, "resourceMethod", software.amazon.jsii.NativeType.VOID);
+    }
+
+    /**
+     * A proxy class which represents a concrete javascript instance of this type.
+     */
+    @software.amazon.jsii.Internal
+    private static final class Jsii$Proxy extends software.amazon.jsii.tests.calculator.module2702.Resource implements software.amazon.jsii.tests.calculator.module2702.IResource.Jsii$Default, software.amazon.jsii.tests.calculator.module2702.IConstruct.Jsii$Default {
+        protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) {
+            super(objRef);
+        }
+    }
+}
+
+`;
+
+exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/module2702/Vpc.java 1`] = `
+package software.amazon.jsii.tests.calculator.module2702;
+
+/**
+ */
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.module2702.Vpc")
+public class Vpc extends software.amazon.jsii.tests.calculator.module2702.Resource implements software.amazon.jsii.tests.calculator.module2702.IVpc {
+
+    protected Vpc(final software.amazon.jsii.JsiiObjectRef objRef) {
+        super(objRef);
+    }
+
+    protected Vpc(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) {
+        super(initializationMode);
+    }
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    public Vpc() {
+        super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);
+        software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this);
+    }
+
+    /**
+     */
+    @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable)
+    @Override
+    public void vpcMethod() {
+        software.amazon.jsii.Kernel.call(this, "vpcMethod", software.amazon.jsii.NativeType.VOID);
+    }
+}
+
+`;
+
 exports[`Generated code for "jsii-calc": <outDir>/java/src/main/java/software/amazon/jsii/tests/calculator/nodirect/sub1/TypeFromSub1.java 1`] = `
 package software.amazon.jsii.tests.calculator.nodirect.sub1;
 
@@ -24871,10 +25313,18 @@ jsii-calc.module2692.submodule2.Foo=software.amazon.jsii.tests.calculator.module
 jsii-calc.module2700.Base=software.amazon.jsii.tests.calculator.module2700.Base
 jsii-calc.module2700.Derived=software.amazon.jsii.tests.calculator.module2700.Derived
 jsii-calc.module2700.IFoo=software.amazon.jsii.tests.calculator.module2700.IFoo
+jsii-calc.module2702.Baz=software.amazon.jsii.tests.calculator.module2702.Baz
 jsii-calc.module2702.Class1=software.amazon.jsii.tests.calculator.module2702.Class1
 jsii-calc.module2702.Class2=software.amazon.jsii.tests.calculator.module2702.Class2
 jsii-calc.module2702.Class3=software.amazon.jsii.tests.calculator.module2702.Class3
+jsii-calc.module2702.Construct=software.amazon.jsii.tests.calculator.module2702.Construct
+jsii-calc.module2702.IBaz=software.amazon.jsii.tests.calculator.module2702.IBaz
+jsii-calc.module2702.IConstruct=software.amazon.jsii.tests.calculator.module2702.IConstruct
 jsii-calc.module2702.IFoo=software.amazon.jsii.tests.calculator.module2702.IFoo
+jsii-calc.module2702.IResource=software.amazon.jsii.tests.calculator.module2702.IResource
+jsii-calc.module2702.IVpc=software.amazon.jsii.tests.calculator.module2702.IVpc
+jsii-calc.module2702.Resource=software.amazon.jsii.tests.calculator.module2702.Resource
+jsii-calc.module2702.Vpc=software.amazon.jsii.tests.calculator.module2702.Vpc
 jsii-calc.nodirect.sub1.TypeFromSub1=software.amazon.jsii.tests.calculator.nodirect.sub1.TypeFromSub1
 jsii-calc.nodirect.sub2.TypeFromSub2=software.amazon.jsii.tests.calculator.nodirect.sub2.TypeFromSub2
 jsii-calc.onlystatic.OnlyStaticMethods=software.amazon.jsii.tests.calculator.onlystatic.OnlyStaticMethods
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
index e58b7a6db6..f02e641b92 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.ts.snap
@@ -333,10 +333,6 @@ import scope.jsii_calc_base_of_base
 class Base(metaclass=jsii.JSIIAbstractClass, jsii_type="@scope/jsii-calc-base.Base"):
     '''A base class.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_BaseProxy"]:
-        return _BaseProxy
-
     def __init__(self) -> None:
         jsii.create(Base, self, [])
 
@@ -351,6 +347,9 @@ class Base(metaclass=jsii.JSIIAbstractClass, jsii_type="@scope/jsii-calc-base.Ba
 class _BaseProxy(Base):
     pass
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, Base).__jsii_proxy_class__ = lambda : _BaseProxy
+
 
 @jsii.data_type(
     jsii_type="@scope/jsii-calc-base.BaseProps",
@@ -402,10 +401,6 @@ class IBaseInterface(
     scope.jsii_calc_base_of_base.IVeryBaseInterface,
     typing_extensions.Protocol,
 ):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IBaseInterfaceProxy"]:
-        return _IBaseInterfaceProxy
-
     @jsii.member(jsii_name="bar")
     def bar(self) -> None:
         ...
@@ -420,6 +415,9 @@ class _IBaseInterfaceProxy(
     def bar(self) -> None:
         return typing.cast(None, jsii.invoke(self, "bar", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IBaseInterface).__jsii_proxy_class__ = lambda : _IBaseInterfaceProxy
+
 
 class StaticConsumer(
     metaclass=jsii.JSIIMeta,
@@ -811,10 +809,6 @@ from ._jsii import *
 
 @jsii.interface(jsii_type="@scope/jsii-calc-base-of-base.IVeryBaseInterface")
 class IVeryBaseInterface(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IVeryBaseInterfaceProxy"]:
-        return _IVeryBaseInterfaceProxy
-
     @jsii.member(jsii_name="foo")
     def foo(self) -> None:
         ...
@@ -827,6 +821,9 @@ class _IVeryBaseInterfaceProxy:
     def foo(self) -> None:
         return typing.cast(None, jsii.invoke(self, "foo", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IVeryBaseInterface).__jsii_proxy_class__ = lambda : _IVeryBaseInterfaceProxy
+
 
 class StaticConsumer(
     metaclass=jsii.JSIIMeta,
@@ -1432,10 +1429,6 @@ class IDoublable(typing_extensions.Protocol):
     :stability: deprecated
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IDoublableProxy"]:
-        return _IDoublableProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="doubleValue")
     def double_value(self) -> jsii.Number:
@@ -1461,6 +1454,9 @@ class _IDoublableProxy:
         '''
         return typing.cast(jsii.Number, jsii.get(self, "doubleValue"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IDoublable).__jsii_proxy_class__ = lambda : _IDoublableProxy
+
 
 @jsii.interface(jsii_type="@scope/jsii-calc-lib.IFriendly")
 class IFriendly(typing_extensions.Protocol):
@@ -1472,10 +1468,6 @@ class IFriendly(typing_extensions.Protocol):
     :stability: deprecated
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IFriendlyProxy"]:
-        return _IFriendlyProxy
-
     @jsii.member(jsii_name="hello")
     def hello(self) -> builtins.str:
         '''(deprecated) Say hello!
@@ -1504,6 +1496,9 @@ class _IFriendlyProxy:
         '''
         return typing.cast(builtins.str, jsii.invoke(self, "hello", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IFriendly).__jsii_proxy_class__ = lambda : _IFriendlyProxy
+
 
 @jsii.interface(jsii_type="@scope/jsii-calc-lib.IThreeLevelsInterface")
 class IThreeLevelsInterface(
@@ -1518,10 +1513,6 @@ class IThreeLevelsInterface(
     :stability: deprecated
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IThreeLevelsInterfaceProxy"]:
-        return _IThreeLevelsInterfaceProxy
-
     @jsii.member(jsii_name="baz")
     def baz(self) -> None:
         '''
@@ -1550,6 +1541,9 @@ class _IThreeLevelsInterfaceProxy(
         '''
         return typing.cast(None, jsii.invoke(self, "baz", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IThreeLevelsInterface).__jsii_proxy_class__ = lambda : _IThreeLevelsInterfaceProxy
+
 
 @jsii.data_type(
     jsii_type="@scope/jsii-calc-lib.MyFirstStruct",
@@ -1633,10 +1627,6 @@ class NumericValue(
     :stability: deprecated
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_NumericValueProxy"]:
-        return _NumericValueProxy
-
     def __init__(self) -> None:
         jsii.create(NumericValue, self, [])
 
@@ -1671,6 +1661,9 @@ class _NumericValueProxy(
         '''
         return typing.cast(jsii.Number, jsii.get(self, "value"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, NumericValue).__jsii_proxy_class__ = lambda : _NumericValueProxy
+
 
 class Operation(
     NumericValue,
@@ -1682,10 +1675,6 @@ class Operation(
     :stability: deprecated
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_OperationProxy"]:
-        return _OperationProxy
-
     def __init__(self) -> None:
         jsii.create(Operation, self, [])
 
@@ -1710,6 +1699,9 @@ class _OperationProxy(
         '''
         return typing.cast(builtins.str, jsii.invoke(self, "toString", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, Operation).__jsii_proxy_class__ = lambda : _OperationProxy
+
 
 @jsii.data_type(
     jsii_type="@scope/jsii-calc-lib.StructWithOnlyOptionals",
@@ -1887,10 +1879,6 @@ class IReflectable(typing_extensions.Protocol):
     :stability: deprecated
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IReflectableProxy"]:
-        return _IReflectableProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="entries")
     def entries(self) -> typing.List["ReflectableEntry"]:
@@ -1915,6 +1903,9 @@ class _IReflectableProxy:
         '''
         return typing.cast(typing.List["ReflectableEntry"], jsii.get(self, "entries"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IReflectable).__jsii_proxy_class__ = lambda : _IReflectableProxy
+
 
 class NestingClass(
     metaclass=jsii.JSIIMeta,
@@ -2567,10 +2558,6 @@ class AbstractClassBase(
     metaclass=jsii.JSIIAbstractClass,
     jsii_type="jsii-calc.AbstractClassBase",
 ):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_AbstractClassBaseProxy"]:
-        return _AbstractClassBaseProxy
-
     def __init__(self) -> None:
         jsii.create(AbstractClassBase, self, [])
 
@@ -2587,6 +2574,9 @@ class _AbstractClassBaseProxy(AbstractClassBase):
     def abstract_property(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.get(self, "abstractProperty"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, AbstractClassBase).__jsii_proxy_class__ = lambda : _AbstractClassBaseProxy
+
 
 class AbstractClassReturner(
     metaclass=jsii.JSIIMeta,
@@ -2615,10 +2605,6 @@ class AbstractSuite(
 ):
     '''Ensures abstract members implementations correctly register overrides in various languages.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_AbstractSuiteProxy"]:
-        return _AbstractSuiteProxy
-
     def __init__(self) -> None:
         jsii.create(AbstractSuite, self, [])
 
@@ -2667,6 +2653,9 @@ class _AbstractSuiteProxy(AbstractSuite):
     def _property(self, value: builtins.str) -> None:
         jsii.set(self, "property", value)
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, AbstractSuite).__jsii_proxy_class__ = lambda : _AbstractSuiteProxy
+
 
 class AllTypes(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.AllTypes"):
     '''This class includes property for all types supported by jsii.
@@ -3033,10 +3022,6 @@ class BinaryOperation(
 ):
     '''Represents an operation with two operands.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_BinaryOperationProxy"]:
-        return _BinaryOperationProxy
-
     def __init__(
         self,
         lhs: scope.jsii_calc_lib.NumericValue,
@@ -3072,6 +3057,9 @@ class _BinaryOperationProxy(
 ):
     pass
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, BinaryOperation).__jsii_proxy_class__ = lambda : _BinaryOperationProxy
+
 
 class BurriedAnonymousObject(
     metaclass=jsii.JSIIAbstractClass,
@@ -3079,10 +3067,6 @@ class BurriedAnonymousObject(
 ):
     '''See https://github.com/aws/aws-cdk/issues/7977.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_BurriedAnonymousObjectProxy"]:
-        return _BurriedAnonymousObjectProxy
-
     def __init__(self) -> None:
         jsii.create(BurriedAnonymousObject, self, [])
 
@@ -3113,6 +3097,9 @@ class _BurriedAnonymousObjectProxy(BurriedAnonymousObject):
         '''
         return typing.cast(typing.Any, jsii.invoke(self, "giveItBack", [value]))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, BurriedAnonymousObject).__jsii_proxy_class__ = lambda : _BurriedAnonymousObjectProxy
+
 
 class Calculator(
     _CompositeOperation_1c4d123b,
@@ -4542,10 +4529,6 @@ class DynamicPropertyBearerChild(
 class Entropy(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.Entropy"):
     '''This class is used to validate that serialization and deserialization does not interpret ISO-8601-formatted timestampts to the native date/time object, as the jsii protocol has a $jsii$date wrapper for this purpose (node's JSON parsing does *NOT* detect dates automatically in this way, so host libraries should not either).'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_EntropyProxy"]:
-        return _EntropyProxy
-
     def __init__(self, clock: "IWallClock") -> None:
         '''Creates a new instance of Entropy.
 
@@ -4584,6 +4567,9 @@ class _EntropyProxy(Entropy):
         '''
         return typing.cast(builtins.str, jsii.invoke(self, "repeat", [word]))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, Entropy).__jsii_proxy_class__ = lambda : _EntropyProxy
+
 
 class EnumDispenser(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.EnumDispenser"):
     @jsii.member(jsii_name="randomIntegerLikeEnum") # type: ignore[misc]
@@ -5100,10 +5086,6 @@ class GreetingAugmenter(
 class IAnonymousImplementationProvider(typing_extensions.Protocol):
     '''We can return an anonymous interface implementation from an override without losing the interface declarations.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IAnonymousImplementationProviderProxy"]:
-        return _IAnonymousImplementationProviderProxy
-
     @jsii.member(jsii_name="provideAsClass")
     def provide_as_class(self) -> "Implementation":
         ...
@@ -5126,13 +5108,12 @@ class _IAnonymousImplementationProviderProxy:
     def provide_as_interface(self) -> "IAnonymouslyImplementMe":
         return typing.cast("IAnonymouslyImplementMe", jsii.invoke(self, "provideAsInterface", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IAnonymousImplementationProvider).__jsii_proxy_class__ = lambda : _IAnonymousImplementationProviderProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IAnonymouslyImplementMe")
 class IAnonymouslyImplementMe(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IAnonymouslyImplementMeProxy"]:
-        return _IAnonymouslyImplementMeProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="value")
     def value(self) -> jsii.Number:
@@ -5155,13 +5136,12 @@ class _IAnonymouslyImplementMeProxy:
     def verb(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.invoke(self, "verb", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IAnonymouslyImplementMe).__jsii_proxy_class__ = lambda : _IAnonymouslyImplementMeProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IAnotherPublicInterface")
 class IAnotherPublicInterface(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IAnotherPublicInterfaceProxy"]:
-        return _IAnotherPublicInterfaceProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="a")
     def a(self) -> builtins.str:
@@ -5184,13 +5164,12 @@ class _IAnotherPublicInterfaceProxy:
     def a(self, value: builtins.str) -> None:
         jsii.set(self, "a", value)
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IAnotherPublicInterface).__jsii_proxy_class__ = lambda : _IAnotherPublicInterfaceProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IBell")
 class IBell(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IBellProxy"]:
-        return _IBellProxy
-
     @jsii.member(jsii_name="ring")
     def ring(self) -> None:
         ...
@@ -5203,15 +5182,14 @@ class _IBellProxy:
     def ring(self) -> None:
         return typing.cast(None, jsii.invoke(self, "ring", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IBell).__jsii_proxy_class__ = lambda : _IBellProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IBellRinger")
 class IBellRinger(typing_extensions.Protocol):
     '''Takes the object parameter as an interface.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IBellRingerProxy"]:
-        return _IBellRingerProxy
-
     @jsii.member(jsii_name="yourTurn")
     def your_turn(self, bell: IBell) -> None:
         '''
@@ -5232,15 +5210,14 @@ class _IBellRingerProxy:
         '''
         return typing.cast(None, jsii.invoke(self, "yourTurn", [bell]))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IBellRinger).__jsii_proxy_class__ = lambda : _IBellRingerProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IConcreteBellRinger")
 class IConcreteBellRinger(typing_extensions.Protocol):
     '''Takes the object parameter as a calss.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IConcreteBellRingerProxy"]:
-        return _IConcreteBellRingerProxy
-
     @jsii.member(jsii_name="yourTurn")
     def your_turn(self, bell: "Bell") -> None:
         '''
@@ -5261,6 +5238,9 @@ class _IConcreteBellRingerProxy:
         '''
         return typing.cast(None, jsii.invoke(self, "yourTurn", [bell]))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IConcreteBellRinger).__jsii_proxy_class__ = lambda : _IConcreteBellRingerProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IDeprecatedInterface")
 class IDeprecatedInterface(typing_extensions.Protocol):
@@ -5270,10 +5250,6 @@ class IDeprecatedInterface(typing_extensions.Protocol):
     :stability: deprecated
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IDeprecatedInterfaceProxy"]:
-        return _IDeprecatedInterfaceProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="mutableProperty")
     def mutable_property(self) -> typing.Optional[jsii.Number]:
@@ -5330,6 +5306,9 @@ class _IDeprecatedInterfaceProxy:
         '''
         return typing.cast(None, jsii.invoke(self, "method", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IDeprecatedInterface).__jsii_proxy_class__ = lambda : _IDeprecatedInterfaceProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IExperimentalInterface")
 class IExperimentalInterface(typing_extensions.Protocol):
@@ -5337,10 +5316,6 @@ class IExperimentalInterface(typing_extensions.Protocol):
     :stability: experimental
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IExperimentalInterfaceProxy"]:
-        return _IExperimentalInterfaceProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="mutableProperty")
     def mutable_property(self) -> typing.Optional[jsii.Number]:
@@ -5387,13 +5362,12 @@ class _IExperimentalInterfaceProxy:
         '''
         return typing.cast(None, jsii.invoke(self, "method", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IExperimentalInterface).__jsii_proxy_class__ = lambda : _IExperimentalInterfaceProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IExtendsPrivateInterface")
 class IExtendsPrivateInterface(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IExtendsPrivateInterfaceProxy"]:
-        return _IExtendsPrivateInterfaceProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="moreThings")
     def more_things(self) -> typing.List[builtins.str]:
@@ -5426,6 +5400,9 @@ class _IExtendsPrivateInterfaceProxy:
     def private(self, value: builtins.str) -> None:
         jsii.set(self, "private", value)
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IExtendsPrivateInterface).__jsii_proxy_class__ = lambda : _IExtendsPrivateInterfaceProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IExternalInterface")
 class IExternalInterface(typing_extensions.Protocol):
@@ -5433,10 +5410,6 @@ class IExternalInterface(typing_extensions.Protocol):
     :external: true
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IExternalInterfaceProxy"]:
-        return _IExternalInterfaceProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="mutableProperty")
     def mutable_property(self) -> typing.Optional[jsii.Number]:
@@ -5483,15 +5456,14 @@ class _IExternalInterfaceProxy:
         '''
         return typing.cast(None, jsii.invoke(self, "method", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IExternalInterface).__jsii_proxy_class__ = lambda : _IExternalInterfaceProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IFriendlier")
 class IFriendlier(scope.jsii_calc_lib.IFriendly, typing_extensions.Protocol):
     '''Even friendlier classes can implement this interface.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IFriendlierProxy"]:
-        return _IFriendlierProxy
-
     @jsii.member(jsii_name="farewell")
     def farewell(self) -> builtins.str:
         '''Say farewell.'''
@@ -5526,15 +5498,14 @@ class _IFriendlierProxy(
         '''
         return typing.cast(builtins.str, jsii.invoke(self, "goodbye", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IFriendlier).__jsii_proxy_class__ = lambda : _IFriendlierProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IInterfaceImplementedByAbstractClass")
 class IInterfaceImplementedByAbstractClass(typing_extensions.Protocol):
     '''awslabs/jsii#220 Abstract return type.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IInterfaceImplementedByAbstractClassProxy"]:
-        return _IInterfaceImplementedByAbstractClassProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="propFromInterface")
     def prop_from_interface(self) -> builtins.str:
@@ -5551,13 +5522,12 @@ class _IInterfaceImplementedByAbstractClassProxy:
     def prop_from_interface(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.get(self, "propFromInterface"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IInterfaceImplementedByAbstractClass).__jsii_proxy_class__ = lambda : _IInterfaceImplementedByAbstractClassProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IInterfaceWithInternal")
 class IInterfaceWithInternal(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IInterfaceWithInternalProxy"]:
-        return _IInterfaceWithInternalProxy
-
     @jsii.member(jsii_name="visible")
     def visible(self) -> None:
         ...
@@ -5570,13 +5540,12 @@ class _IInterfaceWithInternalProxy:
     def visible(self) -> None:
         return typing.cast(None, jsii.invoke(self, "visible", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IInterfaceWithInternal).__jsii_proxy_class__ = lambda : _IInterfaceWithInternalProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IInterfaceWithMethods")
 class IInterfaceWithMethods(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IInterfaceWithMethodsProxy"]:
-        return _IInterfaceWithMethodsProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="value")
     def value(self) -> builtins.str:
@@ -5599,15 +5568,14 @@ class _IInterfaceWithMethodsProxy:
     def do_things(self) -> None:
         return typing.cast(None, jsii.invoke(self, "doThings", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IInterfaceWithMethods).__jsii_proxy_class__ = lambda : _IInterfaceWithMethodsProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IInterfaceWithOptionalMethodArguments")
 class IInterfaceWithOptionalMethodArguments(typing_extensions.Protocol):
     '''awslabs/jsii#175 Interface proxies (and builders) do not respect optional arguments in methods.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IInterfaceWithOptionalMethodArgumentsProxy"]:
-        return _IInterfaceWithOptionalMethodArgumentsProxy
-
     @jsii.member(jsii_name="hello")
     def hello(
         self,
@@ -5638,13 +5606,12 @@ class _IInterfaceWithOptionalMethodArgumentsProxy:
         '''
         return typing.cast(None, jsii.invoke(self, "hello", [arg1, arg2]))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IInterfaceWithOptionalMethodArguments).__jsii_proxy_class__ = lambda : _IInterfaceWithOptionalMethodArgumentsProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IInterfaceWithProperties")
 class IInterfaceWithProperties(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IInterfaceWithPropertiesProxy"]:
-        return _IInterfaceWithPropertiesProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="readOnlyString")
     def read_only_string(self) -> builtins.str:
@@ -5677,16 +5644,15 @@ class _IInterfaceWithPropertiesProxy:
     def read_write_string(self, value: builtins.str) -> None:
         jsii.set(self, "readWriteString", value)
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IInterfaceWithProperties).__jsii_proxy_class__ = lambda : _IInterfaceWithPropertiesProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IInterfaceWithPropertiesExtension")
 class IInterfaceWithPropertiesExtension(
     IInterfaceWithProperties,
     typing_extensions.Protocol,
 ):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IInterfaceWithPropertiesExtensionProxy"]:
-        return _IInterfaceWithPropertiesExtensionProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="foo")
     def foo(self) -> jsii.Number:
@@ -5711,13 +5677,12 @@ class _IInterfaceWithPropertiesExtensionProxy(
     def foo(self, value: jsii.Number) -> None:
         jsii.set(self, "foo", value)
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IInterfaceWithPropertiesExtension).__jsii_proxy_class__ = lambda : _IInterfaceWithPropertiesExtensionProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IJSII417PublicBaseOfBase")
 class IJSII417PublicBaseOfBase(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IJSII417PublicBaseOfBaseProxy"]:
-        return _IJSII417PublicBaseOfBaseProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="hasRoot")
     def has_root(self) -> builtins.bool:
@@ -5740,49 +5705,51 @@ class _IJSII417PublicBaseOfBaseProxy:
     def foo(self) -> None:
         return typing.cast(None, jsii.invoke(self, "foo", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IJSII417PublicBaseOfBase).__jsii_proxy_class__ = lambda : _IJSII417PublicBaseOfBaseProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IJsii487External")
 class IJsii487External(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IJsii487ExternalProxy"]:
-        return _IJsii487ExternalProxy
+    pass
 
 
 class _IJsii487ExternalProxy:
     __jsii_type__: typing.ClassVar[str] = "jsii-calc.IJsii487External"
     pass
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IJsii487External).__jsii_proxy_class__ = lambda : _IJsii487ExternalProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IJsii487External2")
 class IJsii487External2(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IJsii487External2Proxy"]:
-        return _IJsii487External2Proxy
+    pass
 
 
 class _IJsii487External2Proxy:
     __jsii_type__: typing.ClassVar[str] = "jsii-calc.IJsii487External2"
     pass
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IJsii487External2).__jsii_proxy_class__ = lambda : _IJsii487External2Proxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IJsii496")
 class IJsii496(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IJsii496Proxy"]:
-        return _IJsii496Proxy
+    pass
 
 
 class _IJsii496Proxy:
     __jsii_type__: typing.ClassVar[str] = "jsii-calc.IJsii496"
     pass
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IJsii496).__jsii_proxy_class__ = lambda : _IJsii496Proxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IMutableObjectLiteral")
 class IMutableObjectLiteral(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IMutableObjectLiteralProxy"]:
-        return _IMutableObjectLiteralProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="value")
     def value(self) -> builtins.str:
@@ -5805,13 +5772,12 @@ class _IMutableObjectLiteralProxy:
     def value(self, value: builtins.str) -> None:
         jsii.set(self, "value", value)
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IMutableObjectLiteral).__jsii_proxy_class__ = lambda : _IMutableObjectLiteralProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.INonInternalInterface")
 class INonInternalInterface(IAnotherPublicInterface, typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_INonInternalInterfaceProxy"]:
-        return _INonInternalInterfaceProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="b")
     def b(self) -> builtins.str:
@@ -5854,15 +5820,14 @@ class _INonInternalInterfaceProxy(
     def c(self, value: builtins.str) -> None:
         jsii.set(self, "c", value)
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, INonInternalInterface).__jsii_proxy_class__ = lambda : _INonInternalInterfaceProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IObjectWithProperty")
 class IObjectWithProperty(typing_extensions.Protocol):
     '''Make sure that setters are properly called on objects with interfaces.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IObjectWithPropertyProxy"]:
-        return _IObjectWithPropertyProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="property")
     def property(self) -> builtins.str:
@@ -5895,15 +5860,14 @@ class _IObjectWithPropertyProxy:
     def was_set(self) -> builtins.bool:
         return typing.cast(builtins.bool, jsii.invoke(self, "wasSet", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IObjectWithProperty).__jsii_proxy_class__ = lambda : _IObjectWithPropertyProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IOptionalMethod")
 class IOptionalMethod(typing_extensions.Protocol):
     '''Checks that optional result from interface method code generates correctly.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IOptionalMethodProxy"]:
-        return _IOptionalMethodProxy
-
     @jsii.member(jsii_name="optional")
     def optional(self) -> typing.Optional[builtins.str]:
         ...
@@ -5918,13 +5882,12 @@ class _IOptionalMethodProxy:
     def optional(self) -> typing.Optional[builtins.str]:
         return typing.cast(typing.Optional[builtins.str], jsii.invoke(self, "optional", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IOptionalMethod).__jsii_proxy_class__ = lambda : _IOptionalMethodProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IPrivatelyImplemented")
 class IPrivatelyImplemented(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IPrivatelyImplementedProxy"]:
-        return _IPrivatelyImplementedProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="success")
     def success(self) -> builtins.bool:
@@ -5939,13 +5902,12 @@ class _IPrivatelyImplementedProxy:
     def success(self) -> builtins.bool:
         return typing.cast(builtins.bool, jsii.get(self, "success"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IPrivatelyImplemented).__jsii_proxy_class__ = lambda : _IPrivatelyImplementedProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IPublicInterface")
 class IPublicInterface(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IPublicInterfaceProxy"]:
-        return _IPublicInterfaceProxy
-
     @jsii.member(jsii_name="bye")
     def bye(self) -> builtins.str:
         ...
@@ -5958,13 +5920,12 @@ class _IPublicInterfaceProxy:
     def bye(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.invoke(self, "bye", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IPublicInterface).__jsii_proxy_class__ = lambda : _IPublicInterfaceProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IPublicInterface2")
 class IPublicInterface2(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IPublicInterface2Proxy"]:
-        return _IPublicInterface2Proxy
-
     @jsii.member(jsii_name="ciao")
     def ciao(self) -> builtins.str:
         ...
@@ -5977,15 +5938,14 @@ class _IPublicInterface2Proxy:
     def ciao(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.invoke(self, "ciao", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IPublicInterface2).__jsii_proxy_class__ = lambda : _IPublicInterface2Proxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IRandomNumberGenerator")
 class IRandomNumberGenerator(typing_extensions.Protocol):
     '''Generates random numbers.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IRandomNumberGeneratorProxy"]:
-        return _IRandomNumberGeneratorProxy
-
     @jsii.member(jsii_name="next")
     def next(self) -> jsii.Number:
         '''Returns another random number.
@@ -6008,15 +5968,14 @@ class _IRandomNumberGeneratorProxy:
         '''
         return typing.cast(jsii.Number, jsii.invoke(self, "next", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IRandomNumberGenerator).__jsii_proxy_class__ = lambda : _IRandomNumberGeneratorProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IReturnJsii976")
 class IReturnJsii976(typing_extensions.Protocol):
     '''Returns a subclass of a known class which implements an interface.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IReturnJsii976Proxy"]:
-        return _IReturnJsii976Proxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="foo")
     def foo(self) -> jsii.Number:
@@ -6033,13 +5992,12 @@ class _IReturnJsii976Proxy:
     def foo(self) -> jsii.Number:
         return typing.cast(jsii.Number, jsii.get(self, "foo"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IReturnJsii976).__jsii_proxy_class__ = lambda : _IReturnJsii976Proxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IReturnsNumber")
 class IReturnsNumber(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IReturnsNumberProxy"]:
-        return _IReturnsNumberProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="numberProp")
     def number_prop(self) -> scope.jsii_calc_lib.Number:
@@ -6062,13 +6020,12 @@ class _IReturnsNumberProxy:
     def obtain_number(self) -> scope.jsii_calc_lib.IDoublable:
         return typing.cast(scope.jsii_calc_lib.IDoublable, jsii.invoke(self, "obtainNumber", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IReturnsNumber).__jsii_proxy_class__ = lambda : _IReturnsNumberProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IStableInterface")
 class IStableInterface(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IStableInterfaceProxy"]:
-        return _IStableInterfaceProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="mutableProperty")
     def mutable_property(self) -> typing.Optional[jsii.Number]:
@@ -6099,15 +6056,14 @@ class _IStableInterfaceProxy:
     def method(self) -> None:
         return typing.cast(None, jsii.invoke(self, "method", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IStableInterface).__jsii_proxy_class__ = lambda : _IStableInterfaceProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IStructReturningDelegate")
 class IStructReturningDelegate(typing_extensions.Protocol):
     '''Verifies that a "pure" implementation of an interface works correctly.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IStructReturningDelegateProxy"]:
-        return _IStructReturningDelegateProxy
-
     @jsii.member(jsii_name="returnStruct")
     def return_struct(self) -> "StructB":
         ...
@@ -6122,15 +6078,14 @@ class _IStructReturningDelegateProxy:
     def return_struct(self) -> "StructB":
         return typing.cast("StructB", jsii.invoke(self, "returnStruct", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IStructReturningDelegate).__jsii_proxy_class__ = lambda : _IStructReturningDelegateProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IWallClock")
 class IWallClock(typing_extensions.Protocol):
     '''Implement this interface.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IWallClockProxy"]:
-        return _IWallClockProxy
-
     @jsii.member(jsii_name="iso8601Now")
     def iso8601_now(self) -> builtins.str:
         '''Returns the current time, formatted as an ISO-8601 string.'''
@@ -6147,6 +6102,9 @@ class _IWallClockProxy:
         '''Returns the current time, formatted as an ISO-8601 string.'''
         return typing.cast(builtins.str, jsii.invoke(self, "iso8601Now", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IWallClock).__jsii_proxy_class__ = lambda : _IWallClockProxy
+
 
 class ImplementInternalInterface(
     metaclass=jsii.JSIIMeta,
@@ -6320,10 +6278,6 @@ class Isomorphism(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.Isomorp
     \`\`this\`\` from within the constructor.
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IsomorphismProxy"]:
-        return _IsomorphismProxy
-
     def __init__(self) -> None:
         jsii.create(Isomorphism, self, [])
 
@@ -6335,6 +6289,9 @@ class Isomorphism(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.Isomorp
 class _IsomorphismProxy(Isomorphism):
     pass
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, Isomorphism).__jsii_proxy_class__ = lambda : _IsomorphismProxy
+
 
 class Issue2638(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Issue2638"):
     '''Docstrings with period.
@@ -7542,10 +7499,6 @@ class PartiallyInitializedThisConsumer(
     metaclass=jsii.JSIIAbstractClass,
     jsii_type="jsii-calc.PartiallyInitializedThisConsumer",
 ):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_PartiallyInitializedThisConsumerProxy"]:
-        return _PartiallyInitializedThisConsumerProxy
-
     def __init__(self) -> None:
         jsii.create(PartiallyInitializedThisConsumer, self, [])
 
@@ -7580,6 +7533,9 @@ class _PartiallyInitializedThisConsumerProxy(PartiallyInitializedThisConsumer):
         '''
         return typing.cast(builtins.str, jsii.invoke(self, "consumePartiallyInitializedThis", [obj, dt, ev]))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, PartiallyInitializedThisConsumer).__jsii_proxy_class__ = lambda : _PartiallyInitializedThisConsumerProxy
+
 
 class Polymorphism(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Polymorphism"):
     def __init__(self) -> None:
@@ -9104,10 +9060,6 @@ class UnaryOperation(
 ):
     '''An operation on a single operand.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_UnaryOperationProxy"]:
-        return _UnaryOperationProxy
-
     def __init__(self, operand: scope.jsii_calc_lib.NumericValue) -> None:
         '''
         :param operand: -
@@ -9125,6 +9077,9 @@ class _UnaryOperationProxy(
 ):
     pass
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, UnaryOperation).__jsii_proxy_class__ = lambda : _UnaryOperationProxy
+
 
 @jsii.data_type(
     jsii_type="jsii-calc.UnionProperties",
@@ -9346,10 +9301,6 @@ class VoidCallback(
     - Verify that \`\`methodWasCalled\`\` is \`\`true\`\`.
     '''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_VoidCallbackProxy"]:
-        return _VoidCallbackProxy
-
     def __init__(self) -> None:
         jsii.create(VoidCallback, self, [])
 
@@ -9373,6 +9324,9 @@ class _VoidCallbackProxy(VoidCallback):
     def _override_me(self) -> None:
         return typing.cast(None, jsii.invoke(self, "overrideMe", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, VoidCallback).__jsii_proxy_class__ = lambda : _VoidCallbackProxy
+
 
 class WithPrivatePropertyInConstructor(
     metaclass=jsii.JSIIMeta,
@@ -9398,10 +9352,6 @@ class AbstractClass(
     metaclass=jsii.JSIIAbstractClass,
     jsii_type="jsii-calc.AbstractClass",
 ):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_AbstractClassProxy"]:
-        return _AbstractClassProxy
-
     def __init__(self) -> None:
         jsii.create(AbstractClass, self, [])
 
@@ -9433,6 +9383,9 @@ class _AbstractClassProxy(
         '''
         return typing.cast(builtins.str, jsii.invoke(self, "abstractMethod", [name]))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, AbstractClass).__jsii_proxy_class__ = lambda : _AbstractClassProxy
+
 
 class Add(BinaryOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Add"):
     '''The "+" binary operation.'''
@@ -9668,9 +9621,7 @@ class IFriendlyRandomGenerator(
     scope.jsii_calc_lib.IFriendly,
     typing_extensions.Protocol,
 ):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IFriendlyRandomGeneratorProxy"]:
-        return _IFriendlyRandomGeneratorProxy
+    pass
 
 
 class _IFriendlyRandomGeneratorProxy(
@@ -9680,6 +9631,9 @@ class _IFriendlyRandomGeneratorProxy(
     __jsii_type__: typing.ClassVar[str] = "jsii-calc.IFriendlyRandomGenerator"
     pass
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IFriendlyRandomGenerator).__jsii_proxy_class__ = lambda : _IFriendlyRandomGeneratorProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IInterfaceThatShouldNotBeADataType")
 class IInterfaceThatShouldNotBeADataType(
@@ -9688,10 +9642,6 @@ class IInterfaceThatShouldNotBeADataType(
 ):
     '''Even though this interface has only properties, it is disqualified from being a datatype because it inherits from an interface that is not a datatype.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IInterfaceThatShouldNotBeADataTypeProxy"]:
-        return _IInterfaceThatShouldNotBeADataTypeProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="otherValue")
     def other_value(self) -> builtins.str:
@@ -9710,13 +9660,12 @@ class _IInterfaceThatShouldNotBeADataTypeProxy(
     def other_value(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.get(self, "otherValue"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IInterfaceThatShouldNotBeADataType).__jsii_proxy_class__ = lambda : _IInterfaceThatShouldNotBeADataTypeProxy
+
 
 @jsii.interface(jsii_type="jsii-calc.IJSII417Derived")
 class IJSII417Derived(IJSII417PublicBaseOfBase, typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IJSII417DerivedProxy"]:
-        return _IJSII417DerivedProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="property")
     def property(self) -> builtins.str:
@@ -9749,6 +9698,9 @@ class _IJSII417DerivedProxy(
     def baz(self) -> None:
         return typing.cast(None, jsii.invoke(self, "baz", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IJSII417Derived).__jsii_proxy_class__ = lambda : _IJSII417DerivedProxy
+
 
 @jsii.implements(IPublicInterface2)
 class InbetweenClass(
@@ -10168,10 +10120,6 @@ class CompositeOperation(
 ):
     '''Abstract operation composed from an expression of other operations.'''
 
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_CompositeOperationProxy"]:
-        return _CompositeOperationProxy
-
     def __init__(self) -> None:
         jsii.create(CompositeOperation, self, [])
 
@@ -10251,6 +10199,9 @@ class _CompositeOperationProxy(
         '''
         return typing.cast(scope.jsii_calc_lib.NumericValue, jsii.get(self, "expression"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, CompositeOperation).__jsii_proxy_class__ = lambda : _CompositeOperationProxy
+
 
 __all__ = [
     "CompositeOperation",
@@ -10993,10 +10944,6 @@ from .._jsii import *
 
 @jsii.interface(jsii_type="jsii-calc.module2700.IFoo")
 class IFoo(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IFooProxy"]:
-        return _IFooProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="baz")
     def baz(self) -> jsii.Number:
@@ -11019,6 +10966,9 @@ class _IFooProxy:
     def bar(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.invoke(self, "bar", []))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IFoo).__jsii_proxy_class__ = lambda : _IFooProxy
+
 
 @jsii.implements(IFoo)
 class Base(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.module2700.Base"):
@@ -11116,12 +11066,46 @@ class Class3(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.module2702.Class3"):
         return typing.cast(None, jsii.invoke(self, "iBaseInterface", []))
 
 
+@jsii.interface(jsii_type="jsii-calc.module2702.IBaz")
+class IBaz(scope.jsii_calc_base.IBaseInterface, typing_extensions.Protocol):
+    @jsii.member(jsii_name="bazMethod")
+    def baz_method(self) -> None:
+        ...
+
+
+class _IBazProxy(
+    jsii.proxy_for(scope.jsii_calc_base.IBaseInterface) # type: ignore[misc]
+):
+    __jsii_type__: typing.ClassVar[str] = "jsii-calc.module2702.IBaz"
+
+    @jsii.member(jsii_name="bazMethod")
+    def baz_method(self) -> None:
+        return typing.cast(None, jsii.invoke(self, "bazMethod", []))
+
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IBaz).__jsii_proxy_class__ = lambda : _IBazProxy
+
+
+@jsii.interface(jsii_type="jsii-calc.module2702.IConstruct")
+class IConstruct(typing_extensions.Protocol):
+    @jsii.member(jsii_name="constructMethod")
+    def construct_method(self) -> None:
+        ...
+
+
+class _IConstructProxy:
+    __jsii_type__: typing.ClassVar[str] = "jsii-calc.module2702.IConstruct"
+
+    @jsii.member(jsii_name="constructMethod")
+    def construct_method(self) -> None:
+        return typing.cast(None, jsii.invoke(self, "constructMethod", []))
+
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IConstruct).__jsii_proxy_class__ = lambda : _IConstructProxy
+
+
 @jsii.interface(jsii_type="jsii-calc.module2702.IFoo")
 class IFoo(scope.jsii_calc_base.IBaseInterface, typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IFooProxy"]:
-        return _IFooProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="iBaseInterface")
     def i_base_interface(self) -> builtins.str:
@@ -11138,12 +11122,114 @@ class _IFooProxy(
     def i_base_interface(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.get(self, "iBaseInterface"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IFoo).__jsii_proxy_class__ = lambda : _IFooProxy
+
+
+@jsii.interface(jsii_type="jsii-calc.module2702.IResource")
+class IResource(IConstruct, typing_extensions.Protocol):
+    @jsii.member(jsii_name="resourceMethod")
+    def resource_method(self) -> None:
+        ...
+
+
+class _IResourceProxy(
+    jsii.proxy_for(IConstruct) # type: ignore[misc]
+):
+    __jsii_type__: typing.ClassVar[str] = "jsii-calc.module2702.IResource"
+
+    @jsii.member(jsii_name="resourceMethod")
+    def resource_method(self) -> None:
+        return typing.cast(None, jsii.invoke(self, "resourceMethod", []))
+
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IResource).__jsii_proxy_class__ = lambda : _IResourceProxy
+
+
+@jsii.interface(jsii_type="jsii-calc.module2702.IVpc")
+class IVpc(IResource, typing_extensions.Protocol):
+    @jsii.member(jsii_name="vpcMethod")
+    def vpc_method(self) -> None:
+        ...
+
+
+class _IVpcProxy(
+    jsii.proxy_for(IResource) # type: ignore[misc]
+):
+    __jsii_type__: typing.ClassVar[str] = "jsii-calc.module2702.IVpc"
+
+    @jsii.member(jsii_name="vpcMethod")
+    def vpc_method(self) -> None:
+        return typing.cast(None, jsii.invoke(self, "vpcMethod", []))
+
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IVpc).__jsii_proxy_class__ = lambda : _IVpcProxy
+
+
+@jsii.implements(IBaz)
+class Baz(Class3, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.module2702.Baz"):
+    def __init__(self) -> None:
+        jsii.create(Baz, self, [])
+
+    @jsii.member(jsii_name="bazMethod")
+    def baz_method(self) -> None:
+        return typing.cast(None, jsii.invoke(self, "bazMethod", []))
+
+
+@jsii.implements(IConstruct)
+class Construct(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.module2702.Construct"):
+    def __init__(self) -> None:
+        jsii.create(Construct, self, [])
+
+    @jsii.member(jsii_name="constructMethod")
+    def construct_method(self) -> None:
+        return typing.cast(None, jsii.invoke(self, "constructMethod", []))
+
+
+@jsii.implements(IResource)
+class Resource(
+    Construct,
+    metaclass=jsii.JSIIAbstractClass,
+    jsii_type="jsii-calc.module2702.Resource",
+):
+    def __init__(self) -> None:
+        jsii.create(Resource, self, [])
+
+    @jsii.member(jsii_name="resourceMethod")
+    def resource_method(self) -> None:
+        return typing.cast(None, jsii.invoke(self, "resourceMethod", []))
+
+
+class _ResourceProxy(Resource):
+    pass
+
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, Resource).__jsii_proxy_class__ = lambda : _ResourceProxy
+
+
+@jsii.implements(IVpc)
+class Vpc(Resource, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.module2702.Vpc"):
+    def __init__(self) -> None:
+        jsii.create(Vpc, self, [])
+
+    @jsii.member(jsii_name="vpcMethod")
+    def vpc_method(self) -> None:
+        return typing.cast(None, jsii.invoke(self, "vpcMethod", []))
+
 
 __all__ = [
+    "Baz",
     "Class1",
     "Class2",
     "Class3",
+    "Construct",
+    "IBaz",
+    "IConstruct",
     "IFoo",
+    "IResource",
+    "IVpc",
+    "Resource",
+    "Vpc",
 ]
 
 publication.publish()
@@ -11333,10 +11419,6 @@ class ClassWithSelfKwarg(
 
 @jsii.interface(jsii_type="jsii-calc.PythonSelf.IInterfaceWithSelf")
 class IInterfaceWithSelf(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_IInterfaceWithSelfProxy"]:
-        return _IInterfaceWithSelfProxy
-
     @jsii.member(jsii_name="method")
     def method(self_, self: jsii.Number) -> builtins.str:
         '''
@@ -11355,6 +11437,9 @@ class _IInterfaceWithSelfProxy:
         '''
         return typing.cast(builtins.str, jsii.invoke(self_, "method", [self]))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, IInterfaceWithSelf).__jsii_proxy_class__ = lambda : _IInterfaceWithSelfProxy
+
 
 @jsii.data_type(
     jsii_type="jsii-calc.PythonSelf.StructWithSelf",
@@ -11840,10 +11925,6 @@ class Namespaced(
     metaclass=jsii.JSIIAbstractClass,
     jsii_type="jsii-calc.submodule.nested_submodule.Namespaced",
 ):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_NamespacedProxy"]:
-        return _NamespacedProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="definedAt")
     def defined_at(self) -> builtins.str:
@@ -11862,6 +11943,9 @@ class _NamespacedProxy(Namespaced):
     def goodness(self) -> _Goodness_2df26737:
         return typing.cast(_Goodness_2df26737, jsii.get(self, "goodness"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class
+typing.cast(typing.Any, Namespaced).__jsii_proxy_class__ = lambda : _NamespacedProxy
+
 
 __all__ = [
     "Namespaced",
@@ -11889,10 +11973,6 @@ from ...._jsii import *
     jsii_type="jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced"
 )
 class INamespaced(typing_extensions.Protocol):
-    @builtins.staticmethod
-    def __jsii_proxy_class__() -> typing.Type["_INamespacedProxy"]:
-        return _INamespacedProxy
-
     @builtins.property # type: ignore[misc]
     @jsii.member(jsii_name="definedAt")
     def defined_at(self) -> builtins.str:
@@ -11907,6 +11987,9 @@ class _INamespacedProxy:
     def defined_at(self) -> builtins.str:
         return typing.cast(builtins.str, jsii.get(self, "definedAt"))
 
+# Adding a "__jsii_proxy_class__(): typing.Type" function to the interface
+typing.cast(typing.Any, INamespaced).__jsii_proxy_class__ = lambda : _INamespacedProxy
+
 
 __all__ = [
     "INamespaced",
diff --git a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.ts.snap b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.ts.snap
index 9f7c5eed2a..1d918cad28 100644
--- a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.ts.snap
+++ b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.ts.snap
@@ -252,6 +252,13 @@ exports[`jsii-tree --all 1`] = `
  │ │ │         └── type: number
  │ │ ├─┬ module2702
  │ │ │ └─┬ types
+ │ │ │   ├─┬ class Baz (stable)
+ │ │ │   │ ├── base: Class3
+ │ │ │   │ ├── interfaces: IBaz
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer (stable)
+ │ │ │   │   └─┬ bazMethod() method (stable)
+ │ │ │   │     └── returns: void
  │ │ │   ├─┬ class Class1 (stable)
  │ │ │   │ ├── base: Base
  │ │ │   │ └─┬ members
@@ -275,14 +282,60 @@ exports[`jsii-tree --all 1`] = `
  │ │ │   │   │ └── returns: void
  │ │ │   │   └─┬ iBaseInterface() method (stable)
  │ │ │   │     └── returns: void
- │ │ │   └─┬ interface IFoo (stable)
+ │ │ │   ├─┬ class Construct (stable)
+ │ │ │   │ ├── interfaces: IConstruct
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer (stable)
+ │ │ │   │   └─┬ constructMethod() method (stable)
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ class Resource (stable)
+ │ │ │   │ ├── base: Construct
+ │ │ │   │ ├── interfaces: IResource
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer (stable)
+ │ │ │   │   └─┬ resourceMethod() method (stable)
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ class Vpc (stable)
+ │ │ │   │ ├── base: Resource
+ │ │ │   │ ├── interfaces: IVpc
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer (stable)
+ │ │ │   │   └─┬ vpcMethod() method (stable)
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ interface IBaz (stable)
+ │ │ │   │ ├─┬ interfaces
+ │ │ │   │ │ └── IBaseInterface
+ │ │ │   │ └─┬ members
+ │ │ │   │   └─┬ bazMethod() method (stable)
+ │ │ │   │     ├── abstract
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ interface IConstruct (stable)
+ │ │ │   │ └─┬ members
+ │ │ │   │   └─┬ constructMethod() method (stable)
+ │ │ │   │     ├── abstract
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ interface IFoo (stable)
+ │ │ │   │ ├─┬ interfaces
+ │ │ │   │ │ └── IBaseInterface
+ │ │ │   │ └─┬ members
+ │ │ │   │   └─┬ iBaseInterface property (stable)
+ │ │ │   │     ├── abstract
+ │ │ │   │     ├── immutable
+ │ │ │   │     └── type: string
+ │ │ │   ├─┬ interface IResource (stable)
+ │ │ │   │ ├─┬ interfaces
+ │ │ │   │ │ └── IConstruct
+ │ │ │   │ └─┬ members
+ │ │ │   │   └─┬ resourceMethod() method (stable)
+ │ │ │   │     ├── abstract
+ │ │ │   │     └── returns: void
+ │ │ │   └─┬ interface IVpc (stable)
  │ │ │     ├─┬ interfaces
- │ │ │     │ └── IBaseInterface
+ │ │ │     │ └── IResource
  │ │ │     └─┬ members
- │ │ │       └─┬ iBaseInterface property (stable)
+ │ │ │       └─┬ vpcMethod() method (stable)
  │ │ │         ├── abstract
- │ │ │         ├── immutable
- │ │ │         └── type: string
+ │ │ │         └── returns: void
  │ │ ├─┬ nodirect
  │ │ │ ├─┬ submodules
  │ │ │ │ ├─┬ sub1
@@ -3189,15 +3242,36 @@ exports[`jsii-tree --inheritance 1`] = `
  │ │ │   └── interface IFoo
  │ │ ├─┬ module2702
  │ │ │ └─┬ types
+ │ │ │   ├─┬ class Baz
+ │ │ │   │ ├── base: Class3
+ │ │ │   │ └── interfaces: IBaz
  │ │ │   ├─┬ class Class1
  │ │ │   │ └── base: Base
  │ │ │   ├─┬ class Class2
  │ │ │   │ └── base: Base
  │ │ │   ├─┬ class Class3
  │ │ │   │ └── interfaces: IBaseInterface
- │ │ │   └─┬ interface IFoo
+ │ │ │   ├─┬ class Construct
+ │ │ │   │ └── interfaces: IConstruct
+ │ │ │   ├─┬ class Resource
+ │ │ │   │ ├── base: Construct
+ │ │ │   │ └── interfaces: IResource
+ │ │ │   ├─┬ class Vpc
+ │ │ │   │ ├── base: Resource
+ │ │ │   │ └── interfaces: IVpc
+ │ │ │   ├─┬ interface IBaz
+ │ │ │   │ └─┬ interfaces
+ │ │ │   │   └── IBaseInterface
+ │ │ │   ├── interface IConstruct
+ │ │ │   ├─┬ interface IFoo
+ │ │ │   │ └─┬ interfaces
+ │ │ │   │   └── IBaseInterface
+ │ │ │   ├─┬ interface IResource
+ │ │ │   │ └─┬ interfaces
+ │ │ │   │   └── IConstruct
+ │ │ │   └─┬ interface IVpc
  │ │ │     └─┬ interfaces
- │ │ │       └── IBaseInterface
+ │ │ │       └── IResource
  │ │ ├─┬ nodirect
  │ │ │ ├─┬ submodules
  │ │ │ │ ├─┬ sub1
@@ -3705,6 +3779,10 @@ exports[`jsii-tree --members 1`] = `
  │ │ │       └── baz property
  │ │ ├─┬ module2702
  │ │ │ └─┬ types
+ │ │ │   ├─┬ class Baz
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer
+ │ │ │   │   └── bazMethod() method
  │ │ │   ├─┬ class Class1
  │ │ │   │ └─┬ members
  │ │ │   │   ├── <initializer>() initializer
@@ -3719,9 +3797,33 @@ exports[`jsii-tree --members 1`] = `
  │ │ │   │   ├── bar() method
  │ │ │   │   ├── foo() method
  │ │ │   │   └── iBaseInterface() method
- │ │ │   └─┬ interface IFoo
+ │ │ │   ├─┬ class Construct
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer
+ │ │ │   │   └── constructMethod() method
+ │ │ │   ├─┬ class Resource
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer
+ │ │ │   │   └── resourceMethod() method
+ │ │ │   ├─┬ class Vpc
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer
+ │ │ │   │   └── vpcMethod() method
+ │ │ │   ├─┬ interface IBaz
+ │ │ │   │ └─┬ members
+ │ │ │   │   └── bazMethod() method
+ │ │ │   ├─┬ interface IConstruct
+ │ │ │   │ └─┬ members
+ │ │ │   │   └── constructMethod() method
+ │ │ │   ├─┬ interface IFoo
+ │ │ │   │ └─┬ members
+ │ │ │   │   └── iBaseInterface property
+ │ │ │   ├─┬ interface IResource
+ │ │ │   │ └─┬ members
+ │ │ │   │   └── resourceMethod() method
+ │ │ │   └─┬ interface IVpc
  │ │ │     └─┬ members
- │ │ │       └── iBaseInterface property
+ │ │ │       └── vpcMethod() method
  │ │ ├─┬ nodirect
  │ │ │ ├─┬ submodules
  │ │ │ │ ├─┬ sub1
@@ -5105,10 +5207,18 @@ exports[`jsii-tree --types 1`] = `
  │ │ │   └── interface IFoo
  │ │ ├─┬ module2702
  │ │ │ └─┬ types
+ │ │ │   ├── class Baz
  │ │ │   ├── class Class1
  │ │ │   ├── class Class2
  │ │ │   ├── class Class3
- │ │ │   └── interface IFoo
+ │ │ │   ├── class Construct
+ │ │ │   ├── class Resource
+ │ │ │   ├── class Vpc
+ │ │ │   ├── interface IBaz
+ │ │ │   ├── interface IConstruct
+ │ │ │   ├── interface IFoo
+ │ │ │   ├── interface IResource
+ │ │ │   └── interface IVpc
  │ │ ├─┬ nodirect
  │ │ │ ├─┬ submodules
  │ │ │ │ ├─┬ sub1
diff --git a/packages/jsii-reflect/test/__snapshots__/tree.test.ts.snap b/packages/jsii-reflect/test/__snapshots__/tree.test.ts.snap
index cd8430ac31..c52d54d191 100644
--- a/packages/jsii-reflect/test/__snapshots__/tree.test.ts.snap
+++ b/packages/jsii-reflect/test/__snapshots__/tree.test.ts.snap
@@ -393,6 +393,13 @@ exports[`showAll 1`] = `
  │ │ │         └── type: number
  │ │ ├─┬ module2702
  │ │ │ └─┬ types
+ │ │ │   ├─┬ class Baz
+ │ │ │   │ ├── base: Class3
+ │ │ │   │ ├── interfaces: IBaz
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer
+ │ │ │   │   └─┬ bazMethod() method
+ │ │ │   │     └── returns: void
  │ │ │   ├─┬ class Class1
  │ │ │   │ ├── base: Base
  │ │ │   │ └─┬ members
@@ -416,14 +423,60 @@ exports[`showAll 1`] = `
  │ │ │   │   │ └── returns: void
  │ │ │   │   └─┬ iBaseInterface() method
  │ │ │   │     └── returns: void
- │ │ │   └─┬ interface IFoo
+ │ │ │   ├─┬ class Construct
+ │ │ │   │ ├── interfaces: IConstruct
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer
+ │ │ │   │   └─┬ constructMethod() method
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ class Resource
+ │ │ │   │ ├── base: Construct
+ │ │ │   │ ├── interfaces: IResource
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer
+ │ │ │   │   └─┬ resourceMethod() method
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ class Vpc
+ │ │ │   │ ├── base: Resource
+ │ │ │   │ ├── interfaces: IVpc
+ │ │ │   │ └─┬ members
+ │ │ │   │   ├── <initializer>() initializer
+ │ │ │   │   └─┬ vpcMethod() method
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ interface IBaz
+ │ │ │   │ ├─┬ interfaces
+ │ │ │   │ │ └── IBaseInterface
+ │ │ │   │ └─┬ members
+ │ │ │   │   └─┬ bazMethod() method
+ │ │ │   │     ├── abstract
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ interface IConstruct
+ │ │ │   │ └─┬ members
+ │ │ │   │   └─┬ constructMethod() method
+ │ │ │   │     ├── abstract
+ │ │ │   │     └── returns: void
+ │ │ │   ├─┬ interface IFoo
+ │ │ │   │ ├─┬ interfaces
+ │ │ │   │ │ └── IBaseInterface
+ │ │ │   │ └─┬ members
+ │ │ │   │   └─┬ iBaseInterface property
+ │ │ │   │     ├── abstract
+ │ │ │   │     ├── immutable
+ │ │ │   │     └── type: string
+ │ │ │   ├─┬ interface IResource
+ │ │ │   │ ├─┬ interfaces
+ │ │ │   │ │ └── IConstruct
+ │ │ │   │ └─┬ members
+ │ │ │   │   └─┬ resourceMethod() method
+ │ │ │   │     ├── abstract
+ │ │ │   │     └── returns: void
+ │ │ │   └─┬ interface IVpc
  │ │ │     ├─┬ interfaces
- │ │ │     │ └── IBaseInterface
+ │ │ │     │ └── IResource
  │ │ │     └─┬ members
- │ │ │       └─┬ iBaseInterface property
+ │ │ │       └─┬ vpcMethod() method
  │ │ │         ├── abstract
- │ │ │         ├── immutable
- │ │ │         └── type: string
+ │ │ │         └── returns: void
  │ │ ├─┬ nodirect
  │ │ │ ├─┬ submodules
  │ │ │ │ ├─┬ sub1
@@ -3367,10 +3420,18 @@ exports[`types 1`] = `
  │ │ │   └── interface IFoo
  │ │ ├─┬ module2702
  │ │ │ └─┬ types
+ │ │ │   ├── class Baz
  │ │ │   ├── class Class1
  │ │ │   ├── class Class2
  │ │ │   ├── class Class3
- │ │ │   └── interface IFoo
+ │ │ │   ├── class Construct
+ │ │ │   ├── class Resource
+ │ │ │   ├── class Vpc
+ │ │ │   ├── interface IBaz
+ │ │ │   ├── interface IConstruct
+ │ │ │   ├── interface IFoo
+ │ │ │   ├── interface IResource
+ │ │ │   └── interface IVpc
  │ │ ├─┬ nodirect
  │ │ │ ├─┬ submodules
  │ │ │ │ ├─┬ sub1
diff --git a/packages/jsii-reflect/test/__snapshots__/type-system.test.ts.snap b/packages/jsii-reflect/test/__snapshots__/type-system.test.ts.snap
index 886c9e0f64..ec0f40f535 100644
--- a/packages/jsii-reflect/test/__snapshots__/type-system.test.ts.snap
+++ b/packages/jsii-reflect/test/__snapshots__/type-system.test.ts.snap
@@ -163,9 +163,13 @@ Array [
   "jsii-calc.module2689.retval.MyClass",
   "jsii-calc.module2700.Base",
   "jsii-calc.module2700.Derived",
+  "jsii-calc.module2702.Baz",
   "jsii-calc.module2702.Class1",
   "jsii-calc.module2702.Class2",
   "jsii-calc.module2702.Class3",
+  "jsii-calc.module2702.Construct",
+  "jsii-calc.module2702.Resource",
+  "jsii-calc.module2702.Vpc",
   "jsii-calc.nodirect.sub1.TypeFromSub1",
   "jsii-calc.nodirect.sub2.TypeFromSub2",
   "jsii-calc.onlystatic.OnlyStaticMethods",

From a1398a94a5b4a2de7d90cd9a46a66e267b688910 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 27 May 2021 09:19:26 +0200
Subject: [PATCH 24/28] docs: add polothy as a contributor (#2857)

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
---
 .all-contributorsrc |  9 +++++++++
 README.md           | 17 +++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index eb5b09892f..20b5a8a92e 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1140,6 +1140,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "polothy",
+      "name": "Mark Nielsen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/634657?v=4",
+      "profile": "https://polothy.github.io",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoType": "github",
diff --git a/README.md b/README.md
index ac98b73323..412ad1ffb5 100644
--- a/README.md
+++ b/README.md
@@ -133,72 +133,73 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://stackoverflow.com/users/2116873/pedreiro"><img src="https://avatars3.githubusercontent.com/u/10764017?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leandro Padua</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aleandropadua+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/majasb"><img src="https://avatars2.githubusercontent.com/u/142510?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maja S Bratseth</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amajasb+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcosdiez"><img src="https://avatars2.githubusercontent.com/u/297498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcos Diez</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amarcosdiez+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="http://www.matthewbonig.com/"><img src="https://avatars2.githubusercontent.com/u/1559437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Bonig</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ambonig+label%3Abug" title="Bug reports">🐛</a> <a href="#blog-mbonig" title="Blogposts">📝</a></td>
+    <td align="center"><a href="https://polothy.github.io"><img src="https://avatars.githubusercontent.com/u/634657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Nielsen</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=polothy" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://www.matthewbonig.com/"><img src="https://avatars2.githubusercontent.com/u/1559437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Bonig</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ambonig+label%3Abug" title="Bug reports">🐛</a> <a href="#blog-mbonig" title="Blogposts">📝</a></td>
     <td align="center"><a href="https://github.com/mpiroc"><img src="https://avatars2.githubusercontent.com/u/1623344?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Pirocchi</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mpiroc" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ampiroc+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ampiroc" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/mikelane"><img src="https://avatars0.githubusercontent.com/u/6543713?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike Lane</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amikelane+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://elastician.com/"><img src="https://avatars3.githubusercontent.com/u/2056?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitch Garnaat</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agarnaat+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=garnaat" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Agarnaat+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Agarnaat" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/MrArnoldPalmer"><img src="https://avatars0.githubusercontent.com/u/7221111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitchell Valine</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AMrArnoldPalmer+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=MrArnoldPalmer" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3AMrArnoldPalmer+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3AMrArnoldPalmer" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3AMrArnoldPalmer" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/MohamadSoufan"><img src="https://avatars3.githubusercontent.com/u/28849417?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mohamad Soufan</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=MohamadSoufan" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/NetaNir"><img src="https://avatars0.githubusercontent.com/u/8578043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neta Nir</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NetaNir" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ANetaNir+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANetaNir" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANetaNir" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/njlynch"><img src="https://avatars3.githubusercontent.com/u/1376292?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Lynch</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anjlynch+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=njlynch" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anjlynch" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anjlynch" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/njlynch"><img src="https://avatars3.githubusercontent.com/u/1376292?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Lynch</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anjlynch+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=njlynch" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anjlynch" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anjlynch" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/nija-at"><img src="https://avatars2.githubusercontent.com/u/16217941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Jayakar</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=nija-at" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anija-at" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anija-at" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/NGL321"><img src="https://avatars0.githubusercontent.com/u/4944099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Litov</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NGL321" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANGL321" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANGL321" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/Pidz-b"><img src="https://avatars3.githubusercontent.com/u/47750432?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PIDZ - Bart </b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3APidz-b+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/donicek"><img src="https://avatars.githubusercontent.com/u/8548012?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petr Kacer</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adonicek+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://petrabarus.net/"><img src="https://avatars3.githubusercontent.com/u/523289?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petra Barus</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=petrabarus" title="Code">💻</a></td>
     <td align="center"><a href="http://philcali.me/"><img src="https://avatars1.githubusercontent.com/u/105208?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Cali</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aphilcali+label%3Afeature-request" title="Feature requests">🤔</a></td>
-    <td align="center"><a href="https://github.com/Kent1"><img src="https://avatars1.githubusercontent.com/u/83018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Quentin Loos</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AKent1+label%3Afeature-request" title="Feature requests">🤔</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/Kent1"><img src="https://avatars1.githubusercontent.com/u/83018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Quentin Loos</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AKent1+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/Console32"><img src="https://avatars1.githubusercontent.com/u/4870099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raphael</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AConsole32+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/richardhboyd"><img src="https://avatars0.githubusercontent.com/u/58230111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Richard H Boyd</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arichardhboyd+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://rix0r.nl/"><img src="https://avatars2.githubusercontent.com/u/524162?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rico Huijbers</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arix0rrr+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=rix0rrr" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Arix0rrr+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Arix0rrr" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Arix0rrr" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://keybase.io/romainmuller"><img src="https://avatars2.githubusercontent.com/u/411689?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Romain Marcadier</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ARomainMuller+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=RomainMuller" title="Code">💻</a> <a href="#design-RomainMuller" title="Design">🎨</a> <a href="https://github.com/aws/jsii/issues?q=author%3ARomainMuller+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ARomainMuller" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ARomainMuller" title="Reviewed Pull Requests">👀</a> <a href="#blog-RomainMuller" title="Blogposts">📝</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sadikkuzu/"><img src="https://avatars2.githubusercontent.com/u/23168063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SADIK KUZU</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asadikkuzu" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/skarode96"><img src="https://avatars2.githubusercontent.com/u/24491216?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SK</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askarode96+label%3Afeature-request" title="Feature requests">🤔</a></td>
-    <td align="center"><a href="https://github.com/spfink"><img src="https://avatars1.githubusercontent.com/u/20525381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Fink</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=spfink" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aspfink" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/spfink"><img src="https://avatars1.githubusercontent.com/u/20525381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Fink</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=spfink" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aspfink" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://punch.dev/"><img src="https://avatars1.githubusercontent.com/u/38672686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Goodwin</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asam-goodwin" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://skorfmann.com/"><img src="https://avatars1.githubusercontent.com/u/136789?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Korfmann</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=skorfmann" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://digitalsanctum.com/"><img src="https://avatars3.githubusercontent.com/u/30923?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shane Witbeck</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adigitalsanctum+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/shivlaks"><img src="https://avatars0.githubusercontent.com/u/32604953?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shiv Lakshminarayan</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=shivlaks" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ashivlaks" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ashivlaks" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/SomayaB"><img src="https://avatars3.githubusercontent.com/u/23043132?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Somaya</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=SomayaB" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ASomayaB+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ASomayaB" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ASomayaB" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://gitter.im/"><img src="https://avatars2.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=gitter-badger" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Agitter-badger" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://medium.com/@thomaspoignant"><img src="https://avatars2.githubusercontent.com/u/17908063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Poignant</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Athomaspoignant+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://medium.com/@thomaspoignant"><img src="https://avatars2.githubusercontent.com/u/17908063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Poignant</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Athomaspoignant+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ThomasSteinbach"><img src="https://avatars0.githubusercontent.com/u/1683246?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Steinbach</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AThomasSteinbach+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hoegertn"><img src="https://avatars2.githubusercontent.com/u/1287829?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thorsten Hoeger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=hoegertn" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/serverlessunicorn"><img src="https://avatars1.githubusercontent.com/u/54867311?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim Wagner</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aserverlessunicorn+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aserverlessunicorn+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/tobli"><img src="https://avatars3.githubusercontent.com/u/540266?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Lidskog</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=tobli" title="Code">💻</a></td>
     <td align="center"><a href="https://ty.coghlan.dev/"><img src="https://avatars2.githubusercontent.com/u/15920577?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ty Coghlan</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AOphirr33+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/tvanhens"><img src="https://avatars1.githubusercontent.com/u/5342795?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tyler van Hensbergen</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Atvanhens+label%3Afeature-request" title="Feature requests">🤔</a></td>
-    <td align="center"><a href="http://ultidev.com/Products/"><img src="https://avatars1.githubusercontent.com/u/757185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vlad Hrybok</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avgribok+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://ultidev.com/Products/"><img src="https://avatars1.githubusercontent.com/u/757185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vlad Hrybok</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avgribok+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Lanayx"><img src="https://avatars2.githubusercontent.com/u/3329606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vladimir Shchur</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ALanayx+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://yanex.org/"><img src="https://avatars2.githubusercontent.com/u/95996?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yan Zhulanow</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=yanex" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/yglcode"><img src="https://avatars.githubusercontent.com/u/11893614?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yigong Liu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ayglcode+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ayglcode+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/ajnarang"><img src="https://avatars3.githubusercontent.com/u/52025281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ajnarang</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aajnarang+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/aniljava"><img src="https://avatars.githubusercontent.com/u/412569?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aniljava</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=aniljava" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/deccy-mcc"><img src="https://avatars0.githubusercontent.com/u/45844893?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deccy-mcc</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adeccy-mcc+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/apps/dependabot-preview"><img src="https://avatars3.githubusercontent.com/in/2141?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot-preview[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adependabot-preview[bot]+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot-preview[bot]" title="Maintenance">🚧</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/apps/dependabot-preview"><img src="https://avatars3.githubusercontent.com/in/2141?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot-preview[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adependabot-preview[bot]+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot-preview[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars0.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/dheffx"><img src="https://avatars0.githubusercontent.com/u/22029918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dheffx</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adheffx+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gregswdl"><img src="https://avatars0.githubusercontent.com/u/47365273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gregswdl</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agregswdl+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/guyroberts21"><img src="https://avatars.githubusercontent.com/u/47118902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guyroberts21</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=guyroberts21" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/mattBrzezinski"><img src="https://avatars.githubusercontent.com/u/4356074?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mattBrzezinski</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mattBrzezinski" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/apps/mergify"><img src="https://avatars1.githubusercontent.com/in/10562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mergify[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Amergify[bot]" title="Maintenance">🚧</a></td>
-    <td align="center"><a href="https://github.com/seiyashima"><img src="https://avatars2.githubusercontent.com/u/4947101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>seiyashima42</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aseiyashima+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Documentation">📖</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/seiyashima"><img src="https://avatars2.githubusercontent.com/u/4947101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>seiyashima42</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aseiyashima+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/sullis"><img src="https://avatars3.githubusercontent.com/u/30938?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sullis</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=sullis" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vaneek"><img src="https://avatars1.githubusercontent.com/u/8113305?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vaneek</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avaneek+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>

From c83a39abef43e7b5a08628c34555ddf3b7ae5170 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
 <46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 27 May 2021 09:23:35 +0200
Subject: [PATCH 25/28] docs: add lzhoucs as a contributor (#2858)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: 👨🏻‍💻 Romain Marcadier <rmuller@amazon.com>
---
 .all-contributorsrc | 12 +++++++++++-
 README.md           | 17 +++++++++--------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 20b5a8a92e..1405f2edef 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1141,6 +1141,16 @@
         "bug"
       ]
     },
+    {
+      "login": "lzhoucs",
+      "name": "Liang Zhou",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1444104?v=4",
+      "profile": "https://liangzhou.dev",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
     {
       "login": "polothy",
       "name": "Mark Nielsen",
@@ -1158,4 +1168,4 @@
     "README.md"
   ],
   "contributorsPerLine": 7
-}
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 412ad1ffb5..49f1fdea94 100644
--- a/README.md
+++ b/README.md
@@ -131,74 +131,75 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://www.linkedin.com/in/jsdtaylor"><img src="https://avatars0.githubusercontent.com/u/15832750?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Justin Taylor</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ajsdtaylor+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/kiiadi"><img src="https://avatars3.githubusercontent.com/u/4661536?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kyle Thomson</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=kiiadi" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Akiiadi" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://stackoverflow.com/users/2116873/pedreiro"><img src="https://avatars3.githubusercontent.com/u/10764017?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Leandro Padua</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aleandropadua+label%3Abug" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="https://liangzhou.dev"><img src="https://avatars.githubusercontent.com/u/1444104?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Liang Zhou</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Alzhoucs+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=lzhoucs" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/majasb"><img src="https://avatars2.githubusercontent.com/u/142510?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Maja S Bratseth</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amajasb+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/marcosdiez"><img src="https://avatars2.githubusercontent.com/u/297498?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Marcos Diez</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amarcosdiez+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://polothy.github.io"><img src="https://avatars.githubusercontent.com/u/634657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Nielsen</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=polothy" title="Code">💻</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://polothy.github.io"><img src="https://avatars.githubusercontent.com/u/634657?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mark Nielsen</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=polothy" title="Code">💻</a></td>
     <td align="center"><a href="http://www.matthewbonig.com/"><img src="https://avatars2.githubusercontent.com/u/1559437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Bonig</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ambonig+label%3Abug" title="Bug reports">🐛</a> <a href="#blog-mbonig" title="Blogposts">📝</a></td>
     <td align="center"><a href="https://github.com/mpiroc"><img src="https://avatars2.githubusercontent.com/u/1623344?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Matthew Pirocchi</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mpiroc" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ampiroc+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ampiroc" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/mikelane"><img src="https://avatars0.githubusercontent.com/u/6543713?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mike Lane</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Amikelane+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://elastician.com/"><img src="https://avatars3.githubusercontent.com/u/2056?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitch Garnaat</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agarnaat+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=garnaat" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Agarnaat+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Agarnaat" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/MrArnoldPalmer"><img src="https://avatars0.githubusercontent.com/u/7221111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mitchell Valine</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AMrArnoldPalmer+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=MrArnoldPalmer" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3AMrArnoldPalmer+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3AMrArnoldPalmer" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3AMrArnoldPalmer" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/MohamadSoufan"><img src="https://avatars3.githubusercontent.com/u/28849417?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mohamad Soufan</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=MohamadSoufan" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/NetaNir"><img src="https://avatars0.githubusercontent.com/u/8578043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neta Nir</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NetaNir" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ANetaNir+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANetaNir" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANetaNir" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/NetaNir"><img src="https://avatars0.githubusercontent.com/u/8578043?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Neta Nir</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NetaNir" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ANetaNir+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANetaNir" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANetaNir" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/njlynch"><img src="https://avatars3.githubusercontent.com/u/1376292?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nick Lynch</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anjlynch+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=njlynch" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anjlynch" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anjlynch" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/nija-at"><img src="https://avatars2.githubusercontent.com/u/16217941?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Niranjan Jayakar</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=nija-at" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Anija-at+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Anija-at" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Anija-at" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/NGL321"><img src="https://avatars0.githubusercontent.com/u/4944099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Noah Litov</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=NGL321" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ANGL321" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ANGL321" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/Pidz-b"><img src="https://avatars3.githubusercontent.com/u/47750432?v=4?s=100" width="100px;" alt=""/><br /><sub><b>PIDZ - Bart </b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3APidz-b+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/donicek"><img src="https://avatars.githubusercontent.com/u/8548012?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petr Kacer</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adonicek+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://petrabarus.net/"><img src="https://avatars3.githubusercontent.com/u/523289?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Petra Barus</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=petrabarus" title="Code">💻</a></td>
-    <td align="center"><a href="http://philcali.me/"><img src="https://avatars1.githubusercontent.com/u/105208?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Cali</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aphilcali+label%3Afeature-request" title="Feature requests">🤔</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="http://philcali.me/"><img src="https://avatars1.githubusercontent.com/u/105208?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Philip Cali</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aphilcali+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/Kent1"><img src="https://avatars1.githubusercontent.com/u/83018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Quentin Loos</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AKent1+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/Console32"><img src="https://avatars1.githubusercontent.com/u/4870099?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Raphael</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AConsole32+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/richardhboyd"><img src="https://avatars0.githubusercontent.com/u/58230111?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Richard H Boyd</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arichardhboyd+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://rix0r.nl/"><img src="https://avatars2.githubusercontent.com/u/524162?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rico Huijbers</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Arix0rrr+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=rix0rrr" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Arix0rrr+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Arix0rrr" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Arix0rrr" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://keybase.io/romainmuller"><img src="https://avatars2.githubusercontent.com/u/411689?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Romain Marcadier</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ARomainMuller+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=RomainMuller" title="Code">💻</a> <a href="#design-RomainMuller" title="Design">🎨</a> <a href="https://github.com/aws/jsii/issues?q=author%3ARomainMuller+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ARomainMuller" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ARomainMuller" title="Reviewed Pull Requests">👀</a> <a href="#blog-RomainMuller" title="Blogposts">📝</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/sadikkuzu/"><img src="https://avatars2.githubusercontent.com/u/23168063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SADIK KUZU</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asadikkuzu" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/skarode96"><img src="https://avatars2.githubusercontent.com/u/24491216?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SK</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askarode96+label%3Afeature-request" title="Feature requests">🤔</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/skarode96"><img src="https://avatars2.githubusercontent.com/u/24491216?v=4?s=100" width="100px;" alt=""/><br /><sub><b>SK</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askarode96+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/spfink"><img src="https://avatars1.githubusercontent.com/u/20525381?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Fink</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=spfink" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Aspfink" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://punch.dev/"><img src="https://avatars1.githubusercontent.com/u/38672686?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sam Goodwin</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Asam-goodwin" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://skorfmann.com/"><img src="https://avatars1.githubusercontent.com/u/136789?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Sebastian Korfmann</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=skorfmann" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3Askorfmann+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://digitalsanctum.com/"><img src="https://avatars3.githubusercontent.com/u/30923?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shane Witbeck</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adigitalsanctum+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/shivlaks"><img src="https://avatars0.githubusercontent.com/u/32604953?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Shiv Lakshminarayan</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=shivlaks" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Ashivlaks" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3Ashivlaks" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://github.com/SomayaB"><img src="https://avatars3.githubusercontent.com/u/23043132?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Somaya</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=SomayaB" title="Code">💻</a> <a href="https://github.com/aws/jsii/issues?q=author%3ASomayaB+label%3Afeature-request" title="Feature requests">🤔</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3ASomayaB" title="Maintenance">🚧</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+reviewed-by%3ASomayaB" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://gitter.im/"><img src="https://avatars2.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=gitter-badger" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Agitter-badger" title="Maintenance">🚧</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://gitter.im/"><img src="https://avatars2.githubusercontent.com/u/8518239?v=4?s=100" width="100px;" alt=""/><br /><sub><b>The Gitter Badger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=gitter-badger" title="Code">💻</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Agitter-badger" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://medium.com/@thomaspoignant"><img src="https://avatars2.githubusercontent.com/u/17908063?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Poignant</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Athomaspoignant+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/ThomasSteinbach"><img src="https://avatars0.githubusercontent.com/u/1683246?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thomas Steinbach</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AThomasSteinbach+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/hoegertn"><img src="https://avatars2.githubusercontent.com/u/1287829?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thorsten Hoeger</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=hoegertn" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/serverlessunicorn"><img src="https://avatars1.githubusercontent.com/u/54867311?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tim Wagner</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aserverlessunicorn+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Aserverlessunicorn+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/tobli"><img src="https://avatars3.githubusercontent.com/u/540266?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tobias Lidskog</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=tobli" title="Code">💻</a></td>
     <td align="center"><a href="https://ty.coghlan.dev/"><img src="https://avatars2.githubusercontent.com/u/15920577?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ty Coghlan</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3AOphirr33+label%3Abug" title="Bug reports">🐛</a></td>
-    <td align="center"><a href="https://github.com/tvanhens"><img src="https://avatars1.githubusercontent.com/u/5342795?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tyler van Hensbergen</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Atvanhens+label%3Afeature-request" title="Feature requests">🤔</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/tvanhens"><img src="https://avatars1.githubusercontent.com/u/5342795?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tyler van Hensbergen</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Atvanhens+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="http://ultidev.com/Products/"><img src="https://avatars1.githubusercontent.com/u/757185?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vlad Hrybok</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avgribok+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/Lanayx"><img src="https://avatars2.githubusercontent.com/u/3329606?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vladimir Shchur</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3ALanayx+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://yanex.org/"><img src="https://avatars2.githubusercontent.com/u/95996?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yan Zhulanow</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=yanex" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/yglcode"><img src="https://avatars.githubusercontent.com/u/11893614?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Yigong Liu</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Ayglcode+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/issues?q=author%3Ayglcode+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/ajnarang"><img src="https://avatars3.githubusercontent.com/u/52025281?v=4?s=100" width="100px;" alt=""/><br /><sub><b>ajnarang</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aajnarang+label%3Afeature-request" title="Feature requests">🤔</a></td>
     <td align="center"><a href="https://github.com/aniljava"><img src="https://avatars.githubusercontent.com/u/412569?v=4?s=100" width="100px;" alt=""/><br /><sub><b>aniljava</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=aniljava" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/deccy-mcc"><img src="https://avatars0.githubusercontent.com/u/45844893?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deccy-mcc</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adeccy-mcc+label%3Abug" title="Bug reports">🐛</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/deccy-mcc"><img src="https://avatars0.githubusercontent.com/u/45844893?v=4?s=100" width="100px;" alt=""/><br /><sub><b>deccy-mcc</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adeccy-mcc+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot-preview"><img src="https://avatars3.githubusercontent.com/in/2141?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot-preview[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adependabot-preview[bot]+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot-preview[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/apps/dependabot"><img src="https://avatars0.githubusercontent.com/in/29110?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dependabot[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Adependabot[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/dheffx"><img src="https://avatars0.githubusercontent.com/u/22029918?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dheffx</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Adheffx+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/gregswdl"><img src="https://avatars0.githubusercontent.com/u/47365273?v=4?s=100" width="100px;" alt=""/><br /><sub><b>gregswdl</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Agregswdl+label%3Abug" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/guyroberts21"><img src="https://avatars.githubusercontent.com/u/47118902?v=4?s=100" width="100px;" alt=""/><br /><sub><b>guyroberts21</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=guyroberts21" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/mattBrzezinski"><img src="https://avatars.githubusercontent.com/u/4356074?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mattBrzezinski</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=mattBrzezinski" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/apps/mergify"><img src="https://avatars1.githubusercontent.com/in/10562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mergify[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Amergify[bot]" title="Maintenance">🚧</a></td>
   </tr>
   <tr>
+    <td align="center"><a href="https://github.com/apps/mergify"><img src="https://avatars1.githubusercontent.com/in/10562?v=4?s=100" width="100px;" alt=""/><br /><sub><b>mergify[bot]</b></sub></a><br /><a href="https://github.com/aws/jsii/pulls?q=is%3Apr+author%3Amergify[bot]" title="Maintenance">🚧</a></td>
     <td align="center"><a href="https://github.com/seiyashima"><img src="https://avatars2.githubusercontent.com/u/4947101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>seiyashima42</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Aseiyashima+label%3Abug" title="Bug reports">🐛</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Code">💻</a> <a href="https://github.com/aws/jsii/commits?author=seiyashima" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/sullis"><img src="https://avatars3.githubusercontent.com/u/30938?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sullis</b></sub></a><br /><a href="https://github.com/aws/jsii/commits?author=sullis" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/vaneek"><img src="https://avatars1.githubusercontent.com/u/8113305?v=4?s=100" width="100px;" alt=""/><br /><sub><b>vaneek</b></sub></a><br /><a href="https://github.com/aws/jsii/issues?q=author%3Avaneek+label%3Abug" title="Bug reports">🐛</a></td>

From 82f5d5f34dee083e617f7194f7c326ff82f2cd90 Mon Sep 17 00:00:00 2001
From: Liang Zhou <lzhoucs@gmail.com>
Date: Thu, 27 May 2021 02:24:35 -0500
Subject: [PATCH 26/28] fix: update lineMap after altering source.text (#2837)

Fixes #2680
---
 packages/jsii/lib/transforms/ts-comment-replacer.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/jsii/lib/transforms/ts-comment-replacer.ts b/packages/jsii/lib/transforms/ts-comment-replacer.ts
index 3d4dae885c..33a33af409 100644
--- a/packages/jsii/lib/transforms/ts-comment-replacer.ts
+++ b/packages/jsii/lib/transforms/ts-comment-replacer.ts
@@ -126,5 +126,8 @@ function whiteoutLeadingComments(node: ts.Node, source: ts.SourceFile) {
       text = text.slice(0, pos).padEnd(end, ' ') + text.slice(end);
     }
   });
-  source.text = text;
+  if (source.text !== text) {
+    source.text = text;
+    (source as any).lineMap = (ts as any).computeLineStarts(text);
+  }
 }

From 0fbba6bc1af09cbab19acdabaea14e5eb1681ae3 Mon Sep 17 00:00:00 2001
From: Romain Marcadier <rmuller@amazon.com>
Date: Thu, 27 May 2021 09:26:38 +0200
Subject: [PATCH 27/28] fix(pacmak): fails when package path contains space
 (#2758)

Quoting the package path in the sub-shell command so that spaces are not
incorrectly interpreted as argument delimiters.

Fixes #2748
---
 packages/jsii-pacmak/lib/packaging.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/jsii-pacmak/lib/packaging.ts b/packages/jsii-pacmak/lib/packaging.ts
index 162ba2c03c..31ceed9c18 100644
--- a/packages/jsii-pacmak/lib/packaging.ts
+++ b/packages/jsii-pacmak/lib/packaging.ts
@@ -55,7 +55,9 @@ export class JsiiModule {
   public async npmPack() {
     this._tarball = await Scratch.make(async (tmpdir) => {
       logging.debug(`Running "npm pack ${this.moduleDirectory}" in ${tmpdir}`);
-      const args = ['pack', this.moduleDirectory];
+      // Quoting (JSON-stringifying) the module directory in order to avoid
+      // problems if there are spaces or other special characters in the path.
+      const args = ['pack', JSON.stringify(this.moduleDirectory)];
       if (logging.level >= logging.LEVEL_VERBOSE) {
         args.push('--loglevel=verbose');
       }

From 4dced73a12a9a102e30165b6044a9b9fee101ad1 Mon Sep 17 00:00:00 2001
From: AWS CDK Team <aws-cdk@amazon.com>
Date: Thu, 27 May 2021 14:12:48 +0000
Subject: [PATCH 28/28] chore(release): 1.30.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 lerna.json   |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5367b2852c..41bb6d91eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 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.30.0](https://github.com/aws/jsii/compare/v1.29.0...v1.30.0) (2021-05-27)
+
+
+### Features
+
+* **rosetta:** JSII_ROSETTA_MAX_WORKER_COUNT limits max workers ([#2816](https://github.com/aws/jsii/issues/2816)) ([c478da4](https://github.com/aws/jsii/commit/c478da482e688f763ecccf6bff52cded3758ad53))
+
+
+### Bug Fixes
+
+* **docs:** correct the "source version" in Python version mapping ([47a40f1](https://github.com/aws/jsii/commit/47a40f15195c00368c55bb9d08eded063d970dec))
+* update lineMap after altering source.text ([#2837](https://github.com/aws/jsii/issues/2837)) ([82f5d5f](https://github.com/aws/jsii/commit/82f5d5f34dee083e617f7194f7c326ff82f2cd90)), closes [#2680](https://github.com/aws/jsii/issues/2680)
+* **pacmak:** fails when package path contains space ([#2758](https://github.com/aws/jsii/issues/2758)) ([0fbba6b](https://github.com/aws/jsii/commit/0fbba6bc1af09cbab19acdabaea14e5eb1681ae3)), closes [#2748](https://github.com/aws/jsii/issues/2748)
+* **python:** classes do not correctly implement interfaces ([#2809](https://github.com/aws/jsii/issues/2809)) ([0769347](https://github.com/aws/jsii/commit/07693478ff85142cc79691539d72ce5a4169eb9d)), closes [aws/aws-cdk#13474](https://github.com/aws/aws-cdk/issues/13474)
+* **python:** module import fails: NameError: name 'List' is not defined ([#2851](https://github.com/aws/jsii/issues/2851)) ([b7b9e5f](https://github.com/aws/jsii/commit/b7b9e5f75d09543e0e48f31bcde0ee770599fe04))
+
 ## [1.29.0](https://github.com/aws/jsii/compare/v1.28.0...v1.29.0) (2021-04-21)
 
 
diff --git a/lerna.json b/lerna.json
index 6519fa3e86..36021b8eac 100644
--- a/lerna.json
+++ b/lerna.json
@@ -10,5 +10,5 @@
       "rejectCycles": true
     }
   },
-  "version": "1.29.0"
+  "version": "1.30.0"
 }