@flock/wirespec 0.4.4 → 0.5.2

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;
@@ -85,37 +86,37 @@
   setMetadataFor(Reported, 'Reported', classMeta, Enum);
   setMetadataFor(Wirespec, 'Wirespec', objectMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Type', block);
+    return logger.rk('Emitting Definition: Type', block);
   }
   function withLogging_0(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Type Shape', block);
+    return logger.rk('Emitting Definition: Type Shape', block);
   }
   function withLogging_1(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Type Shape Field', block);
+    return logger.rk('Emitting Definition: Type Shape Field', block);
   }
   function withLogging_2(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Type Shape Field Key', block);
+    return logger.rk('Emitting Definition: Type Shape Field Key', block);
   }
   function withLogging_3(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Type Shape Field Value', block);
+    return logger.rk('Emitting Definition: Type Shape Field Value', block);
   }
   setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_4(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Endpoint', block);
+    return logger.rk('Emitting Definition: Endpoint', block);
   }
   setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_5(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Refined', block);
+    return logger.rk('Emitting Definition: Refined', block);
   }
   function withLogging_6(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Refined Validator', block);
+    return logger.rk('Emitting Definition: Refined Validator', block);
   }
   setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_7(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Endpoint', block);
+    return logger.rk('Emitting Definition: Endpoint', block);
   }
   function withLogging_8(_this__u8e3s4, logger, block) {
-    return logger.ok('Emitting Definition: Endpoint Segment', block);
+    return logger.rk('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;
@@ -876,7 +895,7 @@
       var tmp0_subject = $this_emitPrimaryType;
       var tmp;
       if (tmp0_subject instanceof Custom) {
-        tmp = $this_emitPrimaryType.gj_1;
+        tmp = $this_emitPrimaryType.hj_1;
       } else {
         if (tmp0_subject instanceof Primitive) {
           var tmp1_subject = $this_emitPrimaryType.ej_1;
@@ -920,22 +939,22 @@
   function JavaEmitter$emit$lambda_4($this_emit) {
     return function () {
       Companion_getInstance_1();
-      return 'enum ' + $this_emit.ij_1 + ' {\n' + '  ' + joinToString($this_emit.jj_1, ', ') + ';\n}\n';
+      return 'enum ' + $this_emit.kj_1 + ' {\n' + '  ' + joinToString($this_emit.lj_1, ', ') + ';\n}\n';
     };
   }
   function JavaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_1();
       Companion_getInstance_1();
-      var tmp = this$0.mj($this_emit.lj_1);
+      var tmp = this$0.oj($this_emit.nj_1);
       Companion_getInstance_1();
-      return trimMargin('public record ' + $this_emit.kj_1 + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.kj_1 + ' record) {\n            |' + '  ' + tmp + '\n            |' + '  ' + '}\n            |}\n            |');
+      return trimMargin('public record ' + $this_emit.mj_1 + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.mj_1 + ' record) {\n            |' + '  ' + tmp + '\n            |' + '  ' + '}\n            |}\n            |');
     };
   }
   function JavaEmitter$emit$lambda_6($this_emit) {
     return function () {
       Companion_getInstance_1();
-      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.nj_1 + ').matcher(record.value).find();';
+      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.pj_1 + ').matcher(record.value).find();';
     };
   }
   function JavaEmitter$emit$lambda$lambda_0(this$0, $this_emit) {
@@ -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().oj($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) {
@@ -1038,7 +1076,7 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = '"' + $this_emit.pj_1 + '"';
+        tmp = '"' + $this_emit.rj_1 + '"';
       } else {
         if (tmp0_subject instanceof Param) {
           tmp = $this_emit.si_1.dj_1;
@@ -1066,7 +1104,7 @@
       tmp = '{' + it.si_1.dj_1 + '}';
     } else {
       if (tmp0_subject instanceof Literal) {
-        tmp = it.pj_1;
+        tmp = it.rj_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1144,32 +1182,32 @@
     tmp$ret$2 = tmp$ret$1;
     return plus_0(tmp$ret$2, to('WirespecShared', this.ci_1 + '\n\n' + this.bi_1));
   };
-  protoOf(JavaEmitter).qj = function (_this__u8e3s4) {
-    return this.rj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda(_this__u8e3s4, this));
+  protoOf(JavaEmitter).sj = function (_this__u8e3s4) {
+    return this.tj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(JavaEmitter).wi = function (_this__u8e3s4) {
-    return this.sj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.uj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(JavaEmitter).xi = function (_this__u8e3s4) {
-    return this.tj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
+    return this.vj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
   };
   protoOf(JavaEmitter).cj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(JavaEmitter).di = function (_this__u8e3s4) {
     return this.th(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_3(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).vj = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_4(_this__u8e3s4));
-  };
   protoOf(JavaEmitter).xj = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.yj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_4(_this__u8e3s4));
+  };
+  protoOf(JavaEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).mj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(JavaEmitter).oj = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(JavaEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.oh_1, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
+  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;
@@ -1255,6 +1293,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 +1312,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();
@@ -1489,12 +1563,14 @@
   }
   function KotlinEmitter$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;
       var tmp;
       if (tmp0_subject instanceof Custom) {
-        tmp = $this_emit.gj_1;
+        tmp = $this_emit.hj_1;
       } else {
         if (tmp0_subject instanceof Primitive) {
           var tmp1_subject = $this_emit.ej_1;
@@ -1525,23 +1601,29 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
       tmp$ret$0 = $this_emit.qi() ? 'List<' + tmp0_let + '>' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
-      return tmp$ret$1;
+      var tmp1_let = tmp$ret$1;
+      // Inline function 'kotlin.contracts.contract' call
+      var tmp$ret$2;
+      // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
+      tmp$ret$2 = $this_emit.ik() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$3 = tmp$ret$2;
+      return tmp$ret$3;
     };
   }
   function KotlinEmitter$emit$lambda_4($this_emit) {
     return function () {
       Companion_getInstance_1();
-      return 'enum class ' + $this_emit.ij_1 + ' {\n' + '  ' + joinToString($this_emit.jj_1, ', ') + '\n}\n';
+      return 'enum class ' + $this_emit.kj_1 + ' {\n' + '  ' + joinToString($this_emit.lj_1, ', ') + '\n}\n';
     };
   }
   function KotlinEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return trimMargin('data class ' + $this_emit.kj_1 + '(val value: String)\n            |fun ' + $this_emit.kj_1 + '.validate() = ' + this$0.mj($this_emit.lj_1) + '\n            |');
+      return trimMargin('data class ' + $this_emit.mj_1 + '(val value: String)\n            |fun ' + $this_emit.mj_1 + '.validate() = ' + this$0.oj($this_emit.nj_1) + '\n            |');
     };
   }
   function KotlinEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return 'Regex(' + $this_emit.nj_1 + ').find(value)';
+      return 'Regex(' + $this_emit.pj_1 + ').find(value)';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_0(this$0, $this_emit) {
@@ -1731,8 +1813,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;
@@ -1751,29 +1835,63 @@
       }
       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().oj($this_emit.ei_1);
+      var tmp_8 = Companion_getInstance_1().qj($this_emit.ei_1);
       Companion_getInstance_1();
       Companion_getInstance_1();
       Companion_getInstance_1();
@@ -1799,7 +1917,7 @@
       tmp = '{' + it.si_1.dj_1 + '}';
     } else {
       if (tmp0_subject instanceof Literal) {
-        tmp = it.pj_1;
+        tmp = it.rj_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1816,7 +1934,7 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.pj_1;
+        tmp = $this_emit.rj_1;
       } else {
         if (tmp0_subject instanceof Param) {
           tmp = '${' + $this_emit.si_1.dj_1 + '}';
@@ -1846,14 +1964,14 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.ek_1 = packageName;
+    this.gk_1 = packageName;
     var tmp = this;
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
     Companion_getInstance_1();
-    tmp.fk_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.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    ');
   }
   protoOf(KotlinEmitter).qh = function (ast) {
     var tmp$ret$3;
@@ -1871,7 +1989,7 @@
       var result = item.j3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.ek_1) ? '' : 'package ' + this.ek_1) + '\n                    |' + (hasEndpoints(ast, this) ? this.fk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.gk_1) ? '' : 'package ' + this.gk_1) + '\n                    |' + (hasEndpoints(ast, this) ? 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);
@@ -1880,32 +1998,32 @@
     tmp$ret$3 = tmp$ret$2;
     return tmp$ret$3;
   };
-  protoOf(KotlinEmitter).qj = function (_this__u8e3s4) {
-    return this.rj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).sj = function (_this__u8e3s4) {
+    return this.tj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(KotlinEmitter).wi = function (_this__u8e3s4) {
-    return this.sj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.uj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(KotlinEmitter).xi = function (_this__u8e3s4) {
-    return this.tj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.vj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(KotlinEmitter).cj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(KotlinEmitter).di = function (_this__u8e3s4) {
     return this.th(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(KotlinEmitter).vj = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_4(_this__u8e3s4));
-  };
   protoOf(KotlinEmitter).xj = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.yj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_4(_this__u8e3s4));
+  };
+  protoOf(KotlinEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).mj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(KotlinEmitter).oj = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(KotlinEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).ck = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.oh_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function emitContentType_0(_this__u8e3s4) {
     var tmp = split(_this__u8e3s4.vh_1, ['/']);
@@ -1941,7 +2059,7 @@
   }
   function Companion() {
     Companion_instance = this;
-    this.gk_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.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']);
   }
   var Companion_instance;
   function Companion_getInstance_0() {
@@ -1972,7 +2090,7 @@
   }
   function ScalaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return Companion_getInstance_0().gk_1.i1($this_emit.dj_1) ? '`' + $this_emit.dj_1 + '`' : $this_emit.dj_1;
+      return Companion_getInstance_0().jk_1.i1($this_emit.dj_1) ? '`' + $this_emit.dj_1 + '`' : $this_emit.dj_1;
     };
   }
   function ScalaEmitter$emit$lambda_3($this_emit) {
@@ -1982,7 +2100,7 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Custom) {
-        tmp = $this_emit.gj_1;
+        tmp = $this_emit.hj_1;
       } else {
         if (tmp0_subject instanceof Primitive) {
           var tmp1_subject = $this_emit.ej_1;
@@ -2019,20 +2137,20 @@
   function ScalaEmitter$emit$lambda$lambda_0($this_emit) {
     return function (it) {
       Companion_getInstance_1();
-      return '  ' + 'final case object ' + it + ' extends ' + $this_emit.ij_1 + '(label = "' + it + '")';
+      return '  ' + 'final case object ' + it + ' extends ' + $this_emit.kj_1 + '(label = "' + it + '")';
     };
   }
   function ScalaEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return trimMargin('\n        |sealed abstract class ' + $this_emit.ij_1 + '(val label: String)\n        |object ' + $this_emit.ij_1 + ' {\n        |' + joinToString($this_emit.jj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
+      return trimMargin('\n        |sealed abstract class ' + $this_emit.kj_1 + '(val label: String)\n        |object ' + $this_emit.kj_1 + ' {\n        |' + joinToString($this_emit.lj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
     };
   }
   function ScalaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_1();
-      var tmp = this$0.mj($this_emit.lj_1);
+      var tmp = this$0.oj($this_emit.nj_1);
       Companion_getInstance_1();
-      return trimMargin('case class ' + $this_emit.kj_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.kj_1 + 'Ops(val that: ' + $this_emit.kj_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
+      return trimMargin('case class ' + $this_emit.mj_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.mj_1 + 'Ops(val that: ' + $this_emit.mj_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
     };
   }
   function ScalaEmitter$emit$lambda_6($this_emit) {
@@ -2041,7 +2159,7 @@
       Companion_getInstance_1();
       Companion_getInstance_1();
       Companion_getInstance_1();
-      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.nj_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
+      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.pj_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
     };
   }
   function ScalaEmitter$emit$lambda_7() {
@@ -2052,7 +2170,7 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.jk_1 = packageName;
+    this.mk_1 = packageName;
   }
   protoOf(ScalaEmitter).qh = function (ast) {
     var tmp$ret$2;
@@ -2068,39 +2186,39 @@
       // 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.jk_1) ? '' : 'package ' + this.jk_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, isBlank(this.mk_1) ? '' : 'package ' + this.mk_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   };
-  protoOf(ScalaEmitter).qj = function (_this__u8e3s4) {
-    return this.rj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
+  protoOf(ScalaEmitter).sj = function (_this__u8e3s4) {
+    return this.tj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(ScalaEmitter).wi = function (_this__u8e3s4) {
-    return this.sj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.uj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(ScalaEmitter).xi = function (_this__u8e3s4) {
-    return this.tj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.vj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(ScalaEmitter).cj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(ScalaEmitter).di = function (_this__u8e3s4) {
     return this.th(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).vj = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
-  };
   protoOf(ScalaEmitter).xj = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.yj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
+  };
+  protoOf(ScalaEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(ScalaEmitter).mj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(ScalaEmitter).oj = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_7);
+  protoOf(ScalaEmitter).ck = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.oh_1, ScalaEmitter$emit$lambda_7);
   };
   function TypeScriptEmitter$emit$lambda($this_emit, this$0) {
     return function () {
@@ -2135,7 +2253,7 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Custom) {
-        tmp = $this_emit.gj_1;
+        tmp = $this_emit.hj_1;
       } else {
         if (tmp0_subject instanceof Primitive) {
           var tmp1_subject = $this_emit.ej_1;
@@ -2174,18 +2292,18 @@
   }
   function TypeScriptEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return 'type ' + $this_emit.ij_1 + ' = ' + joinToString($this_emit.jj_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
+      return 'type ' + $this_emit.kj_1 + ' = ' + joinToString($this_emit.lj_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
     };
   }
   function TypeScriptEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_1();
-      return trimMargin('interface ' + $this_emit.kj_1 + ' {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.kj_1 + ' = (type: ' + $this_emit.kj_1 + ') => (' + this$0.mj($this_emit.lj_1) + ').test(type.value);\n            |\n            |');
+      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            |');
     };
   }
   function TypeScriptEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return "new RegExp('" + dropLast(drop($this_emit.nj_1, 1), 1) + "')";
+      return "new RegExp('" + dropLast(drop($this_emit.pj_1, 1), 1) + "')";
     };
   }
   function TypeScriptEmitter$emit$lambda_7() {
@@ -2195,32 +2313,32 @@
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
   }
-  protoOf(TypeScriptEmitter).qj = function (_this__u8e3s4) {
-    return this.rj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).sj = function (_this__u8e3s4) {
+    return this.tj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(TypeScriptEmitter).wi = function (_this__u8e3s4) {
-    return this.sj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.uj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(TypeScriptEmitter).xi = function (_this__u8e3s4) {
-    return this.tj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.vj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(TypeScriptEmitter).cj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(TypeScriptEmitter).di = function (_this__u8e3s4) {
     return this.th(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).vj = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
-  };
   protoOf(TypeScriptEmitter).xj = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.yj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).mj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(TypeScriptEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.oh_1, TypeScriptEmitter$emit$lambda_7);
+  protoOf(TypeScriptEmitter).oj = function (_this__u8e3s4) {
+    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);
   };
   function WirespecEmitter$emit$lambda($this_emit, this$0) {
     return function () {
@@ -2255,7 +2373,7 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Custom) {
-        tmp = $this_emit.gj_1;
+        tmp = $this_emit.hj_1;
       } else {
         if (tmp0_subject instanceof Primitive) {
           var tmp1_subject = $this_emit.ej_1;
@@ -2292,17 +2410,17 @@
   function WirespecEmitter$emit$lambda_4($this_emit) {
     return function () {
       Companion_getInstance_1();
-      return 'enum ' + $this_emit.ij_1 + ' {\n' + '  ' + joinToString($this_emit.jj_1, ', ') + '\n}\n';
+      return 'enum ' + $this_emit.kj_1 + ' {\n' + '  ' + joinToString($this_emit.lj_1, ', ') + '\n}\n';
     };
   }
   function WirespecEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return 'refined ' + $this_emit.kj_1 + ' ' + this$0.mj($this_emit.lj_1) + '\n';
+      return 'refined ' + $this_emit.mj_1 + ' ' + this$0.oj($this_emit.nj_1) + '\n';
     };
   }
   function WirespecEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return '/' + dropLast(drop($this_emit.nj_1, 1), 1) + '/g';
+      return '/' + dropLast(drop($this_emit.pj_1, 1), 1) + '/g';
     };
   }
   function WirespecEmitter$emit$lambda_7() {
@@ -2312,32 +2430,32 @@
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
   }
-  protoOf(WirespecEmitter).qj = function (_this__u8e3s4) {
-    return this.rj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
+  protoOf(WirespecEmitter).sj = function (_this__u8e3s4) {
+    return this.tj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(WirespecEmitter).wi = function (_this__u8e3s4) {
-    return this.sj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
+    return this.uj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
   protoOf(WirespecEmitter).xi = function (_this__u8e3s4) {
-    return this.tj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.vj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(WirespecEmitter).cj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
   };
   protoOf(WirespecEmitter).di = function (_this__u8e3s4) {
     return this.th(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).vj = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
-  };
   protoOf(WirespecEmitter).xj = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
+    return this.yj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
+  };
+  protoOf(WirespecEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(WirespecEmitter).mj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(WirespecEmitter).oj = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_7);
+  protoOf(WirespecEmitter).ck = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.oh_1, WirespecEmitter$emit$lambda_7);
   };
   function get_DEFAULT_PACKAGE_NAME() {
     return DEFAULT_PACKAGE_NAME;
@@ -2381,7 +2499,7 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
-  protoOf(Companion_0).oj = function (_this__u8e3s4) {
+  protoOf(Companion_0).qj = function (_this__u8e3s4) {
     var tmp$ret$6;
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
@@ -2447,16 +2565,16 @@
       var tmp0_subject = item;
       var tmp;
       if (tmp0_subject instanceof Type_0) {
-        tmp = to(item.ui_1, this.qj(item));
+        tmp = to(item.ui_1, this.sj(item));
       } else {
         if (tmp0_subject instanceof Endpoint) {
-          tmp = to(item.ei_1, this.ak(item));
+          tmp = to(item.ei_1, this.ck(item));
         } else {
           if (tmp0_subject instanceof Enum_0) {
-            tmp = to(item.ij_1, this.vj(item));
+            tmp = to(item.kj_1, this.xj(item));
           } else {
             if (tmp0_subject instanceof Refined) {
-              tmp = to(item.kj_1, this.xj(item));
+              tmp = to(item.mj_1, this.zj(item));
             } else {
               noWhenBranchMatchedException();
             }
@@ -2499,7 +2617,7 @@
     captureStack(this, NextException);
   }
   function WrongTokenException(expected, actual) {
-    ParserException.call(this, actual.rk_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.pk_1).fc() + ' at line ' + actual.rk_1.sk_1 + ' and position ' + (actual.rk_1.tk_1 - actual.qk_1.length | 0));
+    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));
     captureStack(this, WrongTokenException);
   }
   function NullTokenException(message, coordinates) {
@@ -2517,7 +2635,7 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.vk_1 = coordinates;
+    this.yk_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     var tmp$ret$2;
@@ -2530,10 +2648,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.pk_1;
+      var tmp0_subject = item.sk_1;
       var tmp;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp = item.wk(VOID, '"' + dropLast(drop(item.qk_1, 1), 2) + '"');
+        tmp = item.zk(VOID, '"' + dropLast(drop(item.tk_1, 1), 2) + '"');
       } else {
         tmp = item;
       }
@@ -2571,19 +2689,34 @@
     Type_initEntries();
     return Type_Boolean_instance;
   }
-  function Custom(value, isIterable) {
-    this.gj_1 = value;
-    this.hj_1 = isIterable;
+  function Custom(value, isIterable, isMap) {
+    isMap = isMap === VOID ? false : isMap;
+    this.hj_1 = value;
+    this.ij_1 = isIterable;
+    this.jj_1 = isMap;
   }
   protoOf(Custom).qi = function () {
-    return this.hj_1;
+    return this.ij_1;
+  };
+  protoOf(Custom).ik = function () {
+    return this.jj_1;
+  };
+  protoOf(Custom).al = function (value, isIterable, isMap) {
+    return new Custom(value, isIterable, isMap);
+  };
+  protoOf(Custom).bl = 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);
   };
   protoOf(Custom).toString = function () {
-    return 'Custom(value=' + this.gj_1 + ', isIterable=' + this.hj_1 + ')';
+    return 'Custom(value=' + this.hj_1 + ', isIterable=' + this.ij_1 + ', isMap=' + this.jj_1 + ')';
   };
   protoOf(Custom).hashCode = function () {
-    var result = getStringHashCode(this.gj_1);
-    result = imul(result, 31) + (this.hj_1 | 0) | 0;
+    var result = getStringHashCode(this.hj_1);
+    result = imul(result, 31) + (this.ij_1 | 0) | 0;
+    result = imul(result, 31) + (this.jj_1 | 0) | 0;
     return result;
   };
   protoOf(Custom).equals = function (other) {
@@ -2592,25 +2725,33 @@
     if (!(other instanceof Custom))
       return false;
     var tmp0_other_with_cast = other instanceof Custom ? other : THROW_CCE();
-    if (!(this.gj_1 === tmp0_other_with_cast.gj_1))
-      return false;
     if (!(this.hj_1 === tmp0_other_with_cast.hj_1))
       return false;
+    if (!(this.ij_1 === tmp0_other_with_cast.ij_1))
+      return false;
+    if (!(this.jj_1 === tmp0_other_with_cast.jj_1))
+      return false;
     return true;
   };
-  function Primitive(type, isIterable) {
+  function Primitive(type, isIterable, isMap) {
+    isMap = isMap === VOID ? false : isMap;
     this.ej_1 = type;
     this.fj_1 = isIterable;
+    this.gj_1 = isMap;
   }
   protoOf(Primitive).qi = function () {
     return this.fj_1;
   };
+  protoOf(Primitive).ik = function () {
+    return this.gj_1;
+  };
   protoOf(Primitive).toString = function () {
-    return 'Primitive(type=' + this.ej_1 + ', isIterable=' + this.fj_1 + ')';
+    return 'Primitive(type=' + this.ej_1 + ', isIterable=' + this.fj_1 + ', isMap=' + this.gj_1 + ')';
   };
   protoOf(Primitive).hashCode = function () {
     var result = this.ej_1.hashCode();
     result = imul(result, 31) + (this.fj_1 | 0) | 0;
+    result = imul(result, 31) + (this.gj_1 | 0) | 0;
     return result;
   };
   protoOf(Primitive).equals = function (other) {
@@ -2623,6 +2764,8 @@
       return false;
     if (!(this.fj_1 === tmp0_other_with_cast.fj_1))
       return false;
+    if (!(this.gj_1 === tmp0_other_with_cast.gj_1))
+      return false;
     return true;
   };
   function Identifier(value) {
@@ -2741,13 +2884,13 @@
     Method_TRACE_instance = new Method('TRACE', 7);
   }
   function Literal(value) {
-    this.pj_1 = value;
+    this.rj_1 = value;
   }
   protoOf(Literal).toString = function () {
-    return 'Literal(value=' + this.pj_1 + ')';
+    return 'Literal(value=' + this.rj_1 + ')';
   };
   protoOf(Literal).hashCode = function () {
-    return getStringHashCode(this.pj_1);
+    return getStringHashCode(this.rj_1);
   };
   protoOf(Literal).equals = function (other) {
     if (this === other)
@@ -2755,7 +2898,7 @@
     if (!(other instanceof Literal))
       return false;
     var tmp0_other_with_cast = other instanceof Literal ? other : THROW_CCE();
-    if (!(this.pj_1 === tmp0_other_with_cast.pj_1))
+    if (!(this.rj_1 === tmp0_other_with_cast.rj_1))
       return false;
     return true;
   };
@@ -2938,15 +3081,15 @@
     return true;
   };
   function Enum_0(name, entries) {
-    this.ij_1 = name;
-    this.jj_1 = entries;
+    this.kj_1 = name;
+    this.lj_1 = entries;
   }
   protoOf(Enum_0).toString = function () {
-    return 'Enum(name=' + this.ij_1 + ', entries=' + this.jj_1 + ')';
+    return 'Enum(name=' + this.kj_1 + ', entries=' + this.lj_1 + ')';
   };
   protoOf(Enum_0).hashCode = function () {
-    var result = getStringHashCode(this.ij_1);
-    result = imul(result, 31) + hashCode(this.jj_1) | 0;
+    var result = getStringHashCode(this.kj_1);
+    result = imul(result, 31) + hashCode(this.lj_1) | 0;
     return result;
   };
   protoOf(Enum_0).equals = function (other) {
@@ -2955,20 +3098,20 @@
     if (!(other instanceof Enum_0))
       return false;
     var tmp0_other_with_cast = other instanceof Enum_0 ? other : THROW_CCE();
-    if (!(this.ij_1 === tmp0_other_with_cast.ij_1))
+    if (!(this.kj_1 === tmp0_other_with_cast.kj_1))
       return false;
-    if (!equals(this.jj_1, tmp0_other_with_cast.jj_1))
+    if (!equals(this.lj_1, tmp0_other_with_cast.lj_1))
       return false;
     return true;
   };
   function Validator(value) {
-    this.nj_1 = value;
+    this.pj_1 = value;
   }
   protoOf(Validator).toString = function () {
-    return 'Validator(value=' + this.nj_1 + ')';
+    return 'Validator(value=' + this.pj_1 + ')';
   };
   protoOf(Validator).hashCode = function () {
-    return getStringHashCode(this.nj_1);
+    return getStringHashCode(this.pj_1);
   };
   protoOf(Validator).equals = function (other) {
     if (this === other)
@@ -2976,20 +3119,20 @@
     if (!(other instanceof Validator))
       return false;
     var tmp0_other_with_cast = other instanceof Validator ? other : THROW_CCE();
-    if (!(this.nj_1 === tmp0_other_with_cast.nj_1))
+    if (!(this.pj_1 === tmp0_other_with_cast.pj_1))
       return false;
     return true;
   };
   function Refined(name, validator) {
-    this.kj_1 = name;
-    this.lj_1 = validator;
+    this.mj_1 = name;
+    this.nj_1 = validator;
   }
   protoOf(Refined).toString = function () {
-    return 'Refined(name=' + this.kj_1 + ', validator=' + this.lj_1 + ')';
+    return 'Refined(name=' + this.mj_1 + ', validator=' + this.nj_1 + ')';
   };
   protoOf(Refined).hashCode = function () {
-    var result = getStringHashCode(this.kj_1);
-    result = imul(result, 31) + this.lj_1.hashCode() | 0;
+    var result = getStringHashCode(this.mj_1);
+    result = imul(result, 31) + this.nj_1.hashCode() | 0;
     return result;
   };
   protoOf(Refined).equals = function (other) {
@@ -2998,9 +3141,9 @@
     if (!(other instanceof Refined))
       return false;
     var tmp0_other_with_cast = other instanceof Refined ? other : THROW_CCE();
-    if (!(this.kj_1 === tmp0_other_with_cast.kj_1))
+    if (!(this.mj_1 === tmp0_other_with_cast.mj_1))
       return false;
-    if (!this.lj_1.equals(tmp0_other_with_cast.lj_1))
+    if (!this.nj_1.equals(tmp0_other_with_cast.nj_1))
       return false;
     return true;
   };
@@ -3099,8 +3242,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.zk_1, $this);
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      log(_this__u8e3s4.el_1, $this);
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof WsTypeDef) {
         tmp_0 = raise.ch(parseTypeDeclaration(_this__u8e3s4, $this));
@@ -3115,10 +3258,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.zk_1);
+            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.el_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            _this__u8e3s4.bl();
+            raise.ch(_this__u8e3s4.gl());
             tmp$ret$0 = tmp0_also;
             var tmp1_nel = tmp$ret$0;
             tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3177,21 +3320,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.zk_1.qk_1));
