npm - @flock/wirespec - Versions diffs - 0.7.4 → 0.7.6 - Mend

@flock/wirespec 0.7.4 → 0.7.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/kotlin/wirespec-core.js CHANGED Viewed

@@ -89,37 +89,37 @@
   setMetadataFor(Reported, 'Reported', classMeta, Enum);
   setMetadataFor(Wirespec, 'Wirespec', objectMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Type', block);
+    return logger.dl('Emitting Definition: Type', block);
   }
   function withLogging_0(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Type Shape', block);
+    return logger.dl('Emitting Definition: Type Shape', block);
   }
   function withLogging_1(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Type Shape Field', block);
+    return logger.dl('Emitting Definition: Type Shape Field', block);
   }
   function withLogging_2(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Type Shape Field Key', block);
+    return logger.dl('Emitting Definition: Type Shape Field Key', block);
   }
   function withLogging_3(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Type Shape Field Value', block);
+    return logger.dl('Emitting Definition: Type Shape Field Value', block);
   }
   setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_4(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Endpoint', block);
+    return logger.dl('Emitting Definition: Endpoint', block);
   }
   setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_5(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Refined', block);
+    return logger.dl('Emitting Definition: Refined', block);
   }
   function withLogging_6(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Refined Validator', block);
+    return logger.dl('Emitting Definition: Refined Validator', block);
   }
   setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_7(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Endpoint', block);
+    return logger.dl('Emitting Definition: Endpoint', block);
   }
   function withLogging_8(_this__u8e3s4, logger, block) {
-    return logger.zk('Emitting Definition: Endpoint Segment', block);
+    return logger.dl('Emitting Definition: Endpoint Segment', block);
   }
   setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
   setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [TypeDefinitionEmitterLogger, EnumDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger, EndpointDefinitionEmitterLogger]);
@@ -388,15 +388,18 @@
       new Wirespec();
     return Wirespec_instance;
   }
+  function imprt($this, ast) {
+    return !Companion_getInstance_2().xh(ast) ? '' : 'import community.flock.wirespec.java.Wirespec;\n\n';
+  }
   function emitPrimaryType(_this__u8e3s4, $this) {
-    return $this.wh(_this__u8e3s4, $this.rh_1, JavaEmitter$emitPrimaryType$lambda(_this__u8e3s4));
+    return $this.yh(_this__u8e3s4, $this.rh_1, JavaEmitter$emitPrimaryType$lambda(_this__u8e3s4));
   }
   function emit(_this__u8e3s4, $this, endpoint) {
     Companion_getInstance_2();
-    var tmp = emitContentType(_this__u8e3s4.xh_1, $this);
-    var tmp0_safe_receiver = _this__u8e3s4.xh_1;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zh_1;
-    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.fi(tmp1_safe_receiver);
+    var tmp = emitContentType(_this__u8e3s4.zh_1, $this);
+    var tmp0_safe_receiver = _this__u8e3s4.zh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.bi_1;
+    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.hi(tmp1_safe_receiver);
     var tmp_0 = tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
     Companion_getInstance_2();
     Companion_getInstance_2();
@@ -408,33 +411,33 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp3_safe_receiver = _this__u8e3s4.xh_1;
-    var tmp4_safe_receiver = tmp3_safe_receiver == null ? null : tmp3_safe_receiver.zh_1;
-    var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : $this.fi(tmp4_safe_receiver);
+    var tmp3_safe_receiver = _this__u8e3s4.zh_1;
+    var tmp4_safe_receiver = tmp3_safe_receiver == null ? null : tmp3_safe_receiver.bi_1;
+    var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : $this.hi(tmp4_safe_receiver);
     var tmp_1 = tmp5_elvis_lhs == null ? 'Void' : tmp5_elvis_lhs;
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_2 = emitContentType(_this__u8e3s4.xh_1, $this);
-    var tmp_3 = emitRequestSignature(endpoint, $this, _this__u8e3s4.xh_1);
+    var tmp_2 = emitContentType(_this__u8e3s4.zh_1, $this);
+    var tmp_3 = emitRequestSignature(endpoint, $this, _this__u8e3s4.zh_1);
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_4 = emitPath(endpoint.ii_1, $this);
+    var tmp_4 = emitPath(endpoint.ki_1, $this);
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_5 = emitMap(endpoint.ji_1, $this);
+    var tmp_5 = emitMap(endpoint.li_1, $this);
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_6 = emitMap(endpoint.ki_1, $this);
+    var tmp_6 = emitMap(endpoint.mi_1, $this);
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp6_safe_receiver = _this__u8e3s4.xh_1;
+    var tmp6_safe_receiver = _this__u8e3s4.zh_1;
     var tmp_7;
     if (tmp6_safe_receiver == null) {
       tmp_7 = null;
@@ -444,7 +447,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-      tmp$ret$0 = 'new WirespecShared.Content("' + tmp6_safe_receiver.yh_1 + '", body)';
+      tmp$ret$0 = 'new Wirespec.Content("' + tmp6_safe_receiver.ai_1 + '", body)';
       tmp$ret$1 = tmp$ret$0;
       tmp_7 = tmp$ret$1;
     }
@@ -462,20 +465,20 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp8_safe_receiver = _this__u8e3s4.xh_1;
-    var tmp9_safe_receiver = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.zh_1;
-    var tmp10_elvis_lhs = tmp9_safe_receiver == null ? null : $this.fi(tmp9_safe_receiver);
+    var tmp8_safe_receiver = _this__u8e3s4.zh_1;
+    var tmp9_safe_receiver = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.bi_1;
+    var tmp10_elvis_lhs = tmp9_safe_receiver == null ? null : $this.hi(tmp9_safe_receiver);
     var tmp_9 = tmp10_elvis_lhs == null ? 'Void' : tmp10_elvis_lhs;
     Companion_getInstance_2();
-    return trimMargin('\n        |' + '  ' + 'class Request' + tmp + ' implements Request<' + tmp_0 + '> {\n        |' + '  ' + '  ' + 'private final String path;\n        |' + '  ' + '  ' + 'private final WirespecShared.Method method;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> query;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> headers;\n        |' + '  ' + '  ' + 'private final WirespecShared.Content<' + tmp_1 + '> content;\n        |' + '  ' + '  ' + 'public Request' + tmp_2 + '(' + tmp_3 + ') {\n        |' + '  ' + '  ' + '  ' + 'this.path = ' + tmp_4 + ';\n        |' + '  ' + '  ' + '  ' + 'this.method = WirespecShared.Method.' + endpoint.hi_1.p4_1 + ';\n        |' + '  ' + '  ' + '  ' + 'this.query = ' + tmp_5 + ';\n        |' + '  ' + '  ' + '  ' + 'this.headers = ' + tmp_6 + ';\n        |' + '  ' + '  ' + '  ' + 'this.content = ' + tmp_8 + ';\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '@Override public String getPath() {return path;}\n        |' + '  ' + '  ' + '@Override public WirespecShared.Method getMethod() {return method;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getQuery() {return query;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getHeaders() {return headers;}\n        |' + '  ' + '  ' + '@Override public WirespecShared.Content<' + tmp_9 + '> getContent() {return content;}\n        |' + '  ' + '}\n    ');
+    return trimMargin('\n        |' + '  ' + 'class Request' + tmp + ' implements Request<' + tmp_0 + '> {\n        |' + '  ' + '  ' + 'private final String path;\n        |' + '  ' + '  ' + 'private final Wirespec.Method method;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> query;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> headers;\n        |' + '  ' + '  ' + 'private final Wirespec.Content<' + tmp_1 + '> content;\n        |' + '  ' + '  ' + 'public Request' + tmp_2 + '(' + tmp_3 + ') {\n        |' + '  ' + '  ' + '  ' + 'this.path = ' + tmp_4 + ';\n        |' + '  ' + '  ' + '  ' + 'this.method = Wirespec.Method.' + endpoint.ji_1.p4_1 + ';\n        |' + '  ' + '  ' + '  ' + 'this.query = ' + tmp_5 + ';\n        |' + '  ' + '  ' + '  ' + 'this.headers = ' + tmp_6 + ';\n        |' + '  ' + '  ' + '  ' + 'this.content = ' + tmp_8 + ';\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '@Override public String getPath() {return path;}\n        |' + '  ' + '  ' + '@Override public Wirespec.Method getMethod() {return method;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getQuery() {return query;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getHeaders() {return headers;}\n        |' + '  ' + '  ' + '@Override public Wirespec.Content<' + tmp_9 + '> getContent() {return content;}\n        |' + '  ' + '}\n    ');
   }
   function emit_0(_this__u8e3s4, $this) {
     Companion_getInstance_2();
-    var tmp = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
-    var tmp_0 = emitContentType(_this__u8e3s4.pi_1, $this);
+    var tmp = Companion_getInstance_2().si(_this__u8e3s4.qi_1);
+    var tmp_0 = emitContentType(_this__u8e3s4.ri_1, $this);
     var tmp$ret$1;
     // Inline function 'kotlin.takeIf' call
-    var tmp0_takeIf = _this__u8e3s4.oi_1;
+    var tmp0_takeIf = _this__u8e3s4.qi_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp_1;
     var tmp$ret$0;
@@ -489,9 +492,9 @@
     tmp$ret$1 = tmp_1;
     var tmp0_safe_receiver = tmp$ret$1;
     var tmp_2 = orEmptyString(tmp0_safe_receiver == null ? null : groupStatus(tmp0_safe_receiver, $this), $this);
-    var tmp1_safe_receiver = _this__u8e3s4.pi_1;
-    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.zh_1;
-    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : $this.fi(tmp2_safe_receiver);
+    var tmp1_safe_receiver = _this__u8e3s4.ri_1;
+    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.bi_1;
+    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : $this.hi(tmp2_safe_receiver);
     var tmp_3 = tmp3_elvis_lhs == null ? 'Void' : tmp3_elvis_lhs;
     Companion_getInstance_2();
     Companion_getInstance_2();
@@ -499,17 +502,17 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp4_safe_receiver = _this__u8e3s4.pi_1;
-    var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.zh_1;
-    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : $this.fi(tmp5_safe_receiver);
+    var tmp4_safe_receiver = _this__u8e3s4.ri_1;
+    var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.bi_1;
+    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : $this.hi(tmp5_safe_receiver);
     var tmp_4 = tmp6_elvis_lhs == null ? 'Void' : tmp6_elvis_lhs;
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_5 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
-    var tmp_6 = emitContentType(_this__u8e3s4.pi_1, $this);
+    var tmp_5 = Companion_getInstance_2().si(_this__u8e3s4.qi_1);
+    var tmp_6 = emitContentType(_this__u8e3s4.ri_1, $this);
     var tmp$ret$3;
     // Inline function 'kotlin.takeIf' call
-    var tmp1_takeIf = _this__u8e3s4.oi_1;
+    var tmp1_takeIf = _this__u8e3s4.qi_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp_7;
     var tmp$ret$2;
@@ -536,7 +539,7 @@
       tmp_8 = tmp$ret$5;
     }
     var tmp_9 = orEmptyString(tmp_8, $this);
-    var tmp8_safe_receiver = _this__u8e3s4.pi_1;
+    var tmp8_safe_receiver = _this__u8e3s4.ri_1;
     var tmp_10;
     if (tmp8_safe_receiver == null) {
       tmp_10 = null;
@@ -546,7 +549,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$6;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-      tmp$ret$6 = ', ' + $this.fi(tmp8_safe_receiver.zh_1) + ' body';
+      tmp$ret$6 = ', ' + $this.hi(tmp8_safe_receiver.bi_1) + ' body';
       tmp$ret$7 = tmp$ret$6;
       tmp_10 = tmp$ret$7;
     }
@@ -557,7 +560,7 @@
     Companion_getInstance_2();
     var tmp$ret$9;
     // Inline function 'kotlin.takeIf' call
-    var tmp2_takeIf = _this__u8e3s4.oi_1;
+    var tmp2_takeIf = _this__u8e3s4.qi_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp_12;
     var tmp$ret$8;
@@ -577,7 +580,7 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp11_safe_receiver = _this__u8e3s4.pi_1;
+    var tmp11_safe_receiver = _this__u8e3s4.ri_1;
     var tmp_14;
     if (tmp11_safe_receiver == null) {
       tmp_14 = null;
@@ -587,7 +590,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$10;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-      tmp$ret$10 = 'new WirespecShared.Content("' + tmp11_safe_receiver.yh_1 + '", body)';
+      tmp$ret$10 = 'new Wirespec.Content("' + tmp11_safe_receiver.ai_1 + '", body)';
       tmp$ret$11 = tmp$ret$10;
       tmp_14 = tmp$ret$11;
     }
@@ -601,12 +604,12 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp13_safe_receiver = _this__u8e3s4.pi_1;
-    var tmp14_safe_receiver = tmp13_safe_receiver == null ? null : tmp13_safe_receiver.zh_1;
-    var tmp15_elvis_lhs = tmp14_safe_receiver == null ? null : $this.fi(tmp14_safe_receiver);
+    var tmp13_safe_receiver = _this__u8e3s4.ri_1;
+    var tmp14_safe_receiver = tmp13_safe_receiver == null ? null : tmp13_safe_receiver.bi_1;
+    var tmp15_elvis_lhs = tmp14_safe_receiver == null ? null : $this.hi(tmp14_safe_receiver);
     var tmp_16 = tmp15_elvis_lhs == null ? 'Void' : tmp15_elvis_lhs;
     Companion_getInstance_2();
-    return trimMargin('\n        |' + '  ' + 'class Response' + tmp + tmp_0 + ' implements Response' + tmp_2 + '<' + tmp_3 + '> {\n        |' + '  ' + '  ' + 'private final int status;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> headers;\n        |' + '  ' + '  ' + 'private final WirespecShared.Content<' + tmp_4 + '> content;\n        |' + '  ' + '  ' + 'public Response' + tmp_5 + tmp_6 + '(' + tmp_9 + 'java.util.Map<String, java.util.List<Object>> headers' + tmp_11 + ') {\n        |' + '  ' + '  ' + '  ' + 'this.status = ' + tmp_13 + ';\n        |' + '  ' + '  ' + '  ' + 'this.headers = headers;\n        |' + '  ' + '  ' + '  ' + 'this.content = ' + tmp_15 + ';\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '@Override public int getStatus() {return status;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getHeaders() {return headers;}\n        |' + '  ' + '  ' + '@Override public WirespecShared.Content<' + tmp_16 + '> getContent() {return content;}\n        |' + '  ' + '}\n        ');
+    return trimMargin('\n        |' + '  ' + 'class Response' + tmp + tmp_0 + ' implements Response' + tmp_2 + '<' + tmp_3 + '> {\n        |' + '  ' + '  ' + 'private final int status;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> headers;\n        |' + '  ' + '  ' + 'private final Wirespec.Content<' + tmp_4 + '> content;\n        |' + '  ' + '  ' + 'public Response' + tmp_5 + tmp_6 + '(' + tmp_9 + 'java.util.Map<String, java.util.List<Object>> headers' + tmp_11 + ') {\n        |' + '  ' + '  ' + '  ' + 'this.status = ' + tmp_13 + ';\n        |' + '  ' + '  ' + '  ' + 'this.headers = headers;\n        |' + '  ' + '  ' + '  ' + 'this.content = ' + tmp_15 + ';\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '@Override public int getStatus() {return status;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getHeaders() {return headers;}\n        |' + '  ' + '  ' + '@Override public Wirespec.Content<' + tmp_16 + '> getContent() {return content;}\n        |' + '  ' + '}\n        ');
   }
   function emitResponseMapper(_this__u8e3s4, $this) {
     Companion_getInstance_2();
@@ -619,8 +622,8 @@
       var e = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver = e.pi_1;
-      tmp$ret$0 = to(e.oi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1);
+      var tmp0_safe_receiver = e.ri_1;
+      tmp$ret$0 = to(e.qi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.ai_1);
       var key = tmp$ret$0;
       if (set.a(key)) {
         list.a(e);
@@ -632,10 +635,10 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    return trimMargin('\n        |' + '  ' + 'static <B> Response RESPONSE_MAPPER(WirespecShared.ContentMapper<B> contentMapper, int status, java.util.Map<String, java.util.List<Object>> headers, WirespecShared.Content<B> content) {\n        |' + tmp_0 + '\n        |' + '  ' + '  ' + 'throw new IllegalStateException("Unknown response type");\n        |' + '  ' + '}\n    ');
+    return trimMargin('\n        |' + '  ' + 'static <B> Response RESPONSE_MAPPER(Wirespec.ContentMapper<B> contentMapper, int status, java.util.Map<String, java.util.List<Object>> headers, Wirespec.Content<B> content) {\n        |' + tmp_0 + '\n        |' + '  ' + '  ' + 'throw new IllegalStateException("Unknown response type");\n        |' + '  ' + '}\n    ');
   }
   function emitResponseMapperCondition(_this__u8e3s4, $this) {
-    var tmp0_subject = _this__u8e3s4.pi_1;
+    var tmp0_subject = _this__u8e3s4.ri_1;
     var tmp;
     if (tmp0_subject == null) {
       Companion_getInstance_2();
@@ -643,7 +646,7 @@
       Companion_getInstance_2();
       var tmp$ret$1;
       // Inline function 'kotlin.takeIf' call
-      var tmp0_takeIf = _this__u8e3s4.oi_1;
+      var tmp0_takeIf = _this__u8e3s4.qi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_0;
       var tmp$ret$0;
@@ -665,15 +668,15 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseMapperCondition.<anonymous>' call
-        tmp$ret$2 = 'status == ' + _this__u8e3s4.oi_1 + ' && ';
+        tmp$ret$2 = 'status == ' + _this__u8e3s4.qi_1 + ' && ';
         tmp$ret$3 = tmp$ret$2;
         tmp_1 = tmp$ret$3;
       }
       var tmp_2 = orEmptyString(tmp_1, $this);
-      var tmp_3 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
+      var tmp_3 = Companion_getInstance_2().si(_this__u8e3s4.qi_1);
       var tmp$ret$5;
       // Inline function 'kotlin.takeIf' call
-      var tmp1_takeIf = _this__u8e3s4.oi_1;
+      var tmp1_takeIf = _this__u8e3s4.qi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_4;
       var tmp$ret$4;
@@ -706,7 +709,7 @@
       Companion_getInstance_2();
       var tmp$ret$9;
       // Inline function 'kotlin.takeIf' call
-      var tmp2_takeIf = _this__u8e3s4.oi_1;
+      var tmp2_takeIf = _this__u8e3s4.qi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_6;
       var tmp$ret$8;
@@ -728,7 +731,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$10;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseMapperCondition.<anonymous>' call
-        tmp$ret$10 = 'status == ' + _this__u8e3s4.oi_1 + ' && ';
+        tmp$ret$10 = 'status == ' + _this__u8e3s4.qi_1 + ' && ';
         tmp$ret$11 = tmp$ret$10;
         tmp_7 = tmp$ret$11;
       }
@@ -737,18 +740,18 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_9 = $this.fi(_this__u8e3s4.pi_1.zh_1);
-      var tmp_10 = emitPrimaryType(_this__u8e3s4.pi_1.zh_1, $this);
-      var tmp_11 = _this__u8e3s4.pi_1.zh_1.si();
+      var tmp_9 = $this.hi(_this__u8e3s4.ri_1.bi_1);
+      var tmp_10 = emitPrimaryType(_this__u8e3s4.ri_1.bi_1, $this);
+      var tmp_11 = _this__u8e3s4.ri_1.bi_1.ti();
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_12 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
-      var tmp_13 = emitContentType(_this__u8e3s4.pi_1, $this);
+      var tmp_12 = Companion_getInstance_2().si(_this__u8e3s4.qi_1);
+      var tmp_13 = emitContentType(_this__u8e3s4.ri_1, $this);
       var tmp$ret$13;
       // Inline function 'kotlin.takeIf' call
-      var tmp3_takeIf = _this__u8e3s4.oi_1;
+      var tmp3_takeIf = _this__u8e3s4.qi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_14;
       var tmp$ret$12;
@@ -778,13 +781,13 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'if(' + tmp_8 + 'content.type().equals("' + _this__u8e3s4.pi_1.yh_1 + '")) {\n                    |' + '  ' + '  ' + '  ' + '  ' + 'WirespecShared.Content<' + tmp_9 + '> c = contentMapper.read(content, WirespecShared.getType(' + tmp_10 + '.class, ' + tmp_11 + '));\n                    |' + '  ' + '  ' + '  ' + '  ' + 'return new Response' + tmp_12 + tmp_13 + '(' + tmp_16 + 'headers, c.body());\n                    |' + '  ' + '  ' + '  ' + '}\n                    |\n                ');
+      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'if(' + tmp_8 + 'content.type().equals("' + _this__u8e3s4.ri_1.ai_1 + '")) {\n                    |' + '  ' + '  ' + '  ' + '  ' + 'Wirespec.Content<' + tmp_9 + '> c = contentMapper.read(content, Wirespec.getType(' + tmp_10 + '.class, ' + tmp_11 + '));\n                    |' + '  ' + '  ' + '  ' + '  ' + 'return new Response' + tmp_12 + tmp_13 + '(' + tmp_16 + 'headers, c.body());\n                    |' + '  ' + '  ' + '  ' + '}\n                    |\n                ');
     }
     return tmp;
   }
   function emitContentType(_this__u8e3s4, $this) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.ai_1;
     var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : split(tmp1_safe_receiver, ['/', '-']);
     var tmp;
     if (tmp2_safe_receiver == null) {
@@ -796,14 +799,14 @@
     return tmp3_elvis_lhs == null ? 'Void' : tmp3_elvis_lhs;
   }
   function emit_1(_this__u8e3s4, $this) {
-    return $this.ti(_this__u8e3s4, $this.rh_1, JavaEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.ui(_this__u8e3s4, $this.rh_1, JavaEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function emitRequestSignature(_this__u8e3s4, $this, content) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
     var tmp$ret$1;
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp1_filterIsInstance = _this__u8e3s4.ii_1;
+    var tmp1_filterIsInstance = _this__u8e3s4.ki_1;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
@@ -825,15 +828,15 @@
       var item = tmp0_iterator_0.e();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitRequestSignature.<anonymous>' call
-      tmp$ret$2 = new Field(item.ui_1, item.vi_1, false);
+      tmp$ret$2 = new Field(item.vi_1, item.wi_1, false);
       tmp2_mapTo.a(tmp$ret$2);
     }
     tmp$ret$3 = tmp2_mapTo;
     tmp$ret$4 = tmp$ret$3;
     var pathField = tmp$ret$4;
-    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ji_1), _this__u8e3s4.ki_1), _this__u8e3s4.li_1);
+    var parameters = plus(plus(plus(pathField, _this__u8e3s4.li_1), _this__u8e3s4.mi_1), _this__u8e3s4.ni_1);
     var tmp0_safe_receiver = content;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.bi_1;
     var tmp = filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
     return joinToString(tmp, ', ', VOID, VOID, VOID, VOID, JavaEmitter$emitRequestSignature$lambda($this));
   }
