@flock/wirespec 0.8.31 → 0.8.32

package/wirespec-src-compiler-core.js

@@ -55,36 +55,36 @@
   var trimStart = kotlin_kotlin.$_$.ha;
   var firstOrNull = kotlin_kotlin.$_$.f5;
   var take = kotlin_kotlin.$_$.j6;
-  var ParameterLocation_BODY_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.v;
+  var ParameterLocation_BODY_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.w;
   var ParameterObject = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.d;
-  var ParameterLocation_QUERY_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.y;
+  var ParameterLocation_QUERY_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.z;
   var mapCapacity = kotlin_kotlin.$_$.x5;
   var coerceAtLeast = kotlin_kotlin.$_$.p8;
   var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.o;
-  var _StatusCode___init__impl__t1yi9q = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.o1;
+  var _StatusCode___init__impl__t1yi9q = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.p1;
   var StatusCode = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.k;
-  var Type_ARRAY_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.z;
+  var Type_ARRAY_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.a1;
   var SchemaObject = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.j;
   var ResponseObject = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.i;
   var OperationObject = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.c;
-  var Type_STRING_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.e1;
-  var Type_INTEGER_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.b1;
-  var Type_NUMBER_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.c1;
-  var Type_BOOLEAN_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.a1;
-  var Type_OBJECT_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.d1;
+  var Type_STRING_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.f1;
+  var Type_INTEGER_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.c1;
+  var Type_NUMBER_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.d1;
+  var Type_BOOLEAN_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.b1;
+  var Type_OBJECT_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.e1;
   var InfoObject = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.b;
   var listOf_0 = kotlin_kotlin.$_$.v5;
   var LinkedHashMap_init_$Create$_0 = kotlin_kotlin.$_$.p;
-  var _Path___init__impl__6uf4pw = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.j1;
+  var _Path___init__impl__6uf4pw = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.k1;
   var Path = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.f;
-  var ParameterLocation_PATH_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.x;
+  var ParameterLocation_PATH_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.y;
   var PathItemObject = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.e;
   var toMap = kotlin_kotlin.$_$.p6;
   var plus_1 = kotlin_kotlin.$_$.a6;
   var SwaggerObject = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.l;
-  var Default_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.x1;
+  var Default_getInstance = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.y1;
   var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.f1;
-  var _Ref___init__impl__7qfl46 = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.m1;
+  var _Ref___init__impl__7qfl46 = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.n1;
   var ReferenceObject = kotlin_community_flock_kotlinx_openapi_bindings_kotlin_openapi_bindings.$_$.g;
   var dropLast = kotlin_kotlin.$_$.c9;
   var drop = kotlin_kotlin.$_$.d9;
@@ -132,37 +132,37 @@
   setMetadataFor(Companion, 'Companion', objectMeta);
   setMetadataFor(Emitter, 'Emitter', classMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Endpoint', block);
+    return logger.b25('Emitting Definition: Endpoint', block);
   }
   setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_0(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Endpoint', block);
+    return logger.b25('Emitting Definition: Endpoint', block);
   }
   function withLogging_1(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Endpoint Segment', block);
+    return logger.b25('Emitting Definition: Endpoint Segment', block);
   }
   setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
   function withLogging_2(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Type', block);
+    return logger.b25('Emitting Definition: Type', block);
   }
   function withLogging_3(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Type Shape', block);
+    return logger.b25('Emitting Definition: Type Shape', block);
   }
   function withLogging_4(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Type Shape Field', block);
+    return logger.b25('Emitting Definition: Type Shape Field', block);
   }
   function withLogging_5(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Type Shape Field Key', block);
+    return logger.b25('Emitting Definition: Type Shape Field Key', block);
   }
   function withLogging_6(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Type Shape Field Value', block);
+    return logger.b25('Emitting Definition: Type Shape Field Value', block);
   }
   setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_7(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Refined', block);
+    return logger.b25('Emitting Definition: Refined', block);
   }
   function withLogging_8(_this__u8e3s4, logger, block) {
-    return logger.a25('Emitting Definition: Refined Validator', block);
+    return logger.b25('Emitting Definition: Refined Validator', block);
   }
   setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   setMetadataFor(AbstractEmitter, 'AbstractEmitter', classMeta, Emitter, [Emitter, EnumDefinitionEmitterLogger, EndpointDefinitionEmitterLogger, TypeDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger]);
@@ -532,10 +532,10 @@
   }
   function emit_0(_this__u8e3s4, $this) {
     Companion_getInstance_4();
-    var tmp = Companion_getInstance_4().z21(_this__u8e3s4.x21_1);
-    var tmp_0 = emitContentType(_this__u8e3s4.y21_1, $this);
-    var tmp_1 = orEmptyString(Companion_getInstance_4().z21(_this__u8e3s4.x21_1), $this);
-    var tmp0_safe_receiver = _this__u8e3s4.y21_1;
+    var tmp = Companion_getInstance_4().a22(_this__u8e3s4.x21_1);
+    var tmp_0 = emitContentType(_this__u8e3s4.z21_1, $this);
+    var tmp_1 = orEmptyString(Companion_getInstance_4().a22(_this__u8e3s4.x21_1), $this);
+    var tmp0_safe_receiver = _this__u8e3s4.z21_1;
     var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g21_1;
     var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.o21(tmp1_safe_receiver);
     var tmp_2 = tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
@@ -545,14 +545,14 @@
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
-    var tmp3_safe_receiver = _this__u8e3s4.y21_1;
+    var tmp3_safe_receiver = _this__u8e3s4.z21_1;
     var tmp4_safe_receiver = tmp3_safe_receiver == null ? null : tmp3_safe_receiver.g21_1;
     var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : $this.o21(tmp4_safe_receiver);
     var tmp_3 = tmp5_elvis_lhs == null ? 'Void' : tmp5_elvis_lhs;
     Companion_getInstance_4();
     Companion_getInstance_4();
-    var tmp_4 = Companion_getInstance_4().z21(_this__u8e3s4.x21_1);
-    var tmp_5 = emitContentType(_this__u8e3s4.y21_1, $this);
+    var tmp_4 = Companion_getInstance_4().a22(_this__u8e3s4.x21_1);
+    var tmp_5 = emitContentType(_this__u8e3s4.z21_1, $this);
     // Inline function 'kotlin.takeIf' call
     var tmp0_takeIf = _this__u8e3s4.x21_1;
     // Inline function 'kotlin.contracts.contract' call
@@ -573,7 +573,7 @@
       tmp_7 = 'int status, ';
     }
     var tmp_8 = orEmptyString(tmp_7, $this);
-    var tmp7_safe_receiver = _this__u8e3s4.y21_1;
+    var tmp7_safe_receiver = _this__u8e3s4.z21_1;
     var tmp_9;
     if (tmp7_safe_receiver == null) {
       tmp_9 = null;
@@ -606,7 +606,7 @@
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
-    var tmp10_safe_receiver = _this__u8e3s4.y21_1;
+    var tmp10_safe_receiver = _this__u8e3s4.z21_1;
     var tmp_13;
     if (tmp10_safe_receiver == null) {
       tmp_13 = null;
@@ -626,7 +626,7 @@
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
-    var tmp12_safe_receiver = _this__u8e3s4.y21_1;
+    var tmp12_safe_receiver = _this__u8e3s4.z21_1;
     var tmp13_safe_receiver = tmp12_safe_receiver == null ? null : tmp12_safe_receiver.g21_1;
     var tmp14_elvis_lhs = tmp13_safe_receiver == null ? null : $this.o21(tmp13_safe_receiver);
     var tmp_15 = tmp14_elvis_lhs == null ? 'Void' : tmp14_elvis_lhs;
@@ -642,7 +642,7 @@
     while (tmp0_iterator.d()) {
       var e = tmp0_iterator.e();
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver = e.y21_1;
+      var tmp0_safe_receiver = e.z21_1;
       var key = to(e.x21_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f21_1);
       if (set.a(key)) {
         list.a(e);
@@ -657,7 +657,7 @@
   }
   function emitResponseMapperCondition(_this__u8e3s4, $this) {
     var tmp;
-    if (_this__u8e3s4.y21_1 == null) {
+    if (_this__u8e3s4.z21_1 == null) {
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
@@ -681,7 +681,7 @@
         tmp_1 = 'response.getStatus() == ' + _this__u8e3s4.x21_1 + ' && ';
       }
       var tmp_2 = orEmptyString(tmp_1, $this);
-      var tmp_3 = Companion_getInstance_4().z21(_this__u8e3s4.x21_1);
+      var tmp_3 = Companion_getInstance_4().a22(_this__u8e3s4.x21_1);
       // Inline function 'kotlin.takeIf' call
       var tmp1_takeIf = _this__u8e3s4.x21_1;
       // Inline function 'kotlin.contracts.contract' call
@@ -730,15 +730,15 @@
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
-      var tmp_9 = $this.o21(_this__u8e3s4.y21_1.g21_1);
-      var tmp_10 = emitSymbol(_this__u8e3s4.y21_1.g21_1, $this);
-      var tmp_11 = _this__u8e3s4.y21_1.g21_1.a22();
+      var tmp_9 = $this.o21(_this__u8e3s4.z21_1.g21_1);
+      var tmp_10 = emitSymbol(_this__u8e3s4.z21_1.g21_1, $this);
+      var tmp_11 = _this__u8e3s4.z21_1.g21_1.b22();
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
-      var tmp_12 = Companion_getInstance_4().z21(_this__u8e3s4.x21_1);
-      var tmp_13 = emitContentType(_this__u8e3s4.y21_1, $this);
+      var tmp_12 = Companion_getInstance_4().a22(_this__u8e3s4.x21_1);
+      var tmp_13 = emitContentType(_this__u8e3s4.z21_1, $this);
       // Inline function 'kotlin.takeIf' call
       var tmp3_takeIf = _this__u8e3s4.x21_1;
       // Inline function 'kotlin.contracts.contract' call
@@ -762,7 +762,7 @@
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
-      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'if(' + tmp_8 + 'response.getContent().type().equals("' + _this__u8e3s4.y21_1.f21_1 + '")) {\n                    |' + '  ' + '  ' + '  ' + '  ' + 'Wirespec.Content<' + tmp_9 + '> content = contentMapper.read(response.getContent(), Wirespec.getType(' + tmp_10 + '.class, ' + tmp_11 + '));\n                    |' + '  ' + '  ' + '  ' + '  ' + 'return (Res) new Response' + tmp_12 + tmp_13 + '(' + tmp_16 + 'response.getHeaders(), content.body());\n                    |' + '  ' + '  ' + '  ' + '}\n                    |\n                ');
+      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'if(' + tmp_8 + 'response.getContent().type().equals("' + _this__u8e3s4.z21_1.f21_1 + '")) {\n                    |' + '  ' + '  ' + '  ' + '  ' + 'Wirespec.Content<' + tmp_9 + '> content = contentMapper.read(response.getContent(), Wirespec.getType(' + tmp_10 + '.class, ' + tmp_11 + '));\n                    |' + '  ' + '  ' + '  ' + '  ' + 'return (Res) new Response' + tmp_12 + tmp_13 + '(' + tmp_16 + 'response.getHeaders(), content.body());\n                    |' + '  ' + '  ' + '  ' + '}\n                    |\n                ');
     }
     return tmp;
   }
@@ -780,7 +780,7 @@
   }
   function emit_1(_this__u8e3s4, $this) {
     var tmp = $this.c21();
-    return $this.b22(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.c22(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function emitRequestSignature(_this__u8e3s4, $this, content) {
     // Inline function 'kotlin.collections.map' call
@@ -802,7 +802,7 @@
       var item = tmp0_iterator_0.e();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitRequestSignature.<anonymous>' call
-      tmp$ret$2 = new Field(item.c22_1, item.d22_1, false);
+      tmp$ret$2 = new Field(item.d22_1, item.e22_1, false);
       tmp0_mapTo.a(tmp$ret$2);
     }
     var pathField = tmp0_mapTo;
@@ -833,13 +833,13 @@
       // Inline function 'kotlin.js.asDynamic' call
       tmp = _this__u8e3s4.substring(0, 1) + 'XX';
     } else {
-      tmp = Companion_getInstance_4().z21(_this__u8e3s4);
+      tmp = Companion_getInstance_4().a22(_this__u8e3s4);
     }
     return tmp;
   }
   function Companion() {
     Companion_instance = this;
-    this.e22_1 = listOf(['abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default', 'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private', 'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte', 'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return', 'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final', 'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp', 'volatile', 'const', 'float', 'native', 'super', 'while']);
+    this.f22_1 = listOf(['abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default', 'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private', 'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte', 'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return', 'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final', 'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp', 'volatile', 'const', 'float', 'native', 'super', 'while']);
   }
   var Companion_instance;
   function Companion_getInstance_0() {
@@ -849,30 +849,30 @@
   }
   function JavaEmitter$emit$lambda(this$0, $this_emit) {
     return function () {
-      return trimMargin('public record ' + this$0.h22($this_emit.f22_1) + '(\n            |' + this$0.i22($this_emit.g22_1) + '\n            |) {};\n            |');
+      return trimMargin('public record ' + this$0.i22($this_emit.g22_1) + '(\n            |' + this$0.j22($this_emit.h22_1) + '\n            |) {};\n            |');
     };
   }
   function JavaEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.j22(it);
+      return this$0.k22(it);
     };
   }
   function JavaEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.k22_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.l22_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda(this$0));
     };
   }
   function JavaEmitter$emit$lambda_1($this_emit, this$0) {
     return function () {
       Companion_getInstance_4();
-      return '  ' + ($this_emit.n22_1 ? 'java.util.Optional<' + this$0.o21($this_emit.m22_1) + '>' : this$0.o21($this_emit.m22_1)) + ' ' + this$0.o22($this_emit.l22_1);
+      return '  ' + ($this_emit.o22_1 ? 'java.util.Optional<' + this$0.o21($this_emit.n22_1) + '>' : this$0.o21($this_emit.n22_1)) + ' ' + this$0.p22($this_emit.m22_1);
     };
   }
   function JavaEmitter$emit$lambda_2(this$0, $this_emit) {
     return function () {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.mapIndexed' call
-      var tmp0_mapIndexed = split($this_emit.p22_1, ['-']);
+      var tmp0_mapIndexed = split($this_emit.q22_1, ['-']);
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapIndexedTo' call
       var tmp0_mapIndexedTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp0_mapIndexed, 10));
@@ -885,12 +885,12 @@
         var tmp1 = index;
         index = tmp1 + 1 | 0;
         var tmp1_anonymous = checkIndexOverflow(tmp1);
-        tmp$ret$0 = tmp1_anonymous > 0 ? Companion_getInstance_4().z21(item) : item;
+        tmp$ret$0 = tmp1_anonymous > 0 ? Companion_getInstance_4().a22(item) : item;
         tmp0_mapIndexedTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapIndexedTo;
       tmp$ret$2 = tmp$ret$1;
-      return this$0.h22(this$0.q22(joinToString(tmp$ret$2, '')));
+      return this$0.i22(this$0.r22(joinToString(tmp$ret$2, '')));
     };
   }
   function JavaEmitter$emitSymbol$lambda(this$0, $this_emitSymbol) {
@@ -901,10 +901,10 @@
         tmp = 'Object';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emitSymbol.u22_1;
+          tmp = $this_emitSymbol.v22_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emitSymbol.r22_1;
+            var tmp1_subject = $this_emitSymbol.s22_1;
             var tmp0 = tmp1_subject.w4_1;
             var tmp_0;
             switch (tmp0) {
@@ -930,7 +930,7 @@
           }
         }
       }
-      return this$0.h22(tmp);
+      return this$0.i22(tmp);
     };
   }
   function JavaEmitter$emit$lambda_3(this$0, $this_emit) {
@@ -943,13 +943,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.a22() ? 'java.util.List<' + tmp0_let + '>' : tmp0_let;
+      tmp$ret$0 = $this_emit.b22() ? 'java.util.List<' + tmp0_let + '>' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       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.x22() ? 'java.util.Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.y22() ? 'java.util.Map<String, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -968,7 +968,7 @@
     return function () {
       Companion_getInstance_4();
       Companion_getInstance_4();
-      var tmp = this$0.h22($this_emit.y22_1);
+      var tmp = this$0.i22($this_emit.z22_1);
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
@@ -979,27 +979,27 @@
       Companion_getInstance_4();
       Companion_getInstance_4();
       var toString = trimMargin('\n          |' + '  ' + '@Override\n          |' + '  ' + 'public String toString() {\n          |' + '  ' + '  ' + 'return label;\n          |' + '  ' + '}\n          ');
-      var tmp_0 = this$0.h22($this_emit.y22_1);
+      var tmp_0 = this$0.i22($this_emit.z22_1);
       Companion_getInstance_4();
       Companion_getInstance_4();
       var tmp_1 = ',\n' + '  ';
-      return 'public enum ' + tmp_0 + ' {\n' + '  ' + joinToString($this_emit.z22_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.a23_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.h22($this_emit.a23_1);
+      var tmp = this$0.i22($this_emit.b23_1);
       Companion_getInstance_4();
       Companion_getInstance_4();
-      var tmp_0 = this$0.c23($this_emit.b23_1);
+      var tmp_0 = this$0.d23($this_emit.c23_1);
       Companion_getInstance_4();
-      return trimMargin('public record ' + tmp + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.a23_1 + ' record) {\n            |' + '  ' + tmp_0 + '\n            |' + '  ' + '}\n            |}\n            |');
+      return trimMargin('public record ' + tmp + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.b23_1 + ' record) {\n            |' + '  ' + tmp_0 + '\n            |' + '  ' + '}\n            |}\n            |');
     };
   }
   function JavaEmitter$emit$lambda_6($this_emit) {
     return function () {
       Companion_getInstance_4();
-      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.d23_1 + ').matcher(record.value).find();';
+      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.e23_1 + ').matcher(record.value).find();';
     };
   }
   function JavaEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
@@ -1094,7 +1094,7 @@
         var e = tmp0_iterator_2.e();
         var tmp$ret$9;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver = e.y21_1;
+        var tmp0_safe_receiver = e.z21_1;
         tmp$ret$9 = to(e.x21_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f21_1);
         var key = tmp$ret$9;
         if (set.a(key)) {
@@ -1105,7 +1105,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_4();
-      return trimMargin('public interface ' + $this_emit.p21_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_4().e23($this_emit.p21_1) + '(Request<?> request);\n            |}\n            |');
+      return trimMargin('public interface ' + $this_emit.p21_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_4().f23($this_emit.p21_1) + '(Request<?> request);\n            |}\n            |');
     };
   }
   function JavaEmitter$emitResponseMapper$lambda(this$0) {
@@ -1114,17 +1114,17 @@
     };
   }
   function JavaEmitter$emitContentType$lambda(it) {
-    return Companion_getInstance_4().z21(it);
+    return Companion_getInstance_4().a22(it);
   }
   function JavaEmitter$emit$lambda_8($this_emit) {
     return function () {
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = '"' + $this_emit.f23_1 + '"';
+        tmp = '"' + $this_emit.g23_1 + '"';
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = $this_emit.c22_1.p22_1;
+          tmp = $this_emit.d22_1.q22_1;
         } else {
           noWhenBranchMatchedException();
         }
@@ -1134,21 +1134,21 @@
   }
   function JavaEmitter$emitRequestSignature$lambda(this$0) {
     return function (it) {
-      return this$0.j22(it);
+      return this$0.k22(it);
     };
   }
   function JavaEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return 'java.util.Map.entry("' + it.l22_1.p22_1 + '", java.util.List.of(' + this$0.o22(it.l22_1) + '))';
