@flock/wirespec 0.19.6 → 0.19.7

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

@@ -188,10 +188,10 @@ import {
 //endregion
 //region block: pre-declaration
 function emit_3(type, module_0) {
-  var tmp = this.nr(type.lp_1);
-  var tmp_0 = this.lq(type.mp_1);
+  var tmp = this.or(type.mp_1);
+  var tmp_0 = this.mq(type.np_1);
   // Inline function 'kotlin.run' call
-  var $this$run = type.np_1;
+  var $this$run = type.op_1;
   var tmp_1;
   if ($this$run.r()) {
     tmp_1 = '';
@@ -202,23 +202,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.ip_1, '\n', VOID, VOID, VOID, VOID, JavaTypeDefinitionEmitter$emit$lambda_0(this)), 1);
+  return dropLast_0(joinToString(_this__u8e3s4.jp_1, '\n', VOID, VOID, VOID, VOID, JavaTypeDefinitionEmitter$emit$lambda_0(this)), 1);
 }
 function emit_5(_this__u8e3s4) {
-  return this.nq(_this__u8e3s4.rp_1) + ' ' + this.nr(_this__u8e3s4.qp_1);
+  return this.oq(_this__u8e3s4.sp_1) + ' ' + this.or(_this__u8e3s4.rp_1);
 }
 function emit_6(_this__u8e3s4) {
   // Inline function 'kotlin.let' call
   var it = emitType(this, _this__u8e3s4);
-  return _this__u8e3s4.tu() ? 'java.util.Optional<' + it + '>' : it;
+  return _this__u8e3s4.uu() ? 'java.util.Optional<' + it + '>' : it;
 }
 function emitRoot(_this__u8e3s4, void_0) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = this.x1w(_this__u8e3s4.so_1);
