From 2d2ddd782cf6307c7c459a25bc5a06796468c9e3 Mon Sep 17 00:00:00 2001 From: AWS CDK Automation <43080478+aws-cdk-automation@users.noreply.github.com> Date: Mon, 22 May 2023 16:37:30 -0400 Subject: [PATCH] chore(release): 1.82.0 (#4114) See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.82.0/CHANGELOG.md) --------- Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Romain Marcadier Co-authored-by: Rico Hermans Co-authored-by: AWS CDK Team --- CHANGELOG.md | 16 + gh-pages/requirements-dev.txt | 6 +- lerna.json | 2 +- package.json | 14 +- packages/@jsii/Directory.Build.targets | 2 +- packages/@jsii/benchmarks/package.json | 4 +- packages/@jsii/check-node/package.json | 2 +- packages/@jsii/dotnet-runtime/package.json | 4 +- .../go-runtime-test/project/callbacks_test.go | 18 + packages/@jsii/go-runtime-test/project/go.mod | 6 +- packages/@jsii/go-runtime-test/project/go.sum | 14 +- .../@jsii/go-runtime/jsii-runtime-go/go.mod | 6 +- .../@jsii/go-runtime/jsii-runtime-go/go.sum | 14 +- .../internal/kernel/callbacks.go | 106 +- .../internal/kernel/manage-object.go | 56 + packages/@jsii/integ-test/package.json | 4 +- packages/@jsii/kernel/package.json | 4 +- packages/@jsii/python-runtime/package.json | 2 +- .../@jsii/python-runtime/requirements.txt | 4 +- packages/@jsii/runtime/package.json | 4 +- packages/@scope/jsii-calc-lib/lib/index.ts | 9 + .../@scope/jsii-calc-lib/test/assembly.jsii | 51 +- packages/jsii-calc/lib/compliance.ts | 21 + packages/jsii-calc/lib/documented.ts | 27 + packages/jsii-calc/test/assembly.jsii | 143 +- packages/jsii-pacmak/lib/index.ts | 2 + .../lib/suppress-jsii-upgrade-prompts.ts | 2 + packages/jsii-pacmak/lib/targets/java.ts | 51 +- packages/jsii-pacmak/package.json | 6 +- .../__snapshots__/examples.test.js.snap | 4 + .../prerelease-identifiers.test.js.snap | 8 + .../__snapshots__/target-dotnet.test.js.snap | 233 +++ .../__snapshots__/target-go.test.js.snap | 345 ++++ .../__snapshots__/target-java.test.js.snap | 383 +++- .../__snapshots__/target-python.test.js.snap | 534 ++++-- .../test/generated-code/harness.ts | 6 + .../generated-code/python-pyright.test.ts | 4 +- .../test/generated-code/requirements-dev.txt | 4 +- .../test/__snapshots__/jsii-tree.test.js.snap | 55 + .../test/__snapshots__/tree.test.js.snap | 37 + .../__snapshots__/type-system.test.js.snap | 3 + packages/jsii-rosetta/lib/index.ts | 4 +- packages/jsii-rosetta/lib/upgrade-prompt.ts | 3 + packages/jsii-rosetta/package.json | 4 +- packages/jsii/package.json | 4 +- superchain/Dockerfile | 19 +- superchain/README.md | 19 +- yarn.lock | 1558 +++++++++-------- 48 files changed, 2838 insertions(+), 989 deletions(-) create mode 100644 packages/jsii-pacmak/lib/suppress-jsii-upgrade-prompts.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c07049c19..428d90e9d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,22 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.82.0](https://github.com/aws/jsii/compare/v1.81.0...v1.82.0) (2023-05-22) + + +### Features + +* **go:** register exported properties as callbacks ([#4104](https://github.com/aws/jsii/issues/4104)) ([fa921ec](https://github.com/aws/jsii/commit/fa921ecfb1dab52144e89cbbeeba0b334779cde9)), closes [cdk8s-team/cdk8s#1326](https://github.com/cdk8s-team/cdk8s/issues/1326) +* **superchain:** switch to JDK 20 ([#4082](https://github.com/aws/jsii/issues/4082)) ([f0a1dfc](https://github.com/aws/jsii/commit/f0a1dfce8edb06a1b71758b49886580e6ee271ff)) + + +### Bug Fixes + +* **jsii-pacmak:** disable `doclint` ([#4103](https://github.com/aws/jsii/issues/4103)) ([30afa09](https://github.com/aws/jsii/commit/30afa095e296d71d3700a2a56a36483a92c5457d)) +* **jsii-pacmak:** emit correct `[@return](https://github.com/return)` tag for JavaDocs ([#4095](https://github.com/aws/jsii/issues/4095)) ([fc7ab7c](https://github.com/aws/jsii/commit/fc7ab7c57f4a94949794cc963bbf644ad491d246)) +* **jsii-pacmak:** escape documentation in all positions ([#4096](https://github.com/aws/jsii/issues/4096)) ([6a2248d](https://github.com/aws/jsii/commit/6a2248dde982d2758976cc1b5d4c3e7676b0f204)) +* **pacmak:** _ is not treated as a keyword in Java ([#4094](https://github.com/aws/jsii/issues/4094)) ([eaaf3ee](https://github.com/aws/jsii/commit/eaaf3ee20ad64ba5d5ed4441aa12f27f024e7c85)) + ## [1.81.0](https://github.com/aws/jsii/compare/v1.80.0...v1.81.0) (2023-05-10) diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt index fc83e533c0..17e727366d 100644 --- a/gh-pages/requirements-dev.txt +++ b/gh-pages/requirements-dev.txt @@ -1,4 +1,4 @@ -mkdocs~=1.4.2 -mkdocs-awesome-pages-plugin~=2.9.0 -mkdocs-material~=9.1.8 +mkdocs~=1.4.3 +mkdocs-awesome-pages-plugin~=2.9.1 +mkdocs-material~=9.1.12 mkdocs-git-revision-date-plugin~=0.3.2 diff --git a/lerna.json b/lerna.json index 110cab4012..fe5f3e0d13 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "rejectCycles": true } }, - "version": "1.81.0" + "version": "1.82.0" } diff --git a/package.json b/package.json index 2d445e5e66..61b70a45c6 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,11 @@ "devDependencies": { "@jest/types": "^28.1.3", "@types/jest": "^29.5.1", - "@types/node": "^14.18.42", - "@typescript-eslint/eslint-plugin": "^5.59.0", - "@typescript-eslint/parser": "^5.59.0", - "all-contributors-cli": "^6.24.0", - "eslint": "^8.38.0", + "@types/node": "^14.18.47", + "@typescript-eslint/eslint-plugin": "^5.59.6", + "@typescript-eslint/parser": "^5.59.6", + "all-contributors-cli": "^6.25.1", + "eslint": "^8.40.0", "eslint-config-prettier": "^8.8.0", "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.5", @@ -31,8 +31,8 @@ "jest-circus": "^28.1.3", "jest-config": "^28.1.3", "jest-expect-message": "^1.1.3", - "lerna": "^6.6.1", - "prettier": "^2.8.7", + "lerna": "^6.6.2", + "prettier": "^2.8.8", "standard-version": "^9.5.0", "ts-node": "^10.9.1", "typescript": "~4.7.4" diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index da0bf3d1d0..ff20a64312 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -6,7 +6,7 @@ - + diff --git a/packages/@jsii/benchmarks/package.json b/packages/@jsii/benchmarks/package.json index ceddb3ac05..d9d8fed019 100644 --- a/packages/@jsii/benchmarks/package.json +++ b/packages/@jsii/benchmarks/package.json @@ -8,13 +8,13 @@ "fs-extra": "^10.1.0", "jsii": "^0.0.0", "npm": "^8.19.4", - "tar": "^6.1.13", + "tar": "^6.1.15", "typescript": "~3.9.10", "yargs": "^16.2.0" }, "devDependencies": { "@types/glob": "^8.1.0", - "glob": "^10.2.1" + "glob": "^10.2.4" }, "scripts": { "build": "yarn --silent tsc --build && npm run lint", diff --git a/packages/@jsii/check-node/package.json b/packages/@jsii/check-node/package.json index 331f2ada39..f715048683 100644 --- a/packages/@jsii/check-node/package.json +++ b/packages/@jsii/check-node/package.json @@ -37,6 +37,6 @@ }, "dependencies": { "chalk": "^4.1.2", - "semver": "^7.5.0" + "semver": "^7.5.1" } } diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index eb4b13c815..9f4ddca442 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -39,8 +39,8 @@ }, "devDependencies": { "@jsii/runtime": "^0.0.0", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "jsii-build-tools": "^0.0.0", - "semver": "^7.5.0" + "semver": "^7.5.1" } } diff --git a/packages/@jsii/go-runtime-test/project/callbacks_test.go b/packages/@jsii/go-runtime-test/project/callbacks_test.go index 4bb70bbc70..cca7983571 100644 --- a/packages/@jsii/go-runtime-test/project/callbacks_test.go +++ b/packages/@jsii/go-runtime-test/project/callbacks_test.go @@ -3,6 +3,7 @@ package tests import ( "testing" + "github.com/aws/jsii-runtime-go" calc "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3" ) @@ -18,6 +19,17 @@ func TestPureInterfacesCanBeUsedTransparently(t *testing.T) { } } +func TestPropertyAccessThroughAny(t *testing.T) { + any := &ABC{ + PropA: "Hello", + ProbB: "World", + } + calc.AnyPropertyAccess_MutateProperties(any, jsii.String("a"), jsii.String("b"), jsii.String("result")) + if *any.PropC != "Hello+World" { + t.Errorf("Expected Hello+World; actual %v", any.PropC) + } +} + type StructReturningDelegate struct { expected *calc.StructB } @@ -25,3 +37,9 @@ type StructReturningDelegate struct { func (o *StructReturningDelegate) ReturnStruct() *calc.StructB { return o.expected } + +type ABC struct { + PropA string `json:"a"` + ProbB string `json:"b"` + PropC *string `json:"result,omitempty"` +} diff --git a/packages/@jsii/go-runtime-test/project/go.mod b/packages/@jsii/go-runtime-test/project/go.mod index 6010b4a7f4..80e4400c4a 100644 --- a/packages/@jsii/go-runtime-test/project/go.mod +++ b/packages/@jsii/go-runtime-test/project/go.mod @@ -9,18 +9,18 @@ require ( github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview github.com/stretchr/testify v1.8.2 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/tools v0.8.0 + golang.org/x/tools v0.9.1 ) require ( - github.com/Masterminds/semver/v3 v3.2.0 // indirect + github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 v2.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/mattn/go-isatty v0.0.18 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/yuin/goldmark v1.4.13 // indirect golang.org/x/mod v0.10.0 // indirect - golang.org/x/sys v0.7.0 // indirect + golang.org/x/sys v0.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/packages/@jsii/go-runtime-test/project/go.sum b/packages/@jsii/go-runtime-test/project/go.sum index a2525c2b2c..ffd5b80b93 100644 --- a/packages/@jsii/go-runtime-test/project/go.sum +++ b/packages/@jsii/go-runtime-test/project/go.sum @@ -1,5 +1,5 @@ -github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= -github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= +github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -21,26 +21,26 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= -golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= +golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= +golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod index 996eeeabe3..5ebaca792e 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod +++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod @@ -3,11 +3,11 @@ module github.com/aws/jsii-runtime-go go 1.18 require ( - github.com/Masterminds/semver/v3 v3.2.0 + github.com/Masterminds/semver/v3 v3.2.1 github.com/mattn/go-isatty v0.0.18 github.com/stretchr/testify v1.8.1 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 - golang.org/x/tools v0.8.0 + golang.org/x/tools v0.9.1 ) require ( @@ -15,7 +15,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/yuin/goldmark v1.4.13 // indirect golang.org/x/mod v0.10.0 // indirect - golang.org/x/sys v0.7.0 // indirect + golang.org/x/sys v0.8.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum index fece684a7c..21ea945ca9 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum +++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum @@ -1,5 +1,5 @@ -github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= -github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= +github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -26,16 +26,16 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y= -golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= +golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= +golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/internal/kernel/callbacks.go b/packages/@jsii/go-runtime/jsii-runtime-go/internal/kernel/callbacks.go index 619ee39e90..9af8d20400 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/internal/kernel/callbacks.go +++ b/packages/@jsii/go-runtime/jsii-runtime-go/internal/kernel/callbacks.go @@ -3,6 +3,7 @@ package kernel import ( "fmt" "reflect" + "strings" "github.com/aws/jsii-runtime-go/internal/api" ) @@ -78,9 +79,45 @@ func (g *getCallback) handle(cookie string) (retval reflect.Value, err error) { client := GetClient() receiver := reflect.ValueOf(client.GetObject(g.ObjRef)) - method := receiver.MethodByName(cookie) - return client.invoke(method, nil) + if strings.HasPrefix(cookie, ".") { + // Ready to catch an error if the access panics... + defer func() { + if r := recover(); r != nil { + if err == nil { + var ok bool + if err, ok = r.(error); !ok { + err = fmt.Errorf("%v", r) + } + } else { + // This is not expected - so we panic! + panic(r) + } + } + }() + + // Need to access the underlying struct... + receiver = receiver.Elem() + retval = receiver.FieldByName(cookie[1:]) + + if retval.IsZero() { + // Omit zero-values if a json tag instructs so... + field, _ := receiver.Type().FieldByName(cookie[1:]) + if tag := field.Tag.Get("json"); tag != "" { + for _, attr := range strings.Split(tag, ",")[1:] { + if attr == "omitempty" { + retval = reflect.ValueOf(nil) + break + } + } + } + } + + return + } else { + method := receiver.MethodByName(cookie) + return client.invoke(method, nil) + } } type setCallback struct { @@ -93,9 +130,70 @@ func (s *setCallback) handle(cookie string) (retval reflect.Value, err error) { client := GetClient() receiver := reflect.ValueOf(client.GetObject(s.ObjRef)) - method := receiver.MethodByName(fmt.Sprintf("Set%v", cookie)) + if strings.HasPrefix(cookie, ".") { + // Ready to catch an error if the access panics... + defer func() { + if r := recover(); r != nil { + if err == nil { + var ok bool + if err, ok = r.(error); !ok { + err = fmt.Errorf("%v", r) + } + } else { + // This is not expected - so we panic! + panic(r) + } + } + }() + + // Need to access the underlying struct... + receiver = receiver.Elem() + field := receiver.FieldByName(cookie[1:]) + meta, _ := receiver.Type().FieldByName(cookie[1:]) + + field.Set(convert(reflect.ValueOf(s.Value), meta.Type)) + // Both retval & err are set to zero values here... + return + } else { + method := receiver.MethodByName(fmt.Sprintf("Set%v", cookie)) + return client.invoke(method, []interface{}{s.Value}) + } +} + +func convert(value reflect.Value, typ reflect.Type) reflect.Value { +retry: + vt := value.Type() + + if vt.AssignableTo(typ) { + return value + } + if value.CanConvert(typ) { + return value.Convert(typ) + } + + if typ.Kind() == reflect.Ptr { + switch value.Kind() { + case reflect.String: + str := value.String() + value = reflect.ValueOf(&str) + case reflect.Bool: + bool := value.Bool() + value = reflect.ValueOf(&bool) + case reflect.Int: + int := value.Int() + value = reflect.ValueOf(&int) + case reflect.Float64: + float := value.Float() + value = reflect.ValueOf(&float) + default: + iface := value.Interface() + value = reflect.ValueOf(&iface) + } + goto retry + } - return client.invoke(method, []interface{}{s.Value}) + // Unsure what to do... let default behavior happen... + return value } func (c *Client) invoke(method reflect.Value, args []interface{}) (retval reflect.Value, err error) { diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/internal/kernel/manage-object.go b/packages/@jsii/go-runtime/jsii-runtime-go/internal/kernel/manage-object.go index 7c0e6416ab..40636f884c 100644 --- a/packages/@jsii/go-runtime/jsii-runtime-go/internal/kernel/manage-object.go +++ b/packages/@jsii/go-runtime/jsii-runtime-go/internal/kernel/manage-object.go @@ -1,7 +1,9 @@ package kernel import ( + "fmt" "reflect" + "strings" "github.com/aws/jsii-runtime-go/internal/api" ) @@ -18,6 +20,14 @@ func (c *Client) ManageObject(v reflect.Value) (ref api.ObjectRef, err error) { } interfaces, overrides := c.Types().DiscoverImplementation(vt) + found := make(map[string]bool) + for _, override := range overrides { + if prop, ok := override.(*api.PropertyOverride); ok { + found[prop.JsiiProperty] = true + } + } + overrides = appendExportedProperties(vt, overrides, found) + var resp CreateResponse resp, err = c.Create(CreateProps{ FQN: objectFQN, @@ -33,3 +43,49 @@ func (c *Client) ManageObject(v reflect.Value) (ref api.ObjectRef, err error) { return } + +func appendExportedProperties(vt reflect.Type, overrides []api.Override, found map[string]bool) []api.Override { + if vt.Kind() == reflect.Ptr { + vt = vt.Elem() + } + + if vt.Kind() == reflect.Struct { + for idx := 0; idx < vt.NumField(); idx++ { + field := vt.Field(idx) + // Unexported fields are not relevant here... + if !field.IsExported() { + continue + } + + // Anonymous fields are embed, we traverse them for fields, too... + if field.Anonymous { + overrides = appendExportedProperties(field.Type, overrides, found) + continue + } + + jsonName := field.Tag.Get("json") + if jsonName == "-" { + // Explicit omit via `json:"-"` + continue + } else if jsonName != "" { + // There could be attributes after the field name (e.g. `json:"foo,omitempty"`) + jsonName = strings.Split(jsonName, ",")[0] + } + // The default behavior is to use the field name as-is in JSON. + if jsonName == "" { + jsonName = field.Name + } + + if !found[jsonName] { + overrides = append(overrides, &api.PropertyOverride{ + JsiiProperty: jsonName, + // Using the "." prefix to signify this isn't actually a getter, just raw field access. + GoGetter: fmt.Sprintf(".%s", field.Name), + }) + found[jsonName] = true + } + } + } + + return overrides +} diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 1437d8a86d..4c74da7799 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -23,10 +23,10 @@ "jsii": "^0.0.0", "jsii-pacmak": "^0.0.0", "jsii-rosetta": "^0.0.0", - "tar": "^6.1.13" + "tar": "^6.1.15" }, "devDependencies": { "@types/fs-extra": "^9.0.13", - "@types/tar": "^6.1.4" + "@types/tar": "^6.1.5" } } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index d30f9219ea..4b6ca9ce13 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -34,14 +34,14 @@ "@jsii/spec": "^0.0.0", "fs-extra": "^10.1.0", "lockfile": "^1.0.4", - "tar": "^6.1.13" + "tar": "^6.1.15" }, "devDependencies": { "@scope/jsii-calc-base": "^0.0.0", "@scope/jsii-calc-lib": "^0.0.0", "@types/fs-extra": "^9.0.13", "@types/lockfile": "^1.0.2", - "@types/tar": "^6.1.4", + "@types/tar": "^6.1.5", "jest-expect-message": "^1.1.3", "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120" diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json index 4c2ed1e82e..b9a283fa9a 100644 --- a/packages/@jsii/python-runtime/package.json +++ b/packages/@jsii/python-runtime/package.json @@ -42,6 +42,6 @@ "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", "jsii-pacmak": "^0.0.0", - "pyright": "^1.1.304" + "pyright": "^1.1.309" } } diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index 31472420a0..cd97326e63 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -1,7 +1,7 @@ black~=23.3 -mypy==1.2.0 +mypy==1.3.0 pip~=23.1 -pytest~=7.2 +pytest~=7.3 pytest-mypy~=0.10 setuptools~=67.3.2 types-python-dateutil~=2.8 diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index d6198c98a0..45e4f65cd3 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -44,7 +44,7 @@ "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", "source-map-loader": "^4.0.1", - "webpack": "^5.79.0", - "webpack-cli": "^5.0.1" + "webpack": "^5.82.1", + "webpack-cli": "^5.1.1" } } diff --git a/packages/@scope/jsii-calc-lib/lib/index.ts b/packages/@scope/jsii-calc-lib/lib/index.ts index 46c4bd4045..e6ac60f001 100644 --- a/packages/@scope/jsii-calc-lib/lib/index.ts +++ b/packages/@scope/jsii-calc-lib/lib/index.ts @@ -127,6 +127,15 @@ export class BaseFor2647 { } } +/** + * For Java, test that an identifier that is just a _ is handled + */ +export class FunctionWithUnderscoreArgument { + public foo(_: string) { + return _; + } +} + export * as submodule from './submodule'; export * from './duplicate-inherited-prop'; export * as deprecationRemoval from './deprecation-removal'; diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii index 318b1a07be..f19503b617 100644 --- a/packages/@scope/jsii-calc-lib/test/assembly.jsii +++ b/packages/@scope/jsii-calc-lib/test/assembly.jsii @@ -95,14 +95,14 @@ "@scope/jsii-calc-lib.deprecationRemoval": { "locationInModule": { "filename": "lib/index.ts", - "line": 132 + "line": 141 }, "symbolId": "lib/deprecation-removal:" }, "@scope/jsii-calc-lib.submodule": { "locationInModule": { "filename": "lib/index.ts", - "line": 130 + "line": 139 }, "readme": { "markdown": "# Submodule Readme\n\nThis is a submodule readme.\n" @@ -333,6 +333,51 @@ "name": "EnumFromScopedModule", "symbolId": "lib/index:EnumFromScopedModule" }, + "@scope/jsii-calc-lib.FunctionWithUnderscoreArgument": { + "assembly": "@scope/jsii-calc-lib", + "docs": { + "stability": "deprecated", + "summary": "For Java, test that an identifier that is just a _ is handled." + }, + "fqn": "@scope/jsii-calc-lib.FunctionWithUnderscoreArgument", + "initializer": { + "docs": { + "stability": "deprecated" + } + }, + "kind": "class", + "locationInModule": { + "filename": "lib/index.ts", + "line": 133 + }, + "methods": [ + { + "docs": { + "stability": "deprecated" + }, + "locationInModule": { + "filename": "lib/index.ts", + "line": 134 + }, + "name": "foo", + "parameters": [ + { + "name": "_", + "type": { + "primitive": "string" + } + } + ], + "returns": { + "type": { + "primitive": "string" + } + } + } + ], + "name": "FunctionWithUnderscoreArgument", + "symbolId": "lib/index:FunctionWithUnderscoreArgument" + }, "@scope/jsii-calc-lib.IDoublable": { "assembly": "@scope/jsii-calc-lib", "docs": { @@ -1022,5 +1067,5 @@ } }, "version": "0.0.0", - "fingerprint": "XDMAZYhhgc09X8VS8hpn3ch21YxKDn+HB0w82IofsRM=" + "fingerprint": "yrpQ+/ynmcWEtNZgCAeq2yp4JpEpln2V/fRhUc5uVUs=" } \ No newline at end of file diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts index 725b1a3a7d..e07fac3b92 100644 --- a/packages/jsii-calc/lib/compliance.ts +++ b/packages/jsii-calc/lib/compliance.ts @@ -3141,3 +3141,24 @@ export class PromiseNothing { return PromiseNothing.promiseIt(); } } + +export class AnyPropertyAccess { + /** + * Sets obj[resultProp] to `${obj[propA]}+${obj[propB]}`. + * + * @param obj the receiver object. + * @param propA the first property to read. + * @param propB the second property to read. + * @param resultProp the property to write into. + */ + public static mutateProperties( + obj: any, + propA: string, + propB: string, + resultProp: string, + ) { + obj[resultProp] = `${obj[propA]}+${obj[propB]}`; + } + + private constructor() {} +} diff --git a/packages/jsii-calc/lib/documented.ts b/packages/jsii-calc/lib/documented.ts index d9d6c81ff0..2aefc8674b 100644 --- a/packages/jsii-calc/lib/documented.ts +++ b/packages/jsii-calc/lib/documented.ts @@ -66,3 +66,30 @@ export class Old { // Nothing to do } } + +/** + * > Don't use this interface + * An interface that shouldn't be used, with the annotation in a weird place. + */ +export interface DontUseMe { + /** + * > Don't set this parameter + * + * A parameter that shouldn't be set, with the annotation in a weird place. + */ + readonly dontSetMe?: string; +} + +/** + * > Don't use this class. + * + * A class that shouldn't be used, with the annotation in a weird place. + */ +export class WeirdDocs { + /** + * > Don't read this property + * + * A property that shouldn't be read, with the annotation in a weird place. + */ + public dontReadMe?: string; +} diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii index 135f668337..aefdfc9d7c 100644 --- a/packages/jsii-calc/test/assembly.jsii +++ b/packages/jsii-calc/test/assembly.jsii @@ -1538,6 +1538,72 @@ "name": "AnonymousImplementationProvider", "symbolId": "lib/compliance:AnonymousImplementationProvider" }, + "jsii-calc.AnyPropertyAccess": { + "assembly": "jsii-calc", + "docs": { + "stability": "stable" + }, + "fqn": "jsii-calc.AnyPropertyAccess", + "kind": "class", + "locationInModule": { + "filename": "lib/compliance.ts", + "line": 3145 + }, + "methods": [ + { + "docs": { + "stability": "stable", + "summary": "Sets obj[resultProp] to `${obj[propA]}+${obj[propB]}`." + }, + "locationInModule": { + "filename": "lib/compliance.ts", + "line": 3154 + }, + "name": "mutateProperties", + "parameters": [ + { + "docs": { + "summary": "the receiver object." + }, + "name": "obj", + "type": { + "primitive": "any" + } + }, + { + "docs": { + "summary": "the first property to read." + }, + "name": "propA", + "type": { + "primitive": "string" + } + }, + { + "docs": { + "summary": "the second property to read." + }, + "name": "propB", + "type": { + "primitive": "string" + } + }, + { + "docs": { + "summary": "the property to write into." + }, + "name": "resultProp", + "type": { + "primitive": "string" + } + } + ], + "static": true + } + ], + "name": "AnyPropertyAccess", + "symbolId": "lib/compliance:AnyPropertyAccess" + }, "jsii-calc.AsyncVirtualMethods": { "assembly": "jsii-calc", "docs": { @@ -5066,6 +5132,42 @@ "name": "DontComplainAboutVariadicAfterOptional", "symbolId": "lib/compliance:DontComplainAboutVariadicAfterOptional" }, + "jsii-calc.DontUseMe": { + "assembly": "jsii-calc", + "datatype": true, + "docs": { + "stability": "stable", + "summary": "> Don't use this interface An interface that shouldn't be used, with the annotation in a weird place." + }, + "fqn": "jsii-calc.DontUseMe", + "kind": "interface", + "locationInModule": { + "filename": "lib/documented.ts", + "line": 74 + }, + "name": "DontUseMe", + "properties": [ + { + "abstract": true, + "docs": { + "remarks": "A parameter that shouldn't be set, with the annotation in a weird place.", + "stability": "stable", + "summary": "> Don't set this parameter." + }, + "immutable": true, + "locationInModule": { + "filename": "lib/documented.ts", + "line": 80 + }, + "name": "dontSetMe", + "optional": true, + "type": { + "primitive": "string" + } + } + ], + "symbolId": "lib/documented:DontUseMe" + }, "jsii-calc.DoubleTrouble": { "assembly": "jsii-calc", "docs": { @@ -15944,6 +16046,45 @@ ], "symbolId": "lib/compliance:VoidCallback" }, + "jsii-calc.WeirdDocs": { + "assembly": "jsii-calc", + "docs": { + "remarks": "A class that shouldn't be used, with the annotation in a weird place.", + "stability": "stable", + "summary": "> Don't use this class." + }, + "fqn": "jsii-calc.WeirdDocs", + "initializer": { + "docs": { + "stability": "stable" + } + }, + "kind": "class", + "locationInModule": { + "filename": "lib/documented.ts", + "line": 88 + }, + "name": "WeirdDocs", + "properties": [ + { + "docs": { + "remarks": "A property that shouldn't be read, with the annotation in a weird place.", + "stability": "stable", + "summary": "> Don't read this property." + }, + "locationInModule": { + "filename": "lib/documented.ts", + "line": 94 + }, + "name": "dontReadMe", + "optional": true, + "type": { + "primitive": "string" + } + } + ], + "symbolId": "lib/documented:WeirdDocs" + }, "jsii-calc.WithPrivatePropertyInConstructor": { "assembly": "jsii-calc", "docs": { @@ -18843,5 +18984,5 @@ } }, "version": "3.20.120", - "fingerprint": "EH7xszNdCh9PCFUZ8Foi7g2CPhdrKeZm8CQaUCNv4GQ=" + "fingerprint": "KCZMc5FKKLI0JLhaAjlqS227RmusMVNRWt2UbgA5iOM=" } \ No newline at end of file diff --git a/packages/jsii-pacmak/lib/index.ts b/packages/jsii-pacmak/lib/index.ts index b1831d1267..8d1115759b 100644 --- a/packages/jsii-pacmak/lib/index.ts +++ b/packages/jsii-pacmak/lib/index.ts @@ -1,3 +1,5 @@ +import './suppress-jsii-upgrade-prompts'; + import { TypeSystem } from 'jsii-reflect'; import { Rosetta, UnknownSnippetMode } from 'jsii-rosetta'; import { resolve } from 'path'; diff --git a/packages/jsii-pacmak/lib/suppress-jsii-upgrade-prompts.ts b/packages/jsii-pacmak/lib/suppress-jsii-upgrade-prompts.ts new file mode 100644 index 0000000000..6e6f6bc3f2 --- /dev/null +++ b/packages/jsii-pacmak/lib/suppress-jsii-upgrade-prompts.ts @@ -0,0 +1,2 @@ +// Suppress the upgrade prompt from jsii and jsii-rosetta +process.env.JSII_SUPPRESS_UPGRADE_PROMPT = '1'; diff --git a/packages/jsii-pacmak/lib/targets/java.ts b/packages/jsii-pacmak/lib/targets/java.ts index 26a95248bc..67a7ad36dd 100644 --- a/packages/jsii-pacmak/lib/targets/java.ts +++ b/packages/jsii-pacmak/lib/targets/java.ts @@ -576,6 +576,7 @@ class JavaGenerator extends Generator { 'void', 'volatile', 'while', + '_', ]; /** @@ -587,6 +588,11 @@ class JavaGenerator extends Generator { return propertyName; } + if (propertyName === '_') { + // Slightly different pattern for this one + return '__'; + } + if (JavaGenerator.RESERVED_KEYWORDS.includes(propertyName)) { return `${propertyName}Value`; } @@ -602,6 +608,11 @@ class JavaGenerator extends Generator { return methodName; } + if (methodName === '_') { + // Different pattern for this one. Also this should never happen, who names a function '_' ?? + return 'doIt'; + } + if (JavaGenerator.RESERVED_KEYWORDS.includes(methodName)) { return `do${jsiiToPascalCase(methodName)}`; } @@ -1024,7 +1035,7 @@ class JavaGenerator extends Generator { this.code.openFile(packageInfoFile); this.code.line('/**'); if (mod.readme) { - for (const line of markDownToJavaDoc( + for (const line of myMarkDownToJavaDoc( this.convertSamplesInMarkdown(mod.readme.markdown, { api: 'moduleReadme', moduleFqn: mod.name, @@ -1058,7 +1069,7 @@ class JavaGenerator extends Generator { this.code.openFile(packageInfoFile); this.code.line('/**'); if (mod.readme) { - for (const line of markDownToJavaDoc( + for (const line of myMarkDownToJavaDoc( this.convertSamplesInMarkdown(mod.readme.markdown, { api: 'moduleReadme', moduleFqn, @@ -1188,6 +1199,8 @@ class JavaGenerator extends Generator { '-J-XX:+TieredCompilation', '-J-XX:TieredStopAtLevel=1', ], + doclint: 'none', + quiet: 'true', }, }, { @@ -2226,7 +2239,7 @@ class JavaGenerator extends Generator { this.code.line(); this.code.line('/**'); this.code.line( - ` * @returns a newly built instance of {@link ${builtType}}.`, + ` * @return a newly built instance of {@link ${builtType}}.`, ); this.code.line(' */'); this.emitStabilityAnnotations(cls.initializer); @@ -2281,7 +2294,7 @@ class JavaGenerator extends Generator { ); if (prop.docs?.remarks != null) { const indent = ' '.repeat(7 + prop.fieldName.length); - const remarks = markDownToJavaDoc( + const remarks = myMarkDownToJavaDoc( this.convertSamplesInMarkdown(prop.docs.remarks, { api: 'member', fqn: prop.definingType.fqn, @@ -2710,14 +2723,14 @@ class JavaGenerator extends Generator { const paras = []; if (docs.summary) { - paras.push(renderSummary(docs)); + paras.push(stripNewLines(myMarkDownToJavaDoc(renderSummary(docs)))); } else if (defaultText) { - paras.push(defaultText); + paras.push(myMarkDownToJavaDoc(defaultText)); } if (docs.remarks) { paras.push( - markDownToJavaDoc( + myMarkDownToJavaDoc( this.convertSamplesInMarkdown(docs.remarks, apiLoc), ).trimRight(), ); @@ -2744,14 +2757,14 @@ class JavaGenerator extends Generator { // Hence, we just resort to HTML-encoding everything (same as we do for code // examples that have been translated from MarkDown). paras.push( - markDownToJavaDoc(['```', convertedExample, '```'].join('\n')), + myMarkDownToJavaDoc(['```', convertedExample, '```'].join('\n')), ); } const tagLines = []; if (docs.returns) { - tagLines.push(`@return ${docs.returns}`); + tagLines.push(`@return ${myMarkDownToJavaDoc(docs.returns)}`); } if (docs.see) { tagLines.push( @@ -2759,7 +2772,7 @@ class JavaGenerator extends Generator { ); } if (docs.deprecated) { - tagLines.push(`@deprecated ${docs.deprecated}`); + tagLines.push(`@deprecated ${myMarkDownToJavaDoc(docs.deprecated)}`); } // Params @@ -3462,7 +3475,7 @@ function paramJavadoc( ): string { const parts = ['@param', name]; if (summary) { - parts.push(endWithPeriod(summary)); + parts.push(stripNewLines(myMarkDownToJavaDoc(endWithPeriod(summary)))); } if (!optional) { parts.push('This parameter is required.'); @@ -3640,3 +3653,19 @@ function containsUnionType( containsUnionType(typeRef.collection.elementtype)) ); } + +function myMarkDownToJavaDoc(source: string) { + if (source.includes('{@link') || source.includes('{@code')) { + // Slightly dirty hack: if we are seeing this, it means the docstring was provided literally + // in this file. These strings are safe to not be escaped, and in fact escaping them will + // break them: they will turn into `{@`, which breaks the JavaDoc markup. + // + // Since docstring do not (or at least should not) contain JavaDoc literals, this is safe. + return source; + } + return markDownToJavaDoc(source); +} + +function stripNewLines(x: string) { + return x.replace(/\n/g, ''); +} diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 0188122928..91acf0edf1 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -46,7 +46,7 @@ "fs-extra": "^10.1.0", "jsii-reflect": "^0.0.0", "jsii-rosetta": "^0.0.0", - "semver": "^7.5.0", + "semver": "^7.5.1", "spdx-license-list": "^6.6.0", "xmlbuilder": "^15.1.1", "yargs": "^16.2.0" @@ -60,12 +60,12 @@ "@types/diff": "^5.0.3", "@types/commonmark": "^0.27.6", "@types/fs-extra": "^9.0.13", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "diff": "^5.1.0", "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", - "pyright": "^1.1.304" + "pyright": "^1.1.309" }, "keywords": [ "jsii", diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap index 48665fce29..bdb47bb3f8 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap @@ -670,6 +670,8 @@ exports[`diamond-struct-parameter.ts: /java/pom.xml 1`] = ` -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true @@ -2287,6 +2289,8 @@ exports[`nested-types.ts: /java/pom.xml 1`] = ` -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap index 71806e7887..e9278f4ddf 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap @@ -273,6 +273,8 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: /java/pom.xml 1`] = ` -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true @@ -784,6 +786,8 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: /java/pom.xml 1`] = ` -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true @@ -1283,6 +1287,8 @@ exports[`foo@2.0.0-rc.42: /java/pom.xml 1`] = ` -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true @@ -1771,6 +1777,8 @@ exports[`foo@4.5.6-pre.1337: /java/pom.xml 1`] = ` -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.js.snap index 68e20130d1..ddc5175c17 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-dotnet.test.js.snap @@ -1019,6 +1019,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": / 1`] = ` ┃ ┃ ┣━ 📄 DiamondLeft.cs ┃ ┃ ┣━ 📄 DiamondRight.cs ┃ ┃ ┣━ 📄 EnumFromScopedModule.cs + ┃ ┃ ┣━ 📄 FunctionWithUnderscoreArgument.cs ┃ ┃ ┣━ 📄 IDiamondLeft.cs ┃ ┃ ┣━ 📄 IDiamondRight.cs ┃ ┃ ┣━ 📄 IDoublable.cs @@ -1363,6 +1364,65 @@ namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace `; +exports[`Generated code for "@scope/jsii-calc-lib": /dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/FunctionWithUnderscoreArgument.cs 1`] = ` +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace +{ + /// (deprecated) For Java, test that an identifier that is just a _ is handled. + /// + /// Stability: Deprecated + /// + [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.FunctionWithUnderscoreArgument), fullyQualifiedName: "@scope/jsii-calc-lib.FunctionWithUnderscoreArgument")] + [System.Obsolete()] + public class FunctionWithUnderscoreArgument : DeputyBase + { + /// + /// Stability: Deprecated + /// + [System.Obsolete()] + public FunctionWithUnderscoreArgument(): base(_MakeDeputyProps()) + { + } + + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] + private static DeputyProps _MakeDeputyProps() + { + return new DeputyProps(System.Array.Empty()); + } + + /// Used by jsii to construct an instance of this class from a Javascript-owned object reference + /// The Javascript-owned object reference + [System.Obsolete()] + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + protected FunctionWithUnderscoreArgument(ByRefValue reference): base(reference) + { + } + + /// Used by jsii to construct an instance of this class from DeputyProps + /// The deputy props + [System.Obsolete()] + [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] + protected FunctionWithUnderscoreArgument(DeputyProps props): base(props) + { + } + + /// + /// Stability: Deprecated + /// + [JsiiMethod(name: "foo", returnsJson: "{\\"type\\":{\\"primitive\\":\\"string\\"}}", parametersJson: "[{\\"name\\":\\"_\\",\\"type\\":{\\"primitive\\":\\"string\\"}}]")] + [System.Obsolete()] + public virtual string Foo(string _) + { + return InvokeInstanceMethod(new System.Type[]{typeof(string)}, new object[]{_})!; + } + } +} + +`; + exports[`Generated code for "@scope/jsii-calc-lib": /dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDiamondLeft.cs 1`] = ` using Amazon.JSII.Runtime.Deputy; @@ -2918,6 +2978,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┃ ┣━ 📄 IOptionB.cs ┃ ┃ ┗━ 📄 UseOptions.cs ┃ ┣━ 📄 AnonymousImplementationProvider.cs + ┃ ┣━ 📄 AnyPropertyAccess.cs ┃ ┣━ 📄 AsyncVirtualMethods.cs ┃ ┣━ 📄 AugmentableClass.cs ┃ ┣━ 📄 BaseClass.cs @@ -2977,6 +3038,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┣━ 📄 DoNotOverridePrivates.cs ┃ ┣━ 📄 DoNotRecognizeAnyAsOptional.cs ┃ ┣━ 📄 DontComplainAboutVariadicAfterOptional.cs + ┃ ┣━ 📄 DontUseMe.cs ┃ ┣━ 📄 DoubleTrouble.cs ┃ ┣━ 📄 DummyObj.cs ┃ ┣━ 📄 DynamicPropertyBearer.cs @@ -3029,6 +3091,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┣━ 📄 IDiamondInheritanceFirstMidLevelStruct.cs ┃ ┣━ 📄 IDiamondInheritanceSecondMidLevelStruct.cs ┃ ┣━ 📄 IDiamondInheritanceTopLevelStruct.cs + ┃ ┣━ 📄 IDontUseMe.cs ┃ ┣━ 📄 IDummyObj.cs ┃ ┣━ 📄 IEraseUndefinedHashValuesOptions.cs ┃ ┣━ 📄 IExperimentalInterface.cs @@ -3299,6 +3362,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┣━ 📄 VariadicTypeUnion.cs ┃ ┣━ 📄 VirtualMethodPlayground.cs ┃ ┣━ 📄 VoidCallback.cs + ┃ ┣━ 📄 WeirdDocs.cs ┃ ┗━ 📄 WithPrivatePropertyInConstructor.cs ┣━ 📄 Amazon.JSII.Tests.CalculatorPackageId.csproj ┣━ 📄 AssemblyInfo.cs @@ -4180,6 +4244,45 @@ namespace Amazon.JSII.Tests.CalculatorNamespace `; +exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AnyPropertyAccess.cs 1`] = ` +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace +{ + [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.AnyPropertyAccess), fullyQualifiedName: "jsii-calc.AnyPropertyAccess")] + public class AnyPropertyAccess : DeputyBase + { + /// 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 AnyPropertyAccess(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 AnyPropertyAccess(DeputyProps props): base(props) + { + } + + /// Sets obj[resultProp] to \`\${obj[propA]}+\${obj[propB]}\`. + /// the receiver object. + /// the first property to read. + /// the second property to read. + /// the property to write into. + [JsiiMethod(name: "mutateProperties", parametersJson: "[{\\"docs\\":{\\"summary\\":\\"the receiver object.\\"},\\"name\\":\\"obj\\",\\"type\\":{\\"primitive\\":\\"any\\"}},{\\"docs\\":{\\"summary\\":\\"the first property to read.\\"},\\"name\\":\\"propA\\",\\"type\\":{\\"primitive\\":\\"string\\"}},{\\"docs\\":{\\"summary\\":\\"the second property to read.\\"},\\"name\\":\\"propB\\",\\"type\\":{\\"primitive\\":\\"string\\"}},{\\"docs\\":{\\"summary\\":\\"the property to write into.\\"},\\"name\\":\\"resultProp\\",\\"type\\":{\\"primitive\\":\\"string\\"}}]")] + public static void MutateProperties(object obj, string propA, string propB, string resultProp) + { + InvokeStaticVoidMethod(typeof(Amazon.JSII.Tests.CalculatorNamespace.AnyPropertyAccess), new System.Type[]{typeof(object), typeof(string), typeof(string), typeof(string)}, new object[]{obj, propA, propB, resultProp}); + } + } +} + +`; + exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AsyncVirtualMethods.cs 1`] = ` using Amazon.JSII.Runtime.Deputy; @@ -7196,6 +7299,33 @@ namespace Amazon.JSII.Tests.CalculatorNamespace `; +exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DontUseMe.cs 1`] = ` +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace +{ + /// > Don't use this interface An interface that shouldn't be used, with the annotation in a weird place. + [JsiiByValue(fqn: "jsii-calc.DontUseMe")] + public class DontUseMe : Amazon.JSII.Tests.CalculatorNamespace.IDontUseMe + { + /// > Don't set this parameter. + /// + /// A parameter that shouldn't be set, with the annotation in a weird place. + /// + [JsiiOptional] + [JsiiProperty(name: "dontSetMe", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)] + public string? DontSetMe + { + get; + set; + } + } +} + +`; + exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoubleTrouble.cs 1`] = ` using Amazon.JSII.Runtime.Deputy; @@ -9342,6 +9472,55 @@ namespace Amazon.JSII.Tests.CalculatorNamespace `; +exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDontUseMe.cs 1`] = ` +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace +{ + /// > Don't use this interface An interface that shouldn't be used, with the annotation in a weird place. + [JsiiInterface(nativeType: typeof(IDontUseMe), fullyQualifiedName: "jsii-calc.DontUseMe")] + public interface IDontUseMe + { + /// > Don't set this parameter. + /// + /// A parameter that shouldn't be set, with the annotation in a weird place. + /// + [JsiiProperty(name: "dontSetMe", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)] + [Amazon.JSII.Runtime.Deputy.JsiiOptional] + string? DontSetMe + { + get + { + return null; + } + } + + /// > Don't use this interface An interface that shouldn't be used, with the annotation in a weird place. + [JsiiTypeProxy(nativeType: typeof(IDontUseMe), fullyQualifiedName: "jsii-calc.DontUseMe")] + internal sealed class _Proxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.IDontUseMe + { + private _Proxy(ByRefValue reference): base(reference) + { + } + + /// > Don't set this parameter. + /// + /// A parameter that shouldn't be set, with the annotation in a weird place. + /// + [JsiiOptional] + [JsiiProperty(name: "dontSetMe", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)] + public string? DontSetMe + { + get => GetInstanceProperty(); + } + } + } +} + +`; + exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDummyObj.cs 1`] = ` using Amazon.JSII.Runtime.Deputy; @@ -21167,6 +21346,60 @@ namespace Amazon.JSII.Tests.CalculatorNamespace `; +exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/WeirdDocs.cs 1`] = ` +using Amazon.JSII.Runtime.Deputy; + +#pragma warning disable CS0672,CS0809,CS1591 + +namespace Amazon.JSII.Tests.CalculatorNamespace +{ + /// > Don't use this class. + /// + /// A class that shouldn't be used, with the annotation in a weird place. + /// + [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.WeirdDocs), fullyQualifiedName: "jsii-calc.WeirdDocs")] + public class WeirdDocs : DeputyBase + { + public WeirdDocs(): base(_MakeDeputyProps()) + { + } + + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)] + private static DeputyProps _MakeDeputyProps() + { + return new DeputyProps(System.Array.Empty()); + } + + /// 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 WeirdDocs(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 WeirdDocs(DeputyProps props): base(props) + { + } + + /// > Don't read this property. + /// + /// A property that shouldn't be read, with the annotation in a weird place. + /// + [JsiiOptional] + [JsiiProperty(name: "dontReadMe", typeJson: "{\\"primitive\\":\\"string\\"}", isOptional: true)] + public virtual string? DontReadMe + { + get => GetInstanceProperty(); + set => SetInstanceProperty(value); + } + } +} + +`; + exports[`Generated code for "jsii-calc": /dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/WithPrivatePropertyInConstructor.cs 1`] = ` using Amazon.JSII.Runtime.Deputy; diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.js.snap index d42a223526..61f54f6d5f 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-go.test.js.snap @@ -973,6 +973,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": / 1`] = ` ┣━ 📄 DiamondLeft.go ┣━ 📄 DiamondRight.go ┣━ 📄 EnumFromScopedModule.go + ┣━ 📄 FunctionWithUnderscoreArgument.go ┣━ 📄 go.mod ┣━ 📄 IDoublable.go ┣━ 📄 IFriendly.go @@ -1107,6 +1108,68 @@ const ( ) +`; + +exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/FunctionWithUnderscoreArgument.go 1`] = ` +package scopejsiicalclib + +import ( + _jsii_ "github.com/aws/jsii-runtime-go/runtime" + _init_ "github.com/aws/jsii/jsii-calc/go/scopejsiicalclib/jsii" +) + +// For Java, test that an identifier that is just a _ is handled. +// Deprecated. +type FunctionWithUnderscoreArgument interface { + // Deprecated. + Foo(_arg *string) *string +} + +// The jsii proxy struct for FunctionWithUnderscoreArgument +type jsiiProxy_FunctionWithUnderscoreArgument struct { + _ byte // padding +} + +// Deprecated. +func NewFunctionWithUnderscoreArgument() FunctionWithUnderscoreArgument { + _init_.Initialize() + + j := jsiiProxy_FunctionWithUnderscoreArgument{} + + _jsii_.Create( + "@scope/jsii-calc-lib.FunctionWithUnderscoreArgument", + nil, // no parameters + &j, + ) + + return &j +} + +// Deprecated. +func NewFunctionWithUnderscoreArgument_Override(f FunctionWithUnderscoreArgument) { + _init_.Initialize() + + _jsii_.Create( + "@scope/jsii-calc-lib.FunctionWithUnderscoreArgument", + nil, // no parameters + f, + ) +} + +func (f *jsiiProxy_FunctionWithUnderscoreArgument) Foo(_arg *string) *string { + var returns *string + + _jsii_.Invoke( + f, + "foo", + []interface{}{_arg}, + &returns, + ) + + return returns +} + + `; exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/IDoublable.go 1`] = ` @@ -2197,6 +2260,16 @@ func init() { "VALUE2": EnumFromScopedModule_VALUE2, }, ) + _jsii_.RegisterClass( + "@scope/jsii-calc-lib.FunctionWithUnderscoreArgument", + reflect.TypeOf((*FunctionWithUnderscoreArgument)(nil)).Elem(), + []_jsii_.Member{ + _jsii_.MemberMethod{JsiiMethod: "foo", GoMethod: "Foo"}, + }, + func() interface{} { + return &jsiiProxy_FunctionWithUnderscoreArgument{} + }, + ) _jsii_.RegisterInterface( "@scope/jsii-calc-lib.IDoublable", reflect.TypeOf((*IDoublable)(nil)).Elem(), @@ -2303,6 +2376,9 @@ exports[`Generated code for "@scope/jsii-calc-lib": / 1 ┃ ┣━ 🆕 Reflector__checks.go ┃ ┣━ 🆕 Reflector__no_checks.go ┃ ┗━ 📄 Reflector.go.diff + ┣━ 🆕 FunctionWithUnderscoreArgument__checks.go + ┣━ 🆕 FunctionWithUnderscoreArgument__no_checks.go + ┣━ 📄 FunctionWithUnderscoreArgument.go.diff ┣━ 🆕 Number__checks.go ┣━ 🆕 Number__no_checks.go ┗━ 📄 Number.go.diff @@ -2394,6 +2470,63 @@ exports[`Generated code for "@scope/jsii-calc-lib": /go + `; +exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/FunctionWithUnderscoreArgument.go.diff 1`] = ` +--- go/scopejsiicalclib/FunctionWithUnderscoreArgument.go --no-runtime-type-checking ++++ go/scopejsiicalclib/FunctionWithUnderscoreArgument.go --runtime-type-checking +@@ -42,10 +42,13 @@ + f, + ) + } + + func (f *jsiiProxy_FunctionWithUnderscoreArgument) Foo(_arg *string) *string { ++ if err := f.validateFooParameters(_arg); err != nil { ++ panic(err) ++ } + var returns *string + + _jsii_.Invoke( + f, + "foo", +`; + +exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/FunctionWithUnderscoreArgument__checks.go.diff 1`] = ` +--- go/scopejsiicalclib/FunctionWithUnderscoreArgument__checks.go --no-runtime-type-checking ++++ go/scopejsiicalclib/FunctionWithUnderscoreArgument__checks.go --runtime-type-checking +@@ -0,0 +1,16 @@ ++//go:build !no_runtime_type_checking ++ ++package scopejsiicalclib ++ ++import ( ++ "fmt" ++) ++ ++func (f *jsiiProxy_FunctionWithUnderscoreArgument) validateFooParameters(_arg *string) error { ++ if _arg == nil { ++ return fmt.Errorf("parameter _arg is required, but nil was provided") ++ } ++ ++ return nil ++} ++ +`; + +exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/FunctionWithUnderscoreArgument__no_checks.go.diff 1`] = ` +--- go/scopejsiicalclib/FunctionWithUnderscoreArgument__no_checks.go --no-runtime-type-checking ++++ go/scopejsiicalclib/FunctionWithUnderscoreArgument__no_checks.go --runtime-type-checking +@@ -0,0 +1,10 @@ ++//go:build no_runtime_type_checking ++ ++package scopejsiicalclib ++ ++// Building without runtime type checking enabled, so all the below just return nil ++ ++func (f *jsiiProxy_FunctionWithUnderscoreArgument) validateFooParameters(_arg *string) error { ++ return nil ++} ++ +`; + exports[`Generated code for "@scope/jsii-calc-lib": /go/scopejsiicalclib/Number.go.diff 1`] = ` --- go/scopejsiicalclib/Number.go --no-runtime-type-checking +++ go/scopejsiicalclib/Number.go --runtime-type-checking @@ -2527,6 +2660,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┣━ 📄 main.go ┃ ┗━ 📄 UseOptions.go ┣━ 📄 AnonymousImplementationProvider.go + ┣━ 📄 AnyPropertyAccess.go ┣━ 📄 AsyncVirtualMethods.go ┣━ 📄 AugmentableClass.go ┣━ 📄 BaseClass.go @@ -2595,6 +2729,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┣━ 📄 DoNotOverridePrivates.go ┣━ 📄 DoNotRecognizeAnyAsOptional.go ┣━ 📄 DontComplainAboutVariadicAfterOptional.go + ┣━ 📄 DontUseMe.go ┣━ 📄 DoubleTrouble.go ┣━ 📄 DummyObj.go ┣━ 📄 DynamicPropertyBearer.go @@ -2907,6 +3042,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┣━ 📄 version ┣━ 📄 VirtualMethodPlayground.go ┣━ 📄 VoidCallback.go + ┣━ 📄 WeirdDocs.go ┗━ 📄 WithPrivatePropertyInConstructor.go `; @@ -4025,6 +4161,36 @@ func (a *jsiiProxy_AnonymousImplementationProvider) ProvideAsInterface() IAnonym } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/AnyPropertyAccess.go 1`] = ` +package jsiicalc + +import ( + _jsii_ "github.com/aws/jsii-runtime-go/runtime" + _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" +) + +type AnyPropertyAccess interface { +} + +// The jsii proxy struct for AnyPropertyAccess +type jsiiProxy_AnyPropertyAccess struct { + _ byte // padding +} + +// Sets obj[resultProp] to \`\${obj[propA]}+\${obj[propB]}\`. +func AnyPropertyAccess_MutateProperties(obj interface{}, propA *string, propB *string, resultProp *string) { + _init_.Initialize() + + _jsii_.StaticInvokeVoid( + "jsii-calc.AnyPropertyAccess", + "mutateProperties", + []interface{}{obj, propA, propB, resultProp}, + ) +} + + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/AsyncVirtualMethods.go 1`] = ` @@ -7259,6 +7425,21 @@ func (d *jsiiProxy_DontComplainAboutVariadicAfterOptional) OptionalAndVariadic(o } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/DontUseMe.go 1`] = ` +package jsiicalc + + +// > Don't use this interface An interface that shouldn't be used, with the annotation in a weird place. +type DontUseMe struct { + // > Don't set this parameter. + // + // A parameter that shouldn't be set, with the annotation in a weird place. + DontSetMe *string \`field:"optional" json:"dontSetMe" yaml:"dontSetMe"\` +} + + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/DoubleTrouble.go 1`] = ` @@ -17822,6 +18003,76 @@ func (v *jsiiProxy_VoidCallback) OverrideMe() { } +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/WeirdDocs.go 1`] = ` +package jsiicalc + +import ( + _jsii_ "github.com/aws/jsii-runtime-go/runtime" + _init_ "github.com/aws/jsii/jsii-calc/go/jsiicalc/v3/jsii" +) + +// > Don't use this class. +// +// A class that shouldn't be used, with the annotation in a weird place. +type WeirdDocs interface { + // > Don't read this property. + // + // A property that shouldn't be read, with the annotation in a weird place. + DontReadMe() *string + SetDontReadMe(val *string) +} + +// The jsii proxy struct for WeirdDocs +type jsiiProxy_WeirdDocs struct { + _ byte // padding +} + +func (j *jsiiProxy_WeirdDocs) DontReadMe() *string { + var returns *string + _jsii_.Get( + j, + "dontReadMe", + &returns, + ) + return returns +} + + +func NewWeirdDocs() WeirdDocs { + _init_.Initialize() + + j := jsiiProxy_WeirdDocs{} + + _jsii_.Create( + "jsii-calc.WeirdDocs", + nil, // no parameters + &j, + ) + + return &j +} + +func NewWeirdDocs_Override(w WeirdDocs) { + _init_.Initialize() + + _jsii_.Create( + "jsii-calc.WeirdDocs", + nil, // no parameters + w, + ) +} + +func (j *jsiiProxy_WeirdDocs)SetDontReadMe(val *string) { + _jsii_.Set( + j, + "dontReadMe", + val, + ) +} + + `; exports[`Generated code for "jsii-calc": /go/jsiicalc/WithPrivatePropertyInConstructor.go 1`] = ` @@ -19330,6 +19581,14 @@ func init() { return &j }, ) + _jsii_.RegisterClass( + "jsii-calc.AnyPropertyAccess", + reflect.TypeOf((*AnyPropertyAccess)(nil)).Elem(), + nil, // no members + func() interface{} { + return &jsiiProxy_AnyPropertyAccess{} + }, + ) _jsii_.RegisterClass( "jsii-calc.AsyncVirtualMethods", reflect.TypeOf((*AsyncVirtualMethods)(nil)).Elem(), @@ -19778,6 +20037,10 @@ func init() { return &jsiiProxy_DontComplainAboutVariadicAfterOptional{} }, ) + _jsii_.RegisterStruct( + "jsii-calc.DontUseMe", + reflect.TypeOf((*DontUseMe)(nil)).Elem(), + ) _jsii_.RegisterClass( "jsii-calc.DoubleTrouble", reflect.TypeOf((*DoubleTrouble)(nil)).Elem(), @@ -21533,6 +21796,16 @@ func init() { return &jsiiProxy_VoidCallback{} }, ) + _jsii_.RegisterClass( + "jsii-calc.WeirdDocs", + reflect.TypeOf((*WeirdDocs)(nil)).Elem(), + []_jsii_.Member{ + _jsii_.MemberProperty{JsiiProperty: "dontReadMe", GoGetter: "DontReadMe"}, + }, + func() interface{} { + return &jsiiProxy_WeirdDocs{} + }, + ) _jsii_.RegisterClass( "jsii-calc.WithPrivatePropertyInConstructor", reflect.TypeOf((*WithPrivatePropertyInConstructor)(nil)).Elem(), @@ -24685,6 +24958,9 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┣━ 🆕 UseOptions__checks.go ┃ ┣━ 🆕 UseOptions__no_checks.go ┃ ┗━ 📄 UseOptions.go.diff + ┣━ 🆕 AnyPropertyAccess__checks.go + ┣━ 🆕 AnyPropertyAccess__no_checks.go + ┣━ 📄 AnyPropertyAccess.go.diff ┣━ 🆕 AsyncVirtualMethods__checks.go ┣━ 🆕 AsyncVirtualMethods__no_checks.go ┣━ 📄 AsyncVirtualMethods.go.diff @@ -26109,6 +26385,75 @@ exports[`Generated code for "jsii-calc": /go/jsiicalc/A + `; +exports[`Generated code for "jsii-calc": /go/jsiicalc/AnyPropertyAccess.go.diff 1`] = ` +--- go/jsiicalc/AnyPropertyAccess.go --no-runtime-type-checking ++++ go/jsiicalc/AnyPropertyAccess.go --runtime-type-checking +@@ -15,10 +15,13 @@ + + // Sets obj[resultProp] to \`\${obj[propA]}+\${obj[propB]}\`. + func AnyPropertyAccess_MutateProperties(obj interface{}, propA *string, propB *string, resultProp *string) { + _init_.Initialize() + ++ if err := validateAnyPropertyAccess_MutatePropertiesParameters(obj, propA, propB, resultProp); err != nil { ++ panic(err) ++ } + _jsii_.StaticInvokeVoid( + "jsii-calc.AnyPropertyAccess", + "mutateProperties", + []interface{}{obj, propA, propB, resultProp}, + ) +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/AnyPropertyAccess__checks.go.diff 1`] = ` +--- go/jsiicalc/AnyPropertyAccess__checks.go --no-runtime-type-checking ++++ go/jsiicalc/AnyPropertyAccess__checks.go --runtime-type-checking +@@ -0,0 +1,28 @@ ++//go:build !no_runtime_type_checking ++ ++package jsiicalc ++ ++import ( ++ "fmt" ++) ++ ++func validateAnyPropertyAccess_MutatePropertiesParameters(obj interface{}, propA *string, propB *string, resultProp *string) error { ++ if obj == nil { ++ return fmt.Errorf("parameter obj is required, but nil was provided") ++ } ++ ++ if propA == nil { ++ return fmt.Errorf("parameter propA is required, but nil was provided") ++ } ++ ++ if propB == nil { ++ return fmt.Errorf("parameter propB is required, but nil was provided") ++ } ++ ++ if resultProp == nil { ++ return fmt.Errorf("parameter resultProp is required, but nil was provided") ++ } ++ ++ return nil ++} ++ +`; + +exports[`Generated code for "jsii-calc": /go/jsiicalc/AnyPropertyAccess__no_checks.go.diff 1`] = ` +--- go/jsiicalc/AnyPropertyAccess__no_checks.go --no-runtime-type-checking ++++ go/jsiicalc/AnyPropertyAccess__no_checks.go --runtime-type-checking +@@ -0,0 +1,10 @@ ++//go:build no_runtime_type_checking ++ ++package jsiicalc ++ ++// Building without runtime type checking enabled, so all the below just return nil ++ ++func validateAnyPropertyAccess_MutatePropertiesParameters(obj interface{}, propA *string, propB *string, resultProp *string) error { ++ return nil ++} ++ +`; + exports[`Generated code for "jsii-calc": /go/jsiicalc/AsyncVirtualMethods.go.diff 1`] = ` --- go/jsiicalc/AsyncVirtualMethods.go --no-runtime-type-checking +++ go/jsiicalc/AsyncVirtualMethods.go --runtime-type-checking diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.js.snap index 73464f85aa..2d146a2608 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-java.test.js.snap @@ -359,6 +359,8 @@ exports[`Generated code for "@scope/jsii-calc-base": /java/pom.xml 1`] = -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true @@ -1082,6 +1084,8 @@ exports[`Generated code for "@scope/jsii-calc-base-of-base": /java/pom.x -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true @@ -1440,6 +1444,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": / 1`] = ` ┃ ┣━ 📄 DiamondLeft.java ┃ ┣━ 📄 DiamondRight.java ┃ ┣━ 📄 EnumFromScopedModule.java + ┃ ┣━ 📄 FunctionWithUnderscoreArgument.java ┃ ┣━ 📄 IDoublable.java ┃ ┣━ 📄 IFriendly.java ┃ ┣━ 📄 IThreeLevelsInterface.java @@ -1793,6 +1798,8 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/pom.xml 1`] = -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true @@ -2737,7 +2744,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/src/main/java/ package software.amazon.jsii.tests.calculator.lib; /** - * (deprecated) Check that enums from \\@scoped packages can be references. + * (deprecated) Check that enums from @scoped packages can be references. *

* See awslabs/jsii#138 */ @@ -2760,6 +2767,47 @@ public enum EnumFromScopedModule { `; +exports[`Generated code for "@scope/jsii-calc-lib": /java/src/main/java/software/amazon/jsii/tests/calculator/lib/FunctionWithUnderscoreArgument.java 1`] = ` +package software.amazon.jsii.tests.calculator.lib; + +/** + * (deprecated) For Java, test that an identifier that is just a _ is handled. + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated) +@Deprecated +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.lib.$Module.class, fqn = "@scope/jsii-calc-lib.FunctionWithUnderscoreArgument") +public class FunctionWithUnderscoreArgument extends software.amazon.jsii.JsiiObject { + + protected FunctionWithUnderscoreArgument(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + } + + protected FunctionWithUnderscoreArgument(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) { + super(initializationMode); + } + + /** + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated) + @Deprecated + public FunctionWithUnderscoreArgument() { + super(software.amazon.jsii.JsiiObject.InitializationMode.JSII); + software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this); + } + + /** + * @param _ This parameter is required. + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Deprecated) + @Deprecated + public @org.jetbrains.annotations.NotNull java.lang.String foo(final @org.jetbrains.annotations.NotNull java.lang.String __) { + return software.amazon.jsii.Kernel.call(this, "foo", software.amazon.jsii.NativeType.forClass(java.lang.String.class), new Object[] { java.util.Objects.requireNonNull(__, "__ is required") }); + } +} + +`; + exports[`Generated code for "@scope/jsii-calc-lib": /java/src/main/java/software/amazon/jsii/tests/calculator/lib/IDoublable.java 1`] = ` package software.amazon.jsii.tests.calculator.lib; @@ -3644,6 +3692,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /java/src/main/resou @scope/jsii-calc-lib.DiamondLeft=software.amazon.jsii.tests.calculator.lib.DiamondLeft @scope/jsii-calc-lib.DiamondRight=software.amazon.jsii.tests.calculator.lib.DiamondRight @scope/jsii-calc-lib.EnumFromScopedModule=software.amazon.jsii.tests.calculator.lib.EnumFromScopedModule +@scope/jsii-calc-lib.FunctionWithUnderscoreArgument=software.amazon.jsii.tests.calculator.lib.FunctionWithUnderscoreArgument @scope/jsii-calc-lib.IDoublable=software.amazon.jsii.tests.calculator.lib.IDoublable @scope/jsii-calc-lib.IFriendly=software.amazon.jsii.tests.calculator.lib.IFriendly @scope/jsii-calc-lib.IThreeLevelsInterface=software.amazon.jsii.tests.calculator.lib.IThreeLevelsInterface @@ -3699,6 +3748,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┃ ┣━ 📄 IOptionB.java ┃ ┃ ┗━ 📄 UseOptions.java ┃ ┣━ 📄 AnonymousImplementationProvider.java + ┃ ┣━ 📄 AnyPropertyAccess.java ┃ ┣━ 📄 AsyncVirtualMethods.java ┃ ┣━ 📄 AugmentableClass.java ┃ ┣━ 📄 BaseClass.java @@ -3757,6 +3807,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┣━ 📄 DoNotOverridePrivates.java ┃ ┣━ 📄 DoNotRecognizeAnyAsOptional.java ┃ ┣━ 📄 DontComplainAboutVariadicAfterOptional.java + ┃ ┣━ 📄 DontUseMe.java ┃ ┣━ 📄 DoubleTrouble.java ┃ ┣━ 📄 DummyObj.java ┃ ┣━ 📄 DynamicPropertyBearer.java @@ -4020,6 +4071,7 @@ exports[`Generated code for "jsii-calc": / 1`] = ` ┃ ┣━ 📄 VariadicTypeUnion.java ┃ ┣━ 📄 VirtualMethodPlayground.java ┃ ┣━ 📄 VoidCallback.java + ┃ ┣━ 📄 WeirdDocs.java ┃ ┗━ 📄 WithPrivatePropertyInConstructor.java ┗━ 📁 resources ┗━ 📁 software @@ -4385,6 +4437,8 @@ exports[`Generated code for "jsii-calc": /java/pom.xml 1`] = ` -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 + none + true @@ -4714,9 +4768,9 @@ public abstract class AbstractSuite extends software.amazon.jsii.JsiiObject { protected abstract @org.jetbrains.annotations.NotNull java.lang.String someMethod(final @org.jetbrains.annotations.NotNull java.lang.String str); /** - * Sets \`seed\` to \`this.property\`, then calls \`someMethod\` with \`this.property\` and returns the result. + * Sets seed to this.property, then calls someMethod with this.property and returns the result. *

- * @param seed a \`string\`. This parameter is required. + * @param seed a string. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) public @org.jetbrains.annotations.NotNull java.lang.String workItAll(final @org.jetbrains.annotations.NotNull java.lang.String seed) { @@ -5338,7 +5392,7 @@ public class AmbiguousParameters extends software.amazon.jsii.JsiiObject { } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.AmbiguousParameters}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.AmbiguousParameters}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -5398,6 +5452,40 @@ public class AnonymousImplementationProvider extends software.amazon.jsii.JsiiOb `; +exports[`Generated code for "jsii-calc": /java/src/main/java/software/amazon/jsii/tests/calculator/AnyPropertyAccess.java 1`] = ` +package software.amazon.jsii.tests.calculator; + +/** + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.AnyPropertyAccess") +public class AnyPropertyAccess extends software.amazon.jsii.JsiiObject { + + protected AnyPropertyAccess(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + } + + protected AnyPropertyAccess(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) { + super(initializationMode); + } + + /** + * Sets obj[resultProp] to \${obj[propA]}+\${obj[propB]}. + *

+ * @param obj the receiver object. This parameter is required. + * @param propA the first property to read. This parameter is required. + * @param propB the second property to read. This parameter is required. + * @param resultProp the property to write into. This parameter is required. + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + public static void mutateProperties(final @org.jetbrains.annotations.NotNull java.lang.Object obj, final @org.jetbrains.annotations.NotNull java.lang.String propA, final @org.jetbrains.annotations.NotNull java.lang.String propB, final @org.jetbrains.annotations.NotNull java.lang.String resultProp) { + software.amazon.jsii.JsiiObject.jsiiStaticCall(software.amazon.jsii.tests.calculator.AnyPropertyAccess.class, "mutateProperties", software.amazon.jsii.NativeType.VOID, new Object[] { obj, java.util.Objects.requireNonNull(propA, "propA is required"), java.util.Objects.requireNonNull(propB, "propB is required"), java.util.Objects.requireNonNull(resultProp, "resultProp is required") }); + } +} + +`; + exports[`Generated code for "jsii-calc": /java/src/main/java/software/amazon/jsii/tests/calculator/AsyncVirtualMethods.java 1`] = ` package software.amazon.jsii.tests.calculator; @@ -5778,7 +5866,7 @@ public abstract class BurriedAnonymousObject extends software.amazon.jsii.JsiiOb /** * Implement this method and have it return it's parameter. *

- * @return \`value\` + * @return value * @param value the value that should be returned. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -5796,7 +5884,7 @@ public abstract class BurriedAnonymousObject extends software.amazon.jsii.JsiiOb /** * Implement this method and have it return it's parameter. *

- * @return \`value\` + * @return value * @param value the value that should be returned. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -6052,7 +6140,7 @@ public class Calculator extends software.amazon.jsii.tests.calculator.compositio } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.Calculator}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.Calculator}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -6838,7 +6926,7 @@ public class ClassWithContainerTypes extends software.amazon.jsii.JsiiObject { } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.ClassWithContainerTypes}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.ClassWithContainerTypes}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -7969,7 +8057,7 @@ exports[`Generated code for "jsii-calc": /java/src/main/java/software/am package software.amazon.jsii.tests.calculator; /** - * 1. + *

*

* call #takeThis() -> An ObjectRef will be provisioned for the value (it'll be re-used!) * 2. call #takeThisToo() -> The ObjectRef from before will need to be down-cased to the ParentStruct982 type @@ -9692,6 +9780,136 @@ public class DontComplainAboutVariadicAfterOptional extends software.amazon.jsii `; +exports[`Generated code for "jsii-calc": /java/src/main/java/software/amazon/jsii/tests/calculator/DontUseMe.java 1`] = ` +package software.amazon.jsii.tests.calculator; + +/** + *

Don't use this interface An interface that shouldn't be used, with the annotation in a weird place.

+ */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.DontUseMe") +@software.amazon.jsii.Jsii.Proxy(DontUseMe.Jsii$Proxy.class) +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) +public interface DontUseMe extends software.amazon.jsii.JsiiSerializable { + + /** + *

Don't set this parameter.

+ *

+ * A parameter that shouldn't be set, with the annotation in a weird place. + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + default @org.jetbrains.annotations.Nullable java.lang.String getDontSetMe() { + return null; + } + + /** + * @return a {@link Builder} of {@link DontUseMe} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + static Builder builder() { + return new Builder(); + } + /** + * A builder for {@link DontUseMe} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + public static final class Builder implements software.amazon.jsii.Builder { + java.lang.String dontSetMe; + + /** + * Sets the value of {@link DontUseMe#getDontSetMe} + * @param dontSetMe

Don't set this parameter.

+ * A parameter that shouldn't be set, with the annotation in a weird place. + * @return {@code this} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + public Builder dontSetMe(java.lang.String dontSetMe) { + this.dontSetMe = dontSetMe; + return this; + } + + /** + * Builds the configured instance. + * @return a new instance of {@link DontUseMe} + * @throws NullPointerException if any required attribute was not provided + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + @Override + public DontUseMe build() { + return new Jsii$Proxy(this); + } + } + + /** + * An implementation for {@link DontUseMe} + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + @software.amazon.jsii.Internal + final class Jsii$Proxy extends software.amazon.jsii.JsiiObject implements DontUseMe { + private final java.lang.String dontSetMe; + + /** + * 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.dontSetMe = software.amazon.jsii.Kernel.get(this, "dontSetMe", software.amazon.jsii.NativeType.forClass(java.lang.String.class)); + } + + /** + * Constructor that initializes the object based on literal property values passed by the {@link Builder}. + */ + protected Jsii$Proxy(final Builder builder) { + super(software.amazon.jsii.JsiiObject.InitializationMode.JSII); + this.dontSetMe = builder.dontSetMe; + } + + @Override + public final java.lang.String getDontSetMe() { + return this.dontSetMe; + } + + @Override + @software.amazon.jsii.Internal + 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(); + + if (this.getDontSetMe() != null) { + data.set("dontSetMe", om.valueToTree(this.getDontSetMe())); + } + + final com.fasterxml.jackson.databind.node.ObjectNode struct = com.fasterxml.jackson.databind.node.JsonNodeFactory.instance.objectNode(); + struct.set("fqn", om.valueToTree("jsii-calc.DontUseMe")); + 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 final boolean equals(final Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + DontUseMe.Jsii$Proxy that = (DontUseMe.Jsii$Proxy) o; + + return this.dontSetMe != null ? this.dontSetMe.equals(that.dontSetMe) : that.dontSetMe == null; + } + + @Override + public final int hashCode() { + int result = this.dontSetMe != null ? this.dontSetMe.hashCode() : 0; + return result; + } + } +} + +`; + exports[`Generated code for "jsii-calc": /java/src/main/java/software/amazon/jsii/tests/calculator/DoubleTrouble.java 1`] = ` package software.amazon.jsii.tests.calculator; @@ -9947,7 +10165,7 @@ public class DynamicPropertyBearerChild extends software.amazon.jsii.tests.calcu } /** - * Sets \`this.dynamicProperty\` to the new value, and returns the old value. + * Sets this.dynamicProperty to the new value, and returns the old value. *

* @return the old value that was set. * @param newValue the new value to be set. This parameter is required. @@ -9971,7 +10189,7 @@ exports[`Generated code for "jsii-calc": /java/src/main/java/software/am package software.amazon.jsii.tests.calculator; /** - * This class is used to validate that serialization and deserialization does not interpret ISO-8601-formatted timestampts to the native date/time object, as the jsii protocol has a $jsii$date wrapper for this purpose (node's JSON parsing does *NOT* detect dates automatically in this way, so host libraries should not either). + * This class is used to validate that serialization and deserialization does not interpret ISO-8601-formatted timestampts to the native date/time object, as the jsii protocol has a $jsii$date wrapper for this purpose (node's JSON parsing does NOT detect dates automatically in this way, so host libraries should not either). */ @javax.annotation.Generated(value = "jsii-pacmak") @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -9989,7 +10207,7 @@ public abstract class Entropy extends software.amazon.jsii.JsiiObject { /** * Creates a new instance of Entropy. *

- * @param clock your implementation of \`WallClock\`. This parameter is required. + * @param clock your implementation of WallClock. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) protected Entropy(final @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.IWallClock clock) { @@ -10000,7 +10218,7 @@ public abstract class Entropy extends software.amazon.jsii.JsiiObject { /** * Increases entropy by consuming time from the clock (yes, this is a long shot, please don't judge). *

- * @return the time from the \`WallClock\`. + * @return the time from the WallClock. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) public @org.jetbrains.annotations.NotNull java.lang.String increase() { @@ -10008,9 +10226,9 @@ public abstract class Entropy extends software.amazon.jsii.JsiiObject { } /** - * Implement this method such that it returns \`word\`. + * Implement this method such that it returns word. *

- * @return \`word\`. + * @return word. * @param word the value to return. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -10026,9 +10244,9 @@ public abstract class Entropy extends software.amazon.jsii.JsiiObject { } /** - * Implement this method such that it returns \`word\`. + * Implement this method such that it returns word. *

- * @return \`word\`. + * @return word. * @param word the value to return. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -10103,7 +10321,7 @@ public class EraseUndefinedHashValues extends software.amazon.jsii.JsiiObject { } /** - * Returns \`true\` if \`key\` is defined in \`opts\`. + * Returns true if key is defined in opts. *

* Used to check that undefined/null hash values * are being erased when sending values from native code to JS. @@ -16821,7 +17039,7 @@ public class LevelOne extends software.amazon.jsii.JsiiObject { } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.LevelOne}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.LevelOne}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -17512,7 +17730,7 @@ package software.amazon.jsii.tests.calculator; public interface NestedStruct extends software.amazon.jsii.JsiiSerializable { /** - * When provided, must be > 0. + * When provided, must be > 0. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @org.jetbrains.annotations.NotNull java.lang.Number getNumberProp(); @@ -17533,7 +17751,7 @@ public interface NestedStruct extends software.amazon.jsii.JsiiSerializable { /** * Sets the value of {@link NestedStruct#getNumberProp} - * @param numberProp When provided, must be > 0. This parameter is required. + * @param numberProp When provided, must be > 0. This parameter is required. * @return {@code this} */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -18421,7 +18639,7 @@ public class OptionalStructConsumer extends software.amazon.jsii.JsiiObject { } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.OptionalStructConsumer}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.OptionalStructConsumer}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -18637,7 +18855,7 @@ public class ParamShadowsBuiltins extends software.amazon.jsii.JsiiObject { } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.ParamShadowsBuiltins}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.ParamShadowsBuiltins}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -19587,9 +19805,9 @@ exports[`Generated code for "jsii-calc": /java/src/main/java/software/am package software.amazon.jsii.tests.calculator; /** - * Helps ensure the JSII kernel & runtime cooperate correctly when an un-exported instance of a class is returned with a declared type that is an exported interface, and the instance inherits from an exported class. + * Helps ensure the JSII kernel & runtime cooperate correctly when an un-exported instance of a class is returned with a declared type that is an exported interface, and the instance inherits from an exported class. *

- * @return an instance of an un-exported class that extends \`ExportedBaseClass\`, declared as \`IPrivatelyImplemented\`. + * @return an instance of an un-exported class that extends ExportedBaseClass, declared as IPrivatelyImplemented. * @see https://github.com/aws/jsii/issues/320 */ @javax.annotation.Generated(value = "jsii-pacmak") @@ -20208,7 +20426,7 @@ package software.amazon.jsii.tests.calculator; @software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.SingletonStringEnum") public enum SingletonStringEnum { /** - * 1337. + *

*/ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) SINGLETON_STRING, @@ -20622,7 +20840,7 @@ exports[`Generated code for "jsii-calc": /java/src/main/java/software/am package software.amazon.jsii.tests.calculator; /** - * This is used to validate the ability to use \`this\` from within a static context. + * This is used to validate the ability to use this from within a static context. *

* https://github.com/awslabs/aws-cdk/issues/2304 */ @@ -22127,7 +22345,7 @@ public class SupportsNiceJavaBuilder extends software.amazon.jsii.tests.calculat /** * @param id some identifier. This parameter is required. - * @param defaultBar the default value of \`bar\`. + * @param defaultBar the default value of bar. * @param props some props once can provide. * @param rest a variadic continuation. This parameter is required. */ @@ -22161,7 +22379,7 @@ public class SupportsNiceJavaBuilder extends software.amazon.jsii.tests.calculat /** * @return a new instance of {@link Builder}. * @param id some identifier. This parameter is required. - * @param defaultBar the default value of \`bar\`. + * @param defaultBar the default value of bar. * @param rest a variadic continuation. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -22201,12 +22419,12 @@ public class SupportsNiceJavaBuilder extends software.amazon.jsii.tests.calculat } /** - * An \`id\` field here is terrible API design, because the constructor of \`SupportsNiceJavaBuilder\` already has a parameter named \`id\`. + * An id field here is terrible API design, because the constructor of SupportsNiceJavaBuilder already has a parameter named id. *

* But here we are, doing it like we didn't care. *

* @return {@code this} - * @param id An \`id\` field here is terrible API design, because the constructor of \`SupportsNiceJavaBuilder\` already has a parameter named \`id\`. This parameter is required. + * @param id An id field here is terrible API design, because the constructor of SupportsNiceJavaBuilder already has a parameter named id. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) public Builder id(final java.lang.String id) { @@ -22215,7 +22433,7 @@ public class SupportsNiceJavaBuilder extends software.amazon.jsii.tests.calculat } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.SupportsNiceJavaBuilder}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.SupportsNiceJavaBuilder}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -22257,7 +22475,7 @@ public interface SupportsNiceJavaBuilderProps extends software.amazon.jsii.JsiiS @org.jetbrains.annotations.NotNull java.lang.Number getBar(); /** - * An \`id\` field here is terrible API design, because the constructor of \`SupportsNiceJavaBuilder\` already has a parameter named \`id\`. + * An id field here is terrible API design, because the constructor of SupportsNiceJavaBuilder already has a parameter named id. *

* But here we are, doing it like we didn't care. */ @@ -22294,7 +22512,7 @@ public interface SupportsNiceJavaBuilderProps extends software.amazon.jsii.JsiiS /** * Sets the value of {@link SupportsNiceJavaBuilderProps#getId} - * @param id An \`id\` field here is terrible API design, because the constructor of \`SupportsNiceJavaBuilder\` already has a parameter named \`id\`. + * @param id An id field here is terrible API design, because the constructor of SupportsNiceJavaBuilder already has a parameter named id. * But here we are, doing it like we didn't care. * @return {@code this} */ @@ -22401,7 +22619,7 @@ exports[`Generated code for "jsii-calc": /java/src/main/java/software/am package software.amazon.jsii.tests.calculator; /** - * We can generate fancy builders in Java for classes which take a mix of positional & struct parameters. + * We can generate fancy builders in Java for classes which take a mix of positional & struct parameters. */ @javax.annotation.Generated(value = "jsii-pacmak") @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -22483,12 +22701,12 @@ public class SupportsNiceJavaBuilderWithRequiredProps extends software.amazon.js } /** - * An \`id\` field here is terrible API design, because the constructor of \`SupportsNiceJavaBuilder\` already has a parameter named \`id\`. + * An id field here is terrible API design, because the constructor of SupportsNiceJavaBuilder already has a parameter named id. *

* But here we are, doing it like we didn't care. *

* @return {@code this} - * @param id An \`id\` field here is terrible API design, because the constructor of \`SupportsNiceJavaBuilder\` already has a parameter named \`id\`. This parameter is required. + * @param id An id field here is terrible API design, because the constructor of SupportsNiceJavaBuilder already has a parameter named id. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) public Builder id(final java.lang.String id) { @@ -22497,7 +22715,7 @@ public class SupportsNiceJavaBuilderWithRequiredProps extends software.amazon.js } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.SupportsNiceJavaBuilderWithRequiredProps}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.SupportsNiceJavaBuilderWithRequiredProps}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -22719,7 +22937,7 @@ public class TestStructWithEnum extends software.amazon.jsii.JsiiObject { } /** - * Returns true if \`foo\` is \`StringEnum.A\`. + * Returns true if foo is StringEnum.A. *

* @param input This parameter is required. */ @@ -22729,7 +22947,7 @@ public class TestStructWithEnum extends software.amazon.jsii.JsiiObject { } /** - * Returns true if \`foo\` is \`StringEnum.B\` and \`bar\` is \`AllTypesEnum.THIS_IS_GREAT\`. + * Returns true if foo is StringEnum.B and bar is AllTypesEnum.THIS_IS_GREAT. *

* @param input This parameter is required. */ @@ -22739,7 +22957,7 @@ public class TestStructWithEnum extends software.amazon.jsii.JsiiObject { } /** - * Returns \`foo: StringEnum.A\`. + * Returns foo: StringEnum.A. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.StructWithEnum getStructWithFoo() { @@ -22747,7 +22965,7 @@ public class TestStructWithEnum extends software.amazon.jsii.JsiiObject { } /** - * Returns \`foo: StringEnum.C\` and \`bar: AllTypesEnum.MY_ENUM_VALUE\`. + * Returns foo: StringEnum.C and bar: AllTypesEnum.MY_ENUM_VALUE. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) public @org.jetbrains.annotations.NotNull software.amazon.jsii.tests.calculator.StructWithEnum getStructWithFooBar() { @@ -23585,7 +23803,7 @@ public class VariadicMethod extends software.amazon.jsii.JsiiObject { } /** - * @param prefix a prefix that will be use for all values returned by \`#asArray\`. This parameter is required. + * @param prefix a prefix that will be use for all values returned by #asArray. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) public VariadicMethod(final @org.jetbrains.annotations.NotNull java.lang.Number... prefix) { @@ -23594,7 +23812,7 @@ public class VariadicMethod extends software.amazon.jsii.JsiiObject { } /** - * @param first the first element of the array to be returned (after the \`prefix\` provided at construction time). This parameter is required. + * @param first the first element of the array to be returned (after the prefix provided at construction time). This parameter is required. * @param others other elements to be included in the array. This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @@ -23791,6 +24009,58 @@ public abstract class VoidCallback extends software.amazon.jsii.JsiiObject { `; +exports[`Generated code for "jsii-calc": /java/src/main/java/software/amazon/jsii/tests/calculator/WeirdDocs.java 1`] = ` +package software.amazon.jsii.tests.calculator; + +/** + *

Don't use this class.

+ *

+ * A class that shouldn't be used, with the annotation in a weird place. + */ +@javax.annotation.Generated(value = "jsii-pacmak") +@software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) +@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.WeirdDocs") +public class WeirdDocs extends software.amazon.jsii.JsiiObject { + + protected WeirdDocs(final software.amazon.jsii.JsiiObjectRef objRef) { + super(objRef); + } + + protected WeirdDocs(final software.amazon.jsii.JsiiObject.InitializationMode initializationMode) { + super(initializationMode); + } + + /** + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + public WeirdDocs() { + super(software.amazon.jsii.JsiiObject.InitializationMode.JSII); + software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this); + } + + /** + *

