@flock/wirespec 0.6.1 → 0.6.2

package/kotlin/wirespec-core.js

@@ -86,37 +86,37 @@
   setMetadataFor(Reported, 'Reported', classMeta, Enum);
   setMetadataFor(Wirespec, 'Wirespec', objectMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Type', block);
+    return logger.vk('Emitting Definition: Type', block);
   }
   function withLogging_0(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Type Shape', block);
+    return logger.vk('Emitting Definition: Type Shape', block);
   }
   function withLogging_1(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Type Shape Field', block);
+    return logger.vk('Emitting Definition: Type Shape Field', block);
   }
   function withLogging_2(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Type Shape Field Key', block);
+    return logger.vk('Emitting Definition: Type Shape Field Key', block);
   }
   function withLogging_3(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Type Shape Field Value', block);
+    return logger.vk('Emitting Definition: Type Shape Field Value', block);
   }
   setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_4(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Endpoint', block);
+    return logger.vk('Emitting Definition: Endpoint', block);
   }
   setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_5(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Refined', block);
+    return logger.vk('Emitting Definition: Refined', block);
   }
   function withLogging_6(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Refined Validator', block);
+    return logger.vk('Emitting Definition: Refined Validator', block);
   }
   setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_7(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Endpoint', block);
+    return logger.vk('Emitting Definition: Endpoint', block);
   }
   function withLogging_8(_this__u8e3s4, logger, block) {
-    return logger.tk('Emitting Definition: Endpoint Segment', block);
+    return logger.vk('Emitting Definition: Endpoint Segment', block);
   }
   setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
   setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [TypeDefinitionEmitterLogger, EnumDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger, EndpointDefinitionEmitterLogger]);
@@ -1276,7 +1276,7 @@
       var element = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      tmp$ret$0 = isInt_0(element.mi_1);
+      tmp$ret$0 = Companion_getInstance_1().ek(element.mi_1);
       if (tmp$ret$0) {
         tmp0_filterTo.a(element);
       }
@@ -1313,7 +1313,7 @@
       var element_0 = tmp0_iterator_1.e();
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      tmp$ret$5 = !isInt_0(element_0.mi_1);
+      tmp$ret$5 = !Companion_getInstance_1().ek(element_0.mi_1);
       if (tmp$ret$5) {
         tmp2_filterTo.a(element_0);
       }
@@ -1357,7 +1357,7 @@
       var tmp_0;
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$0 = isInt_0(tmp0_takeIf);
+      tmp$ret$0 = Companion_getInstance_1().ek(tmp0_takeIf);
       if (tmp$ret$0) {
         tmp_0 = tmp0_takeIf;
       } else {
@@ -1387,7 +1387,7 @@
       var tmp_4;
       var tmp$ret$4;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$4 = !isInt_0(tmp1_takeIf);
+      tmp$ret$4 = !Companion_getInstance_1().ek(tmp1_takeIf);
       if (tmp$ret$4) {
         tmp_4 = tmp1_takeIf;
       } else {
@@ -1420,7 +1420,7 @@
       var tmp_6;
       var tmp$ret$8;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$8 = isInt_0(tmp2_takeIf);
+      tmp$ret$8 = Companion_getInstance_1().ek(tmp2_takeIf);
       if (tmp$ret$8) {
         tmp_6 = tmp2_takeIf;
       } else {
@@ -1461,7 +1461,7 @@
       var tmp_13;
       var tmp$ret$12;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$12 = !isInt_0(tmp3_takeIf);
+      tmp$ret$12 = !Companion_getInstance_1().ek(tmp3_takeIf);
       if (tmp$ret$12) {
         tmp_13 = tmp3_takeIf;
       } else {
@@ -1576,7 +1576,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.ik() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.jk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -1763,7 +1763,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 = isInt_0(element.mi_1);
+        tmp$ret$3 = Companion_getInstance_1().ek(element.mi_1);
         if (tmp$ret$3) {
           tmp2_filterTo.a(element);
         }
@@ -1799,7 +1799,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 = isInt_0(element_0.mi_1);
+        tmp$ret$9 = Companion_getInstance_1().ek(element_0.mi_1);
         if (tmp$ret$9) {
           tmp6_filterTo.a(element_0);
         }
@@ -1837,7 +1837,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 = !isInt_0(element_1.mi_1);
+        tmp$ret$14 = !Companion_getInstance_1().ek(element_1.mi_1);
         if (tmp$ret$14) {
           tmp9_filterTo.a(element_1);
         }
@@ -1935,14 +1935,14 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.gk_1 = packageName;
+    this.hk_1 = packageName;
     var tmp = this;
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
-    tmp.hk_1 = trimMargin('\n        |import kotlin.reflect.KType\n        |import kotlin.reflect.typeOf\n        |object WirespecShared {\n        |' + '  ' + 'enum class Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + '  ' + '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: KType): Content<T> fun <T> write(content: Content<T>): Content<B> }\n        |}\n    ');
+    tmp.ik_1 = trimMargin('\n        |import kotlin.reflect.KType\n        |import kotlin.reflect.typeOf\n        |object WirespecShared {\n        |' + '  ' + 'enum class Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + '  ' + '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: KType): Content<T> fun <T> write(content: Content<T>): Content<B> }\n        |}\n    ');
   }
   protoOf(KotlinEmitter).qh = function (ast) {
     var tmp$ret$3;
@@ -1960,7 +1960,7 @@
       var result = item.j3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.gk_1) ? '' : 'package ' + this.gk_1) + '\n                    |' + (Companion_getInstance_1().jk(ast) ? this.hk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.hk_1) ? '' : 'package ' + this.hk_1) + '\n                    |' + (Companion_getInstance_1().kk(ast) ? this.ik_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);
