npm - @flock/wirespec - Versions diffs - 0.9.0 → 0.9.2 - Mend

@flock/wirespec 0.9.0 → 0.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/arrow-arrow-atomic.js +4 -4
package/arrow-arrow-continuations.js +3 -3
package/arrow-arrow-core.js +15 -15
package/clikt-clikt.js +1218 -1218
package/colormath-root-colormath.js +388 -388
package/kotlin-kotlin-stdlib.js +216 -190
package/kotlin-kotlin-stdlib.js.map +1 -1
package/kotlin-openapi-bindings.js +19 -19
package/kotlin-rgxgen.js +1810 -1810
package/kotlinx-serialization-kotlinx-serialization-core-js-ir.js +67 -67
package/kotlinx-serialization-kotlinx-serialization-json-js-ir.js +57 -57
package/markdown.js +1884 -1884
package/mordant-mordant.js +1643 -1643
package/package.json +1 -1
package/wirespec-src-compiler-core.js +782 -666
package/wirespec-src-compiler-core.js.map +1 -1
package/wirespec-src-compiler-lib.js +303 -243
package/wirespec-src-compiler-lib.js.map +1 -1
package/wirespec-src-converter-openapi.js +329 -277
package/wirespec-src-converter-openapi.js.map +1 -1
package/wirespec-src-generator.js +37 -34
package/wirespec-src-generator.js.map +1 -1
package/wirespec-src-plugin-arguments.js +91 -91
package/wirespec-src-plugin-cli.js +141 -141
package/wirespec-src-plugin-npm.d.ts +10 -0
package/wirespec-src-plugin-npm.js +3 -3

package/wirespec-src-compiler-core.js CHANGED Viewed

@@ -16,98 +16,100 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var toString = kotlin_kotlin.$_$.ha;
+  var toString = kotlin_kotlin.$_$.ia;
   var Unit_getInstance = kotlin_kotlin.$_$.x3;
-  var Enum = kotlin_kotlin.$_$.xd;
-  var protoOf = kotlin_kotlin.$_$.ca;
-  var classMeta = kotlin_kotlin.$_$.x8;
-  var VOID = kotlin_kotlin.$_$.gf;
-  var setMetadataFor = kotlin_kotlin.$_$.da;
-  var noWhenBranchMatchedException = kotlin_kotlin.$_$.cf;
+  var Enum = kotlin_kotlin.$_$.yd;
+  var protoOf = kotlin_kotlin.$_$.da;
+  var classMeta = kotlin_kotlin.$_$.y8;
+  var VOID = kotlin_kotlin.$_$.hf;
+  var setMetadataFor = kotlin_kotlin.$_$.ea;
+  var noWhenBranchMatchedException = kotlin_kotlin.$_$.df;
   var Left = kotlin_io_arrow_kt_arrow_core.$_$.c;
   var Right = kotlin_io_arrow_kt_arrow_core.$_$.d;
   var Regex_init_$Create$ = kotlin_kotlin.$_$.z;
-  var to = kotlin_kotlin.$_$.ff;
+  var to = kotlin_kotlin.$_$.gf;
   var listOf = kotlin_kotlin.$_$.t6;
-  var objectMeta = kotlin_kotlin.$_$.ba;
-  var until = kotlin_kotlin.$_$.ta;
-  var substring = kotlin_kotlin.$_$.wc;
+  var objectMeta = kotlin_kotlin.$_$.ca;
+  var until = kotlin_kotlin.$_$.ua;
+  var substring = kotlin_kotlin.$_$.xc;
   var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.t1;
-  var endsWith = kotlin_kotlin.$_$.qb;
-  var startsWith = kotlin_kotlin.$_$.uc;
-  var charSequenceLength = kotlin_kotlin.$_$.v8;
-  var charSequenceGet = kotlin_kotlin.$_$.u8;
+  var endsWith = kotlin_kotlin.$_$.rb;
+  var startsWith = kotlin_kotlin.$_$.vc;
+  var charSequenceLength = kotlin_kotlin.$_$.w8;
+  var charSequenceGet = kotlin_kotlin.$_$.v8;
   var toString_0 = kotlin_kotlin.$_$.x1;
-  var trimMargin = kotlin_kotlin.$_$.ld;
-  var split = kotlin_kotlin.$_$.sc;
+  var trimMargin = kotlin_kotlin.$_$.md;
+  var split = kotlin_kotlin.$_$.tc;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.w4;
   var ArrayList_init_$Create$ = kotlin_kotlin.$_$.j;
   var checkIndexOverflow = kotlin_kotlin.$_$.v4;
   var joinToString = kotlin_kotlin.$_$.f6;
-  var replace = kotlin_kotlin.$_$.nc;
-  var first = kotlin_kotlin.$_$.ub;
-  var isDigit = kotlin_kotlin.$_$.yb;
-  var isBlank = kotlin_kotlin.$_$.xb;
+  var replace = kotlin_kotlin.$_$.oc;
+  var first = kotlin_kotlin.$_$.vb;
+  var isDigit = kotlin_kotlin.$_$.zb;
+  var isBlank = kotlin_kotlin.$_$.yb;
   var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.k;
   var addAll = kotlin_kotlin.$_$.o4;
-  var asSequence = kotlin_kotlin.$_$.hb;
-  var filter = kotlin_kotlin.$_$.za;
-  var joinToString_0 = kotlin_kotlin.$_$.cb;
-  var firstOrNull = kotlin_kotlin.$_$.tb;
-  var Char = kotlin_kotlin.$_$.rd;
+  var asSequence = kotlin_kotlin.$_$.ib;
+  var filter = kotlin_kotlin.$_$.ab;
+  var joinToString_0 = kotlin_kotlin.$_$.db;
+  var firstOrNull = kotlin_kotlin.$_$.ub;
+  var Char = kotlin_kotlin.$_$.sd;
   var listOf_0 = kotlin_kotlin.$_$.s6;
-  var isLetterOrDigit = kotlin_kotlin.$_$.ac;
-  var THROW_CCE = kotlin_kotlin.$_$.he;
-  var isCharSequence = kotlin_kotlin.$_$.l9;
-  var trimStart = kotlin_kotlin.$_$.md;
-  var dropLast = kotlin_kotlin.$_$.ob;
+  var isLetterOrDigit = kotlin_kotlin.$_$.bc;
+  var THROW_CCE = kotlin_kotlin.$_$.ie;
+  var isCharSequence = kotlin_kotlin.$_$.m9;
+  var trimStart = kotlin_kotlin.$_$.nd;
+  var dropLast = kotlin_kotlin.$_$.pb;
   var plus = kotlin_kotlin.$_$.c7;
   var plus_0 = kotlin_kotlin.$_$.d7;
   var filterNotNull = kotlin_kotlin.$_$.s5;
-  var drop = kotlin_kotlin.$_$.pb;
+  var drop = kotlin_kotlin.$_$.qb;
   var toSet = kotlin_kotlin.$_$.a8;
   var distinct = kotlin_kotlin.$_$.l5;
   var firstOrNull_0 = kotlin_kotlin.$_$.t5;
-  var getStringHashCode = kotlin_kotlin.$_$.e9;
+  var getStringHashCode = kotlin_kotlin.$_$.f9;
   var Collection = kotlin_kotlin.$_$.b4;
-  var isInterface = kotlin_kotlin.$_$.p9;
-  var toIntOrNull = kotlin_kotlin.$_$.bd;
-  var numberRangeToNumber = kotlin_kotlin.$_$.w9;
-  var substringBefore = kotlin_kotlin.$_$.vc;
+  var isInterface = kotlin_kotlin.$_$.q9;
+  var toIntOrNull = kotlin_kotlin.$_$.cd;
+  var numberRangeToNumber = kotlin_kotlin.$_$.x9;
+  var substringBefore = kotlin_kotlin.$_$.wc;
   var emptyList = kotlin_kotlin.$_$.o5;
-  var hashCode = kotlin_kotlin.$_$.f9;
-  var equals = kotlin_kotlin.$_$.a9;
+  var hashCode = kotlin_kotlin.$_$.g9;
+  var equals = kotlin_kotlin.$_$.b9;
   var joinToString_1 = kotlin_kotlin.$_$.g6;
-  var Comparator = kotlin_kotlin.$_$.ud;
-  var compareValues = kotlin_kotlin.$_$.g8;
+  var Comparator = kotlin_kotlin.$_$.vd;
+  var compareValues = kotlin_kotlin.$_$.h8;
+  var IllegalStateException_init_$Create$ = kotlin_kotlin.$_$.l1;
   var sortedWith = kotlin_kotlin.$_$.l7;
-  var captureStack = kotlin_kotlin.$_$.r8;
-  var RuntimeException = kotlin_kotlin.$_$.ge;
+  var captureStack = kotlin_kotlin.$_$.s8;
+  var RuntimeException = kotlin_kotlin.$_$.he;
   var RuntimeException_init_$Init$ = kotlin_kotlin.$_$.q1;
   var NonEmptyList = kotlin_io_arrow_kt_arrow_core.$_$.e;
   var DefaultRaise = kotlin_io_arrow_kt_arrow_core.$_$.a;
   var getKClass = kotlin_kotlin.$_$.e;
   var nonFatalOrThrow = kotlin_io_arrow_kt_arrow_core.$_$.g;
   var raisedOrRethrow = kotlin_io_arrow_kt_arrow_core.$_$.b;
-  var CancellationException = kotlin_kotlin.$_$.h8;
+  var CancellationException = kotlin_kotlin.$_$.i8;
   var toList = kotlin_kotlin.$_$.v7;
-  var THROW_ISE = kotlin_kotlin.$_$.ie;
-  var enumEntries = kotlin_kotlin.$_$.k8;
-  var interfaceMeta = kotlin_kotlin.$_$.g9;
+  var THROW_ISE = kotlin_kotlin.$_$.je;
+  var enumEntries = kotlin_kotlin.$_$.l8;
+  var interfaceMeta = kotlin_kotlin.$_$.h9;
   var nonEmptyListOf = kotlin_io_arrow_kt_arrow_core.$_$.f;
   var Companion_getInstance = kotlin_kotlin.$_$.s3;
   var _Result___init__impl__xyqfz8 = kotlin_kotlin.$_$.y1;
-  var createFailure = kotlin_kotlin.$_$.ve;
+  var createFailure = kotlin_kotlin.$_$.we;
   var _Result___get_value__impl__bjfvqg = kotlin_kotlin.$_$.c2;
-  var isObject = kotlin_kotlin.$_$.r9;
+  var isObject = kotlin_kotlin.$_$.s9;
   var _Result___get_isFailure__impl__jpiriv = kotlin_kotlin.$_$.a2;
-  var ensureNotNull = kotlin_kotlin.$_$.we;
+  var zipWithNext = kotlin_kotlin.$_$.f8;
   var last = kotlin_kotlin.$_$.q6;
-  var removePrefix = kotlin_kotlin.$_$.jc;
-  var Pair = kotlin_kotlin.$_$.ee;
+  var removePrefix = kotlin_kotlin.$_$.kc;
+  var Pair = kotlin_kotlin.$_$.fe;
   var toNonEmptyListOrNull = kotlin_io_arrow_kt_arrow_core.$_$.h;
   var getKClassFromExpression = kotlin_kotlin.$_$.d;
-  var println = kotlin_kotlin.$_$.l8;
+  var ensureNotNull = kotlin_kotlin.$_$.xe;
+  var println = kotlin_kotlin.$_$.m8;
   //endregion
   //region block: pre-declaration
   setMetadataFor(Reported, 'Reported', classMeta, Enum);
@@ -161,6 +163,7 @@
   setMetadataFor(NullTokenException, 'NullTokenException', classMeta, ParserException);
   setMetadataFor(NextException, 'NextException', classMeta, NullTokenException);
   setMetadataFor(WrongTokenException, 'WrongTokenException', classMeta, ParserException);
+  setMetadataFor(DefinitionNotExistsException, 'DefinitionNotExistsException', classMeta, ParserException);
   setMetadataFor(AbstractParser, 'AbstractParser', classMeta);
   setMetadataFor(EndpointParser, 'EndpointParser', classMeta, AbstractParser);
   setMetadataFor(EnumParser, 'EnumParser', classMeta, AbstractParser);
