@flock/wirespec 0.18.0-RC.1 → 0.18.1-RC.2

package/wirespec-src-compiler-emitters-java.mjs

@@ -104,13 +104,13 @@ import {
   NonEmptyList__plus_impl_xqmb92tle8a7jcf2wm as NonEmptyList__plus_impl_xqmb9,
 } from './arrow-arrow-core.mjs';
 import {
+  Companion_getInstance3gvtuyxc9uhxj as Companion_getInstance,
   Package2tniq694j1763 as Package,
   File3dimy4iqmuock as File,
   transformChildrend9p91tpcqdkx as transformChildren,
-  Companion_getInstance3gvtuyxc9uhxj as Companion_getInstance,
   withElements2toq84v08e72 as withElements,
   Namespace345pal554qu3j as Namespace,
-  import2unu5h4o3hw1i as import_0,
+  import5uhkz67bd8tt as import_0,
   TransformScopeyrd3lf4zrk76 as TransformScope,
   TransformerBuildera6a1gvlhjj9b as TransformerBuilder,
   transform3eti8i2bqvifx as transform,
@@ -131,14 +131,15 @@ import {
   FunctionCall30872kpnbr7op as FunctionCall,
   transformChildren2mszeagj5nq4c as transformChildren_0,
   convert13xvfhgrf57n5 as convert,
-  AccessorStyle_GETTER_METHODS_getInstance1bhhe32gb7m2i as AccessorStyle_GETTER_METHODS_getInstance,
-  buildClientServerInterfaces2363tdgi9w3me as buildClientServerInterfaces,
+  convertClientServer3s89ijty7q130 as convertClientServer,
+  toGetterAccessors2z6mndbqwlczg as toGetterAccessors,
   rawttvqxl50flj9 as raw,
   generateJavaxqkwhkjcf0ke as generateJava,
   RawElement2yts1x2rbem1g as RawElement,
   VariableReference2vlynnhaw1i64 as VariableReference,
+  withLabelField33ehya4zusm70 as withLabelField,
   function12vu2kapzno4w as function_0,
-  withLabelField22w2j91tp01o3 as withLabelField,
+  plusd54zq6f7l8fy as plus_3,
   Enumlszg09mwd24f as Enum,
   convert2loxpwk8n2r8c as convert_0,
   Function21cuq8qizkin7 as Function,
@@ -150,13 +151,14 @@ import {
   Wildcard_instance2ga1ytfwj78ra as Wildcard_instance,
   TypeDescriptor1hvcpxrtxcqsx as TypeDescriptor,
   JavaGenerator_instance753fwcs3a4n9 as JavaGenerator_instance,
-  SanitizationConfig1cdlo8dm6nafn as SanitizationConfig,
+  SanitizationConfig11mmn3p2c03c1 as SanitizationConfig,
   emit3bzdcd0f6nwtj as emit_0,
   withSharedSource1qgrajaccojj3 as withSharedSource,
   emitn3eihixilqyh as emit_1,
-  wrapWithPackagedyp8fwgcgbx0 as wrapWithPackage,
+  prependImports32gcj3yb8voha as prependImports,
+  placeInPackage1ffljbk9me4ug as placeInPackage,
   convertWithValidation3ar3nbcqsbkpn as convertWithValidation,
-  sanitizeNames3w41y78hqenku as sanitizeNames,
+  sanitizeNames2wqmyf8vafp9x as sanitizeNames,
   convert11ert2po54h1y as convert_1,
   convert37aabdzvtv9vg as convert_2,
   convert17zcptkz4mhr4 as convert_3,
@@ -171,10 +173,10 @@ import {
 //endregion
 //region block: pre-declaration
 function emit_3(type, module_0) {
-  var tmp = this.yq(type.xo_1);
-  var tmp_0 = this.xp(type.yo_1);
+  var tmp = this.wq(type.vo_1);
+  var tmp_0 = this.vp(type.wo_1);
   // Inline function 'kotlin.run' call
-  var $this$run = type.zo_1;
+  var $this$run = type.xo_1;
   var tmp_1;
   if ($this$run.r()) {
     tmp_1 = '';
@@ -185,23 +187,23 @@ function emit_3(type, module_0) {
   return trimMargin('\n        |public record ' + tmp + ' (\n        |' + tmp_0 + '\n        |)' + tmp$ret$1 + ' {\n        |};\n        |\n    ');
 }
 function emit_4(_this__u8e3s4) {
-  return dropLast_0(joinToString(_this__u8e3s4.uo_1, '\n', VOID, VOID, VOID, VOID, JavaTypeDefinitionEmitter$emit$lambda_0(this)), 1);
+  return dropLast_0(joinToString(_this__u8e3s4.so_1, '\n', VOID, VOID, VOID, VOID, JavaTypeDefinitionEmitter$emit$lambda_0(this)), 1);
 }
 function emit_5(_this__u8e3s4) {
-  return this.zp(_this__u8e3s4.dp_1) + ' ' + this.yq(_this__u8e3s4.cp_1);
+  return this.xp(_this__u8e3s4.bp_1) + ' ' + this.wq(_this__u8e3s4.ap_1);
 }
 function emit_6(_this__u8e3s4) {
   // Inline function 'kotlin.let' call
   var it = emitType(this, _this__u8e3s4);
-  return _this__u8e3s4.fu() ? 'java.util.Optional<' + it + '>' : it;
+  return _this__u8e3s4.du() ? 'java.util.Optional<' + it + '>' : it;
 }
 function emitRoot(_this__u8e3s4, void_0) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = this.m1v(_this__u8e3s4.eo_1);
+    tmp = this.l1v(_this__u8e3s4.co_1);
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = this.m1v(_this__u8e3s4.bo_1);
+      tmp = this.l1v(_this__u8e3s4.zn_1);
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = void_0;
@@ -230,15 +232,15 @@ function emitRoot(_this__u8e3s4, void_0) {
 }
 function emitRoot$default(_this__u8e3s4, void_0, $super) {
   void_0 = void_0 === VOID ? 'void' : void_0;
-  return $super === VOID ? this.n1v(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
+  return $super === VOID ? this.m1v(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
 }
 function emit_7(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof RegExp_0) {
-    tmp = 'return java.util.regex.Pattern.compile("' + replace(this.bq(_this__u8e3s4.at_1), '\\', '\\\\') + '").matcher(value).find();';
+    tmp = 'return java.util.regex.Pattern.compile("' + replace(this.zp(_this__u8e3s4.ys_1), '\\', '\\\\') + '").matcher(value).find();';
   } else {
     if (_this__u8e3s4 instanceof Bound) {
-      var tmp1_safe_receiver = _this__u8e3s4.rt_1;
+      var tmp1_safe_receiver = _this__u8e3s4.pt_1;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
         tmp_0 = null;
@@ -247,7 +249,7 @@ function emit_7(_this__u8e3s4) {
         tmp_0 = tmp1_safe_receiver + ' < value';
       }
       var minCheck = tmp_0;
-      var tmp2_safe_receiver = _this__u8e3s4.st_1;
+      var tmp2_safe_receiver = _this__u8e3s4.qt_1;
       var tmp_1;
       if (tmp2_safe_receiver == null) {
         tmp_1 = null;
@@ -273,16 +275,16 @@ function emit_7(_this__u8e3s4) {
 }
 initMetadataForInterface(JavaTypeDefinitionEmitter, 'JavaTypeDefinitionEmitter', VOID, VOID, [TypeDefinitionEmitter]);
 function emit_8(channel) {
-  return trimMargin('\n        |' + emitImports(this, channel) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.yq(channel.oo_1) + ' {\n        |   void invoke(' + emitFullyQualified(this, channel, channel.po_1) + this.m1v(channel.po_1) + ' message);\n        |}\n        |\n    ');
+  return trimMargin('\n        |' + emitImports(this, channel) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.wq(channel.mo_1) + ' {\n        |   void invoke(' + emitFullyQualified(this, channel, channel.no_1) + this.l1v(channel.no_1) + ' message);\n        |}\n        |\n    ');
 }
 initMetadataForInterface(JavaChannelDefinitionEmitter, 'JavaChannelDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
 function emit_9(identifier) {
   var tmp;
   if (identifier instanceof DefinitionIdentifier) {
-    tmp = this.x1v(identifier.n1());
+    tmp = this.w1v(identifier.l1());
   } else {
     if (identifier instanceof FieldIdentifier) {
-      tmp = this.b1w(this.x1v(identifier.n1()));
+      tmp = this.a1w(this.w1v(identifier.l1()));
     } else {
       noWhenBranchMatchedException();
     }
@@ -300,11 +302,11 @@ function sanitizeSymbol(_this__u8e3s4) {
     var item = _iterator__ex2g4s.v();
     var _unary__edvuaz = index;
     index = _unary__edvuaz + 1 | 0;
-    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.qq(item) : item;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.oq(item) : item;
     destination.x(tmp$ret$0);
   }
   var tmp = asSequence(joinToString(destination, ''));
-  return this.a1w(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
+  return this.z1v(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
 }
 function sanitizeFirstIsDigit(_this__u8e3s4) {
   var tmp;
@@ -324,107 +326,44 @@ function sanitizeFirstIsDigit(_this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords(_this__u8e3s4) {
-  return Companion_getInstance_0().d1w_1.h1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance_0().c1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 }
 initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
 function emit_10(enum_0, module_0) {
-  var tmp = this.yq(enum_0.ir_1);
-  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.jr_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.yq(enum_0.ir_1) + '(String label) {\n        |' + Spacer_instance.sr(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.sr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String label() {\n        |' + Spacer_instance.sr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+  var tmp = this.wq(enum_0.gr_1);
+  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.hr_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.wq(enum_0.gr_1) + '(String label) {\n        |' + Spacer_instance.qr(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.qr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String label() {\n        |' + Spacer_instance.qr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 }
 initMetadataForInterface(JavaEnumDefinitionEmitter, 'JavaEnumDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-function emit_11(endpoint) {
-  var tmp = emitImports_0(this, endpoint);
-  var tmp_0 = this.yq(endpoint.gp_1);
-  var tmp_1 = get_pathParams(endpoint);
-  var tmp_2 = emitObject(this, tmp_1, 'Path', 'Wirespec.Path', JavaEndpointDefinitionEmitter$emit$lambda(this));
-  var tmp_3 = emitObject(this, endpoint.jp_1, 'Queries', 'Wirespec.Queries', JavaEndpointDefinitionEmitter$emit$lambda_0(this));
-  var tmp_4 = emitObject(this, endpoint.kp_1, 'RequestHeaders', 'Wirespec.Request.Headers', JavaEndpointDefinitionEmitter$emit$lambda_1(this));
-  var tmp_5 = this.y1v(first_0(endpoint.lp_1), endpoint);
-  var tmp_6 = Spacer_instance.toString();
-  var tmp_7 = emitStatusInterfaces(this, endpoint);
-  var tmp_8 = emitResponseInterfaces(this, endpoint);
-  var tmp_9 = distinctByStatus(endpoint.mp_1);
-  var tmp_10 = joinToString(tmp_9, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_2(this));
-  var tmp_11 = Spacer_instance.toString();
-  var tmp_12 = emitRequestFunctions(this, first_0(endpoint.lp_1), endpoint);
-  var tmp_13 = Spacer_instance.sr(2);
-  var tmp_14 = distinctByStatus(endpoint.mp_1);
-  var tmp_15 = joinToString(tmp_14, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_3(this));
-  var tmp_16 = Spacer_instance.sr(3);
-  var tmp_17 = Spacer_instance.sr(2);
-  var tmp_18 = Spacer_instance.sr(2);
-  var tmp_19 = emitFromResponse(this, endpoint);
-  var tmp_20 = Spacer_instance.sr(2);
-  var tmp_21 = Spacer_instance.sr(2);
-  var tmp_22 = this.c1w(endpoint);
-  var tmp_23 = Spacer_instance.sr(2);
-  var tmp_24 = Spacer_instance.sr(3);
-  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 serialization, Response<?> response) {\n        |' + tmp_15 + '\n        |' + tmp_16 + 'else { throw new IllegalStateException("Cannot match response with status: " + response.status());}\n        |' + tmp_17 + '}\n        |\n        |' + tmp_18 + 'static Response<?> fromResponse(Wirespec.Deserializer serialization, Wirespec.RawResponse response) {\n        |' + tmp_19 + '\n        |' + tmp_20 + '}\n        |\n        |' + tmp_21 + tmp_22 + '\n        |' + tmp_23 + 'class Handlers implements Wirespec.Server<Request, Response<?>>, Wirespec.Client<Request, Response<?>> {\n        |' + tmp_24 + '@Override public String getPathTemplate() { return "/' + joinToString(endpoint.ip_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_4) + '"; }\n        |' + Spacer_instance.sr(3) + '@Override public String getMethod() { return "' + endpoint.hp_1.toString() + '"; }\n        |' + Spacer_instance.sr(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.sr(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.sr(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.sr(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.sr(4) + '};\n        |' + Spacer_instance.sr(3) + '}\n        |' + Spacer_instance.sr(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.sr(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.sr(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.sr(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.sr(4) + '};\n        |' + Spacer_instance.sr(3) + '}\n        |' + Spacer_instance.sr(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
-}
-function emitHandleFunction(endpoint) {
-  return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.rq(this.yq(endpoint.gp_1)) + '(Request request);';
+function emit_11(union) {
+  var tmp = this.wq(union.qo_1);
+  return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.ro_1, VOID, VOID, VOID, VOID, VOID, JavaUnionDefinitionEmitter$emit$lambda) + ' {}\n        |\n    ');
 }
-function emit_12(_this__u8e3s4, endpoint) {
-  return trimMargin('\n        |' + Spacer_instance.toString() + 'record Request (\n        |' + Spacer_instance.sr(2) + 'Path path,\n        |' + Spacer_instance.sr(2) + 'Wirespec.Method method,\n        |' + Spacer_instance.sr(2) + 'Queries queries,\n        |' + Spacer_instance.sr(2) + 'RequestHeaders headers,\n        |' + Spacer_instance.sr(2) + emit_16(this, _this__u8e3s4.pp_1) + ' body\n        |' + Spacer_instance.toString() + ') implements Wirespec.Request<' + emit_16(this, _this__u8e3s4.pp_1) + '> {\n        |' + Spacer_instance.sr(2) + emitConstructor(this, _this__u8e3s4, endpoint) + '\n        |' + Spacer_instance.toString() + '}\n    ');
-}
-function emit_13(_this__u8e3s4) {
-  var tmp = Spacer_instance.toString();
-  var tmp_0 = Companion_instance_1.qq(_this__u8e3s4.sp_1);
-  var tmp_1 = Spacer_instance.sr(2);
-  var tmp_2 = Spacer_instance.sr(2);
-  var tmp_3 = Spacer_instance.sr(2);
-  var tmp_4 = emit_16(this, _this__u8e3s4.up_1);
-  var tmp_5 = Spacer_instance.toString();
-  var tmp_6 = toString_0(first(_this__u8e3s4.sp_1));
-  var tmp_7 = emit_16(this, _this__u8e3s4.up_1);
-  var tmp_8 = concatGenerics(emit_16(this, _this__u8e3s4.up_1));
-  var tmp_9 = Spacer_instance.sr(2);
-  var tmp_10 = Companion_instance_1.qq(_this__u8e3s4.sp_1);
-  var tmp_11 = orNull(joinToString(_this__u8e3s4.tp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_5(this)));
-  var tmp0_safe_receiver = _this__u8e3s4.up_1;
-  var tmp_12;
-  if (tmp0_safe_receiver == null) {
-    tmp_12 = null;
-  } else {
-    // Inline function 'kotlin.let' call
-    tmp_12 = emit_16(this, tmp0_safe_receiver) + ' body';
-  }
-  var tmp_13 = joinToString(listOfNotNull([tmp_11, tmp_12]));
-  var tmp_14 = Spacer_instance.sr(3);
-  var tmp_15 = fixStatus(_this__u8e3s4.sp_1);
-  // Inline function 'kotlin.let' call
-  var tmp_16 = 'new Headers(' + joinToString(_this__u8e3s4.tp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_6(this)) + ')';
-  var tmp_17 = _this__u8e3s4.up_1 == null ? 'null' : 'body';
-  var tmp_18 = Spacer_instance.sr(2);
-  var tmp_19 = Spacer_instance.sr(1);
-  return trimMargin('\n        |' + tmp + 'record Response' + tmp_0 + '(\n        |' + tmp_1 + 'Integer status,\n        |' + tmp_2 + 'Headers headers,\n        |' + tmp_3 + tmp_4 + ' body\n        |' + tmp_5 + ') implements Response' + tmp_6 + 'XX<' + tmp_7 + '>, Response' + tmp_8 + ' {\n        |' + tmp_9 + 'public Response' + tmp_10 + '(' + tmp_13 + ') {\n        |' + tmp_14 + 'this(' + tmp_15 + ', ' + tmp_16 + ', ' + tmp_17 + ');\n        |' + tmp_18 + '}\n        |' + tmp_19 + emitObject(this, _this__u8e3s4.tp_1, 'Headers', 'Wirespec.Response.Headers', JavaEndpointDefinitionEmitter$emit$lambda_7(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
-}
-initMetadataForInterface(JavaEndpointDefinitionEmitter, 'JavaEndpointDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_14(refined) {
-  return trimMargin('\n        |public record ' + this.yq(refined.dr_1) + ' (' + this.zp(refined.er_1) + ' value) implements Wirespec.Refined<' + this.zp(refined.er_1) + '> {\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() { return value.toString(); }\n        |' + Spacer_instance.toString() + 'public boolean validate() {\n        |' + Spacer_instance.toString() + Spacer_instance.toString() + this.mr(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public ' + this.zp(refined.er_1) + ' value() { return value; }\n        |}\n        |\n    ');
+initMetadataForInterface(JavaUnionDefinitionEmitter, 'JavaUnionDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
+function emit_12(refined) {
+  return trimMargin('\n        |public record ' + this.wq(refined.br_1) + ' (' + this.xp(refined.cr_1) + ' value) implements Wirespec.Refined<' + this.xp(refined.cr_1) + '> {\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() { return value.toString(); }\n        |' + Spacer_instance.toString() + 'public boolean validate() {\n        |' + Spacer_instance.toString() + Spacer_instance.toString() + this.kr(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public ' + this.xp(refined.cr_1) + ' value() { return value; }\n        |}\n        |\n    ');
 }
 function emitValidator(_this__u8e3s4) {
   var defaultReturn = 'return true;';
-  var type = _this__u8e3s4.er_1.ru_1;
+  var type = _this__u8e3s4.cr_1.pu_1;
   var tmp;
   if (type instanceof Integer) {
-    var tmp0_safe_receiver = type.wt_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.aq(tmp0_safe_receiver);
+    var tmp0_safe_receiver = type.ut_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.yp(tmp0_safe_receiver);
     tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
   } else {
     if (type instanceof Number_0) {
-      var tmp2_safe_receiver = type.zt_1;
-      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.aq(tmp2_safe_receiver);
+      var tmp2_safe_receiver = type.xt_1;
+      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.yp(tmp2_safe_receiver);
       tmp = tmp3_elvis_lhs == null ? defaultReturn : tmp3_elvis_lhs;
     } else {
       if (type instanceof String_0) {
-        var tmp4_safe_receiver = type.tt_1;
+        var tmp4_safe_receiver = type.rt_1;
         var tmp_0;
         var tmp_1 = tmp4_safe_receiver;
         if ((tmp_1 == null ? null : new RegExp_0(tmp_1)) == null) {
           tmp_0 = null;
         } else {
-          tmp_0 = this.aq(new RegExp_0(tmp4_safe_receiver));
+          tmp_0 = this.yp(new RegExp_0(tmp4_safe_receiver));
         }
         var tmp5_elvis_lhs = tmp_0;
         tmp = tmp5_elvis_lhs == null ? defaultReturn : tmp5_elvis_lhs;
@@ -444,12 +383,75 @@ function emitValidator(_this__u8e3s4) {
   return tmp;
 }
 initMetadataForInterface(JavaRefinedTypeDefinitionEmitter, 'JavaRefinedTypeDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_15(union) {
-  var tmp = this.yq(union.so_1);
-  return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.to_1, VOID, VOID, VOID, VOID, VOID, JavaUnionDefinitionEmitter$emit$lambda) + ' {}\n        |\n    ');
+function emit_13(endpoint) {
+  var tmp = emitImports_0(this, endpoint);
+  var tmp_0 = this.wq(endpoint.ep_1);
+  var tmp_1 = get_pathParams(endpoint);
+  var tmp_2 = emitObject(this, tmp_1, 'Path', 'Wirespec.Path', JavaEndpointDefinitionEmitter$emit$lambda(this));
+  var tmp_3 = emitObject(this, endpoint.hp_1, 'Queries', 'Wirespec.Queries', JavaEndpointDefinitionEmitter$emit$lambda_0(this));
+  var tmp_4 = emitObject(this, endpoint.ip_1, 'RequestHeaders', 'Wirespec.Request.Headers', JavaEndpointDefinitionEmitter$emit$lambda_1(this));
+  var tmp_5 = this.x1v(first_0(endpoint.jp_1), endpoint);
+  var tmp_6 = Spacer_instance.toString();
+  var tmp_7 = emitStatusInterfaces(this, endpoint);
+  var tmp_8 = emitResponseInterfaces(this, endpoint);
+  var tmp_9 = distinctByStatus(endpoint.kp_1);
+  var tmp_10 = joinToString(tmp_9, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_2(this));
+  var tmp_11 = Spacer_instance.toString();
+  var tmp_12 = emitRequestFunctions(this, first_0(endpoint.jp_1), endpoint);
+  var tmp_13 = Spacer_instance.qr(2);
+  var tmp_14 = distinctByStatus(endpoint.kp_1);
+  var tmp_15 = joinToString(tmp_14, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_3(this));
+  var tmp_16 = Spacer_instance.qr(3);
+  var tmp_17 = Spacer_instance.qr(2);
+  var tmp_18 = Spacer_instance.qr(2);
+  var tmp_19 = emitFromResponse(this, endpoint);
+  var tmp_20 = Spacer_instance.qr(2);
+  var tmp_21 = Spacer_instance.qr(2);
+  var tmp_22 = this.b1w(endpoint);
+  var tmp_23 = Spacer_instance.qr(2);
+  var tmp_24 = Spacer_instance.qr(3);
+  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 serialization, Response<?> response) {\n        |' + tmp_15 + '\n        |' + tmp_16 + 'else { throw new IllegalStateException("Cannot match response with status: " + response.status());}\n        |' + tmp_17 + '}\n        |\n        |' + tmp_18 + 'static Response<?> fromResponse(Wirespec.Deserializer serialization, Wirespec.RawResponse response) {\n        |' + tmp_19 + '\n        |' + tmp_20 + '}\n        |\n        |' + tmp_21 + tmp_22 + '\n        |' + tmp_23 + 'class Handlers implements Wirespec.Server<Request, Response<?>>, Wirespec.Client<Request, Response<?>> {\n        |' + tmp_24 + '@Override public String getPathTemplate() { return "/' + joinToString(endpoint.gp_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_4) + '"; }\n        |' + Spacer_instance.qr(3) + '@Override public String getMethod() { return "' + endpoint.fp_1.toString() + '"; }\n        |' + Spacer_instance.qr(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.qr(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.qr(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.qr(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.qr(4) + '};\n        |' + Spacer_instance.qr(3) + '}\n        |' + Spacer_instance.qr(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.qr(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.qr(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.qr(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.qr(4) + '};\n        |' + Spacer_instance.qr(3) + '}\n        |' + Spacer_instance.qr(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 }
-initMetadataForInterface(JavaUnionDefinitionEmitter, 'JavaUnionDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaIdentifierEmitter, JavaEnumDefinitionEmitter, JavaEndpointDefinitionEmitter, JavaChannelDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, JavaUnionDefinitionEmitter, JavaTypeDefinitionEmitter, LanguageEmitter]);
+function emitHandleFunction(endpoint) {
+  return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.pq(this.wq(endpoint.ep_1)) + '(Request request);';
+}
+function emit_14(_this__u8e3s4, endpoint) {
+  return trimMargin('\n        |' + Spacer_instance.toString() + 'record Request (\n        |' + Spacer_instance.qr(2) + 'Path path,\n        |' + Spacer_instance.qr(2) + 'Wirespec.Method method,\n        |' + Spacer_instance.qr(2) + 'Queries queries,\n        |' + Spacer_instance.qr(2) + 'RequestHeaders headers,\n        |' + Spacer_instance.qr(2) + emit_16(this, _this__u8e3s4.np_1) + ' body\n        |' + Spacer_instance.toString() + ') implements Wirespec.Request<' + emit_16(this, _this__u8e3s4.np_1) + '> {\n        |' + Spacer_instance.qr(2) + emitConstructor(this, _this__u8e3s4, endpoint) + '\n        |' + Spacer_instance.toString() + '}\n    ');
+}
+function emit_15(_this__u8e3s4) {
+  var tmp = Spacer_instance.toString();
+  var tmp_0 = Companion_instance_1.oq(_this__u8e3s4.qp_1);
+  var tmp_1 = Spacer_instance.qr(2);
+  var tmp_2 = Spacer_instance.qr(2);
+  var tmp_3 = Spacer_instance.qr(2);
+  var tmp_4 = emit_16(this, _this__u8e3s4.sp_1);
+  var tmp_5 = Spacer_instance.toString();
+  var tmp_6 = toString_0(first(_this__u8e3s4.qp_1));
+  var tmp_7 = emit_16(this, _this__u8e3s4.sp_1);
+  var tmp_8 = concatGenerics(emit_16(this, _this__u8e3s4.sp_1));
+  var tmp_9 = Spacer_instance.qr(2);
+  var tmp_10 = Companion_instance_1.oq(_this__u8e3s4.qp_1);
+  var tmp_11 = orNull(joinToString(_this__u8e3s4.rp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_5(this)));
+  var tmp0_safe_receiver = _this__u8e3s4.sp_1;
+  var tmp_12;
+  if (tmp0_safe_receiver == null) {
+    tmp_12 = null;
+  } else {
+    // Inline function 'kotlin.let' call
+    tmp_12 = emit_16(this, tmp0_safe_receiver) + ' body';
+  }
+  var tmp_13 = joinToString(listOfNotNull([tmp_11, tmp_12]));
+  var tmp_14 = Spacer_instance.qr(3);
+  var tmp_15 = fixStatus(_this__u8e3s4.qp_1);
+  // Inline function 'kotlin.let' call
+  var tmp_16 = 'new Headers(' + joinToString(_this__u8e3s4.rp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_6(this)) + ')';
+  var tmp_17 = _this__u8e3s4.sp_1 == null ? 'null' : 'body';
+  var tmp_18 = Spacer_instance.qr(2);
+  var tmp_19 = Spacer_instance.qr(1);
+  return trimMargin('\n        |' + tmp + 'record Response' + tmp_0 + '(\n        |' + tmp_1 + 'Integer status,\n        |' + tmp_2 + 'Headers headers,\n        |' + tmp_3 + tmp_4 + ' body\n        |' + tmp_5 + ') implements Response' + tmp_6 + 'XX<' + tmp_7 + '>, Response' + tmp_8 + ' {\n        |' + tmp_9 + 'public Response' + tmp_10 + '(' + tmp_13 + ') {\n        |' + tmp_14 + 'this(' + tmp_15 + ', ' + tmp_16 + ', ' + tmp_17 + ');\n        |' + tmp_18 + '}\n        |' + tmp_19 + emitObject(this, _this__u8e3s4.rp_1, 'Headers', 'Wirespec.Response.Headers', JavaEndpointDefinitionEmitter$emit$lambda_7(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
+}
+initMetadataForInterface(JavaEndpointDefinitionEmitter, 'JavaEndpointDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
+initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaEnumDefinitionEmitter, JavaUnionDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, JavaChannelDefinitionEmitter, JavaTypeDefinitionEmitter, JavaIdentifierEmitter, JavaEndpointDefinitionEmitter, LanguageEmitter]);
 initMetadataForCompanion(Companion);
 initMetadataForCompanion(Companion_0);
 initMetadataForClass(JavaIrEmitter$shared$1);
@@ -464,7 +466,7 @@ function emitImports($this, _this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.xq().n1() === element.nu_1)) {
+    if (!(_this__u8e3s4.vq().l1() === element.lu_1)) {
       destination.x(element);
     }
   }
@@ -474,7 +476,7 @@ function emitImports($this, _this__u8e3s4) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$3 = 'import ' + $this.l1v().or_1 + '.model.' + item.nu_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.k1v().mr_1 + '.model.' + item.lu_1 + ';';
     destination_0.x(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -482,8 +484,8 @@ function emitImports($this, _this__u8e3s4) {
 }
 function emitFullyQualified($this, _this__u8e3s4, reference) {
   var tmp;
-  if (_this__u8e3s4.xq().n1() === reference.n1()) {
-    tmp = $this.l1v().or_1 + '.model.';
+  if (_this__u8e3s4.vq().l1() === reference.l1()) {
+    tmp = $this.k1v().mr_1 + '.model.';
   } else {
     tmp = '';
   }
@@ -496,49 +498,49 @@ function JavaChannelDefinitionEmitter$emitImports$lambda(it) {
 function JavaChannelDefinitionEmitter() {
 }
 function JavaEmitter(packageName, emitShared) {
-  packageName = packageName === VOID ? Companion_instance.nr('community.flock.wirespec.generated') : packageName;
-  emitShared = emitShared === VOID ? Companion_instance_0.io() : emitShared;
+  packageName = packageName === VOID ? Companion_instance.lr('community.flock.wirespec.generated') : packageName;
+  emitShared = emitShared === VOID ? Companion_instance_0.go() : emitShared;
   LanguageEmitter.call(this);
-  this.o1v_1 = packageName;
-  this.p1v_1 = emitShared;
-  this.q1v_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
-  this.r1v_1 = FileExtension_Java_getInstance();
-  this.s1v_1 = JavaShared_getInstance();
-  this.t1v_1 = '//';
-}
-protoOf(JavaEmitter).l1v = function () {
-  return this.o1v_1;
+  this.n1v_1 = packageName;
+  this.o1v_1 = emitShared;
+  this.p1v_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
+  this.q1v_1 = FileExtension_Java_getInstance();
+  this.r1v_1 = JavaShared_getInstance();
+  this.s1v_1 = '//';
+}
+protoOf(JavaEmitter).k1v = function () {
+  return this.n1v_1;
+};
+protoOf(JavaEmitter).eq = function () {
+  return this.q1v_1;
 };
-protoOf(JavaEmitter).gq = function () {
+protoOf(JavaEmitter).t1v = function () {
   return this.r1v_1;
 };
-protoOf(JavaEmitter).u1v = function () {
+protoOf(JavaEmitter).fq = function () {
   return this.s1v_1;
 };
-protoOf(JavaEmitter).hq = function () {
-  return this.t1v_1;
-};
-protoOf(JavaEmitter).vq = function (module_0, logger) {
+protoOf(JavaEmitter).tq = function (module_0, logger) {
   // Inline function 'kotlin.let' call
-  var it = protoOf(LanguageEmitter).vq.call(this, module_0, logger);
-  return this.p1v_1.jo_1 ? NonEmptyList__plus_impl_xqmb9(it, new Emitted(Companion_instance.nr('community.flock.wirespec.java').qr() + 'Wirespec', this.u1v().w1v_1)) : it;
+  var it = protoOf(LanguageEmitter).tq.call(this, module_0, logger);
+  return this.o1v_1.ho_1 ? NonEmptyList__plus_impl_xqmb9(it, new Emitted(Companion_instance.lr('community.flock.wirespec.java').or() + 'Wirespec', this.t1v().v1v_1)) : it;
 };
-protoOf(JavaEmitter).wq = function (definition, module_0, logger) {
+protoOf(JavaEmitter).uq = function (definition, module_0, logger) {
   // Inline function 'kotlin.let' call
-  var it = protoOf(LanguageEmitter).wq.call(this, definition, module_0, logger);
-  var subPackageName = plus(this.l1v(), definition);
-  var tmp = subPackageName.qr() + this.x1v(it.ko_1);
+  var it = protoOf(LanguageEmitter).uq.call(this, definition, module_0, logger);
+  var subPackageName = plus(this.k1v(), definition);
+  var tmp = subPackageName.or() + this.w1v(it.io_1);
   // Inline function 'kotlin.text.trimStart' call
-  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.sq(module_0) ? this.q1v_1 : '') + '\n                    |' + it.lo_1 + '\n                    ');
+  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.qq(module_0) ? this.p1v_1 : '') + '\n                    |' + it.jo_1 + '\n                    ');
   var tmp$ret$0 = toString(trimStart(isCharSequence(this_0) ? this_0 : THROW_CCE()));
   return new Emitted(tmp, tmp$ret$0);
 };
 function emitGetType($this, _this__u8e3s4) {
-  return 'Wirespec.getType(' + $this.n1v(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw($this, _this__u8e3s4) + ')';
+  return 'Wirespec.getType(' + $this.m1v(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw($this, _this__u8e3s4) + ')';
 }
 function emitGetTypeRaw($this, _this__u8e3s4) {
   var tmp;
-  var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.fu();
+  var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.du();
   if (tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs) {
     tmp = 'java.util.Optional.class';
   } else {
@@ -553,9 +555,9 @@ function emitGetTypeRaw($this, _this__u8e3s4) {
 function emitConstructor($this, _this__u8e3s4, endpoint) {
   var tmp = get_pathParams(endpoint);
   var tmp_0 = orNull(joinToString(tmp, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda($this)));
-  var tmp_1 = orNull(joinToString(endpoint.jp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_0($this)));
-  var tmp_2 = orNull(joinToString(endpoint.kp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_1($this)));
-  var tmp0_safe_receiver = _this__u8e3s4.pp_1;
+  var tmp_1 = orNull(joinToString(endpoint.hp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_0($this)));
+  var tmp_2 = orNull(joinToString(endpoint.ip_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_1($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.np_1;
   var tmp_3;
   if (tmp0_safe_receiver == null) {
     tmp_3 = null;
@@ -564,112 +566,112 @@ function emitConstructor($this, _this__u8e3s4, endpoint) {
     tmp_3 = emit_16($this, tmp0_safe_receiver) + ' body';
   }
   var tmp_4 = joinToString(listOfNotNull([tmp_0, tmp_1, tmp_2, tmp_3]));
-  var tmp_5 = Spacer_instance.sr(3);
+  var tmp_5 = Spacer_instance.qr(3);
   var tmp_6 = get_pathParams(endpoint);
   // Inline function 'kotlin.let' call
   var tmp$ret$3 = 'new Path(' + joinToString(tmp_6, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_2($this)) + ')';
   var tmp1_elvis_lhs = orNull(tmp$ret$3);
   var tmp_7 = tmp1_elvis_lhs == null ? 'new Path()' : tmp1_elvis_lhs;
-  var tmp_8 = 'Wirespec.Method.' + endpoint.hp_1.b3_1;
+  var tmp_8 = 'Wirespec.Method.' + endpoint.fp_1.a3_1;
   // Inline function 'kotlin.let' call
-  var tmp$ret$5 = 'new Queries(' + joinToString(endpoint.jp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_3($this)) + ')';
+  var tmp$ret$5 = 'new Queries(' + joinToString(endpoint.hp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_3($this)) + ')';
   var tmp2_elvis_lhs = orNull(tmp$ret$5);
   var tmp_9 = tmp2_elvis_lhs == null ? 'new Queries()' : tmp2_elvis_lhs;
   // Inline function 'kotlin.let' call
-  var tmp$ret$7 = 'new RequestHeaders(' + joinToString(endpoint.kp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_4($this)) + ')';
+  var tmp$ret$7 = 'new RequestHeaders(' + joinToString(endpoint.ip_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_4($this)) + ')';
   var tmp3_elvis_lhs = orNull(tmp$ret$7);
   var tmp_10 = tmp3_elvis_lhs == null ? 'new RequestHeaders()' : tmp3_elvis_lhs;
   var tmp_11;
-  if (_this__u8e3s4.pp_1 == null) {
+  if (_this__u8e3s4.np_1 == null) {
     tmp_11 = null;
   } else {
     // Inline function 'kotlin.let' call
     tmp_11 = 'body';
   }
   var tmp5_elvis_lhs = tmp_11;
-  return 'public Request(' + tmp_4 + ') {\n' + tmp_5 + 'this(' + joinToString(listOfNotNull([tmp_7, tmp_8, tmp_9, tmp_10, tmp5_elvis_lhs == null ? 'null' : tmp5_elvis_lhs])) + ');\n' + Spacer_instance.sr(2) + '}';
+  return 'public Request(' + tmp_4 + ') {\n' + tmp_5 + 'this(' + joinToString(listOfNotNull([tmp_7, tmp_8, tmp_9, tmp_10, tmp5_elvis_lhs == null ? 'null' : tmp5_elvis_lhs])) + ');\n' + Spacer_instance.qr(2) + '}';
 }
 function emitDeserializedParams($this, _this__u8e3s4, endpoint) {
   var tmp = get_indexedPathParams(endpoint);
   var tmp_0 = orNull(joinToString(tmp, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda($this)));
-  var tmp_1 = orNull(joinToString(endpoint.jp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_0($this)));
-  var tmp_2 = orNull(joinToString(endpoint.kp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_1($this)));
-  var tmp0_safe_receiver = _this__u8e3s4.pp_1;
+  var tmp_1 = orNull(joinToString(endpoint.hp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_0($this)));
+  var tmp_2 = orNull(joinToString(endpoint.ip_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_1($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.np_1;
   var tmp_3;
   if (tmp0_safe_receiver == null) {
     tmp_3 = null;
   } else {
     // Inline function 'kotlin.let' call
-    tmp_3 = Spacer_instance.sr(4) + 'request.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.rp_1) + ')).orElse(null)';
+    tmp_3 = Spacer_instance.qr(4) + 'request.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.pp_1) + ')).orElse(null)';
   }
   // Inline function 'kotlin.let' call
   var it = joinToString(listOfNotNull([tmp_0, tmp_1, tmp_2, tmp_3]), ',\n');
-  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.sr(3);
+  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.qr(3);
 }
 function emitDeserializedParams_0($this, _this__u8e3s4) {
-  var tmp = orNull(joinToString(_this__u8e3s4.tp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_2($this)));
-  var tmp0_safe_receiver = _this__u8e3s4.up_1;
+  var tmp = orNull(joinToString(_this__u8e3s4.rp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_2($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.sp_1;
   var tmp_0;
   if (tmp0_safe_receiver == null) {
     tmp_0 = null;
   } else {
     // Inline function 'kotlin.let' call
-    tmp_0 = Spacer_instance.sr(5) + 'response.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.rp_1) + ')).orElse(null)';
+    tmp_0 = Spacer_instance.qr(5) + 'response.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.pp_1) + ')).orElse(null)';
   }
   // Inline function 'kotlin.let' call
   var it = joinToString(listOfNotNull([tmp, tmp_0]), ',\n');
-  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.sr(4);
+  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.qr(4);
 }
 function emitSerialized($this, _this__u8e3s4) {
   var tmp;
-  if (!(_this__u8e3s4.up_1 == null)) {
-    tmp = 'java.util.Optional.ofNullable(serialization.serializeBody(r.body, ' + emitGetType($this, ensureNotNull(_this__u8e3s4.up_1).rp_1) + '))';
+  if (!(_this__u8e3s4.sp_1 == null)) {
+    tmp = 'java.util.Optional.ofNullable(serialization.serializeBody(r.body, ' + emitGetType($this, ensureNotNull(_this__u8e3s4.sp_1).pp_1) + '))';
   } else {
     tmp = 'java.util.Optional.empty()';
   }
   var body = tmp;
   var tmp_0;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  if (!_this__u8e3s4.tp_1.r()) {
-    tmp_0 = 'java.util.Map.ofEntries(' + joinToString(_this__u8e3s4.tp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitSerialized$lambda($this)) + ')';
+  if (!_this__u8e3s4.rp_1.r()) {
+    tmp_0 = 'java.util.Map.ofEntries(' + joinToString(_this__u8e3s4.rp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitSerialized$lambda($this)) + ')';
   } else {
     tmp_0 = 'java.util.Collections.emptyMap()';
   }
   var headers = tmp_0;
-  return Spacer_instance.sr(3) + 'if (response instanceof Response' + Companion_instance_1.qq(_this__u8e3s4.sp_1) + ' r) { return new Wirespec.RawResponse(r.status(), ' + headers + ', ' + body + '); }';
+  return Spacer_instance.qr(3) + 'if (response instanceof Response' + Companion_instance_1.oq(_this__u8e3s4.qp_1) + ' r) { return new Wirespec.RawResponse(r.status(), ' + headers + ', ' + body + '); }';
 }
 function emitDeserialized($this, _this__u8e3s4) {
-  return Spacer_instance.sr(4) + 'case ' + _this__u8e3s4.sp_1 + ' -> new Response' + Companion_instance_1.qq(_this__u8e3s4.sp_1) + '(' + emitDeserializedParams_0($this, _this__u8e3s4) + ');';
+  return Spacer_instance.qr(4) + 'case ' + _this__u8e3s4.qp_1 + ' -> new Response' + Companion_instance_1.oq(_this__u8e3s4.qp_1) + '(' + emitDeserializedParams_0($this, _this__u8e3s4) + ');';
 }
 function emitSerializedParams($this, _this__u8e3s4, fields) {
-  return 'java.util.Map.entry("' + _this__u8e3s4.cp_1.n1() + '", serialization.serializeParam(request.' + (fields === 'queries' ? 'queries' : 'headers') + '().' + $this.yq(_this__u8e3s4.cp_1) + '(), ' + emitGetType($this, _this__u8e3s4.dp_1) + '))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.ap_1.l1() + '", serialization.serializeParam(request.' + (fields === 'queries' ? 'queries' : 'headers') + '().' + $this.wq(_this__u8e3s4.ap_1) + '(), ' + emitGetType($this, _this__u8e3s4.bp_1) + '))';
 }
 function emitDeserialized_0($this, _this__u8e3s4) {
-  return Spacer_instance.sr(4) + 'serialization.deserializePath(request.path().get(' + _this__u8e3s4.me_1 + '), ' + emitGetType($this, _this__u8e3s4.ne_1.op_1) + ')';
+  return Spacer_instance.qr(4) + 'serialization.deserializePath(request.path().get(' + _this__u8e3s4.le_1 + '), ' + emitGetType($this, _this__u8e3s4.me_1.mp_1) + ')';
 }
 function emitDeserializedParams_1($this, _this__u8e3s4, fields, caseSensitive) {
   var tmp;
   if (caseSensitive) {
-    tmp = 'request.' + fields + '().getOrDefault("' + _this__u8e3s4.cp_1.n1() + '", java.util.Collections.emptyList())';
+    tmp = 'request.' + fields + '().getOrDefault("' + _this__u8e3s4.ap_1.l1() + '", java.util.Collections.emptyList())';
   } else {
-    tmp = 'request.' + fields + '().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + _this__u8e3s4.cp_1.n1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList())';
+    tmp = 'request.' + fields + '().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + _this__u8e3s4.ap_1.l1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList())';
   }
   var valuesFromField = tmp;
-  return Spacer_instance.sr(4) + 'serialization.<' + $this.zp(_this__u8e3s4.dp_1) + '>deserializeParam(' + valuesFromField + ', ' + emitGetType($this, _this__u8e3s4.dp_1) + ')';
+  return Spacer_instance.qr(4) + 'serialization.<' + $this.xp(_this__u8e3s4.bp_1) + '>deserializeParam(' + valuesFromField + ', ' + emitGetType($this, _this__u8e3s4.bp_1) + ')';
 }
 function emitSerializedHeader($this, _this__u8e3s4) {
-  return 'java.util.Map.entry("' + _this__u8e3s4.cp_1.n1() + '", serialization.<' + $this.zp(_this__u8e3s4.dp_1) + '>serializeParam(r.headers().' + $this.yq(_this__u8e3s4.cp_1) + '(), ' + emitGetType($this, _this__u8e3s4.dp_1) + '))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.ap_1.l1() + '", serialization.<' + $this.xp(_this__u8e3s4.bp_1) + '>serializeParam(r.headers().' + $this.wq(_this__u8e3s4.ap_1) + '(), ' + emitGetType($this, _this__u8e3s4.bp_1) + '))';
 }
 function emitIdentifier($this, _this__u8e3s4) {
-  return 'serialization.serializePath(request.path().' + Companion_instance_1.rq($this.yq(_this__u8e3s4.np_1)) + '(), ' + emitGetType($this, _this__u8e3s4.op_1) + ')';
+  return 'serialization.serializePath(request.path().' + Companion_instance_1.pq($this.wq(_this__u8e3s4.lp_1)) + '(), ' + emitGetType($this, _this__u8e3s4.mp_1) + ')';
 }
 function emit_16($this, _this__u8e3s4) {
-  var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.rp_1;
-  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.zp(tmp1_safe_receiver);
+  var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.pp_1;
+  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.xp(tmp1_safe_receiver);
   return tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
 }
 function emit_17($this, _this__u8e3s4) {
-  return $this.zp(_this__u8e3s4.op_1) + ' ' + $this.yq(_this__u8e3s4.np_1);
+  return $this.xp(_this__u8e3s4.mp_1) + ' ' + $this.wq(_this__u8e3s4.lp_1);
 }
 function emitImports_0($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.filter' call
@@ -679,7 +681,7 @@ function emitImports_0($this, _this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.xq().n1() === element.nu_1)) {
+    if (!(_this__u8e3s4.vq().l1() === element.lu_1)) {
       destination.x(element);
     }
   }
@@ -689,46 +691,46 @@ function emitImports_0($this, _this__u8e3s4) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$3 = 'import ' + $this.l1v().or_1 + '.model.' + item.nu_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.k1v().mr_1 + '.model.' + item.lu_1 + ';';
     destination_0.x(tmp$ret$3);
   }
   var tmp = destination_0;
   return joinToString(tmp, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitImports$lambda);
 }
 function emitRequestFunctions($this, _this__u8e3s4, endpoint) {
-  var tmp = Spacer_instance.sr(2);
-  var tmp_0 = Spacer_instance.sr(3);
-  var tmp_1 = Spacer_instance.sr(4);
-  var tmp_2 = Spacer_instance.sr(4);
-  var tmp_3 = joinToString(endpoint.ip_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda($this));
-  var tmp_4 = Spacer_instance.sr(4);
+  var tmp = Spacer_instance.qr(2);
+  var tmp_0 = Spacer_instance.qr(3);
+  var tmp_1 = Spacer_instance.qr(4);
+  var tmp_2 = Spacer_instance.qr(4);
+  var tmp_3 = joinToString(endpoint.gp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda($this));
+  var tmp_4 = Spacer_instance.qr(4);
   var tmp_5;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  if (!endpoint.jp_1.r()) {
-    tmp_5 = 'java.util.Map.ofEntries(' + joinToString(endpoint.jp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_0($this)) + ')';
+  if (!endpoint.hp_1.r()) {
+    tmp_5 = 'java.util.Map.ofEntries(' + joinToString(endpoint.hp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_0($this)) + ')';
   } else {
     tmp_5 = 'java.util.Collections.emptyMap()';
   }
   var tmp_6 = tmp_5;
-  var tmp_7 = Spacer_instance.sr(4);
+  var tmp_7 = Spacer_instance.qr(4);
   var tmp_8;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  if (!endpoint.kp_1.r()) {
-    tmp_8 = 'java.util.Map.ofEntries(' + joinToString(endpoint.kp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_1($this)) + ')';
+  if (!endpoint.ip_1.r()) {
+    tmp_8 = 'java.util.Map.ofEntries(' + joinToString(endpoint.ip_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_1($this)) + ')';
   } else {
     tmp_8 = 'java.util.Collections.emptyMap()';
   }
   var tmp_9 = tmp_8;
-  var tmp_10 = Spacer_instance.sr(4);
+  var tmp_10 = Spacer_instance.qr(4);
   var tmp_11;
-  if (!(_this__u8e3s4.pp_1 == null)) {
-    var tmp0_safe_receiver = _this__u8e3s4.pp_1;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.rp_1;
+  if (!(_this__u8e3s4.np_1 == null)) {
+    var tmp0_safe_receiver = _this__u8e3s4.np_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.pp_1;
     tmp_11 = 'java.util.Optional.ofNullable(serialization.serializeBody(request.body(), ' + (tmp1_safe_receiver == null ? null : emitGetType($this, tmp1_safe_receiver)) + '))';
   } else {
     tmp_11 = 'java.util.Optional.empty()';
   }
-  return trimMargin('\n        |' + tmp + 'static Wirespec.RawRequest toRequest(Wirespec.Serializer 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 + tmp_11 + '\n        |' + Spacer_instance.sr(3) + ');\n        |' + Spacer_instance.sr(2) + '}\n        |\n        |' + Spacer_instance.sr(2) + 'static Request fromRequest(Wirespec.Deserializer serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.sr(3) + 'return new Request(' + emitDeserializedParams($this, _this__u8e3s4, endpoint) + ');\n        |' + Spacer_instance.sr(2) + '}\n    ');
+  return trimMargin('\n        |' + tmp + 'static Wirespec.RawRequest toRequest(Wirespec.Serializer 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 + tmp_11 + '\n        |' + Spacer_instance.qr(3) + ');\n        |' + Spacer_instance.qr(2) + '}\n        |\n        |' + Spacer_instance.qr(2) + 'static Request fromRequest(Wirespec.Deserializer serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.qr(3) + 'return new Request(' + emitDeserializedParams($this, _this__u8e3s4, endpoint) + ');\n        |' + Spacer_instance.qr(2) + '}\n    ');
 }
 function emitObject($this, _this__u8e3s4, name, extends_0, block) {
   var tmp;
@@ -742,13 +744,13 @@ function emitObject($this, _this__u8e3s4, name, extends_0, block) {
 }
 function emitResponseInterfaces($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.map' call
-  var this_0 = distinctByStatus(_this__u8e3s4.mp_1);
+  var this_0 = distinctByStatus(_this__u8e3s4.kp_1);
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp$ret$0 = emit_16($this, item.up_1);
+    var tmp$ret$0 = emit_16($this, item.sp_1);
     destination.x(tmp$ret$0);
   }
   var tmp = distinct(destination);
@@ -756,13 +758,13 @@ function emitResponseInterfaces($this, _this__u8e3s4) {
 }
 function emitStatusInterfaces($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.map' call
-  var this_0 = _this__u8e3s4.mp_1;
+  var this_0 = _this__u8e3s4.kp_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp$ret$0 = new Char(first(item.sp_1));
+    var tmp$ret$0 = new Char(first(item.qp_1));
     destination.x(tmp$ret$0);
   }
   var tmp = distinct(destination);
@@ -770,26 +772,26 @@ function emitStatusInterfaces($this, _this__u8e3s4) {
 }
 function emitFromResponse($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.filter' call
-  var tmp0 = distinctByStatus(_this__u8e3s4.mp_1);
+  var tmp0 = distinctByStatus(_this__u8e3s4.kp_1);
   // Inline function 'kotlin.collections.filterTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (Companion_instance_1.tq(element.sp_1)) {
+    if (Companion_instance_1.rq(element.qp_1)) {
       destination.x(element);
     }
   }
   var statusResponses = destination;
   var tmp;
   if (statusResponses.r()) {
-    tmp = trimMargin('\n                 |' + Spacer_instance.sr(3) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                ');
+    tmp = trimMargin('\n                 |' + Spacer_instance.qr(3) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                ');
   } else if (statusResponses.a1() === 1) {
     var response = first_0(statusResponses);
-    tmp = trimMargin('\n                    |' + Spacer_instance.sr(3) + 'if (response.statusCode() == ' + response.sp_1 + ') {\n                    |' + Spacer_instance.sr(4) + 'return new Response' + Companion_instance_1.qq(response.sp_1) + '(' + emitDeserializedParams_0($this, response) + ');\n                    |' + Spacer_instance.sr(3) + '} else {\n                    |' + Spacer_instance.sr(4) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.sr(3) + '}\n                ');
+    tmp = trimMargin('\n                    |' + Spacer_instance.qr(3) + 'if (response.statusCode() == ' + response.qp_1 + ') {\n                    |' + Spacer_instance.qr(4) + 'return new Response' + Companion_instance_1.oq(response.qp_1) + '(' + emitDeserializedParams_0($this, response) + ');\n                    |' + Spacer_instance.qr(3) + '} else {\n                    |' + Spacer_instance.qr(4) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.qr(3) + '}\n                ');
   } else {
-    var tmp_0 = Spacer_instance.sr(3);
-    tmp = trimMargin('\n                    |' + tmp_0 + 'return switch (response.statusCode()) {\n                    |' + joinToString(statusResponses, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitFromResponse$lambda($this)) + '\n                    |' + Spacer_instance.sr(4) + 'default -> throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.sr(3) + '};\n                ');
+    var tmp_0 = Spacer_instance.qr(3);
+    tmp = trimMargin('\n                    |' + tmp_0 + 'return switch (response.statusCode()) {\n                    |' + joinToString(statusResponses, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitFromResponse$lambda($this)) + '\n                    |' + Spacer_instance.qr(4) + 'default -> throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.qr(3) + '};\n                ');
   }
   return tmp;
 }
@@ -800,17 +802,17 @@ function JavaEndpointDefinitionEmitter$emit$lambda(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return this$0.yp(it);
+    return this$0.wp(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_1(this$0) {
   return function (it) {
-    return this$0.yp(it);
+    return this$0.wp(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return this$0.z1v(it);
+    return this$0.y1v(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_3(this$0) {
@@ -828,27 +830,27 @@ function JavaEndpointDefinitionEmitter$emitConstructor$lambda(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_0(this$0) {
   return function (it) {
-    return this$0.yp(it);
+    return this$0.wp(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_1(this$0) {
   return function (it) {
-    return this$0.yp(it);
+    return this$0.wp(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_2(this$0) {
   return function (it) {
-    return this$0.yq(it.np_1);
+    return this$0.wq(it.lp_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_3(this$0) {
   return function (it) {
-    return this$0.yq(it.cp_1);
+    return this$0.wq(it.ap_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_4(this$0) {
   return function (it) {
-    return this$0.yq(it.cp_1);
+    return this$0.wq(it.ap_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda(this$0) {
@@ -868,22 +870,22 @@ function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_5(this$0) {
   return function (it) {
-    return this$0.yp(it);
+    return this$0.wp(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_6(this$0) {
   return function (it) {
-    return this$0.yq(it.cp_1);
+    return this$0.wq(it.ap_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_7(this$0) {
   return function (it) {
-    return this$0.yp(it);
+    return this$0.wp(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_2(this$0) {
   return function (it) {
-    return Spacer_instance.sr(5) + 'serialization.<' + this$0.zp(it.dp_1) + '>deserializeParam(response.headers().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + it.cp_1.n1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList()), ' + emitGetType(this$0, it.dp_1) + ')';
+    return Spacer_instance.qr(5) + 'serialization.<' + this$0.xp(it.bp_1) + '>deserializeParam(response.headers().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + it.ap_1.l1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList()), ' + emitGetType(this$0, it.bp_1) + ')';
   };
 }
 function JavaEndpointDefinitionEmitter$emitSerialized$lambda(this$0) {
@@ -899,7 +901,7 @@ function JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Literal) {
-      tmp = '"' + it.jq_1 + '"';
+      tmp = '"' + it.hq_1 + '"';
     } else {
       if (it instanceof Param) {
         tmp = emitIdentifier(this$0, it);
@@ -922,14 +924,14 @@ function JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emitObject$lambda($block) {
   return function (it) {
-    return Spacer_instance.sr(2) + $block(it);
+    return Spacer_instance.qr(2) + $block(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitResponseInterfaces$lambda(it) {
   return Spacer_instance.toString() + 'sealed interface Response' + concatGenerics(it) + ' extends Response<' + it + '> {}';
 }
 function JavaEndpointDefinitionEmitter$emitStatusInterfaces$lambda(it) {
-  return Spacer_instance.toString() + 'sealed interface Response' + toString_0(it.j1_1) + 'XX<T> extends Response<T> {}';
+  return Spacer_instance.toString() + 'sealed interface Response' + toString_0(it.h1_1) + 'XX<T> extends Response<T> {}';
 }
 function JavaEndpointDefinitionEmitter$emitFromResponse$lambda(this$0) {
   return function (it) {
@@ -942,7 +944,7 @@ function sanitizeNegative($this, _this__u8e3s4) {
   return startsWith(_this__u8e3s4, '-') ? '__' + substring(_this__u8e3s4, 1) : _this__u8e3s4;
 }
 function sanitizeEnum($this, _this__u8e3s4) {
-  return $this.b1w($this.a1w(joinToString(split(sanitizeNegative($this, _this__u8e3s4), ['-', ', ', '.', ' ', '//']), '_')));
+  return $this.a1w($this.z1v(joinToString(split(sanitizeNegative($this, _this__u8e3s4), ['-', ', ', '.', ' ', '//']), '_')));
 }
 function JavaEnumDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
@@ -953,7 +955,7 @@ function JavaEnumDefinitionEmitter() {
 }
 function Companion() {
   Companion_instance_2 = this;
-  this.d1w_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.c1w_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']);
 }
 var Companion_instance_2;
 function Companion_getInstance_0() {
@@ -962,16 +964,26 @@ function Companion_getInstance_0() {
   return Companion_instance_2;
 }
 function JavaIdentifierEmitter$sanitizeSymbol$lambda(it) {
-  return isLetterOrDigit(it.j1_1) || listOf(new Char(_Char___init__impl__6a9atx(95))).h1(it);
+  return isLetterOrDigit(it.h1_1) || listOf(new Char(_Char___init__impl__6a9atx(95))).u1(it);
 }
 function JavaIdentifierEmitter() {
 }
+function JavaIrEmitter$shared$o$clientServer$lambda(name) {
+  switch (name.s1h()) {
+    case 'client':
+      return Companion_getInstance().m1h('getClient');
+    case 'server':
+      return Companion_getInstance().m1h('getServer');
+    default:
+      return null;
+  }
+}
 function JavaIrEmitter$shared$o$wirespecFile$lambda(this$0) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof File) {
       // Inline function 'kotlin.collections.partition' call
-      var this_0 = element.r1m_1;
+      var this_0 = element.u1m_1;
       var first = ArrayList_init_$Create$();
       var second = ArrayList_init_$Create$();
       var _iterator__ex2g4s = this_0.t();
@@ -984,9 +996,9 @@ function JavaIrEmitter$shared$o$wirespecFile$lambda(this$0) {
         }
       }
       var _destruct__k2r9zo = new Pair(first, second);
-      var packageElements = _destruct__k2r9zo.oe();
-      var rest = _destruct__k2r9zo.pe();
-      tmp = element.u1m(VOID, plus_1(plus_1(packageElements, this$0.g1w_1), rest));
+      var packageElements = _destruct__k2r9zo.ne();
+      var rest = _destruct__k2r9zo.oe();
+      tmp = element.x1m(VOID, plus_1(plus_1(packageElements, this$0.f1w_1), rest));
     } else {
       tmp = element;
     }
@@ -998,11 +1010,11 @@ function JavaIrEmitter$shared$o$wirespecFile$lambda_0(this$0) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Namespace) {
-      var injected = element.a1n_1.equals(Companion_getInstance().o1h('Wirespec')) ? this$0.h1w_1 : emptyList();
+      var injected = element.z1m_1.equals(Companion_getInstance().m1h('Wirespec')) ? this$0.g1w_1 : emptyList();
       var tmp_0;
       // Inline function 'kotlin.collections.isNotEmpty' call
       if (!injected.r()) {
-        tmp_0 = withElements(element, plus_1(element.s1m(), injected));
+        tmp_0 = withElements(element, plus_1(element.v1m(), injected));
       } else {
         tmp_0 = element;
       }
@@ -1025,7 +1037,7 @@ function sanitizeSymbol_0($this, _this__u8e3s4) {
     var item = _iterator__ex2g4s.v();
     var _unary__edvuaz = index;
     index = _unary__edvuaz + 1 | 0;
-    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.qq(item) : item;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.oq(item) : item;
     destination.x(tmp$ret$0);
   }
   // Inline function 'kotlin.text.filter' call
@@ -1065,7 +1077,7 @@ function sanitizeFirstIsDigit_0($this, _this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords_0($this, _this__u8e3s4) {
-  return Companion_getInstance_1().k1w_1.h1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance_1().j1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 }
 function sanitizeEnum_0($this, _this__u8e3s4) {
   return sanitizeKeywords_0($this, sanitizeFirstIsDigit_0($this, joinToString(split(_this__u8e3s4, ['-', ', ', '.', ' ', '//']), '_')));
@@ -1078,7 +1090,7 @@ function buildImports($this, _this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.xq().n1() === element.nu_1)) {
+    if (!(_this__u8e3s4.vq().l1() === element.lu_1)) {
       destination.x(element);
     }
   }
@@ -1088,7 +1100,7 @@ function buildImports($this, _this__u8e3s4) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$3 = import_0($this.l1v().or_1 + '.model', item.nu_1);
+    var tmp$ret$3 = import_0($this.k1v().mr_1 + '.model', item.lu_1);
     destination_0.x(tmp$ret$3);
   }
   return destination_0;
@@ -1100,18 +1112,18 @@ function injectHandleFunction($this, _this__u8e3s4, endpoint) {
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_0 = scope.a1u_1;
+  var this_0 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.f1h(JavaIrEmitter$injectHandleFunction$lambda(handlersStruct));
-  var tmp$ret$2 = this_1.g1h();
-  tmp.a1u_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.a1u_1;
+  this_1.d1h(JavaIrEmitter$injectHandleFunction$lambda(handlersStruct));
+  var tmp$ret$2 = this_1.e1h();
+  tmp.z1t_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.z1t_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function buildHandlers($this, endpoint) {
-  var pathTemplate = '/' + joinToString(endpoint.ip_1, '/', VOID, VOID, VOID, VOID, JavaIrEmitter$buildHandlers$lambda);
+  var pathTemplate = '/' + joinToString(endpoint.gp_1, '/', VOID, VOID, VOID, VOID, JavaIrEmitter$buildHandlers$lambda);
   return struct('Handlers', JavaIrEmitter$buildHandlers$lambda_0(pathTemplate, endpoint));
 }
 function withFullyQualifiedPrefix($this, _this__u8e3s4, prefix) {
@@ -1121,8 +1133,8 @@ function withFullyQualifiedPrefix($this, _this__u8e3s4, prefix) {
     // Inline function 'community.flock.wirespec.ir.core.transform' call
     var scope = new TransformScope(_this__u8e3s4);
     var tmp_0 = JavaIrEmitter$withFullyQualifiedPrefix$lambda;
-    scope.d1u(tmp_0, JavaIrEmitter$withFullyQualifiedPrefix$lambda_0(prefix));
-    var tmp_1 = scope.a1u_1;
+    scope.c1u(tmp_0, JavaIrEmitter$withFullyQualifiedPrefix$lambda_0(prefix));
+    var tmp_1 = scope.z1t_1;
     tmp = isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
   } else {
     tmp = _this__u8e3s4;
@@ -1132,20 +1144,20 @@ function withFullyQualifiedPrefix($this, _this__u8e3s4, prefix) {
 function transformTypeDescriptors($this, _this__u8e3s4) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
   var scope = new TransformScope(_this__u8e3s4);
-  scope.j1u(JavaIrEmitter$transformTypeDescriptors$lambda($this));
-  var tmp = scope.a1u_1;
+  scope.i1u(JavaIrEmitter$transformTypeDescriptors$lambda($this));
+  var tmp = scope.z1t_1;
   return isInterface(tmp, Element) ? tmp : THROW_CCE();
 }
 function findRoot($this, _this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Nullable) {
-    tmp = findRoot($this, _this__u8e3s4.q1h_1);
+    tmp = findRoot($this, _this__u8e3s4.o1h_1);
   } else {
     if (_this__u8e3s4 instanceof Array_0) {
-      tmp = findRoot($this, _this__u8e3s4.r1h_1);
+      tmp = findRoot($this, _this__u8e3s4.p1h_1);
     } else {
       if (_this__u8e3s4 instanceof Dict_0) {
-        tmp = findRoot($this, _this__u8e3s4.h1m_1);
+        tmp = findRoot($this, _this__u8e3s4.k1m_1);
       } else {
         tmp = _this__u8e3s4;
       }
@@ -1174,7 +1186,7 @@ function toJavaName($this, _this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Integer_0) {
     var tmp_0;
-    switch (_this__u8e3s4.d1m_1.c3_1) {
+    switch (_this__u8e3s4.g1m_1.b3_1) {
       case 0:
         tmp_0 = 'Integer';
         break;
@@ -1189,7 +1201,7 @@ function toJavaName($this, _this__u8e3s4) {
   } else {
     if (_this__u8e3s4 instanceof Number_1) {
       var tmp_1;
-      switch (_this__u8e3s4.e1m_1.c3_1) {
+      switch (_this__u8e3s4.h1m_1.b3_1) {
         case 0:
           tmp_1 = 'Float';
           break;
@@ -1218,7 +1230,7 @@ function toJavaName($this, _this__u8e3s4) {
                 tmp = 'Void';
               } else {
                 if (_this__u8e3s4 instanceof Custom_0) {
-                  tmp = _this__u8e3s4.s1h_1;
+                  tmp = _this__u8e3s4.q1h_1;
                 } else {
                   tmp = 'Object';
                 }
@@ -1233,7 +1245,7 @@ function toJavaName($this, _this__u8e3s4) {
 }
 function Companion_0() {
   Companion_instance_3 = this;
-  this.k1w_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.j1w_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']);
 }
 var Companion_instance_3;
 function Companion_getInstance_1() {
@@ -1245,10 +1257,10 @@ function JavaIrEmitter$sanitizationConfig$lambda(it) {
   return '_' + it;
 }
 function JavaIrEmitter$sanitizationConfig$lambda_0(name) {
-  return name.p1h_1.a1() > 1 ? new Name(listOf(name.t1l())) : name;
+  return name.n1h_1.a1() > 1 ? new Name(listOf(name.r1l())) : name;
 }
 function JavaIrEmitter$sanitizationConfig$lambda_1(name) {
-  return new Name(listOf(name.t1l()));
+  return new Name(listOf(name.r1l()));
 }
 function JavaIrEmitter$sanitizationConfig$lambda_2(this$0) {
   return function (it) {
@@ -1259,62 +1271,68 @@ function JavaIrEmitter$sanitizationConfig$lambda_3(stmt, tr) {
   var tmp;
   var tmp_0;
   if (stmt instanceof FunctionCall) {
-    tmp_0 = stmt.y1l_1.u1h() === 'validate';
+    tmp_0 = stmt.b1m_1.s1h() === 'validate';
   } else {
     tmp_0 = false;
   }
   if (tmp_0) {
-    tmp = transformChildren_0(stmt.c1m(VOID, emptyList()), tr);
+    tmp = transformChildren_0(stmt.f1m(VOID, emptyList()), tr);
   } else {
     tmp = transformChildren_0(stmt, tr);
   }
   return tmp;
 }
 function JavaIrEmitter$shared$1() {
-  this.e1w_1 = 'community.flock.wirespec.java';
-  this.f1w_1 = convert(new Shared(this.e1w_1));
-  this.g1w_1 = listOf_0([import_0('java.lang.reflect', 'Type'), import_0('java.lang.reflect', 'ParameterizedType'), import_0('java.util', 'List'), import_0('java.util', 'Map')]);
-  this.h1w_1 = plus_1(buildClientServerInterfaces(AccessorStyle_GETTER_METHODS_getInstance()), listOf(raw('public static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n  if(rawType != null) {\n    return new ParameterizedType() {\n      public Type getRawType() { return rawType; }\n      public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n      public Type getOwnerType() { return null; }\n    };\n  }\n  else { return actualTypeArguments; }\n}')));
+  this.d1w_1 = 'community.flock.wirespec.java';
+  this.e1w_1 = convert(new Shared(this.d1w_1));
+  this.f1w_1 = listOf_0([import_0('java.lang.reflect', 'Type'), import_0('java.lang.reflect', 'ParameterizedType'), import_0('java.util', 'List'), import_0('java.util', 'Map')]);
   var tmp = this;
+  // Inline function 'kotlin.collections.map' call
+  var this_0 = convertClientServer(new Shared(this.d1w_1));
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
+  var _iterator__ex2g4s = this_0.t();
+  while (_iterator__ex2g4s.u()) {
+    var item = _iterator__ex2g4s.v();
+    var tmp$ret$0 = toGetterAccessors(item, JavaIrEmitter$shared$o$clientServer$lambda);
+    destination.x(tmp$ret$0);
+  }
+  tmp.g1w_1 = plus_1(destination, listOf(raw('public static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n  if(rawType != null) {\n    return new ParameterizedType() {\n      public Type getRawType() { return rawType; }\n      public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n      public Type getOwnerType() { return null; }\n    };\n  }\n  else { return actualTypeArguments; }\n}')));
+  var tmp_0 = this;
   // Inline function 'community.flock.wirespec.ir.core.transform' call
-  var this_0 = this.f1w_1;
-  var scope = new TransformScope(this_0);
+  var this_1 = this.e1w_1;
+  var scope = new TransformScope(this_1);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
-  var tmp_0 = scope;
+  var tmp_1 = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_1 = scope.a1u_1;
+  var this_2 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
-  var this_2 = new TransformerBuilder();
-  this_2.f1h(JavaIrEmitter$shared$o$wirespecFile$lambda(this));
-  var tmp$ret$2 = this_2.g1h();
-  tmp_0.a1u_1 = transform(this_1, tmp$ret$2);
+  var this_3 = new TransformerBuilder();
+  this_3.d1h(JavaIrEmitter$shared$o$wirespecFile$lambda(this));
+  var tmp$ret$5 = this_3.e1h();
+  tmp_1.z1t_1 = transform(this_2, tmp$ret$5);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.injectAfter' call
-  var tmp_1 = scope;
+  var tmp_2 = scope;
   // Inline function 'community.flock.wirespec.ir.core.injectAfter' call
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_3 = scope.a1u_1;
+  var this_4 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
-  var this_4 = new TransformerBuilder();
-  this_4.f1h(JavaIrEmitter$shared$o$wirespecFile$lambda_0(this));
-  var tmp$ret$7 = this_4.g1h();
-  tmp_1.a1u_1 = transform(this_3, tmp$ret$7);
-  var tmp_2 = scope.a1u_1;
-  tmp.i1w_1 = isInterface(tmp_2, Element) ? tmp_2 : THROW_CCE();
-  this.j1w_1 = generateJava(this.i1w_1);
-}
-protoOf(JavaIrEmitter$shared$1).s1w = function () {
-  return this.j1w_1;
+  var this_5 = new TransformerBuilder();
+  this_5.d1h(JavaIrEmitter$shared$o$wirespecFile$lambda_0(this));
+  var tmp$ret$10 = this_5.e1h();
+  tmp_2.z1t_1 = transform(this_4, tmp$ret$10);
+  var tmp_3 = scope.z1t_1;
+  tmp_0.h1w_1 = isInterface(tmp_3, Element) ? tmp_3 : THROW_CCE();
+  this.i1w_1 = generateJava(this.h1w_1);
+}
+protoOf(JavaIrEmitter$shared$1).r1w = function () {
+  return this.i1w_1;
 };
 function JavaIrEmitter$emit$lambda(this$0) {
   return function () {
-    return new File(Companion_getInstance().o1h(Companion_instance.nr('community.flock.wirespec.java').qr() + 'Wirespec'), listOf(new RawElement(this$0.u1v().s1w())));
-  };
-}
-function JavaIrEmitter$emit$lambda_0(this$0) {
-  return function (it) {
-    return sanitizeSymbol_0(this$0, it.u1l());
+    return new File(Companion_getInstance().m1h(Companion_instance.lr('community.flock.wirespec.java').or() + 'Wirespec'), listOf(new RawElement(this$0.t1v().r1w())));
   };
 }
 function JavaIrEmitter$emit$lambda$lambda(this$0) {
@@ -1323,16 +1341,16 @@ function JavaIrEmitter$emit$lambda$lambda(this$0) {
   };
 }
 function JavaIrEmitter$emit$lambda$lambda_0($this$function) {
-  $this$function.j1i(String_instance);
-  $this$function.l1k(new VariableReference(Companion_getInstance().o1h('label')));
+  $this$function.k1i(String_instance);
+  $this$function.j1k(new VariableReference(Companion_getInstance().m1h('label')));
   return Unit_instance;
 }
-function JavaIrEmitter$emit$lambda_1(this$0) {
+function JavaIrEmitter$emit$lambda_0(this$0) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Enum) {
-      var tmp_0 = JavaIrEmitter$emit$lambda$lambda(this$0);
-      tmp = withLabelField(element, tmp_0, VOID, VOID, listOf(function_0('label', VOID, VOID, JavaIrEmitter$emit$lambda$lambda_0)));
+      var tmp_0 = withLabelField(element, JavaIrEmitter$emit$lambda$lambda(this$0));
+      tmp = plus_3(tmp_0, function_0('label', VOID, VOID, JavaIrEmitter$emit$lambda$lambda_0));
     } else {
       tmp = element;
     }
@@ -1342,18 +1360,18 @@ function JavaIrEmitter$emit$lambda_1(this$0) {
 }
 function JavaIrEmitter$emit$lambda$lambda_1($refined) {
   return function ($this$function) {
-    $this$function.j1i(convert_0($refined.er_1));
-    $this$function.l1k(new VariableReference(Companion_getInstance().o1h('value')));
+    $this$function.k1i(convert_0($refined.cr_1));
+    $this$function.j1k(new VariableReference(Companion_getInstance().m1h('value')));
     return Unit_instance;
   };
 }
-function JavaIrEmitter$emit$lambda_2($refined) {
+function JavaIrEmitter$emit$lambda_1($refined) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Struct) {
       var tmp_0 = listOf(new Custom_0('Wirespec.Refined'));
       // Inline function 'kotlin.collections.map' call
-      var this_0 = element.k1n_1;
+      var this_0 = element.j1n_1;
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
       var _iterator__ex2g4s = this_0.t();
@@ -1361,15 +1379,15 @@ function JavaIrEmitter$emit$lambda_2($refined) {
         var item = _iterator__ex2g4s.v();
         var tmp_1;
         if (item instanceof Function) {
-          tmp_1 = item.d1k(VOID, VOID, VOID, VOID, VOID, VOID, VOID, true);
+          tmp_1 = item.b1k(VOID, VOID, VOID, VOID, VOID, VOID, VOID, true);
         } else {
           tmp_1 = item;
         }
         var tmp$ret$0 = tmp_1;
         destination.x(tmp$ret$0);
       }
-      var tmp_2 = destination;
-      tmp = element.m1n(VOID, VOID, VOID, tmp_0, plus_1(tmp_2, listOf(function_0('value', VOID, true, JavaIrEmitter$emit$lambda$lambda_1($refined)))));
+      var tmp_2 = element.l1n(VOID, VOID, VOID, tmp_0, destination);
+      tmp = plus_3(tmp_2, function_0('value', VOID, true, JavaIrEmitter$emit$lambda$lambda_1($refined)));
     } else {
       tmp = element;
     }
@@ -1377,11 +1395,11 @@ function JavaIrEmitter$emit$lambda_2($refined) {
     return transformChildren(transformed, transformer);
   };
 }
-function JavaIrEmitter$emit$lambda_3($imports) {
+function JavaIrEmitter$emit$lambda_2($imports) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof File) {
-      tmp = element.u1m(VOID, plus_1($imports, element.r1m_1));
+      tmp = element.x1m(VOID, plus_1($imports, element.u1m_1));
     } else {
       tmp = element;
     }
@@ -1389,7 +1407,7 @@ function JavaIrEmitter$emit$lambda_3($imports) {
     return transformChildren(transformed, transformer);
   };
 }
-function JavaIrEmitter$emit$lambda_4(this$0, $fullyQualifiedPrefix) {
+function JavaIrEmitter$emit$lambda_3(this$0, $fullyQualifiedPrefix) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Interface) {
@@ -1401,12 +1419,12 @@ function JavaIrEmitter$emit$lambda_4(this$0, $fullyQualifiedPrefix) {
     return transformChildren(transformed, transformer);
   };
 }
-function JavaIrEmitter$emit$lambda_5(element, transformer) {
+function JavaIrEmitter$emit$lambda_4(element, transformer) {
   var tmp;
   if (element instanceof File) {
     // Inline function 'community.flock.wirespec.ir.core.findElement' call
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0 = element.s1m();
+    var tmp0 = element.v1m();
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination = ArrayList_init_$Create$();
     var _iterator__ex2g4s = tmp0.t();
@@ -1418,7 +1436,7 @@ function JavaIrEmitter$emit$lambda_5(element, transformer) {
     }
     var tmp$ret$2 = firstOrNull_0(destination);
     var interfaceElement = ensureNotNull(tmp$ret$2);
-    tmp = element.u1m(VOID, listOf_0([new RawElement('@FunctionalInterface\n'), interfaceElement]));
+    tmp = element.x1m(VOID, listOf_0([new RawElement('@FunctionalInterface\n'), interfaceElement]));
   } else {
     tmp = element;
   }
@@ -1430,9 +1448,9 @@ function JavaIrEmitter$emitEndpointClient$lambda($endpointName) {
     var tmp;
     if (element instanceof Function) {
       var tmp_0;
-      if (element.a1k_1 && element.z1j_1.a1() >= 2) {
-        var transportAssign = element.z1j_1.f1(element.z1j_1.a1() - 2 | 0);
-        var returnStmt = last(element.z1j_1);
+      if (element.y1j_1 && element.x1j_1.a1() >= 2) {
+        var transportAssign = element.x1j_1.f1(element.x1j_1.a1() - 2 | 0);
+        var returnStmt = last(element.x1j_1);
         var tmp_1;
         var tmp_2;
         if (transportAssign instanceof Assignment) {
@@ -1441,11 +1459,11 @@ function JavaIrEmitter$emitEndpointClient$lambda($endpointName) {
           tmp_2 = false;
         }
         if (tmp_2) {
-          var bodyPrefix = dropLast(element.z1j_1, 2);
-          var tmp0_name = Companion_getInstance().o1h('thenApply');
-          var tmp1_receiver = transportAssign.y1o_1;
-          var tmp2_arguments = mapOf(to(Companion_getInstance().o1h('mapper'), new RawExpression('rawResponse -> ' + $endpointName + '.fromRawResponse(serialization(), rawResponse)')));
-          tmp_1 = element.d1k(VOID, VOID, VOID, VOID, plus_2(bodyPrefix, new ReturnStatement(new FunctionCall(tmp1_receiver, VOID, tmp0_name, tmp2_arguments))));
+          var bodyPrefix = dropLast(element.x1j_1, 2);
+          var tmp0_name = Companion_getInstance().m1h('thenApply');
+          var tmp1_receiver = transportAssign.w1o_1;
+          var tmp2_arguments = mapOf(to(Companion_getInstance().m1h('mapper'), new RawExpression('rawResponse -> ' + $endpointName + '.fromRawResponse(serialization(), rawResponse)')));
+          tmp_1 = element.b1k(VOID, VOID, VOID, VOID, plus_2(bodyPrefix, new ReturnStatement(new FunctionCall(tmp1_receiver, VOID, tmp0_name, tmp2_arguments))));
         } else {
           tmp_1 = element;
         }
@@ -1469,7 +1487,7 @@ function JavaIrEmitter$injectHandleFunction$lambda$lambda($handlersStruct) {
       var tmp_0;
       // Inline function 'kotlin.collections.isNotEmpty' call
       if (!injected.r()) {
-        tmp_0 = withElements(element, plus_1(element.s1m(), injected));
+        tmp_0 = withElements(element, plus_1(element.v1m(), injected));
       } else {
         tmp_0 = element;
       }
@@ -1486,21 +1504,21 @@ function JavaIrEmitter$injectHandleFunction$lambda($handlersStruct) {
     var tmp;
     if (element instanceof Interface) {
       var tmp_0;
-      if (element.o1o_1.equals(Companion_getInstance().o1h('Handler'))) {
+      if (element.m1o_1.equals(Companion_getInstance().m1h('Handler'))) {
         // Inline function 'community.flock.wirespec.ir.core.transform' call
         var scope = new TransformScope(element);
         // Inline function 'community.flock.wirespec.ir.core.TransformScope.injectAfter' call
         var tmp_1 = scope;
         // Inline function 'community.flock.wirespec.ir.core.injectAfter' call
         // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-        var this_0 = scope.a1u_1;
+        var this_0 = scope.z1t_1;
         // Inline function 'community.flock.wirespec.ir.core.transformer' call
         // Inline function 'kotlin.apply' call
         var this_1 = new TransformerBuilder();
-        this_1.f1h(JavaIrEmitter$injectHandleFunction$lambda$lambda($handlersStruct));
-        var tmp$ret$2 = this_1.g1h();
-        tmp_1.a1u_1 = transform(this_0, tmp$ret$2);
-        var tmp_2 = scope.a1u_1;
+        this_1.d1h(JavaIrEmitter$injectHandleFunction$lambda$lambda($handlersStruct));
+        var tmp$ret$2 = this_1.e1h();
+        tmp_1.z1t_1 = transform(this_0, tmp$ret$2);
+        var tmp_2 = scope.z1t_1;
         tmp_0 = isInterface(tmp_2, Element) ? tmp_2 : THROW_CCE();
       } else {
         tmp_0 = element;
@@ -1516,10 +1534,10 @@ function JavaIrEmitter$injectHandleFunction$lambda($handlersStruct) {
 function JavaIrEmitter$buildHandlers$lambda(it) {
   var tmp;
   if (it instanceof Literal) {
-    tmp = it.jq_1;
+    tmp = it.hq_1;
   } else {
     if (it instanceof Param) {
-      tmp = '{' + it.np_1.n1() + '}';
+      tmp = '{' + it.lp_1.l1() + '}';
     } else {
       noWhenBranchMatchedException();
     }
@@ -1528,50 +1546,50 @@ function JavaIrEmitter$buildHandlers$lambda(it) {
 }
 function JavaIrEmitter$buildHandlers$lambda$lambda($pathTemplate) {
   return function ($this$function) {
-    $this$function.j1i(String_instance);
-    $this$function.l1k($this$function.d1t($pathTemplate));
+    $this$function.k1i(String_instance);
+    $this$function.j1k($this$function.c1t($pathTemplate));
     return Unit_instance;
   };
 }
 function JavaIrEmitter$buildHandlers$lambda$lambda_0($endpoint) {
   return function ($this$function) {
-    $this$function.j1i(String_instance);
-    $this$function.l1k($this$function.d1t($endpoint.hp_1.b3_1));
+    $this$function.k1i(String_instance);
+    $this$function.j1k($this$function.c1t($endpoint.fp_1.a3_1));
     return Unit_instance;
   };
 }
 function JavaIrEmitter$buildHandlers$lambda$lambda_1($this$function) {
-  $this$function.j1i($this$function.r1i('Wirespec.ServerEdge', [$this$function.r1i('Request', []), $this$function.r1i('Response', [Wildcard_instance])]));
-  $this$function.e1j('serialization', $this$function.r1i('Wirespec.Serialization', []));
-  $this$function.l1k(new RawExpression('new Wirespec.ServerEdge<>() {\n@Override public Request from(Wirespec.RawRequest request) {\n    return fromRawRequest(serialization, request);\n}\n@Override public Wirespec.RawResponse to(Response<?> response) {\n    return toRawResponse(serialization, response);\n}\n}'));
+  $this$function.k1i($this$function.t1h('Wirespec.ServerEdge', [$this$function.t1h('Request', []), $this$function.t1h('Response', [Wildcard_instance])]));
+  $this$function.l1i('serialization', $this$function.t1h('Wirespec.Serialization', []));
+  $this$function.j1k(new RawExpression('new Wirespec.ServerEdge<>() {\n@Override public Request from(Wirespec.RawRequest request) {\n    return fromRawRequest(serialization, request);\n}\n@Override public Wirespec.RawResponse to(Response<?> response) {\n    return toRawResponse(serialization, response);\n}\n}'));
   return Unit_instance;
 }
 function JavaIrEmitter$buildHandlers$lambda$lambda_2($this$function) {
-  $this$function.j1i($this$function.r1i('Wirespec.ClientEdge', [$this$function.r1i('Request', []), $this$function.r1i('Response', [Wildcard_instance])]));
-  $this$function.e1j('serialization', $this$function.r1i('Wirespec.Serialization', []));
-  $this$function.l1k(new RawExpression('new Wirespec.ClientEdge<>() {\n@Override public Wirespec.RawRequest to(Request request) {\n    return toRawRequest(serialization, request);\n}\n@Override public Response<?> from(Wirespec.RawResponse response) {\n    return fromRawResponse(serialization, response);\n}\n}'));
+  $this$function.k1i($this$function.t1h('Wirespec.ClientEdge', [$this$function.t1h('Request', []), $this$function.t1h('Response', [Wildcard_instance])]));
+  $this$function.l1i('serialization', $this$function.t1h('Wirespec.Serialization', []));
+  $this$function.j1k(new RawExpression('new Wirespec.ClientEdge<>() {\n@Override public Wirespec.RawRequest to(Request request) {\n    return toRawRequest(serialization, request);\n}\n@Override public Response<?> from(Wirespec.RawResponse response) {\n    return fromRawResponse(serialization, response);\n}\n}'));
   return Unit_instance;
 }
 function JavaIrEmitter$buildHandlers$lambda_0($pathTemplate, $endpoint) {
   return function ($this$struct) {
-    $this$struct.m1k($this$struct.r1i('Wirespec.Server', [$this$struct.r1i('Request', []), $this$struct.r1i('Response', [Wildcard_instance])]));
-    $this$struct.m1k($this$struct.r1i('Wirespec.Client', [$this$struct.r1i('Request', []), $this$struct.r1i('Response', [Wildcard_instance])]));
-    $this$struct.y1h('getPathTemplate', VOID, true, JavaIrEmitter$buildHandlers$lambda$lambda($pathTemplate));
-    $this$struct.y1h('getMethod', VOID, true, JavaIrEmitter$buildHandlers$lambda$lambda_0($endpoint));
-    $this$struct.y1h('getServer', VOID, true, JavaIrEmitter$buildHandlers$lambda$lambda_1);
-    $this$struct.y1h('getClient', VOID, true, JavaIrEmitter$buildHandlers$lambda$lambda_2);
+    $this$struct.k1k($this$struct.t1h('Wirespec.Server', [$this$struct.t1h('Request', []), $this$struct.t1h('Response', [Wildcard_instance])]));
+    $this$struct.k1k($this$struct.t1h('Wirespec.Client', [$this$struct.t1h('Request', []), $this$struct.t1h('Response', [Wildcard_instance])]));
+    $this$struct.b1i('getPathTemplate', VOID, true, JavaIrEmitter$buildHandlers$lambda$lambda($pathTemplate));
+    $this$struct.b1i('getMethod', VOID, true, JavaIrEmitter$buildHandlers$lambda$lambda_0($endpoint));
+    $this$struct.b1i('getServer', VOID, true, JavaIrEmitter$buildHandlers$lambda$lambda_1);
+    $this$struct.b1i('getClient', VOID, true, JavaIrEmitter$buildHandlers$lambda$lambda_2);
     return Unit_instance;
   };
 }
 function JavaIrEmitter$withFullyQualifiedPrefix$lambda(it) {
-  return it.w1n_1.equals(Companion_getInstance().o1h('message'));
+  return it.v1n_1.equals(Companion_getInstance().m1h('message'));
 }
 function JavaIrEmitter$withFullyQualifiedPrefix$lambda_0($prefix) {
   return function (param) {
-    var t = param.x1n_1;
+    var t = param.w1n_1;
     var tmp;
     if (t instanceof Custom_0) {
-      tmp = param.z1n(VOID, t.k1m($prefix + t.s1h_1));
+      tmp = param.y1n(VOID, t.n1m($prefix + t.q1h_1));
     } else {
       tmp = param;
     }
@@ -1582,8 +1600,8 @@ function JavaIrEmitter$transformTypeDescriptors$lambda(this$0) {
   return function (stmt, tr) {
     var tmp;
     if (stmt instanceof TypeDescriptor) {
-      var rootType = findRoot(this$0, stmt.i1p_1);
-      var containerStr = rawContainerClass(this$0, stmt.i1p_1);
+      var rootType = findRoot(this$0, stmt.h1p_1);
+      var containerStr = rawContainerClass(this$0, stmt.h1p_1);
       var rootStr = toJavaName(this$0, rootType) + '.class';
       var tmp_0;
       if (containerStr == null) {
@@ -1603,91 +1621,99 @@ function JavaIrEmitter$transformTypeDescriptors$lambda(this$0) {
 }
 function JavaIrEmitter(packageName, emitShared) {
   Companion_getInstance_1();
-  packageName = packageName === VOID ? Companion_instance.nr('community.flock.wirespec.generated') : packageName;
-  emitShared = emitShared === VOID ? Companion_instance_0.io() : emitShared;
-  this.l1w_1 = packageName;
-  this.m1w_1 = emitShared;
-  this.n1w_1 = JavaGenerator_instance;
-  this.o1w_1 = FileExtension_Java_getInstance();
-  this.p1w_1 = import_0('community.flock.wirespec.java', 'Wirespec');
+  packageName = packageName === VOID ? Companion_instance.lr('community.flock.wirespec.generated') : packageName;
+  emitShared = emitShared === VOID ? Companion_instance_0.go() : emitShared;
+  this.k1w_1 = packageName;
+  this.l1w_1 = emitShared;
+  this.m1w_1 = JavaGenerator_instance;
+  this.n1w_1 = FileExtension_Java_getInstance();
+  this.o1w_1 = listOf(import_0('community.flock.wirespec.java', 'Wirespec'));
   var tmp = this;
-  var tmp_0 = Companion_getInstance_1().k1w_1;
+  var tmp_0 = Companion_getInstance_1().j1w_1;
   var tmp_1 = JavaIrEmitter$sanitizationConfig$lambda;
   var tmp_2 = JavaIrEmitter$sanitizationConfig$lambda_0;
   var tmp_3 = JavaIrEmitter$sanitizationConfig$lambda_1;
   var tmp_4 = JavaIrEmitter$sanitizationConfig$lambda_2(this);
-  tmp.q1w_1 = new SanitizationConfig(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, JavaIrEmitter$sanitizationConfig$lambda_3);
+  tmp.p1w_1 = new SanitizationConfig(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, JavaIrEmitter$sanitizationConfig$lambda_3);
   var tmp_5 = this;
-  tmp_5.r1w_1 = new JavaIrEmitter$shared$1();
+  tmp_5.q1w_1 = new JavaIrEmitter$shared$1();
 }
-protoOf(JavaIrEmitter).l1v = function () {
-  return this.l1w_1;
+protoOf(JavaIrEmitter).k1v = function () {
+  return this.k1w_1;
 };
-protoOf(JavaIrEmitter).n1u = function () {
-  return this.n1w_1;
+protoOf(JavaIrEmitter).m1u = function () {
+  return this.m1w_1;
 };
-protoOf(JavaIrEmitter).gq = function () {
-  return this.o1w_1;
+protoOf(JavaIrEmitter).eq = function () {
+  return this.n1w_1;
 };
-protoOf(JavaIrEmitter).u1v = function () {
-  return this.r1w_1;
+protoOf(JavaIrEmitter).t1v = function () {
+  return this.q1w_1;
 };
-protoOf(JavaIrEmitter).o1u = function (module_0, logger) {
+protoOf(JavaIrEmitter).n1u = function (module_0, logger) {
   var tmp = emit_0.call(this, module_0, logger);
-  return withSharedSource(tmp, this.m1w_1, JavaIrEmitter$emit$lambda(this));
+  return withSharedSource(tmp, this.l1w_1, JavaIrEmitter$emit$lambda(this));
 };
-protoOf(JavaIrEmitter).wq = function (definition, module_0, logger) {
+protoOf(JavaIrEmitter).uq = function (definition, module_0, logger) {
   var file = emit_1.call(this, definition, module_0, logger);
-  var tmp = this.l1v();
-  var tmp_0 = Companion_instance_1.sq(module_0);
-  return wrapWithPackage(file, tmp, definition, this.p1w_1, tmp_0, JavaIrEmitter$emit$lambda_0(this));
+  var tmp = file.x1m(Companion_getInstance().m1h(sanitizeSymbol_0(this, file.t1m_1.x1l())));
+  // Inline function 'kotlin.takeIf' call
+  var this_0 = this.o1w_1;
+  var tmp_0;
+  if (Companion_instance_1.qq(module_0)) {
+    tmp_0 = this_0;
+  } else {
+    tmp_0 = null;
+  }
+  var tmp$ret$1 = tmp_0;
+  return placeInPackage(prependImports(tmp, tmp$ret$1), this.k1v(), definition);
 };
-protoOf(JavaIrEmitter).wp = function (type, module_0) {
-  return sanitizeNames(convertWithValidation(type, module_0), this.q1w_1);
+protoOf(JavaIrEmitter).up = function (type, module_0) {
+  return sanitizeNames(convertWithValidation(type, module_0), this.p1w_1);
 };
-protoOf(JavaIrEmitter).kr = function (enum_0, module_0) {
+protoOf(JavaIrEmitter).ir = function (enum_0, module_0) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
   var this_0 = convert_1(enum_0);
   var scope = new TransformScope(this_0);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_1 = scope.a1u_1;
+  var this_1 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_2 = new TransformerBuilder();
-  this_2.f1h(JavaIrEmitter$emit$lambda_1(this));
-  var tmp$ret$2 = this_2.g1h();
-  tmp.a1u_1 = transform(this_1, tmp$ret$2);
-  var tmp_0 = scope.a1u_1;
+  this_2.d1h(JavaIrEmitter$emit$lambda_0(this));
+  var tmp$ret$2 = this_2.e1h();
+  tmp.z1t_1 = transform(this_1, tmp$ret$2);
+  var tmp_0 = scope.z1t_1;
   var tmp$ret$6 = isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
-  return sanitizeNames(tmp$ret$6, this.q1w_1);
+  return sanitizeNames(tmp$ret$6, this.p1w_1);
 };
-protoOf(JavaIrEmitter).ar = function (union) {
-  return sanitizeNames(convert_2(union), this.q1w_1);
+protoOf(JavaIrEmitter).yq = function (union) {
+  return sanitizeNames(convert_2(union), this.p1w_1);
 };
-protoOf(JavaIrEmitter).fr = function (refined) {
+protoOf(JavaIrEmitter).dr = function (refined) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
   var this_0 = convert_3(refined);
   var scope = new TransformScope(this_0);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_1 = scope.a1u_1;
+  var this_1 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_2 = new TransformerBuilder();
-  this_2.f1h(JavaIrEmitter$emit$lambda_2(refined));
-  var tmp$ret$2 = this_2.g1h();
-  tmp.a1u_1 = transform(this_1, tmp$ret$2);
-  var tmp_0 = scope.a1u_1;
+  this_2.d1h(JavaIrEmitter$emit$lambda_1(refined));
+  var tmp$ret$2 = this_2.e1h();
+  tmp.z1t_1 = transform(this_1, tmp$ret$2);
+  var tmp_0 = scope.z1t_1;
   var tmp$ret$6 = isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
-  return sanitizeNames(tmp$ret$6, this.q1w_1);
+  return sanitizeNames(tmp$ret$6, this.p1w_1);
 };
-protoOf(JavaIrEmitter).lr = function (endpoint) {
+protoOf(JavaIrEmitter).jr = function (endpoint) {
   var imports = buildImports(this, endpoint);
   // Inline function 'kotlin.let' call
-  var file = sanitizeNames(transformTypeDescriptors(this, injectHandleFunction(this, convert_4(endpoint), endpoint)), this.q1w_1);
+  var file = sanitizeNames(transformTypeDescriptors(this, injectHandleFunction(this, convert_4(endpoint), endpoint)), this.p1w_1);
   var tmp;
   // Inline function 'kotlin.collections.isNotEmpty' call
   if (!imports.r()) {
@@ -1696,77 +1722,77 @@ protoOf(JavaIrEmitter).lr = function (endpoint) {
     // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
     var tmp_0 = scope;
     // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-    var this_0 = scope.a1u_1;
+    var this_0 = scope.z1t_1;
     // Inline function 'community.flock.wirespec.ir.core.transformer' call
     // Inline function 'kotlin.apply' call
     var this_1 = new TransformerBuilder();
-    this_1.f1h(JavaIrEmitter$emit$lambda_3(imports));
-    var tmp$ret$3 = this_1.g1h();
-    tmp_0.a1u_1 = transform(this_0, tmp$ret$3);
-    var tmp_1 = scope.a1u_1;
+    this_1.d1h(JavaIrEmitter$emit$lambda_2(imports));
+    var tmp$ret$3 = this_1.e1h();
+    tmp_0.z1t_1 = transform(this_0, tmp$ret$3);
+    var tmp_1 = scope.z1t_1;
     tmp = isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
   } else {
     tmp = file;
   }
   return tmp;
 };
-protoOf(JavaIrEmitter).zq = function (channel) {
+protoOf(JavaIrEmitter).xq = function (channel) {
   var tmp;
-  if (channel.oo_1.n1() === channel.po_1.n1()) {
-    tmp = this.l1v().or_1 + '.model.';
+  if (channel.mo_1.l1() === channel.no_1.l1()) {
+    tmp = this.k1v().mr_1 + '.model.';
   } else {
     tmp = '';
   }
   var fullyQualifiedPrefix = tmp;
   // Inline function 'community.flock.wirespec.ir.core.transform' call
-  var this_0 = sanitizeNames(convert_5(channel), this.q1w_1);
+  var this_0 = sanitizeNames(convert_5(channel), this.p1w_1);
   var scope = new TransformScope(this_0);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp_0 = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_1 = scope.a1u_1;
+  var this_1 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_2 = new TransformerBuilder();
-  this_2.f1h(JavaIrEmitter$emit$lambda_4(this, fullyQualifiedPrefix));
-  var tmp$ret$2 = this_2.g1h();
-  tmp_0.a1u_1 = transform(this_1, tmp$ret$2);
+  this_2.d1h(JavaIrEmitter$emit$lambda_3(this, fullyQualifiedPrefix));
+  var tmp$ret$2 = this_2.e1h();
+  tmp_0.z1t_1 = transform(this_1, tmp$ret$2);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp_1 = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_3 = scope.a1u_1;
+  var this_3 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_4 = new TransformerBuilder();
-  this_4.f1h(JavaIrEmitter$emit$lambda_5);
-  var tmp$ret$7 = this_4.g1h();
-  tmp_1.a1u_1 = transform(this_3, tmp$ret$7);
-  var tmp_2 = scope.a1u_1;
+  this_4.d1h(JavaIrEmitter$emit$lambda_4);
+  var tmp$ret$7 = this_4.e1h();
+  tmp_1.z1t_1 = transform(this_3, tmp$ret$7);
+  var tmp_2 = scope.z1t_1;
   return isInterface(tmp_2, Element) ? tmp_2 : THROW_CCE();
 };
-protoOf(JavaIrEmitter).r1u = function (endpoint) {
+protoOf(JavaIrEmitter).q1u = function (endpoint) {
   var imports = buildImports(this, endpoint);
-  var endpointImport = import_0(this.l1v().or_1 + '.endpoint', endpoint.gp_1.n1());
-  var file = transformTypeDescriptors(this, sanitizeNames(emitEndpointClient.call(this, endpoint), this.q1w_1));
-  var endpointName = endpoint.gp_1.n1();
+  var endpointImport = import_0(this.k1v().mr_1 + '.endpoint', endpoint.ep_1.l1());
+  var file = transformTypeDescriptors(this, sanitizeNames(emitEndpointClient.call(this, endpoint), this.p1w_1));
+  var endpointName = endpoint.ep_1.l1();
   // Inline function 'community.flock.wirespec.ir.core.transform' call
   var scope = new TransformScope(file);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_0 = scope.a1u_1;
+  var this_0 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.f1h(JavaIrEmitter$emitEndpointClient$lambda(endpointName));
-  var tmp$ret$2 = this_1.g1h();
-  tmp.a1u_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.a1u_1;
+  this_1.d1h(JavaIrEmitter$emitEndpointClient$lambda(endpointName));
+  var tmp$ret$2 = this_1.e1h();
+  tmp.z1t_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.z1t_1;
   var transformedFile = isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
-  var subPackageName = plus_0(this.l1v(), 'client');
-  return new File(Companion_getInstance().o1h(subPackageName.qr() + sanitizeSymbol_0(this, transformedFile.q1m_1.u1l())), plus_1(plus_1(plus_1(plus_1(listOf(new Package(subPackageName.or_1)), listOf(this.p1w_1)), imports), listOf(endpointImport)), transformedFile.r1m_1));
+  var subPackageName = plus_0(this.k1v(), 'client');
+  return new File(Companion_getInstance().m1h(subPackageName.or() + sanitizeSymbol_0(this, transformedFile.t1m_1.x1l())), plus_1(plus_1(plus_1(plus_1(listOf(new Package(subPackageName.mr_1)), this.o1w_1), imports), listOf(endpointImport)), transformedFile.u1m_1));
 };
-protoOf(JavaIrEmitter).q1u = function (endpoints, logger) {
+protoOf(JavaIrEmitter).p1u = function (endpoints, logger) {
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
@@ -1782,7 +1808,7 @@ protoOf(JavaIrEmitter).q1u = function (endpoints, logger) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var e = _iterator__ex2g4s_0.v();
-    var key = e.nu_1;
+    var key = e.lu_1;
     if (set.x(key)) {
       list_0.x(e);
     }
@@ -1809,7 +1835,7 @@ protoOf(JavaIrEmitter).q1u = function (endpoints, logger) {
       var _iterator__ex2g4s_2 = endpoints.t();
       while (_iterator__ex2g4s_2.u()) {
         var element_1 = _iterator__ex2g4s_2.v();
-        if (element_1.gp_1.n1() === element_0.nu_1) {
+        if (element_1.ep_1.l1() === element_0.lu_1) {
           tmp$ret$5 = false;
           break $l$block_0;
         }
@@ -1826,7 +1852,7 @@ protoOf(JavaIrEmitter).q1u = function (endpoints, logger) {
   var _iterator__ex2g4s_3 = destination_0.t();
   while (_iterator__ex2g4s_3.u()) {
     var item = _iterator__ex2g4s_3.v();
-    var tmp$ret$10 = import_0(this.l1v().or_1 + '.model', item.nu_1);
+    var tmp$ret$10 = import_0(this.k1v().mr_1 + '.model', item.lu_1);
     destination_1.x(tmp$ret$10);
   }
   var imports = destination_1;
@@ -1836,7 +1862,7 @@ protoOf(JavaIrEmitter).q1u = function (endpoints, logger) {
   var _iterator__ex2g4s_4 = endpoints.t();
   while (_iterator__ex2g4s_4.u()) {
     var item_0 = _iterator__ex2g4s_4.v();
-    var tmp$ret$13 = import_0(this.l1v().or_1 + '.endpoint', item_0.gp_1.n1());
+    var tmp$ret$13 = import_0(this.k1v().mr_1 + '.endpoint', item_0.ep_1.l1());
     destination_2.x(tmp$ret$13);
   }
   var endpointImports = destination_2;
@@ -1846,23 +1872,23 @@ protoOf(JavaIrEmitter).q1u = function (endpoints, logger) {
   var _iterator__ex2g4s_5 = endpoints.t();
   while (_iterator__ex2g4s_5.u()) {
     var item_1 = _iterator__ex2g4s_5.v();
-    var tmp$ret$16 = import_0(this.l1v().or_1 + '.client', item_1.gp_1.n1() + 'Client');
+    var tmp$ret$16 = import_0(this.k1v().mr_1 + '.client', item_1.ep_1.l1() + 'Client');
     destination_3.x(tmp$ret$16);
   }
   var clientImports = destination_3;
   var allImports = plus_1(plus_1(imports, endpointImports), clientImports);
-  var file = sanitizeNames(emitClient.call(this, endpoints, logger), this.q1w_1);
-  return new File(Companion_getInstance().o1h(this.l1v().qr() + sanitizeSymbol_0(this, file.q1m_1.u1l())), plus_1(plus_1(plus_1(listOf(new Package(this.l1v().or_1)), listOf(this.p1w_1)), allImports), file.r1m_1));
+  var file = sanitizeNames(emitClient.call(this, endpoints, logger), this.p1w_1);
+  return new File(Companion_getInstance().m1h(this.k1v().or() + sanitizeSymbol_0(this, file.t1m_1.x1l())), plus_1(plus_1(plus_1(listOf(new Package(this.k1v().mr_1)), this.o1w_1), allImports), file.u1m_1));
 };
 function JavaRefinedTypeDefinitionEmitter() {
 }
 function JavaShared() {
   JavaShared_instance = this;
-  this.v1v_1 = 'community.flock.wirespec.java';
-  this.w1v_1 = trimMargin('\n        |package ' + this.v1v_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        |import java.util.Optional;\n        |\n        |public interface Wirespec {\n        |' + Spacer_instance.toString() + 'interface Enum { String label(); }\n        |' + Spacer_instance.toString() + 'interface Endpoint {}\n        |' + Spacer_instance.toString() + 'interface Refined<T> { T value(); }\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.sr(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.sr(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.sr(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.sr(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.sr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.sr(2) + 'String getMethod();\n        |' + Spacer_instance.sr(2) + 'ClientEdge<Req, Res> getClient(Serialization serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Server<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.sr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.sr(2) + 'String getMethod();\n        |' + Spacer_instance.sr(2) + 'ServerEdge<Req, Res> getServer(Serialization 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 path(); Method method(); Queries queries(); Headers headers(); T body(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Response<T> { Integer status(); Headers headers(); T body(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Serialization extends Serializer, Deserializer {}\n        |' + Spacer_instance.toString() + 'interface Serializer extends BodySerializer, PathSerializer, ParamSerializer {}\n        |' + Spacer_instance.toString() + 'interface Deserializer extends BodyDeserializer, PathDeserializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface BodySerialization extends BodySerializer, BodyDeserializer {}\n        |' + Spacer_instance.toString() + 'interface BodySerializer { <T> byte[] serializeBody(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface BodyDeserializer { <T> T deserializeBody(byte[] raw, Type type); }\n        |' + Spacer_instance.toString() + 'interface PathSerialization extends PathSerializer, PathDeserializer {}\n        |' + Spacer_instance.toString() + 'interface PathSerializer { <T> String serializePath(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface PathDeserializer { <T> T deserializePath(String raw, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamSerialization extends ParamSerializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface ParamSerializer { <T> List<String> serializeParam(T value, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamDeserializer { <T> T deserializeParam(List<String> values, Type type); }\n        |' + Spacer_instance.toString() + 'record RawRequest(String method, List<String> path, Map<String, List<String>> queries, Map<String, List<String>> headers, Optional<byte[]> body) {}\n        |' + Spacer_instance.toString() + 'record RawResponse(int statusCode, Map<String, List<String>> headers, Optional<byte[]> body) {}\n        |' + Spacer_instance.toString() + 'static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n        |' + Spacer_instance.sr(2) + 'if(rawType != null) {\n        |' + Spacer_instance.sr(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.sr(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.sr(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.sr(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.sr(3) + '};\n        |' + Spacer_instance.sr(2) + '}\n        |' + Spacer_instance.sr(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
+  this.u1v_1 = 'community.flock.wirespec.java';
+  this.v1v_1 = trimMargin('\n        |package ' + this.u1v_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        |import java.util.Optional;\n        |\n        |public interface Wirespec {\n        |' + Spacer_instance.toString() + 'interface Enum { String label(); }\n        |' + Spacer_instance.toString() + 'interface Endpoint {}\n        |' + Spacer_instance.toString() + 'interface Refined<T> { T value(); }\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.qr(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.qr(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.qr(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.qr(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.qr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.qr(2) + 'String getMethod();\n        |' + Spacer_instance.qr(2) + 'ClientEdge<Req, Res> getClient(Serialization serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Server<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.qr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.qr(2) + 'String getMethod();\n        |' + Spacer_instance.qr(2) + 'ServerEdge<Req, Res> getServer(Serialization 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 path(); Method method(); Queries queries(); Headers headers(); T body(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Response<T> { Integer status(); Headers headers(); T body(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Serialization extends Serializer, Deserializer {}\n        |' + Spacer_instance.toString() + 'interface Serializer extends BodySerializer, PathSerializer, ParamSerializer {}\n        |' + Spacer_instance.toString() + 'interface Deserializer extends BodyDeserializer, PathDeserializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface BodySerialization extends BodySerializer, BodyDeserializer {}\n        |' + Spacer_instance.toString() + 'interface BodySerializer { <T> byte[] serializeBody(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface BodyDeserializer { <T> T deserializeBody(byte[] raw, Type type); }\n        |' + Spacer_instance.toString() + 'interface PathSerialization extends PathSerializer, PathDeserializer {}\n        |' + Spacer_instance.toString() + 'interface PathSerializer { <T> String serializePath(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface PathDeserializer { <T> T deserializePath(String raw, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamSerialization extends ParamSerializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface ParamSerializer { <T> List<String> serializeParam(T value, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamDeserializer { <T> T deserializeParam(List<String> values, Type type); }\n        |' + Spacer_instance.toString() + 'record RawRequest(String method, List<String> path, Map<String, List<String>> queries, Map<String, List<String>> headers, Optional<byte[]> body) {}\n        |' + Spacer_instance.toString() + 'record RawResponse(int statusCode, Map<String, List<String>> headers, Optional<byte[]> body) {}\n        |' + Spacer_instance.toString() + 'static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n        |' + Spacer_instance.qr(2) + 'if(rawType != null) {\n        |' + Spacer_instance.qr(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.qr(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.qr(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.qr(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.qr(3) + '};\n        |' + Spacer_instance.qr(2) + '}\n        |' + Spacer_instance.qr(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
 }
-protoOf(JavaShared).s1w = function () {
-  return this.w1v_1;
+protoOf(JavaShared).r1w = function () {
+  return this.v1v_1;
 };
 protoOf(JavaShared).toString = function () {
   return 'JavaShared';
@@ -1886,10 +1912,10 @@ function JavaShared_getInstance() {
 function emitType($this, _this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = 'java.util.Map<String, ' + $this.zp(_this__u8e3s4.eo_1) + '>';
+    tmp = 'java.util.Map<String, ' + $this.xp(_this__u8e3s4.co_1) + '>';
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = 'java.util.List<' + $this.zp(_this__u8e3s4.bo_1) + '>';
+      tmp = 'java.util.List<' + $this.xp(_this__u8e3s4.zn_1) + '>';
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = 'void';
@@ -1898,7 +1924,7 @@ function emitType($this, _this__u8e3s4) {
           tmp = 'Object';
         } else {
           if (_this__u8e3s4 instanceof Custom) {
-            tmp = _this__u8e3s4.nu_1;
+            tmp = _this__u8e3s4.lu_1;
           } else {
             if (_this__u8e3s4 instanceof Primitive) {
               tmp = emit_18($this, _this__u8e3s4);
@@ -1913,14 +1939,14 @@ function emitType($this, _this__u8e3s4) {
   return tmp;
 }
 function emit_18($this, _this__u8e3s4) {
-  var t = _this__u8e3s4.ru_1;
+  var t = _this__u8e3s4.pu_1;
   var tmp;
   if (t instanceof String_0) {
     tmp = 'String';
   } else {
     if (t instanceof Integer) {
       var tmp_0;
-      switch (t.vt_1.c3_1) {
+      switch (t.tt_1.b3_1) {
         case 0:
           tmp_0 = 'Integer';
           break;
@@ -1935,7 +1961,7 @@ function emit_18($this, _this__u8e3s4) {
     } else {
       if (t instanceof Number_0) {
         var tmp_1;
-        switch (t.yt_1.c3_1) {
+        switch (t.wt_1.b3_1) {
           case 0:
             tmp_1 = 'Float';
             break;
@@ -1964,43 +1990,43 @@ function emit_18($this, _this__u8e3s4) {
 }
 function JavaTypeDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
-    return this$0.zp(it);
+    return this$0.xp(it);
   };
 }
 function JavaTypeDefinitionEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return Spacer_instance.toString() + this$0.yp(it) + ',';
+    return Spacer_instance.toString() + this$0.wp(it) + ',';
   };
 }
 function JavaTypeDefinitionEmitter() {
 }
 function JavaUnionDefinitionEmitter$emit$lambda(it) {
-  return it.n1();
+  return it.l1();
 }
 function JavaUnionDefinitionEmitter() {
 }
 //region block: post-declaration
-protoOf(JavaEmitter).yq = emit_9;
-protoOf(JavaEmitter).wp = emit_3;
-protoOf(JavaEmitter).xp = emit_4;
-protoOf(JavaEmitter).yp = emit_5;
-protoOf(JavaEmitter).zp = emit_6;
-protoOf(JavaEmitter).aq = emit_7;
-protoOf(JavaEmitter).lr = emit_11;
-protoOf(JavaEmitter).y1v = emit_12;
-protoOf(JavaEmitter).z1v = emit_13;
-protoOf(JavaEmitter).zq = emit_8;
-protoOf(JavaEmitter).kr = emit_10;
-protoOf(JavaEmitter).ar = emit_15;
-protoOf(JavaEmitter).fr = emit_14;
-protoOf(JavaEmitter).x1v = sanitizeSymbol;
-protoOf(JavaEmitter).a1w = sanitizeFirstIsDigit;
-protoOf(JavaEmitter).b1w = sanitizeKeywords;
-protoOf(JavaEmitter).n1v = emitRoot;
-protoOf(JavaEmitter).m1v = emitRoot$default;
-protoOf(JavaEmitter).c1w = emitHandleFunction;
-protoOf(JavaEmitter).mr = emitValidator;
-protoOf(JavaIrEmitter).qn = emit_2;
+protoOf(JavaEmitter).wq = emit_9;
+protoOf(JavaEmitter).up = emit_3;
+protoOf(JavaEmitter).vp = emit_4;
+protoOf(JavaEmitter).wp = emit_5;
+protoOf(JavaEmitter).xp = emit_6;
+protoOf(JavaEmitter).yp = emit_7;
+protoOf(JavaEmitter).jr = emit_13;
+protoOf(JavaEmitter).x1v = emit_14;
+protoOf(JavaEmitter).y1v = emit_15;
+protoOf(JavaEmitter).xq = emit_8;
+protoOf(JavaEmitter).ir = emit_10;
+protoOf(JavaEmitter).yq = emit_11;
+protoOf(JavaEmitter).dr = emit_12;
+protoOf(JavaEmitter).w1v = sanitizeSymbol;
+protoOf(JavaEmitter).z1v = sanitizeFirstIsDigit;
+protoOf(JavaEmitter).a1w = sanitizeKeywords;
+protoOf(JavaEmitter).m1v = emitRoot;
+protoOf(JavaEmitter).l1v = emitRoot$default;
+protoOf(JavaEmitter).b1w = emitHandleFunction;
+protoOf(JavaEmitter).kr = emitValidator;
+protoOf(JavaIrEmitter).on = emit_2;
 //endregion
 //region block: exports
 export {