@@ -1996,13 +1996,16 @@
   protoOf(KotlinEmitter).ck = function (_this__u8e3s4) {
     return this.dk(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
+  function toField(_this__u8e3s4, identifier, isNullable) {
+    return new Field(new Identifier(identifier), _this__u8e3s4, isNullable);
+  }
   function emitContentType_0(_this__u8e3s4) {
     var tmp = split(_this__u8e3s4.vh_1, ['/']);
     return joinToString(tmp, '', VOID, VOID, VOID, VOID, emitContentType$lambda);
   }
   function groupStatus_0(_this__u8e3s4) {
     var tmp;
-    if (isInt_0(_this__u8e3s4)) {
+    if (Companion_getInstance_1().ek(_this__u8e3s4)) {
       var tmp$ret$1;
       // Inline function 'kotlin.text.substring' call
       var tmp$ret$0;
@@ -2015,12 +2018,6 @@
     }
     return tmp;
   }
-  function isInt_0(_this__u8e3s4) {
-    return !(toIntOrNull(_this__u8e3s4) == null);
-  }
-  function toField(_this__u8e3s4, identifier, isNullable) {
-    return new Field(new Identifier(identifier), _this__u8e3s4, isNullable);
-  }
   function orEmptyString_0(_this__u8e3s4) {
     var tmp0_elvis_lhs = _this__u8e3s4;
     return tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
@@ -2030,7 +2027,7 @@
   }
   function Companion() {
     Companion_instance = this;
-    this.kk_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.lk_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;
   function Companion_getInstance_0() {
@@ -2061,7 +2058,7 @@
   }
   function ScalaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return Companion_getInstance_0().kk_1.i1($this_emit.dj_1) ? '`' + $this_emit.dj_1 + '`' : $this_emit.dj_1;
+      return Companion_getInstance_0().lk_1.i1($this_emit.dj_1) ? '`' + $this_emit.dj_1 + '`' : $this_emit.dj_1;
     };
   }
   function ScalaEmitter$emit$lambda_3($this_emit) {
@@ -2141,7 +2138,7 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.nk_1 = packageName;
+    this.ok_1 = packageName;
   }
   protoOf(ScalaEmitter).qh = function (ast) {
     var tmp$ret$2;
@@ -2157,7 +2154,7 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>' call
       var name = item.i3();
       var result = item.j3();
-      tmp$ret$0 = to(name, isBlank(this.nk_1) ? '' : 'package ' + this.nk_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, isBlank(this.ok_1) ? '' : 'package ' + this.ok_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
@@ -2191,20 +2188,35 @@
   protoOf(ScalaEmitter).ck = function (_this__u8e3s4) {
     return this.dk(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_7);
   };
+  function emitType(_this__u8e3s4, $this) {
+    return '`' + joinToString(_this__u8e3s4, '', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitType$lambda($this)) + '`';
+  }
+  function emitType_0(_this__u8e3s4, $this) {
+    return $this.ri(_this__u8e3s4, $this.oh_1, TypeScriptEmitter$emitType$lambda_0(_this__u8e3s4, $this));
+  }
   function emitName(_this__u8e3s4, $this) {
     var tmp0_safe_receiver = _this__u8e3s4.uh_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
-    return 'Request' + (tmp1_elvis_lhs == null ? 'unknown' : tmp1_elvis_lhs);
+    return 'Request' + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
   function emitName_0(_this__u8e3s4, $this) {
-    var tmp = 'Response' + _this__u8e3s4.mi_1;
+    var tmp = 'Response' + Companion_getInstance_1().pi(_this__u8e3s4.mi_1);
     var tmp0_safe_receiver = _this__u8e3s4.ni_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
-    return tmp + (tmp1_elvis_lhs == null ? 'unknown' : tmp1_elvis_lhs);
+    return tmp + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
+  }
+  function emitMap_1(_this__u8e3s4, $this) {
+    return joinToString(_this__u8e3s4, ', ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitMap$lambda($this));
+  }
+  function emitPath_1(_this__u8e3s4, $this) {
+    return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitPath$lambda($this));
+  }
+  function emit_3(_this__u8e3s4, $this) {
+    return $this.ri(_this__u8e3s4, $this.oh_1, TypeScriptEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function TypeScriptEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('interface ' + $this_emit.ui_1 + ' {\n            |' + this$0.wi($this_emit.vi_1) + '\n            |}\n            |\n            |');
+      return trimMargin('export type ' + $this_emit.ui_1 + ' = {\n            |' + this$0.wi($this_emit.vi_1) + '\n            |}\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda(this$0) {
@@ -2230,6 +2242,8 @@
   }
   function TypeScriptEmitter$emit$lambda_3($this_emit) {
     return function () {
+      var tmp$ret$3;
+      // Inline function 'kotlin.let' call
       var tmp$ret$1;
       // Inline function 'kotlin.let' call
       var tmp0_subject = $this_emit;
@@ -2266,7 +2280,13 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
       tmp$ret$0 = $this_emit.qi() ? tmp0_let + '[]' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
-      return tmp$ret$1;
+      var tmp1_let = tmp$ret$1;
+      // Inline function 'kotlin.contracts.contract' call
+      var tmp$ret$2;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
+      tmp$ret$2 = $this_emit.jk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$3 = tmp$ret$2;
+      return tmp$ret$3;
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_0(it) {
@@ -2280,7 +2300,7 @@
   function TypeScriptEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_1();
-      return trimMargin('interface ' + $this_emit.mj_1 + ' {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.mj_1 + ' = (type: ' + $this_emit.mj_1 + ') => (' + this$0.oj($this_emit.nj_1) + ').test(type.value);\n            |\n            |');
+      return trimMargin('type ' + $this_emit.mj_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.mj_1 + ' = (type: ' + $this_emit.mj_1 + ') => (' + this$0.oj($this_emit.nj_1) + ').test(type.value);\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda_6($this_emit) {
@@ -2292,6 +2312,7 @@
     return function (it) {
       Companion_getInstance_1();
       var tmp = emitName(it, this$0);
+      var tmp_0 = emitType($this_emit.gi_1, this$0);
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
       var tmp1_map = $this_emit.ii_1;
@@ -2308,10 +2329,10 @@
       }
       tmp$ret$1 = tmp0_mapTo;
       tmp$ret$2 = tmp$ret$1;
-      var tmp_0 = joinToString(tmp$ret$2, ',');
+      var tmp_1 = joinToString(tmp$ret$2, ',');
       var tmp$ret$5;
       // Inline function 'kotlin.collections.map' call
-      var tmp3_map = $this_emit.ii_1;
+      var tmp3_map = $this_emit.hi_1;
       var tmp$ret$4;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp2_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp3_map, 10));
@@ -2325,23 +2346,23 @@
       }
       tmp$ret$4 = tmp2_mapTo;
       tmp$ret$5 = tmp$ret$4;
-      var tmp_1 = joinToString(tmp$ret$5, ',');
+      var tmp_2 = joinToString(tmp$ret$5, ',');
       var tmp0_safe_receiver = it.uh_1;
-      var tmp_2;
+      var tmp_3;
       if (tmp0_safe_receiver == null) {
-        tmp_2 = null;
+        tmp_3 = null;
       } else {
         var tmp$ret$7;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$6;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$6 = '{ type: "' + tmp0_safe_receiver.vh_1 + '", body: ' + this$0.di(tmp0_safe_receiver.wh_1) + ' }';
+        tmp$ret$6 = ', content: { type: "' + tmp0_safe_receiver.vh_1 + '", body: ' + this$0.di(tmp0_safe_receiver.wh_1) + ' }';
         tmp$ret$7 = tmp$ret$6;
-        tmp_2 = tmp$ret$7;
+        tmp_3 = tmp$ret$7;
       }
-      var tmp1_elvis_lhs = tmp_2;
-      return '  ' + 'type ' + tmp + ' = { path: string, method: "' + $this_emit.fi_1 + '", headers: {' + tmp_0 + '}, query: {' + tmp_1 + '}, content: ' + (tmp1_elvis_lhs == null ? 'undefined' : tmp1_elvis_lhs) + ' } ';
+      var tmp1_elvis_lhs = tmp_3;
+      return '  ' + 'type ' + tmp + ' = { path: ' + tmp_0 + ', method: "' + $this_emit.fi_1 + '", headers: {' + tmp_1 + '}, query: {' + tmp_2 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' } ';
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_2(this$0) {
@@ -2353,22 +2374,23 @@
     return function (it) {
       Companion_getInstance_1();
       var tmp = emitName_0(it, this$0);
+      var tmp_0 = Companion_getInstance_1().ek(it.mi_1) ? it.mi_1 : 'number';
       var tmp0_safe_receiver = it.ni_1;
-      var tmp_0;
+      var tmp_1;
       if (tmp0_safe_receiver == null) {
-        tmp_0 = null;
+        tmp_1 = null;
       } else {
         var tmp$ret$1;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = '{ type: "' + tmp0_safe_receiver.vh_1 + '", body: ' + this$0.di(tmp0_safe_receiver.wh_1) + ' }';
+        tmp$ret$0 = ', content: { type: "' + tmp0_safe_receiver.vh_1 + '", body: ' + this$0.di(tmp0_safe_receiver.wh_1) + ' }';
         tmp$ret$1 = tmp$ret$0;
-        tmp_0 = tmp$ret$1;
+        tmp_1 = tmp$ret$1;
       }
-      var tmp1_elvis_lhs = tmp_0;
-      return '  ' + 'type ' + tmp + ' = { status: ' + it.mi_1 + ', content: ' + (tmp1_elvis_lhs == null ? 'undefined' : tmp1_elvis_lhs) + ' }';
+      var tmp1_elvis_lhs = tmp_1;
+      return '  ' + 'type ' + tmp + ' = { status: ' + tmp_0 + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' }';
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_4(this$0) {
@@ -2376,6 +2398,37 @@
       return emitName_0(it, this$0);
     };
   }
+  function TypeScriptEmitter$emit$lambda$lambda$lambda(this$0) {
+    return function (it) {
+      return this$0.xi(it);
+    };
+  }
+  function TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit) {
+    return function (it) {
+      var tmp = Companion_getInstance_1().qj(emitName(it, this$0));
+      var tmp_0 = Companion_getInstance_1().sk($this_emit, it.uh_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.gi_1, this$0);
+      var tmp_3 = emitMap_1($this_emit.hi_1, this$0);
+      var tmp_4 = emitMap_1($this_emit.ii_1, this$0);
+      var tmp0_safe_receiver = it.uh_1;
+      var tmp_5;
+      if (tmp0_safe_receiver == null) {
+        tmp_5 = null;
+      } else {
+        var tmp$ret$1;
+        // Inline function 'kotlin.let' call
+        // Inline function 'kotlin.contracts.contract' call
+        var tmp$ret$0;
+        // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
+        tmp$ret$0 = ', content: {type: "' + tmp0_safe_receiver.vh_1 + '", body}';
+        tmp$ret$1 = tmp$ret$0;
+        tmp_5 = tmp$ret$1;
+      }
+      var tmp1_elvis_lhs = tmp_5;
+      return 'export const ' + tmp + ' = (' + tmp_1 + ') => ({path: `' + tmp_2 + '`, method: "' + $this_emit.fi_1.p4_1 + '", query: {' + tmp_3 + '}, headers: {' + tmp_4 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + '} as const)';
+    };
+  }
   function TypeScriptEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
       var tmp = toSet($this_emit.ki_1);
@@ -2393,7 +2446,55 @@
       Companion_getInstance_1();
       var tmp_7 = Companion_getInstance_1().qj($this_emit.ei_1);
       Companion_getInstance_1();
-      return trimMargin('\n          |export namespace ' + $this_emit.ei_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          |}\n        ');
+      Companion_getInstance_1();
+      return trimMargin('\n          |export namespace ' + $this_emit.ei_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.ki_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit)) + '\n          |}\n          |\n        ');
+    };
+  }
+  function TypeScriptEmitter$emitType$lambda(this$0) {
+    return function (it) {
+      return '/' + emitType_0(it, this$0);
+    };
+  }
+  function TypeScriptEmitter$emitType$lambda_0($this_emitType, this$0) {
+    return function () {
+      var tmp0_subject = $this_emitType;
+      var tmp;
+      if (tmp0_subject instanceof Literal) {
+        tmp = $this_emitType.rj_1;
+      } else {
+        if (tmp0_subject instanceof Param) {
+          tmp = '${' + this$0.di($this_emitType.ti_1) + '}';
+        } else {
+          noWhenBranchMatchedException();
+        }
+      }
+      return tmp;
+    };
+  }
+  function TypeScriptEmitter$emitMap$lambda(this$0) {
+    return function (it) {
+      return '"' + this$0.cj(it.zi_1) + '": ' + this$0.cj(it.zi_1);
+    };
+  }
+  function TypeScriptEmitter$emitPath$lambda(this$0) {
+    return function (it) {
+      return emit_3(it, this$0);
+    };
+  }
+  function TypeScriptEmitter$emit$lambda_8($this_emit) {
+    return function () {
+      var tmp0_subject = $this_emit;
+      var tmp;
+      if (tmp0_subject instanceof Literal) {
+        tmp = $this_emit.rj_1;
+      } else {
+        if (tmp0_subject instanceof Param) {
+          tmp = '${' + $this_emit.si_1.dj_1 + '}';
+        } else {
+          noWhenBranchMatchedException();
+        }
+      }
+      return tmp;
     };
   }
   function TypeScriptEmitter(logger) {
@@ -2404,7 +2505,7 @@
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
-    tmp.qk_1 = trimMargin('\n        |export namespace WirespecShared {\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    ');
+    tmp.rk_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    ');
   }
   protoOf(TypeScriptEmitter).qh = function (ast) {
     var tmp$ret$3;
@@ -2422,7 +2523,7 @@
       var result = item.j3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_1().jk(ast) ? this.qk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_1().kk(ast) ? this.rk_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);
@@ -2651,7 +2752,7 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
-  protoOf(Companion_0).jk = function (_this__u8e3s4) {
+  protoOf(Companion_0).kk = function (_this__u8e3s4) {
     var tmp$ret$0;
     $l$block_0: {
       // Inline function 'kotlin.collections.any' call
@@ -2680,6 +2781,47 @@
     }
     return tmp$ret$0;
   };
+  protoOf(Companion_0).sk = function (_this__u8e3s4, content) {
+    var tmp$ret$4;
+    // Inline function 'kotlin.collections.map' call
+    var tmp$ret$1;
+    // Inline function 'kotlin.collections.filterIsInstance' call
+    var tmp1_filterIsInstance = _this__u8e3s4.gi_1;
+    var tmp$ret$0;
+    // Inline function 'kotlin.collections.filterIsInstanceTo' call
+    var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
+    var tmp0_iterator = tmp1_filterIsInstance.c();
+    while (tmp0_iterator.d()) {
+      var element = tmp0_iterator.e();
+      if (element instanceof Param) {
+        tmp0_filterIsInstanceTo.a(element);
+      }
+    }
+    tmp$ret$0 = tmp0_filterIsInstanceTo;
+    tmp$ret$1 = tmp$ret$0;
+    var tmp3_map = tmp$ret$1;
+    var tmp$ret$3;
+    // Inline function 'kotlin.collections.mapTo' call
+    var tmp2_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp3_map, 10));
+    var tmp0_iterator_0 = tmp3_map.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.si_1, item.ti_1, false);
+      tmp2_mapTo.a(tmp$ret$2);
+    }
+    tmp$ret$3 = tmp2_mapTo;
+    tmp$ret$4 = tmp$ret$3;
+    var pathField = tmp$ret$4;
+    var parameters = plus(plus(plus(pathField, _this__u8e3s4.hi_1), _this__u8e3s4.ii_1), _this__u8e3s4.ji_1);
+    var tmp0_safe_receiver = content;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.wh_1;
+    return filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
+  };
+  protoOf(Companion_0).ek = function (_this__u8e3s4) {
+    return !(toIntOrNull(_this__u8e3s4) == null);
+  };
   var Companion_instance_0;
   function Companion_getInstance_1() {
     if (Companion_instance_0 == null)
@@ -2764,7 +2906,7 @@
     captureStack(this, NextException);
   }
   function WrongTokenException(expected, actual) {
-    ParserException.call(this, actual.wk_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.uk_1).fc() + ' at line ' + actual.wk_1.xk_1 + ' and position ' + (actual.wk_1.yk_1 - actual.vk_1.length | 0));
+    ParserException.call(this, actual.yk_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.wk_1).fc() + ' at line ' + actual.yk_1.zk_1 + ' and position ' + (actual.yk_1.al_1 - actual.xk_1.length | 0));
     captureStack(this, WrongTokenException);
   }
   function NullTokenException(message, coordinates) {
@@ -2782,7 +2924,7 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.al_1 = coordinates;
+    this.cl_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     var tmp$ret$2;
@@ -2795,10 +2937,10 @@
       var item = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
-      var tmp0_subject = item.uk_1;
+      var tmp0_subject = item.wk_1;
       var tmp;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp = item.bl(VOID, '"' + dropLast(drop(item.vk_1, 1), 2) + '"');
+        tmp = item.dl(VOID, '"' + dropLast(drop(item.xk_1, 1), 2) + '"');
       } else {
         tmp = item;
       }