@@ -1573,7 +1576,7 @@
         tmp = 'Any';
       } else {
         if (_this__u8e3s4 instanceof Custom_0) {
-          tmp = _this__u8e3s4.n1y_1;
+          tmp = _this__u8e3s4.p2();
         } else {
           if (_this__u8e3s4 instanceof Primitive_0) {
             var tmp_0;
@@ -1618,16 +1621,16 @@
     Companion_getInstance_4();
     var tmp_0 = this.z1s(_this__u8e3s4);
     var tmp_1 = this.z1s(_this__u8e3s4);
-    var tmp_2 = this.s1y(_this__u8e3s4.r1y_1);
+    var tmp_2 = this.p1y(_this__u8e3s4.o1y_1);
     Companion_getInstance_4();
     return trimMargin('case class ' + tmp + '(val value: String) {\n            |' + '  ' + 'implicit class ' + tmp_0 + 'Ops(val that: ' + tmp_1 + ') {\n            |' + tmp_2 + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
   };
-  protoOf(ScalaEmitter).s1y = function (_this__u8e3s4) {
+  protoOf(ScalaEmitter).p1y = function (_this__u8e3s4) {
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
-    return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(""' + _this__u8e3s4.t1y_1 + '"")\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
+    return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(""' + _this__u8e3s4.q1y_1 + '"")\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
   };
   protoOf(ScalaEmitter).z1t = function (_this__u8e3s4) {
     return '// TODO("Not yet implemented")\n';
@@ -1644,7 +1647,7 @@
         tmp = 'any';
       } else {
         if (_this__u8e3s4 instanceof Custom_0) {
-          tmp = sanitizeSymbol_1(_this__u8e3s4.n1y_1, $this);
+          tmp = sanitizeSymbol_1(_this__u8e3s4.p2(), $this);
         } else {
           if (_this__u8e3s4 instanceof Primitive_0) {
             var tmp_0;
@@ -1680,10 +1683,10 @@
   function emitType_0(_this__u8e3s4, $this) {
     var tmp;
     if (_this__u8e3s4 instanceof Literal_0) {
-      tmp = _this__u8e3s4.z1y_1;
+      tmp = _this__u8e3s4.w1y_1;
     } else {
       if (_this__u8e3s4 instanceof Param) {
-        tmp = '${' + $this.i1y(_this__u8e3s4.v1y_1) + '}';
+        tmp = '${' + $this.i1y(_this__u8e3s4.s1y_1) + '}';
       } else {
         noWhenBranchMatchedException();
       }
@@ -1691,14 +1694,14 @@
     return tmp;
   }
   function emitName(_this__u8e3s4, $this) {
-    var tmp0_safe_receiver = _this__u8e3s4.a1z_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : $this.b1z(tmp0_safe_receiver);
+    var tmp0_safe_receiver = _this__u8e3s4.x1y_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : $this.y1y(tmp0_safe_receiver);
     return 'Request' + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
   function emitName_0(_this__u8e3s4, $this) {
-    var tmp = 'Response' + Companion_getInstance_4().n1s(_this__u8e3s4.c1z_1);
-    var tmp0_safe_receiver = _this__u8e3s4.e1z_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : $this.b1z(tmp0_safe_receiver);
+    var tmp = 'Response' + Companion_getInstance_4().n1s(_this__u8e3s4.z1y_1);
+    var tmp0_safe_receiver = _this__u8e3s4.b1z_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : $this.y1y(tmp0_safe_receiver);
     return tmp + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
   function emitMap(_this__u8e3s4, $this) {
@@ -1710,10 +1713,10 @@
   function emit(_this__u8e3s4, $this) {
     var tmp;
     if (_this__u8e3s4 instanceof Literal_0) {
-      tmp = _this__u8e3s4.z1y_1;
+      tmp = _this__u8e3s4.w1y_1;
     } else {
       if (_this__u8e3s4 instanceof Param) {
-        tmp = '${props.' + Companion_getInstance_4().o1s(sanitizeSymbol_1(_this__u8e3s4.u1y_1.j1y_1, $this)) + '}';
+        tmp = '${props.' + Companion_getInstance_4().o1s(sanitizeSymbol_1(_this__u8e3s4.r1y_1.j1y_1, $this)) + '}';
       } else {
         noWhenBranchMatchedException();
       }
@@ -1723,7 +1726,7 @@
   function joinParameters(_this__u8e3s4, $this, content, response) {
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_filterIsInstance = _this__u8e3s4.h1z_1;
+    var tmp0_filterIsInstance = _this__u8e3s4.e1z_1;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var tmp0_filterIsInstanceTo = ArrayList_init_$Create$_0();
     var tmp0_iterator = tmp0_filterIsInstance.v();
@@ -1740,14 +1743,14 @@
       var item = tmp0_iterator_0.y();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.joinParameters.<anonymous>' call
-      tmp$ret$2 = new Field_0(item.u1y_1, item.v1y_1, false);
+      tmp$ret$2 = new Field_0(item.r1y_1, item.s1y_1, false);
       tmp0_mapTo.s(tmp$ret$2);
     }
     var pathField = tmp0_mapTo;
-    var tmp1_elvis_lhs = response == null ? null : response.d1z_1;
-    var parameters = tmp1_elvis_lhs == null ? plus(plus(plus(pathField, _this__u8e3s4.i1z_1), _this__u8e3s4.j1z_1), _this__u8e3s4.k1z_1) : tmp1_elvis_lhs;
+    var tmp1_elvis_lhs = response == null ? null : response.a1z_1;
+    var parameters = tmp1_elvis_lhs == null ? plus(plus(plus(pathField, _this__u8e3s4.f1z_1), _this__u8e3s4.g1z_1), _this__u8e3s4.h1z_1) : tmp1_elvis_lhs;
     // Inline function 'kotlin.collections.map' call
-    var tmp3_safe_receiver = content == null ? null : content.o1z_1;
+    var tmp3_safe_receiver = content == null ? null : content.l1z_1;
     var tmp2_map = filterNotNull(plus_0(parameters, tmp3_safe_receiver == null ? null : toField(tmp3_safe_receiver, $this, 'body', false)));
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo_0 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp2_map, 10));
@@ -1756,7 +1759,7 @@
       var item_0 = tmp0_iterator_1.y();
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.joinParameters.<anonymous>' call
-      tmp$ret$5 = item_0.r1z(Companion_getInstance_6().q1z(Companion_getInstance_4().o1s(sanitizeSymbol_1(item_0.e1y_1.j1y_1, $this))));
+      tmp$ret$5 = item_0.o1z(Companion_getInstance_6().n1z(Companion_getInstance_4().o1s(sanitizeSymbol_1(item_0.e1y_1.j1y_1, $this))));
       tmp0_mapTo_0.s(tmp$ret$5);
     }
     return tmp0_mapTo_0;
@@ -1766,7 +1769,7 @@
     return joinToString_0(filter(tmp, TypeScriptEmitter$sanitizeSymbol$lambda), '');
   }
   function toField(_this__u8e3s4, $this, identifier, isNullable) {
-    return new Field_0(Companion_getInstance_6().q1z(identifier), _this__u8e3s4, isNullable);
+    return new Field_0(Companion_getInstance_6().n1z(identifier), _this__u8e3s4, isNullable);
   }
   function TypeScriptEmitter$emit$lambda(it) {
     return '"' + it + '"';
@@ -1779,10 +1782,10 @@
   function TypeScriptEmitter$emit$lambda_1(it) {
     var tmp;
     if (it instanceof Literal_0) {
-      tmp = it.z1y_1;
+      tmp = it.w1y_1;
     } else {
       if (it instanceof Param) {
-        tmp = ':' + it.u1y_1.j1y_1;
+        tmp = ':' + it.r1y_1.j1y_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1798,11 +1801,11 @@
     return function (it) {
       Companion_getInstance_4();
       var tmp = emitName(it, this$0);
-      var tmp_0 = emitType($this_emit.h1z_1, this$0);
-      var tmp_1 = joinToString($this_emit.j1z_1, ',', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0));
+      var tmp_0 = emitType($this_emit.e1z_1, this$0);
+      var tmp_1 = joinToString($this_emit.g1z_1, ',', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0));
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
-      var tmp0_map = $this_emit.i1z_1;
+      var tmp0_map = $this_emit.f1z_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
@@ -1817,7 +1820,7 @@
       tmp$ret$1 = tmp0_mapTo;
       tmp$ret$2 = tmp$ret$1;
       var tmp_2 = joinToString(tmp$ret$2, ',');
-      var tmp0_safe_receiver = it.a1z_1;
+      var tmp0_safe_receiver = it.x1y_1;
       var tmp_3;
       if (tmp0_safe_receiver == null) {
         tmp_3 = null;
@@ -1827,12 +1830,12 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$3 = ', content: { type: "' + tmp0_safe_receiver.n1z_1 + '", body: ' + this$0.i1y(tmp0_safe_receiver.o1z_1) + ' }';
+        tmp$ret$3 = ', content: { type: "' + tmp0_safe_receiver.k1z_1 + '", body: ' + this$0.i1y(tmp0_safe_receiver.l1z_1) + ' }';
         tmp$ret$4 = tmp$ret$3;
         tmp_3 = tmp$ret$4;
       }
       var tmp1_elvis_lhs = tmp_3;
-      return '  ' + 'type ' + tmp + ' = { path: ' + tmp_0 + ', method: "' + $this_emit.g1z_1 + '", headers: {' + tmp_1 + '}, query: {' + tmp_2 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' } ';
+      return '  ' + 'type ' + tmp + ' = { path: ' + tmp_0 + ', method: "' + $this_emit.d1z_1 + '", headers: {' + tmp_1 + '}, query: {' + tmp_2 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' } ';
     };
   }
   function TypeScriptEmitter$emit$lambda_3(this$0) {
@@ -1844,8 +1847,8 @@
     return function (it) {
       Companion_getInstance_4();
       var tmp = emitName_0(it, this$0);
-      var tmp_0 = Companion_getInstance_4().h1w(it.c1z_1) ? it.c1z_1 : 'string';
-      var tmp0_safe_receiver = it.e1z_1;
+      var tmp_0 = Companion_getInstance_4().h1w(it.z1y_1) ? it.z1y_1 : 'string';
+      var tmp0_safe_receiver = it.b1z_1;
       var tmp_1;
       if (tmp0_safe_receiver == null) {
         tmp_1 = null;
@@ -1855,7 +1858,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', content: { type: "' + tmp0_safe_receiver.n1z_1 + '", body: ' + this$0.i1y(tmp0_safe_receiver.o1z_1) + ' }';
+        tmp$ret$0 = ', content: { type: "' + tmp0_safe_receiver.k1z_1 + '", body: ' + this$0.i1y(tmp0_safe_receiver.l1z_1) + ' }';
         tmp$ret$1 = tmp$ret$0;
         tmp_1 = tmp$ret$1;
       }
@@ -1881,7 +1884,7 @@
       // Inline function 'kotlin.text.orEmpty' call
       var tmp$ret$2;
       // Inline function 'kotlin.takeIf' call
-      var tmp0_takeIf = joinParameters($this_emit, this$0, it.a1z_1, null);
+      var tmp0_takeIf = joinParameters($this_emit, this$0, it.x1y_1, null);
       // Inline function 'kotlin.contracts.contract' call
       var tmp_0;
       var tmp$ret$1;
@@ -1907,10 +1910,10 @@
       var tmp0_elvis_lhs = tmp1_orEmpty;
       tmp$ret$3 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
       var tmp_2 = tmp$ret$3;
-      var tmp_3 = emitPath($this_emit.h1z_1, this$0);
-      var tmp_4 = emitMap($this_emit.i1z_1, this$0);
-      var tmp_5 = emitMap($this_emit.j1z_1, this$0);
-      var tmp1_safe_receiver = it.a1z_1;
+      var tmp_3 = emitPath($this_emit.e1z_1, this$0);
+      var tmp_4 = emitMap($this_emit.f1z_1, this$0);
+      var tmp_5 = emitMap($this_emit.g1z_1, this$0);
+      var tmp1_safe_receiver = it.x1y_1;
       var tmp_6;
       if (tmp1_safe_receiver == null) {
         tmp_6 = null;
@@ -1920,12 +1923,12 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$4;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$4 = ', content: {type: "' + tmp1_safe_receiver.n1z_1 + '", body: props.body}';
+        tmp$ret$4 = ', content: {type: "' + tmp1_safe_receiver.k1z_1 + '", body: props.body}';
         tmp$ret$5 = tmp$ret$4;
         tmp_6 = tmp$ret$5;
       }
       var tmp2_elvis_lhs = tmp_6;
-      return '  ' + 'export const ' + tmp + ' = (' + tmp_2 + ') => ({path: `' + tmp_3 + '`, method: "' + $this_emit.g1z_1.b9_1 + '", query: {' + tmp_4 + '}, headers: {' + tmp_5 + '}' + (tmp2_elvis_lhs == null ? '' : tmp2_elvis_lhs) + '} as const)';
+      return '  ' + 'export const ' + tmp + ' = (' + tmp_2 + ') => ({path: `' + tmp_3 + '`, method: "' + $this_emit.d1z_1.b9_1 + '", query: {' + tmp_4 + '}, headers: {' + tmp_5 + '}' + (tmp2_elvis_lhs == null ? '' : tmp2_elvis_lhs) + '} as const)';
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_1(this$0) {
@@ -1941,7 +1944,7 @@
       // Inline function 'kotlin.text.orEmpty' call
       var tmp$ret$2;
       // Inline function 'kotlin.takeIf' call
-      var tmp0_takeIf = joinParameters($this_emit, this$0, it.e1z_1, it);
+      var tmp0_takeIf = joinParameters($this_emit, this$0, it.b1z_1, it);
       // Inline function 'kotlin.contracts.contract' call
       var tmp_0;
       var tmp$ret$1;
@@ -1967,9 +1970,9 @@
       var tmp0_elvis_lhs = tmp1_orEmpty;
       tmp$ret$3 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
       var tmp_2 = tmp$ret$3;
-      var tmp_3 = Companion_getInstance_4().h1w(it.c1z_1) ? it.c1z_1 : '`' + it.c1z_1 + '`';
-      var tmp_4 = emitMap(it.d1z_1, this$0);
-      var tmp1_safe_receiver = it.e1z_1;
+      var tmp_3 = Companion_getInstance_4().h1w(it.z1y_1) ? it.z1y_1 : '`' + it.z1y_1 + '`';
+      var tmp_4 = emitMap(it.a1z_1, this$0);
+      var tmp1_safe_receiver = it.b1z_1;
       var tmp_5;
       if (tmp1_safe_receiver == null) {
         tmp_5 = null;
@@ -1979,7 +1982,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$4;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$4 = ', content: {type: "' + tmp1_safe_receiver.n1z_1 + '", body: props.body}';
+        tmp$ret$4 = ', content: {type: "' + tmp1_safe_receiver.k1z_1 + '", body: props.body}';
         tmp$ret$5 = tmp$ret$4;
         tmp_5 = tmp$ret$5;
       }
@@ -1987,8 +1990,10 @@
       return '  ' + 'export const ' + tmp + ' = (' + tmp_2 + ') => ({status: ' + tmp_3 + ', headers: {' + tmp_4 + '}' + (tmp2_elvis_lhs == null ? '' : tmp2_elvis_lhs) + '} as const)';
     };
   }
-  function TypeScriptEmitter$emit$lambda_8(it) {
-    return it;
+  function TypeScriptEmitter$emit$lambda_8(this$0) {
+    return function (it) {
+      return this$0.i1y(it);
+    };
   }
   function TypeScriptEmitter$emitType$lambda(this$0) {
     return function (it) {
@@ -2016,7 +2021,7 @@
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
-    tmp.y1y_1 = trimMargin('\n        |export module Wirespec {\n        |' + '  ' + 'export type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'export type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
+    tmp.v1y_1 = trimMargin('\n        |export module Wirespec {\n        |' + '  ' + 'export type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'export type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
   }
   protoOf(TypeScriptEmitter).z1s = function (_this__u8e3s4) {
     var tmp;
@@ -2056,7 +2061,7 @@
       var tmp = sanitizeSymbol_1(item.a1t_1, this);
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_4().a1s(ast) ? this.y1y_1 : '') + '\n                    |' + item.b1t_1 + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_4().a1s(ast) ? this.v1y_1 : '') + '\n                    |' + item.b1t_1 + '\n            ');
       tmp$ret$0 = toString(trimStart(isCharSequence(tmp0_trimStart) ? tmp0_trimStart : THROW_CCE()));
       tmp$ret$1 = new Emitted(tmp, tmp$ret$0);
       tmp0_mapTo.s(tmp$ret$1);
@@ -2089,28 +2094,28 @@
     var tmp1_let = _this__u8e3s4.g1s() ? tmp0_let + '[]' : tmp0_let;
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
-    return _this__u8e3s4.s1z() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
+    return _this__u8e3s4.p1z() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
   };
   protoOf(TypeScriptEmitter).j1t = function (_this__u8e3s4) {
-    var tmp = sanitizeSymbol_1(_this__u8e3s4.q1y_1, this);
-    var tmp_0 = this.s1y(_this__u8e3s4.r1y_1);
-    var tmp_1 = sanitizeSymbol_1(_this__u8e3s4.q1y_1, this);
+    var tmp = sanitizeSymbol_1(_this__u8e3s4.n1y_1, this);
+    var tmp_0 = this.p1y(_this__u8e3s4.o1y_1);
+    var tmp_1 = sanitizeSymbol_1(_this__u8e3s4.n1y_1, this);
     Companion_getInstance_4();
-    return trimMargin('export type ' + tmp + ' = string;\n            |const regExp' + _this__u8e3s4.q1y_1 + ' = ' + tmp_0 + ';\n            |export const validate' + _this__u8e3s4.q1y_1 + ' = (value: string): value is ' + tmp_1 + ' => \n            |' + '  ' + 'regExp' + _this__u8e3s4.q1y_1 + '.test(value);\n            |');
+    return trimMargin('export type ' + tmp + ' = string;\n            |const regExp' + _this__u8e3s4.n1y_1 + ' = ' + tmp_0 + ';\n            |export const validate' + _this__u8e3s4.n1y_1 + ' = (value: string): value is ' + tmp_1 + ' => \n            |' + '  ' + 'regExp' + _this__u8e3s4.n1y_1 + '.test(value);\n            |');
   };
-  protoOf(TypeScriptEmitter).s1y = function (_this__u8e3s4) {
-    return '/' + dropLast(drop(_this__u8e3s4.t1y_1, 1), 1) + '/g';
+  protoOf(TypeScriptEmitter).p1y = function (_this__u8e3s4) {
+    return '/' + dropLast(drop(_this__u8e3s4.q1y_1, 1), 1) + '/g';
   };
   protoOf(TypeScriptEmitter).z1t = function (_this__u8e3s4) {
-    var tmp = sanitizeSymbol_1(_this__u8e3s4.f1z_1, this);
+    var tmp = sanitizeSymbol_1(_this__u8e3s4.c1z_1, this);
     Companion_getInstance_4();
-    var tmp_0 = joinToString(_this__u8e3s4.h1z_1, '/', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_1);
+    var tmp_0 = joinToString(_this__u8e3s4.e1z_1, '/', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_1);
     Companion_getInstance_4();
-    var tmp_1 = toSet(_this__u8e3s4.l1z_1);
+    var tmp_1 = toSet(_this__u8e3s4.i1z_1);
     var tmp_2 = joinToString(tmp_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_2(this, _this__u8e3s4));
     Companion_getInstance_4();
     // Inline function 'kotlin.text.ifEmpty' call
-    var tmp_3 = toSet(_this__u8e3s4.l1z_1);
+    var tmp_3 = toSet(_this__u8e3s4.i1z_1);
     var tmp0_ifEmpty = joinToString(tmp_3, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_3(this));
     var tmp_4;
     // Inline function 'kotlin.text.isEmpty' call
@@ -2121,11 +2126,11 @@
       tmp_4 = tmp0_ifEmpty;
     }
     var tmp_5 = tmp_4;
-    var tmp_6 = toSet(_this__u8e3s4.m1z_1);
+    var tmp_6 = toSet(_this__u8e3s4.j1z_1);
     var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_4(this));
     Companion_getInstance_4();
     // Inline function 'kotlin.text.ifEmpty' call
-    var tmp_8 = toSet(_this__u8e3s4.m1z_1);
+    var tmp_8 = toSet(_this__u8e3s4.j1z_1);
     var tmp1_ifEmpty = joinToString(tmp_8, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_5(this));
     var tmp_9;
     // Inline function 'kotlin.text.isEmpty' call
@@ -2140,16 +2145,16 @@
     Companion_getInstance_4();
     Companion_getInstance_4();
     Companion_getInstance_4();
-    var tmp_11 = Companion_getInstance_4().o1s(sanitizeSymbol_1(_this__u8e3s4.f1z_1, this));
+    var tmp_11 = Companion_getInstance_4().o1s(sanitizeSymbol_1(_this__u8e3s4.c1z_1, this));
     Companion_getInstance_4();
-    var tmp_12 = distinct(_this__u8e3s4.l1z_1);
+    var tmp_12 = distinct(_this__u8e3s4.i1z_1);
     var tmp_13 = joinToString(tmp_12, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_6(this, _this__u8e3s4));
-    var tmp_14 = distinct(_this__u8e3s4.m1z_1);
-    return trimMargin('\n          |export module ' + tmp + ' {\n          |' + '  ' + 'export const PATH = "/' + tmp_0 + '"\n          |' + '  ' + 'export const METHOD = "' + _this__u8e3s4.g1z_1.b9_1 + '"\n          |' + tmp_2 + '\n          |' + '  ' + 'export type Request = ' + tmp_5 + '\n          |' + tmp_7 + '\n          |' + '  ' + 'export type Response = ' + tmp_10 + '\n          |' + '  ' + 'export type Handler = (request:Request) => Promise<Response>\n          |' + '  ' + 'export type Call = {\n          |' + '  ' + '  ' + tmp_11 + ': Handler\n          |' + '  ' + '}\n          |' + tmp_13 + '\n          |' + joinToString(tmp_14, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_7(this, _this__u8e3s4)) + '\n          |}\n          |\n        ');
+    var tmp_14 = distinct(_this__u8e3s4.j1z_1);
+    return trimMargin('\n          |export module ' + tmp + ' {\n          |' + '  ' + 'export const PATH = "/' + tmp_0 + '"\n          |' + '  ' + 'export const METHOD = "' + _this__u8e3s4.d1z_1.b9_1 + '"\n          |' + tmp_2 + '\n          |' + '  ' + 'export type Request = ' + tmp_5 + '\n          |' + tmp_7 + '\n          |' + '  ' + 'export type Response = ' + tmp_10 + '\n          |' + '  ' + 'export type Handler = (request:Request) => Promise<Response>\n          |' + '  ' + 'export type Call = {\n          |' + '  ' + '  ' + tmp_11 + ': Handler\n          |' + '  ' + '}\n          |' + tmp_13 + '\n          |' + joinToString(tmp_14, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_7(this, _this__u8e3s4)) + '\n          |}\n          |\n        ');
   };
   protoOf(TypeScriptEmitter).v1t = function (_this__u8e3s4) {
-    var tmp = sanitizeSymbol_1(_this__u8e3s4.t1z_1, this);
-    return 'export type ' + tmp + ' = ' + joinToString(_this__u8e3s4.u1z_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_8) + '\n';
+    var tmp = sanitizeSymbol_1(_this__u8e3s4.q1z_1, this);
+    return 'export type ' + tmp + ' = ' + joinToString(_this__u8e3s4.r1z_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_8(this)) + '\n';
   };
   function fixStatus(_this__u8e3s4, $this) {
     return _this__u8e3s4 === 'default' ? '200' : _this__u8e3s4;
@@ -2160,8 +2165,8 @@
   function emitRequest(_this__u8e3s4, $this) {
     // Inline function 'kotlin.text.orEmpty' call
     var tmp0_safe_receiver = firstOrNull_0(_this__u8e3s4);
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a1z_1;
-    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.o1z_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.x1y_1;
+    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.l1z_1;
     var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : $this.i1y(tmp2_safe_receiver);
     var tmp;
     if (tmp3_safe_receiver == null) {
@@ -2230,7 +2235,7 @@
   }
   function Companion_2() {
     Companion_instance_2 = this;
-    this.x1z_1 = listOf(['type', 'enum', 'endpoint']);
+    this.u1z_1 = listOf(['type', 'enum', 'endpoint']);
   }
   var Companion_instance_2;
   function Companion_getInstance_3() {
@@ -2252,14 +2257,14 @@
   function WirespecEmitter$emit$lambda_1(this$0) {
     return function (it) {
       Companion_getInstance_4();
-      var tmp = fixStatus(it.c1z_1, this$0);
-      var tmp0_safe_receiver = it.e1z_1;
-      var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.o1z_1;
+      var tmp = fixStatus(it.z1y_1, this$0);
+      var tmp0_safe_receiver = it.b1z_1;
+      var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l1z_1;
       var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : this$0.i1y(tmp1_safe_receiver);
       var tmp_0 = tmp2_elvis_lhs == null ? 'Unit' : tmp2_elvis_lhs;
       var tmp_1;
-      var tmp3_safe_receiver = it.e1z_1;
-      if ((tmp3_safe_receiver == null ? null : tmp3_safe_receiver.p1z_1) === true) {
+      var tmp3_safe_receiver = it.b1z_1;
+      if ((tmp3_safe_receiver == null ? null : tmp3_safe_receiver.m1z_1) === true) {
         tmp_1 = '?';
       } else {
         tmp_1 = '';
@@ -2267,15 +2272,20 @@
       return '  ' + tmp + ' -> ' + tmp_0 + tmp_1;
     };
   }
+  function WirespecEmitter$emit$lambda_2(this$0) {
+    return function (it) {
+      return this$0.i1y(it);
+    };
+  }
   function WirespecEmitter$emitPath$lambda(this$0) {
     return function (it) {
       var tmp0_subject = it;
       var tmp;
       if (tmp0_subject instanceof Param) {
-        tmp = '{' + it.u1y_1.j1y_1 + ': ' + this$0.i1y(it.v1y_1) + '}';
+        tmp = '{' + it.r1y_1.j1y_1 + ': ' + this$0.i1y(it.s1y_1) + '}';
       } else {
         if (tmp0_subject instanceof Literal_0) {
-          tmp = it.z1y_1;
+          tmp = it.w1y_1;
         } else {
           noWhenBranchMatchedException();
         }
@@ -2328,7 +2338,7 @@
     return this.h1y(_this__u8e3s4.e1y_1) + ': ' + this.i1y(_this__u8e3s4.f1y_1) + (_this__u8e3s4.g1y_1 ? '?' : '');
   };
   protoOf(WirespecEmitter).h1y = function (_this__u8e3s4) {
-    return Companion_getInstance_3().x1z_1.r(_this__u8e3s4.j1y_1) ? addBackticks(_this__u8e3s4.j1y_1) : _this__u8e3s4.j1y_1;
+    return Companion_getInstance_3().u1z_1.r(_this__u8e3s4.j1y_1) ? addBackticks(_this__u8e3s4.j1y_1) : _this__u8e3s4.j1y_1;
   };
   protoOf(WirespecEmitter).i1y = function (_this__u8e3s4) {
     // Inline function 'kotlin.let' call
@@ -2340,7 +2350,7 @@
         tmp = 'Any';
       } else {
         if (_this__u8e3s4 instanceof Custom_0) {
-          tmp = _this__u8e3s4.n1y_1;
+          tmp = _this__u8e3s4.p2();
         } else {
           if (_this__u8e3s4 instanceof Primitive_0) {
             var tmp_0;
@@ -2378,19 +2388,19 @@
     return 'enum ' + _this__u8e3s4.y1x_1 + ' {\n' + '  ' + joinToString(_this__u8e3s4.z1x_1, ', ', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_0(this)) + '\n}\n';
   };
   protoOf(WirespecEmitter).j1t = function (_this__u8e3s4) {
-    return 'type ' + _this__u8e3s4.q1y_1 + ' ' + this.s1y(_this__u8e3s4.r1y_1) + '\n';
+    return 'type ' + _this__u8e3s4.n1y_1 + ' ' + this.p1y(_this__u8e3s4.o1y_1) + '\n';
   };
-  protoOf(WirespecEmitter).s1y = function (_this__u8e3s4) {
-    return '/' + dropLast(drop(_this__u8e3s4.t1y_1, 1), 1) + '/g';
+  protoOf(WirespecEmitter).p1y = function (_this__u8e3s4) {
+    return '/' + dropLast(drop(_this__u8e3s4.q1y_1, 1), 1) + '/g';
   };
   protoOf(WirespecEmitter).z1t = function (_this__u8e3s4) {
-    var tmp = emitRequest(_this__u8e3s4.l1z_1, this);
-    var tmp_0 = emitPath_0(_this__u8e3s4.h1z_1, this);
-    var tmp_1 = emitQuery(_this__u8e3s4.i1z_1, this);
-    return trimMargin('\n            |endpoint ' + _this__u8e3s4.f1z_1 + ' ' + _this__u8e3s4.g1z_1 + tmp + ' ' + tmp_0 + tmp_1 + ' -> {\n            |' + joinToString(_this__u8e3s4.m1z_1, '\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_1(this)) + '\n            |}\n            |\n        ');
+    var tmp = emitRequest(_this__u8e3s4.i1z_1, this);
+    var tmp_0 = emitPath_0(_this__u8e3s4.e1z_1, this);
+    var tmp_1 = emitQuery(_this__u8e3s4.f1z_1, this);
+    return trimMargin('\n            |endpoint ' + _this__u8e3s4.c1z_1 + ' ' + _this__u8e3s4.d1z_1 + tmp + ' ' + tmp_0 + tmp_1 + ' -> {\n            |' + joinToString(_this__u8e3s4.j1z_1, '\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_1(this)) + '\n            |}\n            |\n        ');
   };
   protoOf(WirespecEmitter).v1t = function (_this__u8e3s4) {
-    return 'type ' + _this__u8e3s4.t1z_1 + ' = ' + joinToString(_this__u8e3s4.u1z_1, ' | ') + '\n';
+    return 'type ' + _this__u8e3s4.q1z_1 + ' = ' + joinToString(_this__u8e3s4.r1z_1, ' | ', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_2(this)) + '\n';
   };
   function get_DEFAULT_PACKAGE_STRING() {
     return DEFAULT_PACKAGE_STRING;
@@ -2539,7 +2549,7 @@
   protoOf(Companion_3).h1w = function (_this__u8e3s4) {
     return !(toIntOrNull(_this__u8e3s4) == null);
   };
-  protoOf(Companion_3).y1z = function (_this__u8e3s4) {
+  protoOf(Companion_3).v1z = function (_this__u8e3s4) {
     var tmp0_safe_receiver = toIntOrNull(_this__u8e3s4);
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -2636,8 +2646,8 @@
     }
     return tmp_0;
   };
-  protoOf(Emitter).b1z = function (_this__u8e3s4) {
-    var tmp = split(substringBefore(_this__u8e3s4.n1z_1, ';'), ['/', '-']);
+  protoOf(Emitter).y1y = function (_this__u8e3s4) {
+    var tmp = split(substringBefore(_this__u8e3s4.k1z_1, ';'), ['/', '-']);
     return replace(joinToString(tmp, '', VOID, VOID, VOID, VOID, Emitter$emitContentType$lambda), '+', '');
   };
   protoOf(Emitter).j1v = function (_this__u8e3s4, space) {
@@ -3586,7 +3596,7 @@
     return joinToString(tmp0_mapIndexedTo, '');
   }
   function name_0(_this__u8e3s4, $this) {
-    var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.n1z_1;
+    var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.k1z_1;
     var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : substringBefore(tmp1_safe_receiver, ';');
     var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : split(tmp2_safe_receiver, ['/', '-']);
     var tmp;
@@ -3600,7 +3610,7 @@
     return tmp5_elvis_lhs == null ? 'Unit' : tmp5_elvis_lhs;
   }
   function transform_0(_this__u8e3s4, $this) {
-    return new Content(_this__u8e3s4.n1z_1, transform_1(_this__u8e3s4.o1z_1, $this, _this__u8e3s4.p1z_1, false));
+    return new Content(_this__u8e3s4.k1z_1, transform_1(_this__u8e3s4.l1z_1, $this, _this__u8e3s4.m1z_1, false));
   }
   function transform_1(_this__u8e3s4, $this, isNullable, isOptional) {
     var tmp;
@@ -3611,7 +3621,7 @@
         tmp = new Language(Primitive_Any_getInstance(), isNullable, _this__u8e3s4.g1s(), isOptional);
       } else {
         if (_this__u8e3s4 instanceof Custom_0) {
-          tmp = new Custom(_this__u8e3s4.n1y_1, isNullable, _this__u8e3s4.g1s(), isOptional);
+          tmp = new Custom(_this__u8e3s4.p2(), isNullable, _this__u8e3s4.g1s(), isOptional);
         } else {
           if (_this__u8e3s4 instanceof Primitive_0) {
             // Inline function 'kotlin.let' call
@@ -3648,10 +3658,10 @@
   function transform_2(_this__u8e3s4, $this) {
     var tmp;
     if (_this__u8e3s4 instanceof Literal_0) {
-      tmp = new Literal(_this__u8e3s4.z1y_1);
+      tmp = new Literal(_this__u8e3s4.w1y_1);
     } else {
       if (_this__u8e3s4 instanceof Param) {
-        tmp = new Parameter(_this__u8e3s4.u1y_1.j1y_1);
+        tmp = new Parameter(_this__u8e3s4.r1y_1.j1y_1);
       } else {
         noWhenBranchMatchedException();
       }
@@ -3662,7 +3672,7 @@
     return joinToString_1(args, '', VOID, VOID, VOID, VOID, ClassModelTransformer$className$lambda);
   }
   function toField_0(_this__u8e3s4, $this, identifier, isNullable) {
-    return new Field_0(Companion_getInstance_6().q1z(identifier), _this__u8e3s4, isNullable);
+    return new Field_0(Companion_getInstance_6().n1z(identifier), _this__u8e3s4, isNullable);
   }
   function toField$default(_this__u8e3s4, $this, identifier, isNullable, $super) {
     isNullable = isNullable === VOID ? false : isNullable;
@@ -3680,10 +3690,10 @@
     return tmp;
   }
   function sam$kotlin_Comparator$0(function_0) {
-    this.z1z_1 = function_0;
+    this.w1z_1 = function_0;
   }
   protoOf(sam$kotlin_Comparator$0).t9 = function (a, b) {
-    return this.z1z_1(a, b);
+    return this.w1z_1(a, b);
   };
   protoOf(sam$kotlin_Comparator$0).compare = function (a, b) {
     return this.t9(a, b);
@@ -3691,10 +3701,10 @@
   function ClassModelTransformer$transform$lambda(it) {
     var tmp;
     if (it instanceof Literal_0) {
-      tmp = it.z1y_1;
+      tmp = it.w1y_1;
     } else {
       if (it instanceof Param) {
-        tmp = '{' + transform(it.u1y_1, ClassModelTransformer_getInstance()) + '}';
+        tmp = '{' + transform(it.r1y_1, ClassModelTransformer_getInstance()) + '}';
       } else {
         noWhenBranchMatchedException();
       }
@@ -3704,10 +3714,10 @@
   function ClassModelTransformer$transform$lambda_0(a, b) {
     // Inline function 'kotlin.comparisons.compareValuesBy' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-    var tmp = a.c1z_1;
+    var tmp = a.z1y_1;
     var tmp$ret$1;
     // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-    tmp$ret$1 = b.c1z_1;
+    tmp$ret$1 = b.z1y_1;
     return compareValues(tmp, tmp$ret$1);
   }
   function ClassModelTransformer$name$lambda(it) {
@@ -3752,27 +3762,45 @@
     while (tmp0_iterator_1.w()) {
       var element_0 = tmp0_iterator_1.y();
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      if (element_0.u1z_1.r(_this__u8e3s4.a1y_1)) {
+      // Inline function 'kotlin.collections.map' call
+      var tmp0_map_0 = element_0.r1z_1;
+      // Inline function 'kotlin.collections.mapTo' call
+      var tmp0_mapTo_0 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map_0, 10));
+      var tmp0_iterator_2 = tmp0_map_0.v();
+      while (tmp0_iterator_2.w()) {
+        var item_0 = tmp0_iterator_2.y();
+        var tmp$ret$5;
+        // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>.<anonymous>' call
+        var tmp_1;
+        if (item_0 instanceof Custom_0) {
+          tmp_1 = item_0.p2();
+        } else {
+          throw IllegalStateException_init_$Create$('Any Unit of Primitive cannot be part of Union');
+        }
+        tmp$ret$5 = tmp_1;
+        tmp0_mapTo_0.s(tmp$ret$5);
+      }
+      if (tmp0_mapTo_0.r(_this__u8e3s4.a1y_1)) {
         tmp0_filterTo.s(element_0);
       }
     }
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo_0 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_filterTo, 10));
-    var tmp0_iterator_2 = tmp0_filterTo.v();
-    while (tmp0_iterator_2.w()) {
-      var item_0 = tmp0_iterator_2.y();
-      var tmp$ret$8;
+    var tmp0_mapTo_1 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_filterTo, 10));
+    var tmp0_iterator_3 = tmp0_filterTo.v();
+    while (tmp0_iterator_3.w()) {
+      var item_1 = tmp0_iterator_3.y();
+      var tmp$ret$11;
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      tmp$ret$8 = new Custom(item_0.t1z_1);
-      tmp0_mapTo_0.s(tmp$ret$8);
+      tmp$ret$11 = new Custom(item_1.q1z_1);
+      tmp0_mapTo_1.s(tmp$ret$11);
     }
-    return new TypeClass(tmp, tmp_0, tmp0_mapTo_0);
+    return new TypeClass(tmp, tmp_0, tmp0_mapTo_1);
   };
   protoOf(ClassModelTransformer).k1t = function (_this__u8e3s4) {
-    return new RefinedClass(className(this, [_this__u8e3s4.q1y_1]), new Validator(_this__u8e3s4.r1y_1.t1y_1));
+    return new RefinedClass(className(this, [_this__u8e3s4.n1y_1]), new Validator(_this__u8e3s4.o1y_1.q1y_1));
   };
   protoOf(ClassModelTransformer).w1t = function (_this__u8e3s4) {
-    return new UnionClass(className(this, [_this__u8e3s4.t1z_1]));
+    return new UnionClass(className(this, [_this__u8e3s4.q1z_1]));
   };
   protoOf(ClassModelTransformer).r1t = function (_this__u8e3s4) {
     return new EnumClass(className(this, [_this__u8e3s4.y1x_1]), _this__u8e3s4.z1x_1);
@@ -3780,7 +3808,7 @@
   protoOf(ClassModelTransformer).a1u = function (_this__u8e3s4) {
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_filterIsInstance = _this__u8e3s4.h1z_1;
+    var tmp0_filterIsInstance = _this__u8e3s4.e1z_1;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var tmp0_filterIsInstanceTo = ArrayList_init_$Create$_0();
     var tmp0_iterator = tmp0_filterIsInstance.v();
@@ -3797,17 +3825,17 @@
       var item = tmp0_iterator_0.y();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      tmp$ret$2 = new Field_0(item.u1y_1, item.v1y_1, false);
+      tmp$ret$2 = new Field_0(item.r1y_1, item.s1y_1, false);
       tmp0_mapTo.s(tmp$ret$2);
     }
     var pathField = tmp0_mapTo;
-    var parameters = plus(plus(plus(pathField, _this__u8e3s4.i1z_1), _this__u8e3s4.j1z_1), _this__u8e3s4.k1z_1);
-    var tmp0_name = className(this, [_this__u8e3s4.f1z_1, 'Endpoint']);
-    var tmp1_path = joinToString(_this__u8e3s4.h1z_1, '/', '/', VOID, VOID, VOID, ClassModelTransformer$transform$lambda);
-    var tmp2_functionName = Companion_getInstance_4().o1s(_this__u8e3s4.f1z_1);
-    var tmp3_method = _this__u8e3s4.g1z_1.b9_1;
+    var parameters = plus(plus(plus(pathField, _this__u8e3s4.f1z_1), _this__u8e3s4.g1z_1), _this__u8e3s4.h1z_1);
+    var tmp0_name = className(this, [_this__u8e3s4.c1z_1, 'Endpoint']);
+    var tmp1_path = joinToString(_this__u8e3s4.e1z_1, '/', '/', VOID, VOID, VOID, ClassModelTransformer$transform$lambda);
+    var tmp2_functionName = Companion_getInstance_4().o1s(_this__u8e3s4.c1z_1);
+    var tmp3_method = _this__u8e3s4.d1z_1.b9_1;
     // Inline function 'kotlin.collections.map' call
-    var tmp2_map = _this__u8e3s4.l1z_1;
+    var tmp2_map = _this__u8e3s4.i1z_1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo_0 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp2_map, 10));
     var tmp0_iterator_1 = tmp2_map.v();
@@ -3815,30 +3843,30 @@
       var item_0 = tmp0_iterator_1.y();
       var tmp$ret$17;
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      var tmp = className(ClassModelTransformer_getInstance(), ['Request', name_0(item_0.a1z_1, ClassModelTransformer_getInstance())]);
+      var tmp = className(ClassModelTransformer_getInstance(), ['Request', name_0(item_0.x1y_1, ClassModelTransformer_getInstance())]);
       var tmp_0 = new Field('path', new Language(Primitive_String_getInstance(), false), true, true, true);
       var tmp_1 = new Field('method', new Wirespec('Method'), true, true, true);
       var tmp_2 = new Field('query', new Language(Primitive_Map_getInstance(), VOID, VOID, VOID, new Generics(listOf([new Language(Primitive_String_getInstance(), false), new Language(Primitive_List_getInstance(), false, VOID, VOID, new Generics(listOf_0(new Language(Primitive_Any_getInstance(), true))))]))), true, true, true);
       var tmp_3 = new Field('headers', new Language(Primitive_Map_getInstance(), VOID, VOID, VOID, new Generics(listOf([new Language(Primitive_String_getInstance(), false), new Language(Primitive_List_getInstance(), false, VOID, VOID, new Generics(listOf_0(new Language(Primitive_Any_getInstance(), true))))]))), true, true, true);
-      var tmp_4 = item_0.a1z_1 == null;
-      var tmp0_safe_receiver = item_0.a1z_1;
-      var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.o1z_1;
-      var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : transform_1(tmp1_safe_receiver, ClassModelTransformer_getInstance(), item_0.a1z_1.p1z_1, false);
+      var tmp_4 = item_0.x1y_1 == null;
+      var tmp0_safe_receiver = item_0.x1y_1;
+      var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.l1z_1;
+      var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : transform_1(tmp1_safe_receiver, ClassModelTransformer_getInstance(), item_0.x1y_1.m1z_1, false);
       var tmp_5 = listOf([tmp_0, tmp_1, tmp_2, tmp_3, new Field('content', new Wirespec('Content', tmp_4, VOID, VOID, new Generics(listOf_0(tmp2_elvis_lhs == null ? new Language(Primitive_Unit_getInstance()) : tmp2_elvis_lhs))), true, true, true)]);
-      var tmp_6 = className(ClassModelTransformer_getInstance(), ['Request', name_0(item_0.a1z_1, ClassModelTransformer_getInstance())]);
+      var tmp_6 = className(ClassModelTransformer_getInstance(), ['Request', name_0(item_0.x1y_1, ClassModelTransformer_getInstance())]);
       var tmp_7 = new Parameter_0('path', new Language(Primitive_String_getInstance(), false));
       var tmp_8 = new Parameter_0('method', new Wirespec('Method', false));
       var tmp_9 = new Parameter_0('query', new Language(Primitive_Map_getInstance(), VOID, VOID, VOID, new Generics(listOf([new Language(Primitive_String_getInstance(), false), new Language(Primitive_List_getInstance(), false, VOID, VOID, new Generics(listOf_0(new Language(Primitive_Any_getInstance(), true))))]))));
       var tmp_10 = new Parameter_0('headers', new Language(Primitive_Map_getInstance(), VOID, VOID, VOID, new Generics(listOf([new Language(Primitive_String_getInstance(), false), new Language(Primitive_List_getInstance(), false, VOID, VOID, new Generics(listOf_0(new Language(Primitive_Any_getInstance(), true))))]))));
-      var tmp_11 = item_0.a1z_1 == null;
-      var tmp3_safe_receiver = item_0.a1z_1;
-      var tmp4_safe_receiver = tmp3_safe_receiver == null ? null : tmp3_safe_receiver.o1z_1;
-      var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : transform_1(tmp4_safe_receiver, ClassModelTransformer_getInstance(), item_0.a1z_1.p1z_1, false);
+      var tmp_11 = item_0.x1y_1 == null;
+      var tmp3_safe_receiver = item_0.x1y_1;
+      var tmp4_safe_receiver = tmp3_safe_receiver == null ? null : tmp3_safe_receiver.l1z_1;
+      var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : transform_1(tmp4_safe_receiver, ClassModelTransformer_getInstance(), item_0.x1y_1.m1z_1, false);
       var tmp_12 = new RequestAllArgsConstructor(tmp_6, listOf([tmp_7, tmp_8, tmp_9, tmp_10, new Parameter_0('content', new Wirespec('Content', tmp_11, VOID, VOID, new Generics(listOf_0(tmp5_elvis_lhs == null ? new Language(Primitive_Unit_getInstance()) : tmp5_elvis_lhs))))]));
-      var tmp9_name = className(ClassModelTransformer_getInstance(), ['Request', name_0(item_0.a1z_1, ClassModelTransformer_getInstance())]);
+      var tmp9_name = className(ClassModelTransformer_getInstance(), ['Request', name_0(item_0.x1y_1, ClassModelTransformer_getInstance())]);
       // Inline function 'kotlin.collections.map' call
-      var tmp6_safe_receiver = item_0.a1z_1;
-      var tmp7_safe_receiver = tmp6_safe_receiver == null ? null : tmp6_safe_receiver.o1z_1;
+      var tmp6_safe_receiver = item_0.x1y_1;
+      var tmp7_safe_receiver = tmp6_safe_receiver == null ? null : tmp6_safe_receiver.l1z_1;
       var tmp0_map = filterNotNull(plus_0(parameters, tmp7_safe_receiver == null ? null : toField_0(tmp7_safe_receiver, ClassModelTransformer_getInstance(), 'body', false)));
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo_1 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map, 10));
@@ -3850,10 +3878,10 @@
         tmp$ret$5 = transformParameter(item_1, ClassModelTransformer_getInstance());
         tmp0_mapTo_1.s(tmp$ret$5);
       }
-      var tmp8_safe_receiver = item_0.a1z_1;
+      var tmp8_safe_receiver = item_0.x1y_1;
       var tmp11_content = tmp8_safe_receiver == null ? null : transform_0(tmp8_safe_receiver, ClassModelTransformer_getInstance());
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = _this__u8e3s4.h1z_1;
+      var tmp1_map = _this__u8e3s4.e1z_1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo_2 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp1_map, 10));
       var tmp0_iterator_3 = tmp1_map.v();
@@ -3865,9 +3893,9 @@
         tmp0_mapTo_2.s(tmp$ret$8);
       }
       var tmp12_path = new Path(tmp0_mapTo_2);
-      var tmp13_method = _this__u8e3s4.g1z_1.b9_1;
+      var tmp13_method = _this__u8e3s4.d1z_1.b9_1;
       // Inline function 'kotlin.collections.map' call
-      var tmp2_map_0 = _this__u8e3s4.i1z_1;
+      var tmp2_map_0 = _this__u8e3s4.f1z_1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo_3 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp2_map_0, 10));
       var tmp0_iterator_4 = tmp2_map_0.v();
@@ -3879,7 +3907,7 @@
         tmp0_mapTo_3.s(tmp$ret$11);
       }
       // Inline function 'kotlin.collections.map' call
-      var tmp3_map = _this__u8e3s4.j1z_1;
+      var tmp3_map = _this__u8e3s4.g1z_1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo_4 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp3_map, 10));
       var tmp0_iterator_5 = tmp3_map.v();
@@ -3892,14 +3920,14 @@
       }
       var tmp_13 = new RequestParameterConstructor(tmp9_name, tmp0_mapTo_1, tmp12_path, tmp13_method, tmp0_mapTo_3, tmp0_mapTo_4, tmp11_content);
       var tmp_14 = className(ClassModelTransformer_getInstance(), ['Request']);
-      var tmp16_safe_receiver = item_0.a1z_1;
-      var tmp17_safe_receiver = tmp16_safe_receiver == null ? null : tmp16_safe_receiver.o1z_1;
-      var tmp18_elvis_lhs = tmp17_safe_receiver == null ? null : transform_1(tmp17_safe_receiver, ClassModelTransformer_getInstance(), item_0.a1z_1.p1z_1, false);
+      var tmp16_safe_receiver = item_0.x1y_1;
+      var tmp17_safe_receiver = tmp16_safe_receiver == null ? null : tmp16_safe_receiver.l1z_1;
+      var tmp18_elvis_lhs = tmp17_safe_receiver == null ? null : transform_1(tmp17_safe_receiver, ClassModelTransformer_getInstance(), item_0.x1y_1.m1z_1, false);
       tmp$ret$17 = new RequestClass(tmp, tmp_5, tmp_12, tmp_13, listOf_0(new Custom(tmp_14, VOID, VOID, VOID, new Generics(listOf_0(tmp18_elvis_lhs == null ? new Language(Primitive_Unit_getInstance()) : tmp18_elvis_lhs)))));
       tmp0_mapTo_0.s(tmp$ret$17);
     }
     // Inline function 'kotlin.collections.map' call
-    var tmp3_map_0 = _this__u8e3s4.l1z_1;
+    var tmp3_map_0 = _this__u8e3s4.i1z_1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo_5 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp3_map_0, 10));
     var tmp0_iterator_6 = tmp3_map_0.v();
@@ -3907,20 +3935,20 @@
       var item_5 = tmp0_iterator_6.y();
       var tmp$ret$20;
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      var tmp0_safe_receiver_0 = item_5.a1z_1;
+      var tmp0_safe_receiver_0 = item_5.x1y_1;
       var tmp4_content = tmp0_safe_receiver_0 == null ? null : transform_0(tmp0_safe_receiver_0, ClassModelTransformer_getInstance());
-      var tmp1_safe_receiver_0 = item_5.a1z_1;
-      var tmp2_safe_receiver = tmp1_safe_receiver_0 == null ? null : tmp1_safe_receiver_0.o1z_1;
+      var tmp1_safe_receiver_0 = item_5.x1y_1;
+      var tmp2_safe_receiver = tmp1_safe_receiver_0 == null ? null : tmp1_safe_receiver_0.l1z_1;
       var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.g1s();
       var tmp5_isIterable = tmp3_elvis_lhs == null ? false : tmp3_elvis_lhs;
-      var tmp6_responseReference = new Custom(className(ClassModelTransformer_getInstance(), ['Request', name_0(item_5.a1z_1, ClassModelTransformer_getInstance())]));
+      var tmp6_responseReference = new Custom(className(ClassModelTransformer_getInstance(), ['Request', name_0(item_5.x1y_1, ClassModelTransformer_getInstance())]));
       tmp$ret$20 = new RequestCondition(tmp4_content, tmp6_responseReference, tmp5_isIterable);
       tmp0_mapTo_5.s(tmp$ret$20);
     }
     var tmp5_requestMapper = new RequestMapper('REQUEST_MAPPER', tmp0_mapTo_5);
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.sortedBy' call
-    var tmp4_sortedBy = _this__u8e3s4.m1z_1;
+    var tmp4_sortedBy = _this__u8e3s4.j1z_1;
     var tmp$ret$23;
     // Inline function 'kotlin.comparisons.compareBy' call
     var tmp_15 = ClassModelTransformer$transform$lambda_0;
@@ -3933,21 +3961,21 @@
       var item_6 = tmp0_iterator_7.y();
       var tmp$ret$25;
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      var tmp4_statusCode = item_6.c1z_1;
-      var tmp0_safe_receiver_1 = item_6.e1z_1;
+      var tmp4_statusCode = item_6.z1y_1;
+      var tmp0_safe_receiver_1 = item_6.b1z_1;
       var tmp5_content = tmp0_safe_receiver_1 == null ? null : transform_0(tmp0_safe_receiver_1, ClassModelTransformer_getInstance());
-      var tmp1_safe_receiver_1 = item_6.e1z_1;
-      var tmp2_safe_receiver_0 = tmp1_safe_receiver_1 == null ? null : tmp1_safe_receiver_1.o1z_1;
+      var tmp1_safe_receiver_1 = item_6.b1z_1;
+      var tmp2_safe_receiver_0 = tmp1_safe_receiver_1 == null ? null : tmp1_safe_receiver_1.l1z_1;
       var tmp3_elvis_lhs_0 = tmp2_safe_receiver_0 == null ? null : tmp2_safe_receiver_0.g1s();
       var tmp6_isIterable = tmp3_elvis_lhs_0 == null ? false : tmp3_elvis_lhs_0;
-      var tmp7_responseReference = new Custom(className(ClassModelTransformer_getInstance(), ['Response', item_6.c1z_1, name_0(item_6.e1z_1, ClassModelTransformer_getInstance())]));
+      var tmp7_responseReference = new Custom(className(ClassModelTransformer_getInstance(), ['Response', item_6.z1y_1, name_0(item_6.b1z_1, ClassModelTransformer_getInstance())]));
       tmp$ret$25 = new ResponseCondition(tmp4_statusCode, tmp5_content, tmp7_responseReference, tmp6_isIterable);
       tmp0_mapTo_6.s(tmp$ret$25);
     }
     var tmp6_responseMapper = new ResponseMapper('RESPONSE_MAPPER', tmp0_mapTo_6);
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.map' call
-    var tmp6_map = _this__u8e3s4.m1z_1;
+    var tmp6_map = _this__u8e3s4.j1z_1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo_7 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp6_map, 10));
     var tmp0_iterator_8 = tmp6_map.v();
@@ -3955,7 +3983,7 @@
       var item_7 = tmp0_iterator_8.y();
       var tmp$ret$28;
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      tmp$ret$28 = groupStatus(item_7.c1z_1, ClassModelTransformer_getInstance());
+      tmp$ret$28 = groupStatus(item_7.z1y_1, ClassModelTransformer_getInstance());
       tmp0_mapTo_7.s(tmp$ret$28);
     }
     var tmp7_map = distinct(tmp0_mapTo_7);
@@ -3973,14 +4001,14 @@
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.map' call
     // Inline function 'kotlin.collections.filter' call
-    var tmp8_filter = _this__u8e3s4.m1z_1;
+    var tmp8_filter = _this__u8e3s4.j1z_1;
     // Inline function 'kotlin.collections.filterTo' call
     var tmp0_filterTo = ArrayList_init_$Create$_0();
     var tmp0_iterator_10 = tmp8_filter.v();
     while (tmp0_iterator_10.w()) {
       var element_0 = tmp0_iterator_10.y();
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      if (Companion_getInstance_4().y1z(element_0.c1z_1)) {
+      if (Companion_getInstance_4().v1z(element_0.z1y_1)) {
         tmp0_filterTo.s(element_0);
       }
     }
@@ -3991,7 +4019,7 @@
       var item_9 = tmp0_iterator_11.y();
       var tmp$ret$37;
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      tmp$ret$37 = item_9.c1z_1;
+      tmp$ret$37 = item_9.z1y_1;
       tmp0_mapTo_9.s(tmp$ret$37);
     }
     var tmp10_map = distinct(tmp0_mapTo_9);
@@ -4007,7 +4035,7 @@
     }
     var tmp7_responseInterfaces = plus(tmp_16, tmp0_mapTo_10);
     // Inline function 'kotlin.collections.map' call
-    var tmp11_map = _this__u8e3s4.m1z_1;
+    var tmp11_map = _this__u8e3s4.j1z_1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo_11 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp11_map, 10));
     var tmp0_iterator_13 = tmp11_map.v();
@@ -4015,33 +4043,33 @@
       var item_11 = tmp0_iterator_13.y();
       var tmp$ret$49;
       // Inline function 'community.flock.wirespec.compiler.core.emit.transformer.ClassModelTransformer.transform.<anonymous>' call
-      var tmp_17 = className(ClassModelTransformer_getInstance(), ['Response', item_11.c1z_1, name_0(item_11.e1z_1, ClassModelTransformer_getInstance())]);
+      var tmp_17 = className(ClassModelTransformer_getInstance(), ['Response', item_11.z1y_1, name_0(item_11.b1z_1, ClassModelTransformer_getInstance())]);
       var tmp0_reference = new Language(Primitive_Integer_getInstance());
       var tmp_18 = new Field('status', tmp0_reference, true, true, true);
       var tmp_19 = new Field('headers', new Language(Primitive_Map_getInstance(), false, VOID, VOID, new Generics(listOf([new Language(Primitive_String_getInstance(), false), new Language(Primitive_List_getInstance(), false, VOID, VOID, new Generics(listOf_0(new Language(Primitive_Any_getInstance(), true))))]))), true, true, true);
-      var tmp_20 = item_11.e1z_1 == null;
-      var tmp1_safe_receiver_2 = item_11.e1z_1;
-      var tmp2_safe_receiver_1 = tmp1_safe_receiver_2 == null ? null : tmp1_safe_receiver_2.o1z_1;
-      var tmp3_elvis_lhs_1 = tmp2_safe_receiver_1 == null ? null : transform_1(tmp2_safe_receiver_1, ClassModelTransformer_getInstance(), item_11.e1z_1.p1z_1, false);
+      var tmp_20 = item_11.b1z_1 == null;
+      var tmp1_safe_receiver_2 = item_11.b1z_1;
+      var tmp2_safe_receiver_1 = tmp1_safe_receiver_2 == null ? null : tmp1_safe_receiver_2.l1z_1;
+      var tmp3_elvis_lhs_1 = tmp2_safe_receiver_1 == null ? null : transform_1(tmp2_safe_receiver_1, ClassModelTransformer_getInstance(), item_11.b1z_1.m1z_1, false);
       var tmp4_reference = new Wirespec('Content', tmp_20, VOID, VOID, new Generics(listOf_0(tmp3_elvis_lhs_1 == null ? new Language(Primitive_Unit_getInstance()) : tmp3_elvis_lhs_1)));
       var tmp_21 = listOf([tmp_18, tmp_19, new Field('content', tmp4_reference, true, true, true)]);
-      var tmp9_name_0 = className(ClassModelTransformer_getInstance(), ['Response', item_11.c1z_1, name_0(item_11.e1z_1, ClassModelTransformer_getInstance())]);
-      var tmp10_statusCode = item_11.c1z_1;
+      var tmp9_name_0 = className(ClassModelTransformer_getInstance(), ['Response', item_11.z1y_1, name_0(item_11.b1z_1, ClassModelTransformer_getInstance())]);
+      var tmp10_statusCode = item_11.z1y_1;
       var tmp_22 = new Parameter_0('status', new Language(Primitive_Integer_getInstance()));
       var tmp_23 = new Parameter_0('headers', new Language(Primitive_Map_getInstance(), false, VOID, VOID, new Generics(listOf([new Language(Primitive_String_getInstance(), false), new Language(Primitive_List_getInstance(), false, VOID, VOID, new Generics(listOf_0(new Language(Primitive_Any_getInstance(), true))))]))));
-      var tmp_24 = item_11.e1z_1 == null;
-      var tmp5_safe_receiver = item_11.e1z_1;
-      var tmp6_safe_receiver_0 = tmp5_safe_receiver == null ? null : tmp5_safe_receiver.o1z_1;
-      var tmp7_elvis_lhs = tmp6_safe_receiver_0 == null ? null : transform_1(tmp6_safe_receiver_0, ClassModelTransformer_getInstance(), item_11.e1z_1.p1z_1, false);
+      var tmp_24 = item_11.b1z_1 == null;
+      var tmp5_safe_receiver = item_11.b1z_1;
+      var tmp6_safe_receiver_0 = tmp5_safe_receiver == null ? null : tmp5_safe_receiver.l1z_1;
+      var tmp7_elvis_lhs = tmp6_safe_receiver_0 == null ? null : transform_1(tmp6_safe_receiver_0, ClassModelTransformer_getInstance(), item_11.b1z_1.m1z_1, false);
       var tmp11_parameters = listOf([tmp_22, tmp_23, new Parameter_0('content', new Wirespec('Content', tmp_24, VOID, VOID, new Generics(listOf_0(tmp7_elvis_lhs == null ? new Language(Primitive_Unit_getInstance()) : tmp7_elvis_lhs))))]);
-      var tmp8_safe_receiver_0 = item_11.e1z_1;
+      var tmp8_safe_receiver_0 = item_11.b1z_1;
       var tmp12_content = tmp8_safe_receiver_0 == null ? null : transform_0(tmp8_safe_receiver_0, ClassModelTransformer_getInstance());
       var tmp_25 = new ResponseAllArgsConstructor(tmp9_name_0, tmp11_parameters, tmp10_statusCode, tmp12_content);
-      var tmp17_name = className(ClassModelTransformer_getInstance(), ['Response', item_11.c1z_1, name_0(item_11.e1z_1, ClassModelTransformer_getInstance())]);
-      var tmp18_statusCode = item_11.c1z_1;
-      var tmp_26 = listOf_0(!Companion_getInstance_4().h1w(item_11.c1z_1) ? new Parameter_0('status', new Language(Primitive_Integer_getInstance())) : null);
+      var tmp17_name = className(ClassModelTransformer_getInstance(), ['Response', item_11.z1y_1, name_0(item_11.b1z_1, ClassModelTransformer_getInstance())]);
+      var tmp18_statusCode = item_11.z1y_1;
+      var tmp_26 = listOf_0(!Companion_getInstance_4().h1w(item_11.z1y_1) ? new Parameter_0('status', new Language(Primitive_Integer_getInstance())) : null);
       // Inline function 'kotlin.collections.map' call
-      var tmp0_map_0 = item_11.d1z_1;
+      var tmp0_map_0 = item_11.a1z_1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo_12 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_map_0, 10));
       var tmp0_iterator_14 = tmp0_map_0.v();
@@ -4053,12 +4081,12 @@
         tmp0_mapTo_12.s(tmp$ret$43);
       }
       var tmp_27 = plus(tmp_26, tmp0_mapTo_12);
-      var tmp13_safe_receiver = item_11.e1z_1;
-      var tmp14_safe_receiver = tmp13_safe_receiver == null ? null : tmp13_safe_receiver.o1z_1;
+      var tmp13_safe_receiver = item_11.b1z_1;
+      var tmp14_safe_receiver = tmp13_safe_receiver == null ? null : tmp13_safe_receiver.l1z_1;
       var tmp15_safe_receiver = tmp14_safe_receiver == null ? null : toField$default(tmp14_safe_receiver, ClassModelTransformer_getInstance(), 'body');
       var tmp19_parameters = filterNotNull(plus_0(tmp_27, tmp15_safe_receiver == null ? null : transformParameter(tmp15_safe_receiver, ClassModelTransformer_getInstance())));
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map_0 = item_11.d1z_1;
+      var tmp1_map_0 = item_11.a1z_1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo_13 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp1_map_0, 10));
       var tmp0_iterator_15 = tmp1_map_0.v();