+        tmp_0 = raise.ch(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.el_1.tk_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.zk_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3248,11 +3391,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Type_0(typeName, raise.ch(parseTypeShape(_this__u8e3s4, $this)));
@@ -3261,10 +3404,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.zk_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3273,18 +3416,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.zk_1.pk_1;
-      if (tmp0_subject_0 instanceof RightCurly) {
-        _this__u8e3s4.bl();
-      } else {
+      var tmp0_subject_0 = _this__u8e3s4.el_1.sk_1;
+      if (tmp0_subject_0 instanceof RightCurly)
+        raise.ch(_this__u8e3s4.gl());
+      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.zk_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -3342,11 +3485,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
       var tmp$ret$6;
       // Inline function 'kotlin.let' call
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomValue) {
         var tmp$ret$3;
@@ -3357,21 +3500,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.zk_1.qk_1))));
-        while (equals(_this__u8e3s4.zk_1.pk_1, Comma_getInstance())) {
-          _this__u8e3s4.bl();
-          var tmp0_subject_0 = _this__u8e3s4.zk_1.pk_1;
+        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;
           if (tmp0_subject_0 instanceof CustomValue) {
-            tmp0_apply.a(raise.ch(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.zk_1.qk_1))));
+            tmp0_apply.a(raise.ch(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.el_1.tk_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.zk_1);
+            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.el_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-            _this__u8e3s4.bl();
+            raise.ch(_this__u8e3s4.gl());
             tmp$ret$1 = tmp0_also;
             var tmp1_nel = tmp$ret$1;
             tmp$ret$2 = nonEmptyListOf(tmp1_nel, []);
@@ -3385,10 +3528,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.zk_1);
+        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$4 = tmp1_also;
         var tmp2_nel = tmp$ret$4;
         tmp$ret$5 = nonEmptyListOf(tmp2_nel, []);
