@flock/wirespec 0.17.18 → 0.17.20

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

@@ -115,10 +115,10 @@ function emit_3(_this__u8e3s4) {
 function emitRoot(_this__u8e3s4, void_0) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = this.b2b(_this__u8e3s4.e23_1);
+    tmp = this.d2b(_this__u8e3s4.e23_1);
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = this.b2b(_this__u8e3s4.b23_1);
+      tmp = this.d2b(_this__u8e3s4.b23_1);
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = void_0;
@@ -147,7 +147,7 @@ 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.c2b(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
+  return $super === VOID ? this.e2b(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
 }
 function emit_4(_this__u8e3s4) {
   var tmp;
@@ -155,7 +155,7 @@ function emit_4(_this__u8e3s4) {
     tmp = 'return java.util.regex.Pattern.compile("' + replace(this.b25(_this__u8e3s4.a28_1), '\\', '\\\\') + '").matcher(record.value).find();';
   } else {
     if (_this__u8e3s4 instanceof Bound) {
-      var tmp1_safe_receiver = _this__u8e3s4.o28_1;
+      var tmp1_safe_receiver = _this__u8e3s4.q28_1;
       var tmp_0;
       if (tmp1_safe_receiver == null) {
         tmp_0 = null;
@@ -166,7 +166,7 @@ function emit_4(_this__u8e3s4) {
         tmp_0 = tmp1_safe_receiver + ' < record.value';
       }
       var minCheck = tmp_0;
-      var tmp2_safe_receiver = _this__u8e3s4.p28_1;
+      var tmp2_safe_receiver = _this__u8e3s4.r28_1;
       var tmp_1;
       if (tmp2_safe_receiver == null) {
         tmp_1 = null;
@@ -194,79 +194,17 @@ 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.b2b(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.d2b(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.l2b(identifier.b1());
-  } else {
-    if (identifier instanceof FieldIdentifier) {
-      tmp = this.j2a(this.l2b(identifier.b1()));
-    } else {
-      noWhenBranchMatchedException();
-    }
-  }
-  return tmp;
-}
-function sanitizeSymbol(_this__u8e3s4) {
-  // Inline function 'kotlin.collections.mapIndexed' call
-  var this_0 = split(_this__u8e3s4, ['.', ' ', '-']);
-  // Inline function 'kotlin.collections.mapIndexedTo' call
-  var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
-  var index = 0;
-  var tmp0_iterator = this_0.g();
-  while (tmp0_iterator.h()) {
-    var item = tmp0_iterator.i();
-    // Inline function 'community.flock.wirespec.emitters.java.JavaIdentifierEmitter.sanitizeSymbol.<anonymous>' call
-    var tmp1 = index;
-    index = tmp1 + 1 | 0;
-    var tmp$ret$0 = checkIndexOverflow(tmp1) > 0 ? Companion_instance_1.q25(item) : item;
-    destination.e(tmp$ret$0);
-  }
-  var tmp = asSequence(joinToString(destination, ''));
-  return this.i2a(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
-}
-function sanitizeFirstIsDigit(_this__u8e3s4) {
-  var tmp;
-  var tmp0_safe_receiver = firstOrNull(_this__u8e3s4);
-  var tmp_0;
-  var tmp_1 = tmp0_safe_receiver;
-  if ((tmp_1 == null ? null : new Char(tmp_1)) == null) {
-    tmp_0 = null;
-  } else {
-    tmp_0 = isDigit(tmp0_safe_receiver);
-  }
-  if (tmp_0 === true) {
-    tmp = '_' + _this__u8e3s4;
-  } else {
-    tmp = _this__u8e3s4;
-  }
-  return tmp;
-}
-function sanitizeKeywords(_this__u8e3s4) {
-  return Companion_getInstance().m2b_1.o1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
-}
-initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
-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    ');
-}
-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_9(endpoint) {
+function emit_6(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.t2a(first_0(endpoint.l24_1), endpoint);
+  var tmp_5 = this.v2a(first_0(endpoint.l24_1), endpoint);
   var tmp_6 = Spacer_instance.toString();
   var tmp_7 = emitStatusInterfaces(endpoint, this);
   var tmp_8 = emitResponseInterfaces(endpoint, this);
@@ -283,7 +221,7 @@ function emit_9(endpoint) {
   var tmp_19 = emitFromResponse(endpoint, this);
   var tmp_20 = Spacer_instance.s26(2);
   var tmp_21 = Spacer_instance.s26(2);
-  var tmp_22 = this.v2a(endpoint);
+  var tmp_22 = this.x2a(endpoint);
   var tmp_23 = Spacer_instance.s26(2);
   var tmp_24 = 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.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.i24_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_4) + '"; }\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    ');
@@ -291,10 +229,10 @@ function emit_9(endpoint) {
 function emitHandleFunction(endpoint) {
   return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.r25(this.y25(endpoint.g24_1)) + '(Request request);';
 }
-function emit_10(_this__u8e3s4, endpoint) {
+function emit_7(_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_11(_this__u8e3s4) {
+function emit_8(_this__u8e3s4) {
   var tmp = Spacer_instance.toString();
   var tmp_0 = Companion_instance_1.q25(_this__u8e3s4.s24_1);
   var tmp_1 = Spacer_instance.s26(2);
@@ -331,25 +269,77 @@ function emit_11(_this__u8e3s4) {
   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_7(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 }
 initMetadataForInterface(JavaEndpointDefinitionEmitter, 'JavaEndpointDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_12(refined) {
+function emit_9(identifier) {
+  var tmp;
+  if (identifier instanceof DefinitionIdentifier) {
+    tmp = this.n2b(identifier.b1());
+  } else {
+    if (identifier instanceof FieldIdentifier) {
+      tmp = this.l2a(this.n2b(identifier.b1()));
+    } else {
+      noWhenBranchMatchedException();
+    }
+  }
+  return tmp;
+}
+function sanitizeSymbol(_this__u8e3s4) {
+  // Inline function 'kotlin.collections.mapIndexed' call
+  var this_0 = split(_this__u8e3s4, ['.', ' ', '-']);
+  // Inline function 'kotlin.collections.mapIndexedTo' call
+  var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
+  var index = 0;
+  var tmp0_iterator = this_0.g();
+  while (tmp0_iterator.h()) {
+    var item = tmp0_iterator.i();
+    // Inline function 'community.flock.wirespec.emitters.java.JavaIdentifierEmitter.sanitizeSymbol.<anonymous>' call
+    var tmp1 = index;
+    index = tmp1 + 1 | 0;
+    var tmp$ret$0 = checkIndexOverflow(tmp1) > 0 ? Companion_instance_1.q25(item) : item;
+    destination.e(tmp$ret$0);
+  }
+  var tmp = asSequence(joinToString(destination, ''));
+  return this.k2a(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
+}
+function sanitizeFirstIsDigit(_this__u8e3s4) {
+  var tmp;
+  var tmp0_safe_receiver = firstOrNull(_this__u8e3s4);
+  var tmp_0;
+  var tmp_1 = tmp0_safe_receiver;
+  if ((tmp_1 == null ? null : new Char(tmp_1)) == null) {
+    tmp_0 = null;
+  } else {
+    tmp_0 = isDigit(tmp0_safe_receiver);
+  }
+  if (tmp_0 === true) {
+    tmp = '_' + _this__u8e3s4;
+  } else {
+    tmp = _this__u8e3s4;
+  }
+  return tmp;
+}
+function sanitizeKeywords(_this__u8e3s4) {
+  return Companion_getInstance().o2b_1.o1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+}
+initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
+function emit_10(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 = 'return true;';
-  var type = _this__u8e3s4.e26_1.n29_1;
+  var type = _this__u8e3s4.e26_1.p29_1;
   var tmp;
   if (type instanceof Integer) {
-    var tmp0_safe_receiver = type.t28_1;
+    var tmp0_safe_receiver = type.v28_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.a25(tmp0_safe_receiver);
     tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
   } else {
     if (type instanceof Number_0) {
-      var tmp2_safe_receiver = type.w28_1;
+      var tmp2_safe_receiver = type.y28_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 {
       if (type instanceof String_0) {
-        var tmp4_safe_receiver = type.q28_1;
+        var tmp4_safe_receiver = type.s28_1;
         var tmp_0;
         var tmp_1 = tmp4_safe_receiver;
         if ((tmp_1 == null ? null : new RegExp_0(tmp_1)) == null) {
@@ -375,7 +365,17 @@ function emitValidator(_this__u8e3s4) {
   return tmp;
 }
 initMetadataForInterface(JavaRefinedTypeDefinitionEmitter, 'JavaRefinedTypeDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaEnumDefinitionEmitter, JavaUnionDefinitionEmitter, JavaEndpointDefinitionEmitter, JavaIdentifierEmitter, JavaTypeDefinitionEmitter, JavaChannelDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, LanguageEmitter]);
+function emit_11(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    ');
+}
+initMetadataForInterface(JavaEnumDefinitionEmitter, 'JavaEnumDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
+function emit_12(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]);
+initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaEndpointDefinitionEmitter, JavaIdentifierEmitter, JavaChannelDefinitionEmitter, JavaTypeDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, JavaEnumDefinitionEmitter, JavaUnionDefinitionEmitter, LanguageEmitter]);
 initMetadataForCompanion(Companion);
 initMetadataForObject(JavaShared, 'JavaShared');
 //endregion
@@ -389,7 +389,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.j29_1)) {
+    if (!(_this__u8e3s4.x25().b1() === element.l29_1)) {
       destination.e(element);
     }
   }
@@ -399,7 +399,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.g2a().o26_1 + '.model.' + item.j29_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.i2a().o26_1 + '.model.' + item.l29_1 + ';';
     destination_0.e(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -408,7 +408,7 @@ function emitImports(_this__u8e3s4, $this) {
 function emitFullyQualified(_this__u8e3s4, $this, reference) {
   var tmp;
   if (_this__u8e3s4.x25().b1() === reference.b1()) {
-    tmp = $this.g2a().o26_1 + '.model.';
+    tmp = $this.i2a().o26_1 + '.model.';
   } else {
     tmp = '';
   }
@@ -424,46 +424,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.d2b_1 = packageName;
-  this.e2b_1 = emitShared;
-  this.f2b_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
-  this.g2b_1 = FileExtension_Java_getInstance();
-  this.h2b_1 = JavaShared_getInstance();
-  this.i2b_1 = '//';
-}
-protoOf(JavaEmitter).g2a = function () {
-  return this.d2b_1;
+  this.f2b_1 = packageName;
+  this.g2b_1 = emitShared;
+  this.h2b_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
+  this.i2b_1 = FileExtension_Java_getInstance();
+  this.j2b_1 = JavaShared_getInstance();
+  this.k2b_1 = '//';
+}
+protoOf(JavaEmitter).i2a = function () {
+  return this.f2b_1;
 };
 protoOf(JavaEmitter).g25 = function () {
-  return this.g2b_1;
+  return this.i2b_1;
 };
-protoOf(JavaEmitter).q2a = function () {
-  return this.h2b_1;
+protoOf(JavaEmitter).s2a = function () {
+  return this.j2b_1;
 };
 protoOf(JavaEmitter).h25 = function () {
-  return this.i2b_1;
+  return this.k2b_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.e2b_1.j23_1 ? it.vk(new Emitted(Companion_instance.n26('community.flock.wirespec.java').q26() + 'Wirespec', this.q2a().k2b_1)) : it;
+  return this.g2b_1.j23_1 ? it.vk(new Emitted(Companion_instance.n26('community.flock.wirespec.java').q26() + 'Wirespec', this.s2a().m2b_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.g2a(), definition);
-  var tmp = subPackageName.q26() + this.l2b(it.k23_1);
+  var subPackageName = plus(this.i2a(), definition);
+  var tmp = subPackageName.q26() + this.n2b(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.f2b_1 : '') + '\n                    |' + it.l23_1 + '\n                    ');
+  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.s25(module_0) ? this.h2b_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.c2b(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw(_this__u8e3s4, $this) + ')';
+  return 'Wirespec.getType(' + $this.e2b(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw(_this__u8e3s4, $this) + ')';
 }
 function emitGetTypeRaw(_this__u8e3s4, $this) {
   var tmp;
@@ -542,7 +542,7 @@ function emitDeserializedParams(_this__u8e3s4, $this, endpoint) {
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitDeserializedParams.<anonymous>' call
-    tmp_3 = Spacer_instance.s26(4) + 'serialization.deserializeBody(request.body(), ' + emitGetType(tmp0_safe_receiver.r24_1, $this) + ')';
+    tmp_3 = Spacer_instance.s26(4) + 'request.body().<' + emit_13(tmp0_safe_receiver, $this) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType(tmp0_safe_receiver.r24_1, $this) + ')).orElse(null)';
   }
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitDeserializedParams.<anonymous>' call
@@ -560,7 +560,7 @@ function emitDeserializedParams_0(_this__u8e3s4, $this) {
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitDeserializedParams.<anonymous>' call
-    tmp_0 = Spacer_instance.s26(5) + 'serialization.deserializeBody(response.body(), ' + emitGetType(tmp0_safe_receiver.r24_1, $this) + ')';
+    tmp_0 = Spacer_instance.s26(5) + 'response.body().<' + emit_13(tmp0_safe_receiver, $this) + '>map(body -> serialization.deserializeBody(body, ' + emitGetType(tmp0_safe_receiver.r24_1, $this) + ')).orElse(null)';
   }
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.java.JavaEndpointDefinitionEmitter.emitDeserializedParams.<anonymous>' call
@@ -570,9 +570,9 @@ function emitDeserializedParams_0(_this__u8e3s4, $this) {
 function emitSerialized(_this__u8e3s4, $this) {
   var tmp;
   if (!(_this__u8e3s4.u24_1 == null)) {
-    tmp = 'serialization.serializeBody(r.body, ' + emitGetType(ensureNotNull(_this__u8e3s4.u24_1).r24_1, $this) + ')';
+    tmp = 'java.util.Optional.ofNullable(serialization.serializeBody(r.body, ' + emitGetType(ensureNotNull(_this__u8e3s4.u24_1).r24_1, $this) + '))';
   } else {
-    tmp = 'null';
+    tmp = 'java.util.Optional.empty()';
   }
   var body = tmp;
   var tmp_0;
@@ -628,7 +628,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.j29_1)) {
+    if (!(_this__u8e3s4.x25().b1() === element.l29_1)) {
       destination.e(element);
     }
   }
@@ -638,7 +638,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.g2a().o26_1 + '.model.' + item.j29_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.i2a().o26_1 + '.model.' + item.l29_1 + ';';
     destination_0.e(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -673,9 +673,9 @@ 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.body(), ' + (tmp1_safe_receiver == null ? null : emitGetType(tmp1_safe_receiver, $this)) + ')';
+    tmp_11 = 'java.util.Optional.ofNullable(serialization.serializeBody(request.body(), ' + (tmp1_safe_receiver == null ? null : emitGetType(tmp1_safe_receiver, $this)) + '))';
   } else {
-    tmp_11 = 'null';
+    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.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    ');
 }
@@ -762,7 +762,7 @@ function JavaEndpointDefinitionEmitter$emit$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return this$0.u2a(it);
+    return this$0.w2a(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_3(this$0) {
@@ -902,7 +902,7 @@ function sanitizeNegative(_this__u8e3s4, $this) {
   return tmp;
 }
 function sanitizeEnum(_this__u8e3s4, $this) {
-  return $this.j2a($this.i2a(joinToString(split(sanitizeNegative(_this__u8e3s4, $this), ['-', ', ', '.', ' ', '//']), '_')));
+  return $this.l2a($this.k2a(joinToString(split(sanitizeNegative(_this__u8e3s4, $this), ['-', ', ', '.', ' ', '//']), '_')));
 }
 function JavaEnumDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
@@ -913,7 +913,7 @@ function JavaEnumDefinitionEmitter() {
 }
 function Companion() {
   Companion_instance_2 = this;
-  this.m2b_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.o2b_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() {
@@ -930,8 +930,8 @@ function JavaRefinedTypeDefinitionEmitter() {
 }
 function JavaShared() {
   JavaShared_instance = this;
-  this.j2b_1 = 'community.flock.wirespec.java';
-  this.k2b_1 = trimMargin('\n        |package ' + this.j2b_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        ');
+  this.l2b_1 = 'community.flock.wirespec.java';
+  this.m2b_1 = trimMargin('\n        |package ' + this.l2b_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 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, 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.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';
@@ -968,7 +968,7 @@ function emitType(_this__u8e3s4, $this) {
           tmp = 'Object';
         } else {
           if (_this__u8e3s4 instanceof Custom) {
-            tmp = _this__u8e3s4.j29_1;
+            tmp = _this__u8e3s4.l29_1;
           } else {
             if (_this__u8e3s4 instanceof Primitive) {
               tmp = emit_15(_this__u8e3s4, $this);
@@ -983,14 +983,14 @@ function emitType(_this__u8e3s4, $this) {
   return tmp;
 }
 function emit_15(_this__u8e3s4, $this) {
-  var t = _this__u8e3s4.n29_1;
+  var t = _this__u8e3s4.p29_1;
   var tmp;
   if (t instanceof String_0) {
     tmp = 'String';
   } else {
     if (t instanceof Integer) {
       var tmp_0;
-      switch (t.s28_1.r2_1) {
+      switch (t.u28_1.r2_1) {
         case 0:
           tmp_0 = 'Integer';
           break;
@@ -1005,7 +1005,7 @@ function emit_15(_this__u8e3s4, $this) {
     } else {
       if (t instanceof Number_0) {
         var tmp_1;
-        switch (t.v28_1.r2_1) {
+        switch (t.x28_1.r2_1) {
           case 0:
             tmp_1 = 'Float';
             break;
@@ -1050,25 +1050,25 @@ function JavaUnionDefinitionEmitter$emit$lambda(it) {
 function JavaUnionDefinitionEmitter() {
 }
 //region block: post-declaration
-protoOf(JavaEmitter).y25 = emit_6;
+protoOf(JavaEmitter).y25 = emit_9;
 protoOf(JavaEmitter).w24 = emit_0;
 protoOf(JavaEmitter).x24 = emit_1;
 protoOf(JavaEmitter).y24 = emit_2;
 protoOf(JavaEmitter).z24 = emit_3;
 protoOf(JavaEmitter).a25 = emit_4;
-protoOf(JavaEmitter).l26 = emit_9;
-protoOf(JavaEmitter).t2a = emit_10;
-protoOf(JavaEmitter).u2a = emit_11;
+protoOf(JavaEmitter).l26 = emit_6;
+protoOf(JavaEmitter).v2a = emit_7;
+protoOf(JavaEmitter).w2a = emit_8;
 protoOf(JavaEmitter).z25 = emit_5;
-protoOf(JavaEmitter).k26 = emit_7;
-protoOf(JavaEmitter).a26 = emit_8;
-protoOf(JavaEmitter).f26 = emit_12;
-protoOf(JavaEmitter).l2b = sanitizeSymbol;
-protoOf(JavaEmitter).i2a = sanitizeFirstIsDigit;
-protoOf(JavaEmitter).j2a = sanitizeKeywords;
-protoOf(JavaEmitter).c2b = emitRoot;
-protoOf(JavaEmitter).b2b = emitRoot$default;
-protoOf(JavaEmitter).v2a = emitHandleFunction;
+protoOf(JavaEmitter).k26 = emit_11;
+protoOf(JavaEmitter).a26 = emit_12;
+protoOf(JavaEmitter).f26 = emit_10;
+protoOf(JavaEmitter).n2b = sanitizeSymbol;
+protoOf(JavaEmitter).k2a = sanitizeFirstIsDigit;
+protoOf(JavaEmitter).l2a = sanitizeKeywords;
+protoOf(JavaEmitter).e2b = emitRoot;
+protoOf(JavaEmitter).d2b = emitRoot$default;
+protoOf(JavaEmitter).x2a = emitHandleFunction;
 protoOf(JavaEmitter).m26 = emitValidator;
 //endregion
 //region block: exports