@@ -4069,17 +4097,17 @@
         tmp$ret$46 = item_13.e1y_1.j1y_1;
         tmp0_mapTo_13.s(tmp$ret$46);
       }
-      var tmp16_safe_receiver_0 = item_11.e1z_1;
+      var tmp16_safe_receiver_0 = item_11.b1z_1;
       var tmp21_content = tmp16_safe_receiver_0 == null ? null : transform_0(tmp16_safe_receiver_0, ClassModelTransformer_getInstance());
       var tmp_28 = new ResponseParameterConstructor(tmp17_name, tmp19_parameters, tmp18_statusCode, tmp0_mapTo_13, tmp21_content);
-      var tmp25_name = className(ClassModelTransformer_getInstance(), ['Response', item_11.c1z_1]);
-      var tmp22_safe_receiver = item_11.e1z_1;
-      var tmp23_safe_receiver = tmp22_safe_receiver == null ? null : tmp22_safe_receiver.o1z_1;
-      var tmp24_elvis_lhs = tmp23_safe_receiver == null ? null : transform_1(tmp23_safe_receiver, ClassModelTransformer_getInstance(), item_11.e1z_1.p1z_1, false);
+      var tmp25_name = className(ClassModelTransformer_getInstance(), ['Response', item_11.z1y_1]);
+      var tmp22_safe_receiver = item_11.b1z_1;
+      var tmp23_safe_receiver = tmp22_safe_receiver == null ? null : tmp22_safe_receiver.l1z_1;
+      var tmp24_elvis_lhs = tmp23_safe_receiver == null ? null : transform_1(tmp23_safe_receiver, ClassModelTransformer_getInstance(), item_11.b1z_1.m1z_1, false);
       var tmp26_generics = new Generics(listOf_0(tmp24_elvis_lhs == null ? new Language(Primitive_Unit_getInstance()) : tmp24_elvis_lhs));
       var tmp_29 = new Custom(tmp25_name, false, VOID, VOID, tmp26_generics);