@@ -3448,38 +3591,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
-      if (tmp0_subject instanceof Colon) {
-        _this__u8e3s4.bl();
-      } else {
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
+      if (tmp0_subject instanceof Colon)
+        raise.ch(_this__u8e3s4.gl());
+      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.zk_1);
+        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         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.zk_1.pk_1;
+      var type = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (isInterface(type, WsType)) {
-        var tmp_1 = parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.zk_1.qk_1);
+        var tmp_1 = raise.ch(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.el_1.tk_1));
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.zk_1.pk_1;
+        var tmp_2 = _this__u8e3s4.el_1.sk_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) {
-          _this__u8e3s4.bl();
-        }
+        if (tmp2_also)
+          raise.ch(_this__u8e3s4.gl());
         tmp$ret$2 = tmp2_also;
         tmp_0 = new Field(identifier, tmp_1, tmp$ret$2);
       } else {
@@ -3487,10 +3629,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.zk_1);
+        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$3 = tmp3_also;
         var tmp4_nel = tmp$ret$3;
         tmp$ret$4 = nonEmptyListOf(tmp4_nel, []);
@@ -3532,46 +3674,86 @@
     return tmp$ret$11;
   }
   function parseFieldValue(_this__u8e3s4, $this, wsType, value) {
-    var tmp$ret$2;
-    // Inline function 'kotlin.run' call
+    var tmp$ret$7;
+    // Inline function 'arrow.core.raise.either' call
+    var tmp$ret$6;
+    // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
-    var tmp$ret$1;
-    // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseFieldValue.<anonymous>' call
-    _this__u8e3s4.bl();
-    log(_this__u8e3s4.zk_1, $this);
-    var tmp$ret$0;
-    // Inline function 'kotlin.also' call
-    var tmp = _this__u8e3s4.zk_1.pk_1;
-    var tmp0_also = tmp instanceof Brackets;
+    var tmp$ret$5;
+    // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
-    // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseFieldValue.<anonymous>.<anonymous>' call
-    if (tmp0_also) {
-      _this__u8e3s4.bl();
-    }
-    tmp$ret$0 = tmp0_also;
-    var isIterable = tmp$ret$0;
-    var tmp0_subject = wsType;
-    var tmp_0;
-    if (tmp0_subject instanceof WsString) {
-      tmp_0 = new Primitive(Type_String_getInstance(), isIterable);
-    } else {
-      if (tmp0_subject instanceof WsInteger) {
-        tmp_0 = new Primitive(Type_Integer_getInstance(), isIterable);
+    var raise = new DefaultRaise(false);
+    var tmp;
+    try {
+      var tmp$ret$2;
+      // 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);
+      var tmp$ret$0;
+      // Inline function 'kotlin.also' call
+      var tmp_0 = _this__u8e3s4.el_1.sk_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());
+      tmp$ret$0 = tmp0_also;
+      var isIterable = tmp$ret$0;
+      var tmp0_subject = wsType;
+      var tmp_1;
+      if (tmp0_subject instanceof WsString) {
+        tmp_1 = new Primitive(Type_String_getInstance(), isIterable);
       } else {
-        if (tmp0_subject instanceof WsBoolean) {
-          tmp_0 = new Primitive(Type_Boolean_getInstance(), isIterable);
+        if (tmp0_subject instanceof WsInteger) {
+          tmp_1 = new Primitive(Type_Integer_getInstance(), isIterable);
         } else {
-          if (tmp0_subject instanceof CustomType) {
-            tmp_0 = new Custom(value, isIterable);
+          if (tmp0_subject instanceof WsBoolean) {
+            tmp_1 = new Primitive(Type_Boolean_getInstance(), isIterable);
           } else {
-            noWhenBranchMatchedException();
+            if (tmp0_subject instanceof CustomType) {
+              tmp_1 = new Custom(value, isIterable);
+            } else {
+              noWhenBranchMatchedException();
+            }
           }
         }
       }
+      tmp$ret$1 = tmp_1;
+      tmp$ret$2 = tmp$ret$1;
+      var res = tmp$ret$2;
+      raise.zg();
+      var tmp$ret$3;
+      // Inline function 'arrow.core.raise.either.<anonymous>' call
+      tmp$ret$3 = new Right(res);
+      tmp = tmp$ret$3;
+    } catch ($p) {
+      var tmp_2;
+      if ($p instanceof CancellationException) {
+        var e = $p;
+        raise.zg();
+        var tmp$ret$4;
+        // Inline function 'arrow.core.raise.either.<anonymous>' call
+        var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
+        tmp$ret$4 = new Left(tmp1__anonymous__uwfjfc);
+        tmp_2 = tmp$ret$4;
+      } else {
+        if ($p instanceof Error) {
+          var e_0 = $p;
+          raise.zg();
+          var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
+          throw tmp0__anonymous__q1qw7t;
+        } else {
+          throw $p;
+        }
+      }
+      tmp = tmp_2;
     }
-    tmp$ret$1 = tmp_0;
-    tmp$ret$2 = tmp$ret$1;
-    return tmp$ret$2;
+    tmp$ret$5 = tmp;
+    tmp$ret$6 = tmp$ret$5;
+    tmp$ret$7 = tmp$ret$6;
+    return tmp$ret$7;
   }
   function parseEnumTypeDeclaration(_this__u8e3s4, $this) {
     var tmp$ret$8;
@@ -3589,21 +3771,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.zk_1.qk_1));
+        tmp_0 = raise.ch(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.el_1.tk_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.zk_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3660,11 +3842,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Enum_0(typeName, raise.ch(parseEnumTypeEntries(_this__u8e3s4, $this)));
@@ -3673,10 +3855,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.zk_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3685,18 +3867,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.zk_1.pk_1;
-      if (tmp0_subject_0 instanceof RightCurly) {
-        _this__u8e3s4.bl();
-      } else {
+      var tmp0_subject_0 = _this__u8e3s4.el_1.sk_1;
+      if (tmp0_subject_0 instanceof RightCurly)
+        raise.ch(_this__u8e3s4.gl());
+      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.zk_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -3754,9 +3936,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
         var tmp$ret$4;
@@ -3767,28 +3949,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.zk_1.qk_1);
-        _this__u8e3s4.bl();
-        while (equals(_this__u8e3s4.zk_1.pk_1, Comma_getInstance())) {
-          _this__u8e3s4.bl();
-          var tmp0_subject_0 = _this__u8e3s4.zk_1.pk_1;
+        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;
           if (tmp0_subject_0 instanceof CustomType) {
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = tmp0_apply.a(_this__u8e3s4.zk_1.qk_1);
+            var tmp0_also = tmp0_apply.a(_this__u8e3s4.el_1.tk_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            _this__u8e3s4.bl();
+            raise.ch(_this__u8e3s4.gl());
             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.zk_1);
+            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.el_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            _this__u8e3s4.bl();
+            raise.ch(_this__u8e3s4.gl());
             tmp$ret$2 = tmp1_also;
             var tmp2_nel = tmp$ret$2;
             tmp$ret$3 = nonEmptyListOf(tmp2_nel, []);
@@ -3802,10 +3984,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.zk_1);
+        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$5 = tmp1_also_0;
         var tmp2_nel_0 = tmp$ret$5;
         tmp$ret$6 = nonEmptyListOf(tmp2_nel_0, []);
@@ -3862,21 +4044,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.ch(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.zk_1.qk_1));
+        tmp_0 = raise.ch(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.el_1.tk_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.zk_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3933,23 +4115,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
-      _this__u8e3s4.bl();
-      log(_this__u8e3s4.zk_1, $this);
+      raise.ch(_this__u8e3s4.gl());
+      log(_this__u8e3s4.el_1, $this);
       var tmp$ret$2;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.zk_1.pk_1;
+      var tmp0_subject = _this__u8e3s4.el_1.sk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.zk_1.qk_1));
+        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.el_1.tk_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.zk_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.el_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-        _this__u8e3s4.bl();
+        raise.ch(_this__u8e3s4.gl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3958,7 +4140,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
-      _this__u8e3s4.bl();
+      raise.ch(_this__u8e3s4.gl());
       tmp$ret$2 = tmp2_also;
       tmp$ret$3 = tmp$ret$2;
       tmp$ret$4 = tmp$ret$3;
@@ -3996,7 +4178,7 @@
     return tmp$ret$9;
   }
   function log(_this__u8e3s4, $this) {
-    return $this.mh_1.ih('Parsing ' + _this__u8e3s4.pk_1 + ' at line ' + _this__u8e3s4.rk_1.sk_1 + ' position ' + _this__u8e3s4.rk_1.tk_1);
+    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);
   }
   function Parser(logger) {
     this.mh_1 = logger;
@@ -4012,7 +4194,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.pk_1;
+      var tmp = element.sk_1;
       tmp$ret$0 = isInterface(tmp, WhiteSpace);
       if (!tmp$ret$0) {
         tmp0_filterNotTo.a(element);
@@ -4036,7 +4218,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.qk_1 + "', ";
+      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.tk_1 + "', ";
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
@@ -4044,14 +4226,14 @@
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     var tmp$ret$3;
     // Inline function 'kotlin.run' call
-    var tmp0_run = $this.zk_1;
+    var tmp0_run = $this.el_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.qk_1 + "'";
+    tmp$ret$2 = "Current: '" + tmp0_run.tk_1 + "'";
     tmp$ret$3 = tmp$ret$2;
     var curr = tmp$ret$3;
-    var tmp2_safe_receiver = $this.al_1;
+    var tmp2_safe_receiver = $this.fl_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -4061,13 +4243,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.qk_1 + "'";
+      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.tk_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.xk_1.ih(prev + curr + next);
+    $this.cl_1.ih(prev + curr + next);
     tmp$ret$6 = Unit_getInstance();
     return tmp$ret$6;
   }
@@ -4087,7 +4269,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.yk_1.e();
+      tmp$ret$0 = $this.dl_1.e();
       var tmp1_success = tmp$ret$0;
       tmp$ret$1 = _Result___init__impl__xyqfz8(tmp1_success);
       tmp = tmp$ret$1;
@@ -4118,8 +4300,8 @@
     return tmp$ret$4;
   }
   function TokenProvider(logger, tokenIterator) {
-    this.xk_1 = logger;
-    this.yk_1 = tokenIterator;
+    this.cl_1 = logger;
+    this.dl_1 = tokenIterator;
     var tmp = this;
     var tmp0_elvis_lhs = nextToken(this);
     var tmp_0;
@@ -4128,26 +4310,76 @@
     } else {
       tmp_0 = tmp0_elvis_lhs;
     }
-    tmp.zk_1 = tmp_0;
-    this.al_1 = nextToken(this);
+    tmp.el_1 = tmp_0;
+    this.fl_1 = nextToken(this);
     printTokens$default(this);
   }
   protoOf(TokenProvider).d = function () {
-    return !(this.al_1 == null);
+    return !(this.fl_1 == null);
   };