+    tmp = this.y1w(_this__u8e3s4.so_1);
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = this.x1w(_this__u8e3s4.po_1);
+      tmp = this.y1w(_this__u8e3s4.po_1);
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = void_0;
@@ -247,15 +247,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.y1w(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
+  return $super === VOID ? this.z1w(_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.pq(_this__u8e3s4.pt_1), '\\', '\\\\') + '").matcher(value).find();';
+    tmp = 'return java.util.regex.Pattern.compile("' + replace(this.qq(_this__u8e3s4.qt_1), '\\', '\\\\') + '").matcher(value).find();';
   } else {
     if (_this__u8e3s4 instanceof Bound) {
-      var tmp1_safe_receiver = _this__u8e3s4.fu_1;
+      var tmp1_safe_receiver = _this__u8e3s4.gu_1;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
         tmp_0 = null;
@@ -264,7 +264,7 @@ function emit_7(_this__u8e3s4) {
         tmp_0 = tmp1_safe_receiver + ' < value';
       }
       var minCheck = tmp_0;
-      var tmp2_safe_receiver = _this__u8e3s4.gu_1;
+      var tmp2_safe_receiver = _this__u8e3s4.hu_1;
       var tmp_1;
       if (tmp2_safe_receiver == null) {
         tmp_1 = null;
@@ -290,60 +290,16 @@ function emit_7(_this__u8e3s4) {
 }
 initMetadataForInterface(JavaTypeDefinitionEmitter, 'JavaTypeDefinitionEmitter', VOID, VOID, [TypeDefinitionEmitter]);
 function emit_8(channel) {
-  return trimMargin('\n        |' + emitImports(this, channel) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.nr(channel.cp_1) + ' {\n        |   void invoke(' + emitFullyQualified(this, channel, channel.dp_1) + this.x1w(channel.dp_1) + ' message);\n        |}\n        |\n    ');
+  return trimMargin('\n        |' + emitImports(this, channel) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.or(channel.dp_1) + ' {\n        |   void invoke(' + emitFullyQualified(this, channel, channel.ep_1) + this.y1w(channel.ep_1) + ' message);\n        |}\n        |\n    ');
 }
 initMetadataForInterface(JavaChannelDefinitionEmitter, 'JavaChannelDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_9(refined) {
-  return trimMargin('\n        |public record ' + this.nr(refined.sr_1) + ' (' + this.nq(refined.tr_1) + ' value) implements Wirespec.Refined<' + this.nq(refined.tr_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.bs(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public ' + this.nq(refined.tr_1) + ' value() { return value; }\n        |}\n        |\n    ');
-}
-function emitValidator(_this__u8e3s4) {
-  var defaultReturn = 'return true;';
-  var type = _this__u8e3s4.tr_1.fv_1;
-  var tmp;
-  if (type instanceof Integer) {
-    var tmp0_safe_receiver = type.ku_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.oq(tmp0_safe_receiver);
-    tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
-  } else {
-    if (type instanceof Number_0) {
-      var tmp2_safe_receiver = type.nu_1;
-      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.oq(tmp2_safe_receiver);
-      tmp = tmp3_elvis_lhs == null ? defaultReturn : tmp3_elvis_lhs;
-    } else {
-      if (type instanceof String_0) {
-        var tmp4_safe_receiver = type.hu_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.oq(new RegExp_0(tmp4_safe_receiver));
-        }
-        var tmp5_elvis_lhs = tmp_0;
-        tmp = tmp5_elvis_lhs == null ? defaultReturn : tmp5_elvis_lhs;
-      } else {
-        if (equals(type, Boolean_instance)) {
-          tmp = defaultReturn;
-        } else {
-          if (equals(type, Bytes_instance)) {
-            tmp = defaultReturn;
-          } else {
-            noWhenBranchMatchedException();
-          }
-        }
-      }
-    }
-  }
-  return tmp;
-}
-initMetadataForInterface(JavaRefinedTypeDefinitionEmitter, 'JavaRefinedTypeDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_10(identifier) {
+function emit_9(identifier) {
   var tmp;
   if (identifier instanceof DefinitionIdentifier) {
-    tmp = this.i1x(identifier.l1());
+    tmp = this.j1x(identifier.l1());
   } else {
     if (identifier instanceof FieldIdentifier) {
-      tmp = this.m1x(this.i1x(identifier.l1()));
+      tmp = this.n1x(this.j1x(identifier.l1()));
     } else {
       noWhenBranchMatchedException();
     }
@@ -361,11 +317,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.er(item) : item;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.fr(item) : item;
     destination.x(tmp$ret$0);
   }
   var tmp = asSequence(joinToString(destination, ''));
-  return this.l1x(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
+  return this.m1x(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
 }
 function sanitizeFirstIsDigit(_this__u8e3s4) {
   var tmp;
@@ -385,64 +341,64 @@ function sanitizeFirstIsDigit(_this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords(_this__u8e3s4) {
-  return Companion_getInstance_0().o1x_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance_0().p1x_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 }
 initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
-function emit_11(union) {
-  var tmp = this.nr(union.gp_1);
-  return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.hp_1, VOID, VOID, VOID, VOID, VOID, JavaUnionDefinitionEmitter$emit$lambda) + ' {}\n        |\n    ');
+function emit_10(union) {
+  var tmp = this.or(union.hp_1);
+  return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.ip_1, VOID, VOID, VOID, VOID, VOID, JavaUnionDefinitionEmitter$emit$lambda) + ' {}\n        |\n    ');
 }
 initMetadataForInterface(JavaUnionDefinitionEmitter, 'JavaUnionDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-function emit_12(endpoint) {
+function emit_11(endpoint) {
   var tmp = emitImports_0(this, endpoint);
-  var tmp_0 = this.nr(endpoint.up_1);
+  var tmp_0 = this.or(endpoint.vp_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.xp_1, 'Queries', 'Wirespec.Queries', JavaEndpointDefinitionEmitter$emit$lambda_0(this));
-  var tmp_4 = emitObject(this, endpoint.yp_1, 'RequestHeaders', 'Wirespec.Request.Headers', JavaEndpointDefinitionEmitter$emit$lambda_1(this));
-  var tmp_5 = this.j1x(first_0(endpoint.zp_1), endpoint);
+  var tmp_3 = emitObject(this, endpoint.yp_1, 'Queries', 'Wirespec.Queries', JavaEndpointDefinitionEmitter$emit$lambda_0(this));
+  var tmp_4 = emitObject(this, endpoint.zp_1, 'RequestHeaders', 'Wirespec.Request.Headers', JavaEndpointDefinitionEmitter$emit$lambda_1(this));
+  var tmp_5 = this.k1x(first_0(endpoint.aq_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.aq_1);
+  var tmp_9 = distinctByStatus(endpoint.bq_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.zp_1), endpoint);
-  var tmp_13 = Spacer_instance.hs(2);
-  var tmp_14 = distinctByStatus(endpoint.aq_1);
+  var tmp_12 = emitRequestFunctions(this, first_0(endpoint.aq_1), endpoint);
+  var tmp_13 = Spacer_instance.is(2);
+  var tmp_14 = distinctByStatus(endpoint.bq_1);
   var tmp_15 = joinToString(tmp_14, '\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_3(this));
-  var tmp_16 = Spacer_instance.hs(3);
-  var tmp_17 = Spacer_instance.hs(2);
-  var tmp_18 = Spacer_instance.hs(2);
+  var tmp_16 = Spacer_instance.is(3);
+  var tmp_17 = Spacer_instance.is(2);
+  var tmp_18 = Spacer_instance.is(2);
   var tmp_19 = emitFromResponse(this, endpoint);
-  var tmp_20 = Spacer_instance.hs(2);
-  var tmp_21 = Spacer_instance.hs(2);
-  var tmp_22 = this.n1x(endpoint);
-  var tmp_23 = Spacer_instance.hs(2);
-  var tmp_24 = Spacer_instance.hs(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.wp_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_4) + '"; }\n        |' + Spacer_instance.hs(3) + '@Override public String getMethod() { return "' + endpoint.vp_1.toString() + '"; }\n        |' + Spacer_instance.hs(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.hs(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.hs(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.hs(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.hs(4) + '};\n        |' + Spacer_instance.hs(3) + '}\n        |' + Spacer_instance.hs(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.hs(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.hs(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.hs(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.hs(4) + '};\n        |' + Spacer_instance.hs(3) + '}\n        |' + Spacer_instance.hs(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+  var tmp_20 = Spacer_instance.is(2);
+  var tmp_21 = Spacer_instance.is(2);
+  var tmp_22 = this.o1x(endpoint);
+  var tmp_23 = Spacer_instance.is(2);
+  var tmp_24 = Spacer_instance.is(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.xp_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_4) + '"; }\n        |' + Spacer_instance.is(3) + '@Override public String getMethod() { return "' + endpoint.wp_1.toString() + '"; }\n        |' + Spacer_instance.is(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.is(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.is(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.is(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.is(4) + '};\n        |' + Spacer_instance.is(3) + '}\n        |' + Spacer_instance.is(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.is(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.is(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.is(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.is(4) + '};\n        |' + Spacer_instance.is(3) + '}\n        |' + Spacer_instance.is(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 }
 function emitHandleFunction(endpoint) {
-  return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.fr(this.nr(endpoint.up_1)) + '(Request request);';
+  return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.gr(this.or(endpoint.vp_1)) + '(Request request);';
 }
-function emit_13(_this__u8e3s4, endpoint) {
-  return trimMargin('\n        |' + Spacer_instance.toString() + 'record Request (\n        |' + Spacer_instance.hs(2) + 'Path path,\n        |' + Spacer_instance.hs(2) + 'Wirespec.Method method,\n        |' + Spacer_instance.hs(2) + 'Queries queries,\n        |' + Spacer_instance.hs(2) + 'RequestHeaders headers,\n        |' + Spacer_instance.hs(2) + emit_16(this, _this__u8e3s4.dq_1) + ' body\n        |' + Spacer_instance.toString() + ') implements Wirespec.Request<' + emit_16(this, _this__u8e3s4.dq_1) + '> {\n        |' + Spacer_instance.hs(2) + emitConstructor(this, _this__u8e3s4, endpoint) + '\n        |' + Spacer_instance.toString() + '}\n    ');
+function emit_12(_this__u8e3s4, endpoint) {
+  return trimMargin('\n        |' + Spacer_instance.toString() + 'record Request (\n        |' + Spacer_instance.is(2) + 'Path path,\n        |' + Spacer_instance.is(2) + 'Wirespec.Method method,\n        |' + Spacer_instance.is(2) + 'Queries queries,\n        |' + Spacer_instance.is(2) + 'RequestHeaders headers,\n        |' + Spacer_instance.is(2) + emit_16(this, _this__u8e3s4.eq_1) + ' body\n        |' + Spacer_instance.toString() + ') implements Wirespec.Request<' + emit_16(this, _this__u8e3s4.eq_1) + '> {\n        |' + Spacer_instance.is(2) + emitConstructor(this, _this__u8e3s4, endpoint) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 }
-function emit_14(_this__u8e3s4) {
+function emit_13(_this__u8e3s4) {
   var tmp = Spacer_instance.toString();
-  var tmp_0 = Companion_instance_1.er(_this__u8e3s4.gq_1);
-  var tmp_1 = Spacer_instance.hs(2);
-  var tmp_2 = Spacer_instance.hs(2);
-  var tmp_3 = Spacer_instance.hs(2);
-  var tmp_4 = emit_16(this, _this__u8e3s4.iq_1);
+  var tmp_0 = Companion_instance_1.fr(_this__u8e3s4.hq_1);
+  var tmp_1 = Spacer_instance.is(2);
+  var tmp_2 = Spacer_instance.is(2);
+  var tmp_3 = Spacer_instance.is(2);
+  var tmp_4 = emit_16(this, _this__u8e3s4.jq_1);
   var tmp_5 = Spacer_instance.toString();
-  var tmp_6 = toString_0(first(_this__u8e3s4.gq_1));
-  var tmp_7 = emit_16(this, _this__u8e3s4.iq_1);
-  var tmp_8 = concatGenerics(emit_16(this, _this__u8e3s4.iq_1));
-  var tmp_9 = Spacer_instance.hs(2);
-  var tmp_10 = Companion_instance_1.er(_this__u8e3s4.gq_1);
-  var tmp_11 = orNull(joinToString(_this__u8e3s4.hq_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_5(this)));
-  var tmp0_safe_receiver = _this__u8e3s4.iq_1;
+  var tmp_6 = toString_0(first(_this__u8e3s4.hq_1));
+  var tmp_7 = emit_16(this, _this__u8e3s4.jq_1);
+  var tmp_8 = concatGenerics(emit_16(this, _this__u8e3s4.jq_1));
+  var tmp_9 = Spacer_instance.is(2);
+  var tmp_10 = Companion_instance_1.fr(_this__u8e3s4.hq_1);
+  var tmp_11 = orNull(joinToString(_this__u8e3s4.iq_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_5(this)));
+  var tmp0_safe_receiver = _this__u8e3s4.jq_1;
   var tmp_12;
   if (tmp0_safe_receiver == null) {
     tmp_12 = null;
@@ -451,22 +407,66 @@ function emit_14(_this__u8e3s4) {
     tmp_12 = emit_16(this, tmp0_safe_receiver) + ' body';
   }
   var tmp_13 = joinToString(listOfNotNull([tmp_11, tmp_12]));
-  var tmp_14 = Spacer_instance.hs(3);
-  var tmp_15 = fixStatus(_this__u8e3s4.gq_1);
+  var tmp_14 = Spacer_instance.is(3);
+  var tmp_15 = fixStatus(_this__u8e3s4.hq_1);
   // Inline function 'kotlin.let' call
-  var tmp_16 = 'new Headers(' + joinToString(_this__u8e3s4.hq_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_6(this)) + ')';
-  var tmp_17 = _this__u8e3s4.iq_1 == null ? 'null' : 'body';
-  var tmp_18 = Spacer_instance.hs(2);
-  var tmp_19 = Spacer_instance.hs(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.hq_1, 'Headers', 'Wirespec.Response.Headers', JavaEndpointDefinitionEmitter$emit$lambda_7(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
+  var tmp_16 = 'new Headers(' + joinToString(_this__u8e3s4.iq_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_6(this)) + ')';
+  var tmp_17 = _this__u8e3s4.jq_1 == null ? 'null' : 'body';
+  var tmp_18 = Spacer_instance.is(2);
+  var tmp_19 = Spacer_instance.is(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.iq_1, 'Headers', 'Wirespec.Response.Headers', JavaEndpointDefinitionEmitter$emit$lambda_7(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 }
 initMetadataForInterface(JavaEndpointDefinitionEmitter, 'JavaEndpointDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_15(enum_0, module_0) {
-  var tmp = this.nr(enum_0.xr_1);
-  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.yr_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.nr(enum_0.xr_1) + '(String label) {\n        |' + Spacer_instance.hs(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.hs(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String label() {\n        |' + Spacer_instance.hs(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+function emit_14(enum_0, module_0) {
+  var tmp = this.or(enum_0.yr_1);
+  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.zr_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.or(enum_0.yr_1) + '(String label) {\n        |' + Spacer_instance.is(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.is(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String label() {\n        |' + Spacer_instance.is(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 }
 initMetadataForInterface(JavaEnumDefinitionEmitter, 'JavaEnumDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaRefinedTypeDefinitionEmitter, JavaChannelDefinitionEmitter, JavaUnionDefinitionEmitter, JavaEndpointDefinitionEmitter, JavaEnumDefinitionEmitter, JavaTypeDefinitionEmitter, JavaIdentifierEmitter, LanguageEmitter]);
+function emit_15(refined) {
+  return trimMargin('\n        |public record ' + this.or(refined.tr_1) + ' (' + this.oq(refined.ur_1) + ' value) implements Wirespec.Refined<' + this.oq(refined.ur_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.cs(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public ' + this.oq(refined.ur_1) + ' value() { return value; }\n        |}\n        |\n    ');
+}
+function emitValidator(_this__u8e3s4) {
+  var defaultReturn = 'return true;';
+  var type = _this__u8e3s4.ur_1.gv_1;
+  var tmp;
+  if (type instanceof Integer) {
+    var tmp0_safe_receiver = type.lu_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.pq(tmp0_safe_receiver);
+    tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
+  } else {
+    if (type instanceof Number_0) {
+      var tmp2_safe_receiver = type.ou_1;
+      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.pq(tmp2_safe_receiver);
+      tmp = tmp3_elvis_lhs == null ? defaultReturn : tmp3_elvis_lhs;
+    } else {
+      if (type instanceof String_0) {
+        var tmp4_safe_receiver = type.iu_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.pq(new RegExp_0(tmp4_safe_receiver));
+        }
+        var tmp5_elvis_lhs = tmp_0;
+        tmp = tmp5_elvis_lhs == null ? defaultReturn : tmp5_elvis_lhs;
+      } else {
+        if (equals(type, Boolean_instance)) {
+          tmp = defaultReturn;
+        } else {
+          if (equals(type, Bytes_instance)) {
+            tmp = defaultReturn;
+          } else {
+            noWhenBranchMatchedException();
+          }
+        }
+      }
+    }
+  }
+  return tmp;
+}
+initMetadataForInterface(JavaRefinedTypeDefinitionEmitter, 'JavaRefinedTypeDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
+initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaChannelDefinitionEmitter, JavaTypeDefinitionEmitter, JavaIdentifierEmitter, JavaUnionDefinitionEmitter, JavaEndpointDefinitionEmitter, JavaEnumDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, LanguageEmitter]);
 initMetadataForCompanion(Companion);
 initMetadataForCompanion(Companion_0);
 initMetadataForClass(JavaIrEmitter, 'JavaIrEmitter', JavaIrEmitter, VOID, [IrEmitter]);
@@ -480,7 +480,7 @@ function emitImports($this, _this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.mr().l1() === element.bv_1)) {
+    if (!(_this__u8e3s4.nr().l1() === element.cv_1)) {
       destination.x(element);
     }
   }
@@ -490,7 +490,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.w1w().ds_1 + '.model.' + item.bv_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.x1w().es_1 + '.model.' + item.cv_1 + ';';
     destination_0.x(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -498,8 +498,8 @@ function emitImports($this, _this__u8e3s4) {
 }
 function emitFullyQualified($this, _this__u8e3s4, reference) {
   var tmp;
-  if (_this__u8e3s4.mr().l1() === reference.l1()) {
-    tmp = $this.w1w().ds_1 + '.model.';
+  if (_this__u8e3s4.nr().l1() === reference.l1()) {
+    tmp = $this.x1w().es_1 + '.model.';
   } else {
     tmp = '';
   }
@@ -512,49 +512,49 @@ function JavaChannelDefinitionEmitter$emitImports$lambda(it) {
 function JavaChannelDefinitionEmitter() {
 }
 function JavaEmitter(packageName, emitShared) {
-  packageName = packageName === VOID ? Companion_instance.cs('community.flock.wirespec.generated') : packageName;
+  packageName = packageName === VOID ? Companion_instance.ds('community.flock.wirespec.generated') : packageName;
   emitShared = emitShared === VOID ? Companion_instance_0.wo() : emitShared;
   LanguageEmitter.call(this);
-  this.z1w_1 = packageName;
-  this.a1x_1 = emitShared;
-  this.b1x_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
-  this.c1x_1 = FileExtension_Java_getInstance();
-  this.d1x_1 = JavaShared_getInstance();
-  this.e1x_1 = '//';
-}
-protoOf(JavaEmitter).w1w = function () {
-  return this.z1w_1;
-};
-protoOf(JavaEmitter).uq = function () {
-  return this.c1x_1;
+  this.a1x_1 = packageName;
+  this.b1x_1 = emitShared;
+  this.c1x_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
+  this.d1x_1 = FileExtension_Java_getInstance();
+  this.e1x_1 = JavaShared_getInstance();
+  this.f1x_1 = '//';
+}
+protoOf(JavaEmitter).x1w = function () {
+  return this.a1x_1;
 };
-protoOf(JavaEmitter).f1x = function () {
+protoOf(JavaEmitter).vq = function () {
   return this.d1x_1;
 };
-protoOf(JavaEmitter).vq = function () {
+protoOf(JavaEmitter).g1x = function () {
   return this.e1x_1;
 };
-protoOf(JavaEmitter).kr = function (module_0, logger) {
+protoOf(JavaEmitter).wq = function () {
+  return this.f1x_1;
+};
+protoOf(JavaEmitter).lr = function (module_0, logger) {
   // Inline function 'kotlin.let' call
-  var it = protoOf(LanguageEmitter).kr.call(this, module_0, logger);
-  return this.a1x_1.xo_1 ? NonEmptyList__plus_impl_xqmb9(it, new Emitted(Companion_instance.cs('community.flock.wirespec.java').fs() + 'Wirespec', this.f1x().h1x_1)) : it;
+  var it = protoOf(LanguageEmitter).lr.call(this, module_0, logger);
+  return this.b1x_1.xo_1 ? NonEmptyList__plus_impl_xqmb9(it, new Emitted(Companion_instance.ds('community.flock.wirespec.java').gs() + 'Wirespec', this.g1x().i1x_1)) : it;
 };
-protoOf(JavaEmitter).lr = function (definition, module_0, logger) {
+protoOf(JavaEmitter).mr = function (definition, module_0, logger) {
   // Inline function 'kotlin.let' call
-  var it = protoOf(LanguageEmitter).lr.call(this, definition, module_0, logger);
-  var subPackageName = plus(this.w1w(), definition);
-  var tmp = subPackageName.fs() + this.i1x(it.yo_1);
+  var it = protoOf(LanguageEmitter).mr.call(this, definition, module_0, logger);
+  var subPackageName = plus(this.x1w(), definition);
+  var tmp = subPackageName.gs() + this.j1x(it.yo_1);
   // Inline function 'kotlin.text.trimStart' call
-  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.gr(module_0) ? this.b1x_1 : '') + '\n                    |' + it.zo_1 + '\n                    ');
+  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.hr(module_0) ? this.c1x_1 : '') + '\n                    |' + it.zo_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.y1w(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw($this, _this__u8e3s4) + ')';
+  return 'Wirespec.getType(' + $this.z1w(_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.tu();
+  var tmp1_elvis_lhs = _this__u8e3s4 == null ? null : _this__u8e3s4.uu();
   if (tmp1_elvis_lhs == null ? false : tmp1_elvis_lhs) {
     tmp = 'java.util.Optional.class';
   } else {
@@ -569,9 +569,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.xp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_0($this)));
-  var tmp_2 = orNull(joinToString(endpoint.yp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_1($this)));
-  var tmp0_safe_receiver = _this__u8e3s4.dq_1;
+  var tmp_1 = orNull(joinToString(endpoint.yp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_0($this)));
+  var tmp_2 = orNull(joinToString(endpoint.zp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_1($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.eq_1;
   var tmp_3;
   if (tmp0_safe_receiver == null) {
     tmp_3 = null;
@@ -580,112 +580,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.hs(3);
+  var tmp_5 = Spacer_instance.is(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.vp_1.a3_1;
+  var tmp_8 = 'Wirespec.Method.' + endpoint.wp_1.a3_1;
   // Inline function 'kotlin.let' call
-  var tmp$ret$5 = 'new Queries(' + joinToString(endpoint.xp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_3($this)) + ')';
+  var tmp$ret$5 = 'new Queries(' + joinToString(endpoint.yp_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.yp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_4($this)) + ')';
+  var tmp$ret$7 = 'new RequestHeaders(' + joinToString(endpoint.zp_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.dq_1 == null) {
+  if (_this__u8e3s4.eq_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.hs(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.is(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.xp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_0($this)));
-  var tmp_2 = orNull(joinToString(endpoint.yp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_1($this)));
-  var tmp0_safe_receiver = _this__u8e3s4.dq_1;
+  var tmp_1 = orNull(joinToString(endpoint.yp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_0($this)));
+  var tmp_2 = orNull(joinToString(endpoint.zp_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_1($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.eq_1;
   var tmp_3;
   if (tmp0_safe_receiver == null) {
     tmp_3 = null;
   } else {
     // Inline function 'kotlin.let' call
-    tmp_3 = Spacer_instance.hs(4) + 'request.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.fq_1) + ')).orElse(null)';
+    tmp_3 = Spacer_instance.is(4) + 'request.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.gq_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.hs(3);
+  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.is(3);
 }
 function emitDeserializedParams_0($this, _this__u8e3s4) {
-  var tmp = orNull(joinToString(_this__u8e3s4.hq_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_2($this)));
-  var tmp0_safe_receiver = _this__u8e3s4.iq_1;
+  var tmp = orNull(joinToString(_this__u8e3s4.iq_1, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_2($this)));
+  var tmp0_safe_receiver = _this__u8e3s4.jq_1;
   var tmp_0;
   if (tmp0_safe_receiver == null) {
     tmp_0 = null;
   } else {
     // Inline function 'kotlin.let' call
-    tmp_0 = Spacer_instance.hs(5) + 'response.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.fq_1) + ')).orElse(null)';
+    tmp_0 = Spacer_instance.is(5) + 'response.body().<' + emit_16($this, tmp0_safe_receiver) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType($this, tmp0_safe_receiver.gq_1) + ')).orElse(null)';
   }
   // Inline function 'kotlin.let' call
   var it = joinToString(listOfNotNull([tmp, tmp_0]), ',\n');
-  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.hs(4);
+  return isBlank(it) ? '' : '\n' + it + '\n' + Spacer_instance.is(4);
 }
 function emitSerialized($this, _this__u8e3s4) {
   var tmp;
-  if (!(_this__u8e3s4.iq_1 == null)) {
-    tmp = 'java.util.Optional.ofNullable(serialization.serializeBody(r.body, ' + emitGetType($this, ensureNotNull(_this__u8e3s4.iq_1).fq_1) + '))';
+  if (!(_this__u8e3s4.jq_1 == null)) {
+    tmp = 'java.util.Optional.ofNullable(serialization.serializeBody(r.body, ' + emitGetType($this, ensureNotNull(_this__u8e3s4.jq_1).gq_1) + '))';
   } else {
     tmp = 'java.util.Optional.empty()';
   }
   var body = tmp;
   var tmp_0;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  if (!_this__u8e3s4.hq_1.r()) {
-    tmp_0 = 'java.util.Map.ofEntries(' + joinToString(_this__u8e3s4.hq_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitSerialized$lambda($this)) + ')';
+  if (!_this__u8e3s4.iq_1.r()) {
+    tmp_0 = 'java.util.Map.ofEntries(' + joinToString(_this__u8e3s4.iq_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitSerialized$lambda($this)) + ')';
   } else {
     tmp_0 = 'java.util.Collections.emptyMap()';
   }
   var headers = tmp_0;
-  return Spacer_instance.hs(3) + 'if (response instanceof Response' + Companion_instance_1.er(_this__u8e3s4.gq_1) + ' r) { return new Wirespec.RawResponse(r.status(), ' + headers + ', ' + body + '); }';
+  return Spacer_instance.is(3) + 'if (response instanceof Response' + Companion_instance_1.fr(_this__u8e3s4.hq_1) + ' r) { return new Wirespec.RawResponse(r.status(), ' + headers + ', ' + body + '); }';
 }
 function emitDeserialized($this, _this__u8e3s4) {
-  return Spacer_instance.hs(4) + 'case ' + _this__u8e3s4.gq_1 + ' -> new Response' + Companion_instance_1.er(_this__u8e3s4.gq_1) + '(' + emitDeserializedParams_0($this, _this__u8e3s4) + ');';
+  return Spacer_instance.is(4) + 'case ' + _this__u8e3s4.hq_1 + ' -> new Response' + Companion_instance_1.fr(_this__u8e3s4.hq_1) + '(' + emitDeserializedParams_0($this, _this__u8e3s4) + ');';
 }
 function emitSerializedParams($this, _this__u8e3s4, fields) {
-  return 'java.util.Map.entry("' + _this__u8e3s4.qp_1.l1() + '", serialization.serializeParam(request.' + (fields === 'queries' ? 'queries' : 'headers') + '().' + $this.nr(_this__u8e3s4.qp_1) + '(), ' + emitGetType($this, _this__u8e3s4.rp_1) + '))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.rp_1.l1() + '", serialization.serializeParam(request.' + (fields === 'queries' ? 'queries' : 'headers') + '().' + $this.or(_this__u8e3s4.rp_1) + '(), ' + emitGetType($this, _this__u8e3s4.sp_1) + '))';
 }
 function emitDeserialized_0($this, _this__u8e3s4) {
-  return Spacer_instance.hs(4) + 'serialization.deserializePath(request.path().get(' + _this__u8e3s4.te_1 + '), ' + emitGetType($this, _this__u8e3s4.ue_1.cq_1) + ')';
+  return Spacer_instance.is(4) + 'serialization.deserializePath(request.path().get(' + _this__u8e3s4.te_1 + '), ' + emitGetType($this, _this__u8e3s4.ue_1.dq_1) + ')';
 }
 function emitDeserializedParams_1($this, _this__u8e3s4, fields, caseSensitive) {
   var tmp;
   if (caseSensitive) {
-    tmp = 'request.' + fields + '().getOrDefault("' + _this__u8e3s4.qp_1.l1() + '", java.util.Collections.emptyList())';
+    tmp = 'request.' + fields + '().getOrDefault("' + _this__u8e3s4.rp_1.l1() + '", java.util.Collections.emptyList())';
   } else {
-    tmp = 'request.' + fields + '().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + _this__u8e3s4.qp_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.rp_1.l1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList())';
   }
   var valuesFromField = tmp;
-  return Spacer_instance.hs(4) + 'serialization.<' + $this.nq(_this__u8e3s4.rp_1) + '>deserializeParam(' + valuesFromField + ', ' + emitGetType($this, _this__u8e3s4.rp_1) + ')';
+  return Spacer_instance.is(4) + 'serialization.<' + $this.oq(_this__u8e3s4.sp_1) + '>deserializeParam(' + valuesFromField + ', ' + emitGetType($this, _this__u8e3s4.sp_1) + ')';
 }
 function emitSerializedHeader($this, _this__u8e3s4) {
-  return 'java.util.Map.entry("' + _this__u8e3s4.qp_1.l1() + '", serialization.<' + $this.nq(_this__u8e3s4.rp_1) + '>serializeParam(r.headers().' + $this.nr(_this__u8e3s4.qp_1) + '(), ' + emitGetType($this, _this__u8e3s4.rp_1) + '))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.rp_1.l1() + '", serialization.<' + $this.oq(_this__u8e3s4.sp_1) + '>serializeParam(r.headers().' + $this.or(_this__u8e3s4.rp_1) + '(), ' + emitGetType($this, _this__u8e3s4.sp_1) + '))';
 }
 function emitIdentifier($this, _this__u8e3s4) {
-  return 'serialization.serializePath(request.path().' + Companion_instance_1.fr($this.nr(_this__u8e3s4.bq_1)) + '(), ' + emitGetType($this, _this__u8e3s4.cq_1) + ')';
+  return 'serialization.serializePath(request.path().' + Companion_instance_1.gr($this.or(_this__u8e3s4.cq_1)) + '(), ' + emitGetType($this, _this__u8e3s4.dq_1) + ')';
 }
 function emit_16($this, _this__u8e3s4) {
-  var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.fq_1;
-  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.nq(tmp1_safe_receiver);
+  var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.gq_1;
+  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.oq(tmp1_safe_receiver);
   return tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
 }
 function emit_17($this, _this__u8e3s4) {
-  return $this.nq(_this__u8e3s4.cq_1) + ' ' + $this.nr(_this__u8e3s4.bq_1);
+  return $this.oq(_this__u8e3s4.dq_1) + ' ' + $this.or(_this__u8e3s4.cq_1);
 }
 function emitImports_0($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.filter' call
@@ -695,7 +695,7 @@ function emitImports_0($this, _this__u8e3s4) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.mr().l1() === element.bv_1)) {
+    if (!(_this__u8e3s4.nr().l1() === element.cv_1)) {
       destination.x(element);
     }
   }
@@ -705,46 +705,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.w1w().ds_1 + '.model.' + item.bv_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.x1w().es_1 + '.model.' + item.cv_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.hs(2);
-  var tmp_0 = Spacer_instance.hs(3);
-  var tmp_1 = Spacer_instance.hs(4);
-  var tmp_2 = Spacer_instance.hs(4);
-  var tmp_3 = joinToString(endpoint.wp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda($this));
-  var tmp_4 = Spacer_instance.hs(4);
+  var tmp = Spacer_instance.is(2);
+  var tmp_0 = Spacer_instance.is(3);
+  var tmp_1 = Spacer_instance.is(4);
+  var tmp_2 = Spacer_instance.is(4);
+  var tmp_3 = joinToString(endpoint.xp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda($this));
+  var tmp_4 = Spacer_instance.is(4);
   var tmp_5;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  if (!endpoint.xp_1.r()) {
-    tmp_5 = 'java.util.Map.ofEntries(' + joinToString(endpoint.xp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_0($this)) + ')';
+  if (!endpoint.yp_1.r()) {
+    tmp_5 = 'java.util.Map.ofEntries(' + joinToString(endpoint.yp_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.hs(4);
+  var tmp_7 = Spacer_instance.is(4);
   var tmp_8;
   // Inline function 'kotlin.collections.isNotEmpty' call
-  if (!endpoint.yp_1.r()) {
-    tmp_8 = 'java.util.Map.ofEntries(' + joinToString(endpoint.yp_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_1($this)) + ')';
+  if (!endpoint.zp_1.r()) {
+    tmp_8 = 'java.util.Map.ofEntries(' + joinToString(endpoint.zp_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.hs(4);
+  var tmp_10 = Spacer_instance.is(4);
   var tmp_11;
-  if (!(_this__u8e3s4.dq_1 == null)) {
-    var tmp0_safe_receiver = _this__u8e3s4.dq_1;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.fq_1;
+  if (!(_this__u8e3s4.eq_1 == null)) {
+    var tmp0_safe_receiver = _this__u8e3s4.eq_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.gq_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.hs(3) + ');\n        |' + Spacer_instance.hs(2) + '}\n        |\n        |' + Spacer_instance.hs(2) + 'static Request fromRequest(Wirespec.Deserializer serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.hs(3) + 'return new Request(' + emitDeserializedParams($this, _this__u8e3s4, endpoint) + ');\n        |' + Spacer_instance.hs(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.is(3) + ');\n        |' + Spacer_instance.is(2) + '}\n        |\n        |' + Spacer_instance.is(2) + 'static Request fromRequest(Wirespec.Deserializer serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.is(3) + 'return new Request(' + emitDeserializedParams($this, _this__u8e3s4, endpoint) + ');\n        |' + Spacer_instance.is(2) + '}\n    ');
 }
 function emitObject($this, _this__u8e3s4, name, extends_0, block) {
   var tmp;
@@ -758,13 +758,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.aq_1);
+  var this_0 = distinctByStatus(_this__u8e3s4.bq_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.iq_1);
+    var tmp$ret$0 = emit_16($this, item.jq_1);
     destination.x(tmp$ret$0);
   }
   var tmp = distinct(destination);
@@ -772,13 +772,13 @@ function emitResponseInterfaces($this, _this__u8e3s4) {
 }
 function emitStatusInterfaces($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.map' call
-  var this_0 = _this__u8e3s4.aq_1;
+  var this_0 = _this__u8e3s4.bq_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.gq_1));
+    var tmp$ret$0 = new Char(first(item.hq_1));
     destination.x(tmp$ret$0);
   }
   var tmp = distinct(destination);
@@ -786,26 +786,26 @@ function emitStatusInterfaces($this, _this__u8e3s4) {
 }
 function emitFromResponse($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.filter' call
-  var tmp0 = distinctByStatus(_this__u8e3s4.aq_1);
+  var tmp0 = distinctByStatus(_this__u8e3s4.bq_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.ir(element.gq_1)) {
+    if (Companion_instance_1.jr(element.hq_1)) {
       destination.x(element);
     }
   }
   var statusResponses = destination;
   var tmp;
   if (statusResponses.r()) {
-    tmp = trimMargin('\n                 |' + Spacer_instance.hs(3) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                ');
+    tmp = trimMargin('\n                 |' + Spacer_instance.is(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.hs(3) + 'if (response.statusCode() == ' + response.gq_1 + ') {\n                    |' + Spacer_instance.hs(4) + 'return new Response' + Companion_instance_1.er(response.gq_1) + '(' + emitDeserializedParams_0($this, response) + ');\n                    |' + Spacer_instance.hs(3) + '} else {\n                    |' + Spacer_instance.hs(4) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.hs(3) + '}\n                ');
+    tmp = trimMargin('\n                    |' + Spacer_instance.is(3) + 'if (response.statusCode() == ' + response.hq_1 + ') {\n                    |' + Spacer_instance.is(4) + 'return new Response' + Companion_instance_1.fr(response.hq_1) + '(' + emitDeserializedParams_0($this, response) + ');\n                    |' + Spacer_instance.is(3) + '} else {\n                    |' + Spacer_instance.is(4) + 'throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.is(3) + '}\n                ');
   } else {
-    var tmp_0 = Spacer_instance.hs(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.hs(4) + 'default -> throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.hs(3) + '};\n                ');
+    var tmp_0 = Spacer_instance.is(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.is(4) + 'default -> throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n                    |' + Spacer_instance.is(3) + '};\n                ');
   }
   return tmp;
 }
@@ -816,17 +816,17 @@ function JavaEndpointDefinitionEmitter$emit$lambda(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return this$0.mq(it);
+    return this$0.nq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_1(this$0) {
   return function (it) {
-    return this$0.mq(it);
+    return this$0.nq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return this$0.k1x(it);
+    return this$0.l1x(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_3(this$0) {
@@ -844,27 +844,27 @@ function JavaEndpointDefinitionEmitter$emitConstructor$lambda(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_0(this$0) {
   return function (it) {
-    return this$0.mq(it);
+    return this$0.nq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_1(this$0) {
   return function (it) {
-    return this$0.mq(it);
+    return this$0.nq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_2(this$0) {
   return function (it) {
-    return this$0.nr(it.bq_1);
+    return this$0.or(it.cq_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_3(this$0) {
   return function (it) {
-    return this$0.nr(it.qp_1);
+    return this$0.or(it.rp_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitConstructor$lambda_4(this$0) {
   return function (it) {
-    return this$0.nr(it.qp_1);
+    return this$0.or(it.rp_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda(this$0) {
@@ -884,22 +884,22 @@ function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_5(this$0) {
   return function (it) {
-    return this$0.mq(it);
+    return this$0.nq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_6(this$0) {
   return function (it) {
-    return this$0.nr(it.qp_1);
+    return this$0.or(it.rp_1);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_7(this$0) {
   return function (it) {
-    return this$0.mq(it);
+    return this$0.nq(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitDeserializedParams$lambda_2(this$0) {
   return function (it) {
-    return Spacer_instance.hs(5) + 'serialization.<' + this$0.nq(it.rp_1) + '>deserializeParam(response.headers().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + it.qp_1.l1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList()), ' + emitGetType(this$0, it.rp_1) + ')';
+    return Spacer_instance.is(5) + 'serialization.<' + this$0.oq(it.sp_1) + '>deserializeParam(response.headers().entrySet().stream().filter(e -> e.getKey().equalsIgnoreCase("' + it.rp_1.l1() + '")).findFirst().map(java.util.Map.Entry::getValue).orElse(java.util.Collections.emptyList()), ' + emitGetType(this$0, it.sp_1) + ')';
   };
 }
 function JavaEndpointDefinitionEmitter$emitSerialized$lambda(this$0) {
@@ -915,7 +915,7 @@ function JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Literal) {
-      tmp = '"' + it.xq_1 + '"';
+      tmp = '"' + it.yq_1 + '"';
     } else {
       if (it instanceof Param) {
         tmp = emitIdentifier(this$0, it);
@@ -938,7 +938,7 @@ function JavaEndpointDefinitionEmitter$emitRequestFunctions$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emitObject$lambda($block) {
   return function (it) {
-    return Spacer_instance.hs(2) + $block(it);
+    return Spacer_instance.is(2) + $block(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emitResponseInterfaces$lambda(it) {
@@ -958,7 +958,7 @@ function sanitizeNegative($this, _this__u8e3s4) {
   return startsWith(_this__u8e3s4, '-') ? '__' + substring(_this__u8e3s4, 1) : _this__u8e3s4;
 }
 function sanitizeEnum($this, _this__u8e3s4) {
-  return $this.m1x($this.l1x(joinToString(split(sanitizeNegative($this, _this__u8e3s4), ['-', ', ', '.', ' ', '//']), '_')));
+  return $this.n1x($this.m1x(joinToString(split(sanitizeNegative($this, _this__u8e3s4), ['-', ', ', '.', ' ', '//']), '_')));
 }
 function JavaEnumDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
@@ -969,7 +969,7 @@ function JavaEnumDefinitionEmitter() {
 }
 function Companion() {
   Companion_instance_2 = this;
-  this.o1x_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.p1x_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() {
@@ -993,7 +993,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.er(item) : item;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.fr(item) : item;
     destination.x(tmp$ret$0);
   }
   // Inline function 'kotlin.text.filter' call
@@ -1033,14 +1033,14 @@ function sanitizeFirstIsDigit_0($this, _this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords_0($this, _this__u8e3s4) {
-  return Companion_getInstance_1().p1x_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance_1().q1x_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.p1x_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.q1x_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() {
@@ -1052,10 +1052,10 @@ function JavaIrEmitter$sanitizationConfig$lambda(it) {
   return '_' + it;
 }
 function JavaIrEmitter$sanitizationConfig$lambda_0(name) {
-  return name.p1h_1.a1() > 1 ? new Name(listOf(name.t1m())) : name;
+  return name.q1h_1.a1() > 1 ? new Name(listOf(name.u1m())) : name;
 }
 function JavaIrEmitter$sanitizationConfig$lambda_1(name) {
-  return new Name(listOf(name.t1m()));
+  return new Name(listOf(name.u1m()));
 }
 function JavaIrEmitter$sanitizationConfig$lambda_2(this$0) {
   return function (it) {
@@ -1066,23 +1066,23 @@ function JavaIrEmitter$sanitizationConfig$lambda_3(stmt, tr) {
   var tmp;
   var tmp_0;
   if (stmt instanceof FunctionCall) {
-    tmp_0 = stmt.d1n_1.n1j() === 'validate';
+    tmp_0 = stmt.e1n_1.o1j() === 'validate';
   } else {
     tmp_0 = false;
   }
   if (tmp_0) {
-    tmp = transformChildren(stmt.h1n(VOID, emptyList()), tr);
+    tmp = transformChildren(stmt.i1n(VOID, emptyList()), tr);
   } else {
     tmp = transformChildren(stmt, tr);
   }
   return tmp;
 }
 function JavaIrEmitter$emitShared$lambda(name) {
-  switch (name.n1j()) {
+  switch (name.o1j()) {
     case 'client':
-      return Companion_getInstance().r1h('getClient');
+      return Companion_getInstance().s1h('getClient');
     case 'server':
-      return Companion_getInstance().r1h('getServer');
+      return Companion_getInstance().s1h('getServer');
     default:
       return null;
   }
@@ -1092,7 +1092,7 @@ function JavaIrEmitter$emitShared$lambda_0($imports) {
     var tmp;
     if (element instanceof File) {
       // Inline function 'kotlin.collections.partition' call
-      var this_0 = element.z1n_1;
+      var this_0 = element.a1o_1;
       var first = ArrayList_init_$Create$();
       var second = ArrayList_init_$Create$();
       var _iterator__ex2g4s = this_0.t();
@@ -1107,7 +1107,7 @@ function JavaIrEmitter$emitShared$lambda_0($imports) {
       var _destruct__k2r9zo = new Pair(first, second);
       var packageElements = _destruct__k2r9zo.ve();
       var rest = _destruct__k2r9zo.we();
-      tmp = element.c1o(VOID, plus_1(plus_1(packageElements, $imports), rest));
+      tmp = element.d1o(VOID, plus_1(plus_1(packageElements, $imports), rest));
     } else {
       tmp = element;
     }
@@ -1119,11 +1119,11 @@ function JavaIrEmitter$emitShared$lambda_1($clientServer) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Namespace) {
-      var injected = element.e1o_1.equals(Companion_getInstance().r1h('Wirespec')) ? $clientServer : emptyList();
+      var injected = element.f1o_1.equals(Companion_getInstance().s1h('Wirespec')) ? $clientServer : emptyList();
       var tmp_0;
       // Inline function 'kotlin.collections.isNotEmpty' call
       if (!injected.r()) {
-        tmp_0 = withElements(element, plus_1(element.a1o(), injected));
+        tmp_0 = withElements(element, plus_1(element.b1o(), injected));
       } else {
         tmp_0 = element;
       }
@@ -1148,7 +1148,7 @@ function JavaIrEmitter$emitGenerator$lambda_1(it) {
 }
 function JavaIrEmitter$emitGenerator$lambda_2(this$0) {
   return function (it) {
-    return import_0(this$0.w1w().ds_1 + '.model', it);
+    return import_0(this$0.x1w().es_1 + '.model', it);
   };
 }
 function JavaIrEmitter$emit$lambda(this$0) {
@@ -1160,38 +1160,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.f1i(String_instance);
-  $this$function.g1i(new VariableReference(Companion_getInstance().r1h('label')));
+  $this$function.g1i(String_instance);
+  $this$function.h1i(new VariableReference(Companion_getInstance().s1h('label')));
   return Unit_instance;
 }
 function JavaIrEmitter(packageName, emitShared) {
   Companion_getInstance_1();
-  packageName = packageName === VOID ? Companion_instance.cs('community.flock.wirespec.generated') : packageName;
+  packageName = packageName === VOID ? Companion_instance.ds('community.flock.wirespec.generated') : packageName;
   emitShared = emitShared === VOID ? Companion_instance_0.wo() : emitShared;
-  this.q1x_1 = packageName;
-  this.r1x_1 = emitShared;
-  this.s1x_1 = JavaGenerator_getInstance();
-  this.t1x_1 = FileExtension_Java_getInstance();
-  this.u1x_1 = listOf(import_0('community.flock.wirespec.java', 'Wirespec'));
+  this.r1x_1 = packageName;
+  this.s1x_1 = emitShared;
+  this.t1x_1 = JavaGenerator_getInstance();
+  this.u1x_1 = FileExtension_Java_getInstance();
+  this.v1x_1 = listOf(import_0('community.flock.wirespec.java', 'Wirespec'));
   var tmp = this;
-  var tmp_0 = Companion_getInstance_1().p1x_1;
+  var tmp_0 = Companion_getInstance_1().q1x_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.v1x_1 = new SanitizationConfig(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, JavaIrEmitter$sanitizationConfig$lambda_3);
+  tmp.w1x_1 = new SanitizationConfig(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, JavaIrEmitter$sanitizationConfig$lambda_3);
 }
-protoOf(JavaIrEmitter).w1w = function () {
-  return this.q1x_1;
-};
-protoOf(JavaIrEmitter).v1v = function () {
-  return this.s1x_1;
+protoOf(JavaIrEmitter).x1w = function () {
+  return this.r1x_1;
 };
-protoOf(JavaIrEmitter).uq = function () {
+protoOf(JavaIrEmitter).w1v = function () {
   return this.t1x_1;
 };
-protoOf(JavaIrEmitter).z1v = function () {
-  var packageName = Companion_instance.cs('community.flock.wirespec.java');
+protoOf(JavaIrEmitter).vq = function () {
+  return this.u1x_1;
+};
+protoOf(JavaIrEmitter).a1w = function () {
+  var packageName = Companion_instance.ds('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);
@@ -1210,49 +1210,49 @@ protoOf(JavaIrEmitter).z1v = 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.i1v_1;
+  var this_2 = scope.j1v_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_3 = new TransformerBuilder();
-  this_3.b1j(JavaIrEmitter$emitShared$lambda_0(imports));
-  var tmp$ret$5 = this_3.c1j();
-  tmp.i1v_1 = transform(this_2, tmp$ret$5);
+  this_3.c1j(JavaIrEmitter$emitShared$lambda_0(imports));
+  var tmp$ret$5 = this_3.d1j();
+  tmp.j1v_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.i1v_1;
+  var this_4 = scope.j1v_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_5 = new TransformerBuilder();
-  this_5.b1j(JavaIrEmitter$emitShared$lambda_1(clientServer));
-  var tmp$ret$10 = this_5.c1j();
-  tmp_0.i1v_1 = transform(this_4, tmp$ret$10);
-  var tmp_1 = scope.i1v_1;
+  this_5.c1j(JavaIrEmitter$emitShared$lambda_1(clientServer));
+  var tmp$ret$10 = this_5.d1j();
+  tmp_0.j1v_1 = transform(this_4, tmp$ret$10);
+  var tmp_1 = scope.j1v_1;
   var wirespecShared = isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
   var tmp_2;
-  if (this.r1x_1.xo_1) {
+  if (this.s1x_1.xo_1) {
     tmp_2 = wirespecShared;
   } else {
     tmp_2 = null;
   }
   return tmp_2;
 };
-protoOf(JavaIrEmitter).lr = function (definition, module_0, logger) {
+protoOf(JavaIrEmitter).mr = function (definition, module_0, logger) {
   var file = emit_0.call(this, definition, module_0, logger);
-  var tmp = file.c1o(Companion_getInstance().r1h(sanitizeSymbol_0(this, file.y1n_1.s1h())));
+  var tmp = file.d1o(Companion_getInstance().s1h(sanitizeSymbol_0(this, file.z1n_1.t1h())));
   // Inline function 'kotlin.takeIf' call
-  var this_0 = this.u1x_1;
+  var this_0 = this.v1x_1;
   var tmp_0;
-  if (Companion_instance_1.hr(module_0)) {
+  if (Companion_instance_1.ir(module_0)) {
     tmp_0 = this_0;
   } else {
     tmp_0 = null;
   }
   var tmp$ret$1 = tmp_0;
-  return placeInPackage(prependImports(tmp, tmp$ret$1), this.w1w(), definition);
+  return placeInPackage(prependImports(tmp, tmp$ret$1), this.x1w(), definition);
 };
-protoOf(JavaIrEmitter).e1w = function (definition, module_0) {
+protoOf(JavaIrEmitter).f1w = function (definition, module_0) {
   var tmp;
   if (definition instanceof Type) {
     tmp = convertToGenerator_2(definition, module_0);
@@ -1272,33 +1272,33 @@ protoOf(JavaIrEmitter).e1w = function (definition, module_0) {
     }
   }
   var generatorFile = tmp;
-  var sanitized = sanitizeNames(generatorFile, this.v1x_1);
-  var generatorOwnName = definition.mr().l1() + 'Generator';
+  var sanitized = sanitizeNames(generatorFile, this.w1x_1);
+  var generatorOwnName = definition.nr().l1() + 'Generator';
   var tmp_0 = asSequence_0(collectCustomTypeNames(sanitized));
   var tmp_1 = filterNot(tmp_0, JavaIrEmitter$emitGenerator$lambda);
   var tmp_2 = filterNot(tmp_1, JavaIrEmitter$emitGenerator$lambda_0(generatorOwnName));
   var tmp_3 = distinct_0(map(tmp_2, JavaIrEmitter$emitGenerator$lambda_1));
   var modelImports = toList(map(tmp_3, JavaIrEmitter$emitGenerator$lambda_2(this)));
-  return placeInPackage_0(prependImports(sanitized, plus_1(this.u1x_1, modelImports)), this.w1w(), 'generator');
+  return placeInPackage_0(prependImports(sanitized, plus_1(this.v1x_1, modelImports)), this.x1w(), 'generator');
 };
-protoOf(JavaIrEmitter).kq = function (type, module_0) {
-  return sanitizeNames(convertWithValidation(type, module_0), this.v1x_1);
+protoOf(JavaIrEmitter).lq = function (type, module_0) {
+  return sanitizeNames(convertWithValidation(type, module_0), this.w1x_1);
 };
-protoOf(JavaIrEmitter).zr = function (enum_0, module_0) {
+protoOf(JavaIrEmitter).as = 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.v1x_1);
+  return sanitizeNames(injectEnumLabelField(tmp, tmp_0, JavaIrEmitter$emit$lambda_0), this.w1x_1);
 };
-protoOf(JavaIrEmitter).pr = function (union) {
-  return sanitizeNames(convert_1(union), this.v1x_1);
+protoOf(JavaIrEmitter).qr = function (union) {
+  return sanitizeNames(convert_1(union), this.w1x_1);
 };
-protoOf(JavaIrEmitter).ur = function (refined) {
-  return sanitizeNames(applyRefinedStructShape(convert_2(refined), refined), this.v1x_1);
+protoOf(JavaIrEmitter).vr = function (refined) {
+  return sanitizeNames(applyRefinedStructShape(convert_2(refined), refined), this.w1x_1);
 };
-protoOf(JavaIrEmitter).as = function (endpoint) {
-  var tmp = sanitizeNames(transformTypeDescriptors(injectApiField(injectHandleFunction(convert_3(endpoint), endpoint))), this.v1x_1);
+protoOf(JavaIrEmitter).bs = function (endpoint) {
+  var tmp = sanitizeNames(transformTypeDescriptors(injectApiField(injectHandleFunction(convert_3(endpoint), endpoint))), this.w1x_1);
   // Inline function 'kotlin.takeIf' call
-  var this_0 = buildModelImports(endpoint, this.w1w());
+  var this_0 = buildModelImports(endpoint, this.x1w());
   var tmp_0;
   // Inline function 'kotlin.collections.isNotEmpty' call
   if (!this_0.r()) {
@@ -1309,25 +1309,25 @@ protoOf(JavaIrEmitter).as = function (endpoint) {
   var tmp$ret$2 = tmp_0;
   return prependImports(tmp, tmp$ret$2);
 };
-protoOf(JavaIrEmitter).or = function (channel) {
+protoOf(JavaIrEmitter).pr = function (channel) {
   var tmp;
-  if (channel.cp_1.l1() === channel.dp_1.l1()) {
-    tmp = this.w1w().ds_1 + '.model.';
+  if (channel.dp_1.l1() === channel.ep_1.l1()) {
+    tmp = this.x1w().es_1 + '.model.';
   } else {
     tmp = '';
   }
   var fullyQualifiedPrefix = tmp;
-  return qualifyChannelReferences(sanitizeNames(convert_4(channel), this.v1x_1), fullyQualifiedPrefix);
+  return qualifyChannelReferences(sanitizeNames(convert_4(channel), this.w1x_1), fullyQualifiedPrefix);
 };
-protoOf(JavaIrEmitter).d1w = function (endpoint) {
-  var imports = buildModelImports(endpoint, this.w1w());
-  var endpointImport = import_0(this.w1w().ds_1 + '.endpoint', endpoint.up_1.l1());
-  var endpointName = endpoint.up_1.l1();
-  var file = wrapAsyncReturnInThenApply(transformTypeDescriptors(sanitizeNames(emitEndpointClient.call(this, endpoint), this.v1x_1)), endpointName);
-  var subPackageName = plus_0(this.w1w(), 'client');
-  return new File(Companion_getInstance().r1h(subPackageName.fs() + sanitizeSymbol_0(this, file.y1n_1.s1h())), plus_1(plus_1(plus_1(plus_1(listOf(new Package(subPackageName.ds_1)), this.u1x_1), imports), listOf(endpointImport)), file.z1n_1));
+protoOf(JavaIrEmitter).e1w = function (endpoint) {
+  var imports = buildModelImports(endpoint, this.x1w());
+  var endpointImport = import_0(this.x1w().es_1 + '.endpoint', endpoint.vp_1.l1());
+  var endpointName = endpoint.vp_1.l1();
+  var file = wrapAsyncReturnInThenApply(transformTypeDescriptors(sanitizeNames(emitEndpointClient.call(this, endpoint), this.w1x_1)), endpointName);
+  var subPackageName = plus_0(this.x1w(), 'client');
+  return new File(Companion_getInstance().s1h(subPackageName.gs() + sanitizeSymbol_0(this, file.z1n_1.t1h())), plus_1(plus_1(plus_1(plus_1(listOf(new Package(subPackageName.es_1)), this.v1x_1), imports), listOf(endpointImport)), file.a1o_1));
 };
-protoOf(JavaIrEmitter).a1w = function (endpoints, logger) {
+protoOf(JavaIrEmitter).b1w = function (endpoints, logger) {
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
@@ -1343,7 +1343,7 @@ protoOf(JavaIrEmitter).a1w = function (endpoints, logger) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var e = _iterator__ex2g4s_0.v();
-    var key = e.bv_1;
+    var key = e.cv_1;
     if (set.x(key)) {
       list_0.x(e);
     }
@@ -1370,7 +1370,7 @@ protoOf(JavaIrEmitter).a1w = function (endpoints, logger) {
       var _iterator__ex2g4s_2 = endpoints.t();
       while (_iterator__ex2g4s_2.u()) {
         var element_1 = _iterator__ex2g4s_2.v();
-        if (element_1.up_1.l1() === element_0.bv_1) {
+        if (element_1.vp_1.l1() === element_0.cv_1) {
           tmp$ret$5 = false;
           break $l$block_0;
         }
@@ -1387,7 +1387,7 @@ protoOf(JavaIrEmitter).a1w = 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.w1w().ds_1 + '.model', item.bv_1);
+    var tmp$ret$10 = import_0(this.x1w().es_1 + '.model', item.cv_1);
     destination_1.x(tmp$ret$10);
   }
   var imports = destination_1;
@@ -1397,7 +1397,7 @@ protoOf(JavaIrEmitter).a1w = 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.w1w().ds_1 + '.endpoint', item_0.up_1.l1());
+    var tmp$ret$13 = import_0(this.x1w().es_1 + '.endpoint', item_0.vp_1.l1());
     destination_2.x(tmp$ret$13);
   }
   var endpointImports = destination_2;
@@ -1407,19 +1407,19 @@ protoOf(JavaIrEmitter).a1w = 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.w1w().ds_1 + '.client', item_1.up_1.l1() + 'Client');
+    var tmp$ret$16 = import_0(this.x1w().es_1 + '.client', item_1.vp_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.v1x_1);
-  return new File(Companion_getInstance().r1h(this.w1w().fs() + sanitizeSymbol_0(this, file.y1n_1.s1h())), plus_1(plus_1(plus_1(listOf(new Package(this.w1w().ds_1)), this.u1x_1), allImports), file.z1n_1));
+  var file = sanitizeNames(emitClient.call(this, endpoints, logger), this.w1x_1);
+  return new File(Companion_getInstance().s1h(this.x1w().gs() + sanitizeSymbol_0(this, file.z1n_1.t1h())), plus_1(plus_1(plus_1(listOf(new Package(this.x1w().es_1)), this.v1x_1), allImports), file.a1o_1));
 };
 function transformTypeDescriptors(_this__u8e3s4) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
   var scope = new TransformScope(_this__u8e3s4);
-  scope.r1v(transformTypeDescriptors$lambda);
-  var tmp = scope.i1v_1;
+  scope.s1v(transformTypeDescriptors$lambda);
+  var tmp = scope.j1v_1;
   return isInterface(tmp, Element) ? tmp : THROW_CCE();
 }
 function applyRefinedStructShape(_this__u8e3s4, refined) {
@@ -1428,14 +1428,14 @@ 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.i1v_1;
+  var this_0 = scope.j1v_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.b1j(applyRefinedStructShape$lambda(refined));
-  var tmp$ret$2 = this_1.c1j();
-  tmp.i1v_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.i1v_1;
+  this_1.c1j(applyRefinedStructShape$lambda(refined));
+  var tmp$ret$2 = this_1.d1j();
+  tmp.j1v_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.j1v_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function injectApiField(_this__u8e3s4) {
@@ -1445,14 +1445,14 @@ function injectApiField(_this__u8e3s4) {
   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.i1v_1;
+  var this_0 = scope.j1v_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.b1j(injectApiField$lambda);
-  var tmp$ret$2 = this_1.c1j();
-  tmp.i1v_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.i1v_1;
+  this_1.c1j(injectApiField$lambda);
+  var tmp$ret$2 = this_1.d1j();
+  tmp.j1v_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.j1v_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function injectHandleFunction(_this__u8e3s4, endpoint) {
@@ -1462,14 +1462,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.i1v_1;
+  var this_0 = scope.j1v_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.b1j(injectHandleFunction$lambda(handlersStruct));
-  var tmp$ret$2 = this_1.c1j();
-  tmp.i1v_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.i1v_1;
+  this_1.c1j(injectHandleFunction$lambda(handlersStruct));
+  var tmp$ret$2 = this_1.d1j();
+  tmp.j1v_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.j1v_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function buildModelImports(_this__u8e3s4, packageName) {
@@ -1480,7 +1480,7 @@ function buildModelImports(_this__u8e3s4, packageName) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    if (!(_this__u8e3s4.mr().l1() === element.bv_1)) {
+    if (!(_this__u8e3s4.nr().l1() === element.cv_1)) {
       destination.x(element);
     }
   }
@@ -1490,7 +1490,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.ds_1 + '.model', Companion_getInstance().r1h(item.bv_1).s1h());
+    var tmp$ret$3 = import_0(packageName.es_1 + '.model', Companion_getInstance().s1h(item.cv_1).t1h());
     destination_0.x(tmp$ret$3);
   }
   return destination_0;
@@ -1501,14 +1501,14 @@ function qualifyChannelReferences(_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.i1v_1;
+  var this_0 = scope.j1v_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.b1j(qualifyChannelReferences$lambda(fullyQualifiedPrefix));
-  var tmp$ret$2 = this_1.c1j();
-  tmp.i1v_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.i1v_1;
+  this_1.c1j(qualifyChannelReferences$lambda(fullyQualifiedPrefix));
+  var tmp$ret$2 = this_1.d1j();
+  tmp.j1v_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.j1v_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function wrapAsyncReturnInThenApply(_this__u8e3s4, endpointName) {
@@ -1517,26 +1517,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.i1v_1;
+  var this_0 = scope.j1v_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.b1j(wrapAsyncReturnInThenApply$lambda(endpointName));
-  var tmp$ret$2 = this_1.c1j();
-  tmp.i1v_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.i1v_1;
+  this_1.c1j(wrapAsyncReturnInThenApply$lambda(endpointName));
+  var tmp$ret$2 = this_1.d1j();
+  tmp.j1v_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.j1v_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.j1j_1);
+    tmp = findRoot(_this__u8e3s4.k1j_1);
   } else {
     if (_this__u8e3s4 instanceof Array_0) {
-      tmp = findRoot(_this__u8e3s4.k1j_1);
+      tmp = findRoot(_this__u8e3s4.l1j_1);
     } else {
       if (_this__u8e3s4 instanceof Dict_0) {
-        tmp = findRoot(_this__u8e3s4.m1n_1);
+        tmp = findRoot(_this__u8e3s4.n1n_1);
       } else {
         tmp = _this__u8e3s4;
       }
@@ -1565,7 +1565,7 @@ function toJavaName(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Integer_0) {
     var tmp_0;
-    switch (_this__u8e3s4.i1n_1.b3_1) {
+    switch (_this__u8e3s4.j1n_1.b3_1) {
       case 0:
         tmp_0 = 'Integer';
         break;
@@ -1580,7 +1580,7 @@ function toJavaName(_this__u8e3s4) {
   } else {
     if (_this__u8e3s4 instanceof Number_1) {
       var tmp_1;
-      switch (_this__u8e3s4.j1n_1.b3_1) {
+      switch (_this__u8e3s4.k1n_1.b3_1) {
         case 0:
           tmp_1 = 'Float';
           break;
@@ -1609,7 +1609,7 @@ function toJavaName(_this__u8e3s4) {
                 tmp = 'Void';
               } else {
                 if (_this__u8e3s4 instanceof Custom_0) {
-                  tmp = _this__u8e3s4.l1j_1.s1h();
+                  tmp = _this__u8e3s4.m1j_1.t1h();
                 } else {
                   tmp = 'Object';
                 }
@@ -1623,7 +1623,7 @@ function toJavaName(_this__u8e3s4) {
   return tmp;
 }
 function buildHandlersStruct(_this__u8e3s4) {
-  var pathTemplate = '/' + joinToString(_this__u8e3s4.wp_1, '/', VOID, VOID, VOID, VOID, buildHandlersStruct$lambda);
+  var pathTemplate = '/' + joinToString(_this__u8e3s4.xp_1, '/', VOID, VOID, VOID, VOID, buildHandlersStruct$lambda);
   return struct('Handlers', buildHandlersStruct$lambda_0(pathTemplate, _this__u8e3s4));
 }
 function withFullyQualifiedPrefix(_this__u8e3s4, prefix) {
@@ -1635,14 +1635,14 @@ function withFullyQualifiedPrefix(_this__u8e3s4, prefix) {
     // Inline function 'community.flock.wirespec.ir.core.TransformScope.matching' call
     var tmp_0 = scope;
     // Inline function 'community.flock.wirespec.ir.core.transformMatching' call
-    var this_0 = scope.i1v_1;
+    var this_0 = scope.j1v_1;
     // Inline function 'community.flock.wirespec.ir.core.transformer' call
     // Inline function 'kotlin.apply' call
     var this_1 = new TransformerBuilder();
-    this_1.o1v(withFullyQualifiedPrefix$lambda(prefix));
-    var tmp$ret$3 = this_1.c1j();
-    tmp_0.i1v_1 = transform(this_0, tmp$ret$3);
-    var tmp_1 = scope.i1v_1;
+    this_1.p1v(withFullyQualifiedPrefix$lambda(prefix));
+    var tmp$ret$3 = this_1.d1j();
+    tmp_0.j1v_1 = transform(this_0, tmp$ret$3);
+    var tmp_1 = scope.j1v_1;
     tmp = isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
   } else {
     tmp = _this__u8e3s4;
@@ -1652,8 +1652,8 @@ function withFullyQualifiedPrefix(_this__u8e3s4, prefix) {
 function transformTypeDescriptors$lambda(stmt, tr) {
   var tmp;
   if (stmt instanceof TypeDescriptor) {
-    var rootType = findRoot(stmt.o1p_1);
-    var containerStr = rawContainerClass(stmt.o1p_1);
+    var rootType = findRoot(stmt.p1p_1);
+    var containerStr = rawContainerClass(stmt.p1p_1);
     var rootStr = toJavaName(rootType) + '.class';
     var tmp_0;
     if (containerStr == null) {
@@ -1672,8 +1672,8 @@ function transformTypeDescriptors$lambda(stmt, tr) {
 }
 function applyRefinedStructShape$lambda$lambda($refined) {
   return function ($this$function) {
-    $this$function.f1i(convert_5($refined.tr_1));
-    $this$function.g1i(new VariableReference(Companion_getInstance().r1h('value')));
+    $this$function.g1i(convert_5($refined.ur_1));
+    $this$function.h1i(new VariableReference(Companion_getInstance().s1h('value')));
     return Unit_instance;
   };
 }
@@ -1683,18 +1683,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.n1o_1;
+      var this_0 = element.o1o_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.p1l(VOID, VOID, VOID, VOID, VOID, VOID, VOID, true);
+        var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.q1l(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.q1o(VOID, VOID, VOID, tmp_0, destination);
+      var tmp_1 = element.r1o(VOID, VOID, VOID, tmp_0, destination);
       tmp = plus_3(tmp_1, function_0('value', VOID, true, applyRefinedStructShape$lambda$lambda($refined)));
     } else {
       tmp = element;
@@ -1710,7 +1710,7 @@ function injectApiField$lambda(element, transformer) {
     var tmp_0;
     // Inline function 'kotlin.collections.isNotEmpty' call
     if (!injected.r()) {
-      tmp_0 = withElements(element, plus_1(element.a1o(), injected));
+      tmp_0 = withElements(element, plus_1(element.b1o(), injected));
     } else {
       tmp_0 = element;
     }
@@ -1729,7 +1729,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.a1o(), injected));
+        tmp_0 = withElements(element, plus_1(element.b1o(), injected));
       } else {
         tmp_0 = element;
       }
@@ -1746,21 +1746,21 @@ function injectHandleFunction$lambda($handlersStruct) {
     var tmp;
     if (element instanceof Interface) {
       var tmp_0;
-      if (element.s1o_1.equals(Companion_getInstance().r1h('Handler'))) {
+      if (element.t1o_1.equals(Companion_getInstance().s1h('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.i1v_1;
+        var this_0 = scope.j1v_1;
         // Inline function 'community.flock.wirespec.ir.core.transformer' call
         // Inline function 'kotlin.apply' call
         var this_1 = new TransformerBuilder();
-        this_1.b1j(injectHandleFunction$lambda$lambda($handlersStruct));
-        var tmp$ret$2 = this_1.c1j();
-        tmp_1.i1v_1 = transform(this_0, tmp$ret$2);
-        var tmp_2 = scope.i1v_1;
+        this_1.c1j(injectHandleFunction$lambda$lambda($handlersStruct));
+        var tmp$ret$2 = this_1.d1j();
+        tmp_1.j1v_1 = transform(this_0, tmp$ret$2);
+        var tmp_2 = scope.j1v_1;
         tmp_0 = isInterface(tmp_2, Element) ? tmp_2 : THROW_CCE();
       } else {
         tmp_0 = element;
@@ -1791,11 +1791,11 @@ function wrapAsyncReturnInThenApply$lambda($endpointName) {
     if (element instanceof Function) {
       var tmp$ret$0;
       $l$block_1: {
-        if (!element.m1l_1 || element.l1l_1.a1() < 2) {
+        if (!element.n1l_1 || element.m1l_1.a1() < 2) {
           tmp$ret$0 = element;
           break $l$block_1;
         }
-        var tmp_0 = element.l1l_1.b1(element.l1l_1.a1() - 2 | 0);
+        var tmp_0 = element.m1l_1.b1(element.m1l_1.a1() - 2 | 0);
         var tmp0_elvis_lhs = tmp_0 instanceof Assignment ? tmp_0 : null;
         var tmp_1;
         if (tmp0_elvis_lhs == null) {
@@ -1805,16 +1805,16 @@ function wrapAsyncReturnInThenApply$lambda($endpointName) {
           tmp_1 = tmp0_elvis_lhs;
         }
         var transportAssign = tmp_1;
-        var tmp_2 = last(element.l1l_1);
+        var tmp_2 = last(element.m1l_1);
         if (!(tmp_2 instanceof ReturnStatement)) {
           tmp$ret$0 = element;
           break $l$block_1;
         }
-        var tmp_3 = dropLast(element.l1l_1, 2);
-        var tmp1_name = Companion_getInstance().r1h('thenApply');
-        var tmp2_receiver = transportAssign.r1p_1;
-        var tmp3_arguments = mapOf(to(Companion_getInstance().r1h('mapper'), new RawExpression('rawResponse -> ' + $endpointName + '.fromRawResponse(serialization(), rawResponse)')));
-        tmp$ret$0 = element.p1l(VOID, VOID, VOID, VOID, plus_2(tmp_3, new ReturnStatement(new FunctionCall(tmp2_receiver, VOID, tmp1_name, tmp3_arguments))));
+        var tmp_3 = dropLast(element.m1l_1, 2);
+        var tmp1_name = Companion_getInstance().s1h('thenApply');
+        var tmp2_receiver = transportAssign.s1p_1;
+        var tmp3_arguments = mapOf(to(Companion_getInstance().s1h('mapper'), new RawExpression('rawResponse -> ' + $endpointName + '.fromRawResponse(serialization(), rawResponse)')));
+        tmp$ret$0 = element.q1l(VOID, VOID, VOID, VOID, plus_2(tmp_3, new ReturnStatement(new FunctionCall(tmp2_receiver, VOID, tmp1_name, tmp3_arguments))));
       }
       tmp = tmp$ret$0;
     } else {
@@ -1827,10 +1827,10 @@ function wrapAsyncReturnInThenApply$lambda($endpointName) {
 function buildHandlersStruct$lambda(it) {
   var tmp;
   if (it instanceof Literal) {
-    tmp = it.xq_1;
+    tmp = it.yq_1;
   } else {
     if (it instanceof Param) {
-      tmp = '{' + it.bq_1.l1() + '}';
+      tmp = '{' + it.cq_1.l1() + '}';
     } else {
       noWhenBranchMatchedException();
     }
@@ -1839,38 +1839,38 @@ function buildHandlersStruct$lambda(it) {
 }
 function buildHandlersStruct$lambda$lambda($pathTemplate) {
   return function ($this$function) {
-    $this$function.f1i(String_instance);
-    $this$function.g1i($this$function.o1u($pathTemplate));
+    $this$function.g1i(String_instance);
+    $this$function.h1i($this$function.p1u($pathTemplate));
     return Unit_instance;
   };
 }
 function buildHandlersStruct$lambda$lambda_0($this_buildHandlersStruct) {
   return function ($this$function) {
-    $this$function.f1i(String_instance);
-    $this$function.g1i($this$function.o1u($this_buildHandlersStruct.vp_1.a3_1));
+    $this$function.g1i(String_instance);
+    $this$function.h1i($this$function.p1u($this_buildHandlersStruct.wp_1.a3_1));
     return Unit_instance;
   };
 }
 function buildHandlersStruct$lambda$lambda_1($this$function) {
-  $this$function.f1i($this$function.t1h('Wirespec.ServerEdge', [$this$function.t1h('Request', []), $this$function.t1h('Response', [Wildcard_instance])]));
-  $this$function.c1i('serialization', $this$function.t1h('Wirespec.Serialization', []));
-  $this$function.g1i(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.g1i($this$function.u1h('Wirespec.ServerEdge', [$this$function.u1h('Request', []), $this$function.u1h('Response', [Wildcard_instance])]));
+  $this$function.d1i('serialization', $this$function.u1h('Wirespec.Serialization', []));
+  $this$function.h1i(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.f1i($this$function.t1h('Wirespec.ClientEdge', [$this$function.t1h('Request', []), $this$function.t1h('Response', [Wildcard_instance])]));
-  $this$function.c1i('serialization', $this$function.t1h('Wirespec.Serialization', []));
-  $this$function.g1i(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.g1i($this$function.u1h('Wirespec.ClientEdge', [$this$function.u1h('Request', []), $this$function.u1h('Response', [Wildcard_instance])]));
+  $this$function.d1i('serialization', $this$function.u1h('Wirespec.Serialization', []));
+  $this$function.h1i(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.y1k($this$struct.t1h('Wirespec.Server', [$this$struct.t1h('Request', []), $this$struct.t1h('Response', [Wildcard_instance])]));
-    $this$struct.y1k($this$struct.t1h('Wirespec.Client', [$this$struct.t1h('Request', []), $this$struct.t1h('Response', [Wildcard_instance])]));
-    $this$struct.h1i('getPathTemplate', VOID, true, buildHandlersStruct$lambda$lambda($pathTemplate));
-    $this$struct.h1i('getMethod', VOID, true, buildHandlersStruct$lambda$lambda_0($this_buildHandlersStruct));
-    $this$struct.h1i('getServer', VOID, true, buildHandlersStruct$lambda$lambda_1);
-    $this$struct.h1i('getClient', VOID, true, buildHandlersStruct$lambda$lambda_2);
+    $this$struct.z1k($this$struct.u1h('Wirespec.Server', [$this$struct.u1h('Request', []), $this$struct.u1h('Response', [Wildcard_instance])]));
+    $this$struct.z1k($this$struct.u1h('Wirespec.Client', [$this$struct.u1h('Request', []), $this$struct.u1h('Response', [Wildcard_instance])]));
+    $this$struct.i1i('getPathTemplate', VOID, true, buildHandlersStruct$lambda$lambda($pathTemplate));
+    $this$struct.i1i('getMethod', VOID, true, buildHandlersStruct$lambda$lambda_0($this_buildHandlersStruct));
+    $this$struct.i1i('getServer', VOID, true, buildHandlersStruct$lambda$lambda_1);
+    $this$struct.i1i('getClient', VOID, true, buildHandlersStruct$lambda$lambda_2);
     return Unit_instance;
   };
 }
@@ -1878,7 +1878,7 @@ function withFullyQualifiedPrefix$lambda($prefix) {
   return function (type, transformer) {
     var tmp;
     if (type instanceof Custom_0) {
-      tmp = type.p1n(new Name(listOf($prefix + type.l1j_1.s1h())));
+      tmp = type.q1n(new Name(listOf($prefix + type.m1j_1.t1h())));
     } else {
       tmp = type;
     }
@@ -1890,8 +1890,8 @@ function JavaRefinedTypeDefinitionEmitter() {
 }
 function JavaShared() {
   JavaShared_instance = this;
-  this.g1x_1 = 'community.flock.wirespec.java';
-  this.h1x_1 = trimMargin('\n        |package ' + this.g1x_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.hs(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.hs(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.hs(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.hs(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.hs(2) + 'String getPathTemplate();\n        |' + Spacer_instance.hs(2) + 'String getMethod();\n        |' + Spacer_instance.hs(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.hs(2) + 'String getPathTemplate();\n        |' + Spacer_instance.hs(2) + 'String getMethod();\n        |' + Spacer_instance.hs(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.hs(2) + 'if(rawType != null) {\n        |' + Spacer_instance.hs(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.hs(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.hs(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.hs(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.hs(3) + '};\n        |' + Spacer_instance.hs(2) + '}\n        |' + Spacer_instance.hs(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
+  this.h1x_1 = 'community.flock.wirespec.java';
+  this.i1x_1 = trimMargin('\n        |package ' + this.h1x_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.is(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.is(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.is(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.is(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.is(2) + 'String getPathTemplate();\n        |' + Spacer_instance.is(2) + 'String getMethod();\n        |' + Spacer_instance.is(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.is(2) + 'String getPathTemplate();\n        |' + Spacer_instance.is(2) + 'String getMethod();\n        |' + Spacer_instance.is(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.is(2) + 'if(rawType != null) {\n        |' + Spacer_instance.is(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.is(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.is(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.is(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.is(3) + '};\n        |' + Spacer_instance.is(2) + '}\n        |' + Spacer_instance.is(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
 }
 protoOf(JavaShared).toString = function () {
   return 'JavaShared';
@@ -1915,10 +1915,10 @@ function JavaShared_getInstance() {
 function emitType($this, _this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = 'java.util.Map<String, ' + $this.nq(_this__u8e3s4.so_1) + '>';
+    tmp = 'java.util.Map<String, ' + $this.oq(_this__u8e3s4.so_1) + '>';
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = 'java.util.List<' + $this.nq(_this__u8e3s4.po_1) + '>';
+      tmp = 'java.util.List<' + $this.oq(_this__u8e3s4.po_1) + '>';
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = 'void';
@@ -1927,7 +1927,7 @@ function emitType($this, _this__u8e3s4) {
           tmp = 'Object';
         } else {
           if (_this__u8e3s4 instanceof Custom) {
-            tmp = _this__u8e3s4.bv_1;
+            tmp = _this__u8e3s4.cv_1;
           } else {
             if (_this__u8e3s4 instanceof Primitive) {
               tmp = emit_18($this, _this__u8e3s4);
@@ -1942,14 +1942,14 @@ function emitType($this, _this__u8e3s4) {
   return tmp;
 }
 function emit_18($this, _this__u8e3s4) {
-  var t = _this__u8e3s4.fv_1;
+  var t = _this__u8e3s4.gv_1;
   var tmp;
   if (t instanceof String_0) {
     tmp = 'String';
   } else {
     if (t instanceof Integer) {
       var tmp_0;
-      switch (t.ju_1.b3_1) {
+      switch (t.ku_1.b3_1) {
         case 0:
           tmp_0 = 'Integer';
           break;
@@ -1964,7 +1964,7 @@ function emit_18($this, _this__u8e3s4) {
     } else {
       if (t instanceof Number_0) {
         var tmp_1;
-        switch (t.mu_1.b3_1) {
+        switch (t.nu_1.b3_1) {
           case 0:
             tmp_1 = 'Float';
             break;
@@ -1993,12 +1993,12 @@ function emit_18($this, _this__u8e3s4) {
 }
 function JavaTypeDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
-    return this$0.nq(it);
+    return this$0.oq(it);
   };
 }
 function JavaTypeDefinitionEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return Spacer_instance.toString() + this$0.mq(it) + ',';
+    return Spacer_instance.toString() + this$0.nq(it) + ',';
   };
 }
 function JavaTypeDefinitionEmitter() {
@@ -2009,30 +2009,30 @@ function JavaUnionDefinitionEmitter$emit$lambda(it) {
 function JavaUnionDefinitionEmitter() {
 }
 //region block: post-declaration
-protoOf(JavaEmitter).nr = emit_10;
-protoOf(JavaEmitter).kq = emit_3;
-protoOf(JavaEmitter).lq = emit_4;
-protoOf(JavaEmitter).mq = emit_5;
-protoOf(JavaEmitter).nq = emit_6;
-protoOf(JavaEmitter).oq = emit_7;
-protoOf(JavaEmitter).as = emit_12;
-protoOf(JavaEmitter).j1x = emit_13;
-protoOf(JavaEmitter).k1x = emit_14;
-protoOf(JavaEmitter).or = emit_8;
-protoOf(JavaEmitter).zr = emit_15;
-protoOf(JavaEmitter).pr = emit_11;
-protoOf(JavaEmitter).ur = emit_9;
-protoOf(JavaEmitter).i1x = sanitizeSymbol;
-protoOf(JavaEmitter).l1x = sanitizeFirstIsDigit;
-protoOf(JavaEmitter).m1x = sanitizeKeywords;
-protoOf(JavaEmitter).y1w = emitRoot;
-protoOf(JavaEmitter).x1w = emitRoot$default;
-protoOf(JavaEmitter).n1x = emitHandleFunction;
-protoOf(JavaEmitter).bs = emitValidator;
-protoOf(JavaIrEmitter).x1v = get_extensions;
+protoOf(JavaEmitter).or = emit_9;
+protoOf(JavaEmitter).lq = emit_3;
+protoOf(JavaEmitter).mq = emit_4;
+protoOf(JavaEmitter).nq = emit_5;
+protoOf(JavaEmitter).oq = emit_6;
+protoOf(JavaEmitter).pq = emit_7;
+protoOf(JavaEmitter).bs = emit_11;
+protoOf(JavaEmitter).k1x = emit_12;
+protoOf(JavaEmitter).l1x = emit_13;
+protoOf(JavaEmitter).pr = emit_8;
+protoOf(JavaEmitter).as = emit_14;
+protoOf(JavaEmitter).qr = emit_10;
+protoOf(JavaEmitter).vr = emit_15;
+protoOf(JavaEmitter).j1x = sanitizeSymbol;
+protoOf(JavaEmitter).m1x = sanitizeFirstIsDigit;
+protoOf(JavaEmitter).n1x = sanitizeKeywords;
+protoOf(JavaEmitter).z1w = emitRoot;
+protoOf(JavaEmitter).y1w = emitRoot$default;
+protoOf(JavaEmitter).o1x = emitHandleFunction;
+protoOf(JavaEmitter).cs = emitValidator;
+protoOf(JavaIrEmitter).y1v = get_extensions;
 protoOf(JavaIrEmitter).eo = emit_1;
-protoOf(JavaIrEmitter).y1v = emit_2;
-protoOf(JavaIrEmitter).c1w = beforeGenerate;
+protoOf(JavaIrEmitter).z1v = emit_2;
+protoOf(JavaIrEmitter).d1w = beforeGenerate;
 //endregion
 //region block: exports
 export {