@flock/wirespec 0.8.23 → 0.8.25

package/wirespec-src-compiler-core.js

@@ -94,25 +94,25 @@
   setMetadataFor(Wirespec, 'Wirespec', objectMeta);
   setMetadataFor(Companion, 'Companion', objectMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.ol('Emitting Definition: Endpoint', block);
-  }
-  setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
-  function withLogging_0(_this__u8e3s4, logger, block) {
     return logger.ol('Emitting Definition: Type', block);
   }
-  function withLogging_1(_this__u8e3s4, logger, block) {
+  function withLogging_0(_this__u8e3s4, logger, block) {
     return logger.ol('Emitting Definition: Type Shape', block);
   }
-  function withLogging_2(_this__u8e3s4, logger, block) {
+  function withLogging_1(_this__u8e3s4, logger, block) {
     return logger.ol('Emitting Definition: Type Shape Field', block);
   }
-  function withLogging_3(_this__u8e3s4, logger, block) {
+  function withLogging_2(_this__u8e3s4, logger, block) {
     return logger.ol('Emitting Definition: Type Shape Field Key', block);
   }
-  function withLogging_4(_this__u8e3s4, logger, block) {
+  function withLogging_3(_this__u8e3s4, logger, block) {
     return logger.ol('Emitting Definition: Type Shape Field Value', block);
   }
   setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
+  function withLogging_4(_this__u8e3s4, logger, block) {
+    return logger.ol('Emitting Definition: Endpoint', block);
+  }
+  setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_5(_this__u8e3s4, logger, block) {
     return logger.ol('Emitting Definition: Refined', block);
   }
@@ -127,7 +127,7 @@
     return logger.ol('Emitting Definition: Endpoint Segment', block);
   }
   setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
-  setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [EnumDefinitionEmitterLogger, TypeDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger, EndpointDefinitionEmitterLogger]);
+  setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [TypeDefinitionEmitterLogger, EnumDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger, EndpointDefinitionEmitterLogger]);
   setMetadataFor(JavaEmitter, 'JavaEmitter', classMeta, Emitter);
   setMetadataFor(Companion_0, 'Companion', objectMeta);
   setMetadataFor(KotlinEmitter, 'KotlinEmitter', classMeta, Emitter);
@@ -211,6 +211,7 @@
   setMetadataFor(Invalid, 'Invalid', objectMeta, VOID, [TokenType]);
   setMetadataFor(StartOfProgram, 'StartOfProgram', objectMeta, VOID, [WhiteSpace]);
   setMetadataFor(EndOfProgram, 'EndOfProgram', objectMeta, VOID, [TokenType]);
+  setMetadataFor(WsNumber, 'WsNumber', objectMeta, VOID, [WirespecType]);
   setMetadataFor(Logger, 'Logger', classMeta);
   setMetadataFor(noLogger$1, VOID, classMeta, Logger);
   //endregion
@@ -617,7 +618,7 @@
     Companion_getInstance_3();
     Companion_getInstance_3();
     Companion_getInstance_3();
-    return trimMargin('\n        |' + '  ' + 'static <B, Res extends Wirespec.Response<?>> Function<Wirespec.Response<B>, Res> RESPONSE_MAPPER(Wirespec.ContentMapper<B> contentMapper) {\n        |return response -> {\n        |' + tmp_0 + '\n        |' + '  ' + '  ' + 'throw new IllegalStateException("Unknown response type");\n        |' + '  ' + '};\n        |}\n    ');
+    return trimMargin('\n        |' + '  ' + 'static <B, Res extends Response<?>> Function<Wirespec.Response<B>, Res> RESPONSE_MAPPER(Wirespec.ContentMapper<B> contentMapper) {\n        |return response -> {\n        |' + tmp_0 + '\n        |' + '  ' + '  ' + 'throw new IllegalStateException("Unknown response type");\n        |' + '  ' + '};\n        |}\n    ');
   }
   function emitResponseMapperCondition(_this__u8e3s4, $this) {
     var tmp;
@@ -878,6 +879,9 @@
                 tmp_0 = 'Integer';
                 break;
               case 2:
+                tmp_0 = 'Double';
+                break;
+              case 3:
                 tmp_0 = 'Boolean';
                 break;
               default:
@@ -895,6 +899,8 @@
   }
   function JavaEmitter$emit$lambda_3(this$0, $this_emit) {
     return function () {
+      var tmp$ret$3;
+      // Inline function 'kotlin.let' call
       var tmp$ret$1;
       // Inline function 'kotlin.let' call
       var tmp0_let = emitSymbol($this_emit, this$0);
@@ -903,12 +909,18 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
       tmp$ret$0 = $this_emit.cj() ? 'java.util.List<' + tmp0_let + '>' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
-      return tmp$ret$1;
+      var tmp1_let = tmp$ret$1;
+      // Inline function 'kotlin.contracts.contract' call
+      var tmp$ret$2;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
+      tmp$ret$2 = $this_emit.zj() ? 'java.util.Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$3 = tmp$ret$2;
+      return tmp$ret$3;
     };
   }
   function invoke$sanitizeEnum(_this__u8e3s4) {
     // Inline function 'kotlin.let' call
-    var tmp0_let = replace(_this__u8e3s4, '-', '_');
+    var tmp0_let = replace(replace(replace(replace(_this__u8e3s4, '/', '_'), ' ', '_'), '-', '_'), '\u2013', '_');
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.JavaEmitter$emit$lambda.invoke.sanitizeEnum.<anonymous>' call
     return isDigit(first(tmp0_let)) ? '_' + tmp0_let : tmp0_let;
@@ -920,7 +932,7 @@
     return function () {
       Companion_getInstance_3();
       Companion_getInstance_3();
-      var tmp = this$0.jj($this_emit.zj_1);
+      var tmp = this$0.jj($this_emit.ak_1);
       Companion_getInstance_3();
       Companion_getInstance_3();
       Companion_getInstance_3();
@@ -931,27 +943,27 @@
       Companion_getInstance_3();
       Companion_getInstance_3();
       var toString = trimMargin('\n          |' + '  ' + '@Override\n          |' + '  ' + 'public String toString() {\n          |' + '  ' + '  ' + 'return label;\n          |' + '  ' + '}\n          ');
-      var tmp_0 = this$0.jj($this_emit.zj_1);
+      var tmp_0 = this$0.jj($this_emit.ak_1);
       Companion_getInstance_3();
       Companion_getInstance_3();
       var tmp_1 = ',\n' + '  ';
-      return 'public enum ' + tmp_0 + ' {\n' + '  ' + joinToString($this_emit.ak_1, tmp_1, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_0) + ';\n' + body + '\n' + toString + '\n}\n';
+      return 'public enum ' + tmp_0 + ' {\n' + '  ' + joinToString($this_emit.bk_1, tmp_1, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_0) + ';\n' + body + '\n' + toString + '\n}\n';
     };
   }
   function JavaEmitter$emit$lambda_5(this$0, $this_emit) {
     return function () {
-      var tmp = this$0.jj($this_emit.bk_1);
+      var tmp = this$0.jj($this_emit.ck_1);
       Companion_getInstance_3();
       Companion_getInstance_3();
-      var tmp_0 = this$0.dk($this_emit.ck_1);
+      var tmp_0 = this$0.ek($this_emit.dk_1);
       Companion_getInstance_3();
-      return trimMargin('public record ' + tmp + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.bk_1 + ' record) {\n            |' + '  ' + tmp_0 + '\n            |' + '  ' + '}\n            |}\n            |');
+      return trimMargin('public record ' + tmp + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.ck_1 + ' record) {\n            |' + '  ' + tmp_0 + '\n            |' + '  ' + '}\n            |}\n            |');
     };
   }
   function JavaEmitter$emit$lambda_6($this_emit) {
     return function () {
       Companion_getInstance_3();
-      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.ek_1 + ').matcher(record.value).find();';
+      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.fk_1 + ').matcher(record.value).find();';
     };
   }
   function JavaEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