-  protoOf(TokenProvider).bl = function () {
-    var previousToken = this.zk_1;
-    var tmp = this;
-    var tmp0_elvis_lhs = this.al_1;
-    var tmp_0;
-    if (tmp0_elvis_lhs == null) {
-      throw new NextException(previousToken.rk_1);
-    } else {
-      tmp_0 = tmp0_elvis_lhs;
+  protoOf(TokenProvider).gl = function () {
+    var tmp$ret$6;
+    // Inline function 'arrow.core.raise.either' call
+    var tmp$ret$5;
+    // Inline function 'arrow.core.raise.fold' call
+    // Inline function 'kotlin.contracts.contract' call
+    var tmp$ret$4;
+    // Inline function 'arrow.core.raise.fold' call
+    // Inline function 'kotlin.contracts.contract' call
+    var raise = new DefaultRaise(false);
+    var tmp;
+    try {
+      var tmp$ret$1;
+      // Inline function 'arrow.core.raise.either.<anonymous>' call
+      var previousToken = this.el_1;
+      var tmp_0 = this;
+      var tmp0_elvis_lhs = this.fl_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);
+        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);
+      printTokens(this, previousToken);
+      tmp$ret$1 = Unit_getInstance();
+      var res = tmp$ret$1;
+      raise.zg();
+      var tmp$ret$2;
+      // Inline function 'arrow.core.raise.either.<anonymous>' call
+      tmp$ret$2 = new Right(Unit_getInstance());
+      tmp = tmp$ret$2;
+    } catch ($p) {
+      var tmp_2;
+      if ($p instanceof CancellationException) {
+        var e = $p;
+        raise.zg();
+        var tmp$ret$3;
+        // Inline function 'arrow.core.raise.either.<anonymous>' call
+        var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
+        tmp$ret$3 = new Left(tmp1__anonymous__uwfjfc);
+        tmp_2 = tmp$ret$3;
+      } else {
+        if ($p instanceof Error) {
+          var e_0 = $p;
+          raise.zg();
+          var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
+          throw tmp0__anonymous__q1qw7t;
+        } else {
+          throw $p;
+        }
+      }
+      tmp = tmp_2;
     }
-    tmp.zk_1 = tmp_0;
-    this.al_1 = nextToken(this);
-    printTokens(this, previousToken);
+    tmp$ret$4 = tmp;
+    tmp$ret$5 = tmp$ret$4;
+    tmp$ret$6 = tmp$ret$5;
+    return tmp$ret$6;
   };
   function toProvider(_this__u8e3s4, logger) {
     return new TokenProvider(logger, _this__u8e3s4.c());
@@ -4155,15 +4387,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.cl_1 = idx;
-    this.dl_1 = length;
+    this.hl_1 = idx;
+    this.il_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.cl_1 + ', length=' + this.dl_1 + ')';
+    return 'IdxAndLength(idx=' + this.hl_1 + ', length=' + this.il_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.cl_1;
-    result = imul(result, 31) + this.dl_1 | 0;
+    var result = this.hl_1;
+    result = imul(result, 31) + this.il_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -4172,9 +4404,9 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.cl_1 === tmp0_other_with_cast.cl_1))
+    if (!(this.hl_1 === tmp0_other_with_cast.hl_1))
       return false;
