From ad6ccbd43b0cb6efd47d8bbddbfbf5cbfc56ea5e Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Wed, 8 Oct 2025 15:07:25 +0200 Subject: [PATCH 1/7] chore: add a temporary class using type intersections The presence of this class will validate that type intersections pass through our build pipeline properly. The class will be removed again once we've made sure that everything works. --- package.json | 2 +- packages/aws-cdk-lib/core/lib/index.ts | 2 ++ .../core/lib/test-intersections.ts | 31 +++++++++++++++++++ tools/@aws-cdk/cdk-build-tools/package.json | 2 +- yarn.lock | 22 ++++++------- 5 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 packages/aws-cdk-lib/core/lib/test-intersections.ts diff --git a/package.json b/package.json index 30f530ea1b0aa..9f7c4db7be1ba 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@types/prettier": "2.6.0", "@yarnpkg/lockfile": "^1.1.0", "aws-sdk-js-codemod": "^2.4.5", - "cdk-generate-synthetic-examples": "^0.2.29", + "cdk-generate-synthetic-examples": "^0.2.31", "conventional-changelog-cli": "^2.2.2", "fs-extra": "^9.1.0", "graceful-fs": "^4.2.11", diff --git a/packages/aws-cdk-lib/core/lib/index.ts b/packages/aws-cdk-lib/core/lib/index.ts index 2d6110b2896ea..da93245a50b5e 100644 --- a/packages/aws-cdk-lib/core/lib/index.ts +++ b/packages/aws-cdk-lib/core/lib/index.ts @@ -74,3 +74,5 @@ export * from './validation'; export * from './private/intrinsic'; export * from './names'; export * from './time-zone'; + +export * from './test-intersections'; diff --git a/packages/aws-cdk-lib/core/lib/test-intersections.ts b/packages/aws-cdk-lib/core/lib/test-intersections.ts new file mode 100644 index 0000000000000..4956c3819dd3a --- /dev/null +++ b/packages/aws-cdk-lib/core/lib/test-intersections.ts @@ -0,0 +1,31 @@ +import { IAspect } from './aspect'; +import { IReusableStackSynthesizer } from './stack-synthesizers'; + +/** + * Props for the TestIntersections class + * + * @experimental + */ +export interface TestIntersectionProps { + /** + * This input doesn't make any sense -- don't implement it! + */ + readonly field: IAspect & IReusableStackSynthesizer; +} + +/** + * A class that purely exists to demonstrate that type intersections pass through the entire release pipeline + * + * This class will disappear again in the future; do not use it. + * + * @experimental + */ +export class TestIntersections { + constructor(props: TestIntersectionProps) { + void props; + } + + public takeIntersection(field: IAspect & IReusableStackSynthesizer) { + void field; + } +} diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index 304a1bcfac205..e08e450dca354 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -62,7 +62,7 @@ "jest": "^29.7.0", "jest-junit": "^13.2.0", "jsii": "~5.9.6", - "jsii-rosetta": "~5.9.7", + "jsii-rosetta": "~5.9.8", "jsii-pacmak": "1.115.0", "jsii-reflect": "1.115.0", "markdownlint-cli": "^0.45.0", diff --git a/yarn.lock b/yarn.lock index 4b37551915e90..98def0d8b91d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6427,13 +6427,13 @@ case@1.6.3, case@^1.6.3: resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdk-generate-synthetic-examples@^0.2.29: - version "0.2.29" - resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.2.29.tgz#5dae1ec8f43b6797259e081eb6c6aa69e16158cd" - integrity sha512-JP3/2wL0drTcQLgoEJeewWCneBYEcOWmLtwPvvScvXNt3lRApOfhBGcqplM7w/YS2pgKAzort2w2tSzFBTmlzA== +cdk-generate-synthetic-examples@^0.2.31: + version "0.2.31" + resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.2.31.tgz#49601b41adf5466b0a2445a3a2aac0a5fcbc35cd" + integrity sha512-v3qE/R3M4xnVsnTD7Lp4umAgtMEAZ6MEJCxrtpxZx/5aePsU70n2ctnw2+sByxNrSjjT7Ml6tytCnrNVpo0Y+g== dependencies: - "@jsii/spec" "^1.113.0" - jsii-reflect "^1.113.0" + "@jsii/spec" "^1.114.1" + jsii-reflect "^1.114.1" yargs "^17.7.2" cdk8s-plus-27@2.9.5: @@ -10133,7 +10133,7 @@ jsii-reflect@1.113.0, jsii-reflect@^1.113.0: oo-ascii-tree "^1.113.0" yargs "^16.2.0" -jsii-reflect@1.115.0, jsii-reflect@^1.115.0: +jsii-reflect@1.115.0, jsii-reflect@^1.114.1, jsii-reflect@^1.115.0: version "1.115.0" resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.115.0.tgz#debe523fa2de0ba020d54d41a2f7b0e0bc8ef048" integrity sha512-svWvulZ8IH035sLR0aEt3UiN4Ejqh99zSBfVTFsr3bjBfDZqcxIlExFI/fMb7O+a7XwT0WdTakTuX/aajQt3cg== @@ -10145,10 +10145,10 @@ jsii-reflect@1.115.0, jsii-reflect@^1.115.0: oo-ascii-tree "^1.115.0" yargs "^17.7.2" -jsii-rosetta@~5.9.7: - version "5.9.7" - resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.9.7.tgz#b0ae7aa3dbefb6410b963b480b0b0ce93f89853b" - integrity sha512-OQbKI0Q1aOAbJ8vR1I+/Jv3cqZisgBBEm0DwSxrRfEeNd67UOYIcsHM0nefsV48R/FZAKIGEGxZYlix9jgAl8Q== +jsii-rosetta@~5.9.8: + version "5.9.8" + resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.9.8.tgz#dbe2bb9ea89b4793e3ff8f5c3fea7fcbb93a1bba" + integrity sha512-QpCE+5CmYPidfgtDztlFeYcfr2LuTYh3o9H58qhtFHHtTxY3PaRDxZGB4LwcuO6lRnz1a9INlgE2O6AafffReg== dependencies: "@jsii/check-node" "1.114.1" "@jsii/spec" "^1.114.1" From 240109a428352558834c11ab44a6b69e5ae7170e Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Wed, 8 Oct 2025 16:11:05 +0200 Subject: [PATCH 2/7] Support features in awslint --- package.json | 6 +- packages/awslint/bin/awslint.ts | 5 +- packages/awslint/package.json | 2 +- tools/@aws-cdk/cdk-build-tools/package.json | 2 +- yarn.lock | 77 +++------------------ 5 files changed, 18 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index 9f7c4db7be1ba..0d33d2dad5751 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "fs-extra": "^9.1.0", "graceful-fs": "^4.2.11", "jest-junit": "^13.2.0", - "jsii-diff": "1.113.0", - "jsii-pacmak": "1.113.0", - "jsii-reflect": "1.113.0", + "jsii-diff": "1.115.0", + "jsii-pacmak": "1.115.0", + "jsii-reflect": "1.115.0", "lerna": "^8.2.4", "nx": "^20", "semver": "^7.7.2", diff --git a/packages/awslint/bin/awslint.ts b/packages/awslint/bin/awslint.ts index 2f6e71da6c532..6117ca262b3dc 100644 --- a/packages/awslint/bin/awslint.ts +++ b/packages/awslint/bin/awslint.ts @@ -2,12 +2,15 @@ /* eslint-disable no-console */ import * as child_process from 'child_process'; import * as path from 'path'; +import { JsiiFeature } from '@jsii/spec'; import * as chalk from 'chalk'; import * as fs from 'fs-extra'; import * as reflect from 'jsii-reflect'; import * as yargs from 'yargs'; import { ALL_RULES_LINTER, DiagnosticLevel, RuleFilterSet } from '../lib'; +const FEATURES: JsiiFeature[] = ['class-covariant-overrides', 'intersection-types']; + let stackTrace = false; async function main() { @@ -247,7 +250,7 @@ main().catch(e => { async function loadModule(dir: string) { const ts = new reflect.TypeSystem(); - await ts.load(dir, { validate: false }); // Don't validate to save 66% of execution time (20s vs 1min). + await ts.load(dir, { validate: false, supportedFeatures: FEATURES }); // Don't validate to save 66% of execution time (20s vs 1min). // We run 'awslint' during build time, assemblies are guaranteed to be ok. // We won't load any more assemblies. Lock the typesystem to benefit from performance improvements. diff --git a/packages/awslint/package.json b/packages/awslint/package.json index 2d9b089c5ae4b..5389296fb819e 100644 --- a/packages/awslint/package.json +++ b/packages/awslint/package.json @@ -18,7 +18,7 @@ "awslint": "bin/awslint" }, "dependencies": { - "@jsii/spec": "1.113.0", + "@jsii/spec": "1.115.0", "chalk": "^4", "fs-extra": "^9.1.0", "jsii-reflect": "1.115.0", diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index e08e450dca354..736abda79daf8 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -61,7 +61,7 @@ "glob": "^7.2.3", "jest": "^29.7.0", "jest-junit": "^13.2.0", - "jsii": "~5.9.6", + "jsii": "~5.9.7", "jsii-rosetta": "~5.9.8", "jsii-pacmak": "1.115.0", "jsii-reflect": "1.115.0", diff --git a/yarn.lock b/yarn.lock index 98def0d8b91d4..6d1d8d9d9b37c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3494,14 +3494,6 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jsii/check-node@1.113.0": - version "1.113.0" - resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.113.0.tgz#13075880ea626ba8738ee3a220fa6d83fe710091" - integrity sha512-6iPLiQiSVn8/D89ycIpj78cMfmxOIU/F9RUTVYwLqKPw4cxpR+BCC4N83WKyGkZxhOxULLa9f5q+rkWq/vAMpA== - dependencies: - chalk "^4.1.2" - semver "^7.7.2" - "@jsii/check-node@1.114.1": version "1.114.1" resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.114.1.tgz#9ff05988721cdee3d295b80a131e10e449e0571d" @@ -3518,13 +3510,6 @@ chalk "^4.1.2" semver "^7.7.2" -"@jsii/spec@1.113.0", "@jsii/spec@^1.113.0": - version "1.113.0" - resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.113.0.tgz#cc9960a69c285466088c370f8e47d07c5ae73fb4" - integrity sha512-OAQNfJHzMmE42ySJpelOFFKCgnh6hxcKLnmgtaYEzsFW9UxH9gc945FFOXff52GbhUcigGElCqJ3MclrbgXoGw== - dependencies: - ajv "^8.17.1" - "@jsii/spec@1.114.1": version "1.114.1" resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.114.1.tgz#9c064d57f062d913bcfda25b5496bdf4c9c95c46" @@ -6654,15 +6639,6 @@ code-block-writer@^13.0.3: resolved "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.3.tgz#90f8a84763a5012da7af61319dd638655ae90b5b" integrity sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg== -codemaker@^1.113.0: - version "1.113.0" - resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.113.0.tgz#38777d3024bc6d2d4b53daad06d925827237c442" - integrity sha512-eMmKlM79z0QfXHHG8GV6YCrCVz14LIX+Jxxthj4dz8aq5iKvXu/p1oikd7oQj6JDSYfGoBoCXsYjjqJOMDohZw== - dependencies: - camelcase "^6.3.0" - decamelize "^5.0.1" - fs-extra "^10.1.0" - codemaker@^1.115.0: version "1.115.0" resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.115.0.tgz#dddae7c6e84c74e9ff524cfd05d730c6218dfb46" @@ -10073,35 +10049,17 @@ jsesc@^3.0.2: resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== -jsii-diff@1.113.0: - version "1.113.0" - resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.113.0.tgz#fe326ce10b7c9f95f157dc8ad8b75eda95a344b0" - integrity sha512-EV3ZdnET6FdbNrdIGmwjC7WTLOxalzOhQDFWkV5/F2dF8ffMSdFKyQxKuHYLBBOFGYn9LHOJZ4W/VvhuDymSEA== +jsii-diff@1.115.0: + version "1.115.0" + resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.115.0.tgz#599c0ed85d14c66ad1537191db6b73249af5671a" + integrity sha512-+ZSysk1J5bNdPlbSV76B2hIoUo1tnI6sHJZhbexX1sEvrNgXETwMA1/AKKn/V/hz09N8WYcs0DH4nWElg/7Efw== dependencies: - "@jsii/check-node" "1.113.0" - "@jsii/spec" "^1.113.0" + "@jsii/check-node" "1.115.0" + "@jsii/spec" "1.115.0" fs-extra "^10.1.0" - jsii-reflect "^1.113.0" + jsii-reflect "^1.115.0" log4js "^6.9.1" - yargs "^16.2.0" - -jsii-pacmak@1.113.0: - version "1.113.0" - resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.113.0.tgz#98a70008546a63e73e68a0a2deabbc8b5c4b6aa4" - integrity sha512-DeXAWq0v7khODfWxdYXLLmaXP+sC6Lf3Y9/vCrx6/yHoDRw1tnJs07VXjU3e3Gjv1nQxCdzWwnns304o9AjZKQ== - dependencies: - "@jsii/check-node" "1.113.0" - "@jsii/spec" "^1.113.0" - clone "^2.1.2" - codemaker "^1.113.0" - commonmark "^0.31.2" - escape-string-regexp "^4.0.0" - fs-extra "^10.1.0" - jsii-reflect "^1.113.0" - semver "^7.7.2" - spdx-license-list "^6.10.0" - xmlbuilder "^15.1.1" - yargs "^16.2.0" + yargs "^17.7.2" jsii-pacmak@1.115.0: version "1.115.0" @@ -10121,18 +10079,6 @@ jsii-pacmak@1.115.0: xmlbuilder "^15.1.1" yargs "^17.7.2" -jsii-reflect@1.113.0, jsii-reflect@^1.113.0: - version "1.113.0" - resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.113.0.tgz#35f6e2c9e285710edbebeb4c405b8c1fde0e9cba" - integrity sha512-YS0ewXfjFGTuvp8Rrd40yhPc9yYIoF2zMu8xZpWbdwCtgBabAfzra5mwNPeLBWvR4qI4PHE+A2qEGarx3Tufnw== - dependencies: - "@jsii/check-node" "1.113.0" - "@jsii/spec" "^1.113.0" - chalk "^4" - fs-extra "^10.1.0" - oo-ascii-tree "^1.113.0" - yargs "^16.2.0" - jsii-reflect@1.115.0, jsii-reflect@^1.114.1, jsii-reflect@^1.115.0: version "1.115.0" resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.115.0.tgz#debe523fa2de0ba020d54d41a2f7b0e0bc8ef048" @@ -10164,7 +10110,7 @@ jsii-rosetta@~5.9.8: workerpool "^6.5.1" yargs "^17.7.2" -jsii@~5.9.1, jsii@~5.9.6: +jsii@~5.9.1, jsii@~5.9.7: version "5.9.7" resolved "https://registry.npmjs.org/jsii/-/jsii-5.9.7.tgz#26be467316e6ae2034ccd1f5f9f7559b05c731d3" integrity sha512-ozdEz7gF5uxlYvC+Ze8IkcpQI6svLvusqNSfhl7l5nzi1gYdPedzEQp0Vl8M4cSDxkOmgh2Bz3/K/d7HkGM2qQ== @@ -11751,11 +11697,6 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -oo-ascii-tree@^1.113.0: - version "1.113.0" - resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.113.0.tgz#69b40e2b52d812be78141119d3010f62f3d198fe" - integrity sha512-9hGp+3S8qy0MSdBzp5pX2448Iv+w6QyXI6KBVihdt+Sb8nw1MxNu6ErMadTAXmyfCwZzZoEpn9hybTHEQuSJcQ== - oo-ascii-tree@^1.115.0: version "1.115.0" resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.115.0.tgz#60a28f29cc449cd4274140f5d939c08a18c5ac8b" From 42904906de5791872a2cc633babdb579f580d060 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Wed, 8 Oct 2025 16:26:59 +0200 Subject: [PATCH 3/7] Don't pretend to understand this --- packages/awslint/bin/awslint.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/awslint/bin/awslint.ts b/packages/awslint/bin/awslint.ts index 6117ca262b3dc..639b4f85521fb 100644 --- a/packages/awslint/bin/awslint.ts +++ b/packages/awslint/bin/awslint.ts @@ -9,7 +9,7 @@ import * as reflect from 'jsii-reflect'; import * as yargs from 'yargs'; import { ALL_RULES_LINTER, DiagnosticLevel, RuleFilterSet } from '../lib'; -const FEATURES: JsiiFeature[] = ['class-covariant-overrides', 'intersection-types']; +const FEATURES: JsiiFeature[] = ['intersection-types']; let stackTrace = false; From ce80b61a51275df0b2ec7cae694dbc21841898d1 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Wed, 8 Oct 2025 16:41:47 +0200 Subject: [PATCH 4/7] Silence linter errors --- packages/aws-cdk-lib/awslint.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/aws-cdk-lib/awslint.json b/packages/aws-cdk-lib/awslint.json index f18305cb7b2b0..ecd0cb78d2bdf 100644 --- a/packages/aws-cdk-lib/awslint.json +++ b/packages/aws-cdk-lib/awslint.json @@ -1004,6 +1004,11 @@ "construct-ctor-props-type:aws-cdk-lib.aws_inspector.AssessmentTemplate", "props-physical-name:aws-cdk-lib.aws_inspector.AssessmentTemplateProps", "attribute-tag:aws-cdk-lib.aws_scheduler.Schedule.scheduleGroup", - "docs-public-apis:aws-cdk-lib.aws_scheduler.ContextAttribute.name" + "docs-public-apis:aws-cdk-lib.aws_scheduler.ContextAttribute.name", + "no-experimental-apis:aws-cdk-lib.TestIntersections", + "docs-public-apis:aws-cdk-lib.TestIntersections.takeIntersection", + "no-experimental-apis:aws-cdk-lib.TestIntersections.takeIntersection", + "no-experimental-apis:aws-cdk-lib.TestIntersectionProps", + "no-experimental-apis:aws-cdk-lib.TestIntersectionProps.field" ] } From b056a53c89833b3e6e989aae81556b843ad5d4ce Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Thu, 9 Oct 2025 21:30:11 +0200 Subject: [PATCH 5/7] Upgrade --- package.json | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 0d33d2dad5751..a7bc1b7d22540 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@types/prettier": "2.6.0", "@yarnpkg/lockfile": "^1.1.0", "aws-sdk-js-codemod": "^2.4.5", - "cdk-generate-synthetic-examples": "^0.2.31", + "cdk-generate-synthetic-examples": "^0.2.32", "conventional-changelog-cli": "^2.2.2", "fs-extra": "^9.1.0", "graceful-fs": "^4.2.11", diff --git a/yarn.lock b/yarn.lock index 6d1d8d9d9b37c..20ae9f8248c80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3517,7 +3517,7 @@ dependencies: ajv "^8.17.1" -"@jsii/spec@1.115.0", "@jsii/spec@^1.114.1": +"@jsii/spec@1.115.0", "@jsii/spec@^1.114.1", "@jsii/spec@^1.115.0": version "1.115.0" resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.115.0.tgz#be0818bd31509687cb6445873d1ec65e8d24bd24" integrity sha512-qnicuByM0G5L6ZF2yO/e5cHwT6pb5E0aUvgHBycFPHBkgf5yjtvm+Wtk6q61srNuRASYI25BiTOonyABNeRjlw== @@ -6412,13 +6412,13 @@ case@1.6.3, case@^1.6.3: resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdk-generate-synthetic-examples@^0.2.31: - version "0.2.31" - resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.2.31.tgz#49601b41adf5466b0a2445a3a2aac0a5fcbc35cd" - integrity sha512-v3qE/R3M4xnVsnTD7Lp4umAgtMEAZ6MEJCxrtpxZx/5aePsU70n2ctnw2+sByxNrSjjT7Ml6tytCnrNVpo0Y+g== +cdk-generate-synthetic-examples@^0.2.32: + version "0.2.32" + resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.2.32.tgz#e79900e3b1f6ecc7fdb5141086561eb847fd9184" + integrity sha512-Uj7s8dHNv2xUM3E9iLMeSaNwWp1oJ3PmW3fZQ3wlyhUoAielOJP2eH3aMsY81FNy7vJa5KxvGZjWHi101stuWQ== dependencies: - "@jsii/spec" "^1.114.1" - jsii-reflect "^1.114.1" + "@jsii/spec" "^1.115.0" + jsii-reflect "^1.115.0" yargs "^17.7.2" cdk8s-plus-27@2.9.5: @@ -10079,7 +10079,7 @@ jsii-pacmak@1.115.0: xmlbuilder "^15.1.1" yargs "^17.7.2" -jsii-reflect@1.115.0, jsii-reflect@^1.114.1, jsii-reflect@^1.115.0: +jsii-reflect@1.115.0, jsii-reflect@^1.115.0: version "1.115.0" resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.115.0.tgz#debe523fa2de0ba020d54d41a2f7b0e0bc8ef048" integrity sha512-svWvulZ8IH035sLR0aEt3UiN4Ejqh99zSBfVTFsr3bjBfDZqcxIlExFI/fMb7O+a7XwT0WdTakTuX/aajQt3cg== From 1265b3d5cbd1a3113e66a21a3df241db21752be9 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Fri, 10 Oct 2025 10:38:28 +0200 Subject: [PATCH 6/7] Wut --- scripts/run-rosetta.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-rosetta.sh b/scripts/run-rosetta.sh index d5d8c8b32a2b3..1b6d83d3f21d9 100755 --- a/scripts/run-rosetta.sh +++ b/scripts/run-rosetta.sh @@ -73,7 +73,7 @@ time $ROSETTA extract \ if $infuse; then echo "💎 Generating synthetic examples for the remainder" >&2 - time npx cdk-generate-synthetic-examples@^0.1.292 \ + time npx cdk-generate-synthetic-examples \ $(cat $jsii_pkgs_file) time $ROSETTA extract \ From 75e041c313b1be8c35df59a9bf7ccb5a54ede1e7 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Tue, 14 Oct 2025 15:25:34 +0200 Subject: [PATCH 7/7] Upgrade jsii some more --- package.json | 6 +- tools/@aws-cdk/cdk-build-tools/package.json | 4 +- yarn.lock | 70 +++++++++++++++------ 3 files changed, 56 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index a7bc1b7d22540..38f917194dc39 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "fs-extra": "^9.1.0", "graceful-fs": "^4.2.11", "jest-junit": "^13.2.0", - "jsii-diff": "1.115.0", - "jsii-pacmak": "1.115.0", - "jsii-reflect": "1.115.0", + "jsii-diff": "1.116.0", + "jsii-pacmak": "1.116.0", + "jsii-reflect": "1.116.0", "lerna": "^8.2.4", "nx": "^20", "semver": "^7.7.2", diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index 736abda79daf8..212706a911445 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -63,8 +63,8 @@ "jest-junit": "^13.2.0", "jsii": "~5.9.7", "jsii-rosetta": "~5.9.8", - "jsii-pacmak": "1.115.0", - "jsii-reflect": "1.115.0", + "jsii-pacmak": "1.116.0", + "jsii-reflect": "1.116.0", "markdownlint-cli": "^0.45.0", "nyc": "^15.1.0", "semver": "^7.7.2", diff --git a/yarn.lock b/yarn.lock index 20ae9f8248c80..0c69cd681a77d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3510,6 +3510,14 @@ chalk "^4.1.2" semver "^7.7.2" +"@jsii/check-node@1.116.0": + version "1.116.0" + resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.116.0.tgz#f4db6461511f60232aa02bfaf46bd607da49bbae" + integrity sha512-Avk6AKggZJcWpDLGH8lb5duyfGIVHCmmeglM3LfmQvKU/zumbRfeg4LvUXGqJflnRB7GAbzbx8iDNo8FMjIWjg== + dependencies: + chalk "^4.1.2" + semver "^7.7.2" + "@jsii/spec@1.114.1": version "1.114.1" resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.114.1.tgz#9c064d57f062d913bcfda25b5496bdf4c9c95c46" @@ -3524,6 +3532,13 @@ dependencies: ajv "^8.17.1" +"@jsii/spec@1.116.0": + version "1.116.0" + resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.116.0.tgz#8da502da897f15b46ac969033cea5cbee4738f43" + integrity sha512-BqsOMsE7Md6EwaLammXeCOi20GlsA4lAawIrPN0jHeFjZnEqUsiWRXZw+9EG3lTImW9QLVN1cF9kbQ3t3vAXeQ== + dependencies: + ajv "^8.17.1" + "@lerna/create@8.2.4": version "8.2.4" resolved "https://registry.npmjs.org/@lerna/create/-/create-8.2.4.tgz#59a050f58681e9236db38cc5bcc6986ae79d1389" @@ -6639,10 +6654,10 @@ code-block-writer@^13.0.3: resolved "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.3.tgz#90f8a84763a5012da7af61319dd638655ae90b5b" integrity sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg== -codemaker@^1.115.0: - version "1.115.0" - resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.115.0.tgz#dddae7c6e84c74e9ff524cfd05d730c6218dfb46" - integrity sha512-OYTghD9XRaXzjByMXEljGeF5Ci9zZnq90O3GEfkMn4nGWyp7IXHOq4by6IiR2ByJSywTcnoQg0NQnDZUgj/YfA== +codemaker@^1.116.0: + version "1.116.0" + resolved "https://registry.npmjs.org/codemaker/-/codemaker-1.116.0.tgz#1fccbcb720f987ac3d21b0fb92ad6e749eedb6b3" + integrity sha512-o23BKz+Y0Yam/czEbe3UAXVqSY4HFKgUYTffx3YW6yPtAVSX0d50BgIU0RxCUGIWmFD9Go3tXqraRDpo7TxMLg== dependencies: camelcase "^6.3.0" decamelize "^5.0.1" @@ -10049,31 +10064,31 @@ jsesc@^3.0.2: resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== -jsii-diff@1.115.0: - version "1.115.0" - resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.115.0.tgz#599c0ed85d14c66ad1537191db6b73249af5671a" - integrity sha512-+ZSysk1J5bNdPlbSV76B2hIoUo1tnI6sHJZhbexX1sEvrNgXETwMA1/AKKn/V/hz09N8WYcs0DH4nWElg/7Efw== +jsii-diff@1.116.0: + version "1.116.0" + resolved "https://registry.npmjs.org/jsii-diff/-/jsii-diff-1.116.0.tgz#0445d7492e42f7b27c7c7e08703181a3cbcca5cf" + integrity sha512-6t7MJe9gWo/vnkQrHNLlOdOO7ZRnqqGoC2uk8M1C2Gc/Yc8mBuyQhF9Fj0+hPmChURI5cqHsFatFce9P79fS0Q== dependencies: - "@jsii/check-node" "1.115.0" - "@jsii/spec" "1.115.0" + "@jsii/check-node" "1.116.0" + "@jsii/spec" "1.116.0" fs-extra "^10.1.0" - jsii-reflect "^1.115.0" + jsii-reflect "^1.116.0" log4js "^6.9.1" yargs "^17.7.2" -jsii-pacmak@1.115.0: - version "1.115.0" - resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.115.0.tgz#f9d2eb38eff5c6de0be2f9727f548e540e296d88" - integrity sha512-YWzF3Km61i0f7e6Qce1VUjUXhlnMllMP4yqNuaGVAYDw5LIJEUf99CYPUbMIVoCZAcoNKNGLJ0PSJCTzB5Bxjw== +jsii-pacmak@1.116.0: + version "1.116.0" + resolved "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.116.0.tgz#c94d0141d56dbd4f3e9c0d6a5234a9a72ab28215" + integrity sha512-X3UQouUnp05/CbtZzORrBIDQBb26ChX6Ms5q3dXxsJyk5/DEJaCkd6pAnU3wiya7Tsrd8K09mSiuseMzxFvs8Q== dependencies: - "@jsii/check-node" "1.115.0" - "@jsii/spec" "1.115.0" + "@jsii/check-node" "1.116.0" + "@jsii/spec" "1.116.0" clone "^2.1.2" - codemaker "^1.115.0" + codemaker "^1.116.0" commonmark "^0.31.2" escape-string-regexp "^4.0.0" fs-extra "^10.1.0" - jsii-reflect "^1.115.0" + jsii-reflect "^1.116.0" semver "^7.7.2" spdx-license-list "^6.10.0" xmlbuilder "^15.1.1" @@ -10091,6 +10106,18 @@ jsii-reflect@1.115.0, jsii-reflect@^1.115.0: oo-ascii-tree "^1.115.0" yargs "^17.7.2" +jsii-reflect@1.116.0, jsii-reflect@^1.116.0: + version "1.116.0" + resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.116.0.tgz#2dda056b311b9b7eed49ac27c45743f64f0057d7" + integrity sha512-ZIHznFUMHQinqNLu48JibrnB0O0EeINCUgtkgV+SqEN7wsM1kxT3SBLHEbCQqPzB5ZsQzrdl9JW1vMi14/YqGA== + dependencies: + "@jsii/check-node" "1.116.0" + "@jsii/spec" "1.116.0" + chalk "^4" + fs-extra "^10.1.0" + oo-ascii-tree "^1.116.0" + yargs "^17.7.2" + jsii-rosetta@~5.9.8: version "5.9.8" resolved "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.9.8.tgz#dbe2bb9ea89b4793e3ff8f5c3fea7fcbb93a1bba" @@ -11702,6 +11729,11 @@ oo-ascii-tree@^1.115.0: resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.115.0.tgz#60a28f29cc449cd4274140f5d939c08a18c5ac8b" integrity sha512-KbZpipKiCQ5Ws2GryfOUWBxuVpVYosqAi85mtplgMyhQuueOZAO8qeTmNqYYHUxBHOz9O+kKCCjidEkLmCDhLQ== +oo-ascii-tree@^1.116.0: + version "1.116.0" + resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.116.0.tgz#2bd95d7de16b842289e01bd83e29f93ea463eaf5" + integrity sha512-GI0n8coDIoZPywmZp5l2qPO1tqZxN40/tFPYBxWD2vpPeciKiB/nxZ7blDjp97ejxtmdkNouvAmtg4nCYgZihg== + open@^8.4.0: version "8.4.2" resolved "https://registry.npmjs.org/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"