+      return 'java.util.Map.entry("' + it.m22_1.q22_1 + '", java.util.List.of(' + this$0.p22(it.m22_1) + '))';
     };
   }
   function JavaEmitter$emitSegment$lambda(it) {
     var tmp;
     if (it instanceof Param) {
-      tmp = '{' + it.c22_1.p22_1 + '}';
+      tmp = '{' + it.d22_1.q22_1 + '}';
     } else {
       if (it instanceof Literal) {
-        tmp = it.f23_1;
+        tmp = it.g23_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1217,51 +1217,51 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
       var name = item.j3();
       var result = item.k3();
-      tmp$ret$0 = to(this.h22(name), this.n21_1 + '\n\n' + import_0(this, ast) + result);
+      tmp$ret$0 = to(this.i22(name), this.n21_1 + '\n\n' + import_0(this, ast) + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     return tmp0_mapTo;
   };
-  protoOf(JavaEmitter).g23 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).h23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.h23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda(this, _this__u8e3s4));
+    return this.i23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).i22 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).j22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.i23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.j23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).j22 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).k22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.j23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
+    return this.k23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).o22 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).p22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.k23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_2(this, _this__u8e3s4));
+    return this.l23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_2(this, _this__u8e3s4));
   };
   protoOf(JavaEmitter).o21 = function (_this__u8e3s4) {
     var tmp = this.c21();
     return this.d21(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_3(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).l23 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).m23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.m23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_4(this, _this__u8e3s4));
+    return this.n23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_4(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).n23 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).o23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.o23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_5(this, _this__u8e3s4));
+    return this.p23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_5(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).c23 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).d23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.p23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_6(_this__u8e3s4));
+    return this.q23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(JavaEmitter).q23 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).r23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.r23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
+    return this.s23(_this__u8e3s4, tmp, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).q22 = function (_this__u8e3s4) {
-    return Companion_getInstance_0().e22_1.j1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  protoOf(JavaEmitter).r22 = function (_this__u8e3s4) {
+    return Companion_getInstance_0().f22_1.j1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
   };
-  protoOf(JavaEmitter).h22 = function (_this__u8e3s4) {
+  protoOf(JavaEmitter).i22 = function (_this__u8e3s4) {
     return replace(replace(_this__u8e3s4, '.', ''), ' ', '_');
   };
   function emitSymbol_0(_this__u8e3s4, $this) {
@@ -1288,7 +1288,7 @@
       var item = tmp0_iterator_0.e();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitRequestSignature.<anonymous>' call
-      tmp$ret$2 = new Field(item.c22_1, item.d22_1, false);
+      tmp$ret$2 = new Field(item.d22_1, item.e22_1, false);
       tmp0_mapTo.a(tmp$ret$2);
     }
     var pathField = tmp0_mapTo;
@@ -1305,7 +1305,7 @@
   }
   function emit_2(_this__u8e3s4, $this) {
     var tmp = $this.c21();
-    return $this.b22(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.c22(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function emitPath_0(_this__u8e3s4, $this) {
     return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, KotlinEmitter$emitPath$lambda($this));
@@ -1348,7 +1348,7 @@
       Companion_getInstance_4();
       var tmp_0 = $this.o21(_this__u8e3s4.e21_1.g21_1);
       var tmp_1 = emitSymbol_0(_this__u8e3s4.e21_1.g21_1, $this);
-      var tmp_2 = _this__u8e3s4.e21_1.g21_1.a22();
+      var tmp_2 = _this__u8e3s4.e21_1.g21_1.b22();
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
@@ -1372,7 +1372,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_4().a24(element.x21_1)) {
+      if (Companion_getInstance_4().b24(element.x21_1)) {
         tmp0_filterTo.a(element);
       }
     }
@@ -1382,7 +1382,7 @@
     while (tmp0_iterator_0.d()) {
       var e = tmp0_iterator_0.e();
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver = e.y21_1;
+      var tmp0_safe_receiver = e.z21_1;
       var key = to(e.x21_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f21_1);
       if (set.a(key)) {
         list.a(e);
@@ -1398,7 +1398,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_4().a24(element_0.x21_1)) {
+      if (!Companion_getInstance_4().b24(element_0.x21_1)) {
         tmp0_filterTo_0.a(element_0);
       }
     }
@@ -1408,7 +1408,7 @@
     while (tmp0_iterator_2.d()) {
       var e_0 = tmp0_iterator_2.e();
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver_0 = e_0.y21_1;
+      var tmp0_safe_receiver_0 = e_0.z21_1;
       var key_0 = to(e_0.x21_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.f21_1);
       if (set_0.a(key_0)) {
         list_0.a(e_0);
@@ -1429,7 +1429,7 @@
   }
   function emitResponseMapperCondition_0(_this__u8e3s4, $this) {
     var tmp;
-    if (_this__u8e3s4.y21_1 == null) {
+    if (_this__u8e3s4.z21_1 == null) {
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
@@ -1439,7 +1439,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_4().a24(tmp0_takeIf)) {
+      if (Companion_getInstance_4().b24(tmp0_takeIf)) {
         tmp_0 = tmp0_takeIf;
       } else {
         tmp_0 = null;
@@ -1454,13 +1454,13 @@
         tmp_1 = 'response.status == ' + _this__u8e3s4.x21_1 + ' && ';
       }
       var tmp_2 = orEmptyString_0(tmp_1);
-      var tmp_3 = Companion_getInstance_4().z21(_this__u8e3s4.x21_1);
+      var tmp_3 = Companion_getInstance_4().a22(_this__u8e3s4.x21_1);
       // Inline function 'kotlin.takeIf' call
       var tmp1_takeIf = _this__u8e3s4.x21_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_4;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      if (!Companion_getInstance_4().a24(tmp1_takeIf)) {
+      if (!Companion_getInstance_4().b24(tmp1_takeIf)) {
         tmp_4 = tmp1_takeIf;
       } else {
         tmp_4 = null;
@@ -1485,7 +1485,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_4().a24(tmp2_takeIf)) {
+      if (Companion_getInstance_4().b24(tmp2_takeIf)) {
         tmp_6 = tmp2_takeIf;
       } else {
         tmp_6 = null;
@@ -1505,22 +1505,22 @@
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
-      var tmp_9 = $this.o21(_this__u8e3s4.y21_1.g21_1);
-      var tmp_10 = emitSymbol_0(_this__u8e3s4.y21_1.g21_1, $this);
-      var tmp_11 = _this__u8e3s4.y21_1.g21_1.a22();
+      var tmp_9 = $this.o21(_this__u8e3s4.z21_1.g21_1);
+      var tmp_10 = emitSymbol_0(_this__u8e3s4.z21_1.g21_1, $this);
+      var tmp_11 = _this__u8e3s4.z21_1.g21_1.b22();
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
-      var tmp_12 = Companion_getInstance_4().z21(_this__u8e3s4.x21_1);
-      var tmp_13 = emitContentType_0(_this__u8e3s4.y21_1);
+      var tmp_12 = Companion_getInstance_4().a22(_this__u8e3s4.x21_1);
+      var tmp_13 = emitContentType_0(_this__u8e3s4.z21_1);
       // Inline function 'kotlin.takeIf' call
       var tmp3_takeIf = _this__u8e3s4.x21_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_14;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      if (!Companion_getInstance_4().a24(tmp3_takeIf)) {
+      if (!Companion_getInstance_4().b24(tmp3_takeIf)) {
         tmp_14 = tmp3_takeIf;
       } else {
         tmp_14 = null;
@@ -1534,13 +1534,13 @@
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
         tmp_15 = 'response.status, ';
       }
-      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + '  ' + tmp_8 + 'response.content?.type == "' + _this__u8e3s4.y21_1.f21_1 + '" -> contentMapper\n                    |' + '  ' + '  ' + '  ' + '  ' + '  ' + '.read<' + tmp_9 + '>(response.content!!, Wirespec.getType(' + tmp_10 + '::class.java, ' + tmp_11 + '))\n                    |' + '  ' + '  ' + '  ' + '  ' + '  ' + '.let{ Response' + tmp_12 + tmp_13 + '(' + orEmptyString_0(tmp_15) + 'response.headers, it.body) }\n                ');
+      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + '  ' + tmp_8 + 'response.content?.type == "' + _this__u8e3s4.z21_1.f21_1 + '" -> contentMapper\n                    |' + '  ' + '  ' + '  ' + '  ' + '  ' + '.read<' + tmp_9 + '>(response.content!!, Wirespec.getType(' + tmp_10 + '::class.java, ' + tmp_11 + '))\n                    |' + '  ' + '  ' + '  ' + '  ' + '  ' + '.let{ Response' + tmp_12 + tmp_13 + '(' + orEmptyString_0(tmp_15) + 'response.headers, it.body) }\n                ');
     }
     return tmp;
   }
   function Companion_0() {
     Companion_instance_0 = this;
-    this.b24_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.c24_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() {
@@ -1550,30 +1550,30 @@
   }
   function KotlinEmitter$emit$lambda(this$0, $this_emit) {
     return function () {
-      return trimMargin('|data class ' + this$0.h22($this_emit.f22_1) + '(\n           |' + this$0.i22($this_emit.g22_1) + '\n           |)\n           |');
+      return trimMargin('|data class ' + this$0.i22($this_emit.g22_1) + '(\n           |' + this$0.j22($this_emit.h22_1) + '\n           |)\n           |');
     };
   }
   function KotlinEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
       Companion_getInstance_4();
-      return '  ' + 'val ' + this$0.j22(it);
+      return '  ' + 'val ' + this$0.k22(it);
     };
   }
   function KotlinEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.k22_1, ',\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.l22_1, ',\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda(this$0));
     };
   }
   function KotlinEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
-      return this$0.o22($this_emit.l22_1) + ': ' + this$0.o21($this_emit.m22_1) + ($this_emit.n22_1 ? '? = null' : '');
+      return this$0.p22($this_emit.m22_1) + ': ' + this$0.o21($this_emit.n22_1) + ($this_emit.o22_1 ? '? = null' : '');
     };
   }
   function KotlinEmitter$emit$lambda_2(this$0, $this_emit) {
     return function () {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.mapIndexed' call
-      var tmp0_mapIndexed = split($this_emit.p22_1, ['-']);
+      var tmp0_mapIndexed = split($this_emit.q22_1, ['-']);
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapIndexedTo' call
       var tmp0_mapIndexedTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp0_mapIndexed, 10));
@@ -1586,12 +1586,12 @@
         var tmp1 = index;
         index = tmp1 + 1 | 0;
         var tmp1_anonymous = checkIndexOverflow(tmp1);
-        tmp$ret$0 = tmp1_anonymous > 0 ? Companion_getInstance_4().z21(item) : item;
+        tmp$ret$0 = tmp1_anonymous > 0 ? Companion_getInstance_4().a22(item) : item;
         tmp0_mapIndexedTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapIndexedTo;
       tmp$ret$2 = tmp$ret$1;
-      return this$0.h22(this$0.q22(joinToString(tmp$ret$2, '')));
+      return this$0.i22(this$0.r22(joinToString(tmp$ret$2, '')));
     };
   }
   function KotlinEmitter$emitSymbol$lambda(this$0, $this_emitSymbol) {
@@ -1602,10 +1602,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emitSymbol.u22_1;
+          tmp = $this_emitSymbol.v22_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emitSymbol.r22_1;
+            var tmp1_subject = $this_emitSymbol.s22_1;
             var tmp0 = tmp1_subject.w4_1;
             var tmp_0;
             switch (tmp0) {
@@ -1631,7 +1631,7 @@
           }
         }
       }
-      return this$0.h22(tmp);
+      return this$0.i22(tmp);
     };
   }
   function KotlinEmitter$emit$lambda_3(this$0, $this_emit) {
@@ -1644,13 +1644,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.a22() ? 'List<' + tmp0_let + '>' : tmp0_let;
+      tmp$ret$0 = $this_emit.b22() ? 'List<' + tmp0_let + '>' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       var tmp1_let = tmp$ret$1;
       // 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.x22() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.y22() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -1664,16 +1664,16 @@
   }
   function KotlinEmitter$emit$lambda$lambda_0(this$0) {
     return function (it) {
-      return this$0.q22(invoke$sanitizeEnum_0(it)) + '("' + it + '")';
+      return this$0.r22(invoke$sanitizeEnum_0(it)) + '("' + it + '")';
     };
   }
   function KotlinEmitter$emit$lambda_4(this$0, $this_emit) {
     return function () {
-      var tmp = this$0.h22($this_emit.y22_1);
+      var tmp = this$0.i22($this_emit.z22_1);
       Companion_getInstance_4();
       Companion_getInstance_4();
       var tmp_0 = ',\n' + '  ';
-      var tmp_1 = joinToString($this_emit.z22_1, tmp_0, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_0(this$0));
+      var tmp_1 = joinToString($this_emit.a23_1, tmp_0, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_0(this$0));
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
@@ -1683,12 +1683,12 @@
   }
   function KotlinEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return trimMargin('data class ' + $this_emit.a23_1 + '(val value: String)\n            |fun ' + $this_emit.a23_1 + '.validate() = ' + this$0.c23($this_emit.b23_1) + '\n            |');
+      return trimMargin('data class ' + $this_emit.b23_1 + '(val value: String)\n            |fun ' + $this_emit.b23_1 + '.validate() = ' + this$0.d23($this_emit.c23_1) + '\n            |');
     };
   }
   function KotlinEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return 'Regex(' + $this_emit.d23_1 + ').find(value)';
+      return 'Regex(' + $this_emit.e23_1 + ').find(value)';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
@@ -1738,10 +1738,10 @@
   function KotlinEmitter$emit$lambda$lambda_4(this$0) {
     return function (it) {
       Companion_getInstance_4();
-      var tmp0_safe_receiver = it.y21_1;
+      var tmp0_safe_receiver = it.z21_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
       var tmp = tmp1_elvis_lhs == null ? 'Unit' : tmp1_elvis_lhs;
-      var tmp2_safe_receiver = it.y21_1;
+      var tmp2_safe_receiver = it.z21_1;
       var tmp_0;
       if (tmp2_safe_receiver == null) {
         tmp_0 = null;
@@ -1757,11 +1757,11 @@
       }
       var tmp3_elvis_lhs = tmp_0;
       var tmp_1 = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-      var tmp4_safe_receiver = it.y21_1;
+      var tmp4_safe_receiver = it.z21_1;
       var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.g21_1;
       var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.o21(tmp5_safe_receiver);
       var tmp_2 = tmp6_elvis_lhs == null ? 'Unit' : tmp6_elvis_lhs;
-      var tmp7_safe_receiver = it.y21_1;
+      var tmp7_safe_receiver = it.z21_1;
       var tmp_3;
       if (tmp7_safe_receiver == null) {
         tmp_3 = null;
@@ -1782,11 +1782,11 @@
   function KotlinEmitter$emit$lambda$lambda_5(this$0) {
     return function (it) {
       Companion_getInstance_4();
-      var tmp = Companion_getInstance_4().z21(it.x21_1);
-      var tmp0_safe_receiver = it.y21_1;
+      var tmp = Companion_getInstance_4().a22(it.x21_1);
+      var tmp0_safe_receiver = it.z21_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
       var tmp_0 = tmp1_elvis_lhs == null ? 'Unit' : tmp1_elvis_lhs;
-      var tmp2_safe_receiver = it.y21_1;
+      var tmp2_safe_receiver = it.z21_1;
       var tmp_1;
       if (tmp2_safe_receiver == null) {
         tmp_1 = null;
@@ -1802,12 +1802,12 @@
       }
       var tmp3_elvis_lhs = tmp_1;
       var tmp_2 = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-      var tmp_3 = Companion_getInstance_4().z21(it.x21_1);
-      var tmp4_safe_receiver = it.y21_1;
+      var tmp_3 = Companion_getInstance_4().a22(it.x21_1);
+      var tmp4_safe_receiver = it.z21_1;
       var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.g21_1;
       var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.o21(tmp5_safe_receiver);
       var tmp_4 = tmp6_elvis_lhs == null ? 'Unit' : tmp6_elvis_lhs;
-      var tmp7_safe_receiver = it.y21_1;
+      var tmp7_safe_receiver = it.z21_1;
       var tmp_5;
       if (tmp7_safe_receiver == null) {
         tmp_5 = null;
@@ -1861,7 +1861,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_4().a24(element.x21_1);
+        tmp$ret$3 = Companion_getInstance_4().b24(element.x21_1);
         if (tmp$ret$3) {
           tmp0_filterTo.a(element);
         }
@@ -1897,7 +1897,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_4().a24(element_0.x21_1);
+        tmp$ret$9 = Companion_getInstance_4().b24(element_0.x21_1);
         if (tmp$ret$9) {
           tmp0_filterTo_0.a(element_0);
         }
@@ -1912,7 +1912,7 @@
         var e = tmp0_iterator_3.e();
         var tmp$ret$12;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver = e.y21_1;
+        var tmp0_safe_receiver = e.z21_1;
         tmp$ret$12 = to(e.x21_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.f21_1);
         var key = tmp$ret$12;
         if (set.a(key)) {
@@ -1935,7 +1935,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_4().a24(element_1.x21_1);
+        tmp$ret$14 = !Companion_getInstance_4().b24(element_1.x21_1);
         if (tmp$ret$14) {
           tmp0_filterTo_1.a(element_1);
         }
@@ -1950,7 +1950,7 @@
         var e_0 = tmp0_iterator_5.e();
         var tmp$ret$17;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver_0 = e_0.y21_1;
+        var tmp0_safe_receiver_0 = e_0.z21_1;
         tmp$ret$17 = to(e_0.x21_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.f21_1);
         var key_0 = tmp$ret$17;
         if (set_0.a(key_0)) {
@@ -1961,7 +1961,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_4();
-      var tmp_8 = Companion_getInstance_4().e23($this_emit.p21_1);
+      var tmp_8 = Companion_getInstance_4().f23($this_emit.p21_1);
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
@@ -1976,16 +1976,16 @@
   }
   function KotlinEmitter$emitRequestSignature$lambda(this$0) {
     return function (it) {
-      return this$0.j22(it);
+      return this$0.k22(it);
     };
   }
   function KotlinEmitter$emitSegment$lambda(it) {
     var tmp;
     if (it instanceof Param) {
-      tmp = '{' + it.c22_1.p22_1 + '}';
+      tmp = '{' + it.d22_1.q22_1 + '}';
     } else {
       if (it instanceof Literal) {
-        tmp = it.f23_1;
+        tmp = it.g23_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1994,7 +1994,7 @@
   }
   function KotlinEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + it.l22_1.p22_1 + '" to listOf(' + this$0.o22(it.l22_1) + ')';
+      return '"' + it.m22_1.q22_1 + '" to listOf(' + this$0.p22(it.m22_1) + ')';
     };
   }
   function KotlinEmitter$emit$lambda_8($this_emit) {
@@ -2002,10 +2002,10 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.f23_1;
+        tmp = $this_emit.g23_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + $this_emit.c22_1.p22_1 + '}';
+          tmp = '${' + $this_emit.d22_1.q22_1 + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -2038,7 +2038,7 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     AbstractEmitter.call(this, logger);
-    this.x23_1 = packageName;
+    this.y23_1 = packageName;
     var tmp = this;
     Companion_getInstance_4();
     Companion_getInstance_4();
@@ -2087,8 +2087,8 @@
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
-    tmp.y23_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.z23_1 = '\nimport community.flock.wirespec.Wirespec\n';
+    tmp.z23_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.a24_1 = '\nimport community.flock.wirespec.Wirespec\n';
   }
   protoOf(KotlinEmitter).t20 = function (ast) {
     // Inline function 'kotlin.collections.map' call
@@ -2102,70 +2102,70 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>' call
       var name = item.j3();
       var result = item.k3();
-      var tmp = this.h22(name);
+      var tmp = this.i22(name);
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.x23_1) ? '' : 'package ' + this.x23_1) + '\n                    |' + (Companion_getInstance_4().x20(ast) ? this.z23_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.y23_1) ? '' : 'package ' + this.y23_1) + '\n                    |' + (Companion_getInstance_4().x20(ast) ? this.a24_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).g23 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).h23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.h23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda(this, _this__u8e3s4));
+    return this.i23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).i22 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).j22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.i23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.j23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).j22 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).k22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.j23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.k23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).o22 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).p22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.k23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_2(this, _this__u8e3s4));
+    return this.l23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_2(this, _this__u8e3s4));
   };
   protoOf(KotlinEmitter).o21 = function (_this__u8e3s4) {
     var tmp = this.c21();
     return this.d21(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_3(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).l23 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).m23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.m23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_4(this, _this__u8e3s4));
