chore: upgrade typescript to 5.8 (#4871)

mrgrain · web-flow · commit e248df4efc97 · 2025-07-30T12:25:41.000Z
Upgrade typescript version. Some small (type only) code changes were required relating to type inference. Fixes a number of npm warnings I noticed by replacing `npm run <script>` with `yarn <script>` which makes more sense to stay in the same package manager ecosystem. Fixed some jsii warnings in pacmak test packages. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "prettier": "^3.6.2",
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.2",
-    "typescript": "~4.7.4"
+    "typescript": "5.8.x"
   },
   "repository": {
     "type": "git",
@@ -55,8 +55,5 @@
       "**/@fixtures/jsii-calc-bundled/**",
       "**/typescript"
     ]
-  },
-  "resolutions": {
-    "@types/yargs": "17.0.19"
   }
 }
diff --git a/packages/@jsii/check-node/package.json b/packages/@jsii/check-node/package.json
@@ -27,7 +27,7 @@
     "./run": "./lib/run.js"
   },
   "scripts": {
-    "build": "tsc --build && npm run lint",
+    "build": "tsc --build && yarn lint",
     "watch": "tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json
@@ -25,9 +25,9 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "gen": "bash ./generate.sh",
-    "build": "npm run gen && tsc --build && bash ./build.sh",
+    "build": "yarn gen && tsc --build && bash ./build.sh",
     "test": "bash ./test.sh",
-    "test:update": "UPDATE_DIFF=1 npm run test"
+    "test:update": "UPDATE_DIFF=1 yarn test"
   },
   "devDependencies": {
     "@jsii/dotnet-runtime": "^0.0.0",
diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json
@@ -31,10 +31,10 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "gen": "bash ./generate.sh",
-    "build": "npm run gen && tsc --build && dotnet build --force -c Release src/Amazon.JSII.Runtime.sln",
+    "build": "yarn gen && tsc --build && dotnet build --force -c Release src/Amazon.JSII.Runtime.sln",
     "dist-clean": "rm -rf dist && dotnet clean -c Release src/Amazon.JSII.Runtime.sln",
     "test": "dotnet test -c Release src/Amazon.JSII.Runtime.sln",
-    "test:update": "UPDATE_DIFF=1 npm run test",
+    "test:update": "UPDATE_DIFF=1 yarn test",
     "package": "package-dotnet src/Amazon.JSII.Runtime.sln && package-private"
   },
   "devDependencies": {
diff --git a/packages/@jsii/go-runtime-test/build-tools/gen-calc.ts b/packages/@jsii/go-runtime-test/build-tools/gen-calc.ts
@@ -9,9 +9,8 @@ const genRoot = join(__dirname, '..', 'jsii-calc');
 
 removeSync(genRoot);
 runCommand(
-  'npx',
+  'node_modules/.bin/jsii-pacmak',
   [
-    'jsii-pacmak',
     '-t',
     'go',
     '-v',
diff --git a/packages/@jsii/go-runtime/package.json b/packages/@jsii/go-runtime/package.json
@@ -5,9 +5,9 @@
   "description": "",
   "main": "lib/index.js",
   "scripts": {
-    "build": "tsc --build && npm run gen:rt",
+    "build": "tsc --build && yarn gen:rt",
     "gen:rt": "node build-tools/gen.js",
-    "generate": "npm run gen:rt",
+    "generate": "yarn gen:rt",
     "package": "build-tools/package.sh && package-private",
     "doc": "cd jsii-runtime-go && go run golang.org/x/tools/cmd/godoc",
     "fmt": "cd jsii-runtime-go && go run golang.org/x/tools/cmd/goimports -w .",
diff --git a/packages/@jsii/java-runtime-test/package.json b/packages/@jsii/java-runtime-test/package.json
@@ -25,7 +25,7 @@
   "scripts": {
     "build": "bash ./generate.sh",
     "test": "node ./user.xml.t.js > ./project/user.xml && cd project && mvn -B test --settings=user.xml -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false",
-    "test:update": "UPDATE_DIFF=1 npm run test"
+    "test:update": "UPDATE_DIFF=1 yarn test"
   },
   "devDependencies": {
     "@jsii/java-runtime": "^0.0.0",
diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json
@@ -25,10 +25,10 @@
   "types": "lib/index.d.ts",
   "scripts": {
     "gen": "bash ./generate.sh",
-    "build": "tsc --build && npm run gen && cd project && mvn -version && mvn -B deploy -D altDeploymentRepository=local::default::file://${PWD}/../maven-repo --settings=user.xml -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false",
+    "build": "tsc --build && yarn gen && cd project && mvn -version && mvn -B deploy -D altDeploymentRepository=local::default::file://${PWD}/../maven-repo --settings=user.xml -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false",
     "dist-clean": "rm -rf dist maven-repo && cd project && mvn -B clean --settings=user.xml",
     "test": "echo 'Tests are run as part of the build target'",
-    "test:update": "UPDATE_DIFF=1 npm run test",
+    "test:update": "UPDATE_DIFF=1 yarn test",
     "package": "package-java && package-private"
   },
   "devDependencies": {
diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json
@@ -22,7 +22,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc --build && npm run lint",
+    "build": "tsc --build && yarn lint",
     "watch": "tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json
@@ -25,16 +25,16 @@
     "generate": "ts-node build-tools/gen.ts",
     "deps": "ts-node build-tools/deps.ts",
     "dist-clean": "rm -rf dist",
-    "build": "cp ../../../README.md . && rm -f jsii-*.whl && npm run generate && npm run deps && npm run lint",
+    "build": "cp ../../../README.md . && rm -f jsii-*.whl && yarn generate && yarn deps && yarn lint",
     "lint": "ts-node build-tools/venv.ts black .",
     "package": "package-python && package-private",
-    "test": "npm run test:gen && npm run test:run:typeguard-2 && npm run test:run:typeguard-3 && npm run test:run:typeguard-4 && npm run test:types",
-    "test:gen": "npm run deps && ts-node build-tools/gen-calc.ts",
+    "test": "yarn test:gen && yarn test:run:typeguard-2 && yarn test:run:typeguard-3 && yarn test:run:typeguard-4 && yarn test:types",
+    "test:gen": "yarn deps && ts-node build-tools/gen-calc.ts",
     "test:run:typeguard-2": "ts-node build-tools/venv.ts python -m pip install typeguard==2.13.3 && ts-node build-tools/venv.ts py.test -v --mypy",
     "test:run:typeguard-3": "ts-node build-tools/venv.ts python -m pip install typeguard==3.0.2 && ts-node build-tools/venv.ts py.test -v --mypy",
     "test:run:typeguard-4": "ts-node build-tools/venv.ts python -m pip install typeguard==4.3.0 && ts-node build-tools/venv.ts py.test -v --mypy",
     "test:types": "pyright -p .",
-    "test:update": "UPDATE_DIFF=1 npm run test"
+    "test:update": "UPDATE_DIFF=1 yarn test"
   },
   "dependencies": {
     "@jsii/runtime": "^0.0.0"
diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json
@@ -25,7 +25,7 @@
     "jsii-runtime": "bin/jsii-runtime"
   },
   "scripts": {
-    "build": "tsc --build && chmod +x bin/jsii-runtime && npx webpack-cli && npm run lint",
+    "build": "tsc --build && chmod +x bin/jsii-runtime && npx webpack-cli && yarn lint",
     "watch": "tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=webpack.config.js",
     "lint:fix": "yarn lint --fix",
diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json
@@ -22,7 +22,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc --build && bash build-tools/generate-json-schema.sh && npm run lint",
+    "build": "tsc --build && bash build-tools/generate-json-schema.sh && yarn lint",
     "watch": "tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
diff --git a/packages/@scope/jsii-calc-base-of-base/README.md b/packages/@scope/jsii-calc-base-of-base/README.md
@@ -0,0 +1 @@
+# @scope/jsii-calc-base-of-base
diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json
@@ -27,7 +27,7 @@
     "build": "jsii --project-references && jsii-rosetta",
     "pacmak": "jsii-pacmak",
     "test": "diff-test test/assembly.jsii .jsii",
-    "test:update": "npm run build && UPDATE_DIFF=1 npm run test"
+    "test:update": "yarn build && UPDATE_DIFF=1 yarn test"
   },
   "devDependencies": {
     "jsii": "5.8.0",
diff --git a/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii b/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii
@@ -23,6 +23,9 @@
     "tscRootDir": "."
   },
   "name": "@scope/jsii-calc-base-of-base",
+  "readme": {
+    "markdown": "# @scope/jsii-calc-base-of-base\n"
+  },
   "repository": {
     "directory": "packages/@scope/jsii-calc-base-of-base",
     "type": "git",
@@ -166,5 +169,5 @@
     }
   },
   "version": "2.1.1",
-  "fingerprint": "VfnjAv/kKNF0c7yssI920uEZbTr4OrRoFW0hcT57qns="
+  "fingerprint": "V/8hSVOMC08S+++J/qHpdyl7coTRjY5QNqoSOqArr/0="
 }
diff --git a/packages/@scope/jsii-calc-base/README.md b/packages/@scope/jsii-calc-base/README.md
@@ -0,0 +1 @@
+# @scope/jsii-calc-base
diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json
@@ -26,10 +26,10 @@
   "scripts": {
     "build": "jsii --project-references && jsii-rosetta",
     "test": "diff-test test/assembly.jsii .jsii",
-    "test:update": "npm run build && UPDATE_DIFF=1 npm run test"
+    "test:update": "yarn build && UPDATE_DIFF=1 yarn test"
   },
   "dependencies": {
-    "@scope/jsii-calc-base-of-base": "^2.1.1"
+    "@scope/jsii-calc-base-of-base": "2.1.1"
   },
   "peerDependencies": {
     "@scope/jsii-calc-base-of-base": "^2.1.1"
diff --git a/packages/@scope/jsii-calc-base/test/assembly.jsii b/packages/@scope/jsii-calc-base/test/assembly.jsii
@@ -52,6 +52,9 @@
     }
   },
   "name": "@scope/jsii-calc-base",
+  "readme": {
+    "markdown": "# @scope/jsii-calc-base\n"
+  },
   "repository": {
     "directory": "packages/@scope/jsii-calc-base",
     "type": "git",
@@ -207,5 +210,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "IZHOxoRL/MXFfl41fiT4CKd440KPwMz5DAPJe7um6JU="
+  "fingerprint": "b+2upCMi5QzwvvQ7hQ/b0rZC5L5wUo8s/QH2sAlDjWE="
 }
diff --git a/packages/@scope/jsii-calc-lib/README.md b/packages/@scope/jsii-calc-lib/README.md
@@ -0,0 +1 @@
+# @scope/jsii-calc-lib
diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json
@@ -29,7 +29,7 @@
     "build": "jsii --project-references --strip-deprecated=deprecated-to-strip.txt && jsii-rosetta",
     "pacmak": "jsii-pacmak",
     "test": "diff-test test/assembly.jsii .jsii",
-    "test:update": "npm run build && UPDATE_DIFF=1 npm run test"
+    "test:update": "yarn build && UPDATE_DIFF=1 yarn test"
   },
   "dependencies": {
     "@scope/jsii-calc-base": "^0.0.0"
diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii
@@ -85,6 +85,9 @@
     "tscRootDir": "lib"
   },
   "name": "@scope/jsii-calc-lib",
+  "readme": {
+    "markdown": "# @scope/jsii-calc-lib\n"
+  },
   "repository": {
     "directory": "packages/@scope/jsii-calc-lib",
     "type": "git",
@@ -1161,5 +1164,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "96UhBBs//vTawYDeg5dqr+eKokWgEG0LCb9P8eVfdF0="
+  "fingerprint": "QRU99iUfl+h0vGHsaEXYYY3B2J2WSbZJfZbwW8dz18Q="
 }
diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json
@@ -22,7 +22,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc --build && npm run lint",
+    "build": "tsc --build && yarn lint",
     "watch": "tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json
@@ -33,12 +33,12 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "jsii --project-references --silence-warnings reserved-word && npm run lint && jsii-rosetta --compile --verbose",
+    "build": "jsii --project-references --silence-warnings reserved-word && yarn lint && jsii-rosetta --compile --verbose",
     "watch": "jsii --project-references -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
     "test": "(ls test/test.*.js | xargs -n1 node) && diff-test test/assembly.jsii .jsii",
-    "test:update": "npm run build && UPDATE_DIFF=1 npm run test",
+    "test:update": "yarn build && UPDATE_DIFF=1 yarn test",
     "update": "./update-all.sh"
   },
   "dependencies": {
diff --git a/packages/jsii-config/lib/util.ts b/packages/jsii-config/lib/util.ts
@@ -17,7 +17,7 @@ export function getNestedValue(
 /*
  * recursively remove keys from object whose value empty.
  */
-export function removeEmptyValues<T>(fields: T): T {
+export function removeEmptyValues<T extends object>(fields: T): T {
   return Object.entries(fields).reduce(
     (accum: any, [key, val]: [string, any]) => {
       if (typeof val === 'object') {
diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json
@@ -7,21 +7,20 @@
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "scripts": {
-    "build": "tsc --build && npm run lint",
+    "build": "tsc --build && yarn lint",
     "build+test": "tsc --build && yarn test",
     "watch": "tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore --ignore-pattern=test/negatives/*",
     "lint:fix": "yarn lint --fix",
     "test": "jest",
     "package": "package-js",
-    "exec": "npm run build && node bin/jsii-config.js"
+    "exec": "yarn build && node bin/jsii-config.js"
   },
   "bin": {
     "jsii-config": "bin/jsii-config"
   },
   "devDependencies": {
     "@types/inquirer": "^8.2.3",
-    "@types/yargs": "17.0.19",
     "jest-expect-message": "^1.1.3"
   },
   "dependencies": {
diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json
@@ -24,7 +24,7 @@
     "jsii-diff": "bin/jsii-diff"
   },
   "scripts": {
-    "build": "bash ./generate.sh && tsc --build && npm run lint",
+    "build": "bash ./generate.sh && tsc --build && yarn lint",
     "watch": "bash ./generate.sh && tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
diff --git a/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts
@@ -113,7 +113,7 @@ export class FileGenerator {
     propertyGroup.ele('Nullable', 'enable');
     propertyGroup.ele('SymbolPackageFormat', 'snupkg');
     propertyGroup.ele('TargetFramework', TARGET_FRAMEWORK);
-    // Transparently rolll forward across major SDK releases if needed
+    // Transparently roll forward across major SDK releases if needed
     propertyGroup.ele('RollForward', 'Major');
 
     const itemGroup1 = rootNode.ele('ItemGroup');
diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts
@@ -3205,7 +3205,7 @@ function emitParameterTypeChecks(
 
   const paramNames = paramInfo
     .filter((param) => param.name != null)
-    .map((param) => param.name!.split(/\s*:\s*/)[0]);
+    .map((param) => param.name.split(/\s*:\s*/)[0]);
   const typesVar = slugifyAsNeeded('type_hints', paramNames);
 
   let openedBlock = false;
diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json
@@ -26,14 +26,14 @@
   },
   "scripts": {
     "gen": "bash generate.sh",
-    "build": "npm run gen && tsc --build && chmod +x bin/jsii-pacmak && npm run lint",
+    "build": "yarn gen && tsc --build && chmod +x bin/jsii-pacmak && yarn lint",
     "watch": "tsc --build -w",
     "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.ts --ignore-path=.gitignore",
     "lint:fix": "yarn lint --fix",
-    "test": "npm run test:unit && npm run test:build",
+    "test": "yarn test:unit && yarn test:build",
     "test:unit": "jest",
     "test:build": "bash test/build-test.sh",
-    "test:update": "jest -u && npm run test:build",
+    "test:update": "jest -u && yarn test:build",
     "package": "package-js"
   },
   "dependencies": {
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
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
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
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
diff --git a/packages/jsii-reflect/lib/assembly.ts b/packages/jsii-reflect/lib/assembly.ts
diff --git a/packages/jsii-reflect/lib/module-like.ts b/packages/jsii-reflect/lib/module-like.ts
diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json
diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`"prettier": "^3.6.2",`
`38`	`38`	`"standard-version": "^9.5.0",`
`39`	`39`	`"ts-node": "^10.9.2",`
`40`		`- "typescript": "~4.7.4"`
	`40`	`+ "typescript": "5.8.x"`
`41`	`41`	`},`
`42`	`42`	`"repository": {`
`43`	`43`	`"type": "git",`
`@@ -55,8 +55,5 @@`
`55`	`55`	`"/@fixtures/jsii-calc-bundled/",`
`56`	`56`	`"**/typescript"`
`57`	`57`	`]`
`58`		`- },`
`59`		`- "resolutions": {`
`60`		`- "@types/yargs": "17.0.19"`
`61`	`58`	`}`
`62`	`59`	`}`