@@ -864,34 +867,34 @@
       tmp$ret$1 = tmp$ret$0.substring(0, 1);
       tmp = tmp$ret$1 + 'XX';
     } else {
-      tmp = Companion_getInstance_2().ri(_this__u8e3s4);
+      tmp = Companion_getInstance_2().si(_this__u8e3s4);
     }
     return tmp;
   }
   function JavaEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('public record ' + $this_emit.wi_1 + '(\n            |' + this$0.yi($this_emit.xi_1) + '\n            |) {};\n            |');
+      return trimMargin('public record ' + $this_emit.xi_1 + '(\n            |' + this$0.zi($this_emit.yi_1) + '\n            |) {};\n            |');
     };
   }
   function JavaEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.zi(it);
+      return this$0.aj(it);
     };
   }
   function JavaEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.aj_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.bj_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda(this$0));
     };
   }
   function JavaEmitter$emit$lambda_1($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + ($this_emit.dj_1 ? 'java.util.Optional<' + this$0.fi($this_emit.cj_1) + '>' : this$0.fi($this_emit.cj_1)) + ' ' + this$0.ej($this_emit.bj_1);
+      return '  ' + ($this_emit.ej_1 ? 'java.util.Optional<' + this$0.hi($this_emit.dj_1) + '>' : this$0.hi($this_emit.dj_1)) + ' ' + this$0.fj($this_emit.cj_1);
     };
   }
   function JavaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return $this_emit.fj_1;
+      return $this_emit.gj_1;
     };
   }
   function JavaEmitter$emitPrimaryType$lambda($this_emitPrimaryType) {
@@ -902,10 +905,10 @@
         tmp = 'Object';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emitPrimaryType.jj_1;
+          tmp = $this_emitPrimaryType.kj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emitPrimaryType.gj_1;
+            var tmp1_subject = $this_emitPrimaryType.hj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -939,7 +942,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.si() ? 'java.util.List<' + tmp0_let + '>' : tmp0_let;
+      tmp$ret$0 = $this_emit.ti() ? 'java.util.List<' + tmp0_let + '>' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       return tmp$ret$1;
     };
@@ -965,26 +968,32 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var body = trimMargin('\n          |' + '  ' + 'public final String label;\n          |' + '  ' + $this_emit.mj_1 + '(String label) {\n          |' + '  ' + '  ' + 'this.label = label;\n          |' + '  ' + '}\n          ');
+      var body = trimMargin('\n          |' + '  ' + 'public final String label;\n          |' + '  ' + $this_emit.nj_1 + '(String label) {\n          |' + '  ' + '  ' + 'this.label = label;\n          |' + '  ' + '}\n          ');
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      var toString = trimMargin('\n          |' + '  ' + '@Override\n          |' + '  ' + 'public String toString() {\n          |' + '  ' + '  ' + 'return label;\n          |' + '  ' + '}\n          ');
       Companion_getInstance_2();
       Companion_getInstance_2();
       var tmp = ',\n' + '  ';
-      return 'public enum ' + $this_emit.mj_1 + ' {\n' + '  ' + joinToString($this_emit.nj_1, tmp, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_0) + ';\n' + body + '\n}\n';
+      return 'public enum ' + $this_emit.nj_1 + ' {\n' + '  ' + joinToString($this_emit.oj_1, tmp, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_0) + ';\n' + body + '\n' + toString + '\n}\n';
     };
   }
   function JavaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp = this$0.qj($this_emit.pj_1);
+      var tmp = this$0.rj($this_emit.qj_1);
       Companion_getInstance_2();
-      return trimMargin('public record ' + $this_emit.oj_1 + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.oj_1 + ' record) {\n            |' + '  ' + tmp + '\n            |' + '  ' + '}\n            |}\n            |');
+      return trimMargin('public record ' + $this_emit.pj_1 + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.pj_1 + ' record) {\n            |' + '  ' + tmp + '\n            |' + '  ' + '}\n            |}\n            |');
     };
   }
   function JavaEmitter$emit$lambda_6($this_emit) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.rj_1 + ').matcher(record.value).find();';
+      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.sj_1 + ').matcher(record.value).find();';
     };
   }
   function JavaEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
@@ -1010,14 +1019,14 @@
   function JavaEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      var tmp = emitSegment($this_emit.ii_1, this$0);
-      var tmp_0 = emitResponseMapper($this_emit.ni_1, this$0);
+      var tmp = emitSegment($this_emit.ki_1, this$0);
+      var tmp_0 = emitResponseMapper($this_emit.pi_1, this$0);
       Companion_getInstance_2();
-      var tmp_1 = joinToString($this_emit.mi_1, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_1(this$0, $this_emit));
+      var tmp_1 = joinToString($this_emit.oi_1, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_1(this$0, $this_emit));
       Companion_getInstance_2();
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = $this_emit.ni_1;
+      var tmp1_map = $this_emit.pi_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -1026,7 +1035,7 @@
         var item = tmp0_iterator.e();
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$0 = groupStatus(item.oi_1, this$0);
+        tmp$ret$0 = groupStatus(item.qi_1, this$0);
         tmp0_mapTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapTo;
@@ -1037,7 +1046,7 @@
       // Inline function 'kotlin.collections.map' call
       var tmp$ret$5;
       // Inline function 'kotlin.collections.filter' call
-      var tmp3_filter = $this_emit.ni_1;
+      var tmp3_filter = $this_emit.pi_1;
       var tmp$ret$4;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp2_filterTo = ArrayList_init_$Create$();
@@ -1046,7 +1055,7 @@
         var element = tmp0_iterator_0.e();
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$3 = isInt(element.oi_1, this$0);
+        tmp$ret$3 = isInt(element.qi_1, this$0);
         if (tmp$ret$3) {
           tmp2_filterTo.a(element);
         }
@@ -1062,7 +1071,7 @@
         var item_0 = tmp0_iterator_1.e();
         var tmp$ret$6;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$6 = item_0.oi_1;
+        tmp$ret$6 = item_0.qi_1;
         tmp4_mapTo.a(tmp$ret$6);
       }
       tmp$ret$7 = tmp4_mapTo;
@@ -1071,7 +1080,7 @@
       var tmp_5 = joinToString(tmp_4, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_3(this$0));
       var tmp$ret$10;
       // Inline function 'kotlin.collections.distinctBy' call
-      var tmp6_distinctBy = $this_emit.ni_1;
+      var tmp6_distinctBy = $this_emit.pi_1;
       var set = HashSet_init_$Create$();
       var list = ArrayList_init_$Create$();
       var tmp0_iterator_2 = tmp6_distinctBy.c();
@@ -1079,8 +1088,8 @@
         var e = tmp0_iterator_2.e();
         var tmp$ret$9;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver = e.pi_1;
-        tmp$ret$9 = to(e.oi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1);
+        var tmp0_safe_receiver = e.ri_1;
+        tmp$ret$9 = to(e.qi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.ai_1);
         var key = tmp$ret$9;
         if (set.a(key)) {
           list.a(e);
@@ -1090,7 +1099,7 @@
       var tmp_6 = tmp$ret$10;
       var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_4(this$0));
       Companion_getInstance_2();
-      return trimMargin('public interface ' + $this_emit.gi_1 + ' {\n            |' + '  ' + 'static String PATH = "' + tmp + '";\n            |' + tmp_0 + '\n            |' + '  ' + 'interface Request<T> extends WirespecShared.Request<T> {}\n            |' + tmp_1 + '\n            |' + '  ' + 'interface Response<T> extends WirespecShared.Response<T> {}\n            |' + tmp_3 + '\n            |' + tmp_5 + '\n            |' + tmp_7 + '\n            |' + '  ' + 'public Response ' + Companion_getInstance_2().sj($this_emit.gi_1) + '(Request request);\n            |}\n            |');
+      return trimMargin('public interface ' + $this_emit.ii_1 + ' {\n            |' + '  ' + 'static String PATH = "' + tmp + '";\n            |' + tmp_0 + '\n            |' + '  ' + 'interface Request<T> extends Wirespec.Request<T> {}\n            |' + tmp_1 + '\n            |' + '  ' + 'interface Response<T> extends Wirespec.Response<T> {}\n            |' + tmp_3 + '\n            |' + tmp_5 + '\n            |' + tmp_7 + '\n            |' + '  ' + 'public Response ' + Companion_getInstance_2().tj($this_emit.ii_1) + '(Request request);\n            |}\n            |');
     };
   }
   function JavaEmitter$emitResponseMapper$lambda(this$0) {
@@ -1099,17 +1108,17 @@
     };
   }
   function JavaEmitter$emitContentType$lambda(it) {
-    return Companion_getInstance_2().ri(it);
+    return Companion_getInstance_2().si(it);
   }
   function JavaEmitter$emit$lambda_8($this_emit) {
     return function () {
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = '"' + $this_emit.tj_1 + '"';
+        tmp = '"' + $this_emit.uj_1 + '"';
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = $this_emit.ui_1.fj_1;
+          tmp = $this_emit.vi_1.gj_1;
         } else {
           noWhenBranchMatchedException();
         }
@@ -1119,22 +1128,22 @@
   }
   function JavaEmitter$emitRequestSignature$lambda(this$0) {
     return function (it) {
-      return this$0.zi(it);
+      return this$0.aj(it);
     };
   }
   function JavaEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + this$0.ej(it.bj_1) + '", java.util.List.of(' + this$0.ej(it.bj_1) + ')';
