@flock/wirespec 0.18.0-RC.1 → 0.18.1-RC.2

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

@@ -43,12 +43,12 @@ import {
 } from './kotlin-kotlin-stdlib.mjs';
 import {
   Package2tniq694j1763 as Package,
-  Custom2si7lto3wompr as Custom,
-  Importdjdfxu3pjkxa as Import,
+  import5uhkz67bd8tt as import_0,
   File3dimy4iqmuock as File,
   transformChildrend9p91tpcqdkx as transformChildren,
   Interface3pn84xq686t2r as Interface,
   Namespace345pal554qu3j as Namespace,
+  Custom2si7lto3wompr as Custom,
   Companion_getInstance3gvtuyxc9uhxj as Companion_getInstance,
   withElements2toq84v08e72 as withElements,
   TransformScopeyrd3lf4zrk76 as TransformScope,
@@ -59,18 +59,16 @@ import {
   rawttvqxl50flj9 as raw,
   Nameoqr8dt2fim9d as Name,
   transformChildren2mszeagj5nq4c as transformChildren_0,
-  sanitizeFieldName2ukb9v6ywyhle as sanitizeFieldName,
+  sanitizeFieldName1ptgy1kxy8u2m as sanitizeFieldName,
   ConstructorStatement1x4n4sr59iy4n as ConstructorStatement,
   FunctionCall30872kpnbr7op as FunctionCall,
-  SanitizationConfig1cdlo8dm6nafn as SanitizationConfig,
-  AccessorStyle_PROPERTIES_getInstance1nw41hme1mkqu as AccessorStyle_PROPERTIES_getInstance,
-  buildClientServerInterfaces2363tdgi9w3me as buildClientServerInterfaces,
+  SanitizationConfig11mmn3p2c03c1 as SanitizationConfig,
+  convertClientServer3s89ijty7q130 as convertClientServer,
   convert13xvfhgrf57n5 as convert,
   generateScala1gu01ibz2u66l as generateScala,
   RawElement2yts1x2rbem1g as RawElement,
   Constructor3io4sluuia3gk as Constructor,
-  RawExpression2bo7ldfrptjia as RawExpression,
-  withLabelField22w2j91tp01o3 as withLabelField,
+  withLabelField33ehya4zusm70 as withLabelField,
   Enumlszg09mwd24f as Enum,
   transformChildren3n5cjwmxlhwx9 as transformChildren_1,
   FieldCall1iz7z2fx2xo4p as FieldCall,
@@ -80,9 +78,10 @@ import {
   emit3bzdcd0f6nwtj as emit,
   withSharedSource1qgrajaccojj3 as withSharedSource,
   emitn3eihixilqyh as emit_0,
-  wrapWithPackagedyp8fwgcgbx0 as wrapWithPackage,
+  prependImports32gcj3yb8voha as prependImports,
+  placeInPackage1ffljbk9me4ug as placeInPackage,
   convertWithValidation3ar3nbcqsbkpn as convertWithValidation,
-  sanitizeNames3w41y78hqenku as sanitizeNames,
+  sanitizeNames2wqmyf8vafp9x as sanitizeNames,
   convert11ert2po54h1y as convert_0,
   convert37aabdzvtv9vg as convert_1,
   convert17zcptkz4mhr4 as convert_2,
@@ -118,7 +117,7 @@ function ScalaIrEmitter$shared$o$source$lambda(element, transformer) {
   var tmp;
   if (element instanceof File) {
     // Inline function 'kotlin.collections.partition' call
-    var this_0 = element.r1m_1;
+    var this_0 = element.u1m_1;
     var first = ArrayList_init_$Create$();
     var second = ArrayList_init_$Create$();
     var _iterator__ex2g4s = this_0.t();
@@ -131,9 +130,9 @@ function ScalaIrEmitter$shared$o$source$lambda(element, transformer) {
       }
     }
     var _destruct__k2r9zo = new Pair(first, second);
-    var packageElements = _destruct__k2r9zo.oe();
-    var rest = _destruct__k2r9zo.pe();
-    tmp = element.u1m(VOID, plus_0(plus(packageElements, new Import('scala.reflect', new Custom('ClassTag'))), rest));
+    var packageElements = _destruct__k2r9zo.ne();
+    var rest = _destruct__k2r9zo.oe();
+    tmp = element.x1m(VOID, plus_0(plus(packageElements, import_0('scala.reflect', 'ClassTag')), rest));
   } else {
     tmp = element;
   }
@@ -144,9 +143,9 @@ function ScalaIrEmitter$shared$o$source$lambda_0(element, transformer) {
   var tmp;
   if (element instanceof Namespace) {
     var tmp_0;
-    if (element.a1n_1.equals(Companion_getInstance().o1h('Wirespec'))) {
+    if (element.z1m_1.equals(Companion_getInstance().m1h('Wirespec'))) {
       // Inline function 'kotlin.collections.flatMap' call
-      var tmp0 = element.b1n_1;
+      var tmp0 = element.a1n_1;
       // Inline function 'kotlin.collections.flatMapTo' call
       var destination = ArrayList_init_$Create$();
       var _iterator__ex2g4s = tmp0.t();
@@ -155,13 +154,13 @@ function ScalaIrEmitter$shared$o$source$lambda_0(element, transformer) {
         var tmp_1;
         var tmp_2;
         if (element_0 instanceof Interface) {
-          tmp_2 = setOf(['Request', 'Response']).h1(element_0.o1o_1.u1l());
+          tmp_2 = setOf(['Request', 'Response']).u1(element_0.m1o_1.x1l());
         } else {
           tmp_2 = false;
         }
         if (tmp_2) {
           // Inline function 'kotlin.collections.filterIsInstance' call
-          var tmp0_0 = element_0.p1o_1;
+          var tmp0_0 = element_0.n1o_1;
           // Inline function 'kotlin.collections.filterIsInstanceTo' call
           var destination_0 = ArrayList_init_$Create$();
           var _iterator__ex2g4s_0 = tmp0_0.t();
@@ -177,7 +176,7 @@ function ScalaIrEmitter$shared$o$source$lambda_0(element, transformer) {
             var _iterator__ex2g4s_1 = destination_0.t();
             while (_iterator__ex2g4s_1.u()) {
               var element_2 = _iterator__ex2g4s_1.v();
-              if (element_2.o1o_1.u1l() === 'Headers') {
+              if (element_2.m1o_1.x1l() === 'Headers') {
                 tmp$ret$3 = element_2;
                 break $l$block;
               }
@@ -187,9 +186,9 @@ function ScalaIrEmitter$shared$o$source$lambda_0(element, transformer) {
           var nestedHeaders = tmp$ret$3;
           var tmp_3;
           if (!(nestedHeaders == null)) {
-            var tmp_4 = new Namespace(element_0.o1o_1, listOf(nestedHeaders));
+            var tmp_4 = new Namespace(element_0.m1o_1, listOf(nestedHeaders));
             // Inline function 'kotlin.collections.filter' call
-            var tmp0_1 = element_0.p1o_1;
+            var tmp0_1 = element_0.n1o_1;
             // Inline function 'kotlin.collections.filterTo' call
             var destination_1 = ArrayList_init_$Create$();
             var _iterator__ex2g4s_2 = tmp0_1.t();
@@ -197,7 +196,7 @@ function ScalaIrEmitter$shared$o$source$lambda_0(element, transformer) {
               var element_3 = _iterator__ex2g4s_2.v();
               var tmp_5;
               if (element_3 instanceof Interface) {
-                tmp_5 = element_3.o1o_1.u1l() === 'Headers';
+                tmp_5 = element_3.m1o_1.x1l() === 'Headers';
               } else {
                 tmp_5 = false;
               }
@@ -207,22 +206,22 @@ function ScalaIrEmitter$shared$o$source$lambda_0(element, transformer) {
             }
             var tmp_6 = destination_1;
             // Inline function 'kotlin.collections.map' call
-            var this_0 = element_0.t1o_1;
+            var this_0 = element_0.r1o_1;
             // Inline function 'kotlin.collections.mapTo' call
             var destination_2 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
             var _iterator__ex2g4s_3 = this_0.t();
             while (_iterator__ex2g4s_3.u()) {
               var item = _iterator__ex2g4s_3.v();
               var tmp_7;
-              if (item.n1n_1.u1h() === 'headers') {
-                tmp_7 = item.r1n(VOID, new Custom(element_0.o1o_1.u1l() + '.Headers'));
+              if (item.m1n_1.s1h() === 'headers') {
+                tmp_7 = item.q1n(VOID, new Custom(element_0.m1o_1.x1l() + '.Headers'));
               } else {
                 tmp_7 = item;
               }
               var tmp$ret$7 = tmp_7;
               destination_2.x(tmp$ret$7);
             }
-            tmp_3 = listOf_0([tmp_4, element_0.v1o(VOID, tmp_6, VOID, VOID, VOID, destination_2)]);
+            tmp_3 = listOf_0([tmp_4, element_0.t1o(VOID, tmp_6, VOID, VOID, VOID, destination_2)]);
           } else {
             tmp_3 = listOf(element_0);
           }
@@ -234,7 +233,7 @@ function ScalaIrEmitter$shared$o$source$lambda_0(element, transformer) {
         addAll(destination, list);
       }
       var newElements = destination;
-      tmp_0 = element.e1n(VOID, newElements);
+      tmp_0 = element.d1n(VOID, newElements);
     } else {
       tmp_0 = element;
     }
@@ -249,11 +248,11 @@ function ScalaIrEmitter$shared$o$source$lambda_1(this$0) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Namespace) {
-      var injected = element.a1n_1.equals(Companion_getInstance().o1h('Wirespec')) ? this$0.w1z_1 : emptyList();
+      var injected = element.z1m_1.equals(Companion_getInstance().m1h('Wirespec')) ? this$0.c20_1 : emptyList();
       var tmp_0;
       // Inline function 'kotlin.collections.isNotEmpty' call
       if (!injected.r()) {
-        tmp_0 = withElements(element, plus_0(element.s1m(), injected));
+        tmp_0 = withElements(element, plus_0(element.v1m(), injected));
       } else {
         tmp_0 = element;
       }
@@ -266,15 +265,15 @@ function ScalaIrEmitter$shared$o$source$lambda_1(this$0) {
   };
 }
 function _get_sanitizationConfig__sns434($this) {
-  var tmp0 = $this.d20_1;
+  var tmp0 = $this.j20_1;
   var tmp = KProperty1;
   // Inline function 'kotlin.getValue' call
   getPropertyCallableRef('sanitizationConfig', 1, tmp, ScalaIrEmitter$_get_sanitizationConfig_$ref_ydarb0(), null);
-  return tmp0.n1();
+  return tmp0.l1();
 }
 function sanitize($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.mapIndexed' call
-  var this_0 = split(_this__u8e3s4.n1(), ['.', ' ']);
+  var this_0 = split(_this__u8e3s4.l1(), ['.', ' ']);
   // Inline function 'kotlin.collections.mapIndexedTo' call
   var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
   var index = 0;
@@ -283,7 +282,7 @@ function sanitize($this, _this__u8e3s4) {
     var item = _iterator__ex2g4s.v();
     var _unary__edvuaz = index;
     index = _unary__edvuaz + 1 | 0;
-    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance.qq(item) : item;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance.oq(item) : item;
     destination.x(tmp$ret$0);
   }
   // Inline function 'kotlin.text.filter' call
@@ -331,7 +330,7 @@ function sanitizeFirstIsDigit($this, _this__u8e3s4) {
   return tmp;
 }
 function sanitizeKeywords($this, _this__u8e3s4) {
-  return Companion_getInstance_0().f20_1.h1(_this__u8e3s4) ? addBackticks(_this__u8e3s4) : _this__u8e3s4;
+  return Companion_getInstance_0().l20_1.u1(_this__u8e3s4) ? addBackticks(_this__u8e3s4) : _this__u8e3s4;
 }
 function sanitizeSymbol($this, _this__u8e3s4) {
   // Inline function 'kotlin.collections.mapIndexed' call
@@ -344,7 +343,7 @@ function sanitizeSymbol($this, _this__u8e3s4) {
     var item = _iterator__ex2g4s.v();
     var _unary__edvuaz = index;
     index = _unary__edvuaz + 1 | 0;
-    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance.qq(item) : item;
+    var tmp$ret$0 = checkIndexOverflow(_unary__edvuaz) > 0 ? Companion_instance.oq(item) : item;
     destination.x(tmp$ret$0);
   }
   // Inline function 'kotlin.text.filter' call
@@ -377,13 +376,21 @@ function buildImports($this, _this__u8e3s4) {
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var e = _iterator__ex2g4s.v();
-    var key = e.nu_1;
+    var key = e.lu_1;
     if (set.x(key)) {
       list.x(e);
     }
   }
-  var tmp = list;
-  return joinToString(tmp, '\n', VOID, VOID, VOID, VOID, ScalaIrEmitter$buildImports$lambda($this));
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(list, 10));
+  var _iterator__ex2g4s_0 = list.t();
+  while (_iterator__ex2g4s_0.u()) {
+    var item = _iterator__ex2g4s_0.v();
+    var tmp$ret$2 = import_0($this.k1v().mr_1 + '.model', item.lu_1);
+    destination.x(tmp$ret$2);
+  }
+  return destination;
 }
 function addIdentityTypeToCall($this, _this__u8e3s4) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
@@ -391,19 +398,19 @@ function addIdentityTypeToCall($this, _this__u8e3s4) {
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_0 = scope.a1u_1;
+  var this_0 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.f1h(ScalaIrEmitter$addIdentityTypeToCall$lambda);
-  var tmp$ret$2 = this_1.g1h();
-  tmp.a1u_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.a1u_1;
+  this_1.d1h(ScalaIrEmitter$addIdentityTypeToCall$lambda);
+  var tmp$ret$2 = this_1.e1h();
+  tmp.z1t_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.z1t_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function isRequestObject($this, namespace) {
   // Inline function 'kotlin.collections.filterIsInstance' call
-  var tmp0 = namespace.b1n_1;
+  var tmp0 = namespace.a1n_1;
   // Inline function 'kotlin.collections.filterIsInstanceTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = tmp0.t();
@@ -419,7 +426,7 @@ function isRequestObject($this, namespace) {
     var _iterator__ex2g4s_0 = destination.t();
     while (_iterator__ex2g4s_0.u()) {
       var element_0 = _iterator__ex2g4s_0.v();
-      if (element_0.g1n_1.u1l() === 'Request') {
+      if (element_0.f1n_1.x1l() === 'Request') {
         tmp$ret$3 = element_0;
         break $l$block;
       }
@@ -434,7 +441,7 @@ function isRequestObject($this, namespace) {
     tmp = tmp0_elvis_lhs;
   }
   var requestStruct = tmp;
-  return requestStruct.i1n_1.a1() === 1 && single(requestStruct.i1n_1).s1n_1.r() || (requestStruct.h1n_1.r() && requestStruct.i1n_1.r());
+  return requestStruct.h1n_1.a1() === 1 && single(requestStruct.h1n_1).r1n_1.r() || (requestStruct.g1n_1.r() && requestStruct.h1n_1.r());
 }
 function injectHandleFunction($this, _this__u8e3s4) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
@@ -442,26 +449,26 @@ function injectHandleFunction($this, _this__u8e3s4) {
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_0 = scope.a1u_1;
+  var this_0 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.f1h(ScalaIrEmitter$injectHandleFunction$lambda);
-  var tmp$ret$2 = this_1.g1h();
-  tmp.a1u_1 = transform(this_0, tmp$ret$2);
-  var tmp_0 = scope.a1u_1;
+  this_1.d1h(ScalaIrEmitter$injectHandleFunction$lambda);
+  var tmp$ret$2 = this_1.e1h();
+  tmp.z1t_1 = transform(this_0, tmp$ret$2);
+  var tmp_0 = scope.z1t_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function buildClientServerObjects($this, endpoint, requestIsObject, namespace) {
   var reqType = requestIsObject ? 'Request.type' : 'Request';
-  var pathTemplate = '/' + joinToString(endpoint.ip_1, '/', VOID, VOID, VOID, VOID, ScalaIrEmitter$buildClientServerObjects$lambda);
-  var clientObject = raw(trimMargin('\n            |object Client extends Wirespec.Client[' + reqType + ', Response[?]] {\n            |  override val pathTemplate: String = "' + pathTemplate + '"\n            |  override val method: String = "' + endpoint.hp_1.toString() + '"\n            |  override def client(serialization: Wirespec.Serialization): Wirespec.ClientEdge[' + reqType + ', Response[?]] = new Wirespec.ClientEdge[' + reqType + ', Response[?]] {\n            |    override def to(request: ' + reqType + '): Wirespec.RawRequest = toRawRequest(serialization, request)\n            |    override def from(response: Wirespec.RawResponse): Response[?] = fromRawResponse(serialization, response)\n            |  }\n            |}\n            '));
-  var serverObject = raw(trimMargin('\n            |object Server extends Wirespec.Server[' + reqType + ', Response[?]] {\n            |  override val pathTemplate: String = "' + pathTemplate + '"\n            |  override val method: String = "' + endpoint.hp_1.toString() + '"\n            |  override def server(serialization: Wirespec.Serialization): Wirespec.ServerEdge[' + reqType + ', Response[?]] = new Wirespec.ServerEdge[' + reqType + ', Response[?]] {\n            |    override def from(request: Wirespec.RawRequest): ' + reqType + ' = fromRawRequest(serialization, request)\n            |    override def to(response: Response[?]): Wirespec.RawResponse = toRawResponse(serialization, response)\n            |  }\n            |}\n            '));
-  return namespace.e1n(VOID, plus(plus(namespace.b1n_1, clientObject), serverObject));
+  var pathTemplate = '/' + joinToString(endpoint.gp_1, '/', VOID, VOID, VOID, VOID, ScalaIrEmitter$buildClientServerObjects$lambda);
+  var clientObject = raw(trimMargin('\n            |object Client extends Wirespec.Client[' + reqType + ', Response[?]] {\n            |  override val pathTemplate: String = "' + pathTemplate + '"\n            |  override val method: String = "' + endpoint.fp_1.toString() + '"\n            |  override def client(serialization: Wirespec.Serialization): Wirespec.ClientEdge[' + reqType + ', Response[?]] = new Wirespec.ClientEdge[' + reqType + ', Response[?]] {\n            |    override def to(request: ' + reqType + '): Wirespec.RawRequest = toRawRequest(serialization, request)\n            |    override def from(response: Wirespec.RawResponse): Response[?] = fromRawResponse(serialization, response)\n            |  }\n            |}\n            '));
+  var serverObject = raw(trimMargin('\n            |object Server extends Wirespec.Server[' + reqType + ', Response[?]] {\n            |  override val pathTemplate: String = "' + pathTemplate + '"\n            |  override val method: String = "' + endpoint.fp_1.toString() + '"\n            |  override def server(serialization: Wirespec.Serialization): Wirespec.ServerEdge[' + reqType + ', Response[?]] = new Wirespec.ServerEdge[' + reqType + ', Response[?]] {\n            |    override def from(request: Wirespec.RawRequest): ' + reqType + ' = fromRawRequest(serialization, request)\n            |    override def to(response: Response[?]): Wirespec.RawResponse = toRawResponse(serialization, response)\n            |  }\n            |}\n            '));
+  return namespace.d1n(VOID, plus(plus(namespace.a1n_1, clientObject), serverObject));
 }
 function Companion() {
   Companion_instance_2 = this;
-  this.f20_1 = setOf(['abstract', 'case', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', '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', 'given', 'using', 'enum', 'export', 'then']);
+  this.l20_1 = setOf(['abstract', 'case', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', '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', 'given', 'using', 'enum', 'export', 'then']);
 }
 var Companion_instance_2;
 function Companion_getInstance_0() {
@@ -474,13 +481,13 @@ function ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda(it) {
 }
 function ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda_0(this$0) {
   return function (name) {
-    var sanitized = name.p1h_1.a1() > 1 ? name.t1l() : sanitizeSymbol(this$0, name.u1h());
+    var sanitized = name.n1h_1.a1() > 1 ? name.r1l() : sanitizeSymbol(this$0, name.s1h());
     return new Name(listOf(sanitized));
   };
 }
 function ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda_1(this$0) {
   return function (name) {
-    return new Name(listOf(sanitizeSymbol(this$0, name.t1l())));
+    return new Name(listOf(sanitizeSymbol(this$0, name.r1l())));
   };
 }
 function ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda_2(this$0) {
@@ -493,28 +500,28 @@ function ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda_3(this$0) {
     var tmp;
     if (stmt instanceof FunctionCall) {
       var tmp_0;
-      if (stmt.y1l_1.u1h() === 'validate') {
-        tmp_0 = transformChildren_0(stmt.c1m(VOID, emptyList()), tr);
+      if (stmt.b1m_1.s1h() === 'validate') {
+        tmp_0 = transformChildren_0(stmt.f1m(VOID, emptyList()), tr);
       } else {
         tmp_0 = transformChildren_0(stmt, tr);
       }
       tmp = tmp_0;
     } else {
       if (stmt instanceof ConstructorStatement) {
-        var tmp_1 = tr.s1t(stmt.m1m_1);
+        var tmp_1 = tr.r1t(stmt.p1m_1);
         // Inline function 'kotlin.collections.map' call
-        var this_0 = stmt.n1m_1;
+        var this_0 = stmt.q1m_1;
         // Inline function 'kotlin.collections.mapTo' call
         var destination = ArrayList_init_$Create$_0(this_0.a1());
         // Inline function 'kotlin.collections.iterator' call
-        var _iterator__ex2g4s = this_0.l1().t();
+        var _iterator__ex2g4s = this_0.j1().t();
         while (_iterator__ex2g4s.u()) {
           var item = _iterator__ex2g4s.v();
           // Inline function 'kotlin.collections.component1' call
-          var name = item.m1();
+          var name = item.k1();
           // Inline function 'kotlin.collections.component2' call
-          var expr = item.n1();
-          var tmp$ret$3 = to(sanitizeFieldName(_get_sanitizationConfig__sns434(this$0), name), tr.v1t(expr));
+          var expr = item.l1();
+          var tmp$ret$3 = to(sanitizeFieldName(_get_sanitizationConfig__sns434(this$0), name), tr.u1t(expr));
           destination.x(tmp$ret$3);
         }
         tmp = new ConstructorStatement(tmp_1, toMap(destination));
@@ -527,7 +534,7 @@ function ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda_3(this$0) {
 }
 function ScalaIrEmitter$sanitizationConfig$delegate$lambda(this$0) {
   return function () {
-    var tmp = Companion_getInstance_0().f20_1;
+    var tmp = Companion_getInstance_0().l20_1;
     var tmp_0 = ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda;
     var tmp_1 = ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda_0(this$0);
     var tmp_2 = ScalaIrEmitter$sanitizationConfig$delegate$lambda$lambda_1(this$0);
@@ -541,59 +548,59 @@ function ScalaIrEmitter$_get_sanitizationConfig_$ref_ydarb0() {
   };
 }
 function ScalaIrEmitter$shared$1() {
-  this.v1z_1 = 'community.flock.wirespec.scala';
-  this.w1z_1 = buildClientServerInterfaces(AccessorStyle_PROPERTIES_getInstance());
+  this.b20_1 = 'community.flock.wirespec.scala';
+  this.c20_1 = convertClientServer(new Shared(this.b20_1));
   var tmp = this;
   // Inline function 'community.flock.wirespec.ir.core.transform' call
-  var this_0 = convert(new Shared(this.v1z_1));
+  var this_0 = convert(new Shared(this.b20_1));
   var scope = new TransformScope(this_0);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp_0 = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_1 = scope.a1u_1;
+  var this_1 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_2 = new TransformerBuilder();
-  this_2.f1h(ScalaIrEmitter$shared$o$source$lambda);
-  var tmp$ret$2 = this_2.g1h();
-  tmp_0.a1u_1 = transform(this_1, tmp$ret$2);
+  this_2.d1h(ScalaIrEmitter$shared$o$source$lambda);
+  var tmp$ret$2 = this_2.e1h();
+  tmp_0.z1t_1 = transform(this_1, tmp$ret$2);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp_1 = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_3 = scope.a1u_1;
+  var this_3 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_4 = new TransformerBuilder();
-  this_4.f1h(ScalaIrEmitter$shared$o$source$lambda_0);
-  var tmp$ret$7 = this_4.g1h();
-  tmp_1.a1u_1 = transform(this_3, tmp$ret$7);
+  this_4.d1h(ScalaIrEmitter$shared$o$source$lambda_0);
+  var tmp$ret$7 = this_4.e1h();
+  tmp_1.z1t_1 = transform(this_3, tmp$ret$7);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.injectAfter' call
   var tmp_2 = scope;
   // Inline function 'community.flock.wirespec.ir.core.injectAfter' call
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_5 = scope.a1u_1;
+  var this_5 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_6 = new TransformerBuilder();
-  this_6.f1h(ScalaIrEmitter$shared$o$source$lambda_1(this));
-  var tmp$ret$12 = this_6.g1h();
-  tmp_2.a1u_1 = transform(this_5, tmp$ret$12);
-  var tmp_3 = scope.a1u_1;
+  this_6.d1h(ScalaIrEmitter$shared$o$source$lambda_1(this));
+  var tmp$ret$12 = this_6.e1h();
+  tmp_2.z1t_1 = transform(this_5, tmp$ret$12);
+  var tmp_3 = scope.z1t_1;
   var tmp$ret$17 = isInterface(tmp_3, Element) ? tmp_3 : THROW_CCE();
-  tmp.x1z_1 = generateScala(tmp$ret$17);
+  tmp.d20_1 = generateScala(tmp$ret$17);
 }
-protoOf(ScalaIrEmitter$shared$1).s1w = function () {
-  return this.x1z_1;
+protoOf(ScalaIrEmitter$shared$1).r1w = function () {
+  return this.d20_1;
 };
 function ScalaIrEmitter$emit$lambda(this$0) {
   return function () {
-    return new File(Companion_getInstance().o1h(Companion_instance_0.nr('community.flock.wirespec.scala').qr() + 'Wirespec'), listOf(new RawElement(this$0.u1v().s1w())));
+    return new File(Companion_getInstance().m1h(Companion_instance_0.lr('community.flock.wirespec.scala').or() + 'Wirespec'), listOf(new RawElement(this$0.t1v().r1w())));
   };
 }
 function ScalaIrEmitter$emit$lambda_0(element, transformer) {
   var tmp;
   if (element instanceof Struct) {
-    tmp = element.h1n_1.r() ? element.m1n(VOID, VOID, listOf(new Constructor(emptyList(), emptyList()))) : element;
+    tmp = element.g1n_1.r() ? element.l1n(VOID, VOID, listOf(new Constructor(emptyList(), emptyList()))) : element;
   } else {
     tmp = element;
   }
@@ -609,7 +616,7 @@ function ScalaIrEmitter$emit$lambda_1(this$0) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Enum) {
-      tmp = withLabelField(element, ScalaIrEmitter$emit$lambda$lambda(this$0), true, new RawExpression('label'));
+      tmp = withLabelField(element, ScalaIrEmitter$emit$lambda$lambda(this$0));
     } else {
       tmp = element;
     }
@@ -622,55 +629,35 @@ function ScalaIrEmitter$emit$lambda_2(expr, tr) {
   var tmp_0;
   var tmp_1;
   if (expr instanceof FunctionCall) {
-    tmp_1 = expr.y1l_1.t1l() === 'toString';
+    tmp_1 = expr.b1m_1.r1l() === 'toString';
   } else {
     tmp_1 = false;
   }
   if (tmp_1) {
-    tmp_0 = !(expr.w1l_1 == null);
+    tmp_0 = !(expr.z1l_1 == null);
   } else {
     tmp_0 = false;
   }
   if (tmp_0) {
-    var tmp0_safe_receiver = expr.w1l_1;
+    var tmp0_safe_receiver = expr.z1l_1;
     var tmp_2;
     if (tmp0_safe_receiver == null) {
       tmp_2 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_2 = tr.v1t(tmp0_safe_receiver);
+      tmp_2 = tr.u1t(tmp0_safe_receiver);
     }
-    tmp = new FieldCall(tmp_2, Companion_getInstance().o1h('toString'));
+    tmp = new FieldCall(tmp_2, Companion_getInstance().m1h('toString'));
   } else {
     tmp = transformChildren_1(expr, tr);
   }
   return tmp;
 }
-function ScalaIrEmitter$emitClient$lambda(this$0) {
-  return function (it) {
-    return 'import ' + this$0.l1v().or_1 + '.model.' + it.nu_1;
-  };
-}
-function ScalaIrEmitter$emitClient$lambda_0(this$0) {
-  return function (it) {
-    return 'import ' + this$0.l1v().or_1 + '.endpoint.' + it.gp_1.n1();
-  };
-}
-function ScalaIrEmitter$emitClient$lambda_1(this$0) {
-  return function (it) {
-    return 'import ' + this$0.l1v().or_1 + '.client.' + it.gp_1.n1() + 'Client';
-  };
-}
-function ScalaIrEmitter$buildImports$lambda(this$0) {
-  return function (it) {
-    return 'import ' + this$0.l1v().or_1 + '.model.' + it.nu_1;
-  };
-}
 function ScalaIrEmitter$addIdentityTypeToCall$lambda(element, transformer) {
   var tmp;
   if (element instanceof Struct) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = element.j1n_1;
+    var this_0 = element.i1n_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.t();
@@ -679,19 +666,19 @@ function ScalaIrEmitter$addIdentityTypeToCall$lambda(element, transformer) {
       var tmp_0;
       var tmp_1;
       if (item instanceof Custom) {
-        tmp_1 = endsWith(item.s1h_1, '.Call');
+        tmp_1 = endsWith(item.q1h_1, '.Call');
       } else {
         tmp_1 = false;
       }
       if (tmp_1) {
-        tmp_0 = item.k1m(VOID, listOf(new Custom('[A] =>> A')));
+        tmp_0 = item.n1m(VOID, listOf(new Custom('[A] =>> A')));
       } else {
         tmp_0 = item;
       }
       var tmp$ret$0 = tmp_0;
       destination.x(tmp$ret$0);
     }
-    tmp = element.m1n(VOID, VOID, VOID, destination);
+    tmp = element.l1n(VOID, VOID, VOID, destination);
   } else {
     tmp = element;
   }
@@ -702,10 +689,10 @@ function ScalaIrEmitter$injectHandleFunction$lambda(element, transformer) {
   var tmp;
   if (element instanceof Interface) {
     var tmp_0;
-    if (element.o1o_1.equals(Companion_getInstance().o1h('Handler')) || element.o1o_1.equals(Companion_getInstance().o1h('Call'))) {
+    if (element.m1o_1.equals(Companion_getInstance().m1h('Handler')) || element.m1o_1.equals(Companion_getInstance().m1h('Call'))) {
       var tmp0_typeParameters = listOf(new TypeParameter(new Custom('F[_]')));
       // Inline function 'kotlin.collections.map' call
-      var this_0 = element.p1o_1;
+      var this_0 = element.n1o_1;
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
       var _iterator__ex2g4s = this_0.t();
@@ -713,7 +700,7 @@ function ScalaIrEmitter$injectHandleFunction$lambda(element, transformer) {
         var item = _iterator__ex2g4s.v();
         var tmp_1;
         if (item instanceof Function) {
-          var tmp0_safe_receiver = item.y1j_1;
+          var tmp0_safe_receiver = item.w1j_1;
           var tmp_2;
           if (tmp0_safe_receiver == null) {
             tmp_2 = null;
@@ -722,14 +709,14 @@ function ScalaIrEmitter$injectHandleFunction$lambda(element, transformer) {
             tmp_2 = new Custom('F', listOf(tmp0_safe_receiver));
           }
           var tmp2_returnType = tmp_2;
-          tmp_1 = item.d1k(VOID, VOID, VOID, tmp2_returnType, VOID, false);
+          tmp_1 = item.b1k(VOID, VOID, VOID, tmp2_returnType, VOID, false);
         } else {
           tmp_1 = item;
         }
         var tmp$ret$2 = tmp_1;
         destination.x(tmp$ret$2);
       }
-      tmp_0 = element.v1o(VOID, destination, VOID, VOID, tmp0_typeParameters);
+      tmp_0 = element.t1o(VOID, destination, VOID, VOID, tmp0_typeParameters);
     } else {
       tmp_0 = element;
     }
@@ -743,10 +730,10 @@ function ScalaIrEmitter$injectHandleFunction$lambda(element, transformer) {
 function ScalaIrEmitter$buildClientServerObjects$lambda(it) {
   var tmp;
   if (it instanceof Literal) {
-    tmp = it.jq_1;
+    tmp = it.hq_1;
   } else {
     if (it instanceof Param) {
-      tmp = '{' + it.np_1.n1() + '}';
+      tmp = '{' + it.lp_1.l1() + '}';
     } else {
       noWhenBranchMatchedException();
     }
@@ -755,80 +742,89 @@ function ScalaIrEmitter$buildClientServerObjects$lambda(it) {
 }
 function ScalaIrEmitter(packageName, emitShared) {
   Companion_getInstance_0();
-  packageName = packageName === VOID ? Companion_instance_0.nr('community.flock.wirespec.generated') : packageName;
-  emitShared = emitShared === VOID ? Companion_instance_1.io() : emitShared;
-  this.y1z_1 = packageName;
-  this.z1z_1 = emitShared;
-  this.a20_1 = ScalaGenerator_instance;
-  this.b20_1 = FileExtension_Scala_getInstance();
-  this.c20_1 = '\nimport community.flock.wirespec.scala.Wirespec\nimport scala.reflect.ClassTag\n';
+  packageName = packageName === VOID ? Companion_instance_0.lr('community.flock.wirespec.generated') : packageName;
+  emitShared = emitShared === VOID ? Companion_instance_1.go() : emitShared;
+  this.e20_1 = packageName;
+  this.f20_1 = emitShared;
+  this.g20_1 = ScalaGenerator_instance;
+  this.h20_1 = FileExtension_Scala_getInstance();
+  this.i20_1 = listOf_0([import_0('community.flock.wirespec.scala', 'Wirespec'), import_0('scala.reflect', 'ClassTag')]);
   var tmp = this;
-  tmp.d20_1 = lazy(ScalaIrEmitter$sanitizationConfig$delegate$lambda(this));
+  tmp.j20_1 = lazy(ScalaIrEmitter$sanitizationConfig$delegate$lambda(this));
   var tmp_0 = this;
-  tmp_0.e20_1 = new ScalaIrEmitter$shared$1();
+  tmp_0.k20_1 = new ScalaIrEmitter$shared$1();
 }
-protoOf(ScalaIrEmitter).l1v = function () {
-  return this.y1z_1;
+protoOf(ScalaIrEmitter).k1v = function () {
+  return this.e20_1;
 };
-protoOf(ScalaIrEmitter).n1u = function () {
-  return this.a20_1;
+protoOf(ScalaIrEmitter).m1u = function () {
+  return this.g20_1;
 };
-protoOf(ScalaIrEmitter).gq = function () {
-  return this.b20_1;
+protoOf(ScalaIrEmitter).eq = function () {
+  return this.h20_1;
 };
-protoOf(ScalaIrEmitter).u1v = function () {
-  return this.e20_1;
+protoOf(ScalaIrEmitter).t1v = function () {
+  return this.k20_1;
 };
-protoOf(ScalaIrEmitter).o1u = function (module_0, logger) {
+protoOf(ScalaIrEmitter).n1u = function (module_0, logger) {
   var tmp = emit.call(this, module_0, logger);
-  return withSharedSource(tmp, this.z1z_1, ScalaIrEmitter$emit$lambda(this));
+  return withSharedSource(tmp, this.f20_1, ScalaIrEmitter$emit$lambda(this));
 };
-protoOf(ScalaIrEmitter).wq = function (definition, module_0, logger) {
+protoOf(ScalaIrEmitter).uq = function (definition, module_0, logger) {
   var file = emit_0.call(this, definition, module_0, logger);
-  return wrapWithPackage(file, this.l1v(), definition, new RawElement(this.c20_1), Companion_instance.sq(module_0));
+  // Inline function 'kotlin.takeIf' call
+  var this_0 = this.i20_1;
+  var tmp;
+  if (Companion_instance.qq(module_0)) {
+    tmp = this_0;
+  } else {
+    tmp = null;
+  }
+  var tmp$ret$1 = tmp;
+  return placeInPackage(prependImports(file, tmp$ret$1), this.k1v(), definition);
 };
-protoOf(ScalaIrEmitter).wp = function (type, module_0) {
+protoOf(ScalaIrEmitter).up = function (type, module_0) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
   var this_0 = sanitizeNames(convertWithValidation(type, module_0), _get_sanitizationConfig__sns434(this));
   var scope = new TransformScope(this_0);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_1 = scope.a1u_1;
+  var this_1 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_2 = new TransformerBuilder();
-  this_2.f1h(ScalaIrEmitter$emit$lambda_0);
-  var tmp$ret$2 = this_2.g1h();
-  tmp.a1u_1 = transform(this_1, tmp$ret$2);
-  var tmp_0 = scope.a1u_1;
+  this_2.d1h(ScalaIrEmitter$emit$lambda_0);
+  var tmp$ret$2 = this_2.e1h();
+  tmp.z1t_1 = transform(this_1, tmp$ret$2);
+  var tmp_0 = scope.z1t_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 };
-protoOf(ScalaIrEmitter).kr = function (enum_0, module_0) {
+protoOf(ScalaIrEmitter).ir = function (enum_0, module_0) {
   // Inline function 'community.flock.wirespec.ir.core.transform' call
   var this_0 = sanitizeNames(convert_0(enum_0), _get_sanitizationConfig__sns434(this));
   var scope = new TransformScope(this_0);
   // Inline function 'community.flock.wirespec.ir.core.TransformScope.matchingElements' call
   var tmp = scope;
   // Inline function 'community.flock.wirespec.ir.core.transformMatchingElements' call
-  var this_1 = scope.a1u_1;
+  var this_1 = scope.z1t_1;
   // Inline function 'community.flock.wirespec.ir.core.transformer' call
   // Inline function 'kotlin.apply' call
   var this_2 = new TransformerBuilder();
-  this_2.f1h(ScalaIrEmitter$emit$lambda_1(this));
-  var tmp$ret$2 = this_2.g1h();
-  tmp.a1u_1 = transform(this_1, tmp$ret$2);
-  var tmp_0 = scope.a1u_1;
+  this_2.d1h(ScalaIrEmitter$emit$lambda_1(this));
+  var tmp$ret$2 = this_2.e1h();
+  tmp.z1t_1 = transform(this_1, tmp$ret$2);
+  var tmp_0 = scope.z1t_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 };
-protoOf(ScalaIrEmitter).ar = function (union) {
+protoOf(ScalaIrEmitter).yq = function (union) {
   return sanitizeNames(convert_1(union), _get_sanitizationConfig__sns434(this));
 };
-protoOf(ScalaIrEmitter).fr = function (refined) {
+protoOf(ScalaIrEmitter).dr = function (refined) {
   var file = sanitizeNames(convert_2(refined), _get_sanitizationConfig__sns434(this));
   // Inline function 'community.flock.wirespec.ir.core.findElement' call
   // Inline function 'kotlin.collections.filterIsInstance' call
-  var tmp0 = file.s1m();
+  var tmp0 = file.v1m();
   // Inline function 'kotlin.collections.filterIsInstanceTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = tmp0.t();
@@ -841,18 +837,18 @@ protoOf(ScalaIrEmitter).fr = function (refined) {
   var tmp$ret$2 = firstOrNull_0(destination);
   var struct = ensureNotNull(tmp$ret$2);
   // Inline function 'kotlin.collections.map' call
-  var this_0 = struct.h1n_1;
+  var this_0 = struct.g1n_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s_0 = this_0.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$3 = item.r1n(VOID, VOID, true);
+    var tmp$ret$3 = item.q1n(VOID, VOID, true);
     destination_0.x(tmp$ret$3);
   }
   var tmp = destination_0;
   // Inline function 'kotlin.collections.map' call
-  var this_1 = struct.k1n_1;
+  var this_1 = struct.j1n_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination_1 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_1, 10));
   var _iterator__ex2g4s_1 = this_1.t();
@@ -860,7 +856,7 @@ protoOf(ScalaIrEmitter).fr = function (refined) {
     var item_0 = _iterator__ex2g4s_1.v();
     var tmp_0;
     if (item_0 instanceof Function) {
-      tmp_0 = item_0.d1k(VOID, VOID, VOID, VOID, VOID, VOID, VOID, true);
+      tmp_0 = item_0.b1k(VOID, VOID, VOID, VOID, VOID, VOID, VOID, true);
     } else {
       tmp_0 = item_0;
     }
@@ -868,19 +864,19 @@ protoOf(ScalaIrEmitter).fr = function (refined) {
     destination_1.x(tmp$ret$6);
   }
   // Inline function 'community.flock.wirespec.ir.core.transform' call
-  var this_2 = struct.m1n(VOID, tmp, VOID, VOID, destination_1);
+  var this_2 = struct.l1n(VOID, tmp, VOID, VOID, destination_1);
   var scope = new TransformScope(this_2);
-  scope.i1u(ScalaIrEmitter$emit$lambda_2);
-  var tmp_1 = scope.a1u_1;
+  scope.h1u(ScalaIrEmitter$emit$lambda_2);
+  var tmp_1 = scope.z1t_1;
   var updatedStruct = isInterface(tmp_1, Element) ? tmp_1 : THROW_CCE();
-  return new File(Companion_getInstance().o1h(sanitize(this, refined.dr_1)), listOf(updatedStruct));
+  return new File(Companion_getInstance().m1h(sanitize(this, refined.br_1)), listOf(updatedStruct));
 };
-protoOf(ScalaIrEmitter).lr = function (endpoint) {
+protoOf(ScalaIrEmitter).jr = function (endpoint) {
   var imports = buildImports(this, endpoint);
   var file = convert_3(endpoint);
   // Inline function 'community.flock.wirespec.ir.core.findElement' call
   // Inline function 'kotlin.collections.filterIsInstance' call
-  var tmp0 = file.s1m();
+  var tmp0 = file.v1m();
   // Inline function 'kotlin.collections.filterIsInstanceTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = tmp0.t();
@@ -897,62 +893,47 @@ protoOf(ScalaIrEmitter).lr = function (endpoint) {
   // Inline function 'kotlin.let' call
   var ns = injectHandleFunction(this, flattened);
   var body = buildClientServerObjects(this, endpoint, requestIsObject, ns);
-  var sanitized = sanitizeNames(new File(Companion_getInstance().o1h(sanitize(this, endpoint.gp_1)), listOf(body)), _get_sanitizationConfig__sns434(this));
+  var sanitized = sanitizeNames(new File(Companion_getInstance().m1h(sanitize(this, endpoint.ep_1)), listOf(body)), _get_sanitizationConfig__sns434(this));
   var tmp;
-  // Inline function 'kotlin.text.isNotEmpty' call
-  if (charSequenceLength(imports) > 0) {
-    tmp = sanitized.u1m(VOID, plus_0(listOf(new RawElement(imports)), sanitized.r1m_1));
+  // Inline function 'kotlin.collections.isNotEmpty' call
+  if (!imports.r()) {
+    tmp = sanitized.x1m(VOID, plus_0(imports, sanitized.u1m_1));
   } else {
     tmp = sanitized;
   }
   return tmp;
 };
-protoOf(ScalaIrEmitter).zq = function (channel) {
+protoOf(ScalaIrEmitter).xq = function (channel) {
   var imports = buildImports(this, channel);
   var file = sanitizeNames(convert_4(channel), _get_sanitizationConfig__sns434(this));
   var tmp;
-  // Inline function 'kotlin.text.isNotEmpty' call
-  if (charSequenceLength(imports) > 0) {
-    tmp = file.u1m(VOID, plus_0(listOf(new RawElement(imports)), file.r1m_1));
+  // Inline function 'kotlin.collections.isNotEmpty' call
+  if (!imports.r()) {
+    tmp = file.x1m(VOID, plus_0(imports, file.u1m_1));
   } else {
     tmp = file;
   }
   return tmp;
 };
-protoOf(ScalaIrEmitter).r1u = function (endpoint) {
+protoOf(ScalaIrEmitter).q1u = function (endpoint) {
   var imports = buildImports(this, endpoint);
-  var endpointImport = 'import ' + this.l1v().or_1 + '.endpoint.' + endpoint.gp_1.n1();
-  // Inline function 'kotlin.collections.filter' call
-  var tmp0 = listOf_0([imports, endpointImport]);
-  // Inline function 'kotlin.collections.filterTo' call
-  var destination = ArrayList_init_$Create$();
-  var _iterator__ex2g4s = tmp0.t();
-  while (_iterator__ex2g4s.u()) {
-    var element = _iterator__ex2g4s.v();
-    // Inline function 'kotlin.text.isNotEmpty' call
-    if (charSequenceLength(element) > 0) {
-      destination.x(element);
-    }
-  }
-  var allImports = joinToString(destination, '\n');
+  var endpointImport = import_0(this.k1v().mr_1 + '.endpoint', endpoint.ep_1.l1());
   var file = addIdentityTypeToCall(this, sanitizeNames(emitEndpointClient.call(this, endpoint), _get_sanitizationConfig__sns434(this)));
-  var subPackageName = plus_1(this.l1v(), 'client');
-  var tmp = Companion_getInstance().o1h(subPackageName.qr() + file.q1m_1.u1l());
+  var subPackageName = plus_1(this.k1v(), 'client');
+  var tmp = Companion_getInstance().m1h(subPackageName.or() + file.t1m_1.x1l());
   // Inline function 'kotlin.collections.buildList' call
   // Inline function 'kotlin.collections.buildListInternal' call
   // Inline function 'kotlin.apply' call
   var this_0 = ArrayList_init_$Create$();
-  this_0.x(new Package(subPackageName.or_1));
-  this_0.x(new RawElement(this.c20_1));
-  // Inline function 'kotlin.text.isNotEmpty' call
-  if (charSequenceLength(allImports) > 0) {
-    this_0.x(new RawElement(allImports));
-  }
-  this_0.e1(file.r1m_1);
-  var tmp$ret$8 = this_0.o5();
-  return new File(tmp, tmp$ret$8);
+  this_0.x(new Package(subPackageName.mr_1));
+  this_0.e1(this.i20_1);
+  this_0.e1(imports);
+  this_0.x(endpointImport);
+  this_0.e1(file.u1m_1);
+  var tmp$ret$3 = this_0.o5();
+  return new File(tmp, tmp$ret$3);
 };
-protoOf(ScalaIrEmitter).q1u = function (endpoints, logger) {
+protoOf(ScalaIrEmitter).p1u = function (endpoints, logger) {
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
@@ -968,46 +949,57 @@ protoOf(ScalaIrEmitter).q1u = function (endpoints, logger) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var e = _iterator__ex2g4s_0.v();
-    var key = e.nu_1;
+    var key = e.lu_1;
     if (set.x(key)) {
       list_0.x(e);
     }
   }
-  var tmp = list_0;
-  var imports = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, ScalaIrEmitter$emitClient$lambda(this));
-  var endpointImports = joinToString(endpoints, '\n', VOID, VOID, VOID, VOID, ScalaIrEmitter$emitClient$lambda_0(this));
-  var clientImports = joinToString(endpoints, '\n', VOID, VOID, VOID, VOID, ScalaIrEmitter$emitClient$lambda_1(this));
-  // Inline function 'kotlin.collections.filter' call
-  var tmp0 = listOf_0([imports, endpointImports, clientImports]);
-  // Inline function 'kotlin.collections.filterTo' call
-  var destination_0 = ArrayList_init_$Create$();
-  var _iterator__ex2g4s_1 = tmp0.t();
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(list_0, 10));
+  var _iterator__ex2g4s_1 = list_0.t();
   while (_iterator__ex2g4s_1.u()) {
-    var element_0 = _iterator__ex2g4s_1.v();
-    // Inline function 'kotlin.text.isNotEmpty' call
-    if (charSequenceLength(element_0) > 0) {
-      destination_0.x(element_0);
-    }
+    var item = _iterator__ex2g4s_1.v();
+    var tmp$ret$5 = import_0(this.k1v().mr_1 + '.model', item.lu_1);
+    destination_0.x(tmp$ret$5);
+  }
+  var imports = destination_0;
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination_1 = ArrayList_init_$Create$_0(collectionSizeOrDefault(endpoints, 10));
+  var _iterator__ex2g4s_2 = endpoints.t();
+  while (_iterator__ex2g4s_2.u()) {
+    var item_0 = _iterator__ex2g4s_2.v();
+    var tmp$ret$8 = import_0(this.k1v().mr_1 + '.endpoint', item_0.ep_1.l1());
+    destination_1.x(tmp$ret$8);
   }
-  var allImports = joinToString(destination_0, '\n');
+  var endpointImports = destination_1;
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination_2 = ArrayList_init_$Create$_0(collectionSizeOrDefault(endpoints, 10));
+  var _iterator__ex2g4s_3 = endpoints.t();
+  while (_iterator__ex2g4s_3.u()) {
+    var item_1 = _iterator__ex2g4s_3.v();
+    var tmp$ret$11 = import_0(this.k1v().mr_1 + '.client', item_1.ep_1.l1() + 'Client');
+    destination_2.x(tmp$ret$11);
+  }
+  var clientImports = destination_2;
+  var allImports = plus_0(plus_0(imports, endpointImports), clientImports);
   var file = addIdentityTypeToCall(this, sanitizeNames(emitClient.call(this, endpoints, logger), _get_sanitizationConfig__sns434(this)));
-  var tmp_0 = Companion_getInstance().o1h(this.l1v().qr() + file.q1m_1.u1l());
+  var tmp = Companion_getInstance().m1h(this.k1v().or() + file.t1m_1.x1l());
   // Inline function 'kotlin.collections.buildList' call
   // Inline function 'kotlin.collections.buildListInternal' call
   // Inline function 'kotlin.apply' call
   var this_0 = ArrayList_init_$Create$();
-  this_0.x(new Package(this.l1v().or_1));
-  this_0.x(new RawElement(this.c20_1));
-  // Inline function 'kotlin.text.isNotEmpty' call
-  if (charSequenceLength(allImports) > 0) {
-    this_0.x(new RawElement(allImports));
-  }
-  this_0.e1(file.r1m_1);
-  var tmp$ret$13 = this_0.o5();
-  return new File(tmp_0, tmp$ret$13);
+  this_0.x(new Package(this.k1v().mr_1));
+  this_0.e1(this.i20_1);
+  this_0.e1(allImports);
+  this_0.e1(file.u1m_1);
+  var tmp$ret$17 = this_0.o5();
+  return new File(tmp, tmp$ret$17);
 };
 //region block: post-declaration
-protoOf(ScalaIrEmitter).qn = emit_1;
+protoOf(ScalaIrEmitter).on = emit_1;
 //endregion
 //region block: exports
 export {