+    return this.n23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_4(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).n23 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).o23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.o23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.p23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).c23 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).d23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.p23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
+    return this.q23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(KotlinEmitter).q23 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).r23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.r23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
+    return this.s23(_this__u8e3s4, tmp, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).q22 = function (_this__u8e3s4) {
-    return Companion_getInstance_1().b24_1.j1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
+  protoOf(KotlinEmitter).r22 = function (_this__u8e3s4) {
+    return Companion_getInstance_1().c24_1.j1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
   };
-  protoOf(KotlinEmitter).h22 = function (_this__u8e3s4) {
+  protoOf(KotlinEmitter).i22 = function (_this__u8e3s4) {
     return replace(_this__u8e3s4, '.', '');
   };
   function emitContentType_0(_this__u8e3s4) {
     var tmp = split(_this__u8e3s4.f21_1, ['/', '-']);
-    return joinToString(tmp, '', VOID, VOID, VOID, VOID, emitContentType$lambda);
+    return replace(joinToString(tmp, '', VOID, VOID, VOID, VOID, emitContentType$lambda), '+', '');
   }
   function groupStatus_0(_this__u8e3s4) {
     var tmp;
-    if (Companion_getInstance_4().a24(_this__u8e3s4)) {
+    if (Companion_getInstance_4().b24(_this__u8e3s4)) {
       // Inline function 'kotlin.text.substring' call
       // Inline function 'kotlin.js.asDynamic' call
       tmp = _this__u8e3s4.substring(0, 1) + 'XX';
     } else {
-      tmp = Companion_getInstance_4().z21(_this__u8e3s4);
+      tmp = Companion_getInstance_4().a22(_this__u8e3s4);
     }
     return tmp;
   }
@@ -2176,7 +2176,7 @@
     return _this__u8e3s4 == null ? '' : _this__u8e3s4;
   }
   function emitContentType$lambda(it) {
-    return Companion_getInstance_4().z21(it);
+    return Companion_getInstance_4().a22(it);
   }
   function emit_3(_this__u8e3s4, $this, method) {
     // Inline function 'kotlin.collections.map' call
@@ -2248,8 +2248,8 @@
       var tmp$ret$7;
       // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>' call
       var tmp0_in_0 = ParameterLocation_QUERY_getInstance();
-      var tmp1_name = item_0.l22_1.p22_1;
-      var tmp2_type = emitType_0(item_0.m22_1, $this);
+      var tmp1_name = item_0.m22_1.q22_1;
+      var tmp2_type = emitType_0(item_0.n22_1, $this);
       tmp$ret$7 = new ParameterObject(tmp1_name, tmp0_in_0, VOID, VOID, VOID, tmp2_type);
       tmp0_mapTo_0.a(tmp$ret$7);
     }
@@ -2265,7 +2265,7 @@
       // Inline function 'kotlin.collections.plusAssign' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>' call
       var tmp_1 = new StatusCode(_StatusCode___init__impl__t1yi9q(element_0.x21_1));
-      var tmp0_safe_receiver_0 = element_0.y21_1;
+      var tmp0_safe_receiver_0 = element_0.z21_1;
       var tmp1_safe_receiver = tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.g21_1;
       var tmp_2;
       if (tmp1_safe_receiver == null) {
@@ -2275,7 +2275,7 @@
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>.<anonymous>' call
         var tmp_3;
-        switch (tmp1_safe_receiver.a22()) {
+        switch (tmp1_safe_receiver.b22()) {
           case false:
             tmp_3 = $this.o21(tmp1_safe_receiver);
             break;
@@ -2320,7 +2320,7 @@
   function emitType_0(_this__u8e3s4, $this) {
     var tmp;
     if (_this__u8e3s4 instanceof Primitive) {
-      tmp = emitType(_this__u8e3s4.r22_1, $this);
+      tmp = emitType(_this__u8e3s4.s22_1, $this);
     } else {
       if (_this__u8e3s4 instanceof Custom) {
         tmp = Type_OBJECT_getInstance();
@@ -2337,10 +2337,10 @@
   function OpenApiV2Emitter$emitSegment$lambda(it) {
     var tmp;
     if (it instanceof Param) {
-      tmp = '{' + it.c22_1.p22_1 + '}';
+      tmp = '{' + it.d22_1.q22_1 + '}';
     } else {
       if (it instanceof Literal) {
-        tmp = it.f23_1;
+        tmp = it.g23_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -2351,11 +2351,11 @@
     logger = logger === VOID ? get_noLogger() : logger;
     split = split === VOID ? false : split;
     Emitter.call(this, logger, split);
-    this.e24_1 = logger;
-    this.f24_1 = split;
+    this.f24_1 = logger;
+    this.g24_1 = split;
   }
-  protoOf(OpenApiV2Emitter).s23 = function () {
-    return this.f24_1;
+  protoOf(OpenApiV2Emitter).t23 = function () {
+    return this.g24_1;
   };
   protoOf(OpenApiV2Emitter).t20 = function (ast) {
     var tmp = new InfoObject('Wirespec', VOID, VOID, VOID, VOID, '0.0.0');
@@ -2423,7 +2423,7 @@
         var tmp$ret$10;
         // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>.<anonymous>' call
         var tmp0_in = ParameterLocation_PATH_getInstance();
-        var tmp1_name = item_0.c22_1.p22_1;
+        var tmp1_name = item_0.d22_1.q22_1;
         var tmp2_type = Type_STRING_getInstance();
         tmp$ret$10 = new ParameterObject(tmp1_name, tmp0_in, VOID, VOID, VOID, tmp2_type);
         tmp0_mapTo_0.a(tmp$ret$10);
@@ -2460,8 +2460,8 @@
       // Inline function 'kotlin.collections.plusAssign' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>' call
       var tmp0_type = Type_STRING_getInstance();
-      var tmp1_pattern = element_3.b23_1.d23_1;
-      var tmp0_plusAssign = to(element_3.a23_1, new SchemaObject(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp1_pattern, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_type));
+      var tmp1_pattern = element_3.c23_1.e23_1;
+      var tmp0_plusAssign = to(element_3.b23_1, new SchemaObject(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp1_pattern, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp0_type));
       tmp0_associateTo.l3(tmp0_plusAssign.h3_1, tmp0_plusAssign.i3_1);
     }
     var tmp_5 = tmp0_associateTo;
@@ -2485,7 +2485,7 @@
       // Inline function 'kotlin.collections.plusAssign' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>' call
       // Inline function 'kotlin.collections.associate' call
-      var tmp0_associate = element_5.g22_1.k22_1;
+      var tmp0_associate = element_5.h22_1.l22_1;
       var capacity_1 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(tmp0_associate, 10)), 16);
       // Inline function 'kotlin.collections.associateTo' call
       var tmp0_associateTo_1 = LinkedHashMap_init_$Create$(capacity_1);
@@ -2494,20 +2494,20 @@
         var element_6 = tmp0_iterator_8.e();
         // Inline function 'kotlin.collections.plusAssign' call
         // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_plusAssign_0 = this.j22(element_6);
+        var tmp0_plusAssign_0 = this.k22(element_6);
         tmp0_associateTo_1.l3(tmp0_plusAssign_0.h3_1, tmp0_plusAssign_0.i3_1);
       }
       // Inline function 'kotlin.takeIf' call
       // Inline function 'kotlin.collections.map' call
       // Inline function 'kotlin.collections.filter' call
-      var tmp1_filter = element_5.g22_1.k22_1;
+      var tmp1_filter = element_5.h22_1.l22_1;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp0_filterTo = ArrayList_init_$Create$();
       var tmp0_iterator_9 = tmp1_filter.c();
       while (tmp0_iterator_9.d()) {
         var element_7 = tmp0_iterator_9.e();
         // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>.<anonymous>' call
-        if (!element_7.n22_1) {
+        if (!element_7.o22_1) {
           tmp0_filterTo.a(element_7);
         }
       }
@@ -2518,7 +2518,7 @@
         var item_1 = tmp0_iterator_10.e();
         var tmp$ret$29;
         // Inline function 'community.flock.wirespec.compiler.core.emit.OpenApiV2Emitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$29 = item_1.l22_1.p22_1;
+        tmp$ret$29 = item_1.m22_1.q22_1;
         tmp0_mapTo_1.a(tmp$ret$29);
       }
       // Inline function 'kotlin.contracts.contract' call
@@ -2531,23 +2531,23 @@
         tmp_6 = null;
       }
       var tmp1_required = tmp_6;
-      var tmp0_plusAssign_1 = to(element_5.f22_1, new SchemaObject(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp1_required, VOID, VOID, VOID, VOID, tmp0_associateTo_1));
+      var tmp0_plusAssign_1 = to(element_5.g22_1, new SchemaObject(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, tmp1_required, VOID, VOID, VOID, VOID, tmp0_associateTo_1));
       tmp0_associateTo_0.l3(tmp0_plusAssign_1.h3_1, tmp0_plusAssign_1.i3_1);
     }
     var obj = new SwaggerObject('2.0', tmp, VOID, VOID, VOID, tmp_0, tmp_1, tmp_4, plus_1(tmp_5, tmp0_associateTo_0));
     var str = Default_getInstance().j1d(obj);
     return listOf_0(to('OpenApi', str));
   };
-  protoOf(OpenApiV2Emitter).j22 = function (_this__u8e3s4) {
-    return to(_this__u8e3s4.l22_1.p22_1, this.o21(_this__u8e3s4.m22_1));
+  protoOf(OpenApiV2Emitter).k22 = function (_this__u8e3s4) {
+    return to(_this__u8e3s4.m22_1.q22_1, this.o21(_this__u8e3s4.n22_1));
   };
   protoOf(OpenApiV2Emitter).o21 = function (_this__u8e3s4) {
     var tmp;
     if (_this__u8e3s4 instanceof Custom) {
-      tmp = new ReferenceObject(_Ref___init__impl__7qfl46('#/definitions/' + _this__u8e3s4.u22_1));
+      tmp = new ReferenceObject(_Ref___init__impl__7qfl46('#/definitions/' + _this__u8e3s4.v22_1));
     } else {
       if (_this__u8e3s4 instanceof Primitive) {
-        tmp = new SchemaObject(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, emitType(_this__u8e3s4.r22_1, this));
+        tmp = new SchemaObject(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, emitType(_this__u8e3s4.s22_1, this));
       } else {
         if (_this__u8e3s4 instanceof Any) {
           throw IllegalStateException_init_$Create$('Cannot map Any');
@@ -2560,7 +2560,7 @@
   };
   function Companion_1() {
     Companion_instance_1 = this;
-    this.g24_1 = listOf(['abstract', 'case', 'catch', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', 'finally', 'for', 'forSome', 'if', 'implicit', 'import', 'lazy', 'match', 'new', 'null', 'object', 'override', 'package', 'private', 'protected', 'return', 'sealed', 'super', 'this', 'throw', 'trait', 'true', 'try', 'type', 'val', 'var', 'while', 'with', 'yield']);
+    this.h24_1 = listOf(['abstract', 'case', 'catch', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', 'finally', 'for', 'forSome', 'if', 'implicit', 'import', 'lazy', 'match', 'new', 'null', 'object', 'override', 'package', 'private', 'protected', 'return', 'sealed', 'super', 'this', 'throw', 'trait', 'true', 'try', 'type', 'val', 'var', 'while', 'with', 'yield']);
   }
   var Companion_instance_1;
   function Companion_getInstance_2() {
@@ -2570,28 +2570,28 @@
   }
   function ScalaEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('case class ' + $this_emit.f22_1 + '(\n            |' + this$0.i22($this_emit.g22_1) + '\n            |)\n            |\n            |');
+      return trimMargin('case class ' + $this_emit.g22_1 + '(\n            |' + this$0.j22($this_emit.h22_1) + '\n            |)\n            |\n            |');
     };
   }
   function ScalaEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.j22(it);
+      return this$0.k22(it);
     };
   }
   function ScalaEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return dropLast(joinToString($this_emit.k22_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda(this$0)), 1);
+      return dropLast(joinToString($this_emit.l22_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda(this$0)), 1);
     };
   }
   function ScalaEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
       Companion_getInstance_4();
-      return '  ' + 'val ' + this$0.o22($this_emit.l22_1) + ': ' + ($this_emit.n22_1 ? 'Option[' + this$0.o21($this_emit.m22_1) + ']' : this$0.o21($this_emit.m22_1)) + ',';
+      return '  ' + 'val ' + this$0.p22($this_emit.m22_1) + ': ' + ($this_emit.o22_1 ? 'Option[' + this$0.o21($this_emit.n22_1) + ']' : this$0.o21($this_emit.n22_1)) + ',';
     };
   }
   function ScalaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return Companion_getInstance_2().g24_1.j1($this_emit.p22_1) ? '`' + $this_emit.p22_1 + '`' : $this_emit.p22_1;
+      return Companion_getInstance_2().h24_1.j1($this_emit.q22_1) ? '`' + $this_emit.q22_1 + '`' : $this_emit.q22_1;
     };
   }
   function ScalaEmitter$emit$lambda_3($this_emit) {
@@ -2604,10 +2604,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.u22_1;
+          tmp = $this_emit.v22_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.r22_1;
+            var tmp1_subject = $this_emit.s22_1;
             var tmp0 = tmp1_subject.w4_1;
             var tmp_0;
             switch (tmp0) {
@@ -2637,7 +2637,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.a22() ? 'List[' + tmp0_let + ']' : tmp0_let;
+      tmp$ret$0 = $this_emit.b22() ? 'List[' + tmp0_let + ']' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       return tmp$ret$1;
     };
@@ -2659,20 +2659,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.y22_1 + '(label = "' + it + '")';
+      return '  ' + 'final case object ' + tmp$ret$1 + ' extends ' + $this_emit.z22_1 + '(label = "' + it + '")';
     };
   }
   function ScalaEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return trimMargin('\n        |sealed abstract class ' + $this_emit.y22_1 + '(val label: String)\n        |object ' + $this_emit.y22_1 + ' {\n        |' + joinToString($this_emit.z22_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
+      return trimMargin('\n        |sealed abstract class ' + $this_emit.z22_1 + '(val label: String)\n        |object ' + $this_emit.z22_1 + ' {\n        |' + joinToString($this_emit.a23_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_4();
-      var tmp = this$0.c23($this_emit.b23_1);
+      var tmp = this$0.d23($this_emit.c23_1);
       Companion_getInstance_4();
-      return trimMargin('case class ' + $this_emit.a23_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.a23_1 + 'Ops(val that: ' + $this_emit.a23_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
+      return trimMargin('case class ' + $this_emit.b23_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.b23_1 + 'Ops(val that: ' + $this_emit.b23_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
     };
   }
   function ScalaEmitter$emit$lambda_6($this_emit) {
@@ -2681,7 +2681,7 @@
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
-      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.d23_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
+      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.e23_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
     };
   }
   function ScalaEmitter$emit$lambda_7() {
@@ -2692,8 +2692,8 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     AbstractEmitter.call(this, logger);
-    this.l24_1 = packageName;
-    this.m24_1 = '';
+    this.m24_1 = packageName;
+    this.n24_1 = '';
   }
   protoOf(ScalaEmitter).t20 = function (ast) {
     // Inline function 'kotlin.collections.map' call
@@ -2707,53 +2707,53 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>' call
       var name = item.j3();
       var result = item.k3();
-      tmp$ret$0 = to(name, isBlank(this.l24_1) ? '' : 'package ' + this.l24_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, isBlank(this.m24_1) ? '' : 'package ' + this.m24_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     return tmp0_mapTo;
   };
-  protoOf(ScalaEmitter).g23 = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).h23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.h23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
+    return this.i23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
   };
-  protoOf(ScalaEmitter).i22 = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).j22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.i23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.j23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(ScalaEmitter).j22 = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).k22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.j23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.k23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(ScalaEmitter).o22 = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).p22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.k23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.l23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(ScalaEmitter).o21 = function (_this__u8e3s4) {
     var tmp = this.c21();
     return this.d21(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).l23 = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).m23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.m23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
+    return this.n23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).n23 = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).o23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.o23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.p23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(ScalaEmitter).c23 = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).d23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.p23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
+    return this.q23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).q23 = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).r23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.r23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_7);
+    return this.s23(_this__u8e3s4, tmp, ScalaEmitter$emit$lambda_7);
   };
   function emitType_1(_this__u8e3s4, $this) {
     return '`' + joinToString(_this__u8e3s4, '', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitType$lambda($this)) + '`';
   }
   function emitType_2(_this__u8e3s4, $this) {
     var tmp = $this.c21();
-    return $this.b22(_this__u8e3s4, tmp, TypeScriptEmitter$emitType$lambda_0(_this__u8e3s4, $this));
+    return $this.c22(_this__u8e3s4, tmp, TypeScriptEmitter$emitType$lambda_0(_this__u8e3s4, $this));
   }
   function emitName(_this__u8e3s4, $this) {
     var tmp0_safe_receiver = _this__u8e3s4.e21_1;
@@ -2761,8 +2761,8 @@
     return 'Request' + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
   function emitName_0(_this__u8e3s4, $this) {
-    var tmp = 'Response' + Companion_getInstance_4().z21(_this__u8e3s4.x21_1);
-    var tmp0_safe_receiver = _this__u8e3s4.y21_1;
+    var tmp = 'Response' + Companion_getInstance_4().a22(_this__u8e3s4.x21_1);
+    var tmp0_safe_receiver = _this__u8e3s4.z21_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
     return tmp + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
@@ -2774,32 +2774,76 @@
   }
   function emit_5(_this__u8e3s4, $this) {
     var tmp = $this.c21();
-    return $this.b22(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.c22(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_8(_this__u8e3s4));
+  }
+  function joinParameters(_this__u8e3s4, $this, content, response) {
+    // Inline function 'kotlin.collections.map' call
+    // Inline function 'kotlin.collections.filterIsInstance' call
+    var tmp0_filterIsInstance = _this__u8e3s4.r21_1;
+    // Inline function 'kotlin.collections.filterIsInstanceTo' call
+    var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
+    var tmp0_iterator = tmp0_filterIsInstance.c();
+    while (tmp0_iterator.d()) {
+      var element = tmp0_iterator.e();
+      if (element instanceof Param) {
+        tmp0_filterIsInstanceTo.a(element);
+      }
+    }
+    // Inline function 'kotlin.collections.mapTo' call
+    var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp0_filterIsInstanceTo, 10));
+    var tmp0_iterator_0 = tmp0_filterIsInstanceTo.c();
+    while (tmp0_iterator_0.d()) {
+      var item = tmp0_iterator_0.e();
+      var tmp$ret$2;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.joinParameters.<anonymous>' call
+      tmp$ret$2 = new Field(item.d22_1, item.e22_1, false);
+      tmp0_mapTo.a(tmp$ret$2);
+    }
+    var pathField = tmp0_mapTo;
+    var tmp1_elvis_lhs = response == null ? null : response.y21_1;
+    var parameters = tmp1_elvis_lhs == null ? plus(plus(plus(pathField, _this__u8e3s4.s21_1), _this__u8e3s4.t21_1), _this__u8e3s4.u21_1) : tmp1_elvis_lhs;
+    // Inline function 'kotlin.collections.map' call
+    var tmp3_safe_receiver = content == null ? null : content.g21_1;
+    var tmp2_map = filterNotNull(plus_0(parameters, tmp3_safe_receiver == null ? null : toField(tmp3_safe_receiver, 'body', false)));
+    // Inline function 'kotlin.collections.mapTo' call
+    var tmp0_mapTo_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp2_map, 10));
+    var tmp0_iterator_1 = tmp2_map.c();
+    while (tmp0_iterator_1.d()) {
+      var item_0 = tmp0_iterator_1.e();
+      var tmp$ret$5;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.joinParameters.<anonymous>' call
+      tmp$ret$5 = item_0.o24(new Identifier(Companion_getInstance_4().f23(sanitizeSymbol(item_0.m22_1.q22_1, $this))));
+      tmp0_mapTo_0.a(tmp$ret$5);
+    }
+    return tmp0_mapTo_0;
+  }
+  function sanitizeSymbol(_this__u8e3s4, $this) {
+    return replace(replace(replace(_this__u8e3s4, '-', ''), '.', ''), ' ', '_');
   }
   function TypeScriptEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('export type ' + $this_emit.f22_1 + ' = {\n            |' + this$0.i22($this_emit.g22_1) + '\n            |}\n            |\n            |');
