@flock/wirespec 0.17.14 → 0.17.16

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

@@ -76,6 +76,7 @@ import {
   equals2au1ep9vhcato as equals,
   initMetadataForObject1cxne3s9w65el as initMetadataForObject,
   dropLastlqc2oyv04br0 as dropLast,
+  charSequenceLength3278n89t01tmv as charSequenceLength,
   replace3le3ie7l9k8aq as replace,
 } from './kotlin-kotlin-stdlib.mjs';
 //region block: imports
@@ -113,10 +114,10 @@ function emit_3(_this__u8e3s4) {
 function emitRoot(_this__u8e3s4, void_0) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = this.z2a(_this__u8e3s4.e23_1);
+    tmp = this.y2a(_this__u8e3s4.e23_1);
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = this.z2a(_this__u8e3s4.b23_1);
+      tmp = this.y2a(_this__u8e3s4.b23_1);
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = void_0;
@@ -145,15 +146,45 @@ 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.a2b(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
+  return $super === VOID ? this.z2a(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
 }
 function emit_4(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof RegExp_0) {
-    tmp = 'java.util.regex.Pattern.compile("' + replace(this.b25(_this__u8e3s4.a28_1), '\\', '\\\\') + '").matcher(record.value).find();';
+    tmp = 'return java.util.regex.Pattern.compile("' + replace(this.b25(_this__u8e3s4.a28_1), '\\', '\\\\') + '").matcher(record.value).find();';
   } else {
     if (_this__u8e3s4 instanceof Bound) {
-      tmp = '' + _this__u8e3s4.o28_1 + ' < record.value && record.value < ' + _this__u8e3s4.p28_1 + ';';
+      var tmp1_safe_receiver = _this__u8e3s4.o28_1;
+      var tmp_0;
+      if (tmp1_safe_receiver == null) {
+        tmp_0 = null;
+      } else {
+        // Inline function 'kotlin.let' call
+        // Inline function 'kotlin.contracts.contract' call
+        // Inline function 'community.flock.wirespec.emitters.java.JavaTypeDefinitionEmitter.emit.<anonymous>' call
+        tmp_0 = tmp1_safe_receiver + ' < record.value';
+      }
+      var minCheck = tmp_0;
+      var tmp2_safe_receiver = _this__u8e3s4.p28_1;
+      var tmp_1;
+      if (tmp2_safe_receiver == null) {
+        tmp_1 = null;
+      } else {
+        // Inline function 'kotlin.let' call
+        // Inline function 'kotlin.contracts.contract' call
+        // Inline function 'community.flock.wirespec.emitters.java.JavaTypeDefinitionEmitter.emit.<anonymous>' call
+        tmp_1 = 'record.value < ' + tmp2_safe_receiver;
+      }
+      var maxCheck = tmp_1;
+      var checks = joinToString(listOfNotNull([minCheck, maxCheck]), ' && ');
+      var tmp_2;
+      // Inline function 'kotlin.text.isEmpty' call
+      if (charSequenceLength(checks) === 0) {
+        tmp_2 = 'true';
+      } else {
+        tmp_2 = checks;
+      }
+      tmp = 'return ' + tmp_2 + ';';
     } else {
       noWhenBranchMatchedException();
     }
@@ -162,16 +193,16 @@ function emit_4(_this__u8e3s4) {
 }
 initMetadataForInterface(JavaTypeDefinitionEmitter, 'JavaTypeDefinitionEmitter', VOID, VOID, [TypeDefinitionEmitter]);
 function emit_5(channel) {
-  return trimMargin('\n        |' + emitImports(channel, this) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.y25(channel.o23_1) + ' {\n        |   void invoke(' + emitFullyQualified(channel, this, channel.p23_1) + this.z2a(channel.p23_1) + ' message);\n        |}\n        |\n    ');
+  return trimMargin('\n        |' + emitImports(channel, this) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.y25(channel.o23_1) + ' {\n        |   void invoke(' + emitFullyQualified(channel, this, channel.p23_1) + this.y2a(channel.p23_1) + ' message);\n        |}\n        |\n    ');
 }
 initMetadataForInterface(JavaChannelDefinitionEmitter, 'JavaChannelDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
 function emit_6(identifier) {
   var tmp;
   if (identifier instanceof DefinitionIdentifier) {
-    tmp = this.j2b(identifier.b1());
+    tmp = this.i2b(identifier.b1());
   } else {
     if (identifier instanceof FieldIdentifier) {
-      tmp = this.k2a(this.j2b(identifier.b1()));
+      tmp = this.j2a(this.i2b(identifier.b1()));
     } else {
       noWhenBranchMatchedException();
     }
@@ -194,7 +225,7 @@ function sanitizeSymbol(_this__u8e3s4) {
     destination.e(tmp$ret$0);
   }
   var tmp = asSequence(joinToString(destination, ''));
-  return this.j2a(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
+  return this.i2a(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
 }
 function sanitizeFirstIsDigit(_this__u8e3s4) {
   var tmp;
@@ -214,22 +245,30 @@ function sanitizeFirstIsDigit(_this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords(_this__u8e3s4) {
-  return Companion_getInstance().k2b_1.o1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance().j2b_1.o1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 }
 initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
-function emit_7(union) {
+function emit_7(enum_0, module_0) {
+  var tmp = this.y25(enum_0.i26_1);
+  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.j26_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.y25(enum_0.i26_1) + '(String label) {\n        |' + Spacer_instance.s26(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.s26(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String getLabel() {\n        |' + Spacer_instance.s26(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+}
+function sanitizeEnum(_this__u8e3s4) {
+  return this.j2a(this.i2a(joinToString(split(_this__u8e3s4, ['-', ', ', '.', ' ', '//']), '_')));
+}
+initMetadataForInterface(JavaEnumDefinitionEmitter, 'JavaEnumDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
+function emit_8(union) {
   var tmp = this.y25(union.s23_1);
   return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.t23_1, VOID, VOID, VOID, VOID, VOID, JavaUnionDefinitionEmitter$emit$lambda) + ' {}\n        |\n    ');
 }
 initMetadataForInterface(JavaUnionDefinitionEmitter, 'JavaUnionDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-function emit_8(endpoint) {
+function emit_9(endpoint) {
   var tmp = emitImports_0(endpoint, this);
   var tmp_0 = this.y25(endpoint.g24_1);
   var tmp_1 = get_pathParams(endpoint);
   var tmp_2 = emitObject(tmp_1, this, 'Path', 'Wirespec.Path', JavaEndpointDefinitionEmitter$emit$lambda(this));
   var tmp_3 = emitObject(endpoint.j24_1, this, 'Queries', 'Wirespec.Queries', JavaEndpointDefinitionEmitter$emit$lambda_0(this));
   var tmp_4 = emitObject(endpoint.k24_1, this, 'RequestHeaders', 'Wirespec.Request.Headers', JavaEndpointDefinitionEmitter$emit$lambda_1(this));
-  var tmp_5 = this.u2a(first_0(endpoint.l24_1), endpoint);
+  var tmp_5 = this.t2a(first_0(endpoint.l24_1), endpoint);
   var tmp_6 = Spacer_instance.toString();
   var tmp_7 = emitStatusInterfaces(endpoint, this);
   var tmp_8 = emitResponseInterfaces(endpoint, this);
@@ -262,55 +301,60 @@ function emit_8(endpoint) {
   var tmp_23 = Spacer_instance.s26(3);
   var tmp_24 = Spacer_instance.s26(2);
   var tmp_25 = Spacer_instance.s26(2);
-  var tmp_26 = this.w2a(endpoint);
+  var tmp_26 = this.v2a(endpoint);
   var tmp_27 = Spacer_instance.s26(2);
   var tmp_28 = Spacer_instance.s26(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.getStatus());}\n        |' + tmp_17 + '}\n        |\n        |' + tmp_18 + 'static Response<?> fromResponse(Wirespec.Deserializer serialization, Wirespec.RawResponse response) {\n        |' + tmp_19 + 'switch (response.statusCode()) {\n        |' + tmp_21 + '\n        |' + tmp_22 + 'default: throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n        |' + tmp_23 + '}\n        |' + tmp_24 + '}\n        |\n        |' + tmp_25 + tmp_26 + '\n        |' + tmp_27 + 'class Handlers implements Wirespec.Server<Request, Response<?>>, Wirespec.Client<Request, Response<?>> {\n        |' + tmp_28 + '@Override public String getPathTemplate() { return "/' + joinToString(endpoint.i24_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_5) + '"; }\n        |' + Spacer_instance.s26(3) + '@Override public String getMethod() { return "' + endpoint.h24_1.toString() + '"; }\n        |' + Spacer_instance.s26(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.s26(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.s26(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.s26(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.s26(4) + '};\n        |' + Spacer_instance.s26(3) + '}\n        |' + Spacer_instance.s26(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.s26(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.s26(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.s26(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.s26(4) + '};\n        |' + Spacer_instance.s26(3) + '}\n        |' + Spacer_instance.s26(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+  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 + 'switch (response.statusCode()) {\n        |' + tmp_21 + '\n        |' + tmp_22 + 'default: throw new IllegalStateException("Cannot match response with status: " + response.statusCode());\n        |' + tmp_23 + '}\n        |' + tmp_24 + '}\n        |\n        |' + tmp_25 + tmp_26 + '\n        |' + tmp_27 + 'class Handlers implements Wirespec.Server<Request, Response<?>>, Wirespec.Client<Request, Response<?>> {\n        |' + tmp_28 + '@Override public String getPathTemplate() { return "/' + joinToString(endpoint.i24_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_5) + '"; }\n        |' + Spacer_instance.s26(3) + '@Override public String getMethod() { return "' + endpoint.h24_1.toString() + '"; }\n        |' + Spacer_instance.s26(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.s26(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.s26(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.s26(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.s26(4) + '};\n        |' + Spacer_instance.s26(3) + '}\n        |' + Spacer_instance.s26(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.s26(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.s26(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.s26(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.s26(4) + '};\n        |' + Spacer_instance.s26(3) + '}\n        |' + Spacer_instance.s26(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
 }
 function emitHandleFunction(endpoint) {
   return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.r25(this.y25(endpoint.g24_1)) + '(Request request);';
 }
-function emit_9(_this__u8e3s4, endpoint) {
-  return trimMargin('\n        |' + Spacer_instance.toString() + 'class Request implements Wirespec.Request<' + emit_13(_this__u8e3s4.p24_1, this) + '> {\n        |' + Spacer_instance.s26(2) + 'private final Path path;\n        |' + Spacer_instance.s26(2) + 'private final Wirespec.Method method;\n        |' + Spacer_instance.s26(2) + 'private final Queries queries;\n        |' + Spacer_instance.s26(2) + 'private final RequestHeaders headers;\n        |' + Spacer_instance.s26(2) + 'private final ' + emit_13(_this__u8e3s4.p24_1, this) + ' body;\n        |' + Spacer_instance.s26(2) + emitConstructor(_this__u8e3s4, this, endpoint) + '\n        |' + Spacer_instance.s26(2) + '@Override public Path getPath() { return path; }\n        |' + Spacer_instance.s26(2) + '@Override public Wirespec.Method getMethod() { return method; }\n        |' + Spacer_instance.s26(2) + '@Override public Queries getQueries() { return queries; }\n        |' + Spacer_instance.s26(2) + '@Override public RequestHeaders getHeaders() { return headers; }\n        |' + Spacer_instance.s26(2) + '@Override public ' + emit_13(_this__u8e3s4.p24_1, this) + ' getBody() { return body; }\n        |' + Spacer_instance.toString() + '}\n    ');
+function emit_10(_this__u8e3s4, endpoint) {
+  return trimMargin('\n        |' + Spacer_instance.toString() + 'record Request (\n        |' + Spacer_instance.s26(2) + 'Path path,\n        |' + Spacer_instance.s26(2) + 'Wirespec.Method method,\n        |' + Spacer_instance.s26(2) + 'Queries queries,\n        |' + Spacer_instance.s26(2) + 'RequestHeaders headers,\n        |' + Spacer_instance.s26(2) + emit_13(_this__u8e3s4.p24_1, this) + ' body\n        |' + Spacer_instance.toString() + ') implements Wirespec.Request<' + emit_13(_this__u8e3s4.p24_1, this) + '> {\n        |' + Spacer_instance.s26(2) + emitConstructor(_this__u8e3s4, this, endpoint) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 }
-function emit_10(_this__u8e3s4) {
+function emit_11(_this__u8e3s4) {
   var tmp = Spacer_instance.toString();
   var tmp_0 = Companion_instance_1.q25(_this__u8e3s4.s24_1);
-  var tmp_1 = orNull(joinToString(_this__u8e3s4.t24_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_6(this)));
+  var tmp_1 = Spacer_instance.s26(2);
+  var tmp_2 = Spacer_instance.s26(2);
+  var tmp_3 = Spacer_instance.s26(2);
+  var tmp_4 = emit_13(_this__u8e3s4.u24_1, this);
+  var tmp_5 = Spacer_instance.toString();
+  var tmp_6 = toString_0(first(_this__u8e3s4.s24_1));
+  var tmp_7 = emit_13(_this__u8e3s4.u24_1, this);
+  var tmp_8 = concatGenerics(emit_13(_this__u8e3s4.u24_1, this));
+  var tmp_9 = Spacer_instance.s26(2);
+  var tmp_10 = Companion_instance_1.q25(_this__u8e3s4.s24_1);
+  var tmp_11 = orNull(joinToString(_this__u8e3s4.t24_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_6(this)));
   var tmp0_safe_receiver = _this__u8e3s4.u24_1;
-  var tmp_2;
+  var tmp_12;
   if (tmp0_safe_receiver == null) {
-    tmp_2 = null;
+    tmp_12 = null;
   } else {
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emit.<anonymous>' call
-    tmp_2 = emit_13(tmp0_safe_receiver, this) + ' body';
+    tmp_12 = emit_13(tmp0_safe_receiver, this) + ' body';
   }
-  var tmp_3 = joinToString(listOfNotNull([tmp_1, tmp_2]));
-  var tmp_4 = toString_0(first(_this__u8e3s4.s24_1));
-  var tmp_5 = emit_13(_this__u8e3s4.u24_1, this);
-  var tmp_6 = concatGenerics(emit_13(_this__u8e3s4.u24_1, this));
-  var tmp_7 = Spacer_instance.s26(2);
-  var tmp_8 = fixStatus(_this__u8e3s4.s24_1);
-  var tmp_9 = Spacer_instance.s26(2);
+  var tmp_13 = joinToString(listOfNotNull([tmp_11, tmp_12]));
+  var tmp_14 = Spacer_instance.s26(3);
+  var tmp_15 = fixStatus(_this__u8e3s4.s24_1);
   // Inline function 'kotlin.let' call
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emit.<anonymous>' call
-  var tmp_10 = '@Override public Headers getHeaders() { return new Headers(' + joinToString(_this__u8e3s4.t24_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_7(this)) + '); }';
-  var tmp_11 = Spacer_instance.s26(2);
-  var tmp_12 = emit_13(_this__u8e3s4.u24_1, this);
-  var tmp_13 = _this__u8e3s4.u24_1 == null ? 'null' : 'body';
-  var tmp_14 = Spacer_instance.s26(1);
-  return trimMargin('\n        |' + tmp + 'record Response' + tmp_0 + '(' + tmp_3 + ') implements Response' + tmp_4 + 'XX<' + tmp_5 + '>, Response' + tmp_6 + ' {\n        |' + tmp_7 + '@Override public int getStatus() { return ' + tmp_8 + '; }\n        |' + tmp_9 + tmp_10 + '\n        |' + tmp_11 + '@Override public ' + tmp_12 + ' getBody() { return ' + tmp_13 + '; }\n        |' + tmp_14 + emitObject(_this__u8e3s4.t24_1, this, 'Headers', 'Wirespec.Response.Headers', JavaEndpointDefinitionEmitter$emit$lambda_8(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
+  var tmp_16 = 'new Headers(' + joinToString(_this__u8e3s4.t24_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_7(this)) + ')';
+  var tmp_17 = _this__u8e3s4.u24_1 == null ? 'null' : 'body';
+  var tmp_18 = Spacer_instance.s26(2);
+  var tmp_19 = Spacer_instance.s26(1);
+  return trimMargin('\n        |' + tmp + 'record Response' + tmp_0 + '(\n        |' + tmp_1 + 'int 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__u8e3s4.t24_1, this, 'Headers', 'Wirespec.Response.Headers', JavaEndpointDefinitionEmitter$emit$lambda_8(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 }
 initMetadataForInterface(JavaEndpointDefinitionEmitter, 'JavaEndpointDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_11(refined) {
-  return trimMargin('\n        |public record ' + this.y25(refined.d26_1) + ' (String value) implements Wirespec.Refined {\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() { return value; }\n        |' + Spacer_instance.toString() + 'public static boolean validate(' + this.y25(refined.d26_1) + ' record) {\n        |' + Spacer_instance.toString() + Spacer_instance.toString() + 'return ' + this.m26(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String getValue() { return value; }\n        |}\n        |\n    ');
+function emit_12(refined) {
+  return trimMargin('\n        |public record ' + this.y25(refined.d26_1) + ' (' + this.z24(refined.e26_1) + ' value) implements Wirespec.Refined<' + this.z24(refined.e26_1) + '> {\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() { return value.toString(); }\n        |' + Spacer_instance.toString() + 'public static boolean validate(' + this.y25(refined.d26_1) + ' record) {\n        |' + Spacer_instance.toString() + Spacer_instance.toString() + this.m26(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public ' + this.z24(refined.e26_1) + ' getValue() { return value; }\n        |}\n        |\n    ');
 }
 function emitValidator(_this__u8e3s4) {
-  var defaultReturn = 'true;';
-  var type = _this__u8e3s4.e26_1.o29_1;
+  var defaultReturn = 'return true;';
+  var type = _this__u8e3s4.e26_1.n29_1;
   var tmp;
   if (type instanceof Integer) {
     var tmp0_safe_receiver = type.t28_1;
@@ -318,7 +362,7 @@ function emitValidator(_this__u8e3s4) {
     tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
   } else {
     if (type instanceof Number_0) {
-      var tmp2_safe_receiver = type.x28_1;
+      var tmp2_safe_receiver = type.w28_1;
       var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.a25(tmp2_safe_receiver);
       tmp = tmp3_elvis_lhs == null ? defaultReturn : tmp3_elvis_lhs;
     } else {
@@ -349,15 +393,7 @@ function emitValidator(_this__u8e3s4) {
   return tmp;
 }
 initMetadataForInterface(JavaRefinedTypeDefinitionEmitter, 'JavaRefinedTypeDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_12(enum_0, module_0) {
-  var tmp = this.y25(enum_0.i26_1);
-  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.j26_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.y25(enum_0.i26_1) + '(String label) {\n        |' + Spacer_instance.s26(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.s26(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String getLabel() {\n        |' + Spacer_instance.s26(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
-}
-function sanitizeEnum(_this__u8e3s4) {
-  return this.k2a(this.j2a(joinToString(split(_this__u8e3s4, ['-', ', ', '.', ' ', '//']), '_')));
-}
-initMetadataForInterface(JavaEnumDefinitionEmitter, 'JavaEnumDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaIdentifierEmitter, JavaChannelDefinitionEmitter, JavaTypeDefinitionEmitter, JavaUnionDefinitionEmitter, JavaEndpointDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, JavaEnumDefinitionEmitter, LanguageEmitter]);
+initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaEnumDefinitionEmitter, JavaChannelDefinitionEmitter, JavaUnionDefinitionEmitter, JavaIdentifierEmitter, JavaEndpointDefinitionEmitter, JavaTypeDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, LanguageEmitter]);
 initMetadataForCompanion(Companion);
 initMetadataForObject(JavaShared, 'JavaShared');
 //endregion
@@ -371,7 +407,7 @@ function emitImports(_this__u8e3s4, $this) {
   while (tmp0_iterator.h()) {
     var element = tmp0_iterator.i();
     // Inline function 'community.flock.wirespec.emitters.java.JavaChannelDefinitionEmitter.emitImports.<anonymous>' call
-    if (!(_this__u8e3s4.x25().b1() === element.k29_1)) {
+    if (!(_this__u8e3s4.x25().b1() === element.j29_1)) {
       destination.e(element);
     }
   }
@@ -381,7 +417,7 @@ function emitImports(_this__u8e3s4, $this) {
   while (tmp0_iterator_0.h()) {
     var item = tmp0_iterator_0.i();
     // Inline function 'community.flock.wirespec.emitters.java.JavaChannelDefinitionEmitter.emitImports.<anonymous>' call
-    var tmp$ret$3 = 'import ' + $this.h2a().o26_1 + '.model.' + item.k29_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.g2a().o26_1 + '.model.' + item.j29_1 + ';';
     destination_0.e(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -390,7 +426,7 @@ function emitImports(_this__u8e3s4, $this) {
 function emitFullyQualified(_this__u8e3s4, $this, reference) {
   var tmp;
   if (_this__u8e3s4.x25().b1() === reference.b1()) {
-    tmp = $this.h2a().o26_1 + '.model.';
+    tmp = $this.g2a().o26_1 + '.model.';
   } else {
     tmp = '';
   }
@@ -406,46 +442,46 @@ function JavaEmitter(packageName, emitShared) {
   packageName = packageName === VOID ? Companion_instance.n26('community.flock.wirespec.generated') : packageName;
   emitShared = emitShared === VOID ? Companion_instance_0.i23() : emitShared;
   LanguageEmitter.call(this);
-  this.b2b_1 = packageName;
-  this.c2b_1 = emitShared;
-  this.d2b_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
-  this.e2b_1 = FileExtension_Java_getInstance();
-  this.f2b_1 = JavaShared_getInstance();
-  this.g2b_1 = '//';
-}
-protoOf(JavaEmitter).h2a = function () {
-  return this.b2b_1;
+  this.a2b_1 = packageName;
+  this.b2b_1 = emitShared;
+  this.c2b_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
+  this.d2b_1 = FileExtension_Java_getInstance();
+  this.e2b_1 = JavaShared_getInstance();
+  this.f2b_1 = '//';
+}
+protoOf(JavaEmitter).g2a = function () {
+  return this.a2b_1;
 };
 protoOf(JavaEmitter).g25 = function () {
-  return this.e2b_1;
+  return this.d2b_1;
 };
-protoOf(JavaEmitter).r2a = function () {
-  return this.f2b_1;
+protoOf(JavaEmitter).q2a = function () {
+  return this.e2b_1;
 };
 protoOf(JavaEmitter).h25 = function () {
-  return this.g2b_1;
+  return this.f2b_1;
 };
 protoOf(JavaEmitter).v25 = function (module_0, logger) {
   // Inline function 'kotlin.let' call
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.java.JavaEmitter.emit.<anonymous>' call
   var it = protoOf(LanguageEmitter).v25.call(this, module_0, logger);
-  return this.c2b_1.j23_1 ? it.vk(new Emitted(Companion_instance.n26('community.flock.wirespec.java').q26() + 'Wirespec', this.r2a().i2b_1)) : it;
+  return this.b2b_1.j23_1 ? it.vk(new Emitted(Companion_instance.n26('community.flock.wirespec.java').q26() + 'Wirespec', this.q2a().h2b_1)) : it;
 };
 protoOf(JavaEmitter).w25 = function (definition, module_0, logger) {
   // Inline function 'kotlin.let' call
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.java.JavaEmitter.emit.<anonymous>' call
   var it = protoOf(LanguageEmitter).w25.call(this, definition, module_0, logger);
-  var subPackageName = plus(this.h2a(), definition);
-  var tmp = subPackageName.q26() + this.j2b(it.k23_1);
+  var subPackageName = plus(this.g2a(), definition);
+  var tmp = subPackageName.q26() + this.i2b(it.k23_1);
   // Inline function 'kotlin.text.trimStart' call
-  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.s25(module_0) ? this.d2b_1 : '') + '\n                    |' + it.l23_1 + '\n                    ');
+  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.s25(module_0) ? this.c2b_1 : '') + '\n                    |' + it.l23_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__u8e3s4, $this) {
-  return 'Wirespec.getType(' + $this.a2b(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw(_this__u8e3s4, $this) + ')';
+  return 'Wirespec.getType(' + $this.z2a(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw(_this__u8e3s4, $this) + ')';
 }
 function emitGetTypeRaw(_this__u8e3s4, $this) {
   var tmp;
@@ -482,16 +518,22 @@ function emitConstructor(_this__u8e3s4, $this, endpoint) {
   var tmp_6 = get_pathParams(endpoint);
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitConstructor.<anonymous>' call
-  var tmp_7 = 'this.path = new Path(' + joinToString(tmp_6, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_2($this)) + ');';
-  var tmp_8 = 'this.method = Wirespec.Method.' + endpoint.h24_1.q2_1 + ';';
+  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.h24_1.q2_1;
   // Inline function 'kotlin.let' call
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitConstructor.<anonymous>' call
-  var tmp_9 = 'this.queries = new Queries(' + joinToString(endpoint.j24_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_3($this)) + ');';
+  var tmp$ret$5 = 'new Queries(' + joinToString(endpoint.j24_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
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitConstructor.<anonymous>' call
-  var tmp_10 = 'this.headers = new RequestHeaders(' + joinToString(endpoint.k24_1, VOID, VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitConstructor$lambda_4($this)) + ');';
+  var tmp$ret$7 = 'new RequestHeaders(' + joinToString(endpoint.k24_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.p24_1 == null) {
     tmp_11 = null;
@@ -501,8 +543,8 @@ function emitConstructor(_this__u8e3s4, $this, endpoint) {
     // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitConstructor.<anonymous>' call
     tmp_11 = 'body';
   }
-  var tmp2_elvis_lhs = tmp_11;
-  return 'public Request(' + tmp_4 + ') {\n' + tmp_5 + joinToString(listOfNotNull([tmp_7, tmp_8, tmp_9, tmp_10, 'this.body = ' + (tmp2_elvis_lhs == null ? 'null' : tmp2_elvis_lhs) + ';']), '\n' + Spacer_instance.s26(3)) + '\n' + Spacer_instance.s26(2) + '}';
+  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.s26(2) + '}';
 }
 function emitDeserializedParams(_this__u8e3s4, $this, endpoint) {
   // Inline function 'kotlin.let' call
@@ -553,13 +595,13 @@ function emitSerialized(_this__u8e3s4, $this) {
   } else {
     tmp_1 = 'java.util.Collections.emptyMap()';
   }
-  return tmp + 'if (response instanceof Response' + tmp_0 + ' r) { return new Wirespec.RawResponse(r.getStatus(), ' + tmp_1 + ', ' + (!(_this__u8e3s4.u24_1 == null) ? 'serialization.serializeBody(r.body, ' + emitGetType(ensureNotNull(_this__u8e3s4.u24_1).r24_1, $this) + ')' : 'null') + '); }';
+  return tmp + 'if (response instanceof Response' + tmp_0 + ' r) { return new Wirespec.RawResponse(r.status(), ' + tmp_1 + ', ' + (!(_this__u8e3s4.u24_1 == null) ? 'serialization.serializeBody(r.body, ' + emitGetType(ensureNotNull(_this__u8e3s4.u24_1).r24_1, $this) + ')' : 'null') + '); }';
 }
 function emitDeserialized(_this__u8e3s4, $this) {
   return Spacer_instance.s26(4) + 'case ' + _this__u8e3s4.s24_1 + ': return new Response' + Companion_instance_1.q25(_this__u8e3s4.s24_1) + '(' + emitDeserializedParams_0(_this__u8e3s4, $this) + ');';
 }
 function emitSerializedParams(_this__u8e3s4, $this, fields) {
-  return 'java.util.Map.entry("' + _this__u8e3s4.c24_1.b1() + '", serialization.serializeParam(request.' + fields + '.' + $this.y25(_this__u8e3s4.c24_1) + ', ' + emitGetType(_this__u8e3s4.d24_1, $this) + '))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.c24_1.b1() + '", serialization.serializeParam(request.' + (fields === 'queries' ? 'queries' : 'headers') + '().' + $this.y25(_this__u8e3s4.c24_1) + '(), ' + emitGetType(_this__u8e3s4.d24_1, $this) + '))';
 }
 function emitDeserialized_0(_this__u8e3s4, $this) {
   return Spacer_instance.s26(4) + 'serialization.deserializePath(request.path().get(' + _this__u8e3s4.qd_1 + '), ' + emitGetType(_this__u8e3s4.rd_1.o24_1, $this) + ')';
@@ -568,10 +610,10 @@ function emitDeserializedParams_1(_this__u8e3s4, $this, fields) {
   return Spacer_instance.s26(4) + 'serialization.deserializeParam(request.' + fields + '().getOrDefault("' + _this__u8e3s4.c24_1.b1() + '", java.util.Collections.emptyList()), ' + emitGetType(_this__u8e3s4.d24_1, $this) + ')';
 }
 function emitSerializedHeader(_this__u8e3s4, $this) {
-  return 'java.util.Map.entry("' + _this__u8e3s4.c24_1.b1() + '", serialization.serializeParam(r.getHeaders().' + $this.y25(_this__u8e3s4.c24_1) + '(), ' + emitGetType(_this__u8e3s4.d24_1, $this) + '))';
+  return 'java.util.Map.entry("' + _this__u8e3s4.c24_1.b1() + '", serialization.serializeParam(r.headers().' + $this.y25(_this__u8e3s4.c24_1) + '(), ' + emitGetType(_this__u8e3s4.d24_1, $this) + '))';
 }
 function emitIdentifier(_this__u8e3s4, $this) {
-  return 'serialization.serializePath(request.path.' + Companion_instance_1.r25($this.y25(_this__u8e3s4.n24_1)) + ', ' + emitGetType(_this__u8e3s4.o24_1, $this) + ')';
+  return 'serialization.serializePath(request.path().' + Companion_instance_1.r25($this.y25(_this__u8e3s4.n24_1)) + '(), ' + emitGetType(_this__u8e3s4.o24_1, $this) + ')';
 }
 function emit_13(_this__u8e3s4, $this) {
   var tmp1_safe_receiver = _this__u8e3s4 == null ? null : _this__u8e3s4.r24_1;
@@ -591,7 +633,7 @@ function emitImports_0(_this__u8e3s4, $this) {
   while (tmp0_iterator.h()) {
     var element = tmp0_iterator.i();
     // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitImports.<anonymous>' call
-    if (!(_this__u8e3s4.x25().b1() === element.k29_1)) {
+    if (!(_this__u8e3s4.x25().b1() === element.j29_1)) {
       destination.e(element);
     }
   }
@@ -601,7 +643,7 @@ function emitImports_0(_this__u8e3s4, $this) {
   while (tmp0_iterator_0.h()) {
     var item = tmp0_iterator_0.i();
     // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitImports.<anonymous>' call
-    var tmp$ret$3 = 'import ' + $this.h2a().o26_1 + '.model.' + item.k29_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.g2a().o26_1 + '.model.' + item.j29_1 + ';';
     destination_0.e(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -636,16 +678,16 @@ function emitRequestFunctions(_this__u8e3s4, $this, endpoint) {
   if (!(_this__u8e3s4.p24_1 == null)) {
     var tmp0_safe_receiver = _this__u8e3s4.p24_1;
     var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.r24_1;
-    tmp_11 = 'serialization.serializeBody(request.getBody(), ' + (tmp1_safe_receiver == null ? null : emitGetType(tmp1_safe_receiver, $this)) + ')';
+    tmp_11 = 'serialization.serializeBody(request.body(), ' + (tmp1_safe_receiver == null ? null : emitGetType(tmp1_safe_receiver, $this)) + ')';
   } else {
     tmp_11 = 'null';
   }
-  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.s26(3) + ');\n        |' + Spacer_instance.s26(2) + '}\n        |\n        |' + Spacer_instance.s26(2) + 'static Request fromRequest(Wirespec.Deserializer serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.s26(3) + 'return new Request(' + emitDeserializedParams(_this__u8e3s4, $this, endpoint) + ');\n        |' + Spacer_instance.s26(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.s26(3) + ');\n        |' + Spacer_instance.s26(2) + '}\n        |\n        |' + Spacer_instance.s26(2) + 'static Request fromRequest(Wirespec.Deserializer serialization, Wirespec.RawRequest request) {\n        |' + Spacer_instance.s26(3) + 'return new Request(' + emitDeserializedParams(_this__u8e3s4, $this, endpoint) + ');\n        |' + Spacer_instance.s26(2) + '}\n    ');
 }
 function emitObject(_this__u8e3s4, $this, name, extends_0, block) {
   var tmp;
   if (_this__u8e3s4.l()) {
-    tmp = Spacer_instance.toString() + 'class ' + name + ' implements ' + extends_0 + ' {}';
+    tmp = Spacer_instance.toString() + 'static class ' + name + ' implements ' + extends_0 + ' {}';
   } else {
     var tmp_0 = Spacer_instance.toString();
     tmp = trimMargin('\n            |' + tmp_0 + 'public record ' + name + '(\n            |' + joinToString(_this__u8e3s4, ',\n', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emitObject$lambda(block)) + '\n            |' + Spacer_instance.toString() + ') implements ' + extends_0 + ' {}\n        ');
@@ -699,7 +741,7 @@ function JavaEndpointDefinitionEmitter$emit$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return this$0.v2a(it);
+    return this$0.u2a(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_3(this$0) {
@@ -829,14 +871,14 @@ function JavaEndpointDefinitionEmitter() {
 }
 function JavaEnumDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
-    return this$0.x2a(it) + '("' + it + '")';
+    return this$0.w2a(it) + '("' + it + '")';
   };
 }
 function JavaEnumDefinitionEmitter() {
 }
 function Companion() {
   Companion_instance_2 = this;
-  this.k2b_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.j2b_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() {
@@ -853,8 +895,8 @@ function JavaRefinedTypeDefinitionEmitter() {
 }
 function JavaShared() {
   JavaShared_instance = this;
-  this.h2b_1 = 'community.flock.wirespec.java';
-  this.i2b_1 = trimMargin('\n        |package ' + this.h2b_1 + ';\n        |\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |import java.util.List;\n        |import java.util.Map;\n        |\n        |public interface Wirespec {\n        |' + Spacer_instance.toString() + 'interface Enum { String getLabel(); }\n        |' + Spacer_instance.toString() + 'interface Endpoint {}\n        |' + Spacer_instance.toString() + 'interface Refined { String getValue(); }\n        |' + Spacer_instance.toString() + 'interface Path {}\n        |' + Spacer_instance.toString() + 'interface Queries {}\n        |' + Spacer_instance.toString() + 'interface Headers {}\n        |' + Spacer_instance.toString() + 'interface Handler {}\n        |' + Spacer_instance.toString() + 'interface ServerEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.s26(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.s26(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.s26(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.s26(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.s26(2) + 'String getPathTemplate();\n        |' + Spacer_instance.s26(2) + 'String getMethod();\n        |' + Spacer_instance.s26(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.s26(2) + 'String getPathTemplate();\n        |' + Spacer_instance.s26(2) + 'String getMethod();\n        |' + Spacer_instance.s26(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 getPath(); Method getMethod(); Queries getQueries(); Headers getHeaders(); T getBody(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Response<T> { int getStatus(); Headers getHeaders(); T getBody(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface 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, byte[] body) {} \n        |' + Spacer_instance.toString() + 'record RawResponse(int statusCode, Map<String, List<String>> headers, byte[] body) {}\n        |' + Spacer_instance.toString() + 'static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n        |' + Spacer_instance.s26(2) + 'if(rawType != null) {\n        |' + Spacer_instance.s26(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.s26(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.s26(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.s26(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.s26(3) + '};\n        |' + Spacer_instance.s26(2) + '}\n        |' + Spacer_instance.s26(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
+  this.g2b_1 = 'community.flock.wirespec.java';
+  this.h2b_1 = trimMargin('\n        |package ' + this.g2b_1 + ';\n        |\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |import java.util.List;\n        |import java.util.Map;\n        |\n        |public interface Wirespec {\n        |' + Spacer_instance.toString() + 'interface Enum { String getLabel(); }\n        |' + Spacer_instance.toString() + 'interface Endpoint {}\n        |' + Spacer_instance.toString() + 'interface Refined<T> { T getValue(); }\n        |' + Spacer_instance.toString() + 'interface Path {}\n        |' + Spacer_instance.toString() + 'interface Queries {}\n        |' + Spacer_instance.toString() + 'interface Headers {}\n        |' + Spacer_instance.toString() + 'interface Handler {}\n        |' + Spacer_instance.toString() + 'interface ServerEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.s26(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.s26(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.s26(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.s26(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.s26(2) + 'String getPathTemplate();\n        |' + Spacer_instance.s26(2) + 'String getMethod();\n        |' + Spacer_instance.s26(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.s26(2) + 'String getPathTemplate();\n        |' + Spacer_instance.s26(2) + 'String getMethod();\n        |' + Spacer_instance.s26(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> { int 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, byte[] body) {} \n        |' + Spacer_instance.toString() + 'record RawResponse(int statusCode, Map<String, List<String>> headers, byte[] body) {}\n        |' + Spacer_instance.toString() + 'static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n        |' + Spacer_instance.s26(2) + 'if(rawType != null) {\n        |' + Spacer_instance.s26(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.s26(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.s26(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.s26(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.s26(3) + '};\n        |' + Spacer_instance.s26(2) + '}\n        |' + Spacer_instance.s26(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
 }
 protoOf(JavaShared).toString = function () {
   return 'JavaShared';
@@ -891,7 +933,7 @@ function emitType(_this__u8e3s4, $this) {
           tmp = 'Object';
         } else {
           if (_this__u8e3s4 instanceof Custom) {
-            tmp = _this__u8e3s4.k29_1;
+            tmp = _this__u8e3s4.j29_1;
           } else {
             if (_this__u8e3s4 instanceof Primitive) {
               tmp = emit_15(_this__u8e3s4, $this);
@@ -906,7 +948,7 @@ function emitType(_this__u8e3s4, $this) {
   return tmp;
 }
 function emit_15(_this__u8e3s4, $this) {
-  var t = _this__u8e3s4.o29_1;
+  var t = _this__u8e3s4.n29_1;
   var tmp;
   if (t instanceof String_0) {
     tmp = 'String';
@@ -928,7 +970,7 @@ function emit_15(_this__u8e3s4, $this) {
     } else {
       if (t instanceof Number_0) {
         var tmp_1;
-        switch (t.w28_1.r2_1) {
+        switch (t.v28_1.r2_1) {
           case 0:
             tmp_1 = 'Float';
             break;
@@ -979,20 +1021,20 @@ protoOf(JavaEmitter).x24 = emit_1;
 protoOf(JavaEmitter).y24 = emit_2;
 protoOf(JavaEmitter).z24 = emit_3;
 protoOf(JavaEmitter).a25 = emit_4;
-protoOf(JavaEmitter).l26 = emit_8;
-protoOf(JavaEmitter).u2a = emit_9;
-protoOf(JavaEmitter).v2a = emit_10;
+protoOf(JavaEmitter).l26 = emit_9;
+protoOf(JavaEmitter).t2a = emit_10;
+protoOf(JavaEmitter).u2a = emit_11;
 protoOf(JavaEmitter).z25 = emit_5;
-protoOf(JavaEmitter).k26 = emit_12;
-protoOf(JavaEmitter).a26 = emit_7;
-protoOf(JavaEmitter).f26 = emit_11;
-protoOf(JavaEmitter).j2b = sanitizeSymbol;
-protoOf(JavaEmitter).j2a = sanitizeFirstIsDigit;
-protoOf(JavaEmitter).k2a = sanitizeKeywords;
-protoOf(JavaEmitter).a2b = emitRoot;
-protoOf(JavaEmitter).z2a = emitRoot$default;
-protoOf(JavaEmitter).w2a = emitHandleFunction;
-protoOf(JavaEmitter).x2a = sanitizeEnum;
+protoOf(JavaEmitter).k26 = emit_7;
+protoOf(JavaEmitter).a26 = emit_8;
+protoOf(JavaEmitter).f26 = emit_12;
+protoOf(JavaEmitter).i2b = sanitizeSymbol;
+protoOf(JavaEmitter).i2a = sanitizeFirstIsDigit;
+protoOf(JavaEmitter).j2a = sanitizeKeywords;
+protoOf(JavaEmitter).z2a = emitRoot;
+protoOf(JavaEmitter).y2a = emitRoot$default;
+protoOf(JavaEmitter).v2a = emitHandleFunction;
+protoOf(JavaEmitter).w2a = sanitizeEnum;
 protoOf(JavaEmitter).m26 = emitValidator;
 //endregion
 //region block: exports