@flock/wirespec 0.16.8 → 0.16.9

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

@@ -78,7 +78,7 @@ function emit(identifier) {
 }
 initMetadataForInterface(TypeScriptIdentifierEmitter, 'TypeScriptIdentifierEmitter');
 function sanitizeSymbol(_this__u8e3s4) {
-  return this.d2b(_this__u8e3s4.b1());
+  return this.j2b(_this__u8e3s4.b1());
 }
 function sanitizeSymbol_0(_this__u8e3s4) {
   var tmp = asSequence(_this__u8e3s4);
@@ -94,7 +94,7 @@ function emit_0(type, module_0) {
   while (tmp0_iterator.h()) {
     var e = tmp0_iterator.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptTypeDefinitionEmitter.emit.<anonymous>' call
-    var key = e.w28_1;
+    var key = e.c29_1;
     if (set.e(key)) {
       list.e(e);
     }
@@ -105,20 +105,20 @@ function emit_0(type, module_0) {
   while (tmp0_iterator_0.h()) {
     var item = tmp0_iterator_0.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptTypeDefinitionEmitter.emit.<anonymous>' call
-    var tmp$ret$2 = 'import {' + item.w28_1 + "} from './" + item.w28_1 + "'";
+    var tmp$ret$2 = 'import {' + item.c29_1 + "} from './" + item.c29_1 + "'";
     destination.e(tmp$ret$2);
   }
   var tmp = destination;
-  return trimMargin('\n            |' + joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptTypeDefinitionEmitter$emit$lambda) + '\n            |export type ' + this.g2b(type.h24_1) + ' = {\n            |' + this.e25(type.i24_1) + '\n            |}\n            |\n        ');
+  return trimMargin('\n            |' + joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptTypeDefinitionEmitter$emit$lambda) + '\n            |export type ' + this.m2b(type.k24_1) + ' = {\n            |' + this.h25(type.l24_1) + '\n            |}\n            |\n        ');
 }
 function emit_1(_this__u8e3s4) {
   // Inline function 'kotlin.let' call
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = 'Record<string, ' + this.g25(_this__u8e3s4.r23_1) + '>';
+    tmp = 'Record<string, ' + this.j25(_this__u8e3s4.u23_1) + '>';
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = this.g25(_this__u8e3s4.o23_1) + '[]';
+      tmp = this.j25(_this__u8e3s4.r23_1) + '[]';
     } else {
       if (_this__u8e3s4 instanceof Unit) {
         tmp = 'void';
@@ -127,10 +127,10 @@ function emit_1(_this__u8e3s4) {
           tmp = 'any';
         } else {
           if (_this__u8e3s4 instanceof Custom) {
-            tmp = this.d2b(_this__u8e3s4.w28_1);
+            tmp = this.j2b(_this__u8e3s4.c29_1);
           } else {
             if (_this__u8e3s4 instanceof Primitive) {
-              var tmp1_subject = _this__u8e3s4.a29_1;
+              var tmp1_subject = _this__u8e3s4.g29_1;
               var tmp_0;
               if (tmp1_subject instanceof String_0) {
                 tmp_0 = 'string';
@@ -164,15 +164,15 @@ function emit_1(_this__u8e3s4) {
   }
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptTypeDefinitionEmitter.emit.<anonymous>' call
-  return tmp + (_this__u8e3s4.hm() ? ' | undefined' : '');
+  return tmp + (_this__u8e3s4.jm() ? ' | undefined' : '');
 }
 function emit_2(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof RegExp_0) {
-    tmp = _RegExp___get_value__impl__7o7618(_this__u8e3s4.a28_1) + '.test(value)';
+    tmp = _RegExp___get_value__impl__7o7618(_this__u8e3s4.g28_1) + '.test(value)';
   } else {
     if (_this__u8e3s4 instanceof Bound) {
-      tmp = '' + _this__u8e3s4.b28_1 + ' < value && value < ' + _this__u8e3s4.c28_1 + ';';
+      tmp = '' + _this__u8e3s4.h28_1 + ' < value && value < ' + _this__u8e3s4.i28_1 + ';';
     } else {
       noWhenBranchMatchedException();
     }
@@ -180,35 +180,35 @@ function emit_2(_this__u8e3s4) {
   return tmp;
 }
 function emit_3(_this__u8e3s4) {
-  return joinToString(_this__u8e3s4.f24_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptTypeDefinitionEmitter$emit$lambda_0(this));
+  return joinToString(_this__u8e3s4.i24_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptTypeDefinitionEmitter$emit$lambda_0(this));
 }
 function emit_4(_this__u8e3s4) {
-  return Spacer_instance.toString() + this.f26(_this__u8e3s4.l24_1) + ': ' + this.g25(_this__u8e3s4.m24_1);
+  return Spacer_instance.toString() + this.i26(_this__u8e3s4.o24_1) + ': ' + this.j25(_this__u8e3s4.p24_1);
 }
 initMetadataForInterface(TypeScriptTypeDefinitionEmitter, 'TypeScriptTypeDefinitionEmitter', VOID, VOID, [TypeDefinitionEmitter, TypeScriptIdentifierEmitter]);
 function emitClient(ast) {
-  var tmp = 'client.' + this.n25().w25_1;
-  var tmp_0 = this.j25(ast);
+  var tmp = 'client.' + this.q25().z25_1;
+  var tmp_0 = this.m25(ast);
   var tmp_1 = joinToString(tmp_0, '\n', VOID, VOID, VOID, VOID, TypeScriptClientEmitter$emitClient$lambda);
   // Inline function 'kotlin.collections.distinctBy' call
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'arrow.core.NonEmptyList.flatMap' call
-  var this_0 = ast.k25_1;
+  var this_0 = ast.n25_1;
   // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptClientEmitter.emitClient.<anonymous>' call
-  var tmp_2 = this_0.jk_1.m25_1.hk();
+  var tmp_2 = this_0.pk_1.p25_1.nk();
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'kotlin.collections.flatMapTo' call
-  var this_1 = this_0.kk_1;
+  var this_1 = this_0.qk_1;
   var destination = ArrayList_init_$Create$();
   var tmp0_iterator = this_1.g();
   while (tmp0_iterator.h()) {
     var element = tmp0_iterator.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptClientEmitter.emitClient.<anonymous>' call
-    var list = element.m25_1;
+    var list = element.p25_1;
     addAll(destination, list);
   }
   // Inline function 'kotlin.collections.flatMapTo' call
-  var this_2 = tmp_2.ok(destination).nk();
+  var this_2 = tmp_2.uk(destination).tk();
   var destination_0 = ArrayList_init_$Create$();
   var tmp0_iterator_0 = this_2.g();
   while (tmp0_iterator_0.h()) {
@@ -223,18 +223,23 @@ function emitClient(ast) {
   while (tmp0_iterator_1.h()) {
     var e = tmp0_iterator_1.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptClientEmitter.emitClient.<anonymous>' call
-    var key = e.w28_1;
+    var key = e.c29_1;
     if (set.e(key)) {
       list_1.e(e);
     }
   }
   var tmp_3 = list_1;
   var tmp_4 = joinToString(tmp_3, '\n', VOID, VOID, VOID, VOID, TypeScriptClientEmitter$emitClient$lambda_0);
-  var tmp_5 = this.j25(ast);
+  var tmp_5 = this.m25(ast);
   return new Emitted(tmp, trimMargin('\n        |import {Wirespec} from "./Wirespec"\n        |\n        |' + tmp_1 + '\n        |\n        |' + tmp_4 + '\n        |\n        |type RawHandler = (req: Wirespec.RawRequest) => Promise<Wirespec.RawResponse>\n        |\n        |export const Client = (serialization: Wirespec.Serialization, handler: RawHandler) => ({\n        |' + spacer(joinToString(tmp_5, '\n', VOID, VOID, VOID, VOID, TypeScriptClientEmitter$emitClient$lambda_1(this)), 1) + '\n        |})\n        |\n    '));
 }
 initMetadataForInterface(TypeScriptClientEmitter, 'TypeScriptClientEmitter', VOID, VOID, [ClientEmitter, TypeScriptTypeDefinitionEmitter]);
-function emit_5(endpoint) {
+function emit_5(enum_0, module_0) {
+  var tmp = this.m2b(enum_0.q26_1);
+  return 'export type ' + tmp + ' = ' + joinToString(enum_0.r26_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEnumDefinitionEmitter$emit$lambda) + '\n';
+}
+initMetadataForInterface(TypeScriptEnumDefinitionEmitter, 'TypeScriptEnumDefinitionEmitter', VOID, VOID, [TypeScriptTypeDefinitionEmitter]);
+function emit_6(endpoint) {
   // Inline function 'kotlin.collections.map' call
   // Inline function 'kotlin.collections.distinctBy' call
   var this_0 = importReferences(endpoint);
@@ -244,7 +249,7 @@ function emit_5(endpoint) {
   while (tmp0_iterator.h()) {
     var e = tmp0_iterator.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEndpointDefinitionEmitter.emit.<anonymous>' call
-    var key = e.w28_1;
+    var key = e.c29_1;
     if (set.e(key)) {
       list.e(e);
     }
@@ -255,64 +260,64 @@ function emit_5(endpoint) {
   while (tmp0_iterator_0.h()) {
     var item = tmp0_iterator_0.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEndpointDefinitionEmitter.emit.<anonymous>' call
-    var tmp$ret$2 = 'import {' + item.w28_1 + "} from '../model'";
+    var tmp$ret$2 = 'import {' + item.c29_1 + "} from '../model'";
     destination.e(tmp$ret$2);
   }
   var tmp = destination;
   var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emit$lambda);
-  var tmp_1 = this.g2b(endpoint.o24_1);
+  var tmp_1 = this.m2b(endpoint.r24_1);
   var tmp_2 = get_pathParams(endpoint);
   var tmp_3 = emitType(tmp_2, this, 'Path', TypeScriptEndpointDefinitionEmitter$emit$lambda_0(this));
-  var tmp_4 = emitType(endpoint.r24_1, this, 'Queries', TypeScriptEndpointDefinitionEmitter$emit$lambda_1(this));
-  var tmp_5 = emitType(endpoint.s24_1, this, 'Headers', TypeScriptEndpointDefinitionEmitter$emit$lambda_2(this));
-  var tmp_6 = emitType_1(first(endpoint.t24_1), this, endpoint);
-  var tmp_7 = distinctByStatus(endpoint.u24_1);
+  var tmp_4 = emitType(endpoint.u24_1, this, 'Queries', TypeScriptEndpointDefinitionEmitter$emit$lambda_1(this));
+  var tmp_5 = emitType(endpoint.v24_1, this, 'Headers', TypeScriptEndpointDefinitionEmitter$emit$lambda_2(this));
+  var tmp_6 = emitType_1(first(endpoint.w24_1), this, endpoint);
+  var tmp_7 = distinctByStatus(endpoint.x24_1);
   var tmp_8 = joinToString(tmp_7, '\n', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emit$lambda_3(this));
   var tmp_9 = Spacer_instance.toString();
-  var tmp_10 = distinctByStatus(endpoint.u24_1);
+  var tmp_10 = distinctByStatus(endpoint.x24_1);
   var tmp_11 = joinToString(tmp_10, ' | ', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emit$lambda_4(this));
-  var tmp_12 = emitFunction_0(first(endpoint.t24_1), this, endpoint);
-  var tmp_13 = distinctByStatus(endpoint.u24_1);
+  var tmp_12 = emitFunction_0(first(endpoint.w24_1), this, endpoint);
+  var tmp_13 = distinctByStatus(endpoint.x24_1);
   var tmp_14 = joinToString(tmp_13, '\n', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emit$lambda_5(this));
   var tmp_15 = Spacer_instance.toString();
-  var tmp_16 = Spacer_instance.x26(2);
+  var tmp_16 = Spacer_instance.a27(2);
   var tmp_17 = emitHandleFunction(this, endpoint);
   var tmp_18 = Spacer_instance.toString();
-  var tmp_19 = prependIndent(emitClient_0(endpoint, this), Spacer_instance.x26(1));
-  var tmp_20 = prependIndent(emitServer(endpoint, this), Spacer_instance.x26(1));
+  var tmp_19 = prependIndent(emitClient_0(endpoint, this), Spacer_instance.a27(1));
+  var tmp_20 = prependIndent(emitServer(endpoint, this), Spacer_instance.a27(1));
   var tmp_21 = Spacer_instance.toString();
-  var tmp_22 = Spacer_instance.x26(2);
-  var tmp_23 = Companion_instance_0.y25(this.g2b(endpoint.o24_1));
-  var tmp_24 = Spacer_instance.x26(2);
-  var tmp_25 = Spacer_instance.x26(2);
-  return trimMargin('\n          |' + tmp_0 + '\n          |export namespace ' + tmp_1 + ' {\n          |' + tmp_3 + '\n          |' + tmp_4 + '\n          |' + tmp_5 + '\n          |' + tmp_6 + '\n          |' + tmp_8 + '\n          |' + tmp_9 + 'export type Response = ' + tmp_11 + '\n          |' + tmp_12 + '\n          |' + tmp_14 + '\n          |' + tmp_15 + 'export type Handler = {\n          |' + tmp_16 + tmp_17 + '\n          |' + tmp_18 + '}\n          |' + tmp_19 + '\n          |' + tmp_20 + '\n          |' + tmp_21 + 'export const api = {\n          |' + tmp_22 + 'name: "' + tmp_23 + '",\n          |' + tmp_24 + 'method: "' + endpoint.p24_1.q2_1 + '",\n          |' + tmp_25 + 'path: "' + joinToString(endpoint.q24_1, '/', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emit$lambda_6(this)) + '",\n          |' + Spacer_instance.x26(2) + 'server,\n          |' + Spacer_instance.x26(2) + 'client\n          |' + Spacer_instance.toString() + '} as const\n          |}\n          |\n        ');
+  var tmp_22 = Spacer_instance.a27(2);
+  var tmp_23 = Companion_instance_0.b26(this.m2b(endpoint.r24_1));
+  var tmp_24 = Spacer_instance.a27(2);
+  var tmp_25 = Spacer_instance.a27(2);
+  return trimMargin('\n          |' + tmp_0 + '\n          |export namespace ' + tmp_1 + ' {\n          |' + tmp_3 + '\n          |' + tmp_4 + '\n          |' + tmp_5 + '\n          |' + tmp_6 + '\n          |' + tmp_8 + '\n          |' + tmp_9 + 'export type Response = ' + tmp_11 + '\n          |' + tmp_12 + '\n          |' + tmp_14 + '\n          |' + tmp_15 + 'export type Handler = {\n          |' + tmp_16 + tmp_17 + '\n          |' + tmp_18 + '}\n          |' + tmp_19 + '\n          |' + tmp_20 + '\n          |' + tmp_21 + 'export const api = {\n          |' + tmp_22 + 'name: "' + tmp_23 + '",\n          |' + tmp_24 + 'method: "' + endpoint.s24_1.q2_1 + '",\n          |' + tmp_25 + 'path: "' + joinToString(endpoint.t24_1, '/', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emit$lambda_6(this)) + '",\n          |' + Spacer_instance.a27(2) + 'server,\n          |' + Spacer_instance.a27(2) + 'client\n          |' + Spacer_instance.toString() + '} as const\n          |}\n          |\n        ');
 }
 initMetadataForInterface(TypeScriptEndpointDefinitionEmitter, 'TypeScriptEndpointDefinitionEmitter', VOID, VOID, [TypeScriptTypeDefinitionEmitter]);
-function emit_6(refined) {
-  return trimMargin('\n          |export type ' + this.g2b(refined.j26_1) + ' = string;\n          |export const validate' + refined.j26_1.b1() + ' = (value: string): value is ' + this.g2b(refined.j26_1) + ' => \n          |' + Spacer_instance.toString() + this.r26(refined) + ';\n          |\n        ');
+function emit_7(refined) {
+  return trimMargin('\n          |export type ' + this.m2b(refined.m26_1) + ' = string;\n          |export const validate' + refined.m26_1.b1() + ' = (value: string): value is ' + this.m2b(refined.m26_1) + ' => \n          |' + Spacer_instance.toString() + this.u26(refined) + ';\n          |\n        ');
 }
 function emitValidator(_this__u8e3s4) {
   var defaultReturn = 'true;';
-  var type = _this__u8e3s4.k26_1.a29_1;
+  var type = _this__u8e3s4.n26_1.g29_1;
   var tmp;
   if (type instanceof Integer) {
-    var tmp0_safe_receiver = type.g28_1;
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.h25(tmp0_safe_receiver);
+    var tmp0_safe_receiver = type.m28_1;
+    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : this.k25(tmp0_safe_receiver);
     tmp = tmp1_elvis_lhs == null ? defaultReturn : tmp1_elvis_lhs;
   } else {
     if (type instanceof Number_0) {
-      var tmp2_safe_receiver = type.j28_1;
-      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.h25(tmp2_safe_receiver);
+      var tmp2_safe_receiver = type.p28_1;
+      var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : this.k25(tmp2_safe_receiver);
       tmp = tmp3_elvis_lhs == null ? defaultReturn : tmp3_elvis_lhs;
     } else {
       if (type instanceof String_0) {
-        var tmp4_safe_receiver = type.d28_1;
+        var tmp4_safe_receiver = type.j28_1;
         var tmp_0;
         var tmp_1 = tmp4_safe_receiver;
         if ((tmp_1 == null ? null : new RegExp_0(tmp_1)) == null) {
           tmp_0 = null;
         } else {
-          tmp_0 = this.h25(new RegExp_0(tmp4_safe_receiver));
+          tmp_0 = this.k25(new RegExp_0(tmp4_safe_receiver));
         }
         var tmp5_elvis_lhs = tmp_0;
         tmp = tmp5_elvis_lhs == null ? defaultReturn : tmp5_elvis_lhs;
@@ -332,12 +337,7 @@ function emitValidator(_this__u8e3s4) {
   return tmp;
 }
 initMetadataForInterface(TypeScriptRefinedTypeDefinitionEmitter, 'TypeScriptRefinedTypeDefinitionEmitter', VOID, VOID, [TypeScriptTypeDefinitionEmitter]);
-function emit_7(enum_0, module_0) {
-  var tmp = this.g2b(enum_0.n26_1);
-  return 'export type ' + tmp + ' = ' + joinToString(enum_0.o26_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEnumDefinitionEmitter$emit$lambda) + '\n';
-}
-initMetadataForInterface(TypeScriptEnumDefinitionEmitter, 'TypeScriptEnumDefinitionEmitter', VOID, VOID, [TypeScriptTypeDefinitionEmitter]);
-initMetadataForClass(TypeScriptEmitter, 'TypeScriptEmitter', TypeScriptEmitter, LanguageEmitter, [LanguageEmitter, TypeScriptIdentifierEmitter, TypeScriptTypeDefinitionEmitter, TypeScriptEndpointDefinitionEmitter, TypeScriptRefinedTypeDefinitionEmitter, TypeScriptClientEmitter, TypeScriptEnumDefinitionEmitter]);
+initMetadataForClass(TypeScriptEmitter, 'TypeScriptEmitter', TypeScriptEmitter, LanguageEmitter, [LanguageEmitter, TypeScriptEnumDefinitionEmitter, TypeScriptEndpointDefinitionEmitter, TypeScriptRefinedTypeDefinitionEmitter, TypeScriptIdentifierEmitter, TypeScriptClientEmitter, TypeScriptTypeDefinitionEmitter]);
 initMetadataForObject(TypeScriptShared, 'TypeScriptShared');
 //endregion
 function emitClientInterface(_this__u8e3s4, $this, endpoint) {
@@ -345,10 +345,10 @@ function emitClientInterface(_this__u8e3s4, $this, endpoint) {
   return joinToString(tmp, ', ', VOID, VOID, VOID, VOID, TypeScriptClientEmitter$emitClientInterface$lambda($this));
 }
 function emitFunction($this, endpoint, request) {
-  var tmp = endpoint.o24_1.b1();
+  var tmp = endpoint.r24_1.b1();
   var tmp_0 = emitClientInterface(request, $this, endpoint);
   var tmp_1 = Spacer_instance.toString();
-  var tmp_2 = endpoint.o24_1.b1();
+  var tmp_2 = endpoint.r24_1.b1();
   // Inline function 'kotlin.text.orEmpty' call
   // Inline function 'kotlin.takeIf' call
   var this_0 = paramList(request, endpoint);
@@ -372,14 +372,14 @@ function emitFunction($this, endpoint, request) {
   }
   var tmp0_elvis_lhs = tmp_4;
   var tmp$ret$5 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-  return trimMargin('\n        |' + tmp + ': async (props: {' + tmp_0 + '}) => {\n        |' + tmp_1 + 'const req = ' + tmp_2 + '.request(' + tmp$ret$5 + ')\n        |' + Spacer_instance.toString() + 'const rawRequest = ' + endpoint.o24_1.b1() + '.client(serialization).to(req)\n        |' + Spacer_instance.toString() + 'const rawResponse = await handler(rawRequest)\n        |' + Spacer_instance.toString() + 'return ' + endpoint.o24_1.b1() + '.client(serialization).from(rawResponse)\n        |},\n    ');
+  return trimMargin('\n        |' + tmp + ': async (props: {' + tmp_0 + '}) => {\n        |' + tmp_1 + 'const req = ' + tmp_2 + '.request(' + tmp$ret$5 + ')\n        |' + Spacer_instance.toString() + 'const rawRequest = ' + endpoint.r24_1.b1() + '.client(serialization).to(req)\n        |' + Spacer_instance.toString() + 'const rawResponse = await handler(rawRequest)\n        |' + Spacer_instance.toString() + 'return ' + endpoint.r24_1.b1() + '.client(serialization).from(rawResponse)\n        |},\n    ');
 }
 function TypeScriptClientEmitter$emitClient$lambda(_destruct__k2r9zo) {
   var endpoint = _destruct__k2r9zo.sd();
-  return 'import {' + endpoint.o24_1.b1() + '} from "./endpoint/' + endpoint.o24_1.b1() + '"';
+  return 'import {' + endpoint.r24_1.b1() + '} from "./endpoint/' + endpoint.r24_1.b1() + '"';
 }
 function TypeScriptClientEmitter$emitClient$lambda_0(it) {
-  return 'import {' + it.w28_1 + '} from "./model/' + it.w28_1 + '"';
+  return 'import {' + it.c29_1 + '} from "./model/' + it.c29_1 + '"';
 }
 function TypeScriptClientEmitter$emitClient$lambda_1(this$0) {
   return function (_destruct__k2r9zo) {
@@ -390,13 +390,13 @@ function TypeScriptClientEmitter$emitClient$lambda_1(this$0) {
 }
 function TypeScriptClientEmitter$emitClientInterface$lambda(this$0) {
   return function (it) {
-    return it.s25_1.b1() + ': ' + this$0.g25(it.t25_1);
+    return it.v25_1.b1() + ': ' + this$0.j25(it.w25_1);
   };
 }
 function TypeScriptClientEmitter() {
 }
 function TypeScriptEmitter$emit$lambda(it) {
-  return 'export {' + it.d26().b1() + "} from './" + it.d26().b1() + "'";
+  return 'export {' + it.g26().b1() + "} from './" + it.g26().b1() + "'";
 }
 function TypeScriptEmitter$emit$lambda_0(it) {
   // Inline function 'kotlin.text.trimStart' call
@@ -404,32 +404,32 @@ function TypeScriptEmitter$emit$lambda_0(it) {
 }
 function TypeScriptEmitter$emit$lambda_1(this$0) {
   return function (it) {
-    return this$0.g25(it);
+    return this$0.j25(it);
   };
 }
 function TypeScriptEmitter() {
   LanguageEmitter.call(this);
-  this.h2b_1 = FileExtension_TypeScript_getInstance();
-  this.i2b_1 = TypeScriptShared_getInstance();
-  this.j2b_1 = '//';
+  this.n2b_1 = FileExtension_TypeScript_getInstance();
+  this.o2b_1 = TypeScriptShared_getInstance();
+  this.p2b_1 = '//';
 }
-protoOf(TypeScriptEmitter).n25 = function () {
-  return this.h2b_1;
+protoOf(TypeScriptEmitter).q25 = function () {
+  return this.n2b_1;
 };
-protoOf(TypeScriptEmitter).l2a = function () {
-  return this.i2b_1;
+protoOf(TypeScriptEmitter).r2a = function () {
+  return this.o2b_1;
 };
-protoOf(TypeScriptEmitter).o25 = function () {
-  return this.j2b_1;
+protoOf(TypeScriptEmitter).r25 = function () {
+  return this.p2b_1;
 };
-protoOf(TypeScriptEmitter).d23 = function (ast, logger) {
+protoOf(TypeScriptEmitter).g23 = function (ast, logger) {
   // Inline function 'kotlin.run' call
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEmitter.emit.<anonymous>' call
-  var $this$run = protoOf(LanguageEmitter).d23.call(this, ast, logger);
+  var $this$run = protoOf(LanguageEmitter).g23.call(this, ast, logger);
   var tmp;
   if (hasEndpoints(ast)) {
-    tmp = $this$run.pk(this.f2b(ast));
+    tmp = $this$run.vk(this.l2b(ast));
   } else {
     tmp = $this$run;
   }
@@ -437,22 +437,22 @@ protoOf(TypeScriptEmitter).d23 = function (ast, logger) {
   // Inline function 'kotlin.collections.map' call
   // Inline function 'kotlin.collections.groupBy' call
   // Inline function 'arrow.core.NonEmptyList.flatMap' call
-  var this_0 = ast.k25_1;
+  var this_0 = ast.n25_1;
   // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEmitter.emit.<anonymous>' call
-  var tmp_1 = this_0.jk_1.m25_1.hk();
+  var tmp_1 = this_0.pk_1.p25_1.nk();
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'kotlin.collections.flatMapTo' call
-  var this_1 = this_0.kk_1;
+  var this_1 = this_0.qk_1;
   var destination = ArrayList_init_$Create$();
   var tmp0_iterator = this_1.g();
   while (tmp0_iterator.h()) {
     var element = tmp0_iterator.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEmitter.emit.<anonymous>' call
-    var list = element.m25_1;
+    var list = element.p25_1;
     addAll(destination, list);
   }
   // Inline function 'kotlin.collections.groupByTo' call
-  var this_2 = tmp_1.ok(destination);
+  var this_2 = tmp_1.uk(destination);
   var destination_0 = LinkedHashMap_init_$Create$();
   var tmp0_iterator_0 = this_2.g();
   while (tmp0_iterator_0.h()) {
@@ -484,27 +484,27 @@ protoOf(TypeScriptEmitter).d23 = function (ast, logger) {
     var ns = item.a1();
     // Inline function 'kotlin.collections.component2' call
     var defs = item.b1();
-    var tmp_3 = ns + '/index.' + this.n25().w25_1;
+    var tmp_3 = ns + '/index.' + this.q25().z25_1;
     var tmp$ret$15 = new Emitted(tmp_3, joinToString(defs, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda));
     destination_1.e(tmp$ret$15);
   }
-  return tmp_0.ok(destination_1);
+  return tmp_0.uk(destination_1);
 };
-protoOf(TypeScriptEmitter).b26 = function (module_0, logger) {
+protoOf(TypeScriptEmitter).e26 = function (module_0, logger) {
   // Inline function 'kotlin.let' call
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEmitter.emit.<anonymous>' call
-  return protoOf(LanguageEmitter).b26.call(this, module_0, logger).pk(new Emitted('Wirespec', this.l2a().l2b_1));
+  return protoOf(LanguageEmitter).e26.call(this, module_0, logger).vk(new Emitted('Wirespec', this.r2a().r2b_1));
 };
-protoOf(TypeScriptEmitter).c26 = function (definition, module_0, logger) {
+protoOf(TypeScriptEmitter).f26 = function (definition, module_0, logger) {
   // Inline function 'kotlin.let' call
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEmitter.emit.<anonymous>' call
-  var it = protoOf(LanguageEmitter).c26.call(this, definition, module_0, logger);
-  var subPackageName = plus(Companion_instance.s26(''), definition);
-  return new Emitted(subPackageName.v26() + this.d2b(it.x23_1), trimMargin("\n                    |import {Wirespec} from '../Wirespec'\n                    |\n                    |" + it.y23_1 + '\n                '));
+  var it = protoOf(LanguageEmitter).f26.call(this, definition, module_0, logger);
+  var subPackageName = plus(Companion_instance.v26(''), definition);
+  return new Emitted(subPackageName.y26() + this.j2b(it.a24_1), trimMargin("\n                    |import {Wirespec} from '../Wirespec'\n                    |\n                    |" + it.b24_1 + '\n                '));
 };
-protoOf(TypeScriptEmitter).h26 = function (union) {
+protoOf(TypeScriptEmitter).k26 = function (union) {
   // Inline function 'kotlin.collections.map' call
   // Inline function 'kotlin.collections.distinctBy' call
   var this_0 = importReferences(union);
@@ -514,7 +514,7 @@ protoOf(TypeScriptEmitter).h26 = function (union) {
   while (tmp0_iterator.h()) {
     var e = tmp0_iterator.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEmitter.emit.<anonymous>' call
-    var key = e.w28_1;
+    var key = e.c29_1;
     if (set.e(key)) {
       list.e(e);
     }
@@ -525,24 +525,24 @@ protoOf(TypeScriptEmitter).h26 = function (union) {
   while (tmp0_iterator_0.h()) {
     var item = tmp0_iterator_0.i();
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEmitter.emit.<anonymous>' call
-    var tmp$ret$2 = 'import {' + item.w28_1 + "} from '../model'";
+    var tmp$ret$2 = 'import {' + item.c29_1 + "} from '../model'";
     destination.e(tmp$ret$2);
   }
   var tmp = destination;
   var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_0);
-  var tmp_1 = this.g2b(union.d24_1);
-  return trimMargin('\n        |' + tmp_0 + '\n        |export type ' + tmp_1 + ' = ' + joinToString(union.e24_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_1(this)) + '\n        |\n    ');
+  var tmp_1 = this.m2b(union.g24_1);
+  return trimMargin('\n        |' + tmp_0 + '\n        |export type ' + tmp_1 + ' = ' + joinToString(union.h24_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda_1(this)) + '\n        |\n    ');
 };
-protoOf(TypeScriptEmitter).g26 = function (channel) {
-  return this.p25();
+protoOf(TypeScriptEmitter).j26 = function (channel) {
+  return this.s25();
 };
 function emit_8(_this__u8e3s4, $this) {
   var tmp;
   if (_this__u8e3s4 instanceof Literal) {
-    tmp = _this__u8e3s4.q25_1;
+    tmp = _this__u8e3s4.t25_1;
   } else {
     if (_this__u8e3s4 instanceof Param) {
-      tmp = ':' + _this__u8e3s4.v24_1.b1();
+      tmp = ':' + _this__u8e3s4.y24_1.b1();
     } else {
       noWhenBranchMatchedException();
     }
@@ -550,54 +550,54 @@ function emit_8(_this__u8e3s4, $this) {
   return tmp;
 }
 function emitClient_0(_this__u8e3s4, $this) {
-  return trimMargin('\n        |export const client: Wirespec.Client<Request, Response> = (serialization: Wirespec.Serialization) => ({\n        |' + prependIndent(emitClientTo(_this__u8e3s4, $this), Spacer_instance.x26(1)) + ',\n        |' + prependIndent(emitClientFrom(_this__u8e3s4, $this), Spacer_instance.x26(1)) + '\n        |})\n    ');
+  return trimMargin('\n        |export const client: Wirespec.Client<Request, Response> = (serialization: Wirespec.Serialization) => ({\n        |' + prependIndent(emitClientTo(_this__u8e3s4, $this), Spacer_instance.a27(1)) + ',\n        |' + prependIndent(emitClientFrom(_this__u8e3s4, $this), Spacer_instance.a27(1)) + '\n        |})\n    ');
 }
 function emitClientTo(_this__u8e3s4, $this) {
-  var tmp = Spacer_instance.x26(1);
+  var tmp = Spacer_instance.a27(1);
   // Inline function 'kotlin.text.uppercase' call
   // Inline function 'kotlin.js.asDynamic' call
-  var tmp_0 = _this__u8e3s4.p24_1.q2_1.toUpperCase();
-  var tmp_1 = Spacer_instance.x26(1);
+  var tmp_0 = _this__u8e3s4.s24_1.q2_1.toUpperCase();
+  var tmp_1 = Spacer_instance.a27(1);
   var tmp_2 = emitPathArray(_this__u8e3s4, $this);
-  var tmp_3 = Spacer_instance.x26(1);
-  var tmp_4 = joinToString(_this__u8e3s4.r24_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitClientTo$lambda($this));
-  var tmp_5 = Spacer_instance.x26(1);
-  return trimMargin('\n        |to: (it) => ({\n        |' + tmp + 'method: "' + tmp_0 + '",\n        |' + tmp_1 + 'path: ' + tmp_2 + ',\n        |' + tmp_3 + 'queries: {' + tmp_4 + '},\n        |' + tmp_5 + 'headers: {' + joinToString(_this__u8e3s4.s24_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitClientTo$lambda_0($this)) + '},\n        |' + Spacer_instance.x26(1) + 'body: serialization.serialize(it.body)\n        |})\n    ');
+  var tmp_3 = Spacer_instance.a27(1);
+  var tmp_4 = joinToString(_this__u8e3s4.u24_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitClientTo$lambda($this));
+  var tmp_5 = Spacer_instance.a27(1);
+  return trimMargin('\n        |to: (it) => ({\n        |' + tmp + 'method: "' + tmp_0 + '",\n        |' + tmp_1 + 'path: ' + tmp_2 + ',\n        |' + tmp_3 + 'queries: {' + tmp_4 + '},\n        |' + tmp_5 + 'headers: {' + joinToString(_this__u8e3s4.v24_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitClientTo$lambda_0($this)) + '},\n        |' + Spacer_instance.a27(1) + 'body: serialization.serialize(it.body)\n        |})\n    ');
 }
 function emitClientFrom(_this__u8e3s4, $this) {
-  var tmp = Spacer_instance.x26(1);
-  var tmp_0 = distinctByStatus(_this__u8e3s4.u24_1);
-  return trimMargin('\n        |from: (it) => {\n        |' + tmp + 'switch (it.status) {\n        |' + prependIndent(joinToString(tmp_0, '\n', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitClientFrom$lambda($this)), Spacer_instance.x26(2)) + '\n        |' + Spacer_instance.x26(2) + 'default:\n        |' + Spacer_instance.x26(3) + 'throw new Error(`Cannot internalize response with status: ${it.status}`);\n        |' + Spacer_instance.x26(1) + '}\n        |}\n    ');
+  var tmp = Spacer_instance.a27(1);
+  var tmp_0 = distinctByStatus(_this__u8e3s4.x24_1);
+  return trimMargin('\n        |from: (it) => {\n        |' + tmp + 'switch (it.status) {\n        |' + prependIndent(joinToString(tmp_0, '\n', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitClientFrom$lambda($this)), Spacer_instance.a27(2)) + '\n        |' + Spacer_instance.a27(2) + 'default:\n        |' + Spacer_instance.a27(3) + 'throw new Error(`Cannot internalize response with status: ${it.status}`);\n        |' + Spacer_instance.a27(1) + '}\n        |}\n    ');
 }
 function emitClientFromResponse(_this__u8e3s4, $this) {
-  var tmp = fixStatus(_this__u8e3s4.a25_1);
-  var tmp_0 = Spacer_instance.x26(1);
-  var tmp_1 = Spacer_instance.x26(2);
-  var tmp_2 = fixStatus(_this__u8e3s4.a25_1);
-  var tmp_3 = Spacer_instance.x26(2);
-  return trimMargin('\n        |case ' + tmp + ':\n        |' + tmp_0 + 'return {\n        |' + tmp_1 + 'status: ' + tmp_2 + ',\n        |' + tmp_3 + 'headers: {' + joinToString(_this__u8e3s4.b25_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitClientFromResponse$lambda($this)) + '},\n        |' + Spacer_instance.x26(2) + 'body: serialization.deserialize<' + emitReference(_this__u8e3s4, $this) + '>(it.body)\n        |' + Spacer_instance.x26(1) + '};\n    ');
+  var tmp = fixStatus(_this__u8e3s4.d25_1);
+  var tmp_0 = Spacer_instance.a27(1);
+  var tmp_1 = Spacer_instance.a27(2);
+  var tmp_2 = fixStatus(_this__u8e3s4.d25_1);
+  var tmp_3 = Spacer_instance.a27(2);
+  return trimMargin('\n        |case ' + tmp + ':\n        |' + tmp_0 + 'return {\n        |' + tmp_1 + 'status: ' + tmp_2 + ',\n        |' + tmp_3 + 'headers: {' + joinToString(_this__u8e3s4.e25_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitClientFromResponse$lambda($this)) + '},\n        |' + Spacer_instance.a27(2) + 'body: serialization.deserialize<' + emitReference(_this__u8e3s4, $this) + '>(it.body)\n        |' + Spacer_instance.a27(1) + '};\n    ');
 }
 function emitServer(_this__u8e3s4, $this) {
-  return trimMargin('\n        |export const server:Wirespec.Server<Request, Response> = (serialization: Wirespec.Serialization) => ({\n        |' + prependIndent(emitServerFrom(_this__u8e3s4, $this), Spacer_instance.x26(1)) + ',\n        |' + prependIndent(emitServerTo($this), Spacer_instance.x26(1)) + '\n        |})\n    ');
+  return trimMargin('\n        |export const server:Wirespec.Server<Request, Response> = (serialization: Wirespec.Serialization) => ({\n        |' + prependIndent(emitServerFrom(_this__u8e3s4, $this), Spacer_instance.a27(1)) + ',\n        |' + prependIndent(emitServerTo($this), Spacer_instance.a27(1)) + '\n        |})\n    ');
 }
 function emitServerFrom(_this__u8e3s4, $this) {
-  var tmp = Spacer_instance.x26(1);
-  var tmp_0 = Spacer_instance.x26(2);
+  var tmp = Spacer_instance.a27(1);
+  var tmp_0 = Spacer_instance.a27(2);
   // Inline function 'kotlin.text.uppercase' call
   // Inline function 'kotlin.js.asDynamic' call
-  var tmp_1 = _this__u8e3s4.p24_1.q2_1.toUpperCase();
-  var tmp_2 = Spacer_instance.x26(2);
+  var tmp_1 = _this__u8e3s4.s24_1.q2_1.toUpperCase();
+  var tmp_2 = Spacer_instance.a27(2);
   var tmp_3 = get_indexedPathParams(_this__u8e3s4);
-  var tmp_4 = prependIndent(joinToString(tmp_3, ',', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda($this)), Spacer_instance.x26(3));
-  var tmp_5 = Spacer_instance.x26(2);
-  var tmp_6 = Spacer_instance.x26(2);
-  var tmp_7 = joinToString(_this__u8e3s4.r24_1, ',', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda_0($this));
-  var tmp_8 = Spacer_instance.x26(2);
-  var tmp_9 = Spacer_instance.x26(2);
-  return trimMargin('\n        |from: (it) => {\n        |' + tmp + 'return {\n        |' + tmp_0 + 'method: "' + tmp_1 + '",\n        |' + tmp_2 + 'path: {\n        |' + tmp_4 + '\n        |' + tmp_5 + '},\n        |' + tmp_6 + 'queries: {\n        |' + tmp_7 + '\n        |' + tmp_8 + '},\n        |' + tmp_9 + 'headers: {\n        |' + joinToString(_this__u8e3s4.s24_1, ',', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda_1($this)) + '\n        |' + Spacer_instance.x26(2) + '},\n        |' + Spacer_instance.x26(2) + 'body: serialization.deserialize(it.body)\n        |' + Spacer_instance.x26(1) + '}\n        |}\n    ');
+  var tmp_4 = prependIndent(joinToString(tmp_3, ',', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda($this)), Spacer_instance.a27(3));
+  var tmp_5 = Spacer_instance.a27(2);
+  var tmp_6 = Spacer_instance.a27(2);
+  var tmp_7 = joinToString(_this__u8e3s4.u24_1, ',', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda_0($this));
+  var tmp_8 = Spacer_instance.a27(2);
+  var tmp_9 = Spacer_instance.a27(2);
+  return trimMargin('\n        |from: (it) => {\n        |' + tmp + 'return {\n        |' + tmp_0 + 'method: "' + tmp_1 + '",\n        |' + tmp_2 + 'path: {\n        |' + tmp_4 + '\n        |' + tmp_5 + '},\n        |' + tmp_6 + 'queries: {\n        |' + tmp_7 + '\n        |' + tmp_8 + '},\n        |' + tmp_9 + 'headers: {\n        |' + joinToString(_this__u8e3s4.v24_1, ',', VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda_1($this)) + '\n        |' + Spacer_instance.a27(2) + '},\n        |' + Spacer_instance.a27(2) + 'body: serialization.deserialize(it.body)\n        |' + Spacer_instance.a27(1) + '}\n        |}\n    ');
 }
 function emitServerTo($this) {
-  return trimMargin('\n        |to: (it) => ({\n        |' + Spacer_instance.x26(1) + 'status: it.status,\n        |' + Spacer_instance.x26(1) + 'headers: {},\n        |' + Spacer_instance.x26(1) + 'body: serialization.serialize(it.body),\n        |})\n    ');
+  return trimMargin('\n        |to: (it) => ({\n        |' + Spacer_instance.a27(1) + 'status: it.status,\n        |' + Spacer_instance.a27(1) + 'headers: {},\n        |' + Spacer_instance.a27(1) + 'body: serialization.serialize(it.body),\n        |})\n    ');
 }
 function emitType(_this__u8e3s4, $this, name, block) {
   var tmp;
@@ -610,7 +610,7 @@ function emitType(_this__u8e3s4, $this, name, block) {
   return tmp;
 }
 function emitName(_this__u8e3s4, $this) {
-  return 'Response' + Companion_instance_0.x25(_this__u8e3s4.a25_1);
+  return 'Response' + Companion_instance_0.a26(_this__u8e3s4.d25_1);
 }
 function emitFunction_0(_this__u8e3s4, $this, endpoint) {
   var tmp = Spacer_instance.toString();
@@ -640,18 +640,18 @@ function emitFunction_0(_this__u8e3s4, $this, endpoint) {
   }
   var tmp0_elvis_lhs = tmp_4;
   var tmp_5 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-  var tmp_6 = Spacer_instance.x26(2);
+  var tmp_6 = Spacer_instance.a27(2);
   var tmp_7 = get_pathParams(endpoint);
   var tmp_8 = joinToObject(tmp_7, $this, TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_0($this));
-  var tmp_9 = Spacer_instance.x26(2);
-  var tmp_10 = endpoint.p24_1.toString();
-  var tmp_11 = Spacer_instance.x26(2);
-  var tmp_12 = joinToObject(endpoint.r24_1, $this, TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_1($this));
-  var tmp_13 = Spacer_instance.x26(2);
-  var tmp_14 = joinToObject(endpoint.s24_1, $this, TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_2($this));
-  var tmp_15 = Spacer_instance.x26(2);
+  var tmp_9 = Spacer_instance.a27(2);
+  var tmp_10 = endpoint.s24_1.toString();
+  var tmp_11 = Spacer_instance.a27(2);
+  var tmp_12 = joinToObject(endpoint.u24_1, $this, TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_1($this));
+  var tmp_13 = Spacer_instance.a27(2);
+  var tmp_14 = joinToObject(endpoint.v24_1, $this, TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_2($this));
+  var tmp_15 = Spacer_instance.a27(2);
   var tmp_16;
-  if (_this__u8e3s4.x24_1 == null) {
+  if (_this__u8e3s4.a25_1 == null) {
     tmp_16 = null;
   } else {
     // Inline function 'kotlin.let' call
@@ -664,11 +664,11 @@ function emitFunction_0(_this__u8e3s4, $this, endpoint) {
 }
 function emitFunction_1(_this__u8e3s4, $this) {
   var tmp = Spacer_instance.toString();
-  var tmp_0 = Companion_instance_0.x25(_this__u8e3s4.a25_1);
+  var tmp_0 = Companion_instance_0.a26(_this__u8e3s4.d25_1);
   var tmp_1 = paramList_0(_this__u8e3s4);
   var tmp_2 = joinToObject(tmp_1, $this, TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_3($this));
   var tmp_3 = Spacer_instance.toString();
-  var tmp_4 = Companion_instance_0.x25(_this__u8e3s4.a25_1);
+  var tmp_4 = Companion_instance_0.a26(_this__u8e3s4.d25_1);
   // Inline function 'kotlin.text.orEmpty' call
   // Inline function 'kotlin.takeIf' call
   var this_0 = paramList_0(_this__u8e3s4);
@@ -688,18 +688,18 @@ function emitFunction_1(_this__u8e3s4, $this) {
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.emitters.typescript.TypeScriptEndpointDefinitionEmitter.emitFunction.<anonymous>' call
-    tmp_6 = 'params: Response' + Companion_instance_0.x25(_this__u8e3s4.a25_1) + 'Params';
+    tmp_6 = 'params: Response' + Companion_instance_0.a26(_this__u8e3s4.d25_1) + 'Params';
   }
   var tmp0_elvis_lhs = tmp_6;
   var tmp_7 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-  var tmp_8 = Companion_instance_0.x25(_this__u8e3s4.a25_1);
-  var tmp_9 = Spacer_instance.x26(2);
-  var tmp_10 = fixStatus(_this__u8e3s4.a25_1);
-  var tmp_11 = Spacer_instance.x26(2);
-  var tmp_12 = joinToObject(_this__u8e3s4.b25_1, $this, TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_4($this));
-  var tmp_13 = Spacer_instance.x26(2);
+  var tmp_8 = Companion_instance_0.a26(_this__u8e3s4.d25_1);
+  var tmp_9 = Spacer_instance.a27(2);
+  var tmp_10 = fixStatus(_this__u8e3s4.d25_1);
+  var tmp_11 = Spacer_instance.a27(2);
+  var tmp_12 = joinToObject(_this__u8e3s4.e25_1, $this, TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_4($this));
+  var tmp_13 = Spacer_instance.a27(2);
   var tmp_14;
-  if (_this__u8e3s4.c25_1 == null) {
+  if (_this__u8e3s4.f25_1 == null) {
     tmp_14 = null;
   } else {
     // Inline function 'kotlin.let' call
@@ -711,51 +711,51 @@ function emitFunction_1(_this__u8e3s4, $this) {
   return trimIndent('\n      |' + tmp + 'export type Response' + tmp_0 + 'Params = ' + tmp_2 + '\n      |' + tmp_3 + 'export const response' + tmp_4 + ' = (' + tmp_7 + '): Response' + tmp_8 + ' => ({\n      |' + tmp_9 + 'status: ' + tmp_10 + ',\n      |' + tmp_11 + 'headers: ' + tmp_12 + ',\n      |' + tmp_13 + 'body: ' + (tmp2_elvis_lhs == null ? 'undefined' : tmp2_elvis_lhs) + ',\n      |' + Spacer_instance.toString() + '})\n    ');
 }
 function emitReference(_this__u8e3s4, $this) {
-  var tmp0_safe_receiver = _this__u8e3s4.c25_1;
-  var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.z24_1;
-  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.g25(tmp1_safe_receiver);
+  var tmp0_safe_receiver = _this__u8e3s4.f25_1;
+  var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c25_1;
+  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.j25(tmp1_safe_receiver);
   return tmp2_elvis_lhs == null ? 'undefined' : tmp2_elvis_lhs;
 }
 function emitPathArray(_this__u8e3s4, $this) {
-  return joinToString(_this__u8e3s4.q24_1, ', ', '[', ']', VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitPathArray$lambda($this));
+  return joinToString(_this__u8e3s4.t24_1, ', ', '[', ']', VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitPathArray$lambda($this));
 }
 function emitType_0(_this__u8e3s4, $this) {
   var tmp = Spacer_instance.toString();
   var tmp_0 = emitName(_this__u8e3s4, $this);
-  var tmp_1 = Spacer_instance.x26(2);
-  var tmp_2 = fixStatus(_this__u8e3s4.a25_1);
-  var tmp_3 = Spacer_instance.x26(2);
-  return trimIndent('\n      |' + tmp + 'export type ' + tmp_0 + ' = {\n      |' + tmp_1 + 'status: ' + tmp_2 + '\n      |' + tmp_3 + 'headers: {' + joinToString(_this__u8e3s4.b25_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitType$lambda_0($this)) + '}\n      |' + Spacer_instance.x26(2) + 'body: ' + emitReference(_this__u8e3s4, $this) + '\n      |' + Spacer_instance.toString() + '}\n    ');
+  var tmp_1 = Spacer_instance.a27(2);
+  var tmp_2 = fixStatus(_this__u8e3s4.d25_1);
+  var tmp_3 = Spacer_instance.a27(2);
+  return trimIndent('\n      |' + tmp + 'export type ' + tmp_0 + ' = {\n      |' + tmp_1 + 'status: ' + tmp_2 + '\n      |' + tmp_3 + 'headers: {' + joinToString(_this__u8e3s4.e25_1, VOID, VOID, VOID, VOID, VOID, TypeScriptEndpointDefinitionEmitter$emitType$lambda_0($this)) + '}\n      |' + Spacer_instance.a27(2) + 'body: ' + emitReference(_this__u8e3s4, $this) + '\n      |' + Spacer_instance.toString() + '}\n    ');
 }
 function emitReference_0(_this__u8e3s4, $this) {
-  var tmp0_safe_receiver = _this__u8e3s4.x24_1;
-  var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.z24_1;
-  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.g25(tmp1_safe_receiver);
+  var tmp0_safe_receiver = _this__u8e3s4.a25_1;
+  var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.c25_1;
+  var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.j25(tmp1_safe_receiver);
   return tmp2_elvis_lhs == null ? 'undefined' : tmp2_elvis_lhs;
 }
 function emitType_1(_this__u8e3s4, $this, endpoint) {
-  return trimIndent('\n      |' + Spacer_instance.toString() + 'export type Request = {\n      |' + Spacer_instance.x26(2) + 'path: Path\n      |' + Spacer_instance.x26(2) + 'method: "' + endpoint.p24_1.toString() + '"\n      |' + Spacer_instance.x26(2) + 'queries: Queries\n      |' + Spacer_instance.x26(2) + 'headers: Headers\n      |' + Spacer_instance.x26(2) + 'body: ' + emitReference_0(_this__u8e3s4, $this) + '\n      |' + Spacer_instance.toString() + '}\n    ');
+  return trimIndent('\n      |' + Spacer_instance.toString() + 'export type Request = {\n      |' + Spacer_instance.a27(2) + 'path: Path\n      |' + Spacer_instance.a27(2) + 'method: "' + endpoint.s24_1.toString() + '"\n      |' + Spacer_instance.a27(2) + 'queries: Queries\n      |' + Spacer_instance.a27(2) + 'headers: Headers\n      |' + Spacer_instance.a27(2) + 'body: ' + emitReference_0(_this__u8e3s4, $this) + '\n      |' + Spacer_instance.toString() + '}\n    ');
 }
 function emit_9(_this__u8e3s4, $this) {
-  return Spacer_instance.toString() + $this.f26(_this__u8e3s4.v24_1) + ': ' + $this.g25(_this__u8e3s4.w24_1);
+  return Spacer_instance.toString() + $this.i26(_this__u8e3s4.y24_1) + ': ' + $this.j25(_this__u8e3s4.z24_1);
 }
 function emit_10(_this__u8e3s4, $this) {
-  return $this.f26(_this__u8e3s4.s25_1) + (_this__u8e3s4.t25_1.hm() ? '?' : '') + ': ' + $this.g25(_this__u8e3s4.t25_1.q28(false));
+  return $this.i26(_this__u8e3s4.v25_1) + (_this__u8e3s4.w25_1.jm() ? '?' : '') + ': ' + $this.j25(_this__u8e3s4.w25_1.w28(false));
 }
 function emitDeserialize(_this__u8e3s4, $this) {
-  return $this.f26(_this__u8e3s4.rd_1.v24_1) + ': serialization.deserialize(it.path[' + _this__u8e3s4.qd_1 + '])';
+  return $this.i26(_this__u8e3s4.rd_1.y24_1) + ': serialization.deserialize(it.path[' + _this__u8e3s4.qd_1 + '])';
 }
 function emitDeserialize_0(_this__u8e3s4, $this, fields) {
-  return $this.f26(_this__u8e3s4.l24_1) + ': serialization.deserialize(it.' + fields + '[' + $this.f26(_this__u8e3s4.l24_1) + '])';
+  return $this.i26(_this__u8e3s4.o24_1) + ': serialization.deserialize(it.' + fields + '[' + $this.i26(_this__u8e3s4.o24_1) + '])';
 }
 function emitSerialize(_this__u8e3s4, $this, fields) {
-  return $this.f26(_this__u8e3s4.l24_1) + ': serialization.serialize(it.' + fields + '[' + $this.f26(_this__u8e3s4.l24_1) + '])';
+  return $this.i26(_this__u8e3s4.o24_1) + ': serialization.serialize(it.' + fields + '[' + $this.i26(_this__u8e3s4.o24_1) + '])';
 }
 function joinToObject(_this__u8e3s4, $this, transform) {
   return joinToString(_this__u8e3s4, ', ', '{', '}', VOID, VOID, transform);
 }
 function emitHandleFunction($this, endpoint) {
-  return Companion_instance_0.y25($this.g2b(endpoint.o24_1)) + ': (request:Request) => Promise<Response>';
+  return Companion_instance_0.b26($this.m2b(endpoint.r24_1)) + ': (request:Request) => Promise<Response>';
 }
 function TypeScriptEndpointDefinitionEmitter$emit$lambda(it) {
   // Inline function 'kotlin.text.trimStart' call
@@ -768,12 +768,12 @@ function TypeScriptEndpointDefinitionEmitter$emit$lambda_0(this$0) {
 }
 function TypeScriptEndpointDefinitionEmitter$emit$lambda_1(this$0) {
   return function (it) {
-    return this$0.f25(it);
+    return this$0.i25(it);
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emit$lambda_2(this$0) {
   return function (it) {
-    return this$0.f25(it);
+    return this$0.i25(it);
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emit$lambda_3(this$0) {
@@ -823,17 +823,17 @@ function TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda(this$0) {
 }
 function TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda_0(this$0) {
   return function (it) {
-    return prependIndent(emitDeserialize_0(it, this$0, 'queries'), Spacer_instance.x26(3));
+    return prependIndent(emitDeserialize_0(it, this$0, 'queries'), Spacer_instance.a27(3));
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emitServerFrom$lambda_1(this$0) {
   return function (it) {
-    return prependIndent(emitDeserialize_0(it, this$0, 'headers'), Spacer_instance.x26(3));
+    return prependIndent(emitDeserialize_0(it, this$0, 'headers'), Spacer_instance.a27(3));
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emitType$lambda($block) {
   return function (it) {
-    return Spacer_instance.x26(1) + $block(it);
+    return Spacer_instance.a27(1) + $block(it);
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emitFunction$lambda(this$0) {
@@ -843,17 +843,17 @@ function TypeScriptEndpointDefinitionEmitter$emitFunction$lambda(this$0) {
 }
 function TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_0(this$0) {
   return function (it) {
-    return this$0.f26(it.v24_1) + ': params[' + this$0.f26(it.v24_1) + ']';
+    return this$0.i26(it.y24_1) + ': params[' + this$0.i26(it.y24_1) + ']';
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_1(this$0) {
   return function (it) {
-    return this$0.f26(it.l24_1) + ': params[' + this$0.f26(it.l24_1) + ']';
+    return this$0.i26(it.o24_1) + ': params[' + this$0.i26(it.o24_1) + ']';
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_2(this$0) {
   return function (it) {
-    return this$0.f26(it.l24_1) + ': params[' + this$0.f26(it.l24_1) + ']';
+    return this$0.i26(it.o24_1) + ': params[' + this$0.i26(it.o24_1) + ']';
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_3(this$0) {
@@ -863,17 +863,17 @@ function TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_3(this$0) {
 }
 function TypeScriptEndpointDefinitionEmitter$emitFunction$lambda_4(this$0) {
   return function (it) {
-    return this$0.f26(it.l24_1) + ': params[' + this$0.f26(it.l24_1) + ']';
+    return this$0.i26(it.o24_1) + ': params[' + this$0.i26(it.o24_1) + ']';
   };
 }
 function TypeScriptEndpointDefinitionEmitter$emitPathArray$lambda(this$0) {
   return function (it) {
     var tmp;
     if (it instanceof Literal) {
-      tmp = '"' + it.q25_1 + '"';
+      tmp = '"' + it.t25_1 + '"';
     } else {
       if (it instanceof Param) {
-        tmp = 'serialization.serialize(it.path[' + this$0.f26(it.v24_1) + '])';
+        tmp = 'serialization.serialize(it.path[' + this$0.i26(it.y24_1) + '])';
       } else {
         noWhenBranchMatchedException();
       }
@@ -883,7 +883,7 @@ function TypeScriptEndpointDefinitionEmitter$emitPathArray$lambda(this$0) {
 }
 function TypeScriptEndpointDefinitionEmitter$emitType$lambda_0(this$0) {
   return function (it) {
-    return this$0.f26(it.l24_1) + ': ' + this$0.g25(it.m24_1);
+    return this$0.i26(it.o24_1) + ': ' + this$0.j25(it.p24_1);
   };
 }
 function TypeScriptEndpointDefinitionEmitter() {
@@ -899,8 +899,8 @@ function TypeScriptRefinedTypeDefinitionEmitter() {
 }
 function TypeScriptShared() {
   TypeScriptShared_instance = this;
-  this.k2b_1 = 'community.flock.wirespec';
-  this.l2b_1 = trimMargin('\n        |export namespace Wirespec {\n        |' + Spacer_instance.toString() + 'export type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + Spacer_instance.toString() + 'export type RawRequest = { method: Method, path: string[], queries: Record<string, string>, headers: Record<string, string>, body?: string }\n        |' + Spacer_instance.toString() + 'export type RawResponse = { status: number, headers: Record<string, string>, body?: string }\n        |' + Spacer_instance.toString() + 'export type Request<T> = { path: Record<string, unknown>, method: Method, queries?: Record<string, unknown>, headers?: Record<string, unknown>, body?:T }\n        |' + Spacer_instance.toString() + 'export type Response<T> = { status:number, headers?: Record<string, unknown>, body?:T }\n        |' + Spacer_instance.toString() + 'export type Serialization = { serialize: <T>(type: T) => string; deserialize: <T>(raw: string | undefined) => T }\n        |' + Spacer_instance.toString() + 'export type Client<REQ extends Request<unknown>, RES extends Response<unknown>> = (serialization: Serialization) => { to: (request: REQ) => RawRequest; from: (response: RawResponse) => RES }\n        |' + Spacer_instance.toString() + 'export type Server<REQ extends Request<unknown>, RES extends Response<unknown>> = (serialization: Serialization) => { from: (request: RawRequest) => REQ; to: (response: RES) => RawResponse }\n        |' + Spacer_instance.toString() + 'export type Api<REQ extends Request<unknown>, RES extends Response<unknown>> = { name: string; method: Method, path: string, client: Client<REQ, RES>; server: Server<REQ, RES> }\n        |}\n    ');
+  this.q2b_1 = 'community.flock.wirespec';
+  this.r2b_1 = trimMargin('\n        |export namespace Wirespec {\n        |' + Spacer_instance.toString() + 'export type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + Spacer_instance.toString() + 'export type RawRequest = { method: Method, path: string[], queries: Record<string, string>, headers: Record<string, string>, body?: string }\n        |' + Spacer_instance.toString() + 'export type RawResponse = { status: number, headers: Record<string, string>, body?: string }\n        |' + Spacer_instance.toString() + 'export type Request<T> = { path: Record<string, unknown>, method: Method, queries?: Record<string, unknown>, headers?: Record<string, unknown>, body?:T }\n        |' + Spacer_instance.toString() + 'export type Response<T> = { status:number, headers?: Record<string, unknown>, body?:T }\n        |' + Spacer_instance.toString() + 'export type Serialization = { serialize: <T>(type: T) => string; deserialize: <T>(raw: string | undefined) => T }\n        |' + Spacer_instance.toString() + 'export type Client<REQ extends Request<unknown>, RES extends Response<unknown>> = (serialization: Serialization) => { to: (request: REQ) => RawRequest; from: (response: RawResponse) => RES }\n        |' + Spacer_instance.toString() + 'export type Server<REQ extends Request<unknown>, RES extends Response<unknown>> = (serialization: Serialization) => { from: (request: RawRequest) => REQ; to: (response: RES) => RawResponse }\n        |' + Spacer_instance.toString() + 'export type Api<REQ extends Request<unknown>, RES extends Response<unknown>> = { name: string; method: Method, path: string, client: Client<REQ, RES>; server: Server<REQ, RES> }\n        |}\n    ');
 }
 protoOf(TypeScriptShared).toString = function () {
   return 'TypeScriptShared';
@@ -931,26 +931,26 @@ function TypeScriptTypeDefinitionEmitter$emit$lambda(it) {
 }
 function TypeScriptTypeDefinitionEmitter$emit$lambda_0(this$0) {
   return function (it) {
-    return this$0.f25(it);
+    return this$0.i25(it);
   };
 }
 function TypeScriptTypeDefinitionEmitter() {
 }
 //region block: post-declaration
-protoOf(TypeScriptEmitter).p26 = emit_7;
-protoOf(TypeScriptEmitter).d25 = emit_0;
-protoOf(TypeScriptEmitter).g25 = emit_1;
-protoOf(TypeScriptEmitter).h25 = emit_2;
-protoOf(TypeScriptEmitter).e25 = emit_3;
-protoOf(TypeScriptEmitter).f25 = emit_4;
-protoOf(TypeScriptEmitter).f26 = emit;
-protoOf(TypeScriptEmitter).q26 = emit_5;
-protoOf(TypeScriptEmitter).l26 = emit_6;
-protoOf(TypeScriptEmitter).r26 = emitValidator;
-protoOf(TypeScriptEmitter).g2b = sanitizeSymbol;
-protoOf(TypeScriptEmitter).d2b = sanitizeSymbol_0;
-protoOf(TypeScriptEmitter).f2b = emitClient;
-protoOf(TypeScriptEmitter).j25 = emitClientEndpointRequest;
+protoOf(TypeScriptEmitter).s26 = emit_5;
+protoOf(TypeScriptEmitter).g25 = emit_0;
+protoOf(TypeScriptEmitter).j25 = emit_1;
+protoOf(TypeScriptEmitter).k25 = emit_2;
+protoOf(TypeScriptEmitter).h25 = emit_3;
+protoOf(TypeScriptEmitter).i25 = emit_4;
+protoOf(TypeScriptEmitter).i26 = emit;
+protoOf(TypeScriptEmitter).t26 = emit_6;
+protoOf(TypeScriptEmitter).o26 = emit_7;
+protoOf(TypeScriptEmitter).u26 = emitValidator;
+protoOf(TypeScriptEmitter).m2b = sanitizeSymbol;
+protoOf(TypeScriptEmitter).j2b = sanitizeSymbol_0;
+protoOf(TypeScriptEmitter).l2b = emitClient;
+protoOf(TypeScriptEmitter).m25 = emitClientEndpointRequest;
 //endregion
 //region block: exports
 export {