+      return trimMargin('export type ' + $this_emit.g22_1 + ' = {\n            |' + this$0.j22($this_emit.h22_1) + '\n            |}\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.j22(it);
+      return this$0.k22(it);
     };
   }
   function TypeScriptEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.k22_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.l22_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0));
     };
   }
   function TypeScriptEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
       Companion_getInstance_4();
-      return '  ' + this$0.o22($this_emit.l22_1) + ($this_emit.n22_1 ? '?' : '') + ': ' + this$0.o21($this_emit.m22_1);
+      return '  ' + this$0.p22($this_emit.m22_1) + ($this_emit.o22_1 ? '?' : '') + ': ' + this$0.o21($this_emit.n22_1);
     };
   }
   function TypeScriptEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return $this_emit.p22_1;
+      return $this_emit.q22_1;
     };
   }
   function TypeScriptEmitter$emit$lambda_3($this_emit) {
@@ -2814,10 +2858,10 @@
         tmp = 'any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.u22_1;
+          tmp = $this_emit.v22_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.r22_1;
+            var tmp1_subject = $this_emit.s22_1;
             var tmp0 = tmp1_subject.w4_1;
             var tmp_0;
             switch (tmp0) {
@@ -2847,13 +2891,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.a22() ? tmp0_let + '[]' : tmp0_let;
+      tmp$ret$0 = $this_emit.b22() ? tmp0_let + '[]' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       var tmp1_let = tmp$ret$1;
       // 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.x22() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.y22() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -2863,21 +2907,34 @@
   }
   function TypeScriptEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return 'type ' + $this_emit.y22_1 + ' = ' + joinToString($this_emit.z22_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
+      return 'type ' + $this_emit.z22_1 + ' = ' + joinToString($this_emit.a23_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
     };
   }
   function TypeScriptEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_4();
-      return trimMargin('type ' + $this_emit.a23_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.a23_1 + ' = (type: ' + $this_emit.a23_1 + ') => (' + this$0.c23($this_emit.b23_1) + ').test(type.value);\n            |\n            |');
+      return trimMargin('type ' + $this_emit.b23_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.b23_1 + ' = (type: ' + $this_emit.b23_1 + ') => (' + this$0.d23($this_emit.c23_1) + ').test(type.value);\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return "new RegExp('" + dropLast(drop($this_emit.d23_1, 1), 1) + "')";
+      return "new RegExp('" + dropLast(drop($this_emit.e23_1, 1), 1) + "')";
     };
   }
-  function TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
+  function TypeScriptEmitter$emit$lambda$lambda_1(it) {
+    var tmp;
+    if (it instanceof Literal) {
+      tmp = it.g23_1;
+    } else {
+      if (it instanceof Param) {
+        tmp = ':' + it.d22_1.q22_1;
+      } else {
+        noWhenBranchMatchedException();
+      }
+    }
+    return tmp;
+  }
+  function TypeScriptEmitter$emit$lambda$lambda_2(this$0, $this_emit) {
     return function (it) {
       Companion_getInstance_4();
       var tmp = emitName(it, this$0);
@@ -2893,7 +2950,7 @@
         var item = tmp0_iterator.e();
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = this$0.j22(item);
+        tmp$ret$0 = this$0.k22(item);
         tmp0_mapTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapTo;
@@ -2910,7 +2967,7 @@
         var item_0 = tmp0_iterator_0.e();
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$3 = this$0.j22(item_0);
+        tmp$ret$3 = this$0.k22(item_0);
         tmp0_mapTo_0.a(tmp$ret$3);
       }
       tmp$ret$4 = tmp0_mapTo_0;
@@ -2934,17 +2991,17 @@
       return '  ' + 'type ' + tmp + ' = { path: ' + tmp_0 + ', method: "' + $this_emit.q21_1 + '", headers: {' + tmp_1 + '}, query: {' + tmp_2 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' } ';
     };
   }
-  function TypeScriptEmitter$emit$lambda$lambda_2(this$0) {
+  function TypeScriptEmitter$emit$lambda$lambda_3(this$0) {
     return function (it) {
       return emitName(it, this$0);
     };
   }
-  function TypeScriptEmitter$emit$lambda$lambda_3(this$0) {
+  function TypeScriptEmitter$emit$lambda$lambda_4(this$0) {
     return function (it) {
       Companion_getInstance_4();
       var tmp = emitName_0(it, this$0);
-      var tmp_0 = Companion_getInstance_4().a24(it.x21_1) ? it.x21_1 : 'number';
-      var tmp0_safe_receiver = it.y21_1;
+      var tmp_0 = Companion_getInstance_4().b24(it.x21_1) ? it.x21_1 : 'string';
+      var tmp0_safe_receiver = it.z21_1;
       var tmp_1;
       if (tmp0_safe_receiver == null) {
         tmp_1 = null;
@@ -2962,61 +3019,153 @@
       return '  ' + 'type ' + tmp + ' = { status: ' + tmp_0 + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' }';
     };
   }
-  function TypeScriptEmitter$emit$lambda$lambda_4(this$0) {
+  function TypeScriptEmitter$emit$lambda$lambda_5(this$0) {
     return function (it) {
       return emitName_0(it, this$0);
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.j22(it);
+      return this$0.k22(it);
     };
   }
-  function TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit) {
+  function TypeScriptEmitter$emit$lambda$lambda_6(this$0, $this_emit) {
     return function (it) {
-      var tmp = Companion_getInstance_4().e23(emitName(it, this$0));
-      var tmp_0 = Companion_getInstance_4().t24($this_emit, it.e21_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.r21_1, this$0);
-      var tmp_3 = emitMap_1($this_emit.s21_1, this$0);
-      var tmp_4 = emitMap_1($this_emit.t21_1, this$0);
-      var tmp0_safe_receiver = it.e21_1;
-      var tmp_5;
+      Companion_getInstance_4();
+      var tmp = Companion_getInstance_4().f23(emitName(it, this$0));
+      var tmp$ret$3;
+      // Inline function 'kotlin.text.orEmpty' call
+      var tmp$ret$2;
+      // Inline function 'kotlin.takeIf' call
+      var tmp0_takeIf = joinParameters($this_emit, this$0, it.e21_1, null);
+      // Inline function 'kotlin.contracts.contract' call
+      var tmp_0;
+      var tmp$ret$1;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
+      var tmp$ret$0;
+      // Inline function 'kotlin.collections.isNotEmpty' call
+      tmp$ret$0 = !tmp0_takeIf.g();
+      tmp$ret$1 = tmp$ret$0;
+      if (tmp$ret$1) {
+        tmp_0 = tmp0_takeIf;
+      } else {
+        tmp_0 = null;
+      }
+      tmp$ret$2 = tmp_0;
+      var tmp0_safe_receiver = tmp$ret$2;
+      var tmp_1;
+      if (tmp0_safe_receiver == null) {
+        tmp_1 = null;
+      } else {
+        tmp_1 = joinToString(tmp0_safe_receiver, ',', 'obj:{', '}', VOID, VOID, TypeScriptEmitter$emit$lambda$lambda$lambda(this$0));
+      }
+      var tmp1_orEmpty = tmp_1;
+      var tmp0_elvis_lhs = tmp1_orEmpty;
+      tmp$ret$3 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
+      var tmp_2 = tmp$ret$3;
+      var tmp_3 = emitPath_1($this_emit.r21_1, this$0);
+      var tmp_4 = emitMap_1($this_emit.s21_1, this$0);
+      var tmp_5 = emitMap_1($this_emit.t21_1, this$0);
+      var tmp1_safe_receiver = it.e21_1;
+      var tmp_6;
+      if (tmp1_safe_receiver == null) {
+        tmp_6 = null;
+      } else {
+        var tmp$ret$5;
+        // Inline function 'kotlin.let' call
+        // Inline function 'kotlin.contracts.contract' call
+        var tmp$ret$4;
+        // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
+        tmp$ret$4 = ', content: {type: "' + tmp1_safe_receiver.f21_1 + '", body: obj.body}';
+        tmp$ret$5 = tmp$ret$4;
+        tmp_6 = tmp$ret$5;
+      }
+      var tmp2_elvis_lhs = tmp_6;
+      return '  ' + 'export const ' + tmp + ' = (' + tmp_2 + ') => ({path: `' + tmp_3 + '`, method: "' + $this_emit.q21_1.v4_1 + '", query: {' + tmp_4 + '}, headers: {' + tmp_5 + '}' + (tmp2_elvis_lhs == null ? '' : tmp2_elvis_lhs) + '} as const)';
+    };
+  }
+  function TypeScriptEmitter$emit$lambda$lambda$lambda_0(this$0) {
+    return function (it) {
+      return this$0.k22(it);
+    };
+  }
+  function TypeScriptEmitter$emit$lambda$lambda_7(this$0, $this_emit) {
+    return function (it) {
+      Companion_getInstance_4();
+      var tmp = Companion_getInstance_4().f23(emitName_0(it, this$0));
+      var tmp$ret$3;
+      // Inline function 'kotlin.text.orEmpty' call
+      var tmp$ret$2;
+      // Inline function 'kotlin.takeIf' call
+      var tmp0_takeIf = joinParameters($this_emit, this$0, it.z21_1, it);
+      // Inline function 'kotlin.contracts.contract' call
+      var tmp_0;
+      var tmp$ret$1;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
+      var tmp$ret$0;
+      // Inline function 'kotlin.collections.isNotEmpty' call
+      tmp$ret$0 = !tmp0_takeIf.g();
+      tmp$ret$1 = tmp$ret$0;
+      if (tmp$ret$1) {
+        tmp_0 = tmp0_takeIf;
+      } else {
+        tmp_0 = null;
+      }
+      tmp$ret$2 = tmp_0;
+      var tmp0_safe_receiver = tmp$ret$2;
+      var tmp_1;
       if (tmp0_safe_receiver == null) {
+        tmp_1 = null;
+      } else {
+        tmp_1 = joinToString(tmp0_safe_receiver, ',', 'obj:{', '}', VOID, VOID, TypeScriptEmitter$emit$lambda$lambda$lambda_0(this$0));
+      }
+      var tmp1_orEmpty = tmp_1;
+      var tmp0_elvis_lhs = tmp1_orEmpty;
+      tmp$ret$3 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
+      var tmp_2 = tmp$ret$3;
+      var tmp_3 = Companion_getInstance_4().b24(it.x21_1) ? it.x21_1 : '`' + it.x21_1 + '`';
+      var tmp_4 = emitMap_1(it.y21_1, this$0);
+      var tmp1_safe_receiver = it.z21_1;
+      var tmp_5;
+      if (tmp1_safe_receiver == null) {
         tmp_5 = null;
       } else {
-        var tmp$ret$1;
+        var tmp$ret$5;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
-        var tmp$ret$0;
+        var tmp$ret$4;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', content: {type: "' + tmp0_safe_receiver.f21_1 + '", body}';
-        tmp$ret$1 = tmp$ret$0;
-        tmp_5 = tmp$ret$1;
+        tmp$ret$4 = ', content: {type: "' + tmp1_safe_receiver.f21_1 + '", body: obj.body}';
+        tmp$ret$5 = tmp$ret$4;
+        tmp_5 = tmp$ret$5;
       }
-      var tmp1_elvis_lhs = tmp_5;
-      return 'export const ' + tmp + ' = (' + tmp_1 + ') => ({path: `' + tmp_2 + '`, method: "' + $this_emit.q21_1.v4_1 + '", query: {' + tmp_3 + '}, headers: {' + tmp_4 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + '} as const)';
+      var tmp2_elvis_lhs = tmp_5;
+      return '  ' + 'export const ' + tmp + ' = (' + tmp_2 + ') => ({status: ' + tmp_3 + ', headers: {' + tmp_4 + '}' + (tmp2_elvis_lhs == null ? '' : tmp2_elvis_lhs) + '} as const)';
     };
   }
   function TypeScriptEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
-      var tmp = toSet($this_emit.v21_1);
-      var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit));
       Companion_getInstance_4();
-      var tmp_1 = toSet($this_emit.v21_1);
-      var tmp_2 = joinToString(tmp_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_2(this$0));
-      var tmp_3 = toSet($this_emit.w21_1);
-      var tmp_4 = joinToString(tmp_3, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_3(this$0));
+      var tmp = joinToString($this_emit.r21_1, '/', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_1);
+      Companion_getInstance_4();
+      var tmp_0 = toSet($this_emit.v21_1);
+      var tmp_1 = joinToString(tmp_0, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_2(this$0, $this_emit));
+      Companion_getInstance_4();
+      var tmp_2 = toSet($this_emit.v21_1);
+      var tmp_3 = joinToString(tmp_2, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_3(this$0));
+      var tmp_4 = toSet($this_emit.w21_1);
+      var tmp_5 = joinToString(tmp_4, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_4(this$0));
       Companion_getInstance_4();
-      var tmp_5 = toSet($this_emit.w21_1);
-      var tmp_6 = joinToString(tmp_5, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_4(this$0));
+      var tmp_6 = toSet($this_emit.w21_1);
+      var tmp_7 = joinToString(tmp_6, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_5(this$0));
       Companion_getInstance_4();
       Companion_getInstance_4();
       Companion_getInstance_4();
-      var tmp_7 = Companion_getInstance_4().e23($this_emit.p21_1);
       Companion_getInstance_4();
+      var tmp_8 = Companion_getInstance_4().f23($this_emit.p21_1);
       Companion_getInstance_4();
-      return trimMargin('\n          |export namespace ' + $this_emit.p21_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.v21_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit)) + '\n          |}\n          |\n        ');
+      var tmp_9 = joinToString($this_emit.v21_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_6(this$0, $this_emit));
+      return trimMargin('\n          |export module ' + $this_emit.p21_1 + ' {\n          |' + '  ' + 'export const PATH = "/' + tmp + '"\n          |' + '  ' + 'export const METHOD = "' + $this_emit.q21_1.v4_1 + '"\n          |' + tmp_1 + '\n          |' + '  ' + 'export type Request = ' + tmp_3 + '\n          |' + tmp_5 + '\n          |' + '  ' + 'export type Response = ' + tmp_7 + '\n          |' + '  ' + 'export type Handler = (request:Request) => Promise<Response>\n          |' + '  ' + 'export type Call = {\n          |' + '  ' + '  ' + tmp_8 + ': Handler\n          |' + '  ' + '}\n          |' + tmp_9 + '\n          |' + joinToString($this_emit.w21_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_7(this$0, $this_emit)) + '\n          |}\n          |\n        ');
     };
   }
   function TypeScriptEmitter$emitType$lambda(this$0) {
@@ -3029,10 +3178,10 @@
       var tmp0_subject = $this_emitType;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emitType.f23_1;
+        tmp = $this_emitType.g23_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + this$0.o21($this_emitType.d22_1) + '}';
+          tmp = '${' + this$0.o21($this_emitType.e22_1) + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -3042,7 +3191,7 @@
   }
   function TypeScriptEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + this$0.o22(it.l22_1) + '": ' + this$0.o22(it.l22_1);
+      return '"' + this$0.p22(it.m22_1) + '": obj.' + Companion_getInstance_4().f23(sanitizeSymbol(this$0.p22(it.m22_1), this$0));
     };
   }
   function TypeScriptEmitter$emitPath$lambda(this$0) {
@@ -3055,10 +3204,10 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.f23_1;
+        tmp = $this_emit.g23_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + $this_emit.c22_1.p22_1 + '}';
+          tmp = '${obj.' + $this_emit.d22_1.q22_1 + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -3069,13 +3218,13 @@
   function TypeScriptEmitter(logger) {
     logger = logger === VOID ? get_noLogger() : logger;
     AbstractEmitter.call(this, logger);
-    this.r24_1 = '';
+    this.t24_1 = '';
     var tmp = this;
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
-    tmp.s24_1 = trimMargin('\n        |export namespace WirespecShared {\n        |' + '  ' + 'type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
+    tmp.u24_1 = trimMargin('\n        |export module Wirespec {\n        |' + '  ' + 'export type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'export type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
   }
   protoOf(TypeScriptEmitter).t20 = function (ast) {
     // Inline function 'kotlin.collections.map' call
@@ -3091,48 +3240,48 @@
       var result = item.k3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_4().x20(ast) ? this.s24_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_4().x20(ast) ? this.u24_1 : '') + '\n                    |' + result + '\n            ');
       tmp$ret$0 = toString(trimStart(isCharSequence(tmp0_trimStart) ? tmp0_trimStart : THROW_CCE()));
       tmp$ret$1 = to(name, tmp$ret$0);
       tmp0_mapTo.a(tmp$ret$1);
     }
     return tmp0_mapTo;
   };
-  protoOf(TypeScriptEmitter).g23 = function (_this__u8e3s4) {
+  protoOf(TypeScriptEmitter).h23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.h23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
+    return this.i23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
   };
-  protoOf(TypeScriptEmitter).i22 = function (_this__u8e3s4) {
+  protoOf(TypeScriptEmitter).j22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.i23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.j23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(TypeScriptEmitter).j22 = function (_this__u8e3s4) {
+  protoOf(TypeScriptEmitter).k22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.j23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.k23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).o22 = function (_this__u8e3s4) {
+  protoOf(TypeScriptEmitter).p22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.k23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.l23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(TypeScriptEmitter).o21 = function (_this__u8e3s4) {
     var tmp = this.c21();
     return this.d21(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).l23 = function (_this__u8e3s4) {
+  protoOf(TypeScriptEmitter).m23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.m23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
+    return this.n23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).n23 = function (_this__u8e3s4) {
+  protoOf(TypeScriptEmitter).o23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.o23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.p23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(TypeScriptEmitter).c23 = function (_this__u8e3s4) {
+  protoOf(TypeScriptEmitter).d23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.p23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
+    return this.q23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).q23 = function (_this__u8e3s4) {
+  protoOf(TypeScriptEmitter).r23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.r23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
+    return this.s23(_this__u8e3s4, tmp, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function emitPath_2(_this__u8e3s4, $this) {
     return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, WirespecEmitter$emitPath$lambda($this));
@@ -3189,28 +3338,28 @@
   }
   function WirespecEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('type ' + $this_emit.f22_1 + ' {\n            |' + this$0.i22($this_emit.g22_1) + '\n            |}\n            |');
+      return trimMargin('type ' + $this_emit.g22_1 + ' {\n            |' + this$0.j22($this_emit.h22_1) + '\n            |}\n            |');
     };
   }
   function WirespecEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
       Companion_getInstance_4();
-      return '  ' + this$0.j22(it);
+      return '  ' + this$0.k22(it);
     };
   }
   function WirespecEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.k22_1, ',\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.l22_1, ',\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda$lambda(this$0));
     };
   }
   function WirespecEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
-      return this$0.o22($this_emit.l22_1) + ': ' + this$0.o21($this_emit.m22_1) + ($this_emit.n22_1 ? '?' : '');
+      return this$0.p22($this_emit.m22_1) + ': ' + this$0.o21($this_emit.n22_1) + ($this_emit.o22_1 ? '?' : '');
     };
   }
   function WirespecEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return $this_emit.p22_1;
+      return $this_emit.q22_1;
     };
   }
   function WirespecEmitter$emit$lambda_3($this_emit) {
@@ -3223,10 +3372,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.u22_1;
+          tmp = $this_emit.v22_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.r22_1;
+            var tmp1_subject = $this_emit.s22_1;
             var tmp0 = tmp1_subject.w4_1;
             var tmp_0;
             switch (tmp0) {
@@ -3256,7 +3405,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.WirespecEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.a22() ? tmp0_let + '[]' : tmp0_let;
+      tmp$ret$0 = $this_emit.b22() ? tmp0_let + '[]' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       return tmp$ret$1;
     };
@@ -3264,27 +3413,27 @@
   function WirespecEmitter$emit$lambda_4($this_emit) {
     return function () {
       Companion_getInstance_4();
-      return 'enum ' + $this_emit.y22_1 + ' {\n' + '  ' + joinToString($this_emit.z22_1, ', ') + '\n}\n';
+      return 'enum ' + $this_emit.z22_1 + ' {\n' + '  ' + joinToString($this_emit.a23_1, ', ') + '\n}\n';
     };
   }
   function WirespecEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return 'refined ' + $this_emit.a23_1 + ' ' + this$0.c23($this_emit.b23_1) + '\n';
+      return 'refined ' + $this_emit.b23_1 + ' ' + this$0.d23($this_emit.c23_1) + '\n';
     };
   }
   function WirespecEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return '/' + dropLast(drop($this_emit.d23_1, 1), 1) + '/g';