-      var tmp27_safe_receiver = item_11.e1z_1;
-      tmp$ret$49 = new ResponseClass(tmp_17, tmp_21, tmp_25, tmp_28, tmp_29, item_11.c1z_1, tmp27_safe_receiver == null ? null : transform_0(tmp27_safe_receiver, ClassModelTransformer_getInstance()));
+      var tmp27_safe_receiver = item_11.b1z_1;
+      tmp$ret$49 = new ResponseClass(tmp_17, tmp_21, tmp_25, tmp_28, tmp_29, item_11.z1y_1, tmp27_safe_receiver == null ? null : transform_0(tmp27_safe_receiver, ClassModelTransformer_getInstance()));
       tmp0_mapTo_11.s(tmp$ret$49);
     }
     var tmp9_supers = listOf_0(new Wirespec('Endpoint'));
@@ -4106,9 +4134,13 @@
   }
   function WrongTokenException(expected, actual) {
     Companion_getInstance_5();
-    ParserException.call(this, actual.c20_1, '' + expected.d6() + ' expected, not: ' + actual.b20_1.d20() + ' at line ' + actual.c20_1.e20_1 + ' and position ' + (actual.c20_1.f20_1 - actual.a20_1.length | 0));
+    ParserException.call(this, actual.z1z_1, '' + expected.d6() + ' expected, not: ' + actual.y1z_1.a20() + ' at line ' + actual.z1z_1.b20_1 + ' and position ' + (actual.z1z_1.c20_1 - actual.x1z_1.length | 0));
     captureStack(this, WrongTokenException);
   }
