@flock/wirespec 0.5.0 → 0.6.0

package/kotlin/wirespec-core.js

@@ -31,9 +31,10 @@
   var listOf = kotlin_kotlin.$_$.j5;
   var objectMeta = kotlin_kotlin.$_$.s7;
   var trimMargin = kotlin_kotlin.$_$.j9;
+  var HashSet_init_$Create$ = kotlin_kotlin.$_$.m;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.g;
   var joinToString = kotlin_kotlin.$_$.a5;
   var split = kotlin_kotlin.$_$.w8;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.g;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.c4;
   var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.f;
   var plus = kotlin_kotlin.$_$.p5;
@@ -42,8 +43,6 @@
   var toIntOrNull = kotlin_kotlin.$_$.b9;
   var toSet = kotlin_kotlin.$_$.b6;
   var isBlank = kotlin_kotlin.$_$.q8;
-  var Collection = kotlin_kotlin.$_$.m3;
-  var isInterface = kotlin_kotlin.$_$.i7;
   var checkIndexOverflow = kotlin_kotlin.$_$.b4;
   var THROW_CCE = kotlin_kotlin.$_$.y9;
   var isCharSequence = kotlin_kotlin.$_$.e7;
@@ -53,6 +52,8 @@
   var charSequenceLength = kotlin_kotlin.$_$.o6;
   var charSequenceGet = kotlin_kotlin.$_$.n6;
   var toString_0 = kotlin_kotlin.$_$.l1;
+  var Collection = kotlin_kotlin.$_$.m3;
+  var isInterface = kotlin_kotlin.$_$.i7;
   var listOf_0 = kotlin_kotlin.$_$.i5;
   var interfaceMeta = kotlin_kotlin.$_$.z6;
   var captureStack = kotlin_kotlin.$_$.k6;
@@ -85,37 +86,37 @@
   setMetadataFor(Reported, 'Reported', classMeta, Enum);
   setMetadataFor(Wirespec, 'Wirespec', objectMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Type', block);
+    return logger.tk('Emitting Definition: Type', block);
   }
   function withLogging_0(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Type Shape', block);
+    return logger.tk('Emitting Definition: Type Shape', block);
   }
   function withLogging_1(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Type Shape Field', block);
+    return logger.tk('Emitting Definition: Type Shape Field', block);
   }
   function withLogging_2(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Type Shape Field Key', block);
+    return logger.tk('Emitting Definition: Type Shape Field Key', block);
   }
   function withLogging_3(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Type Shape Field Value', block);
+    return logger.tk('Emitting Definition: Type Shape Field Value', block);
   }
   setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_4(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Endpoint', block);
+    return logger.tk('Emitting Definition: Endpoint', block);
   }
   setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_5(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Refined', block);
+    return logger.tk('Emitting Definition: Refined', block);
   }
   function withLogging_6(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Refined Validator', block);
+    return logger.tk('Emitting Definition: Refined Validator', block);
   }
   setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_7(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Endpoint', block);
+    return logger.tk('Emitting Definition: Endpoint', block);
   }
   function withLogging_8(_this__u8e3s4, logger, block) {
-    return logger.rk('Emitting Definition: Endpoint Segment', block);
+    return logger.tk('Emitting Definition: Endpoint Segment', block);
   }
   setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
   setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [TypeDefinitionEmitterLogger, EnumDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger, EndpointDefinitionEmitterLogger]);
@@ -605,11 +606,29 @@
   }
   function emitResponseMapper(_this__u8e3s4, $this) {
     Companion_getInstance_1();
-    var tmp = joinToString(_this__u8e3s4, '', VOID, VOID, VOID, VOID, JavaEmitter$emitResponseMapper$lambda($this));
+    var tmp$ret$1;
+    // Inline function 'kotlin.collections.distinctBy' call
+    var set = HashSet_init_$Create$();
+    var list = ArrayList_init_$Create$();
+    var tmp0_iterator = _this__u8e3s4.c();
+    while (tmp0_iterator.d()) {
+      var e = tmp0_iterator.e();
+      var tmp$ret$0;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseMapper.<anonymous>' call
+      var tmp0_safe_receiver = e.ni_1;
+      tmp$ret$0 = to(e.mi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.vh_1);
+      var key = tmp$ret$0;
+      if (set.a(key)) {
+        list.a(e);
+      }
+    }
+    tmp$ret$1 = list;
+    var tmp = tmp$ret$1;
+    var tmp_0 = joinToString(tmp, '', VOID, VOID, VOID, VOID, JavaEmitter$emitResponseMapper$lambda($this));
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
-    return trimMargin('\n        |' + '  ' + 'static <B> Response RESPONSE_MAPPER(WirespecShared.ContentMapper<B> contentMapper, int status, java.util.Map<String, java.util.List<Object>> headers, WirespecShared.Content<B> content) {\n        |' + tmp + '\n        |' + '  ' + '  ' + 'throw new IllegalStateException("Unknown response type");\n        |' + '  ' + '}\n    ');
+    return trimMargin('\n        |' + '  ' + 'static <B> Response RESPONSE_MAPPER(WirespecShared.ContentMapper<B> contentMapper, int status, java.util.Map<String, java.util.List<Object>> headers, WirespecShared.Content<B> content) {\n        |' + tmp_0 + '\n        |' + '  ' + '  ' + 'throw new IllegalStateException("Unknown response type");\n        |' + '  ' + '}\n    ');
   }
   function emitResponseMapperCondition(_this__u8e3s4, $this) {
     var tmp0_subject = _this__u8e3s4.ni_1;
@@ -1018,11 +1037,30 @@
       }
       tmp$ret$7 = tmp4_mapTo;
       tmp$ret$8 = tmp$ret$7;
