@flock/wirespec 0.9.20 → 0.9.21

package/package.json

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

package/wirespec-src-compiler-core.js

@@ -91,14 +91,14 @@
   var NonEmptyList = kotlin_io_arrow_kt_arrow_core.$_$.e;
   var DefaultRaise = kotlin_io_arrow_kt_arrow_core.$_$.a;
   var getKClass = kotlin_kotlin.$_$.e;
-  var nonFatalOrThrow = kotlin_io_arrow_kt_arrow_core.$_$.g;
+  var nonFatalOrThrow = kotlin_io_arrow_kt_arrow_core.$_$.h;
   var raisedOrRethrow = kotlin_io_arrow_kt_arrow_core.$_$.b;
   var CancellationException = kotlin_kotlin.$_$.v8;
   var toList = kotlin_kotlin.$_$.i8;
   var getKClassFromExpression = kotlin_kotlin.$_$.d;
   var THROW_IAE = kotlin_kotlin.$_$.ze;
   var enumEntries = kotlin_kotlin.$_$.y8;
-  var nonEmptyListOf = kotlin_io_arrow_kt_arrow_core.$_$.f;
+  var nonEmptyListOf = kotlin_io_arrow_kt_arrow_core.$_$.g;
   var Companion_instance = kotlin_kotlin.$_$.d4;
   var _Result___init__impl__xyqfz8 = kotlin_kotlin.$_$.b2;
   var createFailure = kotlin_kotlin.$_$.mf;
@@ -108,7 +108,7 @@
   var last = kotlin_kotlin.$_$.c7;
   var removePrefix = kotlin_kotlin.$_$.xc;
   var Pair = kotlin_kotlin.$_$.ve;
-  var toNonEmptyListOrNull = kotlin_io_arrow_kt_arrow_core.$_$.h;
+  var toNonEmptyListOrNull = kotlin_io_arrow_kt_arrow_core.$_$.i;
   var ensureNotNull = kotlin_kotlin.$_$.nf;
   var println = kotlin_kotlin.$_$.z8;
   //endregion
@@ -1192,7 +1192,7 @@
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger, false);
     this.w26_1 = packageName;
