Skip to content

Commit de1bc80

Browse files
authored
2 parents cc021d6 + b64c858 commit de1bc80

File tree

38 files changed

+1551
-1298
lines changed

38 files changed

+1551
-1298
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
## [1.112.0](https://github.com/aws/jsii/compare/v1.111.0...v1.112.0) (2025-05-07)
6+
7+
8+
### Bug Fixes
9+
10+
* **jsii-pacmak:** CS0108 <static property> hides inherited member ([#4826](https://github.com/aws/jsii/issues/4826)) ([93e422e](https://github.com/aws/jsii/commit/93e422eedad93763bbac7a8212be8949aa1b632e)), closes [#2373](https://github.com/aws/jsii/issues/2373)
11+
512
## [1.111.0](https://github.com/aws/jsii/compare/v1.110.0...v1.111.0) (2025-04-02)
613

714

gh-pages/requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
mkdocs~=1.6.1
22
mkdocs-awesome-pages-plugin~=2.10.1
3-
mkdocs-material~=9.6.10
3+
mkdocs-material~=9.6.12
44
mkdocs-git-revision-date-plugin~=0.3.2

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
"rejectCycles": true
1313
}
1414
},
15-
"version": "1.111.0",
15+
"version": "1.112.0",
1616
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
1717
}

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@
1919
"@jest/types": "^29.6.3",
2020
"@types/jest": "^29.5.14",
2121
"@types/node": "^18",
22-
"@typescript-eslint/eslint-plugin": "^8.25.0",
23-
"@typescript-eslint/parser": "^8.25.0",
22+
"@typescript-eslint/eslint-plugin": "^8.31.1",
23+
"@typescript-eslint/parser": "^8.31.1",
2424
"all-contributors-cli": "^6.26.1",
25-
"eslint": "^9.21.0",
26-
"eslint-config-prettier": "^10.0.1",
25+
"eslint": "^9.25.1",
26+
"eslint-config-prettier": "^10.1.2",
2727
"eslint-import-resolver-node": "^0.3.9",
28-
"eslint-import-resolver-typescript": "^3.8.3",
28+
"eslint-import-resolver-typescript": "^4.3.4",
2929
"eslint-plugin-import": "2.31.0",
30-
"eslint-plugin-prettier": "^5.2.3",
30+
"eslint-plugin-prettier": "^5.2.6",
3131
"jest": "^29.7.0",
3232
"jest-circus": "^28.1.3",
3333
"jest-config": "^28.1.3",
3434
"jest-expect-message": "^1.1.3",
35-
"lerna": "^8.2.0",
36-
"npm-check-updates": "^17.1.15",
37-
"prettier": "^3.5.2",
35+
"lerna": "^8.2.2",
36+
"npm-check-updates": "^18.0.1",
37+
"prettier": "^3.5.3",
3838
"standard-version": "^9.5.0",
3939
"ts-node": "^10.9.2",
4040
"typescript": "~4.7.4"

packages/@jsii/dotnet-runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"@jsii/runtime": "^0.0.0",
42-
"@types/semver": "^7.5.8",
42+
"@types/semver": "^7.7.0",
4343
"jsii-build-tools": "^0.0.0",
4444
"semver": "^7.7.1"
4545
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
1010
github.com/stretchr/testify v1.10.0
1111
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
12-
golang.org/x/tools v0.31.0
12+
golang.org/x/tools v0.33.0
1313
)
1414