-      var tmp_4 = tmp$ret$8;
+      var tmp_4 = toSet(tmp$ret$8);
       var tmp_5 = joinToString(tmp_4, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_2(this$0));
-      var tmp_6 = joinToString($this_emit.li_1, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_3(this$0));
+      var tmp$ret$10;
+      // Inline function 'kotlin.collections.distinctBy' call
+      var tmp6_distinctBy = $this_emit.li_1;
+      var set = HashSet_init_$Create$();
+      var list = ArrayList_init_$Create$();
+      var tmp0_iterator_2 = tmp6_distinctBy.c();
+      while (tmp0_iterator_2.d()) {
+        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.ni_1;
+        tmp$ret$9 = to(e.mi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.vh_1);
+        var key = tmp$ret$9;
+        if (set.a(key)) {
+          list.a(e);
+        }
+      }
+      tmp$ret$10 = list;
+      var tmp_6 = tmp$ret$10;
+      var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_3(this$0));
       Companion_getInstance_1();
-      return trimMargin('public interface ' + $this_emit.ei_1 + ' {\n            |' + '  ' + 'static String PATH = "' + tmp + '";\n            |' + tmp_0 + '\n            |' + '  ' + 'interface Request<T> extends WirespecShared.Request<T> {}\n            |' + tmp_1 + '\n            |' + '  ' + 'interface Response<T> extends WirespecShared.Response<T> {}\n            |' + tmp_3 + '\n            |' + tmp_5 + '\n            |' + tmp_6 + '\n            |' + '  ' + 'public Response ' + Companion_getInstance_1().qj($this_emit.ei_1) + '(Request request);\n            |}\n            |');
+      return trimMargin('public interface ' + $this_emit.ei_1 + ' {\n            |' + '  ' + 'static String PATH = "' + tmp + '";\n            |' + tmp_0 + '\n            |' + '  ' + 'interface Request<T> extends WirespecShared.Request<T> {}\n            |' + tmp_1 + '\n            |' + '  ' + 'interface Response<T> extends WirespecShared.Response<T> {}\n            |' + tmp_3 + '\n            |' + tmp_5 + '\n            |' + tmp_7 + '\n            |' + '  ' + 'public Response ' + Companion_getInstance_1().qj($this_emit.ei_1) + '(Request request);\n            |}\n            |');
     };
   }
   function JavaEmitter$emitResponseMapper$lambda(this$0) {
@@ -1171,35 +1209,6 @@
   protoOf(JavaEmitter).ck = function (_this__u8e3s4) {
     return this.dk(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
-  function hasEndpoints(_this__u8e3s4, $this) {
-    var tmp$ret$0;
-    $l$block_0: {
-      // Inline function 'kotlin.collections.any' call
-      var tmp;
-      if (isInterface(_this__u8e3s4, Collection)) {
-        tmp = _this__u8e3s4.g();
-      } else {
-        tmp = false;
-      }
-      if (tmp) {
-        tmp$ret$0 = false;
-        break $l$block_0;
-      }
-      var tmp0_iterator = _this__u8e3s4.c();
-      while (tmp0_iterator.d()) {
-        var element = tmp0_iterator.e();
-        var tmp$ret$1;
-        // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.hasEndpoints.<anonymous>' call
-        tmp$ret$1 = element instanceof Endpoint;
-        if (tmp$ret$1) {
-          tmp$ret$0 = true;
-          break $l$block_0;
-        }
-      }
-      tmp$ret$0 = false;
-    }
-    return tmp$ret$0;
-  }
   function emitRequestSignature_0(_this__u8e3s4, $this, content) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
@@ -1255,6 +1264,8 @@
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
+    var tmp$ret$4;
+    // Inline function 'kotlin.collections.distinctBy' call
     var tmp$ret$2;
     // Inline function 'kotlin.collections.filter' call
     var tmp$ret$1;
@@ -1272,26 +1283,60 @@
     }
     tmp$ret$1 = tmp0_filterTo;
     tmp$ret$2 = tmp$ret$1;
-    var tmp = tmp$ret$2;
+    var tmp1_distinctBy = tmp$ret$2;
+    var set = HashSet_init_$Create$();
+    var list = ArrayList_init_$Create$();
+    var tmp0_iterator_0 = tmp1_distinctBy.c();
+    while (tmp0_iterator_0.d()) {
+      var e = tmp0_iterator_0.e();
+      var tmp$ret$3;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
+      var tmp0_safe_receiver = e.ni_1;
+      tmp$ret$3 = to(e.mi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.vh_1);
+      var key = tmp$ret$3;
+      if (set.a(key)) {
+        list.a(e);
+      }
+    }
+    tmp$ret$4 = list;
+    var tmp = tmp$ret$4;
     var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emitResponseMapper$lambda($this));
-    var tmp$ret$5;
+    var tmp$ret$9;
+    // Inline function 'kotlin.collections.distinctBy' call
+    var tmp$ret$7;
     // Inline function 'kotlin.collections.filter' call
-    var tmp$ret$4;
+    var tmp$ret$6;
     // Inline function 'kotlin.collections.filterTo' call
-    var tmp1_filterTo = ArrayList_init_$Create$();
-    var tmp0_iterator_0 = _this__u8e3s4.c();
-    while (tmp0_iterator_0.d()) {
-      var element_0 = tmp0_iterator_0.e();
-      var tmp$ret$3;
+    var tmp2_filterTo = ArrayList_init_$Create$();
+    var tmp0_iterator_1 = _this__u8e3s4.c();
+    while (tmp0_iterator_1.d()) {
+      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$3 = !isInt_0(element_0.mi_1);
-      if (tmp$ret$3) {
-        tmp1_filterTo.a(element_0);
+      tmp$ret$5 = !isInt_0(element_0.mi_1);
+      if (tmp$ret$5) {
+        tmp2_filterTo.a(element_0);
       }
     }
-    tmp$ret$4 = tmp1_filterTo;
-    tmp$ret$5 = tmp$ret$4;
-    var tmp_1 = tmp$ret$5;
+    tmp$ret$6 = tmp2_filterTo;
+    tmp$ret$7 = tmp$ret$6;
+    var tmp3_distinctBy = tmp$ret$7;
+    var set_0 = HashSet_init_$Create$();
+    var list_0 = ArrayList_init_$Create$();
+    var tmp0_iterator_2 = tmp3_distinctBy.c();
+    while (tmp0_iterator_2.d()) {
+      var e_0 = tmp0_iterator_2.e();
+      var tmp$ret$8;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
+      var tmp0_safe_receiver_0 = e_0.ni_1;
+      tmp$ret$8 = to(e_0.mi_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.vh_1);
+      var key_0 = tmp$ret$8;
+      if (set_0.a(key_0)) {
+        list_0.a(e_0);
+      }
+    }
+    tmp$ret$9 = list_0;
+    var tmp_1 = tmp$ret$9;
     var tmp_2 = joinToString(tmp_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emitResponseMapper$lambda_0($this));
     Companion_getInstance_1();
     Companion_getInstance_1();
@@ -1739,8 +1784,10 @@
       }
       tmp$ret$7 = tmp4_mapTo;
       tmp$ret$8 = tmp$ret$7;
-      var tmp_2 = tmp$ret$8;
+      var tmp_2 = toSet(tmp$ret$8);
       var tmp_3 = joinToString(tmp_2, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_2);
+      var tmp$ret$13;
+      // Inline function 'kotlin.collections.distinctBy' call
       var tmp$ret$11;
       // Inline function 'kotlin.collections.filter' call
       var tmp7_filter = $this_emit.li_1;
@@ -1759,27 +1806,61 @@
       }
       tmp$ret$10 = tmp6_filterTo;
       tmp$ret$11 = tmp$ret$10;
-      var tmp_4 = tmp$ret$11;
+      var tmp8_distinctBy = tmp$ret$11;
+      var set = HashSet_init_$Create$();
+      var list = ArrayList_init_$Create$();
+      var tmp0_iterator_3 = tmp8_distinctBy.c();
+      while (tmp0_iterator_3.d()) {
+        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.ni_1;
+        tmp$ret$12 = to(e.mi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.vh_1);
+        var key = tmp$ret$12;
+        if (set.a(key)) {
+          list.a(e);
+        }
+      }
+      tmp$ret$13 = list;
+      var tmp_4 = tmp$ret$13;
       var tmp_5 = joinToString(tmp_4, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_3(this$0));
-      var tmp$ret$14;
+      var tmp$ret$18;
+      // Inline function 'kotlin.collections.distinctBy' call
+      var tmp$ret$16;
       // Inline function 'kotlin.collections.filter' call
-      var tmp9_filter = $this_emit.li_1;
-      var tmp$ret$13;
+      var tmp10_filter = $this_emit.li_1;
+      var tmp$ret$15;
       // Inline function 'kotlin.collections.filterTo' call
-      var tmp8_filterTo = ArrayList_init_$Create$();
-      var tmp0_iterator_3 = tmp9_filter.c();
-      while (tmp0_iterator_3.d()) {
-        var element_1 = tmp0_iterator_3.e();
-        var tmp$ret$12;
+      var tmp9_filterTo = ArrayList_init_$Create$();
+      var tmp0_iterator_4 = tmp10_filter.c();
+      while (tmp0_iterator_4.d()) {
+        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$12 = !isInt_0(element_1.mi_1);
-        if (tmp$ret$12) {
-          tmp8_filterTo.a(element_1);
+        tmp$ret$14 = !isInt_0(element_1.mi_1);
+        if (tmp$ret$14) {
+          tmp9_filterTo.a(element_1);
         }
       }
-      tmp$ret$13 = tmp8_filterTo;
-      tmp$ret$14 = tmp$ret$13;
-      var tmp_6 = tmp$ret$14;
+      tmp$ret$15 = tmp9_filterTo;
+      tmp$ret$16 = tmp$ret$15;
+      var tmp11_distinctBy = tmp$ret$16;
+      var set_0 = HashSet_init_$Create$();
+      var list_0 = ArrayList_init_$Create$();
+      var tmp0_iterator_5 = tmp11_distinctBy.c();
+      while (tmp0_iterator_5.d()) {
+        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.ni_1;
+        tmp$ret$17 = to(e_0.mi_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.vh_1);
+        var key_0 = tmp$ret$17;
+        if (set_0.a(key_0)) {
+          list_0.a(e_0);
+        }
+      }
+      tmp$ret$18 = list_0;
+      var tmp_6 = tmp$ret$18;
       var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_4(this$0));
       var tmp_8 = Companion_getInstance_1().qj($this_emit.ei_1);
       Companion_getInstance_1();
@@ -1879,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                    |' + (hasEndpoints(ast, this) ? this.hk_1 : '') + '\n                    |' + result + '\n            ');
+      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            ');
       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);
@@ -1949,7 +2030,7 @@
   }
   function Companion() {
     Companion_instance = this;
-    this.jk_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.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']);
   }
   var Companion_instance;
   function Companion_getInstance_0() {
@@ -1980,7 +2061,7 @@
   }
   function ScalaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return Companion_getInstance_0().jk_1.i1($this_emit.dj_1) ? '`' + $this_emit.dj_1 + '`' : $this_emit.dj_1;