+  function DefinitionNotExistsException(referenceName, coordinates) {
+    ParserException.call(this, coordinates, 'Cannot find reference: ' + referenceName);
+    captureStack(this, DefinitionNotExistsException);
+  }
   function NullTokenException(message, coordinates) {
     ParserException.call(this, coordinates, message + ' cannot be null');
     captureStack(this, NullTokenException);
@@ -4124,15 +4156,15 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.h20_1 = coordinates;
+    this.e20_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     // Inline function 'arrow.core.NonEmptyList.map' call
     // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
     var tmp0_anonymous = _this__u8e3s4.t1q_1;
     var tmp;
-    if (tmp0_anonymous.b20_1 instanceof CustomRegex) {
-      tmp = tmp0_anonymous.i20('"' + dropLast(drop(tmp0_anonymous.a20_1, 1), 2) + '"');
+    if (tmp0_anonymous.y1z_1 instanceof CustomRegex) {
+      tmp = tmp0_anonymous.f20('"' + dropLast(drop(tmp0_anonymous.x1z_1, 1), 2) + '"');
     } else {
       tmp = tmp0_anonymous;
     }
@@ -4147,8 +4179,8 @@
       var tmp$ret$1;
       // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
       var tmp_1;
-      if (item.b20_1 instanceof CustomRegex) {
-        tmp_1 = item.i20('"' + dropLast(drop(item.a20_1, 1), 2) + '"');
+      if (item.y1z_1 instanceof CustomRegex) {
+        tmp_1 = item.f20('"' + dropLast(drop(item.x1z_1, 1), 2) + '"');
       } else {
         tmp_1 = item;
       }
@@ -4168,31 +4200,31 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof Method_0) {
-        tmp_0 = valueOf(_this__u8e3s4.l20_1.a20_1);
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof Method_0) {
+        tmp_0 = valueOf(_this__u8e3s4.i20_1.x1z_1);
       } else {
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.l20_1;
+        var tmp1_invoke = _this__u8e3s4.i20_1;
         tmp$ret$0 = new WrongTokenException(getKClass(Method_0), tmp1_invoke);
         raise.d1r(tmp$ret$0);
       }
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
+      raise.e1r(_this__u8e3s4.l20());
       var method = tmp2_also;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_subject = _this__u8e3s4.l20_1.b20_1;
+      var tmp1_subject = _this__u8e3s4.i20_1.y1z_1;
       var tmp_1;
       if (isInterface(tmp1_subject, WirespecType)) {
-        var tmp_2 = _this__u8e3s4.l20_1.b20_1;
-        tmp_1 = raise.e1r(parseReference(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.l20_1.a20_1));
+        var tmp_2 = _this__u8e3s4.i20_1.y1z_1;
+        tmp_1 = raise.e1r(parseReference(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.i20_1.x1z_1));
       } else {
         tmp_1 = null;
       }
@@ -4225,15 +4257,15 @@
       $l$loop: while (true) {
         var tmp_4;
         var tmp_5;
-        var tmp_6 = _this__u8e3s4.l20_1.b20_1;
+        var tmp_6 = _this__u8e3s4.i20_1.y1z_1;
         if (!(tmp_6 instanceof QuestionMark)) {
-          var tmp_7 = _this__u8e3s4.l20_1.b20_1;
+          var tmp_7 = _this__u8e3s4.i20_1.y1z_1;
           tmp_5 = !(tmp_7 instanceof Hash);
         } else {
           tmp_5 = false;
         }
         if (tmp_5) {
-          var tmp_8 = _this__u8e3s4.l20_1.b20_1;
+          var tmp_8 = _this__u8e3s4.i20_1.y1z_1;
           tmp_4 = !(tmp_8 instanceof Arrow);
         } else {
           tmp_4 = false;
@@ -4245,20 +4277,20 @@
       }
       var segments = tmp4_apply;
       var tmp_9;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof QuestionMark) {
-        raise.e1r(_this__u8e3s4.n20());
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof QuestionMark) {
+        raise.e1r(_this__u8e3s4.l20());
         var tmp_10;
-        if (_this__u8e3s4.l20_1.b20_1 instanceof LeftCurly) {
+        if (_this__u8e3s4.i20_1.y1z_1 instanceof LeftCurly) {
           // Inline function 'kotlin.with' call
-          var tmp5_with = $this.r20_1;
+          var tmp5_with = $this.p20_1;
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-          tmp_10 = raise.e1r(tmp5_with.t20(_this__u8e3s4)).d1y_1;
+          tmp_10 = raise.e1r(tmp5_with.r20(_this__u8e3s4)).d1y_1;
         } else {
           var tmp$ret$11;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_5();
-          var tmp7_invoke = _this__u8e3s4.l20_1;
+          var tmp7_invoke = _this__u8e3s4.i20_1;
           tmp$ret$11 = new WrongTokenException(getKClass(LeftCurly), tmp7_invoke);
           raise.d1r(tmp$ret$11);
         }
@@ -4268,20 +4300,20 @@
       }
       var queryParams = tmp_9;
       var tmp_11;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof Hash) {
-        raise.e1r(_this__u8e3s4.n20());
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof Hash) {
+        raise.e1r(_this__u8e3s4.l20());
         var tmp_12;
-        if (_this__u8e3s4.l20_1.b20_1 instanceof LeftCurly) {
+        if (_this__u8e3s4.i20_1.y1z_1 instanceof LeftCurly) {
           // Inline function 'kotlin.with' call
-          var tmp8_with = $this.r20_1;
+          var tmp8_with = $this.p20_1;
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-          tmp_12 = raise.e1r(tmp8_with.t20(_this__u8e3s4)).d1y_1;
+          tmp_12 = raise.e1r(tmp8_with.r20(_this__u8e3s4)).d1y_1;
         } else {
           var tmp$ret$14;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_5();
-          var tmp10_invoke = _this__u8e3s4.l20_1;
+          var tmp10_invoke = _this__u8e3s4.i20_1;
           tmp$ret$14 = new WrongTokenException(getKClass(LeftCurly), tmp10_invoke);
           raise.d1r(tmp$ret$14);
         }
@@ -4290,31 +4322,31 @@
         tmp_11 = emptyList();
       }
       var headers = tmp_11;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof Arrow)
-        raise.e1r(_this__u8e3s4.n20());
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof Arrow)
+        raise.e1r(_this__u8e3s4.l20());
       else {
         var tmp$ret$15;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp12_invoke = _this__u8e3s4.l20_1;
+        var tmp12_invoke = _this__u8e3s4.i20_1;
         tmp$ret$15 = new WrongTokenException(getKClass(Arrow), tmp12_invoke);
         raise.d1r(tmp$ret$15);
       }
       // Inline function 'kotlin.also' call
       var tmp_13;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof LeftCurly) {
         tmp_13 = Unit_getInstance();
       } else {
         var tmp$ret$16;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp14_invoke = _this__u8e3s4.l20_1;
+        var tmp14_invoke = _this__u8e3s4.i20_1;
         tmp$ret$16 = new WrongTokenException(getKClass(LeftCurly), tmp14_invoke);
         raise.d1r(tmp$ret$16);
       }
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
+      raise.e1r(_this__u8e3s4.l20());
       var responses = raise.e1r(parseEndpointResponses(_this__u8e3s4, $this));
       var res = new Endpoint(name, method, segments, queryParams, headers, emptyList(), requests, responses);
       raise.b1r();
@@ -4352,15 +4384,15 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegments.<anonymous>' call
-      $this.p20(_this__u8e3s4.l20_1);
-      var tmp0_subject = _this__u8e3s4.l20_1.b20_1;
+      $this.n20(_this__u8e3s4.i20_1);
+      var tmp0_subject = _this__u8e3s4.i20_1.y1z_1;
       var tmp_0;
       if (tmp0_subject instanceof Path_0) {
         // Inline function 'kotlin.also' call
-        var tmp0_also = new Literal_0(drop(_this__u8e3s4.l20_1.a20_1, 1));
+        var tmp0_also = new Literal_0(drop(_this__u8e3s4.i20_1.x1z_1, 1));
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegments.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         tmp_0 = tmp0_also;
       } else {
         if (tmp0_subject instanceof ForwardSlash) {
@@ -4369,7 +4401,7 @@
           var tmp$ret$1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_5();
-          var tmp2_invoke = _this__u8e3s4.l20_1;
+          var tmp2_invoke = _this__u8e3s4.i20_1;
           tmp$ret$1 = new WrongTokenException(getKClass(Path_0), tmp2_invoke);
           raise.d1r(tmp$ret$1);
         }
@@ -4410,66 +4442,66 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
-      if (_this__u8e3s4.l20_1.b20_1 instanceof LeftCurly)
-        raise.e1r(_this__u8e3s4.n20());
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof LeftCurly)
+        raise.e1r(_this__u8e3s4.l20());
       else {
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.l20_1;
+        var tmp1_invoke = _this__u8e3s4.i20_1;
         tmp$ret$0 = new WrongTokenException(getKClass(LeftCurly), tmp1_invoke);
         raise.d1r(tmp$ret$0);
       }
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof CustomValue) {
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomValue) {
         // Inline function 'kotlin.also' call
-        var tmp2_also = Companion_getInstance_6().q1z(_this__u8e3s4.l20_1.a20_1);
+        var tmp2_also = Companion_getInstance_6().n1z(_this__u8e3s4.i20_1.x1z_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         tmp_0 = tmp2_also;
       } else {
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp4_invoke = _this__u8e3s4.l20_1;
+        var tmp4_invoke = _this__u8e3s4.i20_1;
         tmp$ret$2 = new WrongTokenException(getKClass(CustomValue), tmp4_invoke);
         raise.d1r(tmp$ret$2);
       }
       var identifier = tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof Colon)
-        raise.e1r(_this__u8e3s4.n20());
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof Colon)
+        raise.e1r(_this__u8e3s4.l20());
       else {
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp6_invoke = _this__u8e3s4.l20_1;
+        var tmp6_invoke = _this__u8e3s4.i20_1;
         tmp$ret$3 = new WrongTokenException(getKClass(Colon), tmp6_invoke);
         raise.d1r(tmp$ret$3);
       }
-      var tmp3_subject = _this__u8e3s4.l20_1.b20_1;
+      var tmp3_subject = _this__u8e3s4.i20_1.y1z_1;
       var tmp_1;
       if (isInterface(tmp3_subject, WirespecType)) {
-        var tmp_2 = _this__u8e3s4.l20_1.b20_1;
-        tmp_1 = raise.e1r(parseReference(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.l20_1.a20_1));
+        var tmp_2 = _this__u8e3s4.i20_1.y1z_1;
+        tmp_1 = raise.e1r(parseReference(_this__u8e3s4, $this, isInterface(tmp_2, WirespecType) ? tmp_2 : THROW_CCE(), _this__u8e3s4.i20_1.x1z_1));
       } else {
         var tmp$ret$4;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp8_invoke = _this__u8e3s4.l20_1;
+        var tmp8_invoke = _this__u8e3s4.i20_1;
         tmp$ret$4 = new WrongTokenException(getKClass(WirespecType), tmp8_invoke);
         raise.d1r(tmp$ret$4);
       }
       var reference = tmp_1;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof RightCurly)
-        raise.e1r(_this__u8e3s4.n20());
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof RightCurly)
+        raise.e1r(_this__u8e3s4.l20());
       else {
         var tmp$ret$5;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp10_invoke = _this__u8e3s4.l20_1;
+        var tmp10_invoke = _this__u8e3s4.i20_1;
         tmp$ret$5 = new WrongTokenException(getKClass(RightCurly), tmp10_invoke);
         raise.d1r(tmp$ret$5);
       }
@@ -4509,40 +4541,40 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>' call
-      $this.p20(_this__u8e3s4.l20_1);
+      $this.n20(_this__u8e3s4.i20_1);
       // Inline function 'kotlin.collections.mutableListOf' call
       var responses = ArrayList_init_$Create$_0();
       $l$loop: while (true) {
-        var tmp_0 = _this__u8e3s4.l20_1.b20_1;
+        var tmp_0 = _this__u8e3s4.i20_1.y1z_1;
         if (!!(tmp_0 instanceof RightCurly)) {
           break $l$loop;
         }
-        if (_this__u8e3s4.l20_1.b20_1 instanceof StatusCode) {
-          responses.s(raise.e1r(parseEndpointResponse(_this__u8e3s4, $this, _this__u8e3s4.l20_1.a20_1)));
+        if (_this__u8e3s4.i20_1.y1z_1 instanceof StatusCode) {
+          responses.s(raise.e1r(parseEndpointResponse(_this__u8e3s4, $this, _this__u8e3s4.i20_1.x1z_1)));
         } else {
           var tmp$ret$1;
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
           Companion_getInstance_5();
-          var tmp1_invoke = _this__u8e3s4.l20_1;
+          var tmp1_invoke = _this__u8e3s4.i20_1;
           tmp$ret$1 = new WrongTokenException(getKClass(StatusCode), tmp1_invoke);
           raise.d1r(tmp$ret$1);
         }
       }
       // Inline function 'kotlin.also' call
       var tmp_1;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof RightCurly) {
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof RightCurly) {
         tmp_1 = Unit_getInstance();
       } else {
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp3_invoke = _this__u8e3s4.l20_1;
+        var tmp3_invoke = _this__u8e3s4.i20_1;
         tmp$ret$2 = new WrongTokenException(getKClass(RightCurly), tmp3_invoke);
         raise.d1r(tmp$ret$2);
       }
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
+      raise.e1r(_this__u8e3s4.l20());
       var res = toList(responses);
       raise.b1r();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -4579,28 +4611,28 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
-      if (!(_this__u8e3s4.l20_1.b20_1 instanceof Arrow)) {
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
+      if (!(_this__u8e3s4.i20_1.y1z_1 instanceof Arrow)) {
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.l20_1;
+        var tmp1_invoke = _this__u8e3s4.i20_1;
         tmp$ret$0 = new WrongTokenException(getKClass(Arrow), tmp1_invoke);
         raise.d1r(tmp$ret$0);
       }
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
-      var tmp1_subject = _this__u8e3s4.l20_1.b20_1;
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
+      var tmp1_subject = _this__u8e3s4.i20_1.y1z_1;
       var tmp_0;
       if (isInterface(tmp1_subject, WirespecType)) {
-        var tmp_1 = _this__u8e3s4.l20_1.b20_1;
-        tmp_0 = raise.e1r(parseContent(_this__u8e3s4, $this, isInterface(tmp_1, WirespecType) ? tmp_1 : THROW_CCE(), _this__u8e3s4.l20_1.a20_1));
+        var tmp_1 = _this__u8e3s4.i20_1.y1z_1;
+        tmp_0 = raise.e1r(parseContent(_this__u8e3s4, $this, isInterface(tmp_1, WirespecType) ? tmp_1 : THROW_CCE(), _this__u8e3s4.i20_1.x1z_1));
       } else {
         var tmp$ret$1;
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp3_invoke = _this__u8e3s4.l20_1;
+        var tmp3_invoke = _this__u8e3s4.i20_1;
         tmp$ret$1 = new WrongTokenException(getKClass(WirespecType), tmp3_invoke);
         raise.d1r(tmp$ret$1);
       }
@@ -4641,7 +4673,7 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseContent.<anonymous>' call
-      $this.p20(_this__u8e3s4.l20_1);
+      $this.n20(_this__u8e3s4.i20_1);
       var res = new Content_0('application/json', raise.e1r(parseReference(_this__u8e3s4, $this, wsType, value)));
       raise.b1r();
       // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -4678,15 +4710,16 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseReference.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
+      var previousToken = _this__u8e3s4.i20_1;
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.l20_1.b20_1;
+      var tmp_0 = _this__u8e3s4.i20_1.y1z_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseReference.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
       var isIterable = tmp0_also;
       var tmp_1;
       if (wsType instanceof WsString) {
@@ -4705,6 +4738,7 @@
                 tmp_1 = new Unit(isIterable);
               } else {
                 if (wsType instanceof CustomType) {
+                  raise.e1r(_this__u8e3s4.s20(previousToken));
                   tmp_1 = new Custom_0(value, isIterable);
                 } else {
                   noWhenBranchMatchedException();
@@ -4741,9 +4775,9 @@
   }
   function EndpointParser(logger) {
     AbstractParser.call(this, logger);
-    this.r20_1 = new TypeParser(logger);
+    this.p20_1 = new TypeParser(logger);
   }
-  protoOf(EndpointParser).u20 = function (_this__u8e3s4) {
+  protoOf(EndpointParser).t20 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4754,20 +4788,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      this.p20(_this__u8e3s4.l20_1);
+      raise.e1r(_this__u8e3s4.l20());
+      this.n20(_this__u8e3s4.i20_1);
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof CustomType) {
-        tmp_0 = raise.e1r(parseEndpointDefinition(_this__u8e3s4, this, _this__u8e3s4.l20_1.a20_1));
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomType) {
+        tmp_0 = raise.e1r(parseEndpointDefinition(_this__u8e3s4, this, _this__u8e3s4.i20_1.x1z_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.l20_1;
+        var tmp1_invoke = _this__u8e3s4.i20_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp2_also);
       }
       var res = tmp_0;
@@ -4806,37 +4840,37 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof LeftCurly) {
         tmp_0 = new Enum_0(typeName, raise.e1r(parseEnumTypeEntries(_this__u8e3s4, $this)));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.l20_1;
+        var tmp1_invoke = _this__u8e3s4.i20_1;
         var tmp2_also = new WrongTokenException(getKClass(LeftCurly), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp2_also);
       }
       var tmp3_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-      if (_this__u8e3s4.l20_1.b20_1 instanceof RightCurly)
-        raise.e1r(_this__u8e3s4.n20());
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof RightCurly)
+        raise.e1r(_this__u8e3s4.l20());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke_0 = _this__u8e3s4.l20_1;
+        var tmp1_invoke_0 = _this__u8e3s4.i20_1;
         var tmp2_also_0 = new WrongTokenException(getKClass(RightCurly), tmp1_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp2_also_0);
       }
       var res = tmp3_also;
