From fcafab48c97e14ba76585d186041b0e8af79cf3a Mon Sep 17 00:00:00 2001 From: Mitchell Valine Date: Fri, 13 Mar 2020 12:33:38 -0700 Subject: [PATCH 01/74] fix(python-runtime): KernelResponse missing types (#1332) Adds `BeginResponse` and `SetResponse` to `KernelResponse` union type in python-runtime. This fixes python-runtime test failures. --- packages/@jsii/python-runtime/src/jsii/_kernel/types.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/@jsii/python-runtime/src/jsii/_kernel/types.py b/packages/@jsii/python-runtime/src/jsii/_kernel/types.py index c8c6398937..665bdbb9d3 100644 --- a/packages/@jsii/python-runtime/src/jsii/_kernel/types.py +++ b/packages/@jsii/python-runtime/src/jsii/_kernel/types.py @@ -232,11 +232,13 @@ class StatsResponse: ] KernelResponse = Union[ + BeginResponse, LoadResponse, CreateResponse, DeleteResponse, GetResponse, InvokeResponse, + SetResponse, StatsResponse, Callback, ] From 9a03e505d16bc208d189a25807f6a34055cbdc36 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 13 Mar 2020 22:44:17 +0000 Subject: [PATCH 02/74] chore(deps): [security] bump acorn from 6.3.0 to 6.4.1 (#1333) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1850aea729..d51e1dc1b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1788,9 +1788,9 @@ acorn-walk@^6.0.1: integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== acorn@^6.0.1, acorn@^6.2.1: - version "6.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" - integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== acorn@^7.1.0: version "7.1.0" From 2fd04deb38da06bc6fb2af525ca1614c2eb4f009 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 15 Mar 2020 02:33:19 +0000 Subject: [PATCH 03/74] chore(deps-dev): bump @types/tar-fs from 1.16.2 to 1.16.3 (#1334) --- packages/jsii-diff/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index ea038c0377..116d148cdf 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -44,7 +44,7 @@ "@types/jest": "^25.1.4", "@types/jest-expect-message": "^1.0.1", "@types/node": "^10.17.17", - "@types/tar-fs": "^1.16.2", + "@types/tar-fs": "^1.16.3", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/yarn.lock b/yarn.lock index d51e1dc1b2..9eda86c042 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1501,10 +1501,10 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== -"@types/tar-fs@^1.16.2": - version "1.16.2" - resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-1.16.2.tgz#6f5acea15d3b7777b8bf3f1c6d4e80ce71288f34" - integrity sha512-eds/pbRf0Fe0EKmrHDbs8mRkfbjz2upAdoUfREw14dPboZaHqqZ1Y+uVeoakoPavpZMpj22nhUTAYkX5bz3DXA== +"@types/tar-fs@^1.16.3": + version "1.16.3" + resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-1.16.3.tgz#425b2b817c405d13d051f36ec6ec6ebd25e31069" + integrity sha512-Y+fdeg11tb9J3UNIatNtrTPM1i8U+WLv2mMhZ3W13mtU19stCgrXJ4iXLkTpoF8jqHi3T/qTS8+fQ3IPzXxpuA== dependencies: "@types/node" "*" "@types/tar-stream" "*" From dcc296129740cdceec7ab3e869a2b761dd4c9ea6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 12:00:38 +0000 Subject: [PATCH 04/74] chore(deps): bump yargs from 15.3.0 to 15.3.1 (#1336) --- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- yarn.lock | 18 +++++++++--------- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index f4c4dd34af..34c826111d 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -31,7 +31,7 @@ "dependencies": { "@jsii/spec": "^1.1.0", "inquirer": "^7.1.0", - "yargs": "^15.3.0" + "yargs": "^15.3.1" }, "jest": { "collectCoverage": true, diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 116d148cdf..f4363dfc27 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -37,7 +37,7 @@ "jsii-reflect": "^1.1.0", "log4js": "^6.1.2", "typescript": "~3.8.3", - "yargs": "^15.3.0" + "yargs": "^15.3.1" }, "devDependencies": { "@types/fs-extra": "^8.1.0", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index c14753ddaf..71c581151e 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -46,7 +46,7 @@ "semver": "^7.1.3", "spdx-license-list": "^6.1.0", "xmlbuilder": "^15.0.0", - "yargs": "^15.3.0" + "yargs": "^15.3.1" }, "devDependencies": { "@jsii/dotnet-jsonmodel": "^1.1.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 4c1243fce6..95b0590f4d 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -37,7 +37,7 @@ "colors": "^1.4.0", "fs-extra": "^8.1.0", "oo-ascii-tree": "^1.1.0", - "yargs": "^15.3.0" + "yargs": "^15.3.1" }, "devDependencies": { "@scope/jsii-calc-lib": "^1.1.0", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 5c733b2c02..a7b56aeabf 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -35,7 +35,7 @@ "fs-extra": "^8.1.0", "typescript": "~3.8.3", "xmldom": "^0.3.0", - "yargs": "^15.3.0" + "yargs": "^15.3.1" }, "jest": { "moduleFileExtensions": [ diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 154dd5c72d..8fa0b74c8f 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -44,7 +44,7 @@ "sort-json": "^2.0.0", "spdx-license-list": "^6.1.0", "typescript": "~3.8.3", - "yargs": "^15.3.0" + "yargs": "^15.3.1" }, "devDependencies": { "@types/clone": "^0.1.30", diff --git a/yarn.lock b/yarn.lock index 9eda86c042..66ccb62f35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9055,10 +9055,10 @@ yargs-parser@^15.0.0: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^18.1.0: - version "18.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.0.tgz#1b0ab1118ebd41f68bb30e729f4c83df36ae84c3" - integrity sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ== +yargs-parser@^18.1.1: + version "18.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.1.tgz#bf7407b915427fc760fcbbccc6c82b4f0ffcbd37" + integrity sha512-KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -9097,10 +9097,10 @@ yargs@^14.0.0, yargs@^14.2.2: y18n "^4.0.0" yargs-parser "^15.0.0" -yargs@^15.0.0, yargs@^15.3.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976" - integrity sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA== +yargs@^15.0.0, yargs@^15.3.1: + version "15.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" + integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== dependencies: cliui "^6.0.0" decamelize "^1.2.0" @@ -9112,4 +9112,4 @@ yargs@^15.0.0, yargs@^15.3.0: string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^18.1.0" + yargs-parser "^18.1.1" From 037eb053a671b4c8f0288686bf1d8a6e6f3cdf6b Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Mon, 16 Mar 2020 16:07:54 +0100 Subject: [PATCH 05/74] chore: ran 'yarn upgrade' (#1337) * chore: ran 'yarn upgrade' * Configure dependabot to update transitive dependencies, too * Disable audit (it is not reliable enough) * Fix import of Octokit for new versions --- .dependabot/config.yml | 3 + .yarnrc | 1 - package.json | 2 +- .../@jsii/integ-test/test/build-cdk.test.ts | 2 +- yarn.lock | 1188 ++++++++--------- 5 files changed, 540 insertions(+), 656 deletions(-) diff --git a/.dependabot/config.yml b/.dependabot/config.yml index 599c0b1339..caceb020c9 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -7,6 +7,9 @@ update_configs: package_manager: javascript update_schedule: live version_requirement_updates: increase_versions + allowed_updates: + - match: + update_type: 'all' default_labels: - dependencies diff --git a/.yarnrc b/.yarnrc index 4f9e871c7a..591e9c3d57 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,2 +1 @@ --install.check-files true # install will verify file tree of packages for consistency ---install.audit true # Run vulnerability audit on installed packages diff --git a/package.json b/package.json index 591ef69b77..fbfab8c3a7 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "@typescript-eslint/eslint-plugin": "^2.23.0", "@typescript-eslint/parser": "^2.23.0", "eslint": "^6.8.0", - "eslint-plugin-import": "^2.20.1", "eslint-import-resolver-node": "^0.3.3", "eslint-import-resolver-typescript": "^2.0.0", + "eslint-plugin-import": "^2.20.1", "lerna": "^3.20.2" }, "repository": { diff --git a/packages/@jsii/integ-test/test/build-cdk.test.ts b/packages/@jsii/integ-test/test/build-cdk.test.ts index 88b6b6f14a..3e47fa9491 100644 --- a/packages/@jsii/integ-test/test/build-cdk.test.ts +++ b/packages/@jsii/integ-test/test/build-cdk.test.ts @@ -1,4 +1,4 @@ -import * as Octokit from '@octokit/rest'; +import { Octokit } from '@octokit/rest'; import * as dotenv from 'dotenv'; import { readdir, mkdtemp, remove } from 'fs-extra'; import * as path from 'path'; diff --git a/yarn.lock b/yarn.lock index 66ccb62f35..43093fea6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,52 +2,25 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.36", "@babel/code-frame@^7.5.5": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d" - integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw== - dependencies: - "@babel/highlight" "^7.0.0" - -"@babel/code-frame@^7.8.3": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.36", "@babel/code-frame@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== dependencies: "@babel/highlight" "^7.8.3" -"@babel/core@^7.0.0-beta.39", "@babel/core@^7.1.0": - version "7.7.2" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.2.tgz#ea5b99693bcfc058116f42fa1dd54da412b29d91" - integrity sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ== - dependencies: - "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.7.2" - "@babel/helpers" "^7.7.0" - "@babel/parser" "^7.7.2" - "@babel/template" "^7.7.0" - "@babel/traverse" "^7.7.2" - "@babel/types" "^7.7.2" - convert-source-map "^1.7.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.13" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.7.5": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941" - integrity sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA== +"@babel/core@^7.0.0-beta.39", "@babel/core@^7.1.0", "@babel/core@^7.7.5": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b" + integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.3" - "@babel/helpers" "^7.8.3" - "@babel/parser" "^7.8.3" - "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/generator" "^7.8.7" + "@babel/helpers" "^7.8.4" + "@babel/parser" "^7.8.7" + "@babel/template" "^7.8.6" + "@babel/traverse" "^7.8.6" + "@babel/types" "^7.8.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.1" @@ -57,35 +30,16 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.7.2": - version "7.7.2" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af" - integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ== - dependencies: - "@babel/types" "^7.7.2" - jsesc "^2.5.1" - lodash "^4.17.13" - source-map "^0.5.0" - -"@babel/generator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.3.tgz#0e22c005b0a94c1c74eafe19ef78ce53a4d45c03" - integrity sha512-WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug== +"@babel/generator@^7.8.6", "@babel/generator@^7.8.7": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e" + integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg== dependencies: - "@babel/types" "^7.8.3" + "@babel/types" "^7.8.7" jsesc "^2.5.1" lodash "^4.17.13" source-map "^0.5.0" -"@babel/helper-function-name@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz#44a5ad151cfff8ed2599c91682dda2ec2c8430a3" - integrity sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q== - dependencies: - "@babel/helper-get-function-arity" "^7.7.0" - "@babel/template" "^7.7.0" - "@babel/types" "^7.7.0" - "@babel/helper-function-name@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca" @@ -95,13 +49,6 @@ "@babel/template" "^7.8.3" "@babel/types" "^7.8.3" -"@babel/helper-get-function-arity@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz#c604886bc97287a1d1398092bc666bc3d7d7aa2d" - integrity sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw== - dependencies: - "@babel/types" "^7.7.0" - "@babel/helper-get-function-arity@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" @@ -109,23 +56,11 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helper-plugin-utils@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" - integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== - -"@babel/helper-plugin-utils@^7.8.0": +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670" integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ== -"@babel/helper-split-export-declaration@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300" - integrity sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA== - dependencies: - "@babel/types" "^7.7.0" - "@babel/helper-split-export-declaration@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9" @@ -133,33 +68,15 @@ dependencies: "@babel/types" "^7.8.3" -"@babel/helpers@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.0.tgz#359bb5ac3b4726f7c1fde0ec75f64b3f4275d60b" - integrity sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g== - dependencies: - "@babel/template" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - -"@babel/helpers@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.3.tgz#382fbb0382ce7c4ce905945ab9641d688336ce85" - integrity sha512-LmU3q9Pah/XyZU89QvBgGt+BCsTPoQa+73RxAQh8fb8qkDyIfeQnmgs+hvzhTCKTzqOyk7JTkS3MS1S8Mq5yrQ== +"@babel/helpers@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73" + integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w== dependencies: "@babel/template" "^7.8.3" - "@babel/traverse" "^7.8.3" + "@babel/traverse" "^7.8.4" "@babel/types" "^7.8.3" -"@babel/highlight@^7.0.0": - version "7.5.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540" - integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ== - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^4.0.0" - "@babel/highlight@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" @@ -169,15 +86,10 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2": - version "7.7.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.3.tgz#5fad457c2529de476a248f75b0f090b3060af043" - integrity sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A== - -"@babel/parser@^7.7.5", "@babel/parser@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081" - integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4" + integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA== "@babel/plugin-syntax-bigint@^7.0.0": version "7.8.3" @@ -187,73 +99,40 @@ "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-object-rest-spread@^7.0.0": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e" - integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - -"@babel/template@^7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0" - integrity sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ== + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.7.0" - "@babel/types" "^7.7.0" + "@babel/helper-plugin-utils" "^7.8.0" -"@babel/template@^7.7.4", "@babel/template@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8" - integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ== +"@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" + integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/parser" "^7.8.3" - "@babel/types" "^7.8.3" - -"@babel/traverse@^7.0.0-beta.39", "@babel/traverse@^7.1.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2": - version "7.7.2" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09" - integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw== - dependencies: - "@babel/code-frame" "^7.5.5" - "@babel/generator" "^7.7.2" - "@babel/helper-function-name" "^7.7.0" - "@babel/helper-split-export-declaration" "^7.7.0" - "@babel/parser" "^7.7.2" - "@babel/types" "^7.7.2" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.13" + "@babel/parser" "^7.8.6" + "@babel/types" "^7.8.6" -"@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.3.tgz#a826215b011c9b4f73f3a893afbc05151358bf9a" - integrity sha512-we+a2lti+eEImHmEXp7bM9cTxGzxPmBiVJlLVD+FuuQMeeO7RaDbutbgeheDkw+Xe3mCfJHnGOWLswT74m2IPg== +"@babel/traverse@^7.0.0-beta.39", "@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" + integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== dependencies: "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.3" + "@babel/generator" "^7.8.6" "@babel/helper-function-name" "^7.8.3" "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/parser" "^7.8.6" + "@babel/types" "^7.8.6" debug "^4.1.0" globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.39", "@babel/types@^7.3.0", "@babel/types@^7.7.0", "@babel/types@^7.7.2": - version "7.7.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.2.tgz#550b82e5571dcd174af576e23f0adba7ffc683f7" - integrity sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA== - dependencies: - esutils "^2.0.2" - lodash "^4.17.13" - to-fast-properties "^2.0.0" - -"@babel/types@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" - integrity sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.39", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" + integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== dependencies: esutils "^2.0.2" lodash "^4.17.13" @@ -265,9 +144,9 @@ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@cnakazawa/watch@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" - integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" + integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ== dependencies: exec-sh "^0.3.2" minimist "^1.2.0" @@ -1229,32 +1108,52 @@ "@octokit/types" "^2.0.0" "@octokit/endpoint@^5.5.0": - version "5.5.1" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.5.1.tgz#2eea81e110ca754ff2de11c79154ccab4ae16b3f" - integrity sha512-nBFhRUb5YzVTCX/iAK1MgQ4uWo89Gu0TH00qQHoYRCsE12dWcG1OiLd7v2EIo2+tpUKPMOQ62QFy9hy9Vg2ULg== + version "5.5.3" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.5.3.tgz#0397d1baaca687a4c8454ba424a627699d97c978" + integrity sha512-EzKwkwcxeegYYah5ukEeAI/gYRLv2Y9U5PpIsseGSFDk+G3RbipQGBs8GuYS1TLCtQaqoO66+aQGtITPalxsNQ== dependencies: "@octokit/types" "^2.0.0" is-plain-object "^3.0.0" - universal-user-agent "^4.0.0" + universal-user-agent "^5.0.0" "@octokit/plugin-enterprise-rest@^3.6.1": version "3.6.2" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-3.6.2.tgz#74de25bef21e0182b4fa03a8678cd00a4e67e561" integrity sha512-3wF5eueS5OHQYuAEudkpN+xVeUsg8vYEMMenEzLphUZ7PRZ8OJtDcsreL3ad9zxXmBbaFWzLmFcdob5CLyZftA== +"@octokit/plugin-paginate-rest@^1.1.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-1.1.2.tgz#004170acf8c2be535aba26727867d692f7b488fc" + integrity sha512-jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q== + dependencies: + "@octokit/types" "^2.0.1" + +"@octokit/plugin-request-log@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e" + integrity sha512-ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw== + +"@octokit/plugin-rest-endpoint-methods@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-2.4.0.tgz#3288ecf5481f68c494dd0602fc15407a59faf61e" + integrity sha512-EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ== + dependencies: + "@octokit/types" "^2.0.1" + deprecation "^2.3.1" + "@octokit/request-error@^1.0.1", "@octokit/request-error@^1.0.2": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.2.0.tgz#a64d2a9d7a13555570cd79722de4a4d76371baaa" - integrity sha512-DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg== + version "1.2.1" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.2.1.tgz#ede0714c773f32347576c25649dc013ae6b31801" + integrity sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA== dependencies: "@octokit/types" "^2.0.0" deprecation "^2.0.0" once "^1.4.0" "@octokit/request@^5.2.0": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.3.1.tgz#3a1ace45e6f88b1be4749c5da963b3a3b4a2f120" - integrity sha512-5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg== + version "5.3.2" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.3.2.tgz#1ca8b90a407772a1ee1ab758e7e0aced213b9883" + integrity sha512-7NPJpg19wVQy1cs2xqXjjRq/RmtSomja/VSWnptfYwuBxLdbYh2UjhGi0Wx7B1v5Iw5GKhfFDQL7jM7SSp7K2g== dependencies: "@octokit/endpoint" "^5.5.0" "@octokit/request-error" "^1.0.1" @@ -1263,32 +1162,17 @@ is-plain-object "^3.0.0" node-fetch "^2.3.0" once "^1.4.0" - universal-user-agent "^4.0.0" + universal-user-agent "^5.0.0" -"@octokit/rest@^16.28.4": - version "16.35.0" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.35.0.tgz#7ccc1f802f407d5b8eb21768c6deca44e7b4c0d8" - integrity sha512-9ShFqYWo0CLoGYhA1FdtdykJuMzS/9H6vSbbQWDX4pWr4p9v+15MsH/wpd/3fIU+tSxylaNO48+PIHqOkBRx3w== - dependencies: - "@octokit/request" "^5.2.0" - "@octokit/request-error" "^1.0.2" - atob-lite "^2.0.0" - before-after-hook "^2.0.0" - btoa-lite "^1.0.0" - deprecation "^2.0.0" - lodash.get "^4.4.2" - lodash.set "^4.3.2" - lodash.uniq "^4.5.0" - octokit-pagination-methods "^1.1.0" - once "^1.4.0" - universal-user-agent "^4.0.0" - -"@octokit/rest@^16.36.0": - version "16.38.1" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.38.1.tgz#be24e0faa7d0bdb9459fbc089ec866ed11774b72" - integrity sha512-zyNFx+/Bd1EXt7LQjfrc6H4wryBQ/oDuZeZhGMBSFr1eMPFDmpEweFQR3R25zjKwBQpDY7L5GQO6A3XSaOfV1w== +"@octokit/rest@^16.28.4", "@octokit/rest@^16.36.0": + version "16.43.1" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.43.1.tgz#3b11e7d1b1ac2bbeeb23b08a17df0b20947eda6b" + integrity sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw== dependencies: "@octokit/auth-token" "^2.4.0" + "@octokit/plugin-paginate-rest" "^1.1.1" + "@octokit/plugin-request-log" "^1.0.0" + "@octokit/plugin-rest-endpoint-methods" "2.4.0" "@octokit/request" "^5.2.0" "@octokit/request-error" "^1.0.2" atob-lite "^2.0.0" @@ -1302,24 +1186,24 @@ once "^1.4.0" universal-user-agent "^4.0.0" -"@octokit/types@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.0.2.tgz#0888497f5a664e28b0449731d5e88e19b2a74f90" - integrity sha512-StASIL2lgT3TRjxv17z9pAqbnI7HGu9DrJlg3sEBFfCLaMEqp+O3IQPUF6EZtQ4xkAu2ml6kMBBCtGxjvmtmuQ== +"@octokit/types@^2.0.0", "@octokit/types@^2.0.1": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.5.0.tgz#f1bbd147e662ae2c79717d518aac686e58257773" + integrity sha512-KEnLwOfdXzxPNL34fj508bhi9Z9cStyN7qY1kOfVahmqtAfrWw6Oq3P4R+dtsg0lYtZdWBpUrS/Ixmd5YILSww== dependencies: "@types/node" ">= 8" "@sinonjs/commons@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.0.tgz#f90ffc52a2e519f018b13b6c4da03cbff36ebed6" - integrity sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg== + version "1.7.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz#da5fd19a5f71177a53778073978873964f49acf1" + integrity sha512-Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ== dependencies: type-detect "4.0.8" "@types/babel__core@^7.1.0": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz#e441ea7df63cd080dfcd02ab199e6d16a735fc30" - integrity sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA== + version "7.1.6" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz#16ff42a5ae203c9af1c6e190ed1f30f83207b610" + integrity sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -1328,9 +1212,9 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.0.tgz#f1ec1c104d1bb463556ecb724018ab788d0c172a" - integrity sha512-c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw== + version "7.6.1" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz#4901767b397e8711aeb99df8d396d7ba7b7f0e04" + integrity sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew== dependencies: "@babel/types" "^7.0.0" @@ -1343,9 +1227,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.8" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.8.tgz#479a4ee3e291a403a1096106013ec22cf9b64012" - integrity sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw== + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.9.tgz#be82fab304b141c3eee81a4ce3b034d0eba1590a" + integrity sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw== dependencies: "@babel/types" "^7.3.0" @@ -1421,9 +1305,9 @@ integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== "@types/istanbul-lib-report@*": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" - integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg== + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== dependencies: "@types/istanbul-lib-coverage" "*" @@ -1451,9 +1335,9 @@ pretty-format "^25.1.0" "@types/json-schema@^7.0.3": - version "7.0.3" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" - integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A== + version "7.0.4" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" + integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== "@types/json5@^0.0.29": version "0.0.29" @@ -1480,9 +1364,9 @@ "@types/node" "*" "@types/node@*", "@types/node@>= 8": - version "12.12.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.11.tgz#bec2961975888d964196bf0016a2f984d793d3ce" - integrity sha512-O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ== + version "13.9.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.1.tgz#96f606f8cd67fb018847d9b61e93997dabdefc72" + integrity sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ== "@types/node@^10.17.17": version "10.17.17" @@ -1510,9 +1394,9 @@ "@types/tar-stream" "*" "@types/tar-stream@*": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-1.6.1.tgz#67d759068ff781d976cad978893bb7a334ec8809" - integrity sha512-pYCDOPuRE+4tXFk1rSMYiuI+kSrXiJ4av1bboQbkcEBA2rqwEWfIn9kdMSH+5nYu58WksHuxwx+7kVbtg0Le7w== + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-2.1.0.tgz#884b1cbe6c35ff459c05a5eba86b406805943ef6" + integrity sha512-s1UQxQUVMHbSkCC0X4qdoiWgHF8DoyY1JjQouFsnk/8ysoTdBaiCHud/exoAZzKDbzAXVc+ah6sczxGVMAohFw== dependencies: "@types/node" "*" @@ -1525,16 +1409,16 @@ "@types/node" "*" "@types/through@*": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93" - integrity sha512-9a7C5VHh+1BKblaYiq+7Tfc+EOmjMdZaD1MYtkQjSoxgB69tBjW98ry6SKsi4zEIWztLOMRuL87A3bdT/Fc/4w== + version "0.0.30" + resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.30.tgz#e0e42ce77e897bd6aead6f6ea62aeb135b8a3895" + integrity sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg== dependencies: "@types/node" "*" "@types/yargs-parser@*": - version "13.1.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228" - integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg== + version "15.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" + integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== "@types/yargs@^15.0.0", "@types/yargs@^15.0.4": version "15.0.4" @@ -1777,10 +1661,10 @@ acorn-globals@^4.3.2: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-jsx@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" - integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== +acorn-jsx@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" + integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== acorn-walk@^6.0.1: version "6.2.0" @@ -1792,10 +1676,10 @@ acorn@^6.0.1, acorn@^6.2.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== -acorn@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" - integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== +acorn@^7.1.0, acorn@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" + integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== agent-base@4, agent-base@^4.3.0: version "4.3.0" @@ -1829,11 +1713,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: - version "6.10.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" - integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== + version "6.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" + integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== dependencies: - fast-deep-equal "^2.0.1" + fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.4.1" uri-js "^4.2.2" @@ -1844,11 +1728,11 @@ ansi-escapes@^3.2.0: integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-escapes@^4.2.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d" - integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" + integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== dependencies: - type-fest "^0.8.1" + type-fest "^0.11.0" ansi-regex@^2.0.0: version "2.1.1" @@ -1877,15 +1761,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172" - integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg== - dependencies: - "@types/color-name" "^1.1.1" - color-convert "^2.0.1" - -ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== @@ -1975,12 +1851,13 @@ array-ify@^1.0.0: integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= + version "3.1.1" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" + integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" + define-properties "^1.1.3" + es-abstract "^1.17.0" + is-string "^1.0.5" array-union@^1.0.2: version "1.0.2" @@ -2000,13 +1877,12 @@ array-unique@^0.3.2: integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= array.prototype.flat@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.2.tgz#8f3c71d245ba349b6b64b4078f76f5576f1fd723" - integrity sha512-VXjh7lAL4KXKF2hY4FnEW9eRW6IhdvFW1sN/JwLbmECbCgACCnBHNyP3lFiYuttr0jxRN9Bsc5+G27dMseSWqQ== + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== dependencies: define-properties "^1.1.3" - es-abstract "^1.15.0" - function-bind "^1.1.1" + es-abstract "^1.17.0-next.1" arrify@^1.0.1: version "1.0.1" @@ -2079,7 +1955,7 @@ atob-lite@^2.0.0: resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696" integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY= -atob@^2.1.1: +atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== @@ -2090,9 +1966,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" - integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== + version "1.9.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" + integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== babel-jest@^25.1.0: version "25.1.0" @@ -2184,10 +2060,17 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5: - version "3.7.1" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de" - integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg== + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" @@ -2230,10 +2113,10 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= -browser-process-hrtime@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4" - integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw== +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browser-resolve@^1.11.3: version "1.11.3" @@ -2301,7 +2184,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -bser@^2.0.0: +bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== @@ -2508,9 +2391,9 @@ chokidar@^2.0.2: fsevents "^1.2.7" chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" - integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== chrome-trace-event@^1.0.2: version "1.0.2" @@ -2952,9 +2835,9 @@ cssom@~0.3.6: integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== cssstyle@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.1.0.tgz#99f50a3aa21d4af16e758ae3e454dcf5940b9122" - integrity sha512-1iwCdymVYhMdQWiZ+9mB7x+urdNLPGTWsIZt6euFk8Yi+dOERK2ccoAUA3Bl8I5vmK5qfz/eLkBRyLbs42ov4A== + version "2.2.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz#e4c44debccd6b7911ed617a4395e5754bba59992" + integrity sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA== dependencies: cssom "~0.3.6" @@ -3138,7 +3021,7 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -deprecation@^2.0.0: +deprecation@^2.0.0, deprecation@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== @@ -3275,9 +3158,9 @@ ecc-jsbn@~0.1.1: safer-buffer "^2.1.0" elliptic@^6.0.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz#c380f5f909bf1b9b4428d028cd18d3b0efd6b52b" - integrity sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg== + version "6.5.2" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" + integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== dependencies: bn.js "^4.4.0" brorand "^1.0.1" @@ -3302,6 +3185,11 @@ emojis-list@^2.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + encoding@^0.1.11: version "0.1.12" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" @@ -3339,10 +3227,10 @@ entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== -env-paths@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0" - integrity sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA= +env-paths@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" + integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== envinfo@^7.3.1: version "7.5.0" @@ -3368,50 +3256,34 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.12.0, es-abstract@^1.15.0, es-abstract@^1.16.2, es-abstract@^1.16.3, es-abstract@^1.5.1, es-abstract@^1.7.0: - version "1.16.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" - integrity sha512-WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-inspect "^1.7.0" - object-keys "^1.1.1" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" - -es-abstract@^1.17.0-next.1: - version "1.17.0-next.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.0-next.1.tgz#94acc93e20b05a6e96dacb5ab2f1cb3a81fc2172" - integrity sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw== +es-abstract@^1.16.3, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4: + version "1.17.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" + integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" + is-callable "^1.1.5" + is-regex "^1.0.5" object-inspect "^1.7.0" object-keys "^1.1.1" object.assign "^4.1.0" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" es-get-iterator@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.0.2.tgz#bc99065aa8c98ce52bc86ab282dedbba4120e0b3" - integrity sha512-ZHb4fuNK3HKHEOvDGyHPKf5cSWh/OvAMskeM/+21NMnTuvqFvz8uHatolu+7Kf6b6oK9C+3Uo1T37pSGPWv0MA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8" + integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ== dependencies: - es-abstract "^1.17.0-next.1" + es-abstract "^1.17.4" has-symbols "^1.0.1" is-arguments "^1.0.4" - is-map "^2.0.0" - is-set "^2.0.0" - is-string "^1.0.4" + is-map "^2.0.1" + is-set "^2.0.1" + is-string "^1.0.5" isarray "^2.0.5" es-to-primitive@^1.2.1: @@ -3446,9 +3318,9 @@ escape-string-regexp@^2.0.0: integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== escodegen@^1.11.1: - version "1.13.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.13.0.tgz#c7adf9bd3f3cc675bb752f202f79a720189cab29" - integrity sha512-eYk2dCkxR07DsHA/X2hRBj0CFAZeri/LyDMc0C8JT1Hqi6JnVpMhJ7XFITbb0+yZS3lVkaPL2oCkZ3AVmeVbMw== + version "1.14.1" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" + integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== dependencies: esprima "^4.0.1" estraverse "^4.2.0" @@ -3477,9 +3349,9 @@ eslint-import-resolver-typescript@^2.0.0: tsconfig-paths "^3.9.0" eslint-module-utils@^2.4.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz#cdf0b40d623032274ccd2abd7e64c4e524d6e19c" - integrity sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw== + version "2.5.2" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" + integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q== dependencies: debug "^2.6.9" pkg-dir "^2.0.0" @@ -3574,12 +3446,12 @@ eslint@^6.8.0: v8-compile-cache "^2.0.3" espree@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d" - integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA== + version "6.2.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" + integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== dependencies: - acorn "^7.1.0" - acorn-jsx "^5.1.0" + acorn "^7.1.1" + acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" esprima@^4.0.0, esprima@^4.0.1: @@ -3588,9 +3460,9 @@ esprima@^4.0.0, esprima@^4.0.1: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" - integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== + version "1.1.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48" + integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q== dependencies: estraverse "^4.0.0" @@ -3617,9 +3489,9 @@ eventemitter3@^3.1.0: integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== events@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88" - integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" + integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -3753,10 +3625,10 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= +fast-deep-equal@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" + integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== fast-glob@^2.2.6: version "2.2.7" @@ -3771,9 +3643,9 @@ fast-glob@^2.2.6: micromatch "^3.1.10" fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-levenshtein@~2.0.6: version "2.0.6" @@ -3781,11 +3653,11 @@ fast-levenshtein@~2.0.6: integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fb-watchman@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" - integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== dependencies: - bser "^2.0.0" + bser "2.1.1" figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: version "3.5.1" @@ -3800,9 +3672,9 @@ figures@^2.0.0: escape-string-regexp "^1.0.5" figures@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec" - integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" + integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== dependencies: escape-string-regexp "^1.0.5" @@ -3813,6 +3685,11 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -3952,9 +3829,9 @@ fs-minipass@^1.2.5: minipass "^2.6.0" fs-minipass@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1" - integrity sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A== + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== dependencies: minipass "^3.0.0" @@ -3974,12 +3851,12 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.2.7: - version "1.2.9" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f" - integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw== + version "1.2.11" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" + integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== dependencies: + bindings "^1.5.0" nan "^2.12.1" - node-pre-gyp "^0.12.0" fsevents@^2.1.2: version "2.1.2" @@ -4141,7 +4018,7 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.4: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.4: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -4195,9 +4072,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^12.1.0: - version "12.3.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" - integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw== + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== dependencies: type-fest "^0.8.1" @@ -4225,7 +4102,7 @@ globrex@^0.1.1: resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== @@ -4236,9 +4113,9 @@ growly@^1.3.0: integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= handlebars@^4.4.0: - version "4.5.3" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482" - integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA== + version "4.7.3" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee" + integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg== dependencies: neo-async "^2.6.0" optimist "^0.6.1" @@ -4251,7 +4128,7 @@ har-schema@^2.0.0: resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= -har-validator@~5.1.0: +har-validator@~5.1.3: version "5.1.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== @@ -4310,7 +4187,7 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.1, has@^1.0.3: +has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== @@ -4350,9 +4227,9 @@ homedir-polyfill@^1.0.1: parse-passwd "^1.0.0" hosted-git-info@^2.1.4, hosted-git-info@^2.7.1: - version "2.8.5" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" - integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== html-encoding-sniffer@^1.0.2: version "1.0.2" @@ -4633,19 +4510,19 @@ is-binary-path@^1.0.0: binary-extensions "^1.0.0" is-boolean-object@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93" - integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M= + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" + integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ== is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" - integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.4, is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== is-ci@^2.0.0: version "2.0.0" @@ -4669,9 +4546,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= + 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== is-descriptor@^0.1.0: version "0.1.6" @@ -4714,11 +4591,9 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== is-fullwidth-code-point@^1.0.0: version "1.0.0" @@ -4756,15 +4631,15 @@ is-glob@^4.0.0, is-glob@^4.0.1: dependencies: is-extglob "^2.1.1" -is-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.0.tgz#1d223ada48a1f5fdb7b3c5c21a45b6a4d48aec3c" - integrity sha512-ptj+FffEGJN9hLuakga2S3mYQt5PVN+w7+fL3SAgxKhlCePSt24Q3fiSozhvphbwCQ0+QPA1rJnLSoS2LnbCVw== +is-map@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" + integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== is-number-object@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" - integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k= + 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== is-number@^3.0.0: version "3.0.0" @@ -4807,17 +4682,17 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= +is-regex@^1.0.4, is-regex@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" + integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== dependencies: - has "^1.0.1" + has "^1.0.3" -is-set@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.0.tgz#ae93342b1de5560c720b4b71599abc799d183cf4" - integrity sha512-So5/xwRDzU3X7kOt2vpvrsj/Asx5E7Q5IyX6itksB96FJgyydSe9tFwfCq7IZ8URDS4h45FhNgfENToTgBfmgw== +is-set@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" + integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== is-ssh@^1.3.0: version "1.3.1" @@ -4836,17 +4711,17 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-string@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64" - integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ= +is-string@^1.0.4, 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== is-symbol@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" - integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== dependencies: - has-symbols "^1.0.0" + has-symbols "^1.0.1" is-text-path@^1.0.1: version "1.0.1" @@ -4865,15 +4740,15 @@ is-utf8@^0.2.0: resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= -is-weakmap@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.0.tgz#88bd0b8ec3a5724477637d58ed96cb00552593fd" - integrity sha512-vZKPGTqgcrNWsav9/lvXA4DvZtxqzdkSm624p85UvZV47pk1cvw+JQ5YrZfQ1KqsogYxnIztAtu4WBdPNz/n/w== +is-weakmap@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" + integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== -is-weakset@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.0.tgz#119577bcf75528e7d5b4c7ebaa4fdee9e2d3e5d7" - integrity sha512-bDiKqyPK2GeWiZNsm1zHf0adJJ2I0gNzwjBxu4iajQPgJH3UZiXTGUPMNmbQ3TIBYPs+tVNpiDSF/eF5U4EF7A== +is-weakset@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" + integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" @@ -4938,9 +4813,9 @@ istanbul-lib-coverage@^3.0.0: integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== istanbul-lib-instrument@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.0.tgz#53321a7970f076262fd3292c8f9b2e4ac544aae1" - integrity sha512-Nm4wVHdo7ZXSG30KjZ2Wl5SU/Bw7bDx1PdaiIFzEStdjs0H12mOTncn1GVYuqQSaZxpg87VGBRsVRPGD2cD1AQ== + version "4.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6" + integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg== dependencies: "@babel/core" "^7.7.5" "@babel/parser" "^7.7.5" @@ -5482,9 +5357,9 @@ kind-of@^5.0.0: integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== kleur@^3.0.3: version "3.0.3" @@ -5582,7 +5457,7 @@ loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== -loader-utils@1.2.3, loader-utils@^1.1.0, loader-utils@^1.2.3: +loader-utils@1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== @@ -5591,6 +5466,15 @@ loader-utils@1.2.3, loader-utils@^1.1.0, loader-utils@^1.2.3: emojis-list "^2.0.0" json5 "^1.0.1" +loader-utils@^1.1.0, loader-utils@^1.2.3: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^1.0.1" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -5728,9 +5612,9 @@ make-dir@^2.0.0, make-dir@^2.1.0: semver "^5.6.0" make-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801" - integrity sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392" + integrity sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w== dependencies: semver "^6.0.0" @@ -5929,17 +5813,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.42.0: - version "1.42.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" - integrity sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ== +mime-db@1.43.0: + version "1.43.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" + integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.25" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.25.tgz#39772d46621f93e2a80a856c53b86a62156a6437" - integrity sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg== + version "2.1.26" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" + integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== dependencies: - mime-db "1.42.0" + mime-db "1.43.0" mimic-fn@^1.0.0: version "1.2.0" @@ -5982,9 +5866,9 @@ minimist@0.0.8: integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== minimist@~0.0.1: version "0.0.10" @@ -6153,9 +6037,9 @@ natural-compare@^1.4.0: integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== + version "2.3.3" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" + integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" @@ -6172,9 +6056,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-fetch-npm@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7" - integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw== + version "2.0.3" + resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.3.tgz#efae4aacb0500444e449a51fc1467397775ebc38" + integrity sha512-DgwoKEsqLnFZtk3ap7GWBHcHwnUhsNmQqEDcdjfQ8GofLEFJ081NAd4Uin3R7RFZBWVJCwHISw1oaEqPgSLloA== dependencies: encoding "^0.1.11" json-parse-better-errors "^1.0.0" @@ -6186,21 +6070,21 @@ node-fetch@^2.3.0, node-fetch@^2.5.0: integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== node-gyp@^5.0.2: - version "5.0.5" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.5.tgz#f6cf1da246eb8c42b097d7cd4d6c3ce23a4163af" - integrity sha512-WABl9s4/mqQdZneZHVWVG4TVr6QQJZUC6PAx47ITSk9lreZ1n+7Z9mMAIbA3vnO4J9W20P7LhCxtzfWsAD/KDw== + version "5.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.0.tgz#8e31260a7af4a2e2f994b0673d4e0b3866156332" + integrity sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw== dependencies: - env-paths "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - request "^2.87.0" - rimraf "2" - semver "~5.3.0" + env-paths "^2.2.0" + glob "^7.1.4" + graceful-fs "^4.2.2" + mkdirp "^0.5.1" + nopt "^4.0.1" + npmlog "^4.1.2" + request "^2.88.0" + rimraf "^2.6.3" + semver "^5.7.1" tar "^4.4.12" - which "1" + which "^1.3.1" node-int64@^0.4.0: version "0.4.0" @@ -6252,10 +6136,10 @@ node-notifier@^6.0.0: shellwords "^0.1.1" which "^1.3.1" -node-pre-gyp@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149" - integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A== +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== dependencies: detect-libc "^1.0.2" mkdirp "^0.5.1" @@ -6266,19 +6150,12 @@ node-pre-gyp@^0.12.0: rc "^1.2.7" rimraf "^2.6.1" semver "^5.3.0" - tar "^4" - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= - dependencies: - abbrev "1" + tar "^4.4.2" nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== dependencies: abbrev "1" osenv "^0.1.4" @@ -6311,9 +6188,11 @@ normalize-url@^3.3.0: integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== npm-bundled@^1.0.1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd" - integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g== + version "1.1.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" + integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + dependencies: + npm-normalize-package-bin "^1.0.1" npm-lifecycle@^3.1.2: version "3.1.4" @@ -6329,6 +6208,11 @@ npm-lifecycle@^3.1.2: umask "^1.1.0" which "^1.3.1" +npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0: version "6.1.1" resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7" @@ -6340,12 +6224,13 @@ npm-lifecycle@^3.1.2: validate-npm-package-name "^3.0.0" npm-packlist@^1.1.6, npm-packlist@^1.4.4: - version "1.4.6" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz#53ba3ed11f8523079f1457376dd379ee4ea42ff4" - integrity sha512-u65uQdb+qwtGvEJh/DgQgW1Xg7sqeNbmxYyrvlNznaVTjV3E5P6F/EFjM+BVHXl7JJlsdG8A64M0XI8FI/IOlg== + version "1.4.8" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" + integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== dependencies: ignore-walk "^3.0.1" npm-bundled "^1.0.1" + npm-normalize-package-bin "^1.0.1" npm-pick-manifest@^3.0.0: version "3.0.2" @@ -6370,7 +6255,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2, npmlog@^4.1.2: +npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -6415,9 +6300,9 @@ object-inspect@^1.7.0: integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== object-is@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" - integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY= + version "1.0.2" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4" + integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ== object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -6441,13 +6326,13 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.getownpropertydescriptors@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" - integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= +object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" + integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== dependencies: - define-properties "^1.1.2" - es-abstract "^1.5.1" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" object.pick@^1.3.0: version "1.3.0" @@ -6457,12 +6342,12 @@ object.pick@^1.3.0: isobject "^3.0.1" object.values@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" - integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== dependencies: define-properties "^1.1.3" - es-abstract "^1.12.0" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" has "^1.0.3" @@ -6585,9 +6470,9 @@ p-limit@^1.1.0: p-try "^1.0.0" p-limit@^2.0.0, p-limit@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" - integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== + version "2.2.2" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" + integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== dependencies: p-try "^2.0.0" @@ -6659,9 +6544,9 @@ p-waterfall@^1.0.0: p-reduce "^1.0.0" pako@~1.0.5: - version "1.0.10" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732" - integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw== + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== parallel-transform@^1.1.0: version "1.2.0" @@ -6944,12 +6829,12 @@ promise-retry@^1.1.1: retry "^0.10.0" prompts@^2.0.1: - version "2.3.0" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.0.tgz#a444e968fa4cc7e86689a74050685ac8006c4cc4" - integrity sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg== + version "2.3.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05" + integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA== dependencies: kleur "^3.0.3" - sisteransi "^1.0.3" + sisteransi "^1.0.4" promzard@^0.3.0: version "0.3.0" @@ -6980,10 +6865,10 @@ prr@~1.0.1: resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= -psl@^1.1.24, psl@^1.1.28: - version "1.4.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2" - integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw== +psl@^1.1.28: + version "1.7.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" + integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== public-encrypt@^4.0.0: version "4.0.3" @@ -7027,7 +6912,7 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= -punycode@^1.2.4, punycode@^1.4.1: +punycode@^1.2.4: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= @@ -7088,9 +6973,9 @@ rc@^1.2.7: strip-json-comments "~2.0.1" react-is@^16.12.0: - version "16.12.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" - integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== + version "16.13.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" + integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA== read-cmd-shim@^1.0.1: version "1.0.5" @@ -7100,14 +6985,14 @@ read-cmd-shim@^1.0.1: graceful-fs "^4.1.2" "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13: - version "2.1.0" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.0.tgz#e3d42e6c35ea5ae820d9a03ab0c7291217fc51d5" - integrity sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A== + version "2.1.1" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.1.tgz#16aa66c59e7d4dad6288f179dd9295fd59bb98f1" + integrity sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A== dependencies: glob "^7.1.1" json-parse-better-errors "^1.0.1" normalize-package-data "^2.0.0" - slash "^1.0.0" + npm-normalize-package-bin "^1.0.0" optionalDependencies: graceful-fs "^4.1.2" @@ -7179,9 +7064,9 @@ read@1, read@~1.0.1: mute-stream "~0.0.4" "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -7192,9 +7077,9 @@ read@1, read@~1.0.1: util-deprecate "~1.0.1" "readable-stream@2 || 3", readable-stream@^3.0.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" - integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ== + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== dependencies: inherits "^2.0.3" string_decoder "^1.1.1" @@ -7261,11 +7146,12 @@ regex-not@^1.0.0, regex-not@^1.0.2: safe-regex "^1.1.0" regexp.prototype.flags@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c" - integrity sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA== + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== dependencies: - define-properties "^1.1.2" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" regexpp@^2.0.1: version "2.0.1" @@ -7315,10 +7201,10 @@ request-promise-native@^1.0.7: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@^2.87.0, request@^2.88.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef" - integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg== +request@^2.88.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -7327,7 +7213,7 @@ request@^2.87.0, request@^2.88.0: extend "~3.0.2" forever-agent "~0.6.1" form-data "~2.3.2" - har-validator "~5.1.0" + har-validator "~5.1.3" http-signature "~1.2.0" is-typedarray "~1.0.0" isstream "~0.1.2" @@ -7337,7 +7223,7 @@ request@^2.87.0, request@^2.88.0: performance-now "^2.1.0" qs "~6.5.2" safe-buffer "^5.1.2" - tough-cookie "~2.4.3" + tough-cookie "~2.5.0" tunnel-agent "^0.6.0" uuid "^3.3.2" @@ -7399,9 +7285,9 @@ resolve@1.1.7: integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2: - version "1.14.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" - integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== + version "1.15.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" + integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== dependencies: path-parse "^1.0.6" @@ -7436,13 +7322,6 @@ rfdc@^1.1.4: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2" integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug== -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -7450,10 +7329,17 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" +rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + rimraf@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.0.tgz#614176d4b3010b75e5c390eb0ee96f6dc0cebb9b" - integrity sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg== + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" @@ -7485,9 +7371,9 @@ run-queue@^1.0.0, run-queue@^1.0.3: aproba "^1.1.1" rxjs@^6.4.0, rxjs@^6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" - integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== + version "6.5.4" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" + integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== dependencies: tslib "^1.9.0" @@ -7556,7 +7442,7 @@ semver-intersect@^1.4.0: dependencies: semver "^5.0.0" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7571,11 +7457,6 @@ semver@^7.1.1, semver@^7.1.3: resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA== -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - serialize-javascript@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" @@ -7646,11 +7527,11 @@ shellwords@^0.1.1: integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== side-channel@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.1.tgz#4fb6c60e13bf4a69baf1b219c50b7feb87cf5c30" - integrity sha512-KhfWUIMFxTnJ1HTWiHhzPZL6CVZubPUFWcaIWY4Fc/551CazpDodWWTVTeJI8AjsC/JpH4fW6hmDa10Dnd4lRg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" + integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== dependencies: - es-abstract "^1.16.2" + es-abstract "^1.17.0-next.1" object-inspect "^1.7.0" signal-exit@^3.0.0, signal-exit@^3.0.2: @@ -7658,16 +7539,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= -sisteransi@^1.0.3: +sisteransi@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3" integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig== -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= - slash@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" @@ -7773,11 +7649,11 @@ source-map-loader@^0.2.4: loader-utils "^1.1.0" source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== dependencies: - atob "^2.1.1" + atob "^2.1.2" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -7936,9 +7812,9 @@ stream-http@^2.7.2: xtend "^4.0.0" stream-shift@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" - integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= + version "1.0.1" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" + integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== streamroller@^2.2.3: version "2.2.3" @@ -7997,18 +7873,18 @@ string.prototype.repeat@^0.2.0: resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf" integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8= -string.prototype.trimleft@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" - integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw== +string.prototype.trimleft@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" + integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== dependencies: define-properties "^1.1.3" function-bind "^1.1.1" -string.prototype.trimright@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" - integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg== +string.prototype.trimright@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" + integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== dependencies: define-properties "^1.1.3" function-bind "^1.1.1" @@ -8140,9 +8016,9 @@ supports-color@^7.0.0, supports-color@^7.1.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.0.0.tgz#b1b94a159e9df00b0a554b2d5f0e0a89690334b0" - integrity sha512-bFhn0MQ8qefLyJ3K7PpHiPUTuTVPWw6RXfaMeV6xgJLXtBbszyboz1bvGTVv4R0YpQm2DqlXXn0fFHhxUHVE5w== + version "2.1.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" + integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -8167,7 +8043,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -8233,9 +8109,9 @@ terser-webpack-plugin@^1.4.3: worker-farm "^1.7.0" terser@^4.1.2: - version "4.4.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.0.tgz#22c46b4817cf4c9565434bfe6ad47336af259ac3" - integrity sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA== + version "4.6.6" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.6.tgz#da2382e6cafbdf86205e82fb9a115bd664d54863" + integrity sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -8368,7 +8244,7 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -tough-cookie@^2.3.3: +tough-cookie@^2.3.3, tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -8385,14 +8261,6 @@ tough-cookie@^3.0.1: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@~2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== - dependencies: - psl "^1.1.24" - punycode "^1.4.1" - tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -8426,9 +8294,9 @@ tsconfig-paths@^3.9.0: strip-bom "^3.0.0" tslib@^1.8.1, tslib@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== + version "1.11.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" + integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== tsutils@^3.17.1: version "3.17.1" @@ -8466,6 +8334,11 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + type-fest@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" @@ -8505,9 +8378,9 @@ typescript@^3.5.3, typescript@~3.8.3: integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== uglify-js@^3.1.4: - version "3.6.9" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.9.tgz#85d353edb6ddfb62a9d798f36e91792249320611" - integrity sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw== + version "3.8.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805" + integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ== dependencies: commander "~2.20.3" source-map "~0.6.1" @@ -8547,9 +8420,16 @@ unique-slug@^2.0.0: imurmurhash "^0.1.4" universal-user-agent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-4.0.0.tgz#27da2ec87e32769619f68a14996465ea1cb9df16" - integrity sha512-eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA== + version "4.0.1" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-4.0.1.tgz#fd8d6cb773a679a709e967ef8288a31fcc03e557" + integrity sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg== + dependencies: + os-name "^3.1.0" + +universal-user-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-5.0.0.tgz#a3182aa758069bf0e79952570ca757de3579c1d9" + integrity sha512-B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q== dependencies: os-name "^3.1.0" @@ -8609,12 +8489,14 @@ util-promisify@^2.1.0: object.getownpropertydescriptors "^2.0.3" util.promisify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" - integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== dependencies: - define-properties "^1.1.2" - object.getownpropertydescriptors "^2.0.3" + define-properties "^1.1.3" + es-abstract "^1.17.2" + has-symbols "^1.0.1" + object.getownpropertydescriptors "^2.1.0" util@0.10.3: version "0.10.3" @@ -8631,9 +8513,9 @@ util@^0.11.0: inherits "2.0.3" uuid@^3.0.1, uuid@^3.3.2: - version "3.3.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" - integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== v8-compile-cache@2.0.3: version "2.0.3" @@ -8646,9 +8528,9 @@ v8-compile-cache@^2.0.3: integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== v8-to-istanbul@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.0.1.tgz#d6a2a3823b8ff49bdf2167ff2a45d82dff81d02f" - integrity sha512-x0yZvZAkjJwdD3fPiJzYP37aod0ati4LlmD2RmpKjqewjKAov/u/ytZ8ViIZb07cN4cePKzl9ijiUi7C1LQ8hQ== + version "4.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.2.tgz#387d173be5383dbec209d21af033dcb892e3ac82" + integrity sha512-G9R+Hpw0ITAmPSr47lSlc5A1uekSYzXxTMlFxso2xoffwo4jQnzbv1p9yXIinO8UMZKfAFewaCHwWvnH4Jb4Ug== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -8684,11 +8566,11 @@ vm-browserify@^1.0.1: integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== w3c-hr-time@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" - integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU= + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== dependencies: - browser-process-hrtime "^0.1.2" + browser-process-hrtime "^1.0.0" w3c-xmlserializer@^1.1.2: version "1.1.2" @@ -8847,21 +8729,21 @@ which-boxed-primitive@^1.0.1: is-symbol "^1.0.2" which-collection@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.0.tgz#303d38022473f4b7048b529b45f6c842d8814269" - integrity sha512-mG4RtFHE+17N2AxRNvBQ488oBjrhaOaI/G+soUaRJwdyDbu5zmqoAKPYBlY7Zd+QTwpfvInRLKo40feo2si1yA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" + integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== dependencies: - is-map "^2.0.0" - is-set "^2.0.0" - is-weakmap "^2.0.0" - is-weakset "^2.0.0" + is-map "^2.0.1" + is-set "^2.0.1" + is-weakmap "^2.0.1" + is-weakset "^2.0.1" which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@1, which@^1.2.14, which@^1.2.9, which@^1.3.1: +which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -8939,9 +8821,9 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2: signal-exit "^3.0.2" write-file-atomic@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz#558328352e673b5bb192cf86500d60b230667d4b" - integrity sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw== + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== dependencies: imurmurhash "^0.1.4" is-typedarray "^1.0.0" @@ -8988,9 +8870,9 @@ write@1.0.3: mkdirp "^0.5.1" ws@^7.0.0: - version "7.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz#03ed52423cd744084b2cf42ed197c8b65a936b8e" - integrity sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A== + version "7.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz#a5411e1fb04d5ed0efee76d26d5c46d830c39b46" + integrity sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ== xml-name-validator@^3.0.0: version "3.0.0" @@ -9040,17 +8922,17 @@ yargs-parser@^10.0.0: camelcase "^4.1.0" yargs-parser@^13.1.0: - version "13.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" - integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^15.0.0: - version "15.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08" - integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ== +yargs-parser@^15.0.1: + version "15.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3" + integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -9081,9 +8963,9 @@ yargs@13.2.4: yargs-parser "^13.1.0" yargs@^14.0.0, yargs@^14.2.2: - version "14.2.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.2.tgz#2769564379009ff8597cdd38fba09da9b493c4b5" - integrity sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA== + version "14.2.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414" + integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg== dependencies: cliui "^5.0.0" decamelize "^1.2.0" @@ -9095,7 +8977,7 @@ yargs@^14.0.0, yargs@^14.2.2: string-width "^3.0.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^15.0.0" + yargs-parser "^15.0.1" yargs@^15.0.0, yargs@^15.3.1: version "15.3.1" From 87200b502769ec4ff5247914ef40055f1cd6de17 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 17:33:49 +0000 Subject: [PATCH 06/74] chore(deps-dev): bump @typescript-eslint/parser from 2.23.0 to 2.24.0 (#1338) --- package.json | 2 +- yarn.lock | 105 ++++++++++++++++++--------------------------------- 2 files changed, 37 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index fbfab8c3a7..0fd5ba5166 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^2.23.0", - "@typescript-eslint/parser": "^2.23.0", + "@typescript-eslint/parser": "^2.24.0", "eslint": "^6.8.0", "eslint-import-resolver-node": "^0.3.3", "eslint-import-resolver-typescript": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 43093fea6d..8058e7bafc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1447,14 +1447,23 @@ "@typescript-eslint/typescript-estree" "2.23.0" eslint-scope "^5.0.0" -"@typescript-eslint/parser@^2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.23.0.tgz#f3d4e2928ff647fe77fc2fcef1a3534fee6a3212" - integrity sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg== +"@typescript-eslint/experimental-utils@2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz#a5cb2ed89fedf8b59638dc83484eb0c8c35e1143" + integrity sha512-DXrwuXTdVh3ycNCMYmWhUzn/gfqu9N0VzNnahjiDJvcyhfBy4gb59ncVZVxdp5XzBC77dCncu0daQgOkbvPwBw== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.24.0" + eslint-scope "^5.0.0" + +"@typescript-eslint/parser@^2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz#2cf0eae6e6dd44d162486ad949c126b887f11eb8" + integrity sha512-H2Y7uacwSSg8IbVxdYExSI3T7uM1DzmOn2COGtCahCC3g8YtM1xYAPi2MAHyfPs61VKxP/J/UiSctcRgw4G8aw== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.23.0" - "@typescript-eslint/typescript-estree" "2.23.0" + "@typescript-eslint/experimental-utils" "2.24.0" + "@typescript-eslint/typescript-estree" "2.24.0" eslint-visitor-keys "^1.1.0" "@typescript-eslint/typescript-estree@2.23.0": @@ -1470,6 +1479,19 @@ semver "^6.3.0" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz#38bbc8bb479790d2f324797ffbcdb346d897c62a" + integrity sha512-RJ0yMe5owMSix55qX7Mi9V6z2FDuuDpN6eR5fzRJrp+8in9UF41IGNQHbg5aMK4/PjVaEQksLvz0IA8n+Mr/FA== + dependencies: + debug "^4.1.1" + eslint-visitor-keys "^1.1.0" + glob "^7.1.6" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^6.3.0" + tsutils "^3.17.1" + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -2905,7 +2927,7 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.1.0, debug@^3.2.6: +debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2965,11 +2987,6 @@ deep-equal@^2.0.1: which-boxed-primitive "^1.0.1" which-collection "^1.0.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -3044,11 +3061,6 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -4290,7 +4302,7 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -4396,7 +4408,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4, ini@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -6036,15 +6048,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" - integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" @@ -6136,22 +6139,6 @@ node-notifier@^6.0.0: shellwords "^0.1.1" which "^1.3.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - nopt@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" @@ -6223,7 +6210,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.6, npm-packlist@^1.4.4: +npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -6255,7 +6242,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -npmlog@^4.0.2, npmlog@^4.1.2: +npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -6962,16 +6949,6 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-is@^16.12.0: version "16.13.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" @@ -7329,7 +7306,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7414,11 +7391,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - saxes@^3.1.9: version "3.1.11" resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" @@ -7442,7 +7414,7 @@ semver-intersect@^1.4.0: dependencies: semver "^5.0.0" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7980,11 +7952,6 @@ strip-json-comments@^3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -8043,7 +8010,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== From 4aa6e1ebd6114fc8011e2922b2f3b362738feaf6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 17:55:54 +0000 Subject: [PATCH 07/74] chore(deps-dev): bump @typescript-eslint/eslint-plugin (#1339) --- package.json | 2 +- yarn.lock | 32 +++++--------------------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 0fd5ba5166..8cfaa6cf64 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "test:update": "lerna run test:update --stream" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.23.0", + "@typescript-eslint/eslint-plugin": "^2.24.0", "@typescript-eslint/parser": "^2.24.0", "eslint": "^6.8.0", "eslint-import-resolver-node": "^0.3.3", diff --git a/yarn.lock b/yarn.lock index 8058e7bafc..20406b2a8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1427,26 +1427,17 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz#aa7133bfb7b685379d9eafe4ae9e08b9037e129d" - integrity sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw== +"@typescript-eslint/eslint-plugin@^2.24.0": + version "2.24.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz#a86cf618c965a462cddf3601f594544b134d6d68" + integrity sha512-wJRBeaMeT7RLQ27UQkDFOu25MqFOBus8PtOa9KaT5ZuxC1kAsd7JEHqWt4YXuY9eancX0GK9C68i5OROnlIzBA== dependencies: - "@typescript-eslint/experimental-utils" "2.23.0" + "@typescript-eslint/experimental-utils" "2.24.0" eslint-utils "^1.4.3" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz#5d2261c8038ec1698ca4435a8da479c661dc9242" - integrity sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.23.0" - eslint-scope "^5.0.0" - "@typescript-eslint/experimental-utils@2.24.0": version "2.24.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz#a5cb2ed89fedf8b59638dc83484eb0c8c35e1143" @@ -1466,19 +1457,6 @@ "@typescript-eslint/typescript-estree" "2.24.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.23.0": - version "2.23.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz#d355960fab96bd550855488dcc34b9a4acac8d36" - integrity sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw== - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@2.24.0": version "2.24.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz#38bbc8bb479790d2f324797ffbcdb346d897c62a" From 6b88509ef84891005d6dc904828bbce9c81a9cc3 Mon Sep 17 00:00:00 2001 From: Mitchell Valine Date: Mon, 16 Mar 2020 16:10:11 -0700 Subject: [PATCH 08/74] fix(dotnet-analyzers): unit test null reference (#1341) Fixes dereference of possible null value in dotnet-analyzers unit test. --- .../Verifiers/DiagnosticVerifier.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs index b5ea35d61b..e110ec6c08 100755 --- a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs +++ b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs @@ -245,7 +245,8 @@ private static string FormatDiagnostics(DiagnosticAnalyzer? analyzer, params Dia Assert.True(location.IsInSource, $"Test base does not currently handle diagnostics in metadata locations. Diagnostic in metadata: {diagnostics[i]}\r\n"); - string resultMethodName = diagnostics[i].Location.SourceTree.FilePath.EndsWith(".cs") ? "GetCSharpResultAt" : "GetBasicResultAt"; + bool fileIsCSharp = diagnostics[i].Location.SourceTree?.FilePath.EndsWith(".cs") ?? false; + string resultMethodName = fileIsCSharp ? "GetCSharpResultAt" : "GetBasicResultAt"; var linePosition = diagnostics[i].Location.GetLineSpan().StartLinePosition; builder.AppendFormat("{0}({1}, {2}, {3}.{4})", From 5393932c4606802ec2dbcbe5dcedd9f37f82b6a6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 13:43:12 +0000 Subject: [PATCH 09/74] chore(deps): bump Microsoft.CodeAnalysis.CSharp.Workspaces (#1343) --- .../src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj index e5148e8513..65c43800d0 100644 --- a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj +++ b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj @@ -10,7 +10,7 @@ - + From bcad8e4c09ebfc12c81c28d5d1356f5d6baedc1d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 17:09:46 +0000 Subject: [PATCH 10/74] chore(deps): bump mkdirp from 0.5.1 to 0.5.3 (#1346) --- yarn.lock | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/yarn.lock b/yarn.lock index 20406b2a8b..2f55ecfbb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5850,12 +5850,7 @@ minimist-options@^3.0.1: arrify "^1.0.1" is-plain-obj "^1.1.0" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0: +minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.0: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== @@ -5932,11 +5927,11 @@ mkdirp@*, mkdirp@^1.0.3: integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g== mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c" + integrity sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg== dependencies: - minimist "0.0.8" + minimist "^1.2.5" mock-fs@^4.11.0: version "4.11.0" From a2da0bfce356c2332232808d4d6eaccaf7c6d4ad Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Mar 2020 17:31:38 +0000 Subject: [PATCH 11/74] chore(deps): bump terser from 4.6.6 to 4.6.7 (#1345) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2f55ecfbb8..c5cd7e2c42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8049,9 +8049,9 @@ terser-webpack-plugin@^1.4.3: worker-farm "^1.7.0" terser@^4.1.2: - version "4.6.6" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.6.tgz#da2382e6cafbdf86205e82fb9a115bd664d54863" - integrity sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g== + version "4.6.7" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72" + integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g== dependencies: commander "^2.20.0" source-map "~0.6.1" From d5f6b5f534d9541302ef59f88e9ccf75d0dc2dce Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 14:05:48 +0000 Subject: [PATCH 12/74] chore(deps): bump prompts from 2.3.1 to 2.3.2 (#1348) --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index c5cd7e2c42..9bd94a33a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6789,9 +6789,9 @@ promise-retry@^1.1.1: retry "^0.10.0" prompts@^2.0.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz#b63a9ce2809f106fa9ae1277c275b167af46ea05" - integrity sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA== + version "2.3.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068" + integrity sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA== dependencies: kleur "^3.0.3" sisteransi "^1.0.4" @@ -7485,9 +7485,9 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= sisteransi@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz#386713f1ef688c7c0304dc4c0632898941cad2e3" - integrity sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig== + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== slash@^2.0.0: version "2.0.0" From 655adeb9f3e9617049fbbe9160b9ef15218790be Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Wed, 18 Mar 2020 16:52:22 +0100 Subject: [PATCH 13/74] fix(kernel): "any" serialization breaks private type instances (#1347) When a "private" type (aka a class that is not visible in the `.jsii` assembly) is passed from JS to Host through an `any`-typed entity, the value was serialized by-value, passing only the instance's properties, and omitting any methods. This changes the behavior of the `SerializationClass.Any` serializer, so that when an anonymous object is encountered, if it has a dynamic getter, setter or any method (including a constructor), it is passed by-reference instead of by-value. Fixes aws/aws-cdk#6746 --- docs/specifications/2-type-system.md | 5 +- packages/@jsii/kernel/lib/objects.ts | 3 +- packages/@jsii/kernel/lib/serialization.ts | 31 +++++++++- .../@jsii/kernel/test/serialization.test.ts | 57 ++++++++++++++++--- .../python-runtime/src/jsii/_reference_map.py | 8 +-- packages/@jsii/python-runtime/tests/README.md | 10 ++++ 6 files changed, 96 insertions(+), 18 deletions(-) create mode 100644 packages/@jsii/python-runtime/tests/README.md diff --git a/docs/specifications/2-type-system.md b/docs/specifications/2-type-system.md index 1b52c301b4..961e71d42f 100644 --- a/docs/specifications/2-type-system.md +++ b/docs/specifications/2-type-system.md @@ -201,8 +201,11 @@ term *primitive* encompasses `boolean`, `string`, and `number`. `interface` | `undefined` | :x: | :x: | :x: | [Reference] | [Reference] `struct` | `undefined` | :x: | :x: | :x: | :x: | [Value] `class` | `undefined` | :x: | :x: | :x: | [Reference] | [Reference] -`any` | `undefined` | [Date] | [Identity] | [Array] | [Reference] | [Mapping] +`any` | `undefined` | [Date] | [Identity] | [Array] | [Reference] | [Value] or [Reference] +In the case of `object` being passed though `any`, the value may be serialized +by [Value] only if the value being passed does not have any method or dynamic +accessor. Otherwise, it must be passed by [Reference] instead. > :warning: The serialization behavior around `undefined` values is affected by > the `optional` attribute of the declared type. As discussed earlier, the `any` diff --git a/packages/@jsii/kernel/lib/objects.ts b/packages/@jsii/kernel/lib/objects.ts index 6a0f888a3d..d1d171cab9 100644 --- a/packages/@jsii/kernel/lib/objects.ts +++ b/packages/@jsii/kernel/lib/objects.ts @@ -26,8 +26,7 @@ const JSII_SYMBOL = Symbol.for('__jsii__'); * information. */ export function jsiiTypeFqn(obj: any): string | undefined { - const jsii = obj.constructor[JSII_SYMBOL]; - return jsii?.fqn; + return obj.constructor[JSII_SYMBOL]?.fqn; } /** diff --git a/packages/@jsii/kernel/lib/serialization.ts b/packages/@jsii/kernel/lib/serialization.ts index 643b47a2db..6baa7c4ea8 100644 --- a/packages/@jsii/kernel/lib/serialization.ts +++ b/packages/@jsii/kernel/lib/serialization.ts @@ -474,7 +474,7 @@ export const SERIALIZERS: {[k: string]: Serializer} = { // If this is or should be a reference type, pass or make the reference // (Like regular reftype serialization, but without the type derivation to an interface) - const jsiiType = jsiiTypeFqn(value); + const jsiiType = jsiiTypeFqn(value) ?? (isByReferenceOnly(value) ? EMPTY_OBJECT_FQN : undefined); if (jsiiType) { return host.objects.registerObject(value, jsiiType); } // At this point we have an object that is not of an exported type. Either an object @@ -737,3 +737,32 @@ function compareSerializationClasses(l: SerializationClass, r: SerializationClas ]; return order.indexOf(l) - order.indexOf(r); } + +/** + * Determines whether `obj` must be passed by-reference or if by-value is acceptable. For example, + * objects with methods, or dynamic getters (or setters) should be passed by-reference as a matter + * of security. The behavior in non-JS runtimes could otherwise differ from that in pure JS (if + * getters are not stable, etc...). + * + * @param obj the object to be tested. + * + * @returns true if `obj` must be passed by-reference. + */ +function isByReferenceOnly(obj: any): boolean { + if (Array.isArray(obj)) { return false; } + + let curr = obj; + // Crawl up the prototype chain to look for dynamic properties or methods. + do { + for (const prop of Object.getOwnPropertyNames(curr)) { + const descr = Object.getOwnPropertyDescriptor(curr, prop); + if (descr?.get != null || descr?.set != null || typeof descr?.value === 'function') { + // Property has a dynamic getter, setter or is a constructor/method, so by-ref required! + return true; + } + } + // End when the parent proto is `Object`, which has no parent proto itself. + } while (Object.getPrototypeOf(curr = Object.getPrototypeOf(curr)) != null); + + return false; +} diff --git a/packages/@jsii/kernel/test/serialization.test.ts b/packages/@jsii/kernel/test/serialization.test.ts index 44ebdb6d4a..74ba3f99b0 100644 --- a/packages/@jsii/kernel/test/serialization.test.ts +++ b/packages/@jsii/kernel/test/serialization.test.ts @@ -1,22 +1,61 @@ -import { OptionalValue, PrimitiveType } from '@jsii/spec'; +import { CANONICAL_ANY, OptionalValue, PrimitiveType } from '@jsii/spec'; +import { TOKEN_REF } from '../lib/api'; import { ObjectTable } from '../lib/objects'; import { SerializationClass, SerializerHost, SERIALIZERS } from '../lib/serialization'; +const TYPE_ANY: OptionalValue = { type: CANONICAL_ANY }; const TYPE_BOOLEAN: OptionalValue = { type: { primitive: PrimitiveType.Boolean } }; const TYPE_NUMBER: OptionalValue = { type: { primitive: PrimitiveType.Number } }; const TYPE_STRING: OptionalValue = { type: { primitive: PrimitiveType.String } }; const TYPE_VOID = 'void'; +const lookupType: SerializerHost['lookupType'] = jest.fn().mockName('host.lookupType'); +const host: SerializerHost = { + debug: jest.fn().mockName('host.debug'), + findSymbol: jest.fn().mockName('host.findSymbol'), + lookupType, + objects: new ObjectTable(lookupType), + recurse: jest.fn().mockName('host.recurse'), +}; + +describe(SerializationClass.Any, () => { + const anySerializer = SERIALIZERS[SerializationClass.Any]; + class PrivateType { + private readonly randomValue = Math.random(); + + public random() { + return this.randomValue; + } + } + + beforeEach(done => { + (host.recurse as jest.Mock).mockImplementation((x: any, type: OptionalValue) => { + expect(type).toEqual(TYPE_ANY); + return anySerializer.serialize(x, type, host); + }); + done(); + }); + + describe(anySerializer.serialize, () => { + test('by-value object literal', () => { + expect(anySerializer.serialize({ literal: { integer: 1337 } }, TYPE_ANY, host)) + .toEqual({ literal: { integer: 1337 } }); + }); + + test('non-exported type instance', () => { + expect(anySerializer.serialize(new PrivateType, TYPE_ANY, host)) + .toEqual({ [TOKEN_REF]: 'Object@10000' }); + }); + + test('arrays', () => { + expect(anySerializer.serialize([{ literal: { integer: 1337 } }], TYPE_ANY, host)) + .toEqual([{ literal: { integer: 1337 } }]); + }); + }); +}); + describe(SerializationClass.Scalar, () => { const scalarSerializer = SERIALIZERS[SerializationClass.Scalar]; - const lookupType: SerializerHost['lookupType'] = jest.fn().mockName('host.lookupType'); - const host: SerializerHost = { - debug: jest.fn().mockName('host.debug'), - findSymbol: jest.fn().mockName('host.findSymbol'), - lookupType, - objects: new ObjectTable(lookupType), - recurse: jest.fn().mockName('host.recurse'), - }; describe(scalarSerializer.deserialize, () => { describe('void', () => { diff --git a/packages/@jsii/python-runtime/src/jsii/_reference_map.py b/packages/@jsii/python-runtime/src/jsii/_reference_map.py index 4320b897dc..1961342285 100644 --- a/packages/@jsii/python-runtime/src/jsii/_reference_map.py +++ b/packages/@jsii/python-runtime/src/jsii/_reference_map.py @@ -95,9 +95,9 @@ def resolve(self, kernel, ref): return data_type(**python_props) elif class_fqn in _enums: return _enums[class_fqn] - elif class_fqn == "Object" and ref.interfaces is not None: + elif class_fqn == "Object": # If any one interface is a struct, all of them are guaranteed to be (Kernel invariant) - if any(fqn in _data_types for fqn in ref.interfaces): + if ref.interfaces is not None and any(fqn in _data_types for fqn in ref.interfaces): # Ugly delayed import here because I can't solve the cyclic # package dependency right now :(. from ._runtime import python_jsii_mapping @@ -117,9 +117,7 @@ def resolve_id(self, id): return self._refs[id] def build_interface_proxies_for_ref(self, ref): - if ref.interfaces is None: - raise AssertionError("Attempted to create interface proxies for ObjectRef without interfaces!") - ifaces = [_interfaces[fqn] for fqn in ref.interfaces] + ifaces = [_interfaces[fqn] for fqn in ref.interfaces or []] classes = [iface.__jsii_proxy_class__() for iface in ifaces] insts = [klass.__new__(klass) for klass in classes] for inst in insts: diff --git a/packages/@jsii/python-runtime/tests/README.md b/packages/@jsii/python-runtime/tests/README.md new file mode 100644 index 0000000000..8cfb8ba88c --- /dev/null +++ b/packages/@jsii/python-runtime/tests/README.md @@ -0,0 +1,10 @@ +# Python jsii runtime tests +## Development Iteration + +When iterating on the jsii runtime for Python, the develomer must run +`yarn build` before making a subsequent attempt at running `pytest` (e.g: via +`yarn test`). This is because the tests run on the code installed in `.env` and +this is updated only by `yarn build`. + +Note also that stack traces from test failures will point to the `.env` tree, +so be careful when using IDE linkage to navigate to points of that trace. From 11efb9998ae94e0cd99a505d81979477f0cb94e9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 11:47:43 +0000 Subject: [PATCH 14/74] chore(deps): bump fsevents from 1.2.11 to 1.2.12 (#1351) --- yarn.lock | 78 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9bd94a33a2..90a1a795bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2905,7 +2905,7 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.1.0: +debug@^3.1.0, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -2965,6 +2965,11 @@ deep-equal@^2.0.1: which-boxed-primitive "^1.0.1" which-collection "^1.0.0" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -3039,6 +3044,11 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" @@ -3841,12 +3851,13 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.2.7: - version "1.2.11" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" - integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== + version "1.2.12" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz#db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c" + integrity sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q== dependencies: bindings "^1.5.0" nan "^2.12.1" + node-pre-gyp "*" fsevents@^2.1.2: version "2.1.2" @@ -4280,7 +4291,7 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -4386,7 +4397,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.2, ini@^1.3.4, ini@^1.3.5: +ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -6021,6 +6032,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.3.3" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" + integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" @@ -6112,6 +6132,22 @@ node-notifier@^6.0.0: shellwords "^0.1.1" which "^1.3.1" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + nopt@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" @@ -6183,7 +6219,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.4.4: +npm-packlist@^1.1.6, npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -6215,7 +6251,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -npmlog@^4.1.2: +npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -6922,6 +6958,16 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + react-is@^16.12.0: version "16.13.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" @@ -7279,7 +7325,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7364,6 +7410,11 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + saxes@^3.1.9: version "3.1.11" resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" @@ -7387,7 +7438,7 @@ semver-intersect@^1.4.0: dependencies: semver "^5.0.0" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -7925,6 +7976,11 @@ strip-json-comments@^3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -7983,7 +8039,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== From aecdc5eecc540e11f91c761de41bcf36c2f88f20 Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Thu, 19 Mar 2020 14:56:52 +0100 Subject: [PATCH 15/74] fix(jsii): out-of-source builds are broken (#1344) * fix: out-of-source builds are broken When configuring tsc.outDir, the jsii compiler would not look for the correct source file and captured no types from the module. This commit fixes this problem by reversing the types attribute in order to resolve back to the corresponding source file. Fixes #1273 * PR feedback Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- packages/@scope/jsii-calc-lib/.gitignore | 3 +- packages/@scope/jsii-calc-lib/package.json | 12 ++-- .../@scope/jsii-calc-lib/test/assembly.jsii | 5 +- .../.jsii | 5 +- ...ts.CalculatorPackageId.LibPackageId.csproj | 1 + .../Internal/DependencyResolution/Anchor.cs | 1 + .../test/expected.jsii-calc-lib/java/pom.xml | 5 ++ .../jsii/tests/calculator/lib/$Module.java | 2 +- .../expected.jsii-calc-lib/python/setup.py | 3 +- .../src/scope/jsii_calc_lib/__init__.py | 1 + .../src/scope/jsii_calc_lib/_jsii/__init__.py | 1 + .../test/__snapshots__/jsii-tree.test.js.snap | 3 +- packages/jsii/lib/assembler.ts | 72 +++++++++++++++++-- packages/jsii/lib/compiler.ts | 16 ++++- 14 files changed, 108 insertions(+), 22 deletions(-) diff --git a/packages/@scope/jsii-calc-lib/.gitignore b/packages/@scope/jsii-calc-lib/.gitignore index 2b974c4d07..744bebe408 100644 --- a/packages/@scope/jsii-calc-lib/.gitignore +++ b/packages/@scope/jsii-calc-lib/.gitignore @@ -1,5 +1,6 @@ tsconfig.json -dist +build/ +dist/ .jsii *.tgz diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index 289df5b375..c1d443f709 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -23,8 +23,8 @@ "engines": { "node": ">= 10.3.0" }, - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "build/index.js", + "types": "build/index.d.ts", "scripts": { "build": "jsii && jsii-rosetta", "test": "diff-test test/assembly.jsii .jsii", @@ -34,7 +34,8 @@ "@scope/jsii-calc-base": "^1.1.0" }, "peerDependencies": { - "@scope/jsii-calc-base": "^1.1.0" + "@scope/jsii-calc-base": "^1.1.0", + "@scope/jsii-calc-base-of-base": "^1.1.0" }, "devDependencies": { "@types/node": "^10.17.17", @@ -63,6 +64,9 @@ "module": "scope.jsii_calc_lib" } }, + "tsc": { + "outDir": "build" + }, "versionFormat": "short" } -} \ No newline at end of file +} diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii index 64ec6f9d7c..29813549a0 100644 --- a/packages/@scope/jsii-calc-lib/test/assembly.jsii +++ b/packages/@scope/jsii-calc-lib/test/assembly.jsii @@ -8,7 +8,8 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base": "^1.1.0" + "@scope/jsii-calc-base": "^1.1.0", + "@scope/jsii-calc-base-of-base": "^1.1.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -516,5 +517,5 @@ } }, "version": "1.1.0", - "fingerprint": "dr9yoUHBpy7DOzkDtuWMW6EBGlCIarZPtTIdtJe3Y4o=" + "fingerprint": "ewx+U4o9Eq6THqw75uddLD5Yhaciw+s/tLVVeGeMKTg=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii index 64ec6f9d7c..29813549a0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii @@ -8,7 +8,8 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base": "^1.1.0" + "@scope/jsii-calc-base": "^1.1.0", + "@scope/jsii-calc-base-of-base": "^1.1.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -516,5 +517,5 @@ } }, "version": "1.1.0", - "fingerprint": "dr9yoUHBpy7DOzkDtuWMW6EBGlCIarZPtTIdtJe3Y4o=" + "fingerprint": "ewx+U4o9Eq6THqw75uddLD5Yhaciw+s/tLVVeGeMKTg=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj index 4bc96b2b99..2f36f09451 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj @@ -27,6 +27,7 @@ + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Internal/DependencyResolution/Anchor.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Internal/DependencyResolution/Anchor.cs index a69be45550..3b887c9da6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Internal/DependencyResolution/Anchor.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Internal/DependencyResolution/Anchor.cs @@ -7,6 +7,7 @@ public sealed class Anchor public Anchor() { new Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Internal.DependencyResolution.Anchor(); + new Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Internal.DependencyResolution.Anchor(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml index efdbb1e9ba..90de034dc6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml @@ -38,6 +38,11 @@ calculator-base [1.1.0,2.0.0) + + software.amazon.jsii.tests + calculator-base-of-base + [1.1.0,2.0.0) + software.amazon.jsii jsii-runtime diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java index 5cfaa774b7..6af183504a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java @@ -12,7 +12,7 @@ public final class $Module extends JsiiModule { @Override public List> getDependencies() { - return asList(software.amazon.jsii.tests.calculator.base.$Module.class); + return asList(software.amazon.jsii.tests.calculator.base.$Module.class, software.amazon.jsii.tests.calculator.baseofbase.$Module.class); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py index c69c7a5f22..a38b038a2b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py @@ -32,7 +32,8 @@ "install_requires": [ "jsii~=1.1.0", "publication>=0.0.3", - "scope.jsii-calc-base>=1.1.0, <2.0.0" + "scope.jsii-calc-base>=1.1.0, <2.0.0", + "scope.jsii-calc-base-of-base>=1.1.0, <2.0.0" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py index 7bc92dbf93..f5df0ebf89 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py @@ -9,6 +9,7 @@ import publication import scope.jsii_calc_base +import scope.jsii_calc_base_of_base __jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "1.1.0", __name__, "jsii-calc-lib@1.1.0.jsii.tgz") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/__init__.py index d10913cc30..e3fcd0f7bb 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/__init__.py @@ -9,6 +9,7 @@ import publication import scope.jsii_calc_base +import scope.jsii_calc_base_of_base __all__ = [] publication.publish() diff --git a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap index b9dd7d1a63..922cd1bce4 100644 --- a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap +++ b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap @@ -2321,7 +2321,8 @@ exports[`jsii-tree --all 1`] = ` │ └── type: @scope/jsii-calc-base-of-base.Very └─┬ @scope/jsii-calc-lib ├─┬ dependencies - │ └── @scope/jsii-calc-base + │ ├── @scope/jsii-calc-base + │ └── @scope/jsii-calc-base-of-base └─┬ types ├─┬ class Number (deprecated) │ ├── base: Value diff --git a/packages/jsii/lib/assembler.ts b/packages/jsii/lib/assembler.ts index 50cddf90ee..4a7b2996e1 100644 --- a/packages/jsii/lib/assembler.ts +++ b/packages/jsii/lib/assembler.ts @@ -26,6 +26,8 @@ const LOG = log4js.getLogger('jsii/assembler'); * The JSII Assembler consumes a ``ts.Program`` instance and emits a JSII assembly. */ export class Assembler implements Emitter { + private readonly mainFile: string; + private _diagnostics = new Array(); private _deferred = new Array(); private _types: { [fqn: string]: spec.Type } = {}; @@ -38,7 +40,26 @@ export class Assembler implements Emitter { public constructor( public readonly projectInfo: ProjectInfo, public readonly program: ts.Program, - public readonly stdlib: string) { } + public readonly stdlib: string) { + const dts = projectInfo.types; + let mainFile = dts.replace(/\.d\.ts(x?)$/, '.ts$1'); + + // If out-of-source build was configured (tsc's outDir and rootDir), the + // main file's path needs to be re-rooted from the outDir into the rootDir. + const tscOutDir = program.getCompilerOptions().outDir; + if (tscOutDir != null) { + mainFile = path.relative(tscOutDir, mainFile); + + // rootDir may be set explicitly or not. If not, inferRootDir replicates + // tsc's behavior of using the longest prefix of all built source files. + const tscRootDir = program.getCompilerOptions().rootDir ?? inferRootDir(program); + if (tscRootDir != null) { + mainFile = path.join(tscRootDir, mainFile); + } + } + + this.mainFile = path.resolve(projectInfo.projectRoot, mainFile); + } private get _typeChecker(): ts.TypeChecker { return this.program.getTypeChecker(); @@ -71,19 +92,24 @@ export class Assembler implements Emitter { this._types = {}; this._deferred = []; - const mainFile = path.resolve(this.projectInfo.projectRoot, this.projectInfo.types.replace(/\.d\.ts(x?)$/, '.ts$1')); const visitPromises = new Array>(); - for (const sourceFile of this.program.getSourceFiles().filter(f => !f.isDeclarationFile)) { - if (sourceFile.fileName !== mainFile) { continue; } + + const sourceFile = this.program.getSourceFile(this.mainFile); + + if (sourceFile == null) { + this._diagnostic(null, ts.DiagnosticCategory.Error, `Could not find "main" file: ${this.mainFile}`); + } else { if (LOG.isTraceEnabled()) { LOG.trace(`Processing source file: ${colors.blue(path.relative(this.projectInfo.projectRoot, sourceFile.fileName))}`); } const symbol = this._typeChecker.getSymbolAtLocation(sourceFile); - if (!symbol) { continue; } - for (const node of this._typeChecker.getExportsOfModule(symbol)) { - visitPromises.push(this._visitNode(node.declarations[0], new EmitContext([], this.projectInfo.stability))); + if (symbol) { + for (const node of this._typeChecker.getExportsOfModule(symbol)) { + visitPromises.push(this._visitNode(node.declarations[0], new EmitContext([], this.projectInfo.stability))); + } } } + await Promise.all(visitPromises); this.callDeferredsInOrder(); @@ -1636,3 +1662,35 @@ async function flattenPromises(promises: Array>): Promise { } return result; } + +function inferRootDir(program: ts.Program): string | undefined { + const directories = program.getRootFileNames() + .filter(fileName => { + const sourceFile = program.getSourceFile(fileName); + return sourceFile != null + && !program.isSourceFileFromExternalLibrary(sourceFile) + && !program.isSourceFileDefaultLibrary(sourceFile); + }) + .map(fileName => path.relative(program.getCurrentDirectory(), path.dirname(fileName))) + .map(segmentPath); + + const maxPrefix = Math.min(...directories.map(segments => segments.length - 1)); + let commonIndex = -1; + while (commonIndex < maxPrefix && new Set(directories.map(segments => segments[commonIndex + 1])).size === 1) { + commonIndex++; + } + + if (commonIndex < 0) { + return undefined; + } + + return directories[0][commonIndex]; + + function segmentPath(fileName: string): string[] { + const result = new Array(); + for (let parent = fileName; parent !== path.dirname(parent); parent = path.dirname(parent)) { + result.unshift(parent); + } + return result; + } +} diff --git a/packages/jsii/lib/compiler.ts b/packages/jsii/lib/compiler.ts index 6f69aa7739..ce2632dfe4 100644 --- a/packages/jsii/lib/compiler.ts +++ b/packages/jsii/lib/compiler.ts @@ -223,8 +223,18 @@ export class Compiler implements Emitter { target: COMPILER_OPTIONS.target && ts.ScriptTarget[COMPILER_OPTIONS.target], jsx: COMPILER_OPTIONS.jsx && Case.snake(ts.JsxEmit[COMPILER_OPTIONS.jsx]), }, - include: [pi.tsc?.rootDir ? `${pi.tsc.rootDir}/**/*.ts` : '**/*.ts'], - exclude: ['node_modules'].concat(pi.excludeTypescript), + include: [ + pi.tsc?.rootDir != null + ? path.join(pi.tsc.rootDir, '**', '*.ts') + : path.join('**', '*.ts') + ], + exclude: [ + 'node_modules', + ...pi.excludeTypescript, + ...pi.tsc?.outDir != null + ? [path.join(pi.tsc.outDir, '**', '*.ts')] + : [], + ], // Change the references a little. We write 'originalpath' to the // file under the 'path' key, which is the same as what the // TypeScript compiler does. Make it relative so that the files are @@ -236,7 +246,7 @@ export class Compiler implements Emitter { /** * Creates a `tsconfig.json` file to improve the IDE experience. * - * @return the fully qualified path to the ``tsconfig.json`` file + * @return the fully qualified path to the `tsconfig.json` file */ private async writeTypeScriptConfig(): Promise { const commentKey = '_generated_by_jsii_'; From 2df5d90f831808d02a4d697946a18065f3ae5ef2 Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Thu, 19 Mar 2020 16:29:27 +0100 Subject: [PATCH 16/74] feat(jsii): introduce submodules feature (#1297) Introduces a `jsii` *Submodule* feature. *Submodules* are introduced by declaring a `namespace`: ```ts // Using a namespaced export statement export * as ns from './subfolder'; // Using a namespace declaration export ns { // ... } ``` *Submodules* can be nested in other *submodules*, but the dependency graph between submodules (and the top-level module) must not result in a cycle (jsii` does currently **not** check for this particular issue, although it probably will in the future). Although this is out-of-scope for this change, they could be enhanced so a specific `README.md` is attached to them, and so that dedicated code-generating configuration can be specified. Fixes #1286 --- docs/specifications/2-type-system.md | 80 + .../ComplianceTests.cs | 12 +- packages/jsii-calc/lib/index.ts | 2 + .../jsii-calc/lib/submodule/child/index.ts | 12 + packages/jsii-calc/lib/submodule/index.ts | 4 + packages/jsii-calc/lib/submodule/my-class.ts | 11 + .../lib/submodule/nested_submodule.ts | 16 + .../lib/submodule/refers-to-parent/index.ts | 5 + packages/jsii-calc/test/assembly.jsii | 251 ++- packages/jsii-diff/lib/index.ts | 6 +- .../lib/targets/dotnet/dotnetgenerator.ts | 32 +- .../lib/targets/dotnet/dotnettyperesolver.ts | 4 +- packages/jsii-pacmak/lib/targets/java.ts | 146 +- packages/jsii-pacmak/lib/targets/python.ts | 387 ++-- packages/jsii-pacmak/test/diff-test.sh | 2 +- .../scope/jsii_calc_base_of_base/__init__.py | 2 +- .../jsii_calc_base_of_base/_jsii/__init__.py | 1 + .../src/scope/jsii_calc_base/__init__.py | 2 +- .../scope/jsii_calc_base/_jsii/__init__.py | 1 + .../src/scope/jsii_calc_lib/__init__.py | 2 +- .../src/scope/jsii_calc_lib/_jsii/__init__.py | 1 + .../.jsii | 251 ++- .../Tests/CalculatorNamespace/Calculator.cs | 2 +- .../CompositeOperation.cs | 8 +- .../CompositeOperationProxy.cs | 6 +- .../JSII/Tests/CalculatorNamespace/Power.cs | 2 +- .../BackReferences/IMyClassReference.cs | 22 + .../BackReferences/MyClassReference.cs | 25 + .../BackReferences/MyClassReferenceProxy.cs | 26 + .../Submodule/Child/Goodness.cs | 33 + .../Submodule/Child/IStructure.cs | 22 + .../Submodule/Child/Structure.cs | 25 + .../Submodule/Child/StructureProxy.cs | 26 + .../CalculatorNamespace/Submodule/MyClass.cs | 63 + .../DeeplyNested/INamespaced.cs | 22 + .../DeeplyNested/INamespacedProxy.cs | 26 + .../Submodule/NestedSubmodule/Namespaced.cs | 45 + .../NestedSubmodule/NamespacedProxy.cs | 26 + .../JSII/Tests/CalculatorNamespace/Sum.cs | 2 +- .../amazon/jsii/tests/calculator/$Module.java | 16 +- .../Base.java | 2 +- .../Derived.java | 4 +- .../Foo.java | 2 +- .../Hello.java | 2 +- .../Hello.java | 2 +- .../tests/calculator/submodule/MyClass.java | 60 + .../back_references/MyClassReference.java | 116 + .../calculator/submodule/child/Goodness.java | 31 + .../calculator/submodule/child/Structure.java | 116 + .../nested_submodule/Namespaced.java | 60 + .../deeply_nested/INamespaced.java | 35 + .../test/expected.jsii-calc/python/setup.py | 11 +- .../python/src/jsii_calc/__init__.py | 1892 +++++++---------- .../python/src/jsii_calc/_jsii/__init__.py | 1 + .../src/jsii_calc/composition/__init__.py | 142 ++ .../__init__.py | 51 + .../__init__.py | 73 + .../__init__.py | 51 + .../src/jsii_calc/submodule/__init__.py | 67 + .../submodule/back_references/__init__.py | 51 + .../src/jsii_calc/submodule/child/__init__.py | 76 + .../submodule/nested_submodule/__init__.py | 62 + .../deeply_nested/__init__.py | 56 + packages/jsii-reflect/actual.txt | 1223 ----------- packages/jsii-reflect/jsii-tree.test.stdout | 5 - packages/jsii-reflect/lib/assembly.ts | 108 +- packages/jsii-reflect/lib/index.ts | 2 + packages/jsii-reflect/lib/module-like.ts | 41 + packages/jsii-reflect/lib/submodule.ts | 21 + packages/jsii-reflect/lib/tree.ts | 29 + packages/jsii-reflect/lib/type-system.ts | 22 +- .../test/__snapshots__/jsii-tree.test.js.snap | 399 +++- .../__snapshots__/type-system.test.js.snap | 240 +-- .../jsii-reflect/test/type-system.test.ts | 2 +- packages/jsii/lib/assembler.ts | 200 +- packages/jsii/lib/compiler.ts | 2 +- packages/jsii/lib/validator.ts | 2 +- .../jsii/test/negatives/namespaced/index.ts | 3 + ....submodules-cannot-have-colliding-names.ts | 7 + .../neg.submodules-cannot-share-symbols.ts | 4 + .../neg.submodules-must-be-camel-cased.ts | 3 + tsconfig.json | 21 +- 82 files changed, 4101 insertions(+), 2823 deletions(-) create mode 100644 packages/jsii-calc/lib/submodule/child/index.ts create mode 100644 packages/jsii-calc/lib/submodule/index.ts create mode 100644 packages/jsii-calc/lib/submodule/my-class.ts create mode 100644 packages/jsii-calc/lib/submodule/nested_submodule.ts create mode 100644 packages/jsii-calc/lib/submodule/refers-to-parent/index.ts rename packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/{composition => Composition}/CompositeOperation.cs (95%) rename packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/{composition => Composition}/CompositeOperationProxy.cs (85%) create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/IMyClassReference.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/MyClassReference.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/MyClassReferenceProxy.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Goodness.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/IStructure.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Structure.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/StructureProxy.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/MyClass.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/DeeplyNested/INamespaced.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/DeeplyNested/INamespacedProxy.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/Namespaced.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/NamespacedProxy.cs rename packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/{DerivedClassHasNoProperties => derived_class_has_no_properties}/Base.java (94%) rename packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/{DerivedClassHasNoProperties => derived_class_has_no_properties}/Derived.java (86%) rename packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/{InterfaceInNamespaceIncludesClasses => interface_in_namespace_includes_classes}/Foo.java (93%) rename packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/{InterfaceInNamespaceIncludesClasses => interface_in_namespace_includes_classes}/Hello.java (98%) rename packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/{InterfaceInNamespaceOnlyInterface => interface_in_namespace_only_interface}/Hello.java (98%) create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/MyClass.java create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/back_references/MyClassReference.java create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Goodness.java create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Structure.java create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/nested_submodule/Namespaced.java create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/nested_submodule/deeply_nested/INamespaced.java create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/composition/__init__.py create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/derived_class_has_no_properties/__init__.py create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_includes_classes/__init__.py create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_only_interface/__init__.py create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/back_references/__init__.py create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/__init__.py create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/deeply_nested/__init__.py delete mode 100644 packages/jsii-reflect/actual.txt delete mode 100644 packages/jsii-reflect/jsii-tree.test.stdout create mode 100644 packages/jsii-reflect/lib/module-like.ts create mode 100644 packages/jsii-reflect/lib/submodule.ts create mode 100644 packages/jsii/test/negatives/namespaced/index.ts create mode 100644 packages/jsii/test/negatives/neg.submodules-cannot-have-colliding-names.ts create mode 100644 packages/jsii/test/negatives/neg.submodules-cannot-share-symbols.ts create mode 100644 packages/jsii/test/negatives/neg.submodules-must-be-camel-cased.ts diff --git a/docs/specifications/2-type-system.md b/docs/specifications/2-type-system.md index 961e71d42f..f8de1ff23f 100644 --- a/docs/specifications/2-type-system.md +++ b/docs/specifications/2-type-system.md @@ -311,6 +311,86 @@ document. } ``` +## Submodules + +> :construction: The *submodules* feature is still under active development and +> the specific behavior around it (in particular with respects to code +> generation) are still subject to change. + +### Overview + +Typescript allows grouping declarations together in *namespaces*, which are +interpreted by *jsii* as *submodules*. *Submodules* names are the fully +qualified name of the namespace from the package's root (if a package `foo` +defines a namespace `ns1`, which itself contains `ns2`, the submodule for `ns2` +will be named `foo.ns1.ns2`). + +*Submodules* may use different [code-generation configuration](#code-generation) +than their parent submodule or package. + +> :construction: *Submodule*-level code-generation configuration is not yet +> implemented. + +### Restrictions + +*Submodules* cannot be involved in dependency cycles. While it is possible to +build such cycles in **JavaScript**, that configuration cannot be reliably +reprensented in certain other programming languages (e.g: **Python**). + +> :construction: [`jsii`] does not currently check for circular submodule +> dependencies. Invalid dependency patterns may result in errors at code +> generation by [`jsii-pacmak`], or at runtime. + +Since this would result in ambiguity that cannot be consistently resolved, a +given type can only be exported as part of one *submodule*. + +[`jsii`]: ../../packages/jsii +[`jsii-pacmak`]: ../../packages/jsii-pacmak + +### Declaration + +There are two supported ways to introduce *submodules*: +* Using the namespaced export syntax: + ```ts + export * as ns from './module'; + ``` +* Using an explicit namespace declaration: + ```ts + export namespace ns { /* ... */ } + ``` + +*Submodules* declared using the `export * as ns from './module';` syntax can be +documented using a markdown document located at `./module/README.md`. + +> :construction: The `./module/README.md` file support is not yet implemented. + +### Code Generation + +In languages where this is relevant (e.g: **Python**), *submodules* are rendered +as native *submodules*. In languages where a namespace system exists (**Java** +uses *packages*, **C#** uses *namespaces*, ...), *submodules* are rendered using +that. + +## Code Generation + +In order to generate code in various programming languages, [`jsii-pacmak`] +needs configuration that provides naming directives (e.g: **Java** package +names, **C#** namespaces, **Python** module names, ...). This configuration is +language-specific and each language implementation specifies and documents its +own configuration schema. + +Configuration is sourced in the `package.json` file at the root of the npm +package, under the special `jsii` key. The general schema is described in the +[configuration] document. + +> :construction: There is a proposition to allow this configuration to be placed +> in a `.jsiirc.json` file, which would take precedence over what is specified +> in `package.json`. *Submodules* introduced using the +> `export * as ns from './module';` syntax would then be able to define +> *submodule*-local configuration using the `./module/.jsiirc.json` file. + +[configuration]: ../configuration.md + ## References The [**TypeScript** Handbook] describes the language's type system and syntax diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs index 49d8f1fbc2..0efed214b6 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs @@ -3,7 +3,7 @@ using System.Linq; using Amazon.JSII.Runtime.Deputy; using Amazon.JSII.Tests.CalculatorNamespace; -using CompositeOperation = Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation; +using CompositeOperation = Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation; using Amazon.JSII.Tests.CalculatorNamespace.LibNamespace; using Newtonsoft.Json.Linq; using Xunit; @@ -1413,11 +1413,11 @@ public void AbstractMembersAreCorrectlyHandled() var abstractSuite = new AbstractSuiteImpl(); Assert.Equal("Wrapped>", abstractSuite.WorkItAll("Oomf!")); } - + private sealed class AbstractSuiteImpl : AbstractSuite { private string _property = ""; - + public AbstractSuiteImpl() {} protected override string SomeMethod(string str) @@ -1440,7 +1440,7 @@ public void CollectionOfInterfaces_ListOfStructs() Assert.IsAssignableFrom(elt); } } - + [Fact(DisplayName = Prefix + nameof(CollectionOfInterfaces_ListOfInterfaces))] public void CollectionOfInterfaces_ListOfInterfaces() { @@ -1449,7 +1449,7 @@ public void CollectionOfInterfaces_ListOfInterfaces() Assert.IsAssignableFrom(elt); } } - + [Fact(DisplayName = Prefix + nameof(CollectionOfInterfaces_MapOfStructs))] public void CollectionOfInterfaces_MapOfStructs() { @@ -1458,7 +1458,7 @@ public void CollectionOfInterfaces_MapOfStructs() Assert.IsAssignableFrom(elt); } } - + [Fact(DisplayName = Prefix + nameof(CollectionOfInterfaces_MapOfInterfaces))] public void CollectionOfInterfaces_MapOfInterfaces() { diff --git a/packages/jsii-calc/lib/index.ts b/packages/jsii-calc/lib/index.ts index 0b507f6734..04754deacd 100644 --- a/packages/jsii-calc/lib/index.ts +++ b/packages/jsii-calc/lib/index.ts @@ -3,3 +3,5 @@ export * from './compliance'; export * from './documented'; export * from './erasures'; export * from './stability'; + +export * as submodule from './submodule'; diff --git a/packages/jsii-calc/lib/submodule/child/index.ts b/packages/jsii-calc/lib/submodule/child/index.ts new file mode 100644 index 0000000000..57dd858234 --- /dev/null +++ b/packages/jsii-calc/lib/submodule/child/index.ts @@ -0,0 +1,12 @@ +export interface Structure { + readonly bool: boolean; +} + +export enum Goodness { + /** It's pretty good */ + PRETTY_GOOD, + /** It's really good */ + REALLY_GOOD, + /** It's amazingly good */ + AMAZINGLY_GOOD +} diff --git a/packages/jsii-calc/lib/submodule/index.ts b/packages/jsii-calc/lib/submodule/index.ts new file mode 100644 index 0000000000..e316cdc703 --- /dev/null +++ b/packages/jsii-calc/lib/submodule/index.ts @@ -0,0 +1,4 @@ +export * as child from './child'; +export * from './my-class'; +export * from './nested_submodule'; +export * as back_references from './refers-to-parent'; diff --git a/packages/jsii-calc/lib/submodule/my-class.ts b/packages/jsii-calc/lib/submodule/my-class.ts new file mode 100644 index 0000000000..991f55679d --- /dev/null +++ b/packages/jsii-calc/lib/submodule/my-class.ts @@ -0,0 +1,11 @@ +import { nested_submodule } from './nested_submodule'; +import { Goodness } from './child'; +import { AllTypes } from '..'; + +export class MyClass implements nested_submodule.deeplyNested.INamespaced { + public readonly definedAt = __filename; + public readonly goodness = Goodness.AMAZINGLY_GOOD; + public allTypes?: AllTypes; + + public constructor() { } +} diff --git a/packages/jsii-calc/lib/submodule/nested_submodule.ts b/packages/jsii-calc/lib/submodule/nested_submodule.ts new file mode 100644 index 0000000000..144e62e904 --- /dev/null +++ b/packages/jsii-calc/lib/submodule/nested_submodule.ts @@ -0,0 +1,16 @@ +import { Goodness } from './child'; + +export namespace nested_submodule { + export namespace deeplyNested { + export interface INamespaced { + readonly definedAt: string; + } + } + + export abstract class Namespaced implements deeplyNested.INamespaced { + public readonly definedAt = __filename; + public abstract readonly goodness: Goodness; + + private constructor() { } + } +} diff --git a/packages/jsii-calc/lib/submodule/refers-to-parent/index.ts b/packages/jsii-calc/lib/submodule/refers-to-parent/index.ts new file mode 100644 index 0000000000..4c4f5b11db --- /dev/null +++ b/packages/jsii-calc/lib/submodule/refers-to-parent/index.ts @@ -0,0 +1,5 @@ +import { MyClass } from '..'; + +export interface MyClassReference { + readonly reference: MyClass; +} diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii index 56967ae828..0db4ab2889 100644 --- a/packages/jsii-calc/test/assembly.jsii +++ b/packages/jsii-calc/test/assembly.jsii @@ -12153,8 +12153,257 @@ ], "name": "CompositionStringStyle", "namespace": "composition.CompositeOperation" + }, + "jsii-calc.submodule.MyClass": { + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.MyClass", + "initializer": { + "docs": { + "stability": "experimental" + } + }, + "interfaces": [ + "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced" + ], + "kind": "class", + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 5 + }, + "name": "MyClass", + "namespace": "submodule", + "properties": [ + { + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 6 + }, + "name": "definedAt", + "overrides": "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced", + "type": { + "primitive": "string" + } + }, + { + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 7 + }, + "name": "goodness", + "type": { + "fqn": "jsii-calc.submodule.child.Goodness" + } + }, + { + "docs": { + "stability": "experimental" + }, + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 8 + }, + "name": "allTypes", + "optional": true, + "type": { + "fqn": "jsii-calc.AllTypes" + } + } + ] + }, + "jsii-calc.submodule.back_references.MyClassReference": { + "assembly": "jsii-calc", + "datatype": true, + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.back_references.MyClassReference", + "kind": "interface", + "locationInModule": { + "filename": "lib/submodule/refers-to-parent/index.ts", + "line": 3 + }, + "name": "MyClassReference", + "namespace": "submodule.back_references", + "properties": [ + { + "abstract": true, + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/refers-to-parent/index.ts", + "line": 4 + }, + "name": "reference", + "type": { + "fqn": "jsii-calc.submodule.MyClass" + } + } + ] + }, + "jsii-calc.submodule.child.Goodness": { + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.child.Goodness", + "kind": "enum", + "locationInModule": { + "filename": "lib/submodule/child/index.ts", + "line": 5 + }, + "members": [ + { + "docs": { + "stability": "experimental", + "summary": "It's pretty good." + }, + "name": "PRETTY_GOOD" + }, + { + "docs": { + "stability": "experimental", + "summary": "It's really good." + }, + "name": "REALLY_GOOD" + }, + { + "docs": { + "stability": "experimental", + "summary": "It's amazingly good." + }, + "name": "AMAZINGLY_GOOD" + } + ], + "name": "Goodness", + "namespace": "submodule.child" + }, + "jsii-calc.submodule.child.Structure": { + "assembly": "jsii-calc", + "datatype": true, + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.child.Structure", + "kind": "interface", + "locationInModule": { + "filename": "lib/submodule/child/index.ts", + "line": 1 + }, + "name": "Structure", + "namespace": "submodule.child", + "properties": [ + { + "abstract": true, + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/child/index.ts", + "line": 2 + }, + "name": "bool", + "type": { + "primitive": "boolean" + } + } + ] + }, + "jsii-calc.submodule.nested_submodule.Namespaced": { + "abstract": true, + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.nested_submodule.Namespaced", + "interfaces": [ + "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced" + ], + "kind": "class", + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 10 + }, + "name": "Namespaced", + "namespace": "submodule.nested_submodule", + "properties": [ + { + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 11 + }, + "name": "definedAt", + "overrides": "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced", + "type": { + "primitive": "string" + } + }, + { + "abstract": true, + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 12 + }, + "name": "goodness", + "type": { + "fqn": "jsii-calc.submodule.child.Goodness" + } + } + ] + }, + "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced": { + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced", + "kind": "interface", + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 5 + }, + "name": "INamespaced", + "namespace": "submodule.nested_submodule.deeplyNested", + "properties": [ + { + "abstract": true, + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 6 + }, + "name": "definedAt", + "type": { + "primitive": "string" + } + } + ] } }, "version": "1.1.0", - "fingerprint": "EIFtfZN4eukuZnpbTeqrxdc/JrKnU8eDm1SVncWk/vU=" + "fingerprint": "vtobmk8xL6Ke30Blb4NyDZ1X7T7J8lcKbbrmZtMtcpU=" } diff --git a/packages/jsii-diff/lib/index.ts b/packages/jsii-diff/lib/index.ts index 50928d65fc..18e6c1b335 100644 --- a/packages/jsii-diff/lib/index.ts +++ b/packages/jsii-diff/lib/index.ts @@ -59,7 +59,11 @@ export function compareEnums(original: reflect.Assembly, updated: reflect.Assemb } } -function* typePairs(xs: T[], updatedAssembly: reflect.Assembly, context: ComparisonContext): IterableIterator<[T, T]> { +function* typePairs( + xs: readonly T[], + updatedAssembly: reflect.Assembly, + context: ComparisonContext +): IterableIterator<[T, T]> { for (const origType of xs) { LOG.trace(origType.fqn); diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts index ebc2d9cea6..9691630fb6 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts @@ -1,7 +1,9 @@ import * as clone from 'clone'; +import { toPascalCase } from 'codemaker'; import * as fs from 'fs-extra'; import * as reflect from 'jsii-reflect'; import * as spec from '@jsii/spec'; +import { Rosetta } from 'jsii-rosetta'; import * as path from 'path'; import { Generator } from '../../generator'; import { DotNetDocGenerator } from './dotnetdocgenerator'; @@ -9,7 +11,6 @@ import { DotNetRuntimeGenerator } from './dotnetruntimegenerator'; import { DotNetTypeResolver } from './dotnettyperesolver'; import { FileGenerator } from './filegenerator'; import { DotNetNameUtils } from './nameutils'; -import { Rosetta } from 'jsii-rosetta'; /** * CODE GENERATOR V2 @@ -120,7 +121,7 @@ export class DotNetGenerator extends Generator { protected onBeginInterface(ifc: spec.InterfaceType) { const implementations = this.typeresolver.resolveImplementedInterfaces(ifc); const interfaceName = this.nameutils.convertInterfaceName(ifc); - const namespace = ifc.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${ifc.namespace}` : this.assembly.targets!.dotnet!.namespace; + const namespace = this.namespaceFor(this.assembly, ifc); this.openFileIfNeeded(interfaceName, namespace, this.isNested(ifc)); this.dotnetDocGenerator.emitDocs(ifc); @@ -137,7 +138,7 @@ export class DotNetGenerator extends Generator { protected onEndInterface(ifc: spec.InterfaceType) { const interfaceName = this.nameutils.convertInterfaceName(ifc); this.code.closeBlock(); - const namespace = ifc.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${ifc.namespace}` : this.assembly.targets!.dotnet!.namespace; + const namespace = this.namespaceFor(this.assembly, ifc); this.closeFileIfNeeded(interfaceName, namespace, this.isNested(ifc)); // emit interface proxy class @@ -212,7 +213,7 @@ export class DotNetGenerator extends Generator { protected onBeginClass(cls: spec.ClassType, abstract: boolean) { let baseTypeNames: string[] = []; - const namespace = cls.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${cls.namespace}` : this.assembly.targets!.dotnet!.namespace; + const namespace = this.namespaceFor(this.assembly, cls); // A class can derive from only one base class // But can implement multiple interfaces @@ -294,7 +295,7 @@ export class DotNetGenerator extends Generator { protected onEndClass(cls: spec.ClassType) { this.code.closeBlock(); const className = this.nameutils.convertClassName(cls); - const namespace = cls.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${cls.namespace}` : this.assembly.targets!.dotnet!.namespace; + const namespace = this.namespaceFor(this.assembly, cls); this.closeFileIfNeeded(className, namespace, this.isNested(cls)); if (cls.abstract) { @@ -338,7 +339,7 @@ export class DotNetGenerator extends Generator { protected onBeginEnum(enm: spec.EnumType) { const enumName = this.nameutils.convertTypeName(enm.name); - const namespace = enm.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${enm.namespace}` : this.assembly.targets!.dotnet!.namespace; + const namespace = this.namespaceFor(this.assembly, enm); this.openFileIfNeeded(enumName, namespace, this.isNested(enm)); this.emitNewLineIfNecessary(); this.dotnetDocGenerator.emitDocs(enm); @@ -349,7 +350,7 @@ export class DotNetGenerator extends Generator { protected onEndEnum(enm: spec.EnumType) { this.code.closeBlock(); const enumName = this.nameutils.convertTypeName(enm.name); - const namespace = enm.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${enm.namespace}` : this.assembly.targets!.dotnet!.namespace; + const namespace = this.namespaceFor(this.assembly, enm); this.closeFileIfNeeded(enumName, namespace, this.isNested(enm)); } @@ -365,6 +366,19 @@ export class DotNetGenerator extends Generator { } } + private namespaceFor(assm: spec.Assembly, type: spec.Type): string { + const parts = [assm.targets!.dotnet!.namespace]; + let ns = type.namespace; + while (ns != null && assm.types?.[`${assm.name}.${ns}`] != null) { + const nesting = assm.types[`${assm.name}.${ns}`]; + ns = nesting.namespace; + } + if (ns != null) { + parts.push(...ns.split('.').map(n => toPascalCase(n))); + } + return parts.join('.'); + } + private emitMethod(cls: spec.ClassType | spec.InterfaceType, method: spec.Method, emitForProxyOrDatatype = false): void { this.emitNewLineIfNecessary(); const returnType = method.returns ? this.typeresolver.toDotNetType(method.returns.type) : 'void'; @@ -502,7 +516,7 @@ export class DotNetGenerator extends Generator { private emitInterfaceProxy(ifc: spec.InterfaceType | spec.ClassType): void { // No need to slugify for a proxy const name = `${this.nameutils.convertTypeName(ifc.name)}Proxy`; - const namespace = ifc.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${ifc.namespace}` : this.assembly.targets!.dotnet!.namespace; + const namespace = this.namespaceFor(this.assembly, ifc); const isNested = this.isNested(ifc); this.openFileIfNeeded(name, namespace, isNested); @@ -537,7 +551,7 @@ export class DotNetGenerator extends Generator { private emitInterfaceDataType(ifc: spec.InterfaceType): void { // Interface datatypes do not need to be prefixed by I, we can call convertClassName const name = this.nameutils.convertClassName(ifc); - const namespace = ifc.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${ifc.namespace}` : this.assembly.targets!.dotnet!.namespace; + const namespace = this.namespaceFor(this.assembly, ifc); const isNested = this.isNested(ifc); this.openFileIfNeeded(name, namespace, isNested); diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnettyperesolver.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnettyperesolver.ts index f809520466..a72d673d3b 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet/dotnettyperesolver.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnettyperesolver.ts @@ -1,4 +1,5 @@ import * as spec from '@jsii/spec'; +import { toPascalCase } from 'codemaker'; import { DotNetDependency } from './filegenerator'; import { DotNetNameUtils } from './nameutils'; @@ -46,6 +47,7 @@ export class DotNetTypeResolver { } const [mod] = fqn.split('.'); const depMod = this.findModule(mod); + const dotnetNamespace = depMod.targets?.dotnet?.namespace; if (!dotnetNamespace) { throw new Error('The module does not have a dotnet.namespace setting'); @@ -59,7 +61,7 @@ export class DotNetTypeResolver { const actualNamespace = this.toDotNetType(this.findType(namespaceFqn)); return `${actualNamespace}.${typeName}`; } - return `${dotnetNamespace}.${type.namespace}.${typeName}`; + return `${dotnetNamespace}.${type.namespace.split('.').map(s => toPascalCase(s)).join('.')}.${typeName}`; } // When undefined, the type is located at the root of the assembly return `${dotnetNamespace}.${typeName}`; diff --git a/packages/jsii-pacmak/lib/targets/java.ts b/packages/jsii-pacmak/lib/targets/java.ts index 25ef90fed7..8a61e9c8c9 100644 --- a/packages/jsii-pacmak/lib/targets/java.ts +++ b/packages/jsii-pacmak/lib/targets/java.ts @@ -1,5 +1,5 @@ import * as clone from 'clone'; -import { toPascalCase } from 'codemaker/lib/case-utils'; +import { toPascalCase, toSnakeCase } from 'codemaker/lib/case-utils'; import * as fs from 'fs-extra'; import * as reflect from 'jsii-reflect'; import { Rosetta, typeScriptSnippetFromSource, Translation, markDownToJavaDoc } from 'jsii-rosetta'; @@ -395,9 +395,9 @@ class JavaGenerator extends Generator { ]; /** - * Turns a raw javascript property name (eg: 'default') into a safe Java property name (eg: 'defaultValue'). - * @param propertyName the raw JSII property Name - */ + * Turns a raw javascript property name (eg: 'default') into a safe Java property name (eg: 'defaultValue'). + * @param propertyName the raw JSII property Name + */ private static safeJavaPropertyName(propertyName: string) { if (!propertyName) { return propertyName; @@ -411,9 +411,9 @@ class JavaGenerator extends Generator { } /** - * Turns a raw javascript method name (eg: 'import') into a safe Java method name (eg: 'doImport'). - * @param methodName - */ + * Turns a raw javascript method name (eg: 'import') into a safe Java method name (eg: 'doImport'). + * @param methodName + */ private static safeJavaMethodName(methodName: string) { if (!methodName) { return methodName; @@ -431,11 +431,11 @@ class JavaGenerator extends Generator { private moduleClass!: string; /** - * A map of all the modules ever referenced during code generation. These include - * direct dependencies but can potentially also include transitive dependencies, when, - * for example, we need to refer to their types when flatting the class hierarchy for - * interface proxies. - */ + * A map of all the modules ever referenced during code generation. These include + * direct dependencies but can potentially also include transitive dependencies, when, + * for example, we need to refer to their types when flatting the class hierarchy for + * interface proxies. + */ private readonly referencedModules: { [name: string]: spec.AssemblyConfiguration } = { }; public constructor(private readonly rosetta: Rosetta) { @@ -530,8 +530,8 @@ class JavaGenerator extends Generator { } /** - * Since we expand the union setters, we will use this event to only emit the getter which returns an Object. - */ + * Since we expand the union setters, we will use this event to only emit the getter which returns an Object. + */ protected onUnionProperty(cls: spec.ClassType, prop: spec.Property, _union: spec.UnionTypeReference) { this.emitProperty(cls, prop); } @@ -651,8 +651,13 @@ class JavaGenerator extends Generator { private emitPackageInfo(mod: spec.Assembly) { if (!mod.docs) { return; } - const packageName = this.getNativeName(mod, undefined); - const packageInfoFile = this.toJavaFilePath(`${mod.name}.package-info`); + const { packageName } = this.toNativeName(mod); + const packageInfoFile = this.toJavaFilePath(mod, { + assembly: mod.name, + fqn: `${mod.name}.package-info`, + kind: spec.TypeKind.Class, + name: 'package-info' + }); this.code.openFile(packageInfoFile); this.code.line('/**'); if (mod.readme) { @@ -1011,14 +1016,14 @@ class JavaGenerator extends Generator { } /** - * We are now going to build a class that can be used as a proxy for untyped - * javascript objects that implement this interface. we want java code to be - * able to interact with them, so we will create a proxy class which - * implements this interface and has the same methods. - * - * These proxies are also used to extend abstract classes to allow the JSII - * engine to instantiate an abstract class in Java. - */ + * We are now going to build a class that can be used as a proxy for untyped + * javascript objects that implement this interface. we want java code to be + * able to interact with them, so we will create a proxy class which + * implements this interface and has the same methods. + * + * These proxies are also used to extend abstract classes to allow the JSII + * engine to instantiate an abstract class in Java. + */ private emitProxy(ifc: spec.InterfaceType | spec.ClassType) { const name = INTERFACE_PROXY_CLASS_NAME; @@ -1516,8 +1521,8 @@ class JavaGenerator extends Generator { return; } - this.code.openFile(this.toJavaFilePath(type.fqn)); - this.code.line(`package ${this.getNativeName(this.assembly, type.namespace)};`); + this.code.openFile(this.toJavaFilePath(this.assembly, type)); + this.code.line(`package ${this.toNativeName(this.assembly, type).packageName};`); this.code.line(); } @@ -1525,7 +1530,7 @@ class JavaGenerator extends Generator { if (this.isNested(type)) { return; } - this.code.closeFile(this.toJavaFilePath(type.fqn)); + this.code.closeFile(this.toJavaFilePath(this.assembly, type)); } private isNested(type: spec.Type) { @@ -1534,11 +1539,12 @@ class JavaGenerator extends Generator { return parent in this.assembly.types; } - private toJavaFilePath(fqn: string) { - const nativeFqn = this.toNativeFqn(fqn); - return `${path.join('src', 'main', 'java', ...nativeFqn.split('.'))}.java`; + private toJavaFilePath(assm: spec.Assembly, type: spec.Type) { + const { packageName, typeName } = this.toNativeName(assm, type); + return `${path.join('src', 'main', 'java', ...packageName.split('.'), typeName.split('.')[0])}.java`; } + // eslint-disable-next-line complexity private addJavaDocs(doc: spec.Documentable, defaultText?: string) { if (!defaultText && Object.keys(doc.docs ?? {}).length === 0 && !((doc as spec.Method).parameters ?? []).some(p => Object.keys(p.docs ?? {}).length !== 0)) { @@ -1758,12 +1764,12 @@ class JavaGenerator extends Generator { } /** - * Wraps a collection into an unmodifiable collection else returns the existing statement. - * @param statement The statement to wrap if necessary. - * @param type The type of the object to wrap. - * @param optional Whether the value is optional (can be null/undefined) or not. - * @returns The modified or original statement. - */ + * Wraps a collection into an unmodifiable collection else returns the existing statement. + * @param statement The statement to wrap if necessary. + * @param type The type of the object to wrap. + * @param optional Whether the value is optional (can be null/undefined) or not. + * @returns The modified or original statement. + */ private wrapCollection(statement: string, type: spec.TypeReference, optional?: boolean): string { if (spec.isCollectionTypeReference(type)) { let wrapper: string; @@ -1804,16 +1810,17 @@ class JavaGenerator extends Generator { return `${this.toNativeFqn(moduleName)}.${MODULE_CLASS_NAME}`; } - private makeModuleFqn(moduleName: string) { - return `${moduleName}.${MODULE_CLASS_NAME}`; - } - private emitModuleFile(mod: spec.Assembly) { const moduleName = mod.name; const moduleClass = this.makeModuleClass(moduleName); - const moduleFile = this.toJavaFilePath(this.makeModuleFqn(moduleName)); + const moduleFile = this.toJavaFilePath(mod, { + assembly: mod.name, + fqn: `${mod.name}.${MODULE_CLASS_NAME}`, + kind: spec.TypeKind.Class, + name: MODULE_CLASS_NAME, + }); this.code.openFile(moduleFile); - this.code.line(`package ${this.toNativeFqn(moduleName)};`); + this.code.line(`package ${this.toNativeName(mod).packageName};`); this.code.line(); if (Object.keys(mod.dependencies ?? {}).length > 0) { this.code.line('import static java.util.Arrays.asList;'); @@ -1875,17 +1882,17 @@ class JavaGenerator extends Generator { } /** - * Computes the java FQN for a JSII FQN: - * 1. Determine which assembly the FQN belongs to (first component of the FQN) - * 2. Locate the `targets.java.package` value for that assembly (this assembly, or one of the dependencies) - * 3. Return the java FQN: ``.`` - * - * @param fqn the JSII FQN to be used. - * - * @returns the corresponding Java FQN. - * - * @throws if the assembly the FQN belongs to does not have a `targets.java.package` set. - */ + * Computes the java FQN for a JSII FQN: + * 1. Determine which assembly the FQN belongs to (first component of the FQN) + * 2. Locate the `targets.java.package` value for that assembly (this assembly, or one of the dependencies) + * 3. Return the java FQN: ``.`` + * + * @param fqn the JSII FQN to be used. + * + * @returns the corresponding Java FQN. + * + * @throws if the assembly the FQN belongs to does not have a `targets.java.package` set. + */ private toNativeFqn(fqn: string): string { const [mod, ...name] = fqn.split('.'); const depMod = this.findModule(mod); @@ -1894,8 +1901,11 @@ class JavaGenerator extends Generator { // dependencies' dependency structure). if (mod !== this.assembly.name) { this.referencedModules[mod] = depMod; + return this.getNativeName(depMod, name.join('.'), mod); } - return this.getNativeName(depMod, name.join('.'), mod); + + const { packageName, typeName } = this.toNativeName(this.assembly, this.assembly.types![fqn]); + return `${packageName}${typeName ? `.${typeName}` : ''}`; } private getNativeName(assm: spec.Assembly, name: string | undefined): string; @@ -1910,9 +1920,33 @@ class JavaGenerator extends Generator { return `${javaPackage}${name ? `.${name}` : ''}`; } + private toNativeName(assm: spec.Assembly): { packageName: string }; + private toNativeName(assm: spec.Assembly, type: spec.Type): { packageName: string, typeName: string }; + private toNativeName(assm: spec.Assembly, type?: spec.Type): { packageName: string, typeName?: string } { + const javaPackage = assm.targets?.java?.package; + if (!javaPackage) { throw new Error(`The module ${assm.name} does not have a java.package setting`); } + + if (type == null) { + return { packageName: javaPackage }; + } + + let ns = type.namespace; + let typeName = type.name; + while (ns != null && assm.types?.[`${assm.name}.${ns}`] != null) { + const nestingType = assm.types[`${assm.name}.${ns}`]; + ns = nestingType.namespace; + typeName = `${nestingType.name}.${typeName}`; + } + + const packageName = ns != null + ? `${javaPackage}.${ns.split('.').map(s => toSnakeCase(s)).join('.')}` + : javaPackage; + return { packageName, typeName }; + } + /** - * Emits an ``@Generated`` annotation honoring the ``this.emitFullGeneratorInfo`` setting. - */ + * Emits an ``@Generated`` annotation honoring the ``this.emitFullGeneratorInfo`` setting. + */ private emitGeneratedAnnotation() { const date = this.emitFullGeneratorInfo ? `, date = "${new Date().toISOString()}"` diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts index 198c4cdacf..2e616be024 100644 --- a/packages/jsii-pacmak/lib/targets/python.ts +++ b/packages/jsii-pacmak/lib/targets/python.ts @@ -76,7 +76,7 @@ const PYTHON_KEYWORDS = [ ]; const pythonModuleNameToFilename = (name: string): string => { - return name.replace(/\./g, '/'); + return path.join(...name.split('.')); }; const toPythonIdentifier = (name: string): string => { @@ -130,49 +130,47 @@ function toPythonParameterName(name: string, liftedParamNames = new Set( return result; } -const setDifference = (setA: Set, setB: Set): Set => { - const difference = new Set(setA); - for (const elem of setB) { - difference.delete(elem); +const setDifference = (setA: Set, setB: Set): Set => { + const result = new Set(); + for (const item of setA) { + if (!setB.has(item)) { + result.add(item); + } } - return difference; + return result; }; -const sortMembers = (sortable: PythonBase[], resolver: TypeResolver): PythonBase[] => { - const sorted: PythonBase[] = []; - const seen: Set = new Set(); - - // We're going to take a copy of our sortable item, because it'll make it easier if - // this method doesn't have side effects. - sortable = sortable.slice(); +const sortMembers = (members: PythonBase[], resolver: TypeResolver): PythonBase[] => { + let sortable = new Array <{ member: PythonBase & ISortableType, dependsOn: Set }>(); + const sorted = new Array(); + const seen = new Set(); // The first thing we want to do, is push any item which is not sortable to the very // front of the list. This will be things like methods, properties, etc. - for (const item of sortable) { - if (!isSortableType(item)) { - sorted.push(item); - seen.add(item); + for (const member of members) { + if (!isSortableType(member)) { + sorted.push(member); + seen.add(member); + } else { + sortable.push({ member, dependsOn: new Set(member.dependsOn(resolver)) }); } } - sortable = sortable.filter(i => !seen.has(i)); // Now that we've pulled out everything that couldn't possibly have dependencies, // we will go through the remaining items, and pull off any items which have no // dependencies that we haven't already sorted. while (sortable.length > 0) { - for (const item of (sortable as Array)) { - const itemDeps: Set = new Set(item.dependsOn(resolver)); - if (setDifference(itemDeps, seen).size === 0) { - sorted.push(item); - seen.add(item); - - break; + for (const { member, dependsOn } of sortable) { + const diff = setDifference(dependsOn, seen); + if ([...diff].find(dep => !(dep instanceof PythonModule)) == null) { + sorted.push(member); + seen.add(member); } } - const leftover = sortable.filter(i => !seen.has(i)); + const leftover = sortable.filter(({ member }) => !seen.has(member)); if (leftover.length === sortable.length) { - throw new Error('Could not sort members (circular dependency?).'); + throw new Error(`Could not sort members (circular dependency?). Leftover: ${leftover.map(lo => lo.member.pythonName).join(', ')}`); } else { sortable = leftover; } @@ -185,6 +183,15 @@ interface PythonBase { readonly pythonName: string; emit(code: CodeMaker, resolver: TypeResolver, opts?: any): void; + + /** + * Determines what modules a particular sortable entity depends on. + * + * @param resolver a TypeResolver. + * + * @returns the pythonNames of modules this entity depends on. + */ + dependsOnModules(resolver: TypeResolver): Set; } interface PythonType extends PythonBase { @@ -199,8 +206,8 @@ interface ISortableType { dependsOn(resolver: TypeResolver): PythonType[]; } -function isSortableType(arg: any): arg is ISortableType { - return arg.dependsOn !== undefined; +function isSortableType(arg: unknown): arg is ISortableType { + return (arg as Partial).dependsOn !== undefined; } interface PythonTypeOpts { @@ -226,12 +233,12 @@ abstract class BasePythonClassType implements PythonType, ISortableType { } public dependsOn(resolver: TypeResolver): PythonType[] { - const dependencies: PythonType[] = []; + const dependencies = new Array(); const parent = resolver.getParent(this.fqn!); // We need to return any bases that are in the same module at the same level of // nesting. - const seen: Set = new Set(); + const seen = new Set(); for (const base of this.bases) { if (spec.isNamedTypeReference(base)) { if (resolver.isInModule(base)) { @@ -258,6 +265,19 @@ abstract class BasePythonClassType implements PythonType, ISortableType { return dependencies; } + public dependsOnModules(resolver: TypeResolver): Set { + const result = new Set(); + const thisModule = resolver.getDefiningPythonModule(this.fqn!); + for (const base of this.bases) { + if (!spec.isNamedTypeReference(base)) { continue; } + const definingModule = resolver.getDefiningPythonModule(base); + if (thisModule !== definingModule) { + result.add(definingModule); + } + } + return result; + } + public addMember(member: PythonBase) { this.members.push(member); } @@ -272,7 +292,7 @@ abstract class BasePythonClassType implements PythonType, ISortableType { this.emitPreamble(code, resolver); if (this.members.length > 0) { - resolver = this.fqn ? resolver.bind(this.fqn) : resolver; + resolver = this.boundResolver(resolver); for (const member of sortMembers(this.members, resolver)) { member.emit(code, resolver); } @@ -283,6 +303,13 @@ abstract class BasePythonClassType implements PythonType, ISortableType { code.closeBlock(); } + protected boundResolver(resolver: TypeResolver): TypeResolver { + if (this.fqn == null) { + return resolver; + } + return resolver.bind(this.fqn); + } + protected abstract getClassParams(resolver: TypeResolver): string[]; protected emitPreamble(_code: CodeMaker, _resolver: TypeResolver) { return; } @@ -291,7 +318,7 @@ abstract class BasePythonClassType implements PythonType, ISortableType { interface BaseMethodOpts { abstract?: boolean; liftedProp?: spec.InterfaceType; - parent?: spec.NamedTypeReference; + parent: spec.NamedTypeReference; } interface BaseMethodEmitOpts { @@ -310,20 +337,40 @@ abstract class BaseMethod implements PythonBase { protected readonly shouldEmitBody: boolean = true; private readonly liftedProp?: spec.InterfaceType; - private readonly parent?: spec.NamedTypeReference; + private readonly parent: spec.NamedTypeReference; public constructor(protected readonly generator: PythonGenerator, public readonly pythonName: string, private readonly jsName: string | undefined, private readonly parameters: spec.Parameter[], - private readonly returns?: spec.OptionalValue, - private readonly docs?: spec.Docs, - opts: BaseMethodOpts = {}) { + private readonly returns: spec.OptionalValue | undefined, + private readonly docs: spec.Docs | undefined, + opts: BaseMethodOpts) { this.abstract = !!opts.abstract; this.liftedProp = opts.liftedProp; this.parent = opts.parent; } + public dependsOnModules(resolver: TypeResolver) { + const result = new Set(); + const thisModule = resolver.getDefiningPythonModule(this.parent); + if (this.returns && spec.isNamedTypeReference(this.returns.type)) { + const definingModule = resolver.getDefiningPythonModule(this.returns.type); + if (thisModule !== definingModule) { + result.add(definingModule); + } + } + for (const param of this.parameters) { + if (spec.isNamedTypeReference(param.type)) { + const definingModule = resolver.getDefiningPythonModule(param.type); + if (thisModule !== definingModule) { + result.add(definingModule); + } + } + } + return result; + } + public emit(code: CodeMaker, resolver: TypeResolver, opts?: BaseMethodEmitOpts) { const { renderAbstract = true, forceEmitBody = false } = opts ?? {}; @@ -339,7 +386,7 @@ abstract class BaseMethod implements PythonBase { // This can hopefully be removed once we get https://github.com/aws/jsii/issues/288 // resolved, so build up a list of all of the prop names so we can check against // them later. - const liftedPropNames: Set = new Set(); + const liftedPropNames = new Set(); if (this.liftedProp?.properties?.length ?? 0 >= 1) { for (const prop of this.liftedProp!.properties!) { liftedPropNames.add(toPythonParameterName(prop.name)); @@ -452,7 +499,7 @@ abstract class BaseMethod implements PythonBase { // We need to build up a list of properties, which are mandatory, these are the // ones we will specifiy to start with in our dictionary literal. - const liftedProps = this.getLiftedProperties(resolver).map(p => new StructField(this.generator, p)); + const liftedProps = this.getLiftedProperties(resolver).map(p => new StructField(this.generator, p, this.parent)); const assignments = liftedProps .map(p => p.pythonName) .map(v => `${v}=${v}`); @@ -514,6 +561,7 @@ abstract class BaseMethod implements PythonBase { interface BasePropertyOpts { abstract?: boolean; immutable?: boolean; + parent: spec.NamedTypeReference; } interface BasePropertyEmitOpts { @@ -531,6 +579,7 @@ abstract class BaseProperty implements PythonBase { protected readonly shouldEmitBody: boolean = true; private readonly immutable: boolean; + private readonly parent: spec.NamedTypeReference; public constructor( private readonly generator: PythonGenerator, @@ -538,7 +587,7 @@ abstract class BaseProperty implements PythonBase { private readonly jsName: string, private readonly type: spec.OptionalValue, private readonly docs: spec.Docs | undefined, - opts: BasePropertyOpts = {}) { + opts: BasePropertyOpts) { const { abstract = false, immutable = false, @@ -546,6 +595,19 @@ abstract class BaseProperty implements PythonBase { this.abstract = abstract; this.immutable = immutable; + this.parent = opts.parent; + } + + public dependsOnModules(resolver: TypeResolver) { + const result = new Set(); + const thisModule = resolver.getDefiningPythonModule(this.parent); + if (spec.isNamedTypeReference(this.type.type)) { + const definingModule = resolver.getDefiningPythonModule(this.type.type); + if (definingModule !== thisModule) { + result.add(definingModule); + } + } + return result; } public emit(code: CodeMaker, resolver: TypeResolver, opts?: BasePropertyEmitOpts) { @@ -679,7 +741,7 @@ class Struct extends BasePythonClassType { * Find all fields (inherited as well) */ private get allMembers(): StructField[] { - return this.thisInterface.allProperties.map(x => new StructField(this.generator, x.spec)); + return this.thisInterface.allProperties.map(x => new StructField(this.generator, x.spec, this.thisInterface)); } private get thisInterface() { @@ -764,7 +826,11 @@ class StructField implements PythonBase { public readonly docs?: spec.Docs; public readonly type: spec.OptionalValue; - public constructor(private readonly generator: PythonGenerator, public readonly prop: spec.Property) { + public constructor( + private readonly generator: PythonGenerator, + public readonly prop: spec.Property, + private readonly parent: spec.NamedTypeReference, + ) { this.pythonName = toPythonPropertyName(prop.name); this.jsiiName = prop.name; this.type = prop; @@ -775,6 +841,18 @@ class StructField implements PythonBase { return !!this.type.optional; } + public dependsOnModules(resolver: TypeResolver) { + const result = new Set(); + const thisModule = resolver.getDefiningPythonModule(this.parent); + if (spec.isNamedTypeReference(this.type.type)) { + const definingModule = resolver.getDefiningPythonModule(this.type.type); + if (thisModule !== definingModule) { + result.add(definingModule); + } + } + return result; + } + public isStruct(generator: PythonGenerator): boolean { return isStruct(generator.reflectAssembly.system, this.type.type); } @@ -811,7 +889,7 @@ interface ClassOpts extends PythonTypeOpts { abstractBases?: spec.ClassType[]; } -class Class extends BasePythonClassType { +class Class extends BasePythonClassType implements ISortableType { private readonly abstract: boolean; private readonly abstractBases: spec.ClassType[]; @@ -833,7 +911,7 @@ class Class extends BasePythonClassType { // We need to return any ifaces that are in the same module at the same level of // nesting. - const seen: Set = new Set(); + const seen = new Set(); for (const iface of this.interfaces) { if (resolver.isInModule(iface)) { // Given a iface, we need to locate the ifaces's parent that is the same @@ -858,6 +936,18 @@ class Class extends BasePythonClassType { return dependencies; } + public dependsOnModules(resolver: TypeResolver): Set { + const result = super.dependsOnModules(resolver); + + for (const member of this.members) { + for (const dep of member.dependsOnModules(resolver)) { + result.add(dep); + } + } + + return result; + } + public emit(code: CodeMaker, resolver: TypeResolver) { // First we emit our implments decorator if (this.interfaces.length > 0) { @@ -874,7 +964,7 @@ class Class extends BasePythonClassType { if (this.abstract) { resolver = this.fqn ? resolver.bind(this.fqn) : resolver; - const proxyBases: string[] = [this.pythonName]; + const proxyBases = [this.pythonName]; for (const base of this.abstractBases) { proxyBases.push(`jsii.proxy_for(${resolver.resolve({ type: base })})`); } @@ -982,18 +1072,16 @@ class EnumMember implements PythonBase { this.value = value; } + public dependsOnModules() { + return new Set(); + } + public emit(code: CodeMaker, _resolver: TypeResolver) { code.line(`${this.pythonName} = "${this.value}"`); this.generator.emitDocString(code, this.docs, { documentableItem: `enum-${this.pythonName}` }); } } -class Namespace extends BasePythonClassType { - protected getClassParams(_resolver: TypeResolver): string[] { - return []; - } -} - interface ModuleOpts { assembly: spec.Assembly; assemblyFilename: string; @@ -1001,32 +1089,39 @@ interface ModuleOpts { package?: Package; } -class Module implements PythonType { - - public readonly pythonName: string; - public readonly fqn: string | null; - +class PythonModule implements PythonType { private readonly assembly: spec.Assembly; private readonly assemblyFilename: string; private readonly loadAssembly: boolean; - private readonly members: PythonBase[]; + private readonly members = new Array(); private readonly package?: Package; - public constructor(name: string, fqn: string | null, opts: ModuleOpts) { - this.pythonName = name; - this.fqn = fqn; - + public constructor( + public readonly pythonName: string, + public readonly fqn: string | null, + opts: ModuleOpts + ) { this.assembly = opts.assembly; this.assemblyFilename = opts.assemblyFilename; this.loadAssembly = opts.loadAssembly; this.package = opts.package; - this.members = []; } public addMember(member: PythonBase) { this.members.push(member); } + public dependsOnModules(resolver: TypeResolver) { + resolver = this.fqn ? resolver.bind(this.fqn, this.pythonName) : resolver; + const result = new Set(); + for (const mem of this.members) { + for (const dep of mem.dependsOnModules(resolver)) { + result.add(dep); + } + } + return result; + } + public emit(code: CodeMaker, resolver: TypeResolver) { this.emitModuleDocumentation(code); @@ -1050,14 +1145,17 @@ class Module implements PythonType { // Determine if we need to write out the kernel load line. if (this.loadAssembly) { code.line(); - code.line( - '__jsii_assembly__ = jsii.JSIIAssembly.load(' + - `"${this.assembly.name}", ` + - `"${this.assembly.version}", ` + - '__name__, ' + - `"${this.assemblyFilename}")` - ); - code.line(); + const params = [ + `"${this.assembly.name}"`, + `"${this.assembly.version}"`, + `"${this.assembly.targets!.python!.module}"`, + `"${this.assemblyFilename}"`, + ]; + code.line(`__jsii_assembly__ = jsii.JSIIAssembly.load(${params.join(', ')})`); + } + + code.line(); + if (this.members.length > 0) { code.line(); } @@ -1083,30 +1181,28 @@ class Module implements PythonType { * Emit the README as module docstring if this is the entry point module (it loads the assembly) */ private emitModuleDocumentation(code: CodeMaker) { - if (this.package && this.loadAssembly && this.package.convertedReadme.trim().length > 0) { + if (this.package && this.fqn === this.assembly.name && this.package.convertedReadme.trim().length > 0) { code.line('"""'); code.line(this.package.convertedReadme); code.line('"""'); } } - private emitDependencyImports(code: CodeMaker, _resolver: TypeResolver) { - const deps = Array.from( - new Set([ - ...Object.keys(this.assembly.dependencies ?? {}).map(d => { - return this.assembly.dependencyClosure![d]!.targets!.python!.module; - }), - ]) - ); + private emitDependencyImports(code: CodeMaker, resolver: TypeResolver) { + const deps = this.dependsOnModules(resolver); - for (const [idx, moduleName] of deps.sort().entries()) { - // If this our first dependency, add a blank line to format our imports - // slightly nicer. - if (idx === 0) { - code.line(); - } + // We need to make sure direct dependencies are always loaded... + for (const dep of Object.keys(this.assembly.dependencies ?? {})) { + const depConfig = this.assembly.dependencyClosure![dep]; + deps.add(depConfig.targets!.python!.module); + } - code.line(`import ${moduleName}`); + // Now actually write the import statements... + if (deps.size > 0) { + code.line(); + for (const moduleName of Array.from(deps).sort()) { + code.line(`import ${moduleName}`); + } } } } @@ -1123,23 +1219,20 @@ class Package { public readonly version: string; public readonly metadata: spec.Assembly; - private readonly modules: Map; - private readonly data: Map; + private readonly modules = new Map(); + private readonly data = new Map(); public constructor(private readonly generator: PythonGenerator, name: string, version: string, metadata: spec.Assembly) { this.name = name; this.version = version; this.metadata = metadata; - - this.modules = new Map(); - this.data = new Map(); } - public addModule(module: Module) { + public addModule(module: PythonModule) { this.modules.set(module.pythonName, module); } - public addData(module: Module, filename: string, data: string | null) { + public addData(module: PythonModule, filename: string, data: string | null) { if (!this.data.has(module.pythonName)) { this.data.set(module.pythonName, []); } @@ -1289,10 +1382,10 @@ interface TypeResolverOpts { } class TypeResolver { + private static readonly STD_TYPES_REGEX = /^(datetime\.datetime|typing\.[A-Z][a-z]+|jsii\.Number)$/; private readonly types: Map; private readonly boundTo?: string; - private readonly stdTypesRe = new RegExp('^(datetime\\.datetime|typing\\.[A-Z][a-z]+|jsii\\.Number)$'); private readonly boundRe!: RegExp; private readonly moduleName?: string; private readonly moduleRe!: RegExp; @@ -1325,7 +1418,9 @@ class TypeResolver { this.findModule, this.findType, fqn, - moduleName !== undefined ? moduleName : this.moduleName, + moduleName !== undefined + ? moduleName.startsWith('.') ? `${this.moduleName}${moduleName}` : moduleName + : this.moduleName, ); } @@ -1341,7 +1436,11 @@ class TypeResolver { public getParent(typeRef: spec.NamedTypeReference | string): PythonType { const fqn = typeof typeRef !== 'string' ? typeRef.fqn : typeRef; - const [, parentFQN] = /^(.+)\.[^.]+$/.exec(fqn) as string[]; + const matches = /^(.+)\.[^.]+$/.exec(fqn); + if (matches == null || !Array.isArray(matches)) { + throw new Error(`Invalid FQN: ${fqn}`); + } + const [, parentFQN] = matches; const parent = this.types.get(parentFQN); if (parent === undefined) { @@ -1351,6 +1450,26 @@ class TypeResolver { return parent; } + public getDefiningPythonModule(typeRef: spec.NamedTypeReference | string): string { + const fqn = typeof typeRef !== 'string' ? typeRef.fqn : typeRef; + const parent = this.types.get(fqn); + + if (parent) { + let mod = parent; + while (!(mod instanceof PythonModule)) { + mod = this.getParent(mod.fqn!); + } + return mod.pythonName; + } + + const matches = /^([^.]+)\./.exec(fqn); + if (matches == null || !Array.isArray(matches)) { + throw new Error(`Invalid FQN: ${fqn}`); + } + const [, assm] = matches; + return this.findModule(assm).targets!.python!.module; + } + public getType(typeRef: spec.NamedTypeReference): PythonType { const type = this.types.get(typeRef.fqn); @@ -1393,7 +1512,7 @@ class TypeResolver { // These are not exactly built in types, but they're also not types that // this resolver has to worry about. - if (this.stdTypesRe.test(innerType)) { + if (TypeResolver.STD_TYPES_REGEX.test(innerType)) { continue; } @@ -1514,6 +1633,7 @@ class PythonGenerator extends Generator { this.types = new Map(); } + // eslint-disable-next-line complexity public emitDocString( code: CodeMaker, docs: spec.Docs | undefined, @@ -1659,13 +1779,14 @@ class PythonGenerator extends Generator { ); // This is the '._jsii' module - const assemblyModule = new Module( + const assemblyModule = new PythonModule( this.getAssemblyModuleName(assm), null, - { assembly: assm, + { + assembly: assm, assemblyFilename: this.getAssemblyFileName(), loadAssembly: false, - package: this.package + package: this.package, }, ); @@ -1683,41 +1804,27 @@ class PythonGenerator extends Generator { } protected onBeginNamespace(ns: string) { - // If we're generating the Namespace that matches our assembly, then we'll - // actually be generating a module, otherwise we'll generate a class within - // that module. - if (ns === this.assembly.name) { - // This is the main Python entry point (facade to the JSII module) - - const module = new Module( + const module = new PythonModule( + [ this.assembly.targets!.python!.module, - ns, - { assembly: this.assembly, - assemblyFilename: this.getAssemblyFileName(), - loadAssembly: ns === this.assembly.name, - package: this.package - }, - ); + ...ns.split('.').slice(1) + .map(toPythonIdentifier) + .map(s => toSnakeCase(s)) + ].join('.'), + ns, + { + assembly: this.assembly, + assemblyFilename: this.getAssemblyFileName(), + loadAssembly: true, + package: this.package, + } + ); - this.package.addModule(module); - // Add our py.typed marker to ensure that gradual typing works for this - // package. + this.package.addModule(module); + this.types.set(ns, module); + if (ns === this.assembly.name) { + // This applies recursively to submodules, so no need to duplicate! this.package.addData(module, 'py.typed', ''); - - this.types.set(ns, module); - } else { - // This should be temporary code, which can be removed and turned into an - // error case once https://github.com/aws/jsii/issues/270 and - // https://github.com/aws/jsii/issues/283 are solved. - this.addPythonType( - new Namespace( - this, - toPythonIdentifier(ns.replace(/^.+\.([^.]+)$/, '$1')), - ns, - {}, - undefined, - ), - ); } } @@ -1765,7 +1872,7 @@ class PythonGenerator extends Generator { parameters, method.returns, method.docs, - { abstract: method.abstract, liftedProp: this.getliftedProp(method) }, + { abstract: method.abstract, liftedProp: this.getliftedProp(method), parent: cls }, ) ); } @@ -1778,7 +1885,7 @@ class PythonGenerator extends Generator { prop.name, prop, prop.docs, - { abstract: prop.abstract, immutable: prop.immutable }, + { abstract: prop.abstract, immutable: prop.immutable, parent: cls }, ) ); } @@ -1795,7 +1902,7 @@ class PythonGenerator extends Generator { parameters, method.returns, method.docs, - { abstract: method.abstract, liftedProp: this.getliftedProp(method) }, + { abstract: method.abstract, liftedProp: this.getliftedProp(method), parent: cls }, ) ); } else { @@ -1807,7 +1914,7 @@ class PythonGenerator extends Generator { parameters, method.returns, method.docs, - { abstract: method.abstract, liftedProp: this.getliftedProp(method) }, + { abstract: method.abstract, liftedProp: this.getliftedProp(method), parent: cls }, ) ); } @@ -1821,7 +1928,7 @@ class PythonGenerator extends Generator { prop.name, prop, prop.docs, - { abstract: prop.abstract, immutable: prop.immutable }, + { abstract: prop.abstract, immutable: prop.immutable, parent: cls }, ) ); } @@ -1867,7 +1974,7 @@ class PythonGenerator extends Generator { parameters, method.returns, method.docs, - { liftedProp: this.getliftedProp(method) }, + { liftedProp: this.getliftedProp(method), parent: ifc }, ) ); } @@ -1876,7 +1983,7 @@ class PythonGenerator extends Generator { let ifaceProperty: InterfaceProperty | StructField; if (ifc.datatype) { - ifaceProperty = new StructField(this, prop); + ifaceProperty = new StructField(this, prop, ifc); } else { ifaceProperty = new InterfaceProperty( this, @@ -1884,7 +1991,7 @@ class PythonGenerator extends Generator { prop.name, prop, prop.docs, - { immutable: prop.immutable }, + { immutable: prop.immutable, parent: ifc }, ); } diff --git a/packages/jsii-pacmak/test/diff-test.sh b/packages/jsii-pacmak/test/diff-test.sh index 288682cf5a..031c3a548b 100755 --- a/packages/jsii-pacmak/test/diff-test.sh +++ b/packages/jsii-pacmak/test/diff-test.sh @@ -2,7 +2,7 @@ set -e cd $(dirname $0) -workdir="$(mktemp -d)" +workdir="$(mktemp -d -t jsii-diff-test.XXXXXXXXXX)" success=true function mktmpdir() { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py index 590690c4bb..fd9d308181 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py @@ -8,7 +8,7 @@ import jsii.compat import publication -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base-of-base", "1.1.0", __name__, "jsii-calc-base-of-base@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base-of-base", "1.1.0", "scope.jsii_calc_base_of_base", "jsii-calc-base-of-base@1.1.0.jsii.tgz") @jsii.interface(jsii_type="@scope/jsii-calc-base-of-base.IVeryBaseInterface") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/__init__.py index 9e39789e5a..8286c95df3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/__init__.py @@ -7,6 +7,7 @@ import jsii import jsii.compat import publication + __all__ = [] publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py index ec61a7b2a8..6338fc2be9 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py @@ -10,7 +10,7 @@ import scope.jsii_calc_base_of_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "1.1.0", __name__, "jsii-calc-base@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "1.1.0", "scope.jsii_calc_base", "jsii-calc-base@1.1.0.jsii.tgz") class Base(metaclass=jsii.JSIIAbstractClass, jsii_type="@scope/jsii-calc-base.Base"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/__init__.py index 03ffbd0be5..2b6e82f761 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/__init__.py @@ -9,6 +9,7 @@ import publication import scope.jsii_calc_base_of_base + __all__ = [] publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py index f5df0ebf89..d8214aac9a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py @@ -11,7 +11,7 @@ import scope.jsii_calc_base import scope.jsii_calc_base_of_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "1.1.0", __name__, "jsii-calc-lib@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "1.1.0", "scope.jsii_calc_lib", "jsii-calc-lib@1.1.0.jsii.tgz") @jsii.enum(jsii_type="@scope/jsii-calc-lib.EnumFromScopedModule") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/__init__.py index e3fcd0f7bb..181a0c1151 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/__init__.py @@ -10,6 +10,7 @@ import scope.jsii_calc_base import scope.jsii_calc_base_of_base + __all__ = [] publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii index 56967ae828..0db4ab2889 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii @@ -12153,8 +12153,257 @@ ], "name": "CompositionStringStyle", "namespace": "composition.CompositeOperation" + }, + "jsii-calc.submodule.MyClass": { + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.MyClass", + "initializer": { + "docs": { + "stability": "experimental" + } + }, + "interfaces": [ + "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced" + ], + "kind": "class", + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 5 + }, + "name": "MyClass", + "namespace": "submodule", + "properties": [ + { + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 6 + }, + "name": "definedAt", + "overrides": "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced", + "type": { + "primitive": "string" + } + }, + { + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 7 + }, + "name": "goodness", + "type": { + "fqn": "jsii-calc.submodule.child.Goodness" + } + }, + { + "docs": { + "stability": "experimental" + }, + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 8 + }, + "name": "allTypes", + "optional": true, + "type": { + "fqn": "jsii-calc.AllTypes" + } + } + ] + }, + "jsii-calc.submodule.back_references.MyClassReference": { + "assembly": "jsii-calc", + "datatype": true, + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.back_references.MyClassReference", + "kind": "interface", + "locationInModule": { + "filename": "lib/submodule/refers-to-parent/index.ts", + "line": 3 + }, + "name": "MyClassReference", + "namespace": "submodule.back_references", + "properties": [ + { + "abstract": true, + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/refers-to-parent/index.ts", + "line": 4 + }, + "name": "reference", + "type": { + "fqn": "jsii-calc.submodule.MyClass" + } + } + ] + }, + "jsii-calc.submodule.child.Goodness": { + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.child.Goodness", + "kind": "enum", + "locationInModule": { + "filename": "lib/submodule/child/index.ts", + "line": 5 + }, + "members": [ + { + "docs": { + "stability": "experimental", + "summary": "It's pretty good." + }, + "name": "PRETTY_GOOD" + }, + { + "docs": { + "stability": "experimental", + "summary": "It's really good." + }, + "name": "REALLY_GOOD" + }, + { + "docs": { + "stability": "experimental", + "summary": "It's amazingly good." + }, + "name": "AMAZINGLY_GOOD" + } + ], + "name": "Goodness", + "namespace": "submodule.child" + }, + "jsii-calc.submodule.child.Structure": { + "assembly": "jsii-calc", + "datatype": true, + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.child.Structure", + "kind": "interface", + "locationInModule": { + "filename": "lib/submodule/child/index.ts", + "line": 1 + }, + "name": "Structure", + "namespace": "submodule.child", + "properties": [ + { + "abstract": true, + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/child/index.ts", + "line": 2 + }, + "name": "bool", + "type": { + "primitive": "boolean" + } + } + ] + }, + "jsii-calc.submodule.nested_submodule.Namespaced": { + "abstract": true, + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.nested_submodule.Namespaced", + "interfaces": [ + "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced" + ], + "kind": "class", + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 10 + }, + "name": "Namespaced", + "namespace": "submodule.nested_submodule", + "properties": [ + { + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 11 + }, + "name": "definedAt", + "overrides": "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced", + "type": { + "primitive": "string" + } + }, + { + "abstract": true, + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 12 + }, + "name": "goodness", + "type": { + "fqn": "jsii-calc.submodule.child.Goodness" + } + } + ] + }, + "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced": { + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced", + "kind": "interface", + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 5 + }, + "name": "INamespaced", + "namespace": "submodule.nested_submodule.deeplyNested", + "properties": [ + { + "abstract": true, + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/nested_submodule.ts", + "line": 6 + }, + "name": "definedAt", + "type": { + "primitive": "string" + } + } + ] } }, "version": "1.1.0", - "fingerprint": "EIFtfZN4eukuZnpbTeqrxdc/JrKnU8eDm1SVncWk/vU=" + "fingerprint": "vtobmk8xL6Ke30Blb4NyDZ1X7T7J8lcKbbrmZtMtcpU=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Calculator.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Calculator.cs index 448c28e32f..806c1e9cd3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Calculator.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Calculator.cs @@ -28,7 +28,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace /// Console.WriteLine(calculator.Expression.Value); /// [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Calculator), fullyQualifiedName: "jsii-calc.Calculator", parametersJson: "[{\"docs\":{\"summary\":\"Initialization properties.\"},\"name\":\"props\",\"optional\":true,\"type\":{\"fqn\":\"jsii-calc.CalculatorProps\"}}]")] - public class Calculator : Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation + public class Calculator : Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation { /// Creates a Calculator object. /// Initialization properties. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperation.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Composition/CompositeOperation.cs similarity index 95% rename from packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperation.cs rename to packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Composition/CompositeOperation.cs index 3a63d09ea9..d1cb0ef425 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperation.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Composition/CompositeOperation.cs @@ -2,13 +2,13 @@ #pragma warning disable CS0672,CS0809,CS1591 -namespace Amazon.JSII.Tests.CalculatorNamespace.composition +namespace Amazon.JSII.Tests.CalculatorNamespace.Composition { /// Abstract operation composed from an expression of other operations. /// /// Stability: Experimental /// - [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation), fullyQualifiedName: "jsii-calc.composition.CompositeOperation")] + [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation), fullyQualifiedName: "jsii-calc.composition.CompositeOperation")] public abstract class CompositeOperation : Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Operation { protected CompositeOperation(): base(new DeputyProps(new object[]{})) @@ -88,9 +88,9 @@ public virtual string[] DecorationPrefixes /// Stability: Experimental /// [JsiiProperty(name: "stringStyle", typeJson: "{\"fqn\":\"jsii-calc.composition.CompositeOperation.CompositionStringStyle\"}")] - public virtual Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation.CompositionStringStyle StringStyle + public virtual Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation.CompositionStringStyle StringStyle { - get => GetInstanceProperty(); + get => GetInstanceProperty(); set => SetInstanceProperty(value); } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperationProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Composition/CompositeOperationProxy.cs similarity index 85% rename from packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperationProxy.cs rename to packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Composition/CompositeOperationProxy.cs index 4f70dac317..ab8f07c320 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperationProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Composition/CompositeOperationProxy.cs @@ -2,14 +2,14 @@ #pragma warning disable CS0672,CS0809,CS1591 -namespace Amazon.JSII.Tests.CalculatorNamespace.composition +namespace Amazon.JSII.Tests.CalculatorNamespace.Composition { /// Abstract operation composed from an expression of other operations. /// /// Stability: Experimental /// - [JsiiTypeProxy(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation), fullyQualifiedName: "jsii-calc.composition.CompositeOperation")] - internal sealed class CompositeOperationProxy : Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation + [JsiiTypeProxy(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation), fullyQualifiedName: "jsii-calc.composition.CompositeOperation")] + internal sealed class CompositeOperationProxy : Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation { private CompositeOperationProxy(ByRefValue reference): base(reference) { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Power.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Power.cs index fe37ebe7b0..f366aa6847 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Power.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Power.cs @@ -9,7 +9,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace /// Stability: Experimental /// [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Power), fullyQualifiedName: "jsii-calc.Power", parametersJson: "[{\"docs\":{\"summary\":\"The base of the power.\"},\"name\":\"base\",\"type\":{\"fqn\":\"@scope/jsii-calc-lib.Value\"}},{\"docs\":{\"summary\":\"The number of times to multiply.\"},\"name\":\"pow\",\"type\":{\"fqn\":\"@scope/jsii-calc-lib.Value\"}}]")] - public class Power : Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation + public class Power : Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation { /// Creates a Power operation. /// The base of the power. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/IMyClassReference.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/IMyClassReference.cs new file mode 100644 index 0000000000..d0bba143dc --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/IMyClassReference.cs @@ -0,0 +1,22 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.BackReferences +{ + /// + /// Stability: Experimental + /// + [JsiiInterface(nativeType: typeof(IMyClassReference), fullyQualifiedName: "jsii-calc.submodule.back_references.MyClassReference")] + public interface IMyClassReference + { + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "reference", typeJson: "{\"fqn\":\"jsii-calc.submodule.MyClass\"}")] + Amazon.JSII.Tests.CalculatorNamespace.Submodule.MyClass Reference + { + get; + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/MyClassReference.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/MyClassReference.cs new file mode 100644 index 0000000000..3abbb5b89f --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/MyClassReference.cs @@ -0,0 +1,25 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.BackReferences +{ + #pragma warning disable CS8618 + + /// + /// Stability: Experimental + /// + [JsiiByValue(fqn: "jsii-calc.submodule.back_references.MyClassReference")] + public class MyClassReference : Amazon.JSII.Tests.CalculatorNamespace.Submodule.BackReferences.IMyClassReference + { + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "reference", typeJson: "{\"fqn\":\"jsii-calc.submodule.MyClass\"}", isOverride: true)] + public Amazon.JSII.Tests.CalculatorNamespace.Submodule.MyClass Reference + { + get; + set; + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/MyClassReferenceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/MyClassReferenceProxy.cs new file mode 100644 index 0000000000..e2c5c7874a --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/BackReferences/MyClassReferenceProxy.cs @@ -0,0 +1,26 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.BackReferences +{ + /// + /// Stability: Experimental + /// + [JsiiTypeProxy(nativeType: typeof(IMyClassReference), fullyQualifiedName: "jsii-calc.submodule.back_references.MyClassReference")] + internal sealed class MyClassReferenceProxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Submodule.BackReferences.IMyClassReference + { + private MyClassReferenceProxy(ByRefValue reference): base(reference) + { + } + + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "reference", typeJson: "{\"fqn\":\"jsii-calc.submodule.MyClass\"}")] + public Amazon.JSII.Tests.CalculatorNamespace.Submodule.MyClass Reference + { + get => GetInstanceProperty(); + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Goodness.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Goodness.cs new file mode 100644 index 0000000000..d479b90294 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Goodness.cs @@ -0,0 +1,33 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child +{ + + /// + /// Stability: Experimental + /// + [JsiiEnum(nativeType: typeof(Goodness), fullyQualifiedName: "jsii-calc.submodule.child.Goodness")] + public enum Goodness + { + /// It's pretty good. + /// + /// Stability: Experimental + /// + [JsiiEnumMember(name: "PRETTY_GOOD")] + PRETTY_GOOD, + /// It's really good. + /// + /// Stability: Experimental + /// + [JsiiEnumMember(name: "REALLY_GOOD")] + REALLY_GOOD, + /// It's amazingly good. + /// + /// Stability: Experimental + /// + [JsiiEnumMember(name: "AMAZINGLY_GOOD")] + AMAZINGLY_GOOD + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/IStructure.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/IStructure.cs new file mode 100644 index 0000000000..0592d56531 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/IStructure.cs @@ -0,0 +1,22 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child +{ + /// + /// Stability: Experimental + /// + [JsiiInterface(nativeType: typeof(IStructure), fullyQualifiedName: "jsii-calc.submodule.child.Structure")] + public interface IStructure + { + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "bool", typeJson: "{\"primitive\":\"boolean\"}")] + bool Bool + { + get; + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Structure.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Structure.cs new file mode 100644 index 0000000000..249762ae88 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Structure.cs @@ -0,0 +1,25 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child +{ + #pragma warning disable CS8618 + + /// + /// Stability: Experimental + /// + [JsiiByValue(fqn: "jsii-calc.submodule.child.Structure")] + public class Structure : Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.IStructure + { + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "bool", typeJson: "{\"primitive\":\"boolean\"}", isOverride: true)] + public bool Bool + { + get; + set; + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/StructureProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/StructureProxy.cs new file mode 100644 index 0000000000..945641b246 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/StructureProxy.cs @@ -0,0 +1,26 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child +{ + /// + /// Stability: Experimental + /// + [JsiiTypeProxy(nativeType: typeof(IStructure), fullyQualifiedName: "jsii-calc.submodule.child.Structure")] + internal sealed class StructureProxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.IStructure + { + private StructureProxy(ByRefValue reference): base(reference) + { + } + + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "bool", typeJson: "{\"primitive\":\"boolean\"}")] + public bool Bool + { + get => GetInstanceProperty(); + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/MyClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/MyClass.cs new file mode 100644 index 0000000000..4d3fc83144 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/MyClass.cs @@ -0,0 +1,63 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule +{ + /// + /// Stability: Experimental + /// + [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Submodule.MyClass), fullyQualifiedName: "jsii-calc.submodule.MyClass")] + public class MyClass : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule.DeeplyNested.INamespaced + { + /// + /// Stability: Experimental + /// + public MyClass(): base(new DeputyProps(new object[]{})) + { + } + + /// Used by jsii to construct an instance of this class from a Javascript-owned object reference + /// The Javascript-owned object reference + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + protected MyClass(ByRefValue reference): base(reference) + { + } + + /// Used by jsii to construct an instance of this class from DeputyProps + /// The deputy props + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + protected MyClass(DeputyProps props): base(props) + { + } + + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "definedAt", typeJson: "{\"primitive\":\"string\"}")] + public virtual string DefinedAt + { + get => GetInstanceProperty(); + } + + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "goodness", typeJson: "{\"fqn\":\"jsii-calc.submodule.child.Goodness\"}")] + public virtual Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.Goodness Goodness + { + get => GetInstanceProperty(); + } + + /// + /// Stability: Experimental + /// + [JsiiOptional] + [JsiiProperty(name: "allTypes", typeJson: "{\"fqn\":\"jsii-calc.AllTypes\"}", isOptional: true)] + public virtual Amazon.JSII.Tests.CalculatorNamespace.AllTypes? AllTypes + { + get => GetInstanceProperty(); + set => SetInstanceProperty(value); + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/DeeplyNested/INamespaced.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/DeeplyNested/INamespaced.cs new file mode 100644 index 0000000000..b68772f183 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/DeeplyNested/INamespaced.cs @@ -0,0 +1,22 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule.DeeplyNested +{ + /// + /// Stability: Experimental + /// + [JsiiInterface(nativeType: typeof(INamespaced), fullyQualifiedName: "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced")] + public interface INamespaced + { + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "definedAt", typeJson: "{\"primitive\":\"string\"}")] + string DefinedAt + { + get; + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/DeeplyNested/INamespacedProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/DeeplyNested/INamespacedProxy.cs new file mode 100644 index 0000000000..13f38d0463 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/DeeplyNested/INamespacedProxy.cs @@ -0,0 +1,26 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule.DeeplyNested +{ + /// + /// Stability: Experimental + /// + [JsiiTypeProxy(nativeType: typeof(INamespaced), fullyQualifiedName: "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced")] + internal sealed class INamespacedProxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule.DeeplyNested.INamespaced + { + private INamespacedProxy(ByRefValue reference): base(reference) + { + } + + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "definedAt", typeJson: "{\"primitive\":\"string\"}")] + public string DefinedAt + { + get => GetInstanceProperty(); + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/Namespaced.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/Namespaced.cs new file mode 100644 index 0000000000..665a692841 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/Namespaced.cs @@ -0,0 +1,45 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule +{ + /// + /// Stability: Experimental + /// + [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule.Namespaced), fullyQualifiedName: "jsii-calc.submodule.nested_submodule.Namespaced")] + public abstract class Namespaced : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule.DeeplyNested.INamespaced + { + /// Used by jsii to construct an instance of this class from a Javascript-owned object reference + /// The Javascript-owned object reference + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + protected Namespaced(ByRefValue reference): base(reference) + { + } + + /// Used by jsii to construct an instance of this class from DeputyProps + /// The deputy props + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + protected Namespaced(DeputyProps props): base(props) + { + } + + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "definedAt", typeJson: "{\"primitive\":\"string\"}")] + public virtual string DefinedAt + { + get => GetInstanceProperty(); + } + + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "goodness", typeJson: "{\"fqn\":\"jsii-calc.submodule.child.Goodness\"}")] + public abstract Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.Goodness Goodness + { + get; + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/NamespacedProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/NamespacedProxy.cs new file mode 100644 index 0000000000..8ba980f079 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/NestedSubmodule/NamespacedProxy.cs @@ -0,0 +1,26 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule +{ + /// + /// Stability: Experimental + /// + [JsiiTypeProxy(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule.Namespaced), fullyQualifiedName: "jsii-calc.submodule.nested_submodule.Namespaced")] + internal sealed class NamespacedProxy : Amazon.JSII.Tests.CalculatorNamespace.Submodule.NestedSubmodule.Namespaced + { + private NamespacedProxy(ByRefValue reference): base(reference) + { + } + + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "goodness", typeJson: "{\"fqn\":\"jsii-calc.submodule.child.Goodness\"}")] + public override Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.Goodness Goodness + { + get => GetInstanceProperty(); + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Sum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Sum.cs index c58a18874c..a6c703dc0e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Sum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Sum.cs @@ -9,7 +9,7 @@ namespace Amazon.JSII.Tests.CalculatorNamespace /// Stability: Experimental /// [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.Sum), fullyQualifiedName: "jsii-calc.Sum")] - public class Sum : Amazon.JSII.Tests.CalculatorNamespace.composition.CompositeOperation + public class Sum : Amazon.JSII.Tests.CalculatorNamespace.Composition.CompositeOperation { /// /// Stability: Experimental diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java index 3725d26e83..3c583fc74c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java @@ -56,8 +56,8 @@ protected Class resolveClass(final String fqn) throws ClassNotFoundException case "jsii-calc.DeprecatedClass": return software.amazon.jsii.tests.calculator.DeprecatedClass.class; case "jsii-calc.DeprecatedEnum": return software.amazon.jsii.tests.calculator.DeprecatedEnum.class; case "jsii-calc.DeprecatedStruct": return software.amazon.jsii.tests.calculator.DeprecatedStruct.class; - case "jsii-calc.DerivedClassHasNoProperties.Base": return software.amazon.jsii.tests.calculator.DerivedClassHasNoProperties.Base.class; - case "jsii-calc.DerivedClassHasNoProperties.Derived": return software.amazon.jsii.tests.calculator.DerivedClassHasNoProperties.Derived.class; + case "jsii-calc.DerivedClassHasNoProperties.Base": return software.amazon.jsii.tests.calculator.derived_class_has_no_properties.Base.class; + case "jsii-calc.DerivedClassHasNoProperties.Derived": return software.amazon.jsii.tests.calculator.derived_class_has_no_properties.Derived.class; case "jsii-calc.DerivedStruct": return software.amazon.jsii.tests.calculator.DerivedStruct.class; case "jsii-calc.DiamondInheritanceBaseLevelStruct": return software.amazon.jsii.tests.calculator.DiamondInheritanceBaseLevelStruct.class; case "jsii-calc.DiamondInheritanceFirstMidLevelStruct": return software.amazon.jsii.tests.calculator.DiamondInheritanceFirstMidLevelStruct.class; @@ -123,9 +123,9 @@ protected Class resolveClass(final String fqn) throws ClassNotFoundException case "jsii-calc.ImplictBaseOfBase": return software.amazon.jsii.tests.calculator.ImplictBaseOfBase.class; case "jsii-calc.InbetweenClass": return software.amazon.jsii.tests.calculator.InbetweenClass.class; case "jsii-calc.InterfaceCollections": return software.amazon.jsii.tests.calculator.InterfaceCollections.class; - case "jsii-calc.InterfaceInNamespaceIncludesClasses.Foo": return software.amazon.jsii.tests.calculator.InterfaceInNamespaceIncludesClasses.Foo.class; - case "jsii-calc.InterfaceInNamespaceIncludesClasses.Hello": return software.amazon.jsii.tests.calculator.InterfaceInNamespaceIncludesClasses.Hello.class; - case "jsii-calc.InterfaceInNamespaceOnlyInterface.Hello": return software.amazon.jsii.tests.calculator.InterfaceInNamespaceOnlyInterface.Hello.class; + case "jsii-calc.InterfaceInNamespaceIncludesClasses.Foo": return software.amazon.jsii.tests.calculator.interface_in_namespace_includes_classes.Foo.class; + case "jsii-calc.InterfaceInNamespaceIncludesClasses.Hello": return software.amazon.jsii.tests.calculator.interface_in_namespace_includes_classes.Hello.class; + case "jsii-calc.InterfaceInNamespaceOnlyInterface.Hello": return software.amazon.jsii.tests.calculator.interface_in_namespace_only_interface.Hello.class; case "jsii-calc.InterfacesMaker": return software.amazon.jsii.tests.calculator.InterfacesMaker.class; case "jsii-calc.JSII417Derived": return software.amazon.jsii.tests.calculator.JSII417Derived.class; case "jsii-calc.JSII417PublicBaseOfBase": return software.amazon.jsii.tests.calculator.JSII417PublicBaseOfBase.class; @@ -207,6 +207,12 @@ protected Class resolveClass(final String fqn) throws ClassNotFoundException case "jsii-calc.WithPrivatePropertyInConstructor": return software.amazon.jsii.tests.calculator.WithPrivatePropertyInConstructor.class; case "jsii-calc.composition.CompositeOperation": return software.amazon.jsii.tests.calculator.composition.CompositeOperation.class; case "jsii-calc.composition.CompositeOperation.CompositionStringStyle": return software.amazon.jsii.tests.calculator.composition.CompositeOperation.CompositionStringStyle.class; + case "jsii-calc.submodule.MyClass": return software.amazon.jsii.tests.calculator.submodule.MyClass.class; + case "jsii-calc.submodule.back_references.MyClassReference": return software.amazon.jsii.tests.calculator.submodule.back_references.MyClassReference.class; + case "jsii-calc.submodule.child.Goodness": return software.amazon.jsii.tests.calculator.submodule.child.Goodness.class; + case "jsii-calc.submodule.child.Structure": return software.amazon.jsii.tests.calculator.submodule.child.Structure.class; + case "jsii-calc.submodule.nested_submodule.Namespaced": return software.amazon.jsii.tests.calculator.submodule.nested_submodule.Namespaced.class; + case "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced": return software.amazon.jsii.tests.calculator.submodule.nested_submodule.deeply_nested.INamespaced.class; default: throw new ClassNotFoundException("Unknown JSII type: " + fqn); } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/DerivedClassHasNoProperties/Base.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/derived_class_has_no_properties/Base.java similarity index 94% rename from packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/DerivedClassHasNoProperties/Base.java rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/derived_class_has_no_properties/Base.java index 089588633c..351ad6515a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/DerivedClassHasNoProperties/Base.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/derived_class_has_no_properties/Base.java @@ -1,4 +1,4 @@ -package software.amazon.jsii.tests.calculator.DerivedClassHasNoProperties; +package software.amazon.jsii.tests.calculator.derived_class_has_no_properties; /** * EXPERIMENTAL diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/DerivedClassHasNoProperties/Derived.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/derived_class_has_no_properties/Derived.java similarity index 86% rename from packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/DerivedClassHasNoProperties/Derived.java rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/derived_class_has_no_properties/Derived.java index a21a1dba31..2544874c3a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/DerivedClassHasNoProperties/Derived.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/derived_class_has_no_properties/Derived.java @@ -1,4 +1,4 @@ -package software.amazon.jsii.tests.calculator.DerivedClassHasNoProperties; +package software.amazon.jsii.tests.calculator.derived_class_has_no_properties; /** * EXPERIMENTAL @@ -6,7 +6,7 @@ @javax.annotation.Generated(value = "jsii-pacmak") @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) @software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.DerivedClassHasNoProperties.Derived") -public class Derived extends software.amazon.jsii.tests.calculator.DerivedClassHasNoProperties.Base { +public class Derived extends software.amazon.jsii.tests.calculator.derived_class_has_no_properties.Base { protected Derived(final software.amazon.jsii.JsiiObjectRef objRef) { super(objRef); diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceIncludesClasses/Foo.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_includes_classes/Foo.java similarity index 93% rename from packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceIncludesClasses/Foo.java rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_includes_classes/Foo.java index c5d4bd64c0..1c4a652e4f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceIncludesClasses/Foo.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_includes_classes/Foo.java @@ -1,4 +1,4 @@ -package software.amazon.jsii.tests.calculator.InterfaceInNamespaceIncludesClasses; +package software.amazon.jsii.tests.calculator.interface_in_namespace_includes_classes; /** * EXPERIMENTAL diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceIncludesClasses/Hello.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_includes_classes/Hello.java similarity index 98% rename from packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceIncludesClasses/Hello.java rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_includes_classes/Hello.java index c043e21246..2ac3a8a133 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceIncludesClasses/Hello.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_includes_classes/Hello.java @@ -1,4 +1,4 @@ -package software.amazon.jsii.tests.calculator.InterfaceInNamespaceIncludesClasses; +package software.amazon.jsii.tests.calculator.interface_in_namespace_includes_classes; /** * EXPERIMENTAL diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceOnlyInterface/Hello.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_only_interface/Hello.java similarity index 98% rename from packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceOnlyInterface/Hello.java rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_only_interface/Hello.java index 2651725351..f2558d4221 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/InterfaceInNamespaceOnlyInterface/Hello.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/interface_in_namespace_only_interface/Hello.java @@ -1,4 +1,4 @@ -package software.amazon.jsii.tests.calculator.InterfaceInNamespaceOnlyInterface; +package software.amazon.jsii.tests.calculator.interface_in_namespace_only_interface; /** * EXPERIMENTAL diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/MyClass.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/MyClass.java new file mode 100644 index 0000000000..3c7642e65c --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/MyClass.java @@ -0,0 +1,60 @@ +package software.amazon.jsii.tests.calculator.submodule; + +/** + * EXPERIMENTAL + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.submodule.MyClass") +public class MyClass extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.submodule.nested_submodule.deeply_nested.INamespaced { + + protected MyClass(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + } + + protected MyClass(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) { + super(initializationMode); + } + + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public MyClass() { + super(software.amazon.jsii.JsiiObject.InitializationMode.JSII); + software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this); + } + + /** + * EXPERIMENTAL + */ + @Override + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public @org.jetbrains.annotations.NotNull java.lang.String getDefinedAt() { + return this.jsiiGet("definedAt", java.lang.String.class); + } + + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.submodule.child.Goodness getGoodness() { + return this.jsiiGet("goodness", software.amazon.jsii.tests.calculator.submodule.child.Goodness.class); + } + + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public @org.jetbrains.annotations.Nullable software.amazon.jsii.tests.calculator.AllTypes getAllTypes() { + return this.jsiiGet("allTypes", software.amazon.jsii.tests.calculator.AllTypes.class); + } + + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public void setAllTypes(final @org.jetbrains.annotations.Nullable software.amazon.jsii.tests.calculator.AllTypes value) { + this.jsiiSet("allTypes", value); + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/back_references/MyClassReference.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/back_references/MyClassReference.java new file mode 100644 index 0000000000..da53a9f033 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/back_references/MyClassReference.java @@ -0,0 +1,116 @@ +package software.amazon.jsii.tests.calculator.submodule.back_references; + +/** + * EXPERIMENTAL + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.submodule.back_references.MyClassReference") +@software.amazon.jsii.Jsii.Proxy(MyClassReference.Jsii$Proxy.class) +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) +public interface MyClassReference extends software.amazon.jsii.JsiiSerializable { + + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.submodule.MyClass getReference(); + + /** + * @return a {@link Builder} of {@link MyClassReference} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + static Builder builder() { + return new Builder(); + } + /** + * A builder for {@link MyClassReference} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public static final class Builder { + private software.amazon.jsii.tests.calculator.submodule.MyClass reference; + + /** + * Sets the value of {@link MyClassReference#getReference} + * @param reference the value to be set. This parameter is required. + * @return {@code this} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public Builder reference(software.amazon.jsii.tests.calculator.submodule.MyClass reference) { + this.reference = reference; + return this; + } + + /** + * Builds the configured instance. + * @return a new instance of {@link MyClassReference} + * @throws NullPointerException if any required attribute was not provided + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public MyClassReference build() { + return new Jsii$Proxy(reference); + } + } + + /** + * An implementation for {@link MyClassReference} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + final class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements MyClassReference { + private final software.amazon.jsii.tests.calculator.submodule.MyClass reference; + + /** + * Constructor that initializes the object based on values retrieved from the JsiiObject. + * @param objRef Reference to the JSII managed object. + */ + protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + this.reference = this.jsiiGet("reference", software.amazon.jsii.tests.calculator.submodule.MyClass.class); + } + + /** + * Constructor that initializes the object based on literal property values passed by the {@link Builder}. + */ + private Jsii$Proxy(final software.amazon.jsii.tests.calculator.submodule.MyClass reference) { + super(software.amazon.jsii.JsiiObject.InitializationMode.JSII); + this.reference = java.util.Objects.requireNonNull(reference, "reference is required"); + } + + @Override + public software.amazon.jsii.tests.calculator.submodule.MyClass getReference() { + return this.reference; + } + + @Override + public com.fasterxml.jackson.databind.JsonNode $jsii$toJson() { + final com.fasterxml.jackson.databind.ObjectMapper om = software.amazon.jsii.JsiiObjectMapper.INSTANCE; + final com.fasterxml.jackson.databind.node.ObjectNode data = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode(); + + data.set("reference", om.valueToTree(this.getReference())); + + final com.fasterxml.jackson.databind.node.ObjectNode struct = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode(); + struct.set("fqn", om.valueToTree("jsii-calc.submodule.back_references.MyClassReference")); + struct.set("data", data); + + final com.fasterxml.jackson.databind.node.ObjectNode obj = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode(); + obj.set("$jsii.struct", struct); + + return obj; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + MyClassReference.Jsii$Proxy that = (MyClassReference.Jsii$Proxy) o; + + return this.reference.equals(that.reference); + } + + @Override + public int hashCode() { + int result = this.reference.hashCode(); + return result; + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Goodness.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Goodness.java new file mode 100644 index 0000000000..7adb4c2f2c --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Goodness.java @@ -0,0 +1,31 @@ +package software.amazon.jsii.tests.calculator.submodule.child; + +/** + * EXPERIMENTAL + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.submodule.child.Goodness") +public enum Goodness { + /** + * It's pretty good. + *

+ * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + PRETTY_GOOD, + /** + * It's really good. + *

+ * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + REALLY_GOOD, + /** + * It's amazingly good. + *

+ * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + AMAZINGLY_GOOD, +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Structure.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Structure.java new file mode 100644 index 0000000000..9ddcc8d1dd --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Structure.java @@ -0,0 +1,116 @@ +package software.amazon.jsii.tests.calculator.submodule.child; + +/** + * EXPERIMENTAL + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.submodule.child.Structure") +@software.amazon.jsii.Jsii.Proxy(Structure.Jsii$Proxy.class) +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) +public interface Structure extends software.amazon.jsii.JsiiSerializable { + + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + @org.jetbrains.annotations.NotNull java.lang.Boolean getBool(); + + /** + * @return a {@link Builder} of {@link Structure} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + static Builder builder() { + return new Builder(); + } + /** + * A builder for {@link Structure} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public static final class Builder { + private java.lang.Boolean bool; + + /** + * Sets the value of {@link Structure#getBool} + * @param bool the value to be set. This parameter is required. + * @return {@code this} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public Builder bool(java.lang.Boolean bool) { + this.bool = bool; + return this; + } + + /** + * Builds the configured instance. + * @return a new instance of {@link Structure} + * @throws NullPointerException if any required attribute was not provided + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public Structure build() { + return new Jsii$Proxy(bool); + } + } + + /** + * An implementation for {@link Structure} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + final class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements Structure { + private final java.lang.Boolean bool; + + /** + * Constructor that initializes the object based on values retrieved from the JsiiObject. + * @param objRef Reference to the JSII managed object. + */ + protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + this.bool = this.jsiiGet("bool", java.lang.Boolean.class); + } + + /** + * Constructor that initializes the object based on literal property values passed by the {@link Builder}. + */ + private Jsii$Proxy(final java.lang.Boolean bool) { + super(software.amazon.jsii.JsiiObject.InitializationMode.JSII); + this.bool = java.util.Objects.requireNonNull(bool, "bool is required"); + } + + @Override + public java.lang.Boolean getBool() { + return this.bool; + } + + @Override + public com.fasterxml.jackson.databind.JsonNode $jsii$toJson() { + final com.fasterxml.jackson.databind.ObjectMapper om = software.amazon.jsii.JsiiObjectMapper.INSTANCE; + final com.fasterxml.jackson.databind.node.ObjectNode data = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode(); + + data.set("bool", om.valueToTree(this.getBool())); + + final com.fasterxml.jackson.databind.node.ObjectNode struct = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode(); + struct.set("fqn", om.valueToTree("jsii-calc.submodule.child.Structure")); + struct.set("data", data); + + final com.fasterxml.jackson.databind.node.ObjectNode obj = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode(); + obj.set("$jsii.struct", struct); + + return obj; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Structure.Jsii$Proxy that = (Structure.Jsii$Proxy) o; + + return this.bool.equals(that.bool); + } + + @Override + public int hashCode() { + int result = this.bool.hashCode(); + return result; + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/nested_submodule/Namespaced.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/nested_submodule/Namespaced.java new file mode 100644 index 0000000000..55c46c15f1 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/nested_submodule/Namespaced.java @@ -0,0 +1,60 @@ +package software.amazon.jsii.tests.calculator.submodule.nested_submodule; + +/** + * EXPERIMENTAL + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.submodule.nested_submodule.Namespaced") +public abstract class Namespaced extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.submodule.nested_submodule.deeply_nested.INamespaced { + + protected Namespaced(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + } + + protected Namespaced(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) { + super(initializationMode); + } + + /** + * EXPERIMENTAL + */ + @Override + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public @org.jetbrains.annotations.NotNull java.lang.String getDefinedAt() { + return this.jsiiGet("definedAt", java.lang.String.class); + } + + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public abstract @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.submodule.child.Goodness getGoodness(); + + /** + * A proxy class which represents a concrete javascript instance of this type. + */ + final static class Jsii$Proxy extends software.amazon.jsii.tests.calculator.submodule.nested_submodule.Namespaced { + protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + } + + /** + * EXPERIMENTAL + */ + @Override + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.submodule.child.Goodness getGoodness() { + return this.jsiiGet("goodness", software.amazon.jsii.tests.calculator.submodule.child.Goodness.class); + } + + /** + * EXPERIMENTAL + */ + @Override + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public @org.jetbrains.annotations.NotNull java.lang.String getDefinedAt() { + return this.jsiiGet("definedAt", java.lang.String.class); + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/nested_submodule/deeply_nested/INamespaced.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/nested_submodule/deeply_nested/INamespaced.java new file mode 100644 index 0000000000..bbd6b414c9 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/nested_submodule/deeply_nested/INamespaced.java @@ -0,0 +1,35 @@ +package software.amazon.jsii.tests.calculator.submodule.nested_submodule.deeply_nested; + +/** + * EXPERIMENTAL + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced") +@software.amazon.jsii.Jsii.Proxy(INamespaced.Jsii$Proxy.class) +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) +public interface INamespaced extends software.amazon.jsii.JsiiSerializable { + + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + @org.jetbrains.annotations.NotNull java.lang.String getDefinedAt(); + + /** + * A proxy class which represents a concrete javascript instance of this type. + */ + final static class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements software.amazon.jsii.tests.calculator.submodule.nested_submodule.deeply_nested.INamespaced { + protected Jsii$Proxy(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + } + + /** + * EXPERIMENTAL + */ + @Override + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public @org.jetbrains.annotations.NotNull java.lang.String getDefinedAt() { + return this.jsiiGet("definedAt", java.lang.String.class); + } + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py index 552e60c6a5..8ec5e190db 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py @@ -18,7 +18,16 @@ }, "packages": [ "jsii_calc", - "jsii_calc._jsii" + "jsii_calc._jsii", + "jsii_calc.composition", + "jsii_calc.derived_class_has_no_properties", + "jsii_calc.interface_in_namespace_includes_classes", + "jsii_calc.interface_in_namespace_only_interface", + "jsii_calc.submodule", + "jsii_calc.submodule.back_references", + "jsii_calc.submodule.child", + "jsii_calc.submodule.nested_submodule", + "jsii_calc.submodule.nested_submodule.deeply_nested" ], "package_data": { "jsii_calc._jsii": [ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py index 3a29c72b32..fff94152a9 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py @@ -37,11 +37,12 @@ import jsii.compat import publication +import jsii_calc.composition import scope.jsii_calc_base import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", __name__, "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") class AbstractClassBase(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.AbstractClassBase"): @@ -740,41 +741,165 @@ def rhs(self) -> scope.jsii_calc_lib.Value: class _BinaryOperationProxy(BinaryOperation, jsii.proxy_for(scope.jsii_calc_lib.Operation)): pass -class Add(BinaryOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Add"): - """The "+" binary operation. +class Calculator(composition.CompositeOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Calculator"): + """A calculator which maintains a current value and allows adding operations. + + Here's how you use it:: + + # Example automatically generated. See https://github.com/aws/jsii/issues/826 + calculator = calc.Calculator() + calculator.add(5) + calculator.mul(3) + print(calculator.expression.value) + + I will repeat this example again, but in an @example tag. stability :stability: experimental + + Example:: + + # Example automatically generated. See https://github.com/aws/jsii/issues/826 + calculator = calc.Calculator() + calculator.add(5) + calculator.mul(3) + print(calculator.expression.value) """ - def __init__(self, lhs: scope.jsii_calc_lib.Value, rhs: scope.jsii_calc_lib.Value) -> None: - """Creates a BinaryOperation. + def __init__(self, *, initial_value: typing.Optional[jsii.Number]=None, maximum_value: typing.Optional[jsii.Number]=None) -> None: + """Creates a Calculator object. - :param lhs: Left-hand side operand. - :param rhs: Right-hand side operand. + :param initial_value: The initial value of the calculator. NOTE: Any number works here, it's fine. Default: 0 + :param maximum_value: The maximum value the calculator can store. Default: none stability :stability: experimental """ - jsii.create(Add, self, [lhs, rhs]) + props = CalculatorProps(initial_value=initial_value, maximum_value=maximum_value) - @jsii.member(jsii_name="toString") - def to_string(self) -> str: - """String representation of the value. + jsii.create(Calculator, self, [props]) + + @jsii.member(jsii_name="add") + def add(self, value: jsii.Number) -> None: + """Adds a number to the current value. + + :param value: - stability :stability: experimental """ - return jsii.invoke(self, "toString", []) + return jsii.invoke(self, "add", [value]) + + @jsii.member(jsii_name="mul") + def mul(self, value: jsii.Number) -> None: + """Multiplies the current value by a number. + + :param value: - + + stability + :stability: experimental + """ + return jsii.invoke(self, "mul", [value]) + + @jsii.member(jsii_name="neg") + def neg(self) -> None: + """Negates the current value. + + stability + :stability: experimental + """ + return jsii.invoke(self, "neg", []) + + @jsii.member(jsii_name="pow") + def pow(self, value: jsii.Number) -> None: + """Raises the current value by a power. + + :param value: - + + stability + :stability: experimental + """ + return jsii.invoke(self, "pow", [value]) + + @jsii.member(jsii_name="readUnionValue") + def read_union_value(self) -> jsii.Number: + """Returns teh value of the union property (if defined). + + stability + :stability: experimental + """ + return jsii.invoke(self, "readUnionValue", []) @builtins.property - @jsii.member(jsii_name="value") - def value(self) -> jsii.Number: - """The value. + @jsii.member(jsii_name="expression") + def expression(self) -> scope.jsii_calc_lib.Value: + """Returns the expression. stability :stability: experimental """ - return jsii.get(self, "value") + return jsii.get(self, "expression") + + @builtins.property + @jsii.member(jsii_name="operationsLog") + def operations_log(self) -> typing.List[scope.jsii_calc_lib.Value]: + """A log of all operations. + + stability + :stability: experimental + """ + return jsii.get(self, "operationsLog") + + @builtins.property + @jsii.member(jsii_name="operationsMap") + def operations_map(self) -> typing.Mapping[str,typing.List[scope.jsii_calc_lib.Value]]: + """A map of per operation name of all operations performed. + + stability + :stability: experimental + """ + return jsii.get(self, "operationsMap") + + @builtins.property + @jsii.member(jsii_name="curr") + def curr(self) -> scope.jsii_calc_lib.Value: + """The current value. + + stability + :stability: experimental + """ + return jsii.get(self, "curr") + + @curr.setter + def curr(self, value: scope.jsii_calc_lib.Value): + jsii.set(self, "curr", value) + + @builtins.property + @jsii.member(jsii_name="maxValue") + def max_value(self) -> typing.Optional[jsii.Number]: + """The maximum value allows in this calculator. + + stability + :stability: experimental + """ + return jsii.get(self, "maxValue") + + @max_value.setter + def max_value(self, value: typing.Optional[jsii.Number]): + jsii.set(self, "maxValue", value) + + @builtins.property + @jsii.member(jsii_name="unionProperty") + def union_property(self) -> typing.Optional[typing.Union[typing.Optional["Add"], typing.Optional["Multiply"], typing.Optional["Power"]]]: + """Example of a property that accepts a union of types. + + stability + :stability: experimental + """ + return jsii.get(self, "unionProperty") + + @union_property.setter + def union_property(self, value: typing.Optional[typing.Union[typing.Optional["Add"], typing.Optional["Multiply"], typing.Optional["Power"]]]): + jsii.set(self, "unionProperty", value) @jsii.data_type(jsii_type="jsii-calc.CalculatorProps", jsii_struct_bases=[], name_mapping={'initial_value': 'initialValue', 'maximum_value': 'maximumValue'}) @@ -1575,39 +1700,6 @@ def __repr__(self) -> str: return 'DeprecatedStruct(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) -class DerivedClassHasNoProperties: - class Base(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.DerivedClassHasNoProperties.Base"): - """ - stability - :stability: experimental - """ - def __init__(self) -> None: - jsii.create(DerivedClassHasNoProperties.Base, self, []) - - @builtins.property - @jsii.member(jsii_name="prop") - def prop(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "prop") - - @prop.setter - def prop(self, value: str): - jsii.set(self, "prop", value) - - - class Derived(Base, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.DerivedClassHasNoProperties.Derived"): - """ - stability - :stability: experimental - """ - def __init__(self) -> None: - jsii.create(DerivedClassHasNoProperties.Derived, self, []) - - - @jsii.data_type(jsii_type="jsii-calc.DerivedStruct", jsii_struct_bases=[scope.jsii_calc_lib.MyFirstStruct], name_mapping={'anumber': 'anumber', 'astring': 'astring', 'first_optional': 'firstOptional', 'another_required': 'anotherRequired', 'bool': 'bool', 'non_primitive': 'nonPrimitive', 'another_optional': 'anotherOptional', 'optional_any': 'optionalAny', 'optional_array': 'optionalArray'}) class DerivedStruct(scope.jsii_calc_lib.MyFirstStruct): def __init__(self, *, anumber: jsii.Number, astring: str, first_optional: typing.Optional[typing.List[str]]=None, another_required: datetime.datetime, bool: bool, non_primitive: "DoubleTrouble", another_optional: typing.Optional[typing.Mapping[str,scope.jsii_calc_lib.Value]]=None, optional_any: typing.Any=None, optional_array: typing.Optional[typing.List[str]]=None): @@ -2496,32 +2588,6 @@ def provide_as_interface(self) -> "IAnonymouslyImplementMe": return jsii.invoke(self, "provideAsInterface", []) -@jsii.implements(IAnonymousImplementationProvider) -class AnonymousImplementationProvider(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.AnonymousImplementationProvider"): - """ - stability - :stability: experimental - """ - def __init__(self) -> None: - jsii.create(AnonymousImplementationProvider, self, []) - - @jsii.member(jsii_name="provideAsClass") - def provide_as_class(self) -> "Implementation": - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "provideAsClass", []) - - @jsii.member(jsii_name="provideAsInterface") - def provide_as_interface(self) -> "IAnonymouslyImplementMe": - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "provideAsInterface", []) - - @jsii.interface(jsii_type="jsii-calc.IAnonymouslyImplementMe") class IAnonymouslyImplementMe(jsii.compat.Protocol): """ @@ -2652,37 +2718,6 @@ def ring(self) -> None: return jsii.invoke(self, "ring", []) -@jsii.implements(IBell) -class Bell(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Bell"): - """ - stability - :stability: experimental - """ - def __init__(self) -> None: - jsii.create(Bell, self, []) - - @jsii.member(jsii_name="ring") - def ring(self) -> None: - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "ring", []) - - @builtins.property - @jsii.member(jsii_name="rung") - def rung(self) -> bool: - """ - stability - :stability: experimental - """ - return jsii.get(self, "rung") - - @rung.setter - def rung(self, value: bool): - jsii.set(self, "rung", value) - - @jsii.interface(jsii_type="jsii-calc.IBellRinger") class IBellRinger(jsii.compat.Protocol): """Takes the object parameter as an interface. @@ -3063,92 +3098,38 @@ def prop_from_interface(self) -> str: return jsii.get(self, "propFromInterface") -@jsii.implements(IInterfaceImplementedByAbstractClass) -class AbstractClass(AbstractClassBase, metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.AbstractClass"): +@jsii.interface(jsii_type="jsii-calc.IInterfaceWithInternal") +class IInterfaceWithInternal(jsii.compat.Protocol): """ stability :stability: experimental """ @builtins.staticmethod def __jsii_proxy_class__(): - return _AbstractClassProxy - - def __init__(self) -> None: - jsii.create(AbstractClass, self, []) + return _IInterfaceWithInternalProxy - @jsii.member(jsii_name="abstractMethod") - @abc.abstractmethod - def abstract_method(self, name: str) -> str: + @jsii.member(jsii_name="visible") + def visible(self) -> None: """ - :param name: - - stability :stability: experimental """ ... - @jsii.member(jsii_name="nonAbstractMethod") - def non_abstract_method(self) -> jsii.Number: + +class _IInterfaceWithInternalProxy(): + """ + stability + :stability: experimental + """ + __jsii_type__ = "jsii-calc.IInterfaceWithInternal" + @jsii.member(jsii_name="visible") + def visible(self) -> None: """ stability :stability: experimental """ - return jsii.invoke(self, "nonAbstractMethod", []) - - @builtins.property - @jsii.member(jsii_name="propFromInterface") - def prop_from_interface(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "propFromInterface") - - -class _AbstractClassProxy(AbstractClass, jsii.proxy_for(AbstractClassBase)): - @jsii.member(jsii_name="abstractMethod") - def abstract_method(self, name: str) -> str: - """ - :param name: - - - stability - :stability: experimental - """ - return jsii.invoke(self, "abstractMethod", [name]) - - -@jsii.interface(jsii_type="jsii-calc.IInterfaceWithInternal") -class IInterfaceWithInternal(jsii.compat.Protocol): - """ - stability - :stability: experimental - """ - @builtins.staticmethod - def __jsii_proxy_class__(): - return _IInterfaceWithInternalProxy - - @jsii.member(jsii_name="visible") - def visible(self) -> None: - """ - stability - :stability: experimental - """ - ... - - -class _IInterfaceWithInternalProxy(): - """ - stability - :stability: experimental - """ - __jsii_type__ = "jsii-calc.IInterfaceWithInternal" - @jsii.member(jsii_name="visible") - def visible(self) -> None: - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "visible", []) + return jsii.invoke(self, "visible", []) @jsii.interface(jsii_type="jsii-calc.IInterfaceWithMethods") @@ -3203,44 +3184,6 @@ def do_things(self) -> None: return jsii.invoke(self, "doThings", []) -@jsii.interface(jsii_type="jsii-calc.IInterfaceThatShouldNotBeADataType") -class IInterfaceThatShouldNotBeADataType(IInterfaceWithMethods, jsii.compat.Protocol): - """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. - - stability - :stability: experimental - """ - @builtins.staticmethod - def __jsii_proxy_class__(): - return _IInterfaceThatShouldNotBeADataTypeProxy - - @builtins.property - @jsii.member(jsii_name="otherValue") - def other_value(self) -> str: - """ - stability - :stability: experimental - """ - ... - - -class _IInterfaceThatShouldNotBeADataTypeProxy(jsii.proxy_for(IInterfaceWithMethods)): - """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. - - stability - :stability: experimental - """ - __jsii_type__ = "jsii-calc.IInterfaceThatShouldNotBeADataType" - @builtins.property - @jsii.member(jsii_name="otherValue") - def other_value(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "otherValue") - - @jsii.interface(jsii_type="jsii-calc.IInterfaceWithOptionalMethodArguments") class IInterfaceWithOptionalMethodArguments(jsii.compat.Protocol): """awslabs/jsii#175 Interface proxies (and builders) do not respect optional arguments in methods. @@ -3345,48 +3288,6 @@ def read_write_string(self, value: str): jsii.set(self, "readWriteString", value) -@jsii.implements(IInterfaceWithProperties) -class ClassWithPrivateConstructorAndAutomaticProperties(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.ClassWithPrivateConstructorAndAutomaticProperties"): - """Class that implements interface properties automatically, but using a private constructor. - - stability - :stability: experimental - """ - @jsii.member(jsii_name="create") - @builtins.classmethod - def create(cls, read_only_string: str, read_write_string: str) -> "ClassWithPrivateConstructorAndAutomaticProperties": - """ - :param read_only_string: - - :param read_write_string: - - - stability - :stability: experimental - """ - return jsii.sinvoke(cls, "create", [read_only_string, read_write_string]) - - @builtins.property - @jsii.member(jsii_name="readOnlyString") - def read_only_string(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "readOnlyString") - - @builtins.property - @jsii.member(jsii_name="readWriteString") - def read_write_string(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "readWriteString") - - @read_write_string.setter - def read_write_string(self, value: str): - jsii.set(self, "readWriteString", value) - - @jsii.interface(jsii_type="jsii-calc.IInterfaceWithPropertiesExtension") class IInterfaceWithPropertiesExtension(IInterfaceWithProperties, jsii.compat.Protocol): """ @@ -3483,74 +3384,6 @@ def foo(self) -> None: return jsii.invoke(self, "foo", []) -@jsii.interface(jsii_type="jsii-calc.IJSII417Derived") -class IJSII417Derived(IJSII417PublicBaseOfBase, jsii.compat.Protocol): - """ - stability - :stability: experimental - """ - @builtins.staticmethod - def __jsii_proxy_class__(): - return _IJSII417DerivedProxy - - @builtins.property - @jsii.member(jsii_name="property") - def property(self) -> str: - """ - stability - :stability: experimental - """ - ... - - @jsii.member(jsii_name="bar") - def bar(self) -> None: - """ - stability - :stability: experimental - """ - ... - - @jsii.member(jsii_name="baz") - def baz(self) -> None: - """ - stability - :stability: experimental - """ - ... - - -class _IJSII417DerivedProxy(jsii.proxy_for(IJSII417PublicBaseOfBase)): - """ - stability - :stability: experimental - """ - __jsii_type__ = "jsii-calc.IJSII417Derived" - @builtins.property - @jsii.member(jsii_name="property") - def property(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "property") - - @jsii.member(jsii_name="bar") - def bar(self) -> None: - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "bar", []) - - @jsii.member(jsii_name="baz") - def baz(self) -> None: - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "baz", []) - - @jsii.interface(jsii_type="jsii-calc.IJsii487External") class IJsii487External(jsii.compat.Protocol): """ @@ -3725,182 +3558,58 @@ def c(self, value: str): jsii.set(self, "c", value) -@jsii.implements(INonInternalInterface) -class ClassThatImplementsTheInternalInterface(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.ClassThatImplementsTheInternalInterface"): - """ +@jsii.interface(jsii_type="jsii-calc.IObjectWithProperty") +class IObjectWithProperty(jsii.compat.Protocol): + """Make sure that setters are properly called on objects with interfaces. + stability :stability: experimental """ - def __init__(self) -> None: - jsii.create(ClassThatImplementsTheInternalInterface, self, []) + @builtins.staticmethod + def __jsii_proxy_class__(): + return _IObjectWithPropertyProxy @builtins.property - @jsii.member(jsii_name="a") - def a(self) -> str: + @jsii.member(jsii_name="property") + def property(self) -> str: """ stability :stability: experimental """ - return jsii.get(self, "a") + ... - @a.setter - def a(self, value: str): - jsii.set(self, "a", value) + @property.setter + def property(self, value: str): + ... - @builtins.property - @jsii.member(jsii_name="b") - def b(self) -> str: + @jsii.member(jsii_name="wasSet") + def was_set(self) -> bool: """ stability :stability: experimental """ - return jsii.get(self, "b") + ... - @b.setter - def b(self, value: str): - jsii.set(self, "b", value) +class _IObjectWithPropertyProxy(): + """Make sure that setters are properly called on objects with interfaces. + + stability + :stability: experimental + """ + __jsii_type__ = "jsii-calc.IObjectWithProperty" @builtins.property - @jsii.member(jsii_name="c") - def c(self) -> str: + @jsii.member(jsii_name="property") + def property(self) -> str: """ stability :stability: experimental """ - return jsii.get(self, "c") + return jsii.get(self, "property") - @c.setter - def c(self, value: str): - jsii.set(self, "c", value) - - @builtins.property - @jsii.member(jsii_name="d") - def d(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "d") - - @d.setter - def d(self, value: str): - jsii.set(self, "d", value) - - -@jsii.implements(INonInternalInterface) -class ClassThatImplementsThePrivateInterface(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.ClassThatImplementsThePrivateInterface"): - """ - stability - :stability: experimental - """ - def __init__(self) -> None: - jsii.create(ClassThatImplementsThePrivateInterface, self, []) - - @builtins.property - @jsii.member(jsii_name="a") - def a(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "a") - - @a.setter - def a(self, value: str): - jsii.set(self, "a", value) - - @builtins.property - @jsii.member(jsii_name="b") - def b(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "b") - - @b.setter - def b(self, value: str): - jsii.set(self, "b", value) - - @builtins.property - @jsii.member(jsii_name="c") - def c(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "c") - - @c.setter - def c(self, value: str): - jsii.set(self, "c", value) - - @builtins.property - @jsii.member(jsii_name="e") - def e(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "e") - - @e.setter - def e(self, value: str): - jsii.set(self, "e", value) - - -@jsii.interface(jsii_type="jsii-calc.IObjectWithProperty") -class IObjectWithProperty(jsii.compat.Protocol): - """Make sure that setters are properly called on objects with interfaces. - - stability - :stability: experimental - """ - @builtins.staticmethod - def __jsii_proxy_class__(): - return _IObjectWithPropertyProxy - - @builtins.property - @jsii.member(jsii_name="property") - def property(self) -> str: - """ - stability - :stability: experimental - """ - ... - - @property.setter - def property(self, value: str): - ... - - @jsii.member(jsii_name="wasSet") - def was_set(self) -> bool: - """ - stability - :stability: experimental - """ - ... - - -class _IObjectWithPropertyProxy(): - """Make sure that setters are properly called on objects with interfaces. - - stability - :stability: experimental - """ - __jsii_type__ = "jsii-calc.IObjectWithProperty" - @builtins.property - @jsii.member(jsii_name="property") - def property(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "property") - - @property.setter - def property(self, value: str): - jsii.set(self, "property", value) + @property.setter + def property(self, value: str): + jsii.set(self, "property", value) @jsii.member(jsii_name="wasSet") def was_set(self) -> bool: @@ -4095,54 +3804,6 @@ def next(self) -> jsii.Number: return jsii.invoke(self, "next", []) -@jsii.interface(jsii_type="jsii-calc.IFriendlyRandomGenerator") -class IFriendlyRandomGenerator(IRandomNumberGenerator, scope.jsii_calc_lib.IFriendly, jsii.compat.Protocol): - """ - stability - :stability: experimental - """ - @builtins.staticmethod - def __jsii_proxy_class__(): - return _IFriendlyRandomGeneratorProxy - - pass - -class _IFriendlyRandomGeneratorProxy(jsii.proxy_for(IRandomNumberGenerator), jsii.proxy_for(scope.jsii_calc_lib.IFriendly)): - """ - stability - :stability: experimental - """ - __jsii_type__ = "jsii-calc.IFriendlyRandomGenerator" - pass - -@jsii.implements(IFriendlyRandomGenerator) -class DoubleTrouble(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.DoubleTrouble"): - """ - stability - :stability: experimental - """ - def __init__(self) -> None: - jsii.create(DoubleTrouble, self, []) - - @jsii.member(jsii_name="hello") - def hello(self) -> str: - """Say hello! - - stability - :stability: experimental - """ - return jsii.invoke(self, "hello", []) - - @jsii.member(jsii_name="next") - def next(self) -> jsii.Number: - """Returns another random number. - - stability - :stability: experimental - """ - return jsii.invoke(self, "next", []) - - @jsii.interface(jsii_type="jsii-calc.IReturnJsii976") class IReturnJsii976(jsii.compat.Protocol): """Returns a subclass of a known class which implements an interface. @@ -4482,94 +4143,6 @@ def map_of_structs(cls) -> typing.Mapping[str,"StructA"]: return jsii.sinvoke(cls, "mapOfStructs", []) -class InterfaceInNamespaceIncludesClasses: - class Foo(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.InterfaceInNamespaceIncludesClasses.Foo"): - """ - stability - :stability: experimental - """ - def __init__(self) -> None: - jsii.create(InterfaceInNamespaceIncludesClasses.Foo, self, []) - - @builtins.property - @jsii.member(jsii_name="bar") - def bar(self) -> typing.Optional[str]: - """ - stability - :stability: experimental - """ - return jsii.get(self, "bar") - - @bar.setter - def bar(self, value: typing.Optional[str]): - jsii.set(self, "bar", value) - - - @jsii.data_type(jsii_type="jsii-calc.InterfaceInNamespaceIncludesClasses.Hello", jsii_struct_bases=[], name_mapping={'foo': 'foo'}) - class Hello(): - def __init__(self, *, foo: jsii.Number): - """ - :param foo: - - stability - :stability: experimental - """ - self._values = { - 'foo': foo, - } - - @builtins.property - def foo(self) -> jsii.Number: - """ - stability - :stability: experimental - """ - return self._values.get('foo') - - def __eq__(self, rhs) -> bool: - return isinstance(rhs, self.__class__) and rhs._values == self._values - - def __ne__(self, rhs) -> bool: - return not (rhs == self) - - def __repr__(self) -> str: - return 'Hello(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) - - - -class InterfaceInNamespaceOnlyInterface: - @jsii.data_type(jsii_type="jsii-calc.InterfaceInNamespaceOnlyInterface.Hello", jsii_struct_bases=[], name_mapping={'foo': 'foo'}) - class Hello(): - def __init__(self, *, foo: jsii.Number): - """ - :param foo: - - stability - :stability: experimental - """ - self._values = { - 'foo': foo, - } - - @builtins.property - def foo(self) -> jsii.Number: - """ - stability - :stability: experimental - """ - return self._values.get('foo') - - def __eq__(self, rhs) -> bool: - return isinstance(rhs, self.__class__) and rhs._values == self._values - - def __ne__(self, rhs) -> bool: - return not (rhs == self) - - def __repr__(self) -> str: - return 'Hello(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) - - - class InterfacesMaker(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.InterfacesMaker"): """We can return arrays of interfaces See aws/aws-cdk#2362. @@ -4623,46 +4196,6 @@ def has_root(self) -> bool: return jsii.get(self, "hasRoot") -class JSII417Derived(JSII417PublicBaseOfBase, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.JSII417Derived"): - """ - stability - :stability: experimental - """ - def __init__(self, property: str) -> None: - """ - :param property: - - - stability - :stability: experimental - """ - jsii.create(JSII417Derived, self, [property]) - - @jsii.member(jsii_name="bar") - def bar(self) -> None: - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "bar", []) - - @jsii.member(jsii_name="baz") - def baz(self) -> None: - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "baz", []) - - @builtins.property - @jsii.member(jsii_name="property") - def _property(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.get(self, "property") - - class JSObjectLiteralForInterface(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.JSObjectLiteralForInterface"): """ stability @@ -6119,55 +5652,14 @@ def __repr__(self) -> str: return 'ParentStruct982(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) -@jsii.data_type(jsii_type="jsii-calc.ChildStruct982", jsii_struct_bases=[ParentStruct982], name_mapping={'foo': 'foo', 'bar': 'bar'}) -class ChildStruct982(ParentStruct982): - def __init__(self, *, foo: str, bar: jsii.Number): - """ - :param foo: - :param bar: - - stability - :stability: experimental - """ - self._values = { - 'foo': foo, - 'bar': bar, - } - - @builtins.property - def foo(self) -> str: - """ - stability - :stability: experimental - """ - return self._values.get('foo') - - @builtins.property - def bar(self) -> jsii.Number: - """ - stability - :stability: experimental - """ - return self._values.get('bar') - - def __eq__(self, rhs) -> bool: - return isinstance(rhs, self.__class__) and rhs._values == self._values - - def __ne__(self, rhs) -> bool: - return not (rhs == self) - - def __repr__(self) -> str: - return 'ChildStruct982(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) - - -class PartiallyInitializedThisConsumer(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.PartiallyInitializedThisConsumer"): - """ - stability - :stability: experimental - """ - @builtins.staticmethod - def __jsii_proxy_class__(): - return _PartiallyInitializedThisConsumerProxy +class PartiallyInitializedThisConsumer(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.PartiallyInitializedThisConsumer"): + """ + stability + :stability: experimental + """ + @builtins.staticmethod + def __jsii_proxy_class__(): + return _PartiallyInitializedThisConsumerProxy def __init__(self) -> None: jsii.create(PartiallyInitializedThisConsumer, self, []) @@ -6219,6 +5711,56 @@ def say_hello(self, friendly: scope.jsii_calc_lib.IFriendly) -> str: return jsii.invoke(self, "sayHello", [friendly]) +class Power(composition.CompositeOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Power"): + """The power operation. + + stability + :stability: experimental + """ + def __init__(self, base: scope.jsii_calc_lib.Value, pow: scope.jsii_calc_lib.Value) -> None: + """Creates a Power operation. + + :param base: The base of the power. + :param pow: The number of times to multiply. + + stability + :stability: experimental + """ + jsii.create(Power, self, [base, pow]) + + @builtins.property + @jsii.member(jsii_name="base") + def base(self) -> scope.jsii_calc_lib.Value: + """The base of the power. + + stability + :stability: experimental + """ + return jsii.get(self, "base") + + @builtins.property + @jsii.member(jsii_name="expression") + def expression(self) -> scope.jsii_calc_lib.Value: + """The expression that this operation consists of. + + Must be implemented by derived classes. + + stability + :stability: experimental + """ + return jsii.get(self, "expression") + + @builtins.property + @jsii.member(jsii_name="pow") + def pow(self) -> scope.jsii_calc_lib.Value: + """The number of times to multiply. + + stability + :stability: experimental + """ + return jsii.get(self, "pow") + + class PropertyNamedProperty(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.PropertyNamedProperty"): """Reproduction for https://github.com/aws/jsii/issues/1113 Where a method or property named "property" would result in impossible to load Python code. @@ -6264,24 +5806,6 @@ def hello(self) -> None: return jsii.invoke(self, "hello", []) -@jsii.implements(IPublicInterface2) -class InbetweenClass(PublicClass, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.InbetweenClass"): - """ - stability - :stability: experimental - """ - def __init__(self) -> None: - jsii.create(InbetweenClass, self, []) - - @jsii.member(jsii_name="ciao") - def ciao(self) -> str: - """ - stability - :stability: experimental - """ - return jsii.invoke(self, "ciao", []) - - class PythonReservedWords(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.PythonReservedWords"): """ stability @@ -7439,6 +6963,46 @@ def __repr__(self) -> str: return 'StructWithJavaReservedWords(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) +class Sum(composition.CompositeOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Sum"): + """An operation that sums multiple values. + + stability + :stability: experimental + """ + def __init__(self) -> None: + """ + stability + :stability: experimental + """ + jsii.create(Sum, self, []) + + @builtins.property + @jsii.member(jsii_name="expression") + def expression(self) -> scope.jsii_calc_lib.Value: + """The expression that this operation consists of. + + Must be implemented by derived classes. + + stability + :stability: experimental + """ + return jsii.get(self, "expression") + + @builtins.property + @jsii.member(jsii_name="parts") + def parts(self) -> typing.List[scope.jsii_calc_lib.Value]: + """The parts to sum. + + stability + :stability: experimental + """ + return jsii.get(self, "parts") + + @parts.setter + def parts(self, value: typing.List[scope.jsii_calc_lib.Value]): + jsii.set(self, "parts", value) + + @jsii.data_type(jsii_type="jsii-calc.SupportsNiceJavaBuilderProps", jsii_struct_bases=[], name_mapping={'bar': 'bar', 'id': 'id'}) class SupportsNiceJavaBuilderProps(): def __init__(self, *, bar: jsii.Number, id: typing.Optional[str]=None): @@ -7532,43 +7096,6 @@ def prop_id(self) -> typing.Optional[str]: return jsii.get(self, "propId") -class SupportsNiceJavaBuilder(SupportsNiceJavaBuilderWithRequiredProps, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.SupportsNiceJavaBuilder"): - """ - stability - :stability: experimental - """ - def __init__(self, id: jsii.Number, default_bar: typing.Optional[jsii.Number]=None, props: typing.Optional["SupportsNiceJavaBuilderProps"]=None, *rest: str) -> None: - """ - :param id: some identifier. - :param default_bar: the default value of ``bar``. - :param props: some props once can provide. - :param rest: a variadic continuation. - - stability - :stability: experimental - """ - jsii.create(SupportsNiceJavaBuilder, self, [id, default_bar, props, *rest]) - - @builtins.property - @jsii.member(jsii_name="id") - def id(self) -> jsii.Number: - """some identifier. - - stability - :stability: experimental - """ - return jsii.get(self, "id") - - @builtins.property - @jsii.member(jsii_name="rest") - def rest(self) -> typing.List[str]: - """ - stability - :stability: experimental - """ - return jsii.get(self, "rest") - - class SyncVirtualMethods(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.SyncVirtualMethods"): """ stability @@ -7843,69 +7370,6 @@ def operand(self) -> scope.jsii_calc_lib.Value: class _UnaryOperationProxy(UnaryOperation, jsii.proxy_for(scope.jsii_calc_lib.Operation)): pass -@jsii.implements(IFriendlier) -class Negate(UnaryOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Negate"): - """The negation operation ("-value"). - - stability - :stability: experimental - """ - def __init__(self, operand: scope.jsii_calc_lib.Value) -> None: - """ - :param operand: - - - stability - :stability: experimental - """ - jsii.create(Negate, self, [operand]) - - @jsii.member(jsii_name="farewell") - def farewell(self) -> str: - """Say farewell. - - stability - :stability: experimental - """ - return jsii.invoke(self, "farewell", []) - - @jsii.member(jsii_name="goodbye") - def goodbye(self) -> str: - """Say goodbye. - - stability - :stability: experimental - """ - return jsii.invoke(self, "goodbye", []) - - @jsii.member(jsii_name="hello") - def hello(self) -> str: - """Say hello! - - stability - :stability: experimental - """ - return jsii.invoke(self, "hello", []) - - @jsii.member(jsii_name="toString") - def to_string(self) -> str: - """String representation of the value. - - stability - :stability: experimental - """ - return jsii.invoke(self, "toString", []) - - @builtins.property - @jsii.member(jsii_name="value") - def value(self) -> jsii.Number: - """The value. - - stability - :stability: experimental - """ - return jsii.get(self, "value") - - @jsii.data_type(jsii_type="jsii-calc.UnionProperties", jsii_struct_bases=[], name_mapping={'bar': 'bar', 'foo': 'foo'}) class UnionProperties(): def __init__(self, *, bar: typing.Union[str, jsii.Number, "AllTypes"], foo: typing.Optional[typing.Union[typing.Optional[str], typing.Optional[jsii.Number]]]=None): @@ -8223,381 +7687,673 @@ def success(self) -> bool: return jsii.get(self, "success") -class composition: - class CompositeOperation(scope.jsii_calc_lib.Operation, metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.composition.CompositeOperation"): - """Abstract operation composed from an expression of other operations. - - stability - :stability: experimental - """ - @builtins.staticmethod - def __jsii_proxy_class__(): - return _CompositeOperationProxy - - def __init__(self) -> None: - jsii.create(composition.CompositeOperation, self, []) - - @jsii.member(jsii_name="toString") - def to_string(self) -> str: - """String representation of the value. - - stability - :stability: experimental - """ - return jsii.invoke(self, "toString", []) +@jsii.implements(IInterfaceImplementedByAbstractClass) +class AbstractClass(AbstractClassBase, metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.AbstractClass"): + """ + stability + :stability: experimental + """ + @builtins.staticmethod + def __jsii_proxy_class__(): + return _AbstractClassProxy - @builtins.property - @jsii.member(jsii_name="expression") - @abc.abstractmethod - def expression(self) -> scope.jsii_calc_lib.Value: - """The expression that this operation consists of. + def __init__(self) -> None: + jsii.create(AbstractClass, self, []) - Must be implemented by derived classes. + @jsii.member(jsii_name="abstractMethod") + @abc.abstractmethod + def abstract_method(self, name: str) -> str: + """ + :param name: - - stability - :stability: experimental - """ - ... + stability + :stability: experimental + """ + ... - @builtins.property - @jsii.member(jsii_name="value") - def value(self) -> jsii.Number: - """The value. + @jsii.member(jsii_name="nonAbstractMethod") + def non_abstract_method(self) -> jsii.Number: + """ + stability + :stability: experimental + """ + return jsii.invoke(self, "nonAbstractMethod", []) - stability - :stability: experimental - """ - return jsii.get(self, "value") + @builtins.property + @jsii.member(jsii_name="propFromInterface") + def prop_from_interface(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "propFromInterface") - @builtins.property - @jsii.member(jsii_name="decorationPostfixes") - def decoration_postfixes(self) -> typing.List[str]: - """A set of postfixes to include in a decorated .toString(). - stability - :stability: experimental - """ - return jsii.get(self, "decorationPostfixes") +class _AbstractClassProxy(AbstractClass, jsii.proxy_for(AbstractClassBase)): + @jsii.member(jsii_name="abstractMethod") + def abstract_method(self, name: str) -> str: + """ + :param name: - - @decoration_postfixes.setter - def decoration_postfixes(self, value: typing.List[str]): - jsii.set(self, "decorationPostfixes", value) + stability + :stability: experimental + """ + return jsii.invoke(self, "abstractMethod", [name]) - @builtins.property - @jsii.member(jsii_name="decorationPrefixes") - def decoration_prefixes(self) -> typing.List[str]: - """A set of prefixes to include in a decorated .toString(). - stability - :stability: experimental - """ - return jsii.get(self, "decorationPrefixes") +class Add(BinaryOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Add"): + """The "+" binary operation. - @decoration_prefixes.setter - def decoration_prefixes(self, value: typing.List[str]): - jsii.set(self, "decorationPrefixes", value) + stability + :stability: experimental + """ + def __init__(self, lhs: scope.jsii_calc_lib.Value, rhs: scope.jsii_calc_lib.Value) -> None: + """Creates a BinaryOperation. - @builtins.property - @jsii.member(jsii_name="stringStyle") - def string_style(self) -> "CompositionStringStyle": - """The .toString() style. + :param lhs: Left-hand side operand. + :param rhs: Right-hand side operand. - stability - :stability: experimental - """ - return jsii.get(self, "stringStyle") + stability + :stability: experimental + """ + jsii.create(Add, self, [lhs, rhs]) - @string_style.setter - def string_style(self, value: "CompositionStringStyle"): - jsii.set(self, "stringStyle", value) + @jsii.member(jsii_name="toString") + def to_string(self) -> str: + """String representation of the value. - @jsii.enum(jsii_type="jsii-calc.composition.CompositeOperation.CompositionStringStyle") - class CompositionStringStyle(enum.Enum): - """Style of .toString() output for CompositeOperation. + stability + :stability: experimental + """ + return jsii.invoke(self, "toString", []) - stability - :stability: experimental - """ - NORMAL = "NORMAL" - """Normal string expression. + @builtins.property + @jsii.member(jsii_name="value") + def value(self) -> jsii.Number: + """The value. - stability - :stability: experimental - """ - DECORATED = "DECORATED" - """Decorated string expression. + stability + :stability: experimental + """ + return jsii.get(self, "value") - stability - :stability: experimental - """ - - - class _CompositeOperationProxy(CompositeOperation, jsii.proxy_for(scope.jsii_calc_lib.Operation)): - @builtins.property - @jsii.member(jsii_name="expression") - def expression(self) -> scope.jsii_calc_lib.Value: - """The expression that this operation consists of. - - Must be implemented by derived classes. - - stability - :stability: experimental - """ - return jsii.get(self, "expression") +@jsii.implements(IAnonymousImplementationProvider) +class AnonymousImplementationProvider(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.AnonymousImplementationProvider"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + jsii.create(AnonymousImplementationProvider, self, []) + @jsii.member(jsii_name="provideAsClass") + def provide_as_class(self) -> "Implementation": + """ + stability + :stability: experimental + """ + return jsii.invoke(self, "provideAsClass", []) -class Calculator(composition.CompositeOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Calculator"): - """A calculator which maintains a current value and allows adding operations. + @jsii.member(jsii_name="provideAsInterface") + def provide_as_interface(self) -> "IAnonymouslyImplementMe": + """ + stability + :stability: experimental + """ + return jsii.invoke(self, "provideAsInterface", []) - Here's how you use it:: - # Example automatically generated. See https://github.com/aws/jsii/issues/826 - calculator = calc.Calculator() - calculator.add(5) - calculator.mul(3) - print(calculator.expression.value) +@jsii.implements(IBell) +class Bell(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Bell"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + jsii.create(Bell, self, []) + + @jsii.member(jsii_name="ring") + def ring(self) -> None: + """ + stability + :stability: experimental + """ + return jsii.invoke(self, "ring", []) + + @builtins.property + @jsii.member(jsii_name="rung") + def rung(self) -> bool: + """ + stability + :stability: experimental + """ + return jsii.get(self, "rung") + + @rung.setter + def rung(self, value: bool): + jsii.set(self, "rung", value) + + +@jsii.data_type(jsii_type="jsii-calc.ChildStruct982", jsii_struct_bases=[ParentStruct982], name_mapping={'foo': 'foo', 'bar': 'bar'}) +class ChildStruct982(ParentStruct982): + def __init__(self, *, foo: str, bar: jsii.Number): + """ + :param foo: + :param bar: + + stability + :stability: experimental + """ + self._values = { + 'foo': foo, + 'bar': bar, + } + + @builtins.property + def foo(self) -> str: + """ + stability + :stability: experimental + """ + return self._values.get('foo') + + @builtins.property + def bar(self) -> jsii.Number: + """ + stability + :stability: experimental + """ + return self._values.get('bar') + + def __eq__(self, rhs) -> bool: + return isinstance(rhs, self.__class__) and rhs._values == self._values + + def __ne__(self, rhs) -> bool: + return not (rhs == self) + + def __repr__(self) -> str: + return 'ChildStruct982(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) + + +@jsii.implements(INonInternalInterface) +class ClassThatImplementsTheInternalInterface(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.ClassThatImplementsTheInternalInterface"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + jsii.create(ClassThatImplementsTheInternalInterface, self, []) + + @builtins.property + @jsii.member(jsii_name="a") + def a(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "a") + + @a.setter + def a(self, value: str): + jsii.set(self, "a", value) + + @builtins.property + @jsii.member(jsii_name="b") + def b(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "b") + + @b.setter + def b(self, value: str): + jsii.set(self, "b", value) + + @builtins.property + @jsii.member(jsii_name="c") + def c(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "c") + + @c.setter + def c(self, value: str): + jsii.set(self, "c", value) + + @builtins.property + @jsii.member(jsii_name="d") + def d(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "d") + + @d.setter + def d(self, value: str): + jsii.set(self, "d", value) + + +@jsii.implements(INonInternalInterface) +class ClassThatImplementsThePrivateInterface(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.ClassThatImplementsThePrivateInterface"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + jsii.create(ClassThatImplementsThePrivateInterface, self, []) + + @builtins.property + @jsii.member(jsii_name="a") + def a(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "a") + + @a.setter + def a(self, value: str): + jsii.set(self, "a", value) + + @builtins.property + @jsii.member(jsii_name="b") + def b(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "b") + + @b.setter + def b(self, value: str): + jsii.set(self, "b", value) + + @builtins.property + @jsii.member(jsii_name="c") + def c(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "c") + + @c.setter + def c(self, value: str): + jsii.set(self, "c", value) + + @builtins.property + @jsii.member(jsii_name="e") + def e(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "e") + + @e.setter + def e(self, value: str): + jsii.set(self, "e", value) + + +@jsii.implements(IInterfaceWithProperties) +class ClassWithPrivateConstructorAndAutomaticProperties(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.ClassWithPrivateConstructorAndAutomaticProperties"): + """Class that implements interface properties automatically, but using a private constructor. + + stability + :stability: experimental + """ + @jsii.member(jsii_name="create") + @builtins.classmethod + def create(cls, read_only_string: str, read_write_string: str) -> "ClassWithPrivateConstructorAndAutomaticProperties": + """ + :param read_only_string: - + :param read_write_string: - + + stability + :stability: experimental + """ + return jsii.sinvoke(cls, "create", [read_only_string, read_write_string]) + + @builtins.property + @jsii.member(jsii_name="readOnlyString") + def read_only_string(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "readOnlyString") + + @builtins.property + @jsii.member(jsii_name="readWriteString") + def read_write_string(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "readWriteString") + + @read_write_string.setter + def read_write_string(self, value: str): + jsii.set(self, "readWriteString", value) + + +@jsii.interface(jsii_type="jsii-calc.IFriendlyRandomGenerator") +class IFriendlyRandomGenerator(IRandomNumberGenerator, scope.jsii_calc_lib.IFriendly, jsii.compat.Protocol): + """ + stability + :stability: experimental + """ + @builtins.staticmethod + def __jsii_proxy_class__(): + return _IFriendlyRandomGeneratorProxy + + pass + +class _IFriendlyRandomGeneratorProxy(jsii.proxy_for(IRandomNumberGenerator), jsii.proxy_for(scope.jsii_calc_lib.IFriendly)): + """ + stability + :stability: experimental + """ + __jsii_type__ = "jsii-calc.IFriendlyRandomGenerator" + pass + +@jsii.interface(jsii_type="jsii-calc.IInterfaceThatShouldNotBeADataType") +class IInterfaceThatShouldNotBeADataType(IInterfaceWithMethods, jsii.compat.Protocol): + """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. + + stability + :stability: experimental + """ + @builtins.staticmethod + def __jsii_proxy_class__(): + return _IInterfaceThatShouldNotBeADataTypeProxy + + @builtins.property + @jsii.member(jsii_name="otherValue") + def other_value(self) -> str: + """ + stability + :stability: experimental + """ + ... + + +class _IInterfaceThatShouldNotBeADataTypeProxy(jsii.proxy_for(IInterfaceWithMethods)): + """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. + + stability + :stability: experimental + """ + __jsii_type__ = "jsii-calc.IInterfaceThatShouldNotBeADataType" + @builtins.property + @jsii.member(jsii_name="otherValue") + def other_value(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "otherValue") + + +@jsii.interface(jsii_type="jsii-calc.IJSII417Derived") +class IJSII417Derived(IJSII417PublicBaseOfBase, jsii.compat.Protocol): + """ + stability + :stability: experimental + """ + @builtins.staticmethod + def __jsii_proxy_class__(): + return _IJSII417DerivedProxy + + @builtins.property + @jsii.member(jsii_name="property") + def property(self) -> str: + """ + stability + :stability: experimental + """ + ... + + @jsii.member(jsii_name="bar") + def bar(self) -> None: + """ + stability + :stability: experimental + """ + ... + + @jsii.member(jsii_name="baz") + def baz(self) -> None: + """ + stability + :stability: experimental + """ + ... - I will repeat this example again, but in an @example tag. +class _IJSII417DerivedProxy(jsii.proxy_for(IJSII417PublicBaseOfBase)): + """ stability :stability: experimental - - Example:: - - # Example automatically generated. See https://github.com/aws/jsii/issues/826 - calculator = calc.Calculator() - calculator.add(5) - calculator.mul(3) - print(calculator.expression.value) """ - def __init__(self, *, initial_value: typing.Optional[jsii.Number]=None, maximum_value: typing.Optional[jsii.Number]=None) -> None: - """Creates a Calculator object. - - :param initial_value: The initial value of the calculator. NOTE: Any number works here, it's fine. Default: 0 - :param maximum_value: The maximum value the calculator can store. Default: none + __jsii_type__ = "jsii-calc.IJSII417Derived" + @builtins.property + @jsii.member(jsii_name="property") + def property(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "property") + @jsii.member(jsii_name="bar") + def bar(self) -> None: + """ stability :stability: experimental """ - props = CalculatorProps(initial_value=initial_value, maximum_value=maximum_value) + return jsii.invoke(self, "bar", []) - jsii.create(Calculator, self, [props]) + @jsii.member(jsii_name="baz") + def baz(self) -> None: + """ + stability + :stability: experimental + """ + return jsii.invoke(self, "baz", []) - @jsii.member(jsii_name="add") - def add(self, value: jsii.Number) -> None: - """Adds a number to the current value. - :param value: - +@jsii.implements(IPublicInterface2) +class InbetweenClass(PublicClass, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.InbetweenClass"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + jsii.create(InbetweenClass, self, []) + @jsii.member(jsii_name="ciao") + def ciao(self) -> str: + """ stability :stability: experimental """ - return jsii.invoke(self, "add", [value]) + return jsii.invoke(self, "ciao", []) - @jsii.member(jsii_name="mul") - def mul(self, value: jsii.Number) -> None: - """Multiplies the current value by a number. - :param value: - +class JSII417Derived(JSII417PublicBaseOfBase, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.JSII417Derived"): + """ + stability + :stability: experimental + """ + def __init__(self, property: str) -> None: + """ + :param property: - stability :stability: experimental """ - return jsii.invoke(self, "mul", [value]) - - @jsii.member(jsii_name="neg") - def neg(self) -> None: - """Negates the current value. + jsii.create(JSII417Derived, self, [property]) + @jsii.member(jsii_name="bar") + def bar(self) -> None: + """ stability :stability: experimental """ - return jsii.invoke(self, "neg", []) - - @jsii.member(jsii_name="pow") - def pow(self, value: jsii.Number) -> None: - """Raises the current value by a power. - - :param value: - + return jsii.invoke(self, "bar", []) + @jsii.member(jsii_name="baz") + def baz(self) -> None: + """ stability :stability: experimental """ - return jsii.invoke(self, "pow", [value]) - - @jsii.member(jsii_name="readUnionValue") - def read_union_value(self) -> jsii.Number: - """Returns teh value of the union property (if defined). + return jsii.invoke(self, "baz", []) + @builtins.property + @jsii.member(jsii_name="property") + def _property(self) -> str: + """ stability :stability: experimental """ - return jsii.invoke(self, "readUnionValue", []) + return jsii.get(self, "property") - @builtins.property - @jsii.member(jsii_name="expression") - def expression(self) -> scope.jsii_calc_lib.Value: - """Returns the expression. + +@jsii.implements(IFriendlier) +class Negate(UnaryOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Negate"): + """The negation operation ("-value"). + + stability + :stability: experimental + """ + def __init__(self, operand: scope.jsii_calc_lib.Value) -> None: + """ + :param operand: - stability :stability: experimental """ - return jsii.get(self, "expression") + jsii.create(Negate, self, [operand]) - @builtins.property - @jsii.member(jsii_name="operationsLog") - def operations_log(self) -> typing.List[scope.jsii_calc_lib.Value]: - """A log of all operations. + @jsii.member(jsii_name="farewell") + def farewell(self) -> str: + """Say farewell. stability :stability: experimental """ - return jsii.get(self, "operationsLog") + return jsii.invoke(self, "farewell", []) - @builtins.property - @jsii.member(jsii_name="operationsMap") - def operations_map(self) -> typing.Mapping[str,typing.List[scope.jsii_calc_lib.Value]]: - """A map of per operation name of all operations performed. + @jsii.member(jsii_name="goodbye") + def goodbye(self) -> str: + """Say goodbye. stability :stability: experimental """ - return jsii.get(self, "operationsMap") + return jsii.invoke(self, "goodbye", []) - @builtins.property - @jsii.member(jsii_name="curr") - def curr(self) -> scope.jsii_calc_lib.Value: - """The current value. + @jsii.member(jsii_name="hello") + def hello(self) -> str: + """Say hello! stability :stability: experimental """ - return jsii.get(self, "curr") - - @curr.setter - def curr(self, value: scope.jsii_calc_lib.Value): - jsii.set(self, "curr", value) + return jsii.invoke(self, "hello", []) - @builtins.property - @jsii.member(jsii_name="maxValue") - def max_value(self) -> typing.Optional[jsii.Number]: - """The maximum value allows in this calculator. + @jsii.member(jsii_name="toString") + def to_string(self) -> str: + """String representation of the value. stability :stability: experimental """ - return jsii.get(self, "maxValue") - - @max_value.setter - def max_value(self, value: typing.Optional[jsii.Number]): - jsii.set(self, "maxValue", value) + return jsii.invoke(self, "toString", []) @builtins.property - @jsii.member(jsii_name="unionProperty") - def union_property(self) -> typing.Optional[typing.Union[typing.Optional["Add"], typing.Optional["Multiply"], typing.Optional["Power"]]]: - """Example of a property that accepts a union of types. + @jsii.member(jsii_name="value") + def value(self) -> jsii.Number: + """The value. stability :stability: experimental """ - return jsii.get(self, "unionProperty") - - @union_property.setter - def union_property(self, value: typing.Optional[typing.Union[typing.Optional["Add"], typing.Optional["Multiply"], typing.Optional["Power"]]]): - jsii.set(self, "unionProperty", value) - + return jsii.get(self, "value") -class Power(composition.CompositeOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Power"): - """The power operation. +class SupportsNiceJavaBuilder(SupportsNiceJavaBuilderWithRequiredProps, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.SupportsNiceJavaBuilder"): + """ stability :stability: experimental """ - def __init__(self, base: scope.jsii_calc_lib.Value, pow: scope.jsii_calc_lib.Value) -> None: - """Creates a Power operation. - - :param base: The base of the power. - :param pow: The number of times to multiply. - - stability - :stability: experimental + def __init__(self, id: jsii.Number, default_bar: typing.Optional[jsii.Number]=None, props: typing.Optional["SupportsNiceJavaBuilderProps"]=None, *rest: str) -> None: """ - jsii.create(Power, self, [base, pow]) - - @builtins.property - @jsii.member(jsii_name="base") - def base(self) -> scope.jsii_calc_lib.Value: - """The base of the power. + :param id: some identifier. + :param default_bar: the default value of ``bar``. + :param props: some props once can provide. + :param rest: a variadic continuation. stability :stability: experimental """ - return jsii.get(self, "base") + jsii.create(SupportsNiceJavaBuilder, self, [id, default_bar, props, *rest]) @builtins.property - @jsii.member(jsii_name="expression") - def expression(self) -> scope.jsii_calc_lib.Value: - """The expression that this operation consists of. - - Must be implemented by derived classes. + @jsii.member(jsii_name="id") + def id(self) -> jsii.Number: + """some identifier. stability :stability: experimental """ - return jsii.get(self, "expression") + return jsii.get(self, "id") @builtins.property - @jsii.member(jsii_name="pow") - def pow(self) -> scope.jsii_calc_lib.Value: - """The number of times to multiply. - + @jsii.member(jsii_name="rest") + def rest(self) -> typing.List[str]: + """ stability :stability: experimental """ - return jsii.get(self, "pow") - + return jsii.get(self, "rest") -class Sum(composition.CompositeOperation, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Sum"): - """An operation that sums multiple values. +@jsii.implements(IFriendlyRandomGenerator) +class DoubleTrouble(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.DoubleTrouble"): + """ stability :stability: experimental """ def __init__(self) -> None: - """ - stability - :stability: experimental - """ - jsii.create(Sum, self, []) - - @builtins.property - @jsii.member(jsii_name="expression") - def expression(self) -> scope.jsii_calc_lib.Value: - """The expression that this operation consists of. + jsii.create(DoubleTrouble, self, []) - Must be implemented by derived classes. + @jsii.member(jsii_name="hello") + def hello(self) -> str: + """Say hello! stability :stability: experimental """ - return jsii.get(self, "expression") + return jsii.invoke(self, "hello", []) - @builtins.property - @jsii.member(jsii_name="parts") - def parts(self) -> typing.List[scope.jsii_calc_lib.Value]: - """The parts to sum. + @jsii.member(jsii_name="next") + def next(self) -> jsii.Number: + """Returns another random number. stability :stability: experimental """ - return jsii.get(self, "parts") - - @parts.setter - def parts(self, value: typing.List[scope.jsii_calc_lib.Value]): - jsii.set(self, "parts", value) + return jsii.invoke(self, "next", []) -__all__ = ["AbstractClass", "AbstractClassBase", "AbstractClassReturner", "AbstractSuite", "Add", "AllTypes", "AllTypesEnum", "AllowedMethodNames", "AmbiguousParameters", "AnonymousImplementationProvider", "AsyncVirtualMethods", "AugmentableClass", "BaseJsii976", "Bell", "BinaryOperation", "Calculator", "CalculatorProps", "ChildStruct982", "ClassThatImplementsTheInternalInterface", "ClassThatImplementsThePrivateInterface", "ClassWithCollections", "ClassWithDocs", "ClassWithJavaReservedWords", "ClassWithMutableObjectLiteralProperty", "ClassWithPrivateConstructorAndAutomaticProperties", "ConfusingToJackson", "ConfusingToJacksonStruct", "ConstructorPassesThisOut", "Constructors", "ConsumePureInterface", "ConsumerCanRingBell", "ConsumersOfThisCrazyTypeSystem", "DataRenderer", "DefaultedConstructorArgument", "Demonstrate982", "DeprecatedClass", "DeprecatedEnum", "DeprecatedStruct", "DerivedClassHasNoProperties", "DerivedStruct", "DiamondInheritanceBaseLevelStruct", "DiamondInheritanceFirstMidLevelStruct", "DiamondInheritanceSecondMidLevelStruct", "DiamondInheritanceTopLevelStruct", "DisappointingCollectionSource", "DoNotOverridePrivates", "DoNotRecognizeAnyAsOptional", "DocumentedClass", "DontComplainAboutVariadicAfterOptional", "DoubleTrouble", "EnumDispenser", "EraseUndefinedHashValues", "EraseUndefinedHashValuesOptions", "ExperimentalClass", "ExperimentalEnum", "ExperimentalStruct", "ExportedBaseClass", "ExtendsInternalInterface", "GiveMeStructs", "Greetee", "GreetingAugmenter", "IAnonymousImplementationProvider", "IAnonymouslyImplementMe", "IAnotherPublicInterface", "IBell", "IBellRinger", "IConcreteBellRinger", "IDeprecatedInterface", "IExperimentalInterface", "IExtendsPrivateInterface", "IFriendlier", "IFriendlyRandomGenerator", "IInterfaceImplementedByAbstractClass", "IInterfaceThatShouldNotBeADataType", "IInterfaceWithInternal", "IInterfaceWithMethods", "IInterfaceWithOptionalMethodArguments", "IInterfaceWithProperties", "IInterfaceWithPropertiesExtension", "IJSII417Derived", "IJSII417PublicBaseOfBase", "IJsii487External", "IJsii487External2", "IJsii496", "IMutableObjectLiteral", "INonInternalInterface", "IObjectWithProperty", "IOptionalMethod", "IPrivatelyImplemented", "IPublicInterface", "IPublicInterface2", "IRandomNumberGenerator", "IReturnJsii976", "IReturnsNumber", "IStableInterface", "IStructReturningDelegate", "ImplementInternalInterface", "Implementation", "ImplementsInterfaceWithInternal", "ImplementsInterfaceWithInternalSubclass", "ImplementsPrivateInterface", "ImplictBaseOfBase", "InbetweenClass", "InterfaceCollections", "InterfaceInNamespaceIncludesClasses", "InterfaceInNamespaceOnlyInterface", "InterfacesMaker", "JSII417Derived", "JSII417PublicBaseOfBase", "JSObjectLiteralForInterface", "JSObjectLiteralToNative", "JSObjectLiteralToNativeClass", "JavaReservedWords", "Jsii487Derived", "Jsii496Derived", "JsiiAgent", "JsonFormatter", "LoadBalancedFargateServiceProps", "MethodNamedProperty", "Multiply", "Negate", "NestedStruct", "NodeStandardLibrary", "NullShouldBeTreatedAsUndefined", "NullShouldBeTreatedAsUndefinedData", "NumberGenerator", "ObjectRefsInCollections", "ObjectWithPropertyProvider", "Old", "OptionalArgumentInvoker", "OptionalConstructorArgument", "OptionalStruct", "OptionalStructConsumer", "OverridableProtectedMember", "OverrideReturnsObject", "ParentStruct982", "PartiallyInitializedThisConsumer", "Polymorphism", "Power", "PropertyNamedProperty", "PublicClass", "PythonReservedWords", "ReferenceEnumFromScopedPackage", "ReturnsPrivateImplementationOfInterface", "RootStruct", "RootStructValidator", "RuntimeTypeChecking", "SecondLevelStruct", "SingleInstanceTwoTypes", "SingletonInt", "SingletonIntEnum", "SingletonString", "SingletonStringEnum", "SmellyStruct", "SomeTypeJsii976", "StableClass", "StableEnum", "StableStruct", "StaticContext", "Statics", "StringEnum", "StripInternal", "StructA", "StructB", "StructParameterType", "StructPassing", "StructUnionConsumer", "StructWithJavaReservedWords", "Sum", "SupportsNiceJavaBuilder", "SupportsNiceJavaBuilderProps", "SupportsNiceJavaBuilderWithRequiredProps", "SyncVirtualMethods", "Thrower", "TopLevelStruct", "UnaryOperation", "UnionProperties", "UseBundledDependency", "UseCalcBase", "UsesInterfaceWithProperties", "VariadicInvoker", "VariadicMethod", "VirtualMethodPlayground", "VoidCallback", "WithPrivatePropertyInConstructor", "__jsii_assembly__", "composition"] +__all__ = ["AbstractClass", "AbstractClassBase", "AbstractClassReturner", "AbstractSuite", "Add", "AllTypes", "AllTypesEnum", "AllowedMethodNames", "AmbiguousParameters", "AnonymousImplementationProvider", "AsyncVirtualMethods", "AugmentableClass", "BaseJsii976", "Bell", "BinaryOperation", "Calculator", "CalculatorProps", "ChildStruct982", "ClassThatImplementsTheInternalInterface", "ClassThatImplementsThePrivateInterface", "ClassWithCollections", "ClassWithDocs", "ClassWithJavaReservedWords", "ClassWithMutableObjectLiteralProperty", "ClassWithPrivateConstructorAndAutomaticProperties", "ConfusingToJackson", "ConfusingToJacksonStruct", "ConstructorPassesThisOut", "Constructors", "ConsumePureInterface", "ConsumerCanRingBell", "ConsumersOfThisCrazyTypeSystem", "DataRenderer", "DefaultedConstructorArgument", "Demonstrate982", "DeprecatedClass", "DeprecatedEnum", "DeprecatedStruct", "DerivedStruct", "DiamondInheritanceBaseLevelStruct", "DiamondInheritanceFirstMidLevelStruct", "DiamondInheritanceSecondMidLevelStruct", "DiamondInheritanceTopLevelStruct", "DisappointingCollectionSource", "DoNotOverridePrivates", "DoNotRecognizeAnyAsOptional", "DocumentedClass", "DontComplainAboutVariadicAfterOptional", "DoubleTrouble", "EnumDispenser", "EraseUndefinedHashValues", "EraseUndefinedHashValuesOptions", "ExperimentalClass", "ExperimentalEnum", "ExperimentalStruct", "ExportedBaseClass", "ExtendsInternalInterface", "GiveMeStructs", "Greetee", "GreetingAugmenter", "IAnonymousImplementationProvider", "IAnonymouslyImplementMe", "IAnotherPublicInterface", "IBell", "IBellRinger", "IConcreteBellRinger", "IDeprecatedInterface", "IExperimentalInterface", "IExtendsPrivateInterface", "IFriendlier", "IFriendlyRandomGenerator", "IInterfaceImplementedByAbstractClass", "IInterfaceThatShouldNotBeADataType", "IInterfaceWithInternal", "IInterfaceWithMethods", "IInterfaceWithOptionalMethodArguments", "IInterfaceWithProperties", "IInterfaceWithPropertiesExtension", "IJSII417Derived", "IJSII417PublicBaseOfBase", "IJsii487External", "IJsii487External2", "IJsii496", "IMutableObjectLiteral", "INonInternalInterface", "IObjectWithProperty", "IOptionalMethod", "IPrivatelyImplemented", "IPublicInterface", "IPublicInterface2", "IRandomNumberGenerator", "IReturnJsii976", "IReturnsNumber", "IStableInterface", "IStructReturningDelegate", "ImplementInternalInterface", "Implementation", "ImplementsInterfaceWithInternal", "ImplementsInterfaceWithInternalSubclass", "ImplementsPrivateInterface", "ImplictBaseOfBase", "InbetweenClass", "InterfaceCollections", "InterfacesMaker", "JSII417Derived", "JSII417PublicBaseOfBase", "JSObjectLiteralForInterface", "JSObjectLiteralToNative", "JSObjectLiteralToNativeClass", "JavaReservedWords", "Jsii487Derived", "Jsii496Derived", "JsiiAgent", "JsonFormatter", "LoadBalancedFargateServiceProps", "MethodNamedProperty", "Multiply", "Negate", "NestedStruct", "NodeStandardLibrary", "NullShouldBeTreatedAsUndefined", "NullShouldBeTreatedAsUndefinedData", "NumberGenerator", "ObjectRefsInCollections", "ObjectWithPropertyProvider", "Old", "OptionalArgumentInvoker", "OptionalConstructorArgument", "OptionalStruct", "OptionalStructConsumer", "OverridableProtectedMember", "OverrideReturnsObject", "ParentStruct982", "PartiallyInitializedThisConsumer", "Polymorphism", "Power", "PropertyNamedProperty", "PublicClass", "PythonReservedWords", "ReferenceEnumFromScopedPackage", "ReturnsPrivateImplementationOfInterface", "RootStruct", "RootStructValidator", "RuntimeTypeChecking", "SecondLevelStruct", "SingleInstanceTwoTypes", "SingletonInt", "SingletonIntEnum", "SingletonString", "SingletonStringEnum", "SmellyStruct", "SomeTypeJsii976", "StableClass", "StableEnum", "StableStruct", "StaticContext", "Statics", "StringEnum", "StripInternal", "StructA", "StructB", "StructParameterType", "StructPassing", "StructUnionConsumer", "StructWithJavaReservedWords", "Sum", "SupportsNiceJavaBuilder", "SupportsNiceJavaBuilderProps", "SupportsNiceJavaBuilderWithRequiredProps", "SyncVirtualMethods", "Thrower", "TopLevelStruct", "UnaryOperation", "UnionProperties", "UseBundledDependency", "UseCalcBase", "UsesInterfaceWithProperties", "VariadicInvoker", "VariadicMethod", "VirtualMethodPlayground", "VoidCallback", "WithPrivatePropertyInConstructor", "__jsii_assembly__"] publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/__init__.py index a4986f03cf..6e6b14b45b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/__init__.py @@ -11,6 +11,7 @@ import scope.jsii_calc_base import scope.jsii_calc_base_of_base import scope.jsii_calc_lib + __all__ = [] publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/composition/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/composition/__init__.py new file mode 100644 index 0000000000..c55d2a0f43 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/composition/__init__.py @@ -0,0 +1,142 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +class CompositeOperation(scope.jsii_calc_lib.Operation, metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.composition.CompositeOperation"): + """Abstract operation composed from an expression of other operations. + + stability + :stability: experimental + """ + @builtins.staticmethod + def __jsii_proxy_class__(): + return _CompositeOperationProxy + + def __init__(self) -> None: + jsii.create(CompositeOperation, self, []) + + @jsii.member(jsii_name="toString") + def to_string(self) -> str: + """String representation of the value. + + stability + :stability: experimental + """ + return jsii.invoke(self, "toString", []) + + @builtins.property + @jsii.member(jsii_name="expression") + @abc.abstractmethod + def expression(self) -> scope.jsii_calc_lib.Value: + """The expression that this operation consists of. + + Must be implemented by derived classes. + + stability + :stability: experimental + """ + ... + + @builtins.property + @jsii.member(jsii_name="value") + def value(self) -> jsii.Number: + """The value. + + stability + :stability: experimental + """ + return jsii.get(self, "value") + + @builtins.property + @jsii.member(jsii_name="decorationPostfixes") + def decoration_postfixes(self) -> typing.List[str]: + """A set of postfixes to include in a decorated .toString(). + + stability + :stability: experimental + """ + return jsii.get(self, "decorationPostfixes") + + @decoration_postfixes.setter + def decoration_postfixes(self, value: typing.List[str]): + jsii.set(self, "decorationPostfixes", value) + + @builtins.property + @jsii.member(jsii_name="decorationPrefixes") + def decoration_prefixes(self) -> typing.List[str]: + """A set of prefixes to include in a decorated .toString(). + + stability + :stability: experimental + """ + return jsii.get(self, "decorationPrefixes") + + @decoration_prefixes.setter + def decoration_prefixes(self, value: typing.List[str]): + jsii.set(self, "decorationPrefixes", value) + + @builtins.property + @jsii.member(jsii_name="stringStyle") + def string_style(self) -> "CompositionStringStyle": + """The .toString() style. + + stability + :stability: experimental + """ + return jsii.get(self, "stringStyle") + + @string_style.setter + def string_style(self, value: "CompositionStringStyle"): + jsii.set(self, "stringStyle", value) + + @jsii.enum(jsii_type="jsii-calc.composition.CompositeOperation.CompositionStringStyle") + class CompositionStringStyle(enum.Enum): + """Style of .toString() output for CompositeOperation. + + stability + :stability: experimental + """ + NORMAL = "NORMAL" + """Normal string expression. + + stability + :stability: experimental + """ + DECORATED = "DECORATED" + """Decorated string expression. + + stability + :stability: experimental + """ + + +class _CompositeOperationProxy(CompositeOperation, jsii.proxy_for(scope.jsii_calc_lib.Operation)): + @builtins.property + @jsii.member(jsii_name="expression") + def expression(self) -> scope.jsii_calc_lib.Value: + """The expression that this operation consists of. + + Must be implemented by derived classes. + + stability + :stability: experimental + """ + return jsii.get(self, "expression") + + +__all__ = ["CompositeOperation", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/derived_class_has_no_properties/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/derived_class_has_no_properties/__init__.py new file mode 100644 index 0000000000..add1f8fbb4 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/derived_class_has_no_properties/__init__.py @@ -0,0 +1,51 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +class Base(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.DerivedClassHasNoProperties.Base"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + jsii.create(jsii_calc.DerivedClassHasNoProperties.Base, self, []) + + @builtins.property + @jsii.member(jsii_name="prop") + def prop(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "prop") + + @prop.setter + def prop(self, value: str): + jsii.set(self, "prop", value) + + +class Derived(jsii_calc.DerivedClassHasNoProperties.Base, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.DerivedClassHasNoProperties.Derived"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + jsii.create(jsii_calc.DerivedClassHasNoProperties.Derived, self, []) + + +__all__ = ["Base", "Derived", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_includes_classes/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_includes_classes/__init__.py new file mode 100644 index 0000000000..7569b9fd1f --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_includes_classes/__init__.py @@ -0,0 +1,73 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +class Foo(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.InterfaceInNamespaceIncludesClasses.Foo"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + jsii.create(jsii_calc.InterfaceInNamespaceIncludesClasses.Foo, self, []) + + @builtins.property + @jsii.member(jsii_name="bar") + def bar(self) -> typing.Optional[str]: + """ + stability + :stability: experimental + """ + return jsii.get(self, "bar") + + @bar.setter + def bar(self, value: typing.Optional[str]): + jsii.set(self, "bar", value) + + +@jsii.data_type(jsii_type="jsii-calc.InterfaceInNamespaceIncludesClasses.Hello", jsii_struct_bases=[], name_mapping={'foo': 'foo'}) +class Hello(): + def __init__(self, *, foo: jsii.Number): + """ + :param foo: + + stability + :stability: experimental + """ + self._values = { + 'foo': foo, + } + + @builtins.property + def foo(self) -> jsii.Number: + """ + stability + :stability: experimental + """ + return self._values.get('foo') + + def __eq__(self, rhs) -> bool: + return isinstance(rhs, self.__class__) and rhs._values == self._values + + def __ne__(self, rhs) -> bool: + return not (rhs == self) + + def __repr__(self) -> str: + return 'Hello(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) + + +__all__ = ["Foo", "Hello", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_only_interface/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_only_interface/__init__.py new file mode 100644 index 0000000000..9ad121c642 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_only_interface/__init__.py @@ -0,0 +1,51 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +@jsii.data_type(jsii_type="jsii-calc.InterfaceInNamespaceOnlyInterface.Hello", jsii_struct_bases=[], name_mapping={'foo': 'foo'}) +class Hello(): + def __init__(self, *, foo: jsii.Number): + """ + :param foo: + + stability + :stability: experimental + """ + self._values = { + 'foo': foo, + } + + @builtins.property + def foo(self) -> jsii.Number: + """ + stability + :stability: experimental + """ + return self._values.get('foo') + + def __eq__(self, rhs) -> bool: + return isinstance(rhs, self.__class__) and rhs._values == self._values + + def __ne__(self, rhs) -> bool: + return not (rhs == self) + + def __repr__(self) -> str: + return 'Hello(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) + + +__all__ = ["Hello", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py new file mode 100644 index 0000000000..6f220a897d --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py @@ -0,0 +1,67 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import jsii_calc +import jsii_calc.submodule.child +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +@jsii.implements(nested_submodule.deeplyNested.INamespaced) +class MyClass(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.submodule.MyClass"): + """ + stability + :stability: experimental + """ + def __init__(self) -> None: + """ + stability + :stability: experimental + """ + jsii.create(MyClass, self, []) + + @builtins.property + @jsii.member(jsii_name="definedAt") + def defined_at(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "definedAt") + + @builtins.property + @jsii.member(jsii_name="goodness") + def goodness(self) -> "child.Goodness": + """ + stability + :stability: experimental + """ + return jsii.get(self, "goodness") + + @builtins.property + @jsii.member(jsii_name="allTypes") + def all_types(self) -> typing.Optional[jsii_calc.AllTypes]: + """ + stability + :stability: experimental + """ + return jsii.get(self, "allTypes") + + @all_types.setter + def all_types(self, value: typing.Optional[jsii_calc.AllTypes]): + jsii.set(self, "allTypes", value) + + +__all__ = ["MyClass", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/back_references/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/back_references/__init__.py new file mode 100644 index 0000000000..7d061d3c1b --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/back_references/__init__.py @@ -0,0 +1,51 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +@jsii.data_type(jsii_type="jsii-calc.submodule.back_references.MyClassReference", jsii_struct_bases=[], name_mapping={'reference': 'reference'}) +class MyClassReference(): + def __init__(self, *, reference: jsii_calc.submodule.MyClass): + """ + :param reference: + + stability + :stability: experimental + """ + self._values = { + 'reference': reference, + } + + @builtins.property + def reference(self) -> jsii_calc.submodule.MyClass: + """ + stability + :stability: experimental + """ + return self._values.get('reference') + + def __eq__(self, rhs) -> bool: + return isinstance(rhs, self.__class__) and rhs._values == self._values + + def __ne__(self, rhs) -> bool: + return not (rhs == self) + + def __repr__(self) -> str: + return 'MyClassReference(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) + + +__all__ = ["MyClassReference", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py new file mode 100644 index 0000000000..e322ab6c71 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py @@ -0,0 +1,76 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +@jsii.enum(jsii_type="jsii-calc.submodule.child.Goodness") +class Goodness(enum.Enum): + """ + stability + :stability: experimental + """ + PRETTY_GOOD = "PRETTY_GOOD" + """It's pretty good. + + stability + :stability: experimental + """ + REALLY_GOOD = "REALLY_GOOD" + """It's really good. + + stability + :stability: experimental + """ + AMAZINGLY_GOOD = "AMAZINGLY_GOOD" + """It's amazingly good. + + stability + :stability: experimental + """ + +@jsii.data_type(jsii_type="jsii-calc.submodule.child.Structure", jsii_struct_bases=[], name_mapping={'bool': 'bool'}) +class Structure(): + def __init__(self, *, bool: bool): + """ + :param bool: + + stability + :stability: experimental + """ + self._values = { + 'bool': bool, + } + + @builtins.property + def bool(self) -> bool: + """ + stability + :stability: experimental + """ + return self._values.get('bool') + + def __eq__(self, rhs) -> bool: + return isinstance(rhs, self.__class__) and rhs._values == self._values + + def __ne__(self, rhs) -> bool: + return not (rhs == self) + + def __repr__(self) -> str: + return 'Structure(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) + + +__all__ = ["Goodness", "Structure", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/__init__.py new file mode 100644 index 0000000000..1381d80e61 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/__init__.py @@ -0,0 +1,62 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import jsii_calc.submodule.child +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +@jsii.implements(deeplyNested.INamespaced) +class Namespaced(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.submodule.nested_submodule.Namespaced"): + """ + stability + :stability: experimental + """ + @builtins.staticmethod + def __jsii_proxy_class__(): + return _NamespacedProxy + + @builtins.property + @jsii.member(jsii_name="definedAt") + def defined_at(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "definedAt") + + @builtins.property + @jsii.member(jsii_name="goodness") + @abc.abstractmethod + def goodness(self) -> jsii_calc.submodule.child.Goodness: + """ + stability + :stability: experimental + """ + ... + + +class _NamespacedProxy(Namespaced): + @builtins.property + @jsii.member(jsii_name="goodness") + def goodness(self) -> jsii_calc.submodule.child.Goodness: + """ + stability + :stability: experimental + """ + return jsii.get(self, "goodness") + + +__all__ = ["Namespaced", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/deeply_nested/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/deeply_nested/__init__.py new file mode 100644 index 0000000000..147de6591a --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/deeply_nested/__init__.py @@ -0,0 +1,56 @@ +import abc +import builtins +import datetime +import enum +import typing + +import jsii +import jsii.compat +import publication + +import scope.jsii_calc_base +import scope.jsii_calc_base_of_base +import scope.jsii_calc_lib + +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") + + +@jsii.interface(jsii_type="jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced") +class INamespaced(jsii.compat.Protocol): + """ + stability + :stability: experimental + """ + @builtins.staticmethod + def __jsii_proxy_class__(): + return _INamespacedProxy + + @builtins.property + @jsii.member(jsii_name="definedAt") + def defined_at(self) -> str: + """ + stability + :stability: experimental + """ + ... + + +class _INamespacedProxy(): + """ + stability + :stability: experimental + """ + __jsii_type__ = "jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced" + @builtins.property + @jsii.member(jsii_name="definedAt") + def defined_at(self) -> str: + """ + stability + :stability: experimental + """ + return jsii.get(self, "definedAt") + + +__all__ = ["INamespaced", "__jsii_assembly__"] + +publication.publish() diff --git a/packages/jsii-reflect/actual.txt b/packages/jsii-reflect/actual.txt deleted file mode 100644 index 7df10da8b9..0000000000 --- a/packages/jsii-reflect/actual.txt +++ /dev/null @@ -1,1223 +0,0 @@ -assemblies - ├─┬ jsii-calc - │ ├─┬ dependencies - │ │ ├── @scope/jsii-calc-base - │ │ └── @scope/jsii-calc-lib - │ └─┬ types - │ ├─┬ AbstractClass class - │ │ ├── base: AbstractClassBase - │ │ ├── interfaces: InterfaceImplementedByAbstractClass - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ abstractMethod(name) method - │ │ │ ├── abstract - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ name - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: primitive:string - │ │ ├─┬ nonAbstractMethod() method - │ │ │ └── returns: primitive:number - │ │ └─┬ propFromInterface property - │ │ ├── immutable - │ │ └── type: primitive:string - │ ├─┬ AbstractClassBase class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ abstractProperty property - │ │ ├── abstract - │ │ ├── immutable - │ │ └── type: primitive:string - │ ├─┬ AbstractClassReturner class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ giveMeAbstract() method - │ │ │ └── returns: class:jsii-calc.AbstractClass - │ │ ├─┬ giveMeInterface() method - │ │ │ └── returns: interface:jsii-calc.InterfaceImplementedByAbstractClass - │ │ └─┬ returnAbstractFromProperty property - │ │ ├── immutable - │ │ └── type: class:jsii-calc.AbstractClassBase - │ ├─┬ Add class - │ │ ├── base: BinaryOperation - │ │ └─┬ members - │ │ ├─┬ (lhs,rhs) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ lhs - │ │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ │ └─┬ rhs - │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ └── returns: void - │ │ ├─┬ toString() method - │ │ │ └── returns: primitive:string - │ │ └─┬ value property - │ │ ├── immutable - │ │ └── type: primitive:number - │ ├─┬ AllTypes class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ enumMethod(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: enum:jsii-calc.StringEnum - │ │ │ └── returns: enum:jsii-calc.StringEnum - │ │ ├─┬ enumPropertyValue property - │ │ │ ├── immutable - │ │ │ └── type: primitive:number - │ │ ├─┬ anyArrayProperty property - │ │ │ └── type: Array - │ │ ├─┬ anyMapProperty property - │ │ │ └── type: Map primitive:any> - │ │ ├─┬ anyProperty property - │ │ │ └── type: primitive:any - │ │ ├─┬ arrayProperty property - │ │ │ └── type: Array - │ │ ├─┬ booleanProperty property - │ │ │ └── type: primitive:boolean - │ │ ├─┬ dateProperty property - │ │ │ └── type: primitive:date - │ │ ├─┬ enumProperty property - │ │ │ └── type: enum:jsii-calc.AllTypesEnum - │ │ ├─┬ jsonProperty property - │ │ │ └── type: primitive:json - │ │ ├─┬ mapProperty property - │ │ │ └── type: Map class:@scope/jsii-calc-lib.Number> - │ │ ├─┬ numberProperty property - │ │ │ └── type: primitive:number - │ │ ├─┬ stringProperty property - │ │ │ └── type: primitive:string - │ │ ├─┬ unionArrayProperty property - │ │ │ └── type: Array - │ │ ├─┬ unionMapProperty property - │ │ │ └── type: Map primitive:string | primitive:number | class:@scope/jsii-calc-lib.Number> - │ │ ├─┬ unionProperty property - │ │ │ └── type: primitive:string | primitive:number | class:jsii-calc.Multiply | class:@scope/jsii-calc-lib.Number - │ │ ├─┬ unknownArrayProperty property - │ │ │ └── type: Array - │ │ ├─┬ unknownMapProperty property - │ │ │ └── type: Map primitive:any> - │ │ ├─┬ unknownProperty property - │ │ │ └── type: primitive:any - │ │ └─┬ optionalEnumValue property - │ │ └── type: enum:jsii-calc.StringEnum (optional) - │ ├─┬ AllowedMethodNames class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ getBar(_p1,_p2) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ _p1 - │ │ │ │ │ └── type: primitive:string - │ │ │ │ └─┬ _p2 - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: void - │ │ ├─┬ getFoo(withParam) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ withParam - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: primitive:string - │ │ ├─┬ setBar(_x,_y,_z) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ _x - │ │ │ │ │ └── type: primitive:string - │ │ │ │ ├─┬ _y - │ │ │ │ │ └── type: primitive:number - │ │ │ │ └─┬ _z - │ │ │ │ └── type: primitive:boolean - │ │ │ └── returns: void - │ │ └─┬ setFoo(_x,_y) method - │ │ ├─┬ parameters - │ │ │ ├─┬ _x - │ │ │ │ └── type: primitive:string - │ │ │ └─┬ _y - │ │ │ └── type: primitive:number - │ │ └── returns: void - │ ├─┬ AsyncVirtualMethods class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ callMe() method - │ │ │ └── returns: primitive:number (promise) - │ │ ├─┬ callMe2() method - │ │ │ └── returns: primitive:number (promise) - │ │ ├─┬ callMeDoublePromise() method - │ │ │ └── returns: primitive:number (promise) - │ │ ├─┬ dontOverrideMe() method - │ │ │ └── returns: primitive:number - │ │ ├─┬ overrideMe(mult) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ mult - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: primitive:number (promise) - │ │ └─┬ overrideMeToo() method - │ │ └── returns: primitive:number (promise) - │ ├─┬ BinaryOperation class - │ │ ├── base: Operation - │ │ ├── interfaces: IFriendly - │ │ └─┬ members - │ │ ├─┬ (lhs,rhs) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ lhs - │ │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ │ └─┬ rhs - │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ └── returns: void - │ │ ├─┬ hello() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ lhs property - │ │ │ ├── immutable - │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ └─┬ rhs property - │ │ ├── immutable - │ │ └── type: class:@scope/jsii-calc-lib.Value - │ ├─┬ Calculator class - │ │ ├── base: CompositeOperation - │ │ └─┬ members - │ │ ├─┬ (props) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ props - │ │ │ │ └── type: interface:jsii-calc.CalculatorProps (optional) - │ │ │ └── returns: void - │ │ ├─┬ add(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: void - │ │ ├─┬ mul(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: void - │ │ ├─┬ neg() method - │ │ │ └── returns: void - │ │ ├─┬ pow(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: void - │ │ ├─┬ readUnionValue() method - │ │ │ └── returns: primitive:number - │ │ ├─┬ expression property - │ │ │ ├── immutable - │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ ├─┬ operationsLog property - │ │ │ ├── immutable - │ │ │ └── type: Array - │ │ ├─┬ operationsMap property - │ │ │ ├── immutable - │ │ │ └── type: Map Array> - │ │ ├─┬ curr property - │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ ├─┬ maxValue property - │ │ │ └── type: primitive:number (optional) - │ │ └─┬ unionProperty property - │ │ └── type: class:jsii-calc.Add | class:jsii-calc.Multiply | class:jsii-calc.Power - │ ├─┬ ClassWithMutableObjectLiteralProperty class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ mutableObject property - │ │ └── type: interface:jsii-calc.MutableObjectLiteral - │ ├─┬ ClassWithPrivateConstructorAndAutomaticProperties class - │ │ ├── interfaces: InterfaceWithProperties - │ │ └─┬ members - │ │ ├─┬ create(readOnlyString,readWriteString) method - │ │ │ ├── static - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ readOnlyString - │ │ │ │ │ └── type: primitive:string - │ │ │ │ └─┬ readWriteString - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: class:jsii-calc.ClassWithPrivateConstructorAndAutomaticProperties - │ │ ├─┬ readOnlyString property - │ │ │ ├── immutable - │ │ │ └── type: primitive:string - │ │ └─┬ readWriteString property - │ │ └── type: primitive:string - │ ├─┬ DefaultedConstructorArgument class - │ │ └─┬ members - │ │ ├─┬ (arg1,arg2,arg3) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ arg1 - │ │ │ │ │ └── type: primitive:number (optional) - │ │ │ │ ├─┬ arg2 - │ │ │ │ │ └── type: primitive:string (optional) - │ │ │ │ └─┬ arg3 - │ │ │ │ └── type: primitive:date (optional) - │ │ │ └── returns: void - │ │ ├─┬ arg1 property - │ │ │ ├── immutable - │ │ │ └── type: primitive:number - │ │ ├─┬ arg3 property - │ │ │ ├── immutable - │ │ │ └── type: primitive:date - │ │ └─┬ arg2 property - │ │ ├── immutable - │ │ └── type: primitive:string (optional) - │ ├─┬ Base class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ prop property - │ │ └── type: primitive:string - │ ├─┬ Derived class - │ │ ├── base: Base - │ │ └─┬ members - │ │ └─┬ () method - │ │ └── returns: void - │ ├─┬ DoNotOverridePrivates class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ changePrivatePropertyValue(newValue) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ newValue - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: void - │ │ ├─┬ privateMethodValue() method - │ │ │ └── returns: primitive:string - │ │ └─┬ privatePropertyValue() method - │ │ └── returns: primitive:string - │ ├─┬ DoNotRecognizeAnyAsOptional class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ method(_requiredAny,_optionalAny,_optionalString) method - │ │ ├─┬ parameters - │ │ │ ├─┬ _requiredAny - │ │ │ │ └── type: primitive:any - │ │ │ ├─┬ _optionalAny - │ │ │ │ └── type: primitive:any (optional) - │ │ │ └─┬ _optionalString - │ │ │ └── type: primitive:string (optional) - │ │ └── returns: void - │ ├─┬ DontComplainAboutVariadicAfterOptional class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ optionalAndVariadic(optional,things) method - │ │ ├── variadic - │ │ ├─┬ parameters - │ │ │ ├─┬ optional - │ │ │ │ └── type: primitive:string (optional) - │ │ │ └─┬ things - │ │ │ ├── type: primitive:string - │ │ │ └── variadic - │ │ └── returns: primitive:string - │ ├─┬ DoubleTrouble class - │ │ ├── interfaces: IFriendlyRandomGenerator - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ hello() method - │ │ │ └── returns: primitive:string - │ │ └─┬ next() method - │ │ └── returns: primitive:number - │ ├─┬ ExportedBaseClass class - │ │ └─┬ members - │ │ ├─┬ (success) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ success - │ │ │ │ └── type: primitive:boolean - │ │ │ └── returns: void - │ │ └─┬ success property - │ │ ├── immutable - │ │ └── type: primitive:boolean - │ ├─┬ GiveMeStructs class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ derivedToFirst(derived) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ derived - │ │ │ │ └── type: interface:jsii-calc.DerivedStruct - │ │ │ └── returns: interface:@scope/jsii-calc-lib.MyFirstStruct - │ │ ├─┬ readDerivedNonPrimitive(derived) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ derived - │ │ │ │ └── type: interface:jsii-calc.DerivedStruct - │ │ │ └── returns: class:jsii-calc.DoubleTrouble - │ │ ├─┬ readFirstNumber(first) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ first - │ │ │ │ └── type: interface:@scope/jsii-calc-lib.MyFirstStruct - │ │ │ └── returns: primitive:number - │ │ └─┬ structLiteral property - │ │ ├── immutable - │ │ └── type: interface:@scope/jsii-calc-lib.StructWithOnlyOptionals - │ ├─┬ GreetingAugmenter class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ betterGreeting(friendly) method - │ │ ├─┬ parameters - │ │ │ └─┬ friendly - │ │ │ └── type: interface:@scope/jsii-calc-lib.IFriendly - │ │ └── returns: primitive:string - │ ├─┬ Foo class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ bar property - │ │ └── type: primitive:string (optional) - │ ├─┬ JSObjectLiteralForInterface class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ giveMeFriendly() method - │ │ │ └── returns: interface:@scope/jsii-calc-lib.IFriendly - │ │ └─┬ giveMeFriendlyGenerator() method - │ │ └── returns: interface:jsii-calc.IFriendlyRandomGenerator - │ ├─┬ JSObjectLiteralToNative class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ returnLiteral() method - │ │ └── returns: class:jsii-calc.JSObjectLiteralToNativeClass - │ ├─┬ JSObjectLiteralToNativeClass class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ propA property - │ │ │ └── type: primitive:string - │ │ └─┬ propB property - │ │ └── type: primitive:number - │ ├─┬ JavaReservedWords class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ abstract() method - │ │ │ └── returns: void - │ │ ├─┬ assert() method - │ │ │ └── returns: void - │ │ ├─┬ boolean() method - │ │ │ └── returns: void - │ │ ├─┬ break() method - │ │ │ └── returns: void - │ │ ├─┬ byte() method - │ │ │ └── returns: void - │ │ ├─┬ case() method - │ │ │ └── returns: void - │ │ ├─┬ catch() method - │ │ │ └── returns: void - │ │ ├─┬ char() method - │ │ │ └── returns: void - │ │ ├─┬ class() method - │ │ │ └── returns: void - │ │ ├─┬ const() method - │ │ │ └── returns: void - │ │ ├─┬ continue() method - │ │ │ └── returns: void - │ │ ├─┬ default() method - │ │ │ └── returns: void - │ │ ├─┬ do() method - │ │ │ └── returns: void - │ │ ├─┬ double() method - │ │ │ └── returns: void - │ │ ├─┬ else() method - │ │ │ └── returns: void - │ │ ├─┬ enum() method - │ │ │ └── returns: void - │ │ ├─┬ extends() method - │ │ │ └── returns: void - │ │ ├─┬ false() method - │ │ │ └── returns: void - │ │ ├─┬ final() method - │ │ │ └── returns: void - │ │ ├─┬ finally() method - │ │ │ └── returns: void - │ │ ├─┬ float() method - │ │ │ └── returns: void - │ │ ├─┬ for() method - │ │ │ └── returns: void - │ │ ├─┬ goto() method - │ │ │ └── returns: void - │ │ ├─┬ if() method - │ │ │ └── returns: void - │ │ ├─┬ implements() method - │ │ │ └── returns: void - │ │ ├─┬ import() method - │ │ │ └── returns: void - │ │ ├─┬ instanceof() method - │ │ │ └── returns: void - │ │ ├─┬ int() method - │ │ │ └── returns: void - │ │ ├─┬ interface() method - │ │ │ └── returns: void - │ │ ├─┬ long() method - │ │ │ └── returns: void - │ │ ├─┬ native() method - │ │ │ └── returns: void - │ │ ├─┬ new() method - │ │ │ └── returns: void - │ │ ├─┬ null() method - │ │ │ └── returns: void - │ │ ├─┬ package() method - │ │ │ └── returns: void - │ │ ├─┬ private() method - │ │ │ └── returns: void - │ │ ├─┬ protected() method - │ │ │ └── returns: void - │ │ ├─┬ public() method - │ │ │ └── returns: void - │ │ ├─┬ return() method - │ │ │ └── returns: void - │ │ ├─┬ short() method - │ │ │ └── returns: void - │ │ ├─┬ static() method - │ │ │ └── returns: void - │ │ ├─┬ strictfp() method - │ │ │ └── returns: void - │ │ ├─┬ super() method - │ │ │ └── returns: void - │ │ ├─┬ switch() method - │ │ │ └── returns: void - │ │ ├─┬ synchronized() method - │ │ │ └── returns: void - │ │ ├─┬ this() method - │ │ │ └── returns: void - │ │ ├─┬ throw() method - │ │ │ └── returns: void - │ │ ├─┬ throws() method - │ │ │ └── returns: void - │ │ ├─┬ transient() method - │ │ │ └── returns: void - │ │ ├─┬ true() method - │ │ │ └── returns: void - │ │ ├─┬ try() method - │ │ │ └── returns: void - │ │ ├─┬ void() method - │ │ │ └── returns: void - │ │ ├─┬ volatile() method - │ │ │ └── returns: void - │ │ └─┬ while property - │ │ └── type: primitive:string - │ ├─┬ JsiiAgent class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ jsiiAgent property - │ │ ├── immutable - │ │ ├── static - │ │ └── type: primitive:string (optional) - │ ├─┬ Multiply class - │ │ ├── base: BinaryOperation - │ │ ├── interfaces: IFriendlier,IRandomNumberGenerator - │ │ └─┬ members - │ │ ├─┬ (lhs,rhs) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ lhs - │ │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ │ └─┬ rhs - │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ └── returns: void - │ │ ├─┬ farewell() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ goodbye() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ next() method - │ │ │ └── returns: primitive:number - │ │ ├─┬ toString() method - │ │ │ └── returns: primitive:string - │ │ └─┬ value property - │ │ ├── immutable - │ │ └── type: primitive:number - │ ├─┬ Negate class - │ │ ├── base: UnaryOperation - │ │ ├── interfaces: IFriendlier - │ │ └─┬ members - │ │ ├─┬ (operand) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ operand - │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ └── returns: void - │ │ ├─┬ farewell() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ goodbye() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ hello() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ toString() method - │ │ │ └── returns: primitive:string - │ │ └─┬ value property - │ │ ├── immutable - │ │ └── type: primitive:number - │ ├─┬ NodeStandardLibrary class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ cryptoSha256() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ fsReadFile() method - │ │ │ └── returns: primitive:string (promise) - │ │ ├─┬ fsReadFileSync() method - │ │ │ └── returns: primitive:string - │ │ └─┬ osPlatform property - │ │ ├── immutable - │ │ └── type: primitive:string - │ ├─┬ NullShouldBeTreatedAsUndefined class - │ │ └─┬ members - │ │ ├─┬ (_param1,optional) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ _param1 - │ │ │ │ │ └── type: primitive:string - │ │ │ │ └─┬ optional - │ │ │ │ └── type: primitive:any (optional) - │ │ │ └── returns: void - │ │ ├─┬ giveMeUndefined(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:any (optional) - │ │ │ └── returns: void - │ │ ├─┬ giveMeUndefinedInsideAnObject(input) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ input - │ │ │ │ └── type: interface:jsii-calc.NullShouldBeTreatedAsUndefinedData - │ │ │ └── returns: void - │ │ ├─┬ verifyPropertyIsUndefined() method - │ │ │ └── returns: void - │ │ └─┬ changeMeToUndefined property - │ │ └── type: primitive:string (optional) - │ ├─┬ NumberGenerator class - │ │ └─┬ members - │ │ ├─┬ (generator) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ generator - │ │ │ │ └── type: interface:jsii-calc.IRandomNumberGenerator - │ │ │ └── returns: void - │ │ ├─┬ isSameGenerator(gen) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ gen - │ │ │ │ └── type: interface:jsii-calc.IRandomNumberGenerator - │ │ │ └── returns: primitive:boolean - │ │ ├─┬ nextTimes100() method - │ │ │ └── returns: primitive:number - │ │ └─┬ generator property - │ │ └── type: interface:jsii-calc.IRandomNumberGenerator - │ ├─┬ ObjectRefsInCollections class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ sumFromArray(values) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ values - │ │ │ │ └── type: Array - │ │ │ └── returns: primitive:number - │ │ └─┬ sumFromMap(values) method - │ │ ├─┬ parameters - │ │ │ └─┬ values - │ │ │ └── type: Map class:@scope/jsii-calc-lib.Value> - │ │ └── returns: primitive:number - │ ├─┬ OptionalConstructorArgument class - │ │ └─┬ members - │ │ ├─┬ (arg1,arg2,arg3) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ arg1 - │ │ │ │ │ └── type: primitive:number - │ │ │ │ ├─┬ arg2 - │ │ │ │ │ └── type: primitive:string - │ │ │ │ └─┬ arg3 - │ │ │ │ └── type: primitive:date (optional) - │ │ │ └── returns: void - │ │ ├─┬ arg1 property - │ │ │ ├── immutable - │ │ │ └── type: primitive:number - │ │ ├─┬ arg2 property - │ │ │ ├── immutable - │ │ │ └── type: primitive:string - │ │ └─┬ arg3 property - │ │ ├── immutable - │ │ └── type: primitive:date (optional) - │ ├─┬ OverrideReturnsObject class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ test(obj) method - │ │ ├─┬ parameters - │ │ │ └─┬ obj - │ │ │ └── type: interface:jsii-calc.IReturnsNumber - │ │ └── returns: primitive:number - │ ├─┬ Polymorphism class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ sayHello(friendly) method - │ │ ├─┬ parameters - │ │ │ └─┬ friendly - │ │ │ └── type: interface:@scope/jsii-calc-lib.IFriendly - │ │ └── returns: primitive:string - │ ├─┬ Power class - │ │ ├── base: CompositeOperation - │ │ └─┬ members - │ │ ├─┬ (base,pow) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ base - │ │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ │ └─┬ pow - │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ └── returns: void - │ │ ├─┬ base property - │ │ │ ├── immutable - │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ ├─┬ expression property - │ │ │ ├── immutable - │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ └─┬ pow property - │ │ ├── immutable - │ │ └── type: class:@scope/jsii-calc-lib.Value - │ ├─┬ ReferenceEnumFromScopedPackage class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ loadFoo() method - │ │ │ └── returns: enum:@scope/jsii-calc-lib.EnumFromScopedModule (optional) - │ │ ├─┬ saveFoo(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: enum:@scope/jsii-calc-lib.EnumFromScopedModule - │ │ │ └── returns: void - │ │ └─┬ foo property - │ │ └── type: enum:@scope/jsii-calc-lib.EnumFromScopedModule (optional) - │ ├─┬ ReturnsPrivateImplementationOfInterface class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ privateImplementation property - │ │ ├── immutable - │ │ └── type: interface:jsii-calc.IPrivatelyImplemented - │ ├─┬ RuntimeTypeChecking class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ methodWithDefaultedArguments(arg1,arg2,arg3) method - │ │ │ ├─┬ parameters - │ │ │ │ ├─┬ arg1 - │ │ │ │ │ └── type: primitive:number (optional) - │ │ │ │ ├─┬ arg2 - │ │ │ │ │ └── type: primitive:string (optional) - │ │ │ │ └─┬ arg3 - │ │ │ │ └── type: primitive:date (optional) - │ │ │ └── returns: void - │ │ ├─┬ methodWithOptionalAnyArgument(arg) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ arg - │ │ │ │ └── type: primitive:any (optional) - │ │ │ └── returns: void - │ │ └─┬ methodWithOptionalArguments(arg1,arg2,arg3) method - │ │ ├─┬ parameters - │ │ │ ├─┬ arg1 - │ │ │ │ └── type: primitive:number - │ │ │ ├─┬ arg2 - │ │ │ │ └── type: primitive:string - │ │ │ └─┬ arg3 - │ │ │ └── type: primitive:date (optional) - │ │ └── returns: void - │ ├─┬ Statics class - │ │ └─┬ members - │ │ ├─┬ (value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: void - │ │ ├─┬ staticMethod(name) method - │ │ │ ├── static - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ name - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: primitive:string - │ │ ├─┬ justMethod() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ BAR property - │ │ │ ├── const - │ │ │ ├── immutable - │ │ │ ├── static - │ │ │ └── type: primitive:number - │ │ ├─┬ ConstObj property - │ │ │ ├── const - │ │ │ ├── immutable - │ │ │ ├── static - │ │ │ └── type: class:jsii-calc.DoubleTrouble - │ │ ├─┬ Foo property - │ │ │ ├── const - │ │ │ ├── immutable - │ │ │ ├── static - │ │ │ └── type: primitive:string - │ │ ├─┬ zooBar property - │ │ │ ├── const - │ │ │ ├── immutable - │ │ │ ├── static - │ │ │ └── type: Map primitive:string> - │ │ ├─┬ instance property - │ │ │ ├── static - │ │ │ └── type: class:jsii-calc.Statics - │ │ ├─┬ nonConstStatic property - │ │ │ ├── static - │ │ │ └── type: primitive:number - │ │ └─┬ value property - │ │ ├── immutable - │ │ └── type: primitive:string - │ ├─┬ Sum class - │ │ ├── base: CompositeOperation - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ expression property - │ │ │ ├── immutable - │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ └─┬ parts property - │ │ └── type: Array - │ ├─┬ SyncVirtualMethods class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ callerIsAsync() method - │ │ │ └── returns: primitive:number (promise) - │ │ ├─┬ callerIsMethod() method - │ │ │ └── returns: primitive:number - │ │ ├─┬ modifyOtherProperty(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: void - │ │ ├─┬ modifyValueOfTheProperty(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: void - │ │ ├─┬ readA() method - │ │ │ └── returns: primitive:number - │ │ ├─┬ retrieveOtherProperty() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ retrieveReadOnlyProperty() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ retrieveValueOfTheProperty() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ virtualMethod(n) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ n - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: primitive:number - │ │ ├─┬ writeA(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: void - │ │ ├─┬ readonlyProperty property - │ │ │ ├── immutable - │ │ │ └── type: primitive:string - │ │ ├─┬ a property - │ │ │ └── type: primitive:number - │ │ ├─┬ callerIsProperty property - │ │ │ └── type: primitive:number - │ │ ├─┬ otherProperty property - │ │ │ └── type: primitive:string - │ │ ├─┬ theProperty property - │ │ │ └── type: primitive:string - │ │ └─┬ valueOfOtherProperty property - │ │ └── type: primitive:string - │ ├─┬ Thrower class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ throwError() method - │ │ └── returns: void - │ ├─┬ UnaryOperation class - │ │ ├── base: Operation - │ │ └─┬ members - │ │ ├─┬ (operand) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ operand - │ │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ │ └── returns: void - │ │ └─┬ operand property - │ │ ├── immutable - │ │ └── type: class:@scope/jsii-calc-lib.Value - │ ├─┬ UseBundledDependency class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ value() method - │ │ └── returns: primitive:any - │ ├─┬ UseCalcBase class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ hello() method - │ │ └── returns: class:@scope/jsii-calc-base.Base - │ ├─┬ UsesInterfaceWithProperties class - │ │ └─┬ members - │ │ ├─┬ (obj) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ obj - │ │ │ │ └── type: interface:jsii-calc.InterfaceWithProperties - │ │ │ └── returns: void - │ │ ├─┬ justRead() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ readStringAndNumber(ext) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ ext - │ │ │ │ └── type: interface:jsii-calc.InterfaceWithPropertiesExtension - │ │ │ └── returns: primitive:string - │ │ ├─┬ writeAndRead(value) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ value - │ │ │ │ └── type: primitive:string - │ │ │ └── returns: primitive:string - │ │ └─┬ obj property - │ │ ├── immutable - │ │ └── type: interface:jsii-calc.InterfaceWithProperties - │ ├─┬ VariadicMethod class - │ │ └─┬ members - │ │ ├─┬ (prefix) method - │ │ │ ├── variadic - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ prefix - │ │ │ │ ├── type: primitive:number - │ │ │ │ └── variadic - │ │ │ └── returns: void - │ │ └─┬ asArray(first,others) method - │ │ ├── variadic - │ │ ├─┬ parameters - │ │ │ ├─┬ first - │ │ │ │ └── type: primitive:number - │ │ │ └─┬ others - │ │ │ ├── type: primitive:number - │ │ │ └── variadic - │ │ └── returns: Array - │ ├─┬ VirtualMethodPlayground class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ overrideMeAsync(index) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ index - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: primitive:number (promise) - │ │ ├─┬ overrideMeSync(index) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ index - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: primitive:number - │ │ ├─┬ parallelSumAsync(count) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ count - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: primitive:number (promise) - │ │ ├─┬ serialSumAsync(count) method - │ │ │ ├─┬ parameters - │ │ │ │ └─┬ count - │ │ │ │ └── type: primitive:number - │ │ │ └── returns: primitive:number (promise) - │ │ └─┬ sumSync(count) method - │ │ ├─┬ parameters - │ │ │ └─┬ count - │ │ │ └── type: primitive:number - │ │ └── returns: primitive:number - │ ├─┬ CompositeOperation class - │ │ ├── base: Operation - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ ├─┬ toString() method - │ │ │ └── returns: primitive:string - │ │ ├─┬ expression property - │ │ │ ├── abstract - │ │ │ ├── immutable - │ │ │ └── type: class:@scope/jsii-calc-lib.Value - │ │ ├─┬ value property - │ │ │ ├── immutable - │ │ │ └── type: primitive:number - │ │ ├─┬ decorationPostfixes property - │ │ │ └── type: Array - │ │ ├─┬ decorationPrefixes property - │ │ │ └── type: Array - │ │ └─┬ stringStyle property - │ │ └── type: enum:jsii-calc.composition.CompositeOperation.CompositionStringStyle - │ ├─┬ CalculatorProps interface - │ │ └─┬ members - │ │ ├─┬ initialValue property - │ │ │ ├── abstract - │ │ │ └── type: primitive:number (optional) - │ │ └─┬ maximumValue property - │ │ ├── abstract - │ │ └── type: primitive:number (optional) - │ ├─┬ DerivedStruct interface - │ │ ├─┬ interfaces - │ │ │ └── MyFirstStruct - │ │ └─┬ members - │ │ ├─┬ anotherRequired property - │ │ │ ├── abstract - │ │ │ └── type: primitive:date - │ │ ├─┬ bool property - │ │ │ ├── abstract - │ │ │ └── type: primitive:boolean - │ │ ├─┬ nonPrimitive property - │ │ │ ├── abstract - │ │ │ └── type: class:jsii-calc.DoubleTrouble - │ │ ├─┬ anotherOptional property - │ │ │ ├── abstract - │ │ │ └── type: Map class:@scope/jsii-calc-lib.Value> - │ │ ├─┬ optionalAny property - │ │ │ ├── abstract - │ │ │ └── type: primitive:any (optional) - │ │ └─┬ optionalArray property - │ │ ├── abstract - │ │ └── type: Array - │ ├─┬ IFriendlier interface - │ │ ├─┬ interfaces - │ │ │ └── IFriendly - │ │ └─┬ members - │ │ ├─┬ farewell() method - │ │ │ ├── abstract - │ │ │ └── returns: primitive:string - │ │ └─┬ goodbye() method - │ │ ├── abstract - │ │ └── returns: primitive:string - │ ├─┬ IFriendlyRandomGenerator interface - │ │ ├─┬ interfaces - │ │ │ ├── IRandomNumberGenerator - │ │ │ └── IFriendly - │ │ └── members - │ ├─┬ IInterfaceThatShouldNotBeADataType interface - │ │ ├─┬ interfaces - │ │ │ └── IInterfaceWithMethods - │ │ └─┬ members - │ │ └─┬ otherValue property - │ │ ├── abstract - │ │ ├── immutable - │ │ └── type: primitive:string - │ ├─┬ IInterfaceWithMethods interface - │ │ └─┬ members - │ │ ├─┬ doThings() method - │ │ │ ├── abstract - │ │ │ └── returns: void - │ │ └─┬ value property - │ │ ├── abstract - │ │ ├── immutable - │ │ └── type: primitive:string - │ ├─┬ IInterfaceWithOptionalMethodArguments interface - │ │ └─┬ members - │ │ └─┬ hello(arg1,arg2) method - │ │ ├── abstract - │ │ ├─┬ parameters - │ │ │ ├─┬ arg1 - │ │ │ │ └── type: primitive:string - │ │ │ └─┬ arg2 - │ │ │ └── type: primitive:number (optional) - │ │ └── returns: void - │ ├─┬ IPrivatelyImplemented interface - │ │ └─┬ members - │ │ └─┬ success property - │ │ ├── abstract - │ │ ├── immutable - │ │ └── type: primitive:boolean - │ ├─┬ IRandomNumberGenerator interface - │ │ └─┬ members - │ │ └─┬ next() method - │ │ ├── abstract - │ │ └── returns: primitive:number - │ ├─┬ IReturnsNumber interface - │ │ └─┬ members - │ │ ├─┬ obtainNumber() method - │ │ │ ├── abstract - │ │ │ └── returns: interface:@scope/jsii-calc-lib.IDoublable - │ │ └─┬ numberProp property - │ │ ├── abstract - │ │ ├── immutable - │ │ └── type: class:@scope/jsii-calc-lib.Number - │ ├─┬ ImplictBaseOfBase interface - │ │ ├─┬ interfaces - │ │ │ └── BaseProps - │ │ └─┬ members - │ │ └─┬ goo property - │ │ ├── abstract - │ │ └── type: primitive:date - │ ├─┬ InterfaceImplementedByAbstractClass interface - │ │ └─┬ members - │ │ └─┬ propFromInterface property - │ │ ├── abstract - │ │ ├── immutable - │ │ └── type: primitive:string - │ ├─┬ Hello interface - │ │ └─┬ members - │ │ └─┬ foo property - │ │ ├── abstract - │ │ └── type: primitive:number - │ ├─┬ Hello interface - │ │ └─┬ members - │ │ └─┬ foo property - │ │ ├── abstract - │ │ └── type: primitive:number - │ ├─┬ InterfaceWithProperties interface - │ │ └─┬ members - │ │ ├─┬ readOnlyString property - │ │ │ ├── abstract - │ │ │ ├── immutable - │ │ │ └── type: primitive:string - │ │ └─┬ readWriteString property - │ │ ├── abstract - │ │ └── type: primitive:string - │ ├─┬ InterfaceWithPropertiesExtension interface - │ │ ├─┬ interfaces - │ │ │ └── InterfaceWithProperties - │ │ └─┬ members - │ │ └─┬ foo property - │ │ ├── abstract - │ │ └── type: primitive:number - │ ├─┬ LoadBalancedFargateServiceProps interface - │ │ └─┬ members - │ │ ├─┬ containerPort property - │ │ │ ├── abstract - │ │ │ └── type: primitive:number (optional) - │ │ ├─┬ cpu property - │ │ │ ├── abstract - │ │ │ └── type: primitive:string (optional) - │ │ ├─┬ memoryMiB property - │ │ │ ├── abstract - │ │ │ └── type: primitive:string (optional) - │ │ ├─┬ publicLoadBalancer property - │ │ │ ├── abstract - │ │ │ └── type: primitive:boolean (optional) - │ │ └─┬ publicTasks property - │ │ ├── abstract - │ │ └── type: primitive:boolean (optional) - │ ├─┬ MutableObjectLiteral interface - │ │ └─┬ members - │ │ └─┬ value property - │ │ ├── abstract - │ │ └── type: primitive:string - │ ├─┬ NullShouldBeTreatedAsUndefinedData interface - │ │ └─┬ members - │ │ ├─┬ arrayWithThreeElementsAndUndefinedAsSecondArgument property - │ │ │ ├── abstract - │ │ │ └── type: Array - │ │ └─┬ thisShouldBeUndefined property - │ │ ├── abstract - │ │ └── type: primitive:any (optional) - │ ├─┬ UnionProperties interface - │ │ └─┬ members - │ │ ├─┬ bar property - │ │ │ ├── abstract - │ │ │ ├── immutable - │ │ │ └── type: primitive:string | primitive:number | class:jsii-calc.AllTypes - │ │ └─┬ foo property - │ │ ├── abstract - │ │ └── type: primitive:string | primitive:number - │ ├─┬ AllTypesEnum enum - │ │ ├── MY_ENUM_VALUE - │ │ ├── YOUR_ENUM_VALUE - │ │ └── THIS_IS_GREAT - │ ├─┬ StringEnum enum - │ │ ├── A - │ │ ├── B - │ │ └── C - │ └─┬ CompositionStringStyle enum - │ ├── NORMAL - │ └── DECORATED - ├─┬ @scope/jsii-calc-base - │ ├─┬ dependencies - │ │ └── @scope/jsii-calc-base-of-base - │ └─┬ types - │ ├─┬ Base class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ typeName() method - │ │ └── returns: primitive:any - │ └─┬ BaseProps interface - │ ├─┬ interfaces - │ │ └── VeryBaseProps - │ └─┬ members - │ └─┬ bar property - │ ├── abstract - │ └── type: primitive:string - ├─┬ @scope/jsii-calc-base-of-base - │ └─┬ types - │ ├─┬ Very class - │ │ └─┬ members - │ │ ├─┬ () method - │ │ │ └── returns: void - │ │ └─┬ hey() method - │ │ └── returns: primitive:number - │ └─┬ VeryBaseProps interface - │ └─┬ members - │ └─┬ foo property - │ ├── abstract - │ └── type: class:@scope/jsii-calc-base-of-base.Very - └─┬ @scope/jsii-calc-lib - ├─┬ dependencies - │ └── @scope/jsii-calc-base - └─┬ types - ├─┬ Number class - │ ├── base: Value - │ ├── interfaces: IDoublable - │ └─┬ members - │ ├─┬ (value) method - │ │ ├─┬ parameters - │ │ │ └─┬ value - │ │ │ └── type: primitive:number - │ │ └── returns: void - │ ├─┬ doubleValue property - │ │ ├── immutable - │ │ └── type: primitive:number - │ └─┬ value property - │ ├── immutable - │ └── type: primitive:number - ├─┬ Operation class - │ ├── base: Value - │ └─┬ members - │ ├─┬ () method - │ │ └── returns: void - │ └─┬ toString() method - │ ├── abstract - │ └── returns: primitive:string - ├─┬ Value class - │ ├── base: Base - │ └─┬ members - │ ├─┬ () method - │ │ └── returns: void - │ ├─┬ toString() method - │ │ └── returns: primitive:string - │ └─┬ value property - │ ├── abstract - │ ├── immutable - │ └── type: primitive:number - ├─┬ IDoublable interface - │ └─┬ members - │ └─┬ doubleValue property - │ ├── abstract - │ ├── immutable - │ └── type: primitive:number - ├─┬ IFriendly interface - │ └─┬ members - │ └─┬ hello() method - │ ├── abstract - │ └── returns: primitive:string - ├─┬ MyFirstStruct interface - │ └─┬ members - │ ├─┬ anumber property - │ │ ├── abstract - │ │ └── type: primitive:number - │ ├─┬ astring property - │ │ ├── abstract - │ │ └── type: primitive:string - │ └─┬ firstOptional property - │ ├── abstract - │ └── type: Array - ├─┬ StructWithOnlyOptionals interface - │ └─┬ members - │ ├─┬ optional1 property - │ │ ├── abstract - │ │ └── type: primitive:string (optional) - │ ├─┬ optional2 property - │ │ ├── abstract - │ │ └── type: primitive:number (optional) - │ └─┬ optional3 property - │ ├── abstract - │ └── type: primitive:boolean (optional) - └─┬ EnumFromScopedModule enum - ├── VALUE1 - └── VALUE2 diff --git a/packages/jsii-reflect/jsii-tree.test.stdout b/packages/jsii-reflect/jsii-tree.test.stdout deleted file mode 100644 index 195636909e..0000000000 --- a/packages/jsii-reflect/jsii-tree.test.stdout +++ /dev/null @@ -1,5 +0,0 @@ -assemblies - ├── jsii-calc - ├── @scope/jsii-calc-base - ├── @scope/jsii-calc-base-of-base - └── @scope/jsii-calc-lib diff --git a/packages/jsii-reflect/lib/assembly.ts b/packages/jsii-reflect/lib/assembly.ts index 92f0425be4..e075600a10 100644 --- a/packages/jsii-reflect/lib/assembly.ts +++ b/packages/jsii-reflect/lib/assembly.ts @@ -2,17 +2,24 @@ import * as jsii from '@jsii/spec'; import { ClassType } from './class'; import { Dependency } from './dependency'; import { EnumType } from './enum'; +import { ModuleLike } from './module-like'; import { InterfaceType } from './interface'; +import { Submodule } from './submodule'; import { Type } from './type'; import { TypeSystem } from './type-system'; -export class Assembly { +export class Assembly extends ModuleLike { private _typeCache?: { [fqn: string]: Type }; + private _submoduleCache?: { [fqn: string]: Submodule }; private _dependencyCache?: { [name: string]: Dependency }; - public constructor( - public readonly system: TypeSystem, - public readonly spec: jsii.Assembly) { } + public constructor(system: TypeSystem, public readonly spec: jsii.Assembly) { + super(system); + } + + public get fqn(): string { + return this.spec.name; + } /** * The version of the spec schema @@ -54,7 +61,7 @@ export class Assembly { * The module repository, maps to "repository" from package.json * This is required since some package managers (like Maven) require it. */ - public get repository(): { type: string, url: string, directory?: string } { + public get repository(): { readonly type: string, readonly url: string, readonly directory?: string } { return this.spec.repository; } @@ -68,7 +75,7 @@ export class Assembly { /** * Additional contributors to this package. */ - public get contributors(): jsii.Person[] { + public get contributors(): readonly jsii.Person[] { return this.spec.contributors ?? []; } @@ -104,7 +111,7 @@ export class Assembly { /** * Dependencies on other assemblies (with semver), the key is the JSII assembly name. */ - public get dependencies(): Dependency[] { + public get dependencies(): readonly Dependency[] { return Object.keys(this._dependencies).map(name => this._dependencies[name]); } @@ -119,7 +126,7 @@ export class Assembly { /** * List if bundled dependencies (these are not expected to be jsii assemblies). */ - public get bundled(): { [module: string]: string } { + public get bundled(): { readonly [module: string]: string } { return this.spec.bundled ?? { }; } @@ -130,37 +137,27 @@ export class Assembly { return this.spec.readme; } - /** - * All types in the assembly, keyed by their fully-qualified-name - */ - public get types(): Type[] { - return Object.keys(this._types).map(key => this._types[key]); + public get submodules(): readonly Submodule[] { + const { submodules } = this._types; + return Object.values(submodules); } - public get classes(): ClassType[] { - return this.types.filter(t => t instanceof ClassType).map(t => t as ClassType); - } - - public get interfaces(): InterfaceType[] { - return this.types.filter(t => t instanceof InterfaceType).map(t => t as InterfaceType); - } - - public get enums(): EnumType[] { - return this.types.filter(t => t instanceof EnumType).map(t => t as EnumType); + /** + * All types in the assembly + */ + public get types(): readonly Type[] { + const { types } = this._types; + return Object.values(types); } public findType(fqn: string) { - const type = this._types[fqn]; + const type = this.tryFindType(fqn); if (!type) { throw new Error(`Type '${fqn}' not found in assembly ${this.name}`); } return type; } - public tryFindType(fqn: string): Type | undefined { - return this._types[fqn]; - } - /** * Validate an assembly after loading * @@ -185,31 +182,70 @@ export class Assembly { } private get _types() { - if (!this._typeCache) { - this._typeCache = { }; + if (!this._typeCache || !this._submoduleCache) { + this._typeCache = {}; + + const submodules: { [fullName: string]: SubmoduleMap } = {}; const ts = this.spec.types ?? { }; for (const fqn of Object.keys(ts)) { - const type = ts[fqn]; - switch (type.kind) { + const typeSpec = ts[fqn]; + + let submodule = typeSpec.namespace; + while (submodule != null && `${this.spec.name}.${submodule}` in ts) { + submodule = ts[`${this.spec.name}.${submodule}`].namespace; + } + + let type: Type; + switch (typeSpec.kind) { case jsii.TypeKind.Class: - this._typeCache[fqn] = new ClassType(this.system, this, type); + type = new ClassType(this.system, this, typeSpec); break; case jsii.TypeKind.Interface: - this._typeCache[fqn] = new InterfaceType(this.system, this, type); + type = new InterfaceType(this.system, this, typeSpec); break; case jsii.TypeKind.Enum: - this._typeCache[fqn] = new EnumType(this.system, this, type); + type = new EnumType(this.system, this, typeSpec); break; default: throw new Error('Unknown type kind'); } + + if (submodule != null) { + const [root, ...parts] = submodule.split('.'); + let container = submodules[root] = submodules[root] ?? { submodules: {}, types: [] }; + for (const part of parts) { + container = container.submodules[part] = container.submodules[part] ?? { submodules: {}, types: [] }; + } + container.types.push(type); + } else { + this._typeCache[fqn] = type; + } + } + + this._submoduleCache = {}; + for (const [name, map] of Object.entries(submodules)) { + this._submoduleCache[name] = makeSubmodule(this.system, map, `${this.name}.${name}`); } } - return this._typeCache; + return { types: this._typeCache, submodules: this._submoduleCache }; } } + +interface SubmoduleMap { + readonly submodules: { [fullName: string]: SubmoduleMap }; + readonly types: Type[]; +} + +function makeSubmodule(system: TypeSystem, map: SubmoduleMap, fullName: string): Submodule { + return new Submodule( + system, + fullName, + Object.entries(map.submodules).map(([name, subMap]) => makeSubmodule(system, subMap, `${fullName}.${name}`)), + map.types, + ); +} diff --git a/packages/jsii-reflect/lib/index.ts b/packages/jsii-reflect/lib/index.ts index 211c90b020..5a6711367f 100644 --- a/packages/jsii-reflect/lib/index.ts +++ b/packages/jsii-reflect/lib/index.ts @@ -7,10 +7,12 @@ export * from './enum'; export * from './initializer'; export * from './interface'; export * from './method'; +export * from './module-like'; export * from './optional-value'; export * from './overridable'; export * from './parameter'; export * from './property'; +export * from './submodule'; export * from './tree'; export * from './type'; export * from './type-member'; diff --git a/packages/jsii-reflect/lib/module-like.ts b/packages/jsii-reflect/lib/module-like.ts new file mode 100644 index 0000000000..88e81970ee --- /dev/null +++ b/packages/jsii-reflect/lib/module-like.ts @@ -0,0 +1,41 @@ +import { ClassType } from './class'; +import { EnumType } from './enum'; +import { InterfaceType } from './interface'; +import { Submodule } from './submodule'; +import { Type } from './type'; +import { TypeSystem } from './type-system'; + +export abstract class ModuleLike { + public abstract readonly fqn: string; + public abstract readonly submodules: readonly Submodule[]; + public abstract readonly types: readonly Type[]; + + protected constructor(public readonly system: TypeSystem) { } + + public get classes(): readonly ClassType[] { + return this.types.filter(t => t instanceof ClassType).map(t => t as ClassType); + } + + public get interfaces(): readonly InterfaceType[] { + return this.types.filter(t => t instanceof InterfaceType).map(t => t as InterfaceType); + } + + public get enums(): readonly EnumType[] { + return this.types.filter(t => t instanceof EnumType).map(t => t as EnumType); + } + + public tryFindType(fqn: string): Type | undefined { + const ownType = this.types.find(type => type.fqn === fqn); + if (ownType != null) { + return ownType; + } + + if (!fqn.startsWith(`${this.fqn}.`)) { + return undefined; + } + + const [subName] = fqn.slice(this.fqn.length + 1).split('.'); + const sub = this.submodules.find(sub => sub.name === subName); + return sub?.tryFindType(fqn); + } +} diff --git a/packages/jsii-reflect/lib/submodule.ts b/packages/jsii-reflect/lib/submodule.ts new file mode 100644 index 0000000000..07b183edf9 --- /dev/null +++ b/packages/jsii-reflect/lib/submodule.ts @@ -0,0 +1,21 @@ +import { ModuleLike } from './module-like'; +import { Type } from './type'; +import { TypeSystem } from './type-system'; + +export class Submodule extends ModuleLike { + /** + * The simple name of the submodule (the last segment of the `fullName`). + */ + public readonly name: string; + + public constructor( + system: TypeSystem, + public readonly fqn: string, + public readonly submodules: readonly Submodule[], + public readonly types: readonly Type[], + ) { + super(system); + + this.name = fqn.split('.').pop()!; + } +} diff --git a/packages/jsii-reflect/lib/tree.ts b/packages/jsii-reflect/lib/tree.ts index 5276ed9c9b..cb55ab98d6 100644 --- a/packages/jsii-reflect/lib/tree.ts +++ b/packages/jsii-reflect/lib/tree.ts @@ -13,6 +13,7 @@ import { OptionalValue } from './optional-value'; import { Parameter } from './parameter'; import { Property } from './property'; import { TypeSystem } from './type-system'; +import { Submodule } from './submodule'; export interface TypeSystemTreeOptions { /** @@ -101,6 +102,13 @@ class AssemblyNode extends AsciiTree { deps.add(...assembly.dependencies.map(d => new DependencyNode(d, options))); } + const submodules = assembly.submodules; + if (submodules.length > 0) { + const title = new TitleNode('submodules'); + this.add(title); + title.add(...submodules.map(s => new SubmoduleNode(s, options))); + } + if (options.types) { const types = new TitleNode('types'); this.add(types); @@ -111,6 +119,27 @@ class AssemblyNode extends AsciiTree { } } +class SubmoduleNode extends AsciiTree { + public constructor(submodule: Submodule, options: TypeSystemTreeOptions) { + super(colors.green(submodule.name)); + + const submodules = submodule.submodules; + if (submodules.length > 0) { + const title = new TitleNode('submodules'); + this.add(title); + title.add(...submodules.map(s => new SubmoduleNode(s, options))); + } + + if (options.types) { + const types = new TitleNode('types'); + this.add(types); + types.add(...submodule.classes.map(c => new ClassNode(c, options))); + types.add(...submodule.interfaces.map(i => new InterfaceNode(i, options))); + types.add(...submodule.enums.map(e => new EnumNode(e, options))); + } + } +} + class MethodNode extends AsciiTree { public constructor(method: Method, options: TypeSystemTreeOptions) { const args = method.parameters.map(p => p.name).join(','); diff --git a/packages/jsii-reflect/lib/type-system.ts b/packages/jsii-reflect/lib/type-system.ts index 8ca951d264..cfafcbe852 100644 --- a/packages/jsii-reflect/lib/type-system.ts +++ b/packages/jsii-reflect/lib/type-system.ts @@ -7,6 +7,7 @@ import { ClassType } from './class'; import { EnumType } from './enum'; import { InterfaceType } from './interface'; import { Method } from './method'; +import { ModuleLike } from './module-like'; import { Property } from './property'; import { Type } from './type'; @@ -227,26 +228,26 @@ export class TypeSystem { return out; } - public get classes() { + public get classes(): readonly ClassType[] { const out = new Array(); this.assemblies.forEach(a => { - out.push(...a.classes); + out.push(...collectTypes(a, item => item.classes)); }); return out; } - public get interfaces() { + public get interfaces(): readonly InterfaceType[] { const out = new Array(); this.assemblies.forEach(a => { - out.push(...a.interfaces); + out.push(...collectTypes(a, item => item.interfaces)); }); return out; } - public get enums() { + public get enums(): readonly EnumType[] { const out = new Array(); this.assemblies.forEach(a => { - out.push(...a.enums); + out.push(...collectTypes(a, item => item.enums)); }); return out; } @@ -275,3 +276,12 @@ function dependenciesOf(packageJson: any) { Object.keys(packageJson.peerDependencies ?? {}).forEach(deps.add.bind(deps)); return Array.from(deps); } + +function collectTypes(module: ModuleLike, getter: (module: ModuleLike) => readonly T[]): readonly T[] { + const result = new Array(); + for (const submodule of module.submodules) { + result.push(...collectTypes(submodule, getter)); + } + result.push(...getter(module)); + return result; +} diff --git a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap index 922cd1bce4..bcd8bd6335 100644 --- a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap +++ b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap @@ -7,6 +7,119 @@ exports[`jsii-tree --all 1`] = ` │ │ ├── @scope/jsii-calc-base │ │ ├── @scope/jsii-calc-base-of-base │ │ └── @scope/jsii-calc-lib + │ ├─┬ submodules + │ │ ├─┬ DerivedClassHasNoProperties + │ │ │ └─┬ types + │ │ │ ├─┬ class Base (experimental) + │ │ │ │ └─┬ members + │ │ │ │ ├── () initializer (experimental) + │ │ │ │ └─┬ prop property (experimental) + │ │ │ │ └── type: string + │ │ │ └─┬ class Derived (experimental) + │ │ │ ├── base: Base + │ │ │ └─┬ members + │ │ │ └── () initializer (experimental) + │ │ ├─┬ InterfaceInNamespaceIncludesClasses + │ │ │ └─┬ types + │ │ │ ├─┬ class Foo (experimental) + │ │ │ │ └─┬ members + │ │ │ │ ├── () initializer (experimental) + │ │ │ │ └─┬ bar property (experimental) + │ │ │ │ └── type: Optional + │ │ │ └─┬ interface Hello (experimental) + │ │ │ └─┬ members + │ │ │ └─┬ foo property (experimental) + │ │ │ ├── abstract + │ │ │ ├── immutable + │ │ │ └── type: number + │ │ ├─┬ InterfaceInNamespaceOnlyInterface + │ │ │ └─┬ types + │ │ │ └─┬ interface Hello (experimental) + │ │ │ └─┬ members + │ │ │ └─┬ foo property (experimental) + │ │ │ ├── abstract + │ │ │ ├── immutable + │ │ │ └── type: number + │ │ ├─┬ composition + │ │ │ └─┬ types + │ │ │ ├─┬ class CompositeOperation (experimental) + │ │ │ │ ├── base: Operation + │ │ │ │ └─┬ members + │ │ │ │ ├── () initializer (experimental) + │ │ │ │ ├─┬ toString() method (experimental) + │ │ │ │ │ └── returns: string + │ │ │ │ ├─┬ expression property (experimental) + │ │ │ │ │ ├── abstract + │ │ │ │ │ ├── immutable + │ │ │ │ │ └── type: @scope/jsii-calc-lib.Value + │ │ │ │ ├─┬ value property (experimental) + │ │ │ │ │ ├── immutable + │ │ │ │ │ └── type: number + │ │ │ │ ├─┬ decorationPostfixes property (experimental) + │ │ │ │ │ └── type: Array + │ │ │ │ ├─┬ decorationPrefixes property (experimental) + │ │ │ │ │ └── type: Array + │ │ │ │ └─┬ stringStyle property (experimental) + │ │ │ │ └── type: jsii-calc.composition.CompositeOperation.CompositionStringStyle + │ │ │ └─┬ enum CompositionStringStyle (experimental) + │ │ │ ├── NORMAL (experimental) + │ │ │ └── DECORATED (experimental) + │ │ └─┬ submodule + │ │ ├─┬ submodules + │ │ │ ├─┬ back_references + │ │ │ │ └─┬ types + │ │ │ │ └─┬ interface MyClassReference (experimental) + │ │ │ │ └─┬ members + │ │ │ │ └─┬ reference property (experimental) + │ │ │ │ ├── abstract + │ │ │ │ ├── immutable + │ │ │ │ └── type: jsii-calc.submodule.MyClass + │ │ │ ├─┬ child + │ │ │ │ └─┬ types + │ │ │ │ ├─┬ interface Structure (experimental) + │ │ │ │ │ └─┬ members + │ │ │ │ │ └─┬ bool property (experimental) + │ │ │ │ │ ├── abstract + │ │ │ │ │ ├── immutable + │ │ │ │ │ └── type: boolean + │ │ │ │ └─┬ enum Goodness (experimental) + │ │ │ │ ├── PRETTY_GOOD (experimental) + │ │ │ │ ├── REALLY_GOOD (experimental) + │ │ │ │ └── AMAZINGLY_GOOD (experimental) + │ │ │ └─┬ nested_submodule + │ │ │ ├─┬ submodules + │ │ │ │ └─┬ deeplyNested + │ │ │ │ └─┬ types + │ │ │ │ └─┬ interface INamespaced (experimental) + │ │ │ │ └─┬ members + │ │ │ │ └─┬ definedAt property (experimental) + │ │ │ │ ├── abstract + │ │ │ │ ├── immutable + │ │ │ │ └── type: string + │ │ │ └─┬ types + │ │ │ └─┬ class Namespaced (experimental) + │ │ │ ├── interfaces: INamespaced + │ │ │ └─┬ members + │ │ │ ├─┬ definedAt property (experimental) + │ │ │ │ ├── immutable + │ │ │ │ └── type: string + │ │ │ └─┬ goodness property (experimental) + │ │ │ ├── abstract + │ │ │ ├── immutable + │ │ │ └── type: jsii-calc.submodule.child.Goodness + │ │ └─┬ types + │ │ └─┬ class MyClass (experimental) + │ │ ├── interfaces: INamespaced + │ │ └─┬ members + │ │ ├── () initializer (experimental) + │ │ ├─┬ definedAt property (experimental) + │ │ │ ├── immutable + │ │ │ └── type: string + │ │ ├─┬ goodness property (experimental) + │ │ │ ├── immutable + │ │ │ └── type: jsii-calc.submodule.child.Goodness + │ │ └─┬ allTypes property (experimental) + │ │ └── type: Optional │ └─┬ types │ ├─┬ class AbstractClass (experimental) │ │ ├── base: AbstractClassBase @@ -531,15 +644,6 @@ exports[`jsii-tree --all 1`] = ` │ │ │ └── type: string │ │ └─┬ mutableProperty property (deprecated) │ │ └── type: Optional - │ ├─┬ class Base (experimental) - │ │ └─┬ members - │ │ ├── () initializer (experimental) - │ │ └─┬ prop property (experimental) - │ │ └── type: string - │ ├─┬ class Derived (experimental) - │ │ ├── base: Base - │ │ └─┬ members - │ │ └── () initializer (experimental) │ ├─┬ class DisappointingCollectionSource (experimental) │ │ └─┬ members │ │ ├─┬ static maybeList property (experimental) @@ -731,11 +835,6 @@ exports[`jsii-tree --all 1`] = ` │ │ └─┬ static mapOfStructs() method (experimental) │ │ ├── static │ │ └── returns: Map jsii-calc.StructA> - │ ├─┬ class Foo (experimental) - │ │ └─┬ members - │ │ ├── () initializer (experimental) - │ │ └─┬ bar property (experimental) - │ │ └── type: Optional │ ├─┬ class InterfacesMaker (experimental) │ │ └─┬ members │ │ └─┬ static makeInterfaces(count) method (experimental) @@ -1674,25 +1773,6 @@ exports[`jsii-tree --all 1`] = ` │ │ └─┬ success property (experimental) │ │ ├── immutable │ │ └── type: boolean - │ ├─┬ class CompositeOperation (experimental) - │ │ ├── base: Operation - │ │ └─┬ members - │ │ ├── () initializer (experimental) - │ │ ├─┬ toString() method (experimental) - │ │ │ └── returns: string - │ │ ├─┬ expression property (experimental) - │ │ │ ├── abstract - │ │ │ ├── immutable - │ │ │ └── type: @scope/jsii-calc-lib.Value - │ │ ├─┬ value property (experimental) - │ │ │ ├── immutable - │ │ │ └── type: number - │ │ ├─┬ decorationPostfixes property (experimental) - │ │ │ └── type: Array - │ │ ├─┬ decorationPrefixes property (experimental) - │ │ │ └── type: Array - │ │ └─┬ stringStyle property (experimental) - │ │ └── type: jsii-calc.composition.CompositeOperation.CompositionStringStyle │ ├─┬ interface CalculatorProps (experimental) │ │ └─┬ members │ │ ├─┬ initialValue property (experimental) @@ -2065,18 +2145,6 @@ exports[`jsii-tree --all 1`] = ` │ │ ├── abstract │ │ ├── immutable │ │ └── type: date - │ ├─┬ interface Hello (experimental) - │ │ └─┬ members - │ │ └─┬ foo property (experimental) - │ │ ├── abstract - │ │ ├── immutable - │ │ └── type: number - │ ├─┬ interface Hello (experimental) - │ │ └─┬ members - │ │ └─┬ foo property (experimental) - │ │ ├── abstract - │ │ ├── immutable - │ │ └── type: number │ ├─┬ interface LoadBalancedFargateServiceProps (experimental) │ │ └─┬ members │ │ ├─┬ containerPort property (experimental) @@ -2270,13 +2338,10 @@ exports[`jsii-tree --all 1`] = ` │ ├─┬ enum StableEnum (stable) │ │ ├── OPTION_A (stable) │ │ └── OPTION_B (stable) - │ ├─┬ enum StringEnum (experimental) - │ │ ├── A (experimental) - │ │ ├── B (experimental) - │ │ └── C (experimental) - │ └─┬ enum CompositionStringStyle (experimental) - │ ├── NORMAL (experimental) - │ └── DECORATED (experimental) + │ └─┬ enum StringEnum (experimental) + │ ├── A (experimental) + │ ├── B (experimental) + │ └── C (experimental) ├─┬ @scope/jsii-calc-base │ ├─┬ dependencies │ │ └── @scope/jsii-calc-base-of-base @@ -2410,6 +2475,44 @@ exports[`jsii-tree --all 1`] = ` exports[`jsii-tree --inheritance 1`] = ` "assemblies ├─┬ jsii-calc + │ ├─┬ submodules + │ │ ├─┬ DerivedClassHasNoProperties + │ │ │ └─┬ types + │ │ │ ├── class Base + │ │ │ └─┬ class Derived + │ │ │ └── base: Base + │ │ ├─┬ InterfaceInNamespaceIncludesClasses + │ │ │ └─┬ types + │ │ │ ├── class Foo + │ │ │ └── interface Hello + │ │ ├─┬ InterfaceInNamespaceOnlyInterface + │ │ │ └─┬ types + │ │ │ └── interface Hello + │ │ ├─┬ composition + │ │ │ └─┬ types + │ │ │ ├─┬ class CompositeOperation + │ │ │ │ └── base: Operation + │ │ │ └── enum CompositionStringStyle + │ │ └─┬ submodule + │ │ ├─┬ submodules + │ │ │ ├─┬ back_references + │ │ │ │ └─┬ types + │ │ │ │ └── interface MyClassReference + │ │ │ ├─┬ child + │ │ │ │ └─┬ types + │ │ │ │ ├── interface Structure + │ │ │ │ └── enum Goodness + │ │ │ └─┬ nested_submodule + │ │ │ ├─┬ submodules + │ │ │ │ └─┬ deeplyNested + │ │ │ │ └─┬ types + │ │ │ │ └── interface INamespaced + │ │ │ └─┬ types + │ │ │ └─┬ class Namespaced + │ │ │ └── interfaces: INamespaced + │ │ └─┬ types + │ │ └─┬ class MyClass + │ │ └── interfaces: INamespaced │ └─┬ types │ ├─┬ class AbstractClass │ │ ├── base: AbstractClassBase @@ -2454,9 +2557,6 @@ exports[`jsii-tree --inheritance 1`] = ` │ ├── class DefaultedConstructorArgument │ ├── class Demonstrate982 │ ├── class DeprecatedClass - │ ├── class Base - │ ├─┬ class Derived - │ │ └── base: Base │ ├── class DisappointingCollectionSource │ ├── class DoNotOverridePrivates │ ├── class DoNotRecognizeAnyAsOptional @@ -2481,7 +2581,6 @@ exports[`jsii-tree --inheritance 1`] = ` │ │ ├── base: PublicClass │ │ └── interfaces: IPublicInterface2 │ ├── class InterfaceCollections - │ ├── class Foo │ ├── class InterfacesMaker │ ├─┬ class JSII417Derived │ │ └── base: JSII417PublicBaseOfBase @@ -2552,8 +2651,6 @@ exports[`jsii-tree --inheritance 1`] = ` │ ├── class VirtualMethodPlayground │ ├── class VoidCallback │ ├── class WithPrivatePropertyInConstructor - │ ├─┬ class CompositeOperation - │ │ └── base: Operation │ ├── interface CalculatorProps │ ├─┬ interface ChildStruct982 │ │ └─┬ interfaces @@ -2629,8 +2726,6 @@ exports[`jsii-tree --inheritance 1`] = ` │ ├─┬ interface ImplictBaseOfBase │ │ └─┬ interfaces │ │ └── BaseProps - │ ├── interface Hello - │ ├── interface Hello │ ├── interface LoadBalancedFargateServiceProps │ ├── interface NestedStruct │ ├── interface NullShouldBeTreatedAsUndefinedData @@ -2653,8 +2748,7 @@ exports[`jsii-tree --inheritance 1`] = ` │ ├── enum SingletonIntEnum │ ├── enum SingletonStringEnum │ ├── enum StableEnum - │ ├── enum StringEnum - │ └── enum CompositionStringStyle + │ └── enum StringEnum ├─┬ @scope/jsii-calc-base │ └─┬ types │ ├── class Base @@ -2692,6 +2786,79 @@ exports[`jsii-tree --inheritance 1`] = ` exports[`jsii-tree --members 1`] = ` "assemblies ├─┬ jsii-calc + │ ├─┬ submodules + │ │ ├─┬ DerivedClassHasNoProperties + │ │ │ └─┬ types + │ │ │ ├─┬ class Base + │ │ │ │ └─┬ members + │ │ │ │ ├── () initializer + │ │ │ │ └── prop property + │ │ │ └─┬ class Derived + │ │ │ └─┬ members + │ │ │ └── () initializer + │ │ ├─┬ InterfaceInNamespaceIncludesClasses + │ │ │ └─┬ types + │ │ │ ├─┬ class Foo + │ │ │ │ └─┬ members + │ │ │ │ ├── () initializer + │ │ │ │ └── bar property + │ │ │ └─┬ interface Hello + │ │ │ └─┬ members + │ │ │ └── foo property + │ │ ├─┬ InterfaceInNamespaceOnlyInterface + │ │ │ └─┬ types + │ │ │ └─┬ interface Hello + │ │ │ └─┬ members + │ │ │ └── foo property + │ │ ├─┬ composition + │ │ │ └─┬ types + │ │ │ ├─┬ class CompositeOperation + │ │ │ │ └─┬ members + │ │ │ │ ├── () initializer + │ │ │ │ ├── toString() method + │ │ │ │ ├── expression property + │ │ │ │ ├── value property + │ │ │ │ ├── decorationPostfixes property + │ │ │ │ ├── decorationPrefixes property + │ │ │ │ └── stringStyle property + │ │ │ └─┬ enum CompositionStringStyle + │ │ │ ├── NORMAL + │ │ │ └── DECORATED + │ │ └─┬ submodule + │ │ ├─┬ submodules + │ │ │ ├─┬ back_references + │ │ │ │ └─┬ types + │ │ │ │ └─┬ interface MyClassReference + │ │ │ │ └─┬ members + │ │ │ │ └── reference property + │ │ │ ├─┬ child + │ │ │ │ └─┬ types + │ │ │ │ ├─┬ interface Structure + │ │ │ │ │ └─┬ members + │ │ │ │ │ └── bool property + │ │ │ │ └─┬ enum Goodness + │ │ │ │ ├── PRETTY_GOOD + │ │ │ │ ├── REALLY_GOOD + │ │ │ │ └── AMAZINGLY_GOOD + │ │ │ └─┬ nested_submodule + │ │ │ ├─┬ submodules + │ │ │ │ └─┬ deeplyNested + │ │ │ │ └─┬ types + │ │ │ │ └─┬ interface INamespaced + │ │ │ │ └─┬ members + │ │ │ │ └── definedAt property + │ │ │ └─┬ types + │ │ │ └─┬ class Namespaced + │ │ │ └─┬ members + │ │ │ ├── definedAt property + │ │ │ └── goodness property + │ │ └─┬ types + │ │ └─┬ class MyClass + │ │ └─┬ members + │ │ ├── () initializer + │ │ ├── definedAt property + │ │ ├── goodness property + │ │ └── allTypes property │ └─┬ types │ ├─┬ class AbstractClass │ │ └─┬ members @@ -2905,13 +3072,6 @@ exports[`jsii-tree --members 1`] = ` │ │ ├── method() method │ │ ├── readonlyProperty property │ │ └── mutableProperty property - │ ├─┬ class Base - │ │ └─┬ members - │ │ ├── () initializer - │ │ └── prop property - │ ├─┬ class Derived - │ │ └─┬ members - │ │ └── () initializer │ ├─┬ class DisappointingCollectionSource │ │ └─┬ members │ │ ├── static maybeList property @@ -3000,10 +3160,6 @@ exports[`jsii-tree --members 1`] = ` │ │ ├── static listOfStructs() method │ │ ├── static mapOfInterfaces() method │ │ └── static mapOfStructs() method - │ ├─┬ class Foo - │ │ └─┬ members - │ │ ├── () initializer - │ │ └── bar property │ ├─┬ class InterfacesMaker │ │ └─┬ members │ │ └── static makeInterfaces(count) method @@ -3408,15 +3564,6 @@ exports[`jsii-tree --members 1`] = ` │ │ └─┬ members │ │ ├── (privateField) initializer │ │ └── success property - │ ├─┬ class CompositeOperation - │ │ └─┬ members - │ │ ├── () initializer - │ │ ├── toString() method - │ │ ├── expression property - │ │ ├── value property - │ │ ├── decorationPostfixes property - │ │ ├── decorationPrefixes property - │ │ └── stringStyle property │ ├─┬ interface CalculatorProps │ │ └─┬ members │ │ ├── initialValue property @@ -3583,12 +3730,6 @@ exports[`jsii-tree --members 1`] = ` │ ├─┬ interface ImplictBaseOfBase │ │ └─┬ members │ │ └── goo property - │ ├─┬ interface Hello - │ │ └─┬ members - │ │ └── foo property - │ ├─┬ interface Hello - │ │ └─┬ members - │ │ └── foo property │ ├─┬ interface LoadBalancedFargateServiceProps │ │ └─┬ members │ │ ├── containerPort property @@ -3674,13 +3815,10 @@ exports[`jsii-tree --members 1`] = ` │ ├─┬ enum StableEnum │ │ ├── OPTION_A │ │ └── OPTION_B - │ ├─┬ enum StringEnum - │ │ ├── A - │ │ ├── B - │ │ └── C - │ └─┬ enum CompositionStringStyle - │ ├── NORMAL - │ └── DECORATED + │ └─┬ enum StringEnum + │ ├── A + │ ├── B + │ └── C ├─┬ @scope/jsii-calc-base │ └─┬ types │ ├─┬ class Base @@ -3748,7 +3886,19 @@ exports[`jsii-tree --members 1`] = ` exports[`jsii-tree --signatures 1`] = ` "assemblies - ├── jsii-calc + ├─┬ jsii-calc + │ └─┬ submodules + │ ├── DerivedClassHasNoProperties + │ ├── InterfaceInNamespaceIncludesClasses + │ ├── InterfaceInNamespaceOnlyInterface + │ ├── composition + │ └─┬ submodule + │ └─┬ submodules + │ ├── back_references + │ ├── child + │ └─┬ nested_submodule + │ └─┬ submodules + │ └── deeplyNested ├── @scope/jsii-calc-base ├── @scope/jsii-calc-base-of-base └── @scope/jsii-calc-lib @@ -3758,6 +3908,40 @@ exports[`jsii-tree --signatures 1`] = ` exports[`jsii-tree --types 1`] = ` "assemblies ├─┬ jsii-calc + │ ├─┬ submodules + │ │ ├─┬ DerivedClassHasNoProperties + │ │ │ └─┬ types + │ │ │ ├── class Base + │ │ │ └── class Derived + │ │ ├─┬ InterfaceInNamespaceIncludesClasses + │ │ │ └─┬ types + │ │ │ ├── class Foo + │ │ │ └── interface Hello + │ │ ├─┬ InterfaceInNamespaceOnlyInterface + │ │ │ └─┬ types + │ │ │ └── interface Hello + │ │ ├─┬ composition + │ │ │ └─┬ types + │ │ │ ├── class CompositeOperation + │ │ │ └── enum CompositionStringStyle + │ │ └─┬ submodule + │ │ ├─┬ submodules + │ │ │ ├─┬ back_references + │ │ │ │ └─┬ types + │ │ │ │ └── interface MyClassReference + │ │ │ ├─┬ child + │ │ │ │ └─┬ types + │ │ │ │ ├── interface Structure + │ │ │ │ └── enum Goodness + │ │ │ └─┬ nested_submodule + │ │ │ ├─┬ submodules + │ │ │ │ └─┬ deeplyNested + │ │ │ │ └─┬ types + │ │ │ │ └── interface INamespaced + │ │ │ └─┬ types + │ │ │ └── class Namespaced + │ │ └─┬ types + │ │ └── class MyClass │ └─┬ types │ ├── class AbstractClass │ ├── class AbstractClassBase @@ -3791,8 +3975,6 @@ exports[`jsii-tree --types 1`] = ` │ ├── class DefaultedConstructorArgument │ ├── class Demonstrate982 │ ├── class DeprecatedClass - │ ├── class Base - │ ├── class Derived │ ├── class DisappointingCollectionSource │ ├── class DoNotOverridePrivates │ ├── class DoNotRecognizeAnyAsOptional @@ -3812,7 +3994,6 @@ exports[`jsii-tree --types 1`] = ` │ ├── class ImplementsPrivateInterface │ ├── class InbetweenClass │ ├── class InterfaceCollections - │ ├── class Foo │ ├── class InterfacesMaker │ ├── class JSII417Derived │ ├── class JSII417PublicBaseOfBase @@ -3872,7 +4053,6 @@ exports[`jsii-tree --types 1`] = ` │ ├── class VirtualMethodPlayground │ ├── class VoidCallback │ ├── class WithPrivatePropertyInConstructor - │ ├── class CompositeOperation │ ├── interface CalculatorProps │ ├── interface ChildStruct982 │ ├── interface ConfusingToJacksonStruct @@ -3922,8 +4102,6 @@ exports[`jsii-tree --types 1`] = ` │ ├── interface IStableInterface │ ├── interface IStructReturningDelegate │ ├── interface ImplictBaseOfBase - │ ├── interface Hello - │ ├── interface Hello │ ├── interface LoadBalancedFargateServiceProps │ ├── interface NestedStruct │ ├── interface NullShouldBeTreatedAsUndefinedData @@ -3946,8 +4124,7 @@ exports[`jsii-tree --types 1`] = ` │ ├── enum SingletonIntEnum │ ├── enum SingletonStringEnum │ ├── enum StableEnum - │ ├── enum StringEnum - │ └── enum CompositionStringStyle + │ └── enum StringEnum ├─┬ @scope/jsii-calc-base │ └─┬ types │ ├── class Base @@ -3974,7 +4151,19 @@ exports[`jsii-tree --types 1`] = ` exports[`jsii-tree 1`] = ` "assemblies - ├── jsii-calc + ├─┬ jsii-calc + │ └─┬ submodules + │ ├── DerivedClassHasNoProperties + │ ├── InterfaceInNamespaceIncludesClasses + │ ├── InterfaceInNamespaceOnlyInterface + │ ├── composition + │ └─┬ submodule + │ └─┬ submodules + │ ├── back_references + │ ├── child + │ └─┬ nested_submodule + │ └─┬ submodules + │ └── deeplyNested ├── @scope/jsii-calc-base ├── @scope/jsii-calc-base-of-base └── @scope/jsii-calc-lib diff --git a/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap b/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap index 09c3596970..c039455160 100644 --- a/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap +++ b/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap @@ -11,125 +11,127 @@ Array [ exports[`TypeSystem.classes lists all the classes in the typesystem 1`] = ` Array [ - "AbstractClass", - "AbstractClassBase", - "AbstractClassReturner", - "AbstractSuite", - "Add", - "AllTypes", - "AllowedMethodNames", - "AmbiguousParameters", - "AnonymousImplementationProvider", - "AsyncVirtualMethods", - "AugmentableClass", - "Base", - "Base", - "BaseJsii976", - "Bell", - "BinaryOperation", - "Calculator", - "ClassThatImplementsTheInternalInterface", - "ClassThatImplementsThePrivateInterface", - "ClassWithCollections", - "ClassWithDocs", - "ClassWithJavaReservedWords", - "ClassWithMutableObjectLiteralProperty", - "ClassWithPrivateConstructorAndAutomaticProperties", - "CompositeOperation", - "ConfusingToJackson", - "ConstructorPassesThisOut", - "Constructors", - "ConsumePureInterface", - "ConsumerCanRingBell", - "ConsumersOfThisCrazyTypeSystem", - "DataRenderer", - "DefaultedConstructorArgument", - "Demonstrate982", - "DeprecatedClass", - "Derived", - "DisappointingCollectionSource", - "DoNotOverridePrivates", - "DoNotRecognizeAnyAsOptional", - "DocumentedClass", - "DontComplainAboutVariadicAfterOptional", - "DoubleTrouble", - "EnumDispenser", - "EraseUndefinedHashValues", - "ExperimentalClass", - "ExportedBaseClass", - "Foo", - "GiveMeStructs", - "GreetingAugmenter", - "ImplementInternalInterface", - "Implementation", - "ImplementsInterfaceWithInternal", - "ImplementsInterfaceWithInternalSubclass", - "ImplementsPrivateInterface", - "InbetweenClass", - "InterfaceCollections", - "InterfacesMaker", - "JSII417Derived", - "JSII417PublicBaseOfBase", - "JSObjectLiteralForInterface", - "JSObjectLiteralToNative", - "JSObjectLiteralToNativeClass", - "JavaReservedWords", - "Jsii487Derived", - "Jsii496Derived", - "JsiiAgent", - "JsonFormatter", - "MethodNamedProperty", - "Multiply", - "Negate", - "NodeStandardLibrary", - "NullShouldBeTreatedAsUndefined", - "Number", - "NumberGenerator", - "ObjectRefsInCollections", - "ObjectWithPropertyProvider", - "Old", - "Operation", - "OptionalArgumentInvoker", - "OptionalConstructorArgument", - "OptionalStructConsumer", - "OverridableProtectedMember", - "OverrideReturnsObject", - "PartiallyInitializedThisConsumer", - "Polymorphism", - "Power", - "PropertyNamedProperty", - "PublicClass", - "PythonReservedWords", - "ReferenceEnumFromScopedPackage", - "ReturnsPrivateImplementationOfInterface", - "RootStructValidator", - "RuntimeTypeChecking", - "SingleInstanceTwoTypes", - "SingletonInt", - "SingletonString", - "SomeTypeJsii976", - "StableClass", - "StaticContext", - "Statics", - "StripInternal", - "StructPassing", - "StructUnionConsumer", - "Sum", - "SupportsNiceJavaBuilder", - "SupportsNiceJavaBuilderWithRequiredProps", - "SyncVirtualMethods", - "Thrower", - "UnaryOperation", - "UseBundledDependency", - "UseCalcBase", - "UsesInterfaceWithProperties", - "Value", - "VariadicInvoker", - "VariadicMethod", - "Very", - "VirtualMethodPlayground", - "VoidCallback", - "WithPrivatePropertyInConstructor", + "@scope/jsii-calc-base-of-base.Very", + "@scope/jsii-calc-base.Base", + "@scope/jsii-calc-lib.Number", + "@scope/jsii-calc-lib.Operation", + "@scope/jsii-calc-lib.Value", + "jsii-calc.AbstractClass", + "jsii-calc.AbstractClassBase", + "jsii-calc.AbstractClassReturner", + "jsii-calc.AbstractSuite", + "jsii-calc.Add", + "jsii-calc.AllTypes", + "jsii-calc.AllowedMethodNames", + "jsii-calc.AmbiguousParameters", + "jsii-calc.AnonymousImplementationProvider", + "jsii-calc.AsyncVirtualMethods", + "jsii-calc.AugmentableClass", + "jsii-calc.BaseJsii976", + "jsii-calc.Bell", + "jsii-calc.BinaryOperation", + "jsii-calc.Calculator", + "jsii-calc.ClassThatImplementsTheInternalInterface", + "jsii-calc.ClassThatImplementsThePrivateInterface", + "jsii-calc.ClassWithCollections", + "jsii-calc.ClassWithDocs", + "jsii-calc.ClassWithJavaReservedWords", + "jsii-calc.ClassWithMutableObjectLiteralProperty", + "jsii-calc.ClassWithPrivateConstructorAndAutomaticProperties", + "jsii-calc.ConfusingToJackson", + "jsii-calc.ConstructorPassesThisOut", + "jsii-calc.Constructors", + "jsii-calc.ConsumePureInterface", + "jsii-calc.ConsumerCanRingBell", + "jsii-calc.ConsumersOfThisCrazyTypeSystem", + "jsii-calc.DataRenderer", + "jsii-calc.DefaultedConstructorArgument", + "jsii-calc.Demonstrate982", + "jsii-calc.DeprecatedClass", + "jsii-calc.DerivedClassHasNoProperties.Base", + "jsii-calc.DerivedClassHasNoProperties.Derived", + "jsii-calc.DisappointingCollectionSource", + "jsii-calc.DoNotOverridePrivates", + "jsii-calc.DoNotRecognizeAnyAsOptional", + "jsii-calc.DocumentedClass", + "jsii-calc.DontComplainAboutVariadicAfterOptional", + "jsii-calc.DoubleTrouble", + "jsii-calc.EnumDispenser", + "jsii-calc.EraseUndefinedHashValues", + "jsii-calc.ExperimentalClass", + "jsii-calc.ExportedBaseClass", + "jsii-calc.GiveMeStructs", + "jsii-calc.GreetingAugmenter", + "jsii-calc.ImplementInternalInterface", + "jsii-calc.Implementation", + "jsii-calc.ImplementsInterfaceWithInternal", + "jsii-calc.ImplementsInterfaceWithInternalSubclass", + "jsii-calc.ImplementsPrivateInterface", + "jsii-calc.InbetweenClass", + "jsii-calc.InterfaceCollections", + "jsii-calc.InterfaceInNamespaceIncludesClasses.Foo", + "jsii-calc.InterfacesMaker", + "jsii-calc.JSII417Derived", + "jsii-calc.JSII417PublicBaseOfBase", + "jsii-calc.JSObjectLiteralForInterface", + "jsii-calc.JSObjectLiteralToNative", + "jsii-calc.JSObjectLiteralToNativeClass", + "jsii-calc.JavaReservedWords", + "jsii-calc.Jsii487Derived", + "jsii-calc.Jsii496Derived", + "jsii-calc.JsiiAgent", + "jsii-calc.JsonFormatter", + "jsii-calc.MethodNamedProperty", + "jsii-calc.Multiply", + "jsii-calc.Negate", + "jsii-calc.NodeStandardLibrary", + "jsii-calc.NullShouldBeTreatedAsUndefined", + "jsii-calc.NumberGenerator", + "jsii-calc.ObjectRefsInCollections", + "jsii-calc.ObjectWithPropertyProvider", + "jsii-calc.Old", + "jsii-calc.OptionalArgumentInvoker", + "jsii-calc.OptionalConstructorArgument", + "jsii-calc.OptionalStructConsumer", + "jsii-calc.OverridableProtectedMember", + "jsii-calc.OverrideReturnsObject", + "jsii-calc.PartiallyInitializedThisConsumer", + "jsii-calc.Polymorphism", + "jsii-calc.Power", + "jsii-calc.PropertyNamedProperty", + "jsii-calc.PublicClass", + "jsii-calc.PythonReservedWords", + "jsii-calc.ReferenceEnumFromScopedPackage", + "jsii-calc.ReturnsPrivateImplementationOfInterface", + "jsii-calc.RootStructValidator", + "jsii-calc.RuntimeTypeChecking", + "jsii-calc.SingleInstanceTwoTypes", + "jsii-calc.SingletonInt", + "jsii-calc.SingletonString", + "jsii-calc.SomeTypeJsii976", + "jsii-calc.StableClass", + "jsii-calc.StaticContext", + "jsii-calc.Statics", + "jsii-calc.StripInternal", + "jsii-calc.StructPassing", + "jsii-calc.StructUnionConsumer", + "jsii-calc.Sum", + "jsii-calc.SupportsNiceJavaBuilder", + "jsii-calc.SupportsNiceJavaBuilderWithRequiredProps", + "jsii-calc.SyncVirtualMethods", + "jsii-calc.Thrower", + "jsii-calc.UnaryOperation", + "jsii-calc.UseBundledDependency", + "jsii-calc.UseCalcBase", + "jsii-calc.UsesInterfaceWithProperties", + "jsii-calc.VariadicInvoker", + "jsii-calc.VariadicMethod", + "jsii-calc.VirtualMethodPlayground", + "jsii-calc.VoidCallback", + "jsii-calc.WithPrivatePropertyInConstructor", + "jsii-calc.composition.CompositeOperation", + "jsii-calc.submodule.MyClass", + "jsii-calc.submodule.nested_submodule.Namespaced", ] `; diff --git a/packages/jsii-reflect/test/type-system.test.ts b/packages/jsii-reflect/test/type-system.test.ts index 21ad3b03fb..354d9da511 100644 --- a/packages/jsii-reflect/test/type-system.test.ts +++ b/packages/jsii-reflect/test/type-system.test.ts @@ -22,7 +22,7 @@ test('TypeSystem.assemblies lists all the loaded assemblies', () => ); test('TypeSystem.classes lists all the classes in the typesystem', () => - expect(typesys.classes.map(c => c.name).sort()).toMatchSnapshot() + expect(typesys.classes.map(c => c.fqn).sort()).toMatchSnapshot() ); test('findClass', () => { diff --git a/packages/jsii/lib/assembler.ts b/packages/jsii/lib/assembler.ts index 4a7b2996e1..33480b93f5 100644 --- a/packages/jsii/lib/assembler.ts +++ b/packages/jsii/lib/assembler.ts @@ -1,3 +1,4 @@ +import * as Case from 'case'; import * as colors from 'colors/safe'; import * as crypto from 'crypto'; // eslint-disable-next-line @typescript-eslint/no-require-imports @@ -32,6 +33,10 @@ export class Assembler implements Emitter { private _deferred = new Array(); private _types: { [fqn: string]: spec.Type } = {}; + /** Map of Symbol to namespace export Symbol */ + private readonly _submoduleMap = new Map(); + private readonly _submodules = new Set(); + /** * @param projectInfo information about the package being assembled * @param program the TypeScript program to be assembled from @@ -104,7 +109,11 @@ export class Assembler implements Emitter { } const symbol = this._typeChecker.getSymbolAtLocation(sourceFile); if (symbol) { - for (const node of this._typeChecker.getExportsOfModule(symbol)) { + const moduleExports = this._typeChecker.getExportsOfModule(symbol); + for (const node of moduleExports) { + this._registerNamespaces(node); + } + for (const node of moduleExports) { visitPromises.push(this._visitNode(node.declarations[0], new EmitContext([], this.projectInfo.stability))); } } @@ -282,7 +291,12 @@ export class Assembler implements Emitter { return type; } - private _diagnostic(node: ts.Node | null, category: ts.DiagnosticCategory, messageText: string) { + private _diagnostic( + node: ts.Node | null, + category: ts.DiagnosticCategory, + messageText: string, + relatedInformation?: ts.DiagnosticRelatedInformation[] + ) { this._diagnostics.push({ domain: 'JSII', category, @@ -291,6 +305,7 @@ export class Assembler implements Emitter { file: node != null ? node.getSourceFile() : undefined, start: node != null ? node.getStart() : undefined, length: node != null ? node.getEnd() - node.getStart() : undefined, + relatedInformation, }); } @@ -318,7 +333,18 @@ export class Assembler implements Emitter { this._diagnostic(node, ts.DiagnosticCategory.Error, `Could not find module for ${modulePath}`); return `unknown.${typeName}`; } - const fqn = `${pkg.name}.${typeName}`; + + let submodule = this._submoduleMap.get(type.symbol); + let submoduleNs = submodule?.name; + // Submodules can be in submodules themselves, so we crawl up the tree... + while (submodule != null && this._submoduleMap.has(submodule)) { + submodule = this._submoduleMap.get(submodule)!; + submoduleNs = `${submodule.name}.${submoduleNs}`; + } + + const fqn = submoduleNs != null + ? `${pkg.name}.${submoduleNs}.${typeName}` + : `${pkg.name}.${typeName}`; if (pkg.name !== this.projectInfo.name && !this._dereference({ fqn }, type.symbol.valueDeclaration)) { this._diagnostic(node, ts.DiagnosticCategory.Error, @@ -337,26 +363,155 @@ export class Assembler implements Emitter { } } + private _registerNamespaces(symbol: ts.Symbol): void { + const declaration = symbol.valueDeclaration ?? symbol.declarations[0]; + if (declaration == null || !ts.isNamespaceExport(declaration)) { + // Nothing to do here... + return; + } + const moduleSpecifier = declaration.parent.moduleSpecifier; + if (moduleSpecifier == null || !ts.isStringLiteral(moduleSpecifier)) { + // There is a grammar error here, so we'll let tsc report this for us. + return; + } + const resolution = ts.resolveModuleName( + moduleSpecifier.text, + declaration.getSourceFile().fileName, + this.program.getCompilerOptions(), + ts.sys + ); + if (resolution.resolvedModule == null) { + // Unresolvable module... We'll let tsc report this for us. + return; + } + if (resolution.resolvedModule.isExternalLibraryImport) { + // External re-exports are "pure-javascript" sugar; they need not be + // represented in the jsii Assembly since the types in there will be + // resolved through dependencies. + return; + } + const sourceFile = this.program.getSourceFile(resolution.resolvedModule.resolvedFileName)!; + const sourceModule = this._typeChecker.getSymbolAtLocation(sourceFile); + // If there's no module, it's a syntax error, and tsc will have reported it for us. + if (sourceModule) { + if (symbol.name !== Case.camel(symbol.name) && symbol.name !== Case.snake(symbol.name)) { + this._diagnostic(declaration, ts.DiagnosticCategory.Error, + `Submodule namespaces must be camelCased or snake_cased. Consider renaming to "${Case.camel(symbol.name)}".`); + } + this._submodules.add(symbol); + this._addToSubmodule(symbol, sourceModule); + } + } + + /** + * Registers Symbols to a particular submodule. This is used to associate + * declarations exported by an `export * as ns from 'moduleLike';` statement + * so that they can subsequently be correctly namespaced. + * + * @param ns the symbol that identifies the submodule. + * @param moduleLike the module-like symbol bound to the submodule. + */ + private _addToSubmodule(ns: ts.Symbol, moduleLike: ts.Symbol) { + // For each symbol exported by the moduleLike, map it to the ns submodule. + for (const symbol of this._typeChecker.getExportsOfModule(moduleLike)) { + if (this._submoduleMap.has(symbol)) { + const currNs = this._submoduleMap.get(symbol)!; + // Checking if there's been two submodules exporting the same symbol, + // which is illegal. We can tell if the currently registered symbol has + // a different name than the one we're currently trying to register in. + if (currNs.name !== ns.name) { + const currNsDecl = currNs.valueDeclaration ?? currNs.declarations[0]; + const nsDecl = ns.valueDeclaration ?? ns.declarations[0]; + this._diagnostic( + symbol.valueDeclaration, + ts.DiagnosticCategory.Error, + `Symbol is re-exported under two distinct submodules (${currNs.name} and ${ns.name})`, + [{ + category: ts.DiagnosticCategory.Warning, + file: currNsDecl.getSourceFile(), + length: currNsDecl.getStart() - currNsDecl.getEnd(), + messageText: `Symbol is exported under the "${currNs.name}" submodule`, + start: currNsDecl.getStart(), + code: JSII_DIAGNOSTICS_CODE + }, { + category: ts.DiagnosticCategory.Warning, + file: nsDecl.getSourceFile(), + length: nsDecl.getStart() - nsDecl.getEnd(), + messageText: `Symbol is exported under the "${ns.name}" submodule`, + start: nsDecl.getStart(), + code: JSII_DIAGNOSTICS_CODE + }] + ); + } + // Found two re-exports, which is odd, but they use the same submodule, + // so it's probably okay? That's likely a tsc error, which will have + // been reported for us already anyway. + continue; + } + this._submoduleMap.set(symbol, ns); + + // If the exported symbol has any declaration, and that delcaration is of + // an entity that can have nested declarations of interest to jsii + // (classes, interfaces, enums, modules), we need to also associate those + // nested symbols to the submodule (or they won't be named correctly!) + const decl = symbol.declarations?.[0]; + if (decl != null) { + if (ts.isClassDeclaration(decl) || ts.isInterfaceDeclaration(decl) || ts.isEnumDeclaration(decl)) { + const type = this._typeChecker.getTypeAtLocation(decl); + if (type.symbol.exports) { + this._addToSubmodule(ns, symbol); + } + } else if (ts.isModuleDeclaration(decl)) { + this._addToSubmodule(ns, symbol); + } else if (ts.isNamespaceExport(decl)) { + this._submoduleMap.set(symbol, ns); + this._registerNamespaces(symbol); + } + } + } + } + /** * Register exported types in ``this.types``. * * @param node a node found in a module * @param namePrefix the prefix for the types' namespaces */ + // eslint-disable-next-line complexity private async _visitNode(node: ts.Declaration, context: EmitContext): Promise { + if (ts.isNamespaceExport(node)) { // export * as ns from 'module'; + // Note: the "ts.NamespaceExport" refers to the "export * as ns" part of + // the statement only. We must refer to `node.parent` in order to be able + // to access the module specifier ("from 'module'") part. + const symbol = this._typeChecker.getSymbolAtLocation(node.parent.moduleSpecifier!)!; + + if (LOG.isTraceEnabled()) { LOG.trace(`Entering submodule: ${colors.cyan([...context.namespace, symbol.name].join('.'))}`); } + + const nsContext = context.appendNamespace(node.name.text); + const promises = new Array>(); + for (const child of this._typeChecker.getExportsOfModule(symbol)) { + promises.push(this._visitNode(child.declarations[0], nsContext)); + } + const allTypes = flattenPromises(promises); + + if (LOG.isTraceEnabled()) { LOG.trace(`Leaving submodule: ${colors.cyan([...context.namespace, symbol.name].join('.'))}`); } + + return allTypes; + } + if ((ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Export) === 0) { return []; } let jsiiType: spec.Type | undefined; - if (ts.isClassDeclaration(node) && _isExported(node)) { + if (ts.isClassDeclaration(node) && _isExported(node)) { // export class Name { ... } jsiiType = await this._visitClass(this._typeChecker.getTypeAtLocation(node), context); - } else if (ts.isInterfaceDeclaration(node) && _isExported(node)) { + } else if (ts.isInterfaceDeclaration(node) && _isExported(node)) { // export interface Name { ... } jsiiType = await this._visitInterface(this._typeChecker.getTypeAtLocation(node), context); - } else if (ts.isEnumDeclaration(node) && _isExported(node)) { + } else if (ts.isEnumDeclaration(node) && _isExported(node)) { // export enum Name { ... } jsiiType = await this._visitEnum(this._typeChecker.getTypeAtLocation(node), context); - } else if (ts.isModuleDeclaration(node)) { + } else if (ts.isModuleDeclaration(node)) { // export namespace name { ... } const name = node.name.getText(); - const symbol = (node as any).symbol; + const symbol = this._typeChecker.getSymbolAtLocation(node.name)!; if (LOG.isTraceEnabled()) { LOG.trace(`Entering namespace: ${colors.cyan([...context.namespace, name].join('.'))}`); } @@ -374,6 +529,31 @@ export class Assembler implements Emitter { if (!jsiiType) { return []; } + // Let's quickly verify the declaration does not collide with a submodule. Submodules get case-adjusted for each + // target language separately, so names cannot collide with case-variations. + for (const submodule of this._submodules) { + const candidates = Array.from(new Set([ + submodule.name, + Case.camel(submodule.name), + Case.pascal(submodule.name), + Case.snake(submodule.name), + ])); + const colliding = candidates.find(name => `${this.projectInfo.name}.${name}` === jsiiType!.fqn); + if (colliding != null) { + const submoduleDecl = submodule.valueDeclaration ?? submodule.declarations[0]; + this._diagnostic(node, ts.DiagnosticCategory.Error, + `Submodule "${submodule.name}" conflicts with "${jsiiType.name}". Restricted names are: ${candidates.join(', ')}`, + [{ + category: ts.DiagnosticCategory.Warning, + code: JSII_DIAGNOSTICS_CODE, + file: submoduleDecl.getSourceFile(), + length: submoduleDecl.getEnd() - submoduleDecl.getStart(), + messageText: 'This is the conflicting submodule declaration.', + start: submoduleDecl.getStart() + }]); + } + } + if (LOG.isInfoEnabled()) { LOG.info(`Registering JSII ${colors.magenta(jsiiType.kind)}: ${colors.green(jsiiType.fqn)}`); } @@ -462,6 +642,7 @@ export class Assembler implements Emitter { return { interfaces: result.length === 0 ? undefined : result, erasedBases }; } + // eslint-disable-next-line complexity private async _visitClass(type: ts.Type, ctx: EmitContext): Promise { if (LOG.isTraceEnabled()) { LOG.trace(`Processing class: ${colors.gray(ctx.namespace.join('.'))}.${colors.cyan(type.symbol.name)}`); @@ -590,7 +771,8 @@ export class Assembler implements Emitter { if (!classDecl.members) { continue; } for (const memberDecl of classDecl.members) { - const member: ts.Symbol = (memberDecl as any).symbol; + // The "??" is to get to the __constructor symbol (getSymbolAtLocation wouldn't work there...) + const member = this._typeChecker.getSymbolAtLocation(memberDecl.name!) ?? ((memberDecl as any).symbol as ts.Symbol); if (!(declaringType.symbol.getDeclarations() ?? []).find(d => d === memberDecl.parent)) { continue; diff --git a/packages/jsii/lib/compiler.ts b/packages/jsii/lib/compiler.ts index ce2632dfe4..8daea35735 100644 --- a/packages/jsii/lib/compiler.ts +++ b/packages/jsii/lib/compiler.ts @@ -190,7 +190,7 @@ export class Compiler implements Emitter { hasErrors = hasErrors || emitHasErrors(assmEmit, this.options.failOnWarnings); diagnostics.push(...assmEmit.diagnostics); } catch (e) { - LOG.error(`Error during type model analysis: ${e}`); + LOG.error(`Error during type model analysis: ${e}\n${e.stack}`); } return { emitSkipped: hasErrors, diagnostics, emittedFiles: emit.emittedFiles }; diff --git a/packages/jsii/lib/validator.ts b/packages/jsii/lib/validator.ts index f29c25b386..be1bfba2c7 100644 --- a/packages/jsii/lib/validator.ts +++ b/packages/jsii/lib/validator.ts @@ -58,7 +58,7 @@ function _defaultValidations(): ValidationFunction[] { _staticConstantNamesMustUseUpperSnakeCase, _memberNamesMustNotLookLikeJavaGettersOrSetters, _allTypeReferencesAreValid, - _inehritanceDoesNotChangeContracts + _inehritanceDoesNotChangeContracts, ]; function _typeNamesMustUsePascalCase(_: Validator, assembly: spec.Assembly, diagnostic: DiagnosticEmitter) { diff --git a/packages/jsii/test/negatives/namespaced/index.ts b/packages/jsii/test/negatives/namespaced/index.ts new file mode 100644 index 0000000000..f666ae2bc7 --- /dev/null +++ b/packages/jsii/test/negatives/namespaced/index.ts @@ -0,0 +1,3 @@ +export class Declaration { + private constructor() { } +} diff --git a/packages/jsii/test/negatives/neg.submodules-cannot-have-colliding-names.ts b/packages/jsii/test/negatives/neg.submodules-cannot-have-colliding-names.ts new file mode 100644 index 0000000000..b92063f8e3 --- /dev/null +++ b/packages/jsii/test/negatives/neg.submodules-cannot-have-colliding-names.ts @@ -0,0 +1,7 @@ +///!MATCH_ERROR: Submodule "ns1" conflicts with "Ns1". + +export * as ns1 from './namespaced'; + +export class Ns1 { + private constructor() { } +} diff --git a/packages/jsii/test/negatives/neg.submodules-cannot-share-symbols.ts b/packages/jsii/test/negatives/neg.submodules-cannot-share-symbols.ts new file mode 100644 index 0000000000..314594178a --- /dev/null +++ b/packages/jsii/test/negatives/neg.submodules-cannot-share-symbols.ts @@ -0,0 +1,4 @@ +///!MATCH_ERROR: Symbol is re-exported under two distinct submodules (ns1 and ns2) + +export * as ns1 from './namespaced'; +export * as ns2 from './namespaced'; diff --git a/packages/jsii/test/negatives/neg.submodules-must-be-camel-cased.ts b/packages/jsii/test/negatives/neg.submodules-must-be-camel-cased.ts new file mode 100644 index 0000000000..0b2d93899c --- /dev/null +++ b/packages/jsii/test/negatives/neg.submodules-must-be-camel-cased.ts @@ -0,0 +1,3 @@ +///!MATCH_ERROR: Submodule namespaces must be camelCased or snake_cased. Consider renaming to "ns1" + +export * as Ns1 from './namespaced'; diff --git a/tsconfig.json b/tsconfig.json index 5e07b4a860..8b462437c8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,15 +2,8 @@ "files": [], "include": [], "references": [ - { "path": "packages/@jsii/dotnet-analyzers" }, - { "path": "packages/@jsii/dotnet-jsonmodel" }, - { "path": "packages/@jsii/dotnet-runtime" }, - { "path": "packages/@jsii/dotnet-runtime-test" }, - { "path": "packages/@jsii/java-runtime" }, - { "path": "packages/@jsii/kernel" }, - { "path": "packages/@jsii/runtime" }, - { "path": "packages/@jsii/spec" }, { "path": "packages/codemaker" }, + { "path": "packages/jsii-calc" }, { "path": "packages/jsii-config" }, { "path": "packages/jsii-diff" }, { "path": "packages/jsii-pacmak" }, @@ -18,5 +11,17 @@ { "path": "packages/jsii-rosetta" }, { "path": "packages/jsii" }, { "path": "packages/oo-ascii-tree" }, + { "path": "packages/@jsii/dotnet-analyzers" }, + { "path": "packages/@jsii/dotnet-jsonmodel" }, + { "path": "packages/@jsii/dotnet-runtime-test" }, + { "path": "packages/@jsii/dotnet-runtime" }, + { "path": "packages/@jsii/integ-test" }, + { "path": "packages/@jsii/java-runtime" }, + { "path": "packages/@jsii/kernel" }, + { "path": "packages/@jsii/runtime" }, + { "path": "packages/@jsii/spec" }, + { "path": "packages/@scope/jsii-calc-base-of-base" }, + { "path": "packages/@scope/jsii-calc-base" }, + { "path": "packages/@scope/jsii-calc-lib" } ] } From d5dee214443db716a39346c37ec6b8873e8e0265 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 16:01:04 +0000 Subject: [PATCH 17/74] chore(deps): bump fs-extra from 8.1.0 to 9.0.0 (#1353) --- packages/@jsii/integ-test/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- yarn.lock | 29 ++++++++++++++++++++++++++ 9 files changed, 37 insertions(+), 8 deletions(-) diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 41fd4bbe00..a6ff9125fc 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -18,7 +18,7 @@ "dependencies": { "@octokit/rest": "^16.36.0", "dotenv": "^8.2.0", - "fs-extra": "^8.1.0", + "fs-extra": "^9.0.0", "jest": "^25.1.0", "jsii": "^1.1.0", "jsii-pacmak": "^1.1.0", diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 86a911d451..2e4c660db9 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@jsii/spec": "^1.1.0", - "fs-extra": "^8.1.0", + "fs-extra": "^9.0.0", "source-map": "^0.7.3", "tar": "^6.0.1" }, diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index eb1b46eb3e..f883748d89 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -32,7 +32,7 @@ "dependencies": { "camelcase": "^5.3.1", "decamelize": "^1.2.0", - "fs-extra": "^8.1.0" + "fs-extra": "^9.0.0" }, "devDependencies": { "@types/decamelize": "^1.2.0", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index f4363dfc27..f0ad6b0d7e 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -33,7 +33,7 @@ }, "dependencies": { "@jsii/spec": "^1.1.0", - "fs-extra": "^8.1.0", + "fs-extra": "^9.0.0", "jsii-reflect": "^1.1.0", "log4js": "^6.1.2", "typescript": "~3.8.3", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 71c581151e..7d08daf0d3 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -40,7 +40,7 @@ "codemaker": "^1.1.0", "commonmark": "^0.29.1", "escape-string-regexp": "^2.0.0", - "fs-extra": "^8.1.0", + "fs-extra": "^9.0.0", "jsii-reflect": "^1.1.0", "jsii-rosetta": "^1.1.0", "semver": "^7.1.3", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 95b0590f4d..8a50e80be8 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -35,7 +35,7 @@ "dependencies": { "@jsii/spec": "^1.1.0", "colors": "^1.4.0", - "fs-extra": "^8.1.0", + "fs-extra": "^9.0.0", "oo-ascii-tree": "^1.1.0", "yargs": "^15.3.1" }, diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index a7b56aeabf..16fc689fac 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -32,7 +32,7 @@ "dependencies": { "@jsii/spec": "^1.1.0", "commonmark": "^0.29.1", - "fs-extra": "^8.1.0", + "fs-extra": "^9.0.0", "typescript": "~3.8.3", "xmldom": "^0.3.0", "yargs": "^15.3.1" diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 8fa0b74c8f..5670e19f05 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -37,7 +37,7 @@ "case": "^1.6.2", "colors": "^1.4.0", "deep-equal": "^2.0.1", - "fs-extra": "^8.1.0", + "fs-extra": "^9.0.0", "log4js": "^6.1.2", "semver": "^7.1.3", "semver-intersect": "^1.4.0", diff --git a/yarn.lock b/yarn.lock index 90a1a795bc..8e5f42c7ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1950,6 +1950,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + atob-lite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696" @@ -3821,6 +3826,16 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" + integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^1.0.0" + fs-minipass@^1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" @@ -5313,6 +5328,15 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179" + integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg== + dependencies: + universalify "^1.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" @@ -8434,6 +8458,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" + integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== + unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" From c6f2cb0703cb7445074686427bb8a083932c6463 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 20:55:42 +0000 Subject: [PATCH 18/74] chore(deps): bump react-is from 16.13.0 to 16.13.1 (#1355) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8e5f42c7ba..5ebc0e62f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6993,9 +6993,9 @@ rc@^1.2.7: strip-json-comments "~2.0.1" react-is@^16.12.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" - integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA== + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== read-cmd-shim@^1.0.1: version "1.0.5" From 81b1409012141a3c0c79659a867fac000f35a8d2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2020 20:51:30 +0000 Subject: [PATCH 19/74] chore(deps): bump es-abstract from 1.17.4 to 1.17.5 (#1359) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5ebc0e62f2..4b655b60ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3262,9 +3262,9 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.16.3, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4: - version "1.17.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" - integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== + version "1.17.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" + integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" From edb2ebe4dc24df2b2eeadc33d4d74c8faa7597ec Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2020 21:13:49 +0000 Subject: [PATCH 20/74] chore(deps): bump html-escaper from 2.0.0 to 2.0.1 (#1358) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4b655b60ea..383fd492ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4255,9 +4255,9 @@ html-encoding-sniffer@^1.0.2: whatwg-encoding "^1.0.1" html-escaper@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491" - integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig== + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.1.tgz#beed86b5d2b921e92533aa11bce6d8e3b583dee7" + integrity sha512-hNX23TjWwD3q56HpWjUHOKj1+4KKlnjv9PcmBUYKVpga+2cnb9nDx/B1o0yO4n+RZXZdiNxzx6B24C9aNMTkkQ== http-cache-semantics@^3.8.1: version "3.8.1" From 8272648373a2269e4022734b14ff5a65868761f1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 22 Mar 2020 21:37:58 +0000 Subject: [PATCH 21/74] chore(deps): bump picomatch from 2.2.1 to 2.2.2 (#1357) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 383fd492ca..be488b72a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6736,9 +6736,9 @@ performance-now@^2.1.0: integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= picomatch@^2.0.4, picomatch@^2.0.5: - version "2.2.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" - integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== pify@^2.0.0, pify@^2.3.0: version "2.3.0" From dfdcf806b77d6b5f2f61b2125d517fee0ff4e31d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 04:21:08 +0000 Subject: [PATCH 22/74] chore(deps): bump esquery from 1.1.0 to 1.2.0 (#1360) --- yarn.lock | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index be488b72a5..6464b700d9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3465,11 +3465,11 @@ esprima@^4.0.0, esprima@^4.0.1: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48" - integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q== + version "1.2.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.2.0.tgz#a010a519c0288f2530b3404124bfb5f02e9797fe" + integrity sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q== dependencies: - estraverse "^4.0.0" + estraverse "^5.0.0" esrecurse@^4.1.0: version "4.2.1" @@ -3478,11 +3478,16 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +estraverse@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.0.0.tgz#ac81750b482c11cca26e4b07e83ed8f75fbcdc22" + integrity sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" From b08f65feab97133ead27857233384d788676ce80 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Mon, 23 Mar 2020 14:49:32 +0100 Subject: [PATCH 23/74] fix(diff): check super types (#1354) Check that an updated type still extends all of its previous base types, so that objects of the updated type can still be assigned to variables or passed into parameters of the declared supertype. This check would have prevented a deployment failure during a big refactoring of the CDK. Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- packages/jsii-diff/lib/classes-ifaces.ts | 66 ++++++++++++- packages/jsii-diff/lib/type-analysis.ts | 3 +- packages/jsii-diff/test/classes.test.ts | 120 +++++++++++++++++++++++ packages/jsii-reflect/lib/type.ts | 10 ++ 4 files changed, 197 insertions(+), 2 deletions(-) diff --git a/packages/jsii-diff/lib/classes-ifaces.ts b/packages/jsii-diff/lib/classes-ifaces.ts index 919c0cdf55..5a6d490e82 100644 --- a/packages/jsii-diff/lib/classes-ifaces.ts +++ b/packages/jsii-diff/lib/classes-ifaces.ts @@ -1,7 +1,7 @@ import * as reflect from 'jsii-reflect'; import * as log4js from 'log4js'; import { compareStabilities } from './stability'; -import { Analysis, FailedAnalysis, isSuperType } from './type-analysis'; +import { Analysis, FailedAnalysis, isSuperType, isNominalSuperType } from './type-analysis'; import { ComparisonContext } from './types'; const LOG = log4js.getLogger('jsii-diff'); @@ -15,6 +15,15 @@ const LOG = log4js.getLogger('jsii-diff'); export function compareReferenceType(original: T, updated: T, context: ComparisonContext) { compareStabilities(original, updated, context); + const ana = assignableToAllBaseTypes(original, updated); + if (!ana.success) { + context.mismatches.report({ + ruleKey: 'base-types', + message: `not assignable to all base types anymore: ${ana.reasons.join(', ')}`, + violator: original, + }); + } + if (original.isClassType() && updated.isClassType()) { if (updated.abstract && !original.abstract) { context.mismatches.report({ @@ -62,6 +71,15 @@ export function compareReferenceType(original: export function compareStruct(original: reflect.InterfaceType, updated: reflect.InterfaceType, context: ComparisonContext) { compareStabilities(original, updated, context); + const ana = assignableToAllBaseTypes(original, updated); + if (!ana.success) { + context.mismatches.report({ + ruleKey: 'base-types', + message: `not assignable to all base types anymore: ${ana.reasons.join(', ')}`, + violator: original, + }); + } + // We don't compare structs here; they will be evaluated for compatibility // based on input and output positions. // @@ -296,3 +314,49 @@ function isCompatibleArgumentType(original: reflect.TypeReference, updated: refl // Input can never be void, so no need to check return isSuperType(updated, original, updated.system); } + +/** + * Verify assignability to supertypes + * + * For every base type B of type T, someone could have written: + * + * ``` + * const variable: B = new T(); + * ``` + * + * This code needs to be valid in the updated assembly, so for each + * B an updated type B' needs to exist in the new assembly which is + * still a supertype of T'. + */ +function assignableToAllBaseTypes(original: reflect.ReferenceType, updated: reflect.ReferenceType): Analysis { + for (const B of baseTypes(original)) { + const result = isNominalSuperType(B.reference, updated.reference, updated.system); + if (!result.success) { return result; } + } + return { success: true }; +} + + +/** + * Return all base types of the given reference type + */ +function baseTypes(type: reflect.ReferenceType) { + const ret = new Array(); + const todo: reflect.ReferenceType[] = [type]; + const seen = new Set(); + + while (todo.length > 0) { + const next = todo.pop()!; + if (seen.has(next.fqn)) { continue; } + ret.push(next); + seen.add(next.fqn); + + todo.push(...next.interfaces); + if (next.isClassType() && next.base) { + todo.push(next.base); + } + } + + return ret; +} + diff --git a/packages/jsii-diff/lib/type-analysis.ts b/packages/jsii-diff/lib/type-analysis.ts index 80d551e525..d660128fad 100644 --- a/packages/jsii-diff/lib/type-analysis.ts +++ b/packages/jsii-diff/lib/type-analysis.ts @@ -1,3 +1,4 @@ +/* eslint-disable complexity */ import * as reflect from 'jsii-reflect'; import { flatMap } from './util'; @@ -93,7 +94,7 @@ export function isSuperType(a: reflect.TypeReference, b: reflect.TypeReference, /** * Find types A and B in the updated type system, and check whether they have a supertype relationship in the type system */ -function isNominalSuperType(a: reflect.TypeReference, b: reflect.TypeReference, updatedSystem: reflect.TypeSystem): Analysis { +export function isNominalSuperType(a: reflect.TypeReference, b: reflect.TypeReference, updatedSystem: reflect.TypeSystem): Analysis { if (a.fqn === undefined) { throw new Error(`I was expecting a named type, got '${a}'`); } diff --git a/packages/jsii-diff/test/classes.test.ts b/packages/jsii-diff/test/classes.test.ts index ab3d4cebfe..ca72ac9a08 100644 --- a/packages/jsii-diff/test/classes.test.ts +++ b/packages/jsii-diff/test/classes.test.ts @@ -169,6 +169,126 @@ test('cannot make a member less visible', () => // ---------------------------------------------------------------------- +describe('implement base types need to be present in updated type system', () => { + + test('for interfaces', () => + expectError( + /not assignable to all base types anymore/, + ` + export interface IPapa { + readonly pipe: string; + } + + export interface IBebe extends IPapa { + readonly pacifier: string; + } + `, ` + export interface IPapa { + readonly pipe: string; + } + + export interface IBebe { + readonly pacifier: string; + } + `) + ); + + test('for structs', () => + expectError( + /not assignable to all base types anymore/, + ` + export interface Papa { + readonly pipe: string; + } + + export interface Bebe extends Papa { + readonly pacifier: string; + } + `, ` + export interface Papa { + readonly pipe: string; + } + + export interface Bebe { + readonly pacifier: string; + } + `) + ); + + test('for classes', () => + expectError( + /not assignable to all base types anymore/, + ` + export interface IPapa { + readonly pipe: string; + } + + export class Bebe implements IPapa { + readonly pipe: string = 'pff'; + readonly pacifier: string = 'mmm'; + } + `, ` + export interface IPapa { + readonly pipe: string; + } + + export class Bebe { + readonly pipe: string = 'pff'; + readonly pacifier: string = 'mmm'; + } + `) + ); + + test('for base classes', () => + expectError( + /not assignable to all base types anymore/, + ` + export class Papa { + readonly pipe: string = 'pff'; + } + + export class Bebe extends Papa { + readonly pacifier: string = 'mmm'; + } + `, ` + export class Papa { + readonly pipe: string = 'pff'; + } + + export class Bebe { + readonly pacifier: string = 'mmm'; + } + `) + ); + + test('new levels of inheritance are allowed', () => + expectNoError( + ` + export class Papa { + readonly pipe: string = 'pff'; + } + + export class Bebe extends Papa { + readonly pacifier: string = 'mmm'; + } + `, ` + export class Papa { + readonly pipe: string = 'pff'; + } + + export class Inbetween extends Papa { + } + + export class Bebe extends Inbetween { + readonly pacifier: string = 'mmm'; + } + `) + ); + +}); + +// ---------------------------------------------------------------------- + test('cannot make a class property optional', () => expectError( /prop.*henk.*type Optional \(formerly string\): output type is now optional/i, diff --git a/packages/jsii-reflect/lib/type.ts b/packages/jsii-reflect/lib/type.ts index 509e9dfd08..814d2a2631 100644 --- a/packages/jsii-reflect/lib/type.ts +++ b/packages/jsii-reflect/lib/type.ts @@ -6,6 +6,7 @@ import { EnumType } from './enum'; import { InterfaceType } from './interface'; import { locationInRepository, SourceLocatable, SourceLocation } from './source'; import { TypeSystem } from './type-system'; +import { TypeReference } from './type-ref'; export abstract class Type implements Documentable, SourceLocatable { public constructor( @@ -51,6 +52,15 @@ export abstract class Type implements Documentable, SourceLocatable { return new Docs(this.system, this, this.spec.docs ?? {}); } + /** + * A type reference to this type + */ + public get reference(): TypeReference { + return new TypeReference(this.system, { + fqn: this.fqn, + }); + } + /** * Determines whether this is a Class type or not. */ From 0eef03a6236d3e43ab33975558d354fc1c804f1a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 18:22:02 +0000 Subject: [PATCH 24/74] chore(deps-dev): bump @typescript-eslint/eslint-plugin (#1361) --- package.json | 2 +- yarn.lock | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 8cfaa6cf64..cc564f8ba8 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "test:update": "lerna run test:update --stream" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.24.0", + "@typescript-eslint/eslint-plugin": "^2.25.0", "@typescript-eslint/parser": "^2.24.0", "eslint": "^6.8.0", "eslint-import-resolver-node": "^0.3.3", diff --git a/yarn.lock b/yarn.lock index 6464b700d9..ee450a4d9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1427,13 +1427,12 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^2.24.0": - version "2.24.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz#a86cf618c965a462cddf3601f594544b134d6d68" - integrity sha512-wJRBeaMeT7RLQ27UQkDFOu25MqFOBus8PtOa9KaT5ZuxC1kAsd7JEHqWt4YXuY9eancX0GK9C68i5OROnlIzBA== +"@typescript-eslint/eslint-plugin@^2.25.0": + version "2.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz#0b60917332f20dcff54d0eb9be2a9e9f4c9fbd02" + integrity sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw== dependencies: - "@typescript-eslint/experimental-utils" "2.24.0" - eslint-utils "^1.4.3" + "@typescript-eslint/experimental-utils" "2.25.0" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" @@ -1447,6 +1446,16 @@ "@typescript-eslint/typescript-estree" "2.24.0" eslint-scope "^5.0.0" +"@typescript-eslint/experimental-utils@2.25.0": + version "2.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz#13691c4fe368bd377b1e5b1e4ad660b220bf7714" + integrity sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.25.0" + eslint-scope "^5.0.0" + eslint-utils "^2.0.0" + "@typescript-eslint/parser@^2.24.0": version "2.24.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz#2cf0eae6e6dd44d162486ad949c126b887f11eb8" @@ -1470,6 +1479,19 @@ semver "^6.3.0" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@2.25.0": + version "2.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz#b790497556734b7476fa7dd3fa539955a5c79e2c" + integrity sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg== + dependencies: + debug "^4.1.1" + eslint-visitor-keys "^1.1.0" + glob "^7.1.6" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^6.3.0" + tsutils "^3.17.1" + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" @@ -3402,6 +3424,13 @@ eslint-utils@^1.4.3: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd" + integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA== + dependencies: + eslint-visitor-keys "^1.1.0" + eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" From 19e0772919a9e8f0e1def3ac25386fd9f2099a5c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 19:12:42 +0000 Subject: [PATCH 25/74] chore(deps-dev): bump @typescript-eslint/parser from 2.24.0 to 2.25.0 (#1362) --- package.json | 2 +- yarn.lock | 34 ++++++---------------------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index cc564f8ba8..4a814115a9 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^2.25.0", - "@typescript-eslint/parser": "^2.24.0", + "@typescript-eslint/parser": "^2.25.0", "eslint": "^6.8.0", "eslint-import-resolver-node": "^0.3.3", "eslint-import-resolver-typescript": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index ee450a4d9c..a27f3eaab3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1437,15 +1437,6 @@ regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.24.0": - version "2.24.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz#a5cb2ed89fedf8b59638dc83484eb0c8c35e1143" - integrity sha512-DXrwuXTdVh3ycNCMYmWhUzn/gfqu9N0VzNnahjiDJvcyhfBy4gb59ncVZVxdp5XzBC77dCncu0daQgOkbvPwBw== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.24.0" - eslint-scope "^5.0.0" - "@typescript-eslint/experimental-utils@2.25.0": version "2.25.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz#13691c4fe368bd377b1e5b1e4ad660b220bf7714" @@ -1456,28 +1447,15 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^2.24.0": - version "2.24.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz#2cf0eae6e6dd44d162486ad949c126b887f11eb8" - integrity sha512-H2Y7uacwSSg8IbVxdYExSI3T7uM1DzmOn2COGtCahCC3g8YtM1xYAPi2MAHyfPs61VKxP/J/UiSctcRgw4G8aw== +"@typescript-eslint/parser@^2.25.0": + version "2.25.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.25.0.tgz#abfb3d999084824d9a756d9b9c0f36fba03adb76" + integrity sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.24.0" - "@typescript-eslint/typescript-estree" "2.24.0" - eslint-visitor-keys "^1.1.0" - -"@typescript-eslint/typescript-estree@2.24.0": - version "2.24.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz#38bbc8bb479790d2f324797ffbcdb346d897c62a" - integrity sha512-RJ0yMe5owMSix55qX7Mi9V6z2FDuuDpN6eR5fzRJrp+8in9UF41IGNQHbg5aMK4/PjVaEQksLvz0IA8n+Mr/FA== - dependencies: - debug "^4.1.1" + "@typescript-eslint/experimental-utils" "2.25.0" + "@typescript-eslint/typescript-estree" "2.25.0" eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" "@typescript-eslint/typescript-estree@2.25.0": version "2.25.0" From 03d025bbcf03c4d110761855b061ee40c4910a52 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 23 Mar 2020 20:33:29 +0000 Subject: [PATCH 26/74] chore(deps): bump mkdirp from 0.5.3 to 0.5.4 (#1363) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index a27f3eaab3..e9feb1ec47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5974,9 +5974,9 @@ mkdirp@*, mkdirp@^1.0.3: integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g== mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz#5a514b7179259287952881e94410ec5465659f8c" - integrity sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg== + version "0.5.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" + integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== dependencies: minimist "^1.2.5" From 3bcc4d1be39622a5f924dcef7f3d7e36ecafed26 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 01:03:04 +0000 Subject: [PATCH 27/74] chore(deps): bump cacache from 12.0.3 to 12.0.4 (#1364) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e9feb1ec47..581b2050cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2241,9 +2241,9 @@ byte-size@^5.0.1: integrity sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw== cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3: - version "12.0.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" - integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== + version "12.0.4" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" + integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== dependencies: bluebird "^3.5.5" chownr "^1.1.1" From 65daa0c65959120977a49f672b487872c0447c46 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 24 Mar 2020 10:56:58 +0000 Subject: [PATCH 28/74] chore(deps-dev): bump webpack from 4.42.0 to 4.42.1 (#1365) --- packages/@jsii/runtime/package.json | 2 +- yarn.lock | 294 ++++++++++++++-------------- 2 files changed, 145 insertions(+), 151 deletions(-) diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 90954ae612..19423e2dc1 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -49,7 +49,7 @@ "source-map-loader": "^0.2.4", "typescript": "~3.8.3", "wasm-loader": "^1.3.0", - "webpack": "^4.42.0", + "webpack": "^4.42.1", "webpack-cli": "^3.3.11" }, "jest": { diff --git a/yarn.lock b/yarn.lock index 581b2050cf..1f1c8b48e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1470,150 +1470,149 @@ semver "^6.3.0" tsutils "^3.17.1" -"@webassemblyjs/ast@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" - integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ== - dependencies: - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/wast-parser" "1.8.5" - -"@webassemblyjs/floating-point-hex-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" - integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== - -"@webassemblyjs/helper-api-error@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" - integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== - -"@webassemblyjs/helper-buffer@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" - integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== - -"@webassemblyjs/helper-code-frame@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e" - integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ== - dependencies: - "@webassemblyjs/wast-printer" "1.8.5" - -"@webassemblyjs/helper-fsm@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" - integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== - -"@webassemblyjs/helper-module-context@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245" - integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g== - dependencies: - "@webassemblyjs/ast" "1.8.5" - mamacro "^0.0.3" - -"@webassemblyjs/helper-wasm-bytecode@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" - integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== - -"@webassemblyjs/helper-wasm-section@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf" - integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - -"@webassemblyjs/ieee754@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e" - integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g== +"@webassemblyjs/ast@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" + integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== + dependencies: + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" + +"@webassemblyjs/floating-point-hex-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" + integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== + +"@webassemblyjs/helper-api-error@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" + integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== + +"@webassemblyjs/helper-buffer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" + integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== + +"@webassemblyjs/helper-code-frame@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" + integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== + dependencies: + "@webassemblyjs/wast-printer" "1.9.0" + +"@webassemblyjs/helper-fsm@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" + integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== + +"@webassemblyjs/helper-module-context@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" + integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== + dependencies: + "@webassemblyjs/ast" "1.9.0" + +"@webassemblyjs/helper-wasm-bytecode@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" + integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== + +"@webassemblyjs/helper-wasm-section@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" + integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + +"@webassemblyjs/ieee754@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" + integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10" - integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A== +"@webassemblyjs/leb128@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" + integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" - integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== - -"@webassemblyjs/wasm-edit@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a" - integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/helper-wasm-section" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/wasm-opt" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - "@webassemblyjs/wast-printer" "1.8.5" - -"@webassemblyjs/wasm-gen@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc" - integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/ieee754" "1.8.5" - "@webassemblyjs/leb128" "1.8.5" - "@webassemblyjs/utf8" "1.8.5" - -"@webassemblyjs/wasm-opt@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264" - integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - -"@webassemblyjs/wasm-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d" - integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-api-error" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/ieee754" "1.8.5" - "@webassemblyjs/leb128" "1.8.5" - "@webassemblyjs/utf8" "1.8.5" - -"@webassemblyjs/wast-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c" - integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/floating-point-hex-parser" "1.8.5" - "@webassemblyjs/helper-api-error" "1.8.5" - "@webassemblyjs/helper-code-frame" "1.8.5" - "@webassemblyjs/helper-fsm" "1.8.5" +"@webassemblyjs/utf8@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" + integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== + +"@webassemblyjs/wasm-edit@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" + integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/helper-wasm-section" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-opt" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/wast-printer" "1.9.0" + +"@webassemblyjs/wasm-gen@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" + integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + +"@webassemblyjs/wasm-opt@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" + integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + +"@webassemblyjs/wasm-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" + integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" + +"@webassemblyjs/wast-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" + integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/floating-point-hex-parser" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-code-frame" "1.9.0" + "@webassemblyjs/helper-fsm" "1.9.0" "@xtuc/long" "4.2.2" -"@webassemblyjs/wast-printer@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc" - integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg== +"@webassemblyjs/wast-printer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" + integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/wast-parser" "1.8.5" + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" "@xtuc/ieee754@^1.2.0": @@ -5679,11 +5678,6 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" -mamacro@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" - integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== - map-age-cleaner@^0.1.1: version "0.1.3" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" @@ -5973,7 +5967,7 @@ mkdirp@*, mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea" integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g== -mkdirp@^0.5.0, mkdirp@^0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3: version "0.5.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.4.tgz#fd01504a6797ec5c9be81ff43d204961ed64a512" integrity sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw== @@ -8704,15 +8698,15 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.42.0: - version "4.42.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz#b901635dd6179391d90740a63c93f76f39883eb8" - integrity sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w== +webpack@^4.42.1: + version "4.42.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.42.1.tgz#ae707baf091f5ca3ef9c38b884287cfe8f1983ef" + integrity sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg== dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/wasm-edit" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/wasm-edit" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" acorn "^6.2.1" ajv "^6.10.2" ajv-keywords "^3.4.1" @@ -8724,7 +8718,7 @@ webpack@^4.42.0: loader-utils "^1.2.3" memory-fs "^0.4.1" micromatch "^3.1.10" - mkdirp "^0.5.1" + mkdirp "^0.5.3" neo-async "^2.6.1" node-libs-browser "^2.2.1" schema-utils "^1.0.0" From 73b09b893638749ebbbb00c19342087f1adb2358 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 10:35:05 +0100 Subject: [PATCH 29/74] chore(deps): bump case from 1.6.2 to 1.6.3 (#1366) Bumps [case](https://github.com/nbubna/Case) from 1.6.2 to 1.6.3. - [Release notes](https://github.com/nbubna/Case/releases) - [Commits](https://github.com/nbubna/Case/compare/1.6.2...1.6.3) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- packages/jsii/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 5670e19f05..187b1321d3 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@jsii/spec": "^1.1.0", - "case": "^1.6.2", + "case": "^1.6.3", "colors": "^1.4.0", "deep-equal": "^2.0.1", "fs-extra": "^9.0.0", diff --git a/yarn.lock b/yarn.lock index 1f1c8b48e1..1140dfe97a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2343,10 +2343,10 @@ capture-exit@^2.0.0: dependencies: rsvp "^4.8.4" -case@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/case/-/case-1.6.2.tgz#2ea68af6956752cd69c349c8b3e6bc860d1cba95" - integrity sha512-ll380ZRoraT7mUK2G92UbH+FJVD5AwdVIAYk9xhV1tauh0carDgYByUD1HhjCWsWgxrfQvCeHvtfj7IYR6TKeg== +case@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" + integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== caseless@~0.12.0: version "0.12.0" From fa44e5ffea95fecd4baaad32441db5cee0ca9704 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 10:35:32 +0100 Subject: [PATCH 30/74] chore(deps): bump figgy-pudding from 3.5.1 to 3.5.2 (#1369) Bumps [figgy-pudding](https://github.com/npm/figgy-pudding) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/npm/figgy-pudding/releases) - [Changelog](https://github.com/npm/figgy-pudding/blob/latest/CHANGELOG.md) - [Commits](https://github.com/npm/figgy-pudding/compare/v3.5.1...v3.5.2) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1140dfe97a..8d234c1b33 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3676,9 +3676,9 @@ fb-watchman@^2.0.0: bser "2.1.1" figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" - integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== + version "3.5.2" + resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" + integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== figures@^2.0.0: version "2.0.0" From b19c31fec21be5e86730f25f2fc636b062594680 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 17:13:30 +0000 Subject: [PATCH 31/74] chore(deps): bump Microsoft.Extensions.DependencyInjection (#1371) --- .../src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj index 8eb1233ce8..930cba3e76 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj @@ -12,7 +12,7 @@ - + From 8ef6b70b1fcb5cf924f6671385122b4a1aec9dd6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 25 Mar 2020 17:37:02 +0000 Subject: [PATCH 32/74] chore(deps): bump psl from 1.7.0 to 1.8.0 (#1376) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8d234c1b33..58f9049451 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6892,9 +6892,9 @@ prr@~1.0.1: integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= psl@^1.1.28: - version "1.7.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" - integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== public-encrypt@^4.0.0: version "4.0.3" From 3ad26726584e415652ec8d2a041c49fef9e0ac85 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 10:51:14 +0000 Subject: [PATCH 33/74] chore(deps): bump babel-plugin-jest-hoist from 25.1.0 to 25.2.1 (#1389) --- yarn.lock | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 58f9049451..c5f2a08ec6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -68,6 +68,11 @@ dependencies: "@babel/types" "^7.8.3" +"@babel/helper-validator-identifier@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed" + integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw== + "@babel/helpers@^7.8.4": version "7.8.4" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73" @@ -129,7 +134,7 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.39", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.39", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== @@ -138,6 +143,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.3.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5" + integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng== + dependencies: + "@babel/helper-validator-identifier" "^7.9.0" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -1999,9 +2013,9 @@ babel-plugin-istanbul@^6.0.0: test-exclude "^6.0.0" babel-plugin-jest-hoist@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz#fb62d7b3b53eb36c97d1bc7fec2072f9bd115981" - integrity sha512-oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw== + version "25.2.1" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.1.tgz#d0003a1f3d5caa281e1107fe03bbf16b799f9955" + integrity sha512-HysbCQfJhxLlyxDbKcB2ucGYV0LjqK4h6dBoI3RtFuOxTiTWK6XGZMsHb0tGh8iJdV4hC6Z2GCHzVvDeh9i0lQ== dependencies: "@types/babel__traverse" "^7.0.6" From 90d690a78f3cc2f54ee19f6d88b07c45e1f19513 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 11:15:37 +0000 Subject: [PATCH 34/74] chore(deps): bump jest-regex-util from 25.1.0 to 25.2.1 (#1398) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c5f2a08ec6..f9f513e8ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5090,9 +5090,9 @@ jest-pnp-resolver@^1.2.1: integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== jest-regex-util@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87" - integrity sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w== + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.1.tgz#db64b0d15cd3642c93b7b9627801d7c518600584" + integrity sha512-wroFVJw62LdqTdkL508ZLV82FrJJWVJMIuYG7q4Uunl1WAPTf4ftPKrqqfec4SvOIlvRZUdEX2TFpWR356YG/w== jest-resolve-dependencies@^25.1.0: version "25.1.0" From ff18983a6547967a904ff8ce675bb0233534678d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 11:40:10 +0000 Subject: [PATCH 35/74] chore(deps): bump jest-mock from 25.1.0 to 25.2.1 (#1396) --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index f9f513e8ec..1df923d5ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -406,10 +406,10 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395" - integrity sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA== +"@jest/types@^25.1.0", "@jest/types@^25.2.1": + version "25.2.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.1.tgz#692c8950d4c21fc6b4cfd141c3470b735c5bffca" + integrity sha512-WuGFGJ3Rrycg+5ZwQTWKjr21M9psANPAWYD28K42hSeUzhv1H591VXIoq0tjs00mydhNOgVOkKSpzRS3CrOYFw== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^1.1.1" @@ -5078,11 +5078,11 @@ jest-message-util@^25.1.0: stack-utils "^1.0.1" jest-mock@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.1.0.tgz#411d549e1b326b7350b2e97303a64715c28615fd" - integrity sha512-28/u0sqS+42vIfcd1mlcg4ZVDmSUYuNvImP4X2lX5hRMLW+CN0BeiKVD4p+ujKKbSPKd3rg/zuhCF+QBLJ4vag== + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.2.1.tgz#37b294b8d0aa94c1af7714e039cc410df61593da" + integrity sha512-ZXcmqpCTG1MEm2AP2q9XiJzdbQ655Pnssj+xQMP1thrW2ptEFrd4vSkxTpxk6rnluLPRKagaHmzUpWNxShMvqQ== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.2.1" jest-pnp-resolver@^1.2.1: version "1.2.1" From 3e291896c3ff7004abbf4762608ba9495ffd4b71 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 12:05:03 +0000 Subject: [PATCH 36/74] chore(deps): bump babel-preset-jest from 25.1.0 to 25.2.1 (#1392) --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1df923d5ec..18c1fd2e8c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2012,7 +2012,7 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^25.1.0: +babel-plugin-jest-hoist@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.1.tgz#d0003a1f3d5caa281e1107fe03bbf16b799f9955" integrity sha512-HysbCQfJhxLlyxDbKcB2ucGYV0LjqK4h6dBoI3RtFuOxTiTWK6XGZMsHb0tGh8iJdV4hC6Z2GCHzVvDeh9i0lQ== @@ -2020,13 +2020,13 @@ babel-plugin-jest-hoist@^25.1.0: "@types/babel__traverse" "^7.0.6" babel-preset-jest@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz#d0aebfebb2177a21cde710996fce8486d34f1d33" - integrity sha512-eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ== + version "25.2.1" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2" + integrity sha512-zXHJBM5iR8oEO4cvdF83AQqqJf3tJrXy3x8nfu2Nlqvn4cneg4Ca8M7cQvC5S9BzDDy1O0tZ9iXru9J6E3ym+A== dependencies: "@babel/plugin-syntax-bigint" "^7.0.0" "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - babel-plugin-jest-hoist "^25.1.0" + babel-plugin-jest-hoist "^25.2.1" babylon@^7.0.0-beta.39: version "7.0.0-beta.47" From 2400020c7db90111674ac1610e1f850778158e05 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 12:29:45 +0000 Subject: [PATCH 37/74] chore(deps): bump diff-sequences from 25.1.0 to 25.2.1 (#1394) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 18c1fd2e8c..88a414d045 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3086,9 +3086,9 @@ dezalgo@^1.0.0: wrappy "1" diff-sequences@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32" - integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw== + version "25.2.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.1.tgz#fcfe8aa07dd9b0c648396a478dabca8e76c6ab27" + integrity sha512-foe7dXnGlSh3jR1ovJmdv+77VQj98eKCHHwJPbZ2eEf0fHwKbkZicpPxEch9smZ+n2dnF6QFwkOQdLq9hpeJUg== diffie-hellman@^5.0.0: version "5.0.3" From 0c2293d817249c909dbbc0f447579b1c5afa96af Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 12:53:56 +0000 Subject: [PATCH 38/74] chore(deps): bump jest-get-type from 25.1.0 to 25.2.1 (#1400) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 88a414d045..73d69d269e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5000,9 +5000,9 @@ jest-expect-message@^1.0.2: integrity sha512-WFiXMgwS2lOqQZt1iJMI/hOXpUm32X+ApsuzYcQpW5m16Pv6/Gd9kgC+Q+Q1YVNU04kYcAOv9NXMnjg6kKUy6Q== jest-get-type@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.1.0.tgz#1cfe5fc34f148dc3a8a3b7275f6b9ce9e2e8a876" - integrity sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw== + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.1.tgz#6c83de603c41b1627e6964da2f5454e6aa3c13a6" + integrity sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w== jest-haste-map@^25.1.0: version "25.1.0" From b840a64824e5aea61a63b8acbf6ac584bee8bac8 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 13:51:33 +0000 Subject: [PATCH 39/74] chore(deps): bump xmlbuilder from 15.0.0 to 15.1.0 (#1401) --- packages/jsii-pacmak/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 7d08daf0d3..0fb2aee354 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -45,7 +45,7 @@ "jsii-rosetta": "^1.1.0", "semver": "^7.1.3", "spdx-license-list": "^6.1.0", - "xmlbuilder": "^15.0.0", + "xmlbuilder": "^15.1.0", "yargs": "^15.3.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 73d69d269e..3a21e894a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8924,10 +8924,10 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== -xmlbuilder@^15.0.0: - version "15.0.0" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.0.0.tgz#de9a078a0b82ef0c6da5c76e58813a879eec31ec" - integrity sha512-KLu/G0DoWhkncQ9eHSI6s0/w+T4TM7rQaLhtCaL6tORv8jFlJPlnGumsgTcGfYeS1qZ/IHqrvDG7zJZ4d7e+nw== +xmlbuilder@^15.1.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.0.tgz#4c4c9109180937baeb839978b590250be09a4aef" + integrity sha512-xae5hmPQnmSFhpiuV3NGXq+FWGOvWy/rIzxVLnRtSSABbPZWltTQCe6WlHDpCq5pGvnGwNsWnS1FdkW7Tx9FNQ== xmlchars@^2.1.1: version "2.2.0" From 3a5076e0f5ac5d21ebda5ea0140338dd67eaea73 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 14:16:58 +0000 Subject: [PATCH 40/74] chore(deps): bump Microsoft.Extensions.Logging (#1375) --- .../Amazon.JSII.Runtime.IntegrationTests.csproj | 2 +- .../src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj index e050de2b96..67fc318125 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj @@ -14,7 +14,7 @@ - + diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj index 930cba3e76..92eb869991 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj @@ -13,7 +13,7 @@ - + From 59cfa8aa8bfde4b7c8d9de134ec4f1a49e73c05d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 14:41:26 +0000 Subject: [PATCH 41/74] chore(deps): bump jest-serializer from 25.1.0 to 25.2.1 (#1390) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3a21e894a4..5a8d70f42a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5171,9 +5171,9 @@ jest-runtime@^25.1.0: yargs "^15.0.0" jest-serializer@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d" - integrity sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA== + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.1.tgz#51727a5fc04256f461abe0fa024a022ba165877a" + integrity sha512-fibDi7M5ffx6c/P66IkvR4FKkjG5ldePAK1WlbNoaU4GZmIAkS9Le/frAwRUFEX0KdnisSPWf+b1RC5jU7EYJQ== jest-snapshot@^25.1.0: version "25.1.0" From 5c6a0e1a4d43847e396b9ecc8e9c19ad35fbee15 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 15:06:31 +0000 Subject: [PATCH 42/74] chore(deps): bump Microsoft.Extensions.Logging.Console (#1374) --- .../src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj index 92eb869991..c6e53d3479 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj @@ -14,7 +14,7 @@ - + From 06d1c6d8f82b8e6d3a43bf3d68a002fb1eb8a5e5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 15:30:57 +0000 Subject: [PATCH 43/74] chore(deps): bump jest-resolve-dependencies from 25.1.0 to 25.2.1 (#1403) --- yarn.lock | 370 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 329 insertions(+), 41 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5a8d70f42a..0cae6d246b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,7 +9,7 @@ dependencies: "@babel/highlight" "^7.8.3" -"@babel/core@^7.0.0-beta.39", "@babel/core@^7.1.0", "@babel/core@^7.7.5": +"@babel/core@^7.0.0-beta.39": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b" integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA== @@ -30,6 +30,28 @@ semver "^5.4.1" source-map "^0.5.0" +"@babel/core@^7.1.0", "@babel/core@^7.7.5": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" + integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.9.0" + "@babel/helper-module-transforms" "^7.9.0" + "@babel/helpers" "^7.9.0" + "@babel/parser" "^7.9.0" + "@babel/template" "^7.8.6" + "@babel/traverse" "^7.9.0" + "@babel/types" "^7.9.0" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.13" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + "@babel/generator@^7.8.6", "@babel/generator@^7.8.7": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e" @@ -40,6 +62,16 @@ lodash "^4.17.13" source-map "^0.5.0" +"@babel/generator@^7.9.0": + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce" + integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA== + dependencies: + "@babel/types" "^7.9.0" + jsesc "^2.5.1" + lodash "^4.17.13" + source-map "^0.5.0" + "@babel/helper-function-name@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca" @@ -56,11 +88,63 @@ dependencies: "@babel/types" "^7.8.3" +"@babel/helper-member-expression-to-functions@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c" + integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA== + dependencies: + "@babel/types" "^7.8.3" + +"@babel/helper-module-imports@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498" + integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg== + dependencies: + "@babel/types" "^7.8.3" + +"@babel/helper-module-transforms@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5" + integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA== + dependencies: + "@babel/helper-module-imports" "^7.8.3" + "@babel/helper-replace-supers" "^7.8.6" + "@babel/helper-simple-access" "^7.8.3" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/template" "^7.8.6" + "@babel/types" "^7.9.0" + lodash "^4.17.13" + +"@babel/helper-optimise-call-expression@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9" + integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ== + dependencies: + "@babel/types" "^7.8.3" + "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670" integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ== +"@babel/helper-replace-supers@^7.8.6": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8" + integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.8.3" + "@babel/helper-optimise-call-expression" "^7.8.3" + "@babel/traverse" "^7.8.6" + "@babel/types" "^7.8.6" + +"@babel/helper-simple-access@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae" + integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw== + dependencies: + "@babel/template" "^7.8.3" + "@babel/types" "^7.8.3" + "@babel/helper-split-export-declaration@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9" @@ -82,20 +166,34 @@ "@babel/traverse" "^7.8.4" "@babel/types" "^7.8.3" +"@babel/helpers@^7.9.0": + version "7.9.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f" + integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA== + dependencies: + "@babel/template" "^7.8.3" + "@babel/traverse" "^7.9.0" + "@babel/types" "^7.9.0" + "@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079" + integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ== dependencies: + "@babel/helper-validator-identifier" "^7.9.0" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7": +"@babel/parser@^7.1.0", "@babel/parser@^7.8.7": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4" integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA== +"@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0": + version "7.9.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8" + integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA== + "@babel/plugin-syntax-bigint@^7.0.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" @@ -119,7 +217,7 @@ "@babel/parser" "^7.8.6" "@babel/types" "^7.8.6" -"@babel/traverse@^7.0.0-beta.39", "@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6": +"@babel/traverse@^7.0.0-beta.39", "@babel/traverse@^7.1.0", "@babel/traverse@^7.8.4": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== @@ -134,16 +232,22 @@ globals "^11.1.0" lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.39", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7": - version "7.8.7" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" - integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== +"@babel/traverse@^7.7.4", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892" + integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w== dependencies: - esutils "^2.0.2" + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.9.0" + "@babel/helper-function-name" "^7.8.3" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/parser" "^7.9.0" + "@babel/types" "^7.9.0" + debug "^4.1.0" + globals "^11.1.0" lodash "^4.17.13" - to-fast-properties "^2.0.0" -"@babel/types@^7.3.0": +"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5" integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng== @@ -152,6 +256,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" +"@babel/types@^7.0.0-beta.39", "@babel/types@^7.8.7": + version "7.8.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d" + integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw== + dependencies: + esutils "^2.0.2" + lodash "^4.17.13" + to-fast-properties "^2.0.0" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -267,6 +380,16 @@ jest-util "^25.1.0" slash "^3.0.0" +"@jest/console@^25.2.1": + version "25.2.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.2.1.tgz#63b35b6a2b67f26866f8dcbb9725452a1c8c0d3b" + integrity sha512-v3tkMr5AeVm6R23wnZdC5dzXdHPFa6j2uiTC15iHISYkGIilE9O1qmAYKELHPXZifDbz9c8WwzsqoN8K8uG4jg== + dependencies: + "@jest/source-map" "^25.2.1" + chalk "^3.0.0" + jest-util "^25.2.1" + slash "^3.0.0" + "@jest/core@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.1.0.tgz#3d4634fc3348bb2d7532915d67781cdac0869e47" @@ -363,6 +486,15 @@ graceful-fs "^4.2.3" source-map "^0.6.0" +"@jest/source-map@^25.2.1": + version "25.2.1" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.2.1.tgz#b62ecf8ae76170b08eff8859b56eb7576df34ab8" + integrity sha512-PgScGJm1U27+9Te/cxP4oUFqJ2PX6NhBL2a6unQ7yafCgs8k02c0LSyjSIx/ao0AwcAdCczfAPDf5lJ7zoB/7A== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.2.3" + source-map "^0.6.0" + "@jest/test-result@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.1.0.tgz#847af2972c1df9822a8200457e64be4ff62821f7" @@ -374,6 +506,17 @@ "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" +"@jest/test-result@^25.2.1": + version "25.2.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.2.1.tgz#dc8d26d4329c055733bd5ad6dc4eda190fbacd3b" + integrity sha512-E0tlWh2iOELRLbbPEngs3Dsx88vGBQOs6O3w46YeXfMHlwwqzWrlvoeUq6kRlHRm1O8H+EBr60Wtrwh20C+zWQ== + dependencies: + "@jest/console" "^25.2.1" + "@jest/transform" "^25.2.1" + "@jest/types" "^25.2.1" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + "@jest/test-sequencer@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.1.0.tgz#4df47208542f0065f356fcdb80026e3c042851ab" @@ -406,6 +549,28 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" +"@jest/transform@^25.2.1": + version "25.2.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.2.1.tgz#08481795277b6ff9d7cb703eb4425ed46861bedc" + integrity sha512-puoD5EfqPeZ5m0dV9l8+PMdOVdRjeWcaEjGkH+eG45l0nPJ2vRcxu8J6CRl/6nQ5ZTHgg7LuM9C6FauNpdRpUA== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^25.2.1" + babel-plugin-istanbul "^6.0.0" + chalk "^3.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.3" + jest-haste-map "^25.2.1" + jest-regex-util "^25.2.1" + jest-util "^25.2.1" + micromatch "^4.0.2" + pirates "^4.0.1" + realpath-native "^2.0.0" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + "@jest/types@^25.1.0", "@jest/types@^25.2.1": version "25.2.1" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.1.tgz#692c8950d4c21fc6b4cfd141c3470b735c5bffca" @@ -1387,6 +1552,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.17.tgz#7a183163a9e6ff720d86502db23ba4aade5999b8" integrity sha512-gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q== +"@types/prettier@^1.19.0": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" + integrity sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ== + "@types/semver@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.1.0.tgz#c8c630d4c18cd326beff77404887596f96408408" @@ -3085,7 +3255,7 @@ dezalgo@^1.0.0: asap "^2.0.0" wrappy "1" -diff-sequences@^25.1.0: +diff-sequences@^25.1.0, diff-sequences@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.1.tgz#fcfe8aa07dd9b0c648396a478dabca8e76c6ab27" integrity sha512-foe7dXnGlSh3jR1ovJmdv+77VQj98eKCHHwJPbZ2eEf0fHwKbkZicpPxEch9smZ+n2dnF6QFwkOQdLq9hpeJUg== @@ -3602,6 +3772,18 @@ expect@^25.1.0: jest-message-util "^25.1.0" jest-regex-util "^25.1.0" +expect@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-25.2.1.tgz#f543b6a7fee921c554b5eec9b8ca384551dccedd" + integrity sha512-mRvuu0xujdgYuS0S2dZ489PGAcXl60blmsLofaq7heqn+ZcUOox+VWQvrCee/x+/0WBpxDs7pBWuFYNO5U+txQ== + dependencies: + "@jest/types" "^25.2.1" + ansi-styles "^4.0.0" + jest-get-type "^25.2.1" + jest-matcher-utils "^25.2.1" + jest-message-util "^25.2.1" + jest-regex-util "^25.2.1" + extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -4953,6 +5135,16 @@ jest-diff@^25.1.0: jest-get-type "^25.1.0" pretty-format "^25.1.0" +jest-diff@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.1.tgz#8c073596cc88356227c86a50d71a23d8a9dfa81a" + integrity sha512-e/TU8VLBBGQQS9tXA5B5LeT806jh7CHUeHbBfrU9UvA2zTbOTRz71UD6fAP1HAhzUEyCVLU2ZP5e8X16A9b0Fg== + dependencies: + chalk "^3.0.0" + diff-sequences "^25.2.1" + jest-get-type "^25.2.1" + pretty-format "^25.2.1" + jest-docblock@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.1.0.tgz#0f44bea3d6ca6dfc38373d465b347c8818eccb64" @@ -4999,7 +5191,7 @@ jest-expect-message@^1.0.2: resolved "https://registry.yarnpkg.com/jest-expect-message/-/jest-expect-message-1.0.2.tgz#6d67cdf093457a607d231038a3b84aa3a076bcba" integrity sha512-WFiXMgwS2lOqQZt1iJMI/hOXpUm32X+ApsuzYcQpW5m16Pv6/Gd9kgC+Q+Q1YVNU04kYcAOv9NXMnjg6kKUy6Q== -jest-get-type@^25.1.0: +jest-get-type@^25.1.0, jest-get-type@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.1.tgz#6c83de603c41b1627e6964da2f5454e6aa3c13a6" integrity sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w== @@ -5022,6 +5214,25 @@ jest-haste-map@^25.1.0: optionalDependencies: fsevents "^2.1.2" +jest-haste-map@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.2.1.tgz#61cbb3c99185b3551d63da9daedc5f64b9efe544" + integrity sha512-svz3KbQmv9qeomR0LlRjQfoi7lQbZQkC39m7uHFKhqyEuX4F6DH6HayNPSEbTCZDx6d9/ljxfAcxlPpgQvrpvQ== + dependencies: + "@jest/types" "^25.2.1" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.3" + jest-serializer "^25.2.1" + jest-util "^25.2.1" + jest-worker "^25.2.1" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + which "^2.0.2" + optionalDependencies: + fsevents "^2.1.2" + jest-jasmine2@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.1.0.tgz#681b59158a430f08d5d0c1cce4f01353e4b48137" @@ -5063,6 +5274,16 @@ jest-matcher-utils@^25.1.0: jest-get-type "^25.1.0" pretty-format "^25.1.0" +jest-matcher-utils@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.2.1.tgz#67da3d3aea74b4de6da990b636d7baebfebac0e4" + integrity sha512-uuoYY8W6eeVxHUEOvrKIVVTl9X6RP+ohQn2Ta2W8OOLMN6oA8pZUKQEPGxLsSqB3RKfpTueurMLrxDTEZGllsA== + dependencies: + chalk "^3.0.0" + jest-diff "^25.2.1" + jest-get-type "^25.2.1" + pretty-format "^25.2.1" + jest-message-util@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.1.0.tgz#702a9a5cb05c144b9aa73f06e17faa219389845e" @@ -5077,6 +5298,20 @@ jest-message-util@^25.1.0: slash "^3.0.0" stack-utils "^1.0.1" +jest-message-util@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.1.tgz#43fb5f239954a28954e74dfea0b75efc4e7377fb" + integrity sha512-pxwehr9uPEuCI9bPjBiZxpFMN0+3wny5p7/E3hbV9XjsqREhJJAMf0czvHtgNeUBo2iAiAI9yi9ICKHPOKePEw== + dependencies: + "@babel/code-frame" "^7.0.0" + "@jest/test-result" "^25.2.1" + "@jest/types" "^25.2.1" + "@types/stack-utils" "^1.0.1" + chalk "^3.0.0" + micromatch "^4.0.2" + slash "^3.0.0" + stack-utils "^1.0.1" + jest-mock@^25.1.0: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.2.1.tgz#37b294b8d0aa94c1af7714e039cc410df61593da" @@ -5089,19 +5324,19 @@ jest-pnp-resolver@^1.2.1: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== -jest-regex-util@^25.1.0: +jest-regex-util@^25.1.0, jest-regex-util@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.1.tgz#db64b0d15cd3642c93b7b9627801d7c518600584" integrity sha512-wroFVJw62LdqTdkL508ZLV82FrJJWVJMIuYG7q4Uunl1WAPTf4ftPKrqqfec4SvOIlvRZUdEX2TFpWR356YG/w== jest-resolve-dependencies@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.1.0.tgz#8a1789ec64eb6aaa77fd579a1066a783437e70d2" - integrity sha512-Cu/Je38GSsccNy4I2vL12ZnBlD170x2Oh1devzuM9TLH5rrnLW1x51lN8kpZLYTvzx9j+77Y5pqBaTqfdzVzrw== + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.1.tgz#47b9ee4b9ec0cf387419f175512367118590f8ee" + integrity sha512-fnct/NyrBpBAVUIMa0M876ubufHP/2Rrc038+gCpVT1s7kazV7ZPFlmGfInahCIthbMr644uzt6pnSvmQgTPGg== dependencies: - "@jest/types" "^25.1.0" - jest-regex-util "^25.1.0" - jest-snapshot "^25.1.0" + "@jest/types" "^25.2.1" + jest-regex-util "^25.2.1" + jest-snapshot "^25.2.1" jest-resolve@^25.1.0: version "25.1.0" @@ -5114,6 +5349,18 @@ jest-resolve@^25.1.0: jest-pnp-resolver "^1.2.1" realpath-native "^1.1.0" +jest-resolve@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.2.1.tgz#44f8f87c5688bad31e762f123540b09cac5907f8" + integrity sha512-5rVc6khEckNH62adcR+jlYd34/jBO/U22VHf+elmyO6UBHNWXSbfy63+spJRN4GQ/0dbu6Hi6ZVdR58bmNG2Eg== + dependencies: + "@jest/types" "^25.2.1" + browser-resolve "^1.11.3" + chalk "^3.0.0" + jest-pnp-resolver "^1.2.1" + realpath-native "^2.0.0" + resolve "^1.15.1" + jest-runner@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.1.0.tgz#fef433a4d42c89ab0a6b6b268e4a4fbe6b26e812" @@ -5170,29 +5417,30 @@ jest-runtime@^25.1.0: strip-bom "^4.0.0" yargs "^15.0.0" -jest-serializer@^25.1.0: +jest-serializer@^25.1.0, jest-serializer@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.1.tgz#51727a5fc04256f461abe0fa024a022ba165877a" integrity sha512-fibDi7M5ffx6c/P66IkvR4FKkjG5ldePAK1WlbNoaU4GZmIAkS9Le/frAwRUFEX0KdnisSPWf+b1RC5jU7EYJQ== -jest-snapshot@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.1.0.tgz#d5880bd4b31faea100454608e15f8d77b9d221d9" - integrity sha512-xZ73dFYN8b/+X2hKLXz4VpBZGIAn7muD/DAg+pXtDzDGw3iIV10jM7WiHqhCcpDZfGiKEj7/2HXAEPtHTj0P2A== +jest-snapshot@^25.1.0, jest-snapshot@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.2.1.tgz#1fdcc8c780f83f0e902dd75df79d0d7313fe939e" + integrity sha512-5Wd8SEJVTXqQvzkQpuYqQt1QTlRj2XVUV/iaEzO+AeSVg6g5pQWu0z2iLdSBlVeWRrX0MyZn6dhxYGwEq4wW0w== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^25.1.0" + "@jest/types" "^25.2.1" + "@types/prettier" "^1.19.0" chalk "^3.0.0" - expect "^25.1.0" - jest-diff "^25.1.0" - jest-get-type "^25.1.0" - jest-matcher-utils "^25.1.0" - jest-message-util "^25.1.0" - jest-resolve "^25.1.0" - mkdirp "^0.5.1" + expect "^25.2.1" + jest-diff "^25.2.1" + jest-get-type "^25.2.1" + jest-matcher-utils "^25.2.1" + jest-message-util "^25.2.1" + jest-resolve "^25.2.1" + make-dir "^3.0.0" natural-compare "^1.4.0" - pretty-format "^25.1.0" - semver "^7.1.1" + pretty-format "^25.2.1" + semver "^6.3.0" jest-util@^25.1.0: version "25.1.0" @@ -5204,6 +5452,16 @@ jest-util@^25.1.0: is-ci "^2.0.0" mkdirp "^0.5.1" +jest-util@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.1.tgz#96086efe850ce6d07c42ad5324b80a3ede4246e6" + integrity sha512-oFVMSY/7flrSgEE/B+RApaBZOdLURXRnXCf4COV5td9uRidxudyjA64I1xk2h9Pf3jloSArm96e2FKAbFs0DYg== + dependencies: + "@jest/types" "^25.2.1" + chalk "^3.0.0" + is-ci "^2.0.0" + make-dir "^3.0.0" + jest-validate@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.1.0.tgz#1469fa19f627bb0a9a98e289f3e9ab6a668c732a" @@ -5236,6 +5494,14 @@ jest-worker@^25.1.0: merge-stream "^2.0.0" supports-color "^7.0.0" +jest-worker@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a" + integrity sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ== + dependencies: + merge-stream "^2.0.0" + supports-color "^7.0.0" + jest@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest/-/jest-25.1.0.tgz#b85ef1ddba2fdb00d295deebbd13567106d35be9" @@ -5346,6 +5612,13 @@ json5@^2.1.0: dependencies: minimist "^1.2.0" +json5@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e" + integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ== + dependencies: + minimist "^1.2.5" + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -6840,6 +7113,16 @@ pretty-format@^25.1.0: ansi-styles "^4.0.0" react-is "^16.12.0" +pretty-format@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.2.1.tgz#3b8f7b9241faa6736cdbc32879bee18454d1318d" + integrity sha512-YS+e9oGYIbEeAFgqTU8qeZ3DN2Pz0iaD81ox+iUjLIXVJWeB7Ro/2AnfxRnl/yJJ5R674d7E3jLPuh6bwg0+qw== + dependencies: + "@jest/types" "^25.2.1" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^16.12.0" + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -7161,6 +7444,11 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" +realpath-native@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" + integrity sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q== + redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" @@ -7324,7 +7612,7 @@ resolve@1.1.7: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.3.2: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.3.2: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== @@ -7492,7 +7780,7 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.1, semver@^7.1.3: +semver@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA== @@ -8795,7 +9083,7 @@ which@^1.2.14, which@^1.2.9, which@^1.3.1: dependencies: isexe "^2.0.0" -which@^2.0.1: +which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== From df0384dcd2f3cb9a1578e36ae5bb4231311f975a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 15:53:41 +0000 Subject: [PATCH 44/74] chore(deps): bump pretty-format from 25.1.0 to 25.2.1 (#1397) --- yarn.lock | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0cae6d246b..cdd00b6fd5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7103,17 +7103,7 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -pretty-format@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.1.0.tgz#ed869bdaec1356fc5ae45de045e2c8ec7b07b0c8" - integrity sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ== - dependencies: - "@jest/types" "^25.1.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - -pretty-format@^25.2.1: +pretty-format@^25.1.0, pretty-format@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.2.1.tgz#3b8f7b9241faa6736cdbc32879bee18454d1318d" integrity sha512-YS+e9oGYIbEeAFgqTU8qeZ3DN2Pz0iaD81ox+iUjLIXVJWeB7Ro/2AnfxRnl/yJJ5R674d7E3jLPuh6bwg0+qw== From 5252cd3f614b814fc8b4cf7c65a07cc8a2a40c33 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 15:53:46 +0000 Subject: [PATCH 45/74] chore(deps): bump jest-diff from 25.1.0 to 25.2.1 (#1393) --- yarn.lock | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index cdd00b6fd5..cda4e9de0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3255,7 +3255,7 @@ dezalgo@^1.0.0: asap "^2.0.0" wrappy "1" -diff-sequences@^25.1.0, diff-sequences@^25.2.1: +diff-sequences@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.1.tgz#fcfe8aa07dd9b0c648396a478dabca8e76c6ab27" integrity sha512-foe7dXnGlSh3jR1ovJmdv+77VQj98eKCHHwJPbZ2eEf0fHwKbkZicpPxEch9smZ+n2dnF6QFwkOQdLq9hpeJUg== @@ -5125,17 +5125,7 @@ jest-config@^25.1.0: pretty-format "^25.1.0" realpath-native "^1.1.0" -jest-diff@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.1.0.tgz#58b827e63edea1bc80c1de952b80cec9ac50e1ad" - integrity sha512-nepXgajT+h017APJTreSieh4zCqnSHEJ1iT8HDlewu630lSJ4Kjjr9KNzm+kzGwwcpsDE6Snx1GJGzzsefaEHw== - dependencies: - chalk "^3.0.0" - diff-sequences "^25.1.0" - jest-get-type "^25.1.0" - pretty-format "^25.1.0" - -jest-diff@^25.2.1: +jest-diff@^25.1.0, jest-diff@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.1.tgz#8c073596cc88356227c86a50d71a23d8a9dfa81a" integrity sha512-e/TU8VLBBGQQS9tXA5B5LeT806jh7CHUeHbBfrU9UvA2zTbOTRz71UD6fAP1HAhzUEyCVLU2ZP5e8X16A9b0Fg== From 3844dd5db670551fa40fce8c40fbd41763526d69 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 16:16:56 +0000 Subject: [PATCH 46/74] chore(deps): bump jest-util from 25.1.0 to 25.2.1 (#1395) --- yarn.lock | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index cda4e9de0a..32fcf042c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5432,17 +5432,7 @@ jest-snapshot@^25.1.0, jest-snapshot@^25.2.1: pretty-format "^25.2.1" semver "^6.3.0" -jest-util@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.1.0.tgz#7bc56f7b2abd534910e9fa252692f50624c897d9" - integrity sha512-7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw== - dependencies: - "@jest/types" "^25.1.0" - chalk "^3.0.0" - is-ci "^2.0.0" - mkdirp "^0.5.1" - -jest-util@^25.2.1: +jest-util@^25.1.0, jest-util@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.1.tgz#96086efe850ce6d07c42ad5324b80a3ede4246e6" integrity sha512-oFVMSY/7flrSgEE/B+RApaBZOdLURXRnXCf4COV5td9uRidxudyjA64I1xk2h9Pf3jloSArm96e2FKAbFs0DYg== From 92a078ac6d3c785c36014ca897b0087b67e1e538 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 16:17:41 +0000 Subject: [PATCH 47/74] chore(deps): bump jest-each from 25.1.0 to 25.2.1 (#1399) --- yarn.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/yarn.lock b/yarn.lock index 32fcf042c3..4f916fda41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5143,15 +5143,15 @@ jest-docblock@^25.1.0: detect-newline "^3.0.0" jest-each@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.1.0.tgz#a6b260992bdf451c2d64a0ccbb3ac25e9b44c26a" - integrity sha512-R9EL8xWzoPySJ5wa0DXFTj7NrzKpRD40Jy+zQDp3Qr/2QmevJgkN9GqioCGtAJ2bW9P/MQRznQHQQhoeAyra7A== + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.2.1.tgz#d96b4fc0c035fcddb852f19da42ea241b1943999" + integrity sha512-2vWAaf11IJsSwkEzGph3un4OMSG4v/3hpM2UqJdeU3peGUgUSn75TlXZGQnT0smbnAr4eE+URW1OpE8U9wl0TA== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.2.1" chalk "^3.0.0" - jest-get-type "^25.1.0" - jest-util "^25.1.0" - pretty-format "^25.1.0" + jest-get-type "^25.2.1" + jest-util "^25.2.1" + pretty-format "^25.2.1" jest-environment-jsdom@^25.1.0: version "25.1.0" From 71b142902e192f2fa594d5aaeb0bea7a667b9079 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 16:44:14 +0000 Subject: [PATCH 48/74] chore(deps): bump jest-resolve-dependencies from 25.2.1 to 25.2.2 (#1408) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4f916fda41..1a0f1fb1a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5320,9 +5320,9 @@ jest-regex-util@^25.1.0, jest-regex-util@^25.2.1: integrity sha512-wroFVJw62LdqTdkL508ZLV82FrJJWVJMIuYG7q4Uunl1WAPTf4ftPKrqqfec4SvOIlvRZUdEX2TFpWR356YG/w== jest-resolve-dependencies@^25.1.0: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.1.tgz#47b9ee4b9ec0cf387419f175512367118590f8ee" - integrity sha512-fnct/NyrBpBAVUIMa0M876ubufHP/2Rrc038+gCpVT1s7kazV7ZPFlmGfInahCIthbMr644uzt6pnSvmQgTPGg== + version "25.2.2" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.2.tgz#6643fd4ce4e486844ac0f88bec9963bdb2bbbea4" + integrity sha512-XeBlobvYexxYOUC6PAuISJ3sUeylLEXYmvA1VT1+q3b2m+1tGPxqrZGVOxKgbE7a+L0YfuCq+JVYWzxlNm6zQQ== dependencies: "@jest/types" "^25.2.1" jest-regex-util "^25.2.1" From f8346bf929d10e0ab0d9c8a4614ce8abe4c93b10 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 17:06:34 +0000 Subject: [PATCH 49/74] chore(deps): bump jest-docblock from 25.1.0 to 25.2.0 (#1380) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1a0f1fb1a0..5283cf55e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5136,9 +5136,9 @@ jest-diff@^25.1.0, jest-diff@^25.2.1: pretty-format "^25.2.1" jest-docblock@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.1.0.tgz#0f44bea3d6ca6dfc38373d465b347c8818eccb64" - integrity sha512-370P/mh1wzoef6hUKiaMcsPtIapY25suP6JqM70V9RJvdKLrV4GaGbfUseUVk4FZJw4oTZ1qSCJNdrClKt5JQA== + version "25.2.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.2.0.tgz#b1b78e275131bcaa9a5722e663545ed949c278ee" + integrity sha512-M7ZDbghaxFd2unWkyDFGLZDjPpIbDtEbICXSzwGrUBccFwVG/1dhLLAYX3D+98bFksaJuM0iMZGuIQUzKgnkQw== dependencies: detect-newline "^3.0.0" From 066779821b8242140a1dc79b5050d71b302561fb Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 17:29:23 +0000 Subject: [PATCH 50/74] chore(deps): bump jest-environment-node from 25.1.0 to 25.2.2 (#1407) --- yarn.lock | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5283cf55e7..82f9ea7aad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -424,24 +424,24 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.1.0.tgz#4a97f64770c9d075f5d2b662b5169207f0a3f787" - integrity sha512-cTpUtsjU4cum53VqBDlcW0E4KbQF03Cn0jckGPW/5rrE9tb+porD3+hhLtHAwhthsqfyF+bizyodTlsRA++sHg== +"@jest/environment@^25.1.0", "@jest/environment@^25.2.1": + version "25.2.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.2.1.tgz#d967f38c05accfb2dba325e93238684e8b1706bd" + integrity sha512-aeA3UlUmpblmv2CHBcNA7LvcXlcCtRpXaKKFVooRy9/Jk8B4IZAZMfrML/d+1cG5FpF17s4JVdu1kx0mbnaqTQ== dependencies: - "@jest/fake-timers" "^25.1.0" - "@jest/types" "^25.1.0" - jest-mock "^25.1.0" + "@jest/fake-timers" "^25.2.1" + "@jest/types" "^25.2.1" + jest-mock "^25.2.1" -"@jest/fake-timers@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.1.0.tgz#a1e0eff51ffdbb13ee81f35b52e0c1c11a350ce8" - integrity sha512-Eu3dysBzSAO1lD7cylZd/CVKdZZ1/43SF35iYBNV1Lvvn2Undp3Grwsv8PrzvbLhqwRzDd4zxrY4gsiHc+wygQ== +"@jest/fake-timers@^25.1.0", "@jest/fake-timers@^25.2.1": + version "25.2.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.2.1.tgz#caaaea22e810796d3538a77fdce6e554c864ae72" + integrity sha512-H1OC8AktrGTD10NHBauICkRCv7VOOrsgI8xokifAsxJMYhqoKBtJZbk2YpbrtnmdTUnk+qoxPUk+Mufwnl44iQ== dependencies: - "@jest/types" "^25.1.0" - jest-message-util "^25.1.0" - jest-mock "^25.1.0" - jest-util "^25.1.0" + "@jest/types" "^25.2.1" + jest-message-util "^25.2.1" + jest-mock "^25.2.1" + jest-util "^25.2.1" lolex "^5.0.0" "@jest/reporters@^25.1.0": @@ -5166,15 +5166,16 @@ jest-environment-jsdom@^25.1.0: jsdom "^15.1.1" jest-environment-node@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.1.0.tgz#797bd89b378cf0bd794dc8e3dca6ef21126776db" - integrity sha512-U9kFWTtAPvhgYY5upnH9rq8qZkj6mYLup5l1caAjjx9uNnkLHN2xgZy5mo4SyLdmrh/EtB9UPpKFShvfQHD0Iw== + version "25.2.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.2.2.tgz#a34e1018a7b032067f9ed675a6d0b033a67a5342" + integrity sha512-3V1zivv0EAu4xoeLaQVHjDrniAB4JU9iOUqpsUpJjL5P8zFuSxpGL9K0zBdnaZFVfQCWSa2pLbSfpWItcLPijQ== dependencies: - "@jest/environment" "^25.1.0" - "@jest/fake-timers" "^25.1.0" - "@jest/types" "^25.1.0" - jest-mock "^25.1.0" - jest-util "^25.1.0" + "@jest/environment" "^25.2.1" + "@jest/fake-timers" "^25.2.1" + "@jest/types" "^25.2.1" + jest-mock "^25.2.1" + jest-util "^25.2.1" + semver "^6.3.0" jest-expect-message@^1.0.2: version "1.0.2" @@ -5302,7 +5303,7 @@ jest-message-util@^25.2.1: slash "^3.0.0" stack-utils "^1.0.1" -jest-mock@^25.1.0: +jest-mock@^25.1.0, jest-mock@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.2.1.tgz#37b294b8d0aa94c1af7714e039cc410df61593da" integrity sha512-ZXcmqpCTG1MEm2AP2q9XiJzdbQ655Pnssj+xQMP1thrW2ptEFrd4vSkxTpxk6rnluLPRKagaHmzUpWNxShMvqQ== From 12adfd29114b19b7670d369f47db4b68a27ea938 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 17:51:42 +0000 Subject: [PATCH 51/74] chore(deps): bump jest-worker from 25.1.0 to 25.2.1 (#1391) --- yarn.lock | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 82f9ea7aad..f4a361bbe4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5467,15 +5467,7 @@ jest-watcher@^25.1.0: jest-util "^25.1.0" string-length "^3.1.0" -jest-worker@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a" - integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg== - dependencies: - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest-worker@^25.2.1: +jest-worker@^25.1.0, jest-worker@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a" integrity sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ== From 58b70d85161e5864b24605bdf55b9109e452ce11 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 18:23:50 +0000 Subject: [PATCH 52/74] chore(deps): bump jest-message-util from 25.1.0 to 25.2.1 (#1402) --- yarn.lock | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/yarn.lock b/yarn.lock index f4a361bbe4..ad688b76d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -495,18 +495,7 @@ graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.1.0.tgz#847af2972c1df9822a8200457e64be4ff62821f7" - integrity sha512-FZzSo36h++U93vNWZ0KgvlNuZ9pnDnztvaM7P/UcTx87aPDotG18bXifkf1Ji44B7k/eIatmMzkBapnAzjkJkg== - dependencies: - "@jest/console" "^25.1.0" - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - -"@jest/test-result@^25.2.1": +"@jest/test-result@^25.1.0", "@jest/test-result@^25.2.1": version "25.2.1" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.2.1.tgz#dc8d26d4329c055733bd5ad6dc4eda190fbacd3b" integrity sha512-E0tlWh2iOELRLbbPEngs3Dsx88vGBQOs6O3w46YeXfMHlwwqzWrlvoeUq6kRlHRm1O8H+EBr60Wtrwh20C+zWQ== @@ -5275,21 +5264,7 @@ jest-matcher-utils@^25.2.1: jest-get-type "^25.2.1" pretty-format "^25.2.1" -jest-message-util@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.1.0.tgz#702a9a5cb05c144b9aa73f06e17faa219389845e" - integrity sha512-Nr/Iwar2COfN22aCqX0kCVbXgn8IBm9nWf4xwGr5Olv/KZh0CZ32RKgZWMVDXGdOahicM10/fgjdimGNX/ttCQ== - dependencies: - "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" - "@types/stack-utils" "^1.0.1" - chalk "^3.0.0" - micromatch "^4.0.2" - slash "^3.0.0" - stack-utils "^1.0.1" - -jest-message-util@^25.2.1: +jest-message-util@^25.1.0, jest-message-util@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.1.tgz#43fb5f239954a28954e74dfea0b75efc4e7377fb" integrity sha512-pxwehr9uPEuCI9bPjBiZxpFMN0+3wny5p7/E3hbV9XjsqREhJJAMf0czvHtgNeUBo2iAiAI9yi9ICKHPOKePEw== From a7edc7c727acfe369558a922e50d204398b1e9f2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 18:24:19 +0000 Subject: [PATCH 53/74] chore(deps): bump jest-jasmine2 from 25.1.0 to 25.2.2 (#1411) --- yarn.lock | 259 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 161 insertions(+), 98 deletions(-) diff --git a/yarn.lock b/yarn.lock index ad688b76d2..7cce714262 100644 --- a/yarn.lock +++ b/yarn.lock @@ -52,7 +52,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.8.6", "@babel/generator@^7.8.7": +"@babel/generator@^7.8.7": version "7.8.8" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.8.tgz#cdcd58caab730834cee9eeadb729e833b625da3e" integrity sha512-HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg== @@ -184,16 +184,16 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.8.7": - version "7.8.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4" - integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA== - -"@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0": +"@babel/parser@^7.1.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0": version "7.9.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8" integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA== +"@babel/parser@^7.8.7": + version "7.8.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.8.tgz#4c3b7ce36db37e0629be1f0d50a571d2f86f6cd4" + integrity sha512-mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA== + "@babel/plugin-syntax-bigint@^7.0.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" @@ -217,22 +217,7 @@ "@babel/parser" "^7.8.6" "@babel/types" "^7.8.6" -"@babel/traverse@^7.0.0-beta.39", "@babel/traverse@^7.1.0", "@babel/traverse@^7.8.4": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" - integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.6" - "@babel/helper-function-name" "^7.8.3" - "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.8.6" - "@babel/types" "^7.8.6" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.13" - -"@babel/traverse@^7.7.4", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": +"@babel/traverse@^7.0.0-beta.39", "@babel/traverse@^7.1.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.4", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892" integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w== @@ -477,16 +462,7 @@ optionalDependencies: node-notifier "^6.0.0" -"@jest/source-map@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.1.0.tgz#b012e6c469ccdbc379413f5c1b1ffb7ba7034fb0" - integrity sha512-ohf2iKT0xnLWcIUhL6U6QN+CwFWf9XnrM2a6ybL9NXxJjgYijjLSitkYHIdzkd8wFliH73qj/+epIpTiWjRtAA== - dependencies: - callsites "^3.0.0" - graceful-fs "^4.2.3" - source-map "^0.6.0" - -"@jest/source-map@^25.2.1": +"@jest/source-map@^25.1.0", "@jest/source-map@^25.2.1": version "25.2.1" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.2.1.tgz#b62ecf8ae76170b08eff8859b56eb7576df34ab8" integrity sha512-PgScGJm1U27+9Te/cxP4oUFqJ2PX6NhBL2a6unQ7yafCgs8k02c0LSyjSIx/ao0AwcAdCczfAPDf5lJ7zoB/7A== @@ -516,6 +492,16 @@ jest-runner "^25.1.0" jest-runtime "^25.1.0" +"@jest/test-sequencer@^25.2.2": + version "25.2.2" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.2.2.tgz#22132174af970527e856c96d78bf446828eb6bde" + integrity sha512-bN1LH30EygCNrZS7gkKBmqBxQwilYiMlAV+wY9oWFRY4VZAxvPwqg5/f0DrZQc60vTW1fXWrkfslSa87sO/P5A== + dependencies: + "@jest/test-result" "^25.2.1" + jest-haste-map "^25.2.1" + jest-runner "^25.2.2" + jest-runtime "^25.2.2" + "@jest/transform@^25.1.0": version "25.1.0" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.1.0.tgz#221f354f512b4628d88ce776d5b9e601028ea9da" @@ -2160,6 +2146,19 @@ babel-jest@^25.1.0: chalk "^3.0.0" slash "^3.0.0" +babel-jest@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.2.1.tgz#d01ff8025b305a886421b176f3d99ec5461b23b7" + integrity sha512-OiBpQGYtV4rWMuFneIaEsqJB0VdoOBw4SqwO4hA2EhDY/O8RylQ20JwALkxv8iv+CYnyrZZfF+DELPgrdrkRIw== + dependencies: + "@jest/transform" "^25.2.1" + "@jest/types" "^25.2.1" + "@types/babel__core" "^7.1.0" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^25.2.1" + chalk "^3.0.0" + slash "^3.0.0" + babel-plugin-istanbul@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" @@ -2178,7 +2177,7 @@ babel-plugin-jest-hoist@^25.2.1: dependencies: "@types/babel__traverse" "^7.0.6" -babel-preset-jest@^25.1.0: +babel-preset-jest@^25.1.0, babel-preset-jest@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2" integrity sha512-zXHJBM5iR8oEO4cvdF83AQqqJf3tJrXy3x8nfu2Nlqvn4cneg4Ca8M7cQvC5S9BzDDy1O0tZ9iXru9J6E3ym+A== @@ -3152,6 +3151,11 @@ deep-is@~0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -3749,18 +3753,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-25.1.0.tgz#7e8d7b06a53f7d66ec927278db3304254ee683ee" - integrity sha512-wqHzuoapQkhc3OKPlrpetsfueuEiMf3iWh0R8+duCu9PIjXoP7HgD5aeypwTnXUAjC8aMsiVDaWwlbJ1RlQ38g== - dependencies: - "@jest/types" "^25.1.0" - ansi-styles "^4.0.0" - jest-get-type "^25.1.0" - jest-matcher-utils "^25.1.0" - jest-message-util "^25.1.0" - jest-regex-util "^25.1.0" - expect@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/expect/-/expect-25.2.1.tgz#f543b6a7fee921c554b5eec9b8ca384551dccedd" @@ -5114,6 +5106,30 @@ jest-config@^25.1.0: pretty-format "^25.1.0" realpath-native "^1.1.0" +jest-config@^25.2.2: + version "25.2.2" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.2.2.tgz#ab595713c1808a16ee714300ed48d02c34191d19" + integrity sha512-nnFcjd57kyc9q5vS1DRQQqowxKiRO6jmonL/lo84DL8Zjdng97jaty6EzJ37lMOqvehZY1ovqKgC7Ki0Iqa/wA== + dependencies: + "@babel/core" "^7.1.0" + "@jest/test-sequencer" "^25.2.2" + "@jest/types" "^25.2.1" + babel-jest "^25.2.1" + chalk "^3.0.0" + deepmerge "^4.2.2" + glob "^7.1.1" + jest-environment-jsdom "^25.2.1" + jest-environment-node "^25.2.2" + jest-get-type "^25.2.1" + jest-jasmine2 "^25.2.2" + jest-regex-util "^25.2.1" + jest-resolve "^25.2.1" + jest-util "^25.2.1" + jest-validate "^25.2.1" + micromatch "^4.0.2" + pretty-format "^25.2.1" + realpath-native "^2.0.0" + jest-diff@^25.1.0, jest-diff@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.1.tgz#8c073596cc88356227c86a50d71a23d8a9dfa81a" @@ -5124,14 +5140,14 @@ jest-diff@^25.1.0, jest-diff@^25.2.1: jest-get-type "^25.2.1" pretty-format "^25.2.1" -jest-docblock@^25.1.0: +jest-docblock@^25.1.0, jest-docblock@^25.2.0: version "25.2.0" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.2.0.tgz#b1b78e275131bcaa9a5722e663545ed949c278ee" integrity sha512-M7ZDbghaxFd2unWkyDFGLZDjPpIbDtEbICXSzwGrUBccFwVG/1dhLLAYX3D+98bFksaJuM0iMZGuIQUzKgnkQw== dependencies: detect-newline "^3.0.0" -jest-each@^25.1.0: +jest-each@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.2.1.tgz#d96b4fc0c035fcddb852f19da42ea241b1943999" integrity sha512-2vWAaf11IJsSwkEzGph3un4OMSG4v/3hpM2UqJdeU3peGUgUSn75TlXZGQnT0smbnAr4eE+URW1OpE8U9wl0TA== @@ -5154,7 +5170,19 @@ jest-environment-jsdom@^25.1.0: jest-util "^25.1.0" jsdom "^15.1.1" -jest-environment-node@^25.1.0: +jest-environment-jsdom@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.2.1.tgz#4f1da1bc46897c6ed818c850464b1114429e3ad5" + integrity sha512-bUhhhXtgrOgLhsFQFXgao8CQPYAEwtaVvhsF6O0A7Ie2uPONtAKCwuxyOM9WJaz9ag2ci5Pg7i2V2PRfGLl95w== + dependencies: + "@jest/environment" "^25.2.1" + "@jest/fake-timers" "^25.2.1" + "@jest/types" "^25.2.1" + jest-mock "^25.2.1" + jest-util "^25.2.1" + jsdom "^15.2.1" + +jest-environment-node@^25.1.0, jest-environment-node@^25.2.2: version "25.2.2" resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.2.2.tgz#a34e1018a7b032067f9ed675a6d0b033a67a5342" integrity sha512-3V1zivv0EAu4xoeLaQVHjDrniAB4JU9iOUqpsUpJjL5P8zFuSxpGL9K0zBdnaZFVfQCWSa2pLbSfpWItcLPijQ== @@ -5213,27 +5241,27 @@ jest-haste-map@^25.2.1: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.1.0.tgz#681b59158a430f08d5d0c1cce4f01353e4b48137" - integrity sha512-GdncRq7jJ7sNIQ+dnXvpKO2MyP6j3naNK41DTTjEAhLEdpImaDA9zSAZwDhijjSF/D7cf4O5fdyUApGBZleaEg== +jest-jasmine2@^25.1.0, jest-jasmine2@^25.2.2: + version "25.2.2" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.2.2.tgz#08ce8ba9a1c2445c7fd98d0be190848bd53dcf7f" + integrity sha512-lB/32iLzuupTlKUlZz1QxKILkMbAIL4iq4O0wjMH6FPBKnkf8YgdQchDQyIzK98xrdYF+DdvmsaS/m6bt+jSiA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.1.0" - "@jest/source-map" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/environment" "^25.2.1" + "@jest/source-map" "^25.2.1" + "@jest/test-result" "^25.2.1" + "@jest/types" "^25.2.1" chalk "^3.0.0" co "^4.6.0" - expect "^25.1.0" + expect "^25.2.1" is-generator-fn "^2.0.0" - jest-each "^25.1.0" - jest-matcher-utils "^25.1.0" - jest-message-util "^25.1.0" - jest-runtime "^25.1.0" - jest-snapshot "^25.1.0" - jest-util "^25.1.0" - pretty-format "^25.1.0" + jest-each "^25.2.1" + jest-matcher-utils "^25.2.1" + jest-message-util "^25.2.1" + jest-runtime "^25.2.2" + jest-snapshot "^25.2.1" + jest-util "^25.2.1" + pretty-format "^25.2.1" throat "^5.0.0" jest-leak-detector@^25.1.0: @@ -5244,15 +5272,13 @@ jest-leak-detector@^25.1.0: jest-get-type "^25.1.0" pretty-format "^25.1.0" -jest-matcher-utils@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz#fa5996c45c7193a3c24e73066fc14acdee020220" - integrity sha512-KGOAFcSFbclXIFE7bS4C53iYobKI20ZWleAdAFun4W1Wz1Kkej8Ng6RRbhL8leaEvIOjGXhGf/a1JjO8bkxIWQ== +jest-leak-detector@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.2.1.tgz#77c55c59c32de9600f6bd9aab9540538b541b253" + integrity sha512-bsxjjFksjLWNqC8aLsN0KO2KQ3tiqPqmFpYt+0y4RLHc1dqaThQL68jra5y1f/yhX3dNC8ugksDvqnGxwxjo4w== dependencies: - chalk "^3.0.0" - jest-diff "^25.1.0" - jest-get-type "^25.1.0" - pretty-format "^25.1.0" + jest-get-type "^25.2.1" + pretty-format "^25.2.1" jest-matcher-utils@^25.2.1: version "25.2.1" @@ -5352,36 +5378,61 @@ jest-runner@^25.1.0: source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.1.0.tgz#02683218f2f95aad0f2ec1c9cdb28c1dc0ec0314" - integrity sha512-mpPYYEdbExKBIBB16ryF6FLZTc1Rbk9Nx0ryIpIMiDDkOeGa0jQOKVI/QeGvVGlunKKm62ywcioeFVzIbK03bA== +jest-runner@^25.2.2: + version "25.2.2" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.2.2.tgz#6dfa528a180a19af45d8038c2727ad4a58b81213" + integrity sha512-U0UACNQK3WovPpNvOsf57qfk815ZfMAq2oH3kQUTZEY7L07nVnY9tVmDvI1RBh1JtkNBqUCSoqYjlTpiBhhghQ== dependencies: - "@jest/console" "^25.1.0" - "@jest/environment" "^25.1.0" - "@jest/source-map" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/console" "^25.2.1" + "@jest/environment" "^25.2.1" + "@jest/test-result" "^25.2.1" + "@jest/types" "^25.2.1" + chalk "^3.0.0" + exit "^0.1.2" + graceful-fs "^4.2.3" + jest-config "^25.2.2" + jest-docblock "^25.2.0" + jest-haste-map "^25.2.1" + jest-jasmine2 "^25.2.2" + jest-leak-detector "^25.2.1" + jest-message-util "^25.2.1" + jest-resolve "^25.2.1" + jest-runtime "^25.2.2" + jest-util "^25.2.1" + jest-worker "^25.2.1" + source-map-support "^0.5.6" + throat "^5.0.0" + +jest-runtime@^25.1.0, jest-runtime@^25.2.2: + version "25.2.2" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.2.2.tgz#6ffbcdc67a3488f1ccb1dba1277ab671e96f5226" + integrity sha512-k0LgYDw8nDOGJRPhFlsitzqOxkDGxyVQQG1O39ToHsuApVkZHguYEw4tNXU8Pc4GdU9/ua9ke6nUjHNiByE8bg== + dependencies: + "@jest/console" "^25.2.1" + "@jest/environment" "^25.2.1" + "@jest/source-map" "^25.2.1" + "@jest/test-result" "^25.2.1" + "@jest/transform" "^25.2.1" + "@jest/types" "^25.2.1" "@types/yargs" "^15.0.0" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.3" - jest-config "^25.1.0" - jest-haste-map "^25.1.0" - jest-message-util "^25.1.0" - jest-mock "^25.1.0" - jest-regex-util "^25.1.0" - jest-resolve "^25.1.0" - jest-snapshot "^25.1.0" - jest-util "^25.1.0" - jest-validate "^25.1.0" - realpath-native "^1.1.0" + jest-config "^25.2.2" + jest-haste-map "^25.2.1" + jest-message-util "^25.2.1" + jest-mock "^25.2.1" + jest-regex-util "^25.2.1" + jest-resolve "^25.2.1" + jest-snapshot "^25.2.1" + jest-util "^25.2.1" + jest-validate "^25.2.1" + realpath-native "^2.0.0" slash "^3.0.0" strip-bom "^4.0.0" - yargs "^15.0.0" + yargs "^15.3.1" jest-serializer@^25.1.0, jest-serializer@^25.2.1: version "25.2.1" @@ -5430,6 +5481,18 @@ jest-validate@^25.1.0: leven "^3.1.0" pretty-format "^25.1.0" +jest-validate@^25.2.1: + version "25.2.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.2.1.tgz#a07a4e6697fc58e6ea31c03de541af4d0a475fbc" + integrity sha512-vGtNFPyvylFfTFFfptzqCy5S3cP/N5JJVwm8gsXeZq8jMmvUngfWtuw+Tr5Wjo+dqOle23td8BE0ruGnsONDmw== + dependencies: + "@jest/types" "^25.2.1" + camelcase "^5.3.1" + chalk "^3.0.0" + jest-get-type "^25.2.1" + leven "^3.1.0" + pretty-format "^25.2.1" + jest-watcher@^25.1.0: version "25.1.0" resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.1.0.tgz#97cb4a937f676f64c9fad2d07b824c56808e9806" @@ -5477,7 +5540,7 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdom@^15.1.1: +jsdom@^15.1.1, jsdom@^15.2.1: version "15.2.1" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== @@ -9209,9 +9272,9 @@ yargs-parser@^15.0.1: decamelize "^1.2.0" yargs-parser@^18.1.1: - version "18.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.1.tgz#bf7407b915427fc760fcbbccc6c82b4f0ffcbd37" - integrity sha512-KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA== + version "18.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1" + integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" From dd81898181d4ed3033fad81a2ade1102d1a9ed3f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 20:32:11 +0000 Subject: [PATCH 54/74] chore(deps): bump signal-exit from 3.0.2 to 3.0.3 (#1416) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7cce714262..13885d959d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7864,9 +7864,9 @@ side-channel@^1.0.1: object-inspect "^1.7.0" signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== sisteransi@^1.0.4: version "1.0.5" From 57b6c2ce919dc8df18128f60535262b14c82b211 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2020 20:54:23 +0000 Subject: [PATCH 55/74] chore(deps): bump jest-leak-detector from 25.1.0 to 25.2.3 (#1420) --- yarn.lock | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/yarn.lock b/yarn.lock index 13885d959d..8b5667a227 100644 --- a/yarn.lock +++ b/yarn.lock @@ -556,6 +556,16 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" +"@jest/types@^25.2.3": + version "25.2.3" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.3.tgz#035c4fb94e2da472f359ff9a211915d59987f6b6" + integrity sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^1.1.1" + "@types/yargs" "^15.0.0" + chalk "^3.0.0" + "@lerna/add@3.20.0": version "3.20.0" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.20.0.tgz#bea7edf36fc93fb72ec34cb9ba854c48d4abf309" @@ -5264,21 +5274,13 @@ jest-jasmine2@^25.1.0, jest-jasmine2@^25.2.2: pretty-format "^25.2.1" throat "^5.0.0" -jest-leak-detector@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.1.0.tgz#ed6872d15aa1c72c0732d01bd073dacc7c38b5c6" - integrity sha512-3xRI264dnhGaMHRvkFyEKpDeaRzcEBhyNrOG5oT8xPxOyUAblIAQnpiR3QXu4wDor47MDTiHbiFcbypdLcLW5w== - dependencies: - jest-get-type "^25.1.0" - pretty-format "^25.1.0" - -jest-leak-detector@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.2.1.tgz#77c55c59c32de9600f6bd9aab9540538b541b253" - integrity sha512-bsxjjFksjLWNqC8aLsN0KO2KQ3tiqPqmFpYt+0y4RLHc1dqaThQL68jra5y1f/yhX3dNC8ugksDvqnGxwxjo4w== +jest-leak-detector@^25.1.0, jest-leak-detector@^25.2.1: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.2.3.tgz#4cf39f137925e0061c04c24ca65cae36465f0238" + integrity sha512-yblCMPE7NJKl7778Cf/73yyFWAas5St0iiEBwq7RDyaz6Xd4WPFnPz2j7yDb/Qce71A1IbDoLADlcwD8zT74Aw== dependencies: jest-get-type "^25.2.1" - pretty-format "^25.2.1" + pretty-format "^25.2.3" jest-matcher-utils@^25.2.1: version "25.2.1" @@ -7114,12 +7116,12 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -pretty-format@^25.1.0, pretty-format@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.2.1.tgz#3b8f7b9241faa6736cdbc32879bee18454d1318d" - integrity sha512-YS+e9oGYIbEeAFgqTU8qeZ3DN2Pz0iaD81ox+iUjLIXVJWeB7Ro/2AnfxRnl/yJJ5R674d7E3jLPuh6bwg0+qw== +pretty-format@^25.1.0, pretty-format@^25.2.1, pretty-format@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.2.3.tgz#ba6e9603a0d80fa2e470b1fed55de1f9bfd81421" + integrity sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w== dependencies: - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" ansi-regex "^5.0.0" ansi-styles "^4.0.0" react-is "^16.12.0" From bdda569729db83abe09edb9f9d922ba4194cd847 Mon Sep 17 00:00:00 2001 From: Mitchell Valine Date: Thu, 26 Mar 2020 15:47:56 -0700 Subject: [PATCH 56/74] feat: add autobump script (#1335) Changes all version numbers in package.json to 0.0.0. to centralize current version to a single location in lerna.json. This removes noise from release PRs. Adds scripts for aligning package versions to the current version. Changes content of scripts/bump.sh to only bump --- .versionrc.json | 5 + buildspec.yaml | 2 + package.json | 4 +- packages/@jsii/dotnet-analyzers/package.json | 4 +- packages/@jsii/dotnet-jsonmodel/package.json | 4 +- .../@jsii/dotnet-runtime-test/package.json | 8 +- packages/@jsii/dotnet-runtime/package.json | 8 +- packages/@jsii/integ-test/package.json | 8 +- packages/@jsii/java-runtime-test/package.json | 8 +- packages/@jsii/java-runtime/package.json | 6 +- packages/@jsii/kernel/package.json | 12 +- packages/@jsii/python-runtime/package.json | 10 +- packages/@jsii/ruby-runtime/package.json | 10 +- .../@jsii/ruby-runtime/project/Gemfile.lock | 2 +- packages/@jsii/runtime/package.json | 14 +- packages/@jsii/spec/package.json | 4 +- .../jsii-calc-base-of-base/package.json | 8 +- .../jsii-calc-base-of-base/test/assembly.jsii | 6 +- packages/@scope/jsii-calc-base/package.json | 14 +- .../@scope/jsii-calc-base/test/assembly.jsii | 8 +- packages/@scope/jsii-calc-lib/package.json | 14 +- .../@scope/jsii-calc-lib/test/assembly.jsii | 10 +- packages/codemaker/package.json | 2 +- packages/jsii-calc/package.json | 22 +- packages/jsii-calc/test/assembly.jsii | 12 +- packages/jsii-config/package.json | 4 +- packages/jsii-diff/package.json | 10 +- packages/jsii-pacmak/package.json | 22 +- .../.jsii | 6 +- ...ulatorPackageId.BaseOfBasePackageId.csproj | 6 +- .../AssemblyInfo.cs | 2 +- ...=> scope-jsii-calc-base-of-base-0.0.0.tgz} | 0 .../java/pom.xml | 4 +- .../tests/calculator/baseofbase/$Module.java | 2 +- ... => jsii-calc-base-of-base@0.0.0.jsii.tgz} | 0 ... => jsii-calc-base-of-base@0.0.0.jsii.tgz} | 0 .../python/setup.py | 6 +- .../scope/jsii_calc_base_of_base/__init__.py | 2 +- ... => jsii-calc-base-of-base@0.0.0.jsii.tgz} | 0 .../.jsii | 8 +- ...s.CalculatorPackageId.BasePackageId.csproj | 8 +- .../AssemblyInfo.cs | 2 +- ...1.0.tgz => scope-jsii-calc-base-0.0.0.tgz} | 0 .../test/expected.jsii-calc-base/java/pom.xml | 6 +- .../jsii/tests/calculator/base/$Module.java | 2 +- ...jsii.tgz => jsii-calc-base@0.0.0.jsii.tgz} | 0 ...jsii.tgz => jsii-calc-base@0.0.0.jsii.tgz} | 0 .../expected.jsii-calc-base/python/setup.py | 8 +- .../src/scope/jsii_calc_base/__init__.py | 2 +- ...jsii.tgz => jsii-calc-base@0.0.0.jsii.tgz} | 0 .../.jsii | 10 +- ...ts.CalculatorPackageId.LibPackageId.csproj | 10 +- .../AssemblyInfo.cs | 2 +- ....1.0.tgz => scope-jsii-calc-lib-0.0.0.tgz} | 0 .../test/expected.jsii-calc-lib/java/pom.xml | 8 +- .../jsii/tests/calculator/lib/$Module.java | 2 +- ....jsii.tgz => jsii-calc-lib@0.0.0.jsii.tgz} | 0 ....jsii.tgz => jsii-calc-lib@0.0.0.jsii.tgz} | 0 .../expected.jsii-calc-lib/python/setup.py | 10 +- .../src/scope/jsii_calc_lib/__init__.py | 2 +- ....jsii.tgz => jsii-calc-lib@0.0.0.jsii.tgz} | 0 .../.jsii | 12 +- ...azon.JSII.Tests.CalculatorPackageId.csproj | 12 +- .../AssemblyInfo.cs | 2 +- ...sii-calc-1.1.0.tgz => jsii-calc-0.0.0.tgz} | 0 .../test/expected.jsii-calc/java/pom.xml | 10 +- .../amazon/jsii/tests/calculator/$Module.java | 2 +- ....1.0.jsii.tgz => jsii-calc@0.0.0.jsii.tgz} | 0 ....1.0.jsii.tgz => jsii-calc@0.0.0.jsii.tgz} | 0 .../test/expected.jsii-calc/python/setup.py | 12 +- .../python/src/jsii_calc/__init__.py | 2 +- ....1.0.jsii.tgz => jsii-calc@0.0.0.jsii.tgz} | 0 .../src/jsii_calc/composition/__init__.py | 2 +- .../__init__.py | 2 +- .../__init__.py | 2 +- .../__init__.py | 2 +- .../src/jsii_calc/submodule/__init__.py | 2 +- .../submodule/back_references/__init__.py | 2 +- .../src/jsii_calc/submodule/child/__init__.py | 2 +- .../submodule/nested_submodule/__init__.py | 2 +- .../deeply_nested/__init__.py | 2 +- packages/jsii-reflect/package.json | 14 +- packages/jsii-rosetta/package.json | 8 +- packages/jsii/package.json | 6 +- packages/oo-ascii-tree/package.json | 4 +- scripts/align-version.js | 38 ++ scripts/align-version.sh | 20 ++ scripts/bump.sh | 42 +-- scripts/get-version-marker.js | 13 + scripts/get-version.js | 18 + tools/jsii-build-tools/package.json | 2 +- yarn.lock | 324 +++++++++++++----- 92 files changed, 574 insertions(+), 334 deletions(-) create mode 100644 .versionrc.json rename packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/{scope-jsii-calc-base-of-base-1.1.0.tgz => scope-jsii-calc-base-of-base-0.0.0.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/{jsii-calc-base-of-base@1.1.0.jsii.tgz => jsii-calc-base-of-base@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/{jsii-calc-base-of-base@1.1.0.jsii.tgz => jsii-calc-base-of-base@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/{jsii-calc-base-of-base@1.1.0.jsii.tgz => jsii-calc-base-of-base@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/{scope-jsii-calc-base-1.1.0.tgz => scope-jsii-calc-base-0.0.0.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/{jsii-calc-base@1.1.0.jsii.tgz => jsii-calc-base@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/js/{jsii-calc-base@1.1.0.jsii.tgz => jsii-calc-base@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/{jsii-calc-base@1.1.0.jsii.tgz => jsii-calc-base@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/{scope-jsii-calc-lib-1.1.0.tgz => scope-jsii-calc-lib-0.0.0.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/{jsii-calc-lib@1.1.0.jsii.tgz => jsii-calc-lib@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/js/{jsii-calc-lib@1.1.0.jsii.tgz => jsii-calc-lib@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/{jsii-calc-lib@1.1.0.jsii.tgz => jsii-calc-lib@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/{jsii-calc-1.1.0.tgz => jsii-calc-0.0.0.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/{jsii-calc@1.1.0.jsii.tgz => jsii-calc@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/js/{jsii-calc@1.1.0.jsii.tgz => jsii-calc@0.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/{jsii-calc@1.1.0.jsii.tgz => jsii-calc@0.0.0.jsii.tgz} (100%) create mode 100755 scripts/align-version.js create mode 100755 scripts/align-version.sh create mode 100644 scripts/get-version-marker.js create mode 100644 scripts/get-version.js diff --git a/.versionrc.json b/.versionrc.json new file mode 100644 index 0000000000..3178955551 --- /dev/null +++ b/.versionrc.json @@ -0,0 +1,5 @@ +{ + "skip": { "tag": true }, + "packageFiles": [ { "filename": "lerna.json", "type": "json" } ], + "bumpFiles": [ { "filename": "lerna.json", "type": "json" } ] +} diff --git a/buildspec.yaml b/buildspec.yaml index 6eb3988768..3eeeb653e5 100644 --- a/buildspec.yaml +++ b/buildspec.yaml @@ -12,6 +12,8 @@ phases: build: commands: - yarn build && yarn test + - /bin/bash ./scripts/align-version.sh + - yarn build post_build: commands: - '[ ${CODEBUILD_BUILD_SUCCEEDING} = 1 ] && yarn package' diff --git a/package.json b/package.json index 4a814115a9..9715feeee8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "private": true, "license": "Apache-2.0", + "version": "0.0.0", "scripts": { "build": "lerna run build --stream --sort --concurrency=1", "bump": "bash scripts/bump.sh", @@ -17,7 +18,8 @@ "eslint-import-resolver-node": "^0.3.3", "eslint-import-resolver-typescript": "^2.0.0", "eslint-plugin-import": "^2.20.1", - "lerna": "^3.20.2" + "lerna": "^3.20.2", + "standard-version": "^7.1.0" }, "repository": { "type": "git", diff --git a/packages/@jsii/dotnet-analyzers/package.json b/packages/@jsii/dotnet-analyzers/package.json index d99c3acf59..950953af5f 100644 --- a/packages/@jsii/dotnet-analyzers/package.json +++ b/packages/@jsii/dotnet-analyzers/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-analyzers", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": ".NET Roslyn Analyzers for Jsii", "license": "Apache-2.0", @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/node": "^10.17.17", - "jsii-build-tools": "^1.1.0", + "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3" } } diff --git a/packages/@jsii/dotnet-jsonmodel/package.json b/packages/@jsii/dotnet-jsonmodel/package.json index 189155fa71..087cd212f0 100644 --- a/packages/@jsii/dotnet-jsonmodel/package.json +++ b/packages/@jsii/dotnet-jsonmodel/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-jsonmodel", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": ".NET json model for jsii spec and api.", "license": "Apache-2.0", @@ -36,7 +36,7 @@ }, "devDependencies": { "@types/node": "^10.17.17", - "jsii-build-tools": "^1.1.0", + "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3" } } diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index f46bb39ee5..29e8157399 100644 --- a/packages/@jsii/dotnet-runtime-test/package.json +++ b/packages/@jsii/dotnet-runtime-test/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-runtime-test", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "Tests for the .NET client for jsii runtime", "license": "Apache-2.0", @@ -30,10 +30,10 @@ "test:update": "UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@jsii/dotnet-runtime": "^1.1.0", + "@jsii/dotnet-runtime": "^0.0.0", "@types/node": "^10.17.17", - "jsii-calc": "^1.1.0", - "jsii-pacmak": "^1.1.0", + "jsii-calc": "^0.0.0", + "jsii-pacmak": "^0.0.0", "typescript": "~3.8.3" } } diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index d4588a34d8..e412b08dff 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-runtime", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": ".NET client for jsii runtime", "license": "Apache-2.0", @@ -37,11 +37,11 @@ "package": "package-dotnet" }, "devDependencies": { - "@jsii/dotnet-jsonmodel": "^1.1.0", - "@jsii/runtime": "^1.1.0", + "@jsii/dotnet-jsonmodel": "^0.0.0", + "@jsii/runtime": "^0.0.0", "@types/node": "^10.17.17", "@types/semver": "^7.1.0", - "jsii-build-tools": "^1.1.0", + "jsii-build-tools": "^0.0.0", "semver": "^7.1.3", "typescript": "~3.8.3" } diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index a6ff9125fc..1af819186e 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/integ-test", - "version": "1.1.0", + "version": "0.0.0", "description": "A suite of integration tests for JSII and related modules.", "private": true, "scripts": { @@ -20,9 +20,9 @@ "dotenv": "^8.2.0", "fs-extra": "^9.0.0", "jest": "^25.1.0", - "jsii": "^1.1.0", - "jsii-pacmak": "^1.1.0", - "jsii-rosetta": "^1.1.0", + "jsii": "^0.0.0", + "jsii-pacmak": "^0.0.0", + "jsii-rosetta": "^0.0.0", "tar": "^6.0.1" }, "devDependencies": { diff --git a/packages/@jsii/java-runtime-test/package.json b/packages/@jsii/java-runtime-test/package.json index fead46e6a7..ac5e65e90f 100644 --- a/packages/@jsii/java-runtime-test/package.json +++ b/packages/@jsii/java-runtime-test/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/java-runtime-test", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "Tests for the Java client for jsii runtime", "license": "Apache-2.0", @@ -28,8 +28,8 @@ "test:update": "UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@jsii/java-runtime": "^1.1.0", - "jsii-calc": "^1.1.0", - "jsii-pacmak": "^1.1.0" + "@jsii/java-runtime": "^0.0.0", + "jsii-calc": "^0.0.0", + "jsii-pacmak": "^0.0.0" } } diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index 3ba1053a4b..0814954228 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/java-runtime", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "Java client for jsii runtime", "license": "Apache-2.0", @@ -31,9 +31,9 @@ "package": "package-java" }, "devDependencies": { - "@jsii/runtime": "^1.1.0", + "@jsii/runtime": "^0.0.0", "@types/node": "^10.17.17", - "jsii-build-tools": "^1.1.0", + "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3" } } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 2e4c660db9..9e14e4fa01 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/kernel", - "version": "1.1.0", + "version": "0.0.0", "description": "kernel for jsii execution environment", "license": "Apache-2.0", "author": { @@ -30,14 +30,14 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^1.1.0", + "@jsii/spec": "^0.0.0", "fs-extra": "^9.0.0", "source-map": "^0.7.3", "tar": "^6.0.1" }, "devDependencies": { - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-lib": "^1.1.0", + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", "@types/jest-expect-message": "^1.0.1", @@ -46,8 +46,8 @@ "eslint": "^6.8.0", "jest": "^25.1.0", "jest-expect-message": "^1.0.2", - "jsii-build-tools": "^1.1.0", - "jsii-calc": "^1.1.0", + "jsii-build-tools": "^0.0.0", + "jsii-calc": "^0.0.0", "typescript": "~3.8.3" }, "jest": { diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json index 9353489d64..546a2e0daf 100644 --- a/packages/@jsii/python-runtime/package.json +++ b/packages/@jsii/python-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/python-runtime", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "Python client for jsii runtime", "license": "Apache-2.0", @@ -30,9 +30,9 @@ "test:update": "UPDATE_DIFF=1 .env/bin/python bin/generate-calc && .env/bin/py.test -v --mypy" }, "dependencies": { - "@jsii/runtime": "^1.1.0", - "jsii-build-tools": "^1.1.0", - "jsii-calc": "^1.1.0", - "jsii-pacmak": "^1.1.0" + "@jsii/runtime": "^0.0.0", + "jsii-build-tools": "^0.0.0", + "jsii-calc": "^0.0.0", + "jsii-pacmak": "^0.0.0" } } diff --git a/packages/@jsii/ruby-runtime/package.json b/packages/@jsii/ruby-runtime/package.json index aba1a51375..625ce3c06e 100644 --- a/packages/@jsii/ruby-runtime/package.json +++ b/packages/@jsii/ruby-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/ruby-runtime", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "Ruby client for jsii runtime", "license": "Apache-2.0", @@ -33,11 +33,11 @@ "package": "package-ruby" }, "devDependencies": { - "@jsii/runtime": "^1.1.0", + "@jsii/runtime": "^0.0.0", "@types/node": "^10.17.17", - "jsii-build-tools": "^1.1.0", - "jsii-calc": "^1.1.0", - "jsii-pacmak": "^1.1.0", + "jsii-build-tools": "^0.0.0", + "jsii-calc": "^0.0.0", + "jsii-pacmak": "^0.0.0", "typescript": "~3.8.3" } } diff --git a/packages/@jsii/ruby-runtime/project/Gemfile.lock b/packages/@jsii/ruby-runtime/project/Gemfile.lock index 9ccf80186b..fc54604255 100644 --- a/packages/@jsii/ruby-runtime/project/Gemfile.lock +++ b/packages/@jsii/ruby-runtime/project/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - jsii_runtime (1.1.0) + jsii_runtime (0.0.0) GEM remote: https://rubygems.org/ diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 19423e2dc1..84f9bb6f86 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/runtime", - "version": "1.1.0", + "version": "0.0.0", "description": "jsii runtime kernel process", "license": "Apache-2.0", "author": { @@ -33,18 +33,18 @@ "package": "package-js" }, "dependencies": { - "@jsii/kernel": "^1.1.0", - "@jsii/spec": "^1.1.0" + "@jsii/kernel": "^0.0.0", + "@jsii/spec": "^0.0.0" }, "devDependencies": { - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-lib": "^1.1.0", + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-lib": "^0.0.0", "@types/jest": "^25.1.4", "@types/node": "^10.17.17", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii-build-tools": "^1.1.0", - "jsii-calc": "^1.1.0", + "jsii-build-tools": "^0.0.0", + "jsii-calc": "^0.0.0", "source-map": "^0.7.3", "source-map-loader": "^0.2.4", "typescript": "~3.8.3", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index 061e6504d7..f56aef93cd 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/spec", - "version": "1.1.0", + "version": "0.0.0", "description": "Specification for jsii assemblies", "license": "Apache-2.0", "author": { @@ -37,7 +37,7 @@ "@types/node": "^10.17.17", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii-build-tools": "^1.1.0", + "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3", "typescript-json-schema": "^0.42.0" }, diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 6b26050a4e..d1cfe31a44 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-base-of-base", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "An example transitive dependency for jsii-calc.", "license": "Apache-2.0", @@ -30,9 +30,9 @@ }, "devDependencies": { "@types/node": "^10.17.17", - "jsii": "^1.1.0", - "jsii-build-tools": "^1.1.0", - "jsii-rosetta": "^1.1.0" + "jsii": "^0.0.0", + "jsii-build-tools": "^0.0.0", + "jsii-rosetta": "^0.0.0" }, "jsii": { "outdir": "dist", diff --git a/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii b/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii index 206f83077b..37b7c81aa4 100644 --- a/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii +++ b/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii @@ -9,7 +9,7 @@ }, "description": "An example transitive dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "1.1.0", + "jsiiVersion": "0.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-base-of-base", "repository": { @@ -110,6 +110,6 @@ ] } }, - "version": "1.1.0", - "fingerprint": "HsGV6vtb/X5t73ySr/Qp8fPhnueSKPxy5SPqxnoe558=" + "version": "0.0.0", + "fingerprint": "v3mwSbKGQ2aa8g0DEKIeaEXh3csX7PX2MJJxHVRufhI=" } diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index 4ab9c97d5f..536a44ad41 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-base", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "An example direct dependency for jsii-calc.", "license": "Apache-2.0", @@ -29,16 +29,16 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^1.1.0" + "@scope/jsii-calc-base-of-base": "^0.0.0" }, "peerDependencies": { - "@scope/jsii-calc-base-of-base": "^1.1.0" + "@scope/jsii-calc-base-of-base": "^0.0.0" }, "devDependencies": { "@types/node": "^10.17.17", - "jsii": "^1.1.0", - "jsii-build-tools": "^1.1.0", - "jsii-rosetta": "^1.1.0" + "jsii": "^0.0.0", + "jsii-build-tools": "^0.0.0", + "jsii-rosetta": "^0.0.0" }, "jsii": { "outdir": "dist", @@ -61,4 +61,4 @@ }, "versionFormat": "short" } -} \ No newline at end of file +} diff --git a/packages/@scope/jsii-calc-base/test/assembly.jsii b/packages/@scope/jsii-calc-base/test/assembly.jsii index 18ec5268a2..37b4544eec 100644 --- a/packages/@scope/jsii-calc-base/test/assembly.jsii +++ b/packages/@scope/jsii-calc-base/test/assembly.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^1.1.0" + "@scope/jsii-calc-base-of-base": "^0.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base-of-base": { @@ -36,7 +36,7 @@ }, "description": "An example direct dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "1.1.0", + "jsiiVersion": "0.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-base", "repository": { @@ -150,6 +150,6 @@ "name": "IBaseInterface" } }, - "version": "1.1.0", - "fingerprint": "piaiqNxSj1XkycnXHPRG4697t6DpKGgkya6effAlXKI=" + "version": "0.0.0", + "fingerprint": "ttHhQ5EzgjW0lybCNSKOfqilJ04kp4VK3arcpRl3rBM=" } diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index c1d443f709..c57afedd80 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-lib", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "A simple calcuator library built on JSII.", "deprecated": "Really just deprecated for shows...", @@ -31,17 +31,17 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "dependencies": { - "@scope/jsii-calc-base": "^1.1.0" + "@scope/jsii-calc-base": "^0.0.0" }, "peerDependencies": { - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-base-of-base": "^1.1.0" + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-base-of-base": "^0.0.0" }, "devDependencies": { "@types/node": "^10.17.17", - "jsii": "^1.1.0", - "jsii-build-tools": "^1.1.0", - "jsii-rosetta": "^1.1.0" + "jsii": "^0.0.0", + "jsii-build-tools": "^0.0.0", + "jsii-rosetta": "^0.0.0" }, "jsii": { "outdir": "dist", diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii index 29813549a0..416b0256e1 100644 --- a/packages/@scope/jsii-calc-lib/test/assembly.jsii +++ b/packages/@scope/jsii-calc-lib/test/assembly.jsii @@ -8,8 +8,8 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-base-of-base": "^1.1.0" + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-base-of-base": "^0.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -63,7 +63,7 @@ "stability": "deprecated" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "1.1.0", + "jsiiVersion": "0.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-lib", "repository": { @@ -516,6 +516,6 @@ ] } }, - "version": "1.1.0", - "fingerprint": "ewx+U4o9Eq6THqw75uddLD5Yhaciw+s/tLVVeGeMKTg=" + "version": "0.0.0", + "fingerprint": "7VgHmQKZ2ceAa99bmuocZRLFxQths+Sf35amRt1SZpE=" } diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index f883748d89..b6520bd287 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -1,6 +1,6 @@ { "name": "codemaker", - "version": "1.1.0", + "version": "0.0.0", "description": "A tiny utility for generating source code", "license": "Apache-2.0", "author": { diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index e2fe848903..a787ea34e1 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -1,6 +1,6 @@ { "name": "jsii-calc", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "A simple calcuator built on JSII.", "stability": "experimental", @@ -37,20 +37,20 @@ }, "dependencies": { "@fixtures/jsii-calc-bundled": "file:../@fixtures/jsii-calc-bundled", - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-base-of-base": "^1.1.0", - "@scope/jsii-calc-lib": "^1.1.0" + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-base-of-base": "^0.0.0", + "@scope/jsii-calc-lib": "^0.0.0" }, "peerDependencies": { - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-base-of-base": "^1.1.0", - "@scope/jsii-calc-lib": "^1.1.0" + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-base-of-base": "^0.0.0", + "@scope/jsii-calc-lib": "^0.0.0" }, "devDependencies": { "@types/node": "^10.17.17", - "jsii": "^1.1.0", - "jsii-build-tools": "^1.1.0", - "jsii-rosetta": "^1.1.0" + "jsii": "^0.0.0", + "jsii-build-tools": "^0.0.0", + "jsii-rosetta": "^0.0.0" }, "jsii": { "outdir": "dist", @@ -107,4 +107,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii index 0db4ab2889..aa35411a8a 100644 --- a/packages/jsii-calc/test/assembly.jsii +++ b/packages/jsii-calc/test/assembly.jsii @@ -34,9 +34,9 @@ } ], "dependencies": { - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-base-of-base": "^1.1.0", - "@scope/jsii-calc-lib": "^1.1.0" + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-base-of-base": "^0.0.0", + "@scope/jsii-calc-lib": "^0.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -113,7 +113,7 @@ "stability": "experimental" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "1.1.0", + "jsiiVersion": "0.0.0", "keywords": [ "aws", "jsii", @@ -12404,6 +12404,6 @@ ] } }, - "version": "1.1.0", - "fingerprint": "vtobmk8xL6Ke30Blb4NyDZ1X7T7J8lcKbbrmZtMtcpU=" + "version": "0.0.0", + "fingerprint": "SEfqfgRvf7Rdw2KRLONITu2b2JruUQ85Ur47eTy1KnA=" } diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 34c826111d..8ec88b1aa7 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -1,6 +1,6 @@ { "name": "jsii-config", - "version": "1.1.0", + "version": "0.0.0", "description": "CLI tool for configuring jsii module configuration in package.json", "main": "lib/index.js", "repository": "https://github.com/aws/jsii", @@ -29,7 +29,7 @@ "typescript": "~3.8.3" }, "dependencies": { - "@jsii/spec": "^1.1.0", + "@jsii/spec": "^0.0.0", "inquirer": "^7.1.0", "yargs": "^15.3.1" }, diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index f0ad6b0d7e..322443ac83 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -1,6 +1,6 @@ { "name": "jsii-diff", - "version": "1.1.0", + "version": "0.0.0", "description": "Assembly comparison for jsii", "license": "Apache-2.0", "author": { @@ -32,9 +32,9 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^1.1.0", + "@jsii/spec": "^0.0.0", "fs-extra": "^9.0.0", - "jsii-reflect": "^1.1.0", + "jsii-reflect": "^0.0.0", "log4js": "^6.1.2", "typescript": "~3.8.3", "yargs": "^15.3.1" @@ -49,8 +49,8 @@ "eslint": "^6.8.0", "jest": "^25.1.0", "jest-expect-message": "^1.0.2", - "jsii": "^1.1.0", - "jsii-build-tools": "^1.1.0" + "jsii": "^0.0.0", + "jsii-build-tools": "^0.0.0" }, "jest": { "collectCoverage": true, diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 0fb2aee354..668c26e546 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -1,6 +1,6 @@ { "name": "jsii-pacmak", - "version": "1.1.0", + "version": "0.0.0", "description": "A code generation framework for jsii backend languages", "license": "Apache-2.0", "author": { @@ -34,25 +34,25 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^1.1.0", + "@jsii/spec": "^0.0.0", "camelcase": "^5.1.3", "clone": "^2.1.2", - "codemaker": "^1.1.0", + "codemaker": "^0.0.0", "commonmark": "^0.29.1", "escape-string-regexp": "^2.0.0", "fs-extra": "^9.0.0", - "jsii-reflect": "^1.1.0", - "jsii-rosetta": "^1.1.0", + "jsii-reflect": "^0.0.0", + "jsii-rosetta": "^0.0.0", "semver": "^7.1.3", "spdx-license-list": "^6.1.0", "xmlbuilder": "^15.1.0", "yargs": "^15.3.1" }, "devDependencies": { - "@jsii/dotnet-jsonmodel": "^1.1.0", - "@jsii/dotnet-runtime": "^1.1.0", - "@jsii/java-runtime": "^1.1.0", - "@scope/jsii-calc-lib": "^1.1.0", + "@jsii/dotnet-jsonmodel": "^0.0.0", + "@jsii/dotnet-runtime": "^0.0.0", + "@jsii/java-runtime": "^0.0.0", + "@scope/jsii-calc-lib": "^0.0.0", "@types/clone": "^0.1.30", "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.1.0", @@ -63,8 +63,8 @@ "@types/yargs": "^15.0.4", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii-build-tools": "^1.1.0", - "jsii-calc": "^1.1.0", + "jsii-build-tools": "^0.0.0", + "jsii-calc": "^0.0.0", "mock-fs": "^4.11.0", "typescript": "~3.8.3" }, diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii index 206f83077b..37b7c81aa4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii @@ -9,7 +9,7 @@ }, "description": "An example transitive dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "1.1.0", + "jsiiVersion": "0.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-base-of-base", "repository": { @@ -110,6 +110,6 @@ ] } }, - "version": "1.1.0", - "fingerprint": "HsGV6vtb/X5t73ySr/Qp8fPhnueSKPxy5SPqxnoe558=" + "version": "0.0.0", + "fingerprint": "v3mwSbKGQ2aa8g0DEKIeaEXh3csX7PX2MJJxHVRufhI=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj index 279409af15..2e640a2830 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj @@ -4,7 +4,7 @@ An example transitive dependency for jsii-calc. Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId Apache-2.0 - 1.1.0 + 0.0.0 Amazon Web Services Amazon Web Services @@ -22,10 +22,10 @@ netcoreapp3.1 - + - + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs index 1b03cde32e..69937feb8a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-base-of-base", "1.1.0", "scope-jsii-calc-base-of-base-1.1.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-base-of-base", "0.0.0", "scope-jsii-calc-base-of-base-0.0.0.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-1.1.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.0.0.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-1.1.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.0.0.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml index f3074f4c3e..dc93f31b5f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-base-of-base - 1.1.0 + 0.0.0 jar UTF-8 @@ -36,7 +36,7 @@ software.amazon.jsii jsii-runtime - [1.1.0,2.0.0) + [0.0.0,0.0.1) org.jetbrains diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java index de345fc45b..162973da54 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java @@ -4,7 +4,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-base-of-base", "1.1.0", $Module.class, "jsii-calc-base-of-base@1.1.0.jsii.tgz"); + super("@scope/jsii-calc-base-of-base", "0.0.0", $Module.class, "jsii-calc-base-of-base@0.0.0.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py index f261f61346..620e92abb9 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-base-of-base", - "version": "1.1.0", + "version": "0.0.0", "description": "An example transitive dependency for jsii-calc.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_base_of_base._jsii": [ - "jsii-calc-base-of-base@1.1.0.jsii.tgz" + "jsii-calc-base-of-base@0.0.0.jsii.tgz" ], "scope.jsii_calc_base_of_base": [ "py.typed" @@ -30,7 +30,7 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=1.1.0", + "jsii~=0.0.0", "publication>=0.0.3" ], "classifiers": [ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py index fd9d308181..fe124745a2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py @@ -8,7 +8,7 @@ import jsii.compat import publication -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base-of-base", "1.1.0", "scope.jsii_calc_base_of_base", "jsii-calc-base-of-base@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base-of-base", "0.0.0", "scope.jsii_calc_base_of_base", "jsii-calc-base-of-base@0.0.0.jsii.tgz") @jsii.interface(jsii_type="@scope/jsii-calc-base-of-base.IVeryBaseInterface") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii index 18ec5268a2..37b4544eec 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^1.1.0" + "@scope/jsii-calc-base-of-base": "^0.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base-of-base": { @@ -36,7 +36,7 @@ }, "description": "An example direct dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "1.1.0", + "jsiiVersion": "0.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-base", "repository": { @@ -150,6 +150,6 @@ "name": "IBaseInterface" } }, - "version": "1.1.0", - "fingerprint": "piaiqNxSj1XkycnXHPRG4697t6DpKGgkya6effAlXKI=" + "version": "0.0.0", + "fingerprint": "ttHhQ5EzgjW0lybCNSKOfqilJ04kp4VK3arcpRl3rBM=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj index 0781c73eda..6df81f8e66 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj @@ -4,7 +4,7 @@ An example direct dependency for jsii-calc. Amazon.JSII.Tests.CalculatorPackageId.BasePackageId Apache-2.0 - 1.1.0 + 0.0.0 Amazon Web Services Amazon Web Services @@ -22,11 +22,11 @@ netcoreapp3.1 - + - - + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs index 170a99e586..b1214dabf5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-base", "1.1.0", "scope-jsii-calc-base-1.1.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-base", "0.0.0", "scope-jsii-calc-base-0.0.0.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-1.1.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.0.0.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-1.1.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.0.0.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml index 1ae76b9187..bfad9315a2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-base - 1.1.0 + 0.0.0 jar UTF-8 @@ -36,12 +36,12 @@ software.amazon.jsii.tests calculator-base-of-base - [1.1.0,2.0.0) + [0.0.0,0.0.1) software.amazon.jsii jsii-runtime - [1.1.0,2.0.0) + [0.0.0,0.0.1) org.jetbrains diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java index be0c238d54..0cb4a51478 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-base", "1.1.0", $Module.class, "jsii-calc-base@1.1.0.jsii.tgz"); + super("@scope/jsii-calc-base", "0.0.0", $Module.class, "jsii-calc-base@0.0.0.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py index c0ec209dd4..4eee448c4c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-base", - "version": "1.1.0", + "version": "0.0.0", "description": "An example direct dependency for jsii-calc.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_base._jsii": [ - "jsii-calc-base@1.1.0.jsii.tgz" + "jsii-calc-base@0.0.0.jsii.tgz" ], "scope.jsii_calc_base": [ "py.typed" @@ -30,9 +30,9 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=1.1.0", + "jsii~=0.0.0", "publication>=0.0.3", - "scope.jsii-calc-base-of-base>=1.1.0, <2.0.0" + "scope.jsii-calc-base-of-base>=0.0.0, <0.0.1" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py index 6338fc2be9..a77738bf34 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py @@ -10,7 +10,7 @@ import scope.jsii_calc_base_of_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "1.1.0", "scope.jsii_calc_base", "jsii-calc-base@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "0.0.0", "scope.jsii_calc_base", "jsii-calc-base@0.0.0.jsii.tgz") class Base(metaclass=jsii.JSIIAbstractClass, jsii_type="@scope/jsii-calc-base.Base"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii index 29813549a0..416b0256e1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii @@ -8,8 +8,8 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-base-of-base": "^1.1.0" + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-base-of-base": "^0.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -63,7 +63,7 @@ "stability": "deprecated" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "1.1.0", + "jsiiVersion": "0.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-lib", "repository": { @@ -516,6 +516,6 @@ ] } }, - "version": "1.1.0", - "fingerprint": "ewx+U4o9Eq6THqw75uddLD5Yhaciw+s/tLVVeGeMKTg=" + "version": "0.0.0", + "fingerprint": "7VgHmQKZ2ceAa99bmuocZRLFxQths+Sf35amRt1SZpE=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj index 2f36f09451..ab48cbd8c8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj @@ -4,7 +4,7 @@ A simple calcuator library built on JSII. (Stability: Deprecated) Amazon.JSII.Tests.CalculatorPackageId.LibPackageId Apache-2.0 - 1.1.0-devpreview + 0.0.0-devpreview Amazon Web Services Amazon Web Services @@ -22,12 +22,12 @@ netcoreapp3.1 - + - - - + + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs index 912447745d..6fc0181843 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-lib", "1.1.0", "scope-jsii-calc-lib-1.1.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-lib", "0.0.0", "scope-jsii-calc-lib-0.0.0.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-1.1.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.0.0.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-1.1.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.0.0.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml index 90de034dc6..9affcca2d3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-lib - 1.1.0.DEVPREVIEW + 0.0.0.DEVPREVIEW jar UTF-8 @@ -36,17 +36,17 @@ software.amazon.jsii.tests calculator-base - [1.1.0,2.0.0) + [0.0.0,0.0.1) software.amazon.jsii.tests calculator-base-of-base - [1.1.0,2.0.0) + [0.0.0,0.0.1) software.amazon.jsii jsii-runtime - [1.1.0,2.0.0) + [0.0.0,0.0.1) org.jetbrains diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java index 6af183504a..66bf5d7d0d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-lib", "1.1.0", $Module.class, "jsii-calc-lib@1.1.0.jsii.tgz"); + super("@scope/jsii-calc-lib", "0.0.0", $Module.class, "jsii-calc-lib@0.0.0.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py index a38b038a2b..f18a4bf443 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-lib", - "version": "1.1.0", + "version": "0.0.0", "description": "A simple calcuator library built on JSII.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_lib._jsii": [ - "jsii-calc-lib@1.1.0.jsii.tgz" + "jsii-calc-lib@0.0.0.jsii.tgz" ], "scope.jsii_calc_lib": [ "py.typed" @@ -30,10 +30,10 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=1.1.0", + "jsii~=0.0.0", "publication>=0.0.3", - "scope.jsii-calc-base>=1.1.0, <2.0.0", - "scope.jsii-calc-base-of-base>=1.1.0, <2.0.0" + "scope.jsii-calc-base>=0.0.0, <0.0.1", + "scope.jsii-calc-base-of-base>=0.0.0, <0.0.1" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py index d8214aac9a..ce6a6b6cc7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py @@ -11,7 +11,7 @@ import scope.jsii_calc_base import scope.jsii_calc_base_of_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "1.1.0", "scope.jsii_calc_lib", "jsii-calc-lib@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "0.0.0", "scope.jsii_calc_lib", "jsii-calc-lib@0.0.0.jsii.tgz") @jsii.enum(jsii_type="@scope/jsii-calc-lib.EnumFromScopedModule") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii index 0db4ab2889..aa35411a8a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii @@ -34,9 +34,9 @@ } ], "dependencies": { - "@scope/jsii-calc-base": "^1.1.0", - "@scope/jsii-calc-base-of-base": "^1.1.0", - "@scope/jsii-calc-lib": "^1.1.0" + "@scope/jsii-calc-base": "^0.0.0", + "@scope/jsii-calc-base-of-base": "^0.0.0", + "@scope/jsii-calc-lib": "^0.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -113,7 +113,7 @@ "stability": "experimental" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "1.1.0", + "jsiiVersion": "0.0.0", "keywords": [ "aws", "jsii", @@ -12404,6 +12404,6 @@ ] } }, - "version": "1.1.0", - "fingerprint": "vtobmk8xL6Ke30Blb4NyDZ1X7T7J8lcKbbrmZtMtcpU=" + "version": "0.0.0", + "fingerprint": "SEfqfgRvf7Rdw2KRLONITu2b2JruUQ85Ur47eTy1KnA=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj index 9aff354c95..525025ccb2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj @@ -5,7 +5,7 @@ https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png Amazon.JSII.Tests.CalculatorPackageId Apache-2.0 - 1.1.0 + 0.0.0 Amazon Web Services Amazon Web Services @@ -24,13 +24,13 @@ netcoreapp3.1 - + - - - - + + + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs index 55501c8f11..f1f382a288 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("jsii-calc", "1.1.0", "jsii-calc-1.1.0.tgz")] +[assembly: JsiiAssembly("jsii-calc", "0.0.0", "jsii-calc-0.0.0.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-1.1.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.0.0.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-1.1.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.0.0.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml index c4cb1f67eb..027d425e2c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml @@ -48,7 +48,7 @@ software.amazon.jsii.tests calculator - 1.1.0 + 0.0.0 jar UTF-8 @@ -57,22 +57,22 @@ software.amazon.jsii.tests calculator-base - [1.1.0,2.0.0) + [0.0.0,0.0.1) software.amazon.jsii.tests calculator-base-of-base - [1.1.0,2.0.0) + [0.0.0,0.0.1) software.amazon.jsii.tests calculator-lib - [1.1.0.DEVPREVIEW,2.0.0.DEVPREVIEW) + [0.0.0.DEVPREVIEW,0.0.1.DEVPREVIEW) software.amazon.jsii jsii-runtime - [1.1.0,2.0.0) + [0.0.0,0.0.1) org.jetbrains diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java index 3c583fc74c..87715c7f08 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("jsii-calc", "1.1.0", $Module.class, "jsii-calc@1.1.0.jsii.tgz"); + super("jsii-calc", "0.0.0", $Module.class, "jsii-calc@0.0.0.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py index 8ec5e190db..32c75ca7ac 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "jsii-calc", - "version": "1.1.0", + "version": "0.0.0", "description": "A simple calcuator built on JSII.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -31,7 +31,7 @@ ], "package_data": { "jsii_calc._jsii": [ - "jsii-calc@1.1.0.jsii.tgz" + "jsii-calc@0.0.0.jsii.tgz" ], "jsii_calc": [ "py.typed" @@ -39,11 +39,11 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=1.1.0", + "jsii~=0.0.0", "publication>=0.0.3", - "scope.jsii-calc-base>=1.1.0, <2.0.0", - "scope.jsii-calc-base-of-base>=1.1.0, <2.0.0", - "scope.jsii-calc-lib>=1.1.0, <2.0.0" + "scope.jsii-calc-base>=0.0.0, <0.0.1", + "scope.jsii-calc-base-of-base>=0.0.0, <0.0.1", + "scope.jsii-calc-lib>=0.0.0, <0.0.1" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py index fff94152a9..8c40bc3512 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py @@ -42,7 +42,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") class AbstractClassBase(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.AbstractClassBase"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@1.1.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@1.1.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/composition/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/composition/__init__.py index c55d2a0f43..b7a64123b5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/composition/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/composition/__init__.py @@ -12,7 +12,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") class CompositeOperation(scope.jsii_calc_lib.Operation, metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.composition.CompositeOperation"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/derived_class_has_no_properties/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/derived_class_has_no_properties/__init__.py index add1f8fbb4..e609c623c1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/derived_class_has_no_properties/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/derived_class_has_no_properties/__init__.py @@ -12,7 +12,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") class Base(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.DerivedClassHasNoProperties.Base"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_includes_classes/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_includes_classes/__init__.py index 7569b9fd1f..ceb15d672b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_includes_classes/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_includes_classes/__init__.py @@ -12,7 +12,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") class Foo(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.InterfaceInNamespaceIncludesClasses.Foo"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_only_interface/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_only_interface/__init__.py index 9ad121c642..d36afe84bb 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_only_interface/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/interface_in_namespace_only_interface/__init__.py @@ -12,7 +12,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") @jsii.data_type(jsii_type="jsii-calc.InterfaceInNamespaceOnlyInterface.Hello", jsii_struct_bases=[], name_mapping={'foo': 'foo'}) diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py index 6f220a897d..b700d11d7c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py @@ -14,7 +14,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") @jsii.implements(nested_submodule.deeplyNested.INamespaced) diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/back_references/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/back_references/__init__.py index 7d061d3c1b..6f25586aba 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/back_references/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/back_references/__init__.py @@ -12,7 +12,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") @jsii.data_type(jsii_type="jsii-calc.submodule.back_references.MyClassReference", jsii_struct_bases=[], name_mapping={'reference': 'reference'}) diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py index e322ab6c71..64110d918d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py @@ -12,7 +12,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") @jsii.enum(jsii_type="jsii-calc.submodule.child.Goodness") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/__init__.py index 1381d80e61..bb70fedc8e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/__init__.py @@ -13,7 +13,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") @jsii.implements(deeplyNested.INamespaced) diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/deeply_nested/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/deeply_nested/__init__.py index 147de6591a..93f8d24fcb 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/deeply_nested/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/nested_submodule/deeply_nested/__init__.py @@ -12,7 +12,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.1.0", "jsii_calc", "jsii-calc@1.1.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") @jsii.interface(jsii_type="jsii-calc.submodule.nested_submodule.deeplyNested.INamespaced") diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 8a50e80be8..346801a21f 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -1,6 +1,6 @@ { "name": "jsii-reflect", - "version": "1.1.0", + "version": "0.0.0", "description": "strongly-typed reflection library and tools for jsii", "license": "Apache-2.0", "author": { @@ -33,23 +33,23 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^1.1.0", + "@jsii/spec": "^0.0.0", "colors": "^1.4.0", "fs-extra": "^9.0.0", - "oo-ascii-tree": "^1.1.0", + "oo-ascii-tree": "^0.0.0", "yargs": "^15.3.1" }, "devDependencies": { - "@scope/jsii-calc-lib": "^1.1.0", + "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", "@types/node": "^10.17.17", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii": "^1.1.0", - "jsii-build-tools": "^1.1.0", - "jsii-calc": "^1.1.0", + "jsii": "^0.0.0", + "jsii-build-tools": "^0.0.0", + "jsii-calc": "^0.0.0", "typescript": "~3.8.3" }, "jest": { diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 16fc689fac..e363acc7b6 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -1,6 +1,6 @@ { "name": "jsii-rosetta", - "version": "1.1.0", + "version": "0.0.0", "description": "Translate TypeScript code snippets to other languages", "main": "lib/index.js", "bin": { @@ -23,14 +23,14 @@ "@types/yargs": "^15.0.4", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii": "^1.1.0", - "jsii-build-tools": "^1.1.0", + "jsii": "^0.0.0", + "jsii-build-tools": "^0.0.0", "memory-streams": "^0.1.3", "mock-fs": "^4.11.0", "typescript": "~3.8.3" }, "dependencies": { - "@jsii/spec": "^1.1.0", + "@jsii/spec": "^0.0.0", "commonmark": "^0.29.1", "fs-extra": "^9.0.0", "typescript": "~3.8.3", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 187b1321d3..aa124b77a2 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -1,6 +1,6 @@ { "name": "jsii", - "version": "1.1.0", + "version": "0.0.0", "description": "TypeScript compiler for jsii", "license": "Apache-2.0", "author": { @@ -33,7 +33,7 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^1.1.0", + "@jsii/spec": "^0.0.0", "case": "^1.6.3", "colors": "^1.4.0", "deep-equal": "^2.0.1", @@ -59,7 +59,7 @@ "eslint": "^6.8.0", "jest": "^25.1.0", "jest-expect-message": "^1.0.2", - "jsii-build-tools": "^1.1.0" + "jsii-build-tools": "^0.0.0" }, "jest": { "collectCoverage": true, diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index bba59b831b..9b1765eb69 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -1,6 +1,6 @@ { "name": "oo-ascii-tree", - "version": "1.1.0", + "version": "0.0.0", "description": "object-oriented ascii tree renderer", "license": "Apache-2.0", "author": { @@ -34,7 +34,7 @@ "@types/node": "^10.17.17", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii-build-tools": "^1.1.0", + "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3" }, "jest": { diff --git a/scripts/align-version.js b/scripts/align-version.js new file mode 100755 index 0000000000..f5b5cdf2ee --- /dev/null +++ b/scripts/align-version.js @@ -0,0 +1,38 @@ +#!/usr/bin/env node +// +// align the version in a package.json file to the version of the repo +// +const fs = require('fs'); + +const marker = require('./get-version-marker'); +const repoVersion = require('./get-version'); + +for (const file of process.argv.splice(2)) { + const pkg = JSON.parse(fs.readFileSync(file).toString()); + + // Ignore fixture packages + if (pkg.name === '@fixtures/jsii-calc-bundled') { + continue; + } + + if (pkg.version !== marker) { + throw new Error(`unexpected - all package.json files in this repo should have a version of ${marker}: ${file}`); + } + + pkg.version = repoVersion; + + processSection(pkg.dependencies || { }, file); + processSection(pkg.devDependencies || { }, file); + processSection(pkg.peerDependencies || { }, file); + + console.error(`${file} => ${repoVersion}`); + fs.writeFileSync(file, JSON.stringify(pkg, undefined, 2)); +} + +function processSection(section, file) { + for (const [ name, version ] of Object.entries(section)) { + if (version === marker || version === '^' + marker) { + section[name] = version.replace(marker, repoVersion); + } + } +} diff --git a/scripts/align-version.sh b/scripts/align-version.sh new file mode 100755 index 0000000000..e4a4cc6f62 --- /dev/null +++ b/scripts/align-version.sh @@ -0,0 +1,20 @@ +#!/bin/bash +#------------------------------------------------------------------------ +# updates all package.json files to the version defined in lerna.json +# this is called when building inside our ci/cd system +#------------------------------------------------------------------------ +set -euo pipefail +scriptdir=$(cd $(dirname $0) && pwd) + +# go to repo root +cd ${scriptdir}/.. + +files="$(find . -name package.json | grep -v node_modules | xargs)" +${scriptdir}/align-version.js ${files} + +# validation +marker=$(node -p "require('./scripts/get-version-marker')") +if find . -name package.json | grep -v node_modules | xargs grep "[^0-9]${marker}"; then + echo "ERROR: unexpected version marker ${marker} in a package.json file" + exit 1 +fi diff --git a/scripts/bump.sh b/scripts/bump.sh index e80e23b4a2..4e27012be1 100755 --- a/scripts/bump.sh +++ b/scripts/bump.sh @@ -1,29 +1,23 @@ #!/bin/bash -scriptdir="$(cd $(dirname $0) && pwd)" +# -------------------------------------------------------------------------------------------------- +# +# This script is intended to be used to bump the version of the CDK modules, update package.json, +# package-lock.json, and create a commit. +# +# to start a version bump, run: +# bump.sh +# +# If a version is not provided, the 'minor' version will be bumped. +# The version can be an explicit version _or_ one of: +# 'major', 'minor', 'patch', 'premajor', 'preminor', 'prepatch', or 'prerelease'. +# +# -------------------------------------------------------------------------------------------------- set -euo pipefail +version=${1:-minor} -# the reason we require a manual version is because we lerna doesn't respect pre 1.0 -# version bumps, so any minor change will cause the "Y" component (in X.Y.Z) to be bumped -# and in pre-1.0 this is considered a major version bump. -ver=${1:-} -if [ -z "${ver}" ]; then - echo "usage: ./bump.sh " - exit 1 -fi +echo "Starting ${version} version bump" -git clean -fqdx - -yarn install - -node_modules/.bin/lerna publish --force-publish=* --skip-npm --skip-git --conventional-commits --repo-version ${ver} - -# update all "peerDependencies" sections in package.json files -# to match their corresponding "dependencies" version requirement -find . -name package.json | grep -v node_modules | xargs node scripts/sync-peer-deps.js - -# rebuild everything -yarn build - -# update test expectations -yarn test:update +# /bin/bash ./install.sh +# Generate CHANGELOG and create a commit (see .versionrc.json) +npx standard-version --release-as ${version} diff --git a/scripts/get-version-marker.js b/scripts/get-version-marker.js new file mode 100644 index 0000000000..e5f8c49806 --- /dev/null +++ b/scripts/get-version-marker.js @@ -0,0 +1,13 @@ +/** + * Returns the version marker used to indicate this is a local dependency. + * + * Usage: + * + * const version = require('./get-version-marker'); + * + * Or from the command line: + * + * node -p require('./get-version-marker') + * + */ +module.exports = '0.0.0'; diff --git a/scripts/get-version.js b/scripts/get-version.js new file mode 100644 index 0000000000..9e6972582c --- /dev/null +++ b/scripts/get-version.js @@ -0,0 +1,18 @@ +/** + * Returns the current repo version. + * + * Usage: + * + * const version = require('./get-version'); + * + * Or from the command line: + * + * node -p require('./get-version') + * + */ +const versionFile = require('../.versionrc.json').packageFiles[0].filename; +if (!versionFile) { + throw new Error(`unable to determine version filename from .versionrc.json at the root of the repo`); +} + +module.exports = require(`../${versionFile}`).version; diff --git a/tools/jsii-build-tools/package.json b/tools/jsii-build-tools/package.json index 5049d04a3b..95efb25f83 100644 --- a/tools/jsii-build-tools/package.json +++ b/tools/jsii-build-tools/package.json @@ -1,6 +1,6 @@ { "name": "jsii-build-tools", - "version": "1.1.0", + "version": "0.0.0", "private": true, "description": "Internal repository-level tools", "license": "Apache-2.0", diff --git a/yarn.lock b/yarn.lock index 8b5667a227..949d059d16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1849,6 +1849,11 @@ acorn@^7.1.0, acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== +add-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa" + integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo= + agent-base@4, agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -2820,7 +2825,7 @@ contains-path@^0.1.0: resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= -conventional-changelog-angular@^5.0.3: +conventional-changelog-angular@^5.0.3, conventional-changelog-angular@^5.0.6: version "5.0.6" resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz#269540c624553aded809c29a3508fdc2b544c059" integrity sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA== @@ -2828,6 +2833,34 @@ conventional-changelog-angular@^5.0.3: compare-func "^1.3.1" q "^1.5.1" +conventional-changelog-atom@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-2.0.3.tgz#3bd14280aa09fe3ec49a0e8fe97b5002db02aad4" + integrity sha512-szZe2ut97qNO6vCCMkm1I/tWu6ol4Rr8a9Lx0y/VlpDnpY0PNp+oGpFgU55lplhx+I3Lro9Iv4/gRj0knfgjzg== + dependencies: + q "^1.5.1" + +conventional-changelog-codemirror@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.3.tgz#ebc088154684f8f5171446b8d546ba6b460d46f2" + integrity sha512-t2afackdgFV2yBdHhWPqrKbpaQeVnz2hSJKdWqjasPo5EpIB6TBL0er3cOP1mnGQmuzk9JSvimNSuqjWGDtU5Q== + dependencies: + q "^1.5.1" + +conventional-changelog-config-spec@2.1.0: + version "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.2.3, conventional-changelog-conventionalcommits@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.2.3.tgz#22855b32d57d0328951c1c2dc01b172a5f24ea37" + integrity sha512-atGa+R4vvEhb8N/8v3IoW59gCBJeeFiX6uIbPu876ENAmkMwsenyn0R21kdDHJFLQdy6zW4J6b4xN8KI3b9oww== + dependencies: + compare-func "^1.3.1" + lodash "^4.17.15" + q "^1.5.1" + conventional-changelog-core@^3.1.6: version "3.2.3" resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.3.tgz#b31410856f431c847086a7dcb4d2ca184a7d88fb" @@ -2847,12 +2880,68 @@ conventional-changelog-core@^3.1.6: read-pkg-up "^3.0.0" through2 "^3.0.0" -conventional-changelog-preset-loader@^2.1.1: +conventional-changelog-core@^4.1.1: + version "4.1.4" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.1.4.tgz#39be27fca6ef20a0f998d7a3a1e97cfa8a055cb6" + integrity sha512-LO58ZbEpp1Ul+y/vOI8rJRsWkovsYkCFbOCVgi6UnVfU8WC0F8K8VQQwaBZWWUpb6JvEiN4GBR5baRP2txZ+Vg== + dependencies: + add-stream "^1.0.0" + conventional-changelog-writer "^4.0.11" + conventional-commits-parser "^3.0.8" + dateformat "^3.0.0" + get-pkg-repo "^1.0.0" + git-raw-commits "2.0.0" + git-remote-origin-url "^2.0.0" + git-semver-tags "^3.0.1" + lodash "^4.17.15" + normalize-package-data "^2.3.5" + q "^1.5.1" + read-pkg "^3.0.0" + read-pkg-up "^3.0.0" + through2 "^3.0.0" + +conventional-changelog-ember@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-2.0.4.tgz#c29b78e4af7825cbecb6c3fd6086ca5c09471ac1" + integrity sha512-q1u73sO9uCnxN4TSw8xu6MRU8Y1h9kpwtcdJuNRwu/LSKI1IE/iuNSH5eQ6aLlQ3HTyrIpTfUuVybW4W0F17rA== + dependencies: + q "^1.5.1" + +conventional-changelog-eslint@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.4.tgz#8f4736a23e0cd97e890e76fccc287db2f205f2ff" + integrity sha512-CPwTUENzhLGl3auunrJxiIEWncAGaby7gOFCdj2gslIuOFJ0KPJVOUhRz4Da/I53sdo/7UncUJkiLg94jEsjxg== + dependencies: + q "^1.5.1" + +conventional-changelog-express@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-2.0.1.tgz#fea2231d99a5381b4e6badb0c1c40a41fcacb755" + integrity sha512-G6uCuCaQhLxdb4eEfAIHpcfcJ2+ao3hJkbLrw/jSK/eROeNfnxCJasaWdDAfFkxsbpzvQT4W01iSynU3OoPLIw== + dependencies: + q "^1.5.1" + +conventional-changelog-jquery@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.6.tgz#460236ad8fb1d29ff932a14fe4e3a45379b63c5e" + integrity sha512-gHAABCXUNA/HjnZEm+vxAfFPJkgtrZvCDIlCKfdPVXtCIo/Q0lN5VKpx8aR5p8KdVRQFF3OuTlvv5kv6iPuRqA== + dependencies: + q "^1.5.1" + +conventional-changelog-jshint@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.3.tgz#ef6e2caf2ee6ffdfda78fcdf7ce87cf6c512d728" + integrity sha512-Pc2PnMPcez634ckzr4EOWviwRSpZcURaK7bjyD9oK6N5fsC/a+3G7LW5m/JpcHPhA9ZxsfIbm7uqZ3ZDGsQ/sw== + dependencies: + compare-func "^1.3.1" + q "^1.5.1" + +conventional-changelog-preset-loader@^2.1.1, conventional-changelog-preset-loader@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.0.tgz#580fa8ab02cef22c24294d25e52d7ccd247a9a6a" integrity sha512-/rHb32J2EJnEXeK4NpDgMaAVTFZS3o1ExmjKMtYVgIC4MQn0vkNSbYpdGRotkfGGRWiqk3Ri3FBkiZGbAfIfOQ== -conventional-changelog-writer@^4.0.6: +conventional-changelog-writer@^4.0.11, conventional-changelog-writer@^4.0.6: version "4.0.11" resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz#9f56d2122d20c96eb48baae0bf1deffaed1edba4" integrity sha512-g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw== @@ -2868,6 +2957,23 @@ conventional-changelog-writer@^4.0.6: split "^1.0.0" through2 "^3.0.0" +conventional-changelog@3.1.15: + version "3.1.15" + resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.15.tgz#103d0b550436cf83e8a59ba88be82ece2613cd9f" + integrity sha512-CoWM+Z9bYyF00QzNpTnxkCLiuLAeRocJz3C/foFjvhsdltdtkJgMChp7GytQNjm4pT7JFBVJTpqLHTpxNtOzaA== + dependencies: + conventional-changelog-angular "^5.0.6" + conventional-changelog-atom "^2.0.3" + conventional-changelog-codemirror "^2.0.3" + conventional-changelog-conventionalcommits "^4.2.3" + conventional-changelog-core "^4.1.1" + conventional-changelog-ember "^2.0.4" + conventional-changelog-eslint "^3.0.4" + conventional-changelog-express "^2.0.1" + conventional-changelog-jquery "^3.0.6" + conventional-changelog-jshint "^2.0.3" + conventional-changelog-preset-loader "^2.3.0" + conventional-commits-filter@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1" @@ -2876,7 +2982,7 @@ conventional-commits-filter@^2.0.2: lodash.ismatch "^4.4.0" modify-values "^1.0.0" -conventional-commits-parser@^3.0.3: +conventional-commits-parser@^3.0.3, conventional-commits-parser@^3.0.8: version "3.0.8" resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz#23310a9bda6c93c874224375e72b09fb275fe710" integrity sha512-YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ== @@ -2889,6 +2995,20 @@ conventional-commits-parser@^3.0.3: through2 "^3.0.0" trim-off-newlines "^1.0.0" +conventional-recommended-bump@6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.0.5.tgz#be7ec24b43bef57108042ea1d49758b58beabc03" + integrity sha512-srkferrB4kACPEbKYltZwX1CQZAEqbQkabKN444mavLRVMetzwJFJf23/+pwvtMsWbd+cc4HaleV1nHke0f8Rw== + dependencies: + concat-stream "^2.0.0" + conventional-changelog-preset-loader "^2.3.0" + conventional-commits-filter "^2.0.2" + conventional-commits-parser "^3.0.8" + git-raw-commits "2.0.0" + git-semver-tags "^3.0.1" + meow "^5.0.0" + q "^1.5.1" + conventional-recommended-bump@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-5.0.1.tgz#5af63903947b6e089e77767601cb592cabb106ba" @@ -3091,7 +3211,7 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.1.0, debug@^3.2.6: +debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -3151,11 +3271,6 @@ deep-equal@^2.0.1: which-boxed-primitive "^1.0.1" which-collection "^1.0.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -3230,26 +3345,26 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-indent@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd" + integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA== + detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= +detect-newline@3.1.0, detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-newline@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2" integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I= -detect-newline@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" - integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== - dezalgo@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" @@ -3325,6 +3440,14 @@ dotenv@*, dotenv@^8.2.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== +dotgitignore@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-2.1.0.tgz#a4b15a4e4ef3cf383598aaf1dfa4a04bcc089b7b" + integrity sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA== + dependencies: + find-up "^3.0.0" + minimatch "^3.0.4" + duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -3867,6 +3990,13 @@ figgy-pudding@^3.4.1, figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== +figures@3.1.0, figures@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec" + integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg== + dependencies: + escape-string-regexp "^1.0.5" + figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" @@ -3874,13 +4004,6 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -3919,6 +4042,14 @@ find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" +find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -3941,14 +4072,6 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find-up@^4.0.0, find-up@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - findup-sync@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" @@ -4015,6 +4138,13 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" +fs-access@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a" + integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o= + dependencies: + null-check "^1.0.0" + fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -4070,7 +4200,6 @@ fsevents@^1.2.7: dependencies: bindings "^1.5.0" nan "^2.12.1" - node-pre-gyp "*" fsevents@^2.1.2: version "2.1.2" @@ -4182,6 +4311,14 @@ git-remote-origin-url@^2.0.0: gitconfiglocal "^1.0.0" pify "^2.3.0" +git-semver-tags@3.0.1, git-semver-tags@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-3.0.1.tgz#9cb9e4974437de1f71f32da3bfe74f4d35afb1b9" + integrity sha512-Hzd1MOHXouITfCasrpVJbRDg9uvW7LfABk3GQmXYZByerBDrfrEMP9HXpNT7RxAbieiocP6u+xq20DkvjwxnCA== + dependencies: + meow "^5.0.0" + semver "^6.0.0" + git-semver-tags@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.3.tgz#48988a718acf593800f99622a952a77c405bfa34" @@ -4504,7 +4641,7 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -4610,7 +4747,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4, ini@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -6362,15 +6499,6 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.2.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" - integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" @@ -6462,22 +6590,6 @@ node-notifier@^6.0.0: shellwords "^0.1.1" which "^1.3.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - nopt@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" @@ -6549,7 +6661,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.6, npm-packlist@^1.4.4: +npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -6581,7 +6693,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -npmlog@^4.0.2, npmlog@^4.1.2: +npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -6591,6 +6703,11 @@ npmlog@^4.0.2, npmlog@^4.1.2: gauge "~2.7.3" set-blocking "~2.0.0" +null-check@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd" + integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0= + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -7288,16 +7405,6 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - react-is@^16.12.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -7660,7 +7767,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7745,11 +7852,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - saxes@^3.1.9: version "3.1.11" resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" @@ -7773,12 +7875,12 @@ semver-intersect@^1.4.0: dependencies: semver "^5.0.0" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@6.3.0, semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -8102,6 +8204,27 @@ stack-utils@^1.0.1: resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA== +standard-version@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-7.1.0.tgz#021dd79eac749548677c876d5a94791df50f1f36" + integrity sha512-bHY2E/1tYGeVl+0XSXFivb+54h2fA4pWJocXAd6FGbtSFUvGsnfmMbIXYDxrYErpq7oEqoKreV8xTAp78WoATA== + dependencies: + chalk "2.4.2" + conventional-changelog "3.1.15" + conventional-changelog-config-spec "2.1.0" + conventional-changelog-conventionalcommits "4.2.3" + conventional-recommended-bump "6.0.5" + detect-indent "6.0.0" + detect-newline "3.1.0" + dotgitignore "2.1.0" + figures "3.1.0" + find-up "4.1.0" + fs-access "1.0.1" + git-semver-tags "3.0.1" + semver "6.3.0" + stringify-package "1.0.1" + yargs "15.0.2" + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -8239,6 +8362,11 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +stringify-package@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85" + integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -8311,11 +8439,6 @@ strip-json-comments@^3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -8374,7 +8497,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -9273,6 +9396,14 @@ yargs-parser@^15.0.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-16.1.0.tgz#73747d53ae187e7b8dbe333f95714c76ea00ecf1" + integrity sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^18.1.1: version "18.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1" @@ -9298,6 +9429,23 @@ yargs@13.2.4: y18n "^4.0.0" yargs-parser "^13.1.0" +yargs@15.0.2: + version "15.0.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.0.2.tgz#4248bf218ef050385c4f7e14ebdf425653d13bd3" + integrity sha512-GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^16.1.0" + yargs@^14.0.0, yargs@^14.2.2: version "14.2.3" resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414" From 39425a4caabcfe3d199f0dc04ee507b57905071d Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Fri, 27 Mar 2020 10:57:28 +0100 Subject: [PATCH 57/74] fix(jsii): single-valued enums are not processed correctly (#1406) TypeScript represents enums similar to union types, and single-valued enums are "simplified" to the sole member (the TypeChecker fiercely refuses to give a handle to the actual `enum` type). This resulted in `jsii` incorrectly tagging the type at usage sites. This commit adds the necessary infrastructure to detect single-valued enums and tweak the FQN generation to obtain the correct result. A new test was added to validate this whole endeavor works correctly even when the single-valued enum is within a submodule (which adds even more complexity to the mix). References: aws/aws-cdk#6712 aws/aws-cdk#6948 --- .../jsii-calc/lib/submodule/child/index.ts | 6 +++ packages/jsii-calc/lib/submodule/my-class.ts | 3 +- packages/jsii-calc/test/assembly.jsii | 41 ++++++++++++++++- .../.jsii | 41 ++++++++++++++++- .../Submodule/Child/Awesomeness.cs | 21 +++++++++ .../CalculatorNamespace/Submodule/MyClass.cs | 9 ++++ .../amazon/jsii/tests/calculator/$Module.java | 1 + .../tests/calculator/submodule/MyClass.java | 8 ++++ .../submodule/child/Awesomeness.java | 17 +++++++ .../src/jsii_calc/submodule/__init__.py | 9 ++++ .../src/jsii_calc/submodule/child/__init__.py | 15 ++++++- .../test/__snapshots__/jsii-tree.test.js.snap | 10 +++++ packages/jsii/lib/assembler.ts | 44 +++++++++++++++++-- 13 files changed, 215 insertions(+), 10 deletions(-) create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Awesomeness.cs create mode 100644 packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Awesomeness.java diff --git a/packages/jsii-calc/lib/submodule/child/index.ts b/packages/jsii-calc/lib/submodule/child/index.ts index 57dd858234..87b0574273 100644 --- a/packages/jsii-calc/lib/submodule/child/index.ts +++ b/packages/jsii-calc/lib/submodule/child/index.ts @@ -10,3 +10,9 @@ export enum Goodness { /** It's amazingly good */ AMAZINGLY_GOOD } + +// There's only one way around these woods... +export enum Awesomeness { + /** It was awesome! */ + AWESOME +} diff --git a/packages/jsii-calc/lib/submodule/my-class.ts b/packages/jsii-calc/lib/submodule/my-class.ts index 991f55679d..aa7e40a83c 100644 --- a/packages/jsii-calc/lib/submodule/my-class.ts +++ b/packages/jsii-calc/lib/submodule/my-class.ts @@ -1,10 +1,11 @@ import { nested_submodule } from './nested_submodule'; -import { Goodness } from './child'; +import { Awesomeness, Goodness } from './child'; import { AllTypes } from '..'; export class MyClass implements nested_submodule.deeplyNested.INamespaced { public readonly definedAt = __filename; public readonly goodness = Goodness.AMAZINGLY_GOOD; + public readonly awesomeness = Awesomeness.AWESOME; public allTypes?: AllTypes; public constructor() { } diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii index aa35411a8a..11f2d2e72e 100644 --- a/packages/jsii-calc/test/assembly.jsii +++ b/packages/jsii-calc/test/assembly.jsii @@ -12176,6 +12176,20 @@ "name": "MyClass", "namespace": "submodule", "properties": [ + { + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 8 + }, + "name": "awesomeness", + "type": { + "fqn": "jsii-calc.submodule.child.Awesomeness" + } + }, { "docs": { "stability": "experimental" @@ -12211,7 +12225,7 @@ }, "locationInModule": { "filename": "lib/submodule/my-class.ts", - "line": 8 + "line": 9 }, "name": "allTypes", "optional": true, @@ -12253,6 +12267,29 @@ } ] }, + "jsii-calc.submodule.child.Awesomeness": { + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.child.Awesomeness", + "kind": "enum", + "locationInModule": { + "filename": "lib/submodule/child/index.ts", + "line": 15 + }, + "members": [ + { + "docs": { + "stability": "experimental", + "summary": "It was awesome!" + }, + "name": "AWESOME" + } + ], + "name": "Awesomeness", + "namespace": "submodule.child" + }, "jsii-calc.submodule.child.Goodness": { "assembly": "jsii-calc", "docs": { @@ -12405,5 +12442,5 @@ } }, "version": "0.0.0", - "fingerprint": "SEfqfgRvf7Rdw2KRLONITu2b2JruUQ85Ur47eTy1KnA=" + "fingerprint": "XNjL7+hJ5KwFtBCVEz4TZH4c2JtVW/gTPS7UNrw02Cg=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii index aa35411a8a..11f2d2e72e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii @@ -12176,6 +12176,20 @@ "name": "MyClass", "namespace": "submodule", "properties": [ + { + "docs": { + "stability": "experimental" + }, + "immutable": true, + "locationInModule": { + "filename": "lib/submodule/my-class.ts", + "line": 8 + }, + "name": "awesomeness", + "type": { + "fqn": "jsii-calc.submodule.child.Awesomeness" + } + }, { "docs": { "stability": "experimental" @@ -12211,7 +12225,7 @@ }, "locationInModule": { "filename": "lib/submodule/my-class.ts", - "line": 8 + "line": 9 }, "name": "allTypes", "optional": true, @@ -12253,6 +12267,29 @@ } ] }, + "jsii-calc.submodule.child.Awesomeness": { + "assembly": "jsii-calc", + "docs": { + "stability": "experimental" + }, + "fqn": "jsii-calc.submodule.child.Awesomeness", + "kind": "enum", + "locationInModule": { + "filename": "lib/submodule/child/index.ts", + "line": 15 + }, + "members": [ + { + "docs": { + "stability": "experimental", + "summary": "It was awesome!" + }, + "name": "AWESOME" + } + ], + "name": "Awesomeness", + "namespace": "submodule.child" + }, "jsii-calc.submodule.child.Goodness": { "assembly": "jsii-calc", "docs": { @@ -12405,5 +12442,5 @@ } }, "version": "0.0.0", - "fingerprint": "SEfqfgRvf7Rdw2KRLONITu2b2JruUQ85Ur47eTy1KnA=" + "fingerprint": "XNjL7+hJ5KwFtBCVEz4TZH4c2JtVW/gTPS7UNrw02Cg=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Awesomeness.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Awesomeness.cs new file mode 100644 index 0000000000..6bf4fd036e --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/Child/Awesomeness.cs @@ -0,0 +1,21 @@ +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child +{ + + /// + /// Stability: Experimental + /// + [JsiiEnum(nativeType: typeof(Awesomeness), fullyQualifiedName: "jsii-calc.submodule.child.Awesomeness")] + public enum Awesomeness + { + ///

It was awesome! + /// + /// Stability: Experimental + /// + [JsiiEnumMember(name: "AWESOME")] + AWESOME + } +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/MyClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/MyClass.cs index 4d3fc83144..3f9ac65bff 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/MyClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Submodule/MyClass.cs @@ -31,6 +31,15 @@ protected MyClass(DeputyProps props): base(props) { } + /// + /// Stability: Experimental + /// + [JsiiProperty(name: "awesomeness", typeJson: "{\"fqn\":\"jsii-calc.submodule.child.Awesomeness\"}")] + public virtual Amazon.JSII.Tests.CalculatorNamespace.Submodule.Child.Awesomeness Awesomeness + { + get => GetInstanceProperty(); + } + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java index 87715c7f08..4b57dd1fe8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java @@ -209,6 +209,7 @@ protected Class resolveClass(final String fqn) throws ClassNotFoundException case "jsii-calc.composition.CompositeOperation.CompositionStringStyle": return software.amazon.jsii.tests.calculator.composition.CompositeOperation.CompositionStringStyle.class; case "jsii-calc.submodule.MyClass": return software.amazon.jsii.tests.calculator.submodule.MyClass.class; case "jsii-calc.submodule.back_references.MyClassReference": return software.amazon.jsii.tests.calculator.submodule.back_references.MyClassReference.class; + case "jsii-calc.submodule.child.Awesomeness": return software.amazon.jsii.tests.calculator.submodule.child.Awesomeness.class; case "jsii-calc.submodule.child.Goodness": return software.amazon.jsii.tests.calculator.submodule.child.Goodness.class; case "jsii-calc.submodule.child.Structure": return software.amazon.jsii.tests.calculator.submodule.child.Structure.class; case "jsii-calc.submodule.nested_submodule.Namespaced": return software.amazon.jsii.tests.calculator.submodule.nested_submodule.Namespaced.class; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/MyClass.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/MyClass.java index 3c7642e65c..0ac621ba45 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/MyClass.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/MyClass.java @@ -25,6 +25,14 @@ public MyClass() { software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this); } + /** + * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.submodule.child.Awesomeness getAwesomeness() { + return this.jsiiGet("awesomeness", software.amazon.jsii.tests.calculator.submodule.child.Awesomeness.class); + } + /** * EXPERIMENTAL */ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Awesomeness.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Awesomeness.java new file mode 100644 index 0000000000..4821e33755 --- /dev/null +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/submodule/child/Awesomeness.java @@ -0,0 +1,17 @@ +package software.amazon.jsii.tests.calculator.submodule.child; + +/** + * EXPERIMENTAL + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.submodule.child.Awesomeness") +public enum Awesomeness { + /** + * It was awesome! + *

+ * EXPERIMENTAL + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Experimental) + AWESOME, +} diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py index b700d11d7c..4cb3f16a6e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/__init__.py @@ -30,6 +30,15 @@ def __init__(self) -> None: """ jsii.create(MyClass, self, []) + @builtins.property + @jsii.member(jsii_name="awesomeness") + def awesomeness(self) -> "child.Awesomeness": + """ + stability + :stability: experimental + """ + return jsii.get(self, "awesomeness") + @builtins.property @jsii.member(jsii_name="definedAt") def defined_at(self) -> str: diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py index 64110d918d..95a1ed3e80 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/submodule/child/__init__.py @@ -15,6 +15,19 @@ __jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.0.0", "jsii_calc", "jsii-calc@0.0.0.jsii.tgz") +@jsii.enum(jsii_type="jsii-calc.submodule.child.Awesomeness") +class Awesomeness(enum.Enum): + """ + stability + :stability: experimental + """ + AWESOME = "AWESOME" + """It was awesome! + + stability + :stability: experimental + """ + @jsii.enum(jsii_type="jsii-calc.submodule.child.Goodness") class Goodness(enum.Enum): """ @@ -71,6 +84,6 @@ def __repr__(self) -> str: return 'Structure(%s)' % ', '.join(k + '=' + repr(v) for k, v in self._values.items()) -__all__ = ["Goodness", "Structure", "__jsii_assembly__"] +__all__ = ["Awesomeness", "Goodness", "Structure", "__jsii_assembly__"] publication.publish() diff --git a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap index bcd8bd6335..42ae3b7664 100644 --- a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap +++ b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap @@ -82,6 +82,8 @@ exports[`jsii-tree --all 1`] = ` │ │ │ │ │ ├── abstract │ │ │ │ │ ├── immutable │ │ │ │ │ └── type: boolean + │ │ │ │ ├─┬ enum Awesomeness (experimental) + │ │ │ │ │ └── AWESOME (experimental) │ │ │ │ └─┬ enum Goodness (experimental) │ │ │ │ ├── PRETTY_GOOD (experimental) │ │ │ │ ├── REALLY_GOOD (experimental) @@ -112,6 +114,9 @@ exports[`jsii-tree --all 1`] = ` │ │ ├── interfaces: INamespaced │ │ └─┬ members │ │ ├── () initializer (experimental) + │ │ ├─┬ awesomeness property (experimental) + │ │ │ ├── immutable + │ │ │ └── type: jsii-calc.submodule.child.Awesomeness │ │ ├─┬ definedAt property (experimental) │ │ │ ├── immutable │ │ │ └── type: string @@ -2501,6 +2506,7 @@ exports[`jsii-tree --inheritance 1`] = ` │ │ │ ├─┬ child │ │ │ │ └─┬ types │ │ │ │ ├── interface Structure + │ │ │ │ ├── enum Awesomeness │ │ │ │ └── enum Goodness │ │ │ └─┬ nested_submodule │ │ │ ├─┬ submodules @@ -2836,6 +2842,8 @@ exports[`jsii-tree --members 1`] = ` │ │ │ │ ├─┬ interface Structure │ │ │ │ │ └─┬ members │ │ │ │ │ └── bool property + │ │ │ │ ├─┬ enum Awesomeness + │ │ │ │ │ └── AWESOME │ │ │ │ └─┬ enum Goodness │ │ │ │ ├── PRETTY_GOOD │ │ │ │ ├── REALLY_GOOD @@ -2856,6 +2864,7 @@ exports[`jsii-tree --members 1`] = ` │ │ └─┬ class MyClass │ │ └─┬ members │ │ ├── () initializer + │ │ ├── awesomeness property │ │ ├── definedAt property │ │ ├── goodness property │ │ └── allTypes property @@ -3932,6 +3941,7 @@ exports[`jsii-tree --types 1`] = ` │ │ │ ├─┬ child │ │ │ │ └─┬ types │ │ │ │ ├── interface Structure + │ │ │ │ ├── enum Awesomeness │ │ │ │ └── enum Goodness │ │ │ └─┬ nested_submodule │ │ │ ├─┬ submodules diff --git a/packages/jsii/lib/assembler.ts b/packages/jsii/lib/assembler.ts index 33480b93f5..b22353feed 100644 --- a/packages/jsii/lib/assembler.ts +++ b/packages/jsii/lib/assembler.ts @@ -319,10 +319,21 @@ export class Assembler implements Emitter { * @returns the FQN of the type, or some "unknown" marker. */ private async _getFQN(type: ts.Type): Promise { - const tsName = this._typeChecker.getFullyQualifiedName(type.symbol); - const groups = /^"([^"]+)"\.(.*)$/.exec(tsName); - let node = type.symbol.valueDeclaration; + const singleValuedEnum = isSingleValuedEnum(type, this._typeChecker); + + const tsFullName = this._typeChecker.getFullyQualifiedName(type.symbol); + const tsName = singleValuedEnum + // If it's a single-valued enum, we need to remove the last qualifier to get back to the enum. + ? tsFullName.replace(/\.[^.]+$/, '') + : tsFullName; + + let node = singleValuedEnum + // If it's a single-valued enum, we need to move to the parent to have the enum declaration + ? type.symbol.valueDeclaration.parent + : type.symbol.valueDeclaration; if (!node && type.symbol.declarations.length > 0) { node = type.symbol.declarations[0]; } + + const groups = /^"([^"]+)"\.(.*)$/.exec(tsName); if (!groups) { this._diagnostic(node, ts.DiagnosticCategory.Error, `Cannot use private type ${tsName} in exported declarations`); return tsName; @@ -334,7 +345,7 @@ export class Assembler implements Emitter { return `unknown.${typeName}`; } - let submodule = this._submoduleMap.get(type.symbol); + let submodule = this._submoduleMap.get( type.symbol); let submoduleNs = submodule?.name; // Submodules can be in submodules themselves, so we crawl up the tree... while (submodule != null && this._submoduleMap.has(submodule)) { @@ -458,6 +469,12 @@ export class Assembler implements Emitter { if (decl != null) { if (ts.isClassDeclaration(decl) || ts.isInterfaceDeclaration(decl) || ts.isEnumDeclaration(decl)) { const type = this._typeChecker.getTypeAtLocation(decl); + if (isSingleValuedEnum(type, this._typeChecker)) { + // type.symbol !== symbol, because symbol is the enum itself, but + // since it's single-valued, the TypeChecker will only show us the + // value's symbol later on. + this._submoduleMap.set(type.symbol, ns); + } if (type.symbol.exports) { this._addToSubmodule(ns, symbol); } @@ -1876,3 +1893,22 @@ function inferRootDir(program: ts.Program): string | undefined { return result; } } + +/** + * Determines whether the provided type is a single-valued enum. It is necessary + * to check as enums are union-like in the type model, and single-valued enum + * types are actually reduced to the only available literal, which can trip + * the assembler. + * + * @param type the type being checked. + * @param typeChecker the type checker to use to get more information. + * + * @return `true` if `type` is a single-valued enum type. + */ +function isSingleValuedEnum(type: ts.Type, typeChecker: ts.TypeChecker): type is ts.EnumType { + if (type.isLiteral() && _isEnumLike(type)) { + // Single-Valued enums are reduced to the only literal available. + return type === typeChecker.getBaseTypeOfLiteralType(type); + } + return false; +} From 92463baf616672d45c3db1e4cacd1be3d289bf99 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:00:06 +0000 Subject: [PATCH 58/74] chore(deps): bump jest-runtime from 25.2.2 to 25.2.4 (#1431) --- yarn.lock | 544 ++++++++++++++++++++++++------------------------------ 1 file changed, 238 insertions(+), 306 deletions(-) diff --git a/yarn.lock b/yarn.lock index 949d059d16..47e7df165d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -355,24 +355,14 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.1.0.tgz#1fc765d44a1e11aec5029c08e798246bd37075ab" - integrity sha512-3P1DpqAMK/L07ag/Y9/Jup5iDEG9P4pRAuZiMQnU0JB3UOvCyYCjCoxr7sIA80SeyUCUKrr24fKAxVpmBgQonA== - dependencies: - "@jest/source-map" "^25.1.0" - chalk "^3.0.0" - jest-util "^25.1.0" - slash "^3.0.0" - -"@jest/console@^25.2.1": - version "25.2.1" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.2.1.tgz#63b35b6a2b67f26866f8dcbb9725452a1c8c0d3b" - integrity sha512-v3tkMr5AeVm6R23wnZdC5dzXdHPFa6j2uiTC15iHISYkGIilE9O1qmAYKELHPXZifDbz9c8WwzsqoN8K8uG4jg== +"@jest/console@^25.1.0", "@jest/console@^25.2.3": + version "25.2.3" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.2.3.tgz#38ac19b916ff61457173799239472659e1a67c39" + integrity sha512-k+37B1aSvOt9tKHWbZZSOy1jdgzesB0bj96igCVUG1nAH1W5EoUfgc5EXbBVU08KSLvkVdWopLXaO3xfVGlxtQ== dependencies: "@jest/source-map" "^25.2.1" chalk "^3.0.0" - jest-util "^25.2.1" + jest-util "^25.2.3" slash "^3.0.0" "@jest/core@^25.1.0": @@ -409,24 +399,24 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.1.0", "@jest/environment@^25.2.1": - version "25.2.1" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.2.1.tgz#d967f38c05accfb2dba325e93238684e8b1706bd" - integrity sha512-aeA3UlUmpblmv2CHBcNA7LvcXlcCtRpXaKKFVooRy9/Jk8B4IZAZMfrML/d+1cG5FpF17s4JVdu1kx0mbnaqTQ== +"@jest/environment@^25.1.0", "@jest/environment@^25.2.1", "@jest/environment@^25.2.4": + version "25.2.4" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.2.4.tgz#74f4d8dd87b427434d0b822cde37bc0e78f3e28b" + integrity sha512-wA4xlhD19/gukkDpJ5HQsTle0pgnzI5qMFEjw267lpTDC8d9N7Ihqr5pI+l0p8Qn1SQhai+glSqxrGdzKy4jxw== dependencies: - "@jest/fake-timers" "^25.2.1" - "@jest/types" "^25.2.1" - jest-mock "^25.2.1" + "@jest/fake-timers" "^25.2.4" + "@jest/types" "^25.2.3" + jest-mock "^25.2.3" -"@jest/fake-timers@^25.1.0", "@jest/fake-timers@^25.2.1": - version "25.2.1" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.2.1.tgz#caaaea22e810796d3538a77fdce6e554c864ae72" - integrity sha512-H1OC8AktrGTD10NHBauICkRCv7VOOrsgI8xokifAsxJMYhqoKBtJZbk2YpbrtnmdTUnk+qoxPUk+Mufwnl44iQ== +"@jest/fake-timers@^25.2.4": + version "25.2.4" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.2.4.tgz#6821b6edde74fda2a42467ae92cc93095d4c9527" + integrity sha512-oC1TJiwfMcBttVN7Wz+VZnqEAgYTiEMu0QLOXpypR89nab0uCB31zm/QeBZddhSstn20qe3yqOXygp6OwvKT/Q== dependencies: - "@jest/types" "^25.2.1" - jest-message-util "^25.2.1" - jest-mock "^25.2.1" - jest-util "^25.2.1" + "@jest/types" "^25.2.3" + jest-message-util "^25.2.4" + jest-mock "^25.2.3" + jest-util "^25.2.3" lolex "^5.0.0" "@jest/reporters@^25.1.0": @@ -462,7 +452,7 @@ optionalDependencies: node-notifier "^6.0.0" -"@jest/source-map@^25.1.0", "@jest/source-map@^25.2.1": +"@jest/source-map@^25.2.1": version "25.2.1" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.2.1.tgz#b62ecf8ae76170b08eff8859b56eb7576df34ab8" integrity sha512-PgScGJm1U27+9Te/cxP4oUFqJ2PX6NhBL2a6unQ7yafCgs8k02c0LSyjSIx/ao0AwcAdCczfAPDf5lJ7zoB/7A== @@ -471,74 +461,42 @@ graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^25.1.0", "@jest/test-result@^25.2.1": - version "25.2.1" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.2.1.tgz#dc8d26d4329c055733bd5ad6dc4eda190fbacd3b" - integrity sha512-E0tlWh2iOELRLbbPEngs3Dsx88vGBQOs6O3w46YeXfMHlwwqzWrlvoeUq6kRlHRm1O8H+EBr60Wtrwh20C+zWQ== +"@jest/test-result@^25.1.0", "@jest/test-result@^25.2.1", "@jest/test-result@^25.2.4": + version "25.2.4" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.2.4.tgz#8fc9eac58e82eb2a82e4058e68c3814f98f59cf5" + integrity sha512-AI7eUy+q2lVhFnaibDFg68NGkrxVWZdD6KBr9Hm6EvN0oAe7GxpEwEavgPfNHQjU2mi6g+NsFn/6QPgTUwM1qg== dependencies: - "@jest/console" "^25.2.1" - "@jest/transform" "^25.2.1" - "@jest/types" "^25.2.1" + "@jest/console" "^25.2.3" + "@jest/transform" "^25.2.4" + "@jest/types" "^25.2.3" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.1.0.tgz#4df47208542f0065f356fcdb80026e3c042851ab" - integrity sha512-WgZLRgVr2b4l/7ED1J1RJQBOharxS11EFhmwDqknpknE0Pm87HLZVS2Asuuw+HQdfQvm2aXL2FvvBLxOD1D0iw== +"@jest/test-sequencer@^25.2.4": + version "25.2.4" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.2.4.tgz#28364aeddec140c696324114f63570f3de536c87" + integrity sha512-TEZm/Rkd6YgskdpTJdYLBtu6Gc11tfWPuSpatq0duH77ekjU8dpqX2zkPdY/ayuHxztV5LTJoV5BLtI9mZfXew== dependencies: - "@jest/test-result" "^25.1.0" - jest-haste-map "^25.1.0" - jest-runner "^25.1.0" - jest-runtime "^25.1.0" + "@jest/test-result" "^25.2.4" + jest-haste-map "^25.2.3" + jest-runner "^25.2.4" + jest-runtime "^25.2.4" -"@jest/test-sequencer@^25.2.2": - version "25.2.2" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.2.2.tgz#22132174af970527e856c96d78bf446828eb6bde" - integrity sha512-bN1LH30EygCNrZS7gkKBmqBxQwilYiMlAV+wY9oWFRY4VZAxvPwqg5/f0DrZQc60vTW1fXWrkfslSa87sO/P5A== - dependencies: - "@jest/test-result" "^25.2.1" - jest-haste-map "^25.2.1" - jest-runner "^25.2.2" - jest-runtime "^25.2.2" - -"@jest/transform@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.1.0.tgz#221f354f512b4628d88ce776d5b9e601028ea9da" - integrity sha512-4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ== - dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^25.1.0" - babel-plugin-istanbul "^6.0.0" - chalk "^3.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.3" - jest-haste-map "^25.1.0" - jest-regex-util "^25.1.0" - jest-util "^25.1.0" - micromatch "^4.0.2" - pirates "^4.0.1" - realpath-native "^1.1.0" - slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" - -"@jest/transform@^25.2.1": - version "25.2.1" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.2.1.tgz#08481795277b6ff9d7cb703eb4425ed46861bedc" - integrity sha512-puoD5EfqPeZ5m0dV9l8+PMdOVdRjeWcaEjGkH+eG45l0nPJ2vRcxu8J6CRl/6nQ5ZTHgg7LuM9C6FauNpdRpUA== +"@jest/transform@^25.1.0", "@jest/transform@^25.2.4": + version "25.2.4" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.2.4.tgz#34336f37f13f62f7d1f5b93d5d150ba9eb3e11b9" + integrity sha512-6eRigvb+G6bs4kW5j1/y8wu4nCrmVuIe0epPBbiWaYlwawJ8yi1EIyK3d/btDqmBpN5GpN4YhR6iPPnDmkYdTA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" babel-plugin-istanbul "^6.0.0" chalk "^3.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.3" - jest-haste-map "^25.2.1" + jest-haste-map "^25.2.3" jest-regex-util "^25.2.1" - jest-util "^25.2.1" + jest-util "^25.2.3" micromatch "^4.0.2" pirates "^4.0.1" realpath-native "^2.0.0" @@ -546,17 +504,7 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^25.1.0", "@jest/types@^25.2.1": - version "25.2.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.1.tgz#692c8950d4c21fc6b4cfd141c3470b735c5bffca" - integrity sha512-WuGFGJ3Rrycg+5ZwQTWKjr21M9psANPAWYD28K42hSeUzhv1H591VXIoq0tjs00mydhNOgVOkKSpzRS3CrOYFw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - -"@jest/types@^25.2.3": +"@jest/types@^25.1.0", "@jest/types@^25.2.1", "@jest/types@^25.2.3": version "25.2.3" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.3.tgz#035c4fb94e2da472f359ff9a211915d59987f6b6" integrity sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ== @@ -2148,26 +2096,13 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== -babel-jest@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.1.0.tgz#206093ac380a4b78c4404a05b3277391278f80fb" - integrity sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg== +babel-jest@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.2.4.tgz#b21b68d3af8f161c3e6e501e91f0dea8e652e344" + integrity sha512-+yDzlyJVWrqih9i2Cvjpt7COaN8vUwCsKGtxJLzg6I0xhxD54K8mvDUCliPKLufyzHh/c5C4MRj4Vk7VMjOjIg== dependencies: - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" - "@types/babel__core" "^7.1.0" - babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^25.1.0" - chalk "^3.0.0" - slash "^3.0.0" - -babel-jest@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.2.1.tgz#d01ff8025b305a886421b176f3d99ec5461b23b7" - integrity sha512-OiBpQGYtV4rWMuFneIaEsqJB0VdoOBw4SqwO4hA2EhDY/O8RylQ20JwALkxv8iv+CYnyrZZfF+DELPgrdrkRIw== - dependencies: - "@jest/transform" "^25.2.1" - "@jest/types" "^25.2.1" + "@jest/transform" "^25.2.4" + "@jest/types" "^25.2.3" "@types/babel__core" "^7.1.0" babel-plugin-istanbul "^6.0.0" babel-preset-jest "^25.2.1" @@ -2192,7 +2127,7 @@ babel-plugin-jest-hoist@^25.2.1: dependencies: "@types/babel__traverse" "^7.0.6" -babel-preset-jest@^25.1.0, babel-preset-jest@^25.2.1: +babel-preset-jest@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz#4ccd0e577f69aa11b71806edfe8b25a5c3ac93a2" integrity sha512-zXHJBM5iR8oEO4cvdF83AQqqJf3tJrXy3x8nfu2Nlqvn4cneg4Ca8M7cQvC5S9BzDDy1O0tZ9iXru9J6E3ym+A== @@ -3898,6 +3833,18 @@ expect@^25.2.1: jest-message-util "^25.2.1" jest-regex-util "^25.2.1" +expect@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/expect/-/expect-25.2.4.tgz#b66e0777c861034ebc21730bb34e1839d5d46806" + integrity sha512-hfuPhPds4yOsZtIw4kwAg70r0hqGmpqekgA+VX7pf/3wZ6FY+xIOXZhNsPMMMsspYG/YIsbAiwqsdnD4Ht+bCA== + dependencies: + "@jest/types" "^25.2.3" + ansi-styles "^4.0.0" + jest-get-type "^25.2.1" + jest-matcher-utils "^25.2.3" + jest-message-util "^25.2.4" + jest-regex-util "^25.2.1" + extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" @@ -5230,51 +5177,28 @@ jest-cli@^25.1.0: realpath-native "^1.1.0" yargs "^15.0.0" -jest-config@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.1.0.tgz#d114e4778c045d3ef239452213b7ad3ec1cbea90" - integrity sha512-tLmsg4SZ5H7tuhBC5bOja0HEblM0coS3Wy5LTCb2C8ZV6eWLewHyK+3qSq9Bi29zmWQ7ojdCd3pxpx4l4d2uGw== +jest-config@^25.1.0, jest-config@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.2.4.tgz#f4f33238979f225683179c89d1e402893008975d" + integrity sha512-fxy3nIpwJqOUQJRVF/q+pNQb6dv5b9YufOeCbpPZJ/md1zXpiupbhfehpfODhnKOfqbzSiigtSLzlWWmbRxnqQ== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^25.1.0" - "@jest/types" "^25.1.0" - babel-jest "^25.1.0" - chalk "^3.0.0" - glob "^7.1.1" - jest-environment-jsdom "^25.1.0" - jest-environment-node "^25.1.0" - jest-get-type "^25.1.0" - jest-jasmine2 "^25.1.0" - jest-regex-util "^25.1.0" - jest-resolve "^25.1.0" - jest-util "^25.1.0" - jest-validate "^25.1.0" - micromatch "^4.0.2" - pretty-format "^25.1.0" - realpath-native "^1.1.0" - -jest-config@^25.2.2: - version "25.2.2" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.2.2.tgz#ab595713c1808a16ee714300ed48d02c34191d19" - integrity sha512-nnFcjd57kyc9q5vS1DRQQqowxKiRO6jmonL/lo84DL8Zjdng97jaty6EzJ37lMOqvehZY1ovqKgC7Ki0Iqa/wA== - dependencies: - "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^25.2.2" - "@jest/types" "^25.2.1" - babel-jest "^25.2.1" + "@jest/test-sequencer" "^25.2.4" + "@jest/types" "^25.2.3" + babel-jest "^25.2.4" chalk "^3.0.0" deepmerge "^4.2.2" glob "^7.1.1" - jest-environment-jsdom "^25.2.1" - jest-environment-node "^25.2.2" + jest-environment-jsdom "^25.2.4" + jest-environment-node "^25.2.4" jest-get-type "^25.2.1" - jest-jasmine2 "^25.2.2" + jest-jasmine2 "^25.2.4" jest-regex-util "^25.2.1" - jest-resolve "^25.2.1" - jest-util "^25.2.1" - jest-validate "^25.2.1" + jest-resolve "^25.2.3" + jest-util "^25.2.3" + jest-validate "^25.2.3" micromatch "^4.0.2" - pretty-format "^25.2.1" + pretty-format "^25.2.3" realpath-native "^2.0.0" jest-diff@^25.1.0, jest-diff@^25.2.1: @@ -5287,13 +5211,30 @@ jest-diff@^25.1.0, jest-diff@^25.2.1: jest-get-type "^25.2.1" pretty-format "^25.2.1" -jest-docblock@^25.1.0, jest-docblock@^25.2.0: +jest-diff@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.3.tgz#54d601a0a754ef26e808a8c8dbadd278c215aa3f" + integrity sha512-VtZ6LAQtaQpFsmEzps15dQc5ELbJxy4L2DOSo2Ev411TUEtnJPkAMD7JneVypeMJQ1y3hgxN9Ao13n15FAnavg== + dependencies: + chalk "^3.0.0" + diff-sequences "^25.2.1" + jest-get-type "^25.2.1" + pretty-format "^25.2.3" + +jest-docblock@^25.1.0: version "25.2.0" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.2.0.tgz#b1b78e275131bcaa9a5722e663545ed949c278ee" integrity sha512-M7ZDbghaxFd2unWkyDFGLZDjPpIbDtEbICXSzwGrUBccFwVG/1dhLLAYX3D+98bFksaJuM0iMZGuIQUzKgnkQw== dependencies: detect-newline "^3.0.0" +jest-docblock@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.2.3.tgz#ac45280c43d59e7139f9fbe5896c6e0320c01ebb" + integrity sha512-d3/tmjLLrH5fpRGmIm3oFa3vOaD/IjPxtXVOrfujpfJ9y1tCDB1x/tvunmdOVAyF03/xeMwburl6ITbiQT1mVA== + dependencies: + detect-newline "^3.0.0" + jest-each@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.2.1.tgz#d96b4fc0c035fcddb852f19da42ea241b1943999" @@ -5305,40 +5246,39 @@ jest-each@^25.2.1: jest-util "^25.2.1" pretty-format "^25.2.1" -jest-environment-jsdom@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.1.0.tgz#6777ab8b3e90fd076801efd3bff8e98694ab43c3" - integrity sha512-ILb4wdrwPAOHX6W82GGDUiaXSSOE274ciuov0lztOIymTChKFtC02ddyicRRCdZlB5YSrv3vzr1Z5xjpEe1OHQ== +jest-each@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.2.3.tgz#64067ba1508ebbd07e9b126c173ab371e8e6309d" + integrity sha512-RTlmCjsBDK2c9T5oO4MqccA3/5Y8BUtiEy7OOQik1iyCgdnNdHbI0pNEpyapZPBG0nlvZ4mIu7aY6zNUvLraAQ== dependencies: - "@jest/environment" "^25.1.0" - "@jest/fake-timers" "^25.1.0" - "@jest/types" "^25.1.0" - jest-mock "^25.1.0" - jest-util "^25.1.0" - jsdom "^15.1.1" + "@jest/types" "^25.2.3" + chalk "^3.0.0" + jest-get-type "^25.2.1" + jest-util "^25.2.3" + pretty-format "^25.2.3" -jest-environment-jsdom@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.2.1.tgz#4f1da1bc46897c6ed818c850464b1114429e3ad5" - integrity sha512-bUhhhXtgrOgLhsFQFXgao8CQPYAEwtaVvhsF6O0A7Ie2uPONtAKCwuxyOM9WJaz9ag2ci5Pg7i2V2PRfGLl95w== +jest-environment-jsdom@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.2.4.tgz#f2783541d0538b1bc43641703372cea6a2e83611" + integrity sha512-5dm+tNwrLmhELdjAwiQnVGf/U9iFMWdTL4/wyrMg2HU6RQnCiuxpWbIigLHUhuP1P2Ak0F4k3xhjrikboKyShA== dependencies: - "@jest/environment" "^25.2.1" - "@jest/fake-timers" "^25.2.1" - "@jest/types" "^25.2.1" - jest-mock "^25.2.1" - jest-util "^25.2.1" + "@jest/environment" "^25.2.4" + "@jest/fake-timers" "^25.2.4" + "@jest/types" "^25.2.3" + jest-mock "^25.2.3" + jest-util "^25.2.3" jsdom "^15.2.1" -jest-environment-node@^25.1.0, jest-environment-node@^25.2.2: - version "25.2.2" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.2.2.tgz#a34e1018a7b032067f9ed675a6d0b033a67a5342" - integrity sha512-3V1zivv0EAu4xoeLaQVHjDrniAB4JU9iOUqpsUpJjL5P8zFuSxpGL9K0zBdnaZFVfQCWSa2pLbSfpWItcLPijQ== +jest-environment-node@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.2.4.tgz#dc211dfb0d8b66dfc1965a8f846e72e54ff0c430" + integrity sha512-Jkc5Y8goyXPrLRHnrUlqC7P4o5zn2m4zw6qWoRJ59kxV1f2a5wK+TTGhrhCwnhW/Ckpdl/pm+LufdvhJkvJbiw== dependencies: - "@jest/environment" "^25.2.1" - "@jest/fake-timers" "^25.2.1" - "@jest/types" "^25.2.1" - jest-mock "^25.2.1" - jest-util "^25.2.1" + "@jest/environment" "^25.2.4" + "@jest/fake-timers" "^25.2.4" + "@jest/types" "^25.2.3" + jest-mock "^25.2.3" + jest-util "^25.2.3" semver "^6.3.0" jest-expect-message@^1.0.2: @@ -5346,40 +5286,22 @@ jest-expect-message@^1.0.2: resolved "https://registry.yarnpkg.com/jest-expect-message/-/jest-expect-message-1.0.2.tgz#6d67cdf093457a607d231038a3b84aa3a076bcba" integrity sha512-WFiXMgwS2lOqQZt1iJMI/hOXpUm32X+ApsuzYcQpW5m16Pv6/Gd9kgC+Q+Q1YVNU04kYcAOv9NXMnjg6kKUy6Q== -jest-get-type@^25.1.0, jest-get-type@^25.2.1: +jest-get-type@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.1.tgz#6c83de603c41b1627e6964da2f5454e6aa3c13a6" integrity sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w== -jest-haste-map@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.1.0.tgz#ae12163d284f19906260aa51fd405b5b2e5a4ad3" - integrity sha512-/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw== - dependencies: - "@jest/types" "^25.1.0" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.3" - jest-serializer "^25.1.0" - jest-util "^25.1.0" - jest-worker "^25.1.0" - micromatch "^4.0.2" - sane "^4.0.3" - walker "^1.0.7" - optionalDependencies: - fsevents "^2.1.2" - -jest-haste-map@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.2.1.tgz#61cbb3c99185b3551d63da9daedc5f64b9efe544" - integrity sha512-svz3KbQmv9qeomR0LlRjQfoi7lQbZQkC39m7uHFKhqyEuX4F6DH6HayNPSEbTCZDx6d9/ljxfAcxlPpgQvrpvQ== +jest-haste-map@^25.1.0, jest-haste-map@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.2.3.tgz#2649392b5af191f0167a27bfb62e5d96d7eaaade" + integrity sha512-pAP22OHtPr4qgZlJJFks2LLgoQUr4XtM1a+F5UaPIZNiCRnePA0hM3L7aiJ0gzwiNIYwMTfKRwG/S1L28J3A3A== dependencies: - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.3" jest-serializer "^25.2.1" - jest-util "^25.2.1" + jest-util "^25.2.3" jest-worker "^25.2.1" micromatch "^4.0.2" sane "^4.0.3" @@ -5388,7 +5310,7 @@ jest-haste-map@^25.2.1: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^25.1.0, jest-jasmine2@^25.2.2: +jest-jasmine2@^25.1.0: version "25.2.2" resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.2.2.tgz#08ce8ba9a1c2445c7fd98d0be190848bd53dcf7f" integrity sha512-lB/32iLzuupTlKUlZz1QxKILkMbAIL4iq4O0wjMH6FPBKnkf8YgdQchDQyIzK98xrdYF+DdvmsaS/m6bt+jSiA== @@ -5411,7 +5333,30 @@ jest-jasmine2@^25.1.0, jest-jasmine2@^25.2.2: pretty-format "^25.2.1" throat "^5.0.0" -jest-leak-detector@^25.1.0, jest-leak-detector@^25.2.1: +jest-jasmine2@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.2.4.tgz#5f77de83e1027f0c7588137055a80da773872374" + integrity sha512-juoKrmNmLwaheNbAg71SuUF9ovwUZCFNTpKVhvCXWk+SSeORcIUMptKdPCoLXV3D16htzhTSKmNxnxSk4SrTjA== + dependencies: + "@babel/traverse" "^7.1.0" + "@jest/environment" "^25.2.4" + "@jest/source-map" "^25.2.1" + "@jest/test-result" "^25.2.4" + "@jest/types" "^25.2.3" + chalk "^3.0.0" + co "^4.6.0" + expect "^25.2.4" + is-generator-fn "^2.0.0" + jest-each "^25.2.3" + jest-matcher-utils "^25.2.3" + jest-message-util "^25.2.4" + jest-runtime "^25.2.4" + jest-snapshot "^25.2.4" + jest-util "^25.2.3" + pretty-format "^25.2.3" + throat "^5.0.0" + +jest-leak-detector@^25.1.0, jest-leak-detector@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.2.3.tgz#4cf39f137925e0061c04c24ca65cae36465f0238" integrity sha512-yblCMPE7NJKl7778Cf/73yyFWAas5St0iiEBwq7RDyaz6Xd4WPFnPz2j7yDb/Qce71A1IbDoLADlcwD8zT74Aw== @@ -5429,26 +5374,36 @@ jest-matcher-utils@^25.2.1: jest-get-type "^25.2.1" pretty-format "^25.2.1" -jest-message-util@^25.1.0, jest-message-util@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.1.tgz#43fb5f239954a28954e74dfea0b75efc4e7377fb" - integrity sha512-pxwehr9uPEuCI9bPjBiZxpFMN0+3wny5p7/E3hbV9XjsqREhJJAMf0czvHtgNeUBo2iAiAI9yi9ICKHPOKePEw== +jest-matcher-utils@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.2.3.tgz#59285bd6d6c810debc9caa585ed985e46a3f28fd" + integrity sha512-ZmiXiwQRVM9MoKjGMP5YsGGk2Th5ncyRxfXKz5AKsmU8m43kgNZirckVzaP61MlSa9LKmXbevdYqVp1ZKAw2Rw== + dependencies: + chalk "^3.0.0" + jest-diff "^25.2.3" + jest-get-type "^25.2.1" + pretty-format "^25.2.3" + +jest-message-util@^25.1.0, jest-message-util@^25.2.1, jest-message-util@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.4.tgz#b1441b9c82f5c11fc661303cbf200a2f136a7762" + integrity sha512-9wWMH3Bf+GVTv0GcQLmH/FRr0x0toptKw9TA8U5YFLVXx7Tq9pvcNzTyJrcTJ+wLqNbMPPJlJNft4MnlcrtF5Q== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/test-result" "^25.2.1" - "@jest/types" "^25.2.1" + "@jest/test-result" "^25.2.4" + "@jest/types" "^25.2.3" "@types/stack-utils" "^1.0.1" chalk "^3.0.0" micromatch "^4.0.2" slash "^3.0.0" stack-utils "^1.0.1" -jest-mock@^25.1.0, jest-mock@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.2.1.tgz#37b294b8d0aa94c1af7714e039cc410df61593da" - integrity sha512-ZXcmqpCTG1MEm2AP2q9XiJzdbQ655Pnssj+xQMP1thrW2ptEFrd4vSkxTpxk6rnluLPRKagaHmzUpWNxShMvqQ== +jest-mock@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.2.3.tgz#b37a581f59d61bd91db27a99bf7eb8b3e5e993d5" + integrity sha512-xlf+pyY0j47zoCs8zGGOGfWyxxLximE8YFOfEK8s4FruR8DtM/UjNj61um+iDuMAFEBDe1bhCXkqiKoCmWjJzg== dependencies: - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" jest-pnp-resolver@^1.2.1: version "1.2.1" @@ -5469,23 +5424,12 @@ jest-resolve-dependencies@^25.1.0: jest-regex-util "^25.2.1" jest-snapshot "^25.2.1" -jest-resolve@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.1.0.tgz#23d8b6a4892362baf2662877c66aa241fa2eaea3" - integrity sha512-XkBQaU1SRCHj2Evz2Lu4Czs+uIgJXWypfO57L7JYccmAXv4slXA6hzNblmcRmf7P3cQ1mE7fL3ABV6jAwk4foQ== - dependencies: - "@jest/types" "^25.1.0" - browser-resolve "^1.11.3" - chalk "^3.0.0" - jest-pnp-resolver "^1.2.1" - realpath-native "^1.1.0" - -jest-resolve@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.2.1.tgz#44f8f87c5688bad31e762f123540b09cac5907f8" - integrity sha512-5rVc6khEckNH62adcR+jlYd34/jBO/U22VHf+elmyO6UBHNWXSbfy63+spJRN4GQ/0dbu6Hi6ZVdR58bmNG2Eg== +jest-resolve@^25.1.0, jest-resolve@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.2.3.tgz#ababeaf2bb948cb6d2dea8453759116da0fb7842" + integrity sha512-1vZMsvM/DBH258PnpUNSXIgtzpYz+vCVCj9+fcy4akZl4oKbD+9hZSlfe9RIDpU0Fc28ozHQrmwX3EqFRRIHGg== dependencies: - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" browser-resolve "^1.11.3" chalk "^3.0.0" jest-pnp-resolver "^1.2.1" @@ -5517,120 +5461,108 @@ jest-runner@^25.1.0: source-map-support "^0.5.6" throat "^5.0.0" -jest-runner@^25.2.2: - version "25.2.2" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.2.2.tgz#6dfa528a180a19af45d8038c2727ad4a58b81213" - integrity sha512-U0UACNQK3WovPpNvOsf57qfk815ZfMAq2oH3kQUTZEY7L07nVnY9tVmDvI1RBh1JtkNBqUCSoqYjlTpiBhhghQ== +jest-runner@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.2.4.tgz#d0daf7c56b4a83b6b675863d5cdcd502c960f9a1" + integrity sha512-5xaIfqqxck9Wg2CV4b9KmJtf/sWO7zWQx7O+34GCLGPzoPcVmB3mZtdrQI1/jS3Reqjru9ycLjgLHSf6XoxRqA== dependencies: - "@jest/console" "^25.2.1" - "@jest/environment" "^25.2.1" - "@jest/test-result" "^25.2.1" - "@jest/types" "^25.2.1" + "@jest/console" "^25.2.3" + "@jest/environment" "^25.2.4" + "@jest/test-result" "^25.2.4" + "@jest/types" "^25.2.3" chalk "^3.0.0" exit "^0.1.2" graceful-fs "^4.2.3" - jest-config "^25.2.2" - jest-docblock "^25.2.0" - jest-haste-map "^25.2.1" - jest-jasmine2 "^25.2.2" - jest-leak-detector "^25.2.1" - jest-message-util "^25.2.1" - jest-resolve "^25.2.1" - jest-runtime "^25.2.2" - jest-util "^25.2.1" + jest-config "^25.2.4" + jest-docblock "^25.2.3" + jest-haste-map "^25.2.3" + jest-jasmine2 "^25.2.4" + jest-leak-detector "^25.2.3" + jest-message-util "^25.2.4" + jest-resolve "^25.2.3" + jest-runtime "^25.2.4" + jest-util "^25.2.3" jest-worker "^25.2.1" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.1.0, jest-runtime@^25.2.2: - version "25.2.2" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.2.2.tgz#6ffbcdc67a3488f1ccb1dba1277ab671e96f5226" - integrity sha512-k0LgYDw8nDOGJRPhFlsitzqOxkDGxyVQQG1O39ToHsuApVkZHguYEw4tNXU8Pc4GdU9/ua9ke6nUjHNiByE8bg== +jest-runtime@^25.1.0, jest-runtime@^25.2.2, jest-runtime@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.2.4.tgz#c66a421e115944426b377a7fd331f6c0902cfa56" + integrity sha512-6ehOUizgIghN+aV5YSrDzTZ+zJ9omgEjJbTHj3Jqes5D52XHfhzT7cSfdREwkNjRytrR7mNwZ7pRauoyNLyJ8Q== dependencies: - "@jest/console" "^25.2.1" - "@jest/environment" "^25.2.1" + "@jest/console" "^25.2.3" + "@jest/environment" "^25.2.4" "@jest/source-map" "^25.2.1" - "@jest/test-result" "^25.2.1" - "@jest/transform" "^25.2.1" - "@jest/types" "^25.2.1" + "@jest/test-result" "^25.2.4" + "@jest/transform" "^25.2.4" + "@jest/types" "^25.2.3" "@types/yargs" "^15.0.0" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.3" - jest-config "^25.2.2" - jest-haste-map "^25.2.1" - jest-message-util "^25.2.1" - jest-mock "^25.2.1" + jest-config "^25.2.4" + jest-haste-map "^25.2.3" + jest-message-util "^25.2.4" + jest-mock "^25.2.3" jest-regex-util "^25.2.1" - jest-resolve "^25.2.1" - jest-snapshot "^25.2.1" - jest-util "^25.2.1" - jest-validate "^25.2.1" + jest-resolve "^25.2.3" + jest-snapshot "^25.2.4" + jest-util "^25.2.3" + jest-validate "^25.2.3" realpath-native "^2.0.0" slash "^3.0.0" strip-bom "^4.0.0" yargs "^15.3.1" -jest-serializer@^25.1.0, jest-serializer@^25.2.1: +jest-serializer@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.1.tgz#51727a5fc04256f461abe0fa024a022ba165877a" integrity sha512-fibDi7M5ffx6c/P66IkvR4FKkjG5ldePAK1WlbNoaU4GZmIAkS9Le/frAwRUFEX0KdnisSPWf+b1RC5jU7EYJQ== -jest-snapshot@^25.1.0, jest-snapshot@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.2.1.tgz#1fdcc8c780f83f0e902dd75df79d0d7313fe939e" - integrity sha512-5Wd8SEJVTXqQvzkQpuYqQt1QTlRj2XVUV/iaEzO+AeSVg6g5pQWu0z2iLdSBlVeWRrX0MyZn6dhxYGwEq4wW0w== +jest-snapshot@^25.1.0, jest-snapshot@^25.2.1, jest-snapshot@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.2.4.tgz#08d4517579c864df4280bcc948ceea34327a4ded" + integrity sha512-nIwpW7FZCq5p0AE3Oyqyb6jL0ENJixXzJ5/CD/XRuOqp3gS5OM3O/k+NnTrniCXxPFV4ry6s9HNfiPQBi0wcoA== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" "@types/prettier" "^1.19.0" chalk "^3.0.0" - expect "^25.2.1" - jest-diff "^25.2.1" + expect "^25.2.4" + jest-diff "^25.2.3" jest-get-type "^25.2.1" - jest-matcher-utils "^25.2.1" - jest-message-util "^25.2.1" - jest-resolve "^25.2.1" + jest-matcher-utils "^25.2.3" + jest-message-util "^25.2.4" + jest-resolve "^25.2.3" make-dir "^3.0.0" natural-compare "^1.4.0" - pretty-format "^25.2.1" + pretty-format "^25.2.3" semver "^6.3.0" -jest-util@^25.1.0, jest-util@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.1.tgz#96086efe850ce6d07c42ad5324b80a3ede4246e6" - integrity sha512-oFVMSY/7flrSgEE/B+RApaBZOdLURXRnXCf4COV5td9uRidxudyjA64I1xk2h9Pf3jloSArm96e2FKAbFs0DYg== +jest-util@^25.1.0, jest-util@^25.2.1, jest-util@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.3.tgz#0abf95a1d6b96f2de5a3ecd61b36c40a182dc256" + integrity sha512-7tWiMICVSo9lNoObFtqLt9Ezt5exdFlWs5fLe1G4XLY2lEbZc814cw9t4YHScqBkWMfzth8ASHKlYBxiX2rdCw== dependencies: - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" chalk "^3.0.0" is-ci "^2.0.0" make-dir "^3.0.0" -jest-validate@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.1.0.tgz#1469fa19f627bb0a9a98e289f3e9ab6a668c732a" - integrity sha512-kGbZq1f02/zVO2+t1KQGSVoCTERc5XeObLwITqC6BTRH3Adv7NZdYqCpKIZLUgpLXf2yISzQ465qOZpul8abXA== - dependencies: - "@jest/types" "^25.1.0" - camelcase "^5.3.1" - chalk "^3.0.0" - jest-get-type "^25.1.0" - leven "^3.1.0" - pretty-format "^25.1.0" - -jest-validate@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.2.1.tgz#a07a4e6697fc58e6ea31c03de541af4d0a475fbc" - integrity sha512-vGtNFPyvylFfTFFfptzqCy5S3cP/N5JJVwm8gsXeZq8jMmvUngfWtuw+Tr5Wjo+dqOle23td8BE0ruGnsONDmw== +jest-validate@^25.1.0, jest-validate@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.2.3.tgz#ecb0f093cf8ae71d15075fb48439b6f78f1fcb5a" + integrity sha512-GObn91jzU0B0Bv4cusAwjP6vnWy78hJUM8MOSz7keRfnac/ZhQWIsUjvk01IfeXNTemCwgR57EtdjQMzFZGREg== dependencies: - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" camelcase "^5.3.1" chalk "^3.0.0" jest-get-type "^25.2.1" leven "^3.1.0" - pretty-format "^25.2.1" + pretty-format "^25.2.3" jest-watcher@^25.1.0: version "25.1.0" @@ -5679,7 +5611,7 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdom@^15.1.1, jsdom@^15.2.1: +jsdom@^15.2.1: version "15.2.1" resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" integrity sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g== From bbff4e45c06a3f94220c701b003224abcb938af3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:22:52 +0000 Subject: [PATCH 59/74] chore(deps): bump watchpack from 1.6.0 to 1.6.1 (#1417) --- yarn.lock | 82 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 47e7df165d..f8ecc9d977 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2497,7 +2497,7 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -chokidar@^2.0.2: +chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== @@ -3146,7 +3146,7 @@ debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.1.0: +debug@^3.1.0, debug@^3.2.6: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -3206,6 +3206,11 @@ deep-equal@^2.0.1: which-boxed-primitive "^1.0.1" which-collection "^1.0.0" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -3290,6 +3295,11 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-newline@3.1.0, detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" @@ -4147,6 +4157,7 @@ fsevents@^1.2.7: dependencies: bindings "^1.5.0" nan "^2.12.1" + node-pre-gyp "*" fsevents@^2.1.2: version "2.1.2" @@ -4588,7 +4599,7 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -4694,7 +4705,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.2, ini@^1.3.4, ini@^1.3.5: +ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -6431,6 +6442,15 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +needle@^2.2.1: + version "2.3.3" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" + integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" @@ -6522,6 +6542,22 @@ node-notifier@^6.0.0: shellwords "^0.1.1" which "^1.3.1" +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + nopt@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" @@ -6593,7 +6629,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.4.4: +npm-packlist@^1.1.6, npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -6625,7 +6661,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -npmlog@^4.1.2: +npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -7337,6 +7373,16 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + react-is@^16.12.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -7699,7 +7745,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -7784,6 +7830,11 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + saxes@^3.1.9: version "3.1.11" resolved "https://registry.yarnpkg.com/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" @@ -7807,7 +7858,7 @@ semver-intersect@^1.4.0: dependencies: semver "^5.0.0" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: +"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.0.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -8371,6 +8422,11 @@ strip-json-comments@^3.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -8429,7 +8485,7 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -8999,11 +9055,11 @@ wasm-loader@^1.3.0: wasm-dce "^1.0.0" watchpack@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" - integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA== + version "1.6.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz#280da0a8718592174010c078c7585a74cd8cd0e2" + integrity sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA== dependencies: - chokidar "^2.0.2" + chokidar "^2.1.8" graceful-fs "^4.1.2" neo-async "^2.5.0" From 354895dd71b29180ed8311b1a4b0ffc31a740e9c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 10:44:59 +0000 Subject: [PATCH 60/74] chore(deps): bump jest-runner from 25.1.0 to 25.2.4 (#1430) --- yarn.lock | 104 +++++------------------------------------------------- 1 file changed, 8 insertions(+), 96 deletions(-) diff --git a/yarn.lock b/yarn.lock index f8ecc9d977..d705864c58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -399,7 +399,7 @@ slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.1.0", "@jest/environment@^25.2.1", "@jest/environment@^25.2.4": +"@jest/environment@^25.1.0", "@jest/environment@^25.2.4": version "25.2.4" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.2.4.tgz#74f4d8dd87b427434d0b822cde37bc0e78f3e28b" integrity sha512-wA4xlhD19/gukkDpJ5HQsTle0pgnzI5qMFEjw267lpTDC8d9N7Ihqr5pI+l0p8Qn1SQhai+glSqxrGdzKy4jxw== @@ -461,7 +461,7 @@ graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^25.1.0", "@jest/test-result@^25.2.1", "@jest/test-result@^25.2.4": +"@jest/test-result@^25.1.0", "@jest/test-result@^25.2.4": version "25.2.4" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.2.4.tgz#8fc9eac58e82eb2a82e4058e68c3814f98f59cf5" integrity sha512-AI7eUy+q2lVhFnaibDFg68NGkrxVWZdD6KBr9Hm6EvN0oAe7GxpEwEavgPfNHQjU2mi6g+NsFn/6QPgTUwM1qg== @@ -3831,18 +3831,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-25.2.1.tgz#f543b6a7fee921c554b5eec9b8ca384551dccedd" - integrity sha512-mRvuu0xujdgYuS0S2dZ489PGAcXl60blmsLofaq7heqn+ZcUOox+VWQvrCee/x+/0WBpxDs7pBWuFYNO5U+txQ== - dependencies: - "@jest/types" "^25.2.1" - ansi-styles "^4.0.0" - jest-get-type "^25.2.1" - jest-matcher-utils "^25.2.1" - jest-message-util "^25.2.1" - jest-regex-util "^25.2.1" - expect@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/expect/-/expect-25.2.4.tgz#b66e0777c861034ebc21730bb34e1839d5d46806" @@ -5212,7 +5200,7 @@ jest-config@^25.1.0, jest-config@^25.2.4: pretty-format "^25.2.3" realpath-native "^2.0.0" -jest-diff@^25.1.0, jest-diff@^25.2.1: +jest-diff@^25.1.0: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.1.tgz#8c073596cc88356227c86a50d71a23d8a9dfa81a" integrity sha512-e/TU8VLBBGQQS9tXA5B5LeT806jh7CHUeHbBfrU9UvA2zTbOTRz71UD6fAP1HAhzUEyCVLU2ZP5e8X16A9b0Fg== @@ -5232,13 +5220,6 @@ jest-diff@^25.2.3: jest-get-type "^25.2.1" pretty-format "^25.2.3" -jest-docblock@^25.1.0: - version "25.2.0" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.2.0.tgz#b1b78e275131bcaa9a5722e663545ed949c278ee" - integrity sha512-M7ZDbghaxFd2unWkyDFGLZDjPpIbDtEbICXSzwGrUBccFwVG/1dhLLAYX3D+98bFksaJuM0iMZGuIQUzKgnkQw== - dependencies: - detect-newline "^3.0.0" - jest-docblock@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.2.3.tgz#ac45280c43d59e7139f9fbe5896c6e0320c01ebb" @@ -5246,17 +5227,6 @@ jest-docblock@^25.2.3: dependencies: detect-newline "^3.0.0" -jest-each@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.2.1.tgz#d96b4fc0c035fcddb852f19da42ea241b1943999" - integrity sha512-2vWAaf11IJsSwkEzGph3un4OMSG4v/3hpM2UqJdeU3peGUgUSn75TlXZGQnT0smbnAr4eE+URW1OpE8U9wl0TA== - dependencies: - "@jest/types" "^25.2.1" - chalk "^3.0.0" - jest-get-type "^25.2.1" - jest-util "^25.2.1" - pretty-format "^25.2.1" - jest-each@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.2.3.tgz#64067ba1508ebbd07e9b126c173ab371e8e6309d" @@ -5321,29 +5291,6 @@ jest-haste-map@^25.1.0, jest-haste-map@^25.2.3: optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^25.1.0: - version "25.2.2" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.2.2.tgz#08ce8ba9a1c2445c7fd98d0be190848bd53dcf7f" - integrity sha512-lB/32iLzuupTlKUlZz1QxKILkMbAIL4iq4O0wjMH6FPBKnkf8YgdQchDQyIzK98xrdYF+DdvmsaS/m6bt+jSiA== - dependencies: - "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.2.1" - "@jest/source-map" "^25.2.1" - "@jest/test-result" "^25.2.1" - "@jest/types" "^25.2.1" - chalk "^3.0.0" - co "^4.6.0" - expect "^25.2.1" - is-generator-fn "^2.0.0" - jest-each "^25.2.1" - jest-matcher-utils "^25.2.1" - jest-message-util "^25.2.1" - jest-runtime "^25.2.2" - jest-snapshot "^25.2.1" - jest-util "^25.2.1" - pretty-format "^25.2.1" - throat "^5.0.0" - jest-jasmine2@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.2.4.tgz#5f77de83e1027f0c7588137055a80da773872374" @@ -5367,7 +5314,7 @@ jest-jasmine2@^25.2.4: pretty-format "^25.2.3" throat "^5.0.0" -jest-leak-detector@^25.1.0, jest-leak-detector@^25.2.3: +jest-leak-detector@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.2.3.tgz#4cf39f137925e0061c04c24ca65cae36465f0238" integrity sha512-yblCMPE7NJKl7778Cf/73yyFWAas5St0iiEBwq7RDyaz6Xd4WPFnPz2j7yDb/Qce71A1IbDoLADlcwD8zT74Aw== @@ -5375,16 +5322,6 @@ jest-leak-detector@^25.1.0, jest-leak-detector@^25.2.3: jest-get-type "^25.2.1" pretty-format "^25.2.3" -jest-matcher-utils@^25.2.1: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.2.1.tgz#67da3d3aea74b4de6da990b636d7baebfebac0e4" - integrity sha512-uuoYY8W6eeVxHUEOvrKIVVTl9X6RP+ohQn2Ta2W8OOLMN6oA8pZUKQEPGxLsSqB3RKfpTueurMLrxDTEZGllsA== - dependencies: - chalk "^3.0.0" - jest-diff "^25.2.1" - jest-get-type "^25.2.1" - pretty-format "^25.2.1" - jest-matcher-utils@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.2.3.tgz#59285bd6d6c810debc9caa585ed985e46a3f28fd" @@ -5395,7 +5332,7 @@ jest-matcher-utils@^25.2.3: jest-get-type "^25.2.1" pretty-format "^25.2.3" -jest-message-util@^25.1.0, jest-message-util@^25.2.1, jest-message-util@^25.2.4: +jest-message-util@^25.1.0, jest-message-util@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.4.tgz#b1441b9c82f5c11fc661303cbf200a2f136a7762" integrity sha512-9wWMH3Bf+GVTv0GcQLmH/FRr0x0toptKw9TA8U5YFLVXx7Tq9pvcNzTyJrcTJ+wLqNbMPPJlJNft4MnlcrtF5Q== @@ -5447,32 +5384,7 @@ jest-resolve@^25.1.0, jest-resolve@^25.2.3: realpath-native "^2.0.0" resolve "^1.15.1" -jest-runner@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.1.0.tgz#fef433a4d42c89ab0a6b6b268e4a4fbe6b26e812" - integrity sha512-su3O5fy0ehwgt+e8Wy7A8CaxxAOCMzL4gUBftSs0Ip32S0epxyZPDov9Znvkl1nhVOJNf4UwAsnqfc3plfQH9w== - dependencies: - "@jest/console" "^25.1.0" - "@jest/environment" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" - chalk "^3.0.0" - exit "^0.1.2" - graceful-fs "^4.2.3" - jest-config "^25.1.0" - jest-docblock "^25.1.0" - jest-haste-map "^25.1.0" - jest-jasmine2 "^25.1.0" - jest-leak-detector "^25.1.0" - jest-message-util "^25.1.0" - jest-resolve "^25.1.0" - jest-runtime "^25.1.0" - jest-util "^25.1.0" - jest-worker "^25.1.0" - source-map-support "^0.5.6" - throat "^5.0.0" - -jest-runner@^25.2.4: +jest-runner@^25.1.0, jest-runner@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.2.4.tgz#d0daf7c56b4a83b6b675863d5cdcd502c960f9a1" integrity sha512-5xaIfqqxck9Wg2CV4b9KmJtf/sWO7zWQx7O+34GCLGPzoPcVmB3mZtdrQI1/jS3Reqjru9ycLjgLHSf6XoxRqA== @@ -5497,7 +5409,7 @@ jest-runner@^25.2.4: source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.1.0, jest-runtime@^25.2.2, jest-runtime@^25.2.4: +jest-runtime@^25.1.0, jest-runtime@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.2.4.tgz#c66a421e115944426b377a7fd331f6c0902cfa56" integrity sha512-6ehOUizgIghN+aV5YSrDzTZ+zJ9omgEjJbTHj3Jqes5D52XHfhzT7cSfdREwkNjRytrR7mNwZ7pRauoyNLyJ8Q== @@ -5553,7 +5465,7 @@ jest-snapshot@^25.1.0, jest-snapshot@^25.2.1, jest-snapshot@^25.2.4: pretty-format "^25.2.3" semver "^6.3.0" -jest-util@^25.1.0, jest-util@^25.2.1, jest-util@^25.2.3: +jest-util@^25.1.0, jest-util@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.3.tgz#0abf95a1d6b96f2de5a3ecd61b36c40a182dc256" integrity sha512-7tWiMICVSo9lNoObFtqLt9Ezt5exdFlWs5fLe1G4XLY2lEbZc814cw9t4YHScqBkWMfzth8ASHKlYBxiX2rdCw== From 4ab922494ca0eee85ed238bd06c9e33eb4e97c36 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 11:08:17 +0000 Subject: [PATCH 61/74] chore(deps): bump istanbul-reports from 3.0.0 to 3.0.1 (#1414) --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index d705864c58..876a957b9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4536,9 +4536,9 @@ html-encoding-sniffer@^1.0.2: whatwg-encoding "^1.0.1" html-escaper@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.1.tgz#beed86b5d2b921e92533aa11bce6d8e3b583dee7" - integrity sha512-hNX23TjWwD3q56HpWjUHOKj1+4KKlnjv9PcmBUYKVpga+2cnb9nDx/B1o0yO4n+RZXZdiNxzx6B24C9aNMTkkQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== http-cache-semantics@^3.8.1: version "3.8.1" @@ -5141,9 +5141,9 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" istanbul-reports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70" - integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A== + version "3.0.1" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.1.tgz#1343217244ad637e0c3b18e7f6b746941a9b5e9a" + integrity sha512-Vm9xwCiQ8t2cNNnckyeAV0UdxKpcQUz4nMxsBvIu8n2kmPSiyb5uaF/8LpmKr+yqL/MdOXaX2Nmdo4Qyxium9Q== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" From 926f6a136dc6626e199b2dbe0461557a17bc1f08 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2020 11:31:24 +0000 Subject: [PATCH 62/74] chore(deps): bump jest from 25.1.0 to 25.2.4 (#1435) --- packages/@jsii/integ-test/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 199 +++++++++++-------------- 13 files changed, 102 insertions(+), 121 deletions(-) diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 1af819186e..bdc276a8ae 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -19,7 +19,7 @@ "@octokit/rest": "^16.36.0", "dotenv": "^8.2.0", "fs-extra": "^9.0.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jsii": "^0.0.0", "jsii-pacmak": "^0.0.0", "jsii-rosetta": "^0.0.0", diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 9e14e4fa01..d834dc1be5 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -44,7 +44,7 @@ "@types/node": "^10.17.17", "@types/tar": "^4.0.3", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jest-expect-message": "^1.0.2", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 84f9bb6f86..2727d7a536 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -42,7 +42,7 @@ "@types/jest": "^25.1.4", "@types/node": "^10.17.17", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", "source-map": "^0.7.3", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index f56aef93cd..51f1a52b50 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -36,7 +36,7 @@ "@types/jest": "^25.1.4", "@types/node": "^10.17.17", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3", "typescript-json-schema": "^0.42.0" diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index b6520bd287..9964d898f6 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -40,7 +40,7 @@ "@types/jest": "^25.1.4", "@types/node": "^10.17.17", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "typescript": "~3.8.3" }, "jest": { diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 8ec88b1aa7..e7acc87cd7 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -24,7 +24,7 @@ "@types/node": "^10.17.17", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jest-expect-message": "^1.0.2", "typescript": "~3.8.3" }, diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 322443ac83..9b4857804a 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -47,7 +47,7 @@ "@types/tar-fs": "^1.16.3", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jest-expect-message": "^1.0.2", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0" diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 668c26e546..ef91b97704 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -62,7 +62,7 @@ "@types/semver": "^7.1.0", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", "mock-fs": "^4.11.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 346801a21f..ec40a2fce5 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -46,7 +46,7 @@ "@types/node": "^10.17.17", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index e363acc7b6..b9bf3e2d6b 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -22,7 +22,7 @@ "@types/node": "^10.17.17", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "memory-streams": "^0.1.3", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index aa124b77a2..57c1decce5 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -57,7 +57,7 @@ "@types/yargs": "^15.0.4", "clone": "^2.1.2", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jest-expect-message": "^1.0.2", "jsii-build-tools": "^0.0.0" }, diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 9b1765eb69..08fd0db9d0 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -33,7 +33,7 @@ "@types/jest": "^25.1.4", "@types/node": "^10.17.17", "eslint": "^6.8.0", - "jest": "^25.1.0", + "jest": "^25.2.4", "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3" }, diff --git a/yarn.lock b/yarn.lock index 876a957b9c..e34796bc34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -355,7 +355,7 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^25.1.0", "@jest/console@^25.2.3": +"@jest/console@^25.2.3": version "25.2.3" resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.2.3.tgz#38ac19b916ff61457173799239472659e1a67c39" integrity sha512-k+37B1aSvOt9tKHWbZZSOy1jdgzesB0bj96igCVUG1nAH1W5EoUfgc5EXbBVU08KSLvkVdWopLXaO3xfVGlxtQ== @@ -365,41 +365,41 @@ jest-util "^25.2.3" slash "^3.0.0" -"@jest/core@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.1.0.tgz#3d4634fc3348bb2d7532915d67781cdac0869e47" - integrity sha512-iz05+NmwCmZRzMXvMo6KFipW7nzhbpEawrKrkkdJzgytavPse0biEnCNr2wRlyCsp3SmKaEY+SGv7YWYQnIdig== +"@jest/core@^25.2.4": + version "25.2.4" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.2.4.tgz#382ef80369d3311f1df79db1ee19e958ae95cdad" + integrity sha512-WcWYShl0Bqfcb32oXtjwbiR78D/djhMdJW+ulp4/bmHgeODcsieqUJfUH+kEv8M7VNV77E6jds5aA+WuGh1nmg== dependencies: - "@jest/console" "^25.1.0" - "@jest/reporters" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/console" "^25.2.3" + "@jest/reporters" "^25.2.4" + "@jest/test-result" "^25.2.4" + "@jest/transform" "^25.2.4" + "@jest/types" "^25.2.3" ansi-escapes "^4.2.1" chalk "^3.0.0" exit "^0.1.2" graceful-fs "^4.2.3" - jest-changed-files "^25.1.0" - jest-config "^25.1.0" - jest-haste-map "^25.1.0" - jest-message-util "^25.1.0" - jest-regex-util "^25.1.0" - jest-resolve "^25.1.0" - jest-resolve-dependencies "^25.1.0" - jest-runner "^25.1.0" - jest-runtime "^25.1.0" - jest-snapshot "^25.1.0" - jest-util "^25.1.0" - jest-validate "^25.1.0" - jest-watcher "^25.1.0" + jest-changed-files "^25.2.3" + jest-config "^25.2.4" + jest-haste-map "^25.2.3" + jest-message-util "^25.2.4" + jest-regex-util "^25.2.1" + jest-resolve "^25.2.3" + jest-resolve-dependencies "^25.2.4" + jest-runner "^25.2.4" + jest-runtime "^25.2.4" + jest-snapshot "^25.2.4" + jest-util "^25.2.3" + jest-validate "^25.2.3" + jest-watcher "^25.2.4" micromatch "^4.0.2" p-each-series "^2.1.0" - realpath-native "^1.1.0" + realpath-native "^2.0.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^25.1.0", "@jest/environment@^25.2.4": +"@jest/environment@^25.2.4": version "25.2.4" resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.2.4.tgz#74f4d8dd87b427434d0b822cde37bc0e78f3e28b" integrity sha512-wA4xlhD19/gukkDpJ5HQsTle0pgnzI5qMFEjw267lpTDC8d9N7Ihqr5pI+l0p8Qn1SQhai+glSqxrGdzKy4jxw== @@ -419,17 +419,16 @@ jest-util "^25.2.3" lolex "^5.0.0" -"@jest/reporters@^25.1.0": - version "25.1.0" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.1.0.tgz#9178ecf136c48f125674ac328f82ddea46e482b0" - integrity sha512-ORLT7hq2acJQa8N+NKfs68ZtHFnJPxsGqmofxW7v7urVhzJvpKZG9M7FAcgh9Ee1ZbCteMrirHA3m5JfBtAaDg== +"@jest/reporters@^25.2.4": + version "25.2.4" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.2.4.tgz#aa01c20aab217150d3a6080d5c98ce0bf34b17ed" + integrity sha512-VHbLxM03jCc+bTLOluW/IqHR2G0Cl0iATwIQbuZtIUast8IXO4fD0oy4jpVGpG5b20S6REA8U3BaQoCW/CeVNQ== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^25.1.0" - "@jest/environment" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/transform" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/console" "^25.2.3" + "@jest/test-result" "^25.2.4" + "@jest/transform" "^25.2.4" + "@jest/types" "^25.2.3" chalk "^3.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -439,11 +438,10 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.0" - jest-haste-map "^25.1.0" - jest-resolve "^25.1.0" - jest-runtime "^25.1.0" - jest-util "^25.1.0" - jest-worker "^25.1.0" + jest-haste-map "^25.2.3" + jest-resolve "^25.2.3" + jest-util "^25.2.3" + jest-worker "^25.2.1" slash "^3.0.0" source-map "^0.6.0" string-length "^3.1.0" @@ -461,7 +459,7 @@ graceful-fs "^4.2.3" source-map "^0.6.0" -"@jest/test-result@^25.1.0", "@jest/test-result@^25.2.4": +"@jest/test-result@^25.2.4": version "25.2.4" resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.2.4.tgz#8fc9eac58e82eb2a82e4058e68c3814f98f59cf5" integrity sha512-AI7eUy+q2lVhFnaibDFg68NGkrxVWZdD6KBr9Hm6EvN0oAe7GxpEwEavgPfNHQjU2mi6g+NsFn/6QPgTUwM1qg== @@ -482,7 +480,7 @@ jest-runner "^25.2.4" jest-runtime "^25.2.4" -"@jest/transform@^25.1.0", "@jest/transform@^25.2.4": +"@jest/transform@^25.2.4": version "25.2.4" resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.2.4.tgz#34336f37f13f62f7d1f5b93d5d150ba9eb3e11b9" integrity sha512-6eRigvb+G6bs4kW5j1/y8wu4nCrmVuIe0epPBbiWaYlwawJ8yi1EIyK3d/btDqmBpN5GpN4YhR6iPPnDmkYdTA== @@ -504,7 +502,7 @@ source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^25.1.0", "@jest/types@^25.2.1", "@jest/types@^25.2.3": +"@jest/types@^25.2.3": version "25.2.3" resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.3.tgz#035c4fb94e2da472f359ff9a211915d59987f6b6" integrity sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ== @@ -3515,7 +3513,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.16.3, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.4: +es-abstract@^1.16.3, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.4: version "1.17.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== @@ -5148,35 +5146,35 @@ istanbul-reports@^3.0.0: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jest-changed-files@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.1.0.tgz#73dae9a7d9949fdfa5c278438ce8f2ff3ec78131" - integrity sha512-bdL1aHjIVy3HaBO3eEQeemGttsq1BDlHgWcOjEOIAcga7OOEGWHD2WSu8HhL7I1F0mFFyci8VKU4tRNk+qtwDA== +jest-changed-files@^25.2.3: + version "25.2.3" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.2.3.tgz#ad19deef9e47ba37efb432d2c9a67dfd97cc78af" + integrity sha512-EFxy94dvvbqRB36ezIPLKJ4fDIC+jAdNs8i8uTwFpaXd6H3LVc3ova1lNS4ZPWk09OCR2vq5kSdSQgar7zMORg== dependencies: - "@jest/types" "^25.1.0" + "@jest/types" "^25.2.3" execa "^3.2.0" throat "^5.0.0" -jest-cli@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.1.0.tgz#75f0b09cf6c4f39360906bf78d580be1048e4372" - integrity sha512-p+aOfczzzKdo3AsLJlhs8J5EW6ffVidfSZZxXedJ0mHPBOln1DccqFmGCoO8JWd4xRycfmwy1eoQkMsF8oekPg== +jest-cli@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.2.4.tgz#021c2383904696597abc060dcb133c82ebd8bfcc" + integrity sha512-zeY2pRDWKj2LZudIncvvguwLMEdcnJqc2jJbwza1beqi80qqLvkPF/BjbFkK2sIV3r+mfTJS+7ITrvK6pCdRjg== dependencies: - "@jest/core" "^25.1.0" - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/core" "^25.2.4" + "@jest/test-result" "^25.2.4" + "@jest/types" "^25.2.3" chalk "^3.0.0" exit "^0.1.2" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^25.1.0" - jest-util "^25.1.0" - jest-validate "^25.1.0" + jest-config "^25.2.4" + jest-util "^25.2.3" + jest-validate "^25.2.3" prompts "^2.0.1" - realpath-native "^1.1.0" - yargs "^15.0.0" + realpath-native "^2.0.0" + yargs "^15.3.1" -jest-config@^25.1.0, jest-config@^25.2.4: +jest-config@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.2.4.tgz#f4f33238979f225683179c89d1e402893008975d" integrity sha512-fxy3nIpwJqOUQJRVF/q+pNQb6dv5b9YufOeCbpPZJ/md1zXpiupbhfehpfODhnKOfqbzSiigtSLzlWWmbRxnqQ== @@ -5272,7 +5270,7 @@ jest-get-type@^25.2.1: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.1.tgz#6c83de603c41b1627e6964da2f5454e6aa3c13a6" integrity sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w== -jest-haste-map@^25.1.0, jest-haste-map@^25.2.3: +jest-haste-map@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.2.3.tgz#2649392b5af191f0167a27bfb62e5d96d7eaaade" integrity sha512-pAP22OHtPr4qgZlJJFks2LLgoQUr4XtM1a+F5UaPIZNiCRnePA0hM3L7aiJ0gzwiNIYwMTfKRwG/S1L28J3A3A== @@ -5332,7 +5330,7 @@ jest-matcher-utils@^25.2.3: jest-get-type "^25.2.1" pretty-format "^25.2.3" -jest-message-util@^25.1.0, jest-message-util@^25.2.4: +jest-message-util@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.4.tgz#b1441b9c82f5c11fc661303cbf200a2f136a7762" integrity sha512-9wWMH3Bf+GVTv0GcQLmH/FRr0x0toptKw9TA8U5YFLVXx7Tq9pvcNzTyJrcTJ+wLqNbMPPJlJNft4MnlcrtF5Q== @@ -5358,21 +5356,21 @@ jest-pnp-resolver@^1.2.1: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ== -jest-regex-util@^25.1.0, jest-regex-util@^25.2.1: +jest-regex-util@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.1.tgz#db64b0d15cd3642c93b7b9627801d7c518600584" integrity sha512-wroFVJw62LdqTdkL508ZLV82FrJJWVJMIuYG7q4Uunl1WAPTf4ftPKrqqfec4SvOIlvRZUdEX2TFpWR356YG/w== -jest-resolve-dependencies@^25.1.0: - version "25.2.2" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.2.tgz#6643fd4ce4e486844ac0f88bec9963bdb2bbbea4" - integrity sha512-XeBlobvYexxYOUC6PAuISJ3sUeylLEXYmvA1VT1+q3b2m+1tGPxqrZGVOxKgbE7a+L0YfuCq+JVYWzxlNm6zQQ== +jest-resolve-dependencies@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.4.tgz#2d904400387d74a366dff54badb40a2b3210e733" + integrity sha512-qhUnK4PfNHzNdca7Ub1mbAqE0j5WNyMTwxBZZJjQlUrdqsiYho/QGK65FuBkZuSoYtKIIqriR9TpGrPEc3P5Gg== dependencies: - "@jest/types" "^25.2.1" + "@jest/types" "^25.2.3" jest-regex-util "^25.2.1" - jest-snapshot "^25.2.1" + jest-snapshot "^25.2.4" -jest-resolve@^25.1.0, jest-resolve@^25.2.3: +jest-resolve@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.2.3.tgz#ababeaf2bb948cb6d2dea8453759116da0fb7842" integrity sha512-1vZMsvM/DBH258PnpUNSXIgtzpYz+vCVCj9+fcy4akZl4oKbD+9hZSlfe9RIDpU0Fc28ozHQrmwX3EqFRRIHGg== @@ -5384,7 +5382,7 @@ jest-resolve@^25.1.0, jest-resolve@^25.2.3: realpath-native "^2.0.0" resolve "^1.15.1" -jest-runner@^25.1.0, jest-runner@^25.2.4: +jest-runner@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.2.4.tgz#d0daf7c56b4a83b6b675863d5cdcd502c960f9a1" integrity sha512-5xaIfqqxck9Wg2CV4b9KmJtf/sWO7zWQx7O+34GCLGPzoPcVmB3mZtdrQI1/jS3Reqjru9ycLjgLHSf6XoxRqA== @@ -5409,7 +5407,7 @@ jest-runner@^25.1.0, jest-runner@^25.2.4: source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^25.1.0, jest-runtime@^25.2.4: +jest-runtime@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.2.4.tgz#c66a421e115944426b377a7fd331f6c0902cfa56" integrity sha512-6ehOUizgIghN+aV5YSrDzTZ+zJ9omgEjJbTHj3Jqes5D52XHfhzT7cSfdREwkNjRytrR7mNwZ7pRauoyNLyJ8Q== @@ -5445,7 +5443,7 @@ jest-serializer@^25.2.1: resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.1.tgz#51727a5fc04256f461abe0fa024a022ba165877a" integrity sha512-fibDi7M5ffx6c/P66IkvR4FKkjG5ldePAK1WlbNoaU4GZmIAkS9Le/frAwRUFEX0KdnisSPWf+b1RC5jU7EYJQ== -jest-snapshot@^25.1.0, jest-snapshot@^25.2.1, jest-snapshot@^25.2.4: +jest-snapshot@^25.2.4: version "25.2.4" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.2.4.tgz#08d4517579c864df4280bcc948ceea34327a4ded" integrity sha512-nIwpW7FZCq5p0AE3Oyqyb6jL0ENJixXzJ5/CD/XRuOqp3gS5OM3O/k+NnTrniCXxPFV4ry6s9HNfiPQBi0wcoA== @@ -5465,7 +5463,7 @@ jest-snapshot@^25.1.0, jest-snapshot@^25.2.1, jest-snapshot@^25.2.4: pretty-format "^25.2.3" semver "^6.3.0" -jest-util@^25.1.0, jest-util@^25.2.3: +jest-util@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.3.tgz#0abf95a1d6b96f2de5a3ecd61b36c40a182dc256" integrity sha512-7tWiMICVSo9lNoObFtqLt9Ezt5exdFlWs5fLe1G4XLY2lEbZc814cw9t4YHScqBkWMfzth8ASHKlYBxiX2rdCw== @@ -5475,7 +5473,7 @@ jest-util@^25.1.0, jest-util@^25.2.3: is-ci "^2.0.0" make-dir "^3.0.0" -jest-validate@^25.1.0, jest-validate@^25.2.3: +jest-validate@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.2.3.tgz#ecb0f093cf8ae71d15075fb48439b6f78f1fcb5a" integrity sha512-GObn91jzU0B0Bv4cusAwjP6vnWy78hJUM8MOSz7keRfnac/ZhQWIsUjvk01IfeXNTemCwgR57EtdjQMzFZGREg== @@ -5487,19 +5485,19 @@ jest-validate@^25.1.0, jest-validate@^25.2.3: leven "^3.1.0" pretty-format "^25.2.3" -jest-watcher@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.1.0.tgz#97cb4a937f676f64c9fad2d07b824c56808e9806" - integrity sha512-Q9eZ7pyaIr6xfU24OeTg4z1fUqBF/4MP6J801lyQfg7CsnZ/TCzAPvCfckKdL5dlBBEKBeHV0AdyjFZ5eWj4ig== +jest-watcher@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.2.4.tgz#dda85b914d470fa4145164a8f70bda4f208bafb6" + integrity sha512-p7g7s3zqcy69slVzQYcphyzkB2FBmJwMbv6k6KjI5mqd6KnUnQPfQVKuVj2l+34EeuxnbXqnrjtUFmxhcL87rg== dependencies: - "@jest/test-result" "^25.1.0" - "@jest/types" "^25.1.0" + "@jest/test-result" "^25.2.4" + "@jest/types" "^25.2.3" ansi-escapes "^4.2.1" chalk "^3.0.0" - jest-util "^25.1.0" + jest-util "^25.2.3" string-length "^3.1.0" -jest-worker@^25.1.0, jest-worker@^25.2.1: +jest-worker@^25.2.1: version "25.2.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.1.tgz#209617015c768652646aa33a7828cc2ab472a18a" integrity sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ== @@ -5507,14 +5505,14 @@ jest-worker@^25.1.0, jest-worker@^25.2.1: merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^25.1.0: - version "25.1.0" - resolved "https://registry.yarnpkg.com/jest/-/jest-25.1.0.tgz#b85ef1ddba2fdb00d295deebbd13567106d35be9" - integrity sha512-FV6jEruneBhokkt9MQk0WUFoNTwnF76CLXtwNMfsc0um0TlB/LG2yxUd0KqaFjEJ9laQmVWQWS0sG/t2GsuI0w== +jest@^25.2.4: + version "25.2.4" + resolved "https://registry.yarnpkg.com/jest/-/jest-25.2.4.tgz#d10941948a2b57eb7accc2e7ae78af4a0e11b40a" + integrity sha512-Lu4LXxf4+durzN/IFilcAoQSisOwgHIXgl9vffopePpSSwFqfj1Pj4y+k3nL8oTbnvjxgDIsEcepy6he4bWqnQ== dependencies: - "@jest/core" "^25.1.0" + "@jest/core" "^25.2.4" import-local "^3.0.2" - jest-cli "^25.1.0" + jest-cli "^25.2.4" js-tokens@^4.0.0: version "4.0.0" @@ -6649,7 +6647,7 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: +object.getownpropertydescriptors@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg== @@ -7437,13 +7435,6 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -realpath-native@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c" - integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA== - dependencies: - util.promisify "^1.0.0" - realpath-native@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" @@ -8847,16 +8838,6 @@ util-promisify@^2.1.0: dependencies: object.getownpropertydescriptors "^2.0.3" -util.promisify@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" - integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.2" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.0" - util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" @@ -9363,7 +9344,7 @@ yargs@^14.0.0, yargs@^14.2.2: y18n "^4.0.0" yargs-parser "^15.0.1" -yargs@^15.0.0, yargs@^15.3.1: +yargs@^15.3.1: version "15.3.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA== From 0c8606b8c9c3f35919a7cd24456e00f032e97239 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 10:00:08 +0000 Subject: [PATCH 63/74] chore(deps): bump flatted from 2.0.1 to 2.0.2 (#1440) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index e34796bc34..9b97caa0ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4035,9 +4035,9 @@ flat-cache@^2.0.1: write "1.0.3" flatted@^2.0.0, flatted@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" - integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== flush-write-stream@^1.0.0: version "1.1.1" From a4dbbca4efbf7f26f29c5898ca54bde9d8a42eb6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 10:22:20 +0000 Subject: [PATCH 64/74] chore(deps): bump jest-diff from 25.2.1 to 25.2.3 (#1438) --- yarn.lock | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9b97caa0ea..584d59e5c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5198,17 +5198,7 @@ jest-config@^25.2.4: pretty-format "^25.2.3" realpath-native "^2.0.0" -jest-diff@^25.1.0: - version "25.2.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.1.tgz#8c073596cc88356227c86a50d71a23d8a9dfa81a" - integrity sha512-e/TU8VLBBGQQS9tXA5B5LeT806jh7CHUeHbBfrU9UvA2zTbOTRz71UD6fAP1HAhzUEyCVLU2ZP5e8X16A9b0Fg== - dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.1" - jest-get-type "^25.2.1" - pretty-format "^25.2.1" - -jest-diff@^25.2.3: +jest-diff@^25.1.0, jest-diff@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.3.tgz#54d601a0a754ef26e808a8c8dbadd278c215aa3f" integrity sha512-VtZ6LAQtaQpFsmEzps15dQc5ELbJxy4L2DOSo2Ev411TUEtnJPkAMD7JneVypeMJQ1y3hgxN9Ao13n15FAnavg== @@ -7111,7 +7101,7 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -pretty-format@^25.1.0, pretty-format@^25.2.1, pretty-format@^25.2.3: +pretty-format@^25.1.0, pretty-format@^25.2.3: version "25.2.3" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.2.3.tgz#ba6e9603a0d80fa2e470b1fed55de1f9bfd81421" integrity sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w== From aa7bc6866bff31cd8d913ae6f3fe735e6543cd22 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 10:44:28 +0000 Subject: [PATCH 65/74] chore(deps): bump string.prototype.trimright from 2.1.1 to 2.1.2 (#1437) --- yarn.lock | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index 584d59e5c5..30ad4f2386 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3513,7 +3513,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.16.3, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.4: +es-abstract@^1.16.3, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5: version "1.17.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== @@ -8203,21 +8203,39 @@ string.prototype.repeat@^0.2.0: resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf" integrity sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8= +string.prototype.trimend@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373" + integrity sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.17.5" + string.prototype.trimstart "^1.0.0" string.prototype.trimright@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" - integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.17.5" + string.prototype.trimend "^1.0.0" + +string.prototype.trimstart@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz#afe596a7ce9de905496919406c9734845f01a2f2" + integrity sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" From 2846b938f68b6a41a207d5d414ae505796393681 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 11:06:35 +0000 Subject: [PATCH 66/74] chore(deps): bump terser from 4.6.7 to 4.6.9 (#1445) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 30ad4f2386..d6fc5fe9b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8462,9 +8462,9 @@ terser-webpack-plugin@^1.4.3: worker-farm "^1.7.0" terser@^4.1.2: - version "4.6.7" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72" - integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g== + version "4.6.9" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.9.tgz#deec3d8c4536461f46392e4d457bcd1ba2ab1212" + integrity sha512-9UuZOApK4oiTpX4AjnWhTCY3fCqntS3ggPQOku9M3Rvr70VETYsuHjSGuRy0D7X/Z994hfnzMy6TQ/H0WQSmXQ== dependencies: commander "^2.20.0" source-map "~0.6.1" From 8f6a211621c594c6e8b41d6b4b4074ef729fad05 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 11:28:40 +0000 Subject: [PATCH 67/74] chore(deps): bump uglify-js from 3.8.0 to 3.8.1 (#1441) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index d6fc5fe9b1..c8bb9f2cd6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8731,9 +8731,9 @@ typescript@^3.5.3, typescript@~3.8.3: integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== uglify-js@^3.1.4: - version "3.8.0" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805" - integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ== + version "3.8.1" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.1.tgz#43bb15ce6f545eaa0a64c49fd29375ea09fa0f93" + integrity sha512-W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw== dependencies: commander "~2.20.3" source-map "~0.6.1" From 6b75e97011172148c7685e9753463e32717fe33c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 11:51:00 +0000 Subject: [PATCH 68/74] chore(deps): bump v8-to-istanbul from 4.1.2 to 4.1.3 (#1439) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c8bb9f2cd6..34e7de74cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8876,9 +8876,9 @@ v8-compile-cache@^2.0.3: integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== v8-to-istanbul@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.2.tgz#387d173be5383dbec209d21af033dcb892e3ac82" - integrity sha512-G9R+Hpw0ITAmPSr47lSlc5A1uekSYzXxTMlFxso2xoffwo4jQnzbv1p9yXIinO8UMZKfAFewaCHwWvnH4Jb4Ug== + version "4.1.3" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20" + integrity sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" From fd4ed5280acac0b2a97673d8ec9ccd558efc1989 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 12:14:24 +0000 Subject: [PATCH 69/74] chore(deps-dev): bump @types/node from 10.17.17 to 10.17.18 (#1446) --- packages/@jsii/dotnet-analyzers/package.json | 2 +- packages/@jsii/dotnet-jsonmodel/package.json | 2 +- packages/@jsii/dotnet-runtime-test/package.json | 2 +- packages/@jsii/dotnet-runtime/package.json | 2 +- packages/@jsii/integ-test/package.json | 2 +- packages/@jsii/java-runtime/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/ruby-runtime/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- packages/@scope/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 | 2 +- packages/jsii-calc/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 8 ++++---- 23 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/@jsii/dotnet-analyzers/package.json b/packages/@jsii/dotnet-analyzers/package.json index 950953af5f..1099e9dfdf 100644 --- a/packages/@jsii/dotnet-analyzers/package.json +++ b/packages/@jsii/dotnet-analyzers/package.json @@ -37,7 +37,7 @@ "package": "package-dotnet" }, "devDependencies": { - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3" } diff --git a/packages/@jsii/dotnet-jsonmodel/package.json b/packages/@jsii/dotnet-jsonmodel/package.json index 087cd212f0..b36d7c7499 100644 --- a/packages/@jsii/dotnet-jsonmodel/package.json +++ b/packages/@jsii/dotnet-jsonmodel/package.json @@ -35,7 +35,7 @@ "package": "package-dotnet" }, "devDependencies": { - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3" } diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index 29e8157399..eaade210ce 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.17", + "@types/node": "^10.17.18", "jsii-calc": "^0.0.0", "jsii-pacmak": "^0.0.0", "typescript": "~3.8.3" diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index e412b08dff..9714176488 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@jsii/dotnet-jsonmodel": "^0.0.0", "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/semver": "^7.1.0", "jsii-build-tools": "^0.0.0", "semver": "^7.1.3", diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index bdc276a8ae..f46c3f5444 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -29,7 +29,7 @@ "@types/dotenv": "^8.2.0", "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/tar": "^4.0.3", "eslint": "^6.8.0", "typescript": "~3.8.3" diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index 0814954228..18a65c457b 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "jsii-build-tools": "^0.0.0", "typescript": "~3.8.3" } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index d834dc1be5..33b0f5e6ef 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -41,7 +41,7 @@ "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", "@types/jest-expect-message": "^1.0.1", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/tar": "^4.0.3", "eslint": "^6.8.0", "jest": "^25.2.4", diff --git a/packages/@jsii/ruby-runtime/package.json b/packages/@jsii/ruby-runtime/package.json index 625ce3c06e..d07f109720 100644 --- a/packages/@jsii/ruby-runtime/package.json +++ b/packages/@jsii/ruby-runtime/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "jsii-build-tools": "^0.0.0", "jsii-calc": "^0.0.0", "jsii-pacmak": "^0.0.0", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 2727d7a536..7b56e434bf 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -40,7 +40,7 @@ "@scope/jsii-calc-base": "^0.0.0", "@scope/jsii-calc-lib": "^0.0.0", "@types/jest": "^25.1.4", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "eslint": "^6.8.0", "jest": "^25.2.4", "jsii-build-tools": "^0.0.0", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index 51f1a52b50..6c2c088ecc 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@types/jest": "^25.1.4", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "eslint": "^6.8.0", "jest": "^25.2.4", "jsii-build-tools": "^0.0.0", diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index d1cfe31a44..27f3ef12df 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -29,7 +29,7 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "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 536a44ad41..a150b871e9 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": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "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 c57afedd80..7ad11808a2 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -38,7 +38,7 @@ "@scope/jsii-calc-base-of-base": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "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 9964d898f6..a52b94b7c5 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -38,7 +38,7 @@ "@types/decamelize": "^1.2.0", "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "eslint": "^6.8.0", "jest": "^25.2.4", "typescript": "~3.8.3" diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index a787ea34e1..4e2eabd41d 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -47,7 +47,7 @@ "@scope/jsii-calc-lib": "^0.0.0" }, "devDependencies": { - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "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 e7acc87cd7..c2963ad322 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -21,7 +21,7 @@ "@types/inquirer": "^6.5.0", "@types/jest": "^25.1.4", "@types/jest-expect-message": "^1.0.1", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", "jest": "^25.2.4", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 9b4857804a..feb1566e86 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -43,7 +43,7 @@ "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", "@types/jest-expect-message": "^1.0.1", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/tar-fs": "^1.16.3", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index ef91b97704..fe07eb4b17 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -58,7 +58,7 @@ "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", "@types/mock-fs": "^4.10.0", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/semver": "^7.1.0", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index ec40a2fce5..1fc6de40f1 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -43,7 +43,7 @@ "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", "jest": "^25.2.4", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index b9bf3e2d6b..4f6d564f9e 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -19,7 +19,7 @@ "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", "@types/mock-fs": "^4.10.0", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/yargs": "^15.0.4", "eslint": "^6.8.0", "jest": "^25.2.4", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 57c1decce5..d96a15e753 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -52,7 +52,7 @@ "@types/fs-extra": "^8.1.0", "@types/jest": "^25.1.4", "@types/jest-expect-message": "^1.0.1", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "@types/semver": "^7.1.0", "@types/yargs": "^15.0.4", "clone": "^2.1.2", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 08fd0db9d0..6236129343 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@types/jest": "^25.1.4", - "@types/node": "^10.17.17", + "@types/node": "^10.17.18", "eslint": "^6.8.0", "jest": "^25.2.4", "jsii-build-tools": "^0.0.0", diff --git a/yarn.lock b/yarn.lock index 34e7de74cc..8d93f1067b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1478,10 +1478,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.1.tgz#96f606f8cd67fb018847d9b61e93997dabdefc72" integrity sha512-E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ== -"@types/node@^10.17.17": - version "10.17.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.17.tgz#7a183163a9e6ff720d86502db23ba4aade5999b8" - integrity sha512-gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q== +"@types/node@^10.17.18": + version "10.17.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.18.tgz#ae364d97382aacdebf583fa4e7132af2dfe56a0c" + integrity sha512-DQ2hl/Jl3g33KuAUOcMrcAOtsbzb+y/ufakzAdeK9z/H/xsvkpbETZZbPNMIiQuk24f5ZRMCcZIViAwyFIiKmg== "@types/prettier@^1.19.0": version "1.19.1" From 4f52a42a5b1ff6f48e0040ac3f29ceed7ea44579 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 12:36:58 +0000 Subject: [PATCH 70/74] chore(deps-dev): bump @typescript-eslint/parser from 2.25.0 to 2.26.0 (#1442) --- package.json | 2 +- yarn.lock | 35 +++++++++++++++++++++++++++++------ 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 9715feeee8..54feb0fcdc 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^2.25.0", - "@typescript-eslint/parser": "^2.25.0", + "@typescript-eslint/parser": "^2.26.0", "eslint": "^6.8.0", "eslint-import-resolver-node": "^0.3.3", "eslint-import-resolver-typescript": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 8d93f1067b..137dd3f6a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1562,14 +1562,24 @@ eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^2.25.0": - version "2.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.25.0.tgz#abfb3d999084824d9a756d9b9c0f36fba03adb76" - integrity sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg== +"@typescript-eslint/experimental-utils@2.26.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz#063390c404d9980767d76274df386c0aa675d91d" + integrity sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.26.0" + eslint-scope "^5.0.0" + eslint-utils "^2.0.0" + +"@typescript-eslint/parser@^2.26.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.26.0.tgz#385463615818b33acb72a25b39c03579df93d76f" + integrity sha512-+Xj5fucDtdKEVGSh9353wcnseMRkPpEAOY96EEenN7kJVrLqy/EVwtIh3mxcUz8lsFXW1mT5nN5vvEam/a5HiQ== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.25.0" - "@typescript-eslint/typescript-estree" "2.25.0" + "@typescript-eslint/experimental-utils" "2.26.0" + "@typescript-eslint/typescript-estree" "2.26.0" eslint-visitor-keys "^1.1.0" "@typescript-eslint/typescript-estree@2.25.0": @@ -1585,6 +1595,19 @@ semver "^6.3.0" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@2.26.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz#d8132cf1ee8a72234f996519a47d8a9118b57d56" + integrity sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg== + dependencies: + debug "^4.1.1" + eslint-visitor-keys "^1.1.0" + glob "^7.1.6" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^6.3.0" + tsutils "^3.17.1" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" From 8bbcd498bd86c1ee06c994f94e2f0a602208bc2a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 13:01:30 +0000 Subject: [PATCH 71/74] chore(deps-dev): bump @typescript-eslint/eslint-plugin (#1443) --- package.json | 2 +- yarn.lock | 33 +++++---------------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 54feb0fcdc..f04f877ecc 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "test:update": "lerna run test:update --stream" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.25.0", + "@typescript-eslint/eslint-plugin": "^2.26.0", "@typescript-eslint/parser": "^2.26.0", "eslint": "^6.8.0", "eslint-import-resolver-node": "^0.3.3", diff --git a/yarn.lock b/yarn.lock index 137dd3f6a1..ec99a331af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1542,26 +1542,16 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^2.25.0": - version "2.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz#0b60917332f20dcff54d0eb9be2a9e9f4c9fbd02" - integrity sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw== +"@typescript-eslint/eslint-plugin@^2.26.0": + version "2.26.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz#04c96560c8981421e5a9caad8394192363cc423f" + integrity sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw== dependencies: - "@typescript-eslint/experimental-utils" "2.25.0" + "@typescript-eslint/experimental-utils" "2.26.0" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.25.0": - version "2.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz#13691c4fe368bd377b1e5b1e4ad660b220bf7714" - integrity sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.25.0" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" - "@typescript-eslint/experimental-utils@2.26.0": version "2.26.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz#063390c404d9980767d76274df386c0aa675d91d" @@ -1582,19 +1572,6 @@ "@typescript-eslint/typescript-estree" "2.26.0" eslint-visitor-keys "^1.1.0" -"@typescript-eslint/typescript-estree@2.25.0": - version "2.25.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz#b790497556734b7476fa7dd3fa539955a5c79e2c" - integrity sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg== - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@2.26.0": version "2.26.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz#d8132cf1ee8a72234f996519a47d8a9118b57d56" From 077464777970b03568f8f962700b518a83492fe7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 16:30:05 +0000 Subject: [PATCH 72/74] chore(deps): bump node-fetch-npm from 2.0.3 to 2.0.4 (#1447) --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ec99a331af..72a6ab618b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6362,9 +6362,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-fetch-npm@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.3.tgz#efae4aacb0500444e449a51fc1467397775ebc38" - integrity sha512-DgwoKEsqLnFZtk3ap7GWBHcHwnUhsNmQqEDcdjfQ8GofLEFJ081NAd4Uin3R7RFZBWVJCwHISw1oaEqPgSLloA== + version "2.0.4" + resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz#6507d0e17a9ec0be3bec516958a497cec54bf5a4" + integrity sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg== dependencies: encoding "^0.1.11" json-parse-better-errors "^1.0.0" From 015fa6164cd7465621be0cf87ffe24da653f9142 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 16:53:43 +0000 Subject: [PATCH 73/74] chore(deps-dev): bump eslint-plugin-import from 2.20.1 to 2.20.2 (#1448) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f04f877ecc..b98dd4b8b1 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "eslint": "^6.8.0", "eslint-import-resolver-node": "^0.3.3", "eslint-import-resolver-typescript": "^2.0.0", - "eslint-plugin-import": "^2.20.1", + "eslint-plugin-import": "^2.20.2", "lerna": "^3.20.2", "standard-version": "^7.1.0" }, diff --git a/yarn.lock b/yarn.lock index 72a6ab618b..1bff0c4327 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3613,10 +3613,10 @@ eslint-module-utils@^2.4.1: debug "^2.6.9" pkg-dir "^2.0.0" -eslint-plugin-import@^2.20.1: - version "2.20.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" - integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw== +eslint-plugin-import@^2.20.2: + version "2.20.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d" + integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg== dependencies: array-includes "^3.0.3" array.prototype.flat "^1.2.1" From 975da5dee456603222ffa7cf4058373780169949 Mon Sep 17 00:00:00 2001 From: AWS CDK Team Date: Tue, 31 Mar 2020 23:40:24 +0000 Subject: [PATCH 74/74] chore(release): 1.2.0 --- CHANGELOG.md | 25 ++++++++++++++++++++++--- lerna.json | 2 +- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77f03d302d..1f0325f831 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,26 @@ -# Change Log +# Changelog -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +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.2.0](https://github.com/aws/jsii/compare/v1.0.0...v1.2.0) (2020-03-31) + + +### Features + +* **jsii:** introduce submodules feature ([#1297](https://github.com/aws/jsii/issues/1297)) ([2df5d90](https://github.com/aws/jsii/commit/2df5d90f831808d02a4d697946a18065f3ae5ef2)), closes [#1286](https://github.com/aws/jsii/issues/1286) +* add autobump script ([#1335](https://github.com/aws/jsii/issues/1335)) ([bdda569](https://github.com/aws/jsii/commit/bdda569729db83abe09edb9f9d922ba4194cd847)) + + +### Bug Fixes + +* **diff:** check super types ([#1354](https://github.com/aws/jsii/issues/1354)) ([b08f65f](https://github.com/aws/jsii/commit/b08f65feab97133ead27857233384d788676ce80)) +* **dotnet:** missing ? on nullable interface members ([#1287](https://github.com/aws/jsii/issues/1287)) ([9299db2](https://github.com/aws/jsii/commit/9299db25348504a4e413a047ce9ba914fb0f8856)), closes [#1285](https://github.com/aws/jsii/issues/1285) +* **dotnet-analyzers:** unit test null reference ([#1341](https://github.com/aws/jsii/issues/1341)) ([6b88509](https://github.com/aws/jsii/commit/6b88509ef84891005d6dc904828bbce9c81a9cc3)) +* **jsii:** missing context on "Message" diagnostics ([#1298](https://github.com/aws/jsii/issues/1298)) ([c44f5f3](https://github.com/aws/jsii/commit/c44f5f30b77225e463d80c2e01e519e40d5601c5)) +* **jsii:** out-of-source builds are broken ([#1344](https://github.com/aws/jsii/issues/1344)) ([aecdc5e](https://github.com/aws/jsii/commit/aecdc5eecc540e11f91c761de41bcf36c2f88f20)), closes [#1273](https://github.com/aws/jsii/issues/1273) +* **jsii:** single-valued enums are not processed correctly ([#1406](https://github.com/aws/jsii/issues/1406)) ([39425a4](https://github.com/aws/jsii/commit/39425a4caabcfe3d199f0dc04ee507b57905071d)), closes [aws/aws-cdk#6712](https://github.com/aws/aws-cdk/issues/6712) [aws/aws-cdk#6948](https://github.com/aws/aws-cdk/issues/6948) +* **kernel:** "any" serialization breaks private type instances ([#1347](https://github.com/aws/jsii/issues/1347)) ([655adeb](https://github.com/aws/jsii/commit/655adeb9f3e9617049fbbe9160b9ef15218790be)), closes [aws/aws-cdk#6746](https://github.com/aws/aws-cdk/issues/6746) +* **python-runtime:** KernelResponse missing types ([#1332](https://github.com/aws/jsii/issues/1332)) ([fcafab4](https://github.com/aws/jsii/commit/fcafab48c97e14ba76585d186041b0e8af79cf3a)) # [1.1.0](https://github.com/aws/jsii/compare/v1.0.0...v1.1.0) (2020-03-10) diff --git a/lerna.json b/lerna.json index 8c03625e65..faf7157a8b 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "rejectCycles": true } }, - "version": "1.1.0" + "version": "1.2.0" }