+      return Companion_getInstance_0().kk_1.i1($this_emit.dj_1) ? '`' + $this_emit.dj_1 + '`' : $this_emit.dj_1;
     };
   }
   function ScalaEmitter$emit$lambda_3($this_emit) {
@@ -2060,7 +2141,7 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.mk_1 = packageName;
+    this.nk_1 = packageName;
   }
   protoOf(ScalaEmitter).qh = function (ast) {
     var tmp$ret$2;
@@ -2076,7 +2157,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.mk_1) ? '' : 'package ' + this.mk_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, isBlank(this.nk_1) ? '' : 'package ' + this.nk_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
@@ -2110,6 +2191,17 @@
   protoOf(ScalaEmitter).ck = function (_this__u8e3s4) {
     return this.dk(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_7);
   };
+  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);
+  }
+  function emitName_0(_this__u8e3s4, $this) {
+    var tmp = 'Response' + _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);
+  }
   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            |');
@@ -2122,13 +2214,13 @@
   }
   function TypeScriptEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return dropLast(joinToString($this_emit.yi_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0)), 1);
+      return joinToString($this_emit.yi_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_1();
-      return '  ' + this$0.cj($this_emit.zi_1) + ($this_emit.bj_1 ? '?' : '') + ': ' + this$0.di($this_emit.aj_1) + ',';
+      return '  ' + this$0.cj($this_emit.zi_1) + ($this_emit.bj_1 ? '?' : '') + ': ' + this$0.di($this_emit.aj_1);
     };
   }
   function TypeScriptEmitter$emit$lambda_2($this_emit) {
@@ -2196,13 +2288,149 @@
       return "new RegExp('" + dropLast(drop($this_emit.pj_1, 1), 1) + "')";
     };
   }