@@ -4875,34 +4909,34 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof CustomType) {
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomType) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var tmp0_apply = ArrayList_init_$Create$_0();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        tmp0_apply.s(_this__u8e3s4.l20_1.a20_1);
-        raise.e1r(_this__u8e3s4.n20());
-        while (equals(_this__u8e3s4.l20_1.b20_1, Comma_getInstance())) {
-          raise.e1r(_this__u8e3s4.n20());
-          if (_this__u8e3s4.l20_1.b20_1 instanceof CustomType) {
+        tmp0_apply.s(_this__u8e3s4.i20_1.x1z_1);
+        raise.e1r(_this__u8e3s4.l20());
+        while (equals(_this__u8e3s4.i20_1.y1z_1, Comma_getInstance())) {
+          raise.e1r(_this__u8e3s4.l20());
+          if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomType) {
             // Inline function 'kotlin.also' call
-            tmp0_apply.s(_this__u8e3s4.l20_1.a20_1);
+            tmp0_apply.s(_this__u8e3s4.i20_1.x1z_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.e1r(_this__u8e3s4.n20());
+            raise.e1r(_this__u8e3s4.l20());
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
             Companion_getInstance_5();
-            var tmp2_invoke = _this__u8e3s4.l20_1;
+            var tmp2_invoke = _this__u8e3s4.i20_1;
             var tmp3_also = new WrongTokenException(getKClass(CustomType), tmp2_invoke);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.e1r(_this__u8e3s4.n20());
+            raise.e1r(_this__u8e3s4.l20());
             raise.d1r(tmp3_also);
           }
         }
@@ -4911,11 +4945,11 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp2_invoke_0 = _this__u8e3s4.l20_1;
+        var tmp2_invoke_0 = _this__u8e3s4.i20_1;
         var tmp3_also_0 = new WrongTokenException(getKClass(CustomType), tmp2_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp3_also_0);
       }
       var res = toSet(tmp_0);
@@ -4946,7 +4980,7 @@
   function EnumParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(EnumParser).w20 = function (_this__u8e3s4) {
+  protoOf(EnumParser).v20 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -4957,20 +4991,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      this.p20(_this__u8e3s4.l20_1);
+      raise.e1r(_this__u8e3s4.l20());
+      this.n20(_this__u8e3s4.i20_1);
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof CustomType) {
-        tmp_0 = raise.e1r(parseEnumTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.l20_1.a20_1));
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomType) {
+        tmp_0 = raise.e1r(parseEnumTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.i20_1.x1z_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.l20_1;
+        var tmp1_invoke = _this__u8e3s4.i20_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp2_also);
       }
       var res = tmp_0;
@@ -5001,7 +5035,7 @@
   function Companion_5() {
     Companion_instance_5 = this;
   }
