@flock/wirespec 0.14.25 → 0.14.26

package/wirespec-src-compiler-core.mjs

@@ -131,7 +131,7 @@ initMetadataForInterface(FieldIdentifier_0, 'FieldIdentifier', VOID, VOID, [Wire
 initMetadataForObject(WirespecField, 'WirespecField', VOID, VOID, [FieldIdentifier_0]);
 initMetadataForCompanion(Companion);
 function notYetImplemented() {
-  return this.m26() + ' TODO("Not yet implemented")\n';
+  return this.l26() + ' TODO("Not yet implemented")\n';
 }
 initMetadataForInterface(NotYetImplemented, 'NotYetImplemented');
 initMetadataForClass(Emitter, 'Emitter', VOID, VOID, [NotYetImplemented]);
@@ -743,11 +743,25 @@ function emitRequestFunctions(_this__u8e3s4, $this, endpoint) {
   var tmp_9 = tmp_8;
   var tmp_10 = Spacer_instance.l25(4);
   var tmp0_safe_receiver = _this__u8e3s4.m25_1;
-  var tmp_11 = $this.p25(tmp0_safe_receiver == null ? null : tmp0_safe_receiver.o25_1, 'Void');
-  var tmp1_safe_receiver = _this__u8e3s4.m25_1;
-  var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.o25_1;
-  var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : _get_isIterable__qavhhr(tmp2_safe_receiver, $this);
-  return trimMargin('\n        |' + tmp + 'static Wirespec.RawRequest toRequest(Wirespec.Serializer<String> serialization, Request request) {\n        |' + tmp_0 + 'return new Wirespec.RawRequest(\n        |' + tmp_1 + 'request.method.name(),\n        |' + tmp_2 + 'java.util.List.of(' + tmp_3 + '),\n        |' + tmp_4 + tmp_6 + ',\n        |' + tmp_7 + tmp_9 + ',\n        |' + tmp_10 + 'serialization.serialize(request.getBody(), Wirespec.getType(' + tmp_11 + '.class, ' + (tmp3_elvis_lhs == null ? false : tmp3_elvis_lhs) + '))\n        |' + Spacer_instance.l25(3) + ');\n        |' + Spacer_instance.l25(2) + '}\n        |\n        |' + Spacer_instance.l25(2) + 'static Request fromRequest(Wirespec.Deserializer<String> serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.l25(3) + 'return new Request(' + emitDeserializedParams(_this__u8e3s4, $this, endpoint) + ');\n        |' + Spacer_instance.l25(2) + '}\n    ');
+  var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.o25_1;
+  return trimMargin('\n        |' + tmp + 'static Wirespec.RawRequest toRequest(Wirespec.Serializer<String> serialization, Request request) {\n        |' + tmp_0 + 'return new Wirespec.RawRequest(\n        |' + tmp_1 + 'request.method.name(),\n        |' + tmp_2 + 'java.util.List.of(' + tmp_3 + '),\n        |' + tmp_4 + tmp_6 + ',\n        |' + tmp_7 + tmp_9 + ',\n        |' + tmp_10 + 'serialization.serialize(request.getBody(), ' + (tmp1_safe_receiver == null ? null : emitGetType(tmp1_safe_receiver, $this)) + ')\n        |' + Spacer_instance.l25(3) + ');\n        |' + Spacer_instance.l25(2) + '}\n        |\n        |' + Spacer_instance.l25(2) + 'static Request fromRequest(Wirespec.Deserializer<String> serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.l25(3) + 'return new Request(' + emitDeserializedParams(_this__u8e3s4, $this, endpoint) + ');\n        |' + Spacer_instance.l25(2) + '}\n    ');
+}
+function emitGetType(_this__u8e3s4, $this) {
+  return 'Wirespec.getType(' + $this.p25(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw(_this__u8e3s4, $this) + ')';
+}
+function emitGetTypeRaw(_this__u8e3s4, $this) {
+  var tmp;
+  var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.sm();
+  if (tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs) {
+    tmp = 'java.util.Optional.class';
+  } else {
+    if (_this__u8e3s4 instanceof Iterable) {
+      tmp = 'java.util.List.class';
+    } else {
+      tmp = null;
+    }
+  }
+  return tmp;
 }
 function emitConstructor(_this__u8e3s4, $this, endpoint) {
   var tmp = $this.q25(endpoint);
@@ -790,8 +804,8 @@ function emitConstructor(_this__u8e3s4, $this, endpoint) {
 function emitDeserializedParams(_this__u8e3s4, $this, endpoint) {
   var tmp = $this.r25(endpoint);
   var tmp_0 = orNull(joinToString(tmp, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emitDeserializedParams$lambda($this)));
-  var tmp_1 = orNull(joinToString(endpoint.c25_1, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emitDeserializedParams$lambda_0($this)));
-  var tmp_2 = orNull(joinToString(endpoint.d25_1, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emitDeserializedParams$lambda_1($this)));
+  var tmp_1 = orNull(joinToString(endpoint.c25_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emitDeserializedParams$lambda_0($this)));
+  var tmp_2 = orNull(joinToString(endpoint.d25_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emitDeserializedParams$lambda_1($this)));
   var tmp0_safe_receiver = _this__u8e3s4.m25_1;
   var tmp_3;
   if (tmp0_safe_receiver == null) {
@@ -799,7 +813,7 @@ function emitDeserializedParams(_this__u8e3s4, $this, endpoint) {
   } else {
     // Inline function 'kotlin.let' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitDeserializedParams.<anonymous>' call
-    tmp_3 = Spacer_instance.l25(4) + 'serialization.deserialize(request.body(), Wirespec.getType(' + $this.p25(tmp0_safe_receiver.o25_1, 'Void') + '.class, ' + _get_isIterable__qavhhr(tmp0_safe_receiver.o25_1, $this) + '))';
+    tmp_3 = Spacer_instance.l25(4) + 'serialization.deserialize(request.body(), ' + emitGetType(tmp0_safe_receiver.o25_1, $this) + ')';
   }
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitDeserializedParams.<anonymous>' call
@@ -807,7 +821,7 @@ function emitDeserializedParams(_this__u8e3s4, $this, endpoint) {
   return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.l25(3);
 }
 function emitDeserializedParams_0(_this__u8e3s4, $this) {
-  var tmp = orNull(joinToString(_this__u8e3s4.h25_1, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emitDeserializedParams$lambda_2($this)));
+  var tmp = orNull(joinToString(_this__u8e3s4.h25_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emitDeserializedParams$lambda_2($this)));
   var tmp0_safe_receiver = _this__u8e3s4.i25_1;
   var tmp_0;
   if (tmp0_safe_receiver == null) {
@@ -815,7 +829,7 @@ function emitDeserializedParams_0(_this__u8e3s4, $this) {
   } else {
     // Inline function 'kotlin.let' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitDeserializedParams.<anonymous>' call
-    tmp_0 = Spacer_instance.l25(4) + 'serialization.deserialize(response.body(), Wirespec.getType(' + $this.p25(tmp0_safe_receiver.o25_1, 'Void') + '.class, ' + _get_isIterable__qavhhr(tmp0_safe_receiver.o25_1, $this) + '))';
+    tmp_0 = Spacer_instance.l25(4) + 'serialization.deserialize(response.body(), ' + emitGetType(tmp0_safe_receiver.o25_1, $this) + ')';
   }
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitDeserializedParams.<anonymous>' call
@@ -832,25 +846,25 @@ function emitSerialized(_this__u8e3s4, $this) {
   } else {
     tmp_1 = 'java.util.Collections.emptyMap()';
   }
-  return tmp + 'if (response instanceof Response' + tmp_0 + ' r) { return new Wirespec.RawResponse(r.getStatus(), ' + tmp_1 + ', ' + (!(_this__u8e3s4.i25_1 == null) ? 'serialization.serialize(r.body, Wirespec.getType(' + $this.p25(_this__u8e3s4.i25_1.o25_1, 'Void') + '.class, ' + _get_isIterable__qavhhr(_this__u8e3s4.i25_1.o25_1, $this) + '))' : 'null') + '); }';
+  return tmp + 'if (response instanceof Response' + tmp_0 + ' r) { return new Wirespec.RawResponse(r.getStatus(), ' + tmp_1 + ', ' + (!(_this__u8e3s4.i25_1 == null) ? 'serialization.serialize(r.body, ' + emitGetType(_this__u8e3s4.i25_1.o25_1, $this) + ')' : 'null') + '); }';
 }
 function emitDeserialized(_this__u8e3s4, $this) {
   return Spacer_instance.l25(4) + 'case ' + _this__u8e3s4.g25_1 + ': return new Response' + Companion_instance_5.s25(_this__u8e3s4.g25_1) + '(' + emitDeserializedParams_0(_this__u8e3s4, $this) + ');';
 }
 function emitSerializedParams(_this__u8e3s4, $this, fields) {
-  return 'java.util.Map.entry("' + _this__u8e3s4.t25_1.b1() + '", serialization.serializeParam(request.' + fields + '.' + $this.v25(_this__u8e3s4.t25_1) + ', Wirespec.getType(' + $this.w25(_this__u8e3s4.u25_1) + '.class, ' + _get_isIterable__qavhhr(_this__u8e3s4.u25_1, $this) + ')))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.t25_1.b1() + '", serialization.serializeParam(request.' + fields + '.' + $this.v25(_this__u8e3s4.t25_1) + ', ' + emitGetType(_this__u8e3s4.u25_1, $this) + '))';
 }
 function emitDeserialized_0(_this__u8e3s4, $this) {
-  return Spacer_instance.l25(4) + 'serialization.<' + $this.j24(_this__u8e3s4.xd_1.y25_1) + '>deserialize(request.path().get(' + _this__u8e3s4.wd_1 + '), Wirespec.getType(' + $this.w25(_this__u8e3s4.xd_1.y25_1) + '.class, ' + _get_isIterable__qavhhr(_this__u8e3s4.xd_1.y25_1, $this) + '))';
+  return Spacer_instance.l25(4) + 'serialization.deserialize(request.path().get(' + _this__u8e3s4.wd_1 + '), ' + emitGetType(_this__u8e3s4.xd_1.x25_1, $this) + ')';
 }
 function emitDeserializedParams_1(_this__u8e3s4, $this, fields) {
-  return Spacer_instance.l25(4) + 'java.util.Optional.ofNullable(request.' + fields + '().get("' + _this__u8e3s4.t25_1.b1() + '")).map(it -> serialization.<' + emitType(_this__u8e3s4.u25_1, $this) + '>deserializeParam(it, Wirespec.getType(' + $this.w25(_this__u8e3s4.u25_1) + '.class, ' + _get_isIterable__qavhhr(_this__u8e3s4.u25_1, $this) + ')))' + (!_this__u8e3s4.u25_1.sm() ? '.get()' : '');
+  return Spacer_instance.l25(4) + 'serialization.deserializeParam(request.' + fields + '().getOrDefault("' + _this__u8e3s4.t25_1.b1() + '", java.util.Collections.emptyList()), ' + emitGetType(_this__u8e3s4.u25_1, $this) + ')';
 }
 function emitSerializedHeader(_this__u8e3s4, $this) {
-  return 'java.util.Map.entry("' + _this__u8e3s4.t25_1.b1() + '", serialization.serializeParam(r.getHeaders().' + $this.v25(_this__u8e3s4.t25_1) + '(), Wirespec.getType(' + $this.w25(_this__u8e3s4.u25_1) + '.class, ' + _get_isIterable__qavhhr(_this__u8e3s4.u25_1, $this) + ')))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.t25_1.b1() + '", serialization.serializeParam(r.getHeaders().' + $this.v25(_this__u8e3s4.t25_1) + '(), ' + emitGetType(_this__u8e3s4.u25_1, $this) + '))';
 }
 function emitIdentifier(_this__u8e3s4, $this) {
-  return 'serialization.serialize(request.path.' + Companion_instance_5.z25($this.v25(_this__u8e3s4.x25_1)) + ', Wirespec.getType(' + $this.w25(_this__u8e3s4.y25_1) + '.class, ' + _get_isIterable__qavhhr(_this__u8e3s4.y25_1, $this) + '))';
+  return 'serialization.serialize(request.path.' + Companion_instance_5.y25($this.v25(_this__u8e3s4.w25_1)) + ', ' + emitGetType(_this__u8e3s4.x25_1, $this) + ')';
 }
 function emit_1(_this__u8e3s4, $this) {
   var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.o25_1;
@@ -858,10 +872,7 @@ function emit_1(_this__u8e3s4, $this) {
   return tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
 }
 function emit_2(_this__u8e3s4, $this) {
-  return $this.j24(_this__u8e3s4.y25_1) + ' ' + $this.v25(_this__u8e3s4.x25_1);
-}
-function _get_isIterable__qavhhr(_this__u8e3s4, $this) {
-  return _this__u8e3s4 instanceof Iterable;
+  return $this.j24(_this__u8e3s4.x25_1) + ' ' + $this.v25(_this__u8e3s4.w25_1);
 }
 function sanitizeSymbol(_this__u8e3s4, $this) {
   // Inline function 'kotlin.collections.mapIndexed' call
@@ -900,8 +911,8 @@ function sanitizeFirstIsDigit(_this__u8e3s4, $this) {
 }
 function Companion() {
   Companion_instance_0 = this;
-  this.a26_1 = setOf(['abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default', 'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private', 'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte', 'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return', 'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final', 'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp', 'volatile', 'const', 'float', 'native', 'super', 'while', 'true', 'false']);
-  this.b26_1 = 'java.util.Collections.emptyMap()';
+  this.z25_1 = setOf(['abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default', 'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private', 'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte', 'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return', 'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final', 'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp', 'volatile', 'const', 'float', 'native', 'super', 'while', 'true', 'false']);
+  this.a26_1 = 'java.util.Collections.emptyMap()';
 }
 var Companion_instance_0;
 function Companion_getInstance_0() {
@@ -916,12 +927,12 @@ function JavaEmitter$emit$lambda(this$0) {
 }
 function JavaEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return Spacer_instance.toString() + this$0.c26(it) + ',';
+    return Spacer_instance.toString() + this$0.b26(it) + ',';
   };
 }
 function JavaEmitter$emit$lambda_1(this$0) {
   return function (it) {
-    return this$0.e26(this$0.d26(it)) + '("' + it + '")';
+    return this$0.d26(this$0.c26(it)) + '("' + it + '")';
   };
 }
 function JavaEmitter$emit$lambda_2(it) {
@@ -938,17 +949,17 @@ function JavaEmitter$emit$lambda_3(this$0) {
 }
 function JavaEmitter$emit$lambda_4(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function JavaEmitter$emit$lambda_5(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function JavaEmitter$emit$lambda_6(this$0) {
   return function (it) {
-    return this$0.f26(it);
+    return this$0.e26(it);
   };
 }
 function JavaEmitter$emit$lambda_7(this$0) {
@@ -963,7 +974,7 @@ function JavaEmitter$emit$lambda_8(this$0) {
 }
 function JavaEmitter$emit$lambda_9(this$0) {
   return function (it) {
-    return this$0.g26(it);
+    return this$0.f26(it);
   };
 }
 function JavaEmitter$emitStatusInterfaces$lambda(it) {
@@ -981,7 +992,7 @@ function JavaEmitter$emitRequestFunctions$lambda(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Literal) {
-      tmp = '"' + it.h26_1 + '"';
+      tmp = '"' + it.g26_1 + '"';
     } else {
       if (it instanceof Param_0) {
         tmp = emitIdentifier(it, this$0);
@@ -1004,7 +1015,7 @@ function JavaEmitter$emitRequestFunctions$lambda_1(this$0) {
 }
 function JavaEmitter$emit$lambda_10(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function JavaEmitter$emit$lambda_11(this$0) {
@@ -1014,7 +1025,7 @@ function JavaEmitter$emit$lambda_11(this$0) {
 }
 function JavaEmitter$emit$lambda_12(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function JavaEmitter$emitConstructor$lambda(this$0) {
@@ -1024,17 +1035,17 @@ function JavaEmitter$emitConstructor$lambda(this$0) {
 }
 function JavaEmitter$emitConstructor$lambda_0(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function JavaEmitter$emitConstructor$lambda_1(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function JavaEmitter$emitConstructor$lambda_2(this$0) {
   return function (it) {
-    return this$0.v25(it.x25_1);
+    return this$0.v25(it.w25_1);
   };
 }
 function JavaEmitter$emitConstructor$lambda_3(this$0) {
@@ -1064,7 +1075,7 @@ function JavaEmitter$emitDeserializedParams$lambda_1(this$0) {
 }
 function JavaEmitter$emitDeserializedParams$lambda_2(this$0) {
   return function (it) {
-    return Spacer_instance.l25(4) + 'java.util.Optional.ofNullable(response.headers().get("' + it.t25_1.b1() + '")).map(it -> serialization.<' + emitType(it.u25_1, this$0) + '>deserializeParam(it, Wirespec.getType(' + this$0.w25(it.u25_1) + '.class, ' + _get_isIterable__qavhhr(it.u25_1, this$0) + ')))' + (!it.u25_1.sm() ? '.get()' : '');
+    return Spacer_instance.l25(4) + 'serialization.deserializeParam(response.headers().getOrDefault("' + it.t25_1.b1() + '", java.util.Collections.emptyList()), ' + emitGetType(it.u25_1, this$0) + ')';
   };
 }
 function JavaEmitter$emitSerialized$lambda(this$0) {
@@ -1077,8 +1088,8 @@ function JavaEmitter$sanitizeSymbol$lambda(it) {
 }
 function JavaEmitter(packageName, emitShared) {
   Companion_getInstance_0();
-  packageName = packageName === VOID ? Companion_instance_6.i26('community.flock.wirespec.generated') : packageName;
-  emitShared = emitShared === VOID ? Companion_instance_4.j26() : emitShared;
+  packageName = packageName === VOID ? Companion_instance_6.h26('community.flock.wirespec.generated') : packageName;
+  emitShared = emitShared === VOID ? Companion_instance_4.i26() : emitShared;
   Emitter.call(this);
   this.d24_1 = packageName;
   this.e24_1 = emitShared;
@@ -1087,38 +1098,38 @@ function JavaEmitter(packageName, emitShared) {
   this.h24_1 = JavaShared_getInstance();
   this.i24_1 = '//';
 }
-protoOf(JavaEmitter).k26 = function () {
+protoOf(JavaEmitter).j26 = function () {
   return this.g24_1;
 };
-protoOf(JavaEmitter).l26 = function () {
+protoOf(JavaEmitter).k26 = function () {
   return this.h24_1;
 };
-protoOf(JavaEmitter).m26 = function () {
+protoOf(JavaEmitter).l26 = function () {
   return this.i24_1;
 };
-protoOf(JavaEmitter).n26 = function (module_0, logger) {
+protoOf(JavaEmitter).m26 = function (module_0, logger) {
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-  var it = protoOf(Emitter).n26.call(this, module_0, logger);
-  return this.e24_1.r26_1 ? it.al(new Emitted(Companion_instance_6.i26('community.flock.wirespec').o26() + 'Wirespec', this.l26().q26_1)) : it;
+  var it = protoOf(Emitter).m26.call(this, module_0, logger);
+  return this.e24_1.q26_1 ? it.al(new Emitted(Companion_instance_6.h26('community.flock.wirespec').n26() + 'Wirespec', this.k26().p26_1)) : it;
 };
-protoOf(JavaEmitter).s26 = function (definition, module_0, logger) {
+protoOf(JavaEmitter).r26 = function (definition, module_0, logger) {
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-  var it = protoOf(Emitter).s26.call(this, definition, module_0, logger);
+  var it = protoOf(Emitter).r26.call(this, definition, module_0, logger);
   var subPackageName = plus_0(this.d24_1, definition);
-  var tmp = subPackageName.o26() + sanitizeSymbol(it.t26_1, this);
+  var tmp = subPackageName.n26() + sanitizeSymbol(it.s26_1, this);
   // Inline function 'kotlin.text.trimStart' call
-  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_5.v26(module_0) ? this.f24_1 : '') + '\n                    |' + it.u26_1 + '\n                ');
+  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_5.u26(module_0) ? this.f24_1 : '') + '\n                    |' + it.t26_1 + '\n                ');
   var tmp$ret$0 = toString(trimStart(isCharSequence(this_0) ? this_0 : THROW_CCE()));
   return new Emitted(tmp, tmp$ret$0);
 };
-protoOf(JavaEmitter).w26 = function (type, module_0) {
-  var tmp = this.v25(type.y26_1);
-  var tmp_0 = this.b27(type.z26_1);
+protoOf(JavaEmitter).v26 = function (type, module_0) {
+  var tmp = this.v25(type.x26_1);
+  var tmp_0 = this.a27(type.y26_1);
   // Inline function 'kotlin.run' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-  var $this$run = type.a27_1;
+  var $this$run = type.z26_1;
   var tmp_1;
   if ($this$run.l()) {
     tmp_1 = '';
@@ -1126,11 +1137,11 @@ protoOf(JavaEmitter).w26 = function (type, module_0) {
     tmp_1 = ' extends ' + joinToString($this$run, ', ', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda(this));
   }
   var tmp$ret$1 = tmp_1;
-  return trimMargin('\n        |public record ' + tmp + ' (\n        |' + tmp_0 + '\n        |)' + tmp$ret$1 + this.c27(type, module_0) + ' {\n        |};\n        |\n    ');
+  return trimMargin('\n        |public record ' + tmp + ' (\n        |' + tmp_0 + '\n        |)' + tmp$ret$1 + this.b27(type, module_0) + ' {\n        |};\n        |\n    ');
 };
-protoOf(JavaEmitter).c27 = function (_this__u8e3s4, module_0) {
+protoOf(JavaEmitter).b27 = function (_this__u8e3s4, module_0) {
   // Inline function 'kotlin.collections.filterIsInstance' call
-  var tmp0 = module_0.e27_1;
+  var tmp0 = module_0.d27_1;
   // Inline function 'kotlin.collections.filterIsInstanceTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.g();
@@ -1148,7 +1159,7 @@ protoOf(JavaEmitter).c27 = function (_this__u8e3s4, module_0) {
     var element_0 = _iterator__ex2g4s_0.i();
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitUnion.<anonymous>' call
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_0 = element_0.h27_1;
+    var tmp0_0 = element_0.g27_1;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination_1 = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_1 = tmp0_0.g();
@@ -1175,7 +1186,7 @@ protoOf(JavaEmitter).c27 = function (_this__u8e3s4, module_0) {
       while (_iterator__ex2g4s_2.h()) {
         var element_2 = _iterator__ex2g4s_2.i();
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitUnion.<anonymous>.<anonymous>' call
-        if (element_2.y23_1 === _this__u8e3s4.y26_1.b1()) {
+        if (element_2.y23_1 === _this__u8e3s4.x26_1.b1()) {
           tmp$ret$4 = true;
           break $l$block_0;
         }
@@ -1193,7 +1204,7 @@ protoOf(JavaEmitter).c27 = function (_this__u8e3s4, module_0) {
   while (_iterator__ex2g4s_3.h()) {
     var item = _iterator__ex2g4s_3.i();
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitUnion.<anonymous>' call
-    var tmp$ret$9 = item.g27_1.b1();
+    var tmp$ret$9 = item.f27_1.b1();
     destination_2.e(tmp$ret$9);
   }
   // Inline function 'kotlin.takeIf' call
@@ -1210,10 +1221,10 @@ protoOf(JavaEmitter).c27 = function (_this__u8e3s4, module_0) {
   var tmp0_elvis_lhs = tmp0_safe_receiver == null ? null : joinToString(tmp0_safe_receiver, ', ', 'implements ');
   return tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
 };
-protoOf(JavaEmitter).b27 = function (_this__u8e3s4) {
-  return dropLast(joinToString(_this__u8e3s4.i27_1, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_0(this)), 1);
+protoOf(JavaEmitter).a27 = function (_this__u8e3s4) {
+  return dropLast(joinToString(_this__u8e3s4.h27_1, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_0(this)), 1);
 };
-protoOf(JavaEmitter).c26 = function (_this__u8e3s4) {
+protoOf(JavaEmitter).b26 = function (_this__u8e3s4) {
   return this.j24(_this__u8e3s4.u25_1) + ' ' + this.v25(_this__u8e3s4.t25_1);
 };
 protoOf(JavaEmitter).j24 = function (_this__u8e3s4) {
@@ -1225,10 +1236,10 @@ protoOf(JavaEmitter).j24 = function (_this__u8e3s4) {
 protoOf(JavaEmitter).p25 = function (_this__u8e3s4, void_0) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = this.w25(_this__u8e3s4.k24_1);
+    tmp = this.i27(_this__u8e3s4.k24_1);
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = this.w25(_this__u8e3s4.a24_1);
+      tmp = this.i27(_this__u8e3s4.a24_1);
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = void_0;
@@ -1255,7 +1266,7 @@ protoOf(JavaEmitter).p25 = function (_this__u8e3s4, void_0) {
   }
   return tmp;
 };
-protoOf(JavaEmitter).w25 = function (_this__u8e3s4, void_0, $super) {
+protoOf(JavaEmitter).i27 = function (_this__u8e3s4, void_0, $super) {
   void_0 = void_0 === VOID ? 'void' : void_0;
   return $super === VOID ? this.p25(_this__u8e3s4, void_0) : $super.p25.call(this, _this__u8e3s4, void_0);
 };
@@ -1265,7 +1276,7 @@ protoOf(JavaEmitter).v25 = function (identifier) {
     tmp = sanitizeSymbol(identifier.b1(), this);
   } else {
     if (identifier instanceof FieldIdentifier) {
-      tmp = this.e26(sanitizeSymbol(identifier.b1(), this));
+      tmp = this.d26(sanitizeSymbol(identifier.b1(), this));
     } else {
       noWhenBranchMatchedException();
     }
@@ -1283,11 +1294,11 @@ protoOf(JavaEmitter).q27 = function (enum_0, module_0) {
   return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + this.u27(joinToString(enum_0.t27_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_1(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.v25(enum_0.s27_1) + '(String label) {\n        |' + Spacer_instance.l25(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.l25(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String getLabel() {\n        |' + Spacer_instance.l25(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 };
 protoOf(JavaEmitter).v27 = function (union) {
-  var tmp = this.v25(union.g27_1);
-  return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.h27_1, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_2) + ' {}\n        |\n    ');
+  var tmp = this.v25(union.f27_1);
+  return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.g27_1, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_2) + ' {}\n        |\n    ');
 };
 protoOf(JavaEmitter).w27 = function (channel) {
-  return trimMargin('\n        |' + this.x27(channel) + '\n        |\n        |public interface ' + this.v25(channel.z27_1) + ' {\n        |   void invoke(' + emitFullyQualified(channel, this, channel.a28_1) + this.w25(channel.a28_1) + ' message);\n        |}\n        |\n    ');
+  return trimMargin('\n        |' + this.x27(channel) + '\n        |\n        |public interface ' + this.v25(channel.z27_1) + ' {\n        |   void invoke(' + emitFullyQualified(channel, this, channel.a28_1) + this.i27(channel.a28_1) + ' message);\n        |}\n        |\n    ');
 };
 protoOf(JavaEmitter).x27 = function (_this__u8e3s4) {
   // Inline function 'kotlin.collections.filter' call
@@ -1361,12 +1372,12 @@ protoOf(JavaEmitter).c28 = function (endpoint) {
   return trimMargin('\n        |' + tmp + '\n        |\n        |public interface ' + tmp_0 + ' extends Wirespec.Endpoint {\n        |' + tmp_2 + '\n        |\n        |' + tmp_3 + '\n        |\n        |' + tmp_4 + '\n        |\n        |' + tmp_5 + '\n        |\n        |' + tmp_6 + 'sealed interface Response<T> extends Wirespec.Response<T> {}\n        |' + tmp_7 + '\n        |' + tmp_8 + '\n        |\n        |' + tmp_10 + '\n        |\n        |' + tmp_11 + 'interface Handler extends Wirespec.Handler {\n        |\n        |' + tmp_12 + '\n        |\n        |' + tmp_13 + 'static Wirespec.RawResponse toResponse(Wirespec.Serializer<String> serialization, Response<?> response) {\n        |' + tmp_15 + '\n        |' + tmp_16 + 'else { throw new IllegalStateException("Cannot match response with status: " + response.getStatus());}\n        |' + tmp_17 + '}\n        |\n        |' + tmp_18 + 'static Response<?> fromResponse(Wirespec.Deserializer<String> serialization, Wirespec.RawResponse response) {\n        |' + tmp_19 + 'switch (response.statusCode()) {\n        |' + tmp_21 + '\n        |' + tmp_22 + 'default: throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n        |' + tmp_23 + '}\n        |' + tmp_24 + '}\n        |\n        |' + tmp_25 + tmp_26 + '\n        |' + tmp_27 + 'class Handlers implements Wirespec.Server<Request, Response<?>>, Wirespec.Client<Request, Response<?>> {\n        |' + tmp_28 + '@Override public String getPathTemplate() { return "/' + joinToString(endpoint.b25_1, '/', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_9(this)) + '"; }\n        |' + Spacer_instance.l25(3) + '@Override public String getMethod() { return "' + endpoint.a25_1.toString() + '"; }\n        |' + Spacer_instance.l25(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization<String> serialization) {\n        |' + Spacer_instance.l25(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.l25(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.l25(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.l25(4) + '};\n        |' + Spacer_instance.l25(3) + '}\n        |' + Spacer_instance.l25(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization<String> serialization) {\n        |' + Spacer_instance.l25(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.l25(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.l25(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.l25(4) + '};\n        |' + Spacer_instance.l25(3) + '}\n        |' + Spacer_instance.l25(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 };
 protoOf(JavaEmitter).f28 = function (endpoint) {
-  return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_5.z25(this.v25(endpoint.z24_1)) + '(Request request);';
+  return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_5.y25(this.v25(endpoint.z24_1)) + '(Request request);';
 };
 protoOf(JavaEmitter).d28 = function (_this__u8e3s4, endpoint) {
   return trimMargin('\n        |' + Spacer_instance.toString() + 'class Request implements Wirespec.Request<' + emit_1(_this__u8e3s4.m25_1, this) + '> {\n        |' + Spacer_instance.l25(2) + 'private final Path path;\n        |' + Spacer_instance.l25(2) + 'private final Wirespec.Method method;\n        |' + Spacer_instance.l25(2) + 'private final Queries queries;\n        |' + Spacer_instance.l25(2) + 'private final RequestHeaders headers;\n        |' + Spacer_instance.l25(2) + 'private final ' + emit_1(_this__u8e3s4.m25_1, this) + ' body;\n        |' + Spacer_instance.l25(2) + emitConstructor(_this__u8e3s4, this, endpoint) + '\n        |' + Spacer_instance.l25(2) + '@Override public Path getPath() { return path; }\n        |' + Spacer_instance.l25(2) + '@Override public Wirespec.Method getMethod() { return method; }\n        |' + Spacer_instance.l25(2) + '@Override public Queries getQueries() { return queries; }\n        |' + Spacer_instance.l25(2) + '@Override public RequestHeaders getHeaders() { return headers; }\n        |' + Spacer_instance.l25(2) + '@Override public ' + emit_1(_this__u8e3s4.m25_1, this) + ' getBody() { return body; }\n        |' + Spacer_instance.toString() + '}\n    ');
 };
-protoOf(JavaEmitter).f26 = function (_this__u8e3s4) {
+protoOf(JavaEmitter).e26 = function (_this__u8e3s4) {
   var tmp = Spacer_instance.toString();
   var tmp_0 = Companion_instance_5.s25(_this__u8e3s4.g25_1);
   var tmp_1 = orNull(joinToString(_this__u8e3s4.h25_1, VOID, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda_10(this)));
@@ -1395,11 +1406,11 @@ protoOf(JavaEmitter).f26 = function (_this__u8e3s4) {
   var tmp_14 = Spacer_instance.l25(1);
   return trimMargin('\n        |' + tmp + 'record Response' + tmp_0 + '(' + tmp_3 + ') implements Response' + tmp_4 + 'XX<' + tmp_5 + '>, Response' + tmp_6 + ' {\n        |' + tmp_7 + '@Override public int getStatus() { return ' + tmp_8 + '; }\n        |' + tmp_9 + tmp_10 + '\n        |' + tmp_11 + '@Override public ' + tmp_12 + ' getBody() { return ' + tmp_13 + '; }\n        |' + tmp_14 + emitObject(_this__u8e3s4.h25_1, this, 'Headers', 'Wirespec.Response.Headers', JavaEmitter$emit$lambda_12(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 };
-protoOf(JavaEmitter).d26 = function (_this__u8e3s4) {
+protoOf(JavaEmitter).c26 = function (_this__u8e3s4) {
   return sanitizeFirstIsDigit(joinToString(split(_this__u8e3s4, ['-', ', ', '.', ' ', '//']), '_'), this);
 };
-protoOf(JavaEmitter).e26 = function (_this__u8e3s4) {
-  return Companion_getInstance_0().a26_1.o1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+protoOf(JavaEmitter).d26 = function (_this__u8e3s4) {
+  return Companion_getInstance_0().z25_1.o1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 };
 function emitStatusInterfaces_0(_this__u8e3s4, $this) {
   // Inline function 'kotlin.collections.map' call
@@ -1505,7 +1516,7 @@ function emitSerializedParams_0(_this__u8e3s4, $this, type, fields) {
   return 'mapOf("' + _this__u8e3s4.t25_1.b1() + '" to (' + type + '.' + fields + '.' + $this.v25(_this__u8e3s4.t25_1) + '?.let{ serialization.serializeParam(it, typeOf<' + $this.j24(_this__u8e3s4.u25_1) + '>()) } ?: emptyList()))';
 }
 function emitDeserialized_2(_this__u8e3s4, $this) {
-  return Spacer_instance.l25(3) + $this.v25(_this__u8e3s4.xd_1.x25_1) + ' = serialization.deserialize(request.path[' + _this__u8e3s4.wd_1 + '], typeOf<' + $this.j24(_this__u8e3s4.xd_1.y25_1) + '>())';
+  return Spacer_instance.l25(3) + $this.v25(_this__u8e3s4.xd_1.w25_1) + ' = serialization.deserialize(request.path[' + _this__u8e3s4.wd_1 + '], typeOf<' + $this.j24(_this__u8e3s4.xd_1.x25_1) + '>())';
 }
 function emitDeserializedParams_3(_this__u8e3s4, $this, type, fields, spaces) {
   return _this__u8e3s4.u25_1.sm() ? Spacer_instance.l25(spaces) + $this.v25(_this__u8e3s4.t25_1) + ' = ' + type + '.' + fields + '["' + _this__u8e3s4.t25_1.b1() + '"]?.let{ serialization.deserializeParam(it, typeOf<' + $this.j24(_this__u8e3s4.u25_1) + '>()) }' : Spacer_instance.l25(spaces) + $this.v25(_this__u8e3s4.t25_1) + ' = serialization.deserializeParam(requireNotNull(' + type + '.' + fields + '["' + _this__u8e3s4.t25_1.b1() + '"]) { "' + $this.v25(_this__u8e3s4.t25_1) + ' is null" }, typeOf<' + $this.j24(_this__u8e3s4.u25_1) + '>())';
@@ -1515,7 +1526,7 @@ function emitDeserializedParams$default(_this__u8e3s4, $this, type, fields, spac
   return emitDeserializedParams_3(_this__u8e3s4, $this, type, fields, spaces);
 }
 function emitIdentifier_0(_this__u8e3s4, $this) {
-  return 'request.path.' + $this.v25(_this__u8e3s4.x25_1) + '.let{serialization.serialize(it, typeOf<' + $this.j24(_this__u8e3s4.y25_1) + '>())}';
+  return 'request.path.' + $this.v25(_this__u8e3s4.w25_1) + '.let{serialization.serialize(it, typeOf<' + $this.j24(_this__u8e3s4.x25_1) + '>())}';
 }
 function emit_3(_this__u8e3s4, $this) {
   var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.o25_1;
@@ -1524,7 +1535,7 @@ function emit_3(_this__u8e3s4, $this) {
   return tmp3_elvis_lhs == null ? 'Unit' : tmp3_elvis_lhs;
 }
 function emit_4(_this__u8e3s4, $this) {
-  return $this.v25(_this__u8e3s4.x25_1) + ': ' + $this.j24(_this__u8e3s4.y25_1);
+  return $this.v25(_this__u8e3s4.w25_1) + ': ' + $this.j24(_this__u8e3s4.x25_1);
 }
 function brace(_this__u8e3s4, $this) {
   return wrap(_this__u8e3s4, $this, '(', ')');
@@ -1592,12 +1603,12 @@ function KotlinEmitter$emit$lambda(this$0) {
 }
 function KotlinEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return Spacer_instance.toString() + 'val ' + this$0.c26(it) + ',';
+    return Spacer_instance.toString() + 'val ' + this$0.b26(it) + ',';
   };
 }
 function KotlinEmitter$emit$lambda_1(this$0) {
   return function (it) {
-    return this$0.e26(this$0.d26(it)) + '("' + it + '")';
+    return this$0.d26(this$0.c26(it)) + '("' + it + '")';
   };
 }
 function KotlinEmitter$emit$lambda_2(it) {
@@ -1611,17 +1622,17 @@ function KotlinEmitter$emit$lambda_3(this$0) {
 }
 function KotlinEmitter$emit$lambda_4(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function KotlinEmitter$emit$lambda_5(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function KotlinEmitter$emit$lambda_6(this$0) {
   return function (it) {
-    return this$0.f26(it);
+    return this$0.e26(it);
   };
 }
 function KotlinEmitter$emit$lambda_7(this$0) {
@@ -1636,7 +1647,7 @@ function KotlinEmitter$emit$lambda_8(this$0) {
 }
 function KotlinEmitter$emit$lambda_9(this$0) {
   return function (it) {
-    return this$0.g26(it);
+    return this$0.f26(it);
   };
 }
 function KotlinEmitter$emitStatusInterfaces$lambda(it) {
@@ -1652,7 +1663,7 @@ function KotlinEmitter$emitObject$lambda($spaces, $block) {
 }
 function KotlinEmitter$emit$lambda_10(this$0) {
   return function (it) {
-    return this$0.v25(it.x25_1);
+    return this$0.v25(it.w25_1);
   };
 }
 function KotlinEmitter$emit$lambda_11(this$0) {
@@ -1669,7 +1680,7 @@ function KotlinEmitter$emit$lambda_13(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Literal) {
-      tmp = '"' + it.h26_1 + '"';
+      tmp = '"' + it.g26_1 + '"';
     } else {
       if (it instanceof Param_0) {
         tmp = emitIdentifier_0(it, this$0);
@@ -1692,7 +1703,7 @@ function KotlinEmitter$emit$lambda_15(this$0) {
 }
 function KotlinEmitter$emit$lambda_16(this$0) {
   return function (it) {
-    return 'val ' + this$0.c26(it);
+    return 'val ' + this$0.b26(it);
   };
 }
 function KotlinEmitter$emit$lambda_17(this$0) {
@@ -1702,7 +1713,7 @@ function KotlinEmitter$emit$lambda_17(this$0) {
 }
 function KotlinEmitter$emit$lambda_18(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function KotlinEmitter$emitConstructor$lambda(this$0) {
@@ -1712,12 +1723,12 @@ function KotlinEmitter$emitConstructor$lambda(this$0) {
 }
 function KotlinEmitter$emitConstructor$lambda_0(this$0) {
   return function (it) {
-    return Spacer_instance.l25(2) + this$0.c26(it);
+    return Spacer_instance.l25(2) + this$0.b26(it);
   };
 }
 function KotlinEmitter$emitConstructor$lambda_1(this$0) {
   return function (it) {
-    return Spacer_instance.l25(2) + this$0.c26(it);
+    return Spacer_instance.l25(2) + this$0.b26(it);
   };
 }
 function KotlinEmitter$emitDeserializedParams$lambda(this$0) {
@@ -1750,8 +1761,8 @@ function KotlinEmitter$sanitizeSymbol$lambda(it) {
 }
 function KotlinEmitter(packageName, emitShared) {
   Companion_getInstance_1();
-  packageName = packageName === VOID ? Companion_instance_6.i26('community.flock.wirespec.generated') : packageName;
-  emitShared = emitShared === VOID ? Companion_instance_4.j26() : emitShared;
+  packageName = packageName === VOID ? Companion_instance_6.h26('community.flock.wirespec.generated') : packageName;
+  emitShared = emitShared === VOID ? Companion_instance_4.i26() : emitShared;
   Emitter.call(this);
   this.i28_1 = packageName;
   this.j28_1 = emitShared;
@@ -1760,42 +1771,42 @@ function KotlinEmitter(packageName, emitShared) {
   this.m28_1 = KotlinShared_getInstance();
   this.n28_1 = '//';
 }
-protoOf(KotlinEmitter).k26 = function () {
+protoOf(KotlinEmitter).j26 = function () {
   return this.l28_1;
 };
-protoOf(KotlinEmitter).l26 = function () {
+protoOf(KotlinEmitter).k26 = function () {
   return this.m28_1;
 };
-protoOf(KotlinEmitter).m26 = function () {
+protoOf(KotlinEmitter).l26 = function () {
   return this.n28_1;
 };
-protoOf(KotlinEmitter).n26 = function (module_0, logger) {
+protoOf(KotlinEmitter).m26 = function (module_0, logger) {
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>' call
-  var it = protoOf(Emitter).n26.call(this, module_0, logger);
-  return this.j28_1.r26_1 ? it.al(new Emitted(Companion_instance_6.i26('community.flock.wirespec').o26() + 'Wirespec', this.l26().r28_1)) : it;
+  var it = protoOf(Emitter).m26.call(this, module_0, logger);
+  return this.j28_1.q26_1 ? it.al(new Emitted(Companion_instance_6.h26('community.flock.wirespec').n26() + 'Wirespec', this.k26().r28_1)) : it;
 };
-protoOf(KotlinEmitter).s26 = function (definition, module_0, logger) {
+protoOf(KotlinEmitter).r26 = function (definition, module_0, logger) {
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>' call
-  var it = protoOf(Emitter).s26.call(this, definition, module_0, logger);
+  var it = protoOf(Emitter).r26.call(this, definition, module_0, logger);
   var subPackageName = plus_0(this.i28_1, definition);
-  var tmp = subPackageName.o26() + sanitizeSymbol_0(it.t26_1, this);
+  var tmp = subPackageName.n26() + sanitizeSymbol_0(it.s26_1, this);
   // Inline function 'kotlin.text.trimStart' call
-  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + '\n                    |' + (Companion_instance_5.v26(module_0) ? this.k28_1 : '') + '\n                    |' + it.u26_1 + '\n                ');
+  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + '\n                    |' + (Companion_instance_5.u26(module_0) ? this.k28_1 : '') + '\n                    |' + it.t26_1 + '\n                ');
   var tmp$ret$0 = toString(trimStart(isCharSequence(this_0) ? this_0 : THROW_CCE()));
   return new Emitted(tmp, tmp$ret$0);
 };
-protoOf(KotlinEmitter).w26 = function (type, module_0) {
+protoOf(KotlinEmitter).v26 = function (type, module_0) {
   var tmp;
-  if (type.z26_1.i27_1.l()) {
-    tmp = 'data object ' + this.v25(type.y26_1);
+  if (type.y26_1.h27_1.l()) {
+    tmp = 'data object ' + this.v25(type.x26_1);
   } else {
-    var tmp_0 = this.v25(type.y26_1);
-    var tmp_1 = this.b27(type.z26_1);
+    var tmp_0 = this.v25(type.x26_1);
+    var tmp_1 = this.a27(type.y26_1);
     // Inline function 'kotlin.run' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>' call
-    var $this$run = type.a27_1;
+    var $this$run = type.z26_1;
     var tmp_2;
     if ($this$run.l()) {
       tmp_2 = '';
@@ -1807,10 +1818,10 @@ protoOf(KotlinEmitter).w26 = function (type, module_0) {
   }
   return tmp;
 };
-protoOf(KotlinEmitter).b27 = function (_this__u8e3s4) {
-  return dropLast(joinToString(_this__u8e3s4.i27_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_0(this)), 1);
+protoOf(KotlinEmitter).a27 = function (_this__u8e3s4) {
+  return dropLast(joinToString(_this__u8e3s4.h27_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_0(this)), 1);
 };
-protoOf(KotlinEmitter).c26 = function (_this__u8e3s4) {
+protoOf(KotlinEmitter).b26 = function (_this__u8e3s4) {
   return this.v25(_this__u8e3s4.t25_1) + ': ' + this.j24(_this__u8e3s4.u25_1);
 };
 protoOf(KotlinEmitter).j24 = function (_this__u8e3s4) {
@@ -1898,7 +1909,7 @@ protoOf(KotlinEmitter).v25 = function (identifier) {
     tmp = sanitizeSymbol_0(identifier.b1(), this);
   } else {
     if (identifier instanceof FieldIdentifier) {
-      tmp = this.e26(sanitizeSymbol_0(identifier.b1(), this));
+      tmp = this.d26(sanitizeSymbol_0(identifier.b1(), this));
     } else {
       noWhenBranchMatchedException();
     }
@@ -1916,7 +1927,7 @@ protoOf(KotlinEmitter).q27 = function (enum_0, module_0) {
   return trimMargin('\n        |enum class ' + tmp + ' (override val label: String): Wirespec.Enum {\n        |' + this.u27(joinToString(enum_0.t27_1, ',\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_1(this))) + ';\n        |' + Spacer_instance.toString() + 'override fun toString(): String {\n        |' + Spacer_instance.l25(2) + 'return label\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 };
 protoOf(KotlinEmitter).v27 = function (union) {
-  return trimMargin('\n        |sealed interface ' + this.v25(union.g27_1) + '\n        |\n    ');
+  return trimMargin('\n        |sealed interface ' + this.v25(union.f27_1) + '\n        |\n    ');
 };
 protoOf(KotlinEmitter).w27 = function (channel) {
   return trimMargin('\n        |interface ' + this.v25(channel.z27_1) + 'Channel {\n        |   operator fun invoke(message: ' + this.j24(channel.a28_1) + ')\n        |}\n        |\n    ');
@@ -1977,7 +1988,7 @@ protoOf(KotlinEmitter).c28 = function (endpoint) {
   return trimMargin('\n        |' + tmp_0 + '\n        |\n        |object ' + tmp_1 + ' : Wirespec.Endpoint {\n        |' + tmp_3 + '\n        |\n        |' + tmp_4 + '\n        |\n        |' + tmp_5 + '\n        |\n        |' + tmp_6 + '\n        |\n        |' + tmp_7 + 'sealed interface Response<T: Any> : Wirespec.Response<T>\n        |\n        |' + tmp_8 + '\n        |\n        |' + tmp_9 + '\n        |\n        |' + tmp_11 + '\n        |\n        |' + tmp_12 + 'fun toResponse(serialization: Wirespec.Serializer<String>, response: Response<*>): Wirespec.RawResponse =\n        |' + tmp_13 + 'when(response) {\n        |' + tmp_15 + '\n        |' + tmp_16 + '}\n        |\n        |' + tmp_17 + 'fun fromResponse(serialization: Wirespec.Deserializer<String>, response: Wirespec.RawResponse): Response<*> =\n        |' + tmp_18 + 'when (response.statusCode) {\n        |' + tmp_20 + '\n        |' + tmp_21 + 'else -> error("Cannot match response with status: ${response.statusCode}")\n        |' + tmp_22 + '}\n        |\n        |' + tmp_23 + 'interface Handler: Wirespec.Handler {\n        |' + tmp_24 + tmp_25 + '\n        |' + tmp_26 + 'companion object: Wirespec.Server<Request, Response<*>>, Wirespec.Client<Request, Response<*>> {\n        |' + tmp_27 + 'override val pathTemplate = "/' + joinToString(endpoint.b25_1, '/', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_9(this)) + '"\n        |' + Spacer_instance.l25(3) + 'override val method = "' + endpoint.a25_1.toString() + '"\n        |' + Spacer_instance.l25(3) + 'override fun server(serialization: Wirespec.Serialization<String>) = object : Wirespec.ServerEdge<Request, Response<*>> {\n        |' + Spacer_instance.l25(4) + 'override fun from(request: Wirespec.RawRequest) = fromRequest(serialization, request)\n        |' + Spacer_instance.l25(4) + 'override fun to(response: Response<*>) = toResponse(serialization, response)\n        |' + Spacer_instance.l25(3) + '}\n        |' + Spacer_instance.l25(3) + 'override fun client(serialization: Wirespec.Serialization<String>) = object : Wirespec.ClientEdge<Request, Response<*>> {\n        |' + Spacer_instance.l25(4) + 'override fun to(request: Request) = toRequest(serialization, request)\n        |' + Spacer_instance.l25(4) + 'override fun from(response: Wirespec.RawResponse) = fromResponse(serialization, response)\n        |' + Spacer_instance.l25(3) + '}\n        |' + Spacer_instance.l25(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 };
 protoOf(KotlinEmitter).f28 = function (endpoint) {
-  return 'suspend fun ' + Companion_instance_5.z25(this.v25(endpoint.z24_1)) + '(request: Request): Response<*>';
+  return 'suspend fun ' + Companion_instance_5.y25(this.v25(endpoint.z24_1)) + '(request: Request): Response<*>';
 };
 protoOf(KotlinEmitter).d28 = function (_this__u8e3s4, endpoint) {
   var tmp = Spacer_instance.toString();
@@ -2016,7 +2027,7 @@ protoOf(KotlinEmitter).d28 = function (_this__u8e3s4, endpoint) {
   }
   return trimMargin('\n        |' + tmp + tmp_0 + '\n        |' + tmp_1 + 'override val path = Path' + tmp_3 + '\n        |' + tmp_4 + 'override val method = Wirespec.Method.' + endpoint.a25_1.q2_1 + '\n        |' + tmp_5 + 'override val queries = Queries' + tmp_6 + '\n        |' + tmp_7 + 'override val headers = Headers' + tmp_8 + tmp_9 + '\n        |' + tmp_10 + '}\n        |\n        |' + tmp_11 + 'fun toRequest(serialization: Wirespec.Serializer<String>, request: Request): Wirespec.RawRequest =\n        |' + tmp_12 + 'Wirespec.RawRequest(\n        |' + tmp_13 + 'path = listOf(' + tmp_14 + '),\n        |' + tmp_15 + 'method = request.method.name,\n        |' + tmp_16 + 'queries = ' + tmp_18 + ',\n        |' + tmp_19 + 'headers = ' + tmp_20 + ',\n        |' + Spacer_instance.l25(3) + 'body = serialization.serialize(request.body, typeOf<' + emit_3(_this__u8e3s4.m25_1, this) + '>()),\n        |' + Spacer_instance.l25(2) + ')\n        |\n        |' + Spacer_instance.toString() + 'fun fromRequest(serialization: Wirespec.Deserializer<String>, request: Wirespec.RawRequest): Request =\n        |' + Spacer_instance.l25(2) + 'Request' + emitDeserializedParams_2(_this__u8e3s4, this, endpoint) + '\n    ');
 };
-protoOf(KotlinEmitter).f26 = function (_this__u8e3s4) {
+protoOf(KotlinEmitter).e26 = function (_this__u8e3s4) {
   var tmp = Spacer_instance.toString();
   var tmp_0 = emit_3(_this__u8e3s4.i25_1, this);
   // Inline function 'kotlin.let' call
@@ -2032,17 +2043,17 @@ protoOf(KotlinEmitter).f26 = function (_this__u8e3s4) {
   var tmp_8 = brace(joinToString(_this__u8e3s4.h25_1, VOID, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda_17(this)), this);
   return trimMargin('\n        |' + tmp + 'data class Response' + _this__u8e3s4.g25_1 + '(override val body: ' + tmp_0 + tmp_1 + ') : Response' + tmp_2 + 'XX<' + tmp_3 + '>, Response' + tmp_4 + ' {\n        |' + tmp_5 + 'override val status = ' + tmp_6 + '\n        |' + tmp_7 + 'override val headers = ResponseHeaders' + tmp_8 + '\n        |' + emitObject_0(_this__u8e3s4.h25_1, this, 'ResponseHeaders', 'Wirespec.Response.Headers', 2, KotlinEmitter$emit$lambda_18(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 };
-protoOf(KotlinEmitter).d26 = function (_this__u8e3s4) {
+protoOf(KotlinEmitter).c26 = function (_this__u8e3s4) {
   return sanitizeFirstIsDigit_0(joinToString(split(_this__u8e3s4, ['-', ', ', '.', ' ', '//']), '_'), this);
 };
-protoOf(KotlinEmitter).e26 = function (_this__u8e3s4) {
+protoOf(KotlinEmitter).d26 = function (_this__u8e3s4) {
   return Companion_getInstance_1().o28_1.o1(_this__u8e3s4) ? addBackticks(_this__u8e3s4) : _this__u8e3s4;
 };
 function emitReferenceCustomImports(_this__u8e3s4, $this) {
   return 'from ..model.' + _this__u8e3s4.y23_1 + ' import ' + _this__u8e3s4.y23_1;
 }
 function emit_5(_this__u8e3s4, $this) {
-  return $this.v25(_this__u8e3s4.x25_1) + ': ' + $this.j24(_this__u8e3s4.y25_1) + ' ';
+  return $this.v25(_this__u8e3s4.w25_1) + ': ' + $this.j24(_this__u8e3s4.x25_1) + ' ';
 }
 function emit_6(_this__u8e3s4, $this) {
   return $this.v25(_this__u8e3s4.z28_1) + ': ' + $this.j24(_this__u8e3s4.a29_1);
@@ -2230,7 +2241,7 @@ function emitDeserializedParams_4(_this__u8e3s4, $this, endpoint) {
   return isBlank(it) ? '' : '(\n' + it + '\n)';
 }
 function emitDeserialized_3(_this__u8e3s4, $this) {
-  return Spacer_instance.l25(3) + $this.v25(_this__u8e3s4.xd_1.x25_1) + ' = serialization.deserialize(request.path[' + _this__u8e3s4.wd_1 + '], ' + emitType_0(_this__u8e3s4.xd_1.y25_1, $this) + ')';
+  return Spacer_instance.l25(3) + $this.v25(_this__u8e3s4.xd_1.w25_1) + ' = serialization.deserialize(request.path[' + _this__u8e3s4.wd_1 + '], ' + emitType_0(_this__u8e3s4.xd_1.x25_1, $this) + ')';
 }
 function emitDeserializedParams_5(_this__u8e3s4, $this, type, fields) {
   return $this.v25(_this__u8e3s4.t25_1) + ' = serialization.deserialize_param(' + type + '.' + fields + '.get("' + _this__u8e3s4.t25_1.b1() + '".lower()), ' + emitType_0(_this__u8e3s4.u25_1, $this) + ')';
@@ -2435,7 +2446,7 @@ function PythonEmitter$emit$lambda_1(this$0) {
 }
 function PythonEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return Spacer_instance.toString() + this$0.c26(it);
+    return Spacer_instance.toString() + this$0.b26(it);
   };
 }
 function PythonEmitter$emitAssignSelf$lambda(this$0) {
@@ -2478,12 +2489,12 @@ function PythonEmitter$emit$lambda_5(this$0) {
 }
 function PythonEmitter$emit$lambda_6(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function PythonEmitter$emit$lambda_7(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function PythonEmitter$emit$lambda_8(this$0) {
@@ -2495,10 +2506,10 @@ function PythonEmitter$emitToRawRequest$lambda(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Literal) {
-      tmp = '"' + it.h26_1 + '"';
+      tmp = '"' + it.g26_1 + '"';
     } else {
       if (it instanceof Param_0) {
-        tmp = 'str(request.path.' + this$0.v25(it.x25_1) + ')';
+        tmp = 'str(request.path.' + this$0.v25(it.w25_1) + ')';
       } else {
         noWhenBranchMatchedException();
       }
@@ -2533,7 +2544,7 @@ function PythonEmitter$emitDeserializedParams$lambda_1(this$0) {
 }
 function PythonEmitter$emit$lambda_9(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function PythonEmitter$emit$lambda_10(this$0) {
@@ -2568,13 +2579,13 @@ function PythonEmitter$emitObject$lambda($spaces, $block) {
 }
 function PythonEmitter$emit$lambda_11(this$0) {
   return function (it) {
-    return Spacer_instance.toString() + this$0.e26(this$0.d26(it)) + ' = "' + it + '"';
+    return Spacer_instance.toString() + this$0.d26(this$0.c26(it)) + ' = "' + it + '"';
   };
 }
 function PythonEmitter(packageName, emitShared) {
   Companion_getInstance_2();
-  packageName = packageName === VOID ? Companion_instance_6.i26('community.flock.wirespec.generated') : packageName;
-  emitShared = emitShared === VOID ? Companion_instance_4.j26() : emitShared;
+  packageName = packageName === VOID ? Companion_instance_6.h26('community.flock.wirespec.generated') : packageName;
+  emitShared = emitShared === VOID ? Companion_instance_4.i26() : emitShared;
   Emitter.call(this);
   this.s28_1 = packageName;
   this.t28_1 = emitShared;
@@ -2583,13 +2594,13 @@ function PythonEmitter(packageName, emitShared) {
   this.w28_1 = PythonShared_instance;
   this.x28_1 = '#';
 }
-protoOf(PythonEmitter).k26 = function () {
+protoOf(PythonEmitter).j26 = function () {
   return this.v28_1;
 };
-protoOf(PythonEmitter).l26 = function () {
+protoOf(PythonEmitter).k26 = function () {
   return this.w28_1;
 };
-protoOf(PythonEmitter).m26 = function () {
+protoOf(PythonEmitter).l26 = function () {
   return this.x28_1;
 };
 protoOf(PythonEmitter).h29 = function (definition) {
@@ -2621,9 +2632,9 @@ protoOf(PythonEmitter).h29 = function (definition) {
   }
   return tmp;
 };
-protoOf(PythonEmitter).n26 = function (module_0, logger) {
+protoOf(PythonEmitter).m26 = function (module_0, logger) {
   // Inline function 'kotlin.collections.sortedBy' call
-  var this_0 = module_0.e27_1;
+  var this_0 = module_0.d27_1;
   // Inline function 'kotlin.comparisons.compareBy' call
   var tmp = PythonEmitter$emit$lambda(this);
   var tmp$ret$0 = new sam$kotlin_Comparator$0(tmp);
@@ -2631,11 +2642,11 @@ protoOf(PythonEmitter).n26 = function (module_0, logger) {
   var statements = ensureNotNull(toNonEmptyListOrNull(tmp$ret$1));
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.PythonEmitter.emit.<anonymous>' call
-  var it = protoOf(Emitter).n26.call(this, module_0.j29(VOID, statements), logger);
-  var init = new Emitted(this.s28_1.o26() + '__init__', 'from . import model\nfrom . import endpoint\nfrom . import wirespec\n');
-  var tmp_0 = this.s28_1.o26() + 'endpoint/' + '__init__';
+  var it = protoOf(Emitter).m26.call(this, module_0.j29(VOID, statements), logger);
+  var init = new Emitted(this.s28_1.n26() + '__init__', 'from . import model\nfrom . import endpoint\nfrom . import wirespec\n');
+  var tmp_0 = this.s28_1.n26() + 'endpoint/' + '__init__';
   // Inline function 'kotlin.collections.filter' call
-  var tmp0 = module_0.e27_1;
+  var tmp0 = module_0.d27_1;
   // Inline function 'kotlin.collections.filterTo' call
   var destination = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s = tmp0.g();
@@ -2657,9 +2668,9 @@ protoOf(PythonEmitter).n26 = function (module_0, logger) {
     destination_0.e(tmp$ret$5);
   }
   var initEndpoint = new Emitted(tmp_0, joinToString(destination_0, '\n'));
-  var tmp_1 = this.s28_1.o26() + 'model/' + '__init__';
+  var tmp_1 = this.s28_1.n26() + 'model/' + '__init__';
   // Inline function 'kotlin.collections.filter' call
-  var tmp0_0 = module_0.e27_1;
+  var tmp0_0 = module_0.d27_1;
   // Inline function 'kotlin.collections.filterTo' call
   var destination_1 = ArrayList_init_$Create$_0();
   var _iterator__ex2g4s_1 = tmp0_0.g();
@@ -2681,39 +2692,39 @@ protoOf(PythonEmitter).n26 = function (module_0, logger) {
     destination_2.e(tmp$ret$11);
   }
   var initModel = new Emitted(tmp_1, joinToString(destination_2, '\n'));
-  var shared = new Emitted(this.s28_1.o26() + 'wirespec', this.l26().l29_1);
-  return this.t28_1.r26_1 ? it.al(init).al(initEndpoint).al(initModel).al(shared) : it.al(init);
+  var shared = new Emitted(this.s28_1.n26() + 'wirespec', this.k26().l29_1);
+  return this.t28_1.q26_1 ? it.al(init).al(initEndpoint).al(initModel).al(shared) : it.al(init);
 };
-protoOf(PythonEmitter).s26 = function (definition, module_0, logger) {
+protoOf(PythonEmitter).r26 = function (definition, module_0, logger) {
   var subPackageName = plus_0(this.s28_1, definition);
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.PythonEmitter.emit.<anonymous>' call
-  var it = protoOf(Emitter).s26.call(this, definition, module_0, logger);
-  var tmp = subPackageName.o26() + sanitizeSymbol_1(it.t26_1, this);
+  var it = protoOf(Emitter).r26.call(this, definition, module_0, logger);
+  var tmp = subPackageName.n26() + sanitizeSymbol_1(it.s26_1, this);
   // Inline function 'kotlin.text.trimStart' call
-  var this_0 = trimMargin('\n                    |' + this.u28_1 + '\n                    |' + it.u26_1 + '\n                ');
+  var this_0 = trimMargin('\n                    |' + this.u28_1 + '\n                    |' + it.t26_1 + '\n                ');
   var tmp$ret$0 = toString(trimStart(isCharSequence(this_0) ? this_0 : THROW_CCE()));
   return new Emitted(tmp, tmp$ret$0);
 };
-protoOf(PythonEmitter).w26 = function (type, module_0) {
+protoOf(PythonEmitter).v26 = function (type, module_0) {
   var tmp;
-  if (type.z26_1.i27_1.l()) {
-    var tmp_0 = this.v25(type.y26_1);
+  if (type.y26_1.h27_1.l()) {
+    var tmp_0 = this.v25(type.x26_1);
     var tmp_1 = Spacer_instance.toString();
     var tmp_2 = this.b28(type);
     tmp = trimMargin('\n            |@dataclass\n            |class ' + tmp_0 + ':\n            |' + tmp_1 + 'pass\n            |\n            |' + joinToString(tmp_2, '\n', VOID, VOID, VOID, VOID, PythonEmitter$emit$lambda_0(this)) + '\n            |\n        ');
   } else {
-    var tmp_3 = this.v25(type.y26_1);
-    var tmp_4 = this.b27(type.z26_1);
+    var tmp_3 = this.v25(type.x26_1);
+    var tmp_4 = this.a27(type.y26_1);
     var tmp_5 = this.b28(type);
     tmp = trimMargin('\n            |@dataclass\n            |class ' + tmp_3 + ':\n            |' + tmp_4 + '\n            |\n            |' + joinToString(tmp_5, '\n', VOID, VOID, VOID, VOID, PythonEmitter$emit$lambda_1(this)) + '\n        ');
   }
   return tmp;
 };
-protoOf(PythonEmitter).b27 = function (_this__u8e3s4) {
-  return joinToString(_this__u8e3s4.i27_1, '\n', VOID, VOID, VOID, VOID, PythonEmitter$emit$lambda_2(this));
+protoOf(PythonEmitter).a27 = function (_this__u8e3s4) {
+  return joinToString(_this__u8e3s4.h27_1, '\n', VOID, VOID, VOID, VOID, PythonEmitter$emit$lambda_2(this));
 };
-protoOf(PythonEmitter).c26 = function (_this__u8e3s4) {
+protoOf(PythonEmitter).b26 = function (_this__u8e3s4) {
   return this.v25(_this__u8e3s4.t25_1) + ": '" + this.j24(_this__u8e3s4.u25_1) + "'";
 };
 protoOf(PythonEmitter).j24 = function (_this__u8e3s4) {
@@ -2753,7 +2764,7 @@ protoOf(PythonEmitter).v25 = function (identifier) {
     tmp = sanitizeSymbol_1(identifier.b1(), this);
   } else {
     if (identifier instanceof FieldIdentifier) {
-      tmp = this.e26(sanitizeSymbol_1(identifier.b1(), this));
+      tmp = this.d26(sanitizeSymbol_1(identifier.b1(), this));
     } else {
       noWhenBranchMatchedException();
     }
@@ -2832,9 +2843,9 @@ protoOf(PythonEmitter).q27 = function (enum_0, module_0) {
   return trimMargin('\n        |class ' + tmp + '(str, Enum):\n        |' + joinToString(enum_0.t27_1, '\n', VOID, VOID, VOID, VOID, PythonEmitter$emit$lambda_11(this)) + '\n        |\n        |' + Spacer_instance.toString() + '@property\n        |' + Spacer_instance.toString() + 'def label(self) -> str:\n        |' + Spacer_instance.l25(2) + 'return self.value\n        |\n        |' + Spacer_instance.toString() + 'def __str__(self) -> str:\n        |' + Spacer_instance.l25(2) + 'return self.value\n    ');
 };
 protoOf(PythonEmitter).v27 = function (union) {
-  return trimMargin('\n        |class ' + this.v25(union.g27_1) + '(ABC):\n        |' + Spacer_instance.toString() + 'pass\n    ');
+  return trimMargin('\n        |class ' + this.v25(union.f27_1) + '(ABC):\n        |' + Spacer_instance.toString() + 'pass\n    ');
 };
-protoOf(PythonEmitter).d26 = function (_this__u8e3s4) {
+protoOf(PythonEmitter).c26 = function (_this__u8e3s4) {
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.PythonEmitter.sanitizeEnum.<anonymous>' call
   var it = joinToString(split(_this__u8e3s4, ['-', ', ', '.', ' ', '//']), '_');
@@ -2854,11 +2865,11 @@ protoOf(PythonEmitter).d26 = function (_this__u8e3s4) {
   }
   return tmp;
 };
-protoOf(PythonEmitter).e26 = function (_this__u8e3s4) {
+protoOf(PythonEmitter).d26 = function (_this__u8e3s4) {
   return Companion_getInstance_2().e29_1.o1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 };
 function emitHandleFunction($this, endpoint) {
-  return Companion_instance_5.z25(sanitizeSymbol_2(endpoint.z24_1, $this)) + ': (request:Request) => Promise<Response>';
+  return Companion_instance_5.y25(sanitizeSymbol_2(endpoint.z24_1, $this)) + ': (request:Request) => Promise<Response>';
 }
 function emitType_1(_this__u8e3s4, $this, name, block) {
   var tmp;
@@ -3050,7 +3061,7 @@ function emitServerTo($this) {
   return trimMargin('\n        |to: (it) => ({\n        |' + Spacer_instance.l25(1) + 'status: it.status,\n        |' + Spacer_instance.l25(1) + 'headers: {},\n        |' + Spacer_instance.l25(1) + 'body: serialization.serialize(it.body),\n        |})\n    ');
 }
 function emitDeserialize(_this__u8e3s4, $this) {
-  return $this.v25(_this__u8e3s4.xd_1.x25_1) + ': serialization.deserialize(it.path[' + _this__u8e3s4.wd_1 + '])';
+  return $this.v25(_this__u8e3s4.xd_1.w25_1) + ': serialization.deserialize(it.path[' + _this__u8e3s4.wd_1 + '])';
 }
 function emitDeserialize_0(_this__u8e3s4, $this, fields) {
   return $this.v25(_this__u8e3s4.t25_1) + ': serialization.deserialize(it.' + fields + '[' + $this.v25(_this__u8e3s4.t25_1) + '])';
@@ -3063,7 +3074,7 @@ function TypeScriptEmitter$emit$lambda(it) {
 }
 function TypeScriptEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function TypeScriptEmitter$emit$lambda_1(this$0) {
@@ -3073,12 +3084,12 @@ function TypeScriptEmitter$emit$lambda_1(this$0) {
 }
 function TypeScriptEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function TypeScriptEmitter$emit$lambda_3(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function TypeScriptEmitter$emit$lambda_4(this$0) {
@@ -3098,7 +3109,7 @@ function TypeScriptEmitter$emit$lambda_6(this$0) {
 }
 function TypeScriptEmitter$emit$lambda_7(this$0) {
   return function (it) {
-    return this$0.g26(it);
+    return this$0.f26(it);
   };
 }
 function TypeScriptEmitter$emit$lambda_8(this$0) {
@@ -3118,7 +3129,7 @@ function TypeScriptEmitter$emitFunction$lambda(this$0) {
 }
 function TypeScriptEmitter$emitFunction$lambda_0(this$0) {
   return function (it) {
-    return this$0.v25(it.x25_1) + ': props[' + this$0.v25(it.x25_1) + ']';
+    return this$0.v25(it.w25_1) + ': props[' + this$0.v25(it.w25_1) + ']';
   };
 }
 function TypeScriptEmitter$emitFunction$lambda_1(this$0) {
@@ -3153,10 +3164,10 @@ function TypeScriptEmitter$emitPathArray$lambda(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Literal) {
-      tmp = '"' + it.h26_1 + '"';
+      tmp = '"' + it.g26_1 + '"';
     } else {
       if (it instanceof Param_0) {
-        tmp = 'serialization.serialize(it.path[' + this$0.v25(it.x25_1) + '])';
+        tmp = 'serialization.serialize(it.path[' + this$0.v25(it.w25_1) + '])';
       } else {
         noWhenBranchMatchedException();
       }
@@ -3200,29 +3211,29 @@ function TypeScriptEmitter$emitServerFrom$lambda_1(this$0) {
   };
 }
 function TypeScriptEmitter(emitShared) {
-  emitShared = emitShared === VOID ? Companion_instance_4.j26() : emitShared;
+  emitShared = emitShared === VOID ? Companion_instance_4.i26() : emitShared;
   Emitter.call(this);
   this.m29_1 = emitShared;
   this.n29_1 = FileExtension_TypeScript_getInstance();
   this.o29_1 = TypeScriptShared_getInstance();
   this.p29_1 = '//';
 }
-protoOf(TypeScriptEmitter).k26 = function () {
+protoOf(TypeScriptEmitter).j26 = function () {
   return this.n29_1;
 };
-protoOf(TypeScriptEmitter).l26 = function () {
+protoOf(TypeScriptEmitter).k26 = function () {
   return this.o29_1;
 };
-protoOf(TypeScriptEmitter).m26 = function () {
+protoOf(TypeScriptEmitter).l26 = function () {
   return this.p29_1;
 };
-protoOf(TypeScriptEmitter).n26 = function (module_0, logger) {
-  var tmp = Companion_instance_5.s25(last(split(module_0.d27_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).n26.call(this, module_0, logger);
+  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.u26_1;
+  var tmp_1 = this_0.uk_1.t26_1;
   // Inline function 'kotlin.collections.map' call
   var this_1 = this_0.vk_1;
   // Inline function 'kotlin.collections.mapTo' call
@@ -3231,7 +3242,7 @@ protoOf(TypeScriptEmitter).n26 = function (module_0, logger) {
   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.u26_1;
+    var tmp$ret$1 = item.t26_1;
     destination.e(tmp$ret$1);
   }
   var tmp$ret$4 = new NonEmptyList(tmp_1, destination);
@@ -3239,22 +3250,22 @@ protoOf(TypeScriptEmitter).n26 = function (module_0, logger) {
   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.r26_1 ? emitted.al(new Emitted(Companion_instance_6.i26('community.flock.wirespec.generated').o26() + 'Wirespec', this.l26().s29_1)) : emitted;
+  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;
 };
-protoOf(TypeScriptEmitter).w26 = function (type, module_0) {
-  return trimMargin('export type ' + sanitizeSymbol_2(type.y26_1, this) + ' = {\n            |' + this.b27(type.z26_1) + '\n            |}\n            |\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            |');
 };
 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';
 };
-protoOf(TypeScriptEmitter).b27 = function (_this__u8e3s4) {
-  return joinToString(_this__u8e3s4.i27_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_0(this));
+protoOf(TypeScriptEmitter).a27 = function (_this__u8e3s4) {
+  return joinToString(_this__u8e3s4.h27_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_0(this));
 };
 protoOf(TypeScriptEmitter).q29 = function (_this__u8e3s4) {
-  return Spacer_instance.toString() + this.v25(_this__u8e3s4.x25_1) + ': ' + this.j24(_this__u8e3s4.y25_1);
+  return Spacer_instance.toString() + this.v25(_this__u8e3s4.w25_1) + ': ' + this.j24(_this__u8e3s4.x25_1);
 };
-protoOf(TypeScriptEmitter).c26 = function (_this__u8e3s4) {
+protoOf(TypeScriptEmitter).b26 = function (_this__u8e3s4) {
   return Spacer_instance.toString() + this.v25(_this__u8e3s4.t25_1) + ': ' + this.j24(_this__u8e3s4.u25_1);
 };
 protoOf(TypeScriptEmitter).j24 = function (_this__u8e3s4) {
@@ -3340,18 +3351,18 @@ protoOf(TypeScriptEmitter).c28 = function (endpoint) {
   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.z25(sanitizeSymbol_2(endpoint.z24_1, this));
+  var tmp_21 = Companion_instance_5.y25(sanitizeSymbol_2(endpoint.z24_1, this));
   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        ');
 };
-protoOf(TypeScriptEmitter).g26 = function (_this__u8e3s4) {
+protoOf(TypeScriptEmitter).f26 = function (_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Literal) {
-    tmp = _this__u8e3s4.h26_1;
+    tmp = _this__u8e3s4.g26_1;
   } else {
     if (_this__u8e3s4 instanceof Param_0) {
-      tmp = ':' + _this__u8e3s4.x25_1.b1();
+      tmp = ':' + _this__u8e3s4.w25_1.b1();
     } else {
       noWhenBranchMatchedException();
     }
@@ -3359,8 +3370,8 @@ protoOf(TypeScriptEmitter).g26 = function (_this__u8e3s4) {
   return tmp;
 };
 protoOf(TypeScriptEmitter).v27 = function (union) {
-  var tmp = sanitizeSymbol_2(union.g27_1, this);
-  return 'export type ' + tmp + ' = ' + joinToString(union.h27_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_8(this)) + '\n';
+  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';
 };
 protoOf(TypeScriptEmitter).v25 = function (identifier) {
   return '"' + identifier.b1() + '"';
@@ -3450,7 +3461,7 @@ function Companion_getInstance_3() {
 }
 function WirespecEmitter$emit$lambda(this$0) {
   return function (it) {
-    return Spacer_instance.toString() + this$0.c26(it);
+    return Spacer_instance.toString() + this$0.b26(it);
   };
 }
 function WirespecEmitter$emit$lambda_0(this$0) {
@@ -3486,10 +3497,10 @@ function WirespecEmitter$emitPath$lambda(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Param_0) {
-      tmp = '{' + it.x25_1.b1() + ': ' + this$0.j24(it.y25_1) + '}';
+      tmp = '{' + it.w25_1.b1() + ': ' + this$0.j24(it.x25_1) + '}';
     } else {
       if (it instanceof Literal) {
-        tmp = it.h26_1;
+        tmp = it.g26_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -3499,7 +3510,7 @@ function WirespecEmitter$emitPath$lambda(this$0) {
 }
 function WirespecEmitter$emitQuery$lambda(this$0) {
   return function (it) {
-    return this$0.c26(it);
+    return this$0.b26(it);
   };
 }
 function WirespecEmitter() {
@@ -3509,19 +3520,19 @@ function WirespecEmitter() {
   this.w29_1 = null;
   this.x29_1 = '\n';
 }
-protoOf(WirespecEmitter).k26 = function () {
+protoOf(WirespecEmitter).j26 = function () {
   return this.v29_1;
 };
-protoOf(WirespecEmitter).m26 = function () {
+protoOf(WirespecEmitter).l26 = function () {
   return this.x29_1;
 };
-protoOf(WirespecEmitter).w26 = function (type, module_0) {
-  return trimMargin('\n        |type ' + this.v25(type.y26_1) + ' {\n        |' + this.b27(type.z26_1) + '\n        |}\n        |');
+protoOf(WirespecEmitter).v26 = function (type, module_0) {
+  return trimMargin('\n        |type ' + this.v25(type.x26_1) + ' {\n        |' + this.a27(type.y26_1) + '\n        |}\n        |');
 };
-protoOf(WirespecEmitter).b27 = function (_this__u8e3s4) {
-  return joinToString(_this__u8e3s4.i27_1, ',\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda(this));
+protoOf(WirespecEmitter).a27 = function (_this__u8e3s4) {
+  return joinToString(_this__u8e3s4.h27_1, ',\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda(this));
 };
-protoOf(WirespecEmitter).c26 = function (_this__u8e3s4) {
+protoOf(WirespecEmitter).b26 = function (_this__u8e3s4) {
   return this.v25(_this__u8e3s4.t25_1) + ': ' + this.j24(_this__u8e3s4.u25_1);
 };
 protoOf(WirespecEmitter).v25 = function (identifier) {
@@ -3643,8 +3654,8 @@ protoOf(WirespecEmitter).c28 = function (endpoint) {
   return trimMargin('\n        |endpoint ' + tmp + ' ' + tmp_0 + tmp_1 + ' ' + tmp_2 + tmp_3 + ' -> {\n        |' + joinToString(endpoint.f25_1, '\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_1(this)) + '\n        |}\n        |\n    ');
 };
 protoOf(WirespecEmitter).v27 = function (union) {
-  var tmp = this.v25(union.g27_1);
-  return 'type ' + tmp + ' = ' + joinToString(union.h27_1, ' | ', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_2(this)) + '\n';
+  var tmp = this.v25(union.f27_1);
+  return 'type ' + tmp + ' = ' + joinToString(union.g27_1, ' | ', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda_2(this)) + '\n';
 };
 function Spacer() {
   this.k25_1 = '  ';
@@ -3692,7 +3703,7 @@ function Companion_3() {
 protoOf(Companion_3).z29 = function (value) {
   return new EmitShared(value == null ? false : value);
 };
-protoOf(Companion_3).j26 = function (value, $super) {
+protoOf(Companion_3).i26 = function (value, $super) {
   value = value === VOID ? null : value;
   return $super === VOID ? this.z29(value) : $super.z29.call(this, value);
 };
@@ -3701,27 +3712,27 @@ function Companion_getInstance_4() {
   return Companion_instance_4;
 }
 function EmitShared(value) {
-  this.r26_1 = value;
+  this.q26_1 = value;
 }
 protoOf(EmitShared).toString = function () {
-  return this.r26_1.toString();
+  return this.q26_1.toString();
 };
 function Emitted(file, result) {
-  this.t26_1 = file;
-  this.u26_1 = result;
+  this.s26_1 = file;
+  this.t26_1 = result;
 }
 protoOf(Emitted).yd = function () {
-  return this.t26_1;
+  return this.s26_1;
 };
 protoOf(Emitted).zd = function () {
-  return this.u26_1;
+  return this.t26_1;
 };
 protoOf(Emitted).toString = function () {
-  return 'Emitted(file=' + this.t26_1 + ', result=' + this.u26_1 + ')';
+  return 'Emitted(file=' + this.s26_1 + ', result=' + this.t26_1 + ')';
 };
 protoOf(Emitted).hashCode = function () {
-  var result = getStringHashCode(this.t26_1);
-  result = imul(result, 31) + getStringHashCode(this.u26_1) | 0;
+  var result = getStringHashCode(this.s26_1);
+  result = imul(result, 31) + getStringHashCode(this.t26_1) | 0;
   return result;
 };
 protoOf(Emitted).equals = function (other) {
@@ -3730,9 +3741,9 @@ protoOf(Emitted).equals = function (other) {
   if (!(other instanceof Emitted))
     return false;
   var tmp0_other_with_cast = other instanceof Emitted ? other : THROW_CCE();
-  if (!(this.t26_1 === tmp0_other_with_cast.t26_1))
+  if (!(this.s26_1 === tmp0_other_with_cast.s26_1))
     return false;
-  if (!(this.u26_1 === tmp0_other_with_cast.u26_1))
+  if (!(this.t26_1 === tmp0_other_with_cast.t26_1))
     return false;
   return true;
 };
@@ -3811,7 +3822,7 @@ function flattenListDict(_this__u8e3s4, $this) {
   return tmp;
 }
 function toParam(_this__u8e3s4, $this) {
-  return new Param(ParamType_PATH_getInstance(), _this__u8e3s4.x25_1, _this__u8e3s4.y25_1);
+  return new Param(ParamType_PATH_getInstance(), _this__u8e3s4.w25_1, _this__u8e3s4.x25_1);
 }
 function root(_this__u8e3s4, $this) {
   var tmp;
@@ -3854,7 +3865,7 @@ protoOf(Companion_4).s25 = function (_this__u8e3s4) {
   }
   return tmp;
 };
-protoOf(Companion_4).z25 = function (_this__u8e3s4) {
+protoOf(Companion_4).y25 = function (_this__u8e3s4) {
   // Inline function 'kotlin.text.replaceFirstChar' call
   var tmp;
   // Inline function 'kotlin.text.isNotEmpty' call
@@ -3874,8 +3885,8 @@ protoOf(Companion_4).z25 = function (_this__u8e3s4) {
   }
   return tmp;
 };
-protoOf(Companion_4).v26 = function (_this__u8e3s4) {
-  var tmp0 = _this__u8e3s4.e27_1;
+protoOf(Companion_4).u26 = function (_this__u8e3s4) {
+  var tmp0 = _this__u8e3s4.d27_1;
   var tmp$ret$0;
   $l$block_0: {
     // Inline function 'kotlin.collections.any' call
@@ -3915,7 +3926,7 @@ protoOf(Companion_4).v26 = function (_this__u8e3s4) {
   return tmp$ret$0;
 };
 protoOf(Companion_4).t29 = function (_this__u8e3s4) {
-  var tmp0 = _this__u8e3s4.e27_1;
+  var tmp0 = _this__u8e3s4.d27_1;
   var tmp$ret$0;
   $l$block_0: {
     // Inline function 'kotlin.collections.any' call
@@ -3982,7 +3993,7 @@ protoOf(Emitter).n23 = function (ast, logger) {
   var this_0 = ast.a2a_1;
   // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
   var it = this_0.uk_1;
-  var tmp = this.n26(it, logger).sk();
+  var tmp = this.m26(it, logger).sk();
   // Inline function 'kotlin.collections.flatMap' call
   var tmp0 = this_0.vk_1;
   // Inline function 'kotlin.collections.flatMapTo' call
@@ -3991,14 +4002,14 @@ protoOf(Emitter).n23 = function (ast, logger) {
   while (_iterator__ex2g4s.h()) {
     var element = _iterator__ex2g4s.i();
     // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
-    var list = this.n26(element, logger);
+    var list = this.m26(element, logger);
     addAll(destination, list);
   }
   // Inline function 'arrow.core.NonEmptyList.map' call
   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.t26_1 + '.' + this.k26().d2a_1, e.u26_1);
+  var tmp_0 = new Emitted(e.s26_1 + '.' + this.j26().d2a_1, e.t26_1);
   // Inline function 'kotlin.collections.map' call
   var this_2 = this_1.vk_1;
   // Inline function 'kotlin.collections.mapTo' call
@@ -4007,17 +4018,17 @@ 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.t26_1 + '.' + this.k26().d2a_1, item.u26_1);
+    var tmp$ret$6 = new Emitted(item.s26_1 + '.' + this.j26().d2a_1, item.t26_1);
     destination_0.e(tmp$ret$6);
   }
   return new NonEmptyList(tmp_0, destination_0);
 };
-protoOf(Emitter).n26 = function (module_0, logger) {
+protoOf(Emitter).m26 = function (module_0, logger) {
   // Inline function 'arrow.core.NonEmptyList.map' call
-  var this_0 = module_0.e27_1;
+  var this_0 = module_0.d27_1;
   // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
   var it = this_0.uk_1;
-  var tmp = this.s26(it, module_0, logger);
+  var tmp = this.r26(it, module_0, logger);
   // Inline function 'kotlin.collections.map' call
   var this_1 = this_0.vk_1;
   // Inline function 'kotlin.collections.mapTo' call
@@ -4026,18 +4037,18 @@ protoOf(Emitter).n26 = function (module_0, logger) {
   while (_iterator__ex2g4s.h()) {
     var item = _iterator__ex2g4s.i();
     // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
-    var tmp$ret$1 = this.s26(item, module_0, logger);
+    var tmp$ret$1 = this.r26(item, module_0, logger);
     destination.e(tmp$ret$1);
   }
   return new NonEmptyList(tmp, destination);
 };
-protoOf(Emitter).s26 = function (definition, 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());
   var tmp;
   if (definition instanceof Type) {
-    tmp = new Emitted(this.v25(definition.y26_1), this.w26(definition, module_0));
+    tmp = new Emitted(this.v25(definition.x26_1), this.v26(definition, module_0));
   } else {
     if (definition instanceof Endpoint) {
       tmp = new Emitted(this.v25(definition.z24_1), this.c28(definition));
@@ -4049,7 +4060,7 @@ protoOf(Emitter).s26 = function (definition, module_0, logger) {
           tmp = new Emitted(this.v25(definition.l27_1), this.j27(definition));
         } else {
           if (definition instanceof Union) {
-            tmp = new Emitted(this.v25(definition.g27_1), this.v27(definition));
+            tmp = new Emitted(this.v25(definition.f27_1), this.v27(definition));
           } else {
             if (definition instanceof Channel) {
               tmp = new Emitted(this.v25(definition.z27_1), this.w27(definition));
@@ -4071,13 +4082,13 @@ protoOf(Emitter).u27 = function (_this__u8e3s4, space, $super) {
   space = space === VOID ? 1 : space;
   return $super === VOID ? this.h28(_this__u8e3s4, space) : $super.h28.call(this, _this__u8e3s4, space);
 };
-protoOf(Emitter).g26 = function (_this__u8e3s4) {
+protoOf(Emitter).f26 = function (_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Literal) {
-    tmp = _this__u8e3s4.h26_1;
+    tmp = _this__u8e3s4.g26_1;
   } else {
     if (_this__u8e3s4 instanceof Param_0) {
-      tmp = '{' + _this__u8e3s4.x25_1.b1() + '}';
+      tmp = '{' + _this__u8e3s4.w25_1.b1() + '}';
     } else {
       noWhenBranchMatchedException();
     }
@@ -4227,7 +4238,7 @@ protoOf(Emitter).b28 = function (_this__u8e3s4) {
     while (_iterator__ex2g4s_0.h()) {
       var item = _iterator__ex2g4s_0.i();
       // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.importReferences.<anonymous>' call
-      var tmp$ret$2 = item.y25_1;
+      var tmp$ret$2 = item.x25_1;
       destination_0.e(tmp$ret$2);
     }
     var tmp_0 = destination_0;
@@ -4317,14 +4328,14 @@ protoOf(Emitter).b28 = function (_this__u8e3s4) {
   } else {
     if (_this__u8e3s4 instanceof Type) {
       // Inline function 'kotlin.collections.filter' call
-      var tmp0_1 = _this__u8e3s4.z26_1.i27_1;
+      var tmp0_1 = _this__u8e3s4.y26_1.h27_1;
       // Inline function 'kotlin.collections.filterTo' call
       var destination_8 = ArrayList_init_$Create$_0();
       var _iterator__ex2g4s_8 = tmp0_1.g();
       while (_iterator__ex2g4s_8.h()) {
         var element_2 = _iterator__ex2g4s_8.i();
         // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.importReferences.<anonymous>' call
-        if (!(_this__u8e3s4.y26_1.b1() === root(element_2.u25_1, this).b1())) {
+        if (!(_this__u8e3s4.x26_1.b1() === root(element_2.u25_1, this).b1())) {
           destination_8.e(element_2);
         }
       }
@@ -4431,7 +4442,7 @@ function FileExtension_Avro_getInstance() {
 }
 function Companion_5() {
 }
-protoOf(Companion_5).i26 = function (value) {
+protoOf(Companion_5).h26 = function (value) {
   // Inline function 'kotlin.let' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.common.Companion.invoke.<anonymous>' call
   return new PackageName(value == null ? 'community.flock.wirespec' : value, !(value == null));
@@ -4447,19 +4458,19 @@ function PackageName(value, createDirectory) {
 protoOf(PackageName).toString = function () {
   return this.u24_1;
 };
-protoOf(PackageName).o26 = function () {
+protoOf(PackageName).n26 = function () {
   return replace(this.u24_1, '.', '/') + '/';
 };
 function plus_0(_this__u8e3s4, definition) {
   return plus_1(_this__u8e3s4, namespace(definition));
 }
 function plus_1(_this__u8e3s4, subPackage) {
-  return Companion_instance_6.i26(_this__u8e3s4.u24_1 + '.' + subPackage);
+  return Companion_instance_6.h26(_this__u8e3s4.u24_1 + '.' + subPackage);
 }
 function JavaShared() {
   JavaShared_instance = this;
-  this.p26_1 = 'community.flock.wirespec.java';
-  this.q26_1 = trimMargin('\n        |package ' + this.p26_1 + ';\n        |\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |import java.util.List;\n        |import java.util.Map;\n        |\n        |public interface Wirespec {\n        |' + Spacer_instance.toString() + 'interface Enum { String getLabel(); }\n        |' + Spacer_instance.toString() + 'interface Endpoint {}\n        |' + Spacer_instance.toString() + 'interface Refined { String getValue(); }\n        |' + Spacer_instance.toString() + 'interface Path {}\n        |' + Spacer_instance.toString() + 'interface Queries {}\n        |' + Spacer_instance.toString() + 'interface Headers {}\n        |' + Spacer_instance.toString() + 'interface Handler {}\n        |' + Spacer_instance.toString() + 'interface ServerEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.l25(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.l25(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.l25(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.l25(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.l25(2) + 'String getPathTemplate();\n        |' + Spacer_instance.l25(2) + 'String getMethod();\n        |' + Spacer_instance.l25(2) + 'ClientEdge<Req, Res> getClient(Serialization<String> serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Server<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.l25(2) + 'String getPathTemplate();\n        |' + Spacer_instance.l25(2) + 'String getMethod();\n        |' + Spacer_instance.l25(2) + 'ServerEdge<Req, Res> getServer(Serialization<String> serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'enum Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + Spacer_instance.toString() + 'interface Request<T> { Path getPath(); Method getMethod(); Queries getQueries(); Headers getHeaders(); T getBody(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Response<T> { int getStatus(); Headers getHeaders(); T getBody(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface ParamSerialization extends ParamSerializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface Serialization<RAW> extends Serializer<RAW>, Deserializer<RAW>, ParamSerialization {}\n        |' + Spacer_instance.toString() + 'interface ParamSerializer { <T> List<String> serializeParam(T value, Type type); }\n        |' + Spacer_instance.toString() + 'interface Serializer<RAW> extends ParamSerializer { <T> RAW serialize(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamDeserializer { <T> T deserializeParam(List<String> values, Type type); }\n        |' + Spacer_instance.toString() + 'interface Deserializer<RAW> extends ParamDeserializer { <T> T deserialize(RAW raw, Type type); }\n        |' + Spacer_instance.toString() + 'record RawRequest(String method, List<String> path, Map<String, List<String>> queries, Map<String, List<String>> headers, String body) {} \n        |' + Spacer_instance.toString() + 'record RawResponse(int statusCode, Map<String, List<String>> headers, String body) {}\n        |' + Spacer_instance.toString() + 'static Type getType(final Class<?> type, final boolean isIterable) {\n        |' + Spacer_instance.l25(2) + 'if(isIterable) {\n        |' + Spacer_instance.l25(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.l25(4) + 'public Type getRawType() { return java.util.List.class; }\n        |' + Spacer_instance.l25(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{type}; }\n        |' + Spacer_instance.l25(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.l25(3) + '};\n        |' + Spacer_instance.l25(2) + '}\n        |' + Spacer_instance.l25(2) + 'else { return type; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+  this.o26_1 = 'community.flock.wirespec.java';
+  this.p26_1 = trimMargin('\n        |package ' + this.o26_1 + ';\n        |\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |import java.util.List;\n        |import java.util.Map;\n        |\n        |public interface Wirespec {\n        |' + Spacer_instance.toString() + 'interface Enum { String getLabel(); }\n        |' + Spacer_instance.toString() + 'interface Endpoint {}\n        |' + Spacer_instance.toString() + 'interface Refined { String getValue(); }\n        |' + Spacer_instance.toString() + 'interface Path {}\n        |' + Spacer_instance.toString() + 'interface Queries {}\n        |' + Spacer_instance.toString() + 'interface Headers {}\n        |' + Spacer_instance.toString() + 'interface Handler {}\n        |' + Spacer_instance.toString() + 'interface ServerEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.l25(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.l25(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.l25(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.l25(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.l25(2) + 'String getPathTemplate();\n        |' + Spacer_instance.l25(2) + 'String getMethod();\n        |' + Spacer_instance.l25(2) + 'ClientEdge<Req, Res> getClient(Serialization<String> serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Server<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.l25(2) + 'String getPathTemplate();\n        |' + Spacer_instance.l25(2) + 'String getMethod();\n        |' + Spacer_instance.l25(2) + 'ServerEdge<Req, Res> getServer(Serialization<String> serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'enum Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + Spacer_instance.toString() + 'interface Request<T> { Path getPath(); Method getMethod(); Queries getQueries(); Headers getHeaders(); T getBody(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Response<T> { int getStatus(); Headers getHeaders(); T getBody(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface ParamSerialization extends ParamSerializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface Serialization<RAW> extends Serializer<RAW>, Deserializer<RAW>, ParamSerialization {}\n        |' + Spacer_instance.toString() + 'interface ParamSerializer { <T> List<String> serializeParam(T value, Type type); }\n        |' + Spacer_instance.toString() + 'interface Serializer<RAW> extends ParamSerializer { <T> RAW serialize(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamDeserializer { <T> T deserializeParam(List<String> values, Type type); }\n        |' + Spacer_instance.toString() + 'interface Deserializer<RAW> extends ParamDeserializer { <T> T deserialize(RAW raw, Type type); }\n        |' + Spacer_instance.toString() + 'record RawRequest(String method, List<String> path, Map<String, List<String>> queries, Map<String, List<String>> headers, String body) {} \n        |' + Spacer_instance.toString() + 'record RawResponse(int statusCode, Map<String, List<String>> headers, String body) {}\n        |' + Spacer_instance.toString() + 'static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n        |' + Spacer_instance.l25(2) + 'if(rawType != null) {\n        |' + Spacer_instance.l25(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.l25(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.l25(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.l25(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.l25(3) + '};\n        |' + Spacer_instance.l25(2) + '}\n        |' + Spacer_instance.l25(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 }
 protoOf(JavaShared).toString = function () {
   return 'JavaShared';
@@ -4821,7 +4832,7 @@ function parseEndpointDefinition(_this__u8e3s4, $this, comment, name) {
       if (_this__u8e3s4.o2a_1.g2a_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)).i27_1;
+        tmp_9 = raise.ll(TypeParser_instance.x2a(_this__u8e3s4)).h27_1;
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         var actual_0 = _this__u8e3s4.o2a_1;
@@ -5184,7 +5195,7 @@ function parseHeaders(_this__u8e3s4, $this) {
       if (_this__u8e3s4.o2a_1.g2a_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)).i27_1;
+        tmp_1 = raise.ll(TypeParser_instance.x2a(_this__u8e3s4)).h27_1;
       } else {
         // Inline function 'community.flock.wirespec.compiler.core.exceptions.Companion.invoke' call
         var actual = _this__u8e3s4.o2a_1;
@@ -5474,23 +5485,23 @@ function EnumParser_getInstance() {
   return EnumParser_instance;
 }
 function Module(uri, statements) {
-  this.d27_1 = uri;
-  this.e27_1 = statements;
+  this.c27_1 = uri;
+  this.d27_1 = statements;
 }
 protoOf(Module).a2b = function (uri, statements) {
   return new Module(uri, statements);
 };
 protoOf(Module).j29 = function (uri, statements, $super) {
-  uri = uri === VOID ? this.d27_1 : uri;
-  statements = statements === VOID ? this.e27_1 : statements;
+  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);
 };
 protoOf(Module).toString = function () {
-  return 'Module(uri=' + this.d27_1 + ', statements=' + this.e27_1.toString() + ')';
+  return 'Module(uri=' + this.c27_1 + ', statements=' + this.d27_1.toString() + ')';
 };
 protoOf(Module).hashCode = function () {
-  var result = getStringHashCode(this.d27_1);
-  result = imul(result, 31) + this.e27_1.hashCode() | 0;
+  var result = getStringHashCode(this.c27_1);
+  result = imul(result, 31) + this.d27_1.hashCode() | 0;
   return result;
 };
 protoOf(Module).equals = function (other) {
@@ -5499,9 +5510,9 @@ protoOf(Module).equals = function (other) {
   if (!(other instanceof Module))
     return false;
   var tmp0_other_with_cast = other instanceof Module ? other : THROW_CCE();
-  if (!(this.d27_1 === tmp0_other_with_cast.d27_1))
+  if (!(this.c27_1 === tmp0_other_with_cast.c27_1))
     return false;
-  if (!this.e27_1.equals(tmp0_other_with_cast.e27_1))
+  if (!this.d27_1.equals(tmp0_other_with_cast.d27_1))
     return false;
   return true;
 };
@@ -5890,13 +5901,13 @@ protoOf(Primitive).equals = function (other) {
   return true;
 };
 function Shape(value) {
-  this.i27_1 = value;
+  this.h27_1 = value;
 }
 protoOf(Shape).toString = function () {
-  return 'Shape(value=' + toString(this.i27_1) + ')';
+  return 'Shape(value=' + toString(this.h27_1) + ')';
 };
 protoOf(Shape).hashCode = function () {
-  return hashCode(this.i27_1);
+  return hashCode(this.h27_1);
 };
 protoOf(Shape).equals = function (other) {
   if (this === other)
@@ -5904,27 +5915,27 @@ protoOf(Shape).equals = function (other) {
   if (!(other instanceof Shape))
     return false;
   var tmp0_other_with_cast = other instanceof Shape ? other : THROW_CCE();
-  if (!equals(this.i27_1, tmp0_other_with_cast.i27_1))
+  if (!equals(this.h27_1, tmp0_other_with_cast.h27_1))
     return false;
   return true;
 };
 function Type(comment, identifier, shape, extends_0) {
-  this.x26_1 = comment;
-  this.y26_1 = identifier;
-  this.z26_1 = shape;
-  this.a27_1 = extends_0;
+  this.w26_1 = comment;
+  this.x26_1 = identifier;
+  this.y26_1 = shape;
+  this.z26_1 = extends_0;
 }
 protoOf(Type).w24 = function () {
-  return this.y26_1;
+  return this.x26_1;
 };
 protoOf(Type).k2b = function (comment, identifier, shape, extends_0) {
   return new Type(comment, identifier, shape, extends_0);
 };
 protoOf(Type).l2b = function (comment, identifier, shape, extends_0, $super) {
-  comment = comment === VOID ? this.x26_1 : comment;
-  identifier = identifier === VOID ? this.y26_1 : identifier;
-  shape = shape === VOID ? this.z26_1 : shape;
-  extends_0 = extends_0 === VOID ? this.a27_1 : extends_0;
+  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);
@@ -5936,21 +5947,21 @@ protoOf(Type).l2b = function (comment, identifier, shape, extends_0, $super) {
   return tmp;
 };
 protoOf(Type).toString = function () {
-  var tmp = this.x26_1;
-  return 'Type(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', identifier=' + this.y26_1.toString() + ', shape=' + this.z26_1.toString() + ', extends=' + toString(this.a27_1) + ')';
+  var tmp = this.w26_1;
+  return 'Type(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', identifier=' + this.x26_1.toString() + ', shape=' + this.y26_1.toString() + ', extends=' + toString(this.z26_1) + ')';
 };
 protoOf(Type).hashCode = function () {
   var tmp;
-  var tmp_0 = this.x26_1;
+  var tmp_0 = this.w26_1;
   if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = Comment__hashCode_impl_tr9dgt(this.x26_1);
+    tmp = Comment__hashCode_impl_tr9dgt(this.w26_1);
   }
   var result = tmp;
+  result = imul(result, 31) + this.x26_1.hashCode() | 0;
   result = imul(result, 31) + this.y26_1.hashCode() | 0;
-  result = imul(result, 31) + this.z26_1.hashCode() | 0;
-  result = imul(result, 31) + hashCode(this.a27_1) | 0;
+  result = imul(result, 31) + hashCode(this.z26_1) | 0;
   return result;
 };
 protoOf(Type).equals = function (other) {
@@ -5959,16 +5970,16 @@ protoOf(Type).equals = function (other) {
   if (!(other instanceof Type))
     return false;
   var tmp0_other_with_cast = other instanceof Type ? other : THROW_CCE();
-  var tmp = this.x26_1;
+  var tmp = this.w26_1;
   var tmp_0 = tmp == null ? null : new Comment(tmp);
-  var tmp_1 = tmp0_other_with_cast.x26_1;
+  var tmp_1 = tmp0_other_with_cast.w26_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
     return false;
-  if (!this.y26_1.equals(tmp0_other_with_cast.y26_1))
+  if (!this.x26_1.equals(tmp0_other_with_cast.x26_1))
     return false;
-  if (!this.z26_1.equals(tmp0_other_with_cast.z26_1))
+  if (!this.y26_1.equals(tmp0_other_with_cast.y26_1))
     return false;
-  if (!equals(this.a27_1, tmp0_other_with_cast.a27_1))
+  if (!equals(this.z26_1, tmp0_other_with_cast.z26_1))
     return false;
   return true;
 };
@@ -6048,13 +6059,13 @@ function Method_initEntries() {
 }
 var $ENTRIES_0;
 function Literal(value) {
-  this.h26_1 = value;
+  this.g26_1 = value;
 }
 protoOf(Literal).toString = function () {
-  return 'Literal(value=' + this.h26_1 + ')';
+  return 'Literal(value=' + this.g26_1 + ')';
 };
 protoOf(Literal).hashCode = function () {
-  return getStringHashCode(this.h26_1);
+  return getStringHashCode(this.g26_1);
 };
 protoOf(Literal).equals = function (other) {
   if (this === other)
@@ -6062,20 +6073,20 @@ protoOf(Literal).equals = function (other) {
   if (!(other instanceof Literal))
     return false;
   var tmp0_other_with_cast = other instanceof Literal ? other : THROW_CCE();
-  if (!(this.h26_1 === tmp0_other_with_cast.h26_1))
+  if (!(this.g26_1 === tmp0_other_with_cast.g26_1))
     return false;
   return true;
 };
 function Param_0(identifier, reference) {
-  this.x25_1 = identifier;
-  this.y25_1 = reference;
+  this.w25_1 = identifier;
+  this.x25_1 = reference;
 }
 protoOf(Param_0).toString = function () {
-  return 'Param(identifier=' + this.x25_1.toString() + ', reference=' + toString(this.y25_1) + ')';
+  return 'Param(identifier=' + this.w25_1.toString() + ', reference=' + toString(this.x25_1) + ')';
 };
 protoOf(Param_0).hashCode = function () {
-  var result = this.x25_1.hashCode();
-  result = imul(result, 31) + hashCode(this.y25_1) | 0;
+  var result = this.w25_1.hashCode();
+  result = imul(result, 31) + hashCode(this.x25_1) | 0;
   return result;
 };
 protoOf(Param_0).equals = function (other) {
@@ -6084,9 +6095,9 @@ protoOf(Param_0).equals = function (other) {
   if (!(other instanceof Param_0))
     return false;
   var tmp0_other_with_cast = other instanceof Param_0 ? other : THROW_CCE();
-  if (!this.x25_1.equals(tmp0_other_with_cast.x25_1))
+  if (!this.w25_1.equals(tmp0_other_with_cast.w25_1))
     return false;
-  if (!equals(this.y25_1, tmp0_other_with_cast.y25_1))
+  if (!equals(this.x25_1, tmp0_other_with_cast.x25_1))
     return false;
   return true;
 };
@@ -6363,28 +6374,28 @@ protoOf(Refined).equals = function (other) {
   return true;
 };
 function Union(comment, identifier, entries) {
-  this.f27_1 = comment;
-  this.g27_1 = identifier;
-  this.h27_1 = entries;
+  this.e27_1 = comment;
+  this.f27_1 = identifier;
+  this.g27_1 = entries;
 }
 protoOf(Union).w24 = function () {
-  return this.g27_1;
+  return this.f27_1;
 };
 protoOf(Union).toString = function () {
-  var tmp = this.f27_1;
-  return 'Union(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', identifier=' + this.g27_1.toString() + ', entries=' + toString(this.h27_1) + ')';
+  var tmp = this.e27_1;
+  return 'Union(comment=' + toString_1(tmp == null ? null : new Comment(tmp)) + ', identifier=' + this.f27_1.toString() + ', entries=' + toString(this.g27_1) + ')';
 };
 protoOf(Union).hashCode = function () {
   var tmp;
-  var tmp_0 = this.f27_1;
+  var tmp_0 = this.e27_1;
   if ((tmp_0 == null ? null : new Comment(tmp_0)) == null) {
     tmp = 0;
   } else {
-    tmp = Comment__hashCode_impl_tr9dgt(this.f27_1);
+    tmp = Comment__hashCode_impl_tr9dgt(this.e27_1);
   }
   var result = tmp;
-  result = imul(result, 31) + this.g27_1.hashCode() | 0;
-  result = imul(result, 31) + hashCode(this.h27_1) | 0;
+  result = imul(result, 31) + this.f27_1.hashCode() | 0;
+  result = imul(result, 31) + hashCode(this.g27_1) | 0;
   return result;
 };
 protoOf(Union).equals = function (other) {
@@ -6393,14 +6404,14 @@ protoOf(Union).equals = function (other) {
   if (!(other instanceof Union))
     return false;
   var tmp0_other_with_cast = other instanceof Union ? other : THROW_CCE();
-  var tmp = this.f27_1;
+  var tmp = this.e27_1;
   var tmp_0 = tmp == null ? null : new Comment(tmp);
-  var tmp_1 = tmp0_other_with_cast.f27_1;
+  var tmp_1 = tmp0_other_with_cast.e27_1;
   if (!equals(tmp_0, tmp_1 == null ? null : new Comment(tmp_1)))
     return false;
-  if (!this.g27_1.equals(tmp0_other_with_cast.g27_1))
+  if (!this.f27_1.equals(tmp0_other_with_cast.f27_1))
     return false;
-  if (!equals(this.h27_1, tmp0_other_with_cast.h27_1))
+  if (!equals(this.g27_1, tmp0_other_with_cast.g27_1))
     return false;
   return true;
 };
@@ -6762,7 +6773,7 @@ function fillExtendsClause(_this__u8e3s4, $this) {
                 var element_0 = _iterator__ex2g4s_0.i();
                 // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.fillExtendsClause.<anonymous>.<anonymous>.<anonymous>' call
                 // Inline function 'kotlin.collections.map' call
-                var this_0 = element_0.h27_1;
+                var this_0 = element_0.g27_1;
                 // Inline function 'kotlin.collections.mapTo' call
                 var destination_1 = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
                 var _iterator__ex2g4s_1 = this_0.g();
@@ -6781,7 +6792,7 @@ function fillExtendsClause(_this__u8e3s4, $this) {
                   var tmp$ret$3 = tmp_1;
                   destination_1.e(tmp$ret$3);
                 }
-                if (destination_1.o1(definition.y26_1.b1())) {
+                if (destination_1.o1(definition.x26_1.b1())) {
                   destination_0.e(element_0);
                 }
               }
@@ -6792,7 +6803,7 @@ function fillExtendsClause(_this__u8e3s4, $this) {
               while (_iterator__ex2g4s_2.h()) {
                 var item_0 = _iterator__ex2g4s_2.i();
                 // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.fillExtendsClause.<anonymous>.<anonymous>.<anonymous>' call
-                var tmp$ret$9 = new Custom(item_0.g27_1.b1(), false);
+                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);
@@ -6848,7 +6859,7 @@ function fillExtendsClause(_this__u8e3s4, $this) {
                   var element_2 = _iterator__ex2g4s_5.i();
                   // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.fillExtendsClause.<anonymous>.<anonymous>.<anonymous>' call
                   // Inline function 'kotlin.collections.map' call
-                  var this_3 = element_2.h27_1;
+                  var this_3 = element_2.g27_1;
                   // Inline function 'kotlin.collections.mapTo' call
                   var destination_6 = ArrayList_init_$Create$(collectionSizeOrDefault(this_3, 10));
                   var _iterator__ex2g4s_6 = this_3.g();
@@ -6867,7 +6878,7 @@ function fillExtendsClause(_this__u8e3s4, $this) {
                     var tmp$ret$16 = tmp_4;
                     destination_6.e(tmp$ret$16);
                   }
-                  if (destination_6.o1(item_1.y26_1.b1())) {
+                  if (destination_6.o1(item_1.x26_1.b1())) {
                     destination_5.e(element_2);
                   }
                 }
@@ -6878,7 +6889,7 @@ function fillExtendsClause(_this__u8e3s4, $this) {
                 while (_iterator__ex2g4s_7.h()) {
                   var item_3 = _iterator__ex2g4s_7.i();
                   // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.fillExtendsClause.<anonymous>.<anonymous>.<anonymous>' call
-                  var tmp$ret$22 = new Custom(item_3.g27_1.b1(), false);
+                  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);
@@ -8979,7 +8990,7 @@ function validateEndpoints($this, ast) {
     var element = _iterator__ex2g4s.i();
     // Inline function 'community.flock.wirespec.compiler.core.validate.Validator.validateEndpoints.<anonymous>' call
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_0 = element.e27_1;
+    var tmp0_0 = element.d27_1;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination_0 = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_0 = tmp0_0.g();
@@ -9080,7 +9091,7 @@ function validateTypes($this, ast) {
     var element = _iterator__ex2g4s.i();
     // Inline function 'community.flock.wirespec.compiler.core.validate.Validator.validateTypes.<anonymous>' call
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_0 = element.e27_1;
+    var tmp0_0 = element.d27_1;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination_0 = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_0 = tmp0_0.g();
@@ -9097,7 +9108,7 @@ function validateTypes($this, ast) {
     while (_iterator__ex2g4s_1.h()) {
       var element_1 = _iterator__ex2g4s_1.i();
       // Inline function 'community.flock.wirespec.compiler.core.validate.Validator.validateTypes.<anonymous>.<anonymous>' call
-      var key = element_1.y26_1.b1();
+      var key = element_1.x26_1.b1();
       // Inline function 'kotlin.collections.getOrPut' call
       var value = destination_1.g2(key);
       var tmp;
@@ -9180,7 +9191,7 @@ function validateChannels($this, ast) {
     var element = _iterator__ex2g4s.i();
     // Inline function 'community.flock.wirespec.compiler.core.validate.Validator.validateChannels.<anonymous>' call
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0_0 = element.e27_1;
+    var tmp0_0 = element.d27_1;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination_0 = ArrayList_init_$Create$_0();
     var _iterator__ex2g4s_0 = tmp0_0.g();