@flock/wirespec 0.18.13 → 0.18.15

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@flock/wirespec",
-  "version": "0.18.13",
+  "version": "0.18.15",
   "main": "wirespec-src-plugin-npm.mjs",
   "types": "wirespec-src-plugin-npm.d.mts",
   "devDependencies": {
     "typescript": "5.9.3"
   },
   "dependencies": {},
-  "peerDependencies": {},
+  "peerDependencies": {
+    "msw": "^2.0.0"
+  },
   "optionalDependencies": {},
   "bundledDependencies": [],
   "bin": {
@@ -27,6 +29,15 @@
     "./serialization": {
       "types": "./wirespec-serialization.d.ts",
       "default": "./wirespec-serialization.mjs"
+    },
+    "./msw": {
+      "types": "./wirespec-msw.d.ts",
+      "default": "./wirespec-msw.mjs"
+    }
+  },
+  "peerDependenciesMeta": {
+    "msw": {
+      "optional": true
     }
   },
   "repository": {

package/wirespec-msw.d.ts

@@ -0,0 +1,53 @@
+import type { RequestHandler } from 'msw'
+import type { Serialization } from './wirespec-serialization'
+
+// Mirrors the generated `Wirespec.RawRequest` / `RawResponse` so generated endpoint `api`
+// objects are assignable to WirespecMswEndpoint (the method union must match exactly).
+type Method = 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH' | 'TRACE'
+
+type RawRequest = {
+    method: Method
+    path: string[]
+    queries: Record<string, string>
+    headers: Record<string, string>
+    body?: string
+}
+
+type RawResponse = {
+    status: number
+    headers: Record<string, string>
+    body?: string
+}
+
+/**
+ * Structural mirror of the generated `Wirespec.Api<Req, Res>` type. The shipped module
+ * cannot import the consumer's per-project generated `Wirespec` namespace, so the shape
+ * is redeclared here; generated endpoint `api` objects are assignable to it.
+ */
+export type WirespecMswEndpoint<Req, Res> = {
+    method: string
+    path: string
+    server: (serialization: Serialization) => {
+        from: (request: RawRequest) => Req
+        to: (response: Res) => RawResponse
+    }
+}
+
+export type WirespecMswOptions = {
+    /** Host or path prefix prepended to the contract path, e.g. "https://api.example.com" or "/api". */
+    baseUrl?: string
+    /** Override the serialization used to (de)serialize requests/responses. */
+    serialization?: Serialization
+}
+
+/**
+ * Build a typed MSW request handler for a generated Wirespec endpoint.
+ *
+ * The generics are inferred from `api.server`, constraining `resolver` to the endpoint's
+ * own request/response types: returning a response from a different endpoint is a compile error.
+ */
+export declare function wirespec<Req, Res>(
+    api: WirespecMswEndpoint<Req, Res>,
+    resolver: (request: Req) => Res | Promise<Res>,
+    options?: WirespecMswOptions,
+): RequestHandler

package/wirespec-msw.mjs

@@ -0,0 +1,83 @@
+import { http, HttpResponse } from 'msw'
+import { wirespecSerialization } from './wirespec-serialization.mjs'
+
+const METHODS = {
+    GET: 'get',
+    PUT: 'put',
+    POST: 'post',
+    DELETE: 'delete',
+    PATCH: 'patch',
+    HEAD: 'head',
+    OPTIONS: 'options',
+}
+
+const PARAM = /^:(.+)$/
+const BRACE = /^\{(.+)\}$/
+
+const segments = (path) => path.replace(/^\/+/, '').split('/').filter((s) => s.length > 0)
+
+// Normalize a Wirespec contract path into an MSW matcher: `{id}` -> `:id`, single leading slash.
+const normalizePath = (path) => {
+    const colon = path.replace(/\{([^/}]+)\}/g, ':$1')
+    return colon.startsWith('/') ? colon : `/${colon}`
+}
+
+// Without a baseUrl, prefix the contract path with `*` so it matches on any origin
+// (a bare relative path is not matched against absolute request URLs in Node). With a
+// baseUrl, pin the origin/prefix instead.
+const matcher = (baseUrl, path) => {
+    const normalized = normalizePath(path)
+    return baseUrl ? `${baseUrl.replace(/\/+$/, '')}${normalized}` : `*${normalized}`
+}
+
+// Rebuild the positional RawRequest.path from the contract template, substituting MSW's
+// matched params for `:name`/`{name}` segments. Using the template (not the raw URL) keeps
+// path-param indices aligned with the contract even when a baseUrl prefix is present.
+const buildPath = (templatePath, params) =>
+    segments(templatePath).map((segment) => {
+        const match = segment.match(PARAM) ?? segment.match(BRACE)
+        if (!match) return segment
+        const value = params[match[1]]
+        return Array.isArray(value) ? value[0] : value
+    })
+
+const readBody = async (request) => {
+    if (request.method === 'GET' || request.method === 'HEAD') return undefined
+    const text = await request.text()
+    return text.length > 0 ? text : undefined
+}
+
+/**
+ * Build an MSW request handler for a generated Wirespec endpoint `api`.
+ *
+ * The resolver receives the deserialized, typed Wirespec request and must return one of
+ * that endpoint's responses; a response from a different endpoint is a compile error.
+ *
+ * Options:
+ *  - baseUrl: host or path prefix to prepend to the contract path (e.g. "https://api.example.com").
+ *  - serialization: override the (de)serializer (defaults to wirespecSerialization).
+ */
+export function wirespec(api, resolver, options = {}) {
+    const serialization = options.serialization ?? wirespecSerialization
+    const pattern = matcher(options.baseUrl, api.path)
+    const method = METHODS[String(api.method).toUpperCase()] ?? 'all'
+    const endpoint = api.server(serialization)
+
+    return http[method](pattern, async ({ request, params }) => {
+        const url = new URL(request.url)
+        const rawRequest = {
+            method: request.method,
+            path: buildPath(api.path, params),
+            queries: Object.fromEntries(url.searchParams),
+            headers: Object.fromEntries(request.headers),
+            body: await readBody(request),
+        }
+        const typedRequest = endpoint.from(rawRequest)
+        const response = await resolver(typedRequest)
+        const rawResponse = endpoint.to(response)
+        return new HttpResponse(rawResponse.body ?? null, {
+            status: rawResponse.status,
+            headers: rawResponse.headers,
+        })
+    })
+}

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