Don't read this property.

+ *

+ * A property that shouldn't be read, with the annotation in a weird place. + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + public @org.jetbrains.annotations.Nullable java.lang.String getDontReadMe() { + return software.amazon.jsii.Kernel.get(this, "dontReadMe", software.amazon.jsii.NativeType.forClass(java.lang.String.class)); + } + + /** + *

Don't read this property.

+ *

+ * A property that shouldn't be read, with the annotation in a weird place. + */ + @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) + public void setDontReadMe(final @org.jetbrains.annotations.Nullable java.lang.String value) { + software.amazon.jsii.Kernel.set(this, "dontReadMe", value); + } +} + +`; + exports[`Generated code for "jsii-calc": /java/src/main/java/software/amazon/jsii/tests/calculator/WithPrivatePropertyInConstructor.java 1`] = ` package software.amazon.jsii.tests.calculator; @@ -24021,7 +24291,7 @@ public abstract class Cdk16625 extends software.amazon.jsii.JsiiObject { } /** - * Implement this functin to return \`gen.next()\`. It is extremely important that the \`donotimport\` submodule is NEVER explicitly loaded in the testing application (otherwise this test is void). + * Implement this functin to return gen.next(). It is extremely important that the donotimport submodule is NEVER explicitly loaded in the testing application (otherwise this test is void). *