@@ -2845,17 +2987,17 @@
   protoOf(Custom).qi = function () {
     return this.ij_1;
   };
-  protoOf(Custom).ik = function () {
+  protoOf(Custom).jk = function () {
     return this.jj_1;
   };
-  protoOf(Custom).cl = function (value, isIterable, isMap) {
+  protoOf(Custom).el = function (value, isIterable, isMap) {
     return new Custom(value, isIterable, isMap);
   };
-  protoOf(Custom).dl = function (value, isIterable, isMap, $super) {
+  protoOf(Custom).fl = function (value, isIterable, isMap, $super) {
     value = value === VOID ? this.hj_1 : value;
     isIterable = isIterable === VOID ? this.ij_1 : isIterable;
     isMap = isMap === VOID ? this.jj_1 : isMap;
-    return $super === VOID ? this.cl(value, isIterable, isMap) : $super.cl.call(this, value, isIterable, isMap);
+    return $super === VOID ? this.el(value, isIterable, isMap) : $super.el.call(this, value, isIterable, isMap);
   };
   protoOf(Custom).toString = function () {
     return 'Custom(value=' + this.hj_1 + ', isIterable=' + this.ij_1 + ', isMap=' + this.jj_1 + ')';
@@ -2889,7 +3031,7 @@
   protoOf(Primitive).qi = function () {
     return this.fj_1;
   };
-  protoOf(Primitive).ik = function () {
+  protoOf(Primitive).jk = function () {
     return this.gj_1;
   };
   protoOf(Primitive).toString = function () {
@@ -3389,8 +3531,8 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>' call
-      log(_this__u8e3s4.gl_1, $this);
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      log(_this__u8e3s4.il_1, $this);
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof WsTypeDef) {
         tmp_0 = raise.ch(parseTypeDeclaration(_this__u8e3s4, $this));
@@ -3405,10 +3547,10 @@
             // Inline function 'arrow.core.nel' call
             var tmp$ret$0;
             // Inline function 'kotlin.also' call
-            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.gl_1);
+            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.il_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            raise.ch(_this__u8e3s4.il());
+            raise.ch(_this__u8e3s4.kl());
             tmp$ret$0 = tmp0_also;
             var tmp1_nel = tmp$ret$0;
             tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3467,21 +3609,21 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.gl_1.vk_1));
+        tmp_0 = raise.ch(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.il_1.xk_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3538,11 +3680,11 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Type_0(typeName, raise.ch(parseTypeShape(_this__u8e3s4, $this)));
@@ -3551,10 +3693,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.gl_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3563,18 +3705,18 @@
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-      var tmp0_subject_0 = _this__u8e3s4.gl_1.uk_1;
+      var tmp0_subject_0 = _this__u8e3s4.il_1.wk_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
       else {
         var tmp$ret$3;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.gl_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -3632,11 +3774,11 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$7;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
       var tmp$ret$6;
       // Inline function 'kotlin.let' call
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomValue) {
         var tmp$ret$3;
@@ -3647,21 +3789,21 @@
         var tmp0_apply = tmp$ret$0;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        tmp0_apply.a(raise.ch(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.gl_1.vk_1))));
-        while (equals(_this__u8e3s4.gl_1.uk_1, Comma_getInstance())) {
-          raise.ch(_this__u8e3s4.il());
-          var tmp0_subject_0 = _this__u8e3s4.gl_1.uk_1;
+        tmp0_apply.a(raise.ch(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.il_1.xk_1))));
+        while (equals(_this__u8e3s4.il_1.wk_1, Comma_getInstance())) {
+          raise.ch(_this__u8e3s4.kl());
+          var tmp0_subject_0 = _this__u8e3s4.il_1.wk_1;
           if (tmp0_subject_0 instanceof CustomValue) {
-            tmp0_apply.a(raise.ch(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.gl_1.vk_1))));
+            tmp0_apply.a(raise.ch(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.il_1.xk_1))));
           } else {
             var tmp$ret$2;
             // Inline function 'arrow.core.nel' call
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.gl_1);
+            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.il_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-            raise.ch(_this__u8e3s4.il());
+            raise.ch(_this__u8e3s4.kl());
             tmp$ret$1 = tmp0_also;
             var tmp1_nel = tmp$ret$1;
             tmp$ret$2 = nonEmptyListOf(tmp1_nel, []);
