Merge branch 'main' into automation/yarn-upgrade

Author: iliapolo

.github/workflows/gh-pages.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Check out
         uses: actions/checkout@v5
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           cache: 'pip'
           cache-dependency-path: 'gh-pages/requirements-dev.txt'

.github/workflows/issue-regression-labeler.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
     - name: Fetch template body
       id: check_regression
-      uses: actions/github-script@v7
+      uses: actions/github-script@v8
       env: 
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         TEMPLATE_BODY: ${{ github.event.issue.body }}

.github/workflows/main.yml

@@ -26,11 +26,11 @@ jobs:
         uses: actions/checkout@v5
       # Set up all of our standard runtimes
       - name: Set up .NET 6
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '6.0.x'
       - name: Set up Go 1.23
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: '1.23'
       - name: Set up Java 8
@@ -39,12 +39,12 @@ jobs:
           distribution: 'zulu'
           java-version: '8'
       - name: Set up Node LTS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           cache: yarn
           node-version: 'lts/*'
       - name: Set up Python 3.9
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.9'
           cache: pip
@@ -108,11 +108,11 @@ jobs:
         uses: actions/checkout@v5
       # Set up all of our standard runtimes
       - name: Set up .NET 6
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '6.0.x'
       - name: Set up Go 1.23
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: '1.23'
       - name: Set up Java 8
@@ -121,12 +121,12 @@ jobs:
           distribution: 'zulu'
           java-version: '8'
       - name: Set up Node LTS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           cache: yarn
           node-version: 'lts/*'
       - name: Set up Python 3.9
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.9'
           cache: pip
@@ -301,11 +301,11 @@ jobs:
           rm built-tree.tgz
       # Set up all of our standard runtimes (this is matrix-based)
       - name: Set up .NET ${{ matrix.dotnet }}
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: ${{ matrix.dotnet }}
       - name: Set up Go ${{ matrix.go }}
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go }}
       - name: Set up Java ${{ matrix.java }}
@@ -314,12 +314,12 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
       - name: Set up Node ${{ matrix.node }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           cache: yarn
           node-version: ${{ matrix.node }}
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python }}
           cache: pip
@@ -390,11 +390,11 @@ jobs:
           path: ${{ runner.temp }}/release-package
       # Set up all of our standard runtimes
       - name: Set up .NET 7
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '7.0.x'
       - name: Set up Go 1.23
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: '1.23'
       - name: Set up Java 20
@@ -403,11 +403,11 @@ jobs:
           distribution: 'corretto'
           java-version: '20'
       - name: Set up Node 20
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '20'
       - name: Set up Python 3.11
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
       - name: Install python3-venv

