feat: intersection types (#4929)

Add support for intersection types to the rest of the jsii toolkit.

This is currently using a prerelease version of the jsii compiler drafted here: aws/jsii-compiler#2325


---

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

Author: rix0rrr

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

@@ -12,6 +12,10 @@ import * as onExit from './on-exit';
 import * as wire from './serialization';
 import * as tar from './tar-cache';
 
+export const ASSEMBLY_SUPPORTED_FEATURES: spec.JsiiFeature[] = [
+  'intersection-types',
+];
+
 export const enum JsiiErrorType {
   JSII_FAULT = '@jsii/kernel.Fault',
   RUNTIME_ERROR = '@jsii/kernel.RuntimeError',
@@ -156,7 +160,12 @@ export class Kernel {
     let assmSpec: spec.Assembly;
     try {
       assmSpec = this.#debugTime(
-        () => spec.loadAssemblyFromPath(packageDir, this.validateAssemblies),
+        () =>
+          spec.loadAssemblyFromPath(
+            packageDir,
+            this.validateAssemblies,
+            ASSEMBLY_SUPPORTED_FEATURES,
+          ),
         `loadAssemblyFromPath(${packageDir})`,
       );
     } catch (e: any) {

packages/@jsii/runtime/test/kernel-host.test.ts

@@ -1,4 +1,4 @@
-import { api } from '@jsii/kernel';
+import { api, ASSEMBLY_SUPPORTED_FEATURES } from '@jsii/kernel';
 import * as spec from '@jsii/spec';
 import { loadAssemblyFromPath } from '@jsii/spec';
 import * as child from 'child_process';
@@ -89,6 +89,9 @@ function loadRequest(library: string): api.LoadRequest {
   function loadAssembly(): spec.Assembly {
     return loadAssemblyFromPath(
       path.resolve(require.resolve(`${library}/package.json`), '..'),
+      true,
+      // Features that the kernel we are wrapping supports
+      ASSEMBLY_SUPPORTED_FEATURES,
     );
   }
 

packages/@jsii/spec/src/assembly-utils.ts

@@ -3,7 +3,6 @@ import * as path from 'path';
 import * as zlib from 'zlib';
 
 import {
-  ALL_TYPESYSTEM_ENFORCED_FEATURES,
   Assembly,
   SPEC_FILE_NAME,
   SPEC_FILE_NAME_COMPRESSED,
@@ -123,13 +122,13 @@ const failNoReadfileProvided = (filename: string) => {
  * @param assemblyBuffer buffer containing SPEC_FILE_NAME contents
  * @param readFile a callback to use for reading additional support files
  * @param validate whether or not to validate the assembly
- * @param supportedFeatures the set of supported features (default: all features enforced by the type system)
+ * @param supportedFeatures the set of supported features (default: no new features since the first jsii release)
  */
 export function loadAssemblyFromBuffer(
   assemblyBuffer: Buffer,
   readFile: (filename: string) => Buffer = failNoReadfileProvided,
   validate = true,
-  supportedFeatures: string[] = ALL_TYPESYSTEM_ENFORCED_FEATURES,
+  supportedFeatures: string[] = [],
 ): Assembly {
   let contents = JSON.parse(assemblyBuffer.toString('utf-8'));
 
@@ -148,7 +147,7 @@ export function loadAssemblyFromBuffer(
   );
   if (unsupported.length > 0) {
     throw new Error(
-      `This jsii tool cannot load the given assembly; using unsupported feature(s): ${unsupported.join(', ')}`,
+      `This jsii tool cannot load the given assembly; using unsupported feature(s): ${unsupported.join(', ')} (supported features: ${supportedFeatures.join(', ')})`,
     );
   }
 

packages/@jsii/spec/src/assembly.ts

@@ -1094,35 +1094,6 @@ export function describeTypeReference(type?: TypeReference): string {
  */
 export type JsiiFeature = 'intersection-types' | 'class-covariant-overrides';
 
-/**
- * For every feature, is it enforced by the type system?
- *
- * Effectively: if a jsii tools links against the most recent version of the
- * spec, is the TypeScript type system going to ensure that they must have
- * support for a given new feature, through exhaustiveness checking?
- *
- * (This map also forces completeness, so we are guaranteed to have a string
- * value for every possible `JsiiFeature` type branch).
- */
-const IS_FEATURE_TYPESYSTEM_ENFORCED: Record<JsiiFeature, boolean> = {
-  'intersection-types': true,
-  'class-covariant-overrides': false,
-};
-
-/**
- * A list of all jsii extension features
- */
-export const ALL_FEATURES = Object.keys(IS_FEATURE_TYPESYSTEM_ENFORCED);
-
-/**
- * A list of all jsii extension features
- */
-export const ALL_TYPESYSTEM_ENFORCED_FEATURES = Object.entries(
-  IS_FEATURE_TYPESYSTEM_ENFORCED,
-)
-  .filter(([_, v]) => v)
-  .map(([k, _]) => k);
-
 /**
  * Determines whether an entity is deprecated.
  *

packages/@scope/jsii-calc-base-of-base/package.json

@@ -30,9 +30,9 @@
     "test:update": "yarn build && UPDATE_DIFF=1 yarn test"
   },
   "devDependencies": {
-    "jsii": "5.9.1",
+    "jsii": "5.9.6",
     "jsii-build-tools": "^0.0.0",
-    "jsii-rosetta": "^5.9.1"
+    "jsii-rosetta": "^5.9.6"
   },
   "jsii": {
     "outdir": "dist",

packages/@scope/jsii-calc-base-of-base/test/assembly.jsii

@@ -9,7 +9,7 @@
   },
   "description": "An example transitive dependency for jsii-calc.",
   "homepage": "https://github.com/aws/jsii",
-  "jsiiVersion": "5.9.1",
+  "jsiiVersion": "5.9.6",
   "license": "Apache-2.0",
   "metadata": {
     "jsii": {
@@ -169,5 +169,5 @@
     }
   },
   "version": "2.1.1",
-  "fingerprint": "aYxN6OFk7UbVs1sLXw8gQJwhedbyv9+wGNPYiMZsxsM="
+  "fingerprint": "xT3ki285s4Oa3XH7pWYl1ZcUwKM/TNBnRDafyUmYtHI="
 }

packages/@scope/jsii-calc-base/package.json

@@ -35,9 +35,9 @@
     "@scope/jsii-calc-base-of-base": "^2.1.1"
   },
   "devDependencies": {
-    "jsii": "5.9.1",
+    "jsii": "5.9.6",
     "jsii-build-tools": "^0.0.0",
-    "jsii-rosetta": "^5.9.1"
+    "jsii-rosetta": "^5.9.6"
   },
   "jsii": {
     "metadata": {

packages/@scope/jsii-calc-base/test/assembly.jsii

@@ -39,7 +39,7 @@
   },
   "description": "An example direct dependency for jsii-calc.",
   "homepage": "https://github.com/aws/jsii",
-  "jsiiVersion": "5.9.1",
+  "jsiiVersion": "5.9.6",
   "license": "Apache-2.0",
   "metadata": {
     "jsii": {
@@ -210,5 +210,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "Tkv4XtmzLBHjpoCQIvmDQWCZzcfyvXQvT70VAeVAjx8="
+  "fingerprint": "uC/anzvNeUVZQRLakfLl74E6VUDzG7IrE8IlleLhl0E="
 }

packages/@scope/jsii-calc-lib/package.json

@@ -39,9 +39,9 @@
     "@scope/jsii-calc-base-of-base": "^2.1.1"
   },
   "devDependencies": {
-    "jsii": "5.9.1",
+    "jsii": "5.9.6",
     "jsii-build-tools": "^0.0.0",
-    "jsii-rosetta": "^5.9.1"
+    "jsii-rosetta": "^5.9.6"
   },
   "jsii": {
     "outdir": "dist",

packages/@scope/jsii-calc-lib/test/assembly.jsii

@@ -71,7 +71,7 @@
     "stability": "deprecated"
   },
   "homepage": "https://github.com/aws/jsii",
-  "jsiiVersion": "5.9.1",
+  "jsiiVersion": "5.9.6",
   "license": "Apache-2.0",
   "metadata": {
     "jsii": {
@@ -1164,5 +1164,5 @@
     }
   },
   "version": "0.0.0",
-  "fingerprint": "H6wdtGhqwOcKK1OUW9voxYuUdStSr5JX3ikW5avTfrk="
+  "fingerprint": "8chnxF4yP6o6nmn+pwW/moRmLso8MgyFcPoNyGJhA+Y="
 }