@@ -3675,10 +3817,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$4;
         // Inline function 'kotlin.also' call
-        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.gl_1);
+        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$4 = tmp1_also;
         var tmp2_nel = tmp$ret$4;
         tmp$ret$5 = nonEmptyListOf(tmp2_nel, []);
@@ -3738,37 +3880,37 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       if (tmp0_subject instanceof Colon)
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
       else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.gl_1);
+        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
         raise.bh(tmp$ret$1);
       }
-      var type = _this__u8e3s4.gl_1.uk_1;
+      var type = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (isInterface(type, WsType)) {
-        var tmp_1 = raise.ch(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.gl_1.vk_1));
+        var tmp_1 = raise.ch(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.il_1.xk_1));
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.gl_1.uk_1;
+        var tmp_2 = _this__u8e3s4.il_1.wk_1;
         var tmp2_also = tmp_2 instanceof QuestionMark;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
         if (tmp2_also)
-          raise.ch(_this__u8e3s4.il());
+          raise.ch(_this__u8e3s4.kl());
         tmp$ret$2 = tmp2_also;
         tmp_0 = new Field(identifier, tmp_1, tmp$ret$2);
       } else {
@@ -3776,10 +3918,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$3;
         // Inline function 'kotlin.also' call
-        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
+        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$3 = tmp3_also;
         var tmp4_nel = tmp$ret$3;
         tmp$ret$4 = nonEmptyListOf(tmp4_nel, []);
@@ -3836,16 +3978,16 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$1;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseFieldValue.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
       var tmp$ret$0;
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.gl_1.uk_1;
+      var tmp_0 = _this__u8e3s4.il_1.wk_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseFieldValue.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
       tmp$ret$0 = tmp0_also;
       var isIterable = tmp$ret$0;
       var tmp0_subject = wsType;
@@ -3918,21 +4060,21 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.gl_1.vk_1));
+        tmp_0 = raise.ch(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.il_1.xk_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3989,11 +4131,11 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Enum_0(typeName, raise.ch(parseEnumTypeEntries(_this__u8e3s4, $this)));
@@ -4002,10 +4144,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.gl_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4014,18 +4156,18 @@
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-      var tmp0_subject_0 = _this__u8e3s4.gl_1.uk_1;
+      var tmp0_subject_0 = _this__u8e3s4.il_1.wk_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
       else {
         var tmp$ret$3;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.gl_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -4083,9 +4225,9 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$7;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
         var tmp$ret$4;
@@ -4096,28 +4238,28 @@
         var tmp0_apply = tmp$ret$0;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        tmp0_apply.a(_this__u8e3s4.gl_1.vk_1);
-        raise.ch(_this__u8e3s4.il());
-        while (equals(_this__u8e3s4.gl_1.uk_1, Comma_getInstance())) {
-          raise.ch(_this__u8e3s4.il());
-          var tmp0_subject_0 = _this__u8e3s4.gl_1.uk_1;
+        tmp0_apply.a(_this__u8e3s4.il_1.xk_1);
+        raise.ch(_this__u8e3s4.kl());
+        while (equals(_this__u8e3s4.il_1.wk_1, Comma_getInstance())) {
+          raise.ch(_this__u8e3s4.kl());
+          var tmp0_subject_0 = _this__u8e3s4.il_1.wk_1;
           if (tmp0_subject_0 instanceof CustomType) {
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = tmp0_apply.a(_this__u8e3s4.gl_1.vk_1);
+            var tmp0_also = tmp0_apply.a(_this__u8e3s4.il_1.xk_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.ch(_this__u8e3s4.il());
+            raise.ch(_this__u8e3s4.kl());
             tmp$ret$1 = tmp0_also;
           } else {
             var tmp$ret$3;
             // Inline function 'arrow.core.nel' call
             var tmp$ret$2;
             // Inline function 'kotlin.also' call
-            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
+            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.il_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.ch(_this__u8e3s4.il());
+            raise.ch(_this__u8e3s4.kl());
             tmp$ret$2 = tmp1_also;
             var tmp2_nel = tmp$ret$2;
             tmp$ret$3 = nonEmptyListOf(tmp2_nel, []);
@@ -4131,10 +4273,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$5;
         // Inline function 'kotlin.also' call
-        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
+        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$5 = tmp1_also_0;
         var tmp2_nel_0 = tmp$ret$5;
         tmp$ret$6 = nonEmptyListOf(tmp2_nel_0, []);
@@ -4191,21 +4333,21 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.gl_1.vk_1));
+        tmp_0 = raise.ch(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.il_1.xk_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4262,23 +4404,23 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$3;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
-      log(_this__u8e3s4.gl_1, $this);
+      raise.ch(_this__u8e3s4.kl());
+      log(_this__u8e3s4.il_1, $this);
       var tmp$ret$2;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
+      var tmp0_subject = _this__u8e3s4.il_1.wk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.gl_1.vk_1));
+        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.il_1.xk_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.gl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.il_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.il());
+        raise.ch(_this__u8e3s4.kl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4287,7 +4429,7 @@
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-      raise.ch(_this__u8e3s4.il());
+      raise.ch(_this__u8e3s4.kl());
       tmp$ret$2 = tmp2_also;
       tmp$ret$3 = tmp$ret$2;
       tmp$ret$4 = tmp$ret$3;
@@ -4325,7 +4467,7 @@
     return tmp$ret$9;
   }
   function log(_this__u8e3s4, $this) {
-    return $this.mh_1.ih('Parsing ' + _this__u8e3s4.uk_1 + ' at line ' + _this__u8e3s4.wk_1.xk_1 + ' position ' + _this__u8e3s4.wk_1.yk_1);
+    return $this.mh_1.ih('Parsing ' + _this__u8e3s4.wk_1 + ' at line ' + _this__u8e3s4.yk_1.zk_1 + ' position ' + _this__u8e3s4.yk_1.al_1);
   }
   function Parser(logger) {
     this.mh_1 = logger;
@@ -4341,7 +4483,7 @@
       var element = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parse.<anonymous>' call
-      var tmp = element.uk_1;
+      var tmp = element.wk_1;
       tmp$ret$0 = isInterface(tmp, WhiteSpace);
       if (!tmp$ret$0) {
         tmp0_filterNotTo.a(element);
@@ -4365,7 +4507,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>.<anonymous>' call
-      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.vk_1 + "', ";
+      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.xk_1 + "', ";
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
@@ -4373,14 +4515,14 @@
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     var tmp$ret$3;
     // Inline function 'kotlin.run' call
-    var tmp0_run = $this.gl_1;
+    var tmp0_run = $this.il_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$2;
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>.<anonymous>' call
-    tmp$ret$2 = "Current: '" + tmp0_run.vk_1 + "'";
+    tmp$ret$2 = "Current: '" + tmp0_run.xk_1 + "'";
     tmp$ret$3 = tmp$ret$2;
     var curr = tmp$ret$3;
-    var tmp2_safe_receiver = $this.hl_1;
+    var tmp2_safe_receiver = $this.jl_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -4390,13 +4532,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$4;
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>.<anonymous>' call
-      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.vk_1 + "'";
+      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.xk_1 + "'";
       tmp$ret$5 = tmp$ret$4;
       tmp_0 = tmp$ret$5;
     }
     var tmp3_elvis_lhs = tmp_0;
     var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-    $this.el_1.ih(prev + curr + next);
+    $this.gl_1.ih(prev + curr + next);
     tmp$ret$6 = Unit_getInstance();
     return tmp$ret$6;
   }
@@ -4416,7 +4558,7 @@
       var tmp0_success = Companion_getInstance();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.nextToken.<anonymous>' call
-      tmp$ret$0 = $this.fl_1.e();
+      tmp$ret$0 = $this.hl_1.e();
       var tmp1_success = tmp$ret$0;
       tmp$ret$1 = _Result___init__impl__xyqfz8(tmp1_success);
       tmp = tmp$ret$1;
@@ -4447,8 +4589,8 @@
     return tmp$ret$4;
   }
   function TokenProvider(logger, tokenIterator) {
-    this.el_1 = logger;
-    this.fl_1 = tokenIterator;
+    this.gl_1 = logger;
+    this.hl_1 = tokenIterator;
     var tmp = this;
     var tmp0_elvis_lhs = nextToken(this);
     var tmp_0;
@@ -4457,14 +4599,14 @@
     } else {
       tmp_0 = tmp0_elvis_lhs;
     }
-    tmp.gl_1 = tmp_0;
-    this.hl_1 = nextToken(this);
+    tmp.il_1 = tmp_0;
+    this.jl_1 = nextToken(this);
     printTokens$default(this);
   }
   protoOf(TokenProvider).d = function () {
-    return !(this.hl_1 == null);
+    return !(this.jl_1 == null);
   };