1515
require (
@@ -22,8 +22,8 @@ require (
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
2323
github.com/yuin/goldmark v1.4.13 // indirect
2424
golang.org/x/mod v0.24.0 // indirect
25-
golang.org/x/sync v0.12.0 // indirect
26-
golang.org/x/sys v0.31.0 // indirect
25+
golang.org/x/sync v0.14.0 // indirect
26+
golang.org/x/sys v0.33.0 // indirect
2727
gopkg.in/yaml.v3 v3.0.1 // indirect
2828
)
2929

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
4949
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
5050
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
5151
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
52+
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
53+
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
54+
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
55+
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
5256
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5357
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5458
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -67,6 +71,10 @@ golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
6771
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
6872
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
6973
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
74+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
75+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
76+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
77+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
7078
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
7179
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
7280
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
@@ -83,6 +91,10 @@ golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
8391
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
8492
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
8593
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
94+
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
95+
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
96+
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
97+
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
8698
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8799
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
88100
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/mattn/go-isatty v0.0.20
99
github.com/stretchr/testify v1.10.0
1010
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
11-
golang.org/x/tools v0.31.0
11+
golang.org/x/tools v0.33.0
1212
)
1313

1414
require (
@@ -17,8 +17,8 @@ require (
1717
github.com/pmezard/go-difflib v1.0.0 // indirect
1818
github.com/yuin/goldmark v1.4.13 // indirect
1919
golang.org/x/mod v0.24.0 // indirect
20-
golang.org/x/sync v0.12.0 // indirect
21-
golang.org/x/sys v0.31.0 // indirect
20+
golang.org/x/sync v0.14.0 // indirect
21+
golang.org/x/sys v0.33.0 // indirect
2222
gopkg.in/yaml.v3 v3.0.1 // indirect
2323
)
2424

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
2626
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
2727
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
2828
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
29-
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
30-
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
29+
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
30+
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
3131
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3232
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3333
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3434
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
36-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
35+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
36+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
3737
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
3838
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
39-
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
40-
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
39+
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
40+
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
4141
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
4242
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4343
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

packages/@jsii/kernel/src/kernel.ts

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -740,18 +740,16 @@ export class Kernel {
740740
return;
741741
}
742742

743-
if (!propInfo) {
744-
// We've overriding a property on an object we have NO type information on (probably
745-
// because it's an anonymous object).
746-
// Pretend it's 'prop: any';
747-
//
748-
// FIXME: We could do better type checking during the conversion if JSII clients
749-
// would tell us the intended interface type.
750-
propInfo = {
751-
name: override.property,
752-
type: spec.CANONICAL_ANY,
753-
};
754-
}
743+
// We've overriding a property on an object we have NO type information on (probably
744+
// because it's an anonymous object).
745+
// Pretend it's 'prop: any';
746+
//
747+
// FIXME: We could do better type checking during the conversion if JSII clients
748+
// would tell us the intended interface type.
749+
propInfo ??= {
750+
name: override.property,
751+
type: spec.CANONICAL_ANY,
752+
};
755753

756754
this.#defineOverridenProperty(obj, objref, override, propInfo);
757755
}
@@ -865,23 +863,21 @@ export class Kernel {
865863
return;
866864
}
867865

868-
if (!methodInfo) {
869-
// We've overriding a method on an object we have NO type information on (probably
870-
// because it's an anonymous object).
871-
// Pretend it's an (...args: any[]) => any
872-
methodInfo = {
873-
name: override.method,
874-
returns: { type: spec.CANONICAL_ANY },
875-
parameters: [
876-
{
877-
name: 'args',
878-
type: spec.CANONICAL_ANY,
879-
variadic: true,
880-
},
881-
],
882-
variadic: true,
883-
};
884-
}
866+
// We've overriding a method on an object we have NO type information on (probably
867+
// because it's an anonymous object).
868+
// Pretend it's an (...args: any[]) => any
869+
methodInfo ??= {
870+
name: override.method,
871+
returns: { type: spec.CANONICAL_ANY },
872+
parameters: [
873+
{
874+
name: 'args',
875+
type: spec.CANONICAL_ANY,
876+
variadic: true,
877+
},
878+
],
879+
variadic: true,
880+
};
885881

886882
this.#defineOverridenMethod(obj, objref, override, methodInfo);
887883
}

0 commit comments

Comments
 (0)