@jsii/kernel 1.113.0 → 1.115.0

package/lib/kernel.d.ts

@@ -1,4 +1,6 @@
+import * as spec from '@jsii/spec';
 import * as api from './api';
+export declare const ASSEMBLY_SUPPORTED_FEATURES: spec.JsiiFeature[];
 export declare const enum JsiiErrorType {
     JSII_FAULT = "@jsii/kernel.Fault",
     RUNTIME_ERROR = "@jsii/kernel.RuntimeError"

package/lib/kernel.js

@@ -12,7 +12,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 };
 var _Kernel_instances, _Kernel_assemblies, _Kernel_objects, _Kernel_cbs, _Kernel_waiting, _Kernel_promises, _Kernel_serializerHost, _Kernel_nextid, _Kernel_syncInProgress, _Kernel_installDir, _Kernel_require, _Kernel_load, _Kernel_addAssembly, _Kernel_findCtor, _Kernel_getPackageDir, _Kernel_create, _Kernel_getSuperPropertyName, _Kernel_applyPropertyOverride, _Kernel_defineOverridenProperty, _Kernel_applyMethodOverride, _Kernel_defineOverridenMethod, _Kernel_findInvokeTarget, _Kernel_validateMethodArguments, _Kernel_assemblyFor, _Kernel_findSymbol, _Kernel_typeInfoForFqn, _Kernel_isVisibleType, _Kernel_typeInfoForMethod, _Kernel_tryTypeInfoForMethod, _Kernel_tryTypeInfoForProperty, _Kernel_typeInfoForProperty, _Kernel_toSandbox, _Kernel_fromSandbox, _Kernel_toSandboxValues, _Kernel_fromSandboxValues, _Kernel_boxUnboxParameters, _Kernel_debug, _Kernel_debugTime, _Kernel_ensureSync, _Kernel_findPropertyTarget, _Kernel_getBinScriptCommand, _Kernel_makecbid, _Kernel_makeprid;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Kernel = exports.RuntimeError = exports.JsiiFault = void 0;
+exports.Kernel = exports.RuntimeError = exports.JsiiFault = exports.ASSEMBLY_SUPPORTED_FEATURES = void 0;
 const spec = require("@jsii/spec");
 const cp = require("child_process");
 const fs = require("fs-extra");
@@ -25,6 +25,9 @@ const objects_1 = require("./objects");
 const onExit = require("./on-exit");
 const wire = require("./serialization");
 const tar = require("./tar-cache");
+exports.ASSEMBLY_SUPPORTED_FEATURES = [
+    'intersection-types',
+];
 class JsiiFault extends Error {
     constructor(message) {
         super(message);
@@ -380,7 +383,7 @@ _Kernel_assemblies = new WeakMap(), _Kernel_objects = new WeakMap(), _Kernel_cbs
     // read .jsii metadata from the root of the package
     let assmSpec;
     try {
-        assmSpec = __classPrivateFieldGet(this, _Kernel_instances, "m", _Kernel_debugTime).call(this, () => spec.loadAssemblyFromPath(packageDir, this.validateAssemblies), `loadAssemblyFromPath(${packageDir})`);
+        assmSpec = __classPrivateFieldGet(this, _Kernel_instances, "m", _Kernel_debugTime).call(this, () => spec.loadAssemblyFromPath(packageDir, this.validateAssemblies, exports.ASSEMBLY_SUPPORTED_FEATURES), `loadAssemblyFromPath(${packageDir})`);
     }
     catch (e) {
         throw new JsiiFault(`Error for package tarball ${req.tarball}: ${e.message}`);

package/lib/serialization.js

@@ -547,6 +547,12 @@ function serializationType(typeRef, lookup) {
         }
         return compoundTypes.sort((l, r) => compareSerializationClasses(l.serializationClass, r.serializationClass));
     }
+    if (spec.isIntersectionTypeReference(typeRef.type)) {
+        return serializationType({
+            optional: typeRef.optional,
+            type: typeRef.type.intersection.types[0],
+        }, lookup);
+    }
     // The next part of the conversion is lookup-dependent
     const type = lookup(typeRef.type.fqn);
     if (spec.isEnumType(type)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsii/kernel",
-  "version": "1.113.0",
+  "version": "1.115.0",
   "description": "kernel for jsii execution environment",
   "license": "Apache-2.0",
   "author": {
@@ -31,19 +31,19 @@
     "package": "package-js"
   },
   "dependencies": {
-    "@jsii/spec": "^1.113.0",
+    "@jsii/spec": "1.115.0",
     "fs-extra": "^10.1.0",
     "lockfile": "^1.0.4",
     "tar": "^6.2.1"
   },
   "devDependencies": {
-    "@scope/jsii-calc-base": "^1.113.0",
-    "@scope/jsii-calc-lib": "^1.113.0",
+    "@scope/jsii-calc-base": "^1.115.0",
+    "@scope/jsii-calc-lib": "^1.115.0",
     "@types/fs-extra": "^9.0.13",
     "@types/lockfile": "^1.0.4",
     "@types/tar": "^6.1.13",
     "jest-expect-message": "^1.1.3",
-    "jsii-build-tools": "^1.113.0",
+    "jsii-build-tools": "^1.115.0",
     "jsii-calc": "^3.20.120"
   }
 }