@@ -197,10 +197,10 @@ function emit_6(_this__u8e3s4) {
 function emitRoot(_this__u8e3s4, void_0) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = this.j1v(_this__u8e3s4.go_1);
+    tmp = this.l1v(_this__u8e3s4.go_1);
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = this.j1v(_this__u8e3s4.do_1);
+      tmp = this.l1v(_this__u8e3s4.do_1);
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = void_0;
@@ -229,7 +229,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.k1v(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
+  return $super === VOID ? this.m1v(_this__u8e3s4, void_0) : emitRoot(_this__u8e3s4, void_0);
 }
 function emit_7(_this__u8e3s4) {
   var tmp;
@@ -272,7 +272,7 @@ function emit_7(_this__u8e3s4) {
 }
 initMetadataForInterface(JavaTypeDefinitionEmitter, 'JavaTypeDefinitionEmitter', VOID, VOID, [TypeDefinitionEmitter]);
 function emit_8(channel) {
-  return trimMargin('\n        |' + emitImports(this, channel) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.br(channel.qo_1) + ' {\n        |   void invoke(' + emitFullyQualified(this, channel, channel.ro_1) + this.j1v(channel.ro_1) + ' message);\n        |}\n        |\n    ');
+  return trimMargin('\n        |' + emitImports(this, channel) + '\n        |\n        |@FunctionalInterface\n        |public interface ' + this.br(channel.qo_1) + ' {\n        |   void invoke(' + emitFullyQualified(this, channel, channel.ro_1) + this.l1v(channel.ro_1) + ' message);\n        |}\n        |\n    ');
 }
 initMetadataForInterface(JavaChannelDefinitionEmitter, 'JavaChannelDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
 function emit_9(endpoint) {
@@ -282,7 +282,7 @@ function emit_9(endpoint) {
   var tmp_2 = emitObject(this, tmp_1, 'Path', 'Wirespec.Path', JavaEndpointDefinitionEmitter$emit$lambda(this));
   var tmp_3 = emitObject(this, endpoint.lp_1, 'Queries', 'Wirespec.Queries', JavaEndpointDefinitionEmitter$emit$lambda_0(this));
   var tmp_4 = emitObject(this, endpoint.mp_1, 'RequestHeaders', 'Wirespec.Request.Headers', JavaEndpointDefinitionEmitter$emit$lambda_1(this));
-  var tmp_5 = this.v1v(first_0(endpoint.np_1), endpoint);
+  var tmp_5 = this.x1v(first_0(endpoint.np_1), endpoint);
   var tmp_6 = Spacer_instance.toString();
   var tmp_7 = emitStatusInterfaces(this, endpoint);
   var tmp_8 = emitResponseInterfaces(this, endpoint);
@@ -299,7 +299,7 @@ function emit_9(endpoint) {
   var tmp_19 = emitFromResponse(this, endpoint);
   var tmp_20 = Spacer_instance.vr(2);
   var tmp_21 = Spacer_instance.vr(2);
-  var tmp_22 = this.z1v(endpoint);
+  var tmp_22 = this.b1w(endpoint);
   var tmp_23 = Spacer_instance.vr(2);
   var tmp_24 = Spacer_instance.vr(3);
   return trimMargin('\n        |' + tmp + '\n        |\n        |public interface ' + tmp_0 + ' extends Wirespec.Endpoint {\n        |' + tmp_2 + '\n        |\n        |' + tmp_3 + '\n        |\n        |' + tmp_4 + '\n        |\n        |' + tmp_5 + '\n        |\n        |' + tmp_6 + 'sealed interface Response<T> extends Wirespec.Response<T> {}\n        |' + tmp_7 + '\n        |' + tmp_8 + '\n        |\n        |' + tmp_10 + '\n        |\n        |' + tmp_11 + 'interface Handler extends Wirespec.Handler {\n        |\n        |' + tmp_12 + '\n        |\n        |' + tmp_13 + 'static Wirespec.RawResponse toResponse(Wirespec.Serializer serialization, Response<?> response) {\n        |' + tmp_15 + '\n        |' + tmp_16 + 'else { throw new IllegalStateException("Cannot match response with status: " + response.status());}\n        |' + tmp_17 + '}\n        |\n        |' + tmp_18 + 'static Response<?> fromResponse(Wirespec.Deserializer serialization, Wirespec.RawResponse response) {\n        |' + tmp_19 + '\n        |' + tmp_20 + '}\n        |\n        |' + tmp_21 + tmp_22 + '\n        |' + tmp_23 + 'class Handlers implements Wirespec.Server<Request, Response<?>>, Wirespec.Client<Request, Response<?>> {\n        |' + tmp_24 + '@Override public String getPathTemplate() { return "/' + joinToString(endpoint.kp_1, '/', VOID, VOID, VOID, VOID, JavaEndpointDefinitionEmitter$emit$lambda_4) + '"; }\n        |' + Spacer_instance.vr(3) + '@Override public String getMethod() { return "' + endpoint.jp_1.toString() + '"; }\n        |' + Spacer_instance.vr(3) + '@Override public Wirespec.ServerEdge<Request, Response<?>> getServer(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.vr(4) + 'return new Wirespec.ServerEdge<>() {\n        |' + Spacer_instance.vr(5) + '@Override public Request from(Wirespec.RawRequest request) { return fromRequest(serialization, request); }\n        |' + Spacer_instance.vr(5) + '@Override public Wirespec.RawResponse to(Response<?> response) { return toResponse(serialization, response); }\n        |' + Spacer_instance.vr(4) + '};\n        |' + Spacer_instance.vr(3) + '}\n        |' + Spacer_instance.vr(3) + '@Override public Wirespec.ClientEdge<Request, Response<?>> getClient(Wirespec.Serialization serialization) {\n        |' + Spacer_instance.vr(4) + 'return new Wirespec.ClientEdge<>() {\n        |' + Spacer_instance.vr(5) + '@Override public Wirespec.RawRequest to(Request request) { return toRequest(serialization, request); }\n        |' + Spacer_instance.vr(5) + '@Override public Response<?> from(Wirespec.RawResponse response) { return fromResponse(serialization, response); }\n        |' + Spacer_instance.vr(4) + '};\n        |' + Spacer_instance.vr(3) + '}\n        |' + Spacer_instance.vr(2) + '}\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
@@ -346,10 +346,10 @@ initMetadataForInterface(JavaEndpointDefinitionEmitter, 'JavaEndpointDefinitionE
 function emit_12(identifier) {
   var tmp;
   if (identifier instanceof DefinitionIdentifier) {
-    tmp = this.u1v(identifier.l1());
+    tmp = this.w1v(identifier.l1());
   } else {
     if (identifier instanceof FieldIdentifier) {
-      tmp = this.y1v(this.u1v(identifier.l1()));
+      tmp = this.a1w(this.w1v(identifier.l1()));
     } else {
       noWhenBranchMatchedException();
     }
@@ -371,7 +371,7 @@ function sanitizeSymbol(_this__u8e3s4) {
     destination.x(tmp$ret$0);
   }
   var tmp = asSequence(joinToString(destination, ''));
-  return this.x1v(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
+  return this.z1v(joinToString_0(filter(tmp, JavaIdentifierEmitter$sanitizeSymbol$lambda), ''));
 }
 function sanitizeFirstIsDigit(_this__u8e3s4) {
   var tmp;
@@ -391,7 +391,7 @@ function sanitizeFirstIsDigit(_this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords(_this__u8e3s4) {
-  return Companion_getInstance_0().a1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance_0().c1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 }
 initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
 function emit_13(enum_0, module_0) {
@@ -448,7 +448,7 @@ function emit_15(union) {
   return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.vo_1, VOID, VOID, VOID, VOID, VOID, JavaUnionDefinitionEmitter$emit$lambda) + ' {}\n        |\n    ');
 }
 initMetadataForInterface(JavaUnionDefinitionEmitter, 'JavaUnionDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaEndpointDefinitionEmitter, JavaEnumDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, JavaUnionDefinitionEmitter, JavaTypeDefinitionEmitter, JavaIdentifierEmitter, JavaChannelDefinitionEmitter, LanguageEmitter]);
+initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaTypeDefinitionEmitter, JavaEndpointDefinitionEmitter, JavaEnumDefinitionEmitter, JavaIdentifierEmitter, JavaRefinedTypeDefinitionEmitter, JavaUnionDefinitionEmitter, JavaChannelDefinitionEmitter, LanguageEmitter]);
 initMetadataForCompanion(Companion);
 initMetadataForCompanion(Companion_0);
 initMetadataForClass(JavaIrEmitter, 'JavaIrEmitter', JavaIrEmitter, VOID, [IrEmitter]);
@@ -472,7 +472,7 @@ function emitImports($this, _this__u8e3s4) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$3 = 'import ' + $this.i1v().rr_1 + '.model.' + item.pu_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.k1v().rr_1 + '.model.' + item.pu_1 + ';';
     destination_0.x(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -481,7 +481,7 @@ function emitImports($this, _this__u8e3s4) {
 function emitFullyQualified($this, _this__u8e3s4, reference) {
   var tmp;
   if (_this__u8e3s4.ar().l1() === reference.l1()) {
-    tmp = $this.i1v().rr_1 + '.model.';
+    tmp = $this.k1v().rr_1 + '.model.';
   } else {
     tmp = '';
   }
@@ -497,42 +497,42 @@ function JavaEmitter(packageName, emitShared) {
   packageName = packageName === VOID ? Companion_instance.qr('community.flock.wirespec.generated') : packageName;
   emitShared = emitShared === VOID ? Companion_instance_0.ko() : emitShared;
   LanguageEmitter.call(this);
-  this.l1v_1 = packageName;
-  this.m1v_1 = emitShared;
-  this.n1v_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
-  this.o1v_1 = FileExtension_Java_getInstance();
-  this.p1v_1 = JavaShared_getInstance();
-  this.q1v_1 = '//';
-}
-protoOf(JavaEmitter).i1v = function () {
-  return this.l1v_1;
+  this.n1v_1 = packageName;
+  this.o1v_1 = emitShared;
+  this.p1v_1 = '\nimport community.flock.wirespec.java.Wirespec;\n';
+  this.q1v_1 = FileExtension_Java_getInstance();
+  this.r1v_1 = JavaShared_getInstance();
+  this.s1v_1 = '//';
+}
+protoOf(JavaEmitter).k1v = function () {
+  return this.n1v_1;
 };
 protoOf(JavaEmitter).iq = function () {
-  return this.o1v_1;
+  return this.q1v_1;
 };
-protoOf(JavaEmitter).r1v = function () {
-  return this.p1v_1;
+protoOf(JavaEmitter).t1v = function () {
+  return this.r1v_1;
 };
 protoOf(JavaEmitter).jq = function () {
-  return this.q1v_1;
+  return this.s1v_1;
 };
 protoOf(JavaEmitter).yq = function (module_0, logger) {
   // Inline function 'kotlin.let' call
   var it = protoOf(LanguageEmitter).yq.call(this, module_0, logger);
-  return this.m1v_1.lo_1 ? NonEmptyList__plus_impl_xqmb9(it, new Emitted(Companion_instance.qr('community.flock.wirespec.java').tr() + 'Wirespec', this.r1v().t1v_1)) : it;
+  return this.o1v_1.lo_1 ? NonEmptyList__plus_impl_xqmb9(it, new Emitted(Companion_instance.qr('community.flock.wirespec.java').tr() + 'Wirespec', this.t1v().v1v_1)) : it;
 };
 protoOf(JavaEmitter).zq = function (definition, module_0, logger) {
   // Inline function 'kotlin.let' call
   var it = protoOf(LanguageEmitter).zq.call(this, definition, module_0, logger);
-  var subPackageName = plus(this.i1v(), definition);
-  var tmp = subPackageName.tr() + this.u1v(it.mo_1);
+  var subPackageName = plus(this.k1v(), definition);
+  var tmp = subPackageName.tr() + this.w1v(it.mo_1);
   // Inline function 'kotlin.text.trimStart' call
-  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.uq(module_0) ? this.n1v_1 : '') + '\n                    |' + it.no_1 + '\n                    ');
+  var this_0 = trimMargin('\n                    |package ' + subPackageName.toString() + ';\n                    |' + (Companion_instance_1.uq(module_0) ? this.p1v_1 : '') + '\n                    |' + it.no_1 + '\n                    ');
   var tmp$ret$0 = toString(trimStart(isCharSequence(this_0) ? this_0 : THROW_CCE()));
   return new Emitted(tmp, tmp$ret$0);
 };
 function emitGetType($this, _this__u8e3s4) {
-  return 'Wirespec.getType(' + $this.k1v(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw($this, _this__u8e3s4) + ')';
+  return 'Wirespec.getType(' + $this.m1v(_this__u8e3s4, 'Void') + '.class, ' + emitGetTypeRaw($this, _this__u8e3s4) + ')';
 }
 function emitGetTypeRaw($this, _this__u8e3s4) {
   var tmp;
@@ -687,7 +687,7 @@ function emitImports_0($this, _this__u8e3s4) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$3 = 'import ' + $this.i1v().rr_1 + '.model.' + item.pu_1 + ';';
+    var tmp$ret$3 = 'import ' + $this.k1v().rr_1 + '.model.' + item.pu_1 + ';';
     destination_0.x(tmp$ret$3);
   }
   var tmp = destination_0;
@@ -808,7 +808,7 @@ function JavaEndpointDefinitionEmitter$emit$lambda_1(this$0) {
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return this$0.w1v(it);
+    return this$0.y1v(it);
   };
 }
 function JavaEndpointDefinitionEmitter$emit$lambda_3(this$0) {
@@ -940,7 +940,7 @@ function sanitizeNegative($this, _this__u8e3s4) {
   return startsWith(_this__u8e3s4, '-') ? '__' + substring(_this__u8e3s4, 1) : _this__u8e3s4;
 }
 function sanitizeEnum($this, _this__u8e3s4) {
-  return $this.y1v($this.x1v(joinToString(split(sanitizeNegative($this, _this__u8e3s4), ['-', ', ', '.', ' ', '//']), '_')));
+  return $this.a1w($this.z1v(joinToString(split(sanitizeNegative($this, _this__u8e3s4), ['-', ', ', '.', ' ', '//']), '_')));
 }
 function JavaEnumDefinitionEmitter$emit$lambda(this$0) {
   return function (it) {
@@ -951,7 +951,7 @@ function JavaEnumDefinitionEmitter() {
 }
 function Companion() {
   Companion_instance_2 = this;
-  this.a1w_1 = setOf(['abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default', 'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private', 'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte', 'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return', 'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final', 'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp', 'volatile', 'const', 'float', 'native', 'super', 'while', 'true', 'false']);
+  this.c1w_1 = setOf(['abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default', 'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private', 'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte', 'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return', 'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final', 'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp', 'volatile', 'const', 'float', 'native', 'super', 'while', 'true', 'false']);
 }
 var Companion_instance_2;
 function Companion_getInstance_0() {
@@ -1015,14 +1015,14 @@ function sanitizeFirstIsDigit_0($this, _this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords_0($this, _this__u8e3s4) {
-  return Companion_getInstance_1().b1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+  return Companion_getInstance_1().d1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
 }
 function sanitizeEnum_0($this, _this__u8e3s4) {
   return sanitizeKeywords_0($this, sanitizeFirstIsDigit_0($this, joinToString(split(_this__u8e3s4, ['-', ', ', '.', ' ', '//']), '_')));
 }
 function Companion_0() {
   Companion_instance_3 = this;
-  this.b1w_1 = setOf(['abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default', 'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private', 'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte', 'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return', 'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final', 'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp', 'volatile', 'const', 'float', 'native', 'super', 'while', 'true', 'false']);
+  this.d1w_1 = setOf(['abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default', 'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private', 'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte', 'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return', 'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final', 'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp', 'volatile', 'const', 'float', 'native', 'super', 'while', 'true', 'false']);
 }
 var Companion_instance_3;
 function Companion_getInstance_1() {
@@ -1134,27 +1134,27 @@ function JavaIrEmitter(packageName, emitShared) {
   Companion_getInstance_1();
   packageName = packageName === VOID ? Companion_instance.qr('community.flock.wirespec.generated') : packageName;
   emitShared = emitShared === VOID ? Companion_instance_0.ko() : emitShared;
-  this.c1w_1 = packageName;
-  this.d1w_1 = emitShared;
-  this.e1w_1 = JavaGenerator_instance;
-  this.f1w_1 = FileExtension_Java_getInstance();
-  this.g1w_1 = listOf(import_0('community.flock.wirespec.java', 'Wirespec'));
+  this.e1w_1 = packageName;
+  this.f1w_1 = emitShared;
+  this.g1w_1 = JavaGenerator_instance;
+  this.h1w_1 = FileExtension_Java_getInstance();
+  this.i1w_1 = listOf(import_0('community.flock.wirespec.java', 'Wirespec'));
   var tmp = this;
-  var tmp_0 = Companion_getInstance_1().b1w_1;
+  var tmp_0 = Companion_getInstance_1().d1w_1;
   var tmp_1 = JavaIrEmitter$sanitizationConfig$lambda;
   var tmp_2 = JavaIrEmitter$sanitizationConfig$lambda_0;
   var tmp_3 = JavaIrEmitter$sanitizationConfig$lambda_1;
   var tmp_4 = JavaIrEmitter$sanitizationConfig$lambda_2(this);
-  tmp.h1w_1 = new SanitizationConfig(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, JavaIrEmitter$sanitizationConfig$lambda_3);
+  tmp.j1w_1 = new SanitizationConfig(tmp_0, tmp_1, tmp_2, tmp_3, tmp_4, JavaIrEmitter$sanitizationConfig$lambda_3);
 }
-protoOf(JavaIrEmitter).i1v = function () {
-  return this.c1w_1;
+protoOf(JavaIrEmitter).k1v = function () {
+  return this.e1w_1;
 };
 protoOf(JavaIrEmitter).p1u = function () {
-  return this.e1w_1;
+  return this.g1w_1;
 };
 protoOf(JavaIrEmitter).iq = function () {
-  return this.f1w_1;
+  return this.h1w_1;
 };
 protoOf(JavaIrEmitter).s1u = function () {
   var packageName = Companion_instance.qr('community.flock.wirespec.java');
@@ -1197,7 +1197,7 @@ protoOf(JavaIrEmitter).s1u = function () {
   var tmp_1 = scope.c1u_1;
   var wirespecShared = isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
   var tmp_2;
-  if (this.d1w_1.lo_1) {
+  if (this.f1w_1.lo_1) {
     tmp_2 = wirespecShared;
   } else {
     tmp_2 = null;
@@ -1208,7 +1208,7 @@ protoOf(JavaIrEmitter).zq = function (definition, module_0, logger) {
   var file = emit_0.call(this, definition, module_0, logger);
   var tmp = file.b1n(Companion_getInstance().k1h(sanitizeSymbol_0(this, file.x1m_1.m1h())));
   // Inline function 'kotlin.takeIf' call
-  var this_0 = this.g1w_1;
+  var this_0 = this.i1w_1;
   var tmp_0;
   if (Companion_instance_1.vq(module_0)) {
     tmp_0 = this_0;
@@ -1216,26 +1216,26 @@ protoOf(JavaIrEmitter).zq = function (definition, module_0, logger) {
     tmp_0 = null;
   }
   var tmp$ret$1 = tmp_0;
-  return placeInPackage(prependImports(tmp, tmp$ret$1), this.i1v(), definition);
+  return placeInPackage(prependImports(tmp, tmp$ret$1), this.k1v(), definition);
 };
 protoOf(JavaIrEmitter).yp = function (type, module_0) {
-  return sanitizeNames(convertWithValidation(type, module_0), this.h1w_1);
+  return sanitizeNames(convertWithValidation(type, module_0), this.j1w_1);
 };
 protoOf(JavaIrEmitter).nr = function (enum_0, module_0) {
   var tmp = convert_0(enum_0);
   var tmp_0 = JavaIrEmitter$emit$lambda(this);
-  return sanitizeNames(injectEnumLabelField(tmp, tmp_0, JavaIrEmitter$emit$lambda_0), this.h1w_1);
+  return sanitizeNames(injectEnumLabelField(tmp, tmp_0, JavaIrEmitter$emit$lambda_0), this.j1w_1);
 };
 protoOf(JavaIrEmitter).dr = function (union) {
-  return sanitizeNames(convert_1(union), this.h1w_1);
+  return sanitizeNames(convert_1(union), this.j1w_1);
 };
 protoOf(JavaIrEmitter).ir = function (refined) {
-  return sanitizeNames(applyRefinedStructShape(convert_2(refined), refined), this.h1w_1);
+  return sanitizeNames(applyRefinedStructShape(convert_2(refined), refined), this.j1w_1);
 };
 protoOf(JavaIrEmitter).or = function (endpoint) {
-  var tmp = sanitizeNames(transformTypeDescriptors(injectApiField(injectHandleFunction(convert_3(endpoint), endpoint))), this.h1w_1);
+  var tmp = sanitizeNames(transformTypeDescriptors(injectApiField(injectHandleFunction(convert_3(endpoint), endpoint))), this.j1w_1);
   // Inline function 'kotlin.takeIf' call
-  var this_0 = buildModelImports(endpoint, this.i1v());
+  var this_0 = buildModelImports(endpoint, this.k1v());
   var tmp_0;
   // Inline function 'kotlin.collections.isNotEmpty' call
   if (!this_0.r()) {
@@ -1249,20 +1249,20 @@ protoOf(JavaIrEmitter).or = function (endpoint) {
 protoOf(JavaIrEmitter).cr = function (channel) {
   var tmp;
   if (channel.qo_1.l1() === channel.ro_1.l1()) {
-    tmp = this.i1v().rr_1 + '.model.';
+    tmp = this.k1v().rr_1 + '.model.';
   } else {
     tmp = '';
   }
   var fullyQualifiedPrefix = tmp;
-  return applyFunctionalInterface(sanitizeNames(convert_4(channel), this.h1w_1), fullyQualifiedPrefix);
+  return applyFunctionalInterface(sanitizeNames(convert_4(channel), this.j1w_1), fullyQualifiedPrefix);
 };
 protoOf(JavaIrEmitter).u1u = function (endpoint) {
-  var imports = buildModelImports(endpoint, this.i1v());
-  var endpointImport = import_0(this.i1v().rr_1 + '.endpoint', endpoint.ip_1.l1());
+  var imports = buildModelImports(endpoint, this.k1v());
+  var endpointImport = import_0(this.k1v().rr_1 + '.endpoint', endpoint.ip_1.l1());
   var endpointName = endpoint.ip_1.l1();
-  var file = wrapAsyncReturnInThenApply(transformTypeDescriptors(sanitizeNames(emitEndpointClient.call(this, endpoint), this.h1w_1)), endpointName);
-  var subPackageName = plus_0(this.i1v(), 'client');
-  return new File(Companion_getInstance().k1h(subPackageName.tr() + sanitizeSymbol_0(this, file.x1m_1.m1h())), plus_1(plus_1(plus_1(plus_1(listOf(new Package(subPackageName.rr_1)), this.g1w_1), imports), listOf(endpointImport)), file.y1m_1));
+  var file = wrapAsyncReturnInThenApply(transformTypeDescriptors(sanitizeNames(emitEndpointClient.call(this, endpoint), this.j1w_1)), endpointName);
+  var subPackageName = plus_0(this.k1v(), 'client');
+  return new File(Companion_getInstance().k1h(subPackageName.tr() + sanitizeSymbol_0(this, file.x1m_1.m1h())), plus_1(plus_1(plus_1(plus_1(listOf(new Package(subPackageName.rr_1)), this.i1w_1), imports), listOf(endpointImport)), file.y1m_1));
 };
 protoOf(JavaIrEmitter).t1u = function (endpoints, logger) {
   // Inline function 'kotlin.collections.flatMap' call
@@ -1324,7 +1324,7 @@ protoOf(JavaIrEmitter).t1u = function (endpoints, logger) {
   var _iterator__ex2g4s_3 = destination_0.t();
   while (_iterator__ex2g4s_3.u()) {
     var item = _iterator__ex2g4s_3.v();
-    var tmp$ret$10 = import_0(this.i1v().rr_1 + '.model', item.pu_1);
+    var tmp$ret$10 = import_0(this.k1v().rr_1 + '.model', item.pu_1);
     destination_1.x(tmp$ret$10);
   }
   var imports = destination_1;
@@ -1334,7 +1334,7 @@ protoOf(JavaIrEmitter).t1u = function (endpoints, logger) {
   var _iterator__ex2g4s_4 = endpoints.t();
   while (_iterator__ex2g4s_4.u()) {
     var item_0 = _iterator__ex2g4s_4.v();
-    var tmp$ret$13 = import_0(this.i1v().rr_1 + '.endpoint', item_0.ip_1.l1());
+    var tmp$ret$13 = import_0(this.k1v().rr_1 + '.endpoint', item_0.ip_1.l1());
     destination_2.x(tmp$ret$13);
   }
   var endpointImports = destination_2;
@@ -1344,13 +1344,13 @@ protoOf(JavaIrEmitter).t1u = function (endpoints, logger) {
   var _iterator__ex2g4s_5 = endpoints.t();
   while (_iterator__ex2g4s_5.u()) {
     var item_1 = _iterator__ex2g4s_5.v();
-    var tmp$ret$16 = import_0(this.i1v().rr_1 + '.client', item_1.ip_1.l1() + 'Client');
+    var tmp$ret$16 = import_0(this.k1v().rr_1 + '.client', item_1.ip_1.l1() + 'Client');
     destination_3.x(tmp$ret$16);
   }
   var clientImports = destination_3;
   var allImports = plus_1(plus_1(imports, endpointImports), clientImports);
-  var file = sanitizeNames(emitClient.call(this, endpoints, logger), this.h1w_1);
-  return new File(Companion_getInstance().k1h(this.i1v().tr() + sanitizeSymbol_0(this, file.x1m_1.m1h())), plus_1(plus_1(plus_1(listOf(new Package(this.i1v().rr_1)), this.g1w_1), allImports), file.y1m_1));
+  var file = sanitizeNames(emitClient.call(this, endpoints, logger), this.j1w_1);
+  return new File(Companion_getInstance().k1h(this.k1v().tr() + sanitizeSymbol_0(this, file.x1m_1.m1h())), plus_1(plus_1(plus_1(listOf(new Package(this.k1v().rr_1)), this.i1w_1), allImports), file.y1m_1));
 };
 function transformTypeDescriptors(_this__u8e3s4) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
@@ -1856,8 +1856,8 @@ function JavaRefinedTypeDefinitionEmitter() {
 }
 function JavaShared() {
   JavaShared_instance = this;
-  this.s1v_1 = 'community.flock.wirespec.java';
-  this.t1v_1 = trimMargin('\n        |package ' + this.s1v_1 + ';\n        |\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |import java.util.List;\n        |import java.util.Map;\n        |import java.util.Optional;\n        |\n        |public interface Wirespec {\n        |' + Spacer_instance.toString() + 'interface Enum { String label(); }\n        |' + Spacer_instance.toString() + 'interface Endpoint {}\n        |' + Spacer_instance.toString() + 'interface Refined<T> { T value(); }\n        |' + Spacer_instance.toString() + 'interface Path {}\n        |' + Spacer_instance.toString() + 'interface Queries {}\n        |' + Spacer_instance.toString() + 'interface Headers {}\n        |' + Spacer_instance.toString() + 'interface Handler {}\n        |' + Spacer_instance.toString() + 'interface ServerEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.vr(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.vr(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.vr(2) + 'String getMethod();\n        |' + Spacer_instance.vr(2) + 'ClientEdge<Req, Res> getClient(Serialization serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Server<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.vr(2) + 'String getMethod();\n        |' + Spacer_instance.vr(2) + 'ServerEdge<Req, Res> getServer(Serialization serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'enum Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + Spacer_instance.toString() + 'interface Request<T> { Path path(); Method method(); Queries queries(); Headers headers(); T body(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Response<T> { Integer status(); Headers headers(); T body(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Serialization extends Serializer, Deserializer {}\n        |' + Spacer_instance.toString() + 'interface Serializer extends BodySerializer, PathSerializer, ParamSerializer {}\n        |' + Spacer_instance.toString() + 'interface Deserializer extends BodyDeserializer, PathDeserializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface BodySerialization extends BodySerializer, BodyDeserializer {}\n        |' + Spacer_instance.toString() + 'interface BodySerializer { <T> byte[] serializeBody(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface BodyDeserializer { <T> T deserializeBody(byte[] raw, Type type); }\n        |' + Spacer_instance.toString() + 'interface PathSerialization extends PathSerializer, PathDeserializer {}\n        |' + Spacer_instance.toString() + 'interface PathSerializer { <T> String serializePath(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface PathDeserializer { <T> T deserializePath(String raw, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamSerialization extends ParamSerializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface ParamSerializer { <T> List<String> serializeParam(T value, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamDeserializer { <T> T deserializeParam(List<String> values, Type type); }\n        |' + Spacer_instance.toString() + 'record RawRequest(String method, List<String> path, Map<String, List<String>> queries, Map<String, List<String>> headers, Optional<byte[]> body) {}\n        |' + Spacer_instance.toString() + 'record RawResponse(int statusCode, Map<String, List<String>> headers, Optional<byte[]> body) {}\n        |' + Spacer_instance.toString() + 'static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n        |' + Spacer_instance.vr(2) + 'if(rawType != null) {\n        |' + Spacer_instance.vr(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.vr(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.vr(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.vr(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.vr(3) + '};\n        |' + Spacer_instance.vr(2) + '}\n        |' + Spacer_instance.vr(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
+  this.u1v_1 = 'community.flock.wirespec.java';
+  this.v1v_1 = trimMargin('\n        |package ' + this.u1v_1 + ';\n        |\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |import java.util.List;\n        |import java.util.Map;\n        |import java.util.Optional;\n        |\n        |public interface Wirespec {\n        |' + Spacer_instance.toString() + 'interface Enum { String label(); }\n        |' + Spacer_instance.toString() + 'interface Endpoint {}\n        |' + Spacer_instance.toString() + 'interface Refined<T> { T value(); }\n        |' + Spacer_instance.toString() + 'interface Path {}\n        |' + Spacer_instance.toString() + 'interface Queries {}\n        |' + Spacer_instance.toString() + 'interface Headers {}\n        |' + Spacer_instance.toString() + 'interface Handler {}\n        |' + Spacer_instance.toString() + 'interface ServerEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'Req from(RawRequest request);\n        |' + Spacer_instance.vr(2) + 'RawResponse to(Res response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface ClientEdge<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'RawRequest to(Req request);\n        |' + Spacer_instance.vr(2) + 'Res from(RawResponse response);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Client<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.vr(2) + 'String getMethod();\n        |' + Spacer_instance.vr(2) + 'ClientEdge<Req, Res> getClient(Serialization serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'interface Server<Req extends Request<?>, Res extends Response<?>> {\n        |' + Spacer_instance.vr(2) + 'String getPathTemplate();\n        |' + Spacer_instance.vr(2) + 'String getMethod();\n        |' + Spacer_instance.vr(2) + 'ServerEdge<Req, Res> getServer(Serialization serialization);\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + 'enum Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + Spacer_instance.toString() + 'interface Request<T> { Path path(); Method method(); Queries queries(); Headers headers(); T body(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Response<T> { Integer status(); Headers headers(); T body(); interface Headers extends Wirespec.Headers {} }\n        |' + Spacer_instance.toString() + 'interface Serialization extends Serializer, Deserializer {}\n        |' + Spacer_instance.toString() + 'interface Serializer extends BodySerializer, PathSerializer, ParamSerializer {}\n        |' + Spacer_instance.toString() + 'interface Deserializer extends BodyDeserializer, PathDeserializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface BodySerialization extends BodySerializer, BodyDeserializer {}\n        |' + Spacer_instance.toString() + 'interface BodySerializer { <T> byte[] serializeBody(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface BodyDeserializer { <T> T deserializeBody(byte[] raw, Type type); }\n        |' + Spacer_instance.toString() + 'interface PathSerialization extends PathSerializer, PathDeserializer {}\n        |' + Spacer_instance.toString() + 'interface PathSerializer { <T> String serializePath(T t, Type type); }\n        |' + Spacer_instance.toString() + 'interface PathDeserializer { <T> T deserializePath(String raw, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamSerialization extends ParamSerializer, ParamDeserializer {}\n        |' + Spacer_instance.toString() + 'interface ParamSerializer { <T> List<String> serializeParam(T value, Type type); }\n        |' + Spacer_instance.toString() + 'interface ParamDeserializer { <T> T deserializeParam(List<String> values, Type type); }\n        |' + Spacer_instance.toString() + 'record RawRequest(String method, List<String> path, Map<String, List<String>> queries, Map<String, List<String>> headers, Optional<byte[]> body) {}\n        |' + Spacer_instance.toString() + 'record RawResponse(int statusCode, Map<String, List<String>> headers, Optional<byte[]> body) {}\n        |' + Spacer_instance.toString() + 'static Type getType(final Class<?> actualTypeArguments, final Class<?> rawType) {\n        |' + Spacer_instance.vr(2) + 'if(rawType != null) {\n        |' + Spacer_instance.vr(3) + 'return new ParameterizedType() {\n        |' + Spacer_instance.vr(4) + 'public Type getRawType() { return rawType; }\n        |' + Spacer_instance.vr(4) + 'public Type[] getActualTypeArguments() { return new Class<?>[]{actualTypeArguments}; }\n        |' + Spacer_instance.vr(4) + 'public Type getOwnerType() { return null; }\n        |' + Spacer_instance.vr(3) + '};\n        |' + Spacer_instance.vr(2) + '}\n        |' + Spacer_instance.vr(2) + 'else { return actualTypeArguments; }\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n        ');
 }
 protoOf(JavaShared).toString = function () {
   return 'JavaShared';
@@ -1982,18 +1982,18 @@ protoOf(JavaEmitter).aq = emit_5;
 protoOf(JavaEmitter).bq = emit_6;
 protoOf(JavaEmitter).cq = emit_7;
 protoOf(JavaEmitter).or = emit_9;
-protoOf(JavaEmitter).v1v = emit_10;
-protoOf(JavaEmitter).w1v = emit_11;
+protoOf(JavaEmitter).x1v = emit_10;
+protoOf(JavaEmitter).y1v = emit_11;
 protoOf(JavaEmitter).cr = emit_8;
 protoOf(JavaEmitter).nr = emit_13;
 protoOf(JavaEmitter).dr = emit_15;
 protoOf(JavaEmitter).ir = emit_14;
-protoOf(JavaEmitter).u1v = sanitizeSymbol;
-protoOf(JavaEmitter).x1v = sanitizeFirstIsDigit;
-protoOf(JavaEmitter).y1v = sanitizeKeywords;
-protoOf(JavaEmitter).k1v = emitRoot;
-protoOf(JavaEmitter).j1v = emitRoot$default;
-protoOf(JavaEmitter).z1v = emitHandleFunction;
+protoOf(JavaEmitter).w1v = sanitizeSymbol;
+protoOf(JavaEmitter).z1v = sanitizeFirstIsDigit;
+protoOf(JavaEmitter).a1w = sanitizeKeywords;
+protoOf(JavaEmitter).m1v = emitRoot;
+protoOf(JavaEmitter).l1v = emitRoot$default;
+protoOf(JavaEmitter).b1w = emitHandleFunction;
 protoOf(JavaEmitter).pr = emitValidator;
 protoOf(JavaIrEmitter).sn = emit_1;
 protoOf(JavaIrEmitter).r1u = emit_2;