+      return '"' + this$0.fj(it.cj_1) + '", java.util.List.of(' + this$0.fj(it.cj_1) + ')';
     };
   }
   function JavaEmitter$emitSegment$lambda(it) {
     var tmp0_subject = it;
     var tmp;
     if (tmp0_subject instanceof Param) {
-      tmp = '{' + it.ui_1.fj_1 + '}';
+      tmp = '{' + it.vi_1.gj_1 + '}';
     } else {
       if (tmp0_subject instanceof Literal) {
-        tmp = it.tj_1;
+        tmp = it.uj_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1187,8 +1196,8 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    tmp.di_1 = trimMargin('\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |\n        |public interface WirespecShared {\n        |' + '  ' + 'enum Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE };\n        |' + '  ' + 'record Content<T> (String type, T body) {};\n        |' + '  ' + 'interface Request<T> { String getPath(); Method getMethod(); java.util.Map<String, java.util.List<Object>> getQuery(); java.util.Map<String, java.util.List<Object>> getHeaders(); Content<T> getContent(); }\n        |' + '  ' + 'interface Response<T> { int getStatus(); java.util.Map<String, java.util.List<Object>> getHeaders(); Content<T> getContent(); }\n        |' + '  ' + 'interface ContentMapper<B> { <T> Content<T> read(Content<B> content, Type valueType); <T> Content<B> write(Content<T> content); }\n        |' + '  ' + 'static Type getType(final Class<?> type, final boolean isIterable) {\n        |' + '  ' + '  ' + 'if(isIterable) {\n        |' + '  ' + '  ' + '  ' + 'return new ParameterizedType() {\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type getRawType() {return java.util.List.class;}\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type[] getActualTypeArguments() {Class<?>[] types = {type};return types;}\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type getOwnerType() {return null;}\n        |' + '  ' + '  ' + '  ' + '};\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + 'else {\n        |' + '  ' + '  ' + '  ' + 'return type;\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n    ');
-    this.ei_1 = isBlank(packageName) ? '' : 'package ' + packageName + ';';
+    tmp.fi_1 = trimMargin('\n        |package community.flock.wirespec.java;\n        |\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |\n        |public interface Wirespec {\n        |' + '  ' + 'enum Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE };\n        |' + '  ' + 'record Content<T> (String type, T body) {};\n        |' + '  ' + 'interface Request<T> { String getPath(); Method getMethod(); java.util.Map<String, java.util.List<Object>> getQuery(); java.util.Map<String, java.util.List<Object>> getHeaders(); Content<T> getContent(); }\n        |' + '  ' + 'interface Response<T> { int getStatus(); java.util.Map<String, java.util.List<Object>> getHeaders(); Content<T> getContent(); }\n        |' + '  ' + 'interface ContentMapper<B> { <T> Content<T> read(Content<B> content, Type valueType); <T> Content<B> write(Content<T> content); }\n        |' + '  ' + 'static Type getType(final Class<?> type, final boolean isIterable) {\n        |' + '  ' + '  ' + 'if(isIterable) {\n        |' + '  ' + '  ' + '  ' + 'return new ParameterizedType() {\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type getRawType() {return java.util.List.class;}\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type[] getActualTypeArguments() {Class<?>[] types = {type};return types;}\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type getOwnerType() {return null;}\n        |' + '  ' + '  ' + '  ' + '};\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + 'else {\n        |' + '  ' + '  ' + '  ' + 'return type;\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n    ');
+    this.gi_1 = isBlank(packageName) ? '' : 'package ' + packageName + ';';
   }
   protoOf(JavaEmitter).th = function (ast) {
     var tmp$ret$2;
@@ -1204,46 +1213,46 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
       var name = item.i3();
       var result = item.j3();
-      tmp$ret$0 = to(name, this.ei_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, this.gi_1 + '\n\n' + imprt(this, ast) + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
     tmp$ret$2 = tmp$ret$1;
-    return plus_0(tmp$ret$2, to('WirespecShared', this.ei_1 + '\n\n' + this.di_1));
-  };
-  protoOf(JavaEmitter).uj = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda(_this__u8e3s4, this));
+    return tmp$ret$2;
   };
-  protoOf(JavaEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(JavaEmitter).vj = function (_this__u8e3s4) {
+    return this.wj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(JavaEmitter).zi = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
+    return this.xj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
+  };
+  protoOf(JavaEmitter).aj = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).ej = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_2(_this__u8e3s4));
+  protoOf(JavaEmitter).fj = function (_this__u8e3s4) {
+    return this.zj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_2(_this__u8e3s4));
   };
-  protoOf(JavaEmitter).fi = function (_this__u8e3s4) {
-    return this.wh(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_3(this, _this__u8e3s4));
+  protoOf(JavaEmitter).hi = function (_this__u8e3s4) {
+    return this.yh(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_3(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).zj = function (_this__u8e3s4) {
-    return this.ak(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(JavaEmitter).ak = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(JavaEmitter).bk = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(JavaEmitter).ck = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).qj = function (_this__u8e3s4) {
-    return this.dk(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(JavaEmitter).rj = function (_this__u8e3s4) {
+    return this.ek(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(JavaEmitter).ek = function (_this__u8e3s4) {
-    return this.fk(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(JavaEmitter).fk = function (_this__u8e3s4) {
+    return this.gk(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function emitRequestSignature_0(_this__u8e3s4, $this, content) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
     var tmp$ret$1;
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp1_filterIsInstance = _this__u8e3s4.ii_1;
+    var tmp1_filterIsInstance = _this__u8e3s4.ki_1;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
@@ -1265,15 +1274,15 @@
       var item = tmp0_iterator_0.e();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitRequestSignature.<anonymous>' call
-      tmp$ret$2 = new Field(item.ui_1, item.vi_1, false);
+      tmp$ret$2 = new Field(item.vi_1, item.wi_1, false);
       tmp2_mapTo.a(tmp$ret$2);
     }
     tmp$ret$3 = tmp2_mapTo;
     tmp$ret$4 = tmp$ret$3;
     var pathField = tmp$ret$4;
-    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ji_1), _this__u8e3s4.ki_1), _this__u8e3s4.li_1);
+    var parameters = plus(plus(plus(pathField, _this__u8e3s4.li_1), _this__u8e3s4.mi_1), _this__u8e3s4.ni_1);
     var tmp0_safe_receiver = content;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.bi_1;
     var tmp = filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
     return trimMargin('\n            |(' + joinToString(tmp, ', ', VOID, VOID, VOID, VOID, KotlinEmitter$emitRequestSignature$lambda($this)) + ')\n        ');
   }
@@ -1284,11 +1293,49 @@
     return joinToString(_this__u8e3s4, ', ', VOID, VOID, VOID, VOID, KotlinEmitter$emitMap$lambda($this));
   }
   function emit_2(_this__u8e3s4, $this) {
-    return $this.ti(_this__u8e3s4, $this.rh_1, KotlinEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.ui(_this__u8e3s4, $this.rh_1, KotlinEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function emitPath_0(_this__u8e3s4, $this) {
     return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, KotlinEmitter$emitPath$lambda($this));
   }
+  function emitRequestMapper(_this__u8e3s4, $this) {
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    var tmp = joinToString(_this__u8e3s4, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emitRequestMapper$lambda($this));
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    return trimMargin('\n        |fun <B> REQUEST_MAPPER(contentMapper: Wirespec.ContentMapper<B>) =\n        |' + '  ' + 'fun(path:String, method: Wirespec.Method, query: Map<String, List<Any?>>, headers:Map<String, List<Any?>>, content: Wirespec.Content<B>?) =\n        |' + '  ' + '  ' + 'when {\n        |' + tmp + '\n        |' + '  ' + '  ' + '  ' + 'else -> error("Cannot map request")\n        |' + '  ' + '  ' + '}\n    ');
+  }
+  function emitRequestMapperCondition(_this__u8e3s4, $this) {
+    var tmp0_subject = _this__u8e3s4.zh_1;
+    var tmp;
+    if (tmp0_subject == null) {
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'content == null -> RequestUnit(path, method, query, headers, null)\n                ');
+    } else {
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      var tmp_0 = $this.hi(_this__u8e3s4.zh_1.bi_1);
+      var tmp_1 = $this.hi(_this__u8e3s4.zh_1.bi_1);
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'content?.type == "' + _this__u8e3s4.zh_1.ai_1 + '" -> contentMapper\n                    |' + '  ' + '  ' + '  ' + '  ' + '.read<' + tmp_0 + '>(content, typeOf<' + tmp_1 + '>().javaType)\n                    |' + '  ' + '  ' + '  ' + '  ' + '.let{ Request' + emitContentType_0(_this__u8e3s4.zh_1) + '(path, method, query, headers, it) }\n                ');
+    }
+    return tmp;
+  }
   function emitResponseMapper_0(_this__u8e3s4, $this) {
     Companion_getInstance_2();
     Companion_getInstance_2();
@@ -1305,7 +1352,7 @@
       var element = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      tmp$ret$0 = Companion_getInstance_2().gk(element.oi_1);
+      tmp$ret$0 = Companion_getInstance_2().mk(element.qi_1);
       if (tmp$ret$0) {
         tmp0_filterTo.a(element);
       }
@@ -1320,8 +1367,8 @@
       var e = tmp0_iterator_0.e();
       var tmp$ret$3;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver = e.pi_1;
-      tmp$ret$3 = to(e.oi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1);
+      var tmp0_safe_receiver = e.ri_1;
+      tmp$ret$3 = to(e.qi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.ai_1);
       var key = tmp$ret$3;
       if (set.a(key)) {
         list.a(e);
@@ -1342,7 +1389,7 @@
       var element_0 = tmp0_iterator_1.e();
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      tmp$ret$5 = !Companion_getInstance_2().gk(element_0.oi_1);
+      tmp$ret$5 = !Companion_getInstance_2().mk(element_0.qi_1);
       if (tmp$ret$5) {
         tmp2_filterTo.a(element_0);
       }
@@ -1357,8 +1404,8 @@
       var e_0 = tmp0_iterator_2.e();
       var tmp$ret$8;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver_0 = e_0.pi_1;
-      tmp$ret$8 = to(e_0.oi_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.yh_1);
+      var tmp0_safe_receiver_0 = e_0.ri_1;
+      tmp$ret$8 = to(e_0.qi_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.ai_1);
       var key_0 = tmp$ret$8;
       if (set_0.a(key_0)) {
         list_0.a(e_0);
@@ -1370,10 +1417,12 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    return trimMargin('\n        |fun <B> RESPONSE_MAPPER(contentMapper: WirespecShared.ContentMapper<B>) =\n        |' + '  ' + 'fun(status: Int, headers:Map<String, List<Any?>>, content: WirespecShared.Content<B>?) =\n        |' + '  ' + '  ' + 'when {\n        |' + tmp_0 + '\n        |' + tmp_2 + '\n        |' + '  ' + '  ' + '  ' + 'else -> error("Cannot map response with status $status")\n    ');
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    return trimMargin('\n        |fun <B> RESPONSE_MAPPER(contentMapper: Wirespec.ContentMapper<B>) =\n        |' + '  ' + 'fun(status: Int, headers:Map<String, List<Any?>>, content: Wirespec.Content<B>?) =\n        |' + '  ' + '  ' + 'when {\n        |' + tmp_0 + '\n        |' + tmp_2 + '\n        |' + '  ' + '  ' + '  ' + 'else -> error("Cannot map response with status $status")\n        |' + '  ' + '  ' + '}\n    ');
   }
   function emitResponseMapperCondition_0(_this__u8e3s4, $this) {
-    var tmp0_subject = _this__u8e3s4.pi_1;
+    var tmp0_subject = _this__u8e3s4.ri_1;
     var tmp;
     if (tmp0_subject == null) {
       Companion_getInstance_2();
@@ -1381,12 +1430,12 @@
       Companion_getInstance_2();
       var tmp$ret$1;
       // Inline function 'kotlin.takeIf' call
-      var tmp0_takeIf = _this__u8e3s4.oi_1;
+      var tmp0_takeIf = _this__u8e3s4.qi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_0;
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$0 = Companion_getInstance_2().gk(tmp0_takeIf);
+      tmp$ret$0 = Companion_getInstance_2().mk(tmp0_takeIf);
       if (tmp$ret$0) {
         tmp_0 = tmp0_takeIf;
       } else {
@@ -1403,20 +1452,20 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-        tmp$ret$2 = 'status == ' + _this__u8e3s4.oi_1 + ' && ';
+        tmp$ret$2 = 'status == ' + _this__u8e3s4.qi_1 + ' && ';
         tmp$ret$3 = tmp$ret$2;
         tmp_1 = tmp$ret$3;
       }
       var tmp_2 = orEmptyString_0(tmp_1);
-      var tmp_3 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
+      var tmp_3 = Companion_getInstance_2().si(_this__u8e3s4.qi_1);
       var tmp$ret$5;
       // Inline function 'kotlin.takeIf' call
-      var tmp1_takeIf = _this__u8e3s4.oi_1;
+      var tmp1_takeIf = _this__u8e3s4.qi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_4;
       var tmp$ret$4;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$4 = !Companion_getInstance_2().gk(tmp1_takeIf);
+      tmp$ret$4 = !Companion_getInstance_2().mk(tmp1_takeIf);
       if (tmp$ret$4) {
         tmp_4 = tmp1_takeIf;
       } else {
@@ -1444,12 +1493,12 @@
       Companion_getInstance_2();
       var tmp$ret$9;
       // Inline function 'kotlin.takeIf' call
-      var tmp2_takeIf = _this__u8e3s4.oi_1;
+      var tmp2_takeIf = _this__u8e3s4.qi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_6;
       var tmp$ret$8;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$8 = Companion_getInstance_2().gk(tmp2_takeIf);
+      tmp$ret$8 = Companion_getInstance_2().mk(tmp2_takeIf);
       if (tmp$ret$8) {
         tmp_6 = tmp2_takeIf;
       } else {
@@ -1466,7 +1515,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$10;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-        tmp$ret$10 = 'status == ' + _this__u8e3s4.oi_1 + ' && ';
+        tmp$ret$10 = 'status == ' + _this__u8e3s4.qi_1 + ' && ';
         tmp$ret$11 = tmp$ret$10;
         tmp_7 = tmp$ret$11;
       }
@@ -1475,22 +1524,22 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_9 = $this.fi(_this__u8e3s4.pi_1.zh_1);
-      var tmp_10 = $this.fi(_this__u8e3s4.pi_1.zh_1);
+      var tmp_9 = $this.hi(_this__u8e3s4.ri_1.bi_1);
+      var tmp_10 = $this.hi(_this__u8e3s4.ri_1.bi_1);
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_11 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
-      var tmp_12 = emitContentType_0(_this__u8e3s4.pi_1);
+      var tmp_11 = Companion_getInstance_2().si(_this__u8e3s4.qi_1);
+      var tmp_12 = emitContentType_0(_this__u8e3s4.ri_1);
       var tmp$ret$13;
       // Inline function 'kotlin.takeIf' call
-      var tmp3_takeIf = _this__u8e3s4.oi_1;
+      var tmp3_takeIf = _this__u8e3s4.qi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_13;
       var tmp$ret$12;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$12 = !Companion_getInstance_2().gk(tmp3_takeIf);
+      tmp$ret$12 = !Companion_getInstance_2().mk(tmp3_takeIf);
       if (tmp$ret$12) {
         tmp_13 = tmp3_takeIf;
       } else {
@@ -1511,13 +1560,13 @@
         tmp$ret$15 = tmp$ret$14;
         tmp_14 = tmp$ret$15;
       }
-      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + tmp_8 + 'content?.type == "' + _this__u8e3s4.pi_1.yh_1 + '" -> contentMapper\n                    |' + '  ' + '  ' + '  ' + '  ' + '.read<' + tmp_9 + '>(content, typeOf<' + tmp_10 + '>())\n                    |' + '  ' + '  ' + '  ' + '  ' + '.let{ Response' + tmp_11 + tmp_12 + '(' + orEmptyString_0(tmp_14) + 'headers, it.body) }\n                ');
+      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + tmp_8 + 'content?.type == "' + _this__u8e3s4.ri_1.ai_1 + '" -> contentMapper\n                    |' + '  ' + '  ' + '  ' + '  ' + '.read<' + tmp_9 + '>(content, typeOf<' + tmp_10 + '>().javaType)\n                    |' + '  ' + '  ' + '  ' + '  ' + '.let{ Response' + tmp_11 + tmp_12 + '(' + orEmptyString_0(tmp_14) + 'headers, it.body) }\n                ');
     }
     return tmp;
   }
   function Companion() {
     Companion_instance = this;
-    this.lk_1 = listOf(['as', 'break', 'class', 'continue', 'do', 'else', 'false', 'for', 'fun', 'if', 'in', 'interface', 'is', 'null', 'object', 'package', 'return', 'super', 'this', 'throw', 'true', 'try', 'typealias', 'typeof', 'val', 'var', 'when', 'while']);
+    this.nk_1 = listOf(['as', 'break', 'class', 'continue', 'do', 'else', 'false', 'for', 'fun', 'if', 'in', 'interface', 'is', 'null', 'object', 'package', 'return', 'super', 'this', 'throw', 'true', 'try', 'typealias', 'typeof', 'val', 'var', 'when', 'while']);
   }
   var Companion_instance;
   function Companion_getInstance_0() {
@@ -1527,30 +1576,30 @@
   }
   function KotlinEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('|data class ' + $this_emit.wi_1 + '(\n           |' + this$0.yi($this_emit.xi_1) + '\n           |)\n           |');
+      return trimMargin('|data class ' + $this_emit.xi_1 + '(\n           |' + this$0.zi($this_emit.yi_1) + '\n           |)\n           |');
     };
   }
   function KotlinEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
       Companion_getInstance_2();
-      return '  ' + 'val ' + this$0.zi(it);
+      return '  ' + 'val ' + this$0.aj(it);
     };
   }
   function KotlinEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.aj_1, ',\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.bj_1, ',\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda(this$0));
     };
   }
   function KotlinEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
-      return this$0.ej($this_emit.bj_1) + ': ' + this$0.fi($this_emit.cj_1) + ($this_emit.dj_1 ? '? = null' : '');
+      return this$0.fj($this_emit.cj_1) + ': ' + this$0.hi($this_emit.dj_1) + ($this_emit.ej_1 ? '? = null' : '');
     };
   }
   function KotlinEmitter$emit$lambda_2(this$0, $this_emit) {
     return function () {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.mapIndexed' call
-      var tmp1_mapIndexed = split($this_emit.fj_1, ['-']);
+      var tmp1_mapIndexed = split($this_emit.gj_1, ['-']);
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapIndexedTo' call
       var tmp0_mapIndexedTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_mapIndexed, 10));
@@ -1563,12 +1612,12 @@
         var tmp1 = index;
         index = tmp1 + 1 | 0;
         var tmp2__anonymous__z9zvc9 = checkIndexOverflow(tmp1);
-        tmp$ret$0 = tmp2__anonymous__z9zvc9 > 0 ? Companion_getInstance_2().ri(item) : item;
+        tmp$ret$0 = tmp2__anonymous__z9zvc9 > 0 ? Companion_getInstance_2().si(item) : item;
         tmp0_mapIndexedTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapIndexedTo;
       tmp$ret$2 = tmp$ret$1;
-      return this$0.mk(joinToString(tmp$ret$2, ''));
+      return this$0.ok(joinToString(tmp$ret$2, ''));
     };
   }
   function KotlinEmitter$emit$lambda_3($this_emit) {
@@ -1583,10 +1632,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.jj_1;
+          tmp = $this_emit.kj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.gj_1;
+            var tmp1_subject = $this_emit.hj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -1613,13 +1662,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.si() ? 'List<' + tmp0_let + '>' : tmp0_let;
+      tmp$ret$0 = $this_emit.ti() ? 'List<' + tmp0_let + '>' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       var tmp1_let = tmp$ret$1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.nk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.pk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -1637,7 +1686,7 @@
   }
   function KotlinEmitter$emit$lambda$lambda_0(this$0) {
     return function (it) {
-      return this$0.mk(invoke$sanitize_0(it)) + '("' + it + '")';
+      return this$0.ok(invoke$sanitize_0(it)) + '("' + it + '")';
     };
   }
   function KotlinEmitter$emit$lambda_4($this_emit, this$0) {
@@ -1645,49 +1694,58 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       var tmp = ',\n' + '  ';
-      return 'enum class ' + $this_emit.mj_1 + ' (val label: String){\n' + '  ' + joinToString($this_emit.nj_1, tmp, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_0(this$0)) + '\n}\n';
+      var tmp_0 = joinToString($this_emit.oj_1, tmp, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_0(this$0));
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      return 'enum class ' + $this_emit.nj_1 + ' (val label: String){\n' + '  ' + tmp_0 + ';\n\n' + '  ' + 'override fun toString(): String {\n' + '  ' + '  ' + 'return label\n' + '  ' + '}\n}\n';
     };
   }
   function KotlinEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return trimMargin('data class ' + $this_emit.oj_1 + '(val value: String)\n            |fun ' + $this_emit.oj_1 + '.validate() = ' + this$0.qj($this_emit.pj_1) + '\n            |');
+      return trimMargin('data class ' + $this_emit.pj_1 + '(val value: String)\n            |fun ' + $this_emit.pj_1 + '.validate() = ' + this$0.rj($this_emit.qj_1) + '\n            |');
     };
   }
   function KotlinEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return 'Regex(' + $this_emit.rj_1 + ').find(value)';