.github/workflows/yarn-upgrade.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           cache: yarn
           node-version: 'lts/*'

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.114.0](https://github.com/aws/jsii/compare/v1.113.0...v1.114.0) (2025-09-04)
+
+
+### Features
+
+* jsii and jsii-rosetta v5.9 ([#4885](https://github.com/aws/jsii/issues/4885)) ([fd4385a](https://github.com/aws/jsii/commit/fd4385aa6d15fba2112c673b83511466687603d4))
+* prepare support for intersection types ([#4898](https://github.com/aws/jsii/issues/4898)) ([d75658e](https://github.com/aws/jsii/commit/d75658e146a17c26e9cc6294cef00322af683672))
+
 ## [1.113.0](https://github.com/aws/jsii/compare/v1.112.0...v1.113.0) (2025-07-31)
 
 

buildspec.yaml

@@ -10,6 +10,7 @@ phases:
     commands:
       - yarn build && yarn test
       - yarn dist-clean
+
       - /bin/bash ./scripts/align-version.sh
       - yarn build
   post_build:

gh-pages/requirements-dev.txt

@@ -1,4 +1,4 @@
 mkdocs~=1.6.1
 mkdocs-awesome-pages-plugin~=2.10.1
-mkdocs-material~=9.6.18
+mkdocs-material~=9.6.19
 mkdocs-git-revision-date-plugin~=0.3.2

lerna.json

@@ -12,6 +12,6 @@
       "rejectCycles": true
     }
   },
-  "version": "1.113.0",
+  "version": "1.114.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/@jsii/kernel/package.json

@@ -31,7 +31,7 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/spec": "^0.0.0",
+    "@jsii/spec": "0.0.0",
     "fs-extra": "^10.1.0",
     "lockfile": "^1.0.4",
     "tar": "^6.2.1"

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

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/prefer-promise-reject-errors */
+import { Assembly, SchemaVersion } from '@jsii/spec';
 import * as childProcess from 'child_process';
 import * as fs from 'fs-extra';
 import * as os from 'os';
@@ -1336,6 +1337,36 @@ defineTest('loading a module twice idepotently succeeds', async (sandbox) => {
   });
 });
 
+defineTest.skipIf(!!recordingOutput)(
+  'loading an assembly with unsupported features fails',
+  async (sandbox) => {
+    const testAssembly: Assembly = {
+      author: {
+        name: 'Me',
+        roles: ['owner'],
+      },
+      description: 'Test',
+      fingerprint: 'asdf',
+      homepage: 'www.example.com',
+      jsiiVersion: '1.20.3',
+      license: 'MIT',
+      name: 'test',
+      repository: { type: 'other', url: 'www.example.com' },
+      schema: SchemaVersion.LATEST,
+      version: '1.2.3',
+      usedFeatures: ['will-never-be-used' as any],
+    };
+
+    await expect(async () =>
+      sandbox.load({
+        tarball: await makeJsiiTarball(testAssembly),
+        name: testAssembly.name,
+        version: testAssembly.version,
+      }),
+    ).rejects.toThrow(/will-never-be-used/);
+  },
+);
+
 defineTest(
   'fails if trying to load two different versions of the same module',
   async (sandbox) => {
@@ -2275,27 +2306,57 @@ async function preparePackage(module: string, useCache = true) {
   }
 
   const packageRoot = findPackageRoot(module);
-  await new Promise<void>((ok, ko) => {
-    const child = childProcess.spawn('npm', ['pack', packageRoot], {
-      cwd: staging,
+
+  await runNpm(['pack', packageRoot], staging);
+
+  const dir = path.join(staging, (await fs.readdir(staging))[0]);
+  cache.set(module, dir);
+  return dir;
+}
+
+async function makeJsiiTarball(assembly: Assembly) {
+  const staging = await fs.mkdtemp(
+    path.join(os.tmpdir(), 'jsii-kernel-tests-'),
+  );
+
+  // clean up only if we are not recording, so playback can refer to these
+  if (!recordingOutput) {
+    process.on('exit', () => fs.removeSync(staging)); // cleanup
+  }
+
+  await fs.writeJson(path.join(staging, 'package.json'), {
+    name: assembly.name,
+    version: assembly.version,
+  });
+
+  await fs.writeJson(path.join(staging, '.jsii'), assembly);
+
+  await runNpm(['pack'], staging);
+
+  const tarballs = (await fs.readdir(staging)).filter((x) => x.endsWith('gz'));
+
+  return path.join(staging, tarballs[0]);
+}
+
+async function runNpm(args: string[], cwd: string): Promise<string> {
+  return new Promise<string>((ok, ko) => {
+    const child = childProcess.spawn('npm', args, {
+      cwd,
       shell: true,
       stdio: ['ignore', 'pipe', 'ignore'],
     });
     const stdout = new Array<Buffer>();
     child.stdout.on('data', (chunk) => stdout.push(Buffer.from(chunk)));
     child.once('close', (code, signal) => {
       if (code === 0) {
-        return ok();
+        return ok(Buffer.concat(stdout).toString());
       }
       if (code != null) {
         return ko(`'npm pack' exited with code ${code}`);
       }
       return ko(`'npm pack' killed by signal ${signal}`);
     });
   });
-  const dir = path.join(staging, (await fs.readdir(staging))[0]);
-  cache.set(module, dir);
-  return dir;
 }
 
 function findPackageRoot(pkg: string) {