@jsii/kernel 1.76.0 → 1.78.0

package/lib/serialization.d.ts

@@ -72,7 +72,9 @@ export interface SerializerHost {
 }
 interface Serializer {
     serialize(value: unknown, type: OptionalValueOrVoid, host: SerializerHost): any;
-    deserialize(value: unknown, type: OptionalValueOrVoid, host: SerializerHost): any;
+    deserialize(value: unknown, type: OptionalValueOrVoid, host: SerializerHost, options?: {
+        allowNullishMapValue?: boolean;
+    }): any;
 }
 export declare const SERIALIZERS: {
     [k: string]: Serializer;

package/lib/serialization.js

@@ -130,14 +130,13 @@ exports.SERIALIZERS = {
             // Map<string, JSON> in order to obtain the correct output behavior here!
             if ((0, api_1.isWireMap)(value)) {
                 return exports.SERIALIZERS["Map" /* SerializationClass.Map */].deserialize(value, {
-                    optional: false,
                     type: {
                         collection: {
                             kind: spec.CollectionKind.Map,
                             elementtype: { primitive: spec.PrimitiveType.Json },
                         },
                     },
-                }, host);
+                }, host, { allowNullishMapValue: true });
             }
             if (typeof value !== 'object') {
                 return value;
@@ -150,9 +149,7 @@ exports.SERIALIZERS = {
                 if (toMap == null) {
                     return toMap;
                 }
-                return process(host, 'deserialize', toMap, {
-                    type: { primitive: spec.PrimitiveType.Json },
-                }, typeof key === 'string' ? `key ${(0, util_1.inspect)(key)}` : `index ${key}`);
+                return process(host, 'deserialize', toMap, { type: { primitive: spec.PrimitiveType.Json } }, typeof key === 'string' ? `key ${(0, util_1.inspect)(key)}` : `index ${key}`);
             }
         },
     },
@@ -222,7 +219,7 @@ exports.SERIALIZERS = {
                 [api_1.TOKEN_MAP]: mapValues(value, (v, key) => process(host, 'serialize', v, { type: mapType.collection.elementtype }, `key ${(0, util_1.inspect)(key)}`)),
             };
         },
-        deserialize(value, optionalValue, host) {
+        deserialize(value, optionalValue, host, { allowNullishMapValue = false } = {}) {
             if (nullAndOk(value, optionalValue)) {
                 return undefined;
             }
@@ -230,9 +227,15 @@ exports.SERIALIZERS = {
             const mapType = optionalValue.type;
             if (!(0, api_1.isWireMap)(value)) {
                 // Compatibility mode with older versions that didn't wrap in [TOKEN_MAP]
-                return mapValues(value, (v, key) => process(host, 'deserialize', v, { type: mapType.collection.elementtype }, `key ${(0, util_1.inspect)(key)}`));
-            }
-            const result = mapValues(value[api_1.TOKEN_MAP], (v, key) => process(host, 'deserialize', v, { type: mapType.collection.elementtype }, `key ${(0, util_1.inspect)(key)}`));
+                return mapValues(value, (v, key) => process(host, 'deserialize', v, {
+                    optional: allowNullishMapValue,
+                    type: mapType.collection.elementtype,
+                }, `key ${(0, util_1.inspect)(key)}`));
+            }
+            const result = mapValues(value[api_1.TOKEN_MAP], (v, key) => process(host, 'deserialize', v, {
+                optional: allowNullishMapValue,
+                type: mapType.collection.elementtype,
+            }, `key ${(0, util_1.inspect)(key)}`));
             Object.defineProperty(result, exports.SYMBOL_WIRE_TYPE, {
                 configurable: false,
                 enumerable: false,
@@ -703,7 +706,7 @@ function isByReferenceOnly(obj) {
 }
 function process(host, serde, value, type, context) {
     const wireTypes = serializationType(type, host.lookupType);
-    host.debug(serde, value, wireTypes);
+    host.debug(serde, value, ...wireTypes);
     const errors = new Array();
     for (const { serializationClass, typeRef } of wireTypes) {
         try {

package/package.json

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