-    if (!(this.dl_1 === tmp0_other_with_cast.dl_1))
+    if (!(this.il_1 === tmp0_other_with_cast.il_1))
       return false;
     return true;
   };
@@ -4182,26 +4414,26 @@
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.sk_1 = line;
-    this.tk_1 = position;
-    this.uk_1 = idxAndLength;
+    this.vk_1 = line;
+    this.wk_1 = position;
+    this.xk_1 = idxAndLength;
   }
-  protoOf(Coordinates).el = function (line, position, idxAndLength) {
+  protoOf(Coordinates).jl = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).fl = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.sk_1 : line;
-    position = position === VOID ? this.tk_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.uk_1 : idxAndLength;
-    return $super === VOID ? this.el(line, position, idxAndLength) : $super.el.call(this, 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).toString = function () {
-    return 'Coordinates(line=' + this.sk_1 + ', position=' + this.tk_1 + ', idxAndLength=' + this.uk_1 + ')';
+    return 'Coordinates(line=' + this.vk_1 + ', position=' + this.wk_1 + ', idxAndLength=' + this.xk_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.sk_1;
-    result = imul(result, 31) + this.tk_1 | 0;
-    result = imul(result, 31) + this.uk_1.hashCode() | 0;
+    var result = this.vk_1;
+    result = imul(result, 31) + this.wk_1 | 0;
+    result = imul(result, 31) + this.xk_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -4210,35 +4442,35 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.sk_1 === tmp0_other_with_cast.sk_1))
+    if (!(this.vk_1 === tmp0_other_with_cast.vk_1))
       return false;