-  function TypeScriptEmitter$emit$lambda_7() {
-    return '// TODO("Not yet implemented")\n';
+  function TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
+    return function (it) {
+      Companion_getInstance_1();
+      var tmp = emitName(it, this$0);
+      var tmp$ret$2;
+      // Inline function 'kotlin.collections.map' call
+      var tmp1_map = $this_emit.ii_1;
+      var tmp$ret$1;
+      // Inline function 'kotlin.collections.mapTo' call
+      var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
+      var tmp0_iterator = tmp1_map.c();
+      while (tmp0_iterator.d()) {
+        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.xi(item);
+        tmp0_mapTo.a(tmp$ret$0);
+      }
+      tmp$ret$1 = tmp0_mapTo;
+      tmp$ret$2 = tmp$ret$1;
+      var tmp_0 = joinToString(tmp$ret$2, ',');
+      var tmp$ret$5;
+      // Inline function 'kotlin.collections.map' call
+      var tmp3_map = $this_emit.ii_1;
+      var tmp$ret$4;
+      // 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_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.xi(item_0);
+        tmp2_mapTo.a(tmp$ret$3);
+      }
+      tmp$ret$4 = tmp2_mapTo;
+      tmp$ret$5 = tmp$ret$4;
+      var tmp_1 = joinToString(tmp$ret$5, ',');
+      var tmp0_safe_receiver = it.uh_1;
+      var tmp_2;
+      if (tmp0_safe_receiver == null) {
+        tmp_2 = 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$7 = tmp$ret$6;
+        tmp_2 = 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) + ' } ';
+    };
+  }
+  function TypeScriptEmitter$emit$lambda$lambda_2(this$0) {
+    return function (it) {
+      return emitName(it, this$0);
+    };
+  }
+  function TypeScriptEmitter$emit$lambda$lambda_3(this$0) {
+    return function (it) {
+      Companion_getInstance_1();
+      var tmp = emitName_0(it, this$0);
+      var tmp0_safe_receiver = it.ni_1;
+      var tmp_0;
+      if (tmp0_safe_receiver == null) {
+        tmp_0 = 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$1 = tmp$ret$0;
+        tmp_0 = 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) + ' }';
+    };
+  }
+  function TypeScriptEmitter$emit$lambda$lambda_4(this$0) {
+    return function (it) {
+      return emitName_0(it, this$0);
+    };
+  }
+  function TypeScriptEmitter$emit$lambda_7($this_emit, this$0) {
+    return function () {
+      var tmp = toSet($this_emit.ki_1);
+      var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit));
+      Companion_getInstance_1();
+      var tmp_1 = toSet($this_emit.ki_1);
+      var tmp_2 = joinToString(tmp_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_2(this$0));
+      var tmp_3 = toSet($this_emit.li_1);
+      var tmp_4 = joinToString(tmp_3, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_3(this$0));
+      Companion_getInstance_1();
+      var tmp_5 = toSet($this_emit.li_1);
+      var tmp_6 = joinToString(tmp_5, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_4(this$0));
+      Companion_getInstance_1();
+      Companion_getInstance_1();
+      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        ');
+    };
   }
   function TypeScriptEmitter(logger) {
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
+    var tmp = this;
+    Companion_getInstance_1();
+    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    ');
   }
