@flock/wirespec 0.18.6 → 0.18.13

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

@@ -160,8 +160,8 @@ import {
   Function21cuq8qizkin7 as Function,
   plusd54zq6f7l8fy as plus_3,
   Struct39wf79cwtn4ty as Struct,
-  Interface3pn84xq686t2r as Interface,
   RawElement2yts1x2rbem1g as RawElement,
+  Interface3pn84xq686t2r as Interface,
   Assignment3kcxc8wlcbmkn as Assignment,
   ReturnStatement29qlfkn9kpy10 as ReturnStatement,
   Wildcard_instance2ga1ytfwj78ra as Wildcard_instance,
@@ -170,10 +170,10 @@ import {
 //endregion
 //region block: pre-declaration
 function emit_3(type, module_0) {
-  var tmp = this.wq(type.vo_1);
-  var tmp_0 = this.vp(type.wo_1);
+  var tmp = this.br(type.zo_1);
+  var tmp_0 = this.zp(type.ap_1);
   // Inline function 'kotlin.run' call
-  var $this$run = type.xo_1;
+  var $this$run = type.bp_1;
   var tmp_1;
   if ($this$run.r()) {
     tmp_1 = '';
@@ -184,23 +184,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.so_1, '\n', VOID, VOID, VOID, VOID, JavaTypeDefinitionEmitter$emit$lambda_0(this)), 1);
+  return dropLast_0(joinToString(_this__u8e3s4.wo_1, '\n', VOID, VOID, VOID, VOID, JavaTypeDefinitionEmitter$emit$lambda_0(this)), 1);
 }
 function emit_5(_this__u8e3s4) {
-  return this.xp(_this__u8e3s4.bp_1) + ' ' + this.wq(_this__u8e3s4.ap_1);
+  return this.bq(_this__u8e3s4.fp_1) + ' ' + this.br(_this__u8e3s4.ep_1);
 }
 function emit_6(_this__u8e3s4) {
   // Inline function 'kotlin.let' call
   var it = emitType(this, _this__u8e3s4);
-  return _this__u8e3s4.cu() ? 'java.util.Optional<' + it + '>' : it;
+  return _this__u8e3s4.hu() ? 'java.util.Optional<' + it + '>' : it;
 }
 function emitRoot(_this__u8e3s4, void_0) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = this.e1v(_this__u8e3s4.co_1);
+    tmp = this.j1v(_this__u8e3s4.go_1);
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = this.e1v(_this__u8e3s4.zn_1);
+      tmp = this.j1v(_this__u8e3s4.do_1);
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = void_0;
@@ -229,15 +229,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.f1v(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
+  return $super === VOID ? this.k1v(_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.zp(_this__u8e3s4.ys_1), '\\', '\\\\') + '").matcher(value).find();';
+    tmp = 'return java.util.regex.Pattern.compile("' + replace(this.dq(_this__u8e3s4.dt_1), '\\', '\\\\') + '").matcher(value).find();';
   } else {
     if (_this__u8e3s4 instanceof Bound) {
-      var tmp1_safe_receiver = _this__u8e3s4.ot_1;
+      var tmp1_safe_receiver = _this__u8e3s4.tt_1;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
         tmp_0 = null;
@@ -246,7 +246,7 @@ function emit_7(_this__u8e3s4) {
         tmp_0 = tmp1_safe_receiver + ' < value';
       }
       var minCheck = tmp_0;
-      var tmp2_safe_receiver = _this__u8e3s4.pt_1;
+      var tmp2_safe_receiver = _this__u8e3s4.ut_1;
       var tmp_1;
       if (tmp2_safe_receiver == null) {
         tmp_1 = null;
@@ -272,16 +272,84 @@ 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.wq(channel.mo_1) + ' {\n        |   void invoke(' + emitFullyQualified(this, channel, channel.no_1) + this.e1v(channel.no_1) + ' message);\n        |}\n        |\n    ');
+  return trimMargin('\n        |' + emitImports(this, channel) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.br(channel.qo_1) + ' {\n        |   void invoke(' + emitFullyQualified(this, channel, channel.ro_1) + this.j1v(channel.ro_1) + ' message);\n        |}\n        |\n    ');
 }
 initMetadataForInterface(JavaChannelDefinitionEmitter, 'JavaChannelDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_9(identifier) {
+function emit_9(endpoint) {
+  var tmp = emitImports_0(this, endpoint);
+  var tmp_0 = this.br(endpoint.ip_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.lp_1, 'Queries', 'Wirespec.Queries', JavaEndpointDefinitionEmitter$emit$lambda_0(this));
+  var tmp_4 = emitObject(this, endpoint.mp_1, 'RequestHeaders', 'Wirespec.Request.Headers', JavaEndpointDefinitionEmitter$emit$lambda_1(this));
+  var tmp_5 = this.v1v(first_0(endpoint.np_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.op_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.np_1), endpoint);
+  var tmp_13 = Spacer_instance.vr(2);
+  var tmp_14 = distinctByStatus(endpoint.op_1);
+  var tmp_15 = joinToString(tmp_14, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_3(this));
+  var tmp_16 = Spacer_instance.vr(3);
+  var tmp_17 = Spacer_instance.vr(2);
+  var tmp_18 = Spacer_instance.vr(2);
+  var tmp_19 = emitFromResponse(this, endpoint);
+  var tmp_20 = Spacer_instance.vr(2);
+  var tmp_21 = Spacer_instance.vr(2);
+  var tmp_22 = this.z1v(endpoint);
+  var tmp_23 = Spacer_instance.vr(2);
+  var tmp_24 = Spacer_instance.vr(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.kp_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_4) + '"; }\n        |' + Spacer_instance.vr(3) + '@Override public String getMethod() { return "' + endpoint.jp_1.toString() + '"; }\n        |' + Spacer_instance.vr(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.vr(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.vr(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.vr(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.vr(4) + '};\n        |' + Spacer_instance.vr(3) + '}\n        |' + Spacer_instance.vr(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.vr(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.vr(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.vr(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.vr(4) + '};\n        |' + Spacer_instance.vr(3) + '}\n        |' + Spacer_instance.vr(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+}
+function emitHandleFunction(endpoint) {
+  return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.tq(this.br(endpoint.ip_1)) + '(Request request);';
+}
+function emit_10(_this__u8e3s4, endpoint) {
+  return trimMargin('\n        |' + Spacer_instance.toString() + 'record Request (\n        |' + Spacer_instance.vr(2) + 'Path path,\n        |' + Spacer_instance.vr(2) + 'Wirespec.Method method,\n        |' + Spacer_instance.vr(2) + 'Queries queries,\n        |' + Spacer_instance.vr(2) + 'RequestHeaders headers,\n        |' + Spacer_instance.vr(2) + emit_16(this, _this__u8e3s4.rp_1) + ' body\n        |' + Spacer_instance.toString() + ') implements Wirespec.Request<' + emit_16(this, _this__u8e3s4.rp_1) + '> {\n        |' + Spacer_instance.vr(2) + emitConstructor(this, _this__u8e3s4, endpoint) + '\n        |' + Spacer_instance.toString() + '}\n    ');
+}
+function emit_11(_this__u8e3s4) {
+  var tmp = Spacer_instance.toString();
+  var tmp_0 = Companion_instance_1.sq(_this__u8e3s4.up_1);
+  var tmp_1 = Spacer_instance.vr(2);
+  var tmp_2 = Spacer_instance.vr(2);
+  var tmp_3 = Spacer_instance.vr(2);
+  var tmp_4 = emit_16(this, _this__u8e3s4.wp_1);
+  var tmp_5 = Spacer_instance.toString();
+  var tmp_6 = toString_0(first(_this__u8e3s4.up_1));
+  var tmp_7 = emit_16(this, _this__u8e3s4.wp_1);
+  var tmp_8 = concatGenerics(emit_16(this, _this__u8e3s4.wp_1));
+  var tmp_9 = Spacer_instance.vr(2);
+  var tmp_10 = Companion_instance_1.sq(_this__u8e3s4.up_1);
+  var tmp_11 = orNull(joinToString(_this__u8e3s4.vp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_5(this)));
+  var tmp0_safe_receiver = _this__u8e3s4.wp_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.vr(3);
+  var tmp_15 = fixStatus(_this__u8e3s4.up_1);
+  // Inline function 'kotlin.let' call
+  var tmp_16 = 'new Headers(' + joinToString(_this__u8e3s4.vp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_6(this)) + ')';
+  var tmp_17 = _this__u8e3s4.wp_1 == null ? 'null' : 'body';
+  var tmp_18 = Spacer_instance.vr(2);
+  var tmp_19 = Spacer_instance.vr(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.vp_1, 'Headers', 'Wirespec.Response.Headers', JavaEndpointDefinitionEmitter$emit$lambda_7(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
+}
+initMetadataForInterface(JavaEndpointDefinitionEmitter, 'JavaEndpointDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
+function emit_12(identifier) {
   var tmp;
   if (identifier instanceof DefinitionIdentifier) {
-    tmp = this.p1v(identifier.l1());
+    tmp = this.u1v(identifier.l1());
   } else {
     if (identifier instanceof FieldIdentifier) {
-      tmp = this.t1v(this.p1v(identifier.l1()));
+      tmp = this.y1v(this.u1v(identifier.l1()));
     } else {
       noWhenBranchMatchedException();
     }
@@ -299,11 +367,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.oq(item) : item;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.sq(item) : item;
     destination.x(tmp$ret$0);
   }
   var tmp = asSequence(joinToString(destination, ''));
-  return this.s1v(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
+  return this.x1v(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
 }
 function sanitizeFirstIsDigit(_this__u8e3s4) {
   var tmp;
@@ -323,34 +391,39 @@ function sanitizeFirstIsDigit(_this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords(_this__u8e3s4) {
-  return Companion_getInstance_0().v1v_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance_0().a1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 }
 initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
-function emit_10(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 emit_13(enum_0, module_0) {
+  var tmp = this.br(enum_0.lr_1);
+  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.mr_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.br(enum_0.lr_1) + '(String label) {\n        |' + Spacer_instance.vr(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.vr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String label() {\n        |' + Spacer_instance.vr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+}
+initMetadataForInterface(JavaEnumDefinitionEmitter, 'JavaEnumDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
+function emit_14(refined) {
+  return trimMargin('\n        |public record ' + this.br(refined.gr_1) + ' (' + this.bq(refined.hr_1) + ' value) implements Wirespec.Refined<' + this.bq(refined.hr_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.pr(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public ' + this.bq(refined.hr_1) + ' value() { return value; }\n        |}\n        |\n    ');
 }
 function emitValidator(_this__u8e3s4) {
   var defaultReturn = 'return true;';
-  var type = _this__u8e3s4.cr_1.ou_1;
+  var type = _this__u8e3s4.hr_1.tu_1;
   var tmp;
   if (type instanceof Integer) {
-    var tmp0_safe_receiver = type.tt_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.yp(tmp0_safe_receiver);
+    var tmp0_safe_receiver = type.yt_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.cq(tmp0_safe_receiver);
     tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
   } else {
     if (type instanceof Number_0) {
-      var tmp2_safe_receiver = type.wt_1;
-      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.yp(tmp2_safe_receiver);
+      var tmp2_safe_receiver = type.bu_1;
+      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.cq(tmp2_safe_receiver);
       tmp = tmp3_elvis_lhs == null ? defaultReturn : tmp3_elvis_lhs;
     } else {
       if (type instanceof String_0) {
-        var tmp4_safe_receiver = type.qt_1;
+        var tmp4_safe_receiver = type.vt_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.yp(new RegExp_0(tmp4_safe_receiver));
+          tmp_0 = this.cq(new RegExp_0(tmp4_safe_receiver));
         }
         var tmp5_elvis_lhs = tmp_0;
         tmp = tmp5_elvis_lhs == null ? defaultReturn : tmp5_elvis_lhs;
@@ -370,85 +443,12 @@ function emitValidator(_this__u8e3s4) {
   return tmp;
 }
 initMetadataForInterface(JavaRefinedTypeDefinitionEmitter, 'JavaRefinedTypeDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_11(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.q1v(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.u1v(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    ');
-}
-function emitHandleFunction(endpoint) {
-  return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.pq(this.wq(endpoint.ep_1)) + '(Request request);';
-}
-function emit_12(_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_13(_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]);
-function emit_14(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_15(union) {
+  var tmp = this.br(union.uo_1);
+  return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.vo_1, VOID, VOID, VOID, VOID, VOID, JavaUnionDefinitionEmitter$emit$lambda) + ' {}\n        |\n    ');
 }
 initMetadataForInterface(JavaUnionDefinitionEmitter, 'JavaUnionDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-function emit_15(enum_0, module_0) {
-  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]);
-initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaChannelDefinitionEmitter, JavaIdentifierEmitter, JavaRefinedTypeDefinitionEmitter, JavaEndpointDefinitionEmitter, JavaUnionDefinitionEmitter, JavaTypeDefinitionEmitter, JavaEnumDefinitionEmitter, LanguageEmitter]);
+initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaEndpointDefinitionEmitter, JavaEnumDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, JavaUnionDefinitionEmitter, JavaTypeDefinitionEmitter, JavaIdentifierEmitter, JavaChannelDefinitionEmitter, LanguageEmitter]);
 initMetadataForCompanion(Companion);
 initMetadataForCompanion(Companion_0);
 initMetadataForClass(JavaIrEmitter, 'JavaIrEmitter', JavaIrEmitter, VOID, [IrEmitter]);
@@ -462,7 +462,7 @@ function emitImports($this, _this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.vq().l1() === element.ku_1)) {
+    if (!(_this__u8e3s4.ar().l1() === element.pu_1)) {
       destination.x(element);
     }
   }
@@ -472,7 +472,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.d1v().mr_1 + '.model.' + item.ku_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.i1v().rr_1 + '.model.' + item.pu_1 + ';';
     destination_0.x(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -480,8 +480,8 @@ function emitImports($this, _this__u8e3s4) {
 }
 function emitFullyQualified($this, _this__u8e3s4, reference) {
   var tmp;
-  if (_this__u8e3s4.vq().l1() === reference.l1()) {
-    tmp = $this.d1v().mr_1 + '.model.';
+  if (_this__u8e3s4.ar().l1() === reference.l1()) {
+    tmp = $this.i1v().rr_1 + '.model.';
   } else {
     tmp = '';
   }
@@ -494,49 +494,49 @@ function JavaChannelDefinitionEmitter$emitImports$lambda(it) {
 function JavaChannelDefinitionEmitter() {
 }
 function JavaEmitter(packageName, emitShared) {
-  packageName = packageName === VOID ? Companion_instance.lr('community.flock.wirespec.generated') : packageName;
-  emitShared = emitShared === VOID ? Companion_instance_0.go() : emitShared;
+  packageName = packageName === VOID ? Companion_instance.qr('community.flock.wirespec.generated') : packageName;
+  emitShared = emitShared === VOID ? Companion_instance_0.ko() : emitShared;
   LanguageEmitter.call(this);
-  this.g1v_1 = packageName;
-  this.h1v_1 = emitShared;
-  this.i1v_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
-  this.j1v_1 = FileExtension_Java_getInstance();
-  this.k1v_1 = JavaShared_getInstance();
-  this.l1v_1 = '//';
-}
-protoOf(JavaEmitter).d1v = function () {
-  return this.g1v_1;
+  this.l1v_1 = packageName;
+  this.m1v_1 = emitShared;
+  this.n1v_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
+  this.o1v_1 = FileExtension_Java_getInstance();
+  this.p1v_1 = JavaShared_getInstance();
+  this.q1v_1 = '//';
+}
+protoOf(JavaEmitter).i1v = function () {
+  return this.l1v_1;
 };
-protoOf(JavaEmitter).eq = function () {
-  return this.j1v_1;
+protoOf(JavaEmitter).iq = function () {
+  return this.o1v_1;
 };
-protoOf(JavaEmitter).m1v = function () {
-  return this.k1v_1;
+protoOf(JavaEmitter).r1v = function () {
+  return this.p1v_1;
 };
-protoOf(JavaEmitter).fq = function () {
-  return this.l1v_1;
+protoOf(JavaEmitter).jq = function () {
+  return this.q1v_1;
 };
-protoOf(JavaEmitter).tq = function (module_0, logger) {
+protoOf(JavaEmitter).yq = function (module_0, logger) {
   // Inline function 'kotlin.let' call
-  var it = protoOf(LanguageEmitter).tq.call(this, module_0, logger);
-  return this.h1v_1.ho_1 ? NonEmptyList__plus_impl_xqmb9(it, new Emitted(Companion_instance.lr('community.flock.wirespec.java').or() + 'Wirespec', this.m1v().o1v_1)) : it;
+  var it = protoOf(LanguageEmitter).yq.call(this, module_0, logger);
+  return this.m1v_1.lo_1 ? NonEmptyList__plus_impl_xqmb9(it, new Emitted(Companion_instance.qr('community.flock.wirespec.java').tr() + 'Wirespec', this.r1v().t1v_1)) : it;
 };
-protoOf(JavaEmitter).uq = function (definition, module_0, logger) {
+protoOf(JavaEmitter).zq = function (definition, module_0, logger) {
   // Inline function 'kotlin.let' call
-  var it = protoOf(LanguageEmitter).uq.call(this, definition, module_0, logger);
-  var subPackageName = plus(this.d1v(), definition);
-  var tmp = subPackageName.or() + this.p1v(it.io_1);
+  var it = protoOf(LanguageEmitter).zq.call(this, definition, module_0, logger);
+  var subPackageName = plus(this.i1v(), definition);
+  var tmp = subPackageName.tr() + this.u1v(it.mo_1);
   // Inline function 'kotlin.text.trimStart' call
-  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.qq(module_0) ? this.i1v_1 : '') + '\n                    |' + it.jo_1 + '\n                    ');
+  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.uq(module_0) ? this.n1v_1 : '') + '\n                    |' + it.no_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.f1v(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw($this, _this__u8e3s4) + ')';
+  return 'Wirespec.getType(' + $this.k1v(_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.cu();
+  var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.hu();
   if (tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs) {
     tmp = 'java.util.Optional.class';
   } else {
@@ -551,9 +551,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.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_1 = orNull(joinToString(endpoint.lp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_0($this)));
+  var tmp_2 = orNull(joinToString(endpoint.mp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_1($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.rp_1;
   var tmp_3;
   if (tmp0_safe_receiver == null) {
     tmp_3 = null;
@@ -562,112 +562,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.qr(3);
+  var tmp_5 = Spacer_instance.vr(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.fp_1.a3_1;
+  var tmp_8 = 'Wirespec.Method.' + endpoint.jp_1.a3_1;
   // Inline function 'kotlin.let' call
-  var tmp$ret$5 = 'new Queries(' + joinToString(endpoint.hp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_3($this)) + ')';
+  var tmp$ret$5 = 'new Queries(' + joinToString(endpoint.lp_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.ip_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_4($this)) + ')';
+  var tmp$ret$7 = 'new RequestHeaders(' + joinToString(endpoint.mp_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.np_1 == null) {
+  if (_this__u8e3s4.rp_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.qr(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.vr(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.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_1 = orNull(joinToString(endpoint.lp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_0($this)));
+  var tmp_2 = orNull(joinToString(endpoint.mp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_1($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.rp_1;
   var tmp_3;
   if (tmp0_safe_receiver == null) {
     tmp_3 = null;
   } else {
     // Inline function 'kotlin.let' call
-    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)';
+    tmp_3 = Spacer_instance.vr(4) + 'request.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.tp_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.qr(3);
+  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.vr(3);
 }
 function emitDeserializedParams_0($this, _this__u8e3s4) {
-  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 = orNull(joinToString(_this__u8e3s4.vp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_2($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.wp_1;
   var tmp_0;
   if (tmp0_safe_receiver == null) {
     tmp_0 = null;
   } else {
     // Inline function 'kotlin.let' call
-    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)';
+    tmp_0 = Spacer_instance.vr(5) + 'response.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.tp_1) + ')).orElse(null)';
   }
   // Inline function 'kotlin.let' call
   var it = joinToString(listOfNotNull([tmp, tmp_0]), ',\n');
-  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.qr(4);
+  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.vr(4);
 }
 function emitSerialized($this, _this__u8e3s4) {
   var tmp;
-  if (!(_this__u8e3s4.sp_1 == null)) {
-    tmp = 'java.util.Optional.ofNullable(serialization.serializeBody(r.body, ' + emitGetType($this, ensureNotNull(_this__u8e3s4.sp_1).pp_1) + '))';
+  if (!(_this__u8e3s4.wp_1 == null)) {
+    tmp = 'java.util.Optional.ofNullable(serialization.serializeBody(r.body, ' + emitGetType($this, ensureNotNull(_this__u8e3s4.wp_1).tp_1) + '))';
   } else {
     tmp = 'java.util.Optional.empty()';
   }
   var body = tmp;
   var tmp_0;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  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)) + ')';
+  if (!_this__u8e3s4.vp_1.r()) {
+    tmp_0 = 'java.util.Map.ofEntries(' + joinToString(_this__u8e3s4.vp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitSerialized$lambda($this)) + ')';
   } else {
     tmp_0 = 'java.util.Collections.emptyMap()';
   }
   var headers = tmp_0;
-  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 + '); }';
+  return Spacer_instance.vr(3) + 'if (response instanceof Response' + Companion_instance_1.sq(_this__u8e3s4.up_1) + ' r) { return new Wirespec.RawResponse(r.status(), ' + headers + ', ' + body + '); }';
 }
 function emitDeserialized($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) + ');';
+  return Spacer_instance.vr(4) + 'case ' + _this__u8e3s4.up_1 + ' -> new Response' + Companion_instance_1.sq(_this__u8e3s4.up_1) + '(' + emitDeserializedParams_0($this, _this__u8e3s4) + ');';
 }
 function emitSerializedParams($this, _this__u8e3s4, fields) {
-  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) + '))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.ep_1.l1() + '", serialization.serializeParam(request.' + (fields === 'queries' ? 'queries' : 'headers') + '().' + $this.br(_this__u8e3s4.ep_1) + '(), ' + emitGetType($this, _this__u8e3s4.fp_1) + '))';
 }
 function emitDeserialized_0($this, _this__u8e3s4) {
-  return Spacer_instance.qr(4) + 'serialization.deserializePath(request.path().get(' + _this__u8e3s4.le_1 + '), ' + emitGetType($this, _this__u8e3s4.me_1.mp_1) + ')';
+  return Spacer_instance.vr(4) + 'serialization.deserializePath(request.path().get(' + _this__u8e3s4.oe_1 + '), ' + emitGetType($this, _this__u8e3s4.pe_1.qp_1) + ')';
 }
 function emitDeserializedParams_1($this, _this__u8e3s4, fields, caseSensitive) {
   var tmp;
   if (caseSensitive) {
-    tmp = 'request.' + fields + '().getOrDefault("' + _this__u8e3s4.ap_1.l1() + '", java.util.Collections.emptyList())';
+    tmp = 'request.' + fields + '().getOrDefault("' + _this__u8e3s4.ep_1.l1() + '", java.util.Collections.emptyList())';
   } else {
-    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())';
+    tmp = 'request.' + fields + '().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + _this__u8e3s4.ep_1.l1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList())';
   }
   var valuesFromField = tmp;
-  return Spacer_instance.qr(4) + 'serialization.<' + $this.xp(_this__u8e3s4.bp_1) + '>deserializeParam(' + valuesFromField + ', ' + emitGetType($this, _this__u8e3s4.bp_1) + ')';
+  return Spacer_instance.vr(4) + 'serialization.<' + $this.bq(_this__u8e3s4.fp_1) + '>deserializeParam(' + valuesFromField + ', ' + emitGetType($this, _this__u8e3s4.fp_1) + ')';
 }
 function emitSerializedHeader($this, _this__u8e3s4) {
-  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) + '))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.ep_1.l1() + '", serialization.<' + $this.bq(_this__u8e3s4.fp_1) + '>serializeParam(r.headers().' + $this.br(_this__u8e3s4.ep_1) + '(), ' + emitGetType($this, _this__u8e3s4.fp_1) + '))';
 }
 function emitIdentifier($this, _this__u8e3s4) {
-  return 'serialization.serializePath(request.path().' + Companion_instance_1.pq($this.wq(_this__u8e3s4.lp_1)) + '(), ' + emitGetType($this, _this__u8e3s4.mp_1) + ')';
+  return 'serialization.serializePath(request.path().' + Companion_instance_1.tq($this.br(_this__u8e3s4.pp_1)) + '(), ' + emitGetType($this, _this__u8e3s4.qp_1) + ')';
 }
 function emit_16($this, _this__u8e3s4) {
-  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);
+  var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.tp_1;
+  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.bq(tmp1_safe_receiver);
   return tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
 }
 function emit_17($this, _this__u8e3s4) {
-  return $this.xp(_this__u8e3s4.mp_1) + ' ' + $this.wq(_this__u8e3s4.lp_1);
+  return $this.bq(_this__u8e3s4.qp_1) + ' ' + $this.br(_this__u8e3s4.pp_1);
 }
 function emitImports_0($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.filter' call
@@ -677,7 +677,7 @@ function emitImports_0($this, _this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.vq().l1() === element.ku_1)) {
+    if (!(_this__u8e3s4.ar().l1() === element.pu_1)) {
       destination.x(element);
     }
   }
@@ -687,46 +687,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.d1v().mr_1 + '.model.' + item.ku_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.i1v().rr_1 + '.model.' + item.pu_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.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 = Spacer_instance.vr(2);
+  var tmp_0 = Spacer_instance.vr(3);
+  var tmp_1 = Spacer_instance.vr(4);
+  var tmp_2 = Spacer_instance.vr(4);
+  var tmp_3 = joinToString(endpoint.kp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda($this));
+  var tmp_4 = Spacer_instance.vr(4);
   var tmp_5;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  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)) + ')';
+  if (!endpoint.lp_1.r()) {
+    tmp_5 = 'java.util.Map.ofEntries(' + joinToString(endpoint.lp_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.qr(4);
+  var tmp_7 = Spacer_instance.vr(4);
   var tmp_8;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  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)) + ')';
+  if (!endpoint.mp_1.r()) {
+    tmp_8 = 'java.util.Map.ofEntries(' + joinToString(endpoint.mp_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.qr(4);
+  var tmp_10 = Spacer_instance.vr(4);
   var tmp_11;
-  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;
+  if (!(_this__u8e3s4.rp_1 == null)) {
+    var tmp0_safe_receiver = _this__u8e3s4.rp_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.tp_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.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    ');
+  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.vr(3) + ');\n        |' + Spacer_instance.vr(2) + '}\n        |\n        |' + Spacer_instance.vr(2) + 'static Request fromRequest(Wirespec.Deserializer serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.vr(3) + 'return new Request(' + emitDeserializedParams($this, _this__u8e3s4, endpoint) + ');\n        |' + Spacer_instance.vr(2) + '}\n    ');
 }
 function emitObject($this, _this__u8e3s4, name, extends_0, block) {
   var tmp;
@@ -740,13 +740,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.kp_1);
+  var this_0 = distinctByStatus(_this__u8e3s4.op_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.sp_1);
+    var tmp$ret$0 = emit_16($this, item.wp_1);
     destination.x(tmp$ret$0);
   }
   var tmp = distinct(destination);
@@ -754,13 +754,13 @@ function emitResponseInterfaces($this, _this__u8e3s4) {
 }
 function emitStatusInterfaces($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.map' call
-  var this_0 = _this__u8e3s4.kp_1;
+  var this_0 = _this__u8e3s4.op_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.qp_1));
+    var tmp$ret$0 = new Char(first(item.up_1));
     destination.x(tmp$ret$0);
   }
   var tmp = distinct(destination);
@@ -768,26 +768,26 @@ function emitStatusInterfaces($this, _this__u8e3s4) {
 }
 function emitFromResponse($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.filter' call
-  var tmp0 = distinctByStatus(_this__u8e3s4.kp_1);
+  var tmp0 = distinctByStatus(_this__u8e3s4.op_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.rq(element.qp_1)) {
+    if (Companion_instance_1.wq(element.up_1)) {
       destination.x(element);
     }
   }
   var statusResponses = destination;
   var tmp;
   if (statusResponses.r()) {
-    tmp = trimMargin('\n                 |' + Spacer_instance.qr(3) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                ');
+    tmp = trimMargin('\n                 |' + Spacer_instance.vr(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.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                ');
+    tmp = trimMargin('\n                    |' + Spacer_instance.vr(3) + 'if (response.statusCode() == ' + response.up_1 + ') {\n                    |' + Spacer_instance.vr(4) + 'return new Response' + Companion_instance_1.sq(response.up_1) + '(' + emitDeserializedParams_0($this, response) + ');\n                    |' + Spacer_instance.vr(3) + '} else {\n                    |' + Spacer_instance.vr(4) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.vr(3) + '}\n                ');
   } else {
-    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                ');
+    var tmp_0 = Spacer_instance.vr(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.vr(4) + 'default -> throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.vr(3) + '};\n                ');
   }
   return tmp;
 }
@@ -798,17 +798,17 @@ function JavaEndpointDefinitionEmitter$emit$lambda(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return this$0.wp(it);
+    return this$0.aq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_1(this$0) {
   return function (it) {
-    return this$0.wp(it);
+    return this$0.aq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return this$0.r1v(it);
+    return this$0.w1v(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_3(this$0) {
@@ -826,27 +826,27 @@ function JavaEndpointDefinitionEmitter$emitConstructor$lambda(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_0(this$0) {
   return function (it) {
-    return this$0.wp(it);
+    return this$0.aq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_1(this$0) {
   return function (it) {
-    return this$0.wp(it);
+    return this$0.aq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_2(this$0) {
   return function (it) {
-    return this$0.wq(it.lp_1);
+    return this$0.br(it.pp_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_3(this$0) {
   return function (it) {
-    return this$0.wq(it.ap_1);
+    return this$0.br(it.ep_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_4(this$0) {
   return function (it) {
-    return this$0.wq(it.ap_1);
+    return this$0.br(it.ep_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda(this$0) {
@@ -866,22 +866,22 @@ function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_5(this$0) {
   return function (it) {
-    return this$0.wp(it);
+    return this$0.aq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_6(this$0) {
   return function (it) {
-    return this$0.wq(it.ap_1);
+    return this$0.br(it.ep_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_7(this$0) {
   return function (it) {
-    return this$0.wp(it);
+    return this$0.aq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_2(this$0) {
   return function (it) {
-    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) + ')';
+    return Spacer_instance.vr(5) + 'serialization.<' + this$0.bq(it.fp_1) + '>deserializeParam(response.headers().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + it.ep_1.l1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList()), ' + emitGetType(this$0, it.fp_1) + ')';
   };
 }
 function JavaEndpointDefinitionEmitter$emitSerialized$lambda(this$0) {
@@ -897,7 +897,7 @@ function JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Literal) {
-      tmp = '"' + it.hq_1 + '"';
+      tmp = '"' + it.lq_1 + '"';
     } else {
       if (it instanceof Param) {
         tmp = emitIdentifier(this$0, it);
@@ -920,7 +920,7 @@ function JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emitObject$lambda($block) {
   return function (it) {
-    return Spacer_instance.qr(2) + $block(it);
+    return Spacer_instance.vr(2) + $block(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitResponseInterfaces$lambda(it) {
@@ -940,7 +940,7 @@ function sanitizeNegative($this, _this__u8e3s4) {
   return startsWith(_this__u8e3s4, '-') ? '__' + substring(_this__u8e3s4, 1) : _this__u8e3s4;
 }
 function sanitizeEnum($this, _this__u8e3s4) {
-  return $this.t1v($this.s1v(joinToString(split(sanitizeNegative($this, _this__u8e3s4), ['-', ', ', '.', ' ', '//']), '_')));
+  return $this.y1v($this.x1v(joinToString(split(sanitizeNegative($this, _this__u8e3s4), ['-', ', ', '.', ' ', '//']), '_')));
 }
 function JavaEnumDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
@@ -951,7 +951,7 @@ function JavaEnumDefinitionEmitter() {
 }
 function Companion() {
   Companion_instance_2 = this;
-  this.v1v_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.a1w_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() {
@@ -975,7 +975,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.oq(item) : item;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.sq(item) : item;
     destination.x(tmp$ret$0);
   }
   // Inline function 'kotlin.text.filter' call
@@ -1015,14 +1015,14 @@ function sanitizeFirstIsDigit_0($this, _this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords_0($this, _this__u8e3s4) {
-  return Companion_getInstance_1().w1v_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance_1().b1w_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, ['-', ', ', '.', ' ', '//']), '_')));
 }
 function Companion_0() {
   Companion_instance_3 = this;
-  this.w1v_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.b1w_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() {
@@ -1034,10 +1034,10 @@ function JavaIrEmitter$sanitizationConfig$lambda(it) {
   return '_' + it;
 }
 function JavaIrEmitter$sanitizationConfig$lambda_0(name) {
-  return name.g1h_1.a1() > 1 ? new Name(listOf(name.s1l())) : name;
+  return name.l1h_1.a1() > 1 ? new Name(listOf(name.x1l())) : name;
 }
 function JavaIrEmitter$sanitizationConfig$lambda_1(name) {
-  return new Name(listOf(name.s1l()));
+  return new Name(listOf(name.x1l()));
 }
 function JavaIrEmitter$sanitizationConfig$lambda_2(this$0) {
   return function (it) {
@@ -1048,23 +1048,23 @@ function JavaIrEmitter$sanitizationConfig$lambda_3(stmt, tr) {
   var tmp;
   var tmp_0;
   if (stmt instanceof FunctionCall) {
-    tmp_0 = stmt.b1m_1.s1h() === 'validate';
+    tmp_0 = stmt.g1m_1.x1h() === 'validate';
   } else {
     tmp_0 = false;
   }
   if (tmp_0) {
-    tmp = transformChildren(stmt.f1m(VOID, emptyList()), tr);
+    tmp = transformChildren(stmt.k1m(VOID, emptyList()), tr);
   } else {
     tmp = transformChildren(stmt, tr);
   }
   return tmp;
 }
 function JavaIrEmitter$emitShared$lambda(name) {
-  switch (name.s1h()) {
+  switch (name.x1h()) {
     case 'client':
-      return Companion_getInstance().f1h('getClient');
+      return Companion_getInstance().k1h('getClient');
     case 'server':
-      return Companion_getInstance().f1h('getServer');
+      return Companion_getInstance().k1h('getServer');
     default:
       return null;
   }
@@ -1074,7 +1074,7 @@ function JavaIrEmitter$emitShared$lambda_0($imports) {
     var tmp;
     if (element instanceof File) {
       // Inline function 'kotlin.collections.partition' call
-      var this_0 = element.t1m_1;
+      var this_0 = element.y1m_1;
       var first = ArrayList_init_$Create$();
       var second = ArrayList_init_$Create$();
       var _iterator__ex2g4s = this_0.t();
@@ -1087,9 +1087,9 @@ function JavaIrEmitter$emitShared$lambda_0($imports) {
         }
       }
       var _destruct__k2r9zo = new Pair(first, second);
-      var packageElements = _destruct__k2r9zo.ne();
-      var rest = _destruct__k2r9zo.oe();
-      tmp = element.w1m(VOID, plus_1(plus_1(packageElements, $imports), rest));
+      var packageElements = _destruct__k2r9zo.qe();
+      var rest = _destruct__k2r9zo.re();
+      tmp = element.b1n(VOID, plus_1(plus_1(packageElements, $imports), rest));
     } else {
       tmp = element;
     }
@@ -1101,11 +1101,11 @@ function JavaIrEmitter$emitShared$lambda_1($clientServer) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Namespace) {
-      var injected = element.y1m_1.equals(Companion_getInstance().f1h('Wirespec')) ? $clientServer : emptyList();
+      var injected = element.d1n_1.equals(Companion_getInstance().k1h('Wirespec')) ? $clientServer : emptyList();
       var tmp_0;
       // Inline function 'kotlin.collections.isNotEmpty' call
       if (!injected.r()) {
-        tmp_0 = withElements(element, plus_1(element.u1m(), injected));
+        tmp_0 = withElements(element, plus_1(element.z1m(), injected));
       } else {
         tmp_0 = element;
       }
@@ -1126,38 +1126,38 @@ function JavaIrEmitter$emit$lambda_0(it) {
   return listOf(function_0('label', VOID, VOID, JavaIrEmitter$emit$lambda$lambda));
 }
 function JavaIrEmitter$emit$lambda$lambda($this$function) {
-  $this$function.k1i(String_instance);
-  $this$function.j1k(new VariableReference(Companion_getInstance().f1h('label')));
+  $this$function.p1i(String_instance);
+  $this$function.o1k(new VariableReference(Companion_getInstance().k1h('label')));
   return Unit_instance;
 }
 function JavaIrEmitter(packageName, emitShared) {
   Companion_getInstance_1();
-  packageName = packageName === VOID ? Companion_instance.lr('community.flock.wirespec.generated') : packageName;
-  emitShared = emitShared === VOID ? Companion_instance_0.go() : emitShared;
-  this.x1v_1 = packageName;
-  this.y1v_1 = emitShared;
-  this.z1v_1 = JavaGenerator_instance;
-  this.a1w_1 = FileExtension_Java_getInstance();
-  this.b1w_1 = listOf(import_0('community.flock.wirespec.java', 'Wirespec'));
+  packageName = packageName === VOID ? Companion_instance.qr('community.flock.wirespec.generated') : packageName;
+  emitShared = emitShared === VOID ? Companion_instance_0.ko() : emitShared;
+  this.c1w_1 = packageName;
+  this.d1w_1 = emitShared;
+  this.e1w_1 = JavaGenerator_instance;
+  this.f1w_1 = FileExtension_Java_getInstance();
+  this.g1w_1 = listOf(import_0('community.flock.wirespec.java', 'Wirespec'));
   var tmp = this;
-  var tmp_0 = Companion_getInstance_1().w1v_1;
+  var tmp_0 = Companion_getInstance_1().b1w_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.c1w_1 = new SanitizationConfig(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, JavaIrEmitter$sanitizationConfig$lambda_3);
+  tmp.h1w_1 = new SanitizationConfig(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, JavaIrEmitter$sanitizationConfig$lambda_3);
 }
-protoOf(JavaIrEmitter).d1v = function () {
-  return this.x1v_1;
+protoOf(JavaIrEmitter).i1v = function () {
+  return this.c1w_1;
 };
-protoOf(JavaIrEmitter).k1u = function () {
-  return this.z1v_1;
+protoOf(JavaIrEmitter).p1u = function () {
+  return this.e1w_1;
 };
-protoOf(JavaIrEmitter).eq = function () {
-  return this.a1w_1;
+protoOf(JavaIrEmitter).iq = function () {
+  return this.f1w_1;
 };
-protoOf(JavaIrEmitter).n1u = function () {
-  var packageName = Companion_instance.lr('community.flock.wirespec.java');
+protoOf(JavaIrEmitter).s1u = function () {
+  var packageName = Companion_instance.qr('community.flock.wirespec.java');
   var imports = listOf_0([import_0('java.lang.reflect', 'Type'), import_0('java.lang.reflect', 'ParameterizedType'), import_0('java.util', 'List'), import_0('java.util', 'Map')]);
   // Inline function 'kotlin.collections.map' call
   var this_0 = convertClientServer(packageName);
@@ -1176,66 +1176,66 @@ protoOf(JavaIrEmitter).n1u = function () {
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_2 = scope.x1t_1;
+  var this_2 = scope.c1u_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_3 = new TransformerBuilder();
-  this_3.c1h(JavaIrEmitter$emitShared$lambda_0(imports));
-  var tmp$ret$5 = this_3.d1h();
-  tmp.x1t_1 = transform(this_2, tmp$ret$5);
+  this_3.h1h(JavaIrEmitter$emitShared$lambda_0(imports));
+  var tmp$ret$5 = this_3.i1h();
+  tmp.c1u_1 = transform(this_2, tmp$ret$5);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.injectAfter' call
   var tmp_0 = scope;
   // Inline function 'community.flock.wirespec.ir.core.injectAfter' call
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_4 = scope.x1t_1;
+  var this_4 = scope.c1u_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_5 = new TransformerBuilder();
-  this_5.c1h(JavaIrEmitter$emitShared$lambda_1(clientServer));
-  var tmp$ret$10 = this_5.d1h();
-  tmp_0.x1t_1 = transform(this_4, tmp$ret$10);
-  var tmp_1 = scope.x1t_1;
+  this_5.h1h(JavaIrEmitter$emitShared$lambda_1(clientServer));
+  var tmp$ret$10 = this_5.i1h();
+  tmp_0.c1u_1 = transform(this_4, tmp$ret$10);
+  var tmp_1 = scope.c1u_1;
   var wirespecShared = isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
   var tmp_2;
-  if (this.y1v_1.ho_1) {
+  if (this.d1w_1.lo_1) {
     tmp_2 = wirespecShared;
   } else {
     tmp_2 = null;
   }
   return tmp_2;
 };
-protoOf(JavaIrEmitter).uq = function (definition, module_0, logger) {
+protoOf(JavaIrEmitter).zq = function (definition, module_0, logger) {
   var file = emit_0.call(this, definition, module_0, logger);
-  var tmp = file.w1m(Companion_getInstance().f1h(sanitizeSymbol_0(this, file.s1m_1.h1h())));
+  var tmp = file.b1n(Companion_getInstance().k1h(sanitizeSymbol_0(this, file.x1m_1.m1h())));
   // Inline function 'kotlin.takeIf' call
-  var this_0 = this.b1w_1;
+  var this_0 = this.g1w_1;
   var tmp_0;
-  if (Companion_instance_1.qq(module_0)) {
+  if (Companion_instance_1.vq(module_0)) {
     tmp_0 = this_0;
   } else {
     tmp_0 = null;
   }
   var tmp$ret$1 = tmp_0;
-  return placeInPackage(prependImports(tmp, tmp$ret$1), this.d1v(), definition);
+  return placeInPackage(prependImports(tmp, tmp$ret$1), this.i1v(), definition);
 };
-protoOf(JavaIrEmitter).up = function (type, module_0) {
-  return sanitizeNames(convertWithValidation(type, module_0), this.c1w_1);
+protoOf(JavaIrEmitter).yp = function (type, module_0) {
+  return sanitizeNames(convertWithValidation(type, module_0), this.h1w_1);
 };
-protoOf(JavaIrEmitter).ir = function (enum_0, module_0) {
+protoOf(JavaIrEmitter).nr = function (enum_0, module_0) {
   var tmp = convert_0(enum_0);
   var tmp_0 = JavaIrEmitter$emit$lambda(this);
-  return sanitizeNames(injectEnumLabelField(tmp, tmp_0, JavaIrEmitter$emit$lambda_0), this.c1w_1);
+  return sanitizeNames(injectEnumLabelField(tmp, tmp_0, JavaIrEmitter$emit$lambda_0), this.h1w_1);
 };
-protoOf(JavaIrEmitter).yq = function (union) {
-  return sanitizeNames(convert_1(union), this.c1w_1);
+protoOf(JavaIrEmitter).dr = function (union) {
+  return sanitizeNames(convert_1(union), this.h1w_1);
 };
-protoOf(JavaIrEmitter).dr = function (refined) {
-  return sanitizeNames(applyRefinedStructShape(convert_2(refined), refined), this.c1w_1);
+protoOf(JavaIrEmitter).ir = function (refined) {
+  return sanitizeNames(applyRefinedStructShape(convert_2(refined), refined), this.h1w_1);
 };
-protoOf(JavaIrEmitter).jr = function (endpoint) {
-  var tmp = sanitizeNames(transformTypeDescriptors(injectHandleFunction(convert_3(endpoint), endpoint)), this.c1w_1);
+protoOf(JavaIrEmitter).or = function (endpoint) {
+  var tmp = sanitizeNames(transformTypeDescriptors(injectApiField(injectHandleFunction(convert_3(endpoint), endpoint))), this.h1w_1);
   // Inline function 'kotlin.takeIf' call
-  var this_0 = buildModelImports(endpoint, this.d1v());
+  var this_0 = buildModelImports(endpoint, this.i1v());
   var tmp_0;
   // Inline function 'kotlin.collections.isNotEmpty' call
   if (!this_0.r()) {
@@ -1246,25 +1246,25 @@ protoOf(JavaIrEmitter).jr = function (endpoint) {
   var tmp$ret$2 = tmp_0;
   return prependImports(tmp, tmp$ret$2);
 };
-protoOf(JavaIrEmitter).xq = function (channel) {
+protoOf(JavaIrEmitter).cr = function (channel) {
   var tmp;
-  if (channel.mo_1.l1() === channel.no_1.l1()) {
-    tmp = this.d1v().mr_1 + '.model.';
+  if (channel.qo_1.l1() === channel.ro_1.l1()) {
+    tmp = this.i1v().rr_1 + '.model.';
   } else {
     tmp = '';
   }
   var fullyQualifiedPrefix = tmp;
-  return applyFunctionalInterface(sanitizeNames(convert_4(channel), this.c1w_1), fullyQualifiedPrefix);
+  return applyFunctionalInterface(sanitizeNames(convert_4(channel), this.h1w_1), fullyQualifiedPrefix);
 };
-protoOf(JavaIrEmitter).p1u = function (endpoint) {
-  var imports = buildModelImports(endpoint, this.d1v());
-  var endpointImport = import_0(this.d1v().mr_1 + '.endpoint', endpoint.ep_1.l1());
-  var endpointName = endpoint.ep_1.l1();
-  var file = wrapAsyncReturnInThenApply(transformTypeDescriptors(sanitizeNames(emitEndpointClient.call(this, endpoint), this.c1w_1)), endpointName);
-  var subPackageName = plus_0(this.d1v(), 'client');
-  return new File(Companion_getInstance().f1h(subPackageName.or() + sanitizeSymbol_0(this, file.s1m_1.h1h())), plus_1(plus_1(plus_1(plus_1(listOf(new Package(subPackageName.mr_1)), this.b1w_1), imports), listOf(endpointImport)), file.t1m_1));
+protoOf(JavaIrEmitter).u1u = function (endpoint) {
+  var imports = buildModelImports(endpoint, this.i1v());
+  var endpointImport = import_0(this.i1v().rr_1 + '.endpoint', endpoint.ip_1.l1());
+  var endpointName = endpoint.ip_1.l1();
+  var file = wrapAsyncReturnInThenApply(transformTypeDescriptors(sanitizeNames(emitEndpointClient.call(this, endpoint), this.h1w_1)), endpointName);
+  var subPackageName = plus_0(this.i1v(), 'client');
+  return new File(Companion_getInstance().k1h(subPackageName.tr() + sanitizeSymbol_0(this, file.x1m_1.m1h())), plus_1(plus_1(plus_1(plus_1(listOf(new Package(subPackageName.rr_1)), this.g1w_1), imports), listOf(endpointImport)), file.y1m_1));
 };
-protoOf(JavaIrEmitter).o1u = function (endpoints, logger) {
+protoOf(JavaIrEmitter).t1u = function (endpoints, logger) {
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
@@ -1280,7 +1280,7 @@ protoOf(JavaIrEmitter).o1u = function (endpoints, logger) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var e = _iterator__ex2g4s_0.v();
-    var key = e.ku_1;
+    var key = e.pu_1;
     if (set.x(key)) {
       list_0.x(e);
     }
@@ -1307,7 +1307,7 @@ protoOf(JavaIrEmitter).o1u = function (endpoints, logger) {
       var _iterator__ex2g4s_2 = endpoints.t();
       while (_iterator__ex2g4s_2.u()) {
         var element_1 = _iterator__ex2g4s_2.v();
-        if (element_1.ep_1.l1() === element_0.ku_1) {
+        if (element_1.ip_1.l1() === element_0.pu_1) {
           tmp$ret$5 = false;
           break $l$block_0;
         }
@@ -1324,7 +1324,7 @@ protoOf(JavaIrEmitter).o1u = 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.d1v().mr_1 + '.model', item.ku_1);
+    var tmp$ret$10 = import_0(this.i1v().rr_1 + '.model', item.pu_1);
     destination_1.x(tmp$ret$10);
   }
   var imports = destination_1;
@@ -1334,7 +1334,7 @@ protoOf(JavaIrEmitter).o1u = 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.d1v().mr_1 + '.endpoint', item_0.ep_1.l1());
+    var tmp$ret$13 = import_0(this.i1v().rr_1 + '.endpoint', item_0.ip_1.l1());
     destination_2.x(tmp$ret$13);
   }
   var endpointImports = destination_2;
@@ -1344,19 +1344,19 @@ protoOf(JavaIrEmitter).o1u = 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.d1v().mr_1 + '.client', item_1.ep_1.l1() + 'Client');
+    var tmp$ret$16 = import_0(this.i1v().rr_1 + '.client', item_1.ip_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.c1w_1);
-  return new File(Companion_getInstance().f1h(this.d1v().or() + sanitizeSymbol_0(this, file.s1m_1.h1h())), plus_1(plus_1(plus_1(listOf(new Package(this.d1v().mr_1)), this.b1w_1), allImports), file.t1m_1));
+  var file = sanitizeNames(emitClient.call(this, endpoints, logger), this.h1w_1);
+  return new File(Companion_getInstance().k1h(this.i1v().tr() + sanitizeSymbol_0(this, file.x1m_1.m1h())), plus_1(plus_1(plus_1(listOf(new Package(this.i1v().rr_1)), this.g1w_1), allImports), file.y1m_1));
 };
 function transformTypeDescriptors(_this__u8e3s4) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
   var scope = new TransformScope(_this__u8e3s4);
-  scope.g1u(transformTypeDescriptors$lambda);
-  var tmp = scope.x1t_1;
+  scope.l1u(transformTypeDescriptors$lambda);
+  var tmp = scope.c1u_1;
   return isInterface(tmp, Element) ? tmp : THROW_CCE();
 }
 function applyRefinedStructShape(_this__u8e3s4, refined) {
@@ -1365,14 +1365,31 @@ function applyRefinedStructShape(_this__u8e3s4, refined) {
   // 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.x1t_1;
+  var this_0 = scope.c1u_1;
+  // Inline function 'community.flock.wirespec.ir.core.transformer' call
+  // Inline function 'kotlin.apply' call
+  var this_1 = new TransformerBuilder();
+  this_1.h1h(applyRefinedStructShape$lambda(refined));
+  var tmp$ret$2 = this_1.i1h();
+  tmp.c1u_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.c1u_1;
+  return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
+}
+function injectApiField(_this__u8e3s4) {
+  // Inline function 'community.flock.wirespec.ir.core.transform' call
+  var scope = new TransformScope(_this__u8e3s4);
+  // Inline function 'community.flock.wirespec.ir.core.TransformScope.injectAfter' call
+  var tmp = scope;
+  // Inline function 'community.flock.wirespec.ir.core.injectAfter' call
+  // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
+  var this_0 = scope.c1u_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.c1h(applyRefinedStructShape$lambda(refined));
-  var tmp$ret$2 = this_1.d1h();
-  tmp.x1t_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.x1t_1;
+  this_1.h1h(injectApiField$lambda);
+  var tmp$ret$2 = this_1.i1h();
+  tmp.c1u_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.c1u_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function injectHandleFunction(_this__u8e3s4, endpoint) {
@@ -1382,14 +1399,14 @@ function injectHandleFunction(_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.x1t_1;
+  var this_0 = scope.c1u_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.c1h(injectHandleFunction$lambda(handlersStruct));
-  var tmp$ret$2 = this_1.d1h();
-  tmp.x1t_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.x1t_1;
+  this_1.h1h(injectHandleFunction$lambda(handlersStruct));
+  var tmp$ret$2 = this_1.i1h();
+  tmp.c1u_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.c1u_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function buildModelImports(_this__u8e3s4, packageName) {
@@ -1400,7 +1417,7 @@ function buildModelImports(_this__u8e3s4, packageName) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.vq().l1() === element.ku_1)) {
+    if (!(_this__u8e3s4.ar().l1() === element.pu_1)) {
       destination.x(element);
     }
   }
@@ -1410,7 +1427,7 @@ function buildModelImports(_this__u8e3s4, packageName) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$3 = import_0(packageName.mr_1 + '.model', Companion_getInstance().f1h(item.ku_1).h1h());
+    var tmp$ret$3 = import_0(packageName.rr_1 + '.model', Companion_getInstance().k1h(item.pu_1).m1h());
     destination_0.x(tmp$ret$3);
   }
   return destination_0;
@@ -1421,24 +1438,24 @@ function applyFunctionalInterface(_this__u8e3s4, fullyQualifiedPrefix) {
   // 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.x1t_1;
+  var this_0 = scope.c1u_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.c1h(applyFunctionalInterface$lambda(fullyQualifiedPrefix));
-  var tmp$ret$2 = this_1.d1h();
-  tmp.x1t_1 = transform(this_0, tmp$ret$2);
+  this_1.h1h(applyFunctionalInterface$lambda(fullyQualifiedPrefix));
+  var tmp$ret$2 = this_1.i1h();
+  tmp.c1u_1 = transform(this_0, tmp$ret$2);
   // 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_2 = scope.x1t_1;
+  var this_2 = scope.c1u_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_3 = new TransformerBuilder();
-  this_3.c1h(applyFunctionalInterface$lambda_0);
-  var tmp$ret$7 = this_3.d1h();
-  tmp_0.x1t_1 = transform(this_2, tmp$ret$7);
-  var tmp_1 = scope.x1t_1;
+  this_3.h1h(applyFunctionalInterface$lambda_0);
+  var tmp$ret$7 = this_3.i1h();
+  tmp_0.c1u_1 = transform(this_2, tmp$ret$7);
+  var tmp_1 = scope.c1u_1;
   return isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
 }
 function wrapAsyncReturnInThenApply(_this__u8e3s4, endpointName) {
@@ -1447,26 +1464,26 @@ function wrapAsyncReturnInThenApply(_this__u8e3s4, endpointName) {
   // 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.x1t_1;
+  var this_0 = scope.c1u_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.c1h(wrapAsyncReturnInThenApply$lambda(endpointName));
-  var tmp$ret$2 = this_1.d1h();
-  tmp.x1t_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.x1t_1;
+  this_1.h1h(wrapAsyncReturnInThenApply$lambda(endpointName));
+  var tmp$ret$2 = this_1.i1h();
+  tmp.c1u_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.c1u_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function findRoot(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Nullable) {
-    tmp = findRoot(_this__u8e3s4.o1h_1);
+    tmp = findRoot(_this__u8e3s4.t1h_1);
   } else {
     if (_this__u8e3s4 instanceof Array_0) {
-      tmp = findRoot(_this__u8e3s4.p1h_1);
+      tmp = findRoot(_this__u8e3s4.u1h_1);
     } else {
       if (_this__u8e3s4 instanceof Dict_0) {
-        tmp = findRoot(_this__u8e3s4.k1m_1);
+        tmp = findRoot(_this__u8e3s4.p1m_1);
       } else {
         tmp = _this__u8e3s4;
       }
@@ -1495,7 +1512,7 @@ function toJavaName(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Integer_0) {
     var tmp_0;
-    switch (_this__u8e3s4.g1m_1.b3_1) {
+    switch (_this__u8e3s4.l1m_1.b3_1) {
       case 0:
         tmp_0 = 'Integer';
         break;
@@ -1510,7 +1527,7 @@ function toJavaName(_this__u8e3s4) {
   } else {
     if (_this__u8e3s4 instanceof Number_1) {
       var tmp_1;
-      switch (_this__u8e3s4.h1m_1.b3_1) {
+      switch (_this__u8e3s4.m1m_1.b3_1) {
         case 0:
           tmp_1 = 'Float';
           break;
@@ -1539,7 +1556,7 @@ function toJavaName(_this__u8e3s4) {
                 tmp = 'Void';
               } else {
                 if (_this__u8e3s4 instanceof Custom_0) {
-                  tmp = _this__u8e3s4.q1h_1.h1h();
+                  tmp = _this__u8e3s4.v1h_1.m1h();
                 } else {
                   tmp = 'Object';
                 }
@@ -1553,7 +1570,7 @@ function toJavaName(_this__u8e3s4) {
   return tmp;
 }
 function buildHandlersStruct(_this__u8e3s4) {
-  var pathTemplate = '/' + joinToString(_this__u8e3s4.gp_1, '/', VOID, VOID, VOID, VOID, buildHandlersStruct$lambda);
+  var pathTemplate = '/' + joinToString(_this__u8e3s4.kp_1, '/', VOID, VOID, VOID, VOID, buildHandlersStruct$lambda);
   return struct('Handlers', buildHandlersStruct$lambda_0(pathTemplate, _this__u8e3s4));
 }
 function withFullyQualifiedPrefix(_this__u8e3s4, prefix) {
@@ -1563,8 +1580,8 @@ function withFullyQualifiedPrefix(_this__u8e3s4, prefix) {
     // Inline function 'community.flock.wirespec.ir.core.transform' call
     var scope = new TransformScope(_this__u8e3s4);
     var tmp_0 = withFullyQualifiedPrefix$lambda;
-    scope.a1u(tmp_0, withFullyQualifiedPrefix$lambda_0(prefix));
-    var tmp_1 = scope.x1t_1;
+    scope.f1u(tmp_0, withFullyQualifiedPrefix$lambda_0(prefix));
+    var tmp_1 = scope.c1u_1;
     tmp = isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
   } else {
     tmp = _this__u8e3s4;
@@ -1574,8 +1591,8 @@ function withFullyQualifiedPrefix(_this__u8e3s4, prefix) {
 function transformTypeDescriptors$lambda(stmt, tr) {
   var tmp;
   if (stmt instanceof TypeDescriptor) {
-    var rootType = findRoot(stmt.h1o_1);
-    var containerStr = rawContainerClass(stmt.h1o_1);
+    var rootType = findRoot(stmt.m1o_1);
+    var containerStr = rawContainerClass(stmt.m1o_1);
     var rootStr = toJavaName(rootType) + '.class';
     var tmp_0;
     if (containerStr == null) {
@@ -1594,8 +1611,8 @@ function transformTypeDescriptors$lambda(stmt, tr) {
 }
 function applyRefinedStructShape$lambda$lambda($refined) {
   return function ($this$function) {
-    $this$function.k1i(convert_5($refined.cr_1));
-    $this$function.j1k(new VariableReference(Companion_getInstance().f1h('value')));
+    $this$function.p1i(convert_5($refined.hr_1));
+    $this$function.o1k(new VariableReference(Companion_getInstance().k1h('value')));
     return Unit_instance;
   };
 }
@@ -1605,18 +1622,18 @@ function applyRefinedStructShape$lambda($refined) {
     if (element instanceof Struct) {
       var tmp_0 = listOf(Custom_init_$Create$('Wirespec.Refined'));
       // Inline function 'kotlin.collections.map' call
-      var this_0 = element.h1n_1;
+      var this_0 = element.m1n_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 tmp0_safe_receiver = item instanceof Function ? item : null;
-        var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.b1k(VOID, VOID, VOID, VOID, VOID, VOID, VOID, true);
+        var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.g1k(VOID, VOID, VOID, VOID, VOID, VOID, VOID, true);
         var tmp$ret$0 = tmp1_elvis_lhs == null ? item : tmp1_elvis_lhs;
         destination.x(tmp$ret$0);
       }
-      var tmp_1 = element.j1n(VOID, VOID, VOID, tmp_0, destination);
+      var tmp_1 = element.o1n(VOID, VOID, VOID, tmp_0, destination);
       tmp = plus_3(tmp_1, function_0('value', VOID, true, applyRefinedStructShape$lambda$lambda($refined)));
     } else {
       tmp = element;
@@ -1625,6 +1642,24 @@ function applyRefinedStructShape$lambda($refined) {
     return transformChildren_0(transformed, transformer);
   };
 }
+function injectApiField$lambda(element, transformer) {
+  var tmp;
+  if (element instanceof Namespace) {
+    var injected = listOf(new RawElement('Handler.Handlers api = new Handler.Handlers();\n'));
+    var tmp_0;
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    if (!injected.r()) {
+      tmp_0 = withElements(element, plus_1(element.z1m(), injected));
+    } else {
+      tmp_0 = element;
+    }
+    tmp = tmp_0;
+  } else {
+    tmp = element;
+  }
+  var transformed = tmp;
+  return transformChildren_0(transformed, transformer);
+}
 function injectHandleFunction$lambda$lambda($handlersStruct) {
   return function (element, transformer) {
     var tmp;
@@ -1633,7 +1668,7 @@ function injectHandleFunction$lambda$lambda($handlersStruct) {
       var tmp_0;
       // Inline function 'kotlin.collections.isNotEmpty' call
       if (!injected.r()) {
-        tmp_0 = withElements(element, plus_1(element.u1m(), injected));
+        tmp_0 = withElements(element, plus_1(element.z1m(), injected));
       } else {
         tmp_0 = element;
       }
@@ -1650,21 +1685,21 @@ function injectHandleFunction$lambda($handlersStruct) {
     var tmp;
     if (element instanceof Interface) {
       var tmp_0;
-      if (element.k1n_1.equals(Companion_getInstance().f1h('Handler'))) {
+      if (element.q1n_1.equals(Companion_getInstance().k1h('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.x1t_1;
+        var this_0 = scope.c1u_1;
         // Inline function 'community.flock.wirespec.ir.core.transformer' call
         // Inline function 'kotlin.apply' call
         var this_1 = new TransformerBuilder();
-        this_1.c1h(injectHandleFunction$lambda$lambda($handlersStruct));
-        var tmp$ret$2 = this_1.d1h();
-        tmp_1.x1t_1 = transform(this_0, tmp$ret$2);
-        var tmp_2 = scope.x1t_1;
+        this_1.h1h(injectHandleFunction$lambda$lambda($handlersStruct));
+        var tmp$ret$2 = this_1.i1h();
+        tmp_1.c1u_1 = transform(this_0, tmp$ret$2);
+        var tmp_2 = scope.c1u_1;
         tmp_0 = isInterface(tmp_2, Element) ? tmp_2 : THROW_CCE();
       } else {
         tmp_0 = element;
@@ -1694,7 +1729,7 @@ function applyFunctionalInterface$lambda_0(element, transformer) {
   if (element instanceof File) {
     // Inline function 'community.flock.wirespec.ir.core.findElement' call
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp0 = element.u1m();
+    var tmp0 = element.z1m();
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var destination = ArrayList_init_$Create$();
     var _iterator__ex2g4s = tmp0.t();
@@ -1706,7 +1741,7 @@ function applyFunctionalInterface$lambda_0(element, transformer) {
     }
     var tmp$ret$2 = firstOrNull_0(destination);
     var interfaceElement = ensureNotNull(tmp$ret$2);
-    tmp = element.w1m(VOID, listOf_0([new RawElement('@FunctionalInterface\n'), interfaceElement]));
+    tmp = element.b1n(VOID, listOf_0([new RawElement('@FunctionalInterface\n'), interfaceElement]));
   } else {
     tmp = element;
   }
@@ -1719,11 +1754,11 @@ function wrapAsyncReturnInThenApply$lambda($endpointName) {
     if (element instanceof Function) {
       var tmp$ret$0;
       $l$block_1: {
-        if (!element.y1j_1 || element.x1j_1.a1() < 2) {
+        if (!element.d1k_1 || element.c1k_1.a1() < 2) {
           tmp$ret$0 = element;
           break $l$block_1;
         }
-        var tmp_0 = element.x1j_1.f1(element.x1j_1.a1() - 2 | 0);
+        var tmp_0 = element.c1k_1.b1(element.c1k_1.a1() - 2 | 0);
         var tmp0_elvis_lhs = tmp_0 instanceof Assignment ? tmp_0 : null;
         var tmp_1;
         if (tmp0_elvis_lhs == null) {
@@ -1733,16 +1768,16 @@ function wrapAsyncReturnInThenApply$lambda($endpointName) {
           tmp_1 = tmp0_elvis_lhs;
         }
         var transportAssign = tmp_1;
-        var tmp_2 = last(element.x1j_1);
+        var tmp_2 = last(element.c1k_1);
         if (!(tmp_2 instanceof ReturnStatement)) {
           tmp$ret$0 = element;
           break $l$block_1;
         }
-        var tmp_3 = dropLast(element.x1j_1, 2);
-        var tmp1_name = Companion_getInstance().f1h('thenApply');
-        var tmp2_receiver = transportAssign.k1o_1;
-        var tmp3_arguments = mapOf(to(Companion_getInstance().f1h('mapper'), new RawExpression('rawResponse -> ' + $endpointName + '.fromRawResponse(serialization(), rawResponse)')));
-        tmp$ret$0 = element.b1k(VOID, VOID, VOID, VOID, plus_2(tmp_3, new ReturnStatement(new FunctionCall(tmp2_receiver, VOID, tmp1_name, tmp3_arguments))));
+        var tmp_3 = dropLast(element.c1k_1, 2);
+        var tmp1_name = Companion_getInstance().k1h('thenApply');
+        var tmp2_receiver = transportAssign.p1o_1;
+        var tmp3_arguments = mapOf(to(Companion_getInstance().k1h('mapper'), new RawExpression('rawResponse -> ' + $endpointName + '.fromRawResponse(serialization(), rawResponse)')));
+        tmp$ret$0 = element.g1k(VOID, VOID, VOID, VOID, plus_2(tmp_3, new ReturnStatement(new FunctionCall(tmp2_receiver, VOID, tmp1_name, tmp3_arguments))));
       }
       tmp = tmp$ret$0;
     } else {
@@ -1755,10 +1790,10 @@ function wrapAsyncReturnInThenApply$lambda($endpointName) {
 function buildHandlersStruct$lambda(it) {
   var tmp;
   if (it instanceof Literal) {
-    tmp = it.hq_1;
+    tmp = it.lq_1;
   } else {
     if (it instanceof Param) {
-      tmp = '{' + it.lp_1.l1() + '}';
+      tmp = '{' + it.pp_1.l1() + '}';
     } else {
       noWhenBranchMatchedException();
     }
@@ -1767,50 +1802,50 @@ function buildHandlersStruct$lambda(it) {
 }
 function buildHandlersStruct$lambda$lambda($pathTemplate) {
   return function ($this$function) {
-    $this$function.k1i(String_instance);
-    $this$function.j1k($this$function.a1t($pathTemplate));
+    $this$function.p1i(String_instance);
+    $this$function.o1k($this$function.f1t($pathTemplate));
     return Unit_instance;
   };
 }
 function buildHandlersStruct$lambda$lambda_0($this_buildHandlersStruct) {
   return function ($this$function) {
-    $this$function.k1i(String_instance);
-    $this$function.j1k($this$function.a1t($this_buildHandlersStruct.fp_1.a3_1));
+    $this$function.p1i(String_instance);
+    $this$function.o1k($this$function.f1t($this_buildHandlersStruct.jp_1.a3_1));
     return Unit_instance;
   };
 }
 function buildHandlersStruct$lambda$lambda_1($this$function) {
-  $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}'));
+  $this$function.p1i($this$function.y1h('Wirespec.ServerEdge', [$this$function.y1h('Request', []), $this$function.y1h('Response', [Wildcard_instance])]));
+  $this$function.q1i('serialization', $this$function.y1h('Wirespec.Serialization', []));
+  $this$function.o1k(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 buildHandlersStruct$lambda$lambda_2($this$function) {
-  $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}'));
+  $this$function.p1i($this$function.y1h('Wirespec.ClientEdge', [$this$function.y1h('Request', []), $this$function.y1h('Response', [Wildcard_instance])]));
+  $this$function.q1i('serialization', $this$function.y1h('Wirespec.Serialization', []));
+  $this$function.o1k(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 buildHandlersStruct$lambda_0($pathTemplate, $this_buildHandlersStruct) {
   return function ($this$struct) {
-    $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, buildHandlersStruct$lambda$lambda($pathTemplate));
-    $this$struct.b1i('getMethod', VOID, true, buildHandlersStruct$lambda$lambda_0($this_buildHandlersStruct));
-    $this$struct.b1i('getServer', VOID, true, buildHandlersStruct$lambda$lambda_1);
-    $this$struct.b1i('getClient', VOID, true, buildHandlersStruct$lambda$lambda_2);
+    $this$struct.p1k($this$struct.y1h('Wirespec.Server', [$this$struct.y1h('Request', []), $this$struct.y1h('Response', [Wildcard_instance])]));
+    $this$struct.p1k($this$struct.y1h('Wirespec.Client', [$this$struct.y1h('Request', []), $this$struct.y1h('Response', [Wildcard_instance])]));
+    $this$struct.g1i('getPathTemplate', VOID, true, buildHandlersStruct$lambda$lambda($pathTemplate));
+    $this$struct.g1i('getMethod', VOID, true, buildHandlersStruct$lambda$lambda_0($this_buildHandlersStruct));
+    $this$struct.g1i('getServer', VOID, true, buildHandlersStruct$lambda$lambda_1);
+    $this$struct.g1i('getClient', VOID, true, buildHandlersStruct$lambda$lambda_2);
     return Unit_instance;
   };
 }
 function withFullyQualifiedPrefix$lambda(it) {
-  return it.u1o_1.equals(Companion_getInstance().f1h('message'));
+  return it.z1o_1.equals(Companion_getInstance().k1h('message'));
 }
 function withFullyQualifiedPrefix$lambda_0($prefix) {
   return function (param) {
-    var t = param.v1o_1;
+    var t = param.a1p_1;
     var tmp;
     if (t instanceof Custom_0) {
-      tmp = param.x1o(VOID, t.n1m(Companion_getInstance().f1h($prefix + t.q1h_1.h1h())));
+      tmp = param.c1p(VOID, t.s1m(Companion_getInstance().k1h($prefix + t.v1h_1.m1h())));
     } else {
       tmp = param;
     }
@@ -1821,8 +1856,8 @@ function JavaRefinedTypeDefinitionEmitter() {
 }
 function JavaShared() {
   JavaShared_instance = this;
-  this.n1v_1 = 'community.flock.wirespec.java';
-  this.o1v_1 = trimMargin('\n        |package ' + this.n1v_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        ');
+  this.s1v_1 = 'community.flock.wirespec.java';
+  this.t1v_1 = trimMargin('\n        |package ' + this.s1v_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.vr(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.vr(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.vr(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.vr(2) + 'String getMethod();\n        |' + Spacer_instance.vr(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.vr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.vr(2) + 'String getMethod();\n        |' + Spacer_instance.vr(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.vr(2) + 'if(rawType != null) {\n        |' + Spacer_instance.vr(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.vr(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.vr(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.vr(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.vr(3) + '};\n        |' + Spacer_instance.vr(2) + '}\n        |' + Spacer_instance.vr(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
 }
 protoOf(JavaShared).toString = function () {
   return 'JavaShared';
@@ -1846,10 +1881,10 @@ function JavaShared_getInstance() {
 function emitType($this, _this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = 'java.util.Map<String, ' + $this.xp(_this__u8e3s4.co_1) + '>';
+    tmp = 'java.util.Map<String, ' + $this.bq(_this__u8e3s4.go_1) + '>';
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = 'java.util.List<' + $this.xp(_this__u8e3s4.zn_1) + '>';
+      tmp = 'java.util.List<' + $this.bq(_this__u8e3s4.do_1) + '>';
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = 'void';
@@ -1858,7 +1893,7 @@ function emitType($this, _this__u8e3s4) {
           tmp = 'Object';
         } else {
           if (_this__u8e3s4 instanceof Custom) {
-            tmp = _this__u8e3s4.ku_1;
+            tmp = _this__u8e3s4.pu_1;
           } else {
             if (_this__u8e3s4 instanceof Primitive) {
               tmp = emit_18($this, _this__u8e3s4);
@@ -1873,14 +1908,14 @@ function emitType($this, _this__u8e3s4) {
   return tmp;
 }
 function emit_18($this, _this__u8e3s4) {
-  var t = _this__u8e3s4.ou_1;
+  var t = _this__u8e3s4.tu_1;
   var tmp;
   if (t instanceof String_0) {
     tmp = 'String';
   } else {
     if (t instanceof Integer) {
       var tmp_0;
-      switch (t.st_1.b3_1) {
+      switch (t.xt_1.b3_1) {
         case 0:
           tmp_0 = 'Integer';
           break;
@@ -1895,7 +1930,7 @@ function emit_18($this, _this__u8e3s4) {
     } else {
       if (t instanceof Number_0) {
         var tmp_1;
-        switch (t.vt_1.b3_1) {
+        switch (t.au_1.b3_1) {
           case 0:
             tmp_1 = 'Float';
             break;
@@ -1924,12 +1959,12 @@ function emit_18($this, _this__u8e3s4) {
 }
 function JavaTypeDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
-    return this$0.xp(it);
+    return this$0.bq(it);
   };
 }
 function JavaTypeDefinitionEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return Spacer_instance.toString() + this$0.wp(it) + ',';
+    return Spacer_instance.toString() + this$0.aq(it) + ',';
   };
 }
 function JavaTypeDefinitionEmitter() {
@@ -1940,28 +1975,28 @@ function JavaUnionDefinitionEmitter$emit$lambda(it) {
 function JavaUnionDefinitionEmitter() {
 }
 //region block: post-declaration
-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_11;
-protoOf(JavaEmitter).q1v = emit_12;
-protoOf(JavaEmitter).r1v = emit_13;
-protoOf(JavaEmitter).xq = emit_8;
-protoOf(JavaEmitter).ir = emit_15;
-protoOf(JavaEmitter).yq = emit_14;
-protoOf(JavaEmitter).dr = emit_10;
-protoOf(JavaEmitter).p1v = sanitizeSymbol;
-protoOf(JavaEmitter).s1v = sanitizeFirstIsDigit;
-protoOf(JavaEmitter).t1v = sanitizeKeywords;
-protoOf(JavaEmitter).f1v = emitRoot;
-protoOf(JavaEmitter).e1v = emitRoot$default;
-protoOf(JavaEmitter).u1v = emitHandleFunction;
-protoOf(JavaEmitter).kr = emitValidator;
-protoOf(JavaIrEmitter).on = emit_1;
-protoOf(JavaIrEmitter).m1u = emit_2;
+protoOf(JavaEmitter).br = emit_12;
+protoOf(JavaEmitter).yp = emit_3;
+protoOf(JavaEmitter).zp = emit_4;
+protoOf(JavaEmitter).aq = emit_5;
+protoOf(JavaEmitter).bq = emit_6;
+protoOf(JavaEmitter).cq = emit_7;
+protoOf(JavaEmitter).or = emit_9;
+protoOf(JavaEmitter).v1v = emit_10;
+protoOf(JavaEmitter).w1v = emit_11;
+protoOf(JavaEmitter).cr = emit_8;
+protoOf(JavaEmitter).nr = emit_13;
+protoOf(JavaEmitter).dr = emit_15;
+protoOf(JavaEmitter).ir = emit_14;
+protoOf(JavaEmitter).u1v = sanitizeSymbol;
+protoOf(JavaEmitter).x1v = sanitizeFirstIsDigit;
+protoOf(JavaEmitter).y1v = sanitizeKeywords;
+protoOf(JavaEmitter).k1v = emitRoot;
+protoOf(JavaEmitter).j1v = emitRoot$default;
+protoOf(JavaEmitter).z1v = emitHandleFunction;
+protoOf(JavaEmitter).pr = emitValidator;
+protoOf(JavaIrEmitter).sn = emit_1;
+protoOf(JavaIrEmitter).r1u = emit_2;
 //endregion
 //region block: exports
 export {