-    this.x26_1 = '\nimport community.flock.wirespec.Wirespec\n';
+    this.x26_1 = '\nimport community.flock.wirespec.Wirespec\nimport kotlin.reflect.typeOf\n';
   }
   protoOf(KotlinEmitter).z21 = function (_this__u8e3s4) {
     var tmp;
@@ -1358,7 +1358,7 @@
     return trimMargin('\n        |fun <B> ' + _this__u8e3s4.k24_1 + '(contentMapper: Wirespec.ContentMapper<B>) = { request: Wirespec.Request<B> ->\n         |' + '  ' + 'when {\n         |' + tmp + '\n         |' + '  ' + '  ' + 'else -> error("Cannot map request")\n         |' + '  ' + '}\n         |}\n    ');
   };
   protoOf(KotlinEmitter).v21 = function (_this__u8e3s4) {
-    return _this__u8e3s4.p24_1 == null ? 'request.content == null -> ' + emitWrap_0(_this__u8e3s4.q24_1, this) + '(request.path, request.method, request.query, request.headers)' : trimMargin('\n                |request.content?.type == "' + _this__u8e3s4.p24_1.n24_1 + '" -> contentMapper\n                |  .read<' + emitWrap_0(_this__u8e3s4.p24_1.o24_1, this) + '>(request.content!!, Wirespec.getType(' + this.f21(_this__u8e3s4.p24_1.o24_1) + '::class.java, ' + _this__u8e3s4.r24_1 + '))\n                |  .let { ' + emitWrap_0(_this__u8e3s4.q24_1, this) + '(request.path, request.method, request.query, request.headers, it) }\n            ');
+    return _this__u8e3s4.p24_1 == null ? 'request.content == null -> ' + emitWrap_0(_this__u8e3s4.q24_1, this) + '(request.path, request.method, request.query, request.headers)' : trimMargin('\n                |request.content?.type == "' + _this__u8e3s4.p24_1.n24_1 + '" -> contentMapper\n                |  .read<' + emitWrap_0(_this__u8e3s4.p24_1.o24_1, this) + '>(request.content!!, typeOf<' + emitWrap_0(_this__u8e3s4.p24_1.o24_1, this) + '>())\n                |  .let { ' + emitWrap_0(_this__u8e3s4.q24_1, this) + '(request.path, request.method, request.query, request.headers, it) }\n            ');
   };
   protoOf(KotlinEmitter).q23 = function (_this__u8e3s4) {
     Companion_getInstance_3();
@@ -1369,7 +1369,7 @@
     return trimMargin('\n         |fun <B> ' + _this__u8e3s4.l25_1 + '(contentMapper: Wirespec.ContentMapper<B>) = { response: Wirespec.Response<B> ->\n         |' + '  ' + 'when {\n         |' + tmp + '\n         |' + '  ' + '  ' + 'else -> error("Cannot map response with status ${response.status}")\n         |' + '  ' + '}\n         |}\n    ');
   };
   protoOf(KotlinEmitter).w21 = function (_this__u8e3s4) {
-    return _this__u8e3s4.o25_1 == null ? trimMargin('\n                |' + (Companion_getInstance_3().k25(_this__u8e3s4.n25_1) ? 'response.status == ' + _this__u8e3s4.n25_1 + ' && ' : '') + 'response.content == null -> ' + emitWrap_0(_this__u8e3s4.p25_1, this) + '(response.status, response.headers, null)\n            ') : trimMargin('\n                |' + (Companion_getInstance_3().k25(_this__u8e3s4.n25_1) ? 'response.status == ' + _this__u8e3s4.n25_1 + ' && ' : '') + 'response.content?.type == "' + _this__u8e3s4.o25_1.n24_1 + '" -> contentMapper\n                |  .read<' + emitWrap_0(_this__u8e3s4.o25_1.o24_1, this) + '>(response.content!!, Wirespec.getType(' + this.f21(_this__u8e3s4.o25_1.o24_1) + '::class.java, false))\n                |  .let { ' + emitWrap_0(_this__u8e3s4.p25_1, this) + '(response.status, response.headers, it) }\n            ');
+    return _this__u8e3s4.o25_1 == null ? trimMargin('\n                |' + (Companion_getInstance_3().k25(_this__u8e3s4.n25_1) ? 'response.status == ' + _this__u8e3s4.n25_1 + ' && ' : '') + 'response.content == null -> ' + emitWrap_0(_this__u8e3s4.p25_1, this) + '(response.status, response.headers, null)\n            ') : trimMargin('\n                |' + (Companion_getInstance_3().k25(_this__u8e3s4.n25_1) ? 'response.status == ' + _this__u8e3s4.n25_1 + ' && ' : '') + 'response.content?.type == "' + _this__u8e3s4.o25_1.n24_1 + '" -> contentMapper\n                |  .read<' + emitWrap_0(_this__u8e3s4.o25_1.o24_1, this) + '>(response.content!!, typeOf<' + emitWrap_0(_this__u8e3s4.o25_1.o24_1, this) + '>())\n                |  .let { ' + emitWrap_0(_this__u8e3s4.p25_1, this) + '(response.status, response.headers, it) }\n            ');
   };
   protoOf(KotlinEmitter).u21 = function (_this__u8e3s4) {
     return sanitizeIdentifier_0(_this__u8e3s4.t25_1, this) + ': ' + emitWrap_0(_this__u8e3s4.u25_1, this);
@@ -4574,18 +4574,25 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseContent.<anonymous>' call
       $this.x29(_this__u8e3s4.s29_1);
-      var res = new Content_0('application/json', raise.ck(parseReference(_this__u8e3s4, $this, wsType, value)));
+      var reference = raise.ck(parseReference(_this__u8e3s4, $this, wsType, value));
+      var tmp_0;
+      if (reference instanceof Unit) {
+        tmp_0 = null;
+      } else {
+        tmp_0 = new Content_0('application/json', reference);
+      }
+      var res = tmp_0;
       raise.zj();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp = new Right(res);
     } catch ($p) {
-      var tmp_0;
+      var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
         raise.zj();
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var it = raisedOrRethrow(e, raise);
-        tmp_0 = new Left(it);
+        tmp_1 = new Left(it);
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
@@ -4595,7 +4602,7 @@
           throw $p;
         }
       }
-      tmp = tmp_0;
+      tmp = tmp_1;
     }
     return tmp;
   }