+      return 'Regex(' + $this_emit.sj_1 + ').find(value)';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
     return function (it) {
       Companion_getInstance_2();
-      var tmp0_safe_receiver = it.xh_1;
+      var tmp0_safe_receiver = it.zh_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
       var tmp = tmp1_elvis_lhs == null ? 'Unit' : tmp1_elvis_lhs;
-      var tmp_0 = emitRequestSignature_0($this_emit, this$0, it.xh_1);
-      var tmp2_safe_receiver = it.xh_1;
-      var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.zh_1;
-      var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : this$0.fi(tmp3_safe_receiver);
-      var tmp_1 = tmp4_elvis_lhs == null ? 'Unit' : tmp4_elvis_lhs;
-      var tmp_2 = emitPath_0($this_emit.ii_1, this$0);
-      var tmp_3 = emitMap_0($this_emit.ji_1, this$0);
-      var tmp_4 = emitMap_0($this_emit.ki_1, this$0);
-      var tmp5_safe_receiver = it.xh_1;
-      var tmp_5;
-      if (tmp5_safe_receiver == null) {
-        tmp_5 = null;
+      var tmp2_safe_receiver = it.zh_1;
+      var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.bi_1;
+      var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : this$0.hi(tmp3_safe_receiver);
+      var tmp_0 = tmp4_elvis_lhs == null ? 'Unit' : tmp4_elvis_lhs;
+      var tmp5_safe_receiver = it.zh_1;
+      var tmp6_safe_receiver = tmp5_safe_receiver == null ? null : tmp5_safe_receiver.bi_1;
+      var tmp7_elvis_lhs = tmp6_safe_receiver == null ? null : this$0.hi(tmp6_safe_receiver);
+      var tmp_1 = tmp7_elvis_lhs == null ? 'Unit' : tmp7_elvis_lhs;
+      var tmp_2 = emitRequestSignature_0($this_emit, this$0, it.zh_1);
+      var tmp_3 = emitPath_0($this_emit.ki_1, this$0);
+      var tmp_4 = emitMap_0($this_emit.li_1, this$0);
+      var tmp_5 = emitMap_0($this_emit.mi_1, this$0);
+      var tmp8_safe_receiver = it.zh_1;
+      var tmp_6;
+      if (tmp8_safe_receiver == null) {
+        tmp_6 = null;
       } else {
         var tmp$ret$1;
         // Inline function 'kotlin.let' call
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = 'WirespecShared.Content("' + tmp5_safe_receiver.yh_1 + '", body)';
+        tmp$ret$0 = 'Wirespec.Content("' + tmp8_safe_receiver.ai_1 + '", body)';
         tmp$ret$1 = tmp$ret$0;
-        tmp_5 = tmp$ret$1;
+        tmp_6 = tmp$ret$1;
       }
-      var tmp6_elvis_lhs = tmp_5;
-      return '  ' + 'class Request' + tmp + ' ' + tmp_0 + ': Request<' + tmp_1 + '> {override val path = "' + tmp_2 + '"; override val method = WirespecShared.Method.' + $this_emit.hi_1.p4_1 + '; override val query = mapOf<String, List<Any?>>(' + tmp_3 + '); override val headers = mapOf<String, List<Any?>>(' + tmp_4 + '); override val content = ' + (tmp6_elvis_lhs == null ? 'null' : tmp6_elvis_lhs) + '}';
+      var tmp9_elvis_lhs = tmp_6;
+      return '  ' + 'class Request' + tmp + '(override val path:String, override val method: Wirespec.Method, override val query: Map<String, List<Any?>>, override val headers: Map<String, List<Any?>>, override val content:Wirespec.Content<' + tmp_0 + '>?) : Request<' + tmp_1 + '> { constructor' + tmp_2 + ': this(path = "' + tmp_3 + '", method = Wirespec.Method.' + $this_emit.ji_1.p4_1 + ', query = mapOf<String, List<Any?>>(' + tmp_4 + '), headers = mapOf<String, List<Any?>>(' + tmp_5 + '), content = ' + (tmp9_elvis_lhs == null ? 'null' : tmp9_elvis_lhs) + ')}';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_2(it) {
@@ -1701,10 +1759,10 @@
   function KotlinEmitter$emit$lambda$lambda_4(this$0) {
     return function (it) {
       Companion_getInstance_2();
-      var tmp0_safe_receiver = it.pi_1;
+      var tmp0_safe_receiver = it.ri_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
       var tmp = tmp1_elvis_lhs == null ? 'Unit' : tmp1_elvis_lhs;
-      var tmp2_safe_receiver = it.pi_1;
+      var tmp2_safe_receiver = it.ri_1;
       var tmp_0;
       if (tmp2_safe_receiver == null) {
         tmp_0 = null;
@@ -1714,17 +1772,17 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', body: ' + this$0.fi(tmp2_safe_receiver.zh_1);
+        tmp$ret$0 = ', body: ' + this$0.hi(tmp2_safe_receiver.bi_1);
         tmp$ret$1 = tmp$ret$0;
         tmp_0 = tmp$ret$1;
       }
       var tmp3_elvis_lhs = tmp_0;
       var tmp_1 = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-      var tmp4_safe_receiver = it.pi_1;
-      var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.zh_1;
-      var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.fi(tmp5_safe_receiver);
+      var tmp4_safe_receiver = it.ri_1;
+      var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.bi_1;
+      var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.hi(tmp5_safe_receiver);
       var tmp_2 = tmp6_elvis_lhs == null ? 'Unit' : tmp6_elvis_lhs;
-      var tmp7_safe_receiver = it.pi_1;
+      var tmp7_safe_receiver = it.ri_1;
       var tmp_3;
       if (tmp7_safe_receiver == null) {
         tmp_3 = null;
@@ -1734,22 +1792,22 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$2 = 'WirespecShared.Content("' + tmp7_safe_receiver.yh_1 + '", body)';
+        tmp$ret$2 = 'Wirespec.Content("' + tmp7_safe_receiver.ai_1 + '", body)';
         tmp$ret$3 = tmp$ret$2;
         tmp_3 = tmp$ret$3;
       }
       var tmp8_elvis_lhs = tmp_3;
-      return '  ' + 'class Response' + it.oi_1 + tmp + ' (override val headers: Map<String, List<Any?>>' + tmp_1 + ' ): Response' + it.oi_1 + '<' + tmp_2 + '> { override val status = ' + it.oi_1 + '; override val content = ' + (tmp8_elvis_lhs == null ? 'null' : tmp8_elvis_lhs) + '}';
+      return '  ' + 'class Response' + it.qi_1 + tmp + ' (override val headers: Map<String, List<Any?>>' + tmp_1 + ' ): Response' + it.qi_1 + '<' + tmp_2 + '> { override val status = ' + it.qi_1 + '; override val content = ' + (tmp8_elvis_lhs == null ? 'null' : tmp8_elvis_lhs) + '}';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_5(this$0) {
     return function (it) {
       Companion_getInstance_2();
-      var tmp = Companion_getInstance_2().ri(it.oi_1);
-      var tmp0_safe_receiver = it.pi_1;
+      var tmp = Companion_getInstance_2().si(it.qi_1);
+      var tmp0_safe_receiver = it.ri_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
       var tmp_0 = tmp1_elvis_lhs == null ? 'Unit' : tmp1_elvis_lhs;
-      var tmp2_safe_receiver = it.pi_1;
+      var tmp2_safe_receiver = it.ri_1;
       var tmp_1;
       if (tmp2_safe_receiver == null) {
         tmp_1 = null;
@@ -1759,18 +1817,18 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', body: ' + this$0.fi(tmp2_safe_receiver.zh_1);
+        tmp$ret$0 = ', body: ' + this$0.hi(tmp2_safe_receiver.bi_1);
         tmp$ret$1 = tmp$ret$0;
         tmp_1 = tmp$ret$1;
       }
       var tmp3_elvis_lhs = tmp_1;
       var tmp_2 = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-      var tmp_3 = Companion_getInstance_2().ri(it.oi_1);
-      var tmp4_safe_receiver = it.pi_1;
-      var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.zh_1;
-      var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.fi(tmp5_safe_receiver);
+      var tmp_3 = Companion_getInstance_2().si(it.qi_1);
+      var tmp4_safe_receiver = it.ri_1;
+      var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.bi_1;
+      var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.hi(tmp5_safe_receiver);
       var tmp_4 = tmp6_elvis_lhs == null ? 'Unit' : tmp6_elvis_lhs;
-      var tmp7_safe_receiver = it.pi_1;
+      var tmp7_safe_receiver = it.ri_1;
       var tmp_5;
       if (tmp7_safe_receiver == null) {
         tmp_5 = null;
@@ -1780,7 +1838,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$2 = 'WirespecShared.Content("' + tmp7_safe_receiver.yh_1 + '", body)';
+        tmp$ret$2 = 'Wirespec.Content("' + tmp7_safe_receiver.ai_1 + '", body)';
         tmp$ret$3 = tmp$ret$2;
         tmp_5 = tmp$ret$3;
       }
@@ -1791,11 +1849,11 @@
   function KotlinEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      var tmp = joinToString($this_emit.mi_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit));
+      var tmp = joinToString($this_emit.oi_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit));
       Companion_getInstance_2();
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = $this_emit.ni_1;
+      var tmp1_map = $this_emit.pi_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -1804,7 +1862,7 @@
         var item = tmp0_iterator.e();
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$0 = groupStatus_0(item.oi_1);
+        tmp$ret$0 = groupStatus_0(item.qi_1);
         tmp0_mapTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapTo;
@@ -1815,7 +1873,7 @@
       // Inline function 'kotlin.collections.map' call
       var tmp$ret$5;
       // Inline function 'kotlin.collections.filter' call
-      var tmp3_filter = $this_emit.ni_1;
+      var tmp3_filter = $this_emit.pi_1;
       var tmp$ret$4;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp2_filterTo = ArrayList_init_$Create$();
@@ -1824,7 +1882,7 @@
         var element = tmp0_iterator_0.e();
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$3 = Companion_getInstance_2().gk(element.oi_1);
+        tmp$ret$3 = Companion_getInstance_2().mk(element.qi_1);
         if (tmp$ret$3) {
           tmp2_filterTo.a(element);
         }
@@ -1840,7 +1898,7 @@
         var item_0 = tmp0_iterator_1.e();
         var tmp$ret$6;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$6 = item_0.oi_1;
+        tmp$ret$6 = item_0.qi_1;
         tmp4_mapTo.a(tmp$ret$6);
       }
       tmp$ret$7 = tmp4_mapTo;
@@ -1851,7 +1909,7 @@
       // Inline function 'kotlin.collections.distinctBy' call
       var tmp$ret$11;
       // Inline function 'kotlin.collections.filter' call
-      var tmp7_filter = $this_emit.ni_1;
+      var tmp7_filter = $this_emit.pi_1;
       var tmp$ret$10;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp6_filterTo = ArrayList_init_$Create$();
@@ -1860,7 +1918,7 @@
         var element_0 = tmp0_iterator_2.e();
         var tmp$ret$9;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$9 = Companion_getInstance_2().gk(element_0.oi_1);
+        tmp$ret$9 = Companion_getInstance_2().mk(element_0.qi_1);
         if (tmp$ret$9) {
           tmp6_filterTo.a(element_0);
         }
@@ -1875,8 +1933,8 @@
         var e = tmp0_iterator_3.e();
         var tmp$ret$12;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver = e.pi_1;
-        tmp$ret$12 = to(e.oi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1);
+        var tmp0_safe_receiver = e.ri_1;
+        tmp$ret$12 = to(e.qi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.ai_1);
         var key = tmp$ret$12;
         if (set.a(key)) {
           list.a(e);
@@ -1889,7 +1947,7 @@
       // Inline function 'kotlin.collections.distinctBy' call
       var tmp$ret$16;
       // Inline function 'kotlin.collections.filter' call
-      var tmp10_filter = $this_emit.ni_1;
+      var tmp10_filter = $this_emit.pi_1;
       var tmp$ret$15;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp9_filterTo = ArrayList_init_$Create$();
@@ -1898,7 +1956,7 @@
         var element_1 = tmp0_iterator_4.e();
         var tmp$ret$14;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$14 = !Companion_getInstance_2().gk(element_1.oi_1);
+        tmp$ret$14 = !Companion_getInstance_2().mk(element_1.qi_1);
         if (tmp$ret$14) {
           tmp9_filterTo.a(element_1);
         }
@@ -1913,8 +1971,8 @@
         var e_0 = tmp0_iterator_5.e();
         var tmp$ret$17;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver_0 = e_0.pi_1;
-        tmp$ret$17 = to(e_0.oi_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.yh_1);
+        var tmp0_safe_receiver_0 = e_0.ri_1;
+        tmp$ret$17 = to(e_0.qi_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.ai_1);
         var key_0 = tmp$ret$17;
         if (set_0.a(key_0)) {
           list_0.a(e_0);
@@ -1923,33 +1981,34 @@
       tmp$ret$18 = list_0;
       var tmp_6 = tmp$ret$18;
       var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_5(this$0));
-      var tmp_8 = Companion_getInstance_2().sj($this_emit.gi_1);
+      var tmp_8 = Companion_getInstance_2().tj($this_emit.ii_1);
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_9 = emitSegment_0($this_emit.ii_1, this$0);
+      var tmp_9 = emitSegment_0($this_emit.ki_1, this$0);
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_10 = emitResponseMapper_0($this_emit.ni_1, this$0);
+      var tmp_10 = emitRequestMapper($this_emit.oi_1, this$0);
       Companion_getInstance_2();
       Companion_getInstance_2();
+      var tmp_11 = emitResponseMapper_0($this_emit.pi_1, this$0);
       Companion_getInstance_2();
-      return trimMargin('interface ' + $this_emit.gi_1 + ' {\n        |' + '  ' + 'sealed interface Request<T>: WirespecShared.Request<T>\n        |' + tmp + '\n        |' + '  ' + 'sealed interface Response<T>: WirespecShared.Response<T>\n        |' + tmp_1 + '\n        |' + tmp_3 + '\n        |' + tmp_5 + '\n        |' + tmp_7 + '\n        |suspend fun ' + tmp_8 + '(request: Request<*>): Response<*>\n        |' + '  ' + 'companion object{\n        |' + '  ' + '  ' + 'const val PATH = "' + tmp_9 + '"\n        |' + '  ' + '  ' + tmp_10 + '\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n        |');
+      return trimMargin('interface ' + $this_emit.ii_1 + ' {\n        |' + '  ' + 'sealed interface Request<T>: Wirespec.Request<T>\n        |' + tmp + '\n        |' + '  ' + 'sealed interface Response<T>: Wirespec.Response<T>\n        |' + tmp_1 + '\n        |' + tmp_3 + '\n        |' + tmp_5 + '\n        |' + tmp_7 + '\n        |suspend fun ' + tmp_8 + '(request: Request<*>): Response<*>\n        |' + '  ' + 'companion object{\n        |' + '  ' + '  ' + 'const val PATH = "' + tmp_9 + '"\n        |' + '  ' + '  ' + tmp_10 + '\n        |' + '  ' + '  ' + tmp_11 + '\n        |' + '  ' + '}\n        |}\n        |');
     };
   }
   function KotlinEmitter$emitRequestSignature$lambda(this$0) {
     return function (it) {
-      return this$0.zi(it);
+      return this$0.aj(it);
     };
   }
   function KotlinEmitter$emitSegment$lambda(it) {
     var tmp0_subject = it;
     var tmp;
     if (tmp0_subject instanceof Param) {
-      tmp = '{' + it.ui_1.fj_1 + '}';
+      tmp = '{' + it.vi_1.gj_1 + '}';
     } else {
       if (tmp0_subject instanceof Literal) {
-        tmp = it.tj_1;
+        tmp = it.uj_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1958,7 +2017,7 @@
   }
   function KotlinEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + this$0.ej(it.bj_1) + '" to listOf(' + this$0.ej(it.bj_1) + ')';
+      return '"' + this$0.fj(it.cj_1) + '" to listOf(' + this$0.fj(it.cj_1) + ')';
     };
   }
   function KotlinEmitter$emit$lambda_8($this_emit) {
@@ -1966,10 +2025,10 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.tj_1;
+        tmp = $this_emit.uj_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + $this_emit.ui_1.fj_1 + '}';
+          tmp = '${' + $this_emit.vi_1.gj_1 + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -1982,6 +2041,11 @@
       return emit_2(it, this$0);
     };
   }
+  function KotlinEmitter$emitRequestMapper$lambda(this$0) {
+    return function (it) {
+      return emitRequestMapperCondition(it, this$0);
+    };
+  }
   function KotlinEmitter$emitResponseMapper$lambda(this$0) {
     return function (it) {
       return emitResponseMapperCondition_0(it, this$0);
@@ -2004,7 +2068,8 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    tmp.kk_1 = trimMargin('\n        |import kotlin.reflect.KType\n        |import kotlin.reflect.typeOf\n        |object WirespecShared {\n        |' + '  ' + 'enum class Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + '  ' + 'data class Content<T> (val type:String, val body:T )\n        |' + '  ' + 'interface Request<T> { val path:String; val method: Method; val query: Map<String, List<Any?>>; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface Response<T> { val status:Int; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface ContentMapper<B> { fun <T> read(content: Content<B>, valueType: KType): Content<T> fun <T> write(content: Content<T>): Content<B> }\n        |}\n    ');
+    tmp.kk_1 = trimMargin('\n        |package community.flock.wirespec.kotlin\n        |\n        |import java.lang.reflect.Type\n        |\n        |interface Wirespec {\n        |' + '  ' + 'enum class Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + '  ' + 'data class Content<T> (val type:String, val body:T )\n        |' + '  ' + 'interface Request<T> { val path:String; val method: Method; val query: Map<String, List<Any?>>; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface Response<T> { val status:Int; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface ContentMapper<B> { fun <T> read(content: Content<B>, valueType: Type): Content<T> fun <T> write(content: Content<T>): Content<B> }\n        |}\n    ');
+    this.lk_1 = 'import kotlin.reflect.typeOf\nimport kotlin.reflect.jvm.javaType\nimport community.flock.wirespec.kotlin.Wirespec\n';
   }
   protoOf(KotlinEmitter).th = function (ast) {
     var tmp$ret$3;
@@ -2022,7 +2087,7 @@
       var result = item.j3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.jk_1) ? '' : 'package ' + this.jk_1) + '\n                    |' + (Companion_getInstance_2().ok(ast) ? this.kk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.jk_1) ? '' : 'package ' + this.jk_1) + '\n                    |' + (Companion_getInstance_2().xh(ast) ? this.lk_1 : '') + '\n                    |' + result + '\n            ');
       tmp$ret$0 = toString(trimStart(isCharSequence(tmp0_trimStart) ? tmp0_trimStart : THROW_CCE()));
       tmp$ret$1 = to(name, tmp$ret$0);
       tmp0_mapTo.a(tmp$ret$1);
@@ -2031,46 +2096,46 @@
     tmp$ret$3 = tmp$ret$2;
     return tmp$ret$3;
   };
-  protoOf(KotlinEmitter).uj = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda(_this__u8e3s4, this));
-  };
-  protoOf(KotlinEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).vj = function (_this__u8e3s4) {
+    return this.wj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(KotlinEmitter).zi = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.xj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
+  };
+  protoOf(KotlinEmitter).aj = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).ej = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_2(this, _this__u8e3s4));
+  protoOf(KotlinEmitter).fj = function (_this__u8e3s4) {
+    return this.zj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_2(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).fi = function (_this__u8e3s4) {
-    return this.wh(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_3(_this__u8e3s4));
+  protoOf(KotlinEmitter).hi = function (_this__u8e3s4) {
+    return this.yh(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(KotlinEmitter).zj = function (_this__u8e3s4) {
-    return this.ak(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_4(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).ak = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_4(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).bk = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).ck = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).qj = function (_this__u8e3s4) {
-    return this.dk(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(KotlinEmitter).rj = function (_this__u8e3s4) {
+    return this.ek(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(KotlinEmitter).ek = function (_this__u8e3s4) {
-    return this.fk(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).fk = function (_this__u8e3s4) {
+    return this.gk(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).mk = function (_this__u8e3s4) {
-    return Companion_getInstance_0().lk_1.i1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
+  protoOf(KotlinEmitter).ok = function (_this__u8e3s4) {
+    return Companion_getInstance_0().nk_1.i1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
   };
   function toField(_this__u8e3s4, identifier, isNullable) {
     return new Field(new Identifier(identifier), _this__u8e3s4, isNullable);
   }
   function emitContentType_0(_this__u8e3s4) {
-    var tmp = split(_this__u8e3s4.yh_1, ['/', '-']);
+    var tmp = split(_this__u8e3s4.ai_1, ['/', '-']);
     return joinToString(tmp, '', VOID, VOID, VOID, VOID, emitContentType$lambda);
   }
   function groupStatus_0(_this__u8e3s4) {
     var tmp;
-    if (Companion_getInstance_2().gk(_this__u8e3s4)) {
+    if (Companion_getInstance_2().mk(_this__u8e3s4)) {
       var tmp$ret$1;
       // Inline function 'kotlin.text.substring' call
       var tmp$ret$0;
@@ -2079,7 +2144,7 @@
       tmp$ret$1 = tmp$ret$0.substring(0, 1);
       tmp = tmp$ret$1 + 'XX';
     } else {
-      tmp = Companion_getInstance_2().ri(_this__u8e3s4);
+      tmp = Companion_getInstance_2().si(_this__u8e3s4);
     }
     return tmp;
   }
@@ -2088,11 +2153,11 @@
     return tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
   }
   function emitContentType$lambda(it) {
-    return Companion_getInstance_2().ri(it);
+    return Companion_getInstance_2().si(it);
   }
   function Companion_0() {
     Companion_instance_0 = this;
-    this.pk_1 = listOf(['abstract', 'case', 'catch', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', 'finally', 'for', 'forSome', 'if', 'implicit', 'import', 'lazy', 'match', 'new', 'null', 'object', 'override', 'package', 'private', 'protected', 'return', 'sealed', 'super', 'this', 'throw', 'trait', 'true', 'try', 'type', 'val', 'var', 'while', 'with', 'yield']);
+    this.qk_1 = listOf(['abstract', 'case', 'catch', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', 'finally', 'for', 'forSome', 'if', 'implicit', 'import', 'lazy', 'match', 'new', 'null', 'object', 'override', 'package', 'private', 'protected', 'return', 'sealed', 'super', 'this', 'throw', 'trait', 'true', 'try', 'type', 'val', 'var', 'while', 'with', 'yield']);
   }
   var Companion_instance_0;
   function Companion_getInstance_1() {
@@ -2102,28 +2167,28 @@
   }
   function ScalaEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('case class ' + $this_emit.wi_1 + '(\n            |' + this$0.yi($this_emit.xi_1) + '\n            |)\n            |\n            |');
+      return trimMargin('case class ' + $this_emit.xi_1 + '(\n            |' + this$0.zi($this_emit.yi_1) + '\n            |)\n            |\n            |');
     };
   }
   function ScalaEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.zi(it);
+      return this$0.aj(it);
     };
   }
   function ScalaEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return dropLast(joinToString($this_emit.aj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda(this$0)), 1);
+      return dropLast(joinToString($this_emit.bj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda(this$0)), 1);
     };
   }
   function ScalaEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + 'val ' + this$0.ej($this_emit.bj_1) + ': ' + ($this_emit.dj_1 ? 'Option[' + this$0.fi($this_emit.cj_1) + ']' : this$0.fi($this_emit.cj_1)) + ',';
+      return '  ' + 'val ' + this$0.fj($this_emit.cj_1) + ': ' + ($this_emit.ej_1 ? 'Option[' + this$0.hi($this_emit.dj_1) + ']' : this$0.hi($this_emit.dj_1)) + ',';
     };
   }
   function ScalaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return Companion_getInstance_1().pk_1.i1($this_emit.fj_1) ? '`' + $this_emit.fj_1 + '`' : $this_emit.fj_1;
+      return Companion_getInstance_1().qk_1.i1($this_emit.gj_1) ? '`' + $this_emit.gj_1 + '`' : $this_emit.gj_1;
     };
   }
   function ScalaEmitter$emit$lambda_3($this_emit) {
@@ -2136,10 +2201,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.jj_1;
+          tmp = $this_emit.kj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.gj_1;
+            var tmp1_subject = $this_emit.hj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -2166,7 +2231,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.si() ? 'List[' + tmp0_let + ']' : tmp0_let;
+      tmp$ret$0 = $this_emit.ti() ? 'List[' + tmp0_let + ']' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       return tmp$ret$1;
     };
@@ -2192,20 +2257,20 @@
       // Inline function 'kotlin.js.asDynamic' call
       tmp$ret$0 = tmp0_uppercase;
       tmp$ret$1 = tmp$ret$0.toUpperCase();
-      return '  ' + 'final case object ' + tmp$ret$1 + ' extends ' + $this_emit.mj_1 + '(label = "' + it + '")';
+      return '  ' + 'final case object ' + tmp$ret$1 + ' extends ' + $this_emit.nj_1 + '(label = "' + it + '")';
     };
   }
   function ScalaEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return trimMargin('\n        |sealed abstract class ' + $this_emit.mj_1 + '(val label: String)\n        |object ' + $this_emit.mj_1 + ' {\n        |' + joinToString($this_emit.nj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
+      return trimMargin('\n        |sealed abstract class ' + $this_emit.nj_1 + '(val label: String)\n        |object ' + $this_emit.nj_1 + ' {\n        |' + joinToString($this_emit.oj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
     };
   }
   function ScalaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      var tmp = this$0.qj($this_emit.pj_1);
+      var tmp = this$0.rj($this_emit.qj_1);
       Companion_getInstance_2();
-      return trimMargin('case class ' + $this_emit.oj_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.oj_1 + 'Ops(val that: ' + $this_emit.oj_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
+      return trimMargin('case class ' + $this_emit.pj_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.pj_1 + 'Ops(val that: ' + $this_emit.pj_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
     };
   }
   function ScalaEmitter$emit$lambda_6($this_emit) {
@@ -2214,7 +2279,7 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.rj_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
+      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.sj_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
     };
   }
   function ScalaEmitter$emit$lambda_7() {
@@ -2225,7 +2290,8 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.sk_1 = packageName;
+    this.tk_1 = packageName;
+    this.uk_1 = '';
   }
   protoOf(ScalaEmitter).th = function (ast) {
     var tmp$ret$2;
@@ -2241,54 +2307,54 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>' call
       var name = item.i3();
       var result = item.j3();
-      tmp$ret$0 = to(name, isBlank(this.sk_1) ? '' : 'package ' + this.sk_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, isBlank(this.tk_1) ? '' : 'package ' + this.tk_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   };
-  protoOf(ScalaEmitter).uj = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
-  };
-  protoOf(ScalaEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(ScalaEmitter).vj = function (_this__u8e3s4) {
+    return this.wj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(ScalaEmitter).zi = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.xj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
+  };
+  protoOf(ScalaEmitter).aj = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(ScalaEmitter).ej = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
+  protoOf(ScalaEmitter).fj = function (_this__u8e3s4) {
+    return this.zj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).fi = function (_this__u8e3s4) {
-    return this.wh(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_3(_this__u8e3s4));
+  protoOf(ScalaEmitter).hi = function (_this__u8e3s4) {
+    return this.yh(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).zj = function (_this__u8e3s4) {
-    return this.ak(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(ScalaEmitter).ak = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).bk = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(ScalaEmitter).ck = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(ScalaEmitter).qj = function (_this__u8e3s4) {
-    return this.dk(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(ScalaEmitter).rj = function (_this__u8e3s4) {
+    return this.ek(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).ek = function (_this__u8e3s4) {
-    return this.fk(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_7);
+  protoOf(ScalaEmitter).fk = function (_this__u8e3s4) {
+    return this.gk(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_7);
   };
   function emitType(_this__u8e3s4, $this) {
     return '`' + joinToString(_this__u8e3s4, '', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitType$lambda($this)) + '`';
   }
   function emitType_0(_this__u8e3s4, $this) {
-    return $this.ti(_this__u8e3s4, $this.rh_1, TypeScriptEmitter$emitType$lambda_0(_this__u8e3s4, $this));
+    return $this.ui(_this__u8e3s4, $this.rh_1, TypeScriptEmitter$emitType$lambda_0(_this__u8e3s4, $this));
   }
   function emitName(_this__u8e3s4, $this) {
-    var tmp0_safe_receiver = _this__u8e3s4.xh_1;
+    var tmp0_safe_receiver = _this__u8e3s4.zh_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
     return 'Request' + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
   function emitName_0(_this__u8e3s4, $this) {
-    var tmp = 'Response' + Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
-    var tmp0_safe_receiver = _this__u8e3s4.pi_1;
+    var tmp = 'Response' + Companion_getInstance_2().si(_this__u8e3s4.qi_1);
+    var tmp0_safe_receiver = _this__u8e3s4.ri_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
     return tmp + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
@@ -2299,32 +2365,32 @@
     return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitPath$lambda($this));
   }
   function emit_3(_this__u8e3s4, $this) {
-    return $this.ti(_this__u8e3s4, $this.rh_1, TypeScriptEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.ui(_this__u8e3s4, $this.rh_1, TypeScriptEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function TypeScriptEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('export type ' + $this_emit.wi_1 + ' = {\n            |' + this$0.yi($this_emit.xi_1) + '\n            |}\n            |\n            |');
+      return trimMargin('export type ' + $this_emit.xi_1 + ' = {\n            |' + this$0.zi($this_emit.yi_1) + '\n            |}\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.zi(it);
+      return this$0.aj(it);
     };
   }
   function TypeScriptEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.aj_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.bj_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0));
     };
   }
   function TypeScriptEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + this$0.ej($this_emit.bj_1) + ($this_emit.dj_1 ? '?' : '') + ': ' + this$0.fi($this_emit.cj_1);
+      return '  ' + this$0.fj($this_emit.cj_1) + ($this_emit.ej_1 ? '?' : '') + ': ' + this$0.hi($this_emit.dj_1);
     };
   }
   function TypeScriptEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return $this_emit.fj_1;
+      return $this_emit.gj_1;
     };
   }
   function TypeScriptEmitter$emit$lambda_3($this_emit) {
@@ -2339,10 +2405,10 @@
         tmp = 'any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.jj_1;
+          tmp = $this_emit.kj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.gj_1;
+            var tmp1_subject = $this_emit.hj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -2369,13 +2435,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.si() ? tmp0_let + '[]' : tmp0_let;
+      tmp$ret$0 = $this_emit.ti() ? tmp0_let + '[]' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       var tmp1_let = tmp$ret$1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.nk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.pk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -2385,28 +2451,28 @@
   }
   function TypeScriptEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return 'type ' + $this_emit.mj_1 + ' = ' + joinToString($this_emit.nj_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
+      return 'type ' + $this_emit.nj_1 + ' = ' + joinToString($this_emit.oj_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
     };
   }
   function TypeScriptEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      return trimMargin('type ' + $this_emit.oj_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.oj_1 + ' = (type: ' + $this_emit.oj_1 + ') => (' + this$0.qj($this_emit.pj_1) + ').test(type.value);\n            |\n            |');
+      return trimMargin('type ' + $this_emit.pj_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.pj_1 + ' = (type: ' + $this_emit.pj_1 + ') => (' + this$0.rj($this_emit.qj_1) + ').test(type.value);\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return "new RegExp('" + dropLast(drop($this_emit.rj_1, 1), 1) + "')";
+      return "new RegExp('" + dropLast(drop($this_emit.sj_1, 1), 1) + "')";
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
     return function (it) {
       Companion_getInstance_2();
       var tmp = emitName(it, this$0);
-      var tmp_0 = emitType($this_emit.ii_1, this$0);
+      var tmp_0 = emitType($this_emit.ki_1, this$0);
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = $this_emit.ki_1;
+      var tmp1_map = $this_emit.mi_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -2415,7 +2481,7 @@
         var item = tmp0_iterator.e();
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = this$0.zi(item);
+        tmp$ret$0 = this$0.aj(item);
         tmp0_mapTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapTo;
@@ -2423,7 +2489,7 @@
       var tmp_1 = joinToString(tmp$ret$2, ',');
       var tmp$ret$5;
       // Inline function 'kotlin.collections.map' call
-      var tmp3_map = $this_emit.ji_1;
+      var tmp3_map = $this_emit.li_1;
       var tmp$ret$4;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp2_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp3_map, 10));
@@ -2432,13 +2498,13 @@
         var item_0 = tmp0_iterator_0.e();
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$3 = this$0.zi(item_0);
+        tmp$ret$3 = this$0.aj(item_0);
         tmp2_mapTo.a(tmp$ret$3);
       }
       tmp$ret$4 = tmp2_mapTo;
       tmp$ret$5 = tmp$ret$4;
       var tmp_2 = joinToString(tmp$ret$5, ',');
-      var tmp0_safe_receiver = it.xh_1;
+      var tmp0_safe_receiver = it.zh_1;
       var tmp_3;
       if (tmp0_safe_receiver == null) {
         tmp_3 = null;
@@ -2448,12 +2514,12 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$6;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$6 = ', content: { type: "' + tmp0_safe_receiver.yh_1 + '", body: ' + this$0.fi(tmp0_safe_receiver.zh_1) + ' }';
+        tmp$ret$6 = ', content: { type: "' + tmp0_safe_receiver.ai_1 + '", body: ' + this$0.hi(tmp0_safe_receiver.bi_1) + ' }';
         tmp$ret$7 = tmp$ret$6;
         tmp_3 = tmp$ret$7;
       }
       var tmp1_elvis_lhs = tmp_3;
-      return '  ' + 'type ' + tmp + ' = { path: ' + tmp_0 + ', method: "' + $this_emit.hi_1 + '", headers: {' + tmp_1 + '}, query: {' + tmp_2 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' } ';
+      return '  ' + 'type ' + tmp + ' = { path: ' + tmp_0 + ', method: "' + $this_emit.ji_1 + '", headers: {' + tmp_1 + '}, query: {' + tmp_2 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' } ';
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_2(this$0) {
@@ -2465,8 +2531,8 @@
     return function (it) {
       Companion_getInstance_2();
       var tmp = emitName_0(it, this$0);
-      var tmp_0 = Companion_getInstance_2().gk(it.oi_1) ? it.oi_1 : 'number';
-      var tmp0_safe_receiver = it.pi_1;
+      var tmp_0 = Companion_getInstance_2().mk(it.qi_1) ? it.qi_1 : 'number';
+      var tmp0_safe_receiver = it.ri_1;
       var tmp_1;
       if (tmp0_safe_receiver == null) {
         tmp_1 = null;
@@ -2476,7 +2542,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', content: { type: "' + tmp0_safe_receiver.yh_1 + '", body: ' + this$0.fi(tmp0_safe_receiver.zh_1) + ' }';
+        tmp$ret$0 = ', content: { type: "' + tmp0_safe_receiver.ai_1 + '", body: ' + this$0.hi(tmp0_safe_receiver.bi_1) + ' }';
         tmp$ret$1 = tmp$ret$0;
         tmp_1 = tmp$ret$1;
       }
@@ -2491,18 +2557,18 @@
   }
   function TypeScriptEmitter$emit$lambda$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.zi(it);
+      return this$0.aj(it);
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit) {
     return function (it) {
-      var tmp = Companion_getInstance_2().sj(emitName(it, this$0));
-      var tmp_0 = Companion_getInstance_2().wk($this_emit, it.xh_1);
+      var tmp = Companion_getInstance_2().tj(emitName(it, this$0));
+      var tmp_0 = Companion_getInstance_2().zk($this_emit, it.zh_1);
       var tmp_1 = joinToString(tmp_0, ',', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda$lambda(this$0));
-      var tmp_2 = emitPath_1($this_emit.ii_1, this$0);
-      var tmp_3 = emitMap_1($this_emit.ji_1, this$0);
-      var tmp_4 = emitMap_1($this_emit.ki_1, this$0);
-      var tmp0_safe_receiver = it.xh_1;
+      var tmp_2 = emitPath_1($this_emit.ki_1, this$0);
+      var tmp_3 = emitMap_1($this_emit.li_1, this$0);
+      var tmp_4 = emitMap_1($this_emit.mi_1, this$0);
+      var tmp0_safe_receiver = it.zh_1;
       var tmp_5;
       if (tmp0_safe_receiver == null) {
         tmp_5 = null;
@@ -2512,33 +2578,33 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', content: {type: "' + tmp0_safe_receiver.yh_1 + '", body}';
+        tmp$ret$0 = ', content: {type: "' + tmp0_safe_receiver.ai_1 + '", body}';
         tmp$ret$1 = tmp$ret$0;
         tmp_5 = tmp$ret$1;
       }
       var tmp1_elvis_lhs = tmp_5;
-      return 'export const ' + tmp + ' = (' + tmp_1 + ') => ({path: `' + tmp_2 + '`, method: "' + $this_emit.hi_1.p4_1 + '", query: {' + tmp_3 + '}, headers: {' + tmp_4 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + '} as const)';
+      return 'export const ' + tmp + ' = (' + tmp_1 + ') => ({path: `' + tmp_2 + '`, method: "' + $this_emit.ji_1.p4_1 + '", query: {' + tmp_3 + '}, headers: {' + tmp_4 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + '} as const)';
     };
   }
   function TypeScriptEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
-      var tmp = toSet($this_emit.mi_1);
+      var tmp = toSet($this_emit.oi_1);
       var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit));
       Companion_getInstance_2();
-      var tmp_1 = toSet($this_emit.mi_1);
+      var tmp_1 = toSet($this_emit.oi_1);
       var tmp_2 = joinToString(tmp_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_2(this$0));
-      var tmp_3 = toSet($this_emit.ni_1);
+      var tmp_3 = toSet($this_emit.pi_1);
       var tmp_4 = joinToString(tmp_3, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_3(this$0));
       Companion_getInstance_2();
-      var tmp_5 = toSet($this_emit.ni_1);
+      var tmp_5 = toSet($this_emit.pi_1);
       var tmp_6 = joinToString(tmp_5, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_4(this$0));
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_7 = Companion_getInstance_2().sj($this_emit.gi_1);
+      var tmp_7 = Companion_getInstance_2().tj($this_emit.ii_1);
       Companion_getInstance_2();
       Companion_getInstance_2();
-      return trimMargin('\n          |export namespace ' + $this_emit.gi_1 + ' {\n          |' + tmp_0 + '\n          |' + '  ' + 'export type Request = ' + tmp_2 + '\n          |' + tmp_4 + '\n          |' + '  ' + 'export type Response = ' + tmp_6 + '\n          |' + '  ' + 'export type Call = {\n          |' + '  ' + '  ' + tmp_7 + ':(request: Request) => Promise<Response>\n          |' + '  ' + '}\n          |' + '  ' + joinToString($this_emit.mi_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit)) + '\n          |}\n          |\n        ');
+      return trimMargin('\n          |export namespace ' + $this_emit.ii_1 + ' {\n          |' + tmp_0 + '\n          |' + '  ' + 'export type Request = ' + tmp_2 + '\n          |' + tmp_4 + '\n          |' + '  ' + 'export type Response = ' + tmp_6 + '\n          |' + '  ' + 'export type Call = {\n          |' + '  ' + '  ' + tmp_7 + ':(request: Request) => Promise<Response>\n          |' + '  ' + '}\n          |' + '  ' + joinToString($this_emit.oi_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit)) + '\n          |}\n          |\n        ');
     };
   }
   function TypeScriptEmitter$emitType$lambda(this$0) {
@@ -2551,10 +2617,10 @@
       var tmp0_subject = $this_emitType;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emitType.tj_1;
+        tmp = $this_emitType.uj_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + this$0.fi($this_emitType.vi_1) + '}';
+          tmp = '${' + this$0.hi($this_emitType.wi_1) + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -2564,7 +2630,7 @@
   }
   function TypeScriptEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + this$0.ej(it.bj_1) + '": ' + this$0.ej(it.bj_1);