+      return '/' + dropLast(drop($this_emit.e23_1, 1), 1) + '/g';
     };
   }
   function WirespecEmitter$emit$lambda$lambda_0(this$0) {
     return function (it) {
       Companion_getInstance_4();
-      var tmp0_safe_receiver = it.y21_1;
+      var tmp0_safe_receiver = it.z21_1;
       var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g21_1;
       var tmp = tmp1_safe_receiver == null ? null : this$0.o21(tmp1_safe_receiver);
       var tmp_0;
-      var tmp2_safe_receiver = it.y21_1;
+      var tmp2_safe_receiver = it.z21_1;
       if ((tmp2_safe_receiver == null ? null : tmp2_safe_receiver.h21_1) === true) {
         tmp_0 = '?';
       } else {
@@ -3306,10 +3455,10 @@
       var tmp0_subject = it;
       var tmp;
       if (tmp0_subject instanceof Param) {
-        tmp = '{' + it.c22_1.p22_1 + ': ' + this$0.o21(it.d22_1) + '}';
+        tmp = '{' + it.d22_1.q22_1 + ': ' + this$0.o21(it.e22_1) + '}';
       } else {
         if (tmp0_subject instanceof Literal) {
-          tmp = it.f23_1;
+          tmp = it.g23_1;
         } else {
           noWhenBranchMatchedException();
         }
@@ -3319,53 +3468,53 @@
   }
   function WirespecEmitter$emitQuery$lambda(this$0) {
     return function (it) {
-      return this$0.j22(it);
+      return this$0.k22(it);
     };
   }
   function WirespecEmitter(logger) {
     logger = logger === VOID ? get_noLogger() : logger;
     AbstractEmitter.call(this, logger);
-    this.y24_1 = '';
+    this.z24_1 = '';
   }
-  protoOf(WirespecEmitter).g23 = function (_this__u8e3s4) {
+  protoOf(WirespecEmitter).h23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.h23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
+    return this.i23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
   };
-  protoOf(WirespecEmitter).i22 = function (_this__u8e3s4) {
+  protoOf(WirespecEmitter).j22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.i23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.j23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(WirespecEmitter).j22 = function (_this__u8e3s4) {
+  protoOf(WirespecEmitter).k22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.j23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.k23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(WirespecEmitter).o22 = function (_this__u8e3s4) {
+  protoOf(WirespecEmitter).p22 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.k23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.l23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(WirespecEmitter).o21 = function (_this__u8e3s4) {
     var tmp = this.c21();
     return this.d21(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).l23 = function (_this__u8e3s4) {
+  protoOf(WirespecEmitter).m23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.m23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
+    return this.n23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).n23 = function (_this__u8e3s4) {
+  protoOf(WirespecEmitter).o23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.o23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.p23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(WirespecEmitter).c23 = function (_this__u8e3s4) {
+  protoOf(WirespecEmitter).d23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.p23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
+    return this.q23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).q23 = function (_this__u8e3s4) {
+  protoOf(WirespecEmitter).r23 = function (_this__u8e3s4) {
     var tmp = this.c21();
-    return this.r23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_7(_this__u8e3s4, this));
+    return this.s23(_this__u8e3s4, tmp, WirespecEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function Companion_2() {
     Companion_instance_2 = this;
-    this.z24_1 = '  ';
+    this.a25_1 = '  ';
   }
   var Companion_instance_2;
   function Companion_getInstance_3() {
@@ -3378,14 +3527,14 @@
     this.r20_1 = logger;
     this.s20_1 = split;
   }
-  protoOf(Emitter).s23 = function () {
+  protoOf(Emitter).t23 = function () {
     return this.s20_1;
   };
   function Companion_3() {
     Companion_instance_3 = this;
     this.w20_1 = '  ';
   }
-  protoOf(Companion_3).z21 = function (_this__u8e3s4) {
+  protoOf(Companion_3).a22 = function (_this__u8e3s4) {
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
     // Inline function 'kotlin.text.isNotEmpty' call
@@ -3405,7 +3554,7 @@
     }
     return tmp;
   };
-  protoOf(Companion_3).e23 = function (_this__u8e3s4) {
+  protoOf(Companion_3).f23 = function (_this__u8e3s4) {
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
     // Inline function 'kotlin.text.isNotEmpty' call
@@ -3452,35 +3601,7 @@
     }
     return tmp$ret$0;
   };
-  protoOf(Companion_3).t24 = function (_this__u8e3s4, content) {
-    // Inline function 'kotlin.collections.map' call
-    // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_filterIsInstance = _this__u8e3s4.r21_1;
-    // Inline function 'kotlin.collections.filterIsInstanceTo' call
-    var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
-    var tmp0_iterator = tmp0_filterIsInstance.c();
-    while (tmp0_iterator.d()) {
-      var element = tmp0_iterator.e();
-      if (element instanceof Param) {
-        tmp0_filterIsInstanceTo.a(element);
-      }
-    }
-    // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp0_filterIsInstanceTo, 10));
-    var tmp0_iterator_0 = tmp0_filterIsInstanceTo.c();
-    while (tmp0_iterator_0.d()) {
-      var item = tmp0_iterator_0.e();
-      var tmp$ret$2;
-      // Inline function 'community.flock.wirespec.compiler.core.emit.common.Companion.joinParameters.<anonymous>' call
-      tmp$ret$2 = new Field(item.c22_1, item.d22_1, false);
-      tmp0_mapTo.a(tmp$ret$2);
-    }
-    var pathField = tmp0_mapTo;
-    var parameters = plus(plus(plus(pathField, _this__u8e3s4.s21_1), _this__u8e3s4.t21_1), _this__u8e3s4.u21_1);
-    var tmp1_safe_receiver = content == null ? null : content.g21_1;
-    return filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
-  };
-  protoOf(Companion_3).a24 = function (_this__u8e3s4) {
+  protoOf(Companion_3).b24 = function (_this__u8e3s4) {
     return !(toIntOrNull(_this__u8e3s4) == null);
   };
   var Companion_instance_3;
@@ -3502,7 +3623,7 @@
   protoOf(AbstractEmitter).c21 = function () {
     return this.a21_1;
   };
-  protoOf(AbstractEmitter).s23 = function () {
+  protoOf(AbstractEmitter).t23 = function () {
     return this.b21_1;
   };
   protoOf(AbstractEmitter).t20 = function (ast) {
@@ -3518,16 +3639,16 @@
       this.c21().h20('Emitting Node ' + this);
       var tmp;
       if (item instanceof Type_0) {
-        tmp = to(item.f22_1, this.g23(item));
+        tmp = to(item.g22_1, this.h23(item));
       } else {
         if (item instanceof Endpoint) {
-          tmp = to(item.p21_1, this.q23(item));
+          tmp = to(item.p21_1, this.r23(item));
         } else {
           if (item instanceof Enum_0) {
-            tmp = to(item.y22_1, this.l23(item));
+            tmp = to(item.z22_1, this.m23(item));
           } else {
             if (item instanceof Refined) {
-              tmp = to(item.a23_1, this.n23(item));
+              tmp = to(item.b23_1, this.o23(item));
             } else {
               noWhenBranchMatchedException();
             }
@@ -3540,7 +3661,7 @@
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.common.AbstractEmitter.emit.<anonymous>' call
     var tmp_0;
-    if (this.s23()) {
+    if (this.t23()) {
       tmp_0 = tmp0_mapTo;
     } else {
       tmp_0 = listOf_0(to('NoName', joinToString(tmp0_mapTo, '\n', VOID, VOID, VOID, VOID, AbstractEmitter$emit$lambda)));
@@ -3574,7 +3695,7 @@
   }
   function WrongTokenException(expected, actual) {
     Companion_getInstance_5();
-    ParserException.call(this, actual.d25_1, '' + expected.kc() + ' expected, not: ' + actual.b25_1.e25() + ' at line ' + actual.d25_1.f25_1 + ' and position ' + (actual.d25_1.g25_1 - actual.c25_1.length | 0));
+    ParserException.call(this, actual.e25_1, '' + expected.kc() + ' expected, not: ' + actual.c25_1.f25() + ' at line ' + actual.e25_1.g25_1 + ' and position ' + (actual.e25_1.h25_1 - actual.d25_1.length | 0));
     captureStack(this, WrongTokenException);
   }
   function NullTokenException(message, coordinates) {
@@ -3592,15 +3713,15 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.i25_1 = coordinates;
+    this.j25_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     // Inline function 'arrow.core.NonEmptyList.map' call
     // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
     var tmp0_anonymous = _this__u8e3s4.q1z_1;
     var tmp;
-    if (tmp0_anonymous.b25_1 instanceof CustomRegex) {
-      tmp = tmp0_anonymous.j25(VOID, '"' + dropLast(drop(tmp0_anonymous.c25_1, 1), 2) + '"');
+    if (tmp0_anonymous.c25_1 instanceof CustomRegex) {
+      tmp = tmp0_anonymous.k25(VOID, '"' + dropLast(drop(tmp0_anonymous.d25_1, 1), 2) + '"');
     } else {
       tmp = tmp0_anonymous;
     }
@@ -3615,8 +3736,8 @@
       var tmp$ret$1;
       // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
       var tmp_1;
-      if (item.b25_1 instanceof CustomRegex) {
-        tmp_1 = item.j25(VOID, '"' + dropLast(drop(item.c25_1, 1), 2) + '"');
+      if (item.c25_1 instanceof CustomRegex) {
+        tmp_1 = item.k25(VOID, '"' + dropLast(drop(item.d25_1, 1), 2) + '"');
       } else {
         tmp_1 = item;
       }
@@ -3636,31 +3757,31 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof Method_0) {
-        tmp_0 = valueOf(_this__u8e3s4.m25_1.c25_1);
+      if (_this__u8e3s4.n25_1.c25_1 instanceof Method_0) {
+        tmp_0 = valueOf(_this__u8e3s4.n25_1.d25_1);
       } else {
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         tmp$ret$0 = new WrongTokenException(getKClass(Method_0), tmp1_invoke);
         raise.a20(tmp$ret$0);
       }
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
+      raise.b20(_this__u8e3s4.p25());
       var method = tmp2_also;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_subject = _this__u8e3s4.m25_1.b25_1;
+      var tmp1_subject = _this__u8e3s4.n25_1.c25_1;
       var tmp_1;
       if (isInterface(tmp1_subject, WirespecType)) {
-        var tmp_2 = _this__u8e3s4.m25_1.b25_1;
-        tmp_1 = raise.b20(parseReference(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.m25_1.c25_1));
+        var tmp_2 = _this__u8e3s4.n25_1.c25_1;
+        tmp_1 = raise.b20(parseReference(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.n25_1.d25_1));
       } else {
         tmp_1 = null;
       }
@@ -3684,15 +3805,15 @@
       $l$loop: while (true) {
         var tmp_3;
         var tmp_4;
-        var tmp_5 = _this__u8e3s4.m25_1.b25_1;
+        var tmp_5 = _this__u8e3s4.n25_1.c25_1;
         if (!(tmp_5 instanceof QuestionMark)) {
-          var tmp_6 = _this__u8e3s4.m25_1.b25_1;
+          var tmp_6 = _this__u8e3s4.n25_1.c25_1;
           tmp_4 = !(tmp_6 instanceof Hash);
         } else {
           tmp_4 = false;
         }
         if (tmp_4) {
-          var tmp_7 = _this__u8e3s4.m25_1.b25_1;
+          var tmp_7 = _this__u8e3s4.n25_1.c25_1;
           tmp_3 = !(tmp_7 instanceof Arrow);
         } else {
           tmp_3 = false;
@@ -3704,20 +3825,20 @@
       }
       var segments = tmp4_apply;
       var tmp_8;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof QuestionMark) {
-        raise.b20(_this__u8e3s4.o25());
+      if (_this__u8e3s4.n25_1.c25_1 instanceof QuestionMark) {
+        raise.b20(_this__u8e3s4.p25());
         var tmp_9;
-        if (_this__u8e3s4.m25_1.b25_1 instanceof LeftCurly) {
+        if (_this__u8e3s4.n25_1.c25_1 instanceof LeftCurly) {
           // Inline function 'kotlin.with' call
-          var tmp5_with = $this.s25_1;
+          var tmp5_with = $this.t25_1;
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-          tmp_9 = raise.b20(tmp5_with.u25(_this__u8e3s4)).k22_1;
+          tmp_9 = raise.b20(tmp5_with.v25(_this__u8e3s4)).l22_1;
         } else {
           var tmp$ret$9;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_5();
-          var tmp7_invoke = _this__u8e3s4.m25_1;
+          var tmp7_invoke = _this__u8e3s4.n25_1;
           tmp$ret$9 = new WrongTokenException(getKClass(LeftCurly), tmp7_invoke);
           raise.a20(tmp$ret$9);
         }
@@ -3727,20 +3848,20 @@
       }
       var queryParams = tmp_8;
       var tmp_10;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof Hash) {
-        raise.b20(_this__u8e3s4.o25());
+      if (_this__u8e3s4.n25_1.c25_1 instanceof Hash) {
+        raise.b20(_this__u8e3s4.p25());
         var tmp_11;
-        if (_this__u8e3s4.m25_1.b25_1 instanceof LeftCurly) {
+        if (_this__u8e3s4.n25_1.c25_1 instanceof LeftCurly) {
           // Inline function 'kotlin.with' call
-          var tmp8_with = $this.s25_1;
+          var tmp8_with = $this.t25_1;
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-          tmp_11 = raise.b20(tmp8_with.u25(_this__u8e3s4)).k22_1;
+          tmp_11 = raise.b20(tmp8_with.v25(_this__u8e3s4)).l22_1;
         } else {
           var tmp$ret$12;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_5();
-          var tmp10_invoke = _this__u8e3s4.m25_1;
+          var tmp10_invoke = _this__u8e3s4.n25_1;
           tmp$ret$12 = new WrongTokenException(getKClass(LeftCurly), tmp10_invoke);
           raise.a20(tmp$ret$12);
         }
@@ -3749,31 +3870,31 @@
         tmp_10 = emptyList();
       }
       var headers = tmp_10;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof Arrow)
-        raise.b20(_this__u8e3s4.o25());
+      if (_this__u8e3s4.n25_1.c25_1 instanceof Arrow)
+        raise.b20(_this__u8e3s4.p25());
       else {
         var tmp$ret$13;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp12_invoke = _this__u8e3s4.m25_1;
+        var tmp12_invoke = _this__u8e3s4.n25_1;
         tmp$ret$13 = new WrongTokenException(getKClass(Arrow), tmp12_invoke);
         raise.a20(tmp$ret$13);
       }
       // Inline function 'kotlin.also' call
       var tmp_12;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.n25_1.c25_1 instanceof LeftCurly) {
         tmp_12 = Unit_getInstance();
       } else {
         var tmp$ret$14;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp14_invoke = _this__u8e3s4.m25_1;
+        var tmp14_invoke = _this__u8e3s4.n25_1;
         tmp$ret$14 = new WrongTokenException(getKClass(LeftCurly), tmp14_invoke);
         raise.a20(tmp$ret$14);
       }
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
+      raise.b20(_this__u8e3s4.p25());
       var responses = raise.b20(parseEndpointResponses(_this__u8e3s4, $this));
       var res = new Endpoint(name, method, segments, queryParams, headers, emptyList(), requests, responses);
       raise.y1z();
@@ -3811,15 +3932,15 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegments.<anonymous>' call
-      $this.q25(_this__u8e3s4.m25_1);
-      var tmp0_subject = _this__u8e3s4.m25_1.b25_1;
+      $this.r25(_this__u8e3s4.n25_1);
+      var tmp0_subject = _this__u8e3s4.n25_1.c25_1;
       var tmp_0;
       if (tmp0_subject instanceof Path_0) {
         // Inline function 'kotlin.also' call
-        var tmp0_also = new Literal(drop(_this__u8e3s4.m25_1.c25_1, 1));
+        var tmp0_also = new Literal(drop(_this__u8e3s4.n25_1.d25_1, 1));
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegments.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         tmp_0 = tmp0_also;
       } else {
         if (tmp0_subject instanceof ForwardSlash) {
@@ -3828,7 +3949,7 @@
           var tmp$ret$1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_5();
-          var tmp2_invoke = _this__u8e3s4.m25_1;
+          var tmp2_invoke = _this__u8e3s4.n25_1;
           tmp$ret$1 = new WrongTokenException(getKClass(Path_0), tmp2_invoke);
           raise.a20(tmp$ret$1);
         }
@@ -3869,66 +3990,66 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
-      if (_this__u8e3s4.m25_1.b25_1 instanceof LeftCurly)
-        raise.b20(_this__u8e3s4.o25());
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
+      if (_this__u8e3s4.n25_1.c25_1 instanceof LeftCurly)
+        raise.b20(_this__u8e3s4.p25());
       else {
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         tmp$ret$0 = new WrongTokenException(getKClass(LeftCurly), tmp1_invoke);
         raise.a20(tmp$ret$0);
       }
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof CustomValue) {
+      if (_this__u8e3s4.n25_1.c25_1 instanceof CustomValue) {
         // Inline function 'kotlin.also' call
-        var tmp2_also = new Identifier(_this__u8e3s4.m25_1.c25_1);
+        var tmp2_also = new Identifier(_this__u8e3s4.n25_1.d25_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         tmp_0 = tmp2_also;
       } else {
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp4_invoke = _this__u8e3s4.m25_1;
+        var tmp4_invoke = _this__u8e3s4.n25_1;
         tmp$ret$2 = new WrongTokenException(getKClass(CustomValue), tmp4_invoke);
         raise.a20(tmp$ret$2);
       }
       var identifier = tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof Colon)
-        raise.b20(_this__u8e3s4.o25());
+      if (_this__u8e3s4.n25_1.c25_1 instanceof Colon)
+        raise.b20(_this__u8e3s4.p25());
       else {
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp6_invoke = _this__u8e3s4.m25_1;
+        var tmp6_invoke = _this__u8e3s4.n25_1;
         tmp$ret$3 = new WrongTokenException(getKClass(Colon), tmp6_invoke);
         raise.a20(tmp$ret$3);
       }
-      var tmp3_subject = _this__u8e3s4.m25_1.b25_1;
+      var tmp3_subject = _this__u8e3s4.n25_1.c25_1;
       var tmp_1;
       if (isInterface(tmp3_subject, WirespecType)) {
-        var tmp_2 = _this__u8e3s4.m25_1.b25_1;
-        tmp_1 = raise.b20(parseReference(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.m25_1.c25_1));
+        var tmp_2 = _this__u8e3s4.n25_1.c25_1;
+        tmp_1 = raise.b20(parseReference(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.n25_1.d25_1));
       } else {
         var tmp$ret$4;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp8_invoke = _this__u8e3s4.m25_1;
+        var tmp8_invoke = _this__u8e3s4.n25_1;
         tmp$ret$4 = new WrongTokenException(getKClass(WirespecType), tmp8_invoke);
         raise.a20(tmp$ret$4);
       }
       var reference = tmp_1;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof RightCurly)
-        raise.b20(_this__u8e3s4.o25());
+      if (_this__u8e3s4.n25_1.c25_1 instanceof RightCurly)
+        raise.b20(_this__u8e3s4.p25());
       else {
         var tmp$ret$5;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp10_invoke = _this__u8e3s4.m25_1;
+        var tmp10_invoke = _this__u8e3s4.n25_1;
         tmp$ret$5 = new WrongTokenException(getKClass(RightCurly), tmp10_invoke);
         raise.a20(tmp$ret$5);
       }
@@ -3968,40 +4089,40 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>' call
-      $this.q25(_this__u8e3s4.m25_1);
+      $this.r25(_this__u8e3s4.n25_1);
       // Inline function 'kotlin.collections.mutableListOf' call
       var responses = ArrayList_init_$Create$();
       $l$loop: while (true) {
-        var tmp_0 = _this__u8e3s4.m25_1.b25_1;
+        var tmp_0 = _this__u8e3s4.n25_1.c25_1;
         if (!!(tmp_0 instanceof RightCurly)) {
           break $l$loop;
         }
-        if (_this__u8e3s4.m25_1.b25_1 instanceof StatusCode_0) {
-          responses.a(raise.b20(parseEndpointResponse(_this__u8e3s4, $this, _this__u8e3s4.m25_1.c25_1)));
+        if (_this__u8e3s4.n25_1.c25_1 instanceof StatusCode_0) {
+          responses.a(raise.b20(parseEndpointResponse(_this__u8e3s4, $this, _this__u8e3s4.n25_1.d25_1)));
         } else {
           var tmp$ret$1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_5();
-          var tmp1_invoke = _this__u8e3s4.m25_1;
+          var tmp1_invoke = _this__u8e3s4.n25_1;
           tmp$ret$1 = new WrongTokenException(getKClass(StatusCode_0), tmp1_invoke);
           raise.a20(tmp$ret$1);
         }
       }
       // Inline function 'kotlin.also' call
       var tmp_1;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof RightCurly) {
+      if (_this__u8e3s4.n25_1.c25_1 instanceof RightCurly) {
         tmp_1 = Unit_getInstance();
       } else {
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp3_invoke = _this__u8e3s4.m25_1;
+        var tmp3_invoke = _this__u8e3s4.n25_1;
         tmp$ret$2 = new WrongTokenException(getKClass(RightCurly), tmp3_invoke);
         raise.a20(tmp$ret$2);
       }
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
+      raise.b20(_this__u8e3s4.p25());
       var res = toList(responses);
       raise.y1z();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -4038,33 +4159,33 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
-      if (!(_this__u8e3s4.m25_1.b25_1 instanceof Arrow)) {
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
+      if (!(_this__u8e3s4.n25_1.c25_1 instanceof Arrow)) {
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         tmp$ret$0 = new WrongTokenException(getKClass(Arrow), tmp1_invoke);
         raise.a20(tmp$ret$0);
       }
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
-      var tmp1_subject = _this__u8e3s4.m25_1.b25_1;
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
+      var tmp1_subject = _this__u8e3s4.n25_1.c25_1;
       var tmp_0;
       if (isInterface(tmp1_subject, WirespecType)) {
-        var tmp_1 = _this__u8e3s4.m25_1.b25_1;
-        tmp_0 = raise.b20(parseContent(_this__u8e3s4, $this, isInterface(tmp_1, WirespecType) ? tmp_1 : THROW_CCE(), _this__u8e3s4.m25_1.c25_1));
+        var tmp_1 = _this__u8e3s4.n25_1.c25_1;
+        tmp_0 = raise.b20(parseContent(_this__u8e3s4, $this, isInterface(tmp_1, WirespecType) ? tmp_1 : THROW_CCE(), _this__u8e3s4.n25_1.d25_1));
       } else {
         var tmp$ret$1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp3_invoke = _this__u8e3s4.m25_1;
+        var tmp3_invoke = _this__u8e3s4.n25_1;
         tmp$ret$1 = new WrongTokenException(getKClass(WirespecType), tmp3_invoke);
         raise.a20(tmp$ret$1);
       }
       var content = tmp_0;
-      var res = new Response(statusCode, content);
+      var res = new Response(statusCode, emptyList(), content);
       raise.y1z();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp = new Right(res);
@@ -4100,7 +4221,7 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseContent.<anonymous>' call
-      $this.q25(_this__u8e3s4.m25_1);
+      $this.r25(_this__u8e3s4.n25_1);
       var res = new Content('application/json', raise.b20(parseReference(_this__u8e3s4, $this, wsType, value)));
       raise.y1z();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -4137,15 +4258,15 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseReference.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.m25_1.b25_1;
+      var tmp_0 = _this__u8e3s4.n25_1.c25_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseReference.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
       var isIterable = tmp0_also;
       var tmp_1;
       if (wsType instanceof WsString) {
@@ -4196,9 +4317,9 @@
   }
   function EndpointParser(logger) {
     AbstractParser.call(this, logger);
-    this.s25_1 = new TypeParser(logger);
+    this.t25_1 = new TypeParser(logger);
   }
-  protoOf(EndpointParser).v25 = function (_this__u8e3s4) {
+  protoOf(EndpointParser).w25 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4209,20 +4330,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      this.r25(_this__u8e3s4.n25_1);
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof CustomType) {
-        tmp_0 = raise.b20(parseEndpointDefinition(_this__u8e3s4, this, _this__u8e3s4.m25_1.c25_1));
+      if (_this__u8e3s4.n25_1.c25_1 instanceof CustomType) {
+        tmp_0 = raise.b20(parseEndpointDefinition(_this__u8e3s4, this, _this__u8e3s4.n25_1.d25_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also);
       }
       var res = tmp_0;
@@ -4261,37 +4382,37 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.n25_1.c25_1 instanceof LeftCurly) {
         tmp_0 = new Enum_0(typeName, raise.b20(parseEnumTypeEntries(_this__u8e3s4, $this)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         var tmp2_also = new WrongTokenException(getKClass(LeftCurly), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also);
       }
       var tmp3_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-      if (_this__u8e3s4.m25_1.b25_1 instanceof RightCurly)
-        raise.b20(_this__u8e3s4.o25());
+      if (_this__u8e3s4.n25_1.c25_1 instanceof RightCurly)
+        raise.b20(_this__u8e3s4.p25());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke_0 = _this__u8e3s4.m25_1;
+        var tmp1_invoke_0 = _this__u8e3s4.n25_1;
         var tmp2_also_0 = new WrongTokenException(getKClass(RightCurly), tmp1_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also_0);
       }
       var res = tmp3_also;
@@ -4330,34 +4451,34 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof CustomType) {
+      if (_this__u8e3s4.n25_1.c25_1 instanceof CustomType) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var tmp0_apply = ArrayList_init_$Create$();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        tmp0_apply.a(_this__u8e3s4.m25_1.c25_1);
-        raise.b20(_this__u8e3s4.o25());
-        while (equals(_this__u8e3s4.m25_1.b25_1, Comma_getInstance())) {
-          raise.b20(_this__u8e3s4.o25());
-          if (_this__u8e3s4.m25_1.b25_1 instanceof CustomType) {
+        tmp0_apply.a(_this__u8e3s4.n25_1.d25_1);
+        raise.b20(_this__u8e3s4.p25());
+        while (equals(_this__u8e3s4.n25_1.c25_1, Comma_getInstance())) {
+          raise.b20(_this__u8e3s4.p25());
+          if (_this__u8e3s4.n25_1.c25_1 instanceof CustomType) {
             // Inline function 'kotlin.also' call
-            tmp0_apply.a(_this__u8e3s4.m25_1.c25_1);
+            tmp0_apply.a(_this__u8e3s4.n25_1.d25_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.b20(_this__u8e3s4.o25());
+            raise.b20(_this__u8e3s4.p25());
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
             Companion_getInstance_5();
-            var tmp2_invoke = _this__u8e3s4.m25_1;
+            var tmp2_invoke = _this__u8e3s4.n25_1;
             var tmp3_also = new WrongTokenException(getKClass(CustomType), tmp2_invoke);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.b20(_this__u8e3s4.o25());
+            raise.b20(_this__u8e3s4.p25());
             raise.a20(tmp3_also);
           }
         }
@@ -4366,11 +4487,11 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp2_invoke_0 = _this__u8e3s4.m25_1;
+        var tmp2_invoke_0 = _this__u8e3s4.n25_1;
         var tmp3_also_0 = new WrongTokenException(getKClass(CustomType), tmp2_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp3_also_0);
       }
       var res = toSet(tmp_0);
@@ -4401,7 +4522,7 @@
   function EnumParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(EnumParser).x25 = function (_this__u8e3s4) {
+  protoOf(EnumParser).y25 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4412,20 +4533,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      this.r25(_this__u8e3s4.n25_1);
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof CustomType) {
-        tmp_0 = raise.b20(parseEnumTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.m25_1.c25_1));
+      if (_this__u8e3s4.n25_1.c25_1 instanceof CustomType) {
+        tmp_0 = raise.b20(parseEnumTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.n25_1.d25_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also);
       }
       var res = tmp_0;
@@ -4544,11 +4665,11 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>' call
-      $this.q25(_this__u8e3s4.m25_1);
-      var tmp0_subject = _this__u8e3s4.m25_1.b25_1;
+      $this.r25(_this__u8e3s4.n25_1);
+      var tmp0_subject = _this__u8e3s4.n25_1.c25_1;
       var tmp_0;
       if (isInterface(tmp0_subject, WirespecDefinition)) {
-        var tmp_1 = _this__u8e3s4.m25_1.b25_1;
+        var tmp_1 = _this__u8e3s4.n25_1.c25_1;
         var tmp1_subject = isInterface(tmp_1, WirespecDefinition) ? tmp_1 : THROW_CCE();
         var tmp_2;
         if (tmp1_subject instanceof WsTypeDef) {
@@ -4556,7 +4677,7 @@
           // Inline function 'kotlin.with' call
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-          tmp$ret$1 = $this.m20_1.a26(_this__u8e3s4);
+          tmp$ret$1 = $this.m20_1.b26(_this__u8e3s4);
           tmp_2 = raise.b20(tmp$ret$1);
         } else {
           if (tmp1_subject instanceof WsEnumTypeDef) {
@@ -4564,7 +4685,7 @@
             // Inline function 'kotlin.with' call
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            tmp$ret$3 = $this.n20_1.x25(_this__u8e3s4);
+            tmp$ret$3 = $this.n20_1.y25(_this__u8e3s4);
             tmp_2 = raise.b20(tmp$ret$3);
           } else {
             if (tmp1_subject instanceof WsRefinedTypeDef) {
@@ -4572,7 +4693,7 @@
               // Inline function 'kotlin.with' call
               // Inline function 'kotlin.contracts.contract' call
               // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-              tmp$ret$5 = $this.o20_1.z25(_this__u8e3s4);
+              tmp$ret$5 = $this.o20_1.a26(_this__u8e3s4);
               tmp_2 = raise.b20(tmp$ret$5);
             } else {
               if (tmp1_subject instanceof WsEndpointDef) {
@@ -4580,7 +4701,7 @@
                 // Inline function 'kotlin.with' call
                 // Inline function 'kotlin.contracts.contract' call
                 // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-                tmp$ret$7 = $this.p20_1.v25(_this__u8e3s4);
+                tmp$ret$7 = $this.p20_1.w25(_this__u8e3s4);
                 tmp_2 = raise.b20(tmp$ret$7);
               } else {
                 noWhenBranchMatchedException();
@@ -4593,11 +4714,11 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp5_invoke = _this__u8e3s4.m25_1;
+        var tmp5_invoke = _this__u8e3s4.n25_1;
         var tmp6_also = new WrongTokenException(getKClass(WirespecDefinition), tmp5_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp6_also);
       }
       var res = tmp_0;
@@ -4633,13 +4754,13 @@
     this.p20_1 = new EndpointParser(logger);
   }
   protoOf(Parser).q20 = function (tokens) {
-    return parse(toProvider(removeWhiteSpace(tokens), this.p25_1), this);
+    return parse(toProvider(removeWhiteSpace(tokens), this.q25_1), this);
   };
   function AbstractParser(logger) {
-    this.p25_1 = logger;
+    this.q25_1 = logger;
   }
-  protoOf(AbstractParser).q25 = function (_this__u8e3s4) {
-    return this.p25_1.h20('Parsing ' + _this__u8e3s4.b25_1 + ' at line ' + _this__u8e3s4.d25_1.f25_1 + ' position ' + _this__u8e3s4.d25_1.g25_1);
+  protoOf(AbstractParser).r25 = function (_this__u8e3s4) {
+    return this.q25_1.h20('Parsing ' + _this__u8e3s4.c25_1 + ' at line ' + _this__u8e3s4.e25_1.g25_1 + ' position ' + _this__u8e3s4.e25_1.h25_1);
   };
   function parseCustomRegex(_this__u8e3s4, $this, typeName) {
     // Inline function 'arrow.core.raise.either' call
@@ -4652,27 +4773,27 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseCustomRegex.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof CustomRegex) {
-        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.m25_1.c25_1));
+      if (_this__u8e3s4.n25_1.c25_1 instanceof CustomRegex) {
+        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.n25_1.d25_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomRegex), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseCustomRegex.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also);
       }
       var tmp3_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseCustomRegex.<anonymous>.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
+      raise.b20(_this__u8e3s4.p25());
       var res = tmp3_also;
       raise.y1z();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -4701,7 +4822,7 @@
   function RefinedTypeParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(RefinedTypeParser).z25 = function (_this__u8e3s4) {
+  protoOf(RefinedTypeParser).a26 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4712,20 +4833,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseRefinedType.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      this.r25(_this__u8e3s4.n25_1);
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof CustomType) {
-        tmp_0 = raise.b20(parseCustomRegex(_this__u8e3s4, this, _this__u8e3s4.m25_1.c25_1));
+      if (_this__u8e3s4.n25_1.c25_1 instanceof CustomType) {
+        tmp_0 = raise.b20(parseCustomRegex(_this__u8e3s4, this, _this__u8e3s4.n25_1.d25_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.RefinedTypeParser.parseRefinedType.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also);
       }
       var res = tmp_0;
@@ -4761,15 +4882,15 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp = "Eating: '" + previousToken.c25_1 + "', ";
+      tmp = "Eating: '" + previousToken.d25_1 + "', ";
     }
     var tmp1_elvis_lhs = tmp;
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-    var curr = "Current: '" + $this.m25_1.c25_1 + "'";
-    var tmp2_safe_receiver = $this.n25_1;
+    var curr = "Current: '" + $this.n25_1.d25_1 + "'";
+    var tmp2_safe_receiver = $this.o25_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -4777,11 +4898,11 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp_0 = ", Next: '" + tmp2_safe_receiver.c25_1 + "'";
+      tmp_0 = ", Next: '" + tmp2_safe_receiver.d25_1 + "'";
     }
     var tmp3_elvis_lhs = tmp_0;
     var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-    $this.k25_1.h20(prev + curr + next);
+    $this.l25_1.h20(prev + curr + next);
   }
   function printTokens$default($this, previousToken, $super) {
     previousToken = previousToken === VOID ? null : previousToken;
@@ -4795,7 +4916,7 @@
       // Inline function 'kotlin.Companion.success' call
       Companion_getInstance();
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.nextToken.<anonymous>' call
-      var tmp1_success = $this.l25_1.e();
+      var tmp1_success = $this.m25_1.e();
       tmp = _Result___init__impl__xyqfz8(tmp1_success);
     } catch ($p) {
       var tmp_0;
@@ -4820,16 +4941,16 @@
     return tmp_1;
   }
   function TokenProvider(logger, tokenIterator) {
-    this.k25_1 = logger;
-    this.l25_1 = tokenIterator;
-    this.m25_1 = ensureNotNull(nextToken(this));
-    this.n25_1 = nextToken(this);
+    this.l25_1 = logger;
+    this.m25_1 = tokenIterator;
+    this.n25_1 = ensureNotNull(nextToken(this));
+    this.o25_1 = nextToken(this);
     printTokens$default(this);
   }
   protoOf(TokenProvider).d = function () {
-    return !(this.n25_1 == null);
+    return !(this.o25_1 == null);
   };
-  protoOf(TokenProvider).o25 = function () {
+  protoOf(TokenProvider).p25 = function () {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4839,17 +4960,17 @@
     var tmp;
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.m25_1;
+      var previousToken = this.n25_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.n25_1;
+      var tmp0_elvis_lhs = this.o25_1;
       var tmp_1;
       if (tmp0_elvis_lhs == null) {
-        raise.a20(new NextException(previousToken.d25_1));
+        raise.a20(new NextException(previousToken.e25_1));
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.m25_1 = tmp_1;
-      this.n25_1 = nextToken(this);
+      tmp_0.n25_1 = tmp_1;
+      this.o25_1 = nextToken(this);
       printTokens(this, previousToken);
       var res = Unit_getInstance();
       raise.y1z();
@@ -4890,20 +5011,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof LeftCurly) {
-        tmp_0 = new Type_0(typeName, raise.b20($this.u25(_this__u8e3s4)));
+      if (_this__u8e3s4.n25_1.c25_1 instanceof LeftCurly) {
+        tmp_0 = new Type_0(typeName, raise.b20($this.v25(_this__u8e3s4)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         var tmp2_also = new WrongTokenException(getKClass(LeftCurly), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also);
       }
       var res = tmp_0;
@@ -4942,42 +5063,42 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
-      if (_this__u8e3s4.m25_1.b25_1 instanceof Colon)
-        raise.b20(_this__u8e3s4.o25());
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
+      if (_this__u8e3s4.n25_1.c25_1 instanceof Colon)
+        raise.b20(_this__u8e3s4.p25());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         var tmp2_also = new WrongTokenException(getKClass(Colon), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also);
       }
-      var type = _this__u8e3s4.m25_1.b25_1;
+      var type = _this__u8e3s4.n25_1.c25_1;
       var tmp_0;
       if (isInterface(type, WirespecType)) {
-        var tmp_1 = raise.b20(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.m25_1.c25_1));
+        var tmp_1 = raise.b20(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.n25_1.d25_1));
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.m25_1.b25_1;
+        var tmp_2 = _this__u8e3s4.n25_1.c25_1;
         var tmp3_also = tmp_2 instanceof QuestionMark;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
         if (tmp3_also)
-          raise.b20(_this__u8e3s4.o25());
+          raise.b20(_this__u8e3s4.p25());
         tmp_0 = new Field(identifier, tmp_1, tmp3_also);
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp5_invoke = _this__u8e3s4.m25_1;
+        var tmp5_invoke = _this__u8e3s4.n25_1;
         var tmp6_also = new WrongTokenException(getKClass(CustomType), tmp5_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp6_also);
       }
       var res = tmp_0;
@@ -5016,15 +5137,15 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseFieldValue.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      $this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      $this.r25(_this__u8e3s4.n25_1);
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.m25_1.b25_1;
+      var tmp_0 = _this__u8e3s4.n25_1.c25_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseFieldValue.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
       var isIterable = tmp0_also;
       var tmp_1;
       if (wsType instanceof WsString) {
@@ -5076,7 +5197,7 @@
   function TypeParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(TypeParser).a26 = function (_this__u8e3s4) {
+  protoOf(TypeParser).b26 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5087,20 +5208,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      this.r25(_this__u8e3s4.n25_1);
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof CustomType) {
-        tmp_0 = raise.b20(parseTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.m25_1.c25_1));
+      if (_this__u8e3s4.n25_1.c25_1 instanceof CustomType) {
+        tmp_0 = raise.b20(parseTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.n25_1.d25_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.m25_1;
+        var tmp1_invoke = _this__u8e3s4.n25_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also);
       }
       var res = tmp_0;
@@ -5128,7 +5249,7 @@
     }
     return tmp;
   };
-  protoOf(TypeParser).u25 = function (_this__u8e3s4) {
+  protoOf(TypeParser).v25 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5139,31 +5260,31 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>' call
-      raise.b20(_this__u8e3s4.o25());
-      this.q25(_this__u8e3s4.m25_1);
+      raise.b20(_this__u8e3s4.p25());
+      this.r25(_this__u8e3s4.n25_1);
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.m25_1.b25_1 instanceof CustomValue) {
+      if (_this__u8e3s4.n25_1.c25_1 instanceof CustomValue) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var tmp0_apply = ArrayList_init_$Create$();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-        tmp0_apply.a(raise.b20(parseField(_this__u8e3s4, this, new Identifier(_this__u8e3s4.m25_1.c25_1))));
-        while (equals(_this__u8e3s4.m25_1.b25_1, Comma_getInstance())) {
-          raise.b20(_this__u8e3s4.o25());
-          if (_this__u8e3s4.m25_1.b25_1 instanceof CustomValue) {
-            tmp0_apply.a(raise.b20(parseField(_this__u8e3s4, this, new Identifier(_this__u8e3s4.m25_1.c25_1))));
+        tmp0_apply.a(raise.b20(parseField(_this__u8e3s4, this, new Identifier(_this__u8e3s4.n25_1.d25_1))));
+        while (equals(_this__u8e3s4.n25_1.c25_1, Comma_getInstance())) {
+          raise.b20(_this__u8e3s4.p25());
+          if (_this__u8e3s4.n25_1.c25_1 instanceof CustomValue) {
+            tmp0_apply.a(raise.b20(parseField(_this__u8e3s4, this, new Identifier(_this__u8e3s4.n25_1.d25_1))));
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
             Companion_getInstance_5();
-            var tmp1_invoke = _this__u8e3s4.m25_1;
+            var tmp1_invoke = _this__u8e3s4.n25_1;
             var tmp2_also = new WrongTokenException(getKClass(CustomValue), tmp1_invoke);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-            raise.b20(_this__u8e3s4.o25());
+            raise.b20(_this__u8e3s4.p25());
             raise.a20(tmp2_also);
           }
         }
@@ -5172,27 +5293,27 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp2_invoke = _this__u8e3s4.m25_1;
+        var tmp2_invoke = _this__u8e3s4.n25_1;
         var tmp3_also = new WrongTokenException(getKClass(CustomValue), tmp2_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp3_also);
       }
       var tmp4_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-      if (_this__u8e3s4.m25_1.b25_1 instanceof RightCurly)
-        raise.b20(_this__u8e3s4.o25());
+      if (_this__u8e3s4.n25_1.c25_1 instanceof RightCurly)
+        raise.b20(_this__u8e3s4.p25());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke_0 = _this__u8e3s4.m25_1;
+        var tmp1_invoke_0 = _this__u8e3s4.n25_1;
         var tmp2_also_0 = new WrongTokenException(getKClass(RightCurly), tmp1_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-        raise.b20(_this__u8e3s4.o25());
+        raise.b20(_this__u8e3s4.p25());
         raise.a20(tmp2_also_0);
       }
       // Inline function 'kotlin.contracts.contract' call
@@ -5277,13 +5398,13 @@
   }
   var $ENTRIES;
   function Literal(value) {
-    this.f23_1 = value;
+    this.g23_1 = value;
   }
   protoOf(Literal).toString = function () {
-    return 'Literal(value=' + this.f23_1 + ')';
+    return 'Literal(value=' + this.g23_1 + ')';
   };
   protoOf(Literal).hashCode = function () {
-    return getStringHashCode(this.f23_1);
+    return getStringHashCode(this.g23_1);
   };
   protoOf(Literal).equals = function (other) {
     if (this === other)
@@ -5291,20 +5412,20 @@
     if (!(other instanceof Literal))
       return false;
     var tmp0_other_with_cast = other instanceof Literal ? other : THROW_CCE();
-    if (!(this.f23_1 === tmp0_other_with_cast.f23_1))
+    if (!(this.g23_1 === tmp0_other_with_cast.g23_1))
       return false;
     return true;
   };
   function Param(identifier, reference) {
-    this.c22_1 = identifier;
-    this.d22_1 = reference;
+    this.d22_1 = identifier;
+    this.e22_1 = reference;
   }
   protoOf(Param).toString = function () {
-    return 'Param(identifier=' + this.c22_1 + ', reference=' + this.d22_1 + ')';
+    return 'Param(identifier=' + this.d22_1 + ', reference=' + this.e22_1 + ')';
   };
   protoOf(Param).hashCode = function () {
-    var result = this.c22_1.hashCode();
-    result = imul(result, 31) + hashCode(this.d22_1) | 0;
+    var result = this.d22_1.hashCode();
+    result = imul(result, 31) + hashCode(this.e22_1) | 0;
     return result;
   };
   protoOf(Param).equals = function (other) {
@@ -5313,9 +5434,9 @@
     if (!(other instanceof Param))
       return false;
     var tmp0_other_with_cast = other instanceof Param ? other : THROW_CCE();
-    if (!this.c22_1.equals(tmp0_other_with_cast.c22_1))
+    if (!this.d22_1.equals(tmp0_other_with_cast.d22_1))
       return false;
-    if (!equals(this.d22_1, tmp0_other_with_cast.d22_1))
+    if (!equals(this.e22_1, tmp0_other_with_cast.e22_1))
       return false;
     return true;
   };
@@ -5341,16 +5462,18 @@
       return false;
     return true;
   };
-  function Response(status, content) {
+  function Response(status, headers, content) {
     this.x21_1 = status;
-    this.y21_1 = content;
+    this.y21_1 = headers;
+    this.z21_1 = content;
   }
   protoOf(Response).toString = function () {
-    return 'Response(status=' + this.x21_1 + ', content=' + this.y21_1 + ')';
+    return 'Response(status=' + this.x21_1 + ', headers=' + this.y21_1 + ', content=' + this.z21_1 + ')';
   };
   protoOf(Response).hashCode = function () {
     var result = getStringHashCode(this.x21_1);
-    result = imul(result, 31) + (this.y21_1 == null ? 0 : this.y21_1.hashCode()) | 0;
+    result = imul(result, 31) + hashCode(this.y21_1) | 0;
+    result = imul(result, 31) + (this.z21_1 == null ? 0 : this.z21_1.hashCode()) | 0;
     return result;
   };
   protoOf(Response).equals = function (other) {
@@ -5363,6 +5486,8 @@
       return false;
     if (!equals(this.y21_1, tmp0_other_with_cast.y21_1))
       return false;
+    if (!equals(this.z21_1, tmp0_other_with_cast.z21_1))
+      return false;
     return true;
   };
   function Content(type, reference, isNullable) {
@@ -5475,15 +5600,15 @@
     return true;
   };
   function Enum_0(name, entries) {
-    this.y22_1 = name;
-    this.z22_1 = entries;
+    this.z22_1 = name;
+    this.a23_1 = entries;
   }
   protoOf(Enum_0).toString = function () {
-    return 'Enum(name=' + this.y22_1 + ', entries=' + this.z22_1 + ')';
+    return 'Enum(name=' + this.z22_1 + ', entries=' + this.a23_1 + ')';
   };
   protoOf(Enum_0).hashCode = function () {
-    var result = getStringHashCode(this.y22_1);
-    result = imul(result, 31) + hashCode(this.z22_1) | 0;
+    var result = getStringHashCode(this.z22_1);
+    result = imul(result, 31) + hashCode(this.a23_1) | 0;
     return result;
   };
   protoOf(Enum_0).equals = function (other) {
@@ -5492,20 +5617,20 @@
     if (!(other instanceof Enum_0))
       return false;
     var tmp0_other_with_cast = other instanceof Enum_0 ? other : THROW_CCE();
-    if (!(this.y22_1 === tmp0_other_with_cast.y22_1))
+    if (!(this.z22_1 === tmp0_other_with_cast.z22_1))
       return false;
-    if (!equals(this.z22_1, tmp0_other_with_cast.z22_1))
+    if (!equals(this.a23_1, tmp0_other_with_cast.a23_1))
       return false;
     return true;
   };
   function Validator(value) {
-    this.d23_1 = value;
+    this.e23_1 = value;
   }
   protoOf(Validator).toString = function () {
-    return 'Validator(value=' + this.d23_1 + ')';
+    return 'Validator(value=' + this.e23_1 + ')';
   };
   protoOf(Validator).hashCode = function () {
-    return getStringHashCode(this.d23_1);
+    return getStringHashCode(this.e23_1);
   };
   protoOf(Validator).equals = function (other) {
     if (this === other)
@@ -5513,20 +5638,20 @@
     if (!(other instanceof Validator))
       return false;
     var tmp0_other_with_cast = other instanceof Validator ? other : THROW_CCE();
-    if (!(this.d23_1 === tmp0_other_with_cast.d23_1))
+    if (!(this.e23_1 === tmp0_other_with_cast.e23_1))
       return false;
     return true;
   };
   function Refined(name, validator) {
-    this.a23_1 = name;
-    this.b23_1 = validator;
+    this.b23_1 = name;
+    this.c23_1 = validator;
   }
   protoOf(Refined).toString = function () {
-    return 'Refined(name=' + this.a23_1 + ', validator=' + this.b23_1 + ')';
+    return 'Refined(name=' + this.b23_1 + ', validator=' + this.c23_1 + ')';
   };
   protoOf(Refined).hashCode = function () {
-    var result = getStringHashCode(this.a23_1);
-    result = imul(result, 31) + this.b23_1.hashCode() | 0;
+    var result = getStringHashCode(this.b23_1);
+    result = imul(result, 31) + this.c23_1.hashCode() | 0;
     return result;
   };
   protoOf(Refined).equals = function (other) {
@@ -5535,9 +5660,9 @@
     if (!(other instanceof Refined))
       return false;
     var tmp0_other_with_cast = other instanceof Refined ? other : THROW_CCE();
-    if (!(this.a23_1 === tmp0_other_with_cast.a23_1))
+    if (!(this.b23_1 === tmp0_other_with_cast.b23_1))
       return false;
-    if (!this.b23_1.equals(tmp0_other_with_cast.b23_1))
+    if (!this.c23_1.equals(tmp0_other_with_cast.c23_1))
       return false;
     return true;
   };
@@ -5576,29 +5701,29 @@
   }
   function Any(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.b26_1 = isIterable;
-    this.c26_1 = isMap;
+    this.c26_1 = isIterable;
+    this.d26_1 = isMap;
   }
-  protoOf(Any).a22 = function () {
-    return this.b26_1;
-  };
-  protoOf(Any).x22 = function () {
+  protoOf(Any).b22 = function () {
     return this.c26_1;
   };
-  protoOf(Any).d26 = function (isIterable, isMap) {
+  protoOf(Any).y22 = function () {
+    return this.d26_1;
+  };
+  protoOf(Any).e26 = function (isIterable, isMap) {
     return new Any(isIterable, isMap);
   };
-  protoOf(Any).e26 = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.b26_1 : isIterable;
-    isMap = isMap === VOID ? this.c26_1 : isMap;
-    return $super === VOID ? this.d26(isIterable, isMap) : $super.d26.call(this, isIterable, isMap);
+  protoOf(Any).f26 = function (isIterable, isMap, $super) {
+    isIterable = isIterable === VOID ? this.c26_1 : isIterable;
+    isMap = isMap === VOID ? this.d26_1 : isMap;
+    return $super === VOID ? this.e26(isIterable, isMap) : $super.e26.call(this, isIterable, isMap);
   };
   protoOf(Any).toString = function () {
-    return 'Any(isIterable=' + this.b26_1 + ', isMap=' + this.c26_1 + ')';
+    return 'Any(isIterable=' + this.c26_1 + ', isMap=' + this.d26_1 + ')';
   };
   protoOf(Any).hashCode = function () {
-    var result = this.b26_1 | 0;
-    result = imul(result, 31) + (this.c26_1 | 0) | 0;
+    var result = this.c26_1 | 0;
+    result = imul(result, 31) + (this.d26_1 | 0) | 0;
     return result;
   };
   protoOf(Any).equals = function (other) {
@@ -5607,40 +5732,40 @@
     if (!(other instanceof Any))
       return false;
     var tmp0_other_with_cast = other instanceof Any ? other : THROW_CCE();
-    if (!(this.b26_1 === tmp0_other_with_cast.b26_1))
-      return false;
     if (!(this.c26_1 === tmp0_other_with_cast.c26_1))
       return false;
+    if (!(this.d26_1 === tmp0_other_with_cast.d26_1))
+      return false;
     return true;
   };
   function Custom(value, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.u22_1 = value;
-    this.v22_1 = isIterable;
-    this.w22_1 = isMap;
+    this.v22_1 = value;
+    this.w22_1 = isIterable;
+    this.x22_1 = isMap;
   }
-  protoOf(Custom).a22 = function () {
-    return this.v22_1;
-  };
-  protoOf(Custom).x22 = function () {
+  protoOf(Custom).b22 = function () {
     return this.w22_1;
   };
-  protoOf(Custom).f26 = function (value, isIterable, isMap) {
+  protoOf(Custom).y22 = function () {
+    return this.x22_1;
+  };
+  protoOf(Custom).g26 = function (value, isIterable, isMap) {
     return new Custom(value, isIterable, isMap);
   };
-  protoOf(Custom).g26 = function (value, isIterable, isMap, $super) {
-    value = value === VOID ? this.u22_1 : value;
-    isIterable = isIterable === VOID ? this.v22_1 : isIterable;
-    isMap = isMap === VOID ? this.w22_1 : isMap;
-    return $super === VOID ? this.f26(value, isIterable, isMap) : $super.f26.call(this, value, isIterable, isMap);
+  protoOf(Custom).h26 = function (value, isIterable, isMap, $super) {
+    value = value === VOID ? this.v22_1 : value;
+    isIterable = isIterable === VOID ? this.w22_1 : isIterable;
+    isMap = isMap === VOID ? this.x22_1 : isMap;
+    return $super === VOID ? this.g26(value, isIterable, isMap) : $super.g26.call(this, value, isIterable, isMap);
   };
   protoOf(Custom).toString = function () {
-    return 'Custom(value=' + this.u22_1 + ', isIterable=' + this.v22_1 + ', isMap=' + this.w22_1 + ')';
+    return 'Custom(value=' + this.v22_1 + ', isIterable=' + this.w22_1 + ', isMap=' + this.x22_1 + ')';
   };
   protoOf(Custom).hashCode = function () {
-    var result = getStringHashCode(this.u22_1);
-    result = imul(result, 31) + (this.v22_1 | 0) | 0;
+    var result = getStringHashCode(this.v22_1);
     result = imul(result, 31) + (this.w22_1 | 0) | 0;
+    result = imul(result, 31) + (this.x22_1 | 0) | 0;
     return result;
   };
   protoOf(Custom).equals = function (other) {
@@ -5649,42 +5774,42 @@
     if (!(other instanceof Custom))
       return false;
     var tmp0_other_with_cast = other instanceof Custom ? other : THROW_CCE();
-    if (!(this.u22_1 === tmp0_other_with_cast.u22_1))
-      return false;
     if (!(this.v22_1 === tmp0_other_with_cast.v22_1))
       return false;
     if (!(this.w22_1 === tmp0_other_with_cast.w22_1))
       return false;
+    if (!(this.x22_1 === tmp0_other_with_cast.x22_1))
+      return false;
     return true;
   };
   function Primitive(type, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.r22_1 = type;
-    this.s22_1 = isIterable;
-    this.t22_1 = isMap;
+    this.s22_1 = type;
+    this.t22_1 = isIterable;
+    this.u22_1 = isMap;
   }
-  protoOf(Primitive).a22 = function () {
-    return this.s22_1;
-  };
-  protoOf(Primitive).x22 = function () {
+  protoOf(Primitive).b22 = function () {
     return this.t22_1;
   };
-  protoOf(Primitive).h26 = function (type, isIterable, isMap) {
+  protoOf(Primitive).y22 = function () {
+    return this.u22_1;
+  };
+  protoOf(Primitive).i26 = function (type, isIterable, isMap) {
     return new Primitive(type, isIterable, isMap);
   };
-  protoOf(Primitive).i26 = function (type, isIterable, isMap, $super) {
-    type = type === VOID ? this.r22_1 : type;
-    isIterable = isIterable === VOID ? this.s22_1 : isIterable;
-    isMap = isMap === VOID ? this.t22_1 : isMap;
-    return $super === VOID ? this.h26(type, isIterable, isMap) : $super.h26.call(this, type, isIterable, isMap);
+  protoOf(Primitive).j26 = function (type, isIterable, isMap, $super) {
+    type = type === VOID ? this.s22_1 : type;
+    isIterable = isIterable === VOID ? this.t22_1 : isIterable;
+    isMap = isMap === VOID ? this.u22_1 : isMap;
+    return $super === VOID ? this.i26(type, isIterable, isMap) : $super.i26.call(this, type, isIterable, isMap);
   };
   protoOf(Primitive).toString = function () {
-    return 'Primitive(type=' + this.r22_1 + ', isIterable=' + this.s22_1 + ', isMap=' + this.t22_1 + ')';
+    return 'Primitive(type=' + this.s22_1 + ', isIterable=' + this.t22_1 + ', isMap=' + this.u22_1 + ')';
   };
   protoOf(Primitive).hashCode = function () {
-    var result = this.r22_1.hashCode();
-    result = imul(result, 31) + (this.s22_1 | 0) | 0;
+    var result = this.s22_1.hashCode();
     result = imul(result, 31) + (this.t22_1 | 0) | 0;
+    result = imul(result, 31) + (this.u22_1 | 0) | 0;
     return result;
   };
   protoOf(Primitive).equals = function (other) {
@@ -5693,22 +5818,22 @@
     if (!(other instanceof Primitive))
       return false;
     var tmp0_other_with_cast = other instanceof Primitive ? other : THROW_CCE();
-    if (!this.r22_1.equals(tmp0_other_with_cast.r22_1))
-      return false;
-    if (!(this.s22_1 === tmp0_other_with_cast.s22_1))
+    if (!this.s22_1.equals(tmp0_other_with_cast.s22_1))
       return false;
     if (!(this.t22_1 === tmp0_other_with_cast.t22_1))
       return false;
+    if (!(this.u22_1 === tmp0_other_with_cast.u22_1))
+      return false;
     return true;
   };
   function Identifier(value) {
-    this.p22_1 = value;
+    this.q22_1 = value;
   }
   protoOf(Identifier).toString = function () {
-    return 'Identifier(value=' + this.p22_1 + ')';
+    return 'Identifier(value=' + this.q22_1 + ')';
   };
   protoOf(Identifier).hashCode = function () {
-    return getStringHashCode(this.p22_1);
+    return getStringHashCode(this.q22_1);
   };
   protoOf(Identifier).equals = function (other) {
     if (this === other)
@@ -5716,22 +5841,31 @@
     if (!(other instanceof Identifier))
       return false;
     var tmp0_other_with_cast = other instanceof Identifier ? other : THROW_CCE();
-    if (!(this.p22_1 === tmp0_other_with_cast.p22_1))
+    if (!(this.q22_1 === tmp0_other_with_cast.q22_1))
       return false;
     return true;
   };
   function Field(identifier, reference, isNullable) {
-    this.l22_1 = identifier;
-    this.m22_1 = reference;
-    this.n22_1 = isNullable;
+    this.m22_1 = identifier;
+    this.n22_1 = reference;
+    this.o22_1 = isNullable;
   }
+  protoOf(Field).k26 = function (identifier, reference, isNullable) {
+    return new Field(identifier, reference, isNullable);
+  };
+  protoOf(Field).o24 = function (identifier, reference, isNullable, $super) {
+    identifier = identifier === VOID ? this.m22_1 : identifier;
+    reference = reference === VOID ? this.n22_1 : reference;
+    isNullable = isNullable === VOID ? this.o22_1 : isNullable;
+    return $super === VOID ? this.k26(identifier, reference, isNullable) : $super.k26.call(this, identifier, reference, isNullable);
+  };
   protoOf(Field).toString = function () {
-    return 'Field(identifier=' + this.l22_1 + ', reference=' + this.m22_1 + ', isNullable=' + this.n22_1 + ')';
+    return 'Field(identifier=' + this.m22_1 + ', reference=' + this.n22_1 + ', isNullable=' + this.o22_1 + ')';
   };
   protoOf(Field).hashCode = function () {
-    var result = this.l22_1.hashCode();
-    result = imul(result, 31) + hashCode(this.m22_1) | 0;
-    result = imul(result, 31) + (this.n22_1 | 0) | 0;
+    var result = this.m22_1.hashCode();
+    result = imul(result, 31) + hashCode(this.n22_1) | 0;
+    result = imul(result, 31) + (this.o22_1 | 0) | 0;
     return result;
   };
   protoOf(Field).equals = function (other) {
@@ -5740,22 +5874,22 @@
     if (!(other instanceof Field))
       return false;
     var tmp0_other_with_cast = other instanceof Field ? other : THROW_CCE();
-    if (!this.l22_1.equals(tmp0_other_with_cast.l22_1))
+    if (!this.m22_1.equals(tmp0_other_with_cast.m22_1))
       return false;
-    if (!equals(this.m22_1, tmp0_other_with_cast.m22_1))
+    if (!equals(this.n22_1, tmp0_other_with_cast.n22_1))
       return false;
-    if (!(this.n22_1 === tmp0_other_with_cast.n22_1))
+    if (!(this.o22_1 === tmp0_other_with_cast.o22_1))
       return false;
     return true;
   };
   function Shape(value) {
-    this.k22_1 = value;
+    this.l22_1 = value;
   }
   protoOf(Shape).toString = function () {
-    return 'Shape(value=' + this.k22_1 + ')';
+    return 'Shape(value=' + this.l22_1 + ')';
   };
   protoOf(Shape).hashCode = function () {
-    return hashCode(this.k22_1);
+    return hashCode(this.l22_1);
   };
   protoOf(Shape).equals = function (other) {
     if (this === other)
@@ -5763,20 +5897,20 @@
     if (!(other instanceof Shape))
       return false;
     var tmp0_other_with_cast = other instanceof Shape ? other : THROW_CCE();
-    if (!equals(this.k22_1, tmp0_other_with_cast.k22_1))
+    if (!equals(this.l22_1, tmp0_other_with_cast.l22_1))
       return false;
     return true;
   };
   function Type_0(name, shape) {
-    this.f22_1 = name;
-    this.g22_1 = shape;
+    this.g22_1 = name;
+    this.h22_1 = shape;
   }
   protoOf(Type_0).toString = function () {
-    return 'Type(name=' + this.f22_1 + ', shape=' + this.g22_1 + ')';
+    return 'Type(name=' + this.g22_1 + ', shape=' + this.h22_1 + ')';
   };
   protoOf(Type_0).hashCode = function () {
-    var result = getStringHashCode(this.f22_1);
-    result = imul(result, 31) + this.g22_1.hashCode() | 0;
+    var result = getStringHashCode(this.g22_1);
+    result = imul(result, 31) + this.h22_1.hashCode() | 0;
     return result;
   };
   protoOf(Type_0).equals = function (other) {
@@ -5785,24 +5919,24 @@
     if (!(other instanceof Type_0))
       return false;
     var tmp0_other_with_cast = other instanceof Type_0 ? other : THROW_CCE();
-    if (!(this.f22_1 === tmp0_other_with_cast.f22_1))
+    if (!(this.g22_1 === tmp0_other_with_cast.g22_1))
       return false;
-    if (!this.g22_1.equals(tmp0_other_with_cast.g22_1))
+    if (!this.h22_1.equals(tmp0_other_with_cast.h22_1))
       return false;
     return true;
   };
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.j26_1 = idx;
-    this.k26_1 = length;
+    this.l26_1 = idx;
+    this.m26_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.j26_1 + ', length=' + this.k26_1 + ')';
+    return 'IdxAndLength(idx=' + this.l26_1 + ', length=' + this.m26_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.j26_1;
-    result = imul(result, 31) + this.k26_1 | 0;
+    var result = this.l26_1;
+    result = imul(result, 31) + this.m26_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -5811,9 +5945,9 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.j26_1 === tmp0_other_with_cast.j26_1))
+    if (!(this.l26_1 === tmp0_other_with_cast.l26_1))
       return false;
-    if (!(this.k26_1 === tmp0_other_with_cast.k26_1))
+    if (!(this.m26_1 === tmp0_other_with_cast.m26_1))
       return false;
     return true;
   };
@@ -5821,26 +5955,26 @@
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.f25_1 = line;
-    this.g25_1 = position;
-    this.h25_1 = idxAndLength;
+    this.g25_1 = line;
+    this.h25_1 = position;
+    this.i25_1 = idxAndLength;
   }
-  protoOf(Coordinates).l26 = function (line, position, idxAndLength) {
+  protoOf(Coordinates).n26 = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).m26 = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.f25_1 : line;
-    position = position === VOID ? this.g25_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.h25_1 : idxAndLength;
-    return $super === VOID ? this.l26(line, position, idxAndLength) : $super.l26.call(this, line, position, idxAndLength);
+  protoOf(Coordinates).o26 = function (line, position, idxAndLength, $super) {
+    line = line === VOID ? this.g25_1 : line;
+    position = position === VOID ? this.h25_1 : position;
+    idxAndLength = idxAndLength === VOID ? this.i25_1 : idxAndLength;
+    return $super === VOID ? this.n26(line, position, idxAndLength) : $super.n26.call(this, line, position, idxAndLength);
   };
   protoOf(Coordinates).toString = function () {
-    return 'Coordinates(line=' + this.f25_1 + ', position=' + this.g25_1 + ', idxAndLength=' + this.h25_1 + ')';
+    return 'Coordinates(line=' + this.g25_1 + ', position=' + this.h25_1 + ', idxAndLength=' + this.i25_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.f25_1;
-    result = imul(result, 31) + this.g25_1 | 0;
-    result = imul(result, 31) + this.h25_1.hashCode() | 0;
+    var result = this.g25_1;
+    result = imul(result, 31) + this.h25_1 | 0;
+    result = imul(result, 31) + this.i25_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -5849,35 +5983,35 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.f25_1 === tmp0_other_with_cast.f25_1))
-      return false;
     if (!(this.g25_1 === tmp0_other_with_cast.g25_1))
       return false;
-    if (!this.h25_1.equals(tmp0_other_with_cast.h25_1))
+    if (!(this.h25_1 === tmp0_other_with_cast.h25_1))
+      return false;
+    if (!this.i25_1.equals(tmp0_other_with_cast.i25_1))
       return false;
     return true;
   };
   function Token(type, value, coordinates) {
-    this.b25_1 = type;
-    this.c25_1 = value;
-    this.d25_1 = coordinates;
+    this.c25_1 = type;
+    this.d25_1 = value;
+    this.e25_1 = coordinates;
   }
-  protoOf(Token).n26 = function (type, value, coordinates) {
+  protoOf(Token).p26 = function (type, value, coordinates) {
     return new Token(type, value, coordinates);
   };
-  protoOf(Token).j25 = function (type, value, coordinates, $super) {
-    type = type === VOID ? this.b25_1 : type;
-    value = value === VOID ? this.c25_1 : value;
-    coordinates = coordinates === VOID ? this.d25_1 : coordinates;
-    return $super === VOID ? this.n26(type, value, coordinates) : $super.n26.call(this, type, value, coordinates);
+  protoOf(Token).k25 = function (type, value, coordinates, $super) {
+    type = type === VOID ? this.c25_1 : type;
+    value = value === VOID ? this.d25_1 : value;
+    coordinates = coordinates === VOID ? this.e25_1 : coordinates;
+    return $super === VOID ? this.p26(type, value, coordinates) : $super.p26.call(this, type, value, coordinates);
   };
   protoOf(Token).toString = function () {
-    return 'Token(type=' + this.b25_1 + ', value=' + this.c25_1 + ', coordinates=' + this.d25_1 + ')';
+    return 'Token(type=' + this.c25_1 + ', value=' + this.d25_1 + ', coordinates=' + this.e25_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = hashCode(this.b25_1);
-    result = imul(result, 31) + getStringHashCode(this.c25_1) | 0;
-    result = imul(result, 31) + this.d25_1.hashCode() | 0;
+    var result = hashCode(this.c25_1);
+    result = imul(result, 31) + getStringHashCode(this.d25_1) | 0;
+    result = imul(result, 31) + this.e25_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -5886,19 +6020,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!equals(this.b25_1, tmp0_other_with_cast.b25_1))
+    if (!equals(this.c25_1, tmp0_other_with_cast.c25_1))
       return false;
-    if (!(this.c25_1 === tmp0_other_with_cast.c25_1))
+    if (!(this.d25_1 === tmp0_other_with_cast.d25_1))
       return false;
-    if (!this.d25_1.equals(tmp0_other_with_cast.d25_1))
+    if (!this.e25_1.equals(tmp0_other_with_cast.e25_1))
       return false;
     return true;
   };
   function plus_2(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.j26_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.l26_1 + length | 0, length);
   }
   function plus_3(_this__u8e3s4, length) {
-    return _this__u8e3s4.m26(VOID, _this__u8e3s4.g25_1 + length | 0, plus_2(_this__u8e3s4.h25_1, length));
+    return _this__u8e3s4.o26(VOID, _this__u8e3s4.h25_1 + length | 0, plus_2(_this__u8e3s4.i25_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     return tokenize_0(_this__u8e3s4, source, nonEmptyListOf(new Token(StartOfProgram_getInstance(), '', new Coordinates()), []));
@@ -5909,12 +6043,12 @@
     var incompleteTokens_0 = incompleteTokens;
     $l$1: do {
       $l$0: do {
-        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).d25_1);
+        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).e25_1);
         var token = tmp0_container.j3();
         var remaining = tmp0_container.k3();
         var tokens = incompleteTokens_0.v1z(token);
         var tmp;
-        var tmp_0 = token.b25_1;
+        var tmp_0 = token.c25_1;
         if (tmp_0 instanceof EndOfProgram) {
           tmp = tokens;
         } else {
@@ -5956,7 +6090,7 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.extractToken.<anonymous>' call
-      tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.c25_1));
+      tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.d25_1));
     }
     var tmp1_elvis_lhs = tmp;
     return tmp1_elvis_lhs == null ? new Pair(endToken(previousTokenCoordinates), '') : tmp1_elvis_lhs;
@@ -5975,7 +6109,7 @@
   function nextCoordinates(_this__u8e3s4, type, value) {
     var tmp;
     if (type instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.f25_1 + 1 | 0, VOID, plus_2(_this__u8e3s4.h25_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.g25_1 + 1 | 0, VOID, plus_2(_this__u8e3s4.i25_1, value.length));
     } else {
       tmp = plus_3(_this__u8e3s4, value.length);
     }
@@ -5989,7 +6123,7 @@
     while (tmp0_iterator.d()) {
       var element = tmp0_iterator.e();
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.removeWhiteSpace.<anonymous>' call
-      var tmp = element.b25_1;
+      var tmp = element.c25_1;
       if (!isInterface(tmp, WhiteSpace)) {
         tmp0_filterNotTo.a(element);
       }
@@ -6630,7 +6764,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.o26_1 = 'EOP';
+    this.q26_1 = 'EOP';
   }
   protoOf(EndOfProgram).toString = function () {
     return 'EndOfProgram';
@@ -6680,7 +6814,7 @@
     }
     return tmp;
   };
-  protoOf(Logger).a25 = function (s, block) {
+  protoOf(Logger).b25 = function (s, block) {
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.utils.Logger.log.<anonymous>' call
@@ -6698,82 +6832,82 @@
     }
   }
   //region block: post-declaration
-  protoOf(JavaEmitter).h23 = withLogging_2;
-  protoOf(JavaEmitter).i23 = withLogging_3;
-  protoOf(JavaEmitter).j23 = withLogging_4;
-  protoOf(JavaEmitter).k23 = withLogging_5;
+  protoOf(JavaEmitter).i23 = withLogging_2;
+  protoOf(JavaEmitter).j23 = withLogging_3;
+  protoOf(JavaEmitter).k23 = withLogging_4;
+  protoOf(JavaEmitter).l23 = withLogging_5;
   protoOf(JavaEmitter).d21 = withLogging_6;
-  protoOf(JavaEmitter).m23 = withLogging;
-  protoOf(JavaEmitter).o23 = withLogging_7;
-  protoOf(JavaEmitter).p23 = withLogging_8;
-  protoOf(JavaEmitter).r23 = withLogging_0;
-  protoOf(JavaEmitter).b22 = withLogging_1;
-  protoOf(KotlinEmitter).h23 = withLogging_2;
-  protoOf(KotlinEmitter).i23 = withLogging_3;
-  protoOf(KotlinEmitter).j23 = withLogging_4;
-  protoOf(KotlinEmitter).k23 = withLogging_5;
+  protoOf(JavaEmitter).n23 = withLogging;
+  protoOf(JavaEmitter).p23 = withLogging_7;
+  protoOf(JavaEmitter).q23 = withLogging_8;
+  protoOf(JavaEmitter).s23 = withLogging_0;
+  protoOf(JavaEmitter).c22 = withLogging_1;
+  protoOf(KotlinEmitter).i23 = withLogging_2;
+  protoOf(KotlinEmitter).j23 = withLogging_3;
+  protoOf(KotlinEmitter).k23 = withLogging_4;
+  protoOf(KotlinEmitter).l23 = withLogging_5;
   protoOf(KotlinEmitter).d21 = withLogging_6;
-  protoOf(KotlinEmitter).m23 = withLogging;
-  protoOf(KotlinEmitter).o23 = withLogging_7;
-  protoOf(KotlinEmitter).p23 = withLogging_8;
-  protoOf(KotlinEmitter).r23 = withLogging_0;
-  protoOf(KotlinEmitter).b22 = withLogging_1;
-  protoOf(ScalaEmitter).h23 = withLogging_2;
-  protoOf(ScalaEmitter).i23 = withLogging_3;
-  protoOf(ScalaEmitter).j23 = withLogging_4;
-  protoOf(ScalaEmitter).k23 = withLogging_5;
+  protoOf(KotlinEmitter).n23 = withLogging;
+  protoOf(KotlinEmitter).p23 = withLogging_7;
+  protoOf(KotlinEmitter).q23 = withLogging_8;
+  protoOf(KotlinEmitter).s23 = withLogging_0;
+  protoOf(KotlinEmitter).c22 = withLogging_1;
+  protoOf(ScalaEmitter).i23 = withLogging_2;
+  protoOf(ScalaEmitter).j23 = withLogging_3;
+  protoOf(ScalaEmitter).k23 = withLogging_4;
+  protoOf(ScalaEmitter).l23 = withLogging_5;
   protoOf(ScalaEmitter).d21 = withLogging_6;
-  protoOf(ScalaEmitter).m23 = withLogging;
-  protoOf(ScalaEmitter).o23 = withLogging_7;
-  protoOf(ScalaEmitter).p23 = withLogging_8;
-  protoOf(ScalaEmitter).r23 = withLogging_0;
-  protoOf(TypeScriptEmitter).h23 = withLogging_2;
-  protoOf(TypeScriptEmitter).i23 = withLogging_3;
-  protoOf(TypeScriptEmitter).j23 = withLogging_4;
-  protoOf(TypeScriptEmitter).k23 = withLogging_5;
+  protoOf(ScalaEmitter).n23 = withLogging;
+  protoOf(ScalaEmitter).p23 = withLogging_7;
+  protoOf(ScalaEmitter).q23 = withLogging_8;
+  protoOf(ScalaEmitter).s23 = withLogging_0;
+  protoOf(TypeScriptEmitter).i23 = withLogging_2;
+  protoOf(TypeScriptEmitter).j23 = withLogging_3;
+  protoOf(TypeScriptEmitter).k23 = withLogging_4;
+  protoOf(TypeScriptEmitter).l23 = withLogging_5;
   protoOf(TypeScriptEmitter).d21 = withLogging_6;
-  protoOf(TypeScriptEmitter).m23 = withLogging;
-  protoOf(TypeScriptEmitter).o23 = withLogging_7;
-  protoOf(TypeScriptEmitter).p23 = withLogging_8;
-  protoOf(TypeScriptEmitter).r23 = withLogging_0;
-  protoOf(TypeScriptEmitter).b22 = withLogging_1;
-  protoOf(WirespecEmitter).h23 = withLogging_2;
-  protoOf(WirespecEmitter).i23 = withLogging_3;
-  protoOf(WirespecEmitter).j23 = withLogging_4;
-  protoOf(WirespecEmitter).k23 = withLogging_5;
+  protoOf(TypeScriptEmitter).n23 = withLogging;
+  protoOf(TypeScriptEmitter).p23 = withLogging_7;
+  protoOf(TypeScriptEmitter).q23 = withLogging_8;
+  protoOf(TypeScriptEmitter).s23 = withLogging_0;
+  protoOf(TypeScriptEmitter).c22 = withLogging_1;
+  protoOf(WirespecEmitter).i23 = withLogging_2;
+  protoOf(WirespecEmitter).j23 = withLogging_3;
+  protoOf(WirespecEmitter).k23 = withLogging_4;
+  protoOf(WirespecEmitter).l23 = withLogging_5;
   protoOf(WirespecEmitter).d21 = withLogging_6;
-  protoOf(WirespecEmitter).m23 = withLogging;
-  protoOf(WirespecEmitter).o23 = withLogging_7;
-  protoOf(WirespecEmitter).p23 = withLogging_8;
-  protoOf(WirespecEmitter).r23 = withLogging_0;
-  protoOf(WsTypeDef).e25 = name;
-  protoOf(WsEnumTypeDef).e25 = name;
-  protoOf(WsRefinedTypeDef).e25 = name;
-  protoOf(WsEndpointDef).e25 = name;
-  protoOf(WhiteSpaceExceptNewLine).e25 = name;
-  protoOf(NewLine).e25 = name;
-  protoOf(LeftCurly).e25 = name;
-  protoOf(RightCurly).e25 = name;
-  protoOf(Colon).e25 = name;
-  protoOf(Comma).e25 = name;
-  protoOf(QuestionMark).e25 = name;
-  protoOf(Hash).e25 = name;
-  protoOf(Brackets).e25 = name;
-  protoOf(WsString).e25 = name;
-  protoOf(WsInteger).e25 = name;
-  protoOf(WsNumber).e25 = name;
-  protoOf(WsBoolean).e25 = name;
-  protoOf(Arrow).e25 = name;
-  protoOf(Method_0).e25 = name;
-  protoOf(CustomRegex).e25 = name;
-  protoOf(StatusCode_0).e25 = name;
-  protoOf(CustomValue).e25 = name;
-  protoOf(CustomType).e25 = name;
-  protoOf(Path_0).e25 = name;
-  protoOf(ForwardSlash).e25 = name;
-  protoOf(Invalid).e25 = name;
-  protoOf(StartOfProgram).e25 = name;
-  protoOf(EndOfProgram).e25 = name;
+  protoOf(WirespecEmitter).n23 = withLogging;
+  protoOf(WirespecEmitter).p23 = withLogging_7;
+  protoOf(WirespecEmitter).q23 = withLogging_8;
+  protoOf(WirespecEmitter).s23 = withLogging_0;
+  protoOf(WsTypeDef).f25 = name;
+  protoOf(WsEnumTypeDef).f25 = name;
+  protoOf(WsRefinedTypeDef).f25 = name;
+  protoOf(WsEndpointDef).f25 = name;
+  protoOf(WhiteSpaceExceptNewLine).f25 = name;
+  protoOf(NewLine).f25 = name;
+  protoOf(LeftCurly).f25 = name;
+  protoOf(RightCurly).f25 = name;
+  protoOf(Colon).f25 = name;
+  protoOf(Comma).f25 = name;
+  protoOf(QuestionMark).f25 = name;
+  protoOf(Hash).f25 = name;
+  protoOf(Brackets).f25 = name;
+  protoOf(WsString).f25 = name;
+  protoOf(WsInteger).f25 = name;
+  protoOf(WsNumber).f25 = name;
+  protoOf(WsBoolean).f25 = name;
+  protoOf(Arrow).f25 = name;
+  protoOf(Method_0).f25 = name;
+  protoOf(CustomRegex).f25 = name;
+  protoOf(StatusCode_0).f25 = name;
+  protoOf(CustomValue).f25 = name;
+  protoOf(CustomType).f25 = name;
+  protoOf(Path_0).f25 = name;
+  protoOf(ForwardSlash).f25 = name;
+  protoOf(Invalid).f25 = name;
+  protoOf(StartOfProgram).f25 = name;
+  protoOf(EndOfProgram).f25 = name;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_NAME = 'community.flock.wirespec.generated';