-  protoOf(TokenProvider).il = function () {
+  protoOf(TokenProvider).kl = function () {
     var tmp$ret$6;
     // Inline function 'arrow.core.raise.either' call
     var tmp$ret$5;
@@ -4478,21 +4620,21 @@
     try {
       var tmp$ret$1;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.gl_1;
+      var previousToken = this.il_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.hl_1;
+      var tmp0_elvis_lhs = this.jl_1;
       var tmp_1;
       if (tmp0_elvis_lhs == null) {
         var tmp$ret$0;
         // Inline function 'arrow.core.nel' call
-        var tmp0_nel = new NextException(previousToken.wk_1);
+        var tmp0_nel = new NextException(previousToken.yk_1);
         tmp$ret$0 = nonEmptyListOf(tmp0_nel, []);
         raise.bh(tmp$ret$0);
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.gl_1 = tmp_1;
-      this.hl_1 = nextToken(this);
+      tmp_0.il_1 = tmp_1;
+      this.jl_1 = nextToken(this);
       printTokens(this, previousToken);
       tmp$ret$1 = Unit_getInstance();
       var res = tmp$ret$1;
@@ -4534,15 +4676,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.jl_1 = idx;
-    this.kl_1 = length;
+    this.ll_1 = idx;
+    this.ml_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.jl_1 + ', length=' + this.kl_1 + ')';
+    return 'IdxAndLength(idx=' + this.ll_1 + ', length=' + this.ml_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.jl_1;
-    result = imul(result, 31) + this.kl_1 | 0;
+    var result = this.ll_1;
+    result = imul(result, 31) + this.ml_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -4551,9 +4693,9 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.jl_1 === tmp0_other_with_cast.jl_1))
+    if (!(this.ll_1 === tmp0_other_with_cast.ll_1))
       return false;
-    if (!(this.kl_1 === tmp0_other_with_cast.kl_1))
+    if (!(this.ml_1 === tmp0_other_with_cast.ml_1))
       return false;
     return true;
   };
@@ -4561,26 +4703,26 @@
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.xk_1 = line;
-    this.yk_1 = position;
-    this.zk_1 = idxAndLength;
+    this.zk_1 = line;
+    this.al_1 = position;
+    this.bl_1 = idxAndLength;
   }
