@flock/wirespec 0.14.29 → 0.15.0

package/wirespec-src-compiler-core.mjs

@@ -65,7 +65,8 @@ import {
   sortedWith2csnbbb21k0lg as sortedWith,
   trimIndent1qytc1wvt8suh as trimIndent,
   prependIndentkl9wuvcodvmu as prependIndent,
-  last1vo29oleiqj36 as last,
+  LinkedHashMap_init_$Create$2gfxg59gogbfz as LinkedHashMap_init_$Create$,
+  HashSet_init_$Create$2bsk5herqkxxm as HashSet_init_$Create$,
   firstOrNull1982767dljvdy as firstOrNull_0,
   isUpperCase16ivdixranflt as isUpperCase,
   repeat2w4c6j8zoq09o as repeat,
@@ -75,7 +76,6 @@ import {
   IndexedValue22atz80p92rrf as IndexedValue,
   listOfNotNull1v4ggfackvuny as listOfNotNull_0,
   flatten2dh4kibw1u0qq as flatten,
-  HashSet_init_$Create$2bsk5herqkxxm as HashSet_init_$Create$,
   emptyList1g2z5xcrvp2zy as emptyList,
   plus310ted5e4i90h as plus,
   filterNotNull3qfgcwmxhwfxe as filterNotNull,
@@ -91,8 +91,8 @@ import {
   dropLast1vpiyky649o34 as dropLast_0,
   zipWithNext2nnv9puh4xyfv as zipWithNext,
   getKClassFromExpression3vpejubogshaw as getKClassFromExpression,
+  last1vo29oleiqj36 as last,
   Paire9pteg33gng7 as Pair,
-  LinkedHashMap_init_$Create$2gfxg59gogbfz as LinkedHashMap_init_$Create$,
   println2shhhgwwt4c61 as println,
 } from './kotlin-kotlin-stdlib.mjs';
 import {
@@ -101,11 +101,11 @@ import {
   _NonEmptySet___get_elements__impl__g09gj93rk9dtepr20b0 as _NonEmptySet___get_elements__impl__g09gj9,
   toNonEmptyListOrNull2ovnnazjb3msz as toNonEmptyListOrNull,
   Right351sh2v8odavg as Right,
-  nonEmptyListOf17xawqyzwrlrt as nonEmptyListOf,
   DefaultRaisevd10gc79qxh8 as DefaultRaise,
   nonFatalOrThrow35agffkx4bbtz as nonFatalOrThrow,
   raisedOrRethrow397oyvsdde7oq as raisedOrRethrow,
   RaiseCancellationException3n5raogfhbd1l as RaiseCancellationException,
+  nonEmptyListOf17xawqyzwrlrt as nonEmptyListOf,
   right2w60qw9uivnyr as right,
   Companion_instancel37dvvdi0gn2 as Companion_instance,
   left3pixsqou14wpr as left,
@@ -3070,49 +3070,64 @@ function emitSerialize(_this__u8e3s4, $this, fields) {
   return $this.v25(_this__u8e3s4.t25_1) + ': serialization.serialize(it.' + fields + '[' + $this.v25(_this__u8e3s4.t25_1) + '])';
 }
 function TypeScriptEmitter$emit$lambda(it) {
+  return 'export {' + it.w24().b1() + "} from './" + it.w24().b1() + "'";
+}
+function TypeScriptEmitter$emit$lambda_0(it) {
+  // Inline function 'kotlin.text.trimStart' call
+  return toString(trimStart(isCharSequence(it) ? it : THROW_CCE()));
+}
+function TypeScriptEmitter$emit$lambda_1(it) {
   return '"' + it + '"';
 }
-function TypeScriptEmitter$emit$lambda_0(this$0) {
+function TypeScriptEmitter$emit$lambda_2(this$0) {
   return function (it) {
     return this$0.b26(it);
   };
 }
-function TypeScriptEmitter$emit$lambda_1(this$0) {
+function TypeScriptEmitter$emit$lambda_3(it) {
+  // Inline function 'kotlin.text.trimStart' call
+  return toString(trimStart(isCharSequence(it) ? it : THROW_CCE()));
+}
+function TypeScriptEmitter$emit$lambda_4(this$0) {
   return function (it) {
     return this$0.q29(it);
   };
 }
-function TypeScriptEmitter$emit$lambda_2(this$0) {
+function TypeScriptEmitter$emit$lambda_5(this$0) {
   return function (it) {
     return this$0.b26(it);
   };
 }
-function TypeScriptEmitter$emit$lambda_3(this$0) {
+function TypeScriptEmitter$emit$lambda_6(this$0) {
   return function (it) {
     return this$0.b26(it);
   };
 }
-function TypeScriptEmitter$emit$lambda_4(this$0) {
+function TypeScriptEmitter$emit$lambda_7(this$0) {
   return function (it) {
     return emitType_3(it, this$0);
   };
 }
-function TypeScriptEmitter$emit$lambda_5(this$0) {
+function TypeScriptEmitter$emit$lambda_8(this$0) {
   return function (it) {
     return emitName(it, this$0);
   };
 }
-function TypeScriptEmitter$emit$lambda_6(this$0) {
+function TypeScriptEmitter$emit$lambda_9(this$0) {
   return function (it) {
     return emitFunction_0(it, this$0);
   };
 }
-function TypeScriptEmitter$emit$lambda_7(this$0) {
+function TypeScriptEmitter$emit$lambda_10(this$0) {
   return function (it) {
     return this$0.f26(it);
   };
 }
-function TypeScriptEmitter$emit$lambda_8(this$0) {
+function TypeScriptEmitter$emit$lambda_11(it) {
+  // Inline function 'kotlin.text.trimStart' call
+  return toString(trimStart(isCharSequence(it) ? it : THROW_CCE()));
+}
+function TypeScriptEmitter$emit$lambda_12(this$0) {
   return function (it) {
     return this$0.j24(it);
   };
@@ -3227,40 +3242,112 @@ protoOf(TypeScriptEmitter).k26 = function () {
 protoOf(TypeScriptEmitter).l26 = function () {
   return this.p29_1;
 };
-protoOf(TypeScriptEmitter).m26 = function (module_0, logger) {
-  var tmp = Companion_instance_5.s25(last(split(module_0.c27_1, ['/'])));
-  var tmp_0 = Companion_instance_5.t29(module_0) ? TypeScriptShared_getInstance().s29_1 : '';
-  // Inline function 'arrow.core.NonEmptyList.map' call
-  var this_0 = protoOf(Emitter).m26.call(this, module_0, logger);
-  // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.stub_for_inlining' call
-  var tmp_1 = this_0.uk_1.t26_1;
+protoOf(TypeScriptEmitter).n23 = function (ast, logger) {
+  // Inline function 'kotlin.let' call
+  // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+  var it = protoOf(Emitter).n23.call(this, ast, logger);
+  // Inline function 'arrow.core.NonEmptyList.flatMap' call
+  var this_0 = ast.r29_1;
+  // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
+  var tmp = this_0.uk_1.d27_1.sk();
+  // Inline function 'kotlin.collections.flatMap' call
+  var tmp0 = this_0.vk_1;
+  // Inline function 'kotlin.collections.flatMapTo' call
+  var destination = ArrayList_init_$Create$_0();
+  var _iterator__ex2g4s = tmp0.g();
+  while (_iterator__ex2g4s.h()) {
+    var element = _iterator__ex2g4s.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
+    var list = element.d27_1;
+    addAll(destination, list);
+  }
+  // Inline function 'kotlin.collections.groupBy' call
+  var tmp0_0 = tmp.zk(destination);
+  // Inline function 'kotlin.collections.groupByTo' call
+  var destination_0 = LinkedHashMap_init_$Create$();
+  var _iterator__ex2g4s_0 = tmp0_0.g();
+  while (_iterator__ex2g4s_0.h()) {
+    var element_0 = _iterator__ex2g4s_0.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
+    var key = namespace(element_0);
+    // Inline function 'kotlin.collections.getOrPut' call
+    var value = destination_0.g2(key);
+    var tmp_0;
+    if (value == null) {
+      // Inline function 'kotlin.collections.groupByTo.<anonymous>' call
+      var answer = ArrayList_init_$Create$_0();
+      destination_0.n2(key, answer);
+      tmp_0 = answer;
+    } else {
+      tmp_0 = value;
+    }
+    var list_0 = tmp_0;
+    list_0.e(element_0);
+  }
   // Inline function 'kotlin.collections.map' call
-  var this_1 = this_0.vk_1;
   // Inline function 'kotlin.collections.mapTo' call
-  var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_1, 10));
-  var _iterator__ex2g4s = this_1.g();
-  while (_iterator__ex2g4s.h()) {
-    var item = _iterator__ex2g4s.i();
-    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.stub_for_inlining' call
-    var tmp$ret$1 = item.t26_1;
-    destination.e(tmp$ret$1);
+  var destination_1 = ArrayList_init_$Create$(destination_0.j());
+  // Inline function 'kotlin.collections.iterator' call
+  var _iterator__ex2g4s_1 = destination_0.z().g();
+  while (_iterator__ex2g4s_1.h()) {
+    var item = _iterator__ex2g4s_1.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
+    // Inline function 'kotlin.collections.component1' call
+    var ns = item.a1();
+    // Inline function 'kotlin.collections.component2' call
+    var defs = item.b1();
+    var tmp_1 = ns + '/index.' + this.j26().u29_1;
+    var tmp$ret$13 = new Emitted(tmp_1, joinToString(defs, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda));
+    destination_1.e(tmp$ret$13);
   }
-  var tmp$ret$4 = new NonEmptyList(tmp_1, destination);
-  // Inline function 'kotlin.text.trimStart' call
-  var this_2 = trimMargin('\n                        |' + tmp_0 + '\n                        |' + joinToString(tmp$ret$4, '\n') + '\n                ');
-  var tmp$ret$5 = toString(trimStart(isCharSequence(this_2) ? this_2 : THROW_CCE()));
-  var emitted = nonEmptyListOf(new Emitted(tmp, tmp$ret$5), []);
-  return this.m29_1.q26_1 ? emitted.al(new Emitted(Companion_instance_6.h26('community.flock.wirespec.generated').n26() + 'Wirespec', this.k26().s29_1)) : emitted;
+  return it.zk(destination_1);
+};
+protoOf(TypeScriptEmitter).m26 = function (module_0, logger) {
+  // Inline function 'kotlin.let' call
+  // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+  var it = protoOf(Emitter).m26.call(this, module_0, logger);
+  return this.m29_1.q26_1 ? it.al(new Emitted('Wirespec', this.k26().w29_1)) : it;
+};
+protoOf(TypeScriptEmitter).r26 = function (definition, module_0, logger) {
+  // Inline function 'kotlin.let' call
+  // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+  var it = protoOf(Emitter).r26.call(this, definition, module_0, logger);
+  var subPackageName = plus_0(Companion_instance_6.h26(''), definition);
+  return new Emitted(subPackageName.n26() + sanitizeSymbol_3(it.s26_1, this), trimMargin('\n                    |' + TypeScriptShared_getInstance().w29_1 + '\n                    |\n                    |' + it.t26_1 + '\n                '));
 };
 protoOf(TypeScriptEmitter).v26 = function (type, module_0) {
-  return trimMargin('export type ' + sanitizeSymbol_2(type.x26_1, this) + ' = {\n            |' + this.a27(type.y26_1) + '\n            |}\n            |\n            |');
+  // Inline function 'kotlin.collections.distinctBy' call
+  var this_0 = this.b28(type);
+  var set = HashSet_init_$Create$();
+  var list = ArrayList_init_$Create$_0();
+  var _iterator__ex2g4s = this_0.g();
+  while (_iterator__ex2g4s.h()) {
+    var e = _iterator__ex2g4s.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+    var key = e.y23_1;
+    if (set.e(key)) {
+      list.e(e);
+    }
+  }
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination = ArrayList_init_$Create$(collectionSizeOrDefault(list, 10));
+  var _iterator__ex2g4s_0 = list.g();
+  while (_iterator__ex2g4s_0.h()) {
+    var item = _iterator__ex2g4s_0.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+    var tmp$ret$2 = 'import {' + item.y23_1 + "} from './" + item.y23_1 + "'";
+    destination.e(tmp$ret$2);
+  }
+  var tmp = destination;
+  return trimMargin('\n            |' + joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_0) + '\n            |export type ' + sanitizeSymbol_2(type.x26_1, this) + ' = {\n            |' + this.a27(type.y26_1) + '\n            |}\n            |\n        ');
 };
 protoOf(TypeScriptEmitter).q27 = function (enum_0, module_0) {
   var tmp = sanitizeSymbol_2(enum_0.s27_1, this);
-  return 'export type ' + tmp + ' = ' + joinToString(enum_0.t27_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda) + '\n';
+  return 'export type ' + tmp + ' = ' + joinToString(enum_0.t27_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_1) + '\n';
 };
 protoOf(TypeScriptEmitter).a27 = function (_this__u8e3s4) {
-  return joinToString(_this__u8e3s4.h27_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_0(this));
+  return joinToString(_this__u8e3s4.h27_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_2(this));
 };
 protoOf(TypeScriptEmitter).q29 = function (_this__u8e3s4) {
   return Spacer_instance.toString() + this.v25(_this__u8e3s4.w25_1) + ': ' + this.j24(_this__u8e3s4.x25_1);
@@ -3329,32 +3416,57 @@ protoOf(TypeScriptEmitter).n27 = function (_this__u8e3s4) {
   return _this__u8e3s4.o27_1;
 };
 protoOf(TypeScriptEmitter).c28 = function (endpoint) {
-  var tmp = sanitizeSymbol_2(endpoint.z24_1, this);
-  var tmp_0 = this.q25(endpoint);
-  var tmp_1 = emitType_1(tmp_0, this, 'Path', TypeScriptEmitter$emit$lambda_1(this));
-  var tmp_2 = emitType_1(endpoint.c25_1, this, 'Queries', TypeScriptEmitter$emit$lambda_2(this));
-  var tmp_3 = emitType_1(endpoint.d25_1, this, 'Headers', TypeScriptEmitter$emit$lambda_3(this));
-  var tmp_4 = emitType_2(first_0(endpoint.e25_1), this, endpoint);
-  var tmp_5 = this.j25(endpoint.f25_1);
-  var tmp_6 = joinToString(tmp_5, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_4(this));
-  var tmp_7 = Spacer_instance.toString();
-  var tmp_8 = this.j25(endpoint.f25_1);
-  var tmp_9 = joinToString(tmp_8, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_5(this));
-  var tmp_10 = emitFunction(first_0(endpoint.e25_1), this, endpoint);
-  var tmp_11 = this.j25(endpoint.f25_1);
-  var tmp_12 = joinToString(tmp_11, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_6(this));
-  var tmp_13 = Spacer_instance.toString();
-  var tmp_14 = Spacer_instance.l25(2);
-  var tmp_15 = emitHandleFunction(this, endpoint);
-  var tmp_16 = Spacer_instance.toString();
-  var tmp_17 = prependIndent(emitClient(endpoint, this), Spacer_instance.l25(1));
-  var tmp_18 = prependIndent(emitServer(endpoint, this), Spacer_instance.l25(1));
-  var tmp_19 = Spacer_instance.toString();
-  var tmp_20 = Spacer_instance.l25(2);
-  var tmp_21 = Companion_instance_5.y25(sanitizeSymbol_2(endpoint.z24_1, this));
+  // Inline function 'kotlin.collections.distinctBy' call
+  var this_0 = this.b28(endpoint);
+  var set = HashSet_init_$Create$();
+  var list = ArrayList_init_$Create$_0();
+  var _iterator__ex2g4s = this_0.g();
+  while (_iterator__ex2g4s.h()) {
+    var e = _iterator__ex2g4s.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+    var key = e.y23_1;
+    if (set.e(key)) {
+      list.e(e);
+    }
+  }
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination = ArrayList_init_$Create$(collectionSizeOrDefault(list, 10));
+  var _iterator__ex2g4s_0 = list.g();
+  while (_iterator__ex2g4s_0.h()) {
+    var item = _iterator__ex2g4s_0.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+    var tmp$ret$2 = 'import {' + item.y23_1 + "} from '../model'";
+    destination.e(tmp$ret$2);
+  }
+  var tmp = destination;
+  var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_3);
+  var tmp_1 = sanitizeSymbol_2(endpoint.z24_1, this);
+  var tmp_2 = this.q25(endpoint);
+  var tmp_3 = emitType_1(tmp_2, this, 'Path', TypeScriptEmitter$emit$lambda_4(this));
+  var tmp_4 = emitType_1(endpoint.c25_1, this, 'Queries', TypeScriptEmitter$emit$lambda_5(this));
+  var tmp_5 = emitType_1(endpoint.d25_1, this, 'Headers', TypeScriptEmitter$emit$lambda_6(this));
+  var tmp_6 = emitType_2(first_0(endpoint.e25_1), this, endpoint);
+  var tmp_7 = this.j25(endpoint.f25_1);
+  var tmp_8 = joinToString(tmp_7, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_7(this));
+  var tmp_9 = Spacer_instance.toString();
+  var tmp_10 = this.j25(endpoint.f25_1);
+  var tmp_11 = joinToString(tmp_10, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_8(this));
+  var tmp_12 = emitFunction(first_0(endpoint.e25_1), this, endpoint);
+  var tmp_13 = this.j25(endpoint.f25_1);
+  var tmp_14 = joinToString(tmp_13, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_9(this));
+  var tmp_15 = Spacer_instance.toString();
+  var tmp_16 = Spacer_instance.l25(2);
+  var tmp_17 = emitHandleFunction(this, endpoint);
+  var tmp_18 = Spacer_instance.toString();
+  var tmp_19 = prependIndent(emitClient(endpoint, this), Spacer_instance.l25(1));
+  var tmp_20 = prependIndent(emitServer(endpoint, this), Spacer_instance.l25(1));
+  var tmp_21 = Spacer_instance.toString();
   var tmp_22 = Spacer_instance.l25(2);
-  var tmp_23 = Spacer_instance.l25(2);
-  return trimMargin('\n          |export namespace ' + tmp + ' {\n          |' + tmp_1 + '\n          |' + tmp_2 + '\n          |' + tmp_3 + '\n          |' + tmp_4 + '\n          |' + tmp_6 + '\n          |' + tmp_7 + 'export type Response = ' + tmp_9 + '\n          |' + tmp_10 + '\n          |' + tmp_12 + '\n          |' + tmp_13 + 'export type Handler = {\n          |' + tmp_14 + tmp_15 + '\n          |' + tmp_16 + '}\n          |' + tmp_17 + '\n          |' + tmp_18 + '\n          |' + tmp_19 + 'export const api = {\n          |' + tmp_20 + 'name: "' + tmp_21 + '",\n          |' + tmp_22 + 'method: "' + endpoint.a25_1.q2_1 + '",\n          |' + tmp_23 + 'path: "' + joinToString(endpoint.b25_1, '/', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_7(this)) + '",\n          |' + Spacer_instance.l25(2) + 'server,\n          |' + Spacer_instance.l25(2) + 'client\n          |' + Spacer_instance.toString() + '} as const\n          |}\n          |\n        ');
+  var tmp_23 = Companion_instance_5.y25(sanitizeSymbol_2(endpoint.z24_1, this));
+  var tmp_24 = Spacer_instance.l25(2);
+  var tmp_25 = Spacer_instance.l25(2);
+  return trimMargin('\n          |' + tmp_0 + '\n          |export namespace ' + tmp_1 + ' {\n          |' + tmp_3 + '\n          |' + tmp_4 + '\n          |' + tmp_5 + '\n          |' + tmp_6 + '\n          |' + tmp_8 + '\n          |' + tmp_9 + 'export type Response = ' + tmp_11 + '\n          |' + tmp_12 + '\n          |' + tmp_14 + '\n          |' + tmp_15 + 'export type Handler = {\n          |' + tmp_16 + tmp_17 + '\n          |' + tmp_18 + '}\n          |' + tmp_19 + '\n          |' + tmp_20 + '\n          |' + tmp_21 + 'export const api = {\n          |' + tmp_22 + 'name: "' + tmp_23 + '",\n          |' + tmp_24 + 'method: "' + endpoint.a25_1.q2_1 + '",\n          |' + tmp_25 + 'path: "' + joinToString(endpoint.b25_1, '/', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_10(this)) + '",\n          |' + Spacer_instance.l25(2) + 'server,\n          |' + Spacer_instance.l25(2) + 'client\n          |' + Spacer_instance.toString() + '} as const\n          |}\n          |\n        ');
 };
 protoOf(TypeScriptEmitter).f26 = function (_this__u8e3s4) {
   var tmp;
@@ -3370,14 +3482,39 @@ protoOf(TypeScriptEmitter).f26 = function (_this__u8e3s4) {
   return tmp;
 };
 protoOf(TypeScriptEmitter).v27 = function (union) {
-  var tmp = sanitizeSymbol_2(union.f27_1, this);
-  return 'export type ' + tmp + ' = ' + joinToString(union.g27_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_8(this)) + '\n';
+  // Inline function 'kotlin.collections.distinctBy' call
+  var this_0 = this.b28(union);
+  var set = HashSet_init_$Create$();
+  var list = ArrayList_init_$Create$_0();
+  var _iterator__ex2g4s = this_0.g();
+  while (_iterator__ex2g4s.h()) {
+    var e = _iterator__ex2g4s.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+    var key = e.y23_1;
+    if (set.e(key)) {
+      list.e(e);
+    }
+  }
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination = ArrayList_init_$Create$(collectionSizeOrDefault(list, 10));
+  var _iterator__ex2g4s_0 = list.g();
+  while (_iterator__ex2g4s_0.h()) {
+    var item = _iterator__ex2g4s_0.i();
+    // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>' call
+    var tmp$ret$2 = 'import {' + item.y23_1 + "} from '../model'";
+    destination.e(tmp$ret$2);
+  }
+  var tmp = destination;
+  var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_11);
+  var tmp_1 = sanitizeSymbol_2(union.f27_1, this);
+  return trimMargin('\n        |' + tmp_0 + '\n        |export type ' + tmp_1 + ' = ' + joinToString(union.g27_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_12(this)) + '\n        |\n    ');
 };
 protoOf(TypeScriptEmitter).v25 = function (identifier) {
   return '"' + identifier.b1() + '"';
 };
 protoOf(TypeScriptEmitter).w27 = function (channel) {
-  return this.u29();
+  return this.x29();
 };
 function emitPath(_this__u8e3s4, $this) {
   return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, WirespecEmitter$emitPath$lambda($this));
@@ -3451,7 +3588,7 @@ function capitalize(_this__u8e3s4, $this) {
 }
 function Companion_2() {
   Companion_instance_3 = this;
-  this.y29_1 = setOf(['type', 'enum', 'endpoint']);
+  this.b2a_1 = setOf(['type', 'enum', 'endpoint']);
 }
 var Companion_instance_3;
 function Companion_getInstance_3() {
@@ -3516,15 +3653,15 @@ function WirespecEmitter$emitQuery$lambda(this$0) {
 function WirespecEmitter() {
   Companion_getInstance_3();
   Emitter.call(this);
-  this.v29_1 = FileExtension_Wirespec_getInstance();
-  this.w29_1 = null;
-  this.x29_1 = '\n';
+  this.y29_1 = FileExtension_Wirespec_getInstance();
+  this.z29_1 = null;
+  this.a2a_1 = '\n';
 }
 protoOf(WirespecEmitter).j26 = function () {
-  return this.v29_1;
+  return this.y29_1;
 };
 protoOf(WirespecEmitter).l26 = function () {
-  return this.x29_1;
+  return this.a2a_1;
 };
 protoOf(WirespecEmitter).v26 = function (type, module_0) {
   return trimMargin('\n        |type ' + this.v25(type.x26_1) + ' {\n        |' + this.a27(type.y26_1) + '\n        |}\n        |');
@@ -3540,12 +3677,12 @@ protoOf(WirespecEmitter).v25 = function (identifier) {
   if (identifier instanceof DefinitionIdentifier) {
     // Inline function 'kotlin.run' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.WirespecEmitter.emit.<anonymous>' call
-    tmp = Companion_getInstance_3().y29_1.o1(identifier.b1()) ? addBackticks(identifier.b1()) : identifier.b1();
+    tmp = Companion_getInstance_3().b2a_1.o1(identifier.b1()) ? addBackticks(identifier.b1()) : identifier.b1();
   } else {
     if (identifier instanceof FieldIdentifier) {
       // Inline function 'kotlin.run' call
       // Inline function 'community.flock.wirespec.compiler.core.emit.WirespecEmitter.emit.<anonymous>' call
-      tmp = Companion_getInstance_3().y29_1.o1(identifier.b1()) || isUpperCase(first(identifier.b1())) ? addBackticks(identifier.b1()) : identifier.b1();
+      tmp = Companion_getInstance_3().b2a_1.o1(identifier.b1()) || isUpperCase(first(identifier.b1())) ? addBackticks(identifier.b1()) : identifier.b1();
     } else {
       noWhenBranchMatchedException();
     }
@@ -3700,12 +3837,12 @@ function namespace(_this__u8e3s4) {
 }
 function Companion_3() {
 }
-protoOf(Companion_3).z29 = function (value) {
+protoOf(Companion_3).c2a = function (value) {
   return new EmitShared(value == null ? false : value);
 };
 protoOf(Companion_3).i26 = function (value, $super) {
   value = value === VOID ? null : value;
-  return $super === VOID ? this.z29(value) : $super.z29.call(this, value);
+  return $super === VOID ? this.c2a(value) : $super.c2a.call(this, value);
 };
 var Companion_instance_4;
 function Companion_getInstance_4() {
@@ -3925,34 +4062,6 @@ protoOf(Companion_4).u26 = function (_this__u8e3s4) {
   }
   return tmp$ret$0;
 };
-protoOf(Companion_4).t29 = function (_this__u8e3s4) {
-  var tmp0 = _this__u8e3s4.d27_1;
-  var tmp$ret$0;
-  $l$block_0: {
-    // Inline function 'kotlin.collections.any' call
-    var tmp;
-    if (isInterface(tmp0, Collection)) {
-      tmp = tmp0.l();
-    } else {
-      tmp = false;
-    }
-    if (tmp) {
-      tmp$ret$0 = false;
-      break $l$block_0;
-    }
-    var _iterator__ex2g4s = tmp0.g();
-    while (_iterator__ex2g4s.h()) {
-      var element = _iterator__ex2g4s.i();
-      // Inline function 'community.flock.wirespec.compiler.core.emit.common.Companion.hasEndpoints.<anonymous>' call
-      if (element instanceof Endpoint) {
-        tmp$ret$0 = true;
-        break $l$block_0;
-      }
-    }
-    tmp$ret$0 = false;
-  }
-  return tmp$ret$0;
-};
 protoOf(Companion_4).e28 = function (_this__u8e3s4) {
   var tmp0_safe_receiver = toIntOrNull(_this__u8e3s4);
   var tmp;
@@ -3990,7 +4099,7 @@ function Emitter() {
 }
 protoOf(Emitter).n23 = function (ast, logger) {
   // Inline function 'arrow.core.NonEmptyList.flatMap' call
-  var this_0 = ast.a2a_1;
+  var this_0 = ast.r29_1;
   // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
   var it = this_0.uk_1;
   var tmp = this.m26(it, logger).sk();
@@ -4009,7 +4118,7 @@ protoOf(Emitter).n23 = function (ast, logger) {
   var this_1 = tmp.zk(destination);
   // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
   var e = this_1.uk_1;
-  var tmp_0 = new Emitted(e.s26_1 + '.' + this.j26().d2a_1, e.t26_1);
+  var tmp_0 = new Emitted(e.s26_1 + '.' + this.j26().u29_1, e.t26_1);
   // Inline function 'kotlin.collections.map' call
   var this_2 = this_1.vk_1;
   // Inline function 'kotlin.collections.mapTo' call
@@ -4018,7 +4127,7 @@ protoOf(Emitter).n23 = function (ast, logger) {
   while (_iterator__ex2g4s_0.h()) {
     var item = _iterator__ex2g4s_0.i();
     // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
-    var tmp$ret$6 = new Emitted(item.s26_1 + '.' + this.j26().d2a_1, item.t26_1);
+    var tmp$ret$6 = new Emitted(item.s26_1 + '.' + this.j26().u29_1, item.t26_1);
     destination_0.e(tmp$ret$6);
   }
   return new NonEmptyList(tmp_0, destination_0);
@@ -4045,7 +4154,7 @@ protoOf(Emitter).m26 = function (module_0, logger) {
 protoOf(Emitter).r26 = function (definition, module_0, logger) {
   // Inline function 'kotlin.run' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
-  logger.e2a('Emitting Node ' + definition.w24().b1());
+  logger.d2a('Emitting Node ' + definition.w24().b1());
   var tmp;
   if (definition instanceof Type) {
     tmp = new Emitted(this.v25(definition.x26_1), this.v26(definition, module_0));
@@ -4361,17 +4470,32 @@ protoOf(Emitter).b28 = function (_this__u8e3s4) {
       }
       tmp = distinct(destination_10);
     } else {
-      if (_this__u8e3s4 instanceof Channel) {
-        var tmp_5;
-        var tmp_6 = _this__u8e3s4.a28_1;
-        if (tmp_6 instanceof Custom) {
-          tmp_5 = listOf_0(_this__u8e3s4.a28_1);
-        } else {
-          tmp_5 = emptyList();
+      if (_this__u8e3s4 instanceof Union) {
+        // Inline function 'kotlin.collections.filterIsInstance' call
+        var tmp0_2 = _this__u8e3s4.g27_1;
+        // Inline function 'kotlin.collections.filterIsInstanceTo' call
+        var destination_11 = ArrayList_init_$Create$_0();
+        var _iterator__ex2g4s_11 = tmp0_2.g();
+        while (_iterator__ex2g4s_11.h()) {
+          var element_4 = _iterator__ex2g4s_11.i();
+          if (element_4 instanceof Custom) {
+            destination_11.e(element_4);
+          }
         }
-        tmp = tmp_5;
+        tmp = destination_11;
       } else {
-        tmp = emptyList();
+        if (_this__u8e3s4 instanceof Channel) {
+          var tmp_5;
+          var tmp_6 = _this__u8e3s4.a28_1;
+          if (tmp_6 instanceof Custom) {
+            tmp_5 = listOf_0(_this__u8e3s4.a28_1);
+          } else {
+            tmp_5 = emptyList();
+          }
+          tmp = tmp_5;
+        } else {
+          tmp = emptyList();
+        }
       }
     }
   }
@@ -4410,7 +4534,7 @@ function FileExtension_initEntries() {
 var $ENTRIES;
 function FileExtension(name, ordinal, value) {
   Enum.call(this, name, ordinal);
-  this.d2a_1 = value;
+  this.u29_1 = value;
 }
 function FileExtension_Java_getInstance() {
   FileExtension_initEntries();
@@ -4541,8 +4665,8 @@ function PythonShared_getInstance() {
 }
 function TypeScriptShared() {
   TypeScriptShared_instance = this;
-  this.r29_1 = 'community.flock.wirespec';
-  this.s29_1 = trimMargin('\n        |export namespace Wirespec {\n        |' + Spacer_instance.toString() + 'export type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + Spacer_instance.toString() + 'export type RawRequest = { method: Method, path: string[], queries: Record<string, string>, headers: Record<string, string>, body?: string }\n        |' + Spacer_instance.toString() + 'export type RawResponse = { status: number, headers: Record<string, string>, body?: string }\n        |' + Spacer_instance.toString() + 'export type Request<T> = { path: Record<string, unknown>, method: Method, queries?: Record<string, unknown>, headers?: Record<string, unknown>, body?:T }\n        |' + Spacer_instance.toString() + 'export type Response<T> = { status:number, headers?: Record<string, unknown>, body?:T }\n        |' + Spacer_instance.toString() + 'export type Serialization = { serialize: <T>(type: T) => string; deserialize: <T>(raw: string | undefined) => T }\n        |' + Spacer_instance.toString() + 'export type Client<REQ extends Request<unknown>, RES extends Response<unknown>> = (serialization: Serialization) => { to: (request: REQ) => RawRequest; from: (response: RawResponse) => RES }\n        |' + Spacer_instance.toString() + 'export type Server<REQ extends Request<unknown>, RES extends Response<unknown>> = (serialization: Serialization) => { from: (request: RawRequest) => REQ; to: (response: RES) => RawResponse }\n        |' + Spacer_instance.toString() + 'export type Api<REQ extends Request<unknown>, RES extends Response<unknown>> = { name: string; method: Method, path: string, client: Client<REQ, RES>; server: Server<REQ, RES> }\n        |}\n    ');
+  this.v29_1 = 'community.flock.wirespec';
+  this.w29_1 = trimMargin('\n        |export namespace Wirespec {\n        |' + Spacer_instance.toString() + 'export type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + Spacer_instance.toString() + 'export type RawRequest = { method: Method, path: string[], queries: Record<string, string>, headers: Record<string, string>, body?: string }\n        |' + Spacer_instance.toString() + 'export type RawResponse = { status: number, headers: Record<string, string>, body?: string }\n        |' + Spacer_instance.toString() + 'export type Request<T> = { path: Record<string, unknown>, method: Method, queries?: Record<string, unknown>, headers?: Record<string, unknown>, body?:T }\n        |' + Spacer_instance.toString() + 'export type Response<T> = { status:number, headers?: Record<string, unknown>, body?:T }\n        |' + Spacer_instance.toString() + 'export type Serialization = { serialize: <T>(type: T) => string; deserialize: <T>(raw: string | undefined) => T }\n        |' + Spacer_instance.toString() + 'export type Client<REQ extends Request<unknown>, RES extends Response<unknown>> = (serialization: Serialization) => { to: (request: REQ) => RawRequest; from: (response: RawResponse) => RES }\n        |' + Spacer_instance.toString() + 'export type Server<REQ extends Request<unknown>, RES extends Response<unknown>> = (serialization: Serialization) => { from: (request: RawRequest) => REQ; to: (response: RES) => RawResponse }\n        |' + Spacer_instance.toString() + 'export type Api<REQ extends Request<unknown>, RES extends Response<unknown>> = { name: string; method: Method, path: string, client: Client<REQ, RES>; server: Server<REQ, RES> }\n        |}\n    ');
 }
 protoOf(TypeScriptShared).toString = function () {
   return 'TypeScriptShared';
@@ -4571,7 +4695,7 @@ function Companion_getInstance_7() {
   return Companion_instance_7;
 }
 function WrongTokenException(expected, actual) {
-  EatTokenException.call(this, actual.h2a_1, '' + expected.t9() + ' expected, not: ' + name(actual.g2a_1) + ' at line ' + actual.h2a_1.i2a_1 + ' and position ' + (actual.h2a_1.j2a_1 - actual.f2a_1.length | 0));
+  EatTokenException.call(this, actual.g2a_1, '' + expected.t9() + ' expected, not: ' + name(actual.f2a_1) + ' at line ' + actual.g2a_1.h2a_1 + ' and position ' + (actual.g2a_1.i2a_1 - actual.e2a_1.length | 0));
 }
 function DefinitionNotExistsException(referenceName, coordinates) {
   EatTokenException.call(this, coordinates, 'Cannot find reference: ' + referenceName);
@@ -4607,11 +4731,11 @@ function ValidationError(coordinates, message) {
   WirespecException.call(this, message, coordinates);
 }
 function WirespecException(message, coordinates) {
-  this.l2a_1 = message;
-  this.m2a_1 = coordinates;
+  this.k2a_1 = message;
+  this.l2a_1 = coordinates;
 }
 protoOf(WirespecException).r1 = function () {
-  return this.l2a_1;
+  return this.k2a_1;
 };
 function parseChannelDefinition(_this__u8e3s4, $this, comment, identifier) {
   // Inline function 'arrow.core.raise.either' call
@@ -4624,34 +4748,34 @@ function parseChannelDefinition(_this__u8e3s4, $this, comment, identifier) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof Arrow)
-      raise.ll(_this__u8e3s4.s2a());
+    raise.ll(_this__u8e3s4.r2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof Arrow)
+      raise.ll(_this__u8e3s4.r2a());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_0 = new WrongTokenException(getKClass(Colon), actual);
       // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_0);
     }
     // Inline function 'kotlin.with' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>' call
-    var type = _this__u8e3s4.o2a_1.g2a_1;
+    var type = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (type instanceof LeftCurly) {
-      tmp_0 = raise.ll(TypeParser_instance.u2a(_this__u8e3s4));
+      tmp_0 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4));
     } else {
       if (isInterface(type, WirespecType_0)) {
-        tmp_0 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4, type));
+        tmp_0 = raise.ll(TypeParser_instance.s2a(_this__u8e3s4, type));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.o2a_1;
+        var actual_0 = _this__u8e3s4.n2a_1;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(getKClass(WirespecType_0), actual_0);
         // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannelDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.ll(_this__u8e3s4.s2a());
+        raise.ll(_this__u8e3s4.r2a());
         raise.kl(this_1);
       }
     }
@@ -4683,7 +4807,7 @@ function parseChannelDefinition(_this__u8e3s4, $this, comment, identifier) {
 }
 function ChannelParser() {
 }
-protoOf(ChannelParser).v2a = function (_this__u8e3s4, comment) {
+protoOf(ChannelParser).u2a = function (_this__u8e3s4, comment) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -4694,19 +4818,19 @@ protoOf(ChannelParser).v2a = function (_this__u8e3s4, comment) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannel.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(tmp0_subject, WirespecType_0)) {
-      tmp_0 = raise.ll(parseChannelDefinition(_this__u8e3s4, ChannelParser_instance, comment, new DefinitionIdentifier(_this__u8e3s4.o2a_1.f2a_1)));
+      tmp_0 = raise.ll(parseChannelDefinition(_this__u8e3s4, ChannelParser_instance, comment, new DefinitionIdentifier(_this__u8e3s4.n2a_1.e2a_1)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_0 = new WrongTokenException(getKClass(WirespecType_0), actual);
       // Inline function 'community.flock.wirespec.compiler.core.parse.ChannelParser.parseChannel.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_0);
     }
     var res = tmp_0;
@@ -4749,31 +4873,31 @@ function parseEndpointDefinition(_this__u8e3s4, $this, comment, name) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
     var tmp_0;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof Method_0) {
-      tmp_0 = valueOf(_this__u8e3s4.o2a_1.f2a_1);
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof Method_0) {
+      tmp_0 = valueOf(_this__u8e3s4.n2a_1.e2a_1);
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       var tmp$ret$0 = new WrongTokenException(getKClass(Method_0), actual);
       raise.kl(tmp$ret$0);
     }
     // Inline function 'kotlin.also' call
     var this_0 = tmp_0;
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
+    raise.ll(_this__u8e3s4.r2a());
     var method = this_0;
     // Inline function 'kotlin.with' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-    var type = _this__u8e3s4.o2a_1.g2a_1;
+    var type = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_1;
     if (type instanceof LeftCurly) {
-      tmp_1 = raise.ll(TypeParser_instance.u2a(_this__u8e3s4));
+      tmp_1 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4));
     } else {
       if (isInterface(type, WirespecType_0)) {
-        tmp_1 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4, type));
+        tmp_1 = raise.ll(TypeParser_instance.s2a(_this__u8e3s4, type));
       } else {
         tmp_1 = null;
       }
@@ -4806,15 +4930,15 @@ function parseEndpointDefinition(_this__u8e3s4, $this, comment, name) {
     $l$loop: while (true) {
       var tmp_3;
       var tmp_4;
-      var tmp_5 = _this__u8e3s4.o2a_1.g2a_1;
+      var tmp_5 = _this__u8e3s4.n2a_1.f2a_1;
       if (!(tmp_5 instanceof QuestionMark)) {
-        var tmp_6 = _this__u8e3s4.o2a_1.g2a_1;
+        var tmp_6 = _this__u8e3s4.n2a_1.f2a_1;
         tmp_4 = !(tmp_6 instanceof Hash);
       } else {
         tmp_4 = false;
       }
       if (tmp_4) {
-        var tmp_7 = _this__u8e3s4.o2a_1.g2a_1;
+        var tmp_7 = _this__u8e3s4.n2a_1.f2a_1;
         tmp_3 = !(tmp_7 instanceof Arrow);
       } else {
         tmp_3 = false;
@@ -4826,16 +4950,16 @@ function parseEndpointDefinition(_this__u8e3s4, $this, comment, name) {
     }
     var segments = this_2;
     var tmp_8;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof QuestionMark) {
-      raise.ll(_this__u8e3s4.s2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof QuestionMark) {
+      raise.ll(_this__u8e3s4.r2a());
       var tmp_9;
-      if (_this__u8e3s4.o2a_1.g2a_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.n2a_1.f2a_1 instanceof LeftCurly) {
         // Inline function 'kotlin.with' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-        tmp_9 = raise.ll(TypeParser_instance.x2a(_this__u8e3s4)).h27_1;
+        tmp_9 = raise.ll(TypeParser_instance.w2a(_this__u8e3s4)).h27_1;
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.o2a_1;
+        var actual_0 = _this__u8e3s4.n2a_1;
         var tmp$ret$13 = new WrongTokenException(getKClass(LeftCurly), actual_0);
         raise.kl(tmp$ret$13);
       }
@@ -4845,23 +4969,23 @@ function parseEndpointDefinition(_this__u8e3s4, $this, comment, name) {
     }
     var queryParams = tmp_8;
     var headers = raise.ll(parseHeaders(_this__u8e3s4, EndpointParser_instance));
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof Arrow)
-      raise.ll(_this__u8e3s4.s2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof Arrow)
+      raise.ll(_this__u8e3s4.r2a());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_1 = _this__u8e3s4.o2a_1;
+      var actual_1 = _this__u8e3s4.n2a_1;
       var tmp$ret$14 = new WrongTokenException(getKClass(Arrow), actual_1);
       raise.kl(tmp$ret$14);
     }
-    if (!(_this__u8e3s4.o2a_1.g2a_1 instanceof LeftCurly)) {
+    if (!(_this__u8e3s4.n2a_1.f2a_1 instanceof LeftCurly)) {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_2 = _this__u8e3s4.o2a_1;
+      var actual_2 = _this__u8e3s4.n2a_1;
       var tmp$ret$15 = new WrongTokenException(getKClass(LeftCurly), actual_2);
       raise.kl(tmp$ret$15);
     }
     // Inline function 'kotlin.also' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointDefinition.<anonymous>.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
+    raise.ll(_this__u8e3s4.r2a());
     var responses = raise.ll(parseEndpointResponses(_this__u8e3s4, EndpointParser_instance));
     var res = new Endpoint(comment, name, method, segments, queryParams, headers, requests, responses);
     raise.il();
@@ -4899,21 +5023,21 @@ function parseEndpointSegments(_this__u8e3s4, $this) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegments.<anonymous>' call
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (tmp0_subject instanceof Path) {
       // Inline function 'kotlin.also' call
-      var this_0 = new Literal(drop(_this__u8e3s4.o2a_1.f2a_1, 1));
+      var this_0 = new Literal(drop(_this__u8e3s4.n2a_1.e2a_1, 1));
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegments.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       tmp_0 = this_0;
     } else {
       if (tmp0_subject instanceof ForwardSlash) {
         tmp_0 = raise.ll(parseEndpointSegmentParam(_this__u8e3s4, EndpointParser_instance));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.o2a_1;
+        var actual = _this__u8e3s4.n2a_1;
         var tmp$ret$1 = new WrongTokenException(getKClass(Path), actual);
         raise.kl(tmp$ret$1);
       }
@@ -4954,64 +5078,64 @@ function parseEndpointSegmentParam(_this__u8e3s4, $this) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof LeftCurly)
-      raise.ll(_this__u8e3s4.s2a());
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof LeftCurly)
+      raise.ll(_this__u8e3s4.r2a());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       var tmp$ret$0 = new WrongTokenException(getKClass(LeftCurly), actual);
       raise.kl(tmp$ret$0);
     }
-    var tmp1_subject = _this__u8e3s4.o2a_1.g2a_1;
+    var tmp1_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(tmp1_subject, WirespecIdentifier)) {
       // Inline function 'kotlin.also' call
-      var this_0 = new FieldIdentifier(_this__u8e3s4.o2a_1.f2a_1);
+      var this_0 = new FieldIdentifier(_this__u8e3s4.n2a_1.e2a_1);
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       tmp_0 = this_0;
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_0 = _this__u8e3s4.o2a_1;
+      var actual_0 = _this__u8e3s4.n2a_1;
       var tmp$ret$2 = new WrongTokenException(getKClass(WirespecIdentifier), actual_0);
       raise.kl(tmp$ret$2);
     }
     var identifier = tmp_0;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof Colon)
-      raise.ll(_this__u8e3s4.s2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof Colon)
+      raise.ll(_this__u8e3s4.r2a());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_1 = _this__u8e3s4.o2a_1;
+      var actual_1 = _this__u8e3s4.n2a_1;
       var tmp$ret$3 = new WrongTokenException(getKClass(Colon), actual_1);
       raise.kl(tmp$ret$3);
     }
     // Inline function 'kotlin.with' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>' call
-    var type = _this__u8e3s4.o2a_1.g2a_1;
+    var type = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_1;
     if (type instanceof LeftCurly) {
-      tmp_1 = raise.ll(TypeParser_instance.u2a(_this__u8e3s4));
+      tmp_1 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4));
     } else {
       if (isInterface(type, WirespecType_0)) {
-        tmp_1 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4, type));
+        tmp_1 = raise.ll(TypeParser_instance.s2a(_this__u8e3s4, type));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_2 = _this__u8e3s4.o2a_1;
+        var actual_2 = _this__u8e3s4.n2a_1;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(getKClass(WirespecType_0), actual_2);
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointSegmentParam.<anonymous>.<anonymous>.<anonymous>' call
-        raise.ll(_this__u8e3s4.s2a());
+        raise.ll(_this__u8e3s4.r2a());
         raise.kl(this_1);
       }
     }
     var reference = tmp_1;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof RightCurly)
-      raise.ll(_this__u8e3s4.s2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof RightCurly)
+      raise.ll(_this__u8e3s4.r2a());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_3 = _this__u8e3s4.o2a_1;
+      var actual_3 = _this__u8e3s4.n2a_1;
       var tmp$ret$8 = new WrongTokenException(getKClass(RightCurly), actual_3);
       raise.kl(tmp$ret$8);
     }
@@ -5051,32 +5175,32 @@ function parseEndpointResponses(_this__u8e3s4, $this) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>' call
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
     // Inline function 'kotlin.collections.mutableListOf' call
     var responses = ArrayList_init_$Create$_0();
     $l$loop: while (true) {
-      var tmp_0 = _this__u8e3s4.o2a_1.g2a_1;
+      var tmp_0 = _this__u8e3s4.n2a_1.f2a_1;
       if (!!(tmp_0 instanceof RightCurly)) {
         break $l$loop;
       }
-      if (_this__u8e3s4.o2a_1.g2a_1 instanceof StatusCode)
-        responses.e(raise.ll(parseEndpointResponse(_this__u8e3s4, EndpointParser_instance, _this__u8e3s4.o2a_1.f2a_1)));
+      if (_this__u8e3s4.n2a_1.f2a_1 instanceof StatusCode)
+        responses.e(raise.ll(parseEndpointResponse(_this__u8e3s4, EndpointParser_instance, _this__u8e3s4.n2a_1.e2a_1)));
       else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.o2a_1;
+        var actual = _this__u8e3s4.n2a_1;
         var tmp$ret$1 = new WrongTokenException(getKClass(StatusCode), actual);
         raise.kl(tmp$ret$1);
       }
     }
-    if (!(_this__u8e3s4.o2a_1.g2a_1 instanceof RightCurly)) {
+    if (!(_this__u8e3s4.n2a_1.f2a_1 instanceof RightCurly)) {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_0 = _this__u8e3s4.o2a_1;
+      var actual_0 = _this__u8e3s4.n2a_1;
       var tmp$ret$2 = new WrongTokenException(getKClass(RightCurly), actual_0);
       raise.kl(tmp$ret$2);
     }
     // Inline function 'kotlin.also' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponses.<anonymous>.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
+    raise.ll(_this__u8e3s4.r2a());
     var res = toList(responses);
     raise.il();
     // Inline function 'arrow.core.raise.either.<anonymous>' call
@@ -5113,32 +5237,32 @@ function parseEndpointResponse(_this__u8e3s4, $this, statusCode) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    if (!(_this__u8e3s4.o2a_1.g2a_1 instanceof Arrow)) {
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    if (!(_this__u8e3s4.n2a_1.f2a_1 instanceof Arrow)) {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       var tmp$ret$0 = new WrongTokenException(getKClass(Arrow), actual);
       raise.kl(tmp$ret$0);
     }
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
     // Inline function 'kotlin.with' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>.<anonymous>' call
-    var type = _this__u8e3s4.o2a_1.g2a_1;
+    var type = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (type instanceof LeftCurly) {
-      tmp_0 = raise.ll(TypeParser_instance.u2a(_this__u8e3s4));
+      tmp_0 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4));
     } else {
       if (isInterface(type, WirespecType_0)) {
-        tmp_0 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4, type));
+        tmp_0 = raise.ll(TypeParser_instance.s2a(_this__u8e3s4, type));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.o2a_1;
+        var actual_0 = _this__u8e3s4.n2a_1;
         // Inline function 'kotlin.also' call
         var this_0 = new WrongTokenException(getKClass(WirespecType_0), actual_0);
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpointResponse.<anonymous>.<anonymous>.<anonymous>' call
-        raise.ll(_this__u8e3s4.s2a());
+        raise.ll(_this__u8e3s4.r2a());
         raise.kl(this_0);
       }
     }
@@ -5187,18 +5311,18 @@ function parseHeaders(_this__u8e3s4, $this) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseHeaders.<anonymous>' call
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
     var tmp_0;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof Hash) {
-      raise.ll(_this__u8e3s4.s2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof Hash) {
+      raise.ll(_this__u8e3s4.r2a());
       var tmp_1;
-      if (_this__u8e3s4.o2a_1.g2a_1 instanceof LeftCurly) {
+      if (_this__u8e3s4.n2a_1.f2a_1 instanceof LeftCurly) {
         // Inline function 'kotlin.with' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseHeaders.<anonymous>.<anonymous>' call
-        tmp_1 = raise.ll(TypeParser_instance.x2a(_this__u8e3s4)).h27_1;
+        tmp_1 = raise.ll(TypeParser_instance.w2a(_this__u8e3s4)).h27_1;
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.o2a_1;
+        var actual = _this__u8e3s4.n2a_1;
         var tmp$ret$2 = new WrongTokenException(getKClass(LeftCurly), actual);
         raise.kl(tmp$ret$2);
       }
@@ -5233,7 +5357,7 @@ function parseHeaders(_this__u8e3s4, $this) {
 }
 function EndpointParser() {
 }
-protoOf(EndpointParser).y2a = function (_this__u8e3s4, comment) {
+protoOf(EndpointParser).x2a = function (_this__u8e3s4, comment) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -5244,19 +5368,19 @@ protoOf(EndpointParser).y2a = function (_this__u8e3s4, comment) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(tmp0_subject, WirespecType_0)) {
-      tmp_0 = raise.ll(parseEndpointDefinition(_this__u8e3s4, EndpointParser_instance, comment, new DefinitionIdentifier(_this__u8e3s4.o2a_1.f2a_1)));
+      tmp_0 = raise.ll(parseEndpointDefinition(_this__u8e3s4, EndpointParser_instance, comment, new DefinitionIdentifier(_this__u8e3s4.n2a_1.e2a_1)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_0 = new WrongTokenException(getKClass(WirespecType_0), actual);
       // Inline function 'community.flock.wirespec.compiler.core.parse.EndpointParser.parseEndpoint.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_0);
     }
     var res = tmp_0;
@@ -5299,32 +5423,32 @@ function parseEnumTypeDefinition(_this__u8e3s4, $this, comment, typeName) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
     var tmp_0;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof LeftCurly) {
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof LeftCurly) {
       tmp_0 = new Enum_0(comment, typeName, raise.ll(parseEnumTypeEntries(_this__u8e3s4, EnumParser_instance)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_0 = new WrongTokenException(getKClass(LeftCurly), actual);
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_0);
     }
     // Inline function 'kotlin.also' call
     var this_1 = tmp_0;
     // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof RightCurly)
-      raise.ll(_this__u8e3s4.s2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof RightCurly)
+      raise.ll(_this__u8e3s4.r2a());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_0 = _this__u8e3s4.o2a_1;
+      var actual_0 = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_2 = new WrongTokenException(getKClass(RightCurly), actual_0);
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_2);
     }
     var res = this_1;
@@ -5363,43 +5487,43 @@ function parseEnumTypeEntries(_this__u8e3s4, $this) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(tmp0_subject, WirespecType_0)) {
       // Inline function 'kotlin.collections.mutableListOf' call
       // Inline function 'kotlin.apply' call
       var this_0 = ArrayList_init_$Create$_0();
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-      this_0.e(_this__u8e3s4.o2a_1.f2a_1);
-      raise.ll(_this__u8e3s4.s2a());
-      while (equals(_this__u8e3s4.o2a_1.g2a_1, Comma_instance)) {
-        raise.ll(_this__u8e3s4.s2a());
-        var tmp0_subject_0 = _this__u8e3s4.o2a_1.g2a_1;
+      this_0.e(_this__u8e3s4.n2a_1.e2a_1);
+      raise.ll(_this__u8e3s4.r2a());
+      while (equals(_this__u8e3s4.n2a_1.f2a_1, Comma_instance)) {
+        raise.ll(_this__u8e3s4.r2a());
+        var tmp0_subject_0 = _this__u8e3s4.n2a_1.f2a_1;
         if (isInterface(tmp0_subject_0, WirespecType_0)) {
           // Inline function 'kotlin.also' call
-          this_0.e(_this__u8e3s4.o2a_1.f2a_1);
+          this_0.e(_this__u8e3s4.n2a_1.e2a_1);
           // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-          raise.ll(_this__u8e3s4.s2a());
+          raise.ll(_this__u8e3s4.r2a());
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = _this__u8e3s4.o2a_1;
+          var actual = _this__u8e3s4.n2a_1;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(getKClass(WirespecType_0), actual);
           // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-          raise.ll(_this__u8e3s4.s2a());
+          raise.ll(_this__u8e3s4.r2a());
           raise.kl(this_1);
         }
       }
       tmp_0 = this_0;
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_0 = _this__u8e3s4.o2a_1;
+      var actual_0 = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_2 = new WrongTokenException(getKClass(WirespecType_0), actual_0);
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_2);
     }
     var res = toSet(tmp_0);
@@ -5429,7 +5553,7 @@ function parseEnumTypeEntries(_this__u8e3s4, $this) {
 }
 function EnumParser() {
 }
-protoOf(EnumParser).z2a = function (_this__u8e3s4, comment) {
+protoOf(EnumParser).y2a = function (_this__u8e3s4, comment) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -5440,19 +5564,19 @@ protoOf(EnumParser).z2a = function (_this__u8e3s4, comment) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(tmp0_subject, WirespecType_0)) {
-      tmp_0 = raise.ll(parseEnumTypeDefinition(_this__u8e3s4, EnumParser_instance, comment, new DefinitionIdentifier(_this__u8e3s4.o2a_1.f2a_1)));
+      tmp_0 = raise.ll(parseEnumTypeDefinition(_this__u8e3s4, EnumParser_instance, comment, new DefinitionIdentifier(_this__u8e3s4.n2a_1.e2a_1)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_0 = new WrongTokenException(getKClass(WirespecType_0), actual);
       // Inline function 'community.flock.wirespec.compiler.core.parse.EnumParser.parseEnum.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_0);
     }
     var res = tmp_0;
@@ -5488,13 +5612,13 @@ function Module(uri, statements) {
   this.c27_1 = uri;
   this.d27_1 = statements;
 }
-protoOf(Module).a2b = function (uri, statements) {
+protoOf(Module).z2a = function (uri, statements) {
   return new Module(uri, statements);
 };
 protoOf(Module).j29 = function (uri, statements, $super) {
   uri = uri === VOID ? this.c27_1 : uri;
   statements = statements === VOID ? this.d27_1 : statements;
-  return $super === VOID ? this.a2b(uri, statements) : $super.a2b.call(this, uri, statements);
+  return $super === VOID ? this.z2a(uri, statements) : $super.z2a.call(this, uri, statements);
 };
 protoOf(Module).toString = function () {
   return 'Module(uri=' + this.c27_1 + ', statements=' + this.d27_1.toString() + ')';
@@ -5517,13 +5641,13 @@ protoOf(Module).equals = function (other) {
   return true;
 };
 function AST(modules) {
-  this.a2a_1 = modules;
+  this.r29_1 = modules;
 }
 protoOf(AST).toString = function () {
-  return 'AST(modules=' + this.a2a_1.toString() + ')';
+  return 'AST(modules=' + this.r29_1.toString() + ')';
 };
 protoOf(AST).hashCode = function () {
-  return this.a2a_1.hashCode();
+  return this.r29_1.hashCode();
 };
 protoOf(AST).equals = function (other) {
   if (this === other)
@@ -5531,7 +5655,7 @@ protoOf(AST).equals = function (other) {
   if (!(other instanceof AST))
     return false;
   var tmp0_other_with_cast = other instanceof AST ? other : THROW_CCE();
-  if (!this.a2a_1.equals(tmp0_other_with_cast.a2a_1))
+  if (!this.r29_1.equals(tmp0_other_with_cast.r29_1))
     return false;
   return true;
 };
@@ -5543,7 +5667,7 @@ function _Comment___get_value__impl__8r3pla($this) {
 }
 function Companion_7() {
 }
-protoOf(Companion_7).b2b = function (comment) {
+protoOf(Companion_7).a2b = function (comment) {
   return _Comment___init__impl__cg8s2u(removeCommentMarkers(comment));
 };
 var Companion_instance_8;
@@ -5559,21 +5683,21 @@ function Comment__hashCode_impl_tr9dgt($this) {
 function Comment__equals_impl_3xkmkx($this, other) {
   if (!(other instanceof Comment))
     return false;
-  if (!($this === (other instanceof Comment ? other.c2b_1 : THROW_CCE())))
+  if (!($this === (other instanceof Comment ? other.b2b_1 : THROW_CCE())))
     return false;
   return true;
 }
 function Comment(value) {
-  this.c2b_1 = value;
+  this.b2b_1 = value;
 }
 protoOf(Comment).toString = function () {
-  return Comment__toString_impl_803gny(this.c2b_1);
+  return Comment__toString_impl_803gny(this.b2b_1);
 };
 protoOf(Comment).hashCode = function () {
-  return Comment__hashCode_impl_tr9dgt(this.c2b_1);
+  return Comment__hashCode_impl_tr9dgt(this.b2b_1);
 };
 protoOf(Comment).equals = function (other) {
-  return Comment__equals_impl_3xkmkx(this.c2b_1, other);
+  return Comment__equals_impl_3xkmkx(this.b2b_1, other);
 };
 function Identifier(name) {
   this.x24_1 = removeBackticks(name);
@@ -5598,10 +5722,10 @@ function Precision(name, ordinal) {
   Enum.call(this, name, ordinal);
 }
 function String_0() {
-  this.d2b_1 = 'String';
+  this.c2b_1 = 'String';
 }
 protoOf(String_0).s2 = function () {
-  return this.d2b_1;
+  return this.c2b_1;
 };
 protoOf(String_0).toString = function () {
   return 'String';
@@ -5670,10 +5794,10 @@ protoOf(Number_0).equals = function (other) {
   return true;
 };
 function Boolean_0() {
-  this.e2b_1 = 'Boolean';
+  this.d2b_1 = 'Boolean';
 }
 protoOf(Boolean_0).s2 = function () {
-  return this.e2b_1;
+  return this.d2b_1;
 };
 protoOf(Boolean_0).toString = function () {
   return 'Boolean';
@@ -5694,10 +5818,10 @@ function Boolean_getInstance() {
   return Boolean_instance;
 }
 function Bytes() {
-  this.f2b_1 = 'Bytes';
+  this.e2b_1 = 'Bytes';
 }
 protoOf(Bytes).s2 = function () {
-  return this.f2b_1;
+  return this.e2b_1;
 };
 protoOf(Bytes).toString = function () {
   return 'Bytes';
@@ -5726,20 +5850,20 @@ function Precision_P64_getInstance() {
   return Precision_P64_instance;
 }
 function Any(isNullable) {
-  this.g2b_1 = isNullable;
-  this.h2b_1 = 'Any';
+  this.f2b_1 = isNullable;
+  this.g2b_1 = 'Any';
 }
 protoOf(Any).sm = function () {
-  return this.g2b_1;
+  return this.f2b_1;
 };
 protoOf(Any).b1 = function () {
-  return this.h2b_1;
+  return this.g2b_1;
 };
 protoOf(Any).toString = function () {
-  return 'Any(isNullable=' + this.g2b_1 + ')';
+  return 'Any(isNullable=' + this.f2b_1 + ')';
 };
 protoOf(Any).hashCode = function () {
-  return getBooleanHashCode(this.g2b_1);
+  return getBooleanHashCode(this.f2b_1);
 };
 protoOf(Any).equals = function (other) {
   if (this === other)
@@ -5747,25 +5871,25 @@ protoOf(Any).equals = function (other) {
   if (!(other instanceof Any))
     return false;
   var tmp0_other_with_cast = other instanceof Any ? other : THROW_CCE();
-  if (!(this.g2b_1 === tmp0_other_with_cast.g2b_1))
+  if (!(this.f2b_1 === tmp0_other_with_cast.f2b_1))
     return false;
   return true;
 };
 function Unit(isNullable) {
-  this.i2b_1 = isNullable;
-  this.j2b_1 = 'Unit';
+  this.h2b_1 = isNullable;
+  this.i2b_1 = 'Unit';
 }
 protoOf(Unit).sm = function () {
-  return this.i2b_1;
+  return this.h2b_1;
 };
 protoOf(Unit).b1 = function () {
-  return this.j2b_1;
+  return this.i2b_1;
 };
 protoOf(Unit).toString = function () {
-  return 'Unit(isNullable=' + this.i2b_1 + ')';
+  return 'Unit(isNullable=' + this.h2b_1 + ')';
 };
 protoOf(Unit).hashCode = function () {
-  return getBooleanHashCode(this.i2b_1);
+  return getBooleanHashCode(this.h2b_1);
 };
 protoOf(Unit).equals = function (other) {
   if (this === other)
@@ -5773,7 +5897,7 @@ protoOf(Unit).equals = function (other) {
   if (!(other instanceof Unit))
     return false;
   var tmp0_other_with_cast = other instanceof Unit ? other : THROW_CCE();
-  if (!(this.i2b_1 === tmp0_other_with_cast.i2b_1))
+  if (!(this.h2b_1 === tmp0_other_with_cast.h2b_1))
     return false;
   return true;
 };
@@ -5928,19 +6052,19 @@ function Type(comment, identifier, shape, extends_0) {
 protoOf(Type).w24 = function () {
   return this.x26_1;
 };
-protoOf(Type).k2b = function (comment, identifier, shape, extends_0) {
+protoOf(Type).j2b = function (comment, identifier, shape, extends_0) {
   return new Type(comment, identifier, shape, extends_0);
 };
-protoOf(Type).l2b = function (comment, identifier, shape, extends_0, $super) {
+protoOf(Type).k2b = function (comment, identifier, shape, extends_0, $super) {
   comment = comment === VOID ? this.w26_1 : comment;
   identifier = identifier === VOID ? this.x26_1 : identifier;
   shape = shape === VOID ? this.y26_1 : shape;
   extends_0 = extends_0 === VOID ? this.z26_1 : extends_0;
   var tmp;
   if ($super === VOID) {
-    tmp = this.k2b(comment, identifier, shape, extends_0);
+    tmp = this.j2b(comment, identifier, shape, extends_0);
   } else {
-    var tmp_0 = $super.k2b;
+    var tmp_0 = $super.j2b;
     var tmp_1 = comment;
     tmp = tmp_0.call(this, tmp_1 == null ? null : new Comment(tmp_1), identifier, shape, extends_0);
   }
@@ -5985,13 +6109,13 @@ protoOf(Type).equals = function (other) {
 };
 function DefinitionIdentifier(name) {
   Identifier.call(this, name);
-  this.n2b_1 = name;
+  this.m2b_1 = name;
 }
 protoOf(DefinitionIdentifier).toString = function () {
-  return 'DefinitionIdentifier(name=' + this.n2b_1 + ')';
+  return 'DefinitionIdentifier(name=' + this.m2b_1 + ')';
 };
 protoOf(DefinitionIdentifier).hashCode = function () {
-  return getStringHashCode(this.n2b_1);
+  return getStringHashCode(this.m2b_1);
 };
 protoOf(DefinitionIdentifier).equals = function (other) {
   if (this === other)
@@ -5999,7 +6123,7 @@ protoOf(DefinitionIdentifier).equals = function (other) {
   if (!(other instanceof DefinitionIdentifier))
     return false;
   var tmp0_other_with_cast = other instanceof DefinitionIdentifier ? other : THROW_CCE();
-  if (!(this.n2b_1 === tmp0_other_with_cast.n2b_1))
+  if (!(this.m2b_1 === tmp0_other_with_cast.m2b_1))
     return false;
   return true;
 };
@@ -6459,13 +6583,13 @@ protoOf(Channel).equals = function (other) {
 };
 function FieldIdentifier(name) {
   Identifier.call(this, name);
-  this.p2b_1 = name;
+  this.o2b_1 = name;
 }
 protoOf(FieldIdentifier).toString = function () {
-  return 'FieldIdentifier(name=' + this.p2b_1 + ')';
+  return 'FieldIdentifier(name=' + this.o2b_1 + ')';
 };
 protoOf(FieldIdentifier).hashCode = function () {
-  return getStringHashCode(this.p2b_1);
+  return getStringHashCode(this.o2b_1);
 };
 protoOf(FieldIdentifier).equals = function (other) {
   if (this === other)
@@ -6473,7 +6597,7 @@ protoOf(FieldIdentifier).equals = function (other) {
   if (!(other instanceof FieldIdentifier))
     return false;
   var tmp0_other_with_cast = other instanceof FieldIdentifier ? other : THROW_CCE();
-  if (!(this.p2b_1 === tmp0_other_with_cast.p2b_1))
+  if (!(this.o2b_1 === tmp0_other_with_cast.o2b_1))
     return false;
   return true;
 };
@@ -6638,47 +6762,47 @@ function parseDefinition(_this__u8e3s4, $this) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>' call
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
     var tmp_0;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof Comment_0) {
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof Comment_0) {
       // Inline function 'kotlin.also' call
-      var this_0 = new Comment(Companion_instance_8.b2b(_this__u8e3s4.o2a_1.f2a_1));
+      var this_0 = new Comment(Companion_instance_8.a2b(_this__u8e3s4.n2a_1.e2a_1));
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-      this_0.c2b_1;
-      raise.ll(_this__u8e3s4.s2a());
-      tmp_0 = this_0.c2b_1;
+      this_0.b2b_1;
+      raise.ll(_this__u8e3s4.r2a());
+      tmp_0 = this_0.b2b_1;
     } else {
       tmp_0 = null;
     }
     var comment = tmp_0;
-    var tmp1_subject = _this__u8e3s4.o2a_1.g2a_1;
+    var tmp1_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_1;
     if (isInterface(tmp1_subject, WirespecDefinition)) {
-      var tmp_2 = _this__u8e3s4.o2a_1.g2a_1;
+      var tmp_2 = _this__u8e3s4.n2a_1.f2a_1;
       var tmp2_subject = isInterface(tmp_2, WirespecDefinition) ? tmp_2 : THROW_CCE();
       var tmp_3;
       if (tmp2_subject instanceof TypeDefinition) {
         // Inline function 'kotlin.with' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-        var tmp$ret$2 = Parser_getInstance().v22_1.q2b(_this__u8e3s4, comment);
+        var tmp$ret$2 = Parser_getInstance().v22_1.p2b(_this__u8e3s4, comment);
         tmp_3 = raise.ll(tmp$ret$2);
       } else {
         if (tmp2_subject instanceof EnumTypeDefinition) {
           // Inline function 'kotlin.with' call
           // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-          var tmp$ret$4 = Parser_getInstance().w22_1.z2a(_this__u8e3s4, comment);
+          var tmp$ret$4 = Parser_getInstance().w22_1.y2a(_this__u8e3s4, comment);
           tmp_3 = raise.ll(tmp$ret$4);
         } else {
           if (tmp2_subject instanceof EndpointDefinition) {
             // Inline function 'kotlin.with' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            var tmp$ret$6 = Parser_getInstance().x22_1.y2a(_this__u8e3s4, comment);
+            var tmp$ret$6 = Parser_getInstance().x22_1.x2a(_this__u8e3s4, comment);
             tmp_3 = raise.ll(tmp$ret$6);
           } else {
             if (tmp2_subject instanceof ChannelDefinition) {
               // Inline function 'kotlin.with' call
               // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-              var tmp$ret$8 = Parser_getInstance().y22_1.v2a(_this__u8e3s4, comment);
+              var tmp$ret$8 = Parser_getInstance().y22_1.u2a(_this__u8e3s4, comment);
               tmp_3 = raise.ll(tmp$ret$8);
             } else {
               noWhenBranchMatchedException();
@@ -6689,11 +6813,11 @@ function parseDefinition(_this__u8e3s4, $this) {
       tmp_1 = tmp_3;
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_1 = new WrongTokenException(getKClass(WirespecDefinition), actual);
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_1);
     }
     var res = tmp_1;
@@ -6806,7 +6930,7 @@ function fillExtendsClause(_this__u8e3s4, $this) {
                 var tmp$ret$9 = new Custom(item_0.f27_1.b1(), false);
                 destination_2.e(tmp$ret$9);
               }
-              tmp_0 = definition.l2b(VOID, VOID, VOID, destination_2);
+              tmp_0 = definition.k2b(VOID, VOID, VOID, destination_2);
             } else {
               if (definition instanceof Union) {
                 tmp_0 = definition;
@@ -6892,7 +7016,7 @@ function fillExtendsClause(_this__u8e3s4, $this) {
                   var tmp$ret$22 = new Custom(item_3.f27_1.b1(), false);
                   destination_7.e(tmp$ret$22);
                 }
-                tmp_3 = item_1.l2b(VOID, VOID, VOID, destination_7);
+                tmp_3 = item_1.k2b(VOID, VOID, VOID, destination_7);
               } else {
                 if (item_1 instanceof Union) {
                   tmp_3 = item_1;
@@ -6938,7 +7062,7 @@ function Parser$validate$lambda$lambda($this$runOption) {
 function Parser$validate$lambda($options) {
   return function (defs) {
     var tmp = Parser_getInstance();
-    return runOption(defs, tmp, $options.s2b_1, Parser$validate$lambda$lambda);
+    return runOption(defs, tmp, $options.r2b_1, Parser$validate$lambda$lambda);
   };
 }
 function Parser() {
@@ -6948,7 +7072,7 @@ function Parser() {
   this.x22_1 = EndpointParser_instance;
   this.y22_1 = ChannelParser_instance;
 }
-protoOf(Parser).t2b = function (_this__u8e3s4, modules, options) {
+protoOf(Parser).s2b = function (_this__u8e3s4, modules, options) {
   // Inline function 'arrow.core.NonEmptyList.map' call
   // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parse.<anonymous>' call
   var it = modules.uk_1;
@@ -7022,11 +7146,11 @@ protoOf(Parser).t2b = function (_this__u8e3s4, modules, options) {
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parse.<anonymous>' call
   var it_2 = tmp_2;
-  return Validator_instance.u2b(it_2);
+  return Validator_instance.t2b(it_2);
 };
 protoOf(Parser).z22 = function (_this__u8e3s4, modules, options, $super) {
   options = options === VOID ? new ParseOptions() : options;
-  return $super === VOID ? this.t2b(_this__u8e3s4, modules, options) : $super.t2b.call(this, _this__u8e3s4, modules, options);
+  return $super === VOID ? this.s2b(_this__u8e3s4, modules, options) : $super.s2b.call(this, _this__u8e3s4, modules, options);
 };
 var Parser_instance;
 function Parser_getInstance() {
@@ -7037,15 +7161,15 @@ function Parser_getInstance() {
 function ParseOptions(strict, allowUnions) {
   strict = strict === VOID ? false : strict;
   allowUnions = allowUnions === VOID ? true : allowUnions;
-  this.r2b_1 = strict;
-  this.s2b_1 = allowUnions;
+  this.q2b_1 = strict;
+  this.r2b_1 = allowUnions;
 }
 protoOf(ParseOptions).toString = function () {
-  return 'ParseOptions(strict=' + this.r2b_1 + ', allowUnions=' + this.s2b_1 + ')';
+  return 'ParseOptions(strict=' + this.q2b_1 + ', allowUnions=' + this.r2b_1 + ')';
 };
 protoOf(ParseOptions).hashCode = function () {
-  var result = getBooleanHashCode(this.r2b_1);
-  result = imul(result, 31) + getBooleanHashCode(this.s2b_1) | 0;
+  var result = getBooleanHashCode(this.q2b_1);
+  result = imul(result, 31) + getBooleanHashCode(this.r2b_1) | 0;
   return result;
 };
 protoOf(ParseOptions).equals = function (other) {
@@ -7054,9 +7178,9 @@ protoOf(ParseOptions).equals = function (other) {
   if (!(other instanceof ParseOptions))
     return false;
   var tmp0_other_with_cast = other instanceof ParseOptions ? other : THROW_CCE();
-  if (!(this.r2b_1 === tmp0_other_with_cast.r2b_1))
+  if (!(this.q2b_1 === tmp0_other_with_cast.q2b_1))
     return false;
-  if (!(this.s2b_1 === tmp0_other_with_cast.s2b_1))
+  if (!(this.r2b_1 === tmp0_other_with_cast.r2b_1))
     return false;
   return true;
 };
@@ -7067,25 +7191,25 @@ function printTokens($this, previousToken) {
   } else {
     // Inline function 'kotlin.run' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-    tmp = "Eating: '" + previousToken.f2a_1 + "', ";
+    tmp = "Eating: '" + previousToken.e2a_1 + "', ";
   }
   var tmp1_elvis_lhs = tmp;
   var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
   // Inline function 'kotlin.run' call
   // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-  var curr = "Current: '" + $this.o2a_1.f2a_1 + "'";
-  var tmp2_safe_receiver = $this.q2a_1;
+  var curr = "Current: '" + $this.n2a_1.e2a_1 + "'";
+  var tmp2_safe_receiver = $this.p2a_1;
   var tmp_0;
   if (tmp2_safe_receiver == null) {
     tmp_0 = null;
   } else {
     // Inline function 'kotlin.run' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-    tmp_0 = ", Next: '" + tmp2_safe_receiver.f2a_1 + "'";
+    tmp_0 = ", Next: '" + tmp2_safe_receiver.e2a_1 + "'";
   }
   var tmp3_elvis_lhs = tmp_0;
   var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-  $this.n2a_1.f23(prev + curr + next);
+  $this.m2a_1.f23(prev + curr + next);
 }
 function printTokens$default($this, previousToken, $super) {
   previousToken = previousToken === VOID ? null : previousToken;
@@ -7098,7 +7222,7 @@ function nextToken($this) {
   try {
     // Inline function 'arrow.core.Companion.catch.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.nextToken.<anonymous>' call
-    var tmp$ret$0 = $this.p2a_1.i();
+    var tmp$ret$0 = $this.o2a_1.i();
     tmp = right(tmp$ret$0);
   } catch ($p) {
     var tmp_0;
@@ -7115,10 +7239,10 @@ function nextToken($this) {
   return tmp.ok();
 }
 function TokenProvider(logger, tokens) {
-  this.n2a_1 = logger;
-  this.o2a_1 = tokens.uk_1;
-  this.p2a_1 = tokens.vk_1.g();
-  this.q2a_1 = nextToken(this);
+  this.m2a_1 = logger;
+  this.n2a_1 = tokens.uk_1;
+  this.o2a_1 = tokens.vk_1.g();
+  this.p2a_1 = nextToken(this);
   var tmp = this;
   // Inline function 'kotlin.collections.mapNotNull' call
   var tmp0 = zipWithNext(tokens);
@@ -7132,10 +7256,10 @@ function TokenProvider(logger, tokens) {
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.definitionNames.<anonymous>' call
     var first = element.yd();
     var second = element.zd();
-    var tmp0_subject = first.g2a_1;
+    var tmp0_subject = first.f2a_1;
     var tmp_0;
     if (isInterface(tmp0_subject, WirespecDefinition)) {
-      tmp_0 = second.f2a_1;
+      tmp_0 = second.e2a_1;
     } else {
       tmp_0 = null;
     }
@@ -7148,10 +7272,10 @@ function TokenProvider(logger, tokens) {
       destination.e(tmp0_safe_receiver);
     }
   }
-  tmp.r2a_1 = destination;
+  tmp.q2a_1 = destination;
   printTokens$default(this);
 }
-protoOf(TokenProvider).v2b = function (_this__u8e3s4) {
+protoOf(TokenProvider).u2b = function (_this__u8e3s4) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -7161,8 +7285,8 @@ protoOf(TokenProvider).v2b = function (_this__u8e3s4) {
   var tmp;
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
-    if (!this.r2a_1.o1(_this__u8e3s4.f2a_1)) {
-      raise.kl(new DefinitionNotExistsException(_this__u8e3s4.f2a_1, _this__u8e3s4.h2a_1));
+    if (!this.q2a_1.o1(_this__u8e3s4.e2a_1)) {
+      raise.kl(new DefinitionNotExistsException(_this__u8e3s4.e2a_1, _this__u8e3s4.g2a_1));
     }
     var res = Unit_instance;
     raise.il();
@@ -7190,9 +7314,9 @@ protoOf(TokenProvider).v2b = function (_this__u8e3s4) {
   return tmp;
 };
 protoOf(TokenProvider).h = function () {
-  return !(this.q2a_1 == null);
+  return !(this.p2a_1 == null);
 };
-protoOf(TokenProvider).s2a = function () {
+protoOf(TokenProvider).r2a = function () {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -7203,17 +7327,17 @@ protoOf(TokenProvider).s2a = function () {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.eatToken.<anonymous>' call
-    var previousToken = this.o2a_1;
+    var previousToken = this.n2a_1;
     var tmp_0 = this;
-    var tmp0_elvis_lhs = this.q2a_1;
+    var tmp0_elvis_lhs = this.p2a_1;
     var tmp_1;
     if (tmp0_elvis_lhs == null) {
-      raise.kl(new NextException(previousToken.h2a_1));
+      raise.kl(new NextException(previousToken.g2a_1));
     } else {
       tmp_1 = tmp0_elvis_lhs;
     }
-    tmp_0.o2a_1 = tmp_1;
-    this.q2a_1 = nextToken(this);
+    tmp_0.n2a_1 = tmp_1;
+    this.p2a_1 = nextToken(this);
     printTokens(this, previousToken);
     var res = previousToken;
     raise.il();
@@ -7240,8 +7364,8 @@ protoOf(TokenProvider).s2a = function () {
   }
   return tmp;
 };
-protoOf(TokenProvider).w2a = function (_this__u8e3s4) {
-  return this.n2a_1.f23('Parsing ' + toString(_this__u8e3s4.g2a_1) + ' at line ' + _this__u8e3s4.h2a_1.i2a_1 + ' position ' + _this__u8e3s4.h2a_1.j2a_1);
+protoOf(TokenProvider).v2a = function (_this__u8e3s4) {
+  return this.m2a_1.f23('Parsing ' + toString(_this__u8e3s4.f2a_1) + ' at line ' + _this__u8e3s4.g2a_1.h2a_1 + ' position ' + _this__u8e3s4.g2a_1.i2a_1);
 };
 function toProvider(_this__u8e3s4, logger) {
   return new TokenProvider(logger, _this__u8e3s4);
@@ -7257,9 +7381,9 @@ function parseRefinedValidator(_this__u8e3s4, $this, accumulatedString) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseRefinedValidator.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     var tmp_1;
     if (isInterface(tmp0_subject, WirespecDefinition)) {
@@ -7270,7 +7394,7 @@ function parseRefinedValidator(_this__u8e3s4, $this, accumulatedString) {
     if (tmp_1) {
       tmp_0 = accumulatedString;
     } else {
-      tmp_0 = raise.ll(parseRefinedValidator(_this__u8e3s4, TypeParser_instance, accumulatedString + _this__u8e3s4.o2a_1.f2a_1));
+      tmp_0 = raise.ll(parseRefinedValidator(_this__u8e3s4, TypeParser_instance, accumulatedString + _this__u8e3s4.n2a_1.e2a_1));
     }
     var res = tmp_0;
     raise.il();
@@ -7308,12 +7432,12 @@ function parseTypeDefinition(_this__u8e3s4, $this, comment, typeName) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (tmp0_subject instanceof LeftCurly) {
-      tmp_0 = new Type(comment, typeName, raise.ll(TypeParser_instance.x2a(_this__u8e3s4)), emptyList());
+      tmp_0 = new Type(comment, typeName, raise.ll(TypeParser_instance.w2a(_this__u8e3s4)), emptyList());
     } else {
       if (tmp0_subject instanceof ForwardSlash) {
         tmp_0 = new Refined(comment, typeName, new Validator(raise.ll(parseRefinedValidator(_this__u8e3s4, TypeParser_instance, '/'))));
@@ -7322,11 +7446,11 @@ function parseTypeDefinition(_this__u8e3s4, $this, comment, typeName) {
           tmp_0 = new Union(comment, typeName, raise.ll(parseUnionTypeEntries(_this__u8e3s4, TypeParser_instance)));
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = _this__u8e3s4.o2a_1;
+          var actual = _this__u8e3s4.n2a_1;
           // Inline function 'kotlin.also' call
           var this_0 = new WrongTokenException(getKClass(TypeDefinitionStart), actual);
           // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeDefinition.<anonymous>.<anonymous>' call
-          raise.ll(_this__u8e3s4.s2a());
+          raise.ll(_this__u8e3s4.r2a());
           raise.kl(this_0);
         }
       }
@@ -7367,33 +7491,33 @@ function parseField(_this__u8e3s4, $this, identifier) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof Colon)
-      raise.ll(_this__u8e3s4.s2a());
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof Colon)
+      raise.ll(_this__u8e3s4.r2a());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_0 = new WrongTokenException(getKClass(Colon), actual);
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_0);
     }
-    var type = _this__u8e3s4.o2a_1.g2a_1;
+    var type = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (type instanceof LeftCurly) {
-      tmp_0 = new Field(identifier, raise.ll(TypeParser_instance.u2a(_this__u8e3s4)));
+      tmp_0 = new Field(identifier, raise.ll(TypeParser_instance.t2a(_this__u8e3s4)));
     } else {
       if (isInterface(type, WirespecType_0)) {
-        tmp_0 = new Field(identifier, raise.ll(TypeParser_instance.t2a(_this__u8e3s4, type)));
+        tmp_0 = new Field(identifier, raise.ll(TypeParser_instance.s2a(_this__u8e3s4, type)));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual_0 = _this__u8e3s4.o2a_1;
+        var actual_0 = _this__u8e3s4.n2a_1;
         // Inline function 'kotlin.also' call
         var this_1 = new WrongTokenException(getKClass(WirespecType_0), actual_0);
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseField.<anonymous>.<anonymous>' call
-        raise.ll(_this__u8e3s4.s2a());
+        raise.ll(_this__u8e3s4.r2a());
         raise.kl(this_1);
       }
     }
@@ -7433,45 +7557,45 @@ function parseUnionTypeEntries(_this__u8e3s4, $this) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(tmp0_subject, TypeIdentifier)) {
       // Inline function 'kotlin.collections.mutableListOf' call
       // Inline function 'kotlin.apply' call
       var this_0 = ArrayList_init_$Create$_0();
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.v2b(_this__u8e3s4.o2a_1));
-      this_0.e(new Custom(_this__u8e3s4.o2a_1.f2a_1, false));
-      raise.ll(_this__u8e3s4.s2a());
-      while (equals(_this__u8e3s4.o2a_1.g2a_1, Pipe_instance)) {
-        raise.ll(_this__u8e3s4.s2a());
-        var tmp0_subject_0 = _this__u8e3s4.o2a_1.g2a_1;
+      raise.ll(_this__u8e3s4.u2b(_this__u8e3s4.n2a_1));
+      this_0.e(new Custom(_this__u8e3s4.n2a_1.e2a_1, false));
+      raise.ll(_this__u8e3s4.r2a());
+      while (equals(_this__u8e3s4.n2a_1.f2a_1, Pipe_instance)) {
+        raise.ll(_this__u8e3s4.r2a());
+        var tmp0_subject_0 = _this__u8e3s4.n2a_1.f2a_1;
         if (isInterface(tmp0_subject_0, TypeIdentifier)) {
-          raise.ll(_this__u8e3s4.v2b(_this__u8e3s4.o2a_1));
+          raise.ll(_this__u8e3s4.u2b(_this__u8e3s4.n2a_1));
           // Inline function 'kotlin.also' call
-          this_0.e(new Custom(_this__u8e3s4.o2a_1.f2a_1, false));
+          this_0.e(new Custom(_this__u8e3s4.n2a_1.e2a_1, false));
           // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-          raise.ll(_this__u8e3s4.s2a());
+          raise.ll(_this__u8e3s4.r2a());
         } else {
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = _this__u8e3s4.o2a_1;
+          var actual = _this__u8e3s4.n2a_1;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(getKClass(TypeIdentifier), actual);
           // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-          raise.ll(_this__u8e3s4.s2a());
+          raise.ll(_this__u8e3s4.r2a());
           raise.kl(this_1);
         }
       }
       tmp_0 = this_0;
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_0 = _this__u8e3s4.o2a_1;
+      var actual_0 = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_2 = new WrongTokenException(getKClass(TypeIdentifier), actual_0);
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseUnionTypeEntries.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_2);
     }
     var res = toSet(tmp_0);
@@ -7511,10 +7635,10 @@ function isNullable(_this__u8e3s4, $this) {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.isNullable.<anonymous>' call
     var tmp_0;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof QuestionMark) {
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof QuestionMark) {
       // Inline function 'kotlin.also' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.isNullable.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       tmp_0 = true;
     } else {
       tmp_0 = false;
@@ -7552,12 +7676,12 @@ function TypeParser$parseWirespecType$lambda_0(it) {
 }
 function TypeParser$parseWirespecType$lambda_1($type) {
   return function (it) {
-    return new Primitive(new Integer(toPrimitivePrecision($type.w2b_1)), it);
+    return new Primitive(new Integer(toPrimitivePrecision($type.v2b_1)), it);
   };
 }
 function TypeParser$parseWirespecType$lambda_2($type) {
   return function (it) {
-    return new Primitive(new Number_0(toPrimitivePrecision($type.x2b_1)), it);
+    return new Primitive(new Number_0(toPrimitivePrecision($type.w2b_1)), it);
   };
 }
 function TypeParser$parseWirespecType$lambda_3(it) {
@@ -7572,13 +7696,13 @@ function Reference$Unit$_init_$ref_od8ye0() {
 }
 function TypeParser$parseWirespecType$lambda_4($$this$either, $this_parseWirespecType, $current) {
   return function (it) {
-    $$this$either.ll($this_parseWirespecType.v2b($current));
-    return new Custom($current.f2a_1, it);
+    $$this$either.ll($this_parseWirespecType.u2b($current));
+    return new Custom($current.e2a_1, it);
   };
 }
 function TypeParser() {
 }
-protoOf(TypeParser).q2b = function (_this__u8e3s4, comment) {
+protoOf(TypeParser).p2b = function (_this__u8e3s4, comment) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -7589,19 +7713,19 @@ protoOf(TypeParser).q2b = function (_this__u8e3s4, comment) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(tmp0_subject, TypeIdentifier)) {
-      tmp_0 = raise.ll(parseTypeDefinition(_this__u8e3s4, TypeParser_instance, comment, new DefinitionIdentifier(_this__u8e3s4.o2a_1.f2a_1)));
+      tmp_0 = raise.ll(parseTypeDefinition(_this__u8e3s4, TypeParser_instance, comment, new DefinitionIdentifier(_this__u8e3s4.n2a_1.e2a_1)));
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual = _this__u8e3s4.o2a_1;
+      var actual = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_0 = new WrongTokenException(getKClass(TypeIdentifier), actual);
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseType.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_0);
     }
     var res = tmp_0;
@@ -7629,7 +7753,7 @@ protoOf(TypeParser).q2b = function (_this__u8e3s4, comment) {
   }
   return tmp;
 };
-protoOf(TypeParser).x2a = function (_this__u8e3s4) {
+protoOf(TypeParser).w2a = function (_this__u8e3s4) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -7640,53 +7764,53 @@ protoOf(TypeParser).x2a = function (_this__u8e3s4) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    _this__u8e3s4.w2a(_this__u8e3s4.o2a_1);
-    var tmp0_subject = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    _this__u8e3s4.v2a(_this__u8e3s4.n2a_1);
+    var tmp0_subject = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(tmp0_subject, WirespecIdentifier)) {
       // Inline function 'kotlin.collections.mutableListOf' call
       // Inline function 'kotlin.apply' call
       var this_0 = ArrayList_init_$Create$_0();
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-      this_0.e(raise.ll(parseField(_this__u8e3s4, TypeParser_instance, new FieldIdentifier(_this__u8e3s4.o2a_1.f2a_1))));
-      while (equals(_this__u8e3s4.o2a_1.g2a_1, Comma_instance)) {
-        raise.ll(_this__u8e3s4.s2a());
-        var tmp0_subject_0 = _this__u8e3s4.o2a_1.g2a_1;
+      this_0.e(raise.ll(parseField(_this__u8e3s4, TypeParser_instance, new FieldIdentifier(_this__u8e3s4.n2a_1.e2a_1))));
+      while (equals(_this__u8e3s4.n2a_1.f2a_1, Comma_instance)) {
+        raise.ll(_this__u8e3s4.r2a());
+        var tmp0_subject_0 = _this__u8e3s4.n2a_1.f2a_1;
         if (isInterface(tmp0_subject_0, WirespecIdentifier))
-          this_0.e(raise.ll(parseField(_this__u8e3s4, TypeParser_instance, new FieldIdentifier(_this__u8e3s4.o2a_1.f2a_1))));
+          this_0.e(raise.ll(parseField(_this__u8e3s4, TypeParser_instance, new FieldIdentifier(_this__u8e3s4.n2a_1.e2a_1))));
         else {
           // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-          var actual = _this__u8e3s4.o2a_1;
+          var actual = _this__u8e3s4.n2a_1;
           // Inline function 'kotlin.also' call
           var this_1 = new WrongTokenException(getKClass(WirespecIdentifier), actual);
           // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-          raise.ll(_this__u8e3s4.s2a());
+          raise.ll(_this__u8e3s4.r2a());
           raise.kl(this_1);
         }
       }
       tmp_0 = this_0;
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_0 = _this__u8e3s4.o2a_1;
+      var actual_0 = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_2 = new WrongTokenException(getKClass(WirespecIdentifier), actual_0);
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_2);
     }
     // Inline function 'kotlin.also' call
     var this_3 = tmp_0;
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>' call
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof RightCurly)
-      raise.ll(_this__u8e3s4.s2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof RightCurly)
+      raise.ll(_this__u8e3s4.r2a());
     else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_1 = _this__u8e3s4.o2a_1;
+      var actual_1 = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_4 = new WrongTokenException(getKClass(RightCurly), actual_1);
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_4);
     }
     // Inline function 'kotlin.let' call
@@ -7716,7 +7840,7 @@ protoOf(TypeParser).x2a = function (_this__u8e3s4) {
   }
   return tmp;
 };
-protoOf(TypeParser).u2a = function (_this__u8e3s4) {
+protoOf(TypeParser).t2a = function (_this__u8e3s4) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -7727,32 +7851,32 @@ protoOf(TypeParser).u2a = function (_this__u8e3s4) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseDict.<anonymous>' call
-    raise.ll(_this__u8e3s4.s2a());
-    var type = _this__u8e3s4.o2a_1.g2a_1;
+    raise.ll(_this__u8e3s4.r2a());
+    var type = _this__u8e3s4.n2a_1.f2a_1;
     var tmp_0;
     if (isInterface(type, WirespecType_0)) {
-      var tmp_1 = raise.ll(TypeParser_instance.t2a(_this__u8e3s4, type));
+      var tmp_1 = raise.ll(TypeParser_instance.s2a(_this__u8e3s4, type));
       var tmp_2;
-      if (_this__u8e3s4.o2a_1.g2a_1 instanceof RightCurly) {
-        raise.ll(_this__u8e3s4.s2a());
+      if (_this__u8e3s4.n2a_1.f2a_1 instanceof RightCurly) {
+        raise.ll(_this__u8e3s4.r2a());
         tmp_2 = raise.ll(isNullable(_this__u8e3s4, TypeParser_instance));
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-        var actual = _this__u8e3s4.o2a_1;
+        var actual = _this__u8e3s4.n2a_1;
         // Inline function 'kotlin.also' call
         var this_0 = new WrongTokenException(getKClass(RightCurly), actual);
         // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseDict.<anonymous>.<anonymous>' call
-        raise.ll(_this__u8e3s4.s2a());
+        raise.ll(_this__u8e3s4.r2a());
         raise.kl(this_0);
       }
       tmp_0 = new Dict(tmp_1, tmp_2);
     } else {
       // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
-      var actual_0 = _this__u8e3s4.o2a_1;
+      var actual_0 = _this__u8e3s4.n2a_1;
       // Inline function 'kotlin.also' call
       var this_1 = new WrongTokenException(getKClass(WirespecType_0), actual_0);
       // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseDict.<anonymous>.<anonymous>' call
-      raise.ll(_this__u8e3s4.s2a());
+      raise.ll(_this__u8e3s4.r2a());
       raise.kl(this_1);
     }
     var res = tmp_0;
@@ -7780,7 +7904,7 @@ protoOf(TypeParser).u2a = function (_this__u8e3s4) {
   }
   return tmp;
 };
-protoOf(TypeParser).t2a = function (_this__u8e3s4, type) {
+protoOf(TypeParser).s2a = function (_this__u8e3s4, type) {
   // Inline function 'arrow.core.raise.either' call
   // Inline function 'arrow.core.raise.fold' call
   // Inline function 'kotlin.contracts.contract' call
@@ -7791,7 +7915,7 @@ protoOf(TypeParser).t2a = function (_this__u8e3s4, type) {
   try {
     // Inline function 'arrow.core.raise.either.<anonymous>' call
     // Inline function 'community.flock.wirespec.compiler.core.parse.TypeParser.parseWirespecType.<anonymous>' call
-    var current = raise.ll(_this__u8e3s4.s2a());
+    var current = raise.ll(_this__u8e3s4.r2a());
     var tmp_0;
     if (type instanceof WsString) {
       tmp_0 = TypeParser$parseWirespecType$lambda;
@@ -7824,8 +7948,8 @@ protoOf(TypeParser).t2a = function (_this__u8e3s4, type) {
     }
     var wirespecType = tmp_0(raise.ll(isNullable(_this__u8e3s4, TypeParser_instance)));
     var tmp_1;
-    if (_this__u8e3s4.o2a_1.g2a_1 instanceof Brackets) {
-      raise.ll(_this__u8e3s4.s2a());
+    if (_this__u8e3s4.n2a_1.f2a_1 instanceof Brackets) {
+      raise.ll(_this__u8e3s4.r2a());
       tmp_1 = new Iterable(wirespecType, raise.ll(isNullable(_this__u8e3s4, TypeParser_instance)));
     } else {
       tmp_1 = wirespecType;
@@ -7877,15 +8001,15 @@ function toPrimitivePrecision(_this__u8e3s4) {
 function IdxAndLength(idx, length) {
   idx = idx === VOID ? 0 : idx;
   length = length === VOID ? 0 : length;
-  this.y2b_1 = idx;
-  this.z2b_1 = length;
+  this.x2b_1 = idx;
+  this.y2b_1 = length;
 }
 protoOf(IdxAndLength).toString = function () {
-  return 'IdxAndLength(idx=' + this.y2b_1 + ', length=' + this.z2b_1 + ')';
+  return 'IdxAndLength(idx=' + this.x2b_1 + ', length=' + this.y2b_1 + ')';
 };
 protoOf(IdxAndLength).hashCode = function () {
-  var result = this.y2b_1;
-  result = imul(result, 31) + this.z2b_1 | 0;
+  var result = this.x2b_1;
+  result = imul(result, 31) + this.y2b_1 | 0;
   return result;
 };
 protoOf(IdxAndLength).equals = function (other) {
@@ -7894,9 +8018,9 @@ protoOf(IdxAndLength).equals = function (other) {
   if (!(other instanceof IdxAndLength))
     return false;
   var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-  if (!(this.y2b_1 === tmp0_other_with_cast.y2b_1))
+  if (!(this.x2b_1 === tmp0_other_with_cast.x2b_1))
     return false;
-  if (!(this.z2b_1 === tmp0_other_with_cast.z2b_1))
+  if (!(this.y2b_1 === tmp0_other_with_cast.y2b_1))
     return false;
   return true;
 };
@@ -7904,26 +8028,26 @@ function Coordinates(line, position, idxAndLength) {
   line = line === VOID ? 1 : line;
   position = position === VOID ? 1 : position;
   idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-  this.i2a_1 = line;
-  this.j2a_1 = position;
-  this.k2a_1 = idxAndLength;
+  this.h2a_1 = line;
+  this.i2a_1 = position;
+  this.j2a_1 = idxAndLength;
 }
-protoOf(Coordinates).a2c = function (line, position, idxAndLength) {
+protoOf(Coordinates).z2b = function (line, position, idxAndLength) {
   return new Coordinates(line, position, idxAndLength);
 };
-protoOf(Coordinates).b2c = function (line, position, idxAndLength, $super) {
-  line = line === VOID ? this.i2a_1 : line;
-  position = position === VOID ? this.j2a_1 : position;
-  idxAndLength = idxAndLength === VOID ? this.k2a_1 : idxAndLength;
-  return $super === VOID ? this.a2c(line, position, idxAndLength) : $super.a2c.call(this, line, position, idxAndLength);
+protoOf(Coordinates).a2c = function (line, position, idxAndLength, $super) {
+  line = line === VOID ? this.h2a_1 : line;
+  position = position === VOID ? this.i2a_1 : position;
+  idxAndLength = idxAndLength === VOID ? this.j2a_1 : idxAndLength;
+  return $super === VOID ? this.z2b(line, position, idxAndLength) : $super.z2b.call(this, line, position, idxAndLength);
 };
 protoOf(Coordinates).toString = function () {
-  return 'Coordinates(line=' + this.i2a_1 + ', position=' + this.j2a_1 + ', idxAndLength=' + this.k2a_1.toString() + ')';
+  return 'Coordinates(line=' + this.h2a_1 + ', position=' + this.i2a_1 + ', idxAndLength=' + this.j2a_1.toString() + ')';
 };
 protoOf(Coordinates).hashCode = function () {
-  var result = this.i2a_1;
-  result = imul(result, 31) + this.j2a_1 | 0;
-  result = imul(result, 31) + this.k2a_1.hashCode() | 0;
+  var result = this.h2a_1;
+  result = imul(result, 31) + this.i2a_1 | 0;
+  result = imul(result, 31) + this.j2a_1.hashCode() | 0;
   return result;
 };
 protoOf(Coordinates).equals = function (other) {
@@ -7932,35 +8056,35 @@ protoOf(Coordinates).equals = function (other) {
   if (!(other instanceof Coordinates))
     return false;
   var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-  if (!(this.i2a_1 === tmp0_other_with_cast.i2a_1))
+  if (!(this.h2a_1 === tmp0_other_with_cast.h2a_1))
     return false;
-  if (!(this.j2a_1 === tmp0_other_with_cast.j2a_1))
+  if (!(this.i2a_1 === tmp0_other_with_cast.i2a_1))
     return false;
-  if (!this.k2a_1.equals(tmp0_other_with_cast.k2a_1))
+  if (!this.j2a_1.equals(tmp0_other_with_cast.j2a_1))
     return false;
   return true;
 };
 function Token(value, type, coordinates) {
-  this.f2a_1 = value;
-  this.g2a_1 = type;
-  this.h2a_1 = coordinates;
+  this.e2a_1 = value;
+  this.f2a_1 = type;
+  this.g2a_1 = coordinates;
 }
-protoOf(Token).c2c = function (value, type, coordinates) {
+protoOf(Token).b2c = function (value, type, coordinates) {
   return new Token(value, type, coordinates);
 };
-protoOf(Token).d2c = function (value, type, coordinates, $super) {
-  value = value === VOID ? this.f2a_1 : value;
-  type = type === VOID ? this.g2a_1 : type;
-  coordinates = coordinates === VOID ? this.h2a_1 : coordinates;
-  return $super === VOID ? this.c2c(value, type, coordinates) : $super.c2c.call(this, value, type, coordinates);
+protoOf(Token).c2c = function (value, type, coordinates, $super) {
+  value = value === VOID ? this.e2a_1 : value;
+  type = type === VOID ? this.f2a_1 : type;
+  coordinates = coordinates === VOID ? this.g2a_1 : coordinates;
+  return $super === VOID ? this.b2c(value, type, coordinates) : $super.b2c.call(this, value, type, coordinates);
 };
 protoOf(Token).toString = function () {
-  return 'Token(value=' + this.f2a_1 + ', type=' + toString(this.g2a_1) + ', coordinates=' + this.h2a_1.toString() + ')';
+  return 'Token(value=' + this.e2a_1 + ', type=' + toString(this.f2a_1) + ', coordinates=' + this.g2a_1.toString() + ')';
 };
 protoOf(Token).hashCode = function () {
-  var result = getStringHashCode(this.f2a_1);
-  result = imul(result, 31) + hashCode(this.g2a_1) | 0;
-  result = imul(result, 31) + this.h2a_1.hashCode() | 0;
+  var result = getStringHashCode(this.e2a_1);
+  result = imul(result, 31) + hashCode(this.f2a_1) | 0;
+  result = imul(result, 31) + this.g2a_1.hashCode() | 0;
   return result;
 };
 protoOf(Token).equals = function (other) {
@@ -7969,19 +8093,19 @@ protoOf(Token).equals = function (other) {
   if (!(other instanceof Token))
     return false;
   var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-  if (!(this.f2a_1 === tmp0_other_with_cast.f2a_1))
+  if (!(this.e2a_1 === tmp0_other_with_cast.e2a_1))
     return false;
-  if (!equals(this.g2a_1, tmp0_other_with_cast.g2a_1))
+  if (!equals(this.f2a_1, tmp0_other_with_cast.f2a_1))
     return false;
-  if (!this.h2a_1.equals(tmp0_other_with_cast.h2a_1))
+  if (!this.g2a_1.equals(tmp0_other_with_cast.g2a_1))
     return false;
   return true;
 };
 function plus_2(_this__u8e3s4, length) {
-  return new IdxAndLength(_this__u8e3s4.y2b_1 + length | 0, length);
+  return new IdxAndLength(_this__u8e3s4.x2b_1 + length | 0, length);
 }
 function plus_3(_this__u8e3s4, length) {
-  return _this__u8e3s4.b2c(VOID, _this__u8e3s4.j2a_1 + length | 0, plus_2(_this__u8e3s4.k2a_1, length));
+  return _this__u8e3s4.a2c(VOID, _this__u8e3s4.i2a_1 + length | 0, plus_2(_this__u8e3s4.j2a_1, length));
 }
 function StartOfProgram() {
 }
@@ -8008,7 +8132,7 @@ function FieldIdentifier_0() {
 function TypeIdentifier() {
 }
 function EndOfProgram() {
-  this.e2c_1 = 'EOP';
+  this.d2c_1 = 'EOP';
 }
 protoOf(EndOfProgram).toString = function () {
   return 'EndOfProgram';
@@ -8511,13 +8635,13 @@ function WsBytes_getInstance() {
   return WsBytes_instance;
 }
 function WsInteger(precision) {
-  this.w2b_1 = precision;
+  this.v2b_1 = precision;
 }
 protoOf(WsInteger).toString = function () {
-  return 'WsInteger(precision=' + this.w2b_1.toString() + ')';
+  return 'WsInteger(precision=' + this.v2b_1.toString() + ')';
 };
 protoOf(WsInteger).hashCode = function () {
-  return this.w2b_1.hashCode();
+  return this.v2b_1.hashCode();
 };
 protoOf(WsInteger).equals = function (other) {
   if (this === other)
@@ -8525,7 +8649,7 @@ protoOf(WsInteger).equals = function (other) {
   if (!(other instanceof WsInteger))
     return false;
   var tmp0_other_with_cast = other instanceof WsInteger ? other : THROW_CCE();
-  if (!this.w2b_1.equals(tmp0_other_with_cast.w2b_1))
+  if (!this.v2b_1.equals(tmp0_other_with_cast.v2b_1))
     return false;
   return true;
 };
@@ -8543,13 +8667,13 @@ function Precision_0(name, ordinal) {
   Enum.call(this, name, ordinal);
 }
 function WsNumber(precision) {
-  this.x2b_1 = precision;
+  this.w2b_1 = precision;
 }
 protoOf(WsNumber).toString = function () {
-  return 'WsNumber(precision=' + this.x2b_1.toString() + ')';
+  return 'WsNumber(precision=' + this.w2b_1.toString() + ')';
 };
 protoOf(WsNumber).hashCode = function () {
-  return this.x2b_1.hashCode();
+  return this.w2b_1.hashCode();
 };
 protoOf(WsNumber).equals = function (other) {
   if (this === other)
@@ -8557,7 +8681,7 @@ protoOf(WsNumber).equals = function (other) {
   if (!(other instanceof WsNumber))
     return false;
   var tmp0_other_with_cast = other instanceof WsNumber ? other : THROW_CCE();
-  if (!this.x2b_1.equals(tmp0_other_with_cast.x2b_1))
+  if (!this.w2b_1.equals(tmp0_other_with_cast.w2b_1))
     return false;
   return true;
 };
@@ -8751,17 +8875,17 @@ function TokenizeOptions(removeWhitespace, specifyTypes, specifyFieldIdentifiers
   removeWhitespace = removeWhitespace === VOID ? true : removeWhitespace;
   specifyTypes = specifyTypes === VOID ? true : specifyTypes;
   specifyFieldIdentifiers = specifyFieldIdentifiers === VOID ? true : specifyFieldIdentifiers;
-  this.f2c_1 = removeWhitespace;
-  this.g2c_1 = specifyTypes;
-  this.h2c_1 = specifyFieldIdentifiers;
+  this.e2c_1 = removeWhitespace;
+  this.f2c_1 = specifyTypes;
+  this.g2c_1 = specifyFieldIdentifiers;
 }
 protoOf(TokenizeOptions).toString = function () {
-  return 'TokenizeOptions(removeWhitespace=' + this.f2c_1 + ', specifyTypes=' + this.g2c_1 + ', specifyFieldIdentifiers=' + this.h2c_1 + ')';
+  return 'TokenizeOptions(removeWhitespace=' + this.e2c_1 + ', specifyTypes=' + this.f2c_1 + ', specifyFieldIdentifiers=' + this.g2c_1 + ')';
 };
 protoOf(TokenizeOptions).hashCode = function () {
-  var result = getBooleanHashCode(this.f2c_1);
+  var result = getBooleanHashCode(this.e2c_1);
+  result = imul(result, 31) + getBooleanHashCode(this.f2c_1) | 0;
   result = imul(result, 31) + getBooleanHashCode(this.g2c_1) | 0;
-  result = imul(result, 31) + getBooleanHashCode(this.h2c_1) | 0;
   return result;
 };
 protoOf(TokenizeOptions).equals = function (other) {
@@ -8770,12 +8894,12 @@ protoOf(TokenizeOptions).equals = function (other) {
   if (!(other instanceof TokenizeOptions))
     return false;
   var tmp0_other_with_cast = other instanceof TokenizeOptions ? other : THROW_CCE();
+  if (!(this.e2c_1 === tmp0_other_with_cast.e2c_1))
+    return false;
   if (!(this.f2c_1 === tmp0_other_with_cast.f2c_1))
     return false;
   if (!(this.g2c_1 === tmp0_other_with_cast.g2c_1))
     return false;
-  if (!(this.h2c_1 === tmp0_other_with_cast.h2c_1))
-    return false;
   return true;
 };
 function optimize(_this__u8e3s4, options) {
@@ -8787,12 +8911,12 @@ function tokenize_1(_this__u8e3s4, source, incompleteTokens) {
   var incompleteTokens_0 = incompleteTokens;
   $l$1: do {
     $l$0: do {
-      var _destruct__k2r9zo = extractToken($this, source_0, last(incompleteTokens_0).h2a_1);
+      var _destruct__k2r9zo = extractToken($this, source_0, last(incompleteTokens_0).g2a_1);
       var token = _destruct__k2r9zo.yd();
       var remaining = _destruct__k2r9zo.zd();
       var tokens = incompleteTokens_0.al(token);
       var tmp;
-      if (token.g2a_1 instanceof EndOfProgram) {
+      if (token.f2a_1 instanceof EndOfProgram) {
         tmp = tokens;
       } else {
         $this = $this;
@@ -8810,7 +8934,7 @@ function runOption_0(_this__u8e3s4, bool, block) {
   return bool ? block(_this__u8e3s4) : _this__u8e3s4;
 }
 function specifyFieldIdentifier(_this__u8e3s4, caseVariants) {
-  var tmp0_subject = _this__u8e3s4.g2a_1;
+  var tmp0_subject = _this__u8e3s4.f2a_1;
   var tmp;
   if (isInterface(tmp0_subject, FieldIdentifier_0)) {
     var tmp$ret$1;
@@ -8822,7 +8946,7 @@ function specifyFieldIdentifier(_this__u8e3s4, caseVariants) {
         // Inline function 'community.flock.wirespec.compiler.core.tokenize.specifyFieldIdentifier.<anonymous>' call
         var regex = element.yd();
         var variant = element.zd();
-        var result = regex.cc(removeBackticks(_this__u8e3s4.f2a_1)) ? _this__u8e3s4.d2c(VOID, variant) : null;
+        var result = regex.cc(removeBackticks(_this__u8e3s4.e2a_1)) ? _this__u8e3s4.c2c(VOID, variant) : null;
         if (!(result == null)) {
           tmp$ret$1 = result;
           break $l$block;
@@ -8838,17 +8962,17 @@ function specifyFieldIdentifier(_this__u8e3s4, caseVariants) {
   return tmp1_elvis_lhs == null ? _this__u8e3s4 : tmp1_elvis_lhs;
 }
 function specifyType(_this__u8e3s4, entries) {
-  var tmp0_subject = _this__u8e3s4.g2a_1;
+  var tmp0_subject = _this__u8e3s4.f2a_1;
   var tmp;
   if (isInterface(tmp0_subject, TypeIdentifier)) {
-    var tmp1_safe_receiver = entries.g2(_this__u8e3s4.f2a_1);
+    var tmp1_safe_receiver = entries.g2(_this__u8e3s4.e2a_1);
     var tmp_0;
     if (tmp1_safe_receiver == null) {
       tmp_0 = null;
     } else {
       // Inline function 'kotlin.let' call
       // Inline function 'community.flock.wirespec.compiler.core.tokenize.specifyType.<anonymous>' call
-      tmp_0 = _this__u8e3s4.d2c(VOID, tmp1_safe_receiver);
+      tmp_0 = _this__u8e3s4.c2c(VOID, tmp1_safe_receiver);
     }
     var tmp2_elvis_lhs = tmp_0;
     tmp = tmp2_elvis_lhs == null ? _this__u8e3s4 : tmp2_elvis_lhs;
@@ -8865,7 +8989,7 @@ function removeWhiteSpace(_this__u8e3s4) {
   while (_iterator__ex2g4s.h()) {
     var element = _iterator__ex2g4s.i();
     // Inline function 'community.flock.wirespec.compiler.core.tokenize.removeWhiteSpace.<anonymous>' call
-    var tmp = element.g2a_1;
+    var tmp = element.f2a_1;
     if (!isInterface(tmp, WhiteSpace)) {
       destination.e(element);
     }
@@ -8908,7 +9032,7 @@ function extractToken(_this__u8e3s4, source, previousTokenCoordinates) {
   } else {
     // Inline function 'kotlin.let' call
     // Inline function 'community.flock.wirespec.compiler.core.tokenize.extractToken.<anonymous>' call
-    tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.f2a_1));
+    tmp = to(tmp0_safe_receiver_0, removePrefix(source, tmp0_safe_receiver_0.e2a_1));
   }
   var tmp1_elvis_lhs = tmp;
   return tmp1_elvis_lhs == null ? new Pair(endToken(previousTokenCoordinates), '') : tmp1_elvis_lhs;
@@ -8924,7 +9048,7 @@ function toToken(_this__u8e3s4, type, previousTokenCoordinates) {
 function nextCoordinates(_this__u8e3s4, type, value) {
   var tmp;
   if (type instanceof NewLine) {
-    tmp = new Coordinates(_this__u8e3s4.i2a_1 + 1 | 0, VOID, plus_2(_this__u8e3s4.k2a_1, value.length));
+    tmp = new Coordinates(_this__u8e3s4.h2a_1 + 1 | 0, VOID, plus_2(_this__u8e3s4.j2a_1, value.length));
   } else {
     tmp = plus_3(_this__u8e3s4, value.length);
   }
@@ -8975,14 +9099,14 @@ function optimize$lambda$lambda_1($this_optimize) {
 }
 function optimize$lambda($options, $this_optimize) {
   return function (tokens) {
-    var tmp = runOption_0(tokens, $options.f2c_1, optimize$lambda$lambda);
-    var tmp_0 = runOption_0(tmp, $options.g2c_1, optimize$lambda$lambda_0($this_optimize));
-    return runOption_0(tmp_0, $options.h2c_1, optimize$lambda$lambda_1($this_optimize));
+    var tmp = runOption_0(tokens, $options.e2c_1, optimize$lambda$lambda);
+    var tmp_0 = runOption_0(tmp, $options.f2c_1, optimize$lambda$lambda_0($this_optimize));
+    return runOption_0(tmp_0, $options.g2c_1, optimize$lambda$lambda_1($this_optimize));
   };
 }
 function validateEndpoints($this, ast) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = ast.a2a_1.yk();
+  var tmp0 = ast.r29_1.yk();
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.g();
@@ -9083,7 +9207,7 @@ function validateEndpoints($this, ast) {
 }
 function validateTypes($this, ast) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = ast.a2a_1.yk();
+  var tmp0 = ast.r29_1.yk();
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.g();
@@ -9183,7 +9307,7 @@ function validateTypes($this, ast) {
 }
 function validateChannels($this, ast) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = ast.a2a_1.yk();
+  var tmp0 = ast.r29_1.yk();
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.g();
@@ -9284,7 +9408,7 @@ function validateChannels($this, ast) {
 }
 function Validator_0() {
 }
-protoOf(Validator_0).u2b = function (ast) {
+protoOf(Validator_0).t2b = function (ast) {
   // Inline function 'arrow.core.flatMap' call
   // Inline function 'kotlin.contracts.contract' call
   var tmp;
@@ -9563,17 +9687,17 @@ function Logger(logLevel) {
   }
   tmp_5.e23_1 = tmp_6;
 }
-protoOf(Logger).i2c = function () {
+protoOf(Logger).h2c = function () {
   return this.b23_1;
 };
-protoOf(Logger).j2c = function () {
+protoOf(Logger).i2c = function () {
   return this.c23_1;
 };
 protoOf(Logger).f23 = function (string) {
-  return logIf(string, this, this.i2c());
+  return logIf(string, this, this.h2c());
 };
-protoOf(Logger).e2a = function (string) {
-  return logIf(string, this, this.j2c());
+protoOf(Logger).d2a = function (string) {
+  return logIf(string, this, this.i2c());
 };
 function NoLogger() {
 }
@@ -9588,7 +9712,7 @@ function _init_properties_Logger_kt__mpqsw() {
   }
 }
 //region block: post-declaration
-protoOf(Emitter).u29 = notYetImplemented;
+protoOf(Emitter).x29 = notYetImplemented;
 //endregion
 //region block: init
 Spacer_instance = new Spacer();