-    if (!(this.tk_1 === tmp0_other_with_cast.tk_1))
+    if (!(this.wk_1 === tmp0_other_with_cast.wk_1))
       return false;
-    if (!this.uk_1.equals(tmp0_other_with_cast.uk_1))
+    if (!this.xk_1.equals(tmp0_other_with_cast.xk_1))
       return false;
     return true;
   };
   function Token(type, value, coordinates) {
-    this.pk_1 = type;
-    this.qk_1 = value;
-    this.rk_1 = coordinates;
+    this.sk_1 = type;
+    this.tk_1 = value;
+    this.uk_1 = coordinates;
   }
-  protoOf(Token).gl = function (type, value, coordinates) {
+  protoOf(Token).ll = function (type, value, coordinates) {
     return new Token(type, value, coordinates);
   };
-  protoOf(Token).wk = function (type, value, coordinates, $super) {
-    type = type === VOID ? this.pk_1 : type;
-    value = value === VOID ? this.qk_1 : value;
-    coordinates = coordinates === VOID ? this.rk_1 : coordinates;
-    return $super === VOID ? this.gl(type, value, coordinates) : $super.gl.call(this, 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).toString = function () {
-    return 'Token(type=' + this.pk_1 + ', value=' + this.qk_1 + ', coordinates=' + this.rk_1 + ')';
+    return 'Token(type=' + this.sk_1 + ', value=' + this.tk_1 + ', coordinates=' + this.uk_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = hashCode(this.pk_1);
-    result = imul(result, 31) + getStringHashCode(this.qk_1) | 0;
-    result = imul(result, 31) + this.rk_1.hashCode() | 0;
+    var result = hashCode(this.sk_1);
+    result = imul(result, 31) + getStringHashCode(this.tk_1) | 0;
+    result = imul(result, 31) + this.uk_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -4247,19 +4479,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!equals(this.pk_1, tmp0_other_with_cast.pk_1))
+    if (!equals(this.sk_1, tmp0_other_with_cast.sk_1))
       return false;
-    if (!(this.qk_1 === tmp0_other_with_cast.qk_1))
+    if (!(this.tk_1 === tmp0_other_with_cast.tk_1))
       return false;
-    if (!this.rk_1.equals(tmp0_other_with_cast.rk_1))
+    if (!this.uk_1.equals(tmp0_other_with_cast.uk_1))
       return false;
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.cl_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.hl_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.fl(VOID, _this__u8e3s4.tk_1 + length | 0, plus_1(_this__u8e3s4.uk_1, length));
+    return _this__u8e3s4.kl(VOID, _this__u8e3s4.wk_1 + length | 0, plus_1(_this__u8e3s4.xk_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     var tmp$ret$1;
@@ -4281,7 +4513,7 @@
     var tmp0_subject = type;
     var tmp;
     if (tmp0_subject instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.sk_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.uk_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.vk_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.xk_1, value.length));
     } else {
       tmp = plus_2(_this__u8e3s4, value.length);
     }
@@ -4289,7 +4521,7 @@
   }
   function lastCoordinates(_this__u8e3s4) {
     var tmp0_safe_receiver = lastOrNull(_this__u8e3s4);
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.rk_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.uk_1;
     return tmp1_elvis_lhs == null ? new Coordinates() : tmp1_elvis_lhs;
   }
   function tokenize_0(_this__u8e3s4, source, tokens) {
@@ -4299,7 +4531,7 @@
     $l$1: do {
       $l$0: do {
         var token = findToken($this, lastCoordinates(tokens_0), source_0);
-        var newSource = removePrefix(source_0, token.qk_1);
+        var newSource = removePrefix(source_0, token.tk_1);
         var newTokens = plus_0(tokens_0, token);
         var tmp;
         var tmp$ret$0;
@@ -4525,7 +4757,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.il_1 = 'EOP';
+    this.nl_1 = 'EOP';
   }
   var EndOfProgram_instance;
   function EndOfProgram_getInstance() {
@@ -4558,7 +4790,7 @@
     }
     return tmp;
   };
-  protoOf(Logger).ok = function (s, block) {
+  protoOf(Logger).rk = function (s, block) {
     var tmp$ret$1;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4581,72 +4813,72 @@
     }
   }
   //region block: post-declaration
-  protoOf(JavaEmitter).rj = withLogging;
-  protoOf(JavaEmitter).sj = withLogging_0;
-  protoOf(JavaEmitter).tj = withLogging_1;
-  protoOf(JavaEmitter).uj = withLogging_2;
+  protoOf(JavaEmitter).tj = withLogging;
+  protoOf(JavaEmitter).uj = withLogging_0;
+  protoOf(JavaEmitter).vj = withLogging_1;
+  protoOf(JavaEmitter).wj = withLogging_2;
   protoOf(JavaEmitter).th = withLogging_3;
-  protoOf(JavaEmitter).wj = withLogging_4;
-  protoOf(JavaEmitter).yj = withLogging_5;
-  protoOf(JavaEmitter).zj = withLogging_6;
-  protoOf(JavaEmitter).bk = withLogging_7;
+  protoOf(JavaEmitter).yj = withLogging_4;
+  protoOf(JavaEmitter).ak = withLogging_5;
+  protoOf(JavaEmitter).bk = withLogging_6;
+  protoOf(JavaEmitter).dk = withLogging_7;
   protoOf(JavaEmitter).ri = withLogging_8;
-  protoOf(KotlinEmitter).rj = withLogging;
-  protoOf(KotlinEmitter).sj = withLogging_0;
-  protoOf(KotlinEmitter).tj = withLogging_1;
-  protoOf(KotlinEmitter).uj = withLogging_2;
+  protoOf(KotlinEmitter).tj = withLogging;
+  protoOf(KotlinEmitter).uj = withLogging_0;
+  protoOf(KotlinEmitter).vj = withLogging_1;
+  protoOf(KotlinEmitter).wj = withLogging_2;
   protoOf(KotlinEmitter).th = withLogging_3;
-  protoOf(KotlinEmitter).wj = withLogging_4;
-  protoOf(KotlinEmitter).yj = withLogging_5;
-  protoOf(KotlinEmitter).zj = withLogging_6;
-  protoOf(KotlinEmitter).bk = withLogging_7;
+  protoOf(KotlinEmitter).yj = withLogging_4;
+  protoOf(KotlinEmitter).ak = withLogging_5;
+  protoOf(KotlinEmitter).bk = withLogging_6;
+  protoOf(KotlinEmitter).dk = withLogging_7;
   protoOf(KotlinEmitter).ri = withLogging_8;
-  protoOf(ScalaEmitter).rj = withLogging;
-  protoOf(ScalaEmitter).sj = withLogging_0;
-  protoOf(ScalaEmitter).tj = withLogging_1;
-  protoOf(ScalaEmitter).uj = withLogging_2;
+  protoOf(ScalaEmitter).tj = withLogging;
+  protoOf(ScalaEmitter).uj = withLogging_0;
+  protoOf(ScalaEmitter).vj = withLogging_1;
+  protoOf(ScalaEmitter).wj = withLogging_2;
   protoOf(ScalaEmitter).th = withLogging_3;
-  protoOf(ScalaEmitter).wj = withLogging_4;
-  protoOf(ScalaEmitter).yj = withLogging_5;
-  protoOf(ScalaEmitter).zj = withLogging_6;
-  protoOf(ScalaEmitter).bk = withLogging_7;
-  protoOf(TypeScriptEmitter).rj = withLogging;
-  protoOf(TypeScriptEmitter).sj = withLogging_0;
-  protoOf(TypeScriptEmitter).tj = withLogging_1;
-  protoOf(TypeScriptEmitter).uj = withLogging_2;
+  protoOf(ScalaEmitter).yj = withLogging_4;
+  protoOf(ScalaEmitter).ak = withLogging_5;
+  protoOf(ScalaEmitter).bk = withLogging_6;
+  protoOf(ScalaEmitter).dk = withLogging_7;
+  protoOf(TypeScriptEmitter).tj = withLogging;
+  protoOf(TypeScriptEmitter).uj = withLogging_0;
+  protoOf(TypeScriptEmitter).vj = withLogging_1;
+  protoOf(TypeScriptEmitter).wj = withLogging_2;
   protoOf(TypeScriptEmitter).th = withLogging_3;
-  protoOf(TypeScriptEmitter).wj = withLogging_4;
-  protoOf(TypeScriptEmitter).yj = withLogging_5;
-  protoOf(TypeScriptEmitter).zj = withLogging_6;
-  protoOf(TypeScriptEmitter).bk = withLogging_7;
-  protoOf(WirespecEmitter).rj = withLogging;
-  protoOf(WirespecEmitter).sj = withLogging_0;
-  protoOf(WirespecEmitter).tj = withLogging_1;
-  protoOf(WirespecEmitter).uj = withLogging_2;
+  protoOf(TypeScriptEmitter).yj = withLogging_4;
+  protoOf(TypeScriptEmitter).ak = withLogging_5;
+  protoOf(TypeScriptEmitter).bk = withLogging_6;
+  protoOf(TypeScriptEmitter).dk = withLogging_7;
+  protoOf(WirespecEmitter).tj = withLogging;
+  protoOf(WirespecEmitter).uj = withLogging_0;
+  protoOf(WirespecEmitter).vj = withLogging_1;
+  protoOf(WirespecEmitter).wj = withLogging_2;
   protoOf(WirespecEmitter).th = withLogging_3;
-  protoOf(WirespecEmitter).wj = withLogging_4;
-  protoOf(WirespecEmitter).yj = withLogging_5;
-  protoOf(WirespecEmitter).zj = withLogging_6;
-  protoOf(WirespecEmitter).bk = withLogging_7;
-  protoOf(WsTypeDef).hl = name;
-  protoOf(WsEnumTypeDef).hl = name;
-  protoOf(WsRefinedTypeDef).hl = name;
-  protoOf(WhiteSpaceExceptNewLine).hl = name;
-  protoOf(NewLine).hl = name;
-  protoOf(LeftCurly).hl = name;
-  protoOf(Colon).hl = name;
-  protoOf(Comma).hl = name;
-  protoOf(QuestionMark).hl = name;
-  protoOf(Brackets).hl = name;
-  protoOf(WsString).hl = name;
-  protoOf(WsInteger).hl = name;
-  protoOf(WsBoolean).hl = name;
-  protoOf(RightCurly).hl = name;
-  protoOf(CustomValue).hl = name;
-  protoOf(CustomType).hl = name;
-  protoOf(CustomRegex).hl = name;
-  protoOf(Invalid).hl = name;
-  protoOf(EndOfProgram).hl = name;
+  protoOf(WirespecEmitter).yj = withLogging_4;
+  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;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_NAME = 'community.flock.wirespec.generated';