-  protoOf(Coordinates).ll = function (line, position, idxAndLength) {
+  protoOf(Coordinates).nl = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).ml = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.xk_1 : line;
-    position = position === VOID ? this.yk_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.zk_1 : idxAndLength;
-    return $super === VOID ? this.ll(line, position, idxAndLength) : $super.ll.call(this, line, position, idxAndLength);
+  protoOf(Coordinates).ol = function (line, position, idxAndLength, $super) {
+    line = line === VOID ? this.zk_1 : line;
+    position = position === VOID ? this.al_1 : position;
+    idxAndLength = idxAndLength === VOID ? this.bl_1 : idxAndLength;
+    return $super === VOID ? this.nl(line, position, idxAndLength) : $super.nl.call(this, line, position, idxAndLength);
   };
   protoOf(Coordinates).toString = function () {
-    return 'Coordinates(line=' + this.xk_1 + ', position=' + this.yk_1 + ', idxAndLength=' + this.zk_1 + ')';
+    return 'Coordinates(line=' + this.zk_1 + ', position=' + this.al_1 + ', idxAndLength=' + this.bl_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.xk_1;
-    result = imul(result, 31) + this.yk_1 | 0;
-    result = imul(result, 31) + this.zk_1.hashCode() | 0;
+    var result = this.zk_1;
+    result = imul(result, 31) + this.al_1 | 0;
+    result = imul(result, 31) + this.bl_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -4589,35 +4731,35 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.xk_1 === tmp0_other_with_cast.xk_1))
+    if (!(this.zk_1 === tmp0_other_with_cast.zk_1))
       return false;