+  protoOf(TypeScriptEmitter).qh = function (ast) {
+    var tmp$ret$3;
+    // Inline function 'kotlin.collections.map' call
+    var tmp1_map = protoOf(Emitter).qh.call(this, ast);
+    var tmp$ret$2;
+    // Inline function 'kotlin.collections.mapTo' call
+    var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
+    var tmp0_iterator = tmp1_map.c();
+    while (tmp0_iterator.d()) {
+      var item = tmp0_iterator.e();
+      var tmp$ret$1;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+      var name = item.i3();
+      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            ');
+      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);
+    }
+    tmp$ret$2 = tmp0_mapTo;
+    tmp$ret$3 = tmp$ret$2;
+    return tmp$ret$3;
+  };
   protoOf(TypeScriptEmitter).sj = function (_this__u8e3s4) {
     return this.tj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
   };
@@ -2228,7 +2456,7 @@
     return this.bk(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
   };
   protoOf(TypeScriptEmitter).ck = function (_this__u8e3s4) {
-    return this.dk(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_7);
+    return this.dk(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function WirespecEmitter$emit$lambda($this_emit, this$0) {
     return function () {
@@ -2423,6 +2651,35 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
+  protoOf(Companion_0).jk = function (_this__u8e3s4) {
+    var tmp$ret$0;
+    $l$block_0: {
+      // Inline function 'kotlin.collections.any' call
+      var tmp;
+      if (isInterface(_this__u8e3s4, Collection)) {
+        tmp = _this__u8e3s4.g();
+      } else {
+        tmp = false;
+      }
+      if (tmp) {
+        tmp$ret$0 = false;
+        break $l$block_0;
+      }
+      var tmp0_iterator = _this__u8e3s4.c();
+      while (tmp0_iterator.d()) {
+        var element = tmp0_iterator.e();
+        var tmp$ret$1;
+        // Inline function 'community.flock.wirespec.compiler.core.emit.common.Companion.hasEndpoints.<anonymous>' call
+        tmp$ret$1 = element instanceof Endpoint;
+        if (tmp$ret$1) {
+          tmp$ret$0 = true;
+          break $l$block_0;
+        }
+      }
+      tmp$ret$0 = false;
+    }
+    return tmp$ret$0;
+  };
   var Companion_instance_0;
   function Companion_getInstance_1() {
     if (Companion_instance_0 == null)
@@ -2507,7 +2764,7 @@
     captureStack(this, NextException);
   }
   function WrongTokenException(expected, actual) {
-    ParserException.call(this, actual.uk_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.sk_1).fc() + ' at line ' + actual.uk_1.vk_1 + ' and position ' + (actual.uk_1.wk_1 - actual.tk_1.length | 0));
+    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));
     captureStack(this, WrongTokenException);
   }
   function NullTokenException(message, coordinates) {
@@ -2525,7 +2782,7 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.yk_1 = coordinates;
+    this.al_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     var tmp$ret$2;
@@ -2538,10 +2795,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.sk_1;
+      var tmp0_subject = item.uk_1;
       var tmp;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp = item.zk(VOID, '"' + dropLast(drop(item.tk_1, 1), 2) + '"');
+        tmp = item.bl(VOID, '"' + dropLast(drop(item.vk_1, 1), 2) + '"');
       } else {
         tmp = item;
       }
@@ -2591,14 +2848,14 @@
   protoOf(Custom).ik = function () {
     return this.jj_1;
   };
-  protoOf(Custom).al = function (value, isIterable, isMap) {
+  protoOf(Custom).cl = function (value, isIterable, isMap) {
     return new Custom(value, isIterable, isMap);
   };
-  protoOf(Custom).bl = function (value, isIterable, isMap, $super) {
+  protoOf(Custom).dl = 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.al(value, isIterable, isMap) : $super.al.call(this, value, isIterable, isMap);
+    return $super === VOID ? this.cl(value, isIterable, isMap) : $super.cl.call(this, value, isIterable, isMap);
   };
   protoOf(Custom).toString = function () {
     return 'Custom(value=' + this.hj_1 + ', isIterable=' + this.ij_1 + ', isMap=' + this.jj_1 + ')';
@@ -3132,8 +3389,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.el_1, $this);
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      log(_this__u8e3s4.gl_1, $this);
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof WsTypeDef) {
         tmp_0 = raise.ch(parseTypeDeclaration(_this__u8e3s4, $this));
@@ -3148,10 +3405,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.el_1);
+            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.gl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            raise.ch(_this__u8e3s4.gl());
+            raise.ch(_this__u8e3s4.il());
             tmp$ret$0 = tmp0_also;
             var tmp1_nel = tmp$ret$0;
             tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3210,21 +3467,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.gl());
-      log(_this__u8e3s4.el_1, $this);
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.el_1.tk_1));
+        tmp_0 = raise.ch(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.gl_1.vk_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.el_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3281,11 +3538,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.gl());
-      log(_this__u8e3s4.el_1, $this);
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Type_0(typeName, raise.ch(parseTypeShape(_this__u8e3s4, $this)));
@@ -3294,10 +3551,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.el_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3306,18 +3563,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.el_1.sk_1;
+      var tmp0_subject_0 = _this__u8e3s4.gl_1.uk_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
       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.el_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.gl_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.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -3375,11 +3632,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.gl());