@@ -1057,7 +1069,7 @@
       var tmp_6 = tmp$ret$10;
       var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_4(this$0));
       Companion_getInstance_3();
-      return trimMargin('public interface ' + $this_emit.ri_1 + ' {\n            |' + '  ' + 'static String PATH = "' + tmp + '";\n            |' + tmp_0 + '\n            |' + '  ' + 'sealed interface Request<T> extends Wirespec.Request<T> {}\n            |' + tmp_1 + '\n            |' + '  ' + 'sealed interface Response<T> extends Wirespec.Response<T> {}\n            |' + tmp_3 + '\n            |' + tmp_5 + '\n            |' + tmp_7 + '\n            |' + '  ' + 'public CompletableFuture<Response<?>> ' + Companion_getInstance_3().fk($this_emit.ri_1) + '(Request<?> request);\n            |}\n            |');
+      return trimMargin('public interface ' + $this_emit.ri_1 + ' {\n            |' + '  ' + 'static String PATH = "' + tmp + '";\n            |' + tmp_0 + '\n            |' + '  ' + 'sealed interface Request<T> extends Wirespec.Request<T> {}\n            |' + tmp_1 + '\n            |' + '  ' + 'sealed interface Response<T> extends Wirespec.Response<T> {}\n            |' + tmp_3 + '\n            |' + tmp_5 + '\n            |' + tmp_7 + '\n            |' + '  ' + 'public CompletableFuture<Response<?>> ' + Companion_getInstance_3().gk($this_emit.ri_1) + '(Request<?> request);\n            |}\n            |');
     };
   }
   function JavaEmitter$emitResponseMapper$lambda(this$0) {
@@ -1073,7 +1085,7 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = '"' + $this_emit.gk_1 + '"';
+        tmp = '"' + $this_emit.hk_1 + '"';
       } else {
         if (tmp0_subject instanceof Param) {
           tmp = $this_emit.ej_1.rj_1;
@@ -1100,7 +1112,7 @@
       tmp = '{' + it.ej_1.rj_1 + '}';
     } else {
       if (it instanceof Literal) {
-        tmp = it.gk_1;
+        tmp = it.hk_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1174,38 +1186,38 @@
     }
     return tmp0_mapTo;
   };
-  protoOf(JavaEmitter).hk = function (_this__u8e3s4) {
-    return this.ik(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda(this, _this__u8e3s4));
+  protoOf(JavaEmitter).ik = function (_this__u8e3s4) {
+    return this.jk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda(this, _this__u8e3s4));
   };
   protoOf(JavaEmitter).kj = function (_this__u8e3s4) {
-    return this.jk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.kk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(JavaEmitter).lj = function (_this__u8e3s4) {
-    return this.kk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
+    return this.lk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
   };
   protoOf(JavaEmitter).qj = function (_this__u8e3s4) {
-    return this.lk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_2(this, _this__u8e3s4));
+    return this.mk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_2(this, _this__u8e3s4));
   };
   protoOf(JavaEmitter).qi = function (_this__u8e3s4) {
     return this.hi(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_3(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).mk = function (_this__u8e3s4) {
-    return this.nk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_4(this, _this__u8e3s4));
+  protoOf(JavaEmitter).nk = function (_this__u8e3s4) {
+    return this.ok(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_4(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).ok = function (_this__u8e3s4) {
-    return this.pk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_5(this, _this__u8e3s4));
+  protoOf(JavaEmitter).pk = function (_this__u8e3s4) {
+    return this.qk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_5(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).dk = function (_this__u8e3s4) {
-    return this.qk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(JavaEmitter).ek = function (_this__u8e3s4) {
+    return this.rk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(JavaEmitter).rk = function (_this__u8e3s4) {
-    return this.sk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(JavaEmitter).sk = function (_this__u8e3s4) {
+    return this.tk(_this__u8e3s4, this.ai_1, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   protoOf(JavaEmitter).sj = function (_this__u8e3s4) {
     return Companion_getInstance_0().gj_1.j1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
   };
   protoOf(JavaEmitter).jj = function (_this__u8e3s4) {
-    return replace(_this__u8e3s4, '.', '');
+    return replace(replace(_this__u8e3s4, '.', ''), ' ', '_');
   };
   function emitSymbol_0(_this__u8e3s4, $this) {
     return $this.hi(_this__u8e3s4, $this.ai_1, KotlinEmitter$emitSymbol$lambda($this, _this__u8e3s4));
@@ -1313,7 +1325,7 @@
     while (tmp0_iterator.d()) {
       var element = tmp0_iterator.e();
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      if (Companion_getInstance_3().yk(element.zi_1)) {
+      if (Companion_getInstance_3().zk(element.zi_1)) {
         tmp0_filterTo.a(element);
       }
     }
@@ -1339,7 +1351,7 @@
     while (tmp0_iterator_1.d()) {
       var element_0 = tmp0_iterator_1.e();
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      if (!Companion_getInstance_3().yk(element_0.zi_1)) {
+      if (!Companion_getInstance_3().zk(element_0.zi_1)) {
         tmp0_filterTo_0.a(element_0);
       }
     }
@@ -1380,7 +1392,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp_0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      if (Companion_getInstance_3().yk(tmp0_takeIf)) {
+      if (Companion_getInstance_3().zk(tmp0_takeIf)) {
         tmp_0 = tmp0_takeIf;
       } else {
         tmp_0 = null;
@@ -1401,7 +1413,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp_4;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      if (!Companion_getInstance_3().yk(tmp1_takeIf)) {
+      if (!Companion_getInstance_3().zk(tmp1_takeIf)) {
         tmp_4 = tmp1_takeIf;
       } else {
         tmp_4 = null;
@@ -1426,7 +1438,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp_6;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      if (Companion_getInstance_3().yk(tmp2_takeIf)) {
+      if (Companion_getInstance_3().zk(tmp2_takeIf)) {
         tmp_6 = tmp2_takeIf;
       } else {
         tmp_6 = null;
@@ -1461,7 +1473,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp_14;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      if (!Companion_getInstance_3().yk(tmp3_takeIf)) {
+      if (!Companion_getInstance_3().zk(tmp3_takeIf)) {
         tmp_14 = tmp3_takeIf;
       } else {
         tmp_14 = null;
@@ -1481,7 +1493,7 @@
   }
   function Companion_0() {
     Companion_instance_0 = this;
-    this.zk_1 = listOf(['as', 'break', 'class', 'continue', 'do', 'else', 'false', 'for', 'fun', 'if', 'in', 'interface', 'is', 'null', 'object', 'package', 'return', 'super', 'this', 'throw', 'true', 'try', 'typealias', 'typeof', 'val', 'var', 'when', 'while']);
+    this.al_1 = listOf(['as', 'break', 'class', 'continue', 'do', 'else', 'false', 'for', 'fun', 'if', 'in', 'interface', 'is', 'null', 'object', 'package', 'return', 'super', 'this', 'throw', 'true', 'try', 'typealias', 'typeof', 'val', 'var', 'when', 'while']);
   }
   var Companion_instance_0;
   function Companion_getInstance_1() {
@@ -1557,6 +1569,9 @@
                 tmp_0 = 'Int';
                 break;
               case 2:
+                tmp_0 = 'Double';
+                break;
+              case 3:
                 tmp_0 = 'Boolean';
                 break;
               default:
@@ -1588,7 +1603,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.al() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.zj() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -1607,11 +1622,11 @@
   }
   function KotlinEmitter$emit$lambda_4(this$0, $this_emit) {
     return function () {
-      var tmp = this$0.jj($this_emit.zj_1);
+      var tmp = this$0.jj($this_emit.ak_1);
       Companion_getInstance_3();
       Companion_getInstance_3();
       var tmp_0 = ',\n' + '  ';
-      var tmp_1 = joinToString($this_emit.ak_1, tmp_0, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_0(this$0));
+      var tmp_1 = joinToString($this_emit.bk_1, tmp_0, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_0(this$0));
       Companion_getInstance_3();
       Companion_getInstance_3();
       Companion_getInstance_3();
@@ -1621,12 +1636,12 @@
   }
   function KotlinEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return trimMargin('data class ' + $this_emit.bk_1 + '(val value: String)\n            |fun ' + $this_emit.bk_1 + '.validate() = ' + this$0.dk($this_emit.ck_1) + '\n            |');
+      return trimMargin('data class ' + $this_emit.ck_1 + '(val value: String)\n            |fun ' + $this_emit.ck_1 + '.validate() = ' + this$0.ek($this_emit.dk_1) + '\n            |');
     };
   }
   function KotlinEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return 'Regex(' + $this_emit.ek_1 + ').find(value)';
+      return 'Regex(' + $this_emit.fk_1 + ').find(value)';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
@@ -1799,7 +1814,7 @@
         var element = tmp0_iterator_0.e();
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$3 = Companion_getInstance_3().yk(element.zi_1);
+        tmp$ret$3 = Companion_getInstance_3().zk(element.zi_1);
         if (tmp$ret$3) {
           tmp0_filterTo.a(element);
         }
@@ -1835,7 +1850,7 @@
         var element_0 = tmp0_iterator_2.e();
         var tmp$ret$9;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$9 = Companion_getInstance_3().yk(element_0.zi_1);
+        tmp$ret$9 = Companion_getInstance_3().zk(element_0.zi_1);
         if (tmp$ret$9) {
           tmp0_filterTo_0.a(element_0);
         }
@@ -1873,7 +1888,7 @@
         var element_1 = tmp0_iterator_4.e();
         var tmp$ret$14;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$14 = !Companion_getInstance_3().yk(element_1.zi_1);
+        tmp$ret$14 = !Companion_getInstance_3().zk(element_1.zi_1);
         if (tmp$ret$14) {
           tmp0_filterTo_1.a(element_1);
         }
@@ -1899,7 +1914,7 @@
       var tmp_6 = tmp$ret$18;
       var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_5(this$0));
       Companion_getInstance_3();
-      var tmp_8 = Companion_getInstance_3().fk($this_emit.ri_1);
+      var tmp_8 = Companion_getInstance_3().gk($this_emit.ri_1);
       Companion_getInstance_3();
       Companion_getInstance_3();
       Companion_getInstance_3();
@@ -1921,7 +1936,7 @@
       tmp = '{' + it.ej_1.rj_1 + '}';
     } else {
       if (it instanceof Literal) {
-        tmp = it.gk_1;
+        tmp = it.hk_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1938,7 +1953,7 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.gk_1;
+        tmp = $this_emit.hk_1;
       } else {
         if (tmp0_subject instanceof Param) {
           tmp = '${' + $this_emit.ej_1.rj_1 + '}';
@@ -1974,7 +1989,7 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.vk_1 = packageName;
+    this.wk_1 = packageName;
     var tmp = this;
     Companion_getInstance_3();
     Companion_getInstance_3();
@@ -2023,8 +2038,8 @@
     Companion_getInstance_3();
     Companion_getInstance_3();
     Companion_getInstance_3();
-    tmp.wk_1 = trimMargin('\n        |package community.flock.wirespec\n        |\n        |import java.lang.reflect.Type\n        |import java.lang.reflect.ParameterizedType\n        |\n        |interface Wirespec {\n        |' + '  ' + 'enum class Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + '  ' + '@JvmRecord data class Content<T> (val type:String, val body:T )\n        |' + '  ' + 'interface Request<T> { val path:String; val method: Method; val query: Map<String, List<Any?>>; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface Response<T> { val status:Int; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface ContentMapper<B> { fun <T> read(content: Content<B>, valueType: Type): Content<T> fun <T> write(content: Content<T>): Content<B> }\n        |' + '  ' + 'companion object {\n        |' + '  ' + '  ' + '@JvmStatic fun getType(type: Class<*>, isIterable: Boolean): Type {\n        |' + '  ' + '  ' + '  ' + 'return if (isIterable) {\n        |' + '  ' + '  ' + '  ' + '  ' + 'object : ParameterizedType {\n        |' + '  ' + '  ' + '  ' + '  ' + '  ' + 'override fun getRawType() = MutableList::class.java\n        |' + '  ' + '  ' + '  ' + '  ' + '  ' + 'override fun getActualTypeArguments() = arrayOf(type)\n        |' + '  ' + '  ' + '  ' + '  ' + '  ' + 'override fun getOwnerType() = null\n        |' + '  ' + '  ' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '  ' + '} else {\n        |' + '  ' + '  ' + '  ' + '  ' + 'type\n        |' + '  ' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n    ');
-    this.xk_1 = '\nimport community.flock.wirespec.Wirespec\n';
+    tmp.xk_1 = trimMargin('\n        |package community.flock.wirespec\n        |\n        |import java.lang.reflect.Type\n        |import java.lang.reflect.ParameterizedType\n        |\n        |interface Wirespec {\n        |' + '  ' + 'enum class Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + '  ' + '@JvmRecord data class Content<T> (val type:String, val body:T )\n        |' + '  ' + 'interface Request<T> { val path:String; val method: Method; val query: Map<String, List<Any?>>; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface Response<T> { val status:Int; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface ContentMapper<B> { fun <T> read(content: Content<B>, valueType: Type): Content<T> fun <T> write(content: Content<T>): Content<B> }\n        |' + '  ' + 'companion object {\n        |' + '  ' + '  ' + '@JvmStatic fun getType(type: Class<*>, isIterable: Boolean): Type {\n        |' + '  ' + '  ' + '  ' + 'return if (isIterable) {\n        |' + '  ' + '  ' + '  ' + '  ' + 'object : ParameterizedType {\n        |' + '  ' + '  ' + '  ' + '  ' + '  ' + 'override fun getRawType() = MutableList::class.java\n        |' + '  ' + '  ' + '  ' + '  ' + '  ' + 'override fun getActualTypeArguments() = arrayOf(type)\n        |' + '  ' + '  ' + '  ' + '  ' + '  ' + 'override fun getOwnerType() = null\n        |' + '  ' + '  ' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '  ' + '} else {\n        |' + '  ' + '  ' + '  ' + '  ' + 'type\n        |' + '  ' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n    ');
+    this.yk_1 = '\nimport community.flock.wirespec.Wirespec\n';
   }
   protoOf(KotlinEmitter).ci = function (ast) {
     // Inline function 'kotlin.collections.map' call
@@ -2041,42 +2056,42 @@
       var tmp = this.jj(name);
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.vk_1) ? '' : 'package ' + this.vk_1) + '\n                    |' + (Companion_getInstance_3().gi(ast) ? this.xk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.wk_1) ? '' : 'package ' + this.wk_1) + '\n                    |' + (Companion_getInstance_3().gi(ast) ? this.yk_1 : '') + '\n                    |' + result + '\n            ');
       tmp$ret$0 = toString(trimStart(isCharSequence(tmp0_trimStart) ? tmp0_trimStart : THROW_CCE()));
       tmp$ret$1 = to(tmp, tmp$ret$0);
       tmp0_mapTo.a(tmp$ret$1);
     }
     return tmp0_mapTo;
   };
-  protoOf(KotlinEmitter).hk = function (_this__u8e3s4) {
-    return this.ik(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda(this, _this__u8e3s4));
+  protoOf(KotlinEmitter).ik = function (_this__u8e3s4) {
+    return this.jk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda(this, _this__u8e3s4));
   };
   protoOf(KotlinEmitter).kj = function (_this__u8e3s4) {
-    return this.jk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.kk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(KotlinEmitter).lj = function (_this__u8e3s4) {
-    return this.kk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.lk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(KotlinEmitter).qj = function (_this__u8e3s4) {
-    return this.lk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_2(this, _this__u8e3s4));
+    return this.mk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_2(this, _this__u8e3s4));
   };
   protoOf(KotlinEmitter).qi = function (_this__u8e3s4) {
     return this.hi(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_3(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).mk = function (_this__u8e3s4) {
-    return this.nk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_4(this, _this__u8e3s4));
+  protoOf(KotlinEmitter).nk = function (_this__u8e3s4) {
+    return this.ok(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_4(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).ok = function (_this__u8e3s4) {
-    return this.pk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).pk = function (_this__u8e3s4) {
+    return this.qk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).dk = function (_this__u8e3s4) {
-    return this.qk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(KotlinEmitter).ek = function (_this__u8e3s4) {
+    return this.rk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(KotlinEmitter).rk = function (_this__u8e3s4) {
-    return this.sk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).sk = function (_this__u8e3s4) {
+    return this.tk(_this__u8e3s4, this.ai_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   protoOf(KotlinEmitter).sj = function (_this__u8e3s4) {
-    return Companion_getInstance_1().zk_1.j1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
+    return Companion_getInstance_1().al_1.j1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
   };
   protoOf(KotlinEmitter).jj = function (_this__u8e3s4) {
     return replace(_this__u8e3s4, '.', '');
@@ -2090,7 +2105,7 @@
   }
   function groupStatus_0(_this__u8e3s4) {
     var tmp;
-    if (Companion_getInstance_3().yk(_this__u8e3s4)) {
+    if (Companion_getInstance_3().zk(_this__u8e3s4)) {
       // Inline function 'kotlin.text.substring' call
       // Inline function 'kotlin.js.asDynamic' call
       tmp = _this__u8e3s4.substring(0, 1) + 'XX';
@@ -2165,6 +2180,9 @@
                 tmp_0 = 'Int';
                 break;
               case 2:
+                tmp_0 = 'Double';
+                break;
+              case 3:
                 tmp_0 = 'Boolean';
                 break;
               default:
@@ -2203,20 +2221,20 @@
       // Inline function 'kotlin.js.asDynamic' call
       tmp$ret$0 = tmp0_uppercase;
       tmp$ret$1 = tmp$ret$0.toUpperCase();
-      return '  ' + 'final case object ' + tmp$ret$1 + ' extends ' + $this_emit.zj_1 + '(label = "' + it + '")';
+      return '  ' + 'final case object ' + tmp$ret$1 + ' extends ' + $this_emit.ak_1 + '(label = "' + it + '")';
     };
   }
   function ScalaEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return trimMargin('\n        |sealed abstract class ' + $this_emit.zj_1 + '(val label: String)\n        |object ' + $this_emit.zj_1 + ' {\n        |' + joinToString($this_emit.ak_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
+      return trimMargin('\n        |sealed abstract class ' + $this_emit.ak_1 + '(val label: String)\n        |object ' + $this_emit.ak_1 + ' {\n        |' + joinToString($this_emit.bk_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
     };
   }
   function ScalaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_3();
-      var tmp = this$0.dk($this_emit.ck_1);
+      var tmp = this$0.ek($this_emit.dk_1);
       Companion_getInstance_3();
-      return trimMargin('case class ' + $this_emit.bk_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.bk_1 + 'Ops(val that: ' + $this_emit.bk_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
+      return trimMargin('case class ' + $this_emit.ck_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.ck_1 + 'Ops(val that: ' + $this_emit.ck_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
     };
   }
   function ScalaEmitter$emit$lambda_6($this_emit) {
@@ -2225,7 +2243,7 @@
       Companion_getInstance_3();
       Companion_getInstance_3();
       Companion_getInstance_3();
-      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.ek_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
+      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.fk_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
     };
   }
   function ScalaEmitter$emit$lambda_7() {
@@ -2256,32 +2274,32 @@
     }
     return tmp0_mapTo;
   };
-  protoOf(ScalaEmitter).hk = function (_this__u8e3s4) {
-    return this.ik(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
+  protoOf(ScalaEmitter).ik = function (_this__u8e3s4) {
+    return this.jk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(ScalaEmitter).kj = function (_this__u8e3s4) {
-    return this.jk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.kk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(ScalaEmitter).lj = function (_this__u8e3s4) {
-    return this.kk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.lk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(ScalaEmitter).qj = function (_this__u8e3s4) {
-    return this.lk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.mk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(ScalaEmitter).qi = function (_this__u8e3s4) {
     return this.hi(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).mk = function (_this__u8e3s4) {
-    return this.nk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(ScalaEmitter).nk = function (_this__u8e3s4) {
+    return this.ok(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).ok = function (_this__u8e3s4) {
-    return this.pk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(ScalaEmitter).pk = function (_this__u8e3s4) {
+    return this.qk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(ScalaEmitter).dk = function (_this__u8e3s4) {
-    return this.qk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(ScalaEmitter).ek = function (_this__u8e3s4) {
+    return this.rk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).rk = function (_this__u8e3s4) {
-    return this.sk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_7);
+  protoOf(ScalaEmitter).sk = function (_this__u8e3s4) {
+    return this.tk(_this__u8e3s4, this.ai_1, ScalaEmitter$emit$lambda_7);
   };
   function emitType(_this__u8e3s4, $this) {
     return '`' + joinToString(_this__u8e3s4, '', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitType$lambda($this)) + '`';
@@ -2361,6 +2379,9 @@
                 tmp_0 = 'number';
                 break;
               case 2:
+                tmp_0 = 'number';
+                break;
+              case 3:
                 tmp_0 = 'boolean';
                 break;
               default:
@@ -2383,7 +2404,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.al() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.zj() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -2393,18 +2414,18 @@
   }
   function TypeScriptEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return 'type ' + $this_emit.zj_1 + ' = ' + joinToString($this_emit.ak_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
+      return 'type ' + $this_emit.ak_1 + ' = ' + joinToString($this_emit.bk_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
     };
   }
   function TypeScriptEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_3();
-      return trimMargin('type ' + $this_emit.bk_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.bk_1 + ' = (type: ' + $this_emit.bk_1 + ') => (' + this$0.dk($this_emit.ck_1) + ').test(type.value);\n            |\n            |');
+      return trimMargin('type ' + $this_emit.ck_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.ck_1 + ' = (type: ' + $this_emit.ck_1 + ') => (' + this$0.ek($this_emit.dk_1) + ').test(type.value);\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return "new RegExp('" + dropLast(drop($this_emit.ek_1, 1), 1) + "')";
+      return "new RegExp('" + dropLast(drop($this_emit.fk_1, 1), 1) + "')";
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
@@ -2473,7 +2494,7 @@
     return function (it) {
       Companion_getInstance_3();
       var tmp = emitName_0(it, this$0);
-      var tmp_0 = Companion_getInstance_3().yk(it.zi_1) ? it.zi_1 : 'number';
+      var tmp_0 = Companion_getInstance_3().zk(it.zi_1) ? it.zi_1 : 'number';
       var tmp0_safe_receiver = it.aj_1;
       var tmp_1;
       if (tmp0_safe_receiver == null) {
@@ -2504,7 +2525,7 @@
   }
   function TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit) {
     return function (it) {
-      var tmp = Companion_getInstance_3().fk(emitName(it, this$0));
+      var tmp = Companion_getInstance_3().gk(emitName(it, this$0));
       var tmp_0 = Companion_getInstance_3().kl($this_emit, it.ii_1);
       var tmp_1 = joinToString(tmp_0, ',', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda$lambda(this$0));
       var tmp_2 = emitPath_1($this_emit.ti_1, this$0);
@@ -2543,7 +2564,7 @@
       Companion_getInstance_3();
       Companion_getInstance_3();
       Companion_getInstance_3();
-      var tmp_7 = Companion_getInstance_3().fk($this_emit.ri_1);
+      var tmp_7 = Companion_getInstance_3().gk($this_emit.ri_1);
       Companion_getInstance_3();
       Companion_getInstance_3();
       return trimMargin('\n          |export namespace ' + $this_emit.ri_1 + ' {\n          |' + tmp_0 + '\n          |' + '  ' + 'export type Request = ' + tmp_2 + '\n          |' + tmp_4 + '\n          |' + '  ' + 'export type Response = ' + tmp_6 + '\n          |' + '  ' + 'export type Call = {\n          |' + '  ' + '  ' + tmp_7 + ':(request: Request) => Promise<Response>\n          |' + '  ' + '}\n          |' + '  ' + joinToString($this_emit.xi_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit)) + '\n          |}\n          |\n        ');
@@ -2559,7 +2580,7 @@
       var tmp0_subject = $this_emitType;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emitType.gk_1;
+        tmp = $this_emitType.hk_1;
       } else {
         if (tmp0_subject instanceof Param) {
           tmp = '${' + this$0.qi($this_emitType.fj_1) + '}';
@@ -2585,7 +2606,7 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.gk_1;
+        tmp = $this_emit.hk_1;
       } else {
         if (tmp0_subject instanceof Param) {
           tmp = '${' + $this_emit.ej_1.rj_1 + '}';
@@ -2628,32 +2649,32 @@
     }
     return tmp0_mapTo;
   };
-  protoOf(TypeScriptEmitter).hk = function (_this__u8e3s4) {
-    return this.ik(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).ik = function (_this__u8e3s4) {
+    return this.jk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(TypeScriptEmitter).kj = function (_this__u8e3s4) {
-    return this.jk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.kk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(TypeScriptEmitter).lj = function (_this__u8e3s4) {
-    return this.kk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.lk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(TypeScriptEmitter).qj = function (_this__u8e3s4) {
-    return this.lk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.mk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(TypeScriptEmitter).qi = function (_this__u8e3s4) {
     return this.hi(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).mk = function (_this__u8e3s4) {
-    return this.nk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).nk = function (_this__u8e3s4) {
+    return this.ok(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).ok = function (_this__u8e3s4) {
-    return this.pk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).pk = function (_this__u8e3s4) {
+    return this.qk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(TypeScriptEmitter).dk = function (_this__u8e3s4) {
-    return this.qk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).ek = function (_this__u8e3s4) {
+    return this.rk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).rk = function (_this__u8e3s4) {
-    return this.sk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).sk = function (_this__u8e3s4) {
+    return this.tk(_this__u8e3s4, this.ai_1, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function WirespecEmitter$emit$lambda($this_emit, this$0) {
     return function () {
@@ -2705,6 +2726,9 @@
                 tmp_0 = 'Integer';
                 break;
               case 2:
+                tmp_0 = 'Number';
+                break;
+              case 3:
                 tmp_0 = 'Boolean';
                 break;
               default:
@@ -2729,17 +2753,17 @@
   function WirespecEmitter$emit$lambda_4($this_emit) {
     return function () {
       Companion_getInstance_3();
-      return 'enum ' + $this_emit.zj_1 + ' {\n' + '  ' + joinToString($this_emit.ak_1, ', ') + '\n}\n';
+      return 'enum ' + $this_emit.ak_1 + ' {\n' + '  ' + joinToString($this_emit.bk_1, ', ') + '\n}\n';
     };
   }
   function WirespecEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return 'refined ' + $this_emit.bk_1 + ' ' + this$0.dk($this_emit.ck_1) + '\n';
+      return 'refined ' + $this_emit.ck_1 + ' ' + this$0.ek($this_emit.dk_1) + '\n';
     };
   }
   function WirespecEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return '/' + dropLast(drop($this_emit.ek_1, 1), 1) + '/g';
+      return '/' + dropLast(drop($this_emit.fk_1, 1), 1) + '/g';
     };
   }
   function WirespecEmitter$emit$lambda_7() {
@@ -2750,32 +2774,32 @@
     Emitter.call(this, logger);
     this.nl_1 = '';
   }
-  protoOf(WirespecEmitter).hk = function (_this__u8e3s4) {
-    return this.ik(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
+  protoOf(WirespecEmitter).ik = function (_this__u8e3s4) {
+    return this.jk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(WirespecEmitter).kj = function (_this__u8e3s4) {
-    return this.jk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.kk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(WirespecEmitter).lj = function (_this__u8e3s4) {
-    return this.kk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.lk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(WirespecEmitter).qj = function (_this__u8e3s4) {
-    return this.lk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.mk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(WirespecEmitter).qi = function (_this__u8e3s4) {
     return this.hi(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).mk = function (_this__u8e3s4) {
-    return this.nk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(WirespecEmitter).nk = function (_this__u8e3s4) {
+    return this.ok(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).ok = function (_this__u8e3s4) {
-    return this.pk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(WirespecEmitter).pk = function (_this__u8e3s4) {
+    return this.qk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(WirespecEmitter).dk = function (_this__u8e3s4) {
-    return this.qk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(WirespecEmitter).ek = function (_this__u8e3s4) {
+    return this.rk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).rk = function (_this__u8e3s4) {
-    return this.sk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_7);
+  protoOf(WirespecEmitter).sk = function (_this__u8e3s4) {
+    return this.tk(_this__u8e3s4, this.ai_1, WirespecEmitter$emit$lambda_7);
   };
   function get_DEFAULT_PACKAGE_NAME() {
     return DEFAULT_PACKAGE_NAME;
@@ -2805,7 +2829,7 @@
     }
     return tmp;
   };
-  protoOf(Companion_2).fk = function (_this__u8e3s4) {
+  protoOf(Companion_2).gk = function (_this__u8e3s4) {
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
     // Inline function 'kotlin.text.isNotEmpty' call
@@ -2880,7 +2904,7 @@
     var tmp1_safe_receiver = content == null ? null : content.ki_1;
     return filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
   };
-  protoOf(Companion_2).yk = function (_this__u8e3s4) {
+  protoOf(Companion_2).zk = function (_this__u8e3s4) {
     return !(toIntOrNull(_this__u8e3s4) == null);
   };
   var Companion_instance_2;
@@ -2911,16 +2935,16 @@
       this.ai_1.qh('Emitting Node ' + this);
       var tmp;
       if (item instanceof Type_0) {
-        tmp = to(item.hj_1, this.hk(item));
+        tmp = to(item.hj_1, this.ik(item));
       } else {
         if (item instanceof Endpoint) {
-          tmp = to(item.ri_1, this.rk(item));
+          tmp = to(item.ri_1, this.sk(item));
         } else {
           if (item instanceof Enum_0) {
-            tmp = to(item.zj_1, this.mk(item));
+            tmp = to(item.ak_1, this.nk(item));
           } else {
             if (item instanceof Refined) {
-              tmp = to(item.bk_1, this.ok(item));
+              tmp = to(item.ck_1, this.pk(item));
             } else {
               noWhenBranchMatchedException();
             }
@@ -3361,13 +3385,17 @@
         if (wsType instanceof WsInteger) {
           tmp_1 = new Primitive(Type_Integer_getInstance(), isIterable);
         } else {
-          if (wsType instanceof WsBoolean) {
-            tmp_1 = new Primitive(Type_Boolean_getInstance(), isIterable);
+          if (wsType instanceof WsNumber) {
+            tmp_1 = new Primitive(Type_Number_getInstance(), isIterable);
           } else {
-            if (wsType instanceof CustomType) {
-              tmp_1 = new Custom(value, isIterable);
+            if (wsType instanceof WsBoolean) {
+              tmp_1 = new Primitive(Type_Boolean_getInstance(), isIterable);
             } else {
-              noWhenBranchMatchedException();
+              if (wsType instanceof CustomType) {
+                tmp_1 = new Custom(value, isIterable);
+              } else {
+                noWhenBranchMatchedException();
+              }
             }
           }
         }
@@ -4330,13 +4358,17 @@
         if (wsType instanceof WsInteger) {
           tmp_1 = new Primitive(Type_Integer_getInstance(), isIterable);
         } else {
-          if (wsType instanceof WsBoolean) {
-            tmp_1 = new Primitive(Type_Boolean_getInstance(), isIterable);
+          if (wsType instanceof WsNumber) {
+            tmp_1 = new Primitive(Type_Number_getInstance(), isIterable);
           } else {
-            if (wsType instanceof CustomType) {
-              tmp_1 = new Custom(value, isIterable);
+            if (wsType instanceof WsBoolean) {
+              tmp_1 = new Primitive(Type_Boolean_getInstance(), isIterable);
             } else {
-              noWhenBranchMatchedException();
+              if (wsType instanceof CustomType) {
+                tmp_1 = new Custom(value, isIterable);
+              } else {
+                noWhenBranchMatchedException();
+              }
             }
           }
         }
@@ -4453,13 +4485,13 @@
   }
   var $ENTRIES;
   function Literal(value) {
-    this.gk_1 = value;
+    this.hk_1 = value;
   }
   protoOf(Literal).toString = function () {
-    return 'Literal(value=' + this.gk_1 + ')';
+    return 'Literal(value=' + this.hk_1 + ')';
   };
   protoOf(Literal).hashCode = function () {
-    return getStringHashCode(this.gk_1);
+    return getStringHashCode(this.hk_1);
   };
   protoOf(Literal).equals = function (other) {
     if (this === other)
@@ -4467,7 +4499,7 @@
     if (!(other instanceof Literal))
       return false;
     var tmp0_other_with_cast = other instanceof Literal ? other : THROW_CCE();
-    if (!(this.gk_1 === tmp0_other_with_cast.gk_1))
+    if (!(this.hk_1 === tmp0_other_with_cast.hk_1))
       return false;
     return true;
   };
@@ -4651,15 +4683,15 @@
     return true;
   };
   function Enum_0(name, entries) {
-    this.zj_1 = name;
-    this.ak_1 = entries;
+    this.ak_1 = name;
+    this.bk_1 = entries;
   }
   protoOf(Enum_0).toString = function () {
-    return 'Enum(name=' + this.zj_1 + ', entries=' + this.ak_1 + ')';
+    return 'Enum(name=' + this.ak_1 + ', entries=' + this.bk_1 + ')';
   };
   protoOf(Enum_0).hashCode = function () {
-    var result = getStringHashCode(this.zj_1);
-    result = imul(result, 31) + hashCode(this.ak_1) | 0;
+    var result = getStringHashCode(this.ak_1);
+    result = imul(result, 31) + hashCode(this.bk_1) | 0;
     return result;
   };
   protoOf(Enum_0).equals = function (other) {
@@ -4668,20 +4700,20 @@
     if (!(other instanceof Enum_0))
       return false;
     var tmp0_other_with_cast = other instanceof Enum_0 ? other : THROW_CCE();
-    if (!(this.zj_1 === tmp0_other_with_cast.zj_1))
+    if (!(this.ak_1 === tmp0_other_with_cast.ak_1))
       return false;
-    if (!equals(this.ak_1, tmp0_other_with_cast.ak_1))
+    if (!equals(this.bk_1, tmp0_other_with_cast.bk_1))
       return false;
     return true;
   };
   function Validator(value) {
-    this.ek_1 = value;
+    this.fk_1 = value;
   }
   protoOf(Validator).toString = function () {
-    return 'Validator(value=' + this.ek_1 + ')';
+    return 'Validator(value=' + this.fk_1 + ')';
   };
   protoOf(Validator).hashCode = function () {
-    return getStringHashCode(this.ek_1);
+    return getStringHashCode(this.fk_1);
   };
   protoOf(Validator).equals = function (other) {
     if (this === other)
@@ -4689,20 +4721,20 @@
     if (!(other instanceof Validator))
       return false;
     var tmp0_other_with_cast = other instanceof Validator ? other : THROW_CCE();
-    if (!(this.ek_1 === tmp0_other_with_cast.ek_1))
+    if (!(this.fk_1 === tmp0_other_with_cast.fk_1))
       return false;
     return true;
   };
   function Refined(name, validator) {
-    this.bk_1 = name;
-    this.ck_1 = validator;
+    this.ck_1 = name;
+    this.dk_1 = validator;
   }
   protoOf(Refined).toString = function () {
-    return 'Refined(name=' + this.bk_1 + ', validator=' + this.ck_1 + ')';
+    return 'Refined(name=' + this.ck_1 + ', validator=' + this.dk_1 + ')';
   };
   protoOf(Refined).hashCode = function () {
-    var result = getStringHashCode(this.bk_1);
-    result = imul(result, 31) + this.ck_1.hashCode() | 0;
+    var result = getStringHashCode(this.ck_1);
+    result = imul(result, 31) + this.dk_1.hashCode() | 0;
     return result;
   };
   protoOf(Refined).equals = function (other) {
@@ -4711,14 +4743,15 @@
     if (!(other instanceof Refined))
       return false;
     var tmp0_other_with_cast = other instanceof Refined ? other : THROW_CCE();
-    if (!(this.bk_1 === tmp0_other_with_cast.bk_1))
+    if (!(this.ck_1 === tmp0_other_with_cast.ck_1))
       return false;
-    if (!this.ck_1.equals(tmp0_other_with_cast.ck_1))
+    if (!this.dk_1.equals(tmp0_other_with_cast.dk_1))
       return false;
     return true;
   };
   var Type_String_instance;
   var Type_Integer_instance;
+  var Type_Number_instance;
   var Type_Boolean_instance;
   var Type_entriesInitialized;
   function Type_initEntries() {
@@ -4727,7 +4760,8 @@
     Type_entriesInitialized = true;
     Type_String_instance = new Type('String', 0);
     Type_Integer_instance = new Type('Integer', 1);
-    Type_Boolean_instance = new Type('Boolean', 2);
+    Type_Number_instance = new Type('Number', 2);
+    Type_Boolean_instance = new Type('Boolean', 3);
   }
   function Type(name, ordinal) {
     Enum.call(this, name, ordinal);
@@ -4740,6 +4774,10 @@
     Type_initEntries();
     return Type_Integer_instance;
   }
+  function Type_Number_getInstance() {
+    Type_initEntries();
+    return Type_Number_instance;
+  }
   function Type_Boolean_getInstance() {
     Type_initEntries();
     return Type_Boolean_instance;
@@ -4752,7 +4790,7 @@
   protoOf(Any).cj = function () {
     return this.nm_1;
   };
-  protoOf(Any).al = function () {
+  protoOf(Any).zj = function () {
     return this.om_1;
   };
   protoOf(Any).pm = function (isIterable, isMap) {
@@ -4792,7 +4830,7 @@
   protoOf(Custom).cj = function () {
     return this.xj_1;
   };
-  protoOf(Custom).al = function () {
+  protoOf(Custom).zj = function () {
     return this.yj_1;
   };
   protoOf(Custom).rm = function (value, isIterable, isMap) {
@@ -4836,7 +4874,7 @@
   protoOf(Primitive).cj = function () {
     return this.uj_1;
   };
-  protoOf(Primitive).al = function () {
+  protoOf(Primitive).zj = function () {
     return this.vj_1;
   };
   protoOf(Primitive).tm = function (type, isIterable, isMap) {
@@ -5922,6 +5960,8 @@
   }
   function Method_0() {
   }
+  function WsNumber() {
+  }
   function validate(_this__u8e3s4) {
     return _this__u8e3s4;
   }
@@ -5961,54 +6001,54 @@
     }
   }
   //region block: post-declaration
-  protoOf(JavaEmitter).ik = withLogging_0;
-  protoOf(JavaEmitter).jk = withLogging_1;
-  protoOf(JavaEmitter).kk = withLogging_2;
-  protoOf(JavaEmitter).lk = withLogging_3;
-  protoOf(JavaEmitter).hi = withLogging_4;
-  protoOf(JavaEmitter).nk = withLogging;
-  protoOf(JavaEmitter).pk = withLogging_5;
-  protoOf(JavaEmitter).qk = withLogging_6;
-  protoOf(JavaEmitter).sk = withLogging_7;
+  protoOf(JavaEmitter).jk = withLogging;
+  protoOf(JavaEmitter).kk = withLogging_0;
+  protoOf(JavaEmitter).lk = withLogging_1;
+  protoOf(JavaEmitter).mk = withLogging_2;
+  protoOf(JavaEmitter).hi = withLogging_3;
+  protoOf(JavaEmitter).ok = withLogging_4;
+  protoOf(JavaEmitter).qk = withLogging_5;
+  protoOf(JavaEmitter).rk = withLogging_6;
+  protoOf(JavaEmitter).tk = withLogging_7;
   protoOf(JavaEmitter).dj = withLogging_8;
-  protoOf(KotlinEmitter).ik = withLogging_0;
-  protoOf(KotlinEmitter).jk = withLogging_1;
-  protoOf(KotlinEmitter).kk = withLogging_2;
-  protoOf(KotlinEmitter).lk = withLogging_3;
-  protoOf(KotlinEmitter).hi = withLogging_4;
-  protoOf(KotlinEmitter).nk = withLogging;
-  protoOf(KotlinEmitter).pk = withLogging_5;
-  protoOf(KotlinEmitter).qk = withLogging_6;
-  protoOf(KotlinEmitter).sk = withLogging_7;
+  protoOf(KotlinEmitter).jk = withLogging;
+  protoOf(KotlinEmitter).kk = withLogging_0;
+  protoOf(KotlinEmitter).lk = withLogging_1;
+  protoOf(KotlinEmitter).mk = withLogging_2;
+  protoOf(KotlinEmitter).hi = withLogging_3;
+  protoOf(KotlinEmitter).ok = withLogging_4;
+  protoOf(KotlinEmitter).qk = withLogging_5;
+  protoOf(KotlinEmitter).rk = withLogging_6;
+  protoOf(KotlinEmitter).tk = withLogging_7;
   protoOf(KotlinEmitter).dj = withLogging_8;
-  protoOf(ScalaEmitter).ik = withLogging_0;
-  protoOf(ScalaEmitter).jk = withLogging_1;
-  protoOf(ScalaEmitter).kk = withLogging_2;
-  protoOf(ScalaEmitter).lk = withLogging_3;
-  protoOf(ScalaEmitter).hi = withLogging_4;
-  protoOf(ScalaEmitter).nk = withLogging;
-  protoOf(ScalaEmitter).pk = withLogging_5;
-  protoOf(ScalaEmitter).qk = withLogging_6;
-  protoOf(ScalaEmitter).sk = withLogging_7;
-  protoOf(TypeScriptEmitter).ik = withLogging_0;
-  protoOf(TypeScriptEmitter).jk = withLogging_1;
-  protoOf(TypeScriptEmitter).kk = withLogging_2;
-  protoOf(TypeScriptEmitter).lk = withLogging_3;
-  protoOf(TypeScriptEmitter).hi = withLogging_4;
-  protoOf(TypeScriptEmitter).nk = withLogging;
-  protoOf(TypeScriptEmitter).pk = withLogging_5;
-  protoOf(TypeScriptEmitter).qk = withLogging_6;
-  protoOf(TypeScriptEmitter).sk = withLogging_7;
+  protoOf(ScalaEmitter).jk = withLogging;
+  protoOf(ScalaEmitter).kk = withLogging_0;
+  protoOf(ScalaEmitter).lk = withLogging_1;
+  protoOf(ScalaEmitter).mk = withLogging_2;
+  protoOf(ScalaEmitter).hi = withLogging_3;
+  protoOf(ScalaEmitter).ok = withLogging_4;
+  protoOf(ScalaEmitter).qk = withLogging_5;
+  protoOf(ScalaEmitter).rk = withLogging_6;
+  protoOf(ScalaEmitter).tk = withLogging_7;
+  protoOf(TypeScriptEmitter).jk = withLogging;
+  protoOf(TypeScriptEmitter).kk = withLogging_0;
+  protoOf(TypeScriptEmitter).lk = withLogging_1;
+  protoOf(TypeScriptEmitter).mk = withLogging_2;
+  protoOf(TypeScriptEmitter).hi = withLogging_3;
+  protoOf(TypeScriptEmitter).ok = withLogging_4;
+  protoOf(TypeScriptEmitter).qk = withLogging_5;
+  protoOf(TypeScriptEmitter).rk = withLogging_6;
+  protoOf(TypeScriptEmitter).tk = withLogging_7;
   protoOf(TypeScriptEmitter).dj = withLogging_8;
-  protoOf(WirespecEmitter).ik = withLogging_0;
-  protoOf(WirespecEmitter).jk = withLogging_1;
-  protoOf(WirespecEmitter).kk = withLogging_2;
-  protoOf(WirespecEmitter).lk = withLogging_3;
-  protoOf(WirespecEmitter).hi = withLogging_4;
-  protoOf(WirespecEmitter).nk = withLogging;
-  protoOf(WirespecEmitter).pk = withLogging_5;
-  protoOf(WirespecEmitter).qk = withLogging_6;
-  protoOf(WirespecEmitter).sk = withLogging_7;
+  protoOf(WirespecEmitter).jk = withLogging;
+  protoOf(WirespecEmitter).kk = withLogging_0;
+  protoOf(WirespecEmitter).lk = withLogging_1;
+  protoOf(WirespecEmitter).mk = withLogging_2;
+  protoOf(WirespecEmitter).hi = withLogging_3;
+  protoOf(WirespecEmitter).ok = withLogging_4;
+  protoOf(WirespecEmitter).qk = withLogging_5;
+  protoOf(WirespecEmitter).rk = withLogging_6;
+  protoOf(WirespecEmitter).tk = withLogging_7;
   protoOf(WsTypeDef).sl = name;
   protoOf(WsEnumTypeDef).sl = name;
   protoOf(WsRefinedTypeDef).sl = name;
@@ -6074,9 +6114,10 @@
   _.$_$.y = Logger;
   _.$_$.z = Type_Boolean_getInstance;
   _.$_$.a1 = Type_Integer_getInstance;
-  _.$_$.b1 = Type_String_getInstance;
-  _.$_$.c1 = Companion_getInstance_3;
-  _.$_$.d1 = Wirespec_getInstance;
+  _.$_$.b1 = Type_Number_getInstance;
+  _.$_$.c1 = Type_String_getInstance;
+  _.$_$.d1 = Companion_getInstance_3;
+  _.$_$.e1 = Wirespec_getInstance;
   //endregion
   return _;
 }));