@flock/wirespec 0.10.23 → 0.10.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flock/wirespec",
-  "version": "0.10.23",
+  "version": "0.10.24",
   "main": "wirespec-src-plugin-npm.js",
   "types": "wirespec-src-plugin-npm.d.ts",
   "devDependencies": {

package/wirespec-src-compiler-core.js

@@ -837,14 +837,14 @@
   function emitDeserialized(_this__u8e3s4, $this) {
     return Spacer_instance.e24(4) + 'case ' + _this__u8e3s4.a24_1 + ' -> new Response' + Companion_getInstance_3().m24(_this__u8e3s4.a24_1) + '(' + emitDeserializedParams_0(_this__u8e3s4, $this) + ');';
   }
-  function emitSerialized_0(_this__u8e3s4, $this, fields) {
-    return 'java.util.Map.entry("' + _this__u8e3s4.n24_1.b1() + '", serialization.serialize(request.' + fields + '.' + $this.q24(_this__u8e3s4.n24_1) + ', Wirespec.getType(' + emitType$default(_this__u8e3s4.o24_1, $this) + '.class, ' + _this__u8e3s4.o24_1.j24() + ')))';
+  function emitSerializedParams(_this__u8e3s4, $this, fields) {
+    return 'java.util.Map.entry("' + _this__u8e3s4.n24_1.b1() + '", serialization.serializeParam(request.' + fields + '.' + $this.q24(_this__u8e3s4.n24_1) + ', Wirespec.getType(' + emitType$default(_this__u8e3s4.o24_1, $this) + '.class, ' + _this__u8e3s4.o24_1.j24() + ')))';
   }
   function emitDeserialized_0(_this__u8e3s4, $this) {
     return Spacer_instance.e24(4) + 'serialization.<' + $this.t24(_this__u8e3s4.pd_1.s24_1) + '>deserialize(request.path().get(' + _this__u8e3s4.od_1 + '), Wirespec.getType(' + emitType$default(_this__u8e3s4.pd_1.s24_1, $this) + '.class, ' + _this__u8e3s4.pd_1.s24_1.j24() + '))';
   }
-  function emitDeserialized_1(_this__u8e3s4, $this, fields) {
-    return Spacer_instance.e24(4) + 'java.util.Optional.ofNullable(request.' + fields + '().get("' + _this__u8e3s4.n24_1.b1() + '")).map(it -> serialization.<' + $this.t24(_this__u8e3s4.o24_1) + '>deserialize(it, Wirespec.getType(' + emitType$default(_this__u8e3s4.o24_1, $this) + '.class, ' + _this__u8e3s4.o24_1.j24() + ')))' + (!_this__u8e3s4.p24_1 ? '.get()' : '');
+  function emitDeserializedParams_1(_this__u8e3s4, $this, fields) {
+    return Spacer_instance.e24(4) + 'java.util.Optional.ofNullable(request.' + fields + '().get("' + _this__u8e3s4.n24_1.b1() + '")).map(it -> serialization.<' + $this.t24(_this__u8e3s4.o24_1) + '>deserializeParam(it, Wirespec.getType(' + emitType$default(_this__u8e3s4.o24_1, $this) + '.class, ' + _this__u8e3s4.o24_1.j24() + ')))' + (!_this__u8e3s4.p24_1 ? '.get()' : '');
   }
   function emitSerializedHeader(_this__u8e3s4, $this) {
     return 'java.util.Map.entry("' + _this__u8e3s4.n24_1.b1() + '", serialization.serialize(r.getHeaders().' + $this.q24(_this__u8e3s4.n24_1) + '(), Wirespec.getType(' + emitType$default(_this__u8e3s4.o24_1, $this) + '.class, ' + _this__u8e3s4.o24_1.j24() + ')))';
@@ -1015,12 +1015,12 @@
   }
   function JavaEmitter$emitRequestFunctions$lambda_0(this$0) {
     return function (it) {
-      return emitSerialized_0(it, this$0, 'queries');
+      return emitSerializedParams(it, this$0, 'queries');
     };
   }
   function JavaEmitter$emitRequestFunctions$lambda_1(this$0) {
     return function (it) {
-      return emitSerialized_0(it, this$0, 'headers');
+      return emitSerializedParams(it, this$0, 'headers');
     };
   }
   function JavaEmitter$emit$lambda_10(this$0) {
@@ -1075,12 +1075,12 @@
   }
   function JavaEmitter$emitDeserializedParams$lambda_0(this$0) {
     return function (it) {
-      return emitDeserialized_1(it, this$0, 'queries');
+      return emitDeserializedParams_1(it, this$0, 'queries');
     };
   }
   function JavaEmitter$emitDeserializedParams$lambda_1(this$0) {
     return function (it) {
-      return emitDeserialized_1(it, this$0, 'headers');
+      return emitDeserializedParams_1(it, this$0, 'headers');
     };
   }
   function JavaEmitter$emitDeserializedParams$lambda_2(this$0) {
@@ -1403,7 +1403,7 @@
     var it = joinToString(listOfNotNull([tmp_0, tmp_1, tmp_2, tmp_3]), ',\n');
     return isBlank(it) ? 'object Request : Wirespec.Request<' + emit_3(_this__u8e3s4.f24_1, $this) + '> {' : 'class Request(\n' + it + '\n' + Spacer_instance.toString() + ') : Wirespec.Request<' + emit_3(_this__u8e3s4.f24_1, $this) + '> {';
   }
-  function emitDeserializedParams_1(_this__u8e3s4, $this, endpoint) {
+  function emitDeserializedParams_2(_this__u8e3s4, $this, endpoint) {
     // Inline function 'kotlin.let' call
     var tmp = $this.l24(endpoint);
     var tmp_0 = orNull(joinToString(tmp, VOID, VOID, VOID, VOID, VOID, KotlinEmitter$emitDeserializedParams$lambda($this)));
@@ -1424,20 +1424,20 @@
     var it = joinToString(listOfNotNull([tmp_0, tmp_1, tmp_2, tmp_3]), ',\n');
     return isBlank(it) ? '' : '(\n' + it + '\n' + Spacer_instance.e24(2) + ')';
   }
-  function emitSerialized_1(_this__u8e3s4, $this) {
+  function emitSerialized_0(_this__u8e3s4, $this) {
     return trimMargin('\n        |' + Spacer_instance.e24(3) + 'is Response' + _this__u8e3s4.a24_1 + ' -> Wirespec.RawResponse(\n        |' + Spacer_instance.e24(4) + 'statusCode = response.status,\n        |' + Spacer_instance.e24(4) + 'headers = mapOf(),\n        |' + Spacer_instance.e24(4) + 'body = ' + (!(_this__u8e3s4.c24_1 == null) ? 'serialization.serialize(response.body, typeOf<' + emit_3(_this__u8e3s4.c24_1, $this) + '>())' : 'null') + ',\n        |' + Spacer_instance.e24(3) + ')\n    ');
   }
-  function emitDeserialized_2(_this__u8e3s4, $this) {
+  function emitDeserialized_1(_this__u8e3s4, $this) {
     return trimMargin('\n        |' + Spacer_instance.e24(3) + _this__u8e3s4.a24_1 + ' -> Response' + _this__u8e3s4.a24_1 + '(\n        |' + Spacer_instance.e24(4) + 'body = serialization.deserialize(requireNotNull(response.body) { "body is null" }, typeOf<' + emit_3(_this__u8e3s4.c24_1, $this) + '>()),\n        |' + Spacer_instance.e24(3) + ')\n    ');
   }
-  function emitSerialized_2(_this__u8e3s4, $this, fields) {
-    return 'request.' + fields + '.' + $this.q24(_this__u8e3s4.n24_1) + '?.let{"' + _this__u8e3s4.n24_1.b1() + '" to serialization.serialize(it, typeOf<' + $this.t24(_this__u8e3s4.o24_1) + '>())}';
+  function emitSerializedParams_0(_this__u8e3s4, $this, fields) {
+    return 'mapOf("' + $this.q24(_this__u8e3s4.n24_1) + '" to (request.' + fields + '.' + $this.q24(_this__u8e3s4.n24_1) + '?.let{ serialization.serializeParam(it, typeOf<' + $this.t24(_this__u8e3s4.o24_1) + '>()) } ?: emptyList()))';
   }
-  function emitDeserialized_3(_this__u8e3s4, $this) {
+  function emitDeserialized_2(_this__u8e3s4, $this) {
     return Spacer_instance.e24(3) + $this.q24(_this__u8e3s4.pd_1.r24_1) + ' = serialization.deserialize(request.path[' + _this__u8e3s4.od_1 + '], typeOf<' + $this.t24(_this__u8e3s4.pd_1.s24_1) + '>())';
   }
-  function emitDeserialized_4(_this__u8e3s4, $this, fields) {
-    return _this__u8e3s4.p24_1 ? Spacer_instance.e24(3) + $this.q24(_this__u8e3s4.n24_1) + ' = request.' + fields + '["' + _this__u8e3s4.n24_1.b1() + '"]?.let{ serialization.deserialize(it, typeOf<' + $this.t24(_this__u8e3s4.o24_1) + '>()) }' : Spacer_instance.e24(3) + $this.q24(_this__u8e3s4.n24_1) + ' = serialization.deserialize(requireNotNull(request.' + fields + '["' + _this__u8e3s4.n24_1.b1() + '"]) { "' + $this.q24(_this__u8e3s4.n24_1) + ' is null" }, typeOf<' + $this.t24(_this__u8e3s4.o24_1) + '>())';
+  function emitDeserializedParams_3(_this__u8e3s4, $this, fields) {
+    return _this__u8e3s4.p24_1 ? Spacer_instance.e24(3) + $this.q24(_this__u8e3s4.n24_1) + ' = request.' + fields + '["' + _this__u8e3s4.n24_1.b1() + '"]?.let{ serialization.deserializeParam(it, typeOf<' + $this.t24(_this__u8e3s4.o24_1) + '>()) }' : Spacer_instance.e24(3) + $this.q24(_this__u8e3s4.n24_1) + ' = serialization.deserializeParam(requireNotNull(request.' + fields + '["' + _this__u8e3s4.n24_1.b1() + '"]) { "' + $this.q24(_this__u8e3s4.n24_1) + ' is null" }, typeOf<' + $this.t24(_this__u8e3s4.o24_1) + '>())';
   }
   function emitIdentifier_0(_this__u8e3s4, $this) {
     return 'request.path.' + $this.q24(_this__u8e3s4.r24_1) + '.let{serialization.serialize(it, typeOf<' + $this.t24(_this__u8e3s4.s24_1) + '>())}';
@@ -1569,12 +1569,12 @@
   }
   function KotlinEmitter$emit$lambda_6(this$0) {
     return function (it) {
-      return emitSerialized_1(it, this$0);
+      return emitSerialized_0(it, this$0);
     };
   }
   function KotlinEmitter$emit$lambda_7(this$0) {
     return function (it) {
-      return emitDeserialized_2(it, this$0);
+      return emitDeserialized_1(it, this$0);
     };
   }
   function KotlinEmitter$emit$lambda_8(this$0) {
@@ -1625,12 +1625,12 @@
   }
   function KotlinEmitter$emit$lambda_13(this$0) {
     return function (it) {
-      return emitSerialized_2(it, this$0, 'queries');
+      return '(' + emitSerializedParams_0(it, this$0, 'queries') + ')';
     };
   }
   function KotlinEmitter$emit$lambda_14(this$0) {
     return function (it) {
-      return emitSerialized_2(it, this$0, 'headers');
+      return '(' + emitSerializedParams_0(it, this$0, 'headers') + ')';
     };
   }
   function KotlinEmitter$emitConstructor$lambda(this$0) {
@@ -1650,17 +1650,17 @@
   }
   function KotlinEmitter$emitDeserializedParams$lambda(this$0) {
     return function (it) {
-      return emitDeserialized_3(it, this$0);
+      return emitDeserialized_2(it, this$0);
     };
   }
   function KotlinEmitter$emitDeserializedParams$lambda_0(this$0) {
     return function (it) {
-      return emitDeserialized_4(it, this$0, 'queries');
+      return emitDeserializedParams_3(it, this$0, 'queries');
     };
   }
   function KotlinEmitter$emitDeserializedParams$lambda_1(this$0) {
     return function (it) {
-      return emitDeserialized_4(it, this$0, 'headers');
+      return emitDeserializedParams_3(it, this$0, 'headers');
     };
   }
   function KotlinEmitter$sanitizeSymbol$lambda(it) {
@@ -1968,7 +1968,7 @@
     var tmp_17;
     // Inline function 'kotlin.collections.isNotEmpty' call
     if (!endpoint.v23_1.l()) {
-      tmp_17 = 'listOf(' + joinToString(endpoint.v23_1, VOID, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_13(this)) + ').filterNotNull().toMap()';
+      tmp_17 = joinToString(endpoint.v23_1, ' + ', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_13(this));
     } else {
       tmp_17 = 'emptyMap()';
     }
@@ -1977,11 +1977,11 @@
     var tmp_20;
     // Inline function 'kotlin.collections.isNotEmpty' call
     if (!endpoint.w23_1.l()) {
-      tmp_20 = 'listOf(' + joinToString(endpoint.w23_1, VOID, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_14(this)) + ').filterNotNull().toMap()';
+      tmp_20 = joinToString(endpoint.w23_1, ' + ', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_14(this));
     } else {
       tmp_20 = 'emptyMap()';
     }
-    return trimMargin('\n        |' + tmp + tmp_0 + '\n        |' + tmp_1 + 'override val path = Path' + tmp_3 + '\n        |' + tmp_4 + 'override val method = Wirespec.Method.' + endpoint.t23_1.p2_1 + '\n        |' + tmp_5 + 'override val queries = Queries' + tmp_6 + '\n        |' + tmp_7 + 'override val headers = Headers' + tmp_8 + tmp_9 + '\n        |' + tmp_10 + '}\n        |\n        |' + tmp_11 + 'fun toRequest(serialization: Wirespec.Serializer<String>, request: Request): Wirespec.RawRequest =\n        |' + tmp_12 + 'Wirespec.RawRequest(\n        |' + tmp_13 + 'path = listOf(' + tmp_14 + '),\n        |' + tmp_15 + 'method = request.method.name,\n        |' + tmp_16 + 'queries = ' + tmp_18 + ',\n        |' + tmp_19 + 'headers = ' + tmp_20 + ',\n        |' + Spacer_instance.e24(3) + 'body = serialization.serialize(request.body, typeOf<' + emit_3(_this__u8e3s4.f24_1, this) + '>()),\n        |' + Spacer_instance.e24(2) + ')\n        |\n        |' + Spacer_instance.toString() + 'fun fromRequest(serialization: Wirespec.Deserializer<String>, request: Wirespec.RawRequest): Request =\n        |' + Spacer_instance.e24(2) + 'Request' + emitDeserializedParams_1(_this__u8e3s4, this, endpoint) + '\n    ');
+    return trimMargin('\n        |' + tmp + tmp_0 + '\n        |' + tmp_1 + 'override val path = Path' + tmp_3 + '\n        |' + tmp_4 + 'override val method = Wirespec.Method.' + endpoint.t23_1.p2_1 + '\n        |' + tmp_5 + 'override val queries = Queries' + tmp_6 + '\n        |' + tmp_7 + 'override val headers = Headers' + tmp_8 + tmp_9 + '\n        |' + tmp_10 + '}\n        |\n        |' + tmp_11 + 'fun toRequest(serialization: Wirespec.Serializer<String>, request: Request): Wirespec.RawRequest =\n        |' + tmp_12 + 'Wirespec.RawRequest(\n        |' + tmp_13 + 'path = listOf(' + tmp_14 + '),\n        |' + tmp_15 + 'method = request.method.name,\n        |' + tmp_16 + 'queries = ' + tmp_18 + ',\n        |' + tmp_19 + 'headers = ' + tmp_20 + ',\n        |' + Spacer_instance.e24(3) + 'body = serialization.serialize(request.body, typeOf<' + emit_3(_this__u8e3s4.f24_1, this) + '>()),\n        |' + Spacer_instance.e24(2) + ')\n        |\n        |' + Spacer_instance.toString() + 'fun fromRequest(serialization: Wirespec.Deserializer<String>, request: Wirespec.RawRequest): Request =\n        |' + Spacer_instance.e24(2) + 'Request' + emitDeserializedParams_2(_this__u8e3s4, this, endpoint) + '\n    ');
   };
   protoOf(KotlinEmitter).y24 = function (_this__u8e3s4) {
     return trimMargin('\n        |' + Spacer_instance.toString() + 'data class Response' + _this__u8e3s4.a24_1 + '(override val body: ' + emit_3(_this__u8e3s4.c24_1, this) + ') : Response' + toString_0(charSequenceGet(_this__u8e3s4.a24_1, 0)) + 'XX<' + emit_3(_this__u8e3s4.c24_1, this) + '>, Response' + concatGenerics(emit_3(_this__u8e3s4.c24_1, this)) + ' {\n        |' + Spacer_instance.e24(2) + 'override val status = ' + fixStatus_0(_this__u8e3s4.a24_1, this) + '\n        |' + Spacer_instance.e24(2) + 'override val headers = Headers\n        |' + Spacer_instance.e24(2) + 'data object Headers : Wirespec.Response.Headers\n        |' + Spacer_instance.toString() + '}\n    ');