-      log(_this__u8e3s4.el_1, $this);
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
       var tmp$ret$6;
       // Inline function 'kotlin.let' call
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomValue) {
         var tmp$ret$3;
@@ -3390,21 +3647,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.el_1.tk_1))));
-        while (equals(_this__u8e3s4.el_1.sk_1, Comma_getInstance())) {
-          raise.ch(_this__u8e3s4.gl());
-          var tmp0_subject_0 = _this__u8e3s4.el_1.sk_1;
+        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;
           if (tmp0_subject_0 instanceof CustomValue) {
-            tmp0_apply.a(raise.ch(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.el_1.tk_1))));
+            tmp0_apply.a(raise.ch(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.gl_1.vk_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.el_1);
+            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.gl_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.gl());
+            raise.ch(_this__u8e3s4.il());
             tmp$ret$1 = tmp0_also;
             var tmp1_nel = tmp$ret$1;
             tmp$ret$2 = nonEmptyListOf(tmp1_nel, []);
@@ -3418,10 +3675,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.el_1);
+        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$4 = tmp1_also;
         var tmp2_nel = tmp$ret$4;
         tmp$ret$5 = nonEmptyListOf(tmp2_nel, []);
@@ -3481,37 +3738,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.gl());
-      log(_this__u8e3s4.el_1, $this);
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       if (tmp0_subject instanceof Colon)
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
       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.el_1);
+        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         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.el_1.sk_1;
+      var type = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (isInterface(type, WsType)) {
-        var tmp_1 = raise.ch(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.el_1.tk_1));
+        var tmp_1 = raise.ch(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.gl_1.vk_1));
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.el_1.sk_1;
+        var tmp_2 = _this__u8e3s4.gl_1.uk_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.gl());
+          raise.ch(_this__u8e3s4.il());
         tmp$ret$2 = tmp2_also;
         tmp_0 = new Field(identifier, tmp_1, tmp$ret$2);
       } else {
@@ -3519,10 +3776,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.el_1);
+        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$3 = tmp3_also;
         var tmp4_nel = tmp$ret$3;
         tmp$ret$4 = nonEmptyListOf(tmp4_nel, []);
@@ -3579,16 +3836,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.gl());
-      log(_this__u8e3s4.el_1, $this);
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
       var tmp$ret$0;
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.el_1.sk_1;
+      var tmp_0 = _this__u8e3s4.gl_1.uk_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.gl());
+        raise.ch(_this__u8e3s4.il());
       tmp$ret$0 = tmp0_also;
       var isIterable = tmp$ret$0;
       var tmp0_subject = wsType;
@@ -3661,21 +3918,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.gl());
-      log(_this__u8e3s4.el_1, $this);
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.el_1.tk_1));
+        tmp_0 = raise.ch(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.gl_1.vk_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.el_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3732,11 +3989,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.gl());
-      log(_this__u8e3s4.el_1, $this);
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Enum_0(typeName, raise.ch(parseEnumTypeEntries(_this__u8e3s4, $this)));
@@ -3745,10 +4002,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.el_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3757,18 +4014,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.el_1.sk_1;
+      var tmp0_subject_0 = _this__u8e3s4.gl_1.uk_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
       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.el_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.gl_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.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -3826,9 +4083,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.gl());
-      log(_this__u8e3s4.el_1, $this);
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
         var tmp$ret$4;
@@ -3839,28 +4096,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.el_1.tk_1);
-        raise.ch(_this__u8e3s4.gl());
-        while (equals(_this__u8e3s4.el_1.sk_1, Comma_getInstance())) {
-          raise.ch(_this__u8e3s4.gl());
-          var tmp0_subject_0 = _this__u8e3s4.el_1.sk_1;
+        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;
           if (tmp0_subject_0 instanceof CustomType) {
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = tmp0_apply.a(_this__u8e3s4.el_1.tk_1);
+            var tmp0_also = tmp0_apply.a(_this__u8e3s4.gl_1.vk_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.gl());
+            raise.ch(_this__u8e3s4.il());
             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.el_1);
+            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_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.gl());
+            raise.ch(_this__u8e3s4.il());
             tmp$ret$2 = tmp1_also;
             var tmp2_nel = tmp$ret$2;
             tmp$ret$3 = nonEmptyListOf(tmp2_nel, []);
@@ -3874,10 +4131,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.el_1);
+        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$5 = tmp1_also_0;
         var tmp2_nel_0 = tmp$ret$5;
         tmp$ret$6 = nonEmptyListOf(tmp2_nel_0, []);
@@ -3934,21 +4191,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.gl());
-      log(_this__u8e3s4.el_1, $this);
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.el_1.tk_1));
+        tmp_0 = raise.ch(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.gl_1.vk_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.el_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4005,23 +4262,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.gl());
-      log(_this__u8e3s4.el_1, $this);
+      raise.ch(_this__u8e3s4.il());
+      log(_this__u8e3s4.gl_1, $this);
       var tmp$ret$2;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      var tmp0_subject = _this__u8e3s4.gl_1.uk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.el_1.tk_1));
+        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.gl_1.vk_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.el_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.gl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-        raise.ch(_this__u8e3s4.gl());
+        raise.ch(_this__u8e3s4.il());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4030,7 +4287,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.gl());
+      raise.ch(_this__u8e3s4.il());
       tmp$ret$2 = tmp2_also;
       tmp$ret$3 = tmp$ret$2;
       tmp$ret$4 = tmp$ret$3;