* @param gen a VERY pseudo random number generator. This parameter is required. */ @@ -24038,7 +24308,7 @@ public abstract class Cdk16625 extends software.amazon.jsii.JsiiObject { } /** - * Implement this functin to return \`gen.next()\`. It is extremely important that the \`donotimport\` submodule is NEVER explicitly loaded in the testing application (otherwise this test is void). + * Implement this functin to return gen.next(). It is extremely important that the donotimport submodule is NEVER explicitly loaded in the testing application (otherwise this test is void). *

* @param gen a VERY pseudo random number generator. This parameter is required. */ @@ -24159,7 +24429,7 @@ public class AcceptsPath extends software.amazon.jsii.JsiiObject { } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.cdk22369.AcceptsPath}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.cdk22369.AcceptsPath}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -25584,25 +25854,25 @@ public class MyClass extends software.amazon.jsii.JsiiObject { * @param _ This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) - public MyClass(final @org.jetbrains.annotations.NotNull java.lang.Number _) { + public MyClass(final @org.jetbrains.annotations.NotNull java.lang.Number __) { super(software.amazon.jsii.JsiiObject.InitializationMode.JSII); - software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this, new Object[] { java.util.Objects.requireNonNull(_, "_ is required") }); + software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this, new Object[] { java.util.Objects.requireNonNull(__, "__ is required") }); } /** * @param _ This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) - public static void bar(final @org.jetbrains.annotations.NotNull java.lang.Boolean _) { - software.amazon.jsii.JsiiObject.jsiiStaticCall(software.amazon.jsii.tests.calculator.module2530.MyClass.class, "bar", software.amazon.jsii.NativeType.VOID, new Object[] { java.util.Objects.requireNonNull(_, "_ is required") }); + public static void bar(final @org.jetbrains.annotations.NotNull java.lang.Boolean __) { + software.amazon.jsii.JsiiObject.jsiiStaticCall(software.amazon.jsii.tests.calculator.module2530.MyClass.class, "bar", software.amazon.jsii.NativeType.VOID, new Object[] { java.util.Objects.requireNonNull(__, "__ is required") }); } /** * @param _ This parameter is required. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) - public void foo(final @org.jetbrains.annotations.NotNull java.lang.String _) { - software.amazon.jsii.Kernel.call(this, "foo", software.amazon.jsii.NativeType.VOID, new Object[] { java.util.Objects.requireNonNull(_, "_ is required") }); + public void foo(final @org.jetbrains.annotations.NotNull java.lang.String __) { + software.amazon.jsii.Kernel.call(this, "foo", software.amazon.jsii.NativeType.VOID, new Object[] { java.util.Objects.requireNonNull(__, "__ is required") }); } } @@ -27405,7 +27675,7 @@ public class ClassWithSelfKwarg extends software.amazon.jsii.JsiiObject { } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.python_self.ClassWithSelfKwarg}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.python_self.ClassWithSelfKwarg}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -27827,7 +28097,7 @@ public class MyClass extends software.amazon.jsii.JsiiObject implements software } /** - * @returns a newly built instance of {@link software.amazon.jsii.tests.calculator.submodule.MyClass}. + * @return a newly built instance of {@link software.amazon.jsii.tests.calculator.submodule.MyClass}. */ @software.amazon.jsii.Stability(software.amazon.jsii.Stability.Level.Stable) @Override @@ -28931,6 +29201,7 @@ jsii-calc.AllTypesEnum=software.amazon.jsii.tests.calculator.AllTypesEnum jsii-calc.AllowedMethodNames=software.amazon.jsii.tests.calculator.AllowedMethodNames jsii-calc.AmbiguousParameters=software.amazon.jsii.tests.calculator.AmbiguousParameters jsii-calc.AnonymousImplementationProvider=software.amazon.jsii.tests.calculator.AnonymousImplementationProvider +jsii-calc.AnyPropertyAccess=software.amazon.jsii.tests.calculator.AnyPropertyAccess jsii-calc.AsyncVirtualMethods=software.amazon.jsii.tests.calculator.AsyncVirtualMethods jsii-calc.AugmentableClass=software.amazon.jsii.tests.calculator.AugmentableClass jsii-calc.BaseClass=software.amazon.jsii.tests.calculator.BaseClass @@ -28979,6 +29250,7 @@ jsii-calc.DoNotOverridePrivates=software.amazon.jsii.tests.calculator.DoNotOverr jsii-calc.DoNotRecognizeAnyAsOptional=software.amazon.jsii.tests.calculator.DoNotRecognizeAnyAsOptional jsii-calc.DocumentedClass=software.amazon.jsii.tests.calculator.DocumentedClass jsii-calc.DontComplainAboutVariadicAfterOptional=software.amazon.jsii.tests.calculator.DontComplainAboutVariadicAfterOptional +jsii-calc.DontUseMe=software.amazon.jsii.tests.calculator.DontUseMe jsii-calc.DoubleTrouble=software.amazon.jsii.tests.calculator.DoubleTrouble jsii-calc.DummyObj=software.amazon.jsii.tests.calculator.DummyObj jsii-calc.DynamicPropertyBearer=software.amazon.jsii.tests.calculator.DynamicPropertyBearer @@ -29152,6 +29424,7 @@ jsii-calc.VariadicMethod=software.amazon.jsii.tests.calculator.VariadicMethod jsii-calc.VariadicTypeUnion=software.amazon.jsii.tests.calculator.VariadicTypeUnion jsii-calc.VirtualMethodPlayground=software.amazon.jsii.tests.calculator.VirtualMethodPlayground jsii-calc.VoidCallback=software.amazon.jsii.tests.calculator.VoidCallback +jsii-calc.WeirdDocs=software.amazon.jsii.tests.calculator.WeirdDocs jsii-calc.WithPrivatePropertyInConstructor=software.amazon.jsii.tests.calculator.WithPrivatePropertyInConstructor jsii-calc.anonymous.IOptionA=software.amazon.jsii.tests.calculator.anonymous.IOptionA jsii-calc.anonymous.IOptionB=software.amazon.jsii.tests.calculator.anonymous.IOptionB diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap index bfdbf7ebf5..eb50eebd42 100644 --- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap +++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap @@ -1583,6 +1583,31 @@ class EnumFromScopedModule(enum.Enum): ''' +class FunctionWithUnderscoreArgument( + metaclass=jsii.JSIIMeta, + jsii_type="@scope/jsii-calc-lib.FunctionWithUnderscoreArgument", +): + '''(deprecated) For Java, test that an identifier that is just a _ is handled. + + :stability: deprecated + ''' + + def __init__(self) -> None: + ''' + :stability: deprecated + ''' + jsii.create(self.__class__, self, []) + + @jsii.member(jsii_name="foo") + def foo(self, _: builtins.str) -> builtins.str: + ''' + :param _: - + + :stability: deprecated + ''' + return typing.cast(builtins.str, jsii.invoke(self, "foo", [_])) + + @jsii.interface(jsii_type="@scope/jsii-calc-lib.IDoublable") class IDoublable(typing_extensions.Protocol): '''(deprecated) The general contract for a concrete number. @@ -1980,6 +2005,7 @@ __all__ = [ "DiamondLeft", "DiamondRight", "EnumFromScopedModule", + "FunctionWithUnderscoreArgument", "IDoublable", "IFriendly", "IThreeLevelsInterface", @@ -2392,7 +2418,21 @@ exports[`Generated code for "@scope/jsii-calc-lib": /py self._values["hoisted_top"] = hoisted_top if right is not None: self._values["right"] = right -@@ -317,10 +331,15 @@ +@@ -191,10 +205,13 @@ + ''' + :param _: - + + :stability: deprecated + ''' ++ if __debug__: ++ type_hints = typing.get_type_hints(_typecheckingstub__9f2d965a28491c2347ed53f3f21b6d1e134bd8c506672f5715c44023bddab720) ++ check_type(argname="argument _", value=_, expected_type=type_hints["_"]) + return typing.cast(builtins.str, jsii.invoke(self, "foo", [_])) + + + @jsii.interface(jsii_type="@scope/jsii-calc-lib.IDoublable") + class IDoublable(typing_extensions.Protocol): +@@ -342,10 +359,15 @@ :param astring: (deprecated) A string value. :param first_optional: @@ -2408,7 +2448,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /py "astring": astring, } if first_optional is not None: -@@ -477,10 +496,15 @@ +@@ -502,10 +524,15 @@ :param optional2: :param optional3: @@ -2424,7 +2464,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /py self._values["optional1"] = optional1 if optional2 is not None: self._values["optional2"] = optional2 -@@ -540,10 +564,13 @@ +@@ -565,10 +592,13 @@ :param value: The number. @@ -2438,7 +2478,7 @@ exports[`Generated code for "@scope/jsii-calc-lib": /py @builtins.property @jsii.member(jsii_name="doubleValue") def double_value(self) -> jsii.Number: -@@ -583,5 +610,57 @@ +@@ -609,5 +639,63 @@ publication.publish() # Loading modules to ensure their types are registered with the jsii runtime library @@ -2473,6 +2513,12 @@ exports[`Generated code for "@scope/jsii-calc-lib": /py + """Type checking stubs""" + pass + ++def _typecheckingstub__9f2d965a28491c2347ed53f3f21b6d1e134bd8c506672f5715c44023bddab720( ++ _: builtins.str, ++) -> None: ++ """Type checking stubs""" ++ pass ++ +def _typecheckingstub__de81edc65427ea9129fd035388008307a6cae942eefc63cb3d9fd8b42956da06( + *, + anumber: jsii.Number, @@ -3490,6 +3536,29 @@ class AmbiguousParameters( return typing.cast("Bell", jsii.get(self, "scope")) +class AnyPropertyAccess( + metaclass=jsii.JSIIMeta, + jsii_type="jsii-calc.AnyPropertyAccess", +): + @jsii.member(jsii_name="mutateProperties") + @builtins.classmethod + def mutate_properties( + cls, + obj: typing.Any, + prop_a: builtins.str, + prop_b: builtins.str, + result_prop: builtins.str, + ) -> None: + '''Sets obj[resultProp] to \`\`\${obj[propA]}+\${obj[propB]}\`\`. + + :param obj: the receiver object. + :param prop_a: the first property to read. + :param prop_b: the second property to read. + :param result_prop: the property to write into. + ''' + return typing.cast(None, jsii.sinvoke(cls, "mutateProperties", [obj, prop_a, prop_b, result_prop])) + + class AsyncVirtualMethods( metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.AsyncVirtualMethods", @@ -5188,6 +5257,46 @@ class DontComplainAboutVariadicAfterOptional( return typing.cast(builtins.str, jsii.invoke(self, "optionalAndVariadic", [optional, *things])) +@jsii.data_type( + jsii_type="jsii-calc.DontUseMe", + jsii_struct_bases=[], + name_mapping={"dont_set_me": "dontSetMe"}, +) +class DontUseMe: + def __init__(self, *, dont_set_me: typing.Optional[builtins.str] = None) -> None: + '''.. epigraph:: + + Don't use this interface An interface that shouldn't be used, with the annotation in a weird place. + + :param dont_set_me: .. epigraph:: Don't set this parameter. A parameter that shouldn't be set, with the annotation in a weird place. + ''' + self._values: typing.Dict[builtins.str, typing.Any] = {} + if dont_set_me is not None: + self._values["dont_set_me"] = dont_set_me + + @builtins.property + def dont_set_me(self) -> typing.Optional[builtins.str]: + '''.. epigraph:: + + Don't set this parameter. + + A parameter that shouldn't be set, with the annotation in a weird place. + ''' + result = self._values.get("dont_set_me") + return typing.cast(typing.Optional[builtins.str], result) + + def __eq__(self, rhs: typing.Any) -> builtins.bool: + return isinstance(rhs, self.__class__) and rhs._values == self._values + + def __ne__(self, rhs: typing.Any) -> builtins.bool: + return not (rhs == self) + + def __repr__(self) -> str: + return "DontUseMe(%s)" % ", ".join( + k + "=" + repr(v) for k, v in self._values.items() + ) + + @jsii.data_type( jsii_type="jsii-calc.DummyObj", jsii_struct_bases=[], @@ -10765,6 +10874,33 @@ class _VoidCallbackProxy(VoidCallback): typing.cast(typing.Any, VoidCallback).__jsii_proxy_class__ = lambda : _VoidCallbackProxy +class WeirdDocs(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.WeirdDocs"): + '''.. epigraph:: + + Don't use this class. + + A class that shouldn't be used, with the annotation in a weird place. + ''' + + def __init__(self) -> None: + jsii.create(self.__class__, self, []) + + @builtins.property + @jsii.member(jsii_name="dontReadMe") + def dont_read_me(self) -> typing.Optional[builtins.str]: + '''.. epigraph:: + + Don't read this property. + + A property that shouldn't be read, with the annotation in a weird place. + ''' + return typing.cast(typing.Optional[builtins.str], jsii.get(self, "dontReadMe")) + + @dont_read_me.setter + def dont_read_me(self, value: typing.Optional[builtins.str]) -> None: + jsii.set(self, "dontReadMe", value) + + class WithPrivatePropertyInConstructor( metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.WithPrivatePropertyInConstructor", @@ -11296,6 +11432,7 @@ __all__ = [ "AllowedMethodNames", "AmbiguousParameters", "AnonymousImplementationProvider", + "AnyPropertyAccess", "AsyncVirtualMethods", "AugmentableClass", "BaseClass", @@ -11342,6 +11479,7 @@ __all__ = [ "DoNotRecognizeAnyAsOptional", "DocumentedClass", "DontComplainAboutVariadicAfterOptional", + "DontUseMe", "DoubleTrouble", "DummyObj", "DynamicPropertyBearer", @@ -11506,6 +11644,7 @@ __all__ = [ "VariadicTypeUnion", "VirtualMethodPlayground", "VoidCallback", + "WeirdDocs", "WithPrivatePropertyInConstructor", "anonymous", "cdk16625", @@ -14855,7 +14994,24 @@ exports[`Generated code for "jsii-calc": /python/src/js jsii.create(self.__class__, self, [scope_, props_]) @builtins.property -@@ -480,10 +568,13 @@ +@@ -465,10 +553,16 @@ + :param obj: the receiver object. + :param prop_a: the first property to read. + :param prop_b: the second property to read. + :param result_prop: the property to write into. + ''' ++ if __debug__: ++ type_hints = typing.get_type_hints(_typecheckingstub__2e74ece926d1cff82c3a42c02b35b0b5b4427369dfc17caf49b658e36503a986) ++ check_type(argname="argument obj", value=obj, expected_type=type_hints["obj"]) ++ check_type(argname="argument prop_a", value=prop_a, expected_type=type_hints["prop_a"]) ++ check_type(argname="argument prop_b", value=prop_b, expected_type=type_hints["prop_b"]) ++ check_type(argname="argument result_prop", value=result_prop, expected_type=type_hints["result_prop"]) + return typing.cast(None, jsii.sinvoke(cls, "mutateProperties", [obj, prop_a, prop_b, result_prop])) + + + class AsyncVirtualMethods( + metaclass=jsii.JSIIMeta, +@@ -503,10 +597,13 @@ @jsii.member(jsii_name="overrideMe") def override_me(self, mult: jsii.Number) -> jsii.Number: ''' @@ -14869,7 +15025,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="overrideMeToo") def override_me_too(self) -> jsii.Number: return typing.cast(jsii.Number, jsii.ainvoke(self, "overrideMeToo", [])) -@@ -544,10 +635,14 @@ +@@ -567,10 +664,14 @@ '''Creates a BinaryOperation. :param lhs: Left-hand side operand. @@ -14884,7 +15040,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="hello") def hello(self) -> builtins.str: '''Say hello!''' -@@ -608,10 +703,13 @@ +@@ -631,10 +732,13 @@ :param value: the value that should be returned. @@ -14898,7 +15054,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class typing.cast(typing.Any, BurriedAnonymousObject).__jsii_proxy_class__ = lambda : _BurriedAnonymousObjectProxy -@@ -661,18 +759,24 @@ +@@ -684,18 +788,24 @@ def add(self, value: jsii.Number) -> None: '''Adds a number to the current value. @@ -14923,7 +15079,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="neg") def neg(self) -> None: '''Negates the current value.''' -@@ -682,10 +786,13 @@ +@@ -705,10 +815,13 @@ def pow(self, value: jsii.Number) -> None: '''Raises the current value by a power. @@ -14937,7 +15093,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="readUnionValue") def read_union_value(self) -> jsii.Number: '''Returns teh value of the union property (if defined).''' -@@ -717,20 +824,26 @@ +@@ -740,20 +853,26 @@ '''The current value.''' return typing.cast(_scope_jsii_calc_lib_c61f082f.NumericValue, jsii.get(self, "curr")) @@ -14964,7 +15120,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="unionProperty") def union_property( -@@ -742,10 +855,13 @@ +@@ -765,10 +884,13 @@ @union_property.setter def union_property( self, @@ -14978,7 +15134,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.CalculatorProps", -@@ -762,10 +878,14 @@ +@@ -785,10 +907,14 @@ '''Properties for Calculator. :param initial_value: The initial value of the calculator. NOTE: Any number works here, it's fine. Default: 0 @@ -14993,7 +15149,7 @@ exports[`Generated code for "jsii-calc": /python/src/js self._values["initial_value"] = initial_value if maximum_value is not None: self._values["maximum_value"] = maximum_value -@@ -811,10 +931,13 @@ +@@ -834,10 +960,13 @@ union_property: typing.Sequence[typing.Mapping[builtins.str, typing.Union[typing.Union["StructA", typing.Dict[builtins.str, typing.Any]], typing.Union["StructB", typing.Dict[builtins.str, typing.Any]]]]], ) -> None: ''' @@ -15007,7 +15163,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="unionProperty") def union_property( -@@ -825,10 +948,13 @@ +@@ -848,10 +977,13 @@ @union_property.setter def union_property( self, @@ -15021,7 +15177,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ClassWithCollections( metaclass=jsii.JSIIMeta, -@@ -841,10 +967,14 @@ +@@ -864,10 +996,14 @@ ) -> None: ''' :param map: - @@ -15036,7 +15192,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="createAList") @builtins.classmethod def create_a_list(cls) -> typing.List[builtins.str]: -@@ -860,37 +990,49 @@ +@@ -883,37 +1019,49 @@ def static_array(cls) -> typing.List[builtins.str]: # pyright: ignore [reportGeneralTypeIssues] return typing.cast(typing.List[builtins.str], jsii.sget(cls, "staticArray")) @@ -15086,7 +15242,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ClassWithContainerTypes( metaclass=jsii.JSIIMeta, -@@ -912,10 +1054,15 @@ +@@ -935,10 +1083,15 @@ :param obj: - :param array_prop: :param obj_prop: @@ -15102,7 +15258,7 @@ exports[`Generated code for "jsii-calc": /python/src/js ) jsii.create(self.__class__, self, [array, record, obj, props]) -@@ -965,17 +1112,23 @@ +@@ -988,17 +1141,23 @@ ): def __init__(self, int: builtins.str) -> None: ''' @@ -15126,7 +15282,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="int") def int(self) -> builtins.str: -@@ -994,10 +1147,13 @@ +@@ -1017,10 +1176,13 @@ def mutable_object(self) -> "IMutableObjectLiteral": return typing.cast("IMutableObjectLiteral", jsii.get(self, "mutableObject")) @@ -15140,7 +15296,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ClassWithNestedUnion( metaclass=jsii.JSIIMeta, -@@ -1008,10 +1164,13 @@ +@@ -1031,10 +1193,13 @@ union_property: typing.Sequence[typing.Union[typing.Mapping[builtins.str, typing.Union[typing.Union["StructA", typing.Dict[builtins.str, typing.Any]], typing.Union["StructB", typing.Dict[builtins.str, typing.Any]]]], typing.Sequence[typing.Union[typing.Union["StructA", typing.Dict[builtins.str, typing.Any]], typing.Union["StructB", typing.Dict[builtins.str, typing.Any]]]]]], ) -> None: ''' @@ -15154,7 +15310,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="unionProperty") def union_property( -@@ -1022,10 +1181,13 @@ +@@ -1045,10 +1210,13 @@ @union_property.setter def union_property( self, @@ -15168,7 +15324,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ConfusingToJackson( metaclass=jsii.JSIIMeta, -@@ -1056,10 +1218,13 @@ +@@ -1079,10 +1247,13 @@ @union_property.setter def union_property( self, @@ -15182,7 +15338,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.ConfusingToJacksonStruct", -@@ -1073,10 +1238,13 @@ +@@ -1096,10 +1267,13 @@ union_property: typing.Optional[typing.Union[_scope_jsii_calc_lib_c61f082f.IFriendly, typing.Sequence[typing.Union[_scope_jsii_calc_lib_c61f082f.IFriendly, "AbstractClass"]]]] = None, ) -> None: ''' @@ -15196,7 +15352,7 @@ exports[`Generated code for "jsii-calc": /python/src/js self._values["union_property"] = union_property @builtins.property -@@ -1104,10 +1272,13 @@ +@@ -1127,10 +1301,13 @@ ): def __init__(self, consumer: "PartiallyInitializedThisConsumer") -> None: ''' @@ -15210,7 +15366,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class Constructors(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Constructors"): def __init__(self) -> None: -@@ -1155,10 +1326,13 @@ +@@ -1178,10 +1355,13 @@ ): def __init__(self, delegate: "IStructReturningDelegate") -> None: ''' @@ -15224,7 +15380,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="workItBaby") def work_it_baby(self) -> "StructB": return typing.cast("StructB", jsii.invoke(self, "workItBaby", [])) -@@ -1187,10 +1361,13 @@ +@@ -1210,10 +1390,13 @@ Returns whether the bell was rung. @@ -15238,7 +15394,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="staticImplementedByPrivateClass") @builtins.classmethod def static_implemented_by_private_class( -@@ -1201,10 +1378,13 @@ +@@ -1224,10 +1407,13 @@ Return whether the bell was rung. @@ -15252,7 +15408,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="staticImplementedByPublicClass") @builtins.classmethod def static_implemented_by_public_class(cls, ringer: "IBellRinger") -> builtins.bool: -@@ -1212,10 +1392,13 @@ +@@ -1235,10 +1421,13 @@ Return whether the bell was rung. @@ -15266,7 +15422,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="staticWhenTypedAsClass") @builtins.classmethod def static_when_typed_as_class(cls, ringer: "IConcreteBellRinger") -> builtins.bool: -@@ -1223,50 +1406,65 @@ +@@ -1246,50 +1435,65 @@ Return whether the bell was rung. @@ -15332,7 +15488,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ConsumersOfThisCrazyTypeSystem( metaclass=jsii.JSIIMeta, -@@ -1281,20 +1479,26 @@ +@@ -1304,20 +1508,26 @@ obj: "IAnotherPublicInterface", ) -> builtins.str: ''' @@ -15359,7 +15515,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.ContainerProps", -@@ -1316,10 +1520,15 @@ +@@ -1339,10 +1549,15 @@ ''' :param array_prop: :param obj_prop: @@ -15375,7 +15531,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "obj_prop": obj_prop, "record_prop": record_prop, } -@@ -1385,17 +1594,23 @@ +@@ -1408,17 +1623,23 @@ data: typing.Mapping[builtins.str, typing.Any], ) -> builtins.str: ''' @@ -15399,7 +15555,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class Default(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Default"): '''A class named "Default". -@@ -1424,10 +1639,15 @@ +@@ -1447,10 +1668,15 @@ ''' :param arg1: - :param arg2: - @@ -15415,7 +15571,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="arg1") def arg1(self) -> jsii.Number: -@@ -1485,10 +1705,14 @@ +@@ -1508,10 +1734,14 @@ :deprecated: this constructor is "just" okay @@ -15430,7 +15586,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="method") def method(self) -> None: ''' -@@ -1518,10 +1742,13 @@ +@@ -1541,10 +1771,13 @@ ''' return typing.cast(typing.Optional[jsii.Number], jsii.get(self, "mutableProperty")) @@ -15444,7 +15600,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.enum(jsii_type="jsii-calc.DeprecatedEnum") class DeprecatedEnum(enum.Enum): -@@ -1557,10 +1784,13 @@ +@@ -1580,10 +1813,13 @@ :deprecated: it just wraps a string @@ -15458,7 +15614,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -1625,10 +1855,21 @@ +@@ -1648,10 +1884,21 @@ :param non_primitive: An example of a non primitive property. :param another_optional: This is optional. :param optional_any: @@ -15480,7 +15636,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "astring": astring, "another_required": another_required, "bool": bool, -@@ -1749,10 +1990,16 @@ +@@ -1772,10 +2019,16 @@ :param hoisted_top: :param left: :param right: @@ -15497,7 +15653,7 @@ exports[`Generated code for "jsii-calc": /python/src/js self._values["hoisted_top"] = hoisted_top if left is not None: self._values["left"] = left -@@ -1810,10 +2057,13 @@ +@@ -1833,10 +2086,13 @@ class DiamondInheritanceBaseLevelStruct: def __init__(self, *, base_level_property: builtins.str) -> None: ''' @@ -15511,7 +15667,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -1851,10 +2101,14 @@ +@@ -1874,10 +2130,14 @@ ) -> None: ''' :param base_level_property: @@ -15526,7 +15682,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "first_mid_level_property": first_mid_level_property, } -@@ -1899,10 +2153,14 @@ +@@ -1922,10 +2182,14 @@ ) -> None: ''' :param base_level_property: @@ -15541,7 +15697,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "second_mid_level_property": second_mid_level_property, } -@@ -1958,10 +2216,16 @@ +@@ -1981,10 +2245,16 @@ :param base_level_property: :param first_mid_level_property: :param second_mid_level_property: @@ -15558,7 +15714,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "first_mid_level_property": first_mid_level_property, "second_mid_level_property": second_mid_level_property, "top_level_property": top_level_property, -@@ -2041,10 +2305,13 @@ +@@ -2064,10 +2334,13 @@ @jsii.member(jsii_name="changePrivatePropertyValue") def change_private_property_value(self, new_value: builtins.str) -> None: ''' @@ -15572,7 +15728,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="privateMethodValue") def private_method_value(self) -> builtins.str: return typing.cast(builtins.str, jsii.invoke(self, "privateMethodValue", [])) -@@ -2073,10 +2340,15 @@ +@@ -2096,10 +2369,15 @@ ''' :param _required_any: - :param _optional_any: - @@ -15588,7 +15744,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class DocumentedClass(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.DocumentedClass"): '''Here's the first line of the TSDoc comment. -@@ -2140,10 +2412,14 @@ +@@ -2163,10 +2441,14 @@ ) -> builtins.str: ''' :param optional: - @@ -15602,8 +15758,22 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( - jsii_type="jsii-calc.DummyObj", -@@ -2153,10 +2429,13 @@ + jsii_type="jsii-calc.DontUseMe", +@@ -2179,10 +2461,13 @@ + + Don't use this interface An interface that shouldn't be used, with the annotation in a weird place. + + :param dont_set_me: .. epigraph:: Don't set this parameter. A parameter that shouldn't be set, with the annotation in a weird place. + ''' ++ if __debug__: ++ type_hints = typing.get_type_hints(_typecheckingstub__feb33b34fd05e771c7e47c132104c701042acfdf4eb6753873c4463e01f3cd9c) ++ check_type(argname="argument dont_set_me", value=dont_set_me, expected_type=type_hints["dont_set_me"]) + self._values: typing.Dict[builtins.str, typing.Any] = {} + if dont_set_me is not None: + self._values["dont_set_me"] = dont_set_me + + @builtins.property +@@ -2216,10 +2501,13 @@ class DummyObj: def __init__(self, *, example: builtins.str) -> None: ''' @@ -15617,7 +15787,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -2185,28 +2464,37 @@ +@@ -2248,28 +2536,37 @@ def __init__(self, value_store: builtins.str) -> None: ''' @@ -15655,7 +15825,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class DynamicPropertyBearerChild( DynamicPropertyBearer, -@@ -2215,20 +2503,26 @@ +@@ -2278,20 +2575,26 @@ ): def __init__(self, original_value: builtins.str) -> None: ''' @@ -15682,7 +15852,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="originalValue") def original_value(self) -> builtins.str: -@@ -2241,10 +2535,13 @@ +@@ -2304,10 +2607,13 @@ def __init__(self, clock: "IWallClock") -> None: '''Creates a new instance of Entropy. @@ -15696,7 +15866,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="increase") def increase(self) -> builtins.str: '''Increases entropy by consuming time from the clock (yes, this is a long shot, please don't judge). -@@ -2272,10 +2569,13 @@ +@@ -2335,10 +2641,13 @@ :param word: the value to return. @@ -15710,7 +15880,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class typing.cast(typing.Any, Entropy).__jsii_proxy_class__ = lambda : _EntropyProxy -@@ -2312,10 +2612,14 @@ +@@ -2375,10 +2684,14 @@ are being erased when sending values from native code to JS. :param opts: - @@ -15725,7 +15895,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="prop1IsNull") @builtins.classmethod def prop1_is_null(cls) -> typing.Mapping[builtins.str, typing.Any]: -@@ -2343,10 +2647,14 @@ +@@ -2406,10 +2719,14 @@ ) -> None: ''' :param option1: @@ -15740,7 +15910,7 @@ exports[`Generated code for "jsii-calc": /python/src/js self._values["option1"] = option1 if option2 is not None: self._values["option2"] = option2 -@@ -2390,10 +2698,14 @@ +@@ -2453,10 +2770,14 @@ :param readonly_string: - :param mutable_number: - @@ -15755,7 +15925,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="method") def method(self) -> None: ''' -@@ -2417,10 +2729,13 @@ +@@ -2480,10 +2801,13 @@ ''' return typing.cast(typing.Optional[jsii.Number], jsii.get(self, "mutableProperty")) @@ -15769,7 +15939,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.enum(jsii_type="jsii-calc.ExperimentalEnum") class ExperimentalEnum(enum.Enum): -@@ -2448,10 +2763,13 @@ +@@ -2511,10 +2835,13 @@ ''' :param readonly_property: @@ -15783,7 +15953,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -2481,10 +2799,13 @@ +@@ -2544,10 +2871,13 @@ ): def __init__(self, success: builtins.bool) -> None: ''' @@ -15797,7 +15967,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="success") def success(self) -> builtins.bool: -@@ -2500,10 +2821,14 @@ +@@ -2563,10 +2893,14 @@ def __init__(self, *, boom: builtins.bool, prop: builtins.str) -> None: ''' :param boom: @@ -15812,7 +15982,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "prop": prop, } -@@ -2545,10 +2870,14 @@ +@@ -2608,10 +2942,14 @@ :param readonly_string: - :param mutable_number: - @@ -15827,7 +15997,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="method") def method(self) -> None: ''' -@@ -2572,10 +2901,13 @@ +@@ -2635,10 +2973,13 @@ ''' return typing.cast(typing.Optional[jsii.Number], jsii.get(self, "mutableProperty")) @@ -15841,7 +16011,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.enum(jsii_type="jsii-calc.ExternalEnum") class ExternalEnum(enum.Enum): -@@ -2603,10 +2935,13 @@ +@@ -2666,10 +3007,13 @@ ''' :param readonly_property: @@ -15855,7 +16025,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -2749,10 +3084,13 @@ +@@ -2812,10 +3156,13 @@ def __init__(self, *, name: typing.Optional[builtins.str] = None) -> None: '''These are some arguments you can pass to a method. @@ -15869,7 +16039,7 @@ exports[`Generated code for "jsii-calc": /python/src/js self._values["name"] = name @builtins.property -@@ -2789,10 +3127,13 @@ +@@ -2852,10 +3199,13 @@ friendly: _scope_jsii_calc_lib_c61f082f.IFriendly, ) -> builtins.str: ''' @@ -15883,7 +16053,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.interface(jsii_type="jsii-calc.IAnonymousImplementationProvider") class IAnonymousImplementationProvider(typing_extensions.Protocol): -@@ -2872,10 +3213,13 @@ +@@ -2935,10 +3285,13 @@ def a(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "a")) @@ -15897,7 +16067,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, IAnotherPublicInterface).__jsii_proxy_class__ = lambda : _IAnotherPublicInterfaceProxy -@@ -2918,10 +3262,13 @@ +@@ -2981,10 +3334,13 @@ @jsii.member(jsii_name="yourTurn") def your_turn(self, bell: IBell) -> None: ''' @@ -15911,7 +16081,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, IBellRinger).__jsii_proxy_class__ = lambda : _IBellRingerProxy -@@ -2946,10 +3293,13 @@ +@@ -3009,10 +3365,13 @@ @jsii.member(jsii_name="yourTurn") def your_turn(self, bell: "Bell") -> None: ''' @@ -15925,7 +16095,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, IConcreteBellRinger).__jsii_proxy_class__ = lambda : _IConcreteBellRingerProxy -@@ -3005,10 +3355,13 @@ +@@ -3068,10 +3427,13 @@ ''' return typing.cast(typing.Optional[jsii.Number], jsii.get(self, "mutableProperty")) @@ -15939,7 +16109,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="method") def method(self) -> None: ''' -@@ -3063,10 +3416,13 @@ +@@ -3126,10 +3488,13 @@ ''' return typing.cast(typing.Optional[jsii.Number], jsii.get(self, "mutableProperty")) @@ -15953,7 +16123,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="method") def method(self) -> None: ''' -@@ -3108,10 +3464,13 @@ +@@ -3171,10 +3536,13 @@ def private(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "private")) @@ -15967,7 +16137,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, IExtendsPrivateInterface).__jsii_proxy_class__ = lambda : _IExtendsPrivateInterfaceProxy -@@ -3157,10 +3516,13 @@ +@@ -3220,10 +3588,13 @@ ''' return typing.cast(typing.Optional[jsii.Number], jsii.get(self, "mutableProperty")) @@ -15981,7 +16151,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="method") def method(self) -> None: ''' -@@ -3342,10 +3704,14 @@ +@@ -3405,10 +3776,14 @@ ) -> None: ''' :param arg1: - @@ -15996,7 +16166,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, IInterfaceWithOptionalMethodArguments).__jsii_proxy_class__ = lambda : _IInterfaceWithOptionalMethodArgumentsProxy -@@ -3380,10 +3746,13 @@ +@@ -3443,10 +3818,13 @@ def read_write_string(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "readWriteString")) @@ -16010,7 +16180,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, IInterfaceWithProperties).__jsii_proxy_class__ = lambda : _IInterfaceWithPropertiesProxy -@@ -3413,10 +3782,13 @@ +@@ -3476,10 +3854,13 @@ def foo(self) -> jsii.Number: return typing.cast(jsii.Number, jsii.get(self, "foo")) @@ -16024,7 +16194,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, IInterfaceWithPropertiesExtension).__jsii_proxy_class__ = lambda : _IInterfaceWithPropertiesExtensionProxy -@@ -3936,10 +4308,13 @@ +@@ -3999,10 +4380,13 @@ def value(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "value")) @@ -16038,7 +16208,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, IMutableObjectLiteral).__jsii_proxy_class__ = lambda : _IMutableObjectLiteralProxy -@@ -3975,19 +4350,25 @@ +@@ -4038,19 +4422,25 @@ def b(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "b")) @@ -16064,7 +16234,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the interface typing.cast(typing.Any, INonInternalInterface).__jsii_proxy_class__ = lambda : _INonInternalInterfaceProxy -@@ -4020,10 +4401,13 @@ +@@ -4083,10 +4473,13 @@ def property(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "property")) @@ -16078,7 +16248,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="wasSet") def was_set(self) -> builtins.bool: return typing.cast(builtins.bool, jsii.invoke(self, "wasSet", [])) -@@ -4216,10 +4600,13 @@ +@@ -4279,10 +4672,13 @@ def mutable_property(self) -> typing.Optional[jsii.Number]: return typing.cast(typing.Optional[jsii.Number], jsii.get(self, "mutableProperty")) @@ -16092,7 +16262,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="method") def method(self) -> None: return typing.cast(None, jsii.invoke(self, "method", [])) -@@ -4286,10 +4673,13 @@ +@@ -4349,10 +4745,13 @@ def prop(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "prop")) @@ -16106,7 +16276,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class Implementation(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Implementation"): def __init__(self) -> None: -@@ -4335,10 +4725,13 @@ +@@ -4398,10 +4797,13 @@ def private(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "private")) @@ -16120,7 +16290,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.ImplictBaseOfBase", -@@ -4356,10 +4749,15 @@ +@@ -4419,10 +4821,15 @@ ''' :param foo: - :param bar: - @@ -16136,7 +16306,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "bar": bar, "goo": goo, } -@@ -4434,10 +4832,13 @@ +@@ -4497,10 +4904,13 @@ count: jsii.Number, ) -> typing.List[_scope_jsii_calc_lib_c61f082f.IDoublable]: ''' @@ -16150,7 +16320,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class Isomorphism(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.Isomorphism"): '''Checks the "same instance" isomorphism is preserved within the constructor. -@@ -4542,19 +4943,25 @@ +@@ -4605,19 +5015,25 @@ def prop_a(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "propA")) @@ -16176,7 +16346,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class JavaReservedWords( metaclass=jsii.JSIIMeta, -@@ -4776,10 +5183,13 @@ +@@ -4839,10 +5255,13 @@ def while_(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "while")) @@ -16190,7 +16360,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.implements(IJsii487External2, IJsii487External) class Jsii487Derived(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Jsii487Derived"): -@@ -4881,10 +5291,13 @@ +@@ -4944,10 +5363,13 @@ @builtins.classmethod def stringify(cls, value: typing.Any = None) -> typing.Optional[builtins.str]: ''' @@ -16204,7 +16374,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class LevelOne(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.LevelOne"): '''Validates that nested classes get correct code generation for the occasional forward reference.''' -@@ -4914,10 +5327,13 @@ +@@ -4977,10 +5399,13 @@ class PropBooleanValue: def __init__(self, *, value: builtins.bool) -> None: ''' @@ -16218,7 +16388,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -4951,10 +5367,13 @@ +@@ -5014,10 +5439,13 @@ ''' :param prop: ''' @@ -16232,7 +16402,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -4989,10 +5408,13 @@ +@@ -5052,10 +5480,13 @@ ''' :param prop: ''' @@ -16246,7 +16416,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -5040,10 +5462,17 @@ +@@ -5103,10 +5534,17 @@ :param cpu: The number of cpu units used by the task. Valid values, which determines your range of valid values for the memory parameter: 256 (.25 vCPU) - Available memory values: 0.5GB, 1GB, 2GB 512 (.5 vCPU) - Available memory values: 1GB, 2GB, 3GB, 4GB 1024 (1 vCPU) - Available memory values: 2GB, 3GB, 4GB, 5GB, 6GB, 7GB, 8GB 2048 (2 vCPU) - Available memory values: Between 4GB and 16GB in 1GB increments 4096 (4 vCPU) - Available memory values: Between 8GB and 30GB in 1GB increments This default is set in the underlying FargateTaskDefinition construct. Default: 256 :param memory_mib: The amount (in MiB) of memory used by the task. This field is required and you must use one of the following values, which determines your range of valid values for the cpu parameter: 0.5GB, 1GB, 2GB - Available cpu values: 256 (.25 vCPU) 1GB, 2GB, 3GB, 4GB - Available cpu values: 512 (.5 vCPU) 2GB, 3GB, 4GB, 5GB, 6GB, 7GB, 8GB - Available cpu values: 1024 (1 vCPU) Between 4GB and 16GB in 1GB increments - Available cpu values: 2048 (2 vCPU) Between 8GB and 30GB in 1GB increments - Available cpu values: 4096 (4 vCPU) This default is set in the underlying FargateTaskDefinition construct. Default: 512 :param public_load_balancer: Determines whether the Application Load Balancer will be internet-facing. Default: true @@ -16264,7 +16434,7 @@ exports[`Generated code for "jsii-calc": /python/src/js self._values["container_port"] = container_port if cpu is not None: self._values["cpu"] = cpu -@@ -5170,10 +5599,14 @@ +@@ -5233,10 +5671,14 @@ '''Creates a BinaryOperation. :param lhs: Left-hand side operand. @@ -16279,7 +16449,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="farewell") def farewell(self) -> builtins.str: '''Say farewell.''' -@@ -5221,10 +5654,13 @@ +@@ -5284,10 +5726,13 @@ class NestedStruct: def __init__(self, *, number_prop: jsii.Number) -> None: ''' @@ -16293,7 +16463,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -5295,17 +5731,24 @@ +@@ -5358,17 +5803,24 @@ def __init__(self, _param1: builtins.str, optional: typing.Any = None) -> None: ''' :param _param1: - @@ -16318,7 +16488,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="giveMeUndefinedInsideAnObject") def give_me_undefined_inside_an_object( self, -@@ -5333,10 +5776,13 @@ +@@ -5396,10 +5848,13 @@ def change_me_to_undefined(self) -> typing.Optional[builtins.str]: return typing.cast(typing.Optional[builtins.str], jsii.get(self, "changeMeToUndefined")) @@ -16332,7 +16502,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.NullShouldBeTreatedAsUndefinedData", -@@ -5355,10 +5801,14 @@ +@@ -5418,10 +5873,14 @@ ) -> None: ''' :param array_with_three_elements_and_undefined_as_second_argument: @@ -16347,7 +16517,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if this_should_be_undefined is not None: self._values["this_should_be_undefined"] = this_should_be_undefined -@@ -5393,17 +5843,23 @@ +@@ -5456,17 +5915,23 @@ def __init__(self, generator: IRandomNumberGenerator) -> None: ''' @@ -16371,7 +16541,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="nextTimes100") def next_times100(self) -> jsii.Number: return typing.cast(jsii.Number, jsii.invoke(self, "nextTimes100", [])) -@@ -5413,10 +5869,13 @@ +@@ -5476,10 +5941,13 @@ def generator(self) -> IRandomNumberGenerator: return typing.cast(IRandomNumberGenerator, jsii.get(self, "generator")) @@ -16385,7 +16555,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ObjectRefsInCollections( metaclass=jsii.JSIIMeta, -@@ -5434,10 +5893,13 @@ +@@ -5497,10 +5965,13 @@ ) -> jsii.Number: '''Returns the sum of all values. @@ -16399,7 +16569,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="sumFromMap") def sum_from_map( self, -@@ -5445,10 +5907,13 @@ +@@ -5508,10 +5979,13 @@ ) -> jsii.Number: '''Returns the sum of all values in a map. @@ -16413,7 +16583,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ObjectWithPropertyProvider( metaclass=jsii.JSIIMeta, -@@ -5489,10 +5954,13 @@ +@@ -5552,10 +6026,13 @@ ): def __init__(self, delegate: IInterfaceWithOptionalMethodArguments) -> None: ''' @@ -16427,7 +16597,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="invokeWithOptional") def invoke_with_optional(self) -> None: return typing.cast(None, jsii.invoke(self, "invokeWithOptional", [])) -@@ -5515,10 +5983,15 @@ +@@ -5578,10 +6055,15 @@ ''' :param arg1: - :param arg2: - @@ -16443,7 +16613,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="arg1") def arg1(self) -> jsii.Number: -@@ -5543,10 +6016,13 @@ +@@ -5606,10 +6088,13 @@ class OptionalStruct: def __init__(self, *, field: typing.Optional[builtins.str] = None) -> None: ''' @@ -16457,7 +16627,7 @@ exports[`Generated code for "jsii-calc": /python/src/js self._values["field"] = field @builtins.property -@@ -5622,10 +6098,13 @@ +@@ -5685,10 +6170,13 @@ def _override_read_write(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "overrideReadWrite")) @@ -16471,7 +16641,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class OverrideReturnsObject( metaclass=jsii.JSIIMeta, -@@ -5637,10 +6116,13 @@ +@@ -5700,10 +6188,13 @@ @jsii.member(jsii_name="test") def test(self, obj: IReturnsNumber) -> jsii.Number: ''' @@ -16485,7 +16655,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ParamShadowsBuiltins( metaclass=jsii.JSIIMeta, -@@ -5662,10 +6144,14 @@ +@@ -5725,10 +6216,14 @@ :param str: should be set to something that is NOT a valid expression in Python (e.g: "\${NOPE}""). :param boolean_property: :param string_property: @@ -16500,7 +16670,7 @@ exports[`Generated code for "jsii-calc": /python/src/js string_property=string_property, struct_property=struct_property, ) -@@ -5695,10 +6181,15 @@ +@@ -5758,10 +6253,15 @@ :param string_property: :param struct_property: ''' @@ -16516,7 +16686,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "string_property": string_property, "struct_property": struct_property, } -@@ -5751,10 +6242,13 @@ +@@ -5814,10 +6314,13 @@ scope: _scope_jsii_calc_lib_c61f082f.Number, ) -> _scope_jsii_calc_lib_c61f082f.Number: ''' @@ -16530,7 +16700,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.ParentStruct982", -@@ -5765,10 +6259,13 @@ +@@ -5828,10 +6331,13 @@ def __init__(self, *, foo: builtins.str) -> None: '''https://github.com/aws/jsii/issues/982. @@ -16544,7 +16714,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -5823,10 +6320,15 @@ +@@ -5886,10 +6392,15 @@ ''' :param obj: - :param dt: - @@ -16560,7 +16730,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class typing.cast(typing.Any, PartiallyInitializedThisConsumer).__jsii_proxy_class__ = lambda : _PartiallyInitializedThisConsumerProxy -@@ -5841,10 +6343,13 @@ +@@ -5904,10 +6415,13 @@ friendly: _scope_jsii_calc_lib_c61f082f.IFriendly, ) -> builtins.str: ''' @@ -16574,7 +16744,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class Power( _CompositeOperation_1c4d123b, -@@ -5861,10 +6366,14 @@ +@@ -5924,10 +6438,14 @@ '''Creates a Power operation. :param base: The base of the power. @@ -16589,7 +16759,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="base") def base(self) -> _scope_jsii_calc_lib_c61f082f.NumericValue: -@@ -6087,10 +6596,13 @@ +@@ -6150,10 +6668,13 @@ value: _scope_jsii_calc_lib_c61f082f.EnumFromScopedModule, ) -> None: ''' @@ -16603,7 +16773,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="foo") def foo( -@@ -6101,10 +6613,13 @@ +@@ -6164,10 +6685,13 @@ @foo.setter def foo( self, @@ -16617,7 +16787,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class ReturnsPrivateImplementationOfInterface( metaclass=jsii.JSIIMeta, -@@ -6146,10 +6661,14 @@ +@@ -6209,10 +6733,14 @@ :param string_prop: May not be empty. :param nested_struct: ''' @@ -16632,7 +16802,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if nested_struct is not None: self._values["nested_struct"] = nested_struct -@@ -6216,17 +6735,25 @@ +@@ -6279,17 +6807,25 @@ ''' :param arg1: - :param arg2: - @@ -16658,7 +16828,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="methodWithOptionalArguments") def method_with_optional_arguments( self, -@@ -6238,10 +6765,15 @@ +@@ -6301,10 +6837,15 @@ :param arg1: - :param arg2: - @@ -16674,7 +16844,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.SecondLevelStruct", -@@ -6260,10 +6792,14 @@ +@@ -6323,10 +6864,14 @@ ) -> None: ''' :param deeper_required_prop: It's long and required. @@ -16689,7 +16859,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if deeper_optional_prop is not None: self._values["deeper_optional_prop"] = deeper_optional_prop -@@ -6325,10 +6861,13 @@ +@@ -6388,10 +6933,13 @@ @jsii.member(jsii_name="isSingletonInt") def is_singleton_int(self, value: jsii.Number) -> builtins.bool: ''' @@ -16703,7 +16873,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.enum(jsii_type="jsii-calc.SingletonIntEnum") class SingletonIntEnum(enum.Enum): -@@ -6347,10 +6886,13 @@ +@@ -6410,10 +6958,13 @@ @jsii.member(jsii_name="isSingletonString") def is_singleton_string(self, value: builtins.str) -> builtins.bool: ''' @@ -16717,7 +16887,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.enum(jsii_type="jsii-calc.SingletonStringEnum") class SingletonStringEnum(enum.Enum): -@@ -6374,10 +6916,14 @@ +@@ -6437,10 +6988,14 @@ ) -> None: ''' :param property: @@ -16732,7 +16902,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "yet_anoter_one": yet_anoter_one, } -@@ -6428,10 +6974,14 @@ +@@ -6491,10 +7046,14 @@ ) -> None: ''' :param readonly_string: - @@ -16747,7 +16917,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="method") def method(self) -> None: return typing.cast(None, jsii.invoke(self, "method", [])) -@@ -6446,10 +6996,13 @@ +@@ -6509,10 +7068,13 @@ def mutable_property(self) -> typing.Optional[jsii.Number]: return typing.cast(typing.Optional[jsii.Number], jsii.get(self, "mutableProperty")) @@ -16761,7 +16931,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.enum(jsii_type="jsii-calc.StableEnum") class StableEnum(enum.Enum): -@@ -6465,10 +7018,13 @@ +@@ -6528,10 +7090,13 @@ class StableStruct: def __init__(self, *, readonly_property: builtins.str) -> None: ''' @@ -16775,7 +16945,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -6505,10 +7061,13 @@ +@@ -6568,10 +7133,13 @@ def static_variable(cls) -> builtins.bool: # pyright: ignore [reportGeneralTypeIssues] return typing.cast(builtins.bool, jsii.sget(cls, "staticVariable")) @@ -16789,7 +16959,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class StaticHelloParent( metaclass=jsii.JSIIMeta, -@@ -6538,19 +7097,25 @@ +@@ -6601,19 +7169,25 @@ class Statics(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.Statics"): def __init__(self, value: builtins.str) -> None: ''' @@ -16815,7 +16985,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="justMethod") def just_method(self) -> builtins.str: return typing.cast(builtins.str, jsii.invoke(self, "justMethod", [])) -@@ -6587,19 +7152,25 @@ +@@ -6650,19 +7224,25 @@ ''' return typing.cast("Statics", jsii.sget(cls, "instance")) @@ -16841,7 +17011,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="value") def value(self) -> builtins.str: -@@ -6622,10 +7193,13 @@ +@@ -6685,10 +7265,13 @@ def you_see_me(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "youSeeMe")) @@ -16855,7 +17025,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.StructA", -@@ -6648,10 +7222,15 @@ +@@ -6711,10 +7294,15 @@ :param required_string: :param optional_number: @@ -16871,7 +17041,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if optional_number is not None: self._values["optional_number"] = optional_number -@@ -6709,10 +7288,15 @@ +@@ -6772,10 +7360,15 @@ :param optional_boolean: :param optional_struct_a: ''' @@ -16887,7 +17057,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if optional_boolean is not None: self._values["optional_boolean"] = optional_boolean -@@ -6764,10 +7348,14 @@ +@@ -6827,10 +7420,14 @@ See: https://github.com/aws/aws-cdk/issues/4302 :param scope: @@ -16902,7 +17072,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if props is not None: self._values["props"] = props -@@ -6810,10 +7398,14 @@ +@@ -6873,10 +7470,14 @@ ) -> jsii.Number: ''' :param _positional: - @@ -16917,7 +17087,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="roundTrip") @builtins.classmethod def round_trip( -@@ -6828,10 +7420,13 @@ +@@ -6891,10 +7492,13 @@ :param _positional: - :param required: This is a required field. :param second_level: A union to really stress test our serialization. @@ -16931,7 +17101,7 @@ exports[`Generated code for "jsii-calc": /python/src/js ) return typing.cast("TopLevelStruct", jsii.sinvoke(cls, "roundTrip", [_positional, input])) -@@ -6848,10 +7443,13 @@ +@@ -6911,10 +7515,13 @@ struct: typing.Union[typing.Union[StructA, typing.Dict[builtins.str, typing.Any]], typing.Union[StructB, typing.Dict[builtins.str, typing.Any]]], ) -> builtins.bool: ''' @@ -16945,7 +17115,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="isStructB") @builtins.classmethod def is_struct_b( -@@ -6859,18 +7457,24 @@ +@@ -6922,18 +7529,24 @@ struct: typing.Union[typing.Union[StructA, typing.Dict[builtins.str, typing.Any]], typing.Union[StructB, typing.Dict[builtins.str, typing.Any]]], ) -> builtins.bool: ''' @@ -16970,7 +17140,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.StructWithCollectionOfUnionts", -@@ -6884,10 +7488,13 @@ +@@ -6947,10 +7560,13 @@ union_property: typing.Sequence[typing.Mapping[builtins.str, typing.Union[typing.Union[StructA, typing.Dict[builtins.str, typing.Any]], typing.Union[StructB, typing.Dict[builtins.str, typing.Any]]]]], ) -> None: ''' @@ -16984,7 +17154,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } @builtins.property -@@ -6924,10 +7531,14 @@ +@@ -6987,10 +7603,14 @@ ) -> None: ''' :param foo: An enum value. @@ -16999,7 +17169,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if bar is not None: self._values["bar"] = bar -@@ -6983,10 +7594,16 @@ +@@ -7046,10 +7666,16 @@ :param default: :param assert_: :param result: @@ -17016,7 +17186,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if assert_ is not None: self._values["assert_"] = assert_ -@@ -7056,10 +7673,13 @@ +@@ -7119,10 +7745,13 @@ @parts.setter def parts( self, @@ -17030,7 +17200,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.SupportsNiceJavaBuilderProps", -@@ -7075,10 +7695,14 @@ +@@ -7138,10 +7767,14 @@ ) -> None: ''' :param bar: Some number, like 42. @@ -17045,7 +17215,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if id is not None: self._values["id"] = id -@@ -7127,10 +7751,13 @@ +@@ -7190,10 +7823,13 @@ ''' :param id_: some identifier of your choice. :param bar: Some number, like 42. @@ -17059,7 +17229,7 @@ exports[`Generated code for "jsii-calc": /python/src/js jsii.create(self.__class__, self, [id_, props]) @builtins.property -@@ -7168,17 +7795,23 @@ +@@ -7231,17 +7867,23 @@ @jsii.member(jsii_name="modifyOtherProperty") def modify_other_property(self, value: builtins.str) -> None: ''' @@ -17083,7 +17253,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="readA") def read_a(self) -> jsii.Number: return typing.cast(jsii.Number, jsii.invoke(self, "readA", [])) -@@ -7198,17 +7831,23 @@ +@@ -7261,17 +7903,23 @@ @jsii.member(jsii_name="virtualMethod") def virtual_method(self, n: jsii.Number) -> jsii.Number: ''' @@ -17107,7 +17277,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="readonlyProperty") def readonly_property(self) -> builtins.str: -@@ -7219,46 +7858,61 @@ +@@ -7282,46 +7930,61 @@ def a(self) -> jsii.Number: return typing.cast(jsii.Number, jsii.get(self, "a")) @@ -17169,7 +17339,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class TestStructWithEnum( metaclass=jsii.JSIIMeta, -@@ -7341,10 +7995,15 @@ +@@ -7404,10 +8067,15 @@ ''' :param required: This is a required field. :param second_level: A union to really stress test our serialization. @@ -17185,7 +17355,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "second_level": second_level, } if optional is not None: -@@ -7435,10 +8094,13 @@ +@@ -7498,10 +8166,13 @@ def __init__(self, operand: _scope_jsii_calc_lib_c61f082f.NumericValue) -> None: ''' @@ -17199,7 +17369,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="operand") def operand(self) -> _scope_jsii_calc_lib_c61f082f.NumericValue: -@@ -7469,10 +8131,14 @@ +@@ -7532,10 +8203,14 @@ ) -> None: ''' :param bar: @@ -17214,7 +17384,7 @@ exports[`Generated code for "jsii-calc": /python/src/js } if foo is not None: self._values["foo"] = foo -@@ -7509,10 +8175,13 @@ +@@ -7572,10 +8247,13 @@ def __init__(self, delegate: typing.Mapping[builtins.str, typing.Any]) -> None: ''' @@ -17228,7 +17398,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.python.classproperty @jsii.member(jsii_name="reflector") def REFLECTOR(cls) -> _scope_jsii_calc_lib_custom_submodule_name_c61f082f.Reflector: -@@ -7555,10 +8224,13 @@ +@@ -7618,10 +8296,13 @@ ): def __init__(self, obj: IInterfaceWithProperties) -> None: ''' @@ -17242,7 +17412,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="justRead") def just_read(self) -> builtins.str: return typing.cast(builtins.str, jsii.invoke(self, "justRead", [])) -@@ -7569,17 +8241,23 @@ +@@ -7632,17 +8313,23 @@ ext: IInterfaceWithPropertiesExtension, ) -> builtins.str: ''' @@ -17266,7 +17436,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="obj") def obj(self) -> IInterfaceWithProperties: -@@ -7589,25 +8267,34 @@ +@@ -7652,25 +8339,34 @@ class VariadicInvoker(metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.VariadicInvoker"): def __init__(self, method: "VariadicMethod") -> None: ''' @@ -17301,7 +17471,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="asArray") def as_array( self, -@@ -7616,10 +8303,14 @@ +@@ -7679,10 +8375,14 @@ ) -> typing.List[jsii.Number]: ''' :param first: the first element of the array to be returned (after the \`\`prefix\`\` provided at construction time). @@ -17316,7 +17486,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class VariadicTypeUnion( metaclass=jsii.JSIIMeta, -@@ -7627,19 +8318,25 @@ +@@ -7690,19 +8390,25 @@ ): def __init__(self, *union: typing.Union[StructA, StructB]) -> None: ''' @@ -17342,7 +17512,7 @@ exports[`Generated code for "jsii-calc": /python/src/js class VirtualMethodPlayground( metaclass=jsii.JSIIMeta, -@@ -7651,38 +8348,53 @@ +@@ -7714,38 +8420,53 @@ @jsii.member(jsii_name="overrideMeAsync") def override_me_async(self, index: jsii.Number) -> jsii.Number: ''' @@ -17396,7 +17566,21 @@ exports[`Generated code for "jsii-calc": /python/src/js class VoidCallback( metaclass=jsii.JSIIAbstractClass, -@@ -7730,10 +8442,13 @@ +@@ -7807,10 +8528,13 @@ + ''' + return typing.cast(typing.Optional[builtins.str], jsii.get(self, "dontReadMe")) + + @dont_read_me.setter + def dont_read_me(self, value: typing.Optional[builtins.str]) -> None: ++ if __debug__: ++ type_hints = typing.get_type_hints(_typecheckingstub__54f5b2f0a61a7f2fafae719635a1408f7ff0a8f8a503e559bf0d6bc99772471f) ++ check_type(argname="argument value", value=value, expected_type=type_hints["value"]) + jsii.set(self, "dontReadMe", value) + + + class WithPrivatePropertyInConstructor( + metaclass=jsii.JSIIMeta, +@@ -7820,10 +8544,13 @@ def __init__(self, private_field: typing.Optional[builtins.str] = None) -> None: ''' @@ -17410,7 +17594,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="success") def success(self) -> builtins.bool: -@@ -7774,10 +8489,13 @@ +@@ -7864,10 +8591,13 @@ @jsii.member(jsii_name="abstractMethod") def abstract_method(self, name: builtins.str) -> builtins.str: ''' @@ -17424,7 +17608,7 @@ exports[`Generated code for "jsii-calc": /python/src/js # Adding a "__jsii_proxy_class__(): typing.Type" function to the abstract class typing.cast(typing.Any, AbstractClass).__jsii_proxy_class__ = lambda : _AbstractClassProxy -@@ -7793,10 +8511,14 @@ +@@ -7883,10 +8613,14 @@ '''Creates a BinaryOperation. :param lhs: Left-hand side operand. @@ -17439,7 +17623,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="toString") def to_string(self) -> builtins.str: '''String representation of the value.''' -@@ -7840,10 +8562,13 @@ +@@ -7930,10 +8664,13 @@ def rung(self) -> builtins.bool: return typing.cast(builtins.bool, jsii.get(self, "rung")) @@ -17453,7 +17637,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.data_type( jsii_type="jsii-calc.ChildStruct982", -@@ -7854,10 +8579,14 @@ +@@ -7944,10 +8681,14 @@ def __init__(self, *, foo: builtins.str, bar: jsii.Number) -> None: ''' :param foo: @@ -17468,7 +17652,7 @@ exports[`Generated code for "jsii-calc": /python/src/js "bar": bar, } -@@ -7898,37 +8627,49 @@ +@@ -7988,37 +8729,49 @@ def a(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "a")) @@ -17518,7 +17702,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.implements(INonInternalInterface) class ClassThatImplementsThePrivateInterface( -@@ -7943,37 +8684,49 @@ +@@ -8033,37 +8786,49 @@ def a(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "a")) @@ -17568,7 +17752,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.implements(IInterfaceWithProperties) class ClassWithPrivateConstructorAndAutomaticProperties( -@@ -7991,10 +8744,14 @@ +@@ -8081,10 +8846,14 @@ ) -> "ClassWithPrivateConstructorAndAutomaticProperties": ''' :param read_only_string: - @@ -17583,7 +17767,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="readOnlyString") def read_only_string(self) -> builtins.str: -@@ -8005,10 +8762,13 @@ +@@ -8095,10 +8864,13 @@ def read_write_string(self) -> builtins.str: return typing.cast(builtins.str, jsii.get(self, "readWriteString")) @@ -17597,7 +17781,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.implements(IIndirectlyImplemented) class FullCombo(BaseClass, metaclass=jsii.JSIIMeta, jsii_type="jsii-calc.FullCombo"): -@@ -8123,10 +8883,13 @@ +@@ -8213,10 +8985,13 @@ ): def __init__(self, property: builtins.str) -> None: ''' @@ -17611,7 +17795,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="bar") def bar(self) -> None: return typing.cast(None, jsii.invoke(self, "bar", [])) -@@ -8147,10 +8910,13 @@ +@@ -8237,10 +9012,13 @@ def __init__(self, operand: _scope_jsii_calc_lib_c61f082f.NumericValue) -> None: ''' @@ -17625,7 +17809,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @jsii.member(jsii_name="farewell") def farewell(self) -> builtins.str: '''Say farewell.''' -@@ -8210,10 +8976,16 @@ +@@ -8300,10 +9078,16 @@ :param id: some identifier. :param default_bar: the default value of \`\`bar\`\`. :param props: some props once can provide. @@ -17642,7 +17826,7 @@ exports[`Generated code for "jsii-calc": /python/src/js @builtins.property @jsii.member(jsii_name="id") def id(self) -> jsii.Number: -@@ -8509,5 +9281,1522 @@ +@@ -8602,5 +9386,1544 @@ from . import nodirect from . import onlystatic from . import python_self @@ -17824,6 +18008,15 @@ exports[`Generated code for "jsii-calc": /python/src/js + """Type checking stubs""" + pass + ++def _typecheckingstub__2e74ece926d1cff82c3a42c02b35b0b5b4427369dfc17caf49b658e36503a986( ++ obj: typing.Any, ++ prop_a: builtins.str, ++ prop_b: builtins.str, ++ result_prop: builtins.str, ++) -> None: ++ """Type checking stubs""" ++ pass ++ +def _typecheckingstub__49537950cbbeb6e2c62cb1b8a079cc9bb5cc6d06d95cf2229128539d2be886a3( + mult: jsii.Number, +) -> None: @@ -18185,6 +18378,13 @@ exports[`Generated code for "jsii-calc": /python/src/js + """Type checking stubs""" + pass + ++def _typecheckingstub__feb33b34fd05e771c7e47c132104c701042acfdf4eb6753873c4463e01f3cd9c( ++ *, ++ dont_set_me: typing.Optional[builtins.str] = None, ++) -> None: ++ """Type checking stubs""" ++ pass ++ +def _typecheckingstub__ae5d543014149876cec8b005abbb94c112981cccaf318870c7fe4e8353c2c675( + *, + example: builtins.str, @@ -19051,6 +19251,12 @@ exports[`Generated code for "jsii-calc": /python/src/js + """Type checking stubs""" + pass + ++def _typecheckingstub__54f5b2f0a61a7f2fafae719635a1408f7ff0a8f8a503e559bf0d6bc99772471f( ++ value: typing.Optional[builtins.str], ++) -> None: ++ """Type checking stubs""" ++ pass ++ +def _typecheckingstub__01fcbc911a24b1fa352275e1273526114db562d2c278b742181eba6e8cb11ad4( + private_field: typing.Optional[builtins.str] = None, +) -> None: diff --git a/packages/jsii-pacmak/test/generated-code/harness.ts b/packages/jsii-pacmak/test/generated-code/harness.ts index 4ca7fb43da..92098e81e1 100644 --- a/packages/jsii-pacmak/test/generated-code/harness.ts +++ b/packages/jsii-pacmak/test/generated-code/harness.ts @@ -280,10 +280,15 @@ async function runPacmak( export async function preparePythonVirtualEnv({ install = [], + installOptions = [], venvDir = __dirname, systemSitePackages = true, }: { install?: readonly string[]; + // some options like `--config-settings` should only be + // passed once. If they are passed multiple times + // then it registers as an array with multiple values + installOptions?: readonly string[]; venvDir?: string; systemSitePackages?: boolean; } = {}) { @@ -345,6 +350,7 @@ export async function preparePythonVirtualEnv({ 'pip', 'install', '--no-input', + ...installOptions, // Additional install parameters ...install, // Note: this resolution is a little ugly, but it's there to avoid creating a dependency cycle diff --git a/packages/jsii-pacmak/test/generated-code/python-pyright.test.ts b/packages/jsii-pacmak/test/generated-code/python-pyright.test.ts index 40d29f1e60..a06a7eeb77 100644 --- a/packages/jsii-pacmak/test/generated-code/python-pyright.test.ts +++ b/packages/jsii-pacmak/test/generated-code/python-pyright.test.ts @@ -48,11 +48,13 @@ beforeAll(async () => { install: TEST_PACKAGES.flatMap(({ moduleName }) => [ '-e', JSON.stringify(path.join(pythonSource, moduleName, TargetName.PYTHON)), + ]), + installOptions: [ // setuptools >=64 requires this // https://github.com/pypa/setuptools/issues/3518 '--config-settings', 'editable_mode=strict', - ]), + ], venvDir: pythonSource, systemSitePackages: false, // Interferes with pyright resolutions... }); diff --git a/packages/jsii-pacmak/test/generated-code/requirements-dev.txt b/packages/jsii-pacmak/test/generated-code/requirements-dev.txt index be60bef784..a1c43aa24a 100644 --- a/packages/jsii-pacmak/test/generated-code/requirements-dev.txt +++ b/packages/jsii-pacmak/test/generated-code/requirements-dev.txt @@ -1,2 +1,2 @@ -mypy==1.2.0 -pip==23.0.1 # required to use --config-settings +mypy==1.3.0 +pip==23.1.2 # required to use --config-settings 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 75380047de..835e0e619b 100644 --- a/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap +++ b/packages/jsii-reflect/test/__snapshots__/jsii-tree.test.js.snap @@ -833,6 +833,20 @@ exports[`jsii-tree --all 1`] = ` │ │ │ └── returns: jsii-calc.Implementation │ │ └─┬ provideAsInterface() method (stable) │ │ └── returns: jsii-calc.IAnonymouslyImplementMe + │ ├─┬ class AnyPropertyAccess (stable) + │ │ └─┬ members + │ │ └─┬ static mutateProperties(obj,propA,propB,resultProp) method (stable) + │ │ ├── static + │ │ ├─┬ parameters + │ │ │ ├─┬ obj + │ │ │ │ └── type: any + │ │ │ ├─┬ propA + │ │ │ │ └── type: string + │ │ │ ├─┬ propB + │ │ │ │ └── type: string + │ │ │ └─┬ resultProp + │ │ │ └── type: string + │ │ └── returns: void │ ├─┬ class AsyncVirtualMethods (stable) │ │ └─┬ members │ │ ├── () initializer (stable) @@ -2566,6 +2580,11 @@ exports[`jsii-tree --all 1`] = ` │ │ └─┬ methodWasCalled property (stable) │ │ ├── immutable │ │ └── type: boolean + │ ├─┬ class WeirdDocs (stable) + │ │ └─┬ members + │ │ ├── () initializer (stable) + │ │ └─┬ dontReadMe property (stable) + │ │ └── type: Optional │ ├─┬ class WithPrivatePropertyInConstructor (stable) │ │ └─┬ members │ │ ├─┬ (privateField) initializer (stable) @@ -2687,6 +2706,12 @@ exports[`jsii-tree --all 1`] = ` │ │ ├── abstract │ │ ├── immutable │ │ └── type: string + │ ├─┬ interface DontUseMe (stable) + │ │ └─┬ members + │ │ └─┬ dontSetMe property (stable) + │ │ ├── abstract + │ │ ├── immutable + │ │ └── type: Optional │ ├─┬ interface DummyObj (stable) │ │ └─┬ members │ │ └─┬ example property (stable) @@ -3543,6 +3568,14 @@ exports[`jsii-tree --all 1`] = ` │ │ └─┬ obj │ │ └── type: @scope/jsii-calc-base.IBaseInterface │ └── returns: void + ├─┬ class FunctionWithUnderscoreArgument (deprecated) + │ └─┬ members + │ ├── () initializer (deprecated) + │ └─┬ foo(_) method (deprecated) + │ ├─┬ parameters + │ │ └─┬ _ + │ │ └── type: string + │ └── returns: string ├─┬ class Number (deprecated) │ ├── base: NumericValue │ ├── interfaces: IDoublable @@ -3856,6 +3889,7 @@ exports[`jsii-tree --inheritance 1`] = ` │ ├── class AmbiguousParameters │ ├─┬ class AnonymousImplementationProvider │ │ └── interfaces: IAnonymousImplementationProvider + │ ├── class AnyPropertyAccess │ ├── class AsyncVirtualMethods │ ├── class AugmentableClass │ ├── class BaseClass @@ -4010,6 +4044,7 @@ exports[`jsii-tree --inheritance 1`] = ` │ ├── class VariadicTypeUnion │ ├── class VirtualMethodPlayground │ ├── class VoidCallback + │ ├── class WeirdDocs │ ├── class WithPrivatePropertyInConstructor │ ├── interface CalculatorProps │ ├─┬ interface ChildStruct982 @@ -4036,6 +4071,7 @@ exports[`jsii-tree --inheritance 1`] = ` │ │ └─┬ interfaces │ │ ├── DiamondInheritanceFirstMidLevelStruct │ │ └── DiamondInheritanceSecondMidLevelStruct + │ ├── interface DontUseMe │ ├── interface DummyObj │ ├── interface EraseUndefinedHashValuesOptions │ ├── interface ExperimentalStruct @@ -4159,6 +4195,7 @@ exports[`jsii-tree --inheritance 1`] = ` │ └── interface ReflectableEntry └─┬ types ├── class BaseFor2647 + ├── class FunctionWithUnderscoreArgument ├─┬ class Number │ ├── base: NumericValue │ └── interfaces: IDoublable @@ -4612,6 +4649,9 @@ exports[`jsii-tree --members 1`] = ` │ │ ├── () initializer │ │ ├── provideAsClass() method │ │ └── provideAsInterface() method + │ ├─┬ class AnyPropertyAccess + │ │ └─┬ members + │ │ └── static mutateProperties(obj,propA,propB,resultProp) method │ ├─┬ class AsyncVirtualMethods │ │ └─┬ members │ │ ├── () initializer @@ -5361,6 +5401,10 @@ exports[`jsii-tree --members 1`] = ` │ │ ├── callMe() method │ │ ├── overrideMe() method │ │ └── methodWasCalled property + │ ├─┬ class WeirdDocs + │ │ └─┬ members + │ │ ├── () initializer + │ │ └── dontReadMe property │ ├─┬ class WithPrivatePropertyInConstructor │ │ └─┬ members │ │ ├── (privateField) initializer @@ -5406,6 +5450,9 @@ exports[`jsii-tree --members 1`] = ` │ ├─┬ interface DiamondInheritanceTopLevelStruct │ │ └─┬ members │ │ └── topLevelProperty property + │ ├─┬ interface DontUseMe + │ │ └─┬ members + │ │ └── dontSetMe property │ ├─┬ interface DummyObj │ │ └─┬ members │ │ └── example property @@ -5791,6 +5838,10 @@ exports[`jsii-tree --members 1`] = ` │ └─┬ members │ ├── (very) initializer │ └── foo(obj) method + ├─┬ class FunctionWithUnderscoreArgument + │ └─┬ members + │ ├── () initializer + │ └── foo(_) method ├─┬ class Number │ └─┬ members │ ├── (value) initializer @@ -6069,6 +6120,7 @@ exports[`jsii-tree --types 1`] = ` │ ├── class AllowedMethodNames │ ├── class AmbiguousParameters │ ├── class AnonymousImplementationProvider + │ ├── class AnyPropertyAccess │ ├── class AsyncVirtualMethods │ ├── class AugmentableClass │ ├── class BaseClass @@ -6195,6 +6247,7 @@ exports[`jsii-tree --types 1`] = ` │ ├── class VariadicTypeUnion │ ├── class VirtualMethodPlayground │ ├── class VoidCallback + │ ├── class WeirdDocs │ ├── class WithPrivatePropertyInConstructor │ ├── interface CalculatorProps │ ├── interface ChildStruct982 @@ -6207,6 +6260,7 @@ exports[`jsii-tree --types 1`] = ` │ ├── interface DiamondInheritanceFirstMidLevelStruct │ ├── interface DiamondInheritanceSecondMidLevelStruct │ ├── interface DiamondInheritanceTopLevelStruct + │ ├── interface DontUseMe │ ├── interface DummyObj │ ├── interface EraseUndefinedHashValuesOptions │ ├── interface ExperimentalStruct @@ -6311,6 +6365,7 @@ exports[`jsii-tree --types 1`] = ` │ └── interface ReflectableEntry └─┬ types ├── class BaseFor2647 + ├── class FunctionWithUnderscoreArgument ├── class Number ├── class NumericValue ├── class Operation diff --git a/packages/jsii-reflect/test/__snapshots__/tree.test.js.snap b/packages/jsii-reflect/test/__snapshots__/tree.test.js.snap index 23525de659..4e12655772 100644 --- a/packages/jsii-reflect/test/__snapshots__/tree.test.js.snap +++ b/packages/jsii-reflect/test/__snapshots__/tree.test.js.snap @@ -1010,6 +1010,20 @@ exports[`showAll 1`] = ` │ │ │ └── returns: jsii-calc.Implementation │ │ └─┬ provideAsInterface() method │ │ └── returns: jsii-calc.IAnonymouslyImplementMe + │ ├─┬ class AnyPropertyAccess + │ │ └─┬ members + │ │ └─┬ static mutateProperties(obj,propA,propB,resultProp) method + │ │ ├── static + │ │ ├─┬ parameters + │ │ │ ├─┬ obj + │ │ │ │ └── type: any + │ │ │ ├─┬ propA + │ │ │ │ └── type: string + │ │ │ ├─┬ propB + │ │ │ │ └── type: string + │ │ │ └─┬ resultProp + │ │ │ └── type: string + │ │ └── returns: void │ ├─┬ class AsyncVirtualMethods │ │ └─┬ members │ │ ├── () initializer @@ -2743,6 +2757,11 @@ exports[`showAll 1`] = ` │ │ └─┬ methodWasCalled property │ │ ├── immutable │ │ └── type: boolean + │ ├─┬ class WeirdDocs + │ │ └─┬ members + │ │ ├── () initializer + │ │ └─┬ dontReadMe property + │ │ └── type: Optional │ ├─┬ class WithPrivatePropertyInConstructor │ │ └─┬ members │ │ ├─┬ (privateField) initializer @@ -2864,6 +2883,12 @@ exports[`showAll 1`] = ` │ │ ├── abstract │ │ ├── immutable │ │ └── type: string + │ ├─┬ interface DontUseMe + │ │ └─┬ members + │ │ └─┬ dontSetMe property + │ │ ├── abstract + │ │ ├── immutable + │ │ └── type: Optional │ ├─┬ interface DummyObj │ │ └─┬ members │ │ └─┬ example property @@ -3720,6 +3745,14 @@ exports[`showAll 1`] = ` │ │ └─┬ obj │ │ └── type: @scope/jsii-calc-base.IBaseInterface │ └── returns: void + ├─┬ class FunctionWithUnderscoreArgument + │ └─┬ members + │ ├── () initializer + │ └─┬ foo(_) method + │ ├─┬ parameters + │ │ └─┬ _ + │ │ └── type: string + │ └── returns: string ├─┬ class Number │ ├── base: NumericValue │ ├── interfaces: IDoublable @@ -4054,6 +4087,7 @@ exports[`types 1`] = ` │ ├── class AllowedMethodNames │ ├── class AmbiguousParameters │ ├── class AnonymousImplementationProvider + │ ├── class AnyPropertyAccess │ ├── class AsyncVirtualMethods │ ├── class AugmentableClass │ ├── class BaseClass @@ -4180,6 +4214,7 @@ exports[`types 1`] = ` │ ├── class VariadicTypeUnion │ ├── class VirtualMethodPlayground │ ├── class VoidCallback + │ ├── class WeirdDocs │ ├── class WithPrivatePropertyInConstructor │ ├── interface CalculatorProps │ ├── interface ChildStruct982 @@ -4192,6 +4227,7 @@ exports[`types 1`] = ` │ ├── interface DiamondInheritanceFirstMidLevelStruct │ ├── interface DiamondInheritanceSecondMidLevelStruct │ ├── interface DiamondInheritanceTopLevelStruct + │ ├── interface DontUseMe │ ├── interface DummyObj │ ├── interface EraseUndefinedHashValuesOptions │ ├── interface ExperimentalStruct @@ -4296,6 +4332,7 @@ exports[`types 1`] = ` │ └── interface ReflectableEntry └─┬ types ├── class BaseFor2647 + ├── class FunctionWithUnderscoreArgument ├── class Number ├── class NumericValue ├── class Operation 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 aa57f8639a..0ad963b291 100644 --- a/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap +++ b/packages/jsii-reflect/test/__snapshots__/type-system.test.js.snap @@ -16,6 +16,7 @@ exports[`TypeSystem.classes lists all the classes in the typesystem 1`] = ` "@scope/jsii-calc-base.Base", "@scope/jsii-calc-base.StaticConsumer", "@scope/jsii-calc-lib.BaseFor2647", + "@scope/jsii-calc-lib.FunctionWithUnderscoreArgument", "@scope/jsii-calc-lib.Number", "@scope/jsii-calc-lib.NumericValue", "@scope/jsii-calc-lib.Operation", @@ -32,6 +33,7 @@ exports[`TypeSystem.classes lists all the classes in the typesystem 1`] = ` "jsii-calc.AllowedMethodNames", "jsii-calc.AmbiguousParameters", "jsii-calc.AnonymousImplementationProvider", + "jsii-calc.AnyPropertyAccess", "jsii-calc.AsyncVirtualMethods", "jsii-calc.AugmentableClass", "jsii-calc.BaseClass", @@ -163,6 +165,7 @@ exports[`TypeSystem.classes lists all the classes in the typesystem 1`] = ` "jsii-calc.VariadicTypeUnion", "jsii-calc.VirtualMethodPlayground", "jsii-calc.VoidCallback", + "jsii-calc.WeirdDocs", "jsii-calc.WithPrivatePropertyInConstructor", "jsii-calc.anonymous.UseOptions", "jsii-calc.cdk16625.Cdk16625", diff --git a/packages/jsii-rosetta/lib/index.ts b/packages/jsii-rosetta/lib/index.ts index 4c5a28d183..e9be061397 100644 --- a/packages/jsii-rosetta/lib/index.ts +++ b/packages/jsii-rosetta/lib/index.ts @@ -1,3 +1,5 @@ +import './upgrade-prompt'; + export * from './translate'; export { renderTree } from './o-tree'; export { TargetLanguage } from './languages/target-language'; @@ -11,5 +13,3 @@ export * from './rosetta-translator'; export * from './snippet'; export * from './markdown'; export * from './strict'; - -import './upgrade-prompt'; diff --git a/packages/jsii-rosetta/lib/upgrade-prompt.ts b/packages/jsii-rosetta/lib/upgrade-prompt.ts index 25fe6dbee5..5492d32556 100644 --- a/packages/jsii-rosetta/lib/upgrade-prompt.ts +++ b/packages/jsii-rosetta/lib/upgrade-prompt.ts @@ -18,4 +18,7 @@ if (process.env.JSII_SUPPRESS_UPGRADE_PROMPT == null) { '#######################################################################################################', ].join('\n'), ); + + // Suppress any further upgrade prompts (e.g: the one from jsii, which is a dependency of jsii-rosetta)... + process.env.JSII_SUPPRESS_UPGRADE_PROMPT = '1'; } diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 8a2472570a..25456e50a2 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -20,7 +20,7 @@ "@types/mock-fs": "^4.13.1", "@types/stream-json": "^1.7.3", "@types/workerpool": "^6.4.0", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "jsii-build-tools": "0.0.0", "jsii-calc": "3.20.120", "memory-streams": "^0.1.3", @@ -35,7 +35,7 @@ "workerpool": "^6.4.0", "yargs": "^16.2.0", "stream-json": "^1.7.5", - "semver": "^7.5.0", + "semver": "^7.5.1", "semver-intersect": "^1.4.0", "fast-glob": "^3.2.12", "jsii": "0.0.0" diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 4727a70a3e..5aeb735948 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -42,7 +42,7 @@ "fast-deep-equal": "^3.1.3", "fs-extra": "^10.1.0", "log4js": "^6.9.1", - "semver": "^7.5.0", + "semver": "^7.5.1", "semver-intersect": "^1.4.0", "sort-json": "^2.0.1", "spdx-license-list": "^6.6.0", @@ -53,7 +53,7 @@ "@types/clone": "^2.1.1", "@types/deep-equal": "^1.0.1", "@types/fs-extra": "^9.0.13", - "@types/semver": "^7.3.13", + "@types/semver": "^7.5.0", "clone": "^2.1.2", "jsii-build-tools": "^0.0.0" }, diff --git a/superchain/Dockerfile b/superchain/Dockerfile index 0c3427e3d4..72f40ae514 100644 --- a/superchain/Dockerfile +++ b/superchain/Dockerfile @@ -157,13 +157,13 @@ RUN apt-get update && rm -rf $(pip cache dir) \ && rm -rf /var/lib/apt/lists/* -# Install JDK8 (Amazon Corretto 8) +# Install JDK20 (Amazon Corretto 20) COPY superchain/gpg/corretto.asc /tmp/corretto.asc RUN apt-key add /tmp/corretto.asc && rm /tmp/corretto.asc \ && echo "deb https://apt.corretto.aws stable main" > /etc/apt/sources.list.d/amazon-corretto.list \ && apt-get update \ && mkdir -p /usr/share/man/man1 \ - && apt-get -y install java-1.8.0-amazon-corretto-jdk \ + && apt-get -y install java-20-amazon-corretto-jdk \ && rm -rf /usr/share/man/man1 \ && rm -rf /var/lib/apt/lists/* @@ -244,9 +244,6 @@ COPY --chown=superchain:superchain superchain/m2-settings.xml /home/superchain/. COPY --chown=superchain:superchain superchain/ssh_config /home/superchain/.ssh/config RUN chmod 600 /home/superchain/.ssh/config -# Add the source used to build this Docker image (to facilitate re-builds, forensics) -COPY superchain /docker-source - # Create the attributions document RUN RUST_DOCS="${RUSTUP_HOME}/toolchains/$(rustup show active-toolchain | cut -d' ' -f 1)/share/doc" \ && RUSTUP_VERSION=$(rustup --version 2>/dev/null | cut -d' ' -f2) \ @@ -289,13 +286,13 @@ RUN RUST_DOCS="${RUSTUP_HOME}/toolchains/$(rustup show active-toolchain | cut -d && echo "------------------------------------ PATENTS ------------------------------------" >> /NOTICE \ && cat ${GOROOT}/PATENTS >> /NOTICE \ && echo "################################################################################" >> /NOTICE \ - && echo "java-1.8.0-amazon-corretto-jdk:" >> /NOTICE \ + && echo "java-20-amazon-corretto-jdk:" >> /NOTICE \ && echo "" >> /NOTICE \ && echo "------------------------------------ LICENSE ------------------------------------" >> /NOTICE \ - && cat /usr/lib/jvm/java-1.8.0-amazon-corretto/LICENSE >> /NOTICE \ + && cat /usr/lib/jvm/java-20-amazon-corretto/LICENSE >> /NOTICE \ && echo "" >> /NOTICE \ && echo "------------------------------------ THIRD-PARTY NOTICES ------------------------------------" >> /NOTICE \ - && cat /usr/lib/jvm/java-1.8.0-amazon-corretto/THIRD_PARTY_README >> /NOTICE \ + && cat /usr/lib/jvm/java-20-amazon-corretto/ADDITIONAL_LICENSE_INFO >> /NOTICE \ && echo "################################################################################" >> /NOTICE \ && echo "maven:" >> /NOTICE \ && echo "" >> /NOTICE \ @@ -346,6 +343,10 @@ RUN RUST_DOCS="${RUSTUP_HOME}/toolchains/$(rustup show active-toolchain | cut -d ;fi \ ;done +# Add the source used to build this Docker image (to facilitate re-builds, forensics) +# Keep this at the end for max caching. +COPY superchain /docker-source + CMD ["/bin/bash"] ######################################################################################################################## @@ -357,6 +358,8 @@ ENV LANG="C.UTF-8" LC_ALL="C.UTF-8" \ CHARSET="UTF-8" \ \ + JAVA_HOME="/usr/lib/jvm/java-20-amazon-corretto" \ + \ DOTNET_CLI_TELEMETRY_OPTOUT="true" \ DOTNET_RUNNING_IN_CONTAINER="true" \ DOTNET_NOLOGO="true" \ diff --git a/superchain/README.md b/superchain/README.md index a53ccb97e8..1d29aaf33b 100644 --- a/superchain/README.md +++ b/superchain/README.md @@ -10,7 +10,7 @@ required in order to package [jsii] projects in all supported languages. SDK | Version ----------------|------------------------------------------- -`OpenJDK 8` | Amazon Corretto `>= 8.242.08.1` +`OpenJDK 20` | Amazon Corretto `>= 20.0.0` `.NET SDK` | `>= 6.0.14` `mono` | `>= 6.8.0.105` `Javascript` | see [NodeJS and NPM](#nodejs-and-npm) @@ -48,6 +48,21 @@ The previous image tags have been discontinued: - `:node14` (users shoudl migrate to `:1-buster-slim-node14`) - `:node14-nightly` (users shoudl migrate to `:1-buster-slim-node14-nightly`) +## Building + +This docker image must be built from the package root with the Dockerfile set to +`superchain/Dockerfile`: + +``` +jsii$ docker build . -f superchain/Dockerfile -t jsii/superchain:local +``` + +In case the tests fail, skip the tests and inspect the image manually: + +``` +jsii$ docker build . -f superchain/Dockerfile -t jsii/superchain:local --target=superchain +``` + ## NodeJS and NPM We build multiple versions of this image, for different versions of Node. They are available as: @@ -60,7 +75,7 @@ If you are building this image from source, you can control the Node version wit `NODE_MAJOR_VERSION` build argument: ``` -docker build [...] --build-arg NODE_MAJOR_VERSION=14 . +jsii$ docker build [...] --build-arg NODE_MAJOR_VERSION=16 ``` ## Included Tools & Utilities diff --git a/yarn.lock b/yarn.lock index 4be1fe399f..689e0503b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17,57 +17,57 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f" - integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g== +"@babel/compat-data@^7.21.5": + version "7.21.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc" + integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA== "@babel/core@^7.11.6", "@babel/core@^7.12.3": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659" - integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA== + version "7.21.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4" + integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.4" - "@babel/helper-compilation-targets" "^7.21.4" - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helpers" "^7.21.0" - "@babel/parser" "^7.21.4" + "@babel/generator" "^7.21.5" + "@babel/helper-compilation-targets" "^7.21.5" + "@babel/helper-module-transforms" "^7.21.5" + "@babel/helpers" "^7.21.5" + "@babel/parser" "^7.21.8" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.4" - "@babel/types" "^7.21.4" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.21.4", "@babel/generator@^7.7.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc" - integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA== +"@babel/generator@^7.21.5", "@babel/generator@^7.7.2": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f" + integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w== dependencies: - "@babel/types" "^7.21.4" + "@babel/types" "^7.21.5" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-compilation-targets@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656" - integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg== +"@babel/helper-compilation-targets@^7.21.5": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366" + integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w== dependencies: - "@babel/compat-data" "^7.21.4" + "@babel/compat-data" "^7.21.5" "@babel/helper-validator-option" "^7.21.0" browserslist "^4.21.3" lru-cache "^5.1.1" semver "^6.3.0" -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== +"@babel/helper-environment-visitor@^7.21.5": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba" + integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ== "@babel/helper-function-name@^7.21.0": version "7.21.0" @@ -84,38 +84,38 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-imports@^7.18.6": +"@babel/helper-module-imports@^7.21.4": version "7.21.4" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== dependencies: "@babel/types" "^7.21.4" -"@babel/helper-module-transforms@^7.21.2": - version "7.21.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" - integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== +"@babel/helper-module-transforms@^7.21.5": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420" + integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw== dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-environment-visitor" "^7.21.5" + "@babel/helper-module-imports" "^7.21.4" + "@babel/helper-simple-access" "^7.21.5" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.19.1" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.2" - "@babel/types" "^7.21.2" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" - integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56" + integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg== -"@babel/helper-simple-access@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" - integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== +"@babel/helper-simple-access@^7.21.5": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee" + integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg== dependencies: - "@babel/types" "^7.20.2" + "@babel/types" "^7.21.5" "@babel/helper-split-export-declaration@^7.18.6": version "7.18.6" @@ -124,10 +124,10 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.21.5": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" + integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" @@ -139,14 +139,14 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== -"@babel/helpers@^7.21.0": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" - integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== +"@babel/helpers@^7.21.5": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08" + integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA== dependencies: "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.0" - "@babel/types" "^7.21.0" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" "@babel/highlight@^7.18.6": version "7.18.6" @@ -157,10 +157,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17" - integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8": + version "7.21.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8" + integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -261,9 +261,9 @@ "@babel/helper-plugin-utils" "^7.20.2" "@babel/runtime@^7.18.9", "@babel/runtime@^7.7.6": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" - integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200" + integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q== dependencies: regenerator-runtime "^0.13.11" @@ -276,28 +276,28 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@^7.7.2": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36" - integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q== +"@babel/traverse@^7.21.5", "@babel/traverse@^7.7.2": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133" + integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw== dependencies: "@babel/code-frame" "^7.21.4" - "@babel/generator" "^7.21.4" - "@babel/helper-environment-visitor" "^7.18.9" + "@babel/generator" "^7.21.5" + "@babel/helper-environment-visitor" "^7.21.5" "@babel/helper-function-name" "^7.21.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.4" - "@babel/types" "^7.21.4" + "@babel/parser" "^7.21.5" + "@babel/types" "^7.21.5" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4" - integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA== +"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.21.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6" + integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== dependencies: - "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-string-parser" "^7.21.5" "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" @@ -331,18 +331,18 @@ eslint-visitor-keys "^3.3.0" "@eslint-community/regexpp@^4.4.0": - version "4.5.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.0.tgz#f6f729b02feee2c749f57e334b7a1b5f40a81724" - integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ== + version "4.5.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884" + integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ== -"@eslint/eslintrc@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02" - integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ== +"@eslint/eslintrc@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.3.tgz#4910db5505f4d503f27774bf356e3704818a0331" + integrity sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ== dependencies: ajv "^6.12.4" debug "^4.3.2" - espree "^9.5.1" + espree "^9.5.2" globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" @@ -350,10 +350,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.38.0": - version "8.38.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.38.0.tgz#73a8a0d8aa8a8e6fe270431c5e72ae91b5337892" - integrity sha512-IoD2MfUnOV58ghIHCiil01PcohxjbYR/qCxsoC+xNgUwh1EY8jOOrYmu3d3a71+tJJ23uscEV4X2HJWMsPJu4g== +"@eslint/js@8.40.0": + version "8.40.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.40.0.tgz#3ba73359e11f5a7bd3e407f70b3528abfae69cec" + integrity sha512-ElyB54bJIhXQYVKjDSvCkPO1iU1tSAeVQJbllWJq1XQSmmA4dgFk8CbiBGpiOPxleE48vDogxCtmMYku4HSVLA== "@fixtures/jsii-calc-bundled@file:packages/@fixtures/jsii-calc-bundled": version "0.19.0" @@ -387,6 +387,18 @@ resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340" integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + "@isaacs/string-locale-compare@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b" @@ -785,27 +797,27 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@lerna/child-process@6.6.1": - version "6.6.1" - resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-6.6.1.tgz#e31bc411ad6d474cf7b676904da6f77f58fd64eb" - integrity sha512-yUCDCcRNNbI9UUsUB6FYEmDHpo5Tn/f0q5D7vhDP4i6Or8kBj82y7+e31hwfLvK2ykOYlDVs2MxAluH/+QUBOQ== +"@lerna/child-process@6.6.2": + version "6.6.2" + resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-6.6.2.tgz#5d803c8dee81a4e013dc428292e77b365cba876c" + integrity sha512-QyKIWEnKQFnYu2ey+SAAm1A5xjzJLJJj3bhIZd3QKyXKKjaJ0hlxam/OsWSltxTNbcyH1jRJjC6Cxv31usv0Ag== dependencies: chalk "^4.1.0" execa "^5.0.0" strong-log-transformer "^2.1.0" -"@lerna/create@6.6.1": - version "6.6.1" - resolved "https://registry.yarnpkg.com/@lerna/create/-/create-6.6.1.tgz#fc20f09e10b612d424a576775ad6eefe6aa96517" - integrity sha512-GDmHFhQ0mr0RcXWXrsLyfMV6ch/dZV/Ped1e6sFVQhsLL9P+FFXX1ZWxa/dQQ90VWF2qWcmK0+S/L3kUz2xvTA== +"@lerna/create@6.6.2": + version "6.6.2" + resolved "https://registry.yarnpkg.com/@lerna/create/-/create-6.6.2.tgz#39a36d80cddb355340c297ed785aa76f4498177f" + integrity sha512-xQ+1Y7D+9etvUlE+unhG/TwmM6XBzGIdFBaNoW8D8kyOa9M2Jf3vdEtAxVa7mhRz66CENfhL/+I/QkVaa7pwbQ== dependencies: - "@lerna/child-process" "6.6.1" + "@lerna/child-process" "6.6.2" dedent "^0.7.0" fs-extra "^9.1.0" init-package-json "^3.0.2" npm-package-arg "8.1.1" p-reduce "^2.1.0" - pacote "^13.6.1" + pacote "15.1.1" pify "^5.0.0" semver "^7.3.4" slash "^3.0.0" @@ -813,10 +825,10 @@ validate-npm-package-name "^4.0.0" yargs-parser "20.2.4" -"@lerna/legacy-package-management@6.6.1": - version "6.6.1" - resolved "https://registry.yarnpkg.com/@lerna/legacy-package-management/-/legacy-package-management-6.6.1.tgz#1f44af40098b9396a4f698514ff2b87016b1ee3d" - integrity sha512-0EYxSFr34VgeudA5rvjGJSY7s4seITMVB7AJ9LRFv9QDUk6jpvapV13ZAaKnhDTxX5vNCfnJuWHXXWq0KyPF/Q== +"@lerna/legacy-package-management@6.6.2": + version "6.6.2" + resolved "https://registry.yarnpkg.com/@lerna/legacy-package-management/-/legacy-package-management-6.6.2.tgz#411c395e72e563ab98f255df77e4068627a85bb0" + integrity sha512-0hZxUPKnHwehUO2xC4ldtdX9bW0W1UosxebDIQlZL2STnZnA2IFmIk2lJVUyFW+cmTPQzV93jfS0i69T9Z+teg== dependencies: "@npmcli/arborist" "6.2.3" "@npmcli/run-script" "4.1.7" @@ -847,7 +859,7 @@ inquirer "8.2.4" is-ci "2.0.0" is-stream "2.0.0" - libnpmpublish "6.0.4" + libnpmpublish "7.1.4" load-json-file "6.2.0" make-dir "3.1.0" minimatch "3.0.5" @@ -861,7 +873,7 @@ p-map-series "2.1.0" p-queue "6.6.2" p-waterfall "2.1.1" - pacote "13.6.2" + pacote "15.1.1" pify "5.0.0" pretty-format "29.4.3" read-cmd-shim "3.0.0" @@ -1081,13 +1093,13 @@ read-package-json-fast "^2.0.3" "@npmcli/map-workspaces@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-3.0.3.tgz#476944b63cd1f65bf83c6fdc7f4ca7be56906b1f" - integrity sha512-HlCvFuTzw4UNoKyZdqiNrln+qMF71QJkxy2dsusV8QQdoa89e2TF4dATCzBxbl4zzRzdDoWWyP5ADVrNAH9cRQ== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-3.0.4.tgz#15ad7d854292e484f7ba04bc30187a8320dba799" + integrity sha512-Z0TbvXkRbacjFFLpVpV0e2mheCh+WzQpcqL+4xp49uNJOxOnIAPZyXtUxZ5Qn3QBTGKA11Exjd9a5411rBrhDg== dependencies: "@npmcli/name-from-folder" "^2.0.0" - glob "^9.3.1" - minimatch "^7.4.2" + glob "^10.2.2" + minimatch "^9.0.0" read-package-json-fast "^3.0.0" "@npmcli/metavuln-calculator@^3.0.1": @@ -1146,11 +1158,14 @@ json-parse-even-better-errors "^2.3.1" "@npmcli/package-json@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-3.0.0.tgz#c9219a197e1be8dbf43c4ef8767a72277c0533b6" - integrity sha512-NnuPuM97xfiCpbTEJYtEuKz6CFbpUHtaT0+5via5pQeI25omvQDFbp1GcGJ/c4zvL/WX0qbde6YiLgfZbWFgvg== + version "3.1.0" + resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-3.1.0.tgz#d9eb34083be4275520f3844d17fc74926d47cae1" + integrity sha512-qNPy6Yf9ruFST99xcrl5EWAvrb7qFrwgVbwdzcTJlIgxbArKOq5e/bgZ6rTL1X9hDgAdPbvL8RWx/OTLSB0ToA== dependencies: + glob "^10.2.2" json-parse-even-better-errors "^3.0.0" + normalize-package-data "^5.0.0" + npm-normalize-package-bin "^3.0.1" "@npmcli/promise-spawn@^3.0.0": version "3.0.0" @@ -1205,9 +1220,9 @@ which "^2.0.2" "@npmcli/run-script@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.0.tgz#f89e322c729e26ae29db6cc8cc76559074aac208" - integrity sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ== + version "6.0.2" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.2.tgz#a25452d45ee7f7fb8c16dfaf9624423c0c0eb885" + integrity sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA== dependencies: "@npmcli/node-gyp" "^3.0.0" "@npmcli/promise-spawn" "^6.0.0" @@ -1215,17 +1230,17 @@ read-package-json-fast "^3.0.0" which "^3.0.0" -"@nrwl/cli@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.9.2.tgz#82537d3d85410b0143d37a3b4fade09675356084" - integrity sha512-QoCmyrcGakHAYTJaNBbOerRQAmqJHMYGCdqtQidV+aP9p1Dy33XxDELfhd+IYmGqngutXuEWChNpWNhPloLnoA== +"@nrwl/cli@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-15.9.4.tgz#63b600dff1cdc126f234d16978a888f72c22a00c" + integrity sha512-FoiGFCLpb/r4HXCM3KYqT0xteP+MRV6bIHjz3bdPHIDLmBNQQnRRaV2K47jtJ6zjh1eOU5UHKyDtDDYf80Idpw== dependencies: - nx "15.9.2" + nx "15.9.4" "@nrwl/devkit@>=15.5.2 < 16": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-15.9.2.tgz#482b89f1bf88d3600b11f8b7e3e4452c5766eca4" - integrity sha512-2DvTstVZb91m+d4wqUJMBHQ3elxyabdmFE6/3aXmtOGeDxTyXyDzf/1O6JvBBiL8K6XC3ZYchjtxUHgxl/NJ5A== + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-15.9.4.tgz#3f0a43a9637fcd0a46c06df2a9c36012b27f006b" + integrity sha512-mUX1kXTuPMdTzFxIzH+MsSNvdppOmstPDOEtiGFZJTuJ625ki0HhNJILO3N2mJ7MeMrLqIlAiNdvelQaObxYsQ== dependencies: ejs "^3.1.7" ignore "^5.0.4" @@ -1233,57 +1248,57 @@ tmp "~0.2.1" tslib "^2.3.0" -"@nrwl/nx-darwin-arm64@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.2.tgz#612d8d714ec876cafd6f1483bf5565704d1b75be" - integrity sha512-Yv+OVsQt3C/hmWOC+YhJZQlsyph5w1BHfbp4jyCvV1ZXBbb8NdvwxgDHPWXxKPTc1EXuB7aEX3qzxM3/OWEUJg== - -"@nrwl/nx-darwin-x64@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.2.tgz#3f77bd90dbabf4782d81f773cfb2739a443e595f" - integrity sha512-qHfdluHlPzV0UHOwj1ZJ+qNEhzfLGiBuy1cOth4BSzDlvMnkuqBWoprfaXoztzYcus2NSILY1/7b3Jw4DAWmMw== - -"@nrwl/nx-linux-arm-gnueabihf@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.2.tgz#3374a5a1692b222ce18f2213a47b4d68fb509e70" - integrity sha512-0GzwbablosnYnnJDCJvAeZv8LlelSrNwUnGhe43saeoZdAew35Ay1E34zBrg/GCGTASuz+knEEYFM+gDD9Mc6A== - -"@nrwl/nx-linux-arm64-gnu@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.2.tgz#e3ec95c6ee3285c77422886cf4cbec1f04804460" - integrity sha512-3mFIY7iUTPG45hSIRaM2DmraCy8W6hNoArAGRrTgYw40BIJHtLrW+Rt7DLyvVXaYCvrKugWOKtxC+jG7kpIZVA== - -"@nrwl/nx-linux-arm64-musl@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.2.tgz#72ce601d256083ded7380c598f1b3eb4dc2a3472" - integrity sha512-FNBnXEtockwxZa4I3NqggrJp0YIbNokJvt/clrICP+ijOacdUDkv8mJedavobkFsRsNq9gzCbRbUScKymrOLrg== - -"@nrwl/nx-linux-x64-gnu@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.2.tgz#2da6bb50cd80d699310e91c7331baa6cfc8ce197" - integrity sha512-gHWsP5lbe4FNQCa1Q/VLxIuik+BqAOcSzyPjdUa4gCDcbxPa8xiE57PgXB5E1XUzOWNnDTlXa/Ll07/TIuKuog== - -"@nrwl/nx-linux-x64-musl@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.2.tgz#39b3bda5868a53b722f1d42700dce71c5ff3f6b9" - integrity sha512-EaFUukCbmoHsYECX2AS4pxXH933yesBFVvBgD38DkoFDxDoJMVt6JqYwm+d5R7S4R2P9U3l++aurljQTRq567Q== - -"@nrwl/nx-win32-arm64-msvc@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.2.tgz#bc350be5cb7d0bfa6c2c5ced40c5af163a457a2c" - integrity sha512-PGAe7QMr51ivx1X3avvs8daNlvv1wGo3OFrobjlu5rSyjC1Y3qHwT9+wdlwzNZ93FIqWOq09s+rE5gfZRfpdAg== - -"@nrwl/nx-win32-x64-msvc@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.2.tgz#3e46c3f7af196bdbf0deb336ec4f9448c54e4a9f" - integrity sha512-Q8onNzhuAZ0l9DNkm8D4Z1AEIzJr8JiT4L2fVBLYrV/R75C2HS3q7lzvfo6oqMY6mXge1cFPcrTtg3YXBQaSWA== - -"@nrwl/tao@15.9.2": - version "15.9.2" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.9.2.tgz#e970efa8b3fb828007b02286e9e505247032b5b3" - integrity sha512-+LqNC37w9c6q6Ukdpf0z0tt1PQFNi4gwhHpJvkYQiKRETHjyrrlyqTNEPEyA7PI62RuYC6VrpVw2gzI7ufqZEA== - dependencies: - nx "15.9.2" +"@nrwl/nx-darwin-arm64@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-arm64/-/nx-darwin-arm64-15.9.4.tgz#e5a2f39d42a60397a01140a251f894788f5d1fda" + integrity sha512-XnvrnT9BJsgThY/4xUcYtE077ERq/img8CkRj7MOOBNOh0/nVcR4LGbBKDHtwE3HPk0ikyS/SxRyNa9msvi3QQ== + +"@nrwl/nx-darwin-x64@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-darwin-x64/-/nx-darwin-x64-15.9.4.tgz#97a810d4ff6b4bf395a43e4740890c0def2372da" + integrity sha512-WKSfSlpVMLchpXkax0geeUNyhvNxwO7qUz/s0/HJWBekt8fizwKDwDj1gP7fOu+YWb/tHiSscbR1km8PtdjhQw== + +"@nrwl/nx-linux-arm-gnueabihf@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-15.9.4.tgz#b8dd23b8c755b7e640d744945ab2dec3fd3eda65" + integrity sha512-a/b4PP7lP/Cgrh0LjC4O2YTt5pyf4DQTGtuE8qlo8o486UiofCtk4QGJX72q80s23L0ejCaKY2ULKx/3zMLjuA== + +"@nrwl/nx-linux-arm64-gnu@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-15.9.4.tgz#5bc150c2bdb2e0a2eaf8721b3c5fdb2eb93f8739" + integrity sha512-ibBV8fMhSfLVd/2WzcDuUm32BoZsattuKkvMmOoyU6Pzoznc3AqyDjJR4xCIoAn5Rf+Nu1oeQONr5FAtb1Ugow== + +"@nrwl/nx-linux-arm64-musl@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-arm64-musl/-/nx-linux-arm64-musl-15.9.4.tgz#df2f18f813828000dc52f1b7668339947b1a0862" + integrity sha512-iIjvVYd7+uM4jVD461+PvU5XTALgSvJOODUaMRGOoDl0KlMuTe6pQZlw0eXjl5rcTd6paKaVFWT5j6awr8kj7w== + +"@nrwl/nx-linux-x64-gnu@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-gnu/-/nx-linux-x64-gnu-15.9.4.tgz#55547b07e6aeb0c36a43e05bd07c15b013f2de9f" + integrity sha512-q4OyH72mdrE4KellBWtwpr5EwfxHKNoFP9//7FAILO68ROh0rpMd7YQMlTB7T04UEUHjKEEsFGTlVXIee3Viwg== + +"@nrwl/nx-linux-x64-musl@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-linux-x64-musl/-/nx-linux-x64-musl-15.9.4.tgz#29cd644736f643566d9c0e1a1171c49a62a08c09" + integrity sha512-67+/XNMR1CgLPyeGX8jqSG6l8yYD0iiwUgcu1Vaxq6N05WwnqVisIW8XzLSRUtKt4WyVQgOWk3aspImpMVOG3Q== + +"@nrwl/nx-win32-arm64-msvc@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-15.9.4.tgz#55a38bf5dc201e9088729fb03e505dc63caf8b3a" + integrity sha512-2rEsq3eOGVCYpYJn2tTJkOGNJm/U8rP/FmqtZXYa6VJv/00XP3Gl00IXFEDaYV6rZo7SWqLxtEPUbjK5LwPzZA== + +"@nrwl/nx-win32-x64-msvc@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/nx-win32-x64-msvc/-/nx-win32-x64-msvc-15.9.4.tgz#56bb859bfe47d08d14f8d5822d9a31d9098d95a9" + integrity sha512-bogVju4Z/hy1jbppqaTNbmV1R4Kg0R5fKxXAXC2LaL7FL0dup31wPumdV+mXttXBNOBDjV8V/Oz1ZqdmxpOJUw== + +"@nrwl/tao@15.9.4": + version "15.9.4" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-15.9.4.tgz#5e384af06d1fb68e326eda2c6a5d8f99ce1583b8" + integrity sha512-m90iz8UsXx1rgPm1dxsBQjSrCViWYZIrp8bpwjSCW24j3kifyilYSXGuKaRwZwUn7eNmH/kZcI9/8qeGIPF4Sg== + dependencies: + nx "15.9.4" "@octokit/auth-token@^2.4.4": version "2.5.0" @@ -1371,10 +1386,10 @@ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-14.0.0.tgz#949c5019028c93f189abbc2fb42f333290f7134a" integrity sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw== -"@octokit/openapi-types@^16.0.0": - version "16.0.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-16.0.0.tgz#d92838a6cd9fb4639ca875ddb3437f1045cc625e" - integrity sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA== +"@octokit/openapi-types@^17.1.2": + version "17.2.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-17.2.0.tgz#f1800b5f9652b8e1b85cc6dfb1e0dc888810bdb5" + integrity sha512-MazrFNx4plbLsGl+LFesMo96eIXkFgEtaKbnNpdh4aQ0VM10aoylFsTYP1AEjkeoRNZiiPe3T6Gl2Hr8dJWdlQ== "@octokit/plugin-enterprise-rest@6.0.1": version "6.0.1" @@ -1447,9 +1462,9 @@ universal-user-agent "^6.0.0" "@octokit/request@^6.0.0": - version "6.2.3" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.3.tgz#76d5d6d44da5c8d406620a4c285d280ae310bdb4" - integrity sha512-TNAodj5yNzrrZ/VxP+H5HiYaZep0H3GU0O7PaF+fhDrt8FPrnkei9Aal/txsN/1P7V3CPiThG0tIvpPDYUsyAA== + version "6.2.4" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.4.tgz#b00a7185865c72bdd432e63168b1e900953ded0c" + integrity sha512-at92SYQstwh7HH6+Kf3bFMnHrle7aIrC0r5rTP+Bb30118B6j1vI2/M4walh6qcQgfuLIKs8NUO5CytHTnUI3A== dependencies: "@octokit/endpoint" "^7.0.0" "@octokit/request-error" "^3.0.0" @@ -1493,11 +1508,11 @@ "@octokit/openapi-types" "^14.0.0" "@octokit/types@^9.0.0": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.0.0.tgz#6050db04ddf4188ec92d60e4da1a2ce0633ff635" - integrity sha512-LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw== + version "9.2.2" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.2.2.tgz#d111d33928f288f48083bfe49d8a9a5945e67db1" + integrity sha512-9BjDxjgQIvCjNWZsbqyH5QC2Yni16oaE6xL+8SUBMzcYPF4TGQBXGA97Cl3KceK9mwiNMb1mOYCz6FbCCLEL+g== dependencies: - "@octokit/openapi-types" "^16.0.0" + "@octokit/openapi-types" "^17.1.2" "@parcel/watcher@2.0.4": version "2.0.4" @@ -1513,16 +1528,16 @@ integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== "@pkgr/utils@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.3.1.tgz#0a9b06ffddee364d6642b3cd562ca76f55b34a03" - integrity sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw== + version "2.4.0" + resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.0.tgz#b6373d2504aedaf2fc7cdf2d13ab1f48fa5f12d5" + integrity sha512-2OCURAmRtdlL8iUDTypMrrxfwe8frXTeXaxGsVOaYtc/wrUyk8Z/0OBetM7cdlsy7ZFWlMX72VogKeh+A4Xcjw== dependencies: cross-spawn "^7.0.3" + fast-glob "^3.2.12" is-glob "^4.0.3" - open "^8.4.0" + open "^9.1.0" picocolors "^1.0.0" - tiny-glob "^0.2.9" - tslib "^2.4.0" + tslib "^2.5.0" "@sigstore/protobuf-specs@^0.1.0": version "0.1.0" @@ -1546,19 +1561,19 @@ dependencies: type-detect "4.0.8" -"@sinonjs/commons@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3" - integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg== +"@sinonjs/commons@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72" + integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA== dependencies: type-detect "4.0.8" "@sinonjs/fake-timers@^10.0.2": - version "10.0.2" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz#d10549ed1f423d80639c528b6c7f5a1017747d0c" - integrity sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw== + version "10.1.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.1.0.tgz#3595e42b3f0a7df80a9681cf58d8cb418eac1e99" + integrity sha512-w1qd368vtrwttm1PRJWPW1QHlbmHrVDGs1eBH/jZvRPUFS4MNXV9Q33EQdjOdeAxZ7O8+3wM7zxztm2nfUSyKw== dependencies: - "@sinonjs/commons" "^2.0.0" + "@sinonjs/commons" "^3.0.0" "@sinonjs/fake-timers@^9.1.2": version "9.1.2" @@ -1588,22 +1603,22 @@ integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== "@tsconfig/node16@^1.0.2": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" - integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== "@tufjs/canonical-json@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31" integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ== -"@tufjs/models@1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.3.tgz#e6cb8a86834da7459a7c836cd892dee56b4bab44" - integrity sha512-mkFEqqRisi13DmR5pX4x+Zk97EiU8djTtpNW1GeuX410y/raAsq/T3ZCjwoRIZ8/cIBfW0olK/sywlAiWevDVw== +"@tufjs/models@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef" + integrity sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A== dependencies: "@tufjs/canonical-json" "1.0.0" - minimatch "^7.4.6" + minimatch "^9.0.0" "@types/babel__core@^7.1.14": version "7.20.0" @@ -1632,9 +1647,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.18.3" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" - integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== + version "7.18.5" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.5.tgz#c107216842905afafd3b6e774f6f935da6f5db80" + integrity sha512-enCvTL8m/EHS/zIvJno9nE+ndYPh1/oNFzRYRmtUqJICG2VnCSBzMLW5VN2KCQU91f23tsNKR8v7VJJQMatl7Q== dependencies: "@babel/types" "^7.3.0" @@ -1774,19 +1789,19 @@ "@types/node" "*" "@types/node@*": - version "18.15.11" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" - integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q== + version "20.1.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.1.7.tgz#ce10c802f7731909d0a44ac9888e8b3a9125eb62" + integrity sha512-WCuw/o4GSwDGMoonES8rcvwsig77dGCMbZDrZr2x4ZZiNW4P/gcoZXe/0twgtobcTkmg9TuKflxYL/DuwDyJzg== -"@types/node@^14.18.42": - version "14.18.42" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.42.tgz#fa39b2dc8e0eba61bdf51c66502f84e23b66e114" - integrity sha512-xefu+RBie4xWlK8hwAzGh3npDz/4VhF6icY/shU+zv/1fNn+ZVG7T7CRwe9LId9sAYRPxI+59QBPuKL3WpyGRg== +"@types/node@^14.18.47": + version "14.18.47" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.47.tgz#89a56b05804d136cb99bf2f823bb00814a889aae" + integrity sha512-OuJi8bIng4wYHHA3YpKauL58dZrPxro3d0tabPHyiNF8rKfGKuVfr83oFlPLmKri1cX+Z3cJP39GXmnqkP11Gw== "@types/node@^16.9.2": - version "16.18.23" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.23.tgz#b6e934fe427eb7081d0015aad070acb3373c3c90" - integrity sha512-XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g== + version "16.18.31" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.31.tgz#7de39c2b9363f0d95b129cc969fcbf98e870251c" + integrity sha512-KPXltf4z4g517OlVJO9XQ2357CYw7fvuJ3ZuBynjXC5Jos9i+K7LvFb7bUIwtJXSZj0vTp9Q6NJBSQpkwwO8Zw== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1803,10 +1818,10 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== -"@types/semver@^7.3.12", "@types/semver@^7.3.13": - version "7.3.13" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" - integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== +"@types/semver@^7.3.12", "@types/semver@^7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a" + integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw== "@types/stack-utils@^2.0.0": version "2.0.1" @@ -1843,10 +1858,10 @@ dependencies: "@types/node" "*" -"@types/tar@^6.1.4": - version "6.1.4" - resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.4.tgz#cf8497e1ebdc09212fd51625cd2eb5ca18365ad1" - integrity sha512-Cp4oxpfIzWt7mr2pbhHT2OTXGMAL0szYCzuf8lRWyIMCgsx6/Hfc3ubztuhvzXHXgraTQxyOCmmg7TDGIMIJJQ== +"@types/tar@^6.1.5": + version "6.1.5" + resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.5.tgz#90ccb3b6a35430e7427410d50eed564e85feaaff" + integrity sha512-qm2I/RlZij5RofuY7vohTpYNaYcrSQlN2MyjucQc7ZweDwaEWkdN/EeNh6e9zjK6uEm6PwjdMXkcj05BxZdX1Q== dependencies: "@types/node" "*" minipass "^4.0.0" @@ -1877,15 +1892,15 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.0.tgz#c0e10eeb936debe5d1c3433cf36206a95befefd0" - integrity sha512-p0QgrEyrxAWBecR56gyn3wkG15TJdI//eetInP3zYRewDh0XS+DhB3VUAd3QqvziFsfaQIoIuZMxZRB7vXYaYw== +"@typescript-eslint/eslint-plugin@^5.59.6": + version "5.59.6" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.6.tgz#a350faef1baa1e961698240f922d8de1761a9e2b" + integrity sha512-sXtOgJNEuRU5RLwPUb1jxtToZbgvq3M6FPpY4QENxoOggK+UpTxUBpj6tD8+Qh2g46Pi9We87E+eHnUw8YcGsw== dependencies: "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.59.0" - "@typescript-eslint/type-utils" "5.59.0" - "@typescript-eslint/utils" "5.59.0" + "@typescript-eslint/scope-manager" "5.59.6" + "@typescript-eslint/type-utils" "5.59.6" + "@typescript-eslint/utils" "5.59.6" debug "^4.3.4" grapheme-splitter "^1.0.4" ignore "^5.2.0" @@ -1893,209 +1908,209 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.0.tgz#0ad7cd019346cc5d150363f64869eca10ca9977c" - integrity sha512-qK9TZ70eJtjojSUMrrEwA9ZDQ4N0e/AuoOIgXuNBorXYcBDk397D2r5MIe1B3cok/oCtdNC5j+lUUpVB+Dpb+w== +"@typescript-eslint/parser@^5.59.6": + version "5.59.6" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.59.6.tgz#bd36f71f5a529f828e20b627078d3ed6738dbb40" + integrity sha512-7pCa6al03Pv1yf/dUg/s1pXz/yGMUBAw5EeWqNTFiSueKvRNonze3hma3lhdsOrQcaOXhbk5gKu2Fludiho9VA== dependencies: - "@typescript-eslint/scope-manager" "5.59.0" - "@typescript-eslint/types" "5.59.0" - "@typescript-eslint/typescript-estree" "5.59.0" + "@typescript-eslint/scope-manager" "5.59.6" + "@typescript-eslint/types" "5.59.6" + "@typescript-eslint/typescript-estree" "5.59.6" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.0.tgz#86501d7a17885710b6716a23be2e93fc54a4fe8c" - integrity sha512-tsoldKaMh7izN6BvkK6zRMINj4Z2d6gGhO2UsI8zGZY3XhLq1DndP3Ycjhi1JwdwPRwtLMW4EFPgpuKhbCGOvQ== +"@typescript-eslint/scope-manager@5.59.6": + version "5.59.6" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.6.tgz#d43a3687aa4433868527cfe797eb267c6be35f19" + integrity sha512-gLbY3Le9Dxcb8KdpF0+SJr6EQ+hFGYFl6tVY8VxLPFDfUZC7BHFw+Vq7bM5lE9DwWPfx4vMWWTLGXgpc0mAYyQ== dependencies: - "@typescript-eslint/types" "5.59.0" - "@typescript-eslint/visitor-keys" "5.59.0" + "@typescript-eslint/types" "5.59.6" + "@typescript-eslint/visitor-keys" "5.59.6" -"@typescript-eslint/type-utils@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.0.tgz#8e8d1420fc2265989fa3a0d897bde37f3851e8c9" - integrity sha512-d/B6VSWnZwu70kcKQSCqjcXpVH+7ABKH8P1KNn4K7j5PXXuycZTPXF44Nui0TEm6rbWGi8kc78xRgOC4n7xFgA== +"@typescript-eslint/type-utils@5.59.6": + version "5.59.6" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.59.6.tgz#37c51d2ae36127d8b81f32a0a4d2efae19277c48" + integrity sha512-A4tms2Mp5yNvLDlySF+kAThV9VTBPCvGf0Rp8nl/eoDX9Okun8byTKoj3fJ52IJitjWOk0fKPNQhXEB++eNozQ== dependencies: - "@typescript-eslint/typescript-estree" "5.59.0" - "@typescript-eslint/utils" "5.59.0" + "@typescript-eslint/typescript-estree" "5.59.6" + "@typescript-eslint/utils" "5.59.6" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.0.tgz#3fcdac7dbf923ec5251545acdd9f1d42d7c4fe32" - integrity sha512-yR2h1NotF23xFFYKHZs17QJnB51J/s+ud4PYU4MqdZbzeNxpgUr05+dNeCN/bb6raslHvGdd6BFCkVhpPk/ZeA== +"@typescript-eslint/types@5.59.6": + version "5.59.6" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.6.tgz#5a6557a772af044afe890d77c6a07e8c23c2460b" + integrity sha512-tH5lBXZI7T2MOUgOWFdVNUILsI02shyQvfzG9EJkoONWugCG77NDDa1EeDGw7oJ5IvsTAAGVV8I3Tk2PNu9QfA== -"@typescript-eslint/typescript-estree@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.0.tgz#8869156ee1dcfc5a95be3ed0e2809969ea28e965" - integrity sha512-sUNnktjmI8DyGzPdZ8dRwW741zopGxltGs/SAPgGL/AAgDpiLsCFLcMNSpbfXfmnNeHmK9h3wGmCkGRGAoUZAg== +"@typescript-eslint/typescript-estree@5.59.6": + version "5.59.6" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.6.tgz#2fb80522687bd3825504925ea7e1b8de7bb6251b" + integrity sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA== dependencies: - "@typescript-eslint/types" "5.59.0" - "@typescript-eslint/visitor-keys" "5.59.0" + "@typescript-eslint/types" "5.59.6" + "@typescript-eslint/visitor-keys" "5.59.6" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.0.tgz#063d066b3bc4850c18872649ed0da9ee72d833d5" - integrity sha512-GGLFd+86drlHSvPgN/el6dRQNYYGOvRSDVydsUaQluwIW3HvbXuxyuD5JETvBt/9qGYe+lOrDk6gRrWOHb/FvA== +"@typescript-eslint/utils@5.59.6": + version "5.59.6" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.6.tgz#82960fe23788113fc3b1f9d4663d6773b7907839" + integrity sha512-vzaaD6EXbTS29cVH0JjXBdzMt6VBlv+hE31XktDRMX1j3462wZCJa7VzO2AxXEXcIl8GQqZPcOPuW/Z1tZVogg== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.59.0" - "@typescript-eslint/types" "5.59.0" - "@typescript-eslint/typescript-estree" "5.59.0" + "@typescript-eslint/scope-manager" "5.59.6" + "@typescript-eslint/types" "5.59.6" + "@typescript-eslint/typescript-estree" "5.59.6" eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.59.0": - version "5.59.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.0.tgz#a59913f2bf0baeb61b5cfcb6135d3926c3854365" - integrity sha512-qZ3iXxQhanchCeaExlKPV3gDQFxMUmU35xfd5eCXB6+kUw1TUAbIy2n7QIrwz9s98DQLzNWyHp61fY0da4ZcbA== +"@typescript-eslint/visitor-keys@5.59.6": + version "5.59.6" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.6.tgz#673fccabf28943847d0c8e9e8d008e3ada7be6bb" + integrity sha512-zEfbFLzB9ETcEJ4HZEEsCR9HHeNku5/Qw1jSS5McYJv5BR+ftYXwFFAH5Al+xkGaZEqowMwl7uoJjQb1YSPF8Q== dependencies: - "@typescript-eslint/types" "5.59.0" + "@typescript-eslint/types" "5.59.6" eslint-visitor-keys "^3.3.0" -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== +"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" + integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== +"@webassemblyjs/floating-point-hex-parser@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== +"@webassemblyjs/helper-api-error@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" + integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== +"@webassemblyjs/helper-buffer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" + integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== +"@webassemblyjs/helper-numbers@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/floating-point-hex-parser" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" "@xtuc/long" "4.2.2" -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== +"@webassemblyjs/helper-wasm-bytecode@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" + integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== +"@webassemblyjs/helper-wasm-section@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" + integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== +"@webassemblyjs/ieee754@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== +"@webassemblyjs/leb128@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" +"@webassemblyjs/utf8@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" + integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== + +"@webassemblyjs/wasm-edit@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" + integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-opt" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/wast-printer" "1.11.6" + +"@webassemblyjs/wasm-gen@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" + integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wasm-opt@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" + integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + +"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" + integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wast-printer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" + integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== + dependencies: + "@webassemblyjs/ast" "1.11.6" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f" - integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A== +"@webpack-cli/configtest@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.0.tgz#b59b33377b1b896a9a7357cfc643b39c1524b1e6" + integrity sha512-K/vuv72vpfSEZoo5KIU0a2FsEoYdW0DUMtMpB5X3LlUwshetMZRZRxB7sCsVji/lFaSxtQQ3aM9O4eMolXkU9w== "@webpack-cli/info@^2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0" integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA== -"@webpack-cli/serve@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8" - integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw== +"@webpack-cli/serve@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.4.tgz#3982ee6f8b42845437fc4d391e93ac5d9da52f0f" + integrity sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A== "@xmldom/xmldom@^0.8.7": version "0.8.7" @@ -2118,9 +2133,9 @@ integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== "@yarnpkg/parsers@^3.0.0-rc.18": - version "3.0.0-rc.42" - resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.42.tgz#3814e90a81bb1f9c06cc83c6a009139c55efe94d" - integrity sha512-eW9Mbegmb5bJjwawJM9ghjUjUqciNMhC6L7XrQPF/clXS5bbP66MstsgCT5hy9VlfUh/CfBT+0Wucf531dMjHA== + version "3.0.0-rc.43" + resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.43.tgz#2bf720ec6444e3f002f40dce734c262e9f3d888a" + integrity sha512-AhFF3mIDfA+jEwQv2WMHmiYhOvmdbh2qhUkDVQfiqzQtUwS4BgoWwom5NpSPg4Ix5vOul+w1690Bt21CkVLpgg== dependencies: js-yaml "^3.10.0" tslib "^2.4.0" @@ -2163,9 +2178,9 @@ abort-controller@^3.0.0: event-target-shim "^5.0.0" acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== + version "1.9.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" + integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== acorn-jsx@^5.3.2: version "5.3.2" @@ -2236,10 +2251,10 @@ ajv@^8.12.0: require-from-string "^2.0.2" uri-js "^4.2.2" -all-contributors-cli@^6.24.0: - version "6.24.0" - resolved "https://registry.yarnpkg.com/all-contributors-cli/-/all-contributors-cli-6.24.0.tgz#25c480c5c6e921532873114c2d6487816e6c22e0" - integrity sha512-7oSKr2PnqxsOotuSwciltcFTS1eVRdjR0cn99hbElfff7gRQBShVhsf/XBprY41sLcgqTk0l0MKgKv6QNgZdMg== +all-contributors-cli@^6.25.1: + version "6.25.1" + resolved "https://registry.yarnpkg.com/all-contributors-cli/-/all-contributors-cli-6.25.1.tgz#d6fbd4e7264939dc8efe897a9ccddc5329e46235" + integrity sha512-Q9MfsO6FH09h71IG6OobfESA7lbooB3/bnO2wnuXbLPye1lFsYsa/jpNZP0YBx6zbhwXqqm6CXRZ9HO/tmD4NQ== dependencies: "@babel/runtime" "^7.7.6" async "^3.1.0" @@ -2269,6 +2284,11 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -2288,6 +2308,11 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + anymatch@^3.0.3: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -2419,9 +2444,9 @@ available-typed-arrays@^1.0.5: integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== axios@^1.0.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.3.5.tgz#e07209b39a0d11848e3e341fa087acd71dadc542" - integrity sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw== + version "1.4.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" + integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -2533,6 +2558,11 @@ before-after-hook@^2.2.0: resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c" integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ== +big-integer@^1.6.44: + version "1.6.51" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" + integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== + bin-links@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.3.tgz#3842711ef3db2cd9f16a5f404a996a12db355a6e" @@ -2569,6 +2599,13 @@ bl@^4.0.3, bl@^4.1.0: inherits "^2.0.4" readable-stream "^3.4.0" +bplist-parser@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e" + integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw== + dependencies: + big-integer "^1.6.44" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -2641,6 +2678,13 @@ builtins@^5.0.0: dependencies: semver "^7.0.0" +bundle-name@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a" + integrity sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw== + dependencies: + run-applescript "^5.0.0" + byte-size@7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.0.tgz#36528cd1ca87d39bd9abd51f5715dc93b6ceb032" @@ -2671,20 +2715,19 @@ cacache@^16.0.0, cacache@^16.1.0, cacache@^16.1.3: unique-filename "^2.0.0" cacache@^17.0.0, cacache@^17.0.4: - version "17.0.5" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.0.5.tgz#6dbec26c11f1f6a2b558bc11ed3316577c339ebc" - integrity sha512-Y/PRQevNSsjAPWykl9aeGz8Pr+OI6BYM9fYDNMvOkuUiG9IhG4LEmaYrZZZvioMUEQ+cBCxT0v8wrnCURccyKA== + version "17.1.2" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.2.tgz#57ce9b79d300373f7266f2f1e4e1718fe09e84b4" + integrity sha512-VcRDUtZd9r7yfGDpdm3dBDBSQbLd19IqWs9q1tuB9g6kmxYLwIjfLngRKMCfDHxReuf0SBclRuYn66Xds7jzUQ== dependencies: "@npmcli/fs" "^3.1.0" fs-minipass "^3.0.0" - glob "^9.3.1" + glob "^10.2.2" lru-cache "^7.7.1" - minipass "^4.0.0" + minipass "^5.0.0" minipass-collect "^1.0.2" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" p-map "^4.0.0" - promise-inflight "^1.0.1" ssri "^10.0.0" tar "^6.1.11" unique-filename "^3.0.0" @@ -2722,9 +2765,9 @@ camelcase@^6.2.0, camelcase@^6.3.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001449: - version "1.0.30001480" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001480.tgz#9bbd35ee44c2480a1e3a3b9f4496f5066817164a" - integrity sha512-q7cpoPPvZYgtyC4VaBSN0Bt+PJ4c4EYRf0DrduInOz2SkFpHD5p3LnvEpqBp7UnJn+8x1Ogl1s38saUxe+ihQQ== + version "1.0.30001488" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz#d19d7b6e913afae3e98f023db97c19e9ddc5e91f" + integrity sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ== case@^1.6.3: version "1.6.3" @@ -2781,7 +2824,7 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.2.0: +ci-info@^3.2.0, ci-info@^3.6.1: version "3.8.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== @@ -2824,9 +2867,9 @@ cli-spinners@2.6.1: integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== cli-spinners@^2.5.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.8.0.tgz#e97a3e2bd00e6d85aa0c13d7f9e3ce236f7787fc" - integrity sha512-/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ== + version "2.9.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.0.tgz#5881d0ad96381e117bbe07ad91f2008fe6ffd8db" + integrity sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g== cli-table3@^0.6.2: version "0.6.3" @@ -2851,7 +2894,7 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" -cliui@^7.0.2, cliui@^7.0.4: +cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== @@ -2959,16 +3002,16 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^9.4.1: - version "9.5.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" - integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== - common-ancestor-path@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7" @@ -3315,6 +3358,24 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== +default-browser-id@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c" + integrity sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA== + dependencies: + bplist-parser "^0.2.0" + untildify "^4.0.0" + +default-browser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-4.0.0.tgz#53c9894f8810bf86696de117a6ce9085a3cbc7da" + integrity sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA== + dependencies: + bundle-name "^3.0.0" + default-browser-id "^3.0.0" + execa "^7.1.1" + titleize "^3.0.0" + defaults@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" @@ -3327,6 +3388,11 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== + define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" @@ -3480,6 +3546,11 @@ duplexer@^0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + ejs@^3.1.7: version "3.1.9" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" @@ -3488,9 +3559,9 @@ ejs@^3.1.7: jake "^10.8.5" electron-to-chromium@^1.4.284: - version "1.4.368" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.368.tgz#75901f97d3e23da2e66feb1e61fbb8e70ac96430" - integrity sha512-e2aeCAixCj9M7nJxdB/wDjO6mbYX+lJJxSJCXDzlr5YPGYVofuJwGN9nKg2o6wWInjX6XmxRinn3AeJMK81ltw== + version "1.4.397" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.397.tgz#82a7e26c657538d59bb713b97ac22f97ea3a90ea" + integrity sha512-jwnPxhh350Q/aMatQia31KAIQdhEsYS0fFZ0BQQlN9tfvOEwShu6ZNwI4kL/xBabjcB/nTy6lSt17kNIluJZ8Q== emittery@^0.10.2: version "0.10.2" @@ -3507,6 +3578,11 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" @@ -3521,10 +3597,10 @@ end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^5.10.0, enhanced-resolve@^5.12.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" - integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== +enhanced-resolve@^5.12.0, enhanced-resolve@^5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.0.tgz#0b6c676c8a3266c99fa281e4433a706f5c0c61c4" + integrity sha512-+DCows0XNwLDcUhbFJPdlQEVnT2zXlCv7hPxemTz86/O+B/hCQ+mb7ydkPKiflpVraqLPCAfu7lDy+hBXueojw== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -3722,7 +3798,7 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-scope@^7.1.1: +eslint-scope@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b" integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== @@ -3730,20 +3806,20 @@ eslint-scope@^7.1.1: esrecurse "^4.3.0" estraverse "^5.2.0" -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc" - integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ== +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" + integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== -eslint@^8.38.0: - version "8.38.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.38.0.tgz#a62c6f36e548a5574dd35728ac3c6209bd1e2f1a" - integrity sha512-pIdsD2jwlUGf/U38Jv97t8lq6HpaU/G9NKbYmpWpZGw3LdTNhZLbJePqxOXGB5+JEKfOPU/XLxYxFh03nr1KTg== +eslint@^8.40.0: + version "8.40.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.40.0.tgz#a564cd0099f38542c4e9a2f630fa45bf33bc42a4" + integrity sha512-bvR+TsP9EHL3TqNtj9sCNJVAFK3fBN8Q7g5waghxyRsPLIMwL73XSKnZFK0hk/O2ANC+iAoq6PWMQ+IfBAJIiQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.4.0" - "@eslint/eslintrc" "^2.0.2" - "@eslint/js" "8.38.0" + "@eslint/eslintrc" "^2.0.3" + "@eslint/js" "8.40.0" "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" @@ -3753,9 +3829,9 @@ eslint@^8.38.0: debug "^4.3.2" doctrine "^3.0.0" escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-visitor-keys "^3.4.0" - espree "^9.5.1" + eslint-scope "^7.2.0" + eslint-visitor-keys "^3.4.1" + espree "^9.5.2" esquery "^1.4.2" esutils "^2.0.2" fast-deep-equal "^3.1.3" @@ -3781,14 +3857,14 @@ eslint@^8.38.0: strip-json-comments "^3.1.0" text-table "^0.2.0" -espree@^9.5.1: - version "9.5.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4" - integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg== +espree@^9.5.2: + version "9.5.2" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b" + integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.4.0" + eslint-visitor-keys "^3.4.1" esprima@^4.0.0: version "4.0.1" @@ -3869,6 +3945,21 @@ execa@^5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" +execa@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-7.1.1.tgz#3eb3c83d239488e7b409d48e8813b76bb55c9c43" + integrity sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.1" + human-signals "^4.3.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^3.0.7" + strip-final-newline "^3.0.0" + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -3985,7 +4076,7 @@ file-url@3.0.0: resolved "https://registry.yarnpkg.com/file-url/-/file-url-3.0.0.tgz#247a586a746ce9f7a8ed05560290968afc262a77" integrity sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA== -filelist@^1.0.1: +filelist@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== @@ -4126,11 +4217,11 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0: minipass "^3.0.0" fs-minipass@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.1.tgz#853809af15b6d03e27638d1ab6432e6b378b085d" - integrity sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw== + version "3.0.2" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.2.tgz#5b383858efa8c1eb8c33b39e994f7e8555b8b3a3" + integrity sha512-2GAfyfoaCDRrM6jaOS3UsBts8yJ55VioXdWcOL7dK9zdAuKT71+WBA4ifnNYqVjYv+4SsPxjK0JT4yIIn4cA/g== dependencies: - minipass "^4.0.0" + minipass "^5.0.0" fs.realpath@^1.0.0: version "1.0.0" @@ -4177,15 +4268,15 @@ gauge@^4.0.3: wide-align "^1.1.5" gauge@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.0.tgz#e270ca9d97dae84abf64e5277ef1ebddc7dd1e2f" - integrity sha512-0s5T5eciEG7Q3ugkxAkFtaDhrrhXsCRivA5y8C9WMHWuI8UlMOJg7+Iwf7Mccii+Dfs3H5jHepU0joPVyQU0Lw== + version "5.0.1" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.1.tgz#1efc801b8ff076b86ef3e9a7a280a975df572112" + integrity sha512-CmykPMJGuNan/3S4kZOpvvPYSNqSHANiWnh9XcMU2pSjtBfF0XzZ2p1bFAxTbnFxyBuPxQYHhzwaoOmUdqzvxQ== dependencies: aproba "^1.0.3 || ^2.0.0" color-support "^1.1.3" console-control-strings "^1.1.0" has-unicode "^2.0.1" - signal-exit "^3.0.7" + signal-exit "^4.0.1" string-width "^4.2.3" strip-ansi "^6.0.1" wide-align "^1.1.5" @@ -4201,12 +4292,13 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: function-bind "^1.1.1" has "^1.0.3" + has-proto "^1.0.1" has-symbols "^1.0.3" get-package-type@^0.1.0: @@ -4239,7 +4331,7 @@ get-stream@6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718" integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== -get-stream@^6.0.0: +get-stream@^6.0.0, get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== @@ -4337,16 +4429,15 @@ glob@7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.2.1.tgz#44288e9186b5cd5baa848728533ba21a94aa8f33" - integrity sha512-ngom3wq2UhjdbmRE/krgkD8BQyi1KZ5l+D2dVm4+Yj+jJIBp74/ZGunL6gNGc/CYuQmvUBiavWEXIotRiv5R6A== +glob@^10.2.2, glob@^10.2.4: + version "10.2.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.2.4.tgz#f5bf7ddb080e3e9039b148a9e2aef3d5ebfc0a25" + integrity sha512-fDboBse/sl1oXSLhIp0FcCJgzW9KmhC/q8ULTKC82zc+DL3TL7FNb8qlt5qqXN53MsKEUSIcb+7DLmEygOE5Yw== dependencies: foreground-child "^3.1.0" - fs.realpath "^1.0.0" jackspeak "^2.0.3" minimatch "^9.0.0" - minipass "^5.0.0" + minipass "^5.0.0 || ^6.0.0" path-scurry "^1.7.0" glob@^7.1.3, glob@^7.1.4, glob@^7.1.7: @@ -4372,7 +4463,7 @@ glob@^8.0.1: minimatch "^5.0.1" once "^1.3.0" -glob@^9.2.0, glob@^9.3.0, glob@^9.3.1: +glob@^9.2.0: version "9.3.5" resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.5.tgz#ca2ed8ca452781a3009685607fdf025a899dfe21" integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q== @@ -4401,11 +4492,6 @@ globalthis@^1.0.3: dependencies: define-properties "^1.1.3" -globalyzer@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465" - integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q== - globby@11.1.0, globby@^11.0.1, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" @@ -4429,11 +4515,6 @@ globby@^13.1.3: merge2 "^1.4.1" slash "^4.0.0" -globrex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" - integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== - gopd@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" @@ -4589,6 +4670,11 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +human-signals@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" + integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -4623,11 +4709,11 @@ ignore-walk@^5.0.1: minimatch "^5.0.1" ignore-walk@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.2.tgz#c48f48397cf8ef6174fcc28aa5f8c1de6203d389" - integrity sha512-ezmQ1Dg2b3jVZh2Dh+ar6Eu2MqNSTkyb32HU2MAQQQX9tKM3q/UQ/9lf03lQ5hW+fOeoMnwxwkleZ0xcNp0/qg== + version "6.0.3" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-6.0.3.tgz#0fcdb6decaccda35e308a7b0948645dd9523b7bb" + integrity sha512-C7FfFoTA+bI10qfeydT8aZbvr91vAEU+2W5BZUlzPec47oNb07SsOfwYrtxuvOYdUApPP/Qlh4DtAO51Ekk2QA== dependencies: - minimatch "^7.4.2" + minimatch "^9.0.0" ignore@^5.0.4, ignore@^5.2.0: version "5.2.4" @@ -4835,9 +4921,9 @@ is-cidr@^4.0.2: cidr-regex "^3.1.1" is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.8.1: - version "2.12.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" - integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== + version "2.12.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" + integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== dependencies: has "^1.0.3" @@ -4853,6 +4939,11 @@ is-docker@^2.0.0, is-docker@^2.1.1: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -4875,6 +4966,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: dependencies: is-extglob "^2.1.1" +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + is-interactive@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" @@ -4966,6 +5064,11 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== +is-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" + integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== + is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" @@ -5080,23 +5183,23 @@ istanbul-reports@^3.1.3: istanbul-lib-report "^3.0.0" jackspeak@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.0.3.tgz#672eb397b97744a265b5862d7762b96e8dad6e61" - integrity sha512-0Jud3OMUdMbrlr3PyUMKESq51LXVAB+a239Ywdvd+Kgxj3MaBRml/nVRxf8tQFyfthMjuRkxkv7Vg58pmIMfuQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.0.tgz#497cbaedc902ec3f31d5d61be804d2364ff9ddad" + integrity sha512-r5XBrqIJfwRIjRt/Xr5fv9Wh09qyhHfKnYddDlpM+ibRR20qrYActpCAgU6U+d53EOEjzkvxPMVHSlgR7leXrQ== dependencies: - cliui "^7.0.4" + "@isaacs/cliui" "^8.0.2" optionalDependencies: "@pkgjs/parseargs" "^0.11.0" jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== + version "10.8.6" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.6.tgz#227a96786a1e035214e0ba84b482d6223d41ef04" + integrity sha512-G43Ub9IYEFfu72sua6rzooi8V8Gz2lkfk48rW20vEWCGizeaEPlKB1Kh8JIA84yQbiAEfqlPmSpGgCKKxH3rDA== dependencies: async "^3.2.3" chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" + filelist "^1.0.4" + minimatch "^3.1.2" jest-changed-files@^29.5.0: version "29.5.0" @@ -5924,14 +6027,14 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -lerna@^6.6.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-6.6.1.tgz#4897171aed64e244a2d0f9000eef5c5b228f9332" - integrity sha512-WJtrvmbmR+6hMB9b5pvsxJzew0lRL6hARgW/My9BM4vYaxwPIA2I0riv3qQu5Zd7lYse7FEqJkTnl9Kn1bXhLA== +lerna@^6.6.2: + version "6.6.2" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-6.6.2.tgz#ad921f913aca4e7307123a598768b6f15ca5804f" + integrity sha512-W4qrGhcdutkRdHEaDf9eqp7u4JvI+1TwFy5woX6OI8WPe4PYBdxuILAsvhp614fUG41rKSGDKlOh+AWzdSidTg== dependencies: - "@lerna/child-process" "6.6.1" - "@lerna/create" "6.6.1" - "@lerna/legacy-package-management" "6.6.1" + "@lerna/child-process" "6.6.2" + "@lerna/create" "6.6.2" + "@lerna/legacy-package-management" "6.6.2" "@npmcli/arborist" "6.2.3" "@npmcli/run-script" "4.1.7" "@nrwl/devkit" ">=15.5.2 < 16" @@ -5965,8 +6068,8 @@ lerna@^6.6.1: is-ci "2.0.0" is-stream "2.0.0" js-yaml "^4.1.0" - libnpmaccess "6.0.3" - libnpmpublish "6.0.4" + libnpmaccess "^6.0.3" + libnpmpublish "7.1.4" load-json-file "6.2.0" make-dir "3.1.0" minimatch "3.0.5" @@ -5983,7 +6086,7 @@ lerna@^6.6.1: p-queue "6.6.2" p-reduce "2.1.0" p-waterfall "2.1.1" - pacote "13.6.2" + pacote "15.1.1" pify "5.0.0" read-cmd-shim "3.0.0" read-package-json "5.0.1" @@ -6019,17 +6122,7 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -libnpmaccess@6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.3.tgz#473cc3e4aadb2bc713419d92e45d23b070d8cded" - integrity sha512-4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg== - dependencies: - aproba "^2.0.0" - minipass "^3.1.1" - npm-package-arg "^9.0.1" - npm-registry-fetch "^13.0.0" - -libnpmaccess@^6.0.4: +libnpmaccess@^6.0.3, libnpmaccess@^6.0.4: version "6.0.4" resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.4.tgz#2dd158bd8a071817e2207d3b201d37cf1ad6ae6b" integrity sha512-qZ3wcfIyUoW0+qSFkMBovcTrSGJ3ZeyvpR7d5N9pEYv/kXs8sHP2wiqEIXBKLFrZlmM0kR0RJD7mtfLngtlLag== @@ -6105,16 +6198,19 @@ libnpmpack@^4.1.3: npm-package-arg "^9.0.1" pacote "^13.6.1" -libnpmpublish@6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-6.0.4.tgz#adb41ec6b0c307d6f603746a4d929dcefb8f1a0b" - integrity sha512-lvAEYW8mB8QblL6Q/PI/wMzKNvIrF7Kpujf/4fGS/32a2i3jzUXi04TNyIBcK6dQJ34IgywfaKGh+Jq4HYPFmg== +libnpmpublish@7.1.4: + version "7.1.4" + resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-7.1.4.tgz#a0d138e00e52a0c71ffc82273acf0082fc2dfb36" + integrity sha512-mMntrhVwut5prP4rJ228eEbEyvIzLWhqFuY90j5QeXBCTT2pWSMno7Yo2S2qplPUr02zPurGH4heGLZ+wORczg== dependencies: - normalize-package-data "^4.0.0" - npm-package-arg "^9.0.1" - npm-registry-fetch "^13.0.0" + ci-info "^3.6.1" + normalize-package-data "^5.0.0" + npm-package-arg "^10.1.0" + npm-registry-fetch "^14.0.3" + proc-log "^3.0.0" semver "^7.3.7" - ssri "^9.0.0" + sigstore "^1.4.0" + ssri "^10.0.1" libnpmpublish@^6.0.5: version "6.0.5" @@ -6283,10 +6379,10 @@ lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== -lru-cache@^9.0.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.0.tgz#19efafa9d08d1c08eb8efd78876075f0b8b1b07b" - integrity sha512-qFXQEwchrZcMVen2uIDceR8Tii6kCJak5rzDStfEM0qA3YLMswaxIEZO0DhIbJ3aqaJiDjt+3crlplOb0tDtKQ== +lru-cache@^9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.1.tgz#c58a93de58630b688de39ad04ef02ef26f1902f1" + integrity sha512-65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A== make-dir@3.1.0, make-dir@^3.0.0: version "3.1.0" @@ -6330,10 +6426,10 @@ make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.2.0: socks-proxy-agent "^7.0.0" ssri "^9.0.0" -make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1: - version "11.1.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.0.tgz#f26b05e89317e960b75fd5e080e40d40f8d7b2a5" - integrity sha512-7ChuOzCb1LzdQZrTy0ky6RsCoMYeM+Fh4cY0+4zsJVhNcH5Q3OJojLY1mGkD0xAhWB29lskECVb6ZopofwjldA== +make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.0: + version "11.1.1" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f" + integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w== dependencies: agentkeepalive "^4.2.1" cacache "^17.0.0" @@ -6342,7 +6438,7 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1: https-proxy-agent "^5.0.0" is-lambda "^1.0.1" lru-cache "^7.7.1" - minipass "^4.0.0" + minipass "^5.0.0" minipass-fetch "^3.0.0" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" @@ -6432,6 +6528,11 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" + integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== + min-indent@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" @@ -6465,13 +6566,6 @@ minimatch@^6.1.6: dependencies: brace-expansion "^2.0.1" -minimatch@^7.4.2, minimatch@^7.4.6: - version "7.4.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb" - integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw== - dependencies: - brace-expansion "^2.0.1" - minimatch@^8.0.2: version "8.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229" @@ -6519,11 +6613,11 @@ minipass-fetch@^2.0.3: encoding "^0.1.13" minipass-fetch@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.2.tgz#2f7275ae13f2fb0f2a469cee4f78250c25c80ab3" - integrity sha512-/ZpF1CQaWYqjbhfFgKNt3azxztEpc/JUPuMkqOgrnMQqcU8CbE409AUdJYTIWryl3PP5CBaTJZT71N49MXP/YA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.3.tgz#d9df70085609864331b533c960fd4ffaa78d15ce" + integrity sha512-n5ITsTkDqYkYJZjcRWzZt9qnZKCT7nKCosJhHoj7S7zD+BP4jVbWs+odsniw5TA3E0sLomhTKOKjF86wf11PuQ== dependencies: - minipass "^4.0.0" + minipass "^5.0.0" minipass-sized "^1.0.3" minizlib "^2.1.2" optionalDependencies: @@ -6575,6 +6669,11 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== +"minipass@^5.0.0 || ^6.0.0": + version "6.0.1" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.1.tgz#315417c259cb32a1b2fc530c0e7f55c901a60a6d" + integrity sha512-Tenl5QPpgozlOGBiveNYHg2f6y+VpxsXRoIHFUVJuSmTonXRAE6q9b8Mp/O46762/2AlW4ye4Nkyvx0fgWDKbw== + minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -6678,9 +6777,9 @@ node-fetch@2.6.7: whatwg-url "^5.0.0" node-fetch@^2.6.0, node-fetch@^2.6.7: - version "2.6.9" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== + version "2.6.11" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" + integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== dependencies: whatwg-url "^5.0.0" @@ -6826,10 +6925,10 @@ npm-normalize-package-bin@^2.0.0: resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff" integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ== -npm-normalize-package-bin@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz#6097436adb4ef09e2628b59a7882576fe53ce485" - integrity sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q== +npm-normalize-package-bin@^3.0.0, npm-normalize-package-bin@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832" + integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ== npm-package-arg@8.1.1: version "8.1.1" @@ -6942,12 +7041,12 @@ npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1, npm-registry-fetch@^13.3 proc-log "^2.0.0" npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3: - version "14.0.4" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.4.tgz#43dfa55ce7c0d0c545d625c7a916bab5b95f7038" - integrity sha512-pMS2DRkwg+M44ct65zrN/Cr9IHK1+n6weuefAo6Er4lc+/8YBCU0Czq04H3ZiSigluh7pb2rMM5JpgcytctB+Q== + version "14.0.5" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz#fe7169957ba4986a4853a650278ee02e568d115d" + integrity sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA== dependencies: make-fetch-happen "^11.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minipass-fetch "^3.0.0" minipass-json-stream "^1.0.1" minizlib "^2.1.2" @@ -6961,6 +7060,13 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" +npm-run-path@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" + integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q== + dependencies: + path-key "^4.0.0" + npm-user-validate@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561" @@ -7065,13 +7171,13 @@ npmlog@^7.0.1: gauge "^5.0.0" set-blocking "^2.0.0" -nx@15.9.2, "nx@>=15.5.2 < 16": - version "15.9.2" - resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.2.tgz#d7ace1e5ae64a47f1b553dc5da08dbdd858bde96" - integrity sha512-wtcs+wsuplSckvgk+bV+/XuGlo+sVWzSG0RpgWBjQYeqA3QsVFEAPVY66Z5cSoukDbTV77ddcAjEw+Rz8oOR1A== +nx@15.9.4, "nx@>=15.5.2 < 16": + version "15.9.4" + resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.4.tgz#1075bc33fe8ee6c6546c21ec6ffcfd2e000946c6" + integrity sha512-P1G4t59UvE/lkHyruLeSOB5ZuNyh01IwU0tTUOi8f9s/NbP7+OQ8MYVwDV74JHTr6mQgjlS+n+4Eox8tVm9itA== dependencies: - "@nrwl/cli" "15.9.2" - "@nrwl/tao" "15.9.2" + "@nrwl/cli" "15.9.4" + "@nrwl/tao" "15.9.4" "@parcel/watcher" "2.0.4" "@yarnpkg/lockfile" "^1.1.0" "@yarnpkg/parsers" "^3.0.0-rc.18" @@ -7106,15 +7212,15 @@ nx@15.9.2, "nx@>=15.5.2 < 16": yargs "^17.6.2" yargs-parser "21.1.1" optionalDependencies: - "@nrwl/nx-darwin-arm64" "15.9.2" - "@nrwl/nx-darwin-x64" "15.9.2" - "@nrwl/nx-linux-arm-gnueabihf" "15.9.2" - "@nrwl/nx-linux-arm64-gnu" "15.9.2" - "@nrwl/nx-linux-arm64-musl" "15.9.2" - "@nrwl/nx-linux-x64-gnu" "15.9.2" - "@nrwl/nx-linux-x64-musl" "15.9.2" - "@nrwl/nx-win32-arm64-msvc" "15.9.2" - "@nrwl/nx-win32-x64-msvc" "15.9.2" + "@nrwl/nx-darwin-arm64" "15.9.4" + "@nrwl/nx-darwin-x64" "15.9.4" + "@nrwl/nx-linux-arm-gnueabihf" "15.9.4" + "@nrwl/nx-linux-arm64-gnu" "15.9.4" + "@nrwl/nx-linux-arm64-musl" "15.9.4" + "@nrwl/nx-linux-x64-gnu" "15.9.4" + "@nrwl/nx-linux-x64-musl" "15.9.4" + "@nrwl/nx-win32-arm64-msvc" "15.9.4" + "@nrwl/nx-win32-x64-msvc" "15.9.4" object-inspect@^1.12.3, object-inspect@^1.9.0: version "1.12.3" @@ -7159,6 +7265,13 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" +onetime@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" + integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== + dependencies: + mimic-fn "^4.0.0" + open@^8.4.0: version "8.4.2" resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" @@ -7168,6 +7281,16 @@ open@^8.4.0: is-docker "^2.1.1" is-wsl "^2.2.0" +open@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6" + integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg== + dependencies: + default-browser "^4.0.0" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^2.2.0" + opener@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" @@ -7313,7 +7436,31 @@ p-waterfall@2.1.1: dependencies: p-reduce "^2.0.0" -pacote@13.6.2, pacote@^13.0.3, pacote@^13.6.1, pacote@^13.6.2: +pacote@15.1.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.1.tgz#94d8c6e0605e04d427610b3aacb0357073978348" + integrity sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ== + dependencies: + "@npmcli/git" "^4.0.0" + "@npmcli/installed-package-contents" "^2.0.1" + "@npmcli/promise-spawn" "^6.0.1" + "@npmcli/run-script" "^6.0.0" + cacache "^17.0.0" + fs-minipass "^3.0.0" + minipass "^4.0.0" + npm-package-arg "^10.0.0" + npm-packlist "^7.0.0" + npm-pick-manifest "^8.0.0" + npm-registry-fetch "^14.0.0" + proc-log "^3.0.0" + promise-retry "^2.0.1" + read-package-json "^6.0.0" + read-package-json-fast "^3.0.0" + sigstore "^1.0.0" + ssri "^10.0.0" + tar "^6.1.11" + +pacote@^13.0.3, pacote@^13.6.1, pacote@^13.6.2: version "13.6.2" resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.6.2.tgz#0d444ba3618ab3e5cd330b451c22967bbd0ca48a" integrity sha512-Gu8fU3GsvOPkak2CkbojR7vjs3k3P9cA6uazKTHdsdV0gpCEQq2opelnEv30KRQWgVzP5Vd/5umjcedma3MKtg== @@ -7341,9 +7488,9 @@ pacote@13.6.2, pacote@^13.0.3, pacote@^13.6.1, pacote@^13.6.2: tar "^6.1.11" pacote@^15.0.0, pacote@^15.0.8: - version "15.1.1" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.1.tgz#94d8c6e0605e04d427610b3aacb0357073978348" - integrity sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ== + version "15.1.3" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.3.tgz#4c0e7fb5e7ab3b27fb3f86514b451ad4c4f64e9d" + integrity sha512-aRts8cZqxiJVDitmAh+3z+FxuO3tLNWEmwDRPEpDDiZJaRz06clP4XX112ynMT5uF0QNoMPajBBHnaStUEPJXA== dependencies: "@npmcli/git" "^4.0.0" "@npmcli/installed-package-contents" "^2.0.1" @@ -7351,7 +7498,7 @@ pacote@^15.0.0, pacote@^15.0.8: "@npmcli/run-script" "^6.0.0" cacache "^17.0.0" fs-minipass "^3.0.0" - minipass "^4.0.0" + minipass "^5.0.0" npm-package-arg "^10.0.0" npm-packlist "^7.0.0" npm-pick-manifest "^8.0.0" @@ -7360,7 +7507,7 @@ pacote@^15.0.0, pacote@^15.0.8: promise-retry "^2.0.1" read-package-json "^6.0.0" read-package-json-fast "^3.0.0" - sigstore "^1.0.0" + sigstore "^1.3.0" ssri "^10.0.0" tar "^6.1.11" @@ -7446,18 +7593,23 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +path-key@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" + integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== + path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-scurry@^1.6.1, path-scurry@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.7.0.tgz#99c741a2cfbce782294a39994d63748b5a24f6db" - integrity sha512-UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg== + version "1.9.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.9.1.tgz#838566bb22e38feaf80ecd49ae06cd12acd782ee" + integrity sha512-UgmoiySyjFxP6tscZDgWGEAgsW5ok8W3F5CJDnnH2pozwSTGE6eH7vwTotMwATWA2r5xqdkKdxYPkwlJjAI/3g== dependencies: - lru-cache "^9.0.0" - minipass "^5.0.0" + lru-cache "^9.1.1" + minipass "^5.0.0 || ^6.0.0" path-type@^3.0.0: version "3.0.0" @@ -7519,9 +7671,9 @@ pkg-dir@^4.2.0: find-up "^4.0.0" postcss-selector-parser@^6.0.10: - version "6.0.11" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" - integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== + version "6.0.13" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" + integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -7538,10 +7690,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.8.7: - version "2.8.7" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450" - integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw== +prettier@^2.8.8: + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== pretty-format@29.4.3: version "29.4.3" @@ -7650,14 +7802,14 @@ punycode@^2.1.0: integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== pure-rand@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.1.tgz#31207dddd15d43f299fdcdb2f572df65030c19af" - integrity sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg== + version "6.0.2" + resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306" + integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ== -pyright@^1.1.304: - version "1.1.304" - resolved "https://registry.yarnpkg.com/pyright/-/pyright-1.1.304.tgz#4871c52120313220a9106ffbe79ff50bfb9f4372" - integrity sha512-b7q53RytKcu/JIzBDfT4po1Uj1eyjXP4wHcWEOXNkWt8+fS8X6lZhRjPe5yzfPvh/2heTKcIEwY+J/VuMobuyw== +pyright@^1.1.309: + version "1.1.309" + resolved "https://registry.yarnpkg.com/pyright/-/pyright-1.1.309.tgz#cb86b73aca53a544877305ef722a06ab204a0436" + integrity sha512-0v65Hmn8BL585D4gLFqot0sJEVK5Nrih/4RtOpHKAowA6I+Je2Pa8mzXbPyiyiAhg7qAoBs7uwQlmM1GU5h1og== q@^1.5.1: version "1.5.1" @@ -7743,11 +7895,11 @@ read-package-json@^5.0.0, read-package-json@^5.0.2: npm-normalize-package-bin "^2.0.0" read-package-json@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.1.tgz#566cb06bc05dbddefba4607e9096d5a9efbcd836" - integrity sha512-AaHqXxfAVa+fNL07x8iAghfKOds/XXsu7zoouIVsbm7PEbQ3nMWXlvjcbrNLjElnUHWQtAo4QEa0RXuvD4XlpA== + version "6.0.3" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.3.tgz#726116b75e00eac2075240995f05681af4ca7122" + integrity sha512-4QbpReW4kxFgeBQ0vPAqh2y8sXEB3D4t3jsXbJKIhBiF80KT6XRo45reqwtftju5J6ru1ax06A2Gb/wM1qCOEQ== dependencies: - glob "^9.3.0" + glob "^10.2.2" json-parse-even-better-errors "^3.0.0" normalize-package-data "^5.0.0" npm-normalize-package-bin "^3.0.0" @@ -7805,9 +7957,9 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stre util-deprecate "^1.0.1" readable-stream@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.3.0.tgz#0914d0c72db03b316c9733bb3461d64a3cc50cba" - integrity sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ== + version "4.4.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.4.0.tgz#55ce132d60a988c460d75c631e9ccf6a7229b468" + integrity sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg== dependencies: abort-controller "^3.0.0" buffer "^6.0.3" @@ -7964,6 +8116,13 @@ rimraf@^4.4.1: dependencies: glob "^9.2.0" +run-applescript@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c" + integrity sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg== + dependencies: + execa "^5.0.0" + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -7984,9 +8143,9 @@ rxjs@^6.6.0: tslib "^1.9.0" rxjs@^7.2.0, rxjs@^7.5.5: - version "7.8.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" - integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0" @@ -8019,7 +8178,7 @@ safe-stable-stringify@^2.2.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -schema-utils@^3.1.0, schema-utils@^3.1.1: +schema-utils@^3.1.1, schema-utils@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99" integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg== @@ -8059,10 +8218,10 @@ semver@^6.0.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.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0: - version "7.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0" - integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA== +semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1: + version "7.5.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" + integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== dependencies: lru-cache "^6.0.0" @@ -8120,14 +8279,14 @@ signal-exit@3.0.7, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== signal-exit@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.1.tgz#96a61033896120ec9335d96851d902cc98f0ba2a" - integrity sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967" + integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q== -sigstore@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.3.0.tgz#cfcb636ff5ef3df1dafb34552ef1ee5e72be1a83" - integrity sha512-dhdv+jOAi1RgLHw13lxumk3rlgZtumUz9QrCNPTx9MazUnUV3BfAb74oYAMPQQ7uaeogB5vTosbz3POzKbEHUQ== +sigstore@^1.0.0, sigstore@^1.3.0, sigstore@^1.4.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.5.2.tgz#8d4c2a549341211cb08c687999843edc48c1a94c" + integrity sha512-X95v6xAAooVpn7PaB94TDmFeSO5SBfCtB1R23fvzr36WTfjtkiiyOeei979nbTjc8nzh6FSLeltQZuODsm1EjQ== dependencies: "@sigstore/protobuf-specs" "^0.1.0" make-fetch-happen "^11.0.1" @@ -8287,11 +8446,11 @@ ssri@9.0.1, ssri@^9.0.0, ssri@^9.0.1: minipass "^3.1.1" ssri@^10.0.0, ssri@^10.0.1: - version "10.0.3" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.3.tgz#7f83da39058ca1d599d174e9eee4237659710bf4" - integrity sha512-lJtX/BFPI/VEtxZmLfeh7pzisIs6micwZ3eruD3+ds9aPsXKlYpwDS2Q7omD6WC42WO9+bnUSzlMmfv8uK8meg== + version "10.0.4" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6" + integrity sha512-12+IR2CB2C28MMAw0Ncqwj5QbTcs0nGIhgJzYWzDkb21vWmfNI83KS4f3Ci6GI98WreIfG7o9UXp3C0qbpA8nQ== dependencies: - minipass "^4.0.0" + minipass "^5.0.0" stack-utils@^2.0.3: version "2.0.6" @@ -8349,7 +8508,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -8358,6 +8517,15 @@ string-length@^4.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + string.prototype.repeat@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf" @@ -8414,13 +8582,20 @@ stringify-package@^1.0.1: resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85" integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg== -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" +strip-ansi@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== + dependencies: + ansi-regex "^6.0.1" + strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -8436,6 +8611,11 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-final-newline@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" + integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== + strip-indent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" @@ -8527,14 +8707,14 @@ tar@6.1.11: mkdirp "^1.0.3" yallist "^4.0.0" -tar@^6.1.0, tar@^6.1.11, tar@^6.1.13, tar@^6.1.2: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== +tar@^6.1.0, tar@^6.1.11, tar@^6.1.15, tar@^6.1.2: + version "6.1.15" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" + integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -8561,20 +8741,20 @@ tempy@1.0.0: unique-string "^2.0.0" terser-webpack-plugin@^5.3.7: - version "5.3.7" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7" - integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw== + version "5.3.8" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.8.tgz#415e03d2508f7de63d59eca85c5d102838f06610" + integrity sha512-WiHL3ElchZMsK27P8uIUh4604IgJyAW47LVXGbEoB21DbQcZ+OuMpGjVYnEUaqcWM6dO8uS2qUbA7LSCWqvsbg== dependencies: "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" serialize-javascript "^6.0.1" - terser "^5.16.5" + terser "^5.16.8" -terser@^5.16.5: - version "5.17.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69" - integrity sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw== +terser@^5.16.8: + version "5.17.4" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.4.tgz#b0c2d94897dfeba43213ed5f90ed117270a2c696" + integrity sha512-jcEKZw6UPrgugz/0Tuk/PVyLAPfMBJf5clnGueo45wTweoV8yh7Q7PEkhkJ5uuUbC7zAxEcG3tqNr1bstkQ8nw== dependencies: "@jridgewell/source-map" "^0.3.2" acorn "^8.5.0" @@ -8620,19 +8800,16 @@ through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6: resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== -tiny-glob@^0.2.9: - version "0.2.9" - resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2" - integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg== - dependencies: - globalyzer "0.1.0" - globrex "^0.1.2" - tiny-relative-date@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07" integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A== +titleize@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53" + integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ== + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -8740,12 +8917,13 @@ tsutils@^3.21.0: tslib "^1.8.1" tuf-js@^1.1.3: - version "1.1.4" - resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.4.tgz#e85a936b16859c7fae23e5f040bc0f7b559b3192" - integrity sha512-Lw2JRM3HTYhEtQJM2Th3aNCPbnXirtWMl065BawwmM2pX6XStH/ZO9e8T2hh0zk/HUa+1i6j+Lv6eDitKTau6A== + version "1.1.6" + resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.6.tgz#ad3e7a20237b83b51c2a8f9d1ddf093279a10fc2" + integrity sha512-CXwFVIsXGbVY4vFiWF7TJKWmlKJAT8TWkH4RmiohJRcDJInix++F0dznDmoVbtJNzZ8yLprKUG4YrDIhv3nBMg== dependencies: - "@tufjs/models" "1.0.3" - make-fetch-happen "^11.0.1" + "@tufjs/models" "1.0.4" + debug "^4.3.4" + make-fetch-happen "^11.1.0" type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" @@ -8902,6 +9080,11 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== +untildify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" + integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== + upath@2.0.1, upath@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" @@ -9024,17 +9207,17 @@ webidl-conversions@^3.0.0: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webpack-cli@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a" - integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A== +webpack-cli@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.1.tgz#c211ac6d911e77c512978f7132f0d735d4a97ace" + integrity sha512-OLJwVMoXnXYH2ncNGU8gxVpUtm3ybvdioiTvHgUyBuyMLKiVvWy+QObzBsMtp5pH7qQoEuWgeEUQ/sU3ZJFzAw== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.0.1" + "@webpack-cli/configtest" "^2.1.0" "@webpack-cli/info" "^2.0.1" - "@webpack-cli/serve" "^2.0.1" + "@webpack-cli/serve" "^2.0.4" colorette "^2.0.14" - commander "^9.4.1" + commander "^10.0.1" cross-spawn "^7.0.3" envinfo "^7.7.3" fastest-levenshtein "^1.0.12" @@ -9056,21 +9239,21 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.79.0: - version "5.79.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.79.0.tgz#8552b5da5a26e4e25842c08a883e08fc7740547a" - integrity sha512-3mN4rR2Xq+INd6NnYuL9RC9GAmc1ROPKJoHhrZ4pAjdMFEkJJWrsPw8o2JjCIyQyTu7rTXYn4VG6OpyB3CobZg== +webpack@^5.82.1: + version "5.82.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.82.1.tgz#8f38c78e53467556e8a89054ebd3ef6e9f67dbab" + integrity sha512-C6uiGQJ+Gt4RyHXXYt+v9f+SN1v83x68URwgxNQ98cvH8kxiuywWGP4XeNZ1paOzZ63aY3cTciCEQJNFUljlLw== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" + "@webassemblyjs/ast" "^1.11.5" + "@webassemblyjs/wasm-edit" "^1.11.5" + "@webassemblyjs/wasm-parser" "^1.11.5" acorn "^8.7.1" acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" + enhanced-resolve "^5.14.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" @@ -9080,7 +9263,7 @@ webpack@^5.79.0: loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.0" + schema-utils "^3.1.2" tapable "^2.1.1" terser-webpack-plugin "^5.3.7" watchpack "^2.4.0" @@ -9106,9 +9289,9 @@ which-boxed-primitive@^1.0.2: is-symbol "^1.0.3" which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== + version "2.0.1" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" + integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== which-typed-array@^1.1.9: version "1.1.9" @@ -9130,9 +9313,9 @@ which@^2.0.1, which@^2.0.2: isexe "^2.0.0" which@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/which/-/which-3.0.0.tgz#a9efd016db59728758a390d23f1687b6e8f59f8e" - integrity sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ== + version "3.0.1" + resolved "https://registry.yarnpkg.com/which/-/which-3.0.1.tgz#89f1cd0c23f629a8105ffe69b8172791c87b4be1" + integrity sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg== dependencies: isexe "^2.0.0" @@ -9144,9 +9327,9 @@ wide-align@^1.1.5: string-width "^1.0.2 || 2 || 3 || 4" wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" + integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== word-wrap@^1.2.3: version "1.2.3" @@ -9163,6 +9346,15 @@ workerpool@^6.4.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462" integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A== +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -9172,14 +9364,14 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" wrappy@1: version "1.0.2" @@ -9212,12 +9404,12 @@ write-file-atomic@^4.0.0, write-file-atomic@^4.0.1, write-file-atomic@^4.0.2: signal-exit "^3.0.7" write-file-atomic@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.0.tgz#54303f117e109bf3d540261125c8ea5a7320fab0" - integrity sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w== + version "5.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7" + integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== dependencies: imurmurhash "^0.1.4" - signal-exit "^3.0.7" + signal-exit "^4.0.1" write-json-file@^3.2.0: version "3.2.0" @@ -9329,9 +9521,9 @@ yargs@^15.0.1: yargs-parser "^18.1.2" yargs@^17.1.1, yargs@^17.3.1, yargs@^17.6.2: - version "17.7.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" - integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== dependencies: cliui "^8.0.1" escalade "^3.1.1"