Skip to content

Commit d7af9b9

Browse files
authored
chore(release): 1.121.0 (#4996)
See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.121.0/CHANGELOG.md)
2 parents 192dc88 + 135c882 commit d7af9b9

25 files changed

+1659
-721
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
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.121.0](https://github.com/aws/jsii/compare/v1.120.0...v1.121.0) (2025-12-09)
6+
7+
8+
### Features
9+
10+
* **jsii-reflect:** add parent assembly reference to Submodule ([#4992](https://github.com/aws/jsii/issues/4992)) ([1232932](https://github.com/aws/jsii/commit/12329322dc0b13a22f1ae51ac24bdd9e49e5e85b))
11+
* **jsii-reflect:** track directory and package.json for Assembly ([#4991](https://github.com/aws/jsii/issues/4991)) ([3232edf](https://github.com/aws/jsii/commit/3232edf7ffbfa5f6d0c10d07dce2fd4ccba2734f))
12+
13+
14+
### Bug Fixes
15+
16+
* **jsii-pacmak:** compilation fails if a type is named "Object" ([#4990](https://github.com/aws/jsii/issues/4990)) ([6a5fc58](https://github.com/aws/jsii/commit/6a5fc5816bbb5fca6fc8feae5ec2b479630ddfa3))
17+
* **jsii-pacmak:** inheritance between nested types fails ([#4993](https://github.com/aws/jsii/issues/4993)) ([d5009c5](https://github.com/aws/jsii/commit/d5009c5de737909c1890ed6d33af264699e2a1fd))
18+
519
## [1.120.0](https://github.com/aws/jsii/compare/v1.119.0...v1.120.0) (2025-11-24)
620

721

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.120.0",
15+
"version": "1.121.0",
1616
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
1717
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
black~=25.11
2-
mypy==1.18.2
2+
mypy==1.19.0
33
pip~=25.3
44
pytest~=8.4
55
pytest-mypy~=1.0

packages/jsii-calc/lib/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ export * from './stability';
99
export * from './submodules';
1010
export * from './container-types';
1111
export * from './indirect-implementation';
12+
export * from './nested-struct-inheritance';
1213

1314
export * as submodule from './submodule';
1415
export * as onlystatic from './only-static';
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* eslint-disable @typescript-eslint/no-namespace */
2+
export class SomeContainingClass {
3+
public sayHello() {
4+
return 'hello';
5+
}
6+
}
7+
8+
/**
9+
* Check that we can have 2 interfaces in a class namespace inherit from each other
10+
*
11+
* This gave trouble in Python.
12+
*
13+
* Also purposely have the types in the wrong order in the source code to catch potential ordering mistakes.
14+
*/
15+
export namespace SomeContainingClass {
16+
export interface ChildStruct extends ParentStruct {
17+
readonly field2: string;
18+
}
19+
20+
export interface ParentStruct {
21+
readonly field1: string;
22+
}
23+
}

packages/jsii-calc/test/assembly.jsii

Lines changed: 128 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,14 @@
210210
"jsii-calc.anonymous": {
211211
"locationInModule": {
212212
"filename": "lib/index.ts",
213-
"line": 29
213+
"line": 30
214214
},
215215
"symbolId": "lib/anonymous/index:"
216216
},
217217
"jsii-calc.cdk16625": {
218218
"locationInModule": {
219219
"filename": "lib/index.ts",
220-
"line": 24
220+
"line": 25
221221
},
222222
"symbolId": "lib/cdk16625/index:"
223223
},
@@ -231,7 +231,7 @@
231231
"jsii-calc.cdk22369": {
232232
"locationInModule": {
233233
"filename": "lib/index.ts",
234-
"line": 25
234+
"line": 26
235235
},
236236
"symbolId": "lib/cdk22369/index:"
237237
},
@@ -245,7 +245,7 @@
245245
"jsii-calc.covariantOverrides": {
246246
"locationInModule": {
247247
"filename": "lib/index.ts",
248-
"line": 34
248+
"line": 35
249249
},
250250
"symbolId": "lib/covariant-overrides/index:"
251251
},
@@ -259,7 +259,7 @@
259259
"jsii-calc.homonymousForwardReferences": {
260260
"locationInModule": {
261261
"filename": "lib/index.ts",
262-
"line": 32
262+
"line": 33
263263
},
264264
"readme": {
265265
"markdown": "Verifies homonymous forward references don't trip the Python type checker\n\nThis has been an issue when stub functions were introduced to create a reliable source for type checking\ninformation, which was reported in https://github.com/aws/jsii/issues/3818.\n"
@@ -283,49 +283,49 @@
283283
"jsii-calc.intersection": {
284284
"locationInModule": {
285285
"filename": "lib/index.ts",
286-
"line": 31
286+
"line": 32
287287
},
288288
"symbolId": "lib/intersection:"
289289
},
290290
"jsii-calc.jsii3656": {
291291
"locationInModule": {
292292
"filename": "lib/index.ts",
293-
"line": 26
293+
"line": 27
294294
},
295295
"symbolId": "lib/jsii3656/index:"
296296
},
297297
"jsii-calc.jsii4894": {
298298
"locationInModule": {
299299
"filename": "lib/index.ts",
300-
"line": 27
300+
"line": 28
301301
},
302302
"symbolId": "lib/jsii4894:"
303303
},
304304
"jsii-calc.module2530": {
305305
"locationInModule": {
306306
"filename": "lib/index.ts",
307-
"line": 21
307+
"line": 22
308308
},
309309
"symbolId": "lib/module2530/index:"
310310
},
311311
"jsii-calc.module2617": {
312312
"locationInModule": {
313313
"filename": "lib/index.ts",
314-
"line": 17
314+
"line": 18
315315
},
316316
"symbolId": "lib/module2617/index:"
317317
},
318318
"jsii-calc.module2647": {
319319
"locationInModule": {
320320
"filename": "lib/index.ts",
321-
"line": 16
321+
"line": 17
322322
},
323323
"symbolId": "lib/module2647/index:"
324324
},
325325
"jsii-calc.module2689": {
326326
"locationInModule": {
327327
"filename": "lib/index.ts",
328-
"line": 18
328+
"line": 19
329329
},
330330
"symbolId": "lib/module2689/index:"
331331
},
@@ -360,7 +360,7 @@
360360
"jsii-calc.module2692": {
361361
"locationInModule": {
362362
"filename": "lib/index.ts",
363-
"line": 20
363+
"line": 21
364364
},
365365
"symbolId": "lib/module2692/index:"
366366
},
@@ -381,21 +381,21 @@
381381
"jsii-calc.module2700": {
382382
"locationInModule": {
383383
"filename": "lib/index.ts",
384-
"line": 22
384+
"line": 23
385385
},
386386
"symbolId": "lib/module2700/index:"
387387
},
388388
"jsii-calc.module2702": {
389389
"locationInModule": {
390390
"filename": "lib/index.ts",
391-
"line": 19
391+
"line": 20
392392
},
393393
"symbolId": "lib/module2702/index:"
394394
},
395395
"jsii-calc.nodirect": {
396396
"locationInModule": {
397397
"filename": "lib/index.ts",
398-
"line": 15
398+
"line": 16
399399
},
400400
"symbolId": "lib/no-direct-types/index:"
401401
},
@@ -416,21 +416,21 @@
416416
"jsii-calc.onlystatic": {
417417
"locationInModule": {
418418
"filename": "lib/index.ts",
419-
"line": 14
419+
"line": 15
420420
},
421421
"symbolId": "lib/only-static/index:"
422422
},
423423
"jsii-calc.pascalCaseName": {
424424
"locationInModule": {
425425
"filename": "lib/index.ts",
426-
"line": 33
426+
"line": 34
427427
},
428428
"symbolId": "lib/pascal-case-name/index:"
429429
},
430430
"jsii-calc.submodule": {
431431
"locationInModule": {
432432
"filename": "lib/index.ts",
433-
"line": 13
433+
"line": 14
434434
},
435435
"readme": {
436436
"markdown": "Read you, read me\n=================\n\nThis is the readme of the `jsii-calc.submodule` module.\n"
@@ -492,7 +492,7 @@
492492
"jsii-calc.union": {
493493
"locationInModule": {
494494
"filename": "lib/index.ts",
495-
"line": 30
495+
"line": 31
496496
},
497497
"symbolId": "lib/union:"
498498
}
@@ -13214,6 +13214,113 @@
1321413214
],
1321513215
"symbolId": "lib/calculator:SmellyStruct"
1321613216
},
13217+
"jsii-calc.SomeContainingClass": {
13218+
"assembly": "jsii-calc",
13219+
"docs": {
13220+
"remarks": "This gave trouble in Python.\n\nAlso purposely have the types in the wrong order in the source code to catch potential ordering mistakes.",
13221+
"stability": "stable",
13222+
"summary": "Check that we can have 2 interfaces in a class namespace inherit from each other."
13223+
},
13224+
"fqn": "jsii-calc.SomeContainingClass",
13225+
"initializer": {
13226+
"docs": {
13227+
"stability": "stable"
13228+
}
13229+
},
13230+
"kind": "class",
13231+
"locationInModule": {
13232+
"filename": "lib/nested-struct-inheritance.ts",
13233+
"line": 2
13234+
},
13235+
"methods": [
13236+
{
13237+
"docs": {
13238+
"stability": "stable"
13239+
},
13240+
"locationInModule": {
13241+
"filename": "lib/nested-struct-inheritance.ts",
13242+
"line": 3
13243+
},
13244+
"name": "sayHello",
13245+
"returns": {
13246+
"type": {
13247+
"primitive": "string"
13248+
}
13249+
}
13250+
}
13251+
],
13252+
"name": "SomeContainingClass",
13253+
"symbolId": "lib/nested-struct-inheritance:SomeContainingClass"
13254+
},
13255+
"jsii-calc.SomeContainingClass.ChildStruct": {
13256+
"assembly": "jsii-calc",
13257+
"datatype": true,
13258+
"docs": {
13259+
"stability": "stable"
13260+
},
13261+
"fqn": "jsii-calc.SomeContainingClass.ChildStruct",
13262+
"interfaces": [
13263+
"jsii-calc.SomeContainingClass.ParentStruct"
13264+
],
13265+
"kind": "interface",
13266+
"locationInModule": {
13267+
"filename": "lib/nested-struct-inheritance.ts",
13268+
"line": 16
13269+
},
13270+
"name": "ChildStruct",
13271+
"namespace": "SomeContainingClass",
13272+
"properties": [
13273+
{
13274+
"abstract": true,
13275+
"docs": {
13276+
"stability": "stable"
13277+
},
13278+
"immutable": true,
13279+
"locationInModule": {
13280+
"filename": "lib/nested-struct-inheritance.ts",
13281+
"line": 17
13282+
},
13283+
"name": "field2",
13284+
"type": {
13285+
"primitive": "string"
13286+
}
13287+
}
13288+
],
13289+
"symbolId": "lib/nested-struct-inheritance:SomeContainingClass.ChildStruct"
13290+
},
13291+
"jsii-calc.SomeContainingClass.ParentStruct": {
13292+
"assembly": "jsii-calc",
13293+
"datatype": true,
13294+
"docs": {
13295+
"stability": "stable"
13296+
},
13297+
"fqn": "jsii-calc.SomeContainingClass.ParentStruct",
13298+
"kind": "interface",
13299+
"locationInModule": {
13300+
"filename": "lib/nested-struct-inheritance.ts",
13301+
"line": 20
13302+
},
13303+
"name": "ParentStruct",
13304+
"namespace": "SomeContainingClass",
13305+
"properties": [
13306+
{
13307+
"abstract": true,
13308+
"docs": {
13309+
"stability": "stable"
13310+
},
13311+
"immutable": true,
13312+
"locationInModule": {
13313+
"filename": "lib/nested-struct-inheritance.ts",
13314+
"line": 21
13315+
},
13316+
"name": "field1",
13317+
"type": {
13318+
"primitive": "string"
13319+
}
13320+
}
13321+
],
13322+
"symbolId": "lib/nested-struct-inheritance:SomeContainingClass.ParentStruct"
13323+
},
1321713324
"jsii-calc.SomeTypeJsii976": {
1321813325
"assembly": "jsii-calc",
1321913326
"docs": {
@@ -19786,5 +19893,5 @@
1978619893
"intersection-types"
1978719894
],
1978819895
"version": "3.20.120",
19789-
"fingerprint": "6Vy4e6a5fe6HlMnZVVfUxQ6kP2NgQEfEjwgiDHv/Ssw="
19896+
"fingerprint": "TNPI4Pzx1sCoo70P/RA0Nnp1IhHvJVLOQ+IOoracN3k="
1979019897
}

packages/jsii-pacmak/lib/targets/java.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2659,7 +2659,9 @@ class JavaGenerator extends Generator {
26592659

26602660
this.code.line();
26612661
this.code.line('@Override');
2662-
this.code.openBlock('public final boolean equals(final Object o)');
2662+
this.code.openBlock(
2663+
'public final boolean equals(final java.lang.Object o)',
2664+
);
26632665
this.code.line('if (this == o) return true;');
26642666

26652667
// This was already checked by `super.equals(o)`, so we skip it here...

0 commit comments

Comments
 (0)