-  protoOf(Companion_5).q1z = function (s) {
+  protoOf(Companion_5).n1z = function (s) {
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5051,29 +5085,32 @@
   }
   function Any(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.x20_1 = isIterable;
-    this.y20_1 = isMap;
+    this.w20_1 = isIterable;
+    this.x20_1 = isMap;
   }
   protoOf(Any).g1s = function () {
+    return this.w20_1;
+  };
+  protoOf(Any).p1z = function () {
     return this.x20_1;
   };
-  protoOf(Any).s1z = function () {
-    return this.y20_1;
+  protoOf(Any).p2 = function () {
+    return 'Any';
   };
-  protoOf(Any).z20 = function (isIterable, isMap) {
+  protoOf(Any).y20 = function (isIterable, isMap) {
     return new Any(isIterable, isMap);
   };
-  protoOf(Any).a21 = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.x20_1 : isIterable;
-    isMap = isMap === VOID ? this.y20_1 : isMap;
-    return $super === VOID ? this.z20(isIterable, isMap) : $super.z20.call(this, isIterable, isMap);
+  protoOf(Any).z20 = function (isIterable, isMap, $super) {
+    isIterable = isIterable === VOID ? this.w20_1 : isIterable;
+    isMap = isMap === VOID ? this.x20_1 : isMap;
+    return $super === VOID ? this.y20(isIterable, isMap) : $super.y20.call(this, isIterable, isMap);
   };
   protoOf(Any).toString = function () {
-    return 'Any(isIterable=' + this.x20_1 + ', isMap=' + this.y20_1 + ')';
+    return 'Any(isIterable=' + this.w20_1 + ', isMap=' + this.x20_1 + ')';
   };
   protoOf(Any).hashCode = function () {
-    var result = this.x20_1 | 0;
-    result = imul(result, 31) + (this.y20_1 | 0) | 0;
+    var result = this.w20_1 | 0;
+    result = imul(result, 31) + (this.x20_1 | 0) | 0;
     return result;
   };
   protoOf(Any).equals = function (other) {
@@ -5082,37 +5119,40 @@
     if (!(other instanceof Any))
       return false;
     var tmp0_other_with_cast = other instanceof Any ? other : THROW_CCE();
-    if (!(this.x20_1 === tmp0_other_with_cast.x20_1))
+    if (!(this.w20_1 === tmp0_other_with_cast.w20_1))
       return false;
-    if (!(this.y20_1 === tmp0_other_with_cast.y20_1))
+    if (!(this.x20_1 === tmp0_other_with_cast.x20_1))
       return false;
     return true;
   };
   function Unit(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.b21_1 = isIterable;
-    this.c21_1 = isMap;
+    this.a21_1 = isIterable;
+    this.b21_1 = isMap;
   }
   protoOf(Unit).g1s = function () {
+    return this.a21_1;
+  };
+  protoOf(Unit).p1z = function () {
     return this.b21_1;
   };
-  protoOf(Unit).s1z = function () {
-    return this.c21_1;
+  protoOf(Unit).p2 = function () {
+    return 'Unit';
   };
-  protoOf(Unit).z20 = function (isIterable, isMap) {
+  protoOf(Unit).y20 = function (isIterable, isMap) {
     return new Unit(isIterable, isMap);
   };
-  protoOf(Unit).d21 = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.b21_1 : isIterable;
-    isMap = isMap === VOID ? this.c21_1 : isMap;
-    return $super === VOID ? this.z20(isIterable, isMap) : $super.z20.call(this, isIterable, isMap);
+  protoOf(Unit).c21 = function (isIterable, isMap, $super) {
+    isIterable = isIterable === VOID ? this.a21_1 : isIterable;
+    isMap = isMap === VOID ? this.b21_1 : isMap;
+    return $super === VOID ? this.y20(isIterable, isMap) : $super.y20.call(this, isIterable, isMap);
   };
   protoOf(Unit).toString = function () {
-    return 'Unit(isIterable=' + this.b21_1 + ', isMap=' + this.c21_1 + ')';
+    return 'Unit(isIterable=' + this.a21_1 + ', isMap=' + this.b21_1 + ')';
   };
   protoOf(Unit).hashCode = function () {
-    var result = this.b21_1 | 0;
-    result = imul(result, 31) + (this.c21_1 | 0) | 0;
+    var result = this.a21_1 | 0;
+    result = imul(result, 31) + (this.b21_1 | 0) | 0;
     return result;
   };
   protoOf(Unit).equals = function (other) {
@@ -5121,43 +5161,43 @@
     if (!(other instanceof Unit))
       return false;
     var tmp0_other_with_cast = other instanceof Unit ? other : THROW_CCE();
-    if (!(this.b21_1 === tmp0_other_with_cast.b21_1))
+    if (!(this.a21_1 === tmp0_other_with_cast.a21_1))
       return false;
-    if (!(this.c21_1 === tmp0_other_with_cast.c21_1))
+    if (!(this.b21_1 === tmp0_other_with_cast.b21_1))
       return false;
     return true;
   };
   function Custom_0(value, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.n1y_1 = value;
-    this.o1y_1 = isIterable;
-    this.p1y_1 = isMap;
+    this.d21_1 = value;
+    this.e21_1 = isIterable;
+    this.f21_1 = isMap;
   }
   protoOf(Custom_0).p2 = function () {
-    return this.n1y_1;
+    return this.d21_1;
   };
   protoOf(Custom_0).g1s = function () {
-    return this.o1y_1;
+    return this.e21_1;
   };
-  protoOf(Custom_0).s1z = function () {
-    return this.p1y_1;
+  protoOf(Custom_0).p1z = function () {
+    return this.f21_1;
   };
-  protoOf(Custom_0).e21 = function (value, isIterable, isMap) {
+  protoOf(Custom_0).g21 = function (value, isIterable, isMap) {
     return new Custom_0(value, isIterable, isMap);
   };
-  protoOf(Custom_0).f21 = function (value, isIterable, isMap, $super) {
-    value = value === VOID ? this.n1y_1 : value;
-    isIterable = isIterable === VOID ? this.o1y_1 : isIterable;
-    isMap = isMap === VOID ? this.p1y_1 : isMap;
-    return $super === VOID ? this.e21(value, isIterable, isMap) : $super.e21.call(this, value, isIterable, isMap);
+  protoOf(Custom_0).h21 = function (value, isIterable, isMap, $super) {
+    value = value === VOID ? this.d21_1 : value;
+    isIterable = isIterable === VOID ? this.e21_1 : isIterable;
+    isMap = isMap === VOID ? this.f21_1 : isMap;
+    return $super === VOID ? this.g21(value, isIterable, isMap) : $super.g21.call(this, value, isIterable, isMap);
   };
   protoOf(Custom_0).toString = function () {
-    return 'Custom(value=' + this.n1y_1 + ', isIterable=' + this.o1y_1 + ', isMap=' + this.p1y_1 + ')';
+    return 'Custom(value=' + this.d21_1 + ', isIterable=' + this.e21_1 + ', isMap=' + this.f21_1 + ')';
   };
   protoOf(Custom_0).hashCode = function () {
-    var result = getStringHashCode(this.n1y_1);
-    result = imul(result, 31) + (this.o1y_1 | 0) | 0;
-    result = imul(result, 31) + (this.p1y_1 | 0) | 0;
+    var result = getStringHashCode(this.d21_1);
+    result = imul(result, 31) + (this.e21_1 | 0) | 0;
+    result = imul(result, 31) + (this.f21_1 | 0) | 0;
     return result;
   };
   protoOf(Custom_0).equals = function (other) {
@@ -5166,11 +5206,11 @@
     if (!(other instanceof Custom_0))
       return false;
     var tmp0_other_with_cast = other instanceof Custom_0 ? other : THROW_CCE();
-    if (!(this.n1y_1 === tmp0_other_with_cast.n1y_1))
+    if (!(this.d21_1 === tmp0_other_with_cast.d21_1))
       return false;
-    if (!(this.o1y_1 === tmp0_other_with_cast.o1y_1))
+    if (!(this.e21_1 === tmp0_other_with_cast.e21_1))
       return false;
-    if (!(this.p1y_1 === tmp0_other_with_cast.p1y_1))
+    if (!(this.f21_1 === tmp0_other_with_cast.f21_1))
       return false;
     return true;
   };
@@ -5184,17 +5224,20 @@
   protoOf(Primitive_0).g1s = function () {
     return this.l1y_1;
   };
-  protoOf(Primitive_0).s1z = function () {
+  protoOf(Primitive_0).p1z = function () {
     return this.m1y_1;
   };
-  protoOf(Primitive_0).g21 = function (type, isIterable, isMap) {
+  protoOf(Primitive_0).p2 = function () {
+    return this.k1y_1.b9_1;
+  };
+  protoOf(Primitive_0).i21 = function (type, isIterable, isMap) {
     return new Primitive_0(type, isIterable, isMap);
   };
-  protoOf(Primitive_0).h21 = function (type, isIterable, isMap, $super) {
+  protoOf(Primitive_0).j21 = function (type, isIterable, isMap, $super) {
     type = type === VOID ? this.k1y_1 : type;
     isIterable = isIterable === VOID ? this.l1y_1 : isIterable;
     isMap = isMap === VOID ? this.m1y_1 : isMap;
-    return $super === VOID ? this.g21(type, isIterable, isMap) : $super.g21.call(this, type, isIterable, isMap);
+    return $super === VOID ? this.i21(type, isIterable, isMap) : $super.i21.call(this, type, isIterable, isMap);
   };
   protoOf(Primitive_0).toString = function () {
     return 'Primitive(type=' + this.k1y_1 + ', isIterable=' + this.l1y_1 + ', isMap=' + this.m1y_1 + ')';
@@ -5247,14 +5290,14 @@
     this.f1y_1 = reference;
     this.g1y_1 = isNullable;
   }
-  protoOf(Field_0).i21 = function (identifier, reference, isNullable) {
+  protoOf(Field_0).k21 = function (identifier, reference, isNullable) {
     return new Field_0(identifier, reference, isNullable);
   };
-  protoOf(Field_0).r1z = function (identifier, reference, isNullable, $super) {
+  protoOf(Field_0).o1z = function (identifier, reference, isNullable, $super) {
     identifier = identifier === VOID ? this.e1y_1 : identifier;
     reference = reference === VOID ? this.f1y_1 : reference;
     isNullable = isNullable === VOID ? this.g1y_1 : isNullable;
-    return $super === VOID ? this.i21(identifier, reference, isNullable) : $super.i21.call(this, identifier, reference, isNullable);
+    return $super === VOID ? this.k21(identifier, reference, isNullable) : $super.k21.call(this, identifier, reference, isNullable);
   };
   protoOf(Field_0).toString = function () {
     return 'Field(identifier=' + this.e1y_1 + ', reference=' + this.f1y_1 + ', isNullable=' + this.g1y_1 + ')';
@@ -5384,16 +5427,16 @@
   }
   var $ENTRIES;
   function Literal_0(value) {
-    this.z1y_1 = value;
+    this.w1y_1 = value;
   }
   protoOf(Literal_0).p2 = function () {
-    return this.z1y_1;
+    return this.w1y_1;
   };
   protoOf(Literal_0).toString = function () {
-    return 'Literal(value=' + this.z1y_1 + ')';
+    return 'Literal(value=' + this.w1y_1 + ')';
   };
   protoOf(Literal_0).hashCode = function () {
-    return getStringHashCode(this.z1y_1);
+    return getStringHashCode(this.w1y_1);
   };
   protoOf(Literal_0).equals = function (other) {
     if (this === other)
@@ -5401,20 +5444,20 @@
     if (!(other instanceof Literal_0))
       return false;
     var tmp0_other_with_cast = other instanceof Literal_0 ? other : THROW_CCE();
-    if (!(this.z1y_1 === tmp0_other_with_cast.z1y_1))
+    if (!(this.w1y_1 === tmp0_other_with_cast.w1y_1))
       return false;
     return true;
   };
   function Param(identifier, reference) {
-    this.u1y_1 = identifier;
-    this.v1y_1 = reference;
+    this.r1y_1 = identifier;
+    this.s1y_1 = reference;
   }
   protoOf(Param).toString = function () {
-    return 'Param(identifier=' + this.u1y_1 + ', reference=' + this.v1y_1 + ')';
+    return 'Param(identifier=' + this.r1y_1 + ', reference=' + this.s1y_1 + ')';
   };
   protoOf(Param).hashCode = function () {
-    var result = this.u1y_1.hashCode();
-    result = imul(result, 31) + hashCode(this.v1y_1) | 0;
+    var result = this.r1y_1.hashCode();
+    result = imul(result, 31) + hashCode(this.s1y_1) | 0;
     return result;
   };
   protoOf(Param).equals = function (other) {
@@ -5423,9 +5466,9 @@
     if (!(other instanceof Param))
       return false;
     var tmp0_other_with_cast = other instanceof Param ? other : THROW_CCE();
-    if (!this.u1y_1.equals(tmp0_other_with_cast.u1y_1))
+    if (!this.r1y_1.equals(tmp0_other_with_cast.r1y_1))
       return false;
-    if (!equals(this.v1y_1, tmp0_other_with_cast.v1y_1))
+    if (!equals(this.s1y_1, tmp0_other_with_cast.s1y_1))
       return false;
     return true;
   };
@@ -5433,13 +5476,13 @@
     Enum.call(this, name, ordinal);
   }
   function Request(content) {
-    this.a1z_1 = content;
+    this.x1y_1 = content;
   }
   protoOf(Request).toString = function () {
-    return 'Request(content=' + this.a1z_1 + ')';
+    return 'Request(content=' + this.x1y_1 + ')';
   };
   protoOf(Request).hashCode = function () {
-    return this.a1z_1 == null ? 0 : this.a1z_1.hashCode();
+    return this.x1y_1 == null ? 0 : this.x1y_1.hashCode();
   };
   protoOf(Request).equals = function (other) {
     if (this === other)
@@ -5447,22 +5490,22 @@
     if (!(other instanceof Request))
       return false;
     var tmp0_other_with_cast = other instanceof Request ? other : THROW_CCE();
-    if (!equals(this.a1z_1, tmp0_other_with_cast.a1z_1))
+    if (!equals(this.x1y_1, tmp0_other_with_cast.x1y_1))
       return false;
     return true;
   };
   function Response(status, headers, content) {
-    this.c1z_1 = status;
-    this.d1z_1 = headers;
-    this.e1z_1 = content;
+    this.z1y_1 = status;
+    this.a1z_1 = headers;
+    this.b1z_1 = content;
   }
   protoOf(Response).toString = function () {
-    return 'Response(status=' + this.c1z_1 + ', headers=' + this.d1z_1 + ', content=' + this.e1z_1 + ')';
+    return 'Response(status=' + this.z1y_1 + ', headers=' + this.a1z_1 + ', content=' + this.b1z_1 + ')';
   };
   protoOf(Response).hashCode = function () {
-    var result = getStringHashCode(this.c1z_1);
-    result = imul(result, 31) + hashCode(this.d1z_1) | 0;
-    result = imul(result, 31) + (this.e1z_1 == null ? 0 : this.e1z_1.hashCode()) | 0;
+    var result = getStringHashCode(this.z1y_1);
+    result = imul(result, 31) + hashCode(this.a1z_1) | 0;
+    result = imul(result, 31) + (this.b1z_1 == null ? 0 : this.b1z_1.hashCode()) | 0;
     return result;
   };
   protoOf(Response).equals = function (other) {
@@ -5471,27 +5514,27 @@
     if (!(other instanceof Response))
       return false;
     var tmp0_other_with_cast = other instanceof Response ? other : THROW_CCE();
-    if (!(this.c1z_1 === tmp0_other_with_cast.c1z_1))
+    if (!(this.z1y_1 === tmp0_other_with_cast.z1y_1))
       return false;
-    if (!equals(this.d1z_1, tmp0_other_with_cast.d1z_1))
+    if (!equals(this.a1z_1, tmp0_other_with_cast.a1z_1))
       return false;
-    if (!equals(this.e1z_1, tmp0_other_with_cast.e1z_1))
+    if (!equals(this.b1z_1, tmp0_other_with_cast.b1z_1))
       return false;
     return true;
   };
   function Content_0(type, reference, isNullable) {
     isNullable = isNullable === VOID ? false : isNullable;
-    this.n1z_1 = type;
-    this.o1z_1 = reference;
-    this.p1z_1 = isNullable;
+    this.k1z_1 = type;
+    this.l1z_1 = reference;
+    this.m1z_1 = isNullable;
   }
   protoOf(Content_0).toString = function () {
-    return 'Content(type=' + this.n1z_1 + ', reference=' + this.o1z_1 + ', isNullable=' + this.p1z_1 + ')';
+    return 'Content(type=' + this.k1z_1 + ', reference=' + this.l1z_1 + ', isNullable=' + this.m1z_1 + ')';
   };
   protoOf(Content_0).hashCode = function () {
-    var result = getStringHashCode(this.n1z_1);
-    result = imul(result, 31) + hashCode(this.o1z_1) | 0;
-    result = imul(result, 31) + (this.p1z_1 | 0) | 0;
+    var result = getStringHashCode(this.k1z_1);
+    result = imul(result, 31) + hashCode(this.l1z_1) | 0;
+    result = imul(result, 31) + (this.m1z_1 | 0) | 0;
     return result;
   };
   protoOf(Content_0).equals = function (other) {
@@ -5500,11 +5543,11 @@
     if (!(other instanceof Content_0))
       return false;
     var tmp0_other_with_cast = other instanceof Content_0 ? other : THROW_CCE();
-    if (!(this.n1z_1 === tmp0_other_with_cast.n1z_1))
+    if (!(this.k1z_1 === tmp0_other_with_cast.k1z_1))
       return false;
-    if (!equals(this.o1z_1, tmp0_other_with_cast.o1z_1))
+    if (!equals(this.l1z_1, tmp0_other_with_cast.l1z_1))
       return false;
-    if (!(this.p1z_1 === tmp0_other_with_cast.p1z_1))
+    if (!(this.m1z_1 === tmp0_other_with_cast.m1z_1))
       return false;
     return true;
   };
@@ -5541,30 +5584,30 @@
     return Method_TRACE_instance;
   }
   function Endpoint(name, method, path, query, headers, cookies, requests, responses) {
-    this.f1z_1 = name;
-    this.g1z_1 = method;
-    this.h1z_1 = path;
-    this.i1z_1 = query;
-    this.j1z_1 = headers;
-    this.k1z_1 = cookies;
-    this.l1z_1 = requests;
-    this.m1z_1 = responses;
+    this.c1z_1 = name;
+    this.d1z_1 = method;
+    this.e1z_1 = path;
+    this.f1z_1 = query;
+    this.g1z_1 = headers;
+    this.h1z_1 = cookies;
+    this.i1z_1 = requests;
+    this.j1z_1 = responses;
   }
   protoOf(Endpoint).va = function () {
-    return this.f1z_1;
+    return this.c1z_1;
   };
   protoOf(Endpoint).toString = function () {
-    return 'Endpoint(name=' + this.f1z_1 + ', method=' + this.g1z_1 + ', path=' + this.h1z_1 + ', query=' + this.i1z_1 + ', headers=' + this.j1z_1 + ', cookies=' + this.k1z_1 + ', requests=' + this.l1z_1 + ', responses=' + this.m1z_1 + ')';
+    return 'Endpoint(name=' + this.c1z_1 + ', method=' + this.d1z_1 + ', path=' + this.e1z_1 + ', query=' + this.f1z_1 + ', headers=' + this.g1z_1 + ', cookies=' + this.h1z_1 + ', requests=' + this.i1z_1 + ', responses=' + this.j1z_1 + ')';
   };
   protoOf(Endpoint).hashCode = function () {
-    var result = getStringHashCode(this.f1z_1);
-    result = imul(result, 31) + this.g1z_1.hashCode() | 0;
+    var result = getStringHashCode(this.c1z_1);
+    result = imul(result, 31) + this.d1z_1.hashCode() | 0;
+    result = imul(result, 31) + hashCode(this.e1z_1) | 0;
+    result = imul(result, 31) + hashCode(this.f1z_1) | 0;
+    result = imul(result, 31) + hashCode(this.g1z_1) | 0;
     result = imul(result, 31) + hashCode(this.h1z_1) | 0;
     result = imul(result, 31) + hashCode(this.i1z_1) | 0;
     result = imul(result, 31) + hashCode(this.j1z_1) | 0;
-    result = imul(result, 31) + hashCode(this.k1z_1) | 0;
-    result = imul(result, 31) + hashCode(this.l1z_1) | 0;
-    result = imul(result, 31) + hashCode(this.m1z_1) | 0;
     return result;
   };
   protoOf(Endpoint).equals = function (other) {
@@ -5573,21 +5616,21 @@
     if (!(other instanceof Endpoint))
       return false;
     var tmp0_other_with_cast = other instanceof Endpoint ? other : THROW_CCE();
-    if (!(this.f1z_1 === tmp0_other_with_cast.f1z_1))
+    if (!(this.c1z_1 === tmp0_other_with_cast.c1z_1))
       return false;
-    if (!this.g1z_1.equals(tmp0_other_with_cast.g1z_1))
+    if (!this.d1z_1.equals(tmp0_other_with_cast.d1z_1))
       return false;
-    if (!equals(this.h1z_1, tmp0_other_with_cast.h1z_1))
+    if (!equals(this.e1z_1, tmp0_other_with_cast.e1z_1))
       return false;
-    if (!equals(this.i1z_1, tmp0_other_with_cast.i1z_1))
+    if (!equals(this.f1z_1, tmp0_other_with_cast.f1z_1))
       return false;
-    if (!equals(this.j1z_1, tmp0_other_with_cast.j1z_1))
+    if (!equals(this.g1z_1, tmp0_other_with_cast.g1z_1))
       return false;
-    if (!equals(this.k1z_1, tmp0_other_with_cast.k1z_1))
+    if (!equals(this.h1z_1, tmp0_other_with_cast.h1z_1))
       return false;
-    if (!equals(this.l1z_1, tmp0_other_with_cast.l1z_1))
+    if (!equals(this.i1z_1, tmp0_other_with_cast.i1z_1))
       return false;
-    if (!equals(this.m1z_1, tmp0_other_with_cast.m1z_1))
+    if (!equals(this.j1z_1, tmp0_other_with_cast.j1z_1))
       return false;
     return true;
   };
@@ -5619,16 +5662,16 @@
     return true;
   };
   function Validator_0(value) {
-    this.t1y_1 = value;
+    this.q1y_1 = value;
   }
   protoOf(Validator_0).p2 = function () {
-    return this.t1y_1;
+    return this.q1y_1;
   };
   protoOf(Validator_0).toString = function () {
-    return 'Validator(value=' + this.t1y_1 + ')';
+    return 'Validator(value=' + this.q1y_1 + ')';
   };
   protoOf(Validator_0).hashCode = function () {
-    return getStringHashCode(this.t1y_1);
+    return getStringHashCode(this.q1y_1);
   };
   protoOf(Validator_0).equals = function (other) {
     if (this === other)
@@ -5636,23 +5679,23 @@
     if (!(other instanceof Validator_0))
       return false;
     var tmp0_other_with_cast = other instanceof Validator_0 ? other : THROW_CCE();
-    if (!(this.t1y_1 === tmp0_other_with_cast.t1y_1))
+    if (!(this.q1y_1 === tmp0_other_with_cast.q1y_1))
       return false;
     return true;
   };
   function Refined(name, validator) {
-    this.q1y_1 = name;
-    this.r1y_1 = validator;
+    this.n1y_1 = name;
+    this.o1y_1 = validator;
   }
   protoOf(Refined).va = function () {
-    return this.q1y_1;
+    return this.n1y_1;
   };
   protoOf(Refined).toString = function () {
-    return 'Refined(name=' + this.q1y_1 + ', validator=' + this.r1y_1 + ')';
+    return 'Refined(name=' + this.n1y_1 + ', validator=' + this.o1y_1 + ')';
   };
   protoOf(Refined).hashCode = function () {
-    var result = getStringHashCode(this.q1y_1);
-    result = imul(result, 31) + this.r1y_1.hashCode() | 0;
+    var result = getStringHashCode(this.n1y_1);
+    result = imul(result, 31) + this.o1y_1.hashCode() | 0;
     return result;
   };
   protoOf(Refined).equals = function (other) {
@@ -5661,25 +5704,25 @@
     if (!(other instanceof Refined))
       return false;
     var tmp0_other_with_cast = other instanceof Refined ? other : THROW_CCE();
-    if (!(this.q1y_1 === tmp0_other_with_cast.q1y_1))
+    if (!(this.n1y_1 === tmp0_other_with_cast.n1y_1))
       return false;
-    if (!this.r1y_1.equals(tmp0_other_with_cast.r1y_1))
+    if (!this.o1y_1.equals(tmp0_other_with_cast.o1y_1))
       return false;
     return true;
   };
   function Union(name, entries) {
-    this.t1z_1 = name;
-    this.u1z_1 = entries;
+    this.q1z_1 = name;
+    this.r1z_1 = entries;
   }
   protoOf(Union).va = function () {
-    return this.t1z_1;
+    return this.q1z_1;
   };
   protoOf(Union).toString = function () {
-    return 'Union(name=' + this.t1z_1 + ', entries=' + this.u1z_1 + ')';
+    return 'Union(name=' + this.q1z_1 + ', entries=' + this.r1z_1 + ')';
   };
   protoOf(Union).hashCode = function () {
-    var result = getStringHashCode(this.t1z_1);
-    result = imul(result, 31) + hashCode(this.u1z_1) | 0;
+    var result = getStringHashCode(this.q1z_1);
+    result = imul(result, 31) + hashCode(this.r1z_1) | 0;
     return result;
   };
   protoOf(Union).equals = function (other) {
@@ -5688,9 +5731,9 @@
     if (!(other instanceof Union))
       return false;
     var tmp0_other_with_cast = other instanceof Union ? other : THROW_CCE();
-    if (!(this.t1z_1 === tmp0_other_with_cast.t1z_1))
+    if (!(this.q1z_1 === tmp0_other_with_cast.q1z_1))
       return false;
-    if (!equals(this.u1z_1, tmp0_other_with_cast.u1z_1))
+    if (!equals(this.r1z_1, tmp0_other_with_cast.r1z_1))
       return false;
     return true;
   };
@@ -5787,11 +5830,11 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>' call
-      $this.p20(_this__u8e3s4.l20_1);
-      var tmp0_subject = _this__u8e3s4.l20_1.b20_1;
+      $this.n20(_this__u8e3s4.i20_1);
+      var tmp0_subject = _this__u8e3s4.i20_1.y1z_1;
       var tmp_0;
       if (isInterface(tmp0_subject, WirespecDefinition)) {
-        var tmp_1 = _this__u8e3s4.l20_1.b20_1;
+        var tmp_1 = _this__u8e3s4.i20_1.y1z_1;
         var tmp1_subject = isInterface(tmp_1, WirespecDefinition) ? tmp_1 : THROW_CCE();
         var tmp_2;
         if (tmp1_subject instanceof WsTypeDef) {
@@ -5799,7 +5842,7 @@
           // Inline function 'kotlin.with' call
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-          tmp$ret$1 = $this.s1r_1.j21(_this__u8e3s4);
+          tmp$ret$1 = $this.s1r_1.l21(_this__u8e3s4);
           tmp_2 = raise.e1r(tmp$ret$1);
         } else {
           if (tmp1_subject instanceof WsEnumTypeDef) {
@@ -5807,7 +5850,7 @@
             // Inline function 'kotlin.with' call
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            tmp$ret$3 = $this.t1r_1.w20(_this__u8e3s4);
+            tmp$ret$3 = $this.t1r_1.v20(_this__u8e3s4);
             tmp_2 = raise.e1r(tmp$ret$3);
           } else {
             if (tmp1_subject instanceof WsEndpointDef) {
@@ -5815,7 +5858,7 @@
               // Inline function 'kotlin.with' call
               // Inline function 'kotlin.contracts.contract' call
               // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-              tmp$ret$5 = $this.u1r_1.u20(_this__u8e3s4);
+              tmp$ret$5 = $this.u1r_1.t20(_this__u8e3s4);
               tmp_2 = raise.e1r(tmp$ret$5);
             } else {
               noWhenBranchMatchedException();
@@ -5827,11 +5870,11 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp4_invoke = _this__u8e3s4.l20_1;
+        var tmp4_invoke = _this__u8e3s4.i20_1;
         var tmp5_also = new WrongTokenException(getKClass(WirespecDefinition), tmp4_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp5_also);
       }
       var res = tmp_0;
@@ -5866,13 +5909,13 @@
     this.u1r_1 = new EndpointParser(logger);
   }
   protoOf(Parser).v1r = function (tokens) {
-    return parse_0(toProvider(removeWhiteSpace(tokens), this.o20_1), this);
+    return parse_0(toProvider(removeWhiteSpace(tokens), this.m20_1), this);
   };
   function AbstractParser(logger) {
-    this.o20_1 = logger;
+    this.m20_1 = logger;
   }
-  protoOf(AbstractParser).p20 = function (_this__u8e3s4) {
-    return this.o20_1.k1r('Parsing ' + _this__u8e3s4.b20_1 + ' at line ' + _this__u8e3s4.c20_1.e20_1 + ' position ' + _this__u8e3s4.c20_1.f20_1);
+  protoOf(AbstractParser).n20 = function (_this__u8e3s4) {
+    return this.m20_1.k1r('Parsing ' + _this__u8e3s4.y1z_1 + ' at line ' + _this__u8e3s4.z1z_1.b20_1 + ' position ' + _this__u8e3s4.z1z_1.c20_1);
   };
   function printTokens($this, previousToken) {
     var tmp;
@@ -5882,15 +5925,15 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp = "Eating: '" + previousToken.a20_1 + "', ";
+      tmp = "Eating: '" + previousToken.x1z_1 + "', ";
     }
     var tmp1_elvis_lhs = tmp;
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-    var curr = "Current: '" + $this.l20_1.a20_1 + "'";
-    var tmp2_safe_receiver = $this.m20_1;
+    var curr = "Current: '" + $this.i20_1.x1z_1 + "'";
+    var tmp2_safe_receiver = $this.j20_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -5898,11 +5941,11 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp_0 = ", Next: '" + tmp2_safe_receiver.a20_1 + "'";
+      tmp_0 = ", Next: '" + tmp2_safe_receiver.x1z_1 + "'";
     }
     var tmp3_elvis_lhs = tmp_0;
     var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-    $this.j20_1.k1r(prev + curr + next);
+    $this.g20_1.k1r(prev + curr + next);
   }
   function printTokens$default($this, previousToken, $super) {
     previousToken = previousToken === VOID ? null : previousToken;
@@ -5916,7 +5959,7 @@
       // Inline function 'kotlin.Companion.success' call
       Companion_getInstance();
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.nextToken.<anonymous>' call
-      var tmp1_success = $this.k20_1.y();
+      var tmp1_success = $this.h20_1.y();
       tmp = _Result___init__impl__xyqfz8(tmp1_success);
     } catch ($p) {
       var tmp_0;
@@ -5940,17 +5983,86 @@
     }
     return tmp_1;
   }
-  function TokenProvider(logger, tokenIterator) {
-    this.j20_1 = logger;
-    this.k20_1 = tokenIterator;
-    this.l20_1 = ensureNotNull(nextToken(this));
-    this.m20_1 = nextToken(this);
+  function TokenProvider(logger, list) {
+    this.g20_1 = logger;
+    this.h20_1 = list.u1q_1.v();
+    this.i20_1 = list.t1q_1;
+    this.j20_1 = nextToken(this);
+    var tmp = this;
+    // Inline function 'kotlin.collections.mapNotNull' call
+    var tmp0_mapNotNull = zipWithNext(removeWhiteSpace(list));
+    // Inline function 'kotlin.collections.mapNotNullTo' call
+    var tmp0_mapNotNullTo = ArrayList_init_$Create$_0();
+    // Inline function 'kotlin.collections.forEach' call
+    var tmp0_iterator = tmp0_mapNotNull.v();
+    while (tmp0_iterator.w()) {
+      var element = tmp0_iterator.y();
+      // Inline function 'kotlin.collections.mapNotNullTo.<anonymous>' call
+      // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.definitionNames.<anonymous>' call
+      var first = element.fd();
+      var second = element.gd();
+      var tmp0_subject = first.y1z_1;
+      var tmp_0;
+      if (isInterface(tmp0_subject, WirespecDefinition)) {
+        tmp_0 = second.x1z_1;
+      } else {
+        tmp_0 = null;
+      }
+      var tmp0_safe_receiver = tmp_0;
+      if (tmp0_safe_receiver == null)
+        null;
+      else {
+        // Inline function 'kotlin.let' call
+        // Inline function 'kotlin.contracts.contract' call
+        tmp0_mapNotNullTo.s(tmp0_safe_receiver);
+      }
+    }
+    tmp.k20_1 = tmp0_mapNotNullTo;
     printTokens$default(this);
   }
+  protoOf(TokenProvider).s20 = function (_this__u8e3s4) {
+    // Inline function 'arrow.core.raise.either' call
+    // Inline function 'arrow.core.raise.fold' call
+    // Inline function 'kotlin.contracts.contract' call
+    // Inline function 'arrow.core.raise.fold' call
+    // Inline function 'kotlin.contracts.contract' call
+    var raise = new DefaultRaise(false);
+    var tmp;
+    try {
+      // Inline function 'arrow.core.raise.either.<anonymous>' call
+      var tmp_0;
+      if (!this.k20_1.r(_this__u8e3s4.x1z_1)) {
+        raise.d1r(new DefinitionNotExistsException(_this__u8e3s4.x1z_1, _this__u8e3s4.z1z_1));
+      }
+      var res = tmp_0;
+      raise.b1r();
+      // Inline function 'arrow.core.raise.either.<anonymous>' call
+      tmp = new Right(Unit_getInstance());
+    } catch ($p) {
+      var tmp_1;
+      if ($p instanceof CancellationException) {
+        var e = $p;
+        raise.b1r();
+        // Inline function 'arrow.core.raise.either.<anonymous>' call
+        var tmp0_anonymous = raisedOrRethrow(e, raise);
+        tmp_1 = new Left(tmp0_anonymous);
+      } else {
+        if ($p instanceof Error) {
+          var e_0 = $p;
+          raise.b1r();
+          throw nonFatalOrThrow(e_0);
+        } else {
+          throw $p;
+        }
+      }
+      tmp = tmp_1;
+    }
+    return tmp;
+  };
   protoOf(TokenProvider).w = function () {
-    return !(this.m20_1 == null);
+    return !(this.j20_1 == null);
   };
-  protoOf(TokenProvider).n20 = function () {
+  protoOf(TokenProvider).l20 = function () {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5960,17 +6072,17 @@
     var tmp;
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.l20_1;
+      var previousToken = this.i20_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.m20_1;
+      var tmp0_elvis_lhs = this.j20_1;
       var tmp_1;
       if (tmp0_elvis_lhs == null) {
-        raise.d1r(new NextException(previousToken.c20_1));
+        raise.d1r(new NextException(previousToken.z1z_1));
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.l20_1 = tmp_1;
-      this.m20_1 = nextToken(this);
+      tmp_0.i20_1 = tmp_1;
+      this.j20_1 = nextToken(this);
       printTokens(this, previousToken);
       var res = Unit_getInstance();
       raise.b1r();
@@ -5998,7 +6110,7 @@
     return tmp;
   };
   function toProvider(_this__u8e3s4, logger) {
-    return new TokenProvider(logger, _this__u8e3s4.v());
+    return new TokenProvider(logger, _this__u8e3s4);
   }
   function parseTypeDefinition(_this__u8e3s4, $this, typeName) {
     // Inline function 'arrow.core.raise.either' call
@@ -6011,19 +6123,19 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
-      var tmp0_subject = _this__u8e3s4.l20_1.b20_1;
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
+      var tmp0_subject = _this__u8e3s4.i20_1.y1z_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
-        tmp_0 = new Type_0(typeName, raise.e1r($this.t20(_this__u8e3s4)));
+        tmp_0 = new Type_0(typeName, raise.e1r($this.r20(_this__u8e3s4)));
       } else {
         if (tmp0_subject instanceof CustomRegex) {
           // Inline function 'kotlin.also' call
-          var tmp0_also = new Refined(typeName, new Validator_0(_this__u8e3s4.l20_1.a20_1));
+          var tmp0_also = new Refined(typeName, new Validator_0(_this__u8e3s4.i20_1.x1z_1));
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>.<anonymous>' call
-          raise.e1r(_this__u8e3s4.n20());
+          raise.e1r(_this__u8e3s4.l20());
           tmp_0 = tmp0_also;
         } else {
           if (tmp0_subject instanceof Equals) {
@@ -6032,11 +6144,11 @@
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
             Companion_getInstance_5();
-            var tmp2_invoke = _this__u8e3s4.l20_1;
+            var tmp2_invoke = _this__u8e3s4.i20_1;
             var tmp3_also = new WrongTokenException(getKClass(LeftCurly), tmp2_invoke);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>.<anonymous>' call
-            raise.e1r(_this__u8e3s4.n20());
+            raise.e1r(_this__u8e3s4.l20());
             raise.d1r(tmp3_also);
           }
         }
@@ -6077,42 +6189,42 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
-      if (_this__u8e3s4.l20_1.b20_1 instanceof Colon)
-        raise.e1r(_this__u8e3s4.n20());
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof Colon)
+        raise.e1r(_this__u8e3s4.l20());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.l20_1;
+        var tmp1_invoke = _this__u8e3s4.i20_1;
         var tmp2_also = new WrongTokenException(getKClass(Colon), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp2_also);
       }
-      var type = _this__u8e3s4.l20_1.b20_1;
+      var type = _this__u8e3s4.i20_1.y1z_1;
       var tmp_0;
       if (isInterface(type, WirespecType)) {
-        var tmp_1 = raise.e1r(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.l20_1.a20_1));
+        var tmp_1 = raise.e1r(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.i20_1.x1z_1));
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.l20_1.b20_1;
+        var tmp_2 = _this__u8e3s4.i20_1.y1z_1;
         var tmp3_also = tmp_2 instanceof QuestionMark;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
         if (tmp3_also)
-          raise.e1r(_this__u8e3s4.n20());
+          raise.e1r(_this__u8e3s4.l20());
         tmp_0 = new Field_0(identifier, tmp_1, tmp3_also);
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp5_invoke = _this__u8e3s4.l20_1;
+        var tmp5_invoke = _this__u8e3s4.i20_1;
         var tmp6_also = new WrongTokenException(getKClass(CustomType), tmp5_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp6_also);
       }
       var res = tmp_0;
@@ -6151,15 +6263,16 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseFieldValue.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
+      var previousToken = _this__u8e3s4.i20_1;
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.l20_1.b20_1;
+      var tmp_0 = _this__u8e3s4.i20_1.y1z_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseFieldValue.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
       var isIterable = tmp0_also;
       var tmp_1;
       if (wsType instanceof WsString) {
@@ -6178,6 +6291,7 @@
                 tmp_1 = new Unit(isIterable);
               } else {
                 if (wsType instanceof CustomType) {
+                  raise.e1r(_this__u8e3s4.s20(previousToken));
                   tmp_1 = new Custom_0(value, isIterable);
                 } else {
                   noWhenBranchMatchedException();
@@ -6223,34 +6337,36 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      $this.p20(_this__u8e3s4.l20_1);
+      raise.e1r(_this__u8e3s4.l20());
+      $this.n20(_this__u8e3s4.i20_1);
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof CustomType) {
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomType) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var tmp0_apply = ArrayList_init_$Create$_0();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>' call
-        tmp0_apply.s(_this__u8e3s4.l20_1.a20_1);
-        raise.e1r(_this__u8e3s4.n20());
-        while (equals(_this__u8e3s4.l20_1.b20_1, Pipe_getInstance())) {
-          raise.e1r(_this__u8e3s4.n20());
-          if (_this__u8e3s4.l20_1.b20_1 instanceof CustomType) {
+        raise.e1r(_this__u8e3s4.s20(_this__u8e3s4.i20_1));
+        tmp0_apply.s(new Custom_0(_this__u8e3s4.i20_1.x1z_1, false));
+        raise.e1r(_this__u8e3s4.l20());
+        while (equals(_this__u8e3s4.i20_1.y1z_1, Pipe_getInstance())) {
+          raise.e1r(_this__u8e3s4.l20());
+          if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomType) {
+            raise.e1r(_this__u8e3s4.s20(_this__u8e3s4.i20_1));
             // Inline function 'kotlin.also' call
-            tmp0_apply.s(_this__u8e3s4.l20_1.a20_1);
+            tmp0_apply.s(new Custom_0(_this__u8e3s4.i20_1.x1z_1, false));
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.e1r(_this__u8e3s4.n20());
+            raise.e1r(_this__u8e3s4.l20());
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
             Companion_getInstance_5();
-            var tmp2_invoke = _this__u8e3s4.l20_1;
+            var tmp2_invoke = _this__u8e3s4.i20_1;
             var tmp3_also = new WrongTokenException(getKClass(CustomType), tmp2_invoke);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.e1r(_this__u8e3s4.n20());
+            raise.e1r(_this__u8e3s4.l20());
             raise.d1r(tmp3_also);
           }
         }
@@ -6259,11 +6375,11 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp2_invoke_0 = _this__u8e3s4.l20_1;
+        var tmp2_invoke_0 = _this__u8e3s4.i20_1;
         var tmp3_also_0 = new WrongTokenException(getKClass(CustomType), tmp2_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp3_also_0);
       }
       var res = toSet(tmp_0);
@@ -6294,7 +6410,7 @@
   function TypeParser(logger) {
     AbstractParser.call(this, logger);
   }
-  protoOf(TypeParser).j21 = function (_this__u8e3s4) {
+  protoOf(TypeParser).l21 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -6305,20 +6421,20 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      this.p20(_this__u8e3s4.l20_1);
+      raise.e1r(_this__u8e3s4.l20());
+      this.n20(_this__u8e3s4.i20_1);
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof CustomType) {
-        tmp_0 = raise.e1r(parseTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.l20_1.a20_1));
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomType) {
+        tmp_0 = raise.e1r(parseTypeDefinition(_this__u8e3s4, this, _this__u8e3s4.i20_1.x1z_1));
       } else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke = _this__u8e3s4.l20_1;
+        var tmp1_invoke = _this__u8e3s4.i20_1;
         var tmp2_also = new WrongTokenException(getKClass(CustomType), tmp1_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp2_also);
       }
       var res = tmp_0;
@@ -6346,7 +6462,7 @@
     }
     return tmp;
   };
-  protoOf(TypeParser).t20 = function (_this__u8e3s4) {
+  protoOf(TypeParser).r20 = function (_this__u8e3s4) {
     // Inline function 'arrow.core.raise.either' call
     // Inline function 'arrow.core.raise.fold' call
     // Inline function 'kotlin.contracts.contract' call
@@ -6357,31 +6473,31 @@
     try {
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>' call
-      raise.e1r(_this__u8e3s4.n20());
-      this.p20(_this__u8e3s4.l20_1);
+      raise.e1r(_this__u8e3s4.l20());
+      this.n20(_this__u8e3s4.i20_1);
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.also' call
       var tmp_0;
-      if (_this__u8e3s4.l20_1.b20_1 instanceof CustomValue) {
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomValue) {
         // Inline function 'kotlin.apply' call
         // Inline function 'kotlin.collections.mutableListOf' call
         var tmp0_apply = ArrayList_init_$Create$_0();
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-        tmp0_apply.s(raise.e1r(parseField(_this__u8e3s4, this, Companion_getInstance_6().q1z(_this__u8e3s4.l20_1.a20_1))));
-        while (equals(_this__u8e3s4.l20_1.b20_1, Comma_getInstance())) {
-          raise.e1r(_this__u8e3s4.n20());
-          if (_this__u8e3s4.l20_1.b20_1 instanceof CustomValue) {
-            tmp0_apply.s(raise.e1r(parseField(_this__u8e3s4, this, Companion_getInstance_6().q1z(_this__u8e3s4.l20_1.a20_1))));
+        tmp0_apply.s(raise.e1r(parseField(_this__u8e3s4, this, Companion_getInstance_6().n1z(_this__u8e3s4.i20_1.x1z_1))));
+        while (equals(_this__u8e3s4.i20_1.y1z_1, Comma_getInstance())) {
+          raise.e1r(_this__u8e3s4.l20());
+          if (_this__u8e3s4.i20_1.y1z_1 instanceof CustomValue) {
+            tmp0_apply.s(raise.e1r(parseField(_this__u8e3s4, this, Companion_getInstance_6().n1z(_this__u8e3s4.i20_1.x1z_1))));
           } else {
             // Inline function 'kotlin.also' call
             // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
             Companion_getInstance_5();
-            var tmp1_invoke = _this__u8e3s4.l20_1;
+            var tmp1_invoke = _this__u8e3s4.i20_1;
             var tmp2_also = new WrongTokenException(getKClass(CustomValue), tmp1_invoke);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-            raise.e1r(_this__u8e3s4.n20());
+            raise.e1r(_this__u8e3s4.l20());
             raise.d1r(tmp2_also);
           }
         }
@@ -6390,27 +6506,27 @@
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp2_invoke = _this__u8e3s4.l20_1;
+        var tmp2_invoke = _this__u8e3s4.i20_1;
         var tmp3_also = new WrongTokenException(getKClass(CustomValue), tmp2_invoke);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp3_also);
       }
       var tmp4_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-      if (_this__u8e3s4.l20_1.b20_1 instanceof RightCurly)
-        raise.e1r(_this__u8e3s4.n20());
+      if (_this__u8e3s4.i20_1.y1z_1 instanceof RightCurly)
+        raise.e1r(_this__u8e3s4.l20());
       else {
         // Inline function 'kotlin.also' call
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         Companion_getInstance_5();
-        var tmp1_invoke_0 = _this__u8e3s4.l20_1;
+        var tmp1_invoke_0 = _this__u8e3s4.i20_1;
         var tmp2_also_0 = new WrongTokenException(getKClass(RightCurly), tmp1_invoke_0);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-        raise.e1r(_this__u8e3s4.n20());
+        raise.e1r(_this__u8e3s4.l20());
         raise.d1r(tmp2_also_0);
       }
       // Inline function 'kotlin.contracts.contract' call
@@ -6442,15 +6558,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.k21_1 = idx;
-    this.l21_1 = length;
+    this.m21_1 = idx;
+    this.n21_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.k21_1 + ', length=' + this.l21_1 + ')';
+    return 'IdxAndLength(idx=' + this.m21_1 + ', length=' + this.n21_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.k21_1;
-    result = imul(result, 31) + this.l21_1 | 0;
+    var result = this.m21_1;
+    result = imul(result, 31) + this.n21_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -6459,9 +6575,9 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.k21_1 === tmp0_other_with_cast.k21_1))
+    if (!(this.m21_1 === tmp0_other_with_cast.m21_1))
       return false;
-    if (!(this.l21_1 === tmp0_other_with_cast.l21_1))
+    if (!(this.n21_1 === tmp0_other_with_cast.n21_1))
       return false;
     return true;
   };
@@ -6469,26 +6585,26 @@
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.e20_1 = line;
-    this.f20_1 = position;
-    this.g20_1 = idxAndLength;
+    this.b20_1 = line;
+    this.c20_1 = position;
+    this.d20_1 = idxAndLength;
   }
-  protoOf(Coordinates).m21 = function (line, position, idxAndLength) {
+  protoOf(Coordinates).o21 = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).n21 = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.e20_1 : line;
-    position = position === VOID ? this.f20_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.g20_1 : idxAndLength;
-    return $super === VOID ? this.m21(line, position, idxAndLength) : $super.m21.call(this, line, position, idxAndLength);
+  protoOf(Coordinates).p21 = function (line, position, idxAndLength, $super) {
+    line = line === VOID ? this.b20_1 : line;
+    position = position === VOID ? this.c20_1 : position;
+    idxAndLength = idxAndLength === VOID ? this.d20_1 : idxAndLength;
+    return $super === VOID ? this.o21(line, position, idxAndLength) : $super.o21.call(this, line, position, idxAndLength);
   };
   protoOf(Coordinates).toString = function () {
-    return 'Coordinates(line=' + this.e20_1 + ', position=' + this.f20_1 + ', idxAndLength=' + this.g20_1 + ')';
+    return 'Coordinates(line=' + this.b20_1 + ', position=' + this.c20_1 + ', idxAndLength=' + this.d20_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.e20_1;
-    result = imul(result, 31) + this.f20_1 | 0;
-    result = imul(result, 31) + this.g20_1.hashCode() | 0;
+    var result = this.b20_1;
+    result = imul(result, 31) + this.c20_1 | 0;
+    result = imul(result, 31) + this.d20_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -6497,38 +6613,38 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.e20_1 === tmp0_other_with_cast.e20_1))
+    if (!(this.b20_1 === tmp0_other_with_cast.b20_1))
       return false;
-    if (!(this.f20_1 === tmp0_other_with_cast.f20_1))
+    if (!(this.c20_1 === tmp0_other_with_cast.c20_1))
       return false;
-    if (!this.g20_1.equals(tmp0_other_with_cast.g20_1))
+    if (!this.d20_1.equals(tmp0_other_with_cast.d20_1))
       return false;
     return true;
   };
   function Token(value, type, coordinates) {
-    this.a20_1 = value;
-    this.b20_1 = type;
-    this.c20_1 = coordinates;
+    this.x1z_1 = value;
+    this.y1z_1 = type;
+    this.z1z_1 = coordinates;
   }
   protoOf(Token).p2 = function () {
-    return this.a20_1;
+    return this.x1z_1;
   };
-  protoOf(Token).o21 = function (value, type, coordinates) {
+  protoOf(Token).q21 = function (value, type, coordinates) {
     return new Token(value, type, coordinates);
   };
-  protoOf(Token).i20 = function (value, type, coordinates, $super) {
-    value = value === VOID ? this.a20_1 : value;
-    type = type === VOID ? this.b20_1 : type;
-    coordinates = coordinates === VOID ? this.c20_1 : coordinates;
-    return $super === VOID ? this.o21(value, type, coordinates) : $super.o21.call(this, value, type, coordinates);
+  protoOf(Token).f20 = function (value, type, coordinates, $super) {
+    value = value === VOID ? this.x1z_1 : value;
+    type = type === VOID ? this.y1z_1 : type;
+    coordinates = coordinates === VOID ? this.z1z_1 : coordinates;
+    return $super === VOID ? this.q21(value, type, coordinates) : $super.q21.call(this, value, type, coordinates);
   };
   protoOf(Token).toString = function () {
-    return 'Token(value=' + this.a20_1 + ', type=' + this.b20_1 + ', coordinates=' + this.c20_1 + ')';
+    return 'Token(value=' + this.x1z_1 + ', type=' + this.y1z_1 + ', coordinates=' + this.z1z_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = getStringHashCode(this.a20_1);
-    result = imul(result, 31) + hashCode(this.b20_1) | 0;
-    result = imul(result, 31) + this.c20_1.hashCode() | 0;
+    var result = getStringHashCode(this.x1z_1);
+    result = imul(result, 31) + hashCode(this.y1z_1) | 0;
+    result = imul(result, 31) + this.z1z_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -6537,19 +6653,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!(this.a20_1 === tmp0_other_with_cast.a20_1))
+    if (!(this.x1z_1 === tmp0_other_with_cast.x1z_1))
       return false;
-    if (!equals(this.b20_1, tmp0_other_with_cast.b20_1))
+    if (!equals(this.y1z_1, tmp0_other_with_cast.y1z_1))
       return false;
-    if (!this.c20_1.equals(tmp0_other_with_cast.c20_1))
+    if (!this.z1z_1.equals(tmp0_other_with_cast.z1z_1))
       return false;
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.k21_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.m21_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.n21(VOID, _this__u8e3s4.f20_1 + length | 0, plus_1(_this__u8e3s4.g20_1, length));
+    return _this__u8e3s4.p21(VOID, _this__u8e3s4.c20_1 + length | 0, plus_1(_this__u8e3s4.d20_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     var tmp0_type = StartOfProgram_getInstance();
@@ -6562,12 +6678,12 @@
     var incompleteTokens_0 = incompleteTokens;
     $l$1: do {
       $l$0: do {
-        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).c20_1);
+        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).z1z_1);
         var token = tmp0_container.fd();
         var remaining = tmp0_container.gd();
         var tokens = incompleteTokens_0.y1q(token);
         var tmp;
-        var tmp_0 = token.b20_1;
+        var tmp_0 = token.y1z_1;
         if (tmp_0 instanceof EndOfProgram) {
           tmp = tokens;
         } else {
@@ -6609,7 +6725,7 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.extractToken.<anonymous>' call
-      tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.a20_1));
+      tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.x1z_1));
     }
     var tmp1_elvis_lhs = tmp;
     return tmp1_elvis_lhs == null ? new Pair(endToken(previousTokenCoordinates), '') : tmp1_elvis_lhs;
@@ -6629,7 +6745,7 @@
   function nextCoordinates(_this__u8e3s4, type, value) {
     var tmp;
     if (type instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.e20_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.g20_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.b20_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.d20_1, value.length));
     } else {
       tmp = plus_2(_this__u8e3s4, value.length);
     }
@@ -6643,7 +6759,7 @@
     while (tmp0_iterator.w()) {
       var element = tmp0_iterator.y();
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.removeWhiteSpace.<anonymous>' call
-      var tmp = element.b20_1;
+      var tmp = element.y1z_1;
       if (!isInterface(tmp, WhiteSpace)) {
         tmp0_filterNotTo.s(element);
       }
@@ -7330,7 +7446,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.p21_1 = 'EOP';
+    this.r21_1 = 'EOP';
   }
   protoOf(EndOfProgram).toString = function () {
     return 'EndOfProgram';
@@ -7391,36 +7507,36 @@
     }
   }
   //region block: post-declaration
-  protoOf(WsTypeDef).d20 = name;
-  protoOf(WsEnumTypeDef).d20 = name;
-  protoOf(WsEndpointDef).d20 = name;
-  protoOf(WhiteSpaceExceptNewLine).d20 = name;
-  protoOf(NewLine).d20 = name;
-  protoOf(LeftCurly).d20 = name;
-  protoOf(RightCurly).d20 = name;
-  protoOf(Arrow).d20 = name;
-  protoOf(Equals).d20 = name;
-  protoOf(Pipe).d20 = name;
-  protoOf(Colon).d20 = name;
-  protoOf(Comma).d20 = name;
-  protoOf(QuestionMark).d20 = name;
-  protoOf(Hash).d20 = name;
-  protoOf(Brackets).d20 = name;
-  protoOf(WsString).d20 = name;
-  protoOf(WsInteger).d20 = name;
-  protoOf(WsNumber).d20 = name;
-  protoOf(WsBoolean).d20 = name;
-  protoOf(WsUnit).d20 = name;
-  protoOf(Method_0).d20 = name;
-  protoOf(CustomRegex).d20 = name;
-  protoOf(StatusCode).d20 = name;
-  protoOf(CustomValue).d20 = name;
-  protoOf(CustomType).d20 = name;
-  protoOf(Path_0).d20 = name;
-  protoOf(ForwardSlash).d20 = name;
-  protoOf(Invalid).d20 = name;
-  protoOf(StartOfProgram).d20 = name;
-  protoOf(EndOfProgram).d20 = name;
+  protoOf(WsTypeDef).a20 = name;
+  protoOf(WsEnumTypeDef).a20 = name;
+  protoOf(WsEndpointDef).a20 = name;
+  protoOf(WhiteSpaceExceptNewLine).a20 = name;
+  protoOf(NewLine).a20 = name;
+  protoOf(LeftCurly).a20 = name;
+  protoOf(RightCurly).a20 = name;
+  protoOf(Arrow).a20 = name;
+  protoOf(Equals).a20 = name;
+  protoOf(Pipe).a20 = name;
+  protoOf(Colon).a20 = name;
+  protoOf(Comma).a20 = name;
+  protoOf(QuestionMark).a20 = name;
+  protoOf(Hash).a20 = name;
+  protoOf(Brackets).a20 = name;
+  protoOf(WsString).a20 = name;
+  protoOf(WsInteger).a20 = name;
+  protoOf(WsNumber).a20 = name;
+  protoOf(WsBoolean).a20 = name;
+  protoOf(WsUnit).a20 = name;
+  protoOf(Method_0).a20 = name;
+  protoOf(CustomRegex).a20 = name;
+  protoOf(StatusCode).a20 = name;
+  protoOf(CustomValue).a20 = name;
+  protoOf(CustomType).a20 = name;
+  protoOf(Path_0).a20 = name;
+  protoOf(ForwardSlash).a20 = name;
+  protoOf(Invalid).a20 = name;
+  protoOf(StartOfProgram).a20 = name;
+  protoOf(EndOfProgram).a20 = name;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_STRING = 'community.flock.wirespec.generated';