@flock/wirespec 0.18.13 → 0.18.14

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@flock/wirespec",
-  "version": "0.18.13",
+  "version": "0.18.14",
   "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-core.mjs

@@ -183,7 +183,7 @@ initMetadataForClass(ParamType, 'ParamType', VOID, Enum);
 initMetadataForClass(Param, 'Param');
 initMetadataForClass(FileExtension, 'FileExtension', VOID, Enum);
 initMetadataForCompanion(Companion_0);
-initMetadataForClass(LanguageEmitter, 'LanguageEmitter', VOID, VOID, [TypeDefinitionEmitter, NotYetImplemented]);
+initMetadataForClass(LanguageEmitter, 'LanguageEmitter', VOID, VOID, [NotYetImplemented, TypeDefinitionEmitter]);
 initMetadataForCompanion(Companion_1);
 initMetadataForClass(PackageName, 'PackageName');
 initMetadataForObject(Spacer, 'Spacer');

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

@@ -275,7 +275,107 @@ 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    ');
 }
 initMetadataForInterface(JavaChannelDefinitionEmitter, 'JavaChannelDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_9(endpoint) {
+function emit_9(refined) {
+  return trimMargin('\n        |public record ' + this.br(refined.gr_1) + ' (' + this.bq(refined.hr_1) + ' value) implements Wirespec.Refined<' + this.bq(refined.hr_1) + '> {\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() { return value.toString(); }\n        |' + Spacer_instance.toString() + 'public boolean validate() {\n        |' + Spacer_instance.toString() + Spacer_instance.toString() + this.pr(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public ' + this.bq(refined.hr_1) + ' value() { return value; }\n        |}\n        |\n    ');
+}
+function emitValidator(_this__u8e3s4) {
+  var defaultReturn = 'return true;';
+  var type = _this__u8e3s4.hr_1.tu_1;
+  var tmp;
+  if (type instanceof Integer) {
+    var tmp0_safe_receiver = type.yt_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.cq(tmp0_safe_receiver);
+    tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
+  } else {
+    if (type instanceof Number_0) {
+      var tmp2_safe_receiver = type.bu_1;
+      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.cq(tmp2_safe_receiver);
+      tmp = tmp3_elvis_lhs == null ? defaultReturn : tmp3_elvis_lhs;
+    } else {
+      if (type instanceof String_0) {
+        var tmp4_safe_receiver = type.vt_1;
+        var tmp_0;
+        var tmp_1 = tmp4_safe_receiver;
+        if ((tmp_1 == null ? null : new RegExp_0(tmp_1)) == null) {
+          tmp_0 = null;
+        } else {
+          tmp_0 = this.cq(new RegExp_0(tmp4_safe_receiver));
+        }
+        var tmp5_elvis_lhs = tmp_0;
+        tmp = tmp5_elvis_lhs == null ? defaultReturn : tmp5_elvis_lhs;
+      } else {
+        if (equals(type, Boolean_instance)) {
+          tmp = defaultReturn;
+        } else {
+          if (equals(type, Bytes_instance)) {
+            tmp = defaultReturn;
+          } else {
+            noWhenBranchMatchedException();
+          }
+        }
+      }
+    }
+  }
+  return tmp;
+}
+initMetadataForInterface(JavaRefinedTypeDefinitionEmitter, 'JavaRefinedTypeDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
+function emit_10(identifier) {
+  var tmp;
+  if (identifier instanceof DefinitionIdentifier) {
+    tmp = this.u1v(identifier.l1());
+  } else {
+    if (identifier instanceof FieldIdentifier) {
+      tmp = this.y1v(this.u1v(identifier.l1()));
+    } 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 _iterator__ex2g4s = this_0.t();
+  while (_iterator__ex2g4s.u()) {
+    var item = _iterator__ex2g4s.v();
+    var _unary__edvuaz = index;
+    index = _unary__edvuaz + 1 | 0;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.sq(item) : item;
+    destination.x(tmp$ret$0);
+  }
+  var tmp = asSequence(joinToString(destination, ''));
+  return this.x1v(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_0().a1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
+}
+initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
+function emit_11(enum_0, module_0) {
+  var tmp = this.br(enum_0.lr_1);
+  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.mr_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.br(enum_0.lr_1) + '(String label) {\n        |' + Spacer_instance.vr(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.vr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String label() {\n        |' + Spacer_instance.vr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
+}
+initMetadataForInterface(JavaEnumDefinitionEmitter, 'JavaEnumDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
+function emit_12(endpoint) {
   var tmp = emitImports_0(this, endpoint);
   var tmp_0 = this.br(endpoint.ip_1);
   var tmp_1 = get_pathParams(endpoint);
@@ -307,10 +407,10 @@ function emit_9(endpoint) {
 function emitHandleFunction(endpoint) {
   return 'java.util.concurrent.CompletableFuture<Response<?>> ' + Companion_instance_1.tq(this.br(endpoint.ip_1)) + '(Request request);';
 }
-function emit_10(_this__u8e3s4, endpoint) {
+function emit_13(_this__u8e3s4, endpoint) {
   return trimMargin('\n        |' + Spacer_instance.toString() + 'record Request (\n        |' + Spacer_instance.vr(2) + 'Path path,\n        |' + Spacer_instance.vr(2) + 'Wirespec.Method method,\n        |' + Spacer_instance.vr(2) + 'Queries queries,\n        |' + Spacer_instance.vr(2) + 'RequestHeaders headers,\n        |' + Spacer_instance.vr(2) + emit_16(this, _this__u8e3s4.rp_1) + ' body\n        |' + Spacer_instance.toString() + ') implements Wirespec.Request<' + emit_16(this, _this__u8e3s4.rp_1) + '> {\n        |' + Spacer_instance.vr(2) + emitConstructor(this, _this__u8e3s4, endpoint) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 }
-function emit_11(_this__u8e3s4) {
+function emit_14(_this__u8e3s4) {
   var tmp = Spacer_instance.toString();
   var tmp_0 = Companion_instance_1.sq(_this__u8e3s4.up_1);
   var tmp_1 = Spacer_instance.vr(2);
@@ -343,112 +443,12 @@ function emit_11(_this__u8e3s4) {
   return trimMargin('\n        |' + tmp + 'record Response' + tmp_0 + '(\n        |' + tmp_1 + 'Integer status,\n        |' + tmp_2 + 'Headers headers,\n        |' + tmp_3 + tmp_4 + ' body\n        |' + tmp_5 + ') implements Response' + tmp_6 + 'XX<' + tmp_7 + '>, Response' + tmp_8 + ' {\n        |' + tmp_9 + 'public Response' + tmp_10 + '(' + tmp_13 + ') {\n        |' + tmp_14 + 'this(' + tmp_15 + ', ' + tmp_16 + ', ' + tmp_17 + ');\n        |' + tmp_18 + '}\n        |' + tmp_19 + emitObject(this, _this__u8e3s4.vp_1, 'Headers', 'Wirespec.Response.Headers', JavaEndpointDefinitionEmitter$emit$lambda_7(this)) + '\n        |' + Spacer_instance.toString() + '}\n    ');
 }
 initMetadataForInterface(JavaEndpointDefinitionEmitter, 'JavaEndpointDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
-function emit_12(identifier) {
-  var tmp;
-  if (identifier instanceof DefinitionIdentifier) {
-    tmp = this.u1v(identifier.l1());
-  } else {
-    if (identifier instanceof FieldIdentifier) {
-      tmp = this.y1v(this.u1v(identifier.l1()));
-    } 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 _iterator__ex2g4s = this_0.t();
-  while (_iterator__ex2g4s.u()) {
-    var item = _iterator__ex2g4s.v();
-    var _unary__edvuaz = index;
-    index = _unary__edvuaz + 1 | 0;
-    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance_1.sq(item) : item;
-    destination.x(tmp$ret$0);
-  }
-  var tmp = asSequence(joinToString(destination, ''));
-  return this.x1v(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_0().a1w_1.u1(_this__u8e3s4) ? '_' + _this__u8e3s4 : _this__u8e3s4;
-}
-initMetadataForInterface(JavaIdentifierEmitter, 'JavaIdentifierEmitter');
-function emit_13(enum_0, module_0) {
-  var tmp = this.br(enum_0.lr_1);
-  return trimMargin('\n        |public enum ' + tmp + ' implements Wirespec.Enum {\n        |' + spacer(joinToString(enum_0.mr_1, ',\n', VOID, VOID, VOID, VOID, JavaEnumDefinitionEmitter$emit$lambda(this))) + ';\n        |' + Spacer_instance.toString() + 'public final String label;\n        |' + Spacer_instance.toString() + this.br(enum_0.lr_1) + '(String label) {\n        |' + Spacer_instance.vr(2) + 'this.label = label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() {\n        |' + Spacer_instance.vr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String label() {\n        |' + Spacer_instance.vr(2) + 'return label;\n        |' + Spacer_instance.toString() + '}\n        |}\n        |\n    ');
-}
-initMetadataForInterface(JavaEnumDefinitionEmitter, 'JavaEnumDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-function emit_14(refined) {
-  return trimMargin('\n        |public record ' + this.br(refined.gr_1) + ' (' + this.bq(refined.hr_1) + ' value) implements Wirespec.Refined<' + this.bq(refined.hr_1) + '> {\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public String toString() { return value.toString(); }\n        |' + Spacer_instance.toString() + 'public boolean validate() {\n        |' + Spacer_instance.toString() + Spacer_instance.toString() + this.pr(refined) + '\n        |' + Spacer_instance.toString() + '}\n        |' + Spacer_instance.toString() + '@Override\n        |' + Spacer_instance.toString() + 'public ' + this.bq(refined.hr_1) + ' value() { return value; }\n        |}\n        |\n    ');
-}
-function emitValidator(_this__u8e3s4) {
-  var defaultReturn = 'return true;';
-  var type = _this__u8e3s4.hr_1.tu_1;
-  var tmp;
-  if (type instanceof Integer) {
-    var tmp0_safe_receiver = type.yt_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.cq(tmp0_safe_receiver);
-    tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
-  } else {
-    if (type instanceof Number_0) {
-      var tmp2_safe_receiver = type.bu_1;
-      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.cq(tmp2_safe_receiver);
-      tmp = tmp3_elvis_lhs == null ? defaultReturn : tmp3_elvis_lhs;
-    } else {
-      if (type instanceof String_0) {
-        var tmp4_safe_receiver = type.vt_1;
-        var tmp_0;
-        var tmp_1 = tmp4_safe_receiver;
-        if ((tmp_1 == null ? null : new RegExp_0(tmp_1)) == null) {
-          tmp_0 = null;
-        } else {
-          tmp_0 = this.cq(new RegExp_0(tmp4_safe_receiver));
-        }
-        var tmp5_elvis_lhs = tmp_0;
-        tmp = tmp5_elvis_lhs == null ? defaultReturn : tmp5_elvis_lhs;
-      } else {
-        if (equals(type, Boolean_instance)) {
-          tmp = defaultReturn;
-        } else {
-          if (equals(type, Bytes_instance)) {
-            tmp = defaultReturn;
-          } else {
-            noWhenBranchMatchedException();
-          }
-        }
-      }
-    }
-  }
-  return tmp;
-}
-initMetadataForInterface(JavaRefinedTypeDefinitionEmitter, 'JavaRefinedTypeDefinitionEmitter', VOID, VOID, [JavaTypeDefinitionEmitter]);
 function emit_15(union) {
   var tmp = this.br(union.uo_1);
   return trimMargin('\n        |public sealed interface ' + tmp + ' permits ' + joinToString(union.vo_1, VOID, VOID, VOID, VOID, VOID, JavaUnionDefinitionEmitter$emit$lambda) + ' {}\n        |\n    ');
 }
 initMetadataForInterface(JavaUnionDefinitionEmitter, 'JavaUnionDefinitionEmitter', VOID, VOID, [JavaIdentifierEmitter]);
-initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaEndpointDefinitionEmitter, JavaEnumDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, JavaUnionDefinitionEmitter, JavaTypeDefinitionEmitter, JavaIdentifierEmitter, JavaChannelDefinitionEmitter, LanguageEmitter]);
+initMetadataForClass(JavaEmitter, 'JavaEmitter', JavaEmitter, LanguageEmitter, [JavaChannelDefinitionEmitter, JavaRefinedTypeDefinitionEmitter, JavaEnumDefinitionEmitter, JavaEndpointDefinitionEmitter, JavaTypeDefinitionEmitter, JavaIdentifierEmitter, JavaUnionDefinitionEmitter, LanguageEmitter]);
 initMetadataForCompanion(Companion);
 initMetadataForCompanion(Companion_0);
 initMetadataForClass(JavaIrEmitter, 'JavaIrEmitter', JavaIrEmitter, VOID, [IrEmitter]);
@@ -1975,19 +1975,19 @@ function JavaUnionDefinitionEmitter$emit$lambda(it) {
 function JavaUnionDefinitionEmitter() {
 }
 //region block: post-declaration
-protoOf(JavaEmitter).br = emit_12;
+protoOf(JavaEmitter).br = emit_10;
 protoOf(JavaEmitter).yp = emit_3;
 protoOf(JavaEmitter).zp = emit_4;
 protoOf(JavaEmitter).aq = emit_5;
 protoOf(JavaEmitter).bq = emit_6;
 protoOf(JavaEmitter).cq = emit_7;
-protoOf(JavaEmitter).or = emit_9;
-protoOf(JavaEmitter).v1v = emit_10;
-protoOf(JavaEmitter).w1v = emit_11;
+protoOf(JavaEmitter).or = emit_12;
+protoOf(JavaEmitter).v1v = emit_13;
+protoOf(JavaEmitter).w1v = emit_14;
 protoOf(JavaEmitter).cr = emit_8;
-protoOf(JavaEmitter).nr = emit_13;
+protoOf(JavaEmitter).nr = emit_11;
 protoOf(JavaEmitter).dr = emit_15;
-protoOf(JavaEmitter).ir = emit_14;
+protoOf(JavaEmitter).ir = emit_9;
 protoOf(JavaEmitter).u1v = sanitizeSymbol;
 protoOf(JavaEmitter).x1v = sanitizeFirstIsDigit;
 protoOf(JavaEmitter).y1v = sanitizeKeywords;