+      return '"' + this$0.fj(it.cj_1) + '": ' + this$0.fj(it.cj_1);
     };
   }
   function TypeScriptEmitter$emitPath$lambda(this$0) {
@@ -2577,10 +2643,10 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.tj_1;
+        tmp = $this_emit.uj_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + $this_emit.ui_1.fj_1 + '}';
+          tmp = '${' + $this_emit.vi_1.gj_1 + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -2591,12 +2657,13 @@
   function TypeScriptEmitter(logger) {
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
+    this.xk_1 = '';
     var tmp = this;
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    tmp.vk_1 = trimMargin('\n        |export namespace WirespecShared {\n        |' + '  ' + 'type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
+    tmp.yk_1 = trimMargin('\n        |export namespace WirespecShared {\n        |' + '  ' + 'type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
   }
   protoOf(TypeScriptEmitter).th = function (ast) {
     var tmp$ret$3;
@@ -2614,7 +2681,7 @@
       var result = item.j3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_2().ok(ast) ? this.vk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_2().xh(ast) ? this.yk_1 : '') + '\n                    |' + result + '\n            ');
       tmp$ret$0 = toString(trimStart(isCharSequence(tmp0_trimStart) ? tmp0_trimStart : THROW_CCE()));
       tmp$ret$1 = to(name, tmp$ret$0);
       tmp0_mapTo.a(tmp$ret$1);
@@ -2623,57 +2690,57 @@
     tmp$ret$3 = tmp$ret$2;
     return tmp$ret$3;
   };
-  protoOf(TypeScriptEmitter).uj = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
-  };
-  protoOf(TypeScriptEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).vj = function (_this__u8e3s4) {
+    return this.wj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(TypeScriptEmitter).zi = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.xj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(TypeScriptEmitter).ej = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).aj = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).fi = function (_this__u8e3s4) {
-    return this.wh(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_3(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).fj = function (_this__u8e3s4) {
+    return this.zj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).zj = function (_this__u8e3s4) {
-    return this.ak(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).hi = function (_this__u8e3s4) {
+    return this.yh(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).bk = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).ak = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).qj = function (_this__u8e3s4) {
-    return this.dk(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).ck = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(TypeScriptEmitter).ek = function (_this__u8e3s4) {
-    return this.fk(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).rj = function (_this__u8e3s4) {
+    return this.ek(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
+  };
+  protoOf(TypeScriptEmitter).fk = function (_this__u8e3s4) {
+    return this.gk(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function WirespecEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('type ' + $this_emit.wi_1 + ' {\n            |' + this$0.yi($this_emit.xi_1) + '\n            |}\n            |');
+      return trimMargin('type ' + $this_emit.xi_1 + ' {\n            |' + this$0.zi($this_emit.yi_1) + '\n            |}\n            |');
     };
   }
   function WirespecEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.zi(it);
+      return this$0.aj(it);
     };
   }
   function WirespecEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return dropLast(joinToString($this_emit.aj_1, '\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda$lambda(this$0)), 1);
+      return dropLast(joinToString($this_emit.bj_1, '\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda$lambda(this$0)), 1);
     };
   }
   function WirespecEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + this$0.ej($this_emit.bj_1) + ($this_emit.dj_1 ? '?' : '') + ': ' + this$0.fi($this_emit.cj_1) + ',';
+      return '  ' + this$0.fj($this_emit.cj_1) + ($this_emit.ej_1 ? '?' : '') + ': ' + this$0.hi($this_emit.dj_1) + ',';
     };
   }
   function WirespecEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return $this_emit.fj_1;
+      return $this_emit.gj_1;
     };
   }
   function WirespecEmitter$emit$lambda_3($this_emit) {
@@ -2686,10 +2753,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.jj_1;
+          tmp = $this_emit.kj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.gj_1;
+            var tmp1_subject = $this_emit.hj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -2716,7 +2783,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.WirespecEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.si() ? tmp0_let + '[]' : tmp0_let;
+      tmp$ret$0 = $this_emit.ti() ? tmp0_let + '[]' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       return tmp$ret$1;
     };
@@ -2724,17 +2791,17 @@
   function WirespecEmitter$emit$lambda_4($this_emit) {
     return function () {
       Companion_getInstance_2();
-      return 'enum ' + $this_emit.mj_1 + ' {\n' + '  ' + joinToString($this_emit.nj_1, ', ') + '\n}\n';
+      return 'enum ' + $this_emit.nj_1 + ' {\n' + '  ' + joinToString($this_emit.oj_1, ', ') + '\n}\n';
     };
   }
   function WirespecEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return 'refined ' + $this_emit.oj_1 + ' ' + this$0.qj($this_emit.pj_1) + '\n';
+      return 'refined ' + $this_emit.pj_1 + ' ' + this$0.rj($this_emit.qj_1) + '\n';
     };
   }
   function WirespecEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return '/' + dropLast(drop($this_emit.rj_1, 1), 1) + '/g';