@@ -4068,7 +4325,7 @@
     return tmp$ret$9;
   }
   function log(_this__u8e3s4, $this) {
-    return $this.mh_1.ih('Parsing ' + _this__u8e3s4.sk_1 + ' at line ' + _this__u8e3s4.uk_1.vk_1 + ' position ' + _this__u8e3s4.uk_1.wk_1);
+    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);
   }
   function Parser(logger) {
     this.mh_1 = logger;
@@ -4084,7 +4341,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.sk_1;
+      var tmp = element.uk_1;
       tmp$ret$0 = isInterface(tmp, WhiteSpace);
       if (!tmp$ret$0) {
         tmp0_filterNotTo.a(element);
@@ -4108,7 +4365,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.tk_1 + "', ";
+      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.vk_1 + "', ";
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
@@ -4116,14 +4373,14 @@
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     var tmp$ret$3;
     // Inline function 'kotlin.run' call
-    var tmp0_run = $this.el_1;
+    var tmp0_run = $this.gl_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.tk_1 + "'";
+    tmp$ret$2 = "Current: '" + tmp0_run.vk_1 + "'";
     tmp$ret$3 = tmp$ret$2;
     var curr = tmp$ret$3;
-    var tmp2_safe_receiver = $this.fl_1;
+    var tmp2_safe_receiver = $this.hl_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -4133,13 +4390,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.tk_1 + "'";
+      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.vk_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.cl_1.ih(prev + curr + next);
+    $this.el_1.ih(prev + curr + next);
     tmp$ret$6 = Unit_getInstance();
     return tmp$ret$6;
   }
@@ -4159,7 +4416,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.dl_1.e();
+      tmp$ret$0 = $this.fl_1.e();
       var tmp1_success = tmp$ret$0;
       tmp$ret$1 = _Result___init__impl__xyqfz8(tmp1_success);
       tmp = tmp$ret$1;
@@ -4190,8 +4447,8 @@
     return tmp$ret$4;
   }
   function TokenProvider(logger, tokenIterator) {
-    this.cl_1 = logger;
-    this.dl_1 = tokenIterator;
+    this.el_1 = logger;
+    this.fl_1 = tokenIterator;
     var tmp = this;
     var tmp0_elvis_lhs = nextToken(this);
     var tmp_0;
@@ -4200,14 +4457,14 @@
     } else {
       tmp_0 = tmp0_elvis_lhs;
     }
-    tmp.el_1 = tmp_0;
-    this.fl_1 = nextToken(this);
+    tmp.gl_1 = tmp_0;
+    this.hl_1 = nextToken(this);
     printTokens$default(this);
   }
   protoOf(TokenProvider).d = function () {
-    return !(this.fl_1 == null);
+    return !(this.hl_1 == null);
   };
-  protoOf(TokenProvider).gl = function () {
+  protoOf(TokenProvider).il = function () {
     var tmp$ret$6;
     // Inline function 'arrow.core.raise.either' call
     var tmp$ret$5;
@@ -4221,21 +4478,21 @@
     try {
       var tmp$ret$1;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.el_1;
+      var previousToken = this.gl_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.fl_1;
+      var tmp0_elvis_lhs = this.hl_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.uk_1);
+        var tmp0_nel = new NextException(previousToken.wk_1);
         tmp$ret$0 = nonEmptyListOf(tmp0_nel, []);
         raise.bh(tmp$ret$0);
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.el_1 = tmp_1;
-      this.fl_1 = nextToken(this);
+      tmp_0.gl_1 = tmp_1;
+      this.hl_1 = nextToken(this);
       printTokens(this, previousToken);
       tmp$ret$1 = Unit_getInstance();
       var res = tmp$ret$1;
@@ -4277,15 +4534,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.hl_1 = idx;
-    this.il_1 = length;
+    this.jl_1 = idx;
+    this.kl_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.hl_1 + ', length=' + this.il_1 + ')';
+    return 'IdxAndLength(idx=' + this.jl_1 + ', length=' + this.kl_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.hl_1;
-    result = imul(result, 31) + this.il_1 | 0;
+    var result = this.jl_1;
+    result = imul(result, 31) + this.kl_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -4294,9 +4551,9 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.hl_1 === tmp0_other_with_cast.hl_1))
+    if (!(this.jl_1 === tmp0_other_with_cast.jl_1))
       return false;
-    if (!(this.il_1 === tmp0_other_with_cast.il_1))
+    if (!(this.kl_1 === tmp0_other_with_cast.kl_1))
       return false;
     return true;
   };
@@ -4304,26 +4561,26 @@
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.vk_1 = line;
-    this.wk_1 = position;
-    this.xk_1 = idxAndLength;
+    this.xk_1 = line;
+    this.yk_1 = position;
+    this.zk_1 = idxAndLength;
   }
-  protoOf(Coordinates).jl = function (line, position, idxAndLength) {
+  protoOf(Coordinates).ll = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).kl = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.vk_1 : line;
-    position = position === VOID ? this.wk_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.xk_1 : idxAndLength;
-    return $super === VOID ? this.jl(line, position, idxAndLength) : $super.jl.call(this, 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).toString = function () {
-    return 'Coordinates(line=' + this.vk_1 + ', position=' + this.wk_1 + ', idxAndLength=' + this.xk_1 + ')';
+    return 'Coordinates(line=' + this.xk_1 + ', position=' + this.yk_1 + ', idxAndLength=' + this.zk_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.vk_1;
-    result = imul(result, 31) + this.wk_1 | 0;
-    result = imul(result, 31) + this.xk_1.hashCode() | 0;
+    var result = this.xk_1;
+    result = imul(result, 31) + this.yk_1 | 0;
+    result = imul(result, 31) + this.zk_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -4332,35 +4589,35 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    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 === tmp0_other_with_cast.wk_1))
+    if (!(this.yk_1 === tmp0_other_with_cast.yk_1))
       return false;