-    if (!(this.yk_1 === tmp0_other_with_cast.yk_1))
+    if (!(this.al_1 === tmp0_other_with_cast.al_1))
       return false;
-    if (!this.zk_1.equals(tmp0_other_with_cast.zk_1))
+    if (!this.bl_1.equals(tmp0_other_with_cast.bl_1))
       return false;
     return true;
   };
   function Token(type, value, coordinates) {
-    this.uk_1 = type;
-    this.vk_1 = value;
-    this.wk_1 = coordinates;
+    this.wk_1 = type;
+    this.xk_1 = value;
+    this.yk_1 = coordinates;
   }
-  protoOf(Token).nl = function (type, value, coordinates) {
+  protoOf(Token).pl = function (type, value, coordinates) {
     return new Token(type, value, coordinates);
   };
-  protoOf(Token).bl = function (type, value, coordinates, $super) {
-    type = type === VOID ? this.uk_1 : type;
-    value = value === VOID ? this.vk_1 : value;
-    coordinates = coordinates === VOID ? this.wk_1 : coordinates;
-    return $super === VOID ? this.nl(type, value, coordinates) : $super.nl.call(this, type, value, coordinates);
+  protoOf(Token).dl = function (type, value, coordinates, $super) {
+    type = type === VOID ? this.wk_1 : type;
+    value = value === VOID ? this.xk_1 : value;
+    coordinates = coordinates === VOID ? this.yk_1 : coordinates;
+    return $super === VOID ? this.pl(type, value, coordinates) : $super.pl.call(this, type, value, coordinates);
   };
   protoOf(Token).toString = function () {
-    return 'Token(type=' + this.uk_1 + ', value=' + this.vk_1 + ', coordinates=' + this.wk_1 + ')';
+    return 'Token(type=' + this.wk_1 + ', value=' + this.xk_1 + ', coordinates=' + this.yk_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = hashCode(this.uk_1);
-    result = imul(result, 31) + getStringHashCode(this.vk_1) | 0;
-    result = imul(result, 31) + this.wk_1.hashCode() | 0;
+    var result = hashCode(this.wk_1);
+    result = imul(result, 31) + getStringHashCode(this.xk_1) | 0;
+    result = imul(result, 31) + this.yk_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -4626,19 +4768,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!equals(this.uk_1, tmp0_other_with_cast.uk_1))
+    if (!equals(this.wk_1, tmp0_other_with_cast.wk_1))
       return false;
-    if (!(this.vk_1 === tmp0_other_with_cast.vk_1))
+    if (!(this.xk_1 === tmp0_other_with_cast.xk_1))
       return false;
-    if (!this.wk_1.equals(tmp0_other_with_cast.wk_1))
+    if (!this.yk_1.equals(tmp0_other_with_cast.yk_1))
       return false;
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.jl_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.ll_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.ml(VOID, _this__u8e3s4.yk_1 + length | 0, plus_1(_this__u8e3s4.zk_1, length));
+    return _this__u8e3s4.ol(VOID, _this__u8e3s4.al_1 + length | 0, plus_1(_this__u8e3s4.bl_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     var tmp$ret$1;
@@ -4660,7 +4802,7 @@
     var tmp0_subject = type;
     var tmp;
     if (tmp0_subject instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.xk_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.zk_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.zk_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.bl_1, value.length));
     } else {
       tmp = plus_2(_this__u8e3s4, value.length);
     }
@@ -4668,7 +4810,7 @@
   }
   function lastCoordinates(_this__u8e3s4) {
     var tmp0_safe_receiver = lastOrNull(_this__u8e3s4);
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.wk_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yk_1;
     return tmp1_elvis_lhs == null ? new Coordinates() : tmp1_elvis_lhs;
   }
   function tokenize_0(_this__u8e3s4, source, tokens) {
@@ -4678,7 +4820,7 @@
     $l$1: do {
       $l$0: do {
         var token = findToken($this, lastCoordinates(tokens_0), source_0);
-        var newSource = removePrefix(source_0, token.vk_1);
+        var newSource = removePrefix(source_0, token.xk_1);
         var newTokens = plus_0(tokens_0, token);
         var tmp;
         var tmp$ret$0;
@@ -4904,7 +5046,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.pl_1 = 'EOP';
+    this.rl_1 = 'EOP';
   }
   var EndOfProgram_instance;
   function EndOfProgram_getInstance() {
@@ -4937,7 +5079,7 @@
     }
     return tmp;
   };
-  protoOf(Logger).tk = function (s, block) {
+  protoOf(Logger).vk = function (s, block) {
     var tmp$ret$1;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4998,6 +5140,7 @@
   protoOf(TypeScriptEmitter).ak = withLogging_5;
   protoOf(TypeScriptEmitter).bk = withLogging_6;
   protoOf(TypeScriptEmitter).dk = withLogging_7;
+  protoOf(TypeScriptEmitter).ri = withLogging_8;
   protoOf(WirespecEmitter).tj = withLogging;
   protoOf(WirespecEmitter).uj = withLogging_0;
   protoOf(WirespecEmitter).vj = withLogging_1;
@@ -5007,25 +5150,25 @@
   protoOf(WirespecEmitter).ak = withLogging_5;
   protoOf(WirespecEmitter).bk = withLogging_6;
   protoOf(WirespecEmitter).dk = withLogging_7;
-  protoOf(WsTypeDef).ol = name;
-  protoOf(WsEnumTypeDef).ol = name;
-  protoOf(WsRefinedTypeDef).ol = name;
-  protoOf(WhiteSpaceExceptNewLine).ol = name;
-  protoOf(NewLine).ol = name;
-  protoOf(LeftCurly).ol = name;
-  protoOf(Colon).ol = name;
-  protoOf(Comma).ol = name;
-  protoOf(QuestionMark).ol = name;
-  protoOf(Brackets).ol = name;
-  protoOf(WsString).ol = name;
-  protoOf(WsInteger).ol = name;
-  protoOf(WsBoolean).ol = name;
-  protoOf(RightCurly).ol = name;
-  protoOf(CustomValue).ol = name;
-  protoOf(CustomType).ol = name;
-  protoOf(CustomRegex).ol = name;
-  protoOf(Invalid).ol = name;
-  protoOf(EndOfProgram).ol = name;
+  protoOf(WsTypeDef).ql = name;
+  protoOf(WsEnumTypeDef).ql = name;
+  protoOf(WsRefinedTypeDef).ql = name;
+  protoOf(WhiteSpaceExceptNewLine).ql = name;
+  protoOf(NewLine).ql = name;
+  protoOf(LeftCurly).ql = name;
+  protoOf(Colon).ql = name;
+  protoOf(Comma).ql = name;
+  protoOf(QuestionMark).ql = name;
+  protoOf(Brackets).ql = name;
+  protoOf(WsString).ql = name;
+  protoOf(WsInteger).ql = name;
+  protoOf(WsBoolean).ql = name;
+  protoOf(RightCurly).ql = name;
+  protoOf(CustomValue).ql = name;
+  protoOf(CustomType).ql = name;
+  protoOf(CustomRegex).ql = name;
+  protoOf(Invalid).ql = name;
+  protoOf(EndOfProgram).ql = name;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_NAME = 'community.flock.wirespec.generated';