+      return '/' + dropLast(drop($this_emit.sj_1, 1), 1) + '/g';
     };
   }
   function WirespecEmitter$emit$lambda_7() {
@@ -2743,33 +2810,34 @@
   function WirespecEmitter(logger) {
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
+    this.cl_1 = '';
   }
-  protoOf(WirespecEmitter).uj = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
-  };
-  protoOf(WirespecEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(WirespecEmitter).vj = function (_this__u8e3s4) {
+    return this.wj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(WirespecEmitter).zi = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.xj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
+  };
+  protoOf(WirespecEmitter).aj = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(WirespecEmitter).ej = function (_this__u8e3s4) {
-    return this.yj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
+  protoOf(WirespecEmitter).fj = function (_this__u8e3s4) {
+    return this.zj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).fi = function (_this__u8e3s4) {
-    return this.wh(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_3(_this__u8e3s4));
+  protoOf(WirespecEmitter).hi = function (_this__u8e3s4) {
+    return this.yh(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).zj = function (_this__u8e3s4) {
-    return this.ak(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(WirespecEmitter).ak = function (_this__u8e3s4) {
+    return this.bk(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).bk = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(WirespecEmitter).ck = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(WirespecEmitter).qj = function (_this__u8e3s4) {
-    return this.dk(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(WirespecEmitter).rj = function (_this__u8e3s4) {
+    return this.ek(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).ek = function (_this__u8e3s4) {
-    return this.fk(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_7);
+  protoOf(WirespecEmitter).fk = function (_this__u8e3s4) {
+    return this.gk(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_7);
   };
   function get_DEFAULT_PACKAGE_NAME() {
     return DEFAULT_PACKAGE_NAME;
@@ -2777,9 +2845,9 @@
   var DEFAULT_PACKAGE_NAME;
   function Companion_1() {
     Companion_instance_1 = this;
-    this.qi_1 = '  ';
+    this.wh_1 = '  ';
   }
-  protoOf(Companion_1).ri = function (_this__u8e3s4) {
+  protoOf(Companion_1).si = function (_this__u8e3s4) {
     var tmp$ret$6;
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
@@ -2813,7 +2881,7 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
-  protoOf(Companion_1).sj = function (_this__u8e3s4) {
+  protoOf(Companion_1).tj = function (_this__u8e3s4) {
     var tmp$ret$6;
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
@@ -2847,7 +2915,7 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
-  protoOf(Companion_1).ok = function (_this__u8e3s4) {
+  protoOf(Companion_1).xh = function (_this__u8e3s4) {
     var tmp$ret$0;
     $l$block_0: {
       // Inline function 'kotlin.collections.any' call
@@ -2876,12 +2944,12 @@
     }
     return tmp$ret$0;
   };
-  protoOf(Companion_1).wk = function (_this__u8e3s4, content) {
+  protoOf(Companion_1).zk = function (_this__u8e3s4, content) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
     var tmp$ret$1;
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp1_filterIsInstance = _this__u8e3s4.ii_1;
+    var tmp1_filterIsInstance = _this__u8e3s4.ki_1;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
@@ -2903,18 +2971,18 @@
       var item = tmp0_iterator_0.e();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.common.Companion.joinParameters.<anonymous>' call
-      tmp$ret$2 = new Field(item.ui_1, item.vi_1, false);
+      tmp$ret$2 = new Field(item.vi_1, item.wi_1, false);
       tmp2_mapTo.a(tmp$ret$2);
     }
     tmp$ret$3 = tmp2_mapTo;
     tmp$ret$4 = tmp$ret$3;
     var pathField = tmp$ret$4;
-    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ji_1), _this__u8e3s4.ki_1), _this__u8e3s4.li_1);
+    var parameters = plus(plus(plus(pathField, _this__u8e3s4.li_1), _this__u8e3s4.mi_1), _this__u8e3s4.ni_1);
     var tmp0_safe_receiver = content;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.bi_1;
     return filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
   };
-  protoOf(Companion_1).gk = function (_this__u8e3s4) {
+  protoOf(Companion_1).mk = function (_this__u8e3s4) {
     return !(toIntOrNull(_this__u8e3s4) == null);
   };
   var Companion_instance_1;
@@ -2949,16 +3017,16 @@
       var tmp0_subject = item;
       var tmp;
       if (tmp0_subject instanceof Type_0) {
-        tmp = to(item.wi_1, this.uj(item));
+        tmp = to(item.xi_1, this.vj(item));
       } else {
         if (tmp0_subject instanceof Endpoint) {
-          tmp = to(item.gi_1, this.ek(item));
+          tmp = to(item.ii_1, this.fk(item));
         } else {
           if (tmp0_subject instanceof Enum_0) {
-            tmp = to(item.mj_1, this.zj(item));
+            tmp = to(item.nj_1, this.ak(item));
           } else {
             if (tmp0_subject instanceof Refined) {
-              tmp = to(item.oj_1, this.bk(item));
+              tmp = to(item.pj_1, this.ck(item));
             } else {
               noWhenBranchMatchedException();
             }
@@ -2997,7 +3065,7 @@
     captureStack(this, NextException);
   }
   function WrongTokenException(expected, actual) {
-    ParserException.call(this, actual.cl_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.al_1).fc() + ' at line ' + actual.cl_1.dl_1 + ' and position ' + (actual.cl_1.el_1 - actual.bl_1.length | 0));
+    ParserException.call(this, actual.gl_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.el_1).fc() + ' at line ' + actual.gl_1.hl_1 + ' and position ' + (actual.gl_1.il_1 - actual.fl_1.length | 0));
     captureStack(this, WrongTokenException);
   }
   function NullTokenException(message, coordinates) {
@@ -3015,7 +3083,7 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.gl_1 = coordinates;
+    this.kl_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     var tmp$ret$4;
@@ -3023,10 +3091,10 @@
     var tmp$ret$0;
     // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
     var tmp2__anonymous__z9zvc9 = _this__u8e3s4.ug_1;
-    var tmp0_subject = tmp2__anonymous__z9zvc9.al_1;
+    var tmp0_subject = tmp2__anonymous__z9zvc9.el_1;
     var tmp;
     if (tmp0_subject instanceof CustomRegex) {
-      tmp = tmp2__anonymous__z9zvc9.hl(VOID, '"' + dropLast(drop(tmp2__anonymous__z9zvc9.bl_1, 1), 2) + '"');
+      tmp = tmp2__anonymous__z9zvc9.ll(VOID, '"' + dropLast(drop(tmp2__anonymous__z9zvc9.fl_1, 1), 2) + '"');
     } else {
       tmp = tmp2__anonymous__z9zvc9;
     }
@@ -3043,10 +3111,10 @@
       var item = tmp0_iterator.e();
       var tmp$ret$1;
       // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
-      var tmp0_subject_0 = item.al_1;
+      var tmp0_subject_0 = item.el_1;
       var tmp_1;
       if (tmp0_subject_0 instanceof CustomRegex) {
-        tmp_1 = item.hl(VOID, '"' + dropLast(drop(item.bl_1, 1), 2) + '"');
+        tmp_1 = item.ll(VOID, '"' + dropLast(drop(item.fl_1, 1), 2) + '"');
       } else {
         tmp_1 = item;
       }
@@ -3087,29 +3155,29 @@
   }
   function Any(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.il_1 = isIterable;
-    this.jl_1 = isMap;
+    this.ml_1 = isIterable;
+    this.nl_1 = isMap;
   }
-  protoOf(Any).si = function () {
-    return this.il_1;
+  protoOf(Any).ti = function () {
+    return this.ml_1;
   };
-  protoOf(Any).nk = function () {
-    return this.jl_1;
+  protoOf(Any).pk = function () {
+    return this.nl_1;
   };
-  protoOf(Any).kl = function (isIterable, isMap) {
+  protoOf(Any).ol = function (isIterable, isMap) {
     return new Any(isIterable, isMap);
   };
-  protoOf(Any).ll = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.il_1 : isIterable;
-    isMap = isMap === VOID ? this.jl_1 : isMap;
-    return $super === VOID ? this.kl(isIterable, isMap) : $super.kl.call(this, isIterable, isMap);
+  protoOf(Any).pl = function (isIterable, isMap, $super) {
+    isIterable = isIterable === VOID ? this.ml_1 : isIterable;
+    isMap = isMap === VOID ? this.nl_1 : isMap;
+    return $super === VOID ? this.ol(isIterable, isMap) : $super.ol.call(this, isIterable, isMap);
   };
   protoOf(Any).toString = function () {
-    return 'Any(isIterable=' + this.il_1 + ', isMap=' + this.jl_1 + ')';
+    return 'Any(isIterable=' + this.ml_1 + ', isMap=' + this.nl_1 + ')';
   };
   protoOf(Any).hashCode = function () {
-    var result = this.il_1 | 0;
-    result = imul(result, 31) + (this.jl_1 | 0) | 0;
+    var result = this.ml_1 | 0;
+    result = imul(result, 31) + (this.nl_1 | 0) | 0;
     return result;
   };
   protoOf(Any).equals = function (other) {
@@ -3118,40 +3186,40 @@
     if (!(other instanceof Any))
       return false;
     var tmp0_other_with_cast = other instanceof Any ? other : THROW_CCE();
-    if (!(this.il_1 === tmp0_other_with_cast.il_1))
+    if (!(this.ml_1 === tmp0_other_with_cast.ml_1))
       return false;
-    if (!(this.jl_1 === tmp0_other_with_cast.jl_1))
+    if (!(this.nl_1 === tmp0_other_with_cast.nl_1))
       return false;
     return true;
   };
   function Custom(value, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.jj_1 = value;
-    this.kj_1 = isIterable;
-    this.lj_1 = isMap;
+    this.kj_1 = value;
+    this.lj_1 = isIterable;
+    this.mj_1 = isMap;
   }
-  protoOf(Custom).si = function () {
-    return this.kj_1;
-  };
-  protoOf(Custom).nk = function () {
+  protoOf(Custom).ti = function () {
     return this.lj_1;
   };
-  protoOf(Custom).ml = function (value, isIterable, isMap) {
+  protoOf(Custom).pk = function () {
+    return this.mj_1;
+  };
+  protoOf(Custom).ql = function (value, isIterable, isMap) {
     return new Custom(value, isIterable, isMap);
   };
-  protoOf(Custom).nl = function (value, isIterable, isMap, $super) {
-    value = value === VOID ? this.jj_1 : value;
-    isIterable = isIterable === VOID ? this.kj_1 : isIterable;
-    isMap = isMap === VOID ? this.lj_1 : isMap;
-    return $super === VOID ? this.ml(value, isIterable, isMap) : $super.ml.call(this, value, isIterable, isMap);
+  protoOf(Custom).rl = function (value, isIterable, isMap, $super) {
+    value = value === VOID ? this.kj_1 : value;
+    isIterable = isIterable === VOID ? this.lj_1 : isIterable;
+    isMap = isMap === VOID ? this.mj_1 : isMap;
+    return $super === VOID ? this.ql(value, isIterable, isMap) : $super.ql.call(this, value, isIterable, isMap);
   };
   protoOf(Custom).toString = function () {
-    return 'Custom(value=' + this.jj_1 + ', isIterable=' + this.kj_1 + ', isMap=' + this.lj_1 + ')';
+    return 'Custom(value=' + this.kj_1 + ', isIterable=' + this.lj_1 + ', isMap=' + this.mj_1 + ')';
   };
   protoOf(Custom).hashCode = function () {
-    var result = getStringHashCode(this.jj_1);
-    result = imul(result, 31) + (this.kj_1 | 0) | 0;
+    var result = getStringHashCode(this.kj_1);
     result = imul(result, 31) + (this.lj_1 | 0) | 0;
+    result = imul(result, 31) + (this.mj_1 | 0) | 0;
     return result;
   };
   protoOf(Custom).equals = function (other) {
@@ -3160,42 +3228,42 @@
     if (!(other instanceof Custom))
       return false;
     var tmp0_other_with_cast = other instanceof Custom ? other : THROW_CCE();
-    if (!(this.jj_1 === tmp0_other_with_cast.jj_1))
-      return false;
     if (!(this.kj_1 === tmp0_other_with_cast.kj_1))
       return false;
     if (!(this.lj_1 === tmp0_other_with_cast.lj_1))
       return false;
+    if (!(this.mj_1 === tmp0_other_with_cast.mj_1))
+      return false;
     return true;
   };
   function Primitive(type, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.gj_1 = type;
-    this.hj_1 = isIterable;
-    this.ij_1 = isMap;
+    this.hj_1 = type;
+    this.ij_1 = isIterable;
+    this.jj_1 = isMap;
   }
-  protoOf(Primitive).si = function () {
-    return this.hj_1;
-  };
-  protoOf(Primitive).nk = function () {
+  protoOf(Primitive).ti = function () {
     return this.ij_1;
   };
-  protoOf(Primitive).ol = function (type, isIterable, isMap) {
+  protoOf(Primitive).pk = function () {
+    return this.jj_1;
+  };
+  protoOf(Primitive).sl = function (type, isIterable, isMap) {
     return new Primitive(type, isIterable, isMap);
   };
-  protoOf(Primitive).pl = function (type, isIterable, isMap, $super) {
-    type = type === VOID ? this.gj_1 : type;
-    isIterable = isIterable === VOID ? this.hj_1 : isIterable;
-    isMap = isMap === VOID ? this.ij_1 : isMap;
-    return $super === VOID ? this.ol(type, isIterable, isMap) : $super.ol.call(this, type, isIterable, isMap);
+  protoOf(Primitive).tl = function (type, isIterable, isMap, $super) {
+    type = type === VOID ? this.hj_1 : type;
+    isIterable = isIterable === VOID ? this.ij_1 : isIterable;
+    isMap = isMap === VOID ? this.jj_1 : isMap;
+    return $super === VOID ? this.sl(type, isIterable, isMap) : $super.sl.call(this, type, isIterable, isMap);
   };
   protoOf(Primitive).toString = function () {
-    return 'Primitive(type=' + this.gj_1 + ', isIterable=' + this.hj_1 + ', isMap=' + this.ij_1 + ')';
+    return 'Primitive(type=' + this.hj_1 + ', isIterable=' + this.ij_1 + ', isMap=' + this.jj_1 + ')';
   };
   protoOf(Primitive).hashCode = function () {
-    var result = this.gj_1.hashCode();
-    result = imul(result, 31) + (this.hj_1 | 0) | 0;
+    var result = this.hj_1.hashCode();
     result = imul(result, 31) + (this.ij_1 | 0) | 0;
+    result = imul(result, 31) + (this.jj_1 | 0) | 0;
     return result;
   };
   protoOf(Primitive).equals = function (other) {
@@ -3204,22 +3272,22 @@
     if (!(other instanceof Primitive))
       return false;
     var tmp0_other_with_cast = other instanceof Primitive ? other : THROW_CCE();
-    if (!this.gj_1.equals(tmp0_other_with_cast.gj_1))
-      return false;
-    if (!(this.hj_1 === tmp0_other_with_cast.hj_1))
+    if (!this.hj_1.equals(tmp0_other_with_cast.hj_1))
       return false;
     if (!(this.ij_1 === tmp0_other_with_cast.ij_1))
       return false;
+    if (!(this.jj_1 === tmp0_other_with_cast.jj_1))
+      return false;
     return true;
   };
   function Identifier(value) {
-    this.fj_1 = value;
+    this.gj_1 = value;
   }
   protoOf(Identifier).toString = function () {
-    return 'Identifier(value=' + this.fj_1 + ')';
+    return 'Identifier(value=' + this.gj_1 + ')';
   };
   protoOf(Identifier).hashCode = function () {
-    return getStringHashCode(this.fj_1);
+    return getStringHashCode(this.gj_1);
   };
   protoOf(Identifier).equals = function (other) {
     if (this === other)
@@ -3227,22 +3295,22 @@
     if (!(other instanceof Identifier))
       return false;
     var tmp0_other_with_cast = other instanceof Identifier ? other : THROW_CCE();
-    if (!(this.fj_1 === tmp0_other_with_cast.fj_1))
+    if (!(this.gj_1 === tmp0_other_with_cast.gj_1))
       return false;
     return true;
   };
   function Field(identifier, reference, isNullable) {
-    this.bj_1 = identifier;
-    this.cj_1 = reference;
-    this.dj_1 = isNullable;
+    this.cj_1 = identifier;
+    this.dj_1 = reference;
+    this.ej_1 = isNullable;
   }
   protoOf(Field).toString = function () {
-    return 'Field(identifier=' + this.bj_1 + ', reference=' + this.cj_1 + ', isNullable=' + this.dj_1 + ')';
+    return 'Field(identifier=' + this.cj_1 + ', reference=' + this.dj_1 + ', isNullable=' + this.ej_1 + ')';
   };
   protoOf(Field).hashCode = function () {
-    var result = this.bj_1.hashCode();
-    result = imul(result, 31) + hashCode(this.cj_1) | 0;
-    result = imul(result, 31) + (this.dj_1 | 0) | 0;
+    var result = this.cj_1.hashCode();
+    result = imul(result, 31) + hashCode(this.dj_1) | 0;
+    result = imul(result, 31) + (this.ej_1 | 0) | 0;
     return result;
   };
   protoOf(Field).equals = function (other) {
@@ -3251,22 +3319,22 @@
     if (!(other instanceof Field))
       return false;
     var tmp0_other_with_cast = other instanceof Field ? other : THROW_CCE();
-    if (!this.bj_1.equals(tmp0_other_with_cast.bj_1))
+    if (!this.cj_1.equals(tmp0_other_with_cast.cj_1))
       return false;
-    if (!equals(this.cj_1, tmp0_other_with_cast.cj_1))
+    if (!equals(this.dj_1, tmp0_other_with_cast.dj_1))
       return false;
-    if (!(this.dj_1 === tmp0_other_with_cast.dj_1))
+    if (!(this.ej_1 === tmp0_other_with_cast.ej_1))
       return false;
     return true;
   };
   function Shape(value) {
-    this.aj_1 = value;
+    this.bj_1 = value;
   }
   protoOf(Shape).toString = function () {
-    return 'Shape(value=' + this.aj_1 + ')';
+    return 'Shape(value=' + this.bj_1 + ')';
   };
   protoOf(Shape).hashCode = function () {
-    return hashCode(this.aj_1);
+    return hashCode(this.bj_1);
   };
   protoOf(Shape).equals = function (other) {
     if (this === other)
@@ -3274,20 +3342,20 @@
     if (!(other instanceof Shape))
       return false;
     var tmp0_other_with_cast = other instanceof Shape ? other : THROW_CCE();
-    if (!equals(this.aj_1, tmp0_other_with_cast.aj_1))
+    if (!equals(this.bj_1, tmp0_other_with_cast.bj_1))
       return false;
     return true;
   };
   function Type_0(name, shape) {
-    this.wi_1 = name;
-    this.xi_1 = shape;
+    this.xi_1 = name;
+    this.yi_1 = shape;
   }
   protoOf(Type_0).toString = function () {
-    return 'Type(name=' + this.wi_1 + ', shape=' + this.xi_1 + ')';
+    return 'Type(name=' + this.xi_1 + ', shape=' + this.yi_1 + ')';
   };
   protoOf(Type_0).hashCode = function () {
-    var result = getStringHashCode(this.wi_1);
-    result = imul(result, 31) + this.xi_1.hashCode() | 0;
+    var result = getStringHashCode(this.xi_1);
+    result = imul(result, 31) + this.yi_1.hashCode() | 0;
     return result;
   };
   protoOf(Type_0).equals = function (other) {
@@ -3296,9 +3364,9 @@
     if (!(other instanceof Type_0))
       return false;
     var tmp0_other_with_cast = other instanceof Type_0 ? other : THROW_CCE();
-    if (!(this.wi_1 === tmp0_other_with_cast.wi_1))
+    if (!(this.xi_1 === tmp0_other_with_cast.xi_1))
       return false;
-    if (!this.xi_1.equals(tmp0_other_with_cast.xi_1))
+    if (!this.yi_1.equals(tmp0_other_with_cast.yi_1))
       return false;
     return true;
   };
@@ -3328,13 +3396,13 @@
     Method_TRACE_instance = new Method('TRACE', 7);
   }
   function Literal(value) {
-    this.tj_1 = value;
+    this.uj_1 = value;
   }
   protoOf(Literal).toString = function () {
-    return 'Literal(value=' + this.tj_1 + ')';
+    return 'Literal(value=' + this.uj_1 + ')';
   };
   protoOf(Literal).hashCode = function () {
-    return getStringHashCode(this.tj_1);
+    return getStringHashCode(this.uj_1);
   };
   protoOf(Literal).equals = function (other) {
     if (this === other)
@@ -3342,20 +3410,20 @@
     if (!(other instanceof Literal))
       return false;
     var tmp0_other_with_cast = other instanceof Literal ? other : THROW_CCE();
-    if (!(this.tj_1 === tmp0_other_with_cast.tj_1))
+    if (!(this.uj_1 === tmp0_other_with_cast.uj_1))
       return false;
     return true;
   };
   function Param(identifier, reference) {
-    this.ui_1 = identifier;
-    this.vi_1 = reference;
+    this.vi_1 = identifier;
+    this.wi_1 = reference;
   }
   protoOf(Param).toString = function () {
-    return 'Param(identifier=' + this.ui_1 + ', reference=' + this.vi_1 + ')';
+    return 'Param(identifier=' + this.vi_1 + ', reference=' + this.wi_1 + ')';
   };
   protoOf(Param).hashCode = function () {
-    var result = this.ui_1.hashCode();
-    result = imul(result, 31) + hashCode(this.vi_1) | 0;
+    var result = this.vi_1.hashCode();
+    result = imul(result, 31) + hashCode(this.wi_1) | 0;
     return result;
   };
   protoOf(Param).equals = function (other) {
@@ -3364,9 +3432,9 @@
     if (!(other instanceof Param))
       return false;
     var tmp0_other_with_cast = other instanceof Param ? other : THROW_CCE();
-    if (!this.ui_1.equals(tmp0_other_with_cast.ui_1))
+    if (!this.vi_1.equals(tmp0_other_with_cast.vi_1))
       return false;
-    if (!equals(this.vi_1, tmp0_other_with_cast.vi_1))
+    if (!equals(this.wi_1, tmp0_other_with_cast.wi_1))
       return false;
     return true;
   };
@@ -3374,13 +3442,13 @@
     Enum.call(this, name, ordinal);
   }
   function Request(content) {
-    this.xh_1 = content;
+    this.zh_1 = content;
   }
   protoOf(Request).toString = function () {
-    return 'Request(content=' + this.xh_1 + ')';
+    return 'Request(content=' + this.zh_1 + ')';
   };
   protoOf(Request).hashCode = function () {
-    return this.xh_1 == null ? 0 : this.xh_1.hashCode();
+    return this.zh_1 == null ? 0 : this.zh_1.hashCode();
   };
   protoOf(Request).equals = function (other) {
     if (this === other)
@@ -3388,20 +3456,20 @@
     if (!(other instanceof Request))
       return false;
     var tmp0_other_with_cast = other instanceof Request ? other : THROW_CCE();
-    if (!equals(this.xh_1, tmp0_other_with_cast.xh_1))
+    if (!equals(this.zh_1, tmp0_other_with_cast.zh_1))
       return false;
     return true;
   };
   function Response(status, content) {
-    this.oi_1 = status;
-    this.pi_1 = content;
+    this.qi_1 = status;
+    this.ri_1 = content;
   }
   protoOf(Response).toString = function () {
-    return 'Response(status=' + this.oi_1 + ', content=' + this.pi_1 + ')';
+    return 'Response(status=' + this.qi_1 + ', content=' + this.ri_1 + ')';
   };
   protoOf(Response).hashCode = function () {
-    var result = getStringHashCode(this.oi_1);
-    result = imul(result, 31) + (this.pi_1 == null ? 0 : this.pi_1.hashCode()) | 0;
+    var result = getStringHashCode(this.qi_1);
+    result = imul(result, 31) + (this.ri_1 == null ? 0 : this.ri_1.hashCode()) | 0;
     return result;
   };
   protoOf(Response).equals = function (other) {
@@ -3410,24 +3478,24 @@
     if (!(other instanceof Response))
       return false;
     var tmp0_other_with_cast = other instanceof Response ? other : THROW_CCE();
-    if (!(this.oi_1 === tmp0_other_with_cast.oi_1))
+    if (!(this.qi_1 === tmp0_other_with_cast.qi_1))
       return false;
-    if (!equals(this.pi_1, tmp0_other_with_cast.pi_1))
+    if (!equals(this.ri_1, tmp0_other_with_cast.ri_1))
       return false;
     return true;
   };
   function Content(type, reference, isNullable) {
-    this.yh_1 = type;
-    this.zh_1 = reference;
-    this.ai_1 = isNullable;
+    this.ai_1 = type;
+    this.bi_1 = reference;
+    this.ci_1 = isNullable;
   }
   protoOf(Content).toString = function () {
-    return 'Content(type=' + this.yh_1 + ', reference=' + this.zh_1 + ', isNullable=' + this.ai_1 + ')';
+    return 'Content(type=' + this.ai_1 + ', reference=' + this.bi_1 + ', isNullable=' + this.ci_1 + ')';
   };
   protoOf(Content).hashCode = function () {
-    var result = getStringHashCode(this.yh_1);
-    result = imul(result, 31) + hashCode(this.zh_1) | 0;
-    result = imul(result, 31) + (this.ai_1 | 0) | 0;
+    var result = getStringHashCode(this.ai_1);
+    result = imul(result, 31) + hashCode(this.bi_1) | 0;
+    result = imul(result, 31) + (this.ci_1 | 0) | 0;
     return result;
   };
   protoOf(Content).equals = function (other) {
@@ -3436,11 +3504,11 @@
     if (!(other instanceof Content))
       return false;
     var tmp0_other_with_cast = other instanceof Content ? other : THROW_CCE();
-    if (!(this.yh_1 === tmp0_other_with_cast.yh_1))
+    if (!(this.ai_1 === tmp0_other_with_cast.ai_1))
       return false;
-    if (!equals(this.zh_1, tmp0_other_with_cast.zh_1))
+    if (!equals(this.bi_1, tmp0_other_with_cast.bi_1))
       return false;
-    if (!(this.ai_1 === tmp0_other_with_cast.ai_1))
+    if (!(this.ci_1 === tmp0_other_with_cast.ci_1))
       return false;
     return true;
   };
@@ -3477,27 +3545,27 @@
     return Method_TRACE_instance;
   }
   function Endpoint(name, method, path, query, headers, cookies, requests, responses) {
-    this.gi_1 = name;
-    this.hi_1 = method;
-    this.ii_1 = path;
-    this.ji_1 = query;
-    this.ki_1 = headers;
-    this.li_1 = cookies;
-    this.mi_1 = requests;
-    this.ni_1 = responses;
+    this.ii_1 = name;
+    this.ji_1 = method;
+    this.ki_1 = path;
+    this.li_1 = query;
+    this.mi_1 = headers;
+    this.ni_1 = cookies;
+    this.oi_1 = requests;
+    this.pi_1 = responses;
   }
   protoOf(Endpoint).toString = function () {
-    return 'Endpoint(name=' + this.gi_1 + ', method=' + this.hi_1 + ', path=' + this.ii_1 + ', query=' + this.ji_1 + ', headers=' + this.ki_1 + ', cookies=' + this.li_1 + ', requests=' + this.mi_1 + ', responses=' + this.ni_1 + ')';
+    return 'Endpoint(name=' + this.ii_1 + ', method=' + this.ji_1 + ', path=' + this.ki_1 + ', query=' + this.li_1 + ', headers=' + this.mi_1 + ', cookies=' + this.ni_1 + ', requests=' + this.oi_1 + ', responses=' + this.pi_1 + ')';
   };
   protoOf(Endpoint).hashCode = function () {
-    var result = getStringHashCode(this.gi_1);
-    result = imul(result, 31) + this.hi_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.ii_1) | 0;
-    result = imul(result, 31) + hashCode(this.ji_1) | 0;
+    var result = getStringHashCode(this.ii_1);
+    result = imul(result, 31) + this.ji_1.hashCode() | 0;
     result = imul(result, 31) + hashCode(this.ki_1) | 0;
     result = imul(result, 31) + hashCode(this.li_1) | 0;
     result = imul(result, 31) + hashCode(this.mi_1) | 0;
     result = imul(result, 31) + hashCode(this.ni_1) | 0;
+    result = imul(result, 31) + hashCode(this.oi_1) | 0;
+    result = imul(result, 31) + hashCode(this.pi_1) | 0;
     return result;
   };
   protoOf(Endpoint).equals = function (other) {
@@ -3506,13 +3574,9 @@
     if (!(other instanceof Endpoint))
       return false;
     var tmp0_other_with_cast = other instanceof Endpoint ? other : THROW_CCE();
-    if (!(this.gi_1 === tmp0_other_with_cast.gi_1))
-      return false;
-    if (!this.hi_1.equals(tmp0_other_with_cast.hi_1))
+    if (!(this.ii_1 === tmp0_other_with_cast.ii_1))
       return false;
-    if (!equals(this.ii_1, tmp0_other_with_cast.ii_1))
-      return false;
-    if (!equals(this.ji_1, tmp0_other_with_cast.ji_1))
+    if (!this.ji_1.equals(tmp0_other_with_cast.ji_1))
       return false;
     if (!equals(this.ki_1, tmp0_other_with_cast.ki_1))
       return false;
@@ -3522,18 +3586,22 @@
       return false;
     if (!equals(this.ni_1, tmp0_other_with_cast.ni_1))
       return false;
+    if (!equals(this.oi_1, tmp0_other_with_cast.oi_1))
+      return false;
+    if (!equals(this.pi_1, tmp0_other_with_cast.pi_1))
+      return false;
     return true;
   };
   function Enum_0(name, entries) {
-    this.mj_1 = name;
-    this.nj_1 = entries;
+    this.nj_1 = name;
+    this.oj_1 = entries;
   }
   protoOf(Enum_0).toString = function () {
-    return 'Enum(name=' + this.mj_1 + ', entries=' + this.nj_1 + ')';
+    return 'Enum(name=' + this.nj_1 + ', entries=' + this.oj_1 + ')';
   };
   protoOf(Enum_0).hashCode = function () {
-    var result = getStringHashCode(this.mj_1);
-    result = imul(result, 31) + hashCode(this.nj_1) | 0;
+    var result = getStringHashCode(this.nj_1);
+    result = imul(result, 31) + hashCode(this.oj_1) | 0;
     return result;
   };
   protoOf(Enum_0).equals = function (other) {
@@ -3542,20 +3610,20 @@
     if (!(other instanceof Enum_0))
       return false;
     var tmp0_other_with_cast = other instanceof Enum_0 ? other : THROW_CCE();
-    if (!(this.mj_1 === tmp0_other_with_cast.mj_1))
+    if (!(this.nj_1 === tmp0_other_with_cast.nj_1))
       return false;
-    if (!equals(this.nj_1, tmp0_other_with_cast.nj_1))
+    if (!equals(this.oj_1, tmp0_other_with_cast.oj_1))
       return false;
     return true;
   };
   function Validator(value) {
-    this.rj_1 = value;
+    this.sj_1 = value;
   }
   protoOf(Validator).toString = function () {
-    return 'Validator(value=' + this.rj_1 + ')';
+    return 'Validator(value=' + this.sj_1 + ')';
   };
   protoOf(Validator).hashCode = function () {
-    return getStringHashCode(this.rj_1);
+    return getStringHashCode(this.sj_1);
   };
   protoOf(Validator).equals = function (other) {
     if (this === other)
@@ -3563,20 +3631,20 @@
     if (!(other instanceof Validator))
       return false;
     var tmp0_other_with_cast = other instanceof Validator ? other : THROW_CCE();
-    if (!(this.rj_1 === tmp0_other_with_cast.rj_1))
+    if (!(this.sj_1 === tmp0_other_with_cast.sj_1))
       return false;
     return true;
   };
   function Refined(name, validator) {
-    this.oj_1 = name;
-    this.pj_1 = validator;
+    this.pj_1 = name;
+    this.qj_1 = validator;
   }
   protoOf(Refined).toString = function () {
-    return 'Refined(name=' + this.oj_1 + ', validator=' + this.pj_1 + ')';
+    return 'Refined(name=' + this.pj_1 + ', validator=' + this.qj_1 + ')';
   };
   protoOf(Refined).hashCode = function () {
-    var result = getStringHashCode(this.oj_1);
-    result = imul(result, 31) + this.pj_1.hashCode() | 0;
+    var result = getStringHashCode(this.pj_1);
+    result = imul(result, 31) + this.qj_1.hashCode() | 0;
     return result;
   };
   protoOf(Refined).equals = function (other) {
@@ -3585,9 +3653,9 @@
     if (!(other instanceof Refined))
       return false;
     var tmp0_other_with_cast = other instanceof Refined ? other : THROW_CCE();
-    if (!(this.oj_1 === tmp0_other_with_cast.oj_1))
+    if (!(this.pj_1 === tmp0_other_with_cast.pj_1))
       return false;
-    if (!this.pj_1.equals(tmp0_other_with_cast.pj_1))
+    if (!this.qj_1.equals(tmp0_other_with_cast.qj_1))
       return false;
     return true;
   };
@@ -3686,8 +3754,8 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>' call
-      log(_this__u8e3s4.sl_1, $this);
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      log(_this__u8e3s4.wl_1, $this);
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof WsTypeDef) {
         tmp_0 = raise.fh(parseTypeDeclaration(_this__u8e3s4, $this));
@@ -3702,10 +3770,10 @@
             // Inline function 'arrow.core.nel' call
             var tmp$ret$0;
             // Inline function 'kotlin.also' call
-            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.sl_1);
+            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.wl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            raise.fh(_this__u8e3s4.ul());
+            raise.fh(_this__u8e3s4.yl());
             tmp$ret$0 = tmp0_also;
             var tmp1_nel = tmp$ret$0;
             tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3764,21 +3832,21 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.fh(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.sl_1.bl_1));
+        tmp_0 = raise.fh(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.wl_1.fl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3835,11 +3903,11 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Type_0(typeName, raise.fh(parseTypeShape(_this__u8e3s4, $this)));
@@ -3848,10 +3916,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.sl_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3860,18 +3928,18 @@
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-      var tmp0_subject_0 = _this__u8e3s4.sl_1.al_1;
+      var tmp0_subject_0 = _this__u8e3s4.wl_1.el_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
       else {
         var tmp$ret$3;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.sl_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -3929,11 +3997,11 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$7;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
       var tmp$ret$6;
       // Inline function 'kotlin.let' call
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomValue) {
         var tmp$ret$3;
@@ -3944,21 +4012,21 @@
         var tmp0_apply = tmp$ret$0;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        tmp0_apply.a(raise.fh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.sl_1.bl_1))));
-        while (equals(_this__u8e3s4.sl_1.al_1, Comma_getInstance())) {
-          raise.fh(_this__u8e3s4.ul());
-          var tmp0_subject_0 = _this__u8e3s4.sl_1.al_1;
+        tmp0_apply.a(raise.fh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.wl_1.fl_1))));
+        while (equals(_this__u8e3s4.wl_1.el_1, Comma_getInstance())) {
+          raise.fh(_this__u8e3s4.yl());
+          var tmp0_subject_0 = _this__u8e3s4.wl_1.el_1;
           if (tmp0_subject_0 instanceof CustomValue) {
-            tmp0_apply.a(raise.fh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.sl_1.bl_1))));
+            tmp0_apply.a(raise.fh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.wl_1.fl_1))));
           } else {
             var tmp$ret$2;
             // Inline function 'arrow.core.nel' call
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.sl_1);
+            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.wl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-            raise.fh(_this__u8e3s4.ul());
+            raise.fh(_this__u8e3s4.yl());
             tmp$ret$1 = tmp0_also;
             var tmp1_nel = tmp$ret$1;
             tmp$ret$2 = nonEmptyListOf(tmp1_nel, []);
@@ -3972,10 +4040,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$4;
         // Inline function 'kotlin.also' call
-        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.sl_1);
+        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$4 = tmp1_also;
         var tmp2_nel = tmp$ret$4;
         tmp$ret$5 = nonEmptyListOf(tmp2_nel, []);
@@ -4035,37 +4103,37 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       if (tmp0_subject instanceof Colon)
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
       else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.sl_1);
+        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
         raise.eh(tmp$ret$1);
       }
-      var type = _this__u8e3s4.sl_1.al_1;
+      var type = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (isInterface(type, WsType)) {
-        var tmp_1 = raise.fh(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.sl_1.bl_1));
+        var tmp_1 = raise.fh(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.wl_1.fl_1));
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.sl_1.al_1;
+        var tmp_2 = _this__u8e3s4.wl_1.el_1;
         var tmp2_also = tmp_2 instanceof QuestionMark;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
         if (tmp2_also)
-          raise.fh(_this__u8e3s4.ul());
+          raise.fh(_this__u8e3s4.yl());
         tmp$ret$2 = tmp2_also;
         tmp_0 = new Field(identifier, tmp_1, tmp$ret$2);
       } else {
@@ -4073,10 +4141,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$3;
         // Inline function 'kotlin.also' call
-        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
+        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$3 = tmp3_also;
         var tmp4_nel = tmp$ret$3;
         tmp$ret$4 = nonEmptyListOf(tmp4_nel, []);
@@ -4133,16 +4201,16 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$1;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseFieldValue.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
       var tmp$ret$0;
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.sl_1.al_1;
+      var tmp_0 = _this__u8e3s4.wl_1.el_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseFieldValue.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
       tmp$ret$0 = tmp0_also;
       var isIterable = tmp$ret$0;
       var tmp0_subject = wsType;
@@ -4215,21 +4283,21 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.fh(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.sl_1.bl_1));
+        tmp_0 = raise.fh(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.wl_1.fl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4286,11 +4354,11 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Enum_0(typeName, raise.fh(parseEnumTypeEntries(_this__u8e3s4, $this)));
@@ -4299,10 +4367,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.sl_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4311,18 +4379,18 @@
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-      var tmp0_subject_0 = _this__u8e3s4.sl_1.al_1;
+      var tmp0_subject_0 = _this__u8e3s4.wl_1.el_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
       else {
         var tmp$ret$3;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.sl_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -4380,9 +4448,9 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$7;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
         var tmp$ret$4;
@@ -4393,28 +4461,28 @@
         var tmp0_apply = tmp$ret$0;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        tmp0_apply.a(_this__u8e3s4.sl_1.bl_1);
-        raise.fh(_this__u8e3s4.ul());
-        while (equals(_this__u8e3s4.sl_1.al_1, Comma_getInstance())) {
-          raise.fh(_this__u8e3s4.ul());
-          var tmp0_subject_0 = _this__u8e3s4.sl_1.al_1;
+        tmp0_apply.a(_this__u8e3s4.wl_1.fl_1);
+        raise.fh(_this__u8e3s4.yl());
+        while (equals(_this__u8e3s4.wl_1.el_1, Comma_getInstance())) {
+          raise.fh(_this__u8e3s4.yl());
+          var tmp0_subject_0 = _this__u8e3s4.wl_1.el_1;
           if (tmp0_subject_0 instanceof CustomType) {
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = tmp0_apply.a(_this__u8e3s4.sl_1.bl_1);
+            var tmp0_also = tmp0_apply.a(_this__u8e3s4.wl_1.fl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.fh(_this__u8e3s4.ul());
+            raise.fh(_this__u8e3s4.yl());
             tmp$ret$1 = tmp0_also;
           } else {
             var tmp$ret$3;
             // Inline function 'arrow.core.nel' call
             var tmp$ret$2;
             // Inline function 'kotlin.also' call
-            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
+            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.wl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.fh(_this__u8e3s4.ul());
+            raise.fh(_this__u8e3s4.yl());
             tmp$ret$2 = tmp1_also;
             var tmp2_nel = tmp$ret$2;
             tmp$ret$3 = nonEmptyListOf(tmp2_nel, []);
@@ -4428,10 +4496,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$5;
         // Inline function 'kotlin.also' call
-        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
+        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$5 = tmp1_also_0;
         var tmp2_nel_0 = tmp$ret$5;
         tmp$ret$6 = nonEmptyListOf(tmp2_nel_0, []);
@@ -4488,21 +4556,21 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.fh(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.sl_1.bl_1));
+        tmp_0 = raise.fh(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.wl_1.fl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4559,23 +4627,23 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$3;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
-      log(_this__u8e3s4.sl_1, $this);
+      raise.fh(_this__u8e3s4.yl());
+      log(_this__u8e3s4.wl_1, $this);
       var tmp$ret$2;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
+      var tmp0_subject = _this__u8e3s4.wl_1.el_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.sl_1.bl_1));
+        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.wl_1.fl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.sl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.wl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-        raise.fh(_this__u8e3s4.ul());
+        raise.fh(_this__u8e3s4.yl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4584,7 +4652,7 @@
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-      raise.fh(_this__u8e3s4.ul());
+      raise.fh(_this__u8e3s4.yl());
       tmp$ret$2 = tmp2_also;
       tmp$ret$3 = tmp$ret$2;
       tmp$ret$4 = tmp$ret$3;
@@ -4622,7 +4690,7 @@
     return tmp$ret$9;
   }
   function log(_this__u8e3s4, $this) {
-    return $this.ph_1.lh('Parsing ' + _this__u8e3s4.al_1 + ' at line ' + _this__u8e3s4.cl_1.dl_1 + ' position ' + _this__u8e3s4.cl_1.el_1);
+    return $this.ph_1.lh('Parsing ' + _this__u8e3s4.el_1 + ' at line ' + _this__u8e3s4.gl_1.hl_1 + ' position ' + _this__u8e3s4.gl_1.il_1);
   }
   function Parser(logger) {
     this.ph_1 = logger;
@@ -4638,7 +4706,7 @@
       var element = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parse.<anonymous>' call
-      var tmp = element.al_1;
+      var tmp = element.el_1;
       tmp$ret$0 = isInterface(tmp, WhiteSpace);
       if (!tmp$ret$0) {
         tmp0_filterNotTo.a(element);
@@ -4659,7 +4727,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.bl_1 + "', ";
+      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.fl_1 + "', ";
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
@@ -4667,14 +4735,14 @@
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     var tmp$ret$3;
     // Inline function 'kotlin.run' call
-    var tmp0_run = $this.sl_1;
+    var tmp0_run = $this.wl_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$2;
     // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-    tmp$ret$2 = "Current: '" + tmp0_run.bl_1 + "'";
+    tmp$ret$2 = "Current: '" + tmp0_run.fl_1 + "'";
     tmp$ret$3 = tmp$ret$2;
     var curr = tmp$ret$3;
-    var tmp2_safe_receiver = $this.tl_1;
+    var tmp2_safe_receiver = $this.xl_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -4684,13 +4752,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$4;
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
-      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.bl_1 + "'";
+      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.fl_1 + "'";
       tmp$ret$5 = tmp$ret$4;
       tmp_0 = tmp$ret$5;
     }
     var tmp3_elvis_lhs = tmp_0;
     var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-    $this.ql_1.lh(prev + curr + next);
+    $this.ul_1.lh(prev + curr + next);
   }
   function printTokens$default($this, previousToken, $super) {
     previousToken = previousToken === VOID ? null : previousToken;
@@ -4708,7 +4776,7 @@
       var tmp0_success = Companion_getInstance();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.nextToken.<anonymous>' call
-      tmp$ret$0 = $this.rl_1.e();
+      tmp$ret$0 = $this.vl_1.e();
       var tmp1_success = tmp$ret$0;
       tmp$ret$1 = _Result___init__impl__xyqfz8(tmp1_success);
       tmp = tmp$ret$1;
@@ -4739,8 +4807,8 @@
     return tmp$ret$4;
   }
   function TokenProvider(logger, tokenIterator) {
-    this.ql_1 = logger;
-    this.rl_1 = tokenIterator;
+    this.ul_1 = logger;
+    this.vl_1 = tokenIterator;
     var tmp = this;
     var tmp0_elvis_lhs = nextToken(this);
     var tmp_0;
@@ -4753,14 +4821,14 @@
     } else {
       tmp_0 = tmp0_elvis_lhs;
     }
-    tmp.sl_1 = tmp_0;
-    this.tl_1 = nextToken(this);
+    tmp.wl_1 = tmp_0;
+    this.xl_1 = nextToken(this);
     printTokens$default(this);
   }
   protoOf(TokenProvider).d = function () {
-    return !(this.tl_1 == null);
+    return !(this.xl_1 == null);
   };
-  protoOf(TokenProvider).ul = function () {
+  protoOf(TokenProvider).yl = function () {
     var tmp$ret$6;
     // Inline function 'arrow.core.raise.either' call
     var tmp$ret$5;
@@ -4774,21 +4842,21 @@
     try {
       var tmp$ret$1;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.sl_1;
+      var previousToken = this.wl_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.tl_1;
+      var tmp0_elvis_lhs = this.xl_1;
       var tmp_1;
       if (tmp0_elvis_lhs == null) {
         var tmp$ret$0;
         // Inline function 'arrow.core.nel' call
-        var tmp0_nel = new NextException(previousToken.cl_1);
+        var tmp0_nel = new NextException(previousToken.gl_1);
         tmp$ret$0 = nonEmptyListOf(tmp0_nel, []);
         raise.eh(tmp$ret$0);
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.sl_1 = tmp_1;
-      this.tl_1 = nextToken(this);
+      tmp_0.wl_1 = tmp_1;
+      this.xl_1 = nextToken(this);
       printTokens(this, previousToken);
       tmp$ret$1 = Unit_getInstance();
       var res = tmp$ret$1;
@@ -4830,15 +4898,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.vl_1 = idx;
-    this.wl_1 = length;
+    this.zl_1 = idx;
+    this.am_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.vl_1 + ', length=' + this.wl_1 + ')';
+    return 'IdxAndLength(idx=' + this.zl_1 + ', length=' + this.am_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.vl_1;
-    result = imul(result, 31) + this.wl_1 | 0;
+    var result = this.zl_1;
+    result = imul(result, 31) + this.am_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -4847,9 +4915,9 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.vl_1 === tmp0_other_with_cast.vl_1))
+    if (!(this.zl_1 === tmp0_other_with_cast.zl_1))
       return false;
-    if (!(this.wl_1 === tmp0_other_with_cast.wl_1))
+    if (!(this.am_1 === tmp0_other_with_cast.am_1))
       return false;
     return true;
   };
@@ -4857,26 +4925,26 @@
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.dl_1 = line;
-    this.el_1 = position;
-    this.fl_1 = idxAndLength;
+    this.hl_1 = line;
+    this.il_1 = position;
+    this.jl_1 = idxAndLength;
   }
-  protoOf(Coordinates).xl = function (line, position, idxAndLength) {
+  protoOf(Coordinates).bm = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).yl = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.dl_1 : line;
-    position = position === VOID ? this.el_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.fl_1 : idxAndLength;
-    return $super === VOID ? this.xl(line, position, idxAndLength) : $super.xl.call(this, line, position, idxAndLength);
+  protoOf(Coordinates).cm = function (line, position, idxAndLength, $super) {
+    line = line === VOID ? this.hl_1 : line;
+    position = position === VOID ? this.il_1 : position;
+    idxAndLength = idxAndLength === VOID ? this.jl_1 : idxAndLength;
+    return $super === VOID ? this.bm(line, position, idxAndLength) : $super.bm.call(this, line, position, idxAndLength);
   };
   protoOf(Coordinates).toString = function () {
-    return 'Coordinates(line=' + this.dl_1 + ', position=' + this.el_1 + ', idxAndLength=' + this.fl_1 + ')';
+    return 'Coordinates(line=' + this.hl_1 + ', position=' + this.il_1 + ', idxAndLength=' + this.jl_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.dl_1;
-    result = imul(result, 31) + this.el_1 | 0;
-    result = imul(result, 31) + this.fl_1.hashCode() | 0;
+    var result = this.hl_1;
+    result = imul(result, 31) + this.il_1 | 0;
+    result = imul(result, 31) + this.jl_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -4885,35 +4953,35 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.dl_1 === tmp0_other_with_cast.dl_1))
+    if (!(this.hl_1 === tmp0_other_with_cast.hl_1))
       return false;
-    if (!(this.el_1 === tmp0_other_with_cast.el_1))
+    if (!(this.il_1 === tmp0_other_with_cast.il_1))
       return false;
-    if (!this.fl_1.equals(tmp0_other_with_cast.fl_1))
+    if (!this.jl_1.equals(tmp0_other_with_cast.jl_1))
       return false;
     return true;
   };
   function Token(type, value, coordinates) {
-    this.al_1 = type;
-    this.bl_1 = value;
-    this.cl_1 = coordinates;
+    this.el_1 = type;
+    this.fl_1 = value;
+    this.gl_1 = coordinates;
   }
-  protoOf(Token).zl = function (type, value, coordinates) {
+  protoOf(Token).dm = function (type, value, coordinates) {
     return new Token(type, value, coordinates);
   };
-  protoOf(Token).hl = function (type, value, coordinates, $super) {
-    type = type === VOID ? this.al_1 : type;
-    value = value === VOID ? this.bl_1 : value;
-    coordinates = coordinates === VOID ? this.cl_1 : coordinates;
-    return $super === VOID ? this.zl(type, value, coordinates) : $super.zl.call(this, type, value, coordinates);
+  protoOf(Token).ll = function (type, value, coordinates, $super) {
+    type = type === VOID ? this.el_1 : type;
+    value = value === VOID ? this.fl_1 : value;
+    coordinates = coordinates === VOID ? this.gl_1 : coordinates;
+    return $super === VOID ? this.dm(type, value, coordinates) : $super.dm.call(this, type, value, coordinates);
   };
   protoOf(Token).toString = function () {
-    return 'Token(type=' + this.al_1 + ', value=' + this.bl_1 + ', coordinates=' + this.cl_1 + ')';
+    return 'Token(type=' + this.el_1 + ', value=' + this.fl_1 + ', coordinates=' + this.gl_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = hashCode(this.al_1);
-    result = imul(result, 31) + getStringHashCode(this.bl_1) | 0;
-    result = imul(result, 31) + this.cl_1.hashCode() | 0;
+    var result = hashCode(this.el_1);
+    result = imul(result, 31) + getStringHashCode(this.fl_1) | 0;
+    result = imul(result, 31) + this.gl_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -4922,19 +4990,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!equals(this.al_1, tmp0_other_with_cast.al_1))
+    if (!equals(this.el_1, tmp0_other_with_cast.el_1))
       return false;
-    if (!(this.bl_1 === tmp0_other_with_cast.bl_1))
+    if (!(this.fl_1 === tmp0_other_with_cast.fl_1))
       return false;
-    if (!this.cl_1.equals(tmp0_other_with_cast.cl_1))
+    if (!this.gl_1.equals(tmp0_other_with_cast.gl_1))
       return false;
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.vl_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.zl_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.yl(VOID, _this__u8e3s4.el_1 + length | 0, plus_1(_this__u8e3s4.fl_1, length));
+    return _this__u8e3s4.cm(VOID, _this__u8e3s4.il_1 + length | 0, plus_1(_this__u8e3s4.jl_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     var tmp$ret$3;
@@ -4955,7 +5023,7 @@
     // Inline function 'community.flock.wirespec.compiler.core.tokenize.tokenize.<anonymous>' call
     var tmp = EndOfProgram_getInstance();
     EndOfProgram_getInstance();
-    var tmp_0 = last(tmp1_let).cl_1;
+    var tmp_0 = last(tmp1_let).gl_1;
     var tmp_1 = EndOfProgram_getInstance();
     EndOfProgram_getInstance();
     tmp$ret$2 = tmp1_let.zg(new Token(tmp, 'EOP', nextCoordinates(tmp_0, tmp_1, 'EOP')));
@@ -4966,7 +5034,7 @@
     var tmp0_subject = type;
     var tmp;
     if (tmp0_subject instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.dl_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.fl_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.hl_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.jl_1, value.length));
     } else {
       tmp = plus_2(_this__u8e3s4, value.length);
     }
@@ -4978,7 +5046,7 @@
     var incompleteTokens_0 = incompleteTokens;
     $l$1: do {
       $l$0: do {
-        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).cl_1);
+        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).gl_1);
         var token = tmp0_container.i3();
         var remaining = tmp0_container.j3();
         var tokens = incompleteTokens_0.zg(token);
@@ -5041,7 +5109,7 @@
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$3;
     // Inline function 'community.flock.wirespec.compiler.core.tokenize.extractToken.<anonymous>' call
-    tmp$ret$3 = to(tmp1_let, removePrefix(source, tmp1_let.bl_1));
+    tmp$ret$3 = to(tmp1_let, removePrefix(source, tmp1_let.fl_1));
     tmp$ret$4 = tmp$ret$3;
     return tmp$ret$4;
   }
@@ -5214,7 +5282,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.bm_1 = 'EOP';
+    this.fm_1 = 'EOP';
   }
   var EndOfProgram_instance;
   function EndOfProgram_getInstance() {
@@ -5247,7 +5315,7 @@
     }
     return tmp;
   };
-  protoOf(Logger).zk = function (s, block) {
+  protoOf(Logger).dl = function (s, block) {
     var tmp$ret$1;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5270,73 +5338,73 @@
     }
   }
   //region block: post-declaration
-  protoOf(JavaEmitter).vj = withLogging;
-  protoOf(JavaEmitter).wj = withLogging_0;
-  protoOf(JavaEmitter).xj = withLogging_1;
-  protoOf(JavaEmitter).yj = withLogging_2;
-  protoOf(JavaEmitter).wh = withLogging_3;
-  protoOf(JavaEmitter).ak = withLogging_4;
-  protoOf(JavaEmitter).ck = withLogging_5;
-  protoOf(JavaEmitter).dk = withLogging_6;
-  protoOf(JavaEmitter).fk = withLogging_7;
-  protoOf(JavaEmitter).ti = withLogging_8;
-  protoOf(KotlinEmitter).vj = withLogging;
-  protoOf(KotlinEmitter).wj = withLogging_0;
-  protoOf(KotlinEmitter).xj = withLogging_1;
-  protoOf(KotlinEmitter).yj = withLogging_2;
-  protoOf(KotlinEmitter).wh = withLogging_3;
-  protoOf(KotlinEmitter).ak = withLogging_4;
-  protoOf(KotlinEmitter).ck = withLogging_5;
-  protoOf(KotlinEmitter).dk = withLogging_6;
-  protoOf(KotlinEmitter).fk = withLogging_7;
-  protoOf(KotlinEmitter).ti = withLogging_8;
-  protoOf(ScalaEmitter).vj = withLogging;
-  protoOf(ScalaEmitter).wj = withLogging_0;
-  protoOf(ScalaEmitter).xj = withLogging_1;
-  protoOf(ScalaEmitter).yj = withLogging_2;
-  protoOf(ScalaEmitter).wh = withLogging_3;
-  protoOf(ScalaEmitter).ak = withLogging_4;
-  protoOf(ScalaEmitter).ck = withLogging_5;
-  protoOf(ScalaEmitter).dk = withLogging_6;
-  protoOf(ScalaEmitter).fk = withLogging_7;
-  protoOf(TypeScriptEmitter).vj = withLogging;
-  protoOf(TypeScriptEmitter).wj = withLogging_0;
-  protoOf(TypeScriptEmitter).xj = withLogging_1;
-  protoOf(TypeScriptEmitter).yj = withLogging_2;
-  protoOf(TypeScriptEmitter).wh = withLogging_3;
-  protoOf(TypeScriptEmitter).ak = withLogging_4;
-  protoOf(TypeScriptEmitter).ck = withLogging_5;
-  protoOf(TypeScriptEmitter).dk = withLogging_6;
-  protoOf(TypeScriptEmitter).fk = withLogging_7;
-  protoOf(TypeScriptEmitter).ti = withLogging_8;
-  protoOf(WirespecEmitter).vj = withLogging;
-  protoOf(WirespecEmitter).wj = withLogging_0;
-  protoOf(WirespecEmitter).xj = withLogging_1;
-  protoOf(WirespecEmitter).yj = withLogging_2;
-  protoOf(WirespecEmitter).wh = withLogging_3;
-  protoOf(WirespecEmitter).ak = withLogging_4;
-  protoOf(WirespecEmitter).ck = withLogging_5;
-  protoOf(WirespecEmitter).dk = withLogging_6;
-  protoOf(WirespecEmitter).fk = withLogging_7;
-  protoOf(WsTypeDef).am = name;
-  protoOf(WsEnumTypeDef).am = name;
-  protoOf(WsRefinedTypeDef).am = name;
-  protoOf(WhiteSpaceExceptNewLine).am = name;
-  protoOf(NewLine).am = name;
-  protoOf(LeftCurly).am = name;
-  protoOf(Colon).am = name;
-  protoOf(Comma).am = name;
-  protoOf(QuestionMark).am = name;
-  protoOf(Brackets).am = name;
-  protoOf(WsString).am = name;
-  protoOf(WsInteger).am = name;
-  protoOf(WsBoolean).am = name;
-  protoOf(RightCurly).am = name;
-  protoOf(CustomValue).am = name;
-  protoOf(CustomType).am = name;
-  protoOf(CustomRegex).am = name;
-  protoOf(Invalid).am = name;
-  protoOf(EndOfProgram).am = name;
+  protoOf(JavaEmitter).wj = withLogging;
+  protoOf(JavaEmitter).xj = withLogging_0;
+  protoOf(JavaEmitter).yj = withLogging_1;
+  protoOf(JavaEmitter).zj = withLogging_2;
+  protoOf(JavaEmitter).yh = withLogging_3;
+  protoOf(JavaEmitter).bk = withLogging_4;
+  protoOf(JavaEmitter).dk = withLogging_5;
+  protoOf(JavaEmitter).ek = withLogging_6;
+  protoOf(JavaEmitter).gk = withLogging_7;
+  protoOf(JavaEmitter).ui = withLogging_8;
+  protoOf(KotlinEmitter).wj = withLogging;
+  protoOf(KotlinEmitter).xj = withLogging_0;
+  protoOf(KotlinEmitter).yj = withLogging_1;
+  protoOf(KotlinEmitter).zj = withLogging_2;
+  protoOf(KotlinEmitter).yh = withLogging_3;
+  protoOf(KotlinEmitter).bk = withLogging_4;
+  protoOf(KotlinEmitter).dk = withLogging_5;
+  protoOf(KotlinEmitter).ek = withLogging_6;
+  protoOf(KotlinEmitter).gk = withLogging_7;
+  protoOf(KotlinEmitter).ui = withLogging_8;
+  protoOf(ScalaEmitter).wj = withLogging;
+  protoOf(ScalaEmitter).xj = withLogging_0;
+  protoOf(ScalaEmitter).yj = withLogging_1;
+  protoOf(ScalaEmitter).zj = withLogging_2;
+  protoOf(ScalaEmitter).yh = withLogging_3;
+  protoOf(ScalaEmitter).bk = withLogging_4;
+  protoOf(ScalaEmitter).dk = withLogging_5;
+  protoOf(ScalaEmitter).ek = withLogging_6;
+  protoOf(ScalaEmitter).gk = withLogging_7;
+  protoOf(TypeScriptEmitter).wj = withLogging;
+  protoOf(TypeScriptEmitter).xj = withLogging_0;
+  protoOf(TypeScriptEmitter).yj = withLogging_1;
+  protoOf(TypeScriptEmitter).zj = withLogging_2;
+  protoOf(TypeScriptEmitter).yh = withLogging_3;
+  protoOf(TypeScriptEmitter).bk = withLogging_4;
+  protoOf(TypeScriptEmitter).dk = withLogging_5;
+  protoOf(TypeScriptEmitter).ek = withLogging_6;
+  protoOf(TypeScriptEmitter).gk = withLogging_7;
+  protoOf(TypeScriptEmitter).ui = withLogging_8;
+  protoOf(WirespecEmitter).wj = withLogging;
+  protoOf(WirespecEmitter).xj = withLogging_0;
+  protoOf(WirespecEmitter).yj = withLogging_1;
+  protoOf(WirespecEmitter).zj = withLogging_2;
+  protoOf(WirespecEmitter).yh = withLogging_3;
+  protoOf(WirespecEmitter).bk = withLogging_4;
+  protoOf(WirespecEmitter).dk = withLogging_5;
+  protoOf(WirespecEmitter).ek = withLogging_6;
+  protoOf(WirespecEmitter).gk = withLogging_7;
+  protoOf(WsTypeDef).em = name;
+  protoOf(WsEnumTypeDef).em = name;
+  protoOf(WsRefinedTypeDef).em = name;
+  protoOf(WhiteSpaceExceptNewLine).em = name;
+  protoOf(NewLine).em = name;
+  protoOf(LeftCurly).em = name;
+  protoOf(Colon).em = name;
+  protoOf(Comma).em = name;
+  protoOf(QuestionMark).em = name;
+  protoOf(Brackets).em = name;
+  protoOf(WsString).em = name;
+  protoOf(WsInteger).em = name;
+  protoOf(WsBoolean).em = name;
+  protoOf(RightCurly).em = name;
+  protoOf(CustomValue).em = name;
+  protoOf(CustomType).em = name;
+  protoOf(CustomRegex).em = name;
+  protoOf(Invalid).em = name;
+  protoOf(EndOfProgram).em = name;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_NAME = 'community.flock.wirespec.generated';