-    if (!this.xk_1.equals(tmp0_other_with_cast.xk_1))
+    if (!this.zk_1.equals(tmp0_other_with_cast.zk_1))
       return false;
     return true;
   };
   function Token(type, value, coordinates) {
-    this.sk_1 = type;
-    this.tk_1 = value;
-    this.uk_1 = coordinates;
+    this.uk_1 = type;
+    this.vk_1 = value;
+    this.wk_1 = coordinates;
   }
-  protoOf(Token).ll = function (type, value, coordinates) {
+  protoOf(Token).nl = function (type, value, coordinates) {
     return new Token(type, value, coordinates);
   };
-  protoOf(Token).zk = function (type, value, coordinates, $super) {
-    type = type === VOID ? this.sk_1 : type;
-    value = value === VOID ? this.tk_1 : value;
-    coordinates = coordinates === VOID ? this.uk_1 : coordinates;
-    return $super === VOID ? this.ll(type, value, coordinates) : $super.ll.call(this, 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).toString = function () {
-    return 'Token(type=' + this.sk_1 + ', value=' + this.tk_1 + ', coordinates=' + this.uk_1 + ')';
+    return 'Token(type=' + this.uk_1 + ', value=' + this.vk_1 + ', coordinates=' + this.wk_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = hashCode(this.sk_1);
-    result = imul(result, 31) + getStringHashCode(this.tk_1) | 0;
-    result = imul(result, 31) + this.uk_1.hashCode() | 0;
+    var result = hashCode(this.uk_1);
+    result = imul(result, 31) + getStringHashCode(this.vk_1) | 0;
+    result = imul(result, 31) + this.wk_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -4369,19 +4626,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!equals(this.sk_1, tmp0_other_with_cast.sk_1))
+    if (!equals(this.uk_1, tmp0_other_with_cast.uk_1))
       return false;
-    if (!(this.tk_1 === tmp0_other_with_cast.tk_1))
+    if (!(this.vk_1 === tmp0_other_with_cast.vk_1))
       return false;
-    if (!this.uk_1.equals(tmp0_other_with_cast.uk_1))
+    if (!this.wk_1.equals(tmp0_other_with_cast.wk_1))
       return false;
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.hl_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.jl_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.kl(VOID, _this__u8e3s4.wk_1 + length | 0, plus_1(_this__u8e3s4.xk_1, length));
+    return _this__u8e3s4.ml(VOID, _this__u8e3s4.yk_1 + length | 0, plus_1(_this__u8e3s4.zk_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     var tmp$ret$1;
@@ -4403,7 +4660,7 @@
     var tmp0_subject = type;
     var tmp;
     if (tmp0_subject instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.vk_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.xk_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.xk_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.zk_1, value.length));
     } else {
       tmp = plus_2(_this__u8e3s4, value.length);
     }
@@ -4411,7 +4668,7 @@
   }
   function lastCoordinates(_this__u8e3s4) {
     var tmp0_safe_receiver = lastOrNull(_this__u8e3s4);
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.uk_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.wk_1;
     return tmp1_elvis_lhs == null ? new Coordinates() : tmp1_elvis_lhs;
   }
   function tokenize_0(_this__u8e3s4, source, tokens) {
@@ -4421,7 +4678,7 @@
     $l$1: do {
       $l$0: do {
         var token = findToken($this, lastCoordinates(tokens_0), source_0);
-        var newSource = removePrefix(source_0, token.tk_1);
+        var newSource = removePrefix(source_0, token.vk_1);
         var newTokens = plus_0(tokens_0, token);
         var tmp;
         var tmp$ret$0;
@@ -4647,7 +4904,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.nl_1 = 'EOP';
+    this.pl_1 = 'EOP';
   }
   var EndOfProgram_instance;
   function EndOfProgram_getInstance() {
@@ -4680,7 +4937,7 @@
     }
     return tmp;
   };
-  protoOf(Logger).rk = function (s, block) {
+  protoOf(Logger).tk = function (s, block) {
     var tmp$ret$1;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4750,25 +5007,25 @@
   protoOf(WirespecEmitter).ak = withLogging_5;
   protoOf(WirespecEmitter).bk = withLogging_6;
   protoOf(WirespecEmitter).dk = withLogging_7;
-  protoOf(WsTypeDef).ml = name;
-  protoOf(WsEnumTypeDef).ml = name;
-  protoOf(WsRefinedTypeDef).ml = name;
-  protoOf(WhiteSpaceExceptNewLine).ml = name;
-  protoOf(NewLine).ml = name;
-  protoOf(LeftCurly).ml = name;
-  protoOf(Colon).ml = name;
-  protoOf(Comma).ml = name;
-  protoOf(QuestionMark).ml = name;
-  protoOf(Brackets).ml = name;
-  protoOf(WsString).ml = name;
-  protoOf(WsInteger).ml = name;
-  protoOf(WsBoolean).ml = name;
-  protoOf(RightCurly).ml = name;
-  protoOf(CustomValue).ml = name;
-  protoOf(CustomType).ml = name;
-  protoOf(CustomRegex).ml = name;
-  protoOf(Invalid).ml = name;
-  protoOf(EndOfProgram).ml = name;
+  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;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_NAME = 'community.flock.wirespec.generated';