@flock/wirespec 0.22.5 → 0.22.6

package/wirespec-src-plugin-extensions.mjs

@@ -56,10 +56,8 @@ import {
   trim6jpmwojjgb3l as trim_0,
   mapOf2zpbbmyqk8xpf as mapOf,
   mapOf1xd03cq9cnmy8 as mapOf_0,
-  emptySetcxexqki71qfa as emptySet,
   getStringHashCode26igk1bx568vk as getStringHashCode,
   hashCodeq5arwsb9dgti as hashCode,
-  trimEnd17pt8cbotbalj as trimEnd,
   initMetadataForObject1cxne3s9w65el as initMetadataForObject,
   charSequenceLength3278n89t01tmv as charSequenceLength,
   charCodeAt1yspne1d8erbm as charCodeAt,
@@ -68,18 +66,23 @@ import {
   toString22rbkbhdb5cl2 as toString_0,
   StringBuilder_init_$Create$3ds9zx2kx9u4d as StringBuilder_init_$Create$,
   toSet2orjxp16sotqu as toSet_0,
-  getBooleanHashCode1bbj3u6b3v0a7 as getBooleanHashCode,
-  listOfNotNull1v4ggfackvuny as listOfNotNull,
-  KtMap140uvy3s5zad8 as KtMap,
+  trimEnd17pt8cbotbalj as trimEnd,
   toString30pk9tzaqopn as toString_1,
+  getBooleanHashCode1bbj3u6b3v0a7 as getBooleanHashCode,
   firstOrNull1982767dljvdy as firstOrNull_0,
   charSequenceGet1vxk1y5n17t1z as charSequenceGet,
   HashSet_init_$Create$2w31ptb4ree5i as HashSet_init_$Create$,
   distinct10qe1scfdvu5k as distinct,
-  plus18eogev54fmsa as plus_1,
+  KtMap140uvy3s5zad8 as KtMap,
+  initMetadataForInterface1egvbzx539z91 as initMetadataForInterface,
+  single3ds7xj9roxi5z as single,
+  plus2lr02ok6jhhxu as plus_1,
+  getValue48kllevslyh6 as getValue,
+  listOfNotNull2woi2boe01ub4 as listOfNotNull,
+  singleo93pzdgfc557 as single_0,
   trimStart5ewg8zf6cs5u as trimStart,
   startsWith26w8qjqapeeq6 as startsWith,
-  getValue48kllevslyh6 as getValue,
+  listOfNotNull1v4ggfackvuny as listOfNotNull_0,
 } from './kotlin-kotlin-stdlib.mjs';
 import {
   NonEmptyList3ak25ihy2gcvs as NonEmptyList,
@@ -151,15 +154,19 @@ import {
   Array2vay9bq78aua1 as Array_0,
   Paramvfwnys2w6aj1 as Param,
   struct1gzvysjt73bn4 as struct,
+  Field2nwjpxu9j2svq as Field_0,
+  convertToGenerator1arvbkvdv4bro as convertToGenerator,
+  forEachElement2kk527cjhfon1 as forEachElement,
+  Shape2rkbve9uak0g8 as Shape,
   Package1a6hdgk3p4frd as Package,
   raw1mm1rmqheq474 as raw,
   Refined1lkzc0dg6wey7 as Refined,
   Endpoint1jsq06yr3xdhp as Endpoint,
   Channel2fhxi4a4pwb64 as Channel,
+  Rpc1w89psy5tk702 as Rpc,
   Enumoqsp4e7al89r as Enum_1,
   HasName33ghsv8lnn7sd as HasName,
   Unionccsavx6nrdr2 as Union_0,
-  forEachElement2kk527cjhfon1 as forEachElement,
   TransformScope3fhztkr2eyk36 as TransformScope,
   TransformerBuilder26pbjl5nmg6wa as TransformerBuilder,
   transformhd96z3w1u5uc as transform,
@@ -206,19 +213,55 @@ initMetadataForObject(ChannelDslFile, 'ChannelDslFile');
 initMetadataForClass(Slot, 'Slot');
 initMetadataForObject(EndpointDslFile, 'EndpointDslFile');
 initMetadataForClass(Primitive_0, 'Primitive');
-initMetadataForClass(NestedObject, 'NestedObject');
-initMetadataForClass(NestedList, 'NestedList');
+initMetadataForClass(Nested, 'Nested');
 initMetadataForClass(NamedTypedField, 'NamedTypedField');
 initMetadataForClass(ResponseVariantShape, 'ResponseVariantShape');
 initMetadataForClass(BodyKind, 'BodyKind', VOID, Enum);
 initMetadataForCompanion(Companion_2);
 initMetadataForClass(EndpointShape, 'EndpointShape');
 initMetadataForObject(RecordBuilder, 'RecordBuilder');
-initMetadataForObject(TypeDslFile, 'TypeDslFile');
 initMetadataForCompanion(Companion_3);
+initMetadataForClass(RecordRef, 'RecordRef');
+function wrap(expr, depth) {
+  var v = 'v' + depth;
+  var call = this.ot() ? '?.' : '.';
+  var tmp;
+  if (this instanceof Wrap) {
+    tmp = this.q35_1 ? expr + '?.let { ' + v + ' -> ' + this.p35_1 + '(' + v + ') }' : this.p35_1 + '(' + expr + ')';
+  } else {
+    if (this instanceof Each) {
+      tmp = expr + call + 'map { ' + v + ' -> ' + this.s35_1.r35(v, depth + 1 | 0) + ' }';
+    } else {
+      if (this instanceof Values) {
+        tmp = expr + call + 'mapValues { (_, ' + v + ') -> ' + this.u35_1.r35(v, depth + 1 | 0) + ' }';
+      } else {
+        noWhenBranchMatchedException();
+      }
+    }
+  }
+  return tmp;
+}
+function wrap$default(expr, depth, $super) {
+  depth = depth === VOID ? 0 : depth;
+  return $super === VOID ? this.r35(expr, depth) : wrap(expr, depth);
+}
+initMetadataForInterface(Refinement, 'Refinement');
+initMetadataForClass(Wrap, 'Wrap', VOID, VOID, [Refinement]);
+initMetadataForClass(Each, 'Each', VOID, VOID, [Refinement]);
+initMetadataForClass(Values, 'Values', VOID, VOID, [Refinement]);
+initMetadataForCompanion(Companion_4);
+initMetadataForObject(RpcDslFile, 'RpcDslFile');
+initMetadataForClass(Request, 'Request');
+initMetadataForClass(Value, 'Value');
+initMetadataForCompanion(Companion_5);
+initMetadataForClass(Outcome, 'Outcome');
+initMetadataForCompanion(Companion_6);
+initMetadataForClass(RpcShape, 'RpcShape');
+initMetadataForObject(TypeDslFile, 'TypeDslFile');
+initMetadataForCompanion(Companion_7);
 initMetadataForClass(TypeShape, 'TypeShape');
 initMetadataForClass(KotestDslExtension, 'KotestDslExtension');
-initMetadataForCompanion(Companion_4);
+initMetadataForCompanion(Companion_8);
 initMetadataForClass(KotlinxSerializationExtension, 'KotlinxSerializationExtension', KotlinxSerializationExtension);
 initMetadataForClass(SpringMappingAnnotationsExtension, 'SpringMappingAnnotationsExtension');
 initMetadataForClass(SpringNativeHintsExtension, 'SpringNativeHintsExtension');
@@ -244,9 +287,9 @@ function AvroExtension(packageName, language) {
       var message = 'AvroExtension supports Java and Kotlin targets only, got ' + toString(language);
       throw IllegalStateException_init_$Create$(toString(message));
   }
-  tmp.d32_1 = tmp_0;
+  tmp.c33_1 = tmp_0;
 }
-protoOf(AvroExtension).b1b = function (ir, ast) {
+protoOf(AvroExtension).f1b = function (ir, ast) {
   // Inline function 'kotlin.collections.buildList' call
   // Inline function 'kotlin.collections.buildListInternal' call
   // Inline function 'kotlin.apply' call
@@ -259,7 +302,7 @@ protoOf(AvroExtension).b1b = function (ir, ast) {
     var _iterator__ex2g4s_0 = (new NonEmptyList(element.gp_1)).t();
     while (_iterator__ex2g4s_0.u()) {
       var element_0 = _iterator__ex2g4s_0.v();
-      this_0.g1(this.d32_1.e32(element_0, element));
+      this_0.g1(this.c33_1.d33(element_0, element));
     }
   }
   var avroFiles = this_0.q5();
@@ -282,7 +325,7 @@ function emit($this, identifier) {
     if (identifier instanceof FieldIdentifier) {
       // Inline function 'kotlin.let' call
       var it = sanitizeSymbol($this, identifier.o1());
-      tmp = JavaGenerator_getInstance().j1b_1.i1(it) ? '_' + it : it;
+      tmp = JavaGenerator_getInstance().i1c_1.i1(it) ? '_' + it : it;
     } else {
       noWhenBranchMatchedException();
     }
@@ -342,17 +385,17 @@ function emitType($this, $receiver) {
           tmp = 'Object';
         } else {
           if ($receiver instanceof Custom) {
-            tmp = $receiver.n19_1;
+            tmp = $receiver.x19_1;
           } else {
             if ($receiver instanceof Primitive) {
-              var t = $receiver.p19_1;
+              var t = $receiver.z19_1;
               var tmp_0;
               if (t instanceof String_0) {
                 tmp_0 = 'String';
               } else {
                 if (t instanceof Integer) {
                   var tmp_1;
-                  switch (t.x19_1.e3_1) {
+                  switch (t.h1a_1.e3_1) {
                     case 0:
                       tmp_1 = 'Integer';
                       break;
@@ -367,7 +410,7 @@ function emitType($this, $receiver) {
                 } else {
                   if (t instanceof Number_0) {
                     var tmp_2;
-                    switch (t.s19_1.e3_1) {
+                    switch (t.c1a_1.e3_1) {
                       case 0:
                         tmp_2 = 'Float';
                         break;
@@ -421,7 +464,7 @@ function emitRoot($this, $receiver) {
   return tmp;
 }
 function schemaField($this, definition, module_0) {
-  return trimMargin('\n        |public static final org.apache.avro.Schema SCHEMA =\n        |  new org.apache.avro.Schema.Parser().parse("' + schema($this.f32_1, definition, module_0) + '");\n        |\n        ');
+  return trimMargin('\n        |public static final org.apache.avro.Schema SCHEMA =\n        |  new org.apache.avro.Schema.Parser().parse("' + schema($this.e33_1, definition, module_0) + '");\n        |\n        ');
 }
 function toValue($this, field) {
   var reference = field.pp_1;
@@ -434,10 +477,10 @@ function toValue($this, field) {
     } else {
       if (reference instanceof Primitive) {
         var tmp_0;
-        if (reference.p19_1 instanceof Bytes) {
+        if (reference.z19_1 instanceof Bytes) {
           tmp_0 = 'java.nio.ByteBuffer.wrap(data.' + emit($this, field.op_1) + '())';
         } else {
-          tmp_0 = 'data.' + emit($this, field.op_1) + '()' + (reference.q19_1 ? '.orElse(null)' : '');
+          tmp_0 = 'data.' + emit($this, field.op_1) + '()' + (reference.a1a_1 ? '.orElse(null)' : '');
         }
         tmp = tmp_0;
       } else {
@@ -462,10 +505,10 @@ function JavaAvroSource$fromValue$lambda(this$0, $module) {
       tmp = '((java.util.List<org.apache.avro.generic.GenericData.Record>) record.get(' + index + ')).stream().map(it -> ' + avroClass(emitRoot(this$0, reference.yp_1)) + '.from(it)).toList()';
     } else {
       if (reference instanceof Custom) {
-        tmp = reference.o19_1 ? '(' + emit_0(this$0, reference) + ') java.util.Optional.ofNullable((' + emitRoot(this$0, field.pp_1) + ') record.get(' + index + '))' : isEnum(reference, $module) ? avroClass(emit_0(this$0, field.pp_1)) + '.from((org.apache.avro.generic.GenericData.EnumSymbol) record.get(' + index + '))' : avroClass(emit_0(this$0, field.pp_1)) + '.from((org.apache.avro.generic.GenericData.Record) record.get(' + index + '))';
+        tmp = reference.y19_1 ? '(' + emit_0(this$0, reference) + ') java.util.Optional.ofNullable((' + emitRoot(this$0, field.pp_1) + ') record.get(' + index + '))' : isEnum(reference, $module) ? avroClass(emit_0(this$0, field.pp_1)) + '.from((org.apache.avro.generic.GenericData.EnumSymbol) record.get(' + index + '))' : avroClass(emit_0(this$0, field.pp_1)) + '.from((org.apache.avro.generic.GenericData.Record) record.get(' + index + '))';
       } else {
         if (reference instanceof Primitive) {
-          tmp = reference.q19_1 ? '(' + emit_0(this$0, reference) + ') java.util.Optional.ofNullable((' + emitRoot(this$0, field.pp_1) + ') record.get(' + index + '))' : equals(reference.p19_1, Bytes_instance) ? '(' + emit_0(this$0, reference) + ') ((java.nio.ByteBuffer) record.get(' + index + ')).array()' : equals(reference.p19_1, new String_0(null)) ? '(' + emit_0(this$0, reference) + ') record.get(' + index + ').toString()' : '(' + emit_0(this$0, reference) + ') record.get(' + index + ')';
+          tmp = reference.a1a_1 ? '(' + emit_0(this$0, reference) + ') java.util.Optional.ofNullable((' + emitRoot(this$0, field.pp_1) + ') record.get(' + index + '))' : equals(reference.z19_1, Bytes_instance) ? '(' + emit_0(this$0, reference) + ') ((java.nio.ByteBuffer) record.get(' + index + ')).array()' : equals(reference.z19_1, new String_0(null)) ? '(' + emit_0(this$0, reference) + ') record.get(' + index + ').toString()' : '(' + emit_0(this$0, reference) + ') record.get(' + index + ')';
         } else {
           tmp = '(' + emit_0(this$0, reference) + ') record.get(' + index + ')';
         }
@@ -475,9 +518,9 @@ function JavaAvroSource$fromValue$lambda(this$0, $module) {
   };
 }
 function JavaAvroSource(packageName) {
-  this.f32_1 = packageName;
+  this.e33_1 = packageName;
 }
-protoOf(JavaAvroSource).e32 = function (definition, module_0) {
+protoOf(JavaAvroSource).d33 = function (definition, module_0) {
   var tmp;
   if (definition instanceof Type) {
     var tmp_0 = emit(this, definition.kp_1);
@@ -510,10 +553,10 @@ protoOf(JavaAvroSource).e32 = function (definition, module_0) {
       var tmp$ret$5 = 'record.put(' + checkIndexOverflow(_unary__edvuaz_0) + ', ' + toValue(this, item_0) + ')';
       destination_0.x(tmp$ret$5);
     }
-    tmp = listOf(typeAvroFile(this.f32_1, tmp_0, tmp_1, 'new org.apache.avro.generic.GenericData.Record(SCHEMA)', tmp_2, destination_0));
+    tmp = listOf(typeAvroFile(this.e33_1, tmp_0, tmp_1, 'new org.apache.avro.generic.GenericData.Record(SCHEMA)', tmp_2, destination_0));
   } else {
     if (definition instanceof Enum_0) {
-      tmp = listOf(enumAvroFile(this.f32_1, emit(this, definition.qs_1), schemaField(this, definition, module_0), emit(this, definition.qs_1) + '.valueOf(record.toString())', 'new org.apache.avro.generic.GenericData.EnumSymbol(SCHEMA, data.name())'));
+      tmp = listOf(enumAvroFile(this.e33_1, emit(this, definition.qs_1), schemaField(this, definition, module_0), emit(this, definition.qs_1) + '.valueOf(record.toString())', 'new org.apache.avro.generic.GenericData.EnumSymbol(SCHEMA, data.name())'));
     } else {
       tmp = emptyList();
     }
@@ -528,7 +571,7 @@ function emit_1($this, identifier) {
     if (identifier instanceof FieldIdentifier) {
       // Inline function 'kotlin.let' call
       var it = sanitize($this, identifier);
-      tmp = KotlinGenerator_getInstance().l1b_1.i1(it) ? addBackticks(it) : it;
+      tmp = KotlinGenerator_getInstance().k1c_1.i1(it) ? addBackticks(it) : it;
     } else {
       noWhenBranchMatchedException();
     }
@@ -583,17 +626,17 @@ function emit_2($this, $receiver) {
           tmp = 'Any';
         } else {
           if ($receiver instanceof Custom) {
-            tmp = $receiver.n19_1;
+            tmp = $receiver.x19_1;
           } else {
             if ($receiver instanceof Primitive) {
-              var t = $receiver.p19_1;
+              var t = $receiver.z19_1;
               var tmp_0;
               if (t instanceof String_0) {
                 tmp_0 = 'String';
               } else {
                 if (t instanceof Integer) {
                   var tmp_1;
-                  switch (t.x19_1.e3_1) {
+                  switch (t.h1a_1.e3_1) {
                     case 0:
                       tmp_1 = 'Int';
                       break;
@@ -608,7 +651,7 @@ function emit_2($this, $receiver) {
                 } else {
                   if (t instanceof Number_0) {
                     var tmp_2;
-                    switch (t.s19_1.e3_1) {
+                    switch (t.c1a_1.e3_1) {
                       case 0:
                         tmp_2 = 'Float';
                         break;
@@ -647,11 +690,11 @@ function emit_2($this, $receiver) {
   return $receiver.ot() ? it + '?' : it;
 }
 function avroObject($this, reference) {
-  return avroClass(emit_2($this, reference.p1a(false)));
+  return avroClass(emit_2($this, reference.t1a(false)));
 }
 function schemaField_0($this, definition, module_0, explicitType) {
   var declaration = explicitType ? 'val SCHEMA: org.apache.avro.Schema' : 'val SCHEMA';
-  return declaration + ' = org.apache.avro.Schema.Parser().parse("' + schema($this.g32_1, definition, module_0) + '")';
+  return declaration + ' = org.apache.avro.Schema.Parser().parse("' + schema($this.f33_1, definition, module_0) + '")';
 }
 function toValue_0($this, field) {
   var value = 'data.' + emit_1($this, field.op_1);
@@ -680,7 +723,7 @@ function toValue_0($this, field) {
         tmp = field.pp_1.ot() ? access + '.let{' + avroObject($this, reference) + '.to(it)}' : avroObject($this, reference) + '.to(' + value + ')';
       } else {
         if (reference instanceof Primitive) {
-          tmp = equals(reference.p19_1, Bytes_instance) && reference.q19_1 ? access + '.let{java.nio.ByteBuffer.wrap(it)}' : equals(reference.p19_1, Bytes_instance) ? 'java.nio.ByteBuffer.wrap(' + value + ')' : value;
+          tmp = equals(reference.z19_1, Bytes_instance) && reference.a1a_1 ? access + '.let{java.nio.ByteBuffer.wrap(it)}' : equals(reference.z19_1, Bytes_instance) ? 'java.nio.ByteBuffer.wrap(' + value + ')' : value;
         } else {
           // Inline function 'kotlin.error' call
           var message = 'Cannot emit Avro: ' + toString(reference);
@@ -701,7 +744,7 @@ function element($this, module_0, reference, value) {
   } else {
     if (reference instanceof Primitive) {
       var tmp_0;
-      if (reference.p19_1 instanceof String_0) {
+      if (reference.z19_1 instanceof String_0) {
         tmp_0 = value + '.toString()';
       } else {
         tmp_0 = value + ' as ' + emit_2($this, reference);
@@ -732,10 +775,10 @@ function KotlinAvroSource$fromValue$lambda(this$0, $module) {
       } else {
         if (reference instanceof Custom) {
           var carrier = isEnum(reference, $module) ? 'org.apache.avro.generic.GenericData.EnumSymbol' : 'org.apache.avro.generic.GenericData.Record';
-          tmp = reference.o19_1 ? '(' + get + ' as ' + carrier + '?)?.let{' + avroObject(this$0, reference) + '.from(it)}' : element(this$0, $module, reference, get);
+          tmp = reference.y19_1 ? '(' + get + ' as ' + carrier + '?)?.let{' + avroObject(this$0, reference) + '.from(it)}' : element(this$0, $module, reference, get);
         } else {
           if (reference instanceof Primitive) {
-            var tmp1_subject = reference.p19_1;
+            var tmp1_subject = reference.z19_1;
             var tmp_0;
             if (tmp1_subject instanceof Bytes) {
               tmp_0 = '(' + get + ' as java.nio.ByteBuffer' + orNull + ')' + orNull + '.array()';
@@ -759,9 +802,9 @@ function KotlinAvroSource$fromValue$lambda(this$0, $module) {
   };
 }
 function KotlinAvroSource(packageName) {
-  this.g32_1 = packageName;
+  this.f33_1 = packageName;
 }
-protoOf(KotlinAvroSource).e32 = function (definition, module_0) {
+protoOf(KotlinAvroSource).d33 = function (definition, module_0) {
   var tmp;
   if (definition instanceof Type) {
     var tmp_0 = emit_1(this, definition.kp_1);
@@ -794,10 +837,10 @@ protoOf(KotlinAvroSource).e32 = function (definition, module_0) {
       var tmp$ret$5 = 'record.put(' + checkIndexOverflow(_unary__edvuaz_0) + ', ' + toValue_0(this, item_0) + ')';
       destination_0.x(tmp$ret$5);
     }
-    tmp = listOf(typeAvroFile(this.g32_1, tmp_0, tmp_1, 'org.apache.avro.generic.GenericData.Record(SCHEMA)', tmp_2, destination_0));
+    tmp = listOf(typeAvroFile(this.f33_1, tmp_0, tmp_1, 'org.apache.avro.generic.GenericData.Record(SCHEMA)', tmp_2, destination_0));
   } else {
     if (definition instanceof Enum_0) {
-      tmp = listOf(enumAvroFile(this.g32_1, emit_1(this, definition.qs_1), schemaField_0(this, definition, module_0, true), emit_1(this, definition.qs_1) + '.valueOf(record.toString())', 'org.apache.avro.generic.GenericData.EnumSymbol(SCHEMA, data.name)'));
+      tmp = listOf(enumAvroFile(this.f33_1, emit_1(this, definition.qs_1), schemaField_0(this, definition, module_0, true), emit_1(this, definition.qs_1) + '.valueOf(record.toString())', 'org.apache.avro.generic.GenericData.EnumSymbol(SCHEMA, data.name)'));
     } else {
       tmp = emptyList();
     }
@@ -877,10 +920,10 @@ function emitAvroSchema(packageName, definition, module_0) {
   var $this$with = AvroJsonEmitter_getInstance();
   var tmp;
   if (definition instanceof Type) {
-    tmp = $this$with.o30(definition, module_0, mutableListOf([definition.kp_1.o1()])).n31(VOID, VOID, packageName.bt_1);
+    tmp = $this$with.n31(definition, module_0, mutableListOf([definition.kp_1.o1()])).m32(VOID, VOID, packageName.bt_1);
   } else {
     if (definition instanceof Enum_0) {
-      tmp = $this$with.l30(definition);
+      tmp = $this$with.k31(definition);
     } else {
       tmp = null;
     }
@@ -903,11 +946,11 @@ function emitAvroSchema(packageName, definition, module_0) {
     // Inline function 'kotlinx.serialization.encodeToString' call
     var this_0 = Default_getInstance();
     // Inline function 'kotlinx.serialization.serializer' call
-    var this_1 = this_0.h24();
+    var this_1 = this_0.g25();
     // Inline function 'kotlinx.serialization.internal.cast' call
     var this_2 = serializer(this_1, createKType(getKClass(Type_0), arrayOf([]), false));
     var tmp$ret$6 = isInterface(this_2, KSerializer) ? this_2 : THROW_CCE();
-    tmp_1 = this_0.m2l(tmp$ret$6, tmp1_safe_receiver);
+    tmp_1 = this_0.l2m(tmp$ret$6, tmp1_safe_receiver);
   }
   var tmp2_safe_receiver = tmp_1;
   return tmp2_safe_receiver == null ? null : escaped(tmp2_safe_receiver);
@@ -916,16 +959,16 @@ function flatten(_this__u8e3s4, defined) {
   _init_properties_AvroExtension_kt__50nkjp();
   var tmp;
   if (_this__u8e3s4 instanceof RecordType) {
-    defined.x(_this__u8e3s4.r2z_1);
+    defined.x(_this__u8e3s4.q30_1);
     // Inline function 'kotlin.collections.map' call
-    var this_0 = _this__u8e3s4.t2z_1;
+    var this_0 = _this__u8e3s4.s30_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.t();
     while (_iterator__ex2g4s.u()) {
       var item = _iterator__ex2g4s.v();
       // Inline function 'kotlin.collections.map' call
-      var this_1 = item.y2z_1;
+      var this_1 = item.x30_1;
       // Inline function 'kotlin.collections.mapTo' call
       var destination_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_1, 10));
       var _iterator__ex2g4s_0 = this_1.t();
@@ -934,17 +977,17 @@ function flatten(_this__u8e3s4, defined) {
         var tmp$ret$5 = flatten(item_0, defined);
         destination_0.x(tmp$ret$5);
       }
-      var tmp$ret$2 = item.i31(VOID, TypeList_init_$Create$(destination_0));
+      var tmp$ret$2 = item.h32(VOID, TypeList_init_$Create$(destination_0));
       destination.x(tmp$ret$2);
     }
-    tmp = _this__u8e3s4.n31(VOID, VOID, VOID, destination);
+    tmp = _this__u8e3s4.m32(VOID, VOID, VOID, destination);
   } else {
     if (_this__u8e3s4 instanceof ArrayType) {
-      tmp = _this__u8e3s4.p31(VOID, flatten(_this__u8e3s4.w2z_1, defined));
+      tmp = _this__u8e3s4.o32(VOID, flatten(_this__u8e3s4.v30_1, defined));
     } else {
       if (_this__u8e3s4 instanceof EnumType) {
         // Inline function 'kotlin.also' call
-        defined.x(_this__u8e3s4.n2z_1);
+        defined.x(_this__u8e3s4.m30_1);
         tmp = _this__u8e3s4;
       } else {
         if (_this__u8e3s4 instanceof LogicalType) {
@@ -952,20 +995,20 @@ function flatten(_this__u8e3s4, defined) {
         } else {
           if (_this__u8e3s4 instanceof SimpleType) {
             var tmp_0;
-            if (get_AVRO_PRIMITIVES().i1(_this__u8e3s4.d2z_1) || defined.i1(_this__u8e3s4.d2z_1)) {
+            if (get_AVRO_PRIMITIVES().i1(_this__u8e3s4.c30_1) || defined.i1(_this__u8e3s4.c30_1)) {
               tmp_0 = _this__u8e3s4;
             } else {
-              defined.x(_this__u8e3s4.d2z_1);
-              tmp_0 = _this__u8e3s4.l31('<<<<<' + _this__u8e3s4.d2z_1 + '>>>>>');
+              defined.x(_this__u8e3s4.c30_1);
+              tmp_0 = _this__u8e3s4.k32('<<<<<' + _this__u8e3s4.c30_1 + '>>>>>');
             }
             tmp = tmp_0;
           } else {
             if (_this__u8e3s4 instanceof MapType) {
-              tmp = _this__u8e3s4.q31(VOID, flatten(_this__u8e3s4.h2z_1, defined));
+              tmp = _this__u8e3s4.p32(VOID, flatten(_this__u8e3s4.g30_1, defined));
             } else {
               if (_this__u8e3s4 instanceof UnionType) {
                 // Inline function 'kotlin.collections.map' call
-                var this_2 = _this__u8e3s4.f2z_1;
+                var this_2 = _this__u8e3s4.e30_1;
                 // Inline function 'kotlin.collections.mapTo' call
                 var destination_1 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_2, 10));
                 var _iterator__ex2g4s_1 = this_2.t();
@@ -974,7 +1017,7 @@ function flatten(_this__u8e3s4, defined) {
                   var tmp$ret$10 = flatten(item_1, defined);
                   destination_1.x(tmp$ret$10);
                 }
-                tmp = _this__u8e3s4.s31(VOID, TypeList_init_$Create$(destination_1));
+                tmp = _this__u8e3s4.r32(VOID, TypeList_init_$Create$(destination_1));
               } else {
                 noWhenBranchMatchedException();
               }
@@ -988,9 +1031,9 @@ function flatten(_this__u8e3s4, defined) {
 }
 function typeAvroFile$lambda$lambda$lambda($typeName, $fromArgs) {
   return function ($this$function) {
-    $this$function.m13('record', $this$function.q14('org.apache.avro.generic.GenericData.Record', []));
-    $this$function.j13($this$function.q14($typeName, []));
-    var tmp = $this$function.q14($typeName, []);
+    $this$function.w13('record', $this$function.a15('org.apache.avro.generic.GenericData.Record', []));
+    $this$function.t13($this$function.a15($typeName, []));
+    var tmp = $this$function.a15($typeName, []);
     // Inline function 'kotlin.collections.associate' call
     var this_0 = $fromArgs;
     var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
@@ -1007,72 +1050,72 @@ function typeAvroFile$lambda$lambda$lambda($typeName, $fromArgs) {
       var pair = to(tmp_0, isInterface(tmp_1, Expression) ? tmp_1 : THROW_CCE());
       destination.v2(pair.ff_1, pair.gf_1);
     }
-    $this$function.p13(new ConstructorStatement(tmp, destination));
+    $this$function.z13(new ConstructorStatement(tmp, destination));
     return Unit_instance;
   };
 }
 function typeAvroFile$lambda$lambda$lambda_0($typeName, $recordConstructor, $toPuts) {
   return function ($this$function) {
-    $this$function.m13('data', $this$function.q14($typeName, []));
-    $this$function.j13($this$function.q14('org.apache.avro.generic.GenericData.Record', []));
-    $this$function.q13('record', new RawExpression($recordConstructor));
+    $this$function.w13('data', $this$function.a15($typeName, []));
+    $this$function.t13($this$function.a15('org.apache.avro.generic.GenericData.Record', []));
+    $this$function.a14('record', new RawExpression($recordConstructor));
     // Inline function 'kotlin.collections.forEach' call
     var _iterator__ex2g4s = $toPuts.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      $this$function.i14(element);
+      $this$function.s14(element);
     }
-    $this$function.p13(new VariableReference(Companion_getInstance().wt('record')));
+    $this$function.z13(new VariableReference(Companion_getInstance().wt('record')));
     return Unit_instance;
   };
 }
 function typeAvroFile$lambda$lambda($schemaField, $typeName, $fromArgs, $recordConstructor, $toPuts) {
   return function ($this$namespace) {
-    $this$namespace.i14($schemaField);
-    $this$namespace.w15('from', true, VOID, typeAvroFile$lambda$lambda$lambda($typeName, $fromArgs));
-    $this$namespace.w15('to', true, VOID, typeAvroFile$lambda$lambda$lambda_0($typeName, $recordConstructor, $toPuts));
+    $this$namespace.s14($schemaField);
+    $this$namespace.g16('from', true, VOID, typeAvroFile$lambda$lambda$lambda($typeName, $fromArgs));
+    $this$namespace.g16('to', true, VOID, typeAvroFile$lambda$lambda$lambda_0($typeName, $recordConstructor, $toPuts));
     return Unit_instance;
   };
 }
 function typeAvroFile$lambda($packageName, $typeName, $schemaField, $fromArgs, $recordConstructor, $toPuts) {
   return function ($this$file) {
-    $this$file.e17($packageName.bt_1 + '.avro');
-    $this$file.s15($packageName.bt_1 + '.model', $typeName);
+    $this$file.o17($packageName.bt_1 + '.avro');
+    $this$file.c16($packageName.bt_1 + '.model', $typeName);
     var tmp = $typeName + 'Avro';
-    $this$file.e16(tmp, VOID, typeAvroFile$lambda$lambda($schemaField, $typeName, $fromArgs, $recordConstructor, $toPuts));
+    $this$file.o16(tmp, VOID, typeAvroFile$lambda$lambda($schemaField, $typeName, $fromArgs, $recordConstructor, $toPuts));
     return Unit_instance;
   };
 }
 function enumAvroFile$lambda$lambda$lambda($enumName, $fromExpr) {
   return function ($this$function) {
-    $this$function.m13('record', $this$function.q14('org.apache.avro.generic.GenericData.EnumSymbol', []));
-    $this$function.j13($this$function.q14($enumName, []));
-    $this$function.p13(new RawExpression($fromExpr));
+    $this$function.w13('record', $this$function.a15('org.apache.avro.generic.GenericData.EnumSymbol', []));
+    $this$function.t13($this$function.a15($enumName, []));
+    $this$function.z13(new RawExpression($fromExpr));
     return Unit_instance;
   };
 }
 function enumAvroFile$lambda$lambda$lambda_0($enumName, $toExpr) {
   return function ($this$function) {
-    $this$function.m13('data', $this$function.q14($enumName, []));
-    $this$function.j13($this$function.q14('org.apache.avro.generic.GenericData.EnumSymbol', []));
-    $this$function.p13(new RawExpression($toExpr));
+    $this$function.w13('data', $this$function.a15($enumName, []));
+    $this$function.t13($this$function.a15('org.apache.avro.generic.GenericData.EnumSymbol', []));
+    $this$function.z13(new RawExpression($toExpr));
     return Unit_instance;
   };
 }
 function enumAvroFile$lambda$lambda($schemaField, $enumName, $fromExpr, $toExpr) {
   return function ($this$namespace) {
-    $this$namespace.i14($schemaField);
-    $this$namespace.w15('from', true, VOID, enumAvroFile$lambda$lambda$lambda($enumName, $fromExpr));
-    $this$namespace.w15('to', true, VOID, enumAvroFile$lambda$lambda$lambda_0($enumName, $toExpr));
+    $this$namespace.s14($schemaField);
+    $this$namespace.g16('from', true, VOID, enumAvroFile$lambda$lambda$lambda($enumName, $fromExpr));
+    $this$namespace.g16('to', true, VOID, enumAvroFile$lambda$lambda$lambda_0($enumName, $toExpr));
     return Unit_instance;
   };
 }
 function enumAvroFile$lambda($packageName, $enumName, $schemaField, $fromExpr, $toExpr) {
   return function ($this$file) {
-    $this$file.e17($packageName.bt_1 + '.avro');
-    $this$file.s15($packageName.bt_1 + '.model', $enumName);
+    $this$file.o17($packageName.bt_1 + '.avro');
+    $this$file.c16($packageName.bt_1 + '.model', $enumName);
     var tmp = $enumName + 'Avro';
-    $this$file.e16(tmp, VOID, enumAvroFile$lambda$lambda($schemaField, $enumName, $fromExpr, $toExpr));
+    $this$file.o16(tmp, VOID, enumAvroFile$lambda$lambda($schemaField, $enumName, $fromExpr, $toExpr));
     return Unit_instance;
   };
 }
@@ -1085,7 +1128,7 @@ function _init_properties_AvroExtension_kt__50nkjp() {
 }
 function annotate($this, $receiver, recordNames, unionMemberNames) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = $receiver.iv_1;
+  var tmp0 = $receiver.cv_1;
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = tmp0.t();
@@ -1093,11 +1136,11 @@ function annotate($this, $receiver, recordNames, unionMemberNames) {
     var element = _iterator__ex2g4s.v();
     var tmp;
     if (element instanceof Union) {
-      tmp = listOf_0([Companion_getInstance_0().i32_1, element]);
+      tmp = listOf_0([Companion_getInstance_0().h33_1, element]);
     } else {
       if (element instanceof Struct) {
-        var pascal = element.hx_1.zt();
-        tmp = !recordNames.i1(pascal) ? listOf(element) : unionMemberNames.i1(pascal) ? listOf_0([Companion_getInstance_0().j32(pascal), annotateFields($this, element)]) : listOf(annotateFields($this, element));
+        var pascal = element.bx_1.zt();
+        tmp = !recordNames.i1(pascal) ? listOf(element) : unionMemberNames.i1(pascal) ? listOf_0([Companion_getInstance_0().i33(pascal), annotateFields($this, element)]) : listOf(annotateFields($this, element));
       } else {
         tmp = listOf(element);
       }
@@ -1105,11 +1148,11 @@ function annotate($this, $receiver, recordNames, unionMemberNames) {
     var list = tmp;
     addAll(destination, list);
   }
-  return $receiver.lv(VOID, destination);
+  return $receiver.fv(VOID, destination);
 }
 function annotateFields($this, $receiver) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = $receiver.ix_1;
+  var tmp0 = $receiver.cx_1;
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = tmp0.t();
@@ -1117,24 +1160,24 @@ function annotateFields($this, $receiver) {
     var element = _iterator__ex2g4s.v();
     var tmp;
     if (element instanceof Field) {
-      tmp = listOf_0([Companion_getInstance_0().k32(element.cw_1.xt()), element]);
+      tmp = listOf_0([Companion_getInstance_0().j33(element.wv_1.xt()), element]);
     } else {
       tmp = listOf(element);
     }
     var list = tmp;
     addAll(destination, list);
   }
-  return $receiver.sx(VOID, destination);
+  return $receiver.mx(VOID, destination);
 }
 function Companion() {
   Companion_instance_1 = this;
-  this.h32_1 = 'com.fasterxml.jackson.annotation';
-  this.i32_1 = new RawElement('@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, property = "type")\n');
+  this.g33_1 = 'com.fasterxml.jackson.annotation';
+  this.h33_1 = new RawElement('@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, property = "type")\n');
 }
-protoOf(Companion).k32 = function (name) {
+protoOf(Companion).j33 = function (name) {
   return new RawElement('@com.fasterxml.jackson.annotation.JsonProperty("' + name + '")');
 };
-protoOf(Companion).j32 = function (name) {
+protoOf(Companion).i33 = function (name) {
   return new RawElement('@com.fasterxml.jackson.annotation.JsonTypeName("' + name + '")\n');
 };
 var Companion_instance_1;
@@ -1166,21 +1209,21 @@ function JacksonExtension$extend$lambda_3(it) {
   return it instanceof File;
 }
 function JacksonExtension$extend$lambda_4(it) {
-  return it.iv_1;
+  return it.cv_1;
 }
 function JacksonExtension$extend$lambda_5(it) {
   return it instanceof Union;
 }
 function JacksonExtension$extend$lambda_6(it) {
-  return it.pw_1;
+  return it.jw_1;
 }
 function JacksonExtension$extend$lambda_7(it) {
-  return it.qu_1.zt();
+  return it.nu_1.zt();
 }
 function JacksonExtension() {
   Companion_getInstance_0();
 }
-protoOf(JacksonExtension).b1b = function (ir, ast) {
+protoOf(JacksonExtension).f1b = function (ir, ast) {
   var tmp = asSequence_0(new NonEmptyList(ast.ep_1));
   // Inline function 'kotlin.sequences.filterIsInstance' call
   var this_0 = flatMap(tmp, JacksonExtension$extend$lambda);
@@ -1230,13 +1273,13 @@ function Target(name, ordinal) {
   Enum.call(this, name, ordinal);
 }
 function Model_0(type, builder, fields) {
-  this.l32_1 = type;
-  this.m32_1 = builder;
-  this.n32_1 = fields;
+  this.k33_1 = type;
+  this.l33_1 = builder;
+  this.m33_1 = fields;
 }
 function withBuilders($this, $receiver, target, recordNames) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = $receiver.iv_1;
+  var tmp0 = $receiver.cv_1;
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = tmp0.t();
@@ -1261,19 +1304,19 @@ function withBuilders($this, $receiver, target, recordNames) {
     var list = tmp2_elvis_lhs == null ? listOf(element) : tmp2_elvis_lhs;
     addAll(destination, list);
   }
-  return $receiver.lv(VOID, destination);
+  return $receiver.fv(VOID, destination);
 }
 function isRecord($this, $receiver, recordNames) {
   var tmp;
   var tmp_0;
-  if (recordNames.i1($receiver.hx_1.zt())) {
+  if (recordNames.i1($receiver.bx_1.zt())) {
     // Inline function 'kotlin.collections.isNotEmpty' call
     tmp_0 = !fieldList($receiver).r();
   } else {
     tmp_0 = false;
   }
   if (tmp_0) {
-    var tmp0 = $receiver.lx_1;
+    var tmp0 = $receiver.fx_1;
     var tmp$ret$1;
     $l$block_0: {
       // Inline function 'kotlin.collections.none' call
@@ -1292,7 +1335,7 @@ function isRecord($this, $receiver, recordNames) {
         var element = _iterator__ex2g4s.v();
         var tmp_2;
         if (element instanceof Struct) {
-          tmp_2 = element.hx_1.equals(Companion_getInstance_1().o32_1);
+          tmp_2 = element.bx_1.equals(Companion_getInstance_1().n33_1);
         } else {
           tmp_2 = false;
         }
@@ -1311,15 +1354,15 @@ function isRecord($this, $receiver, recordNames) {
 }
 function withBuilder($this, $receiver, target) {
   // Inline function 'kotlin.let' call
-  var pascal = $receiver.hx_1.zt();
+  var pascal = $receiver.bx_1.zt();
   var tmp;
   switch (target.e3_1) {
     case 0:
     case 1:
-      tmp = Custom_init_$Create$(Companion_getInstance_1().o32_1.xt());
+      tmp = Custom_init_$Create$(Companion_getInstance_1().n33_1.xt());
       break;
     case 2:
-      tmp = Custom_init_$Create$(pascal + '.' + Companion_getInstance_1().o32_1.xt());
+      tmp = Custom_init_$Create$(pascal + '.' + Companion_getInstance_1().n33_1.xt());
       break;
     default:
       noWhenBranchMatchedException();
@@ -1330,12 +1373,12 @@ function withBuilder($this, $receiver, target) {
   var tmp_0;
   switch (target.e3_1) {
     case 0:
-      tmp_0 = listOf($receiver.sx(VOID, VOID, VOID, VOID, plus_0(plus_0(plus_0($receiver.lx_1, entryPoint($this, model)), toBuilder($this, model)), builder($this, model, target))));
+      tmp_0 = listOf($receiver.mx(VOID, VOID, VOID, VOID, plus_0(plus_0(plus_0($receiver.fx_1, entryPoint($this, model)), toBuilder($this, model)), builder($this, model, target))));
       break;
     case 1:
       // Inline function 'kotlin.collections.filterNot' call
 
-      var tmp0 = $receiver.lx_1;
+      var tmp0 = $receiver.fx_1;
       // Inline function 'kotlin.collections.filterNotTo' call
 
       var destination = ArrayList_init_$Create$();
@@ -1345,7 +1388,7 @@ function withBuilder($this, $receiver, target) {
         var tmp_1;
         if (element instanceof RawElement) {
           // Inline function 'kotlin.text.trim' call
-          var this_0 = element.gy_1;
+          var this_0 = element.ay_1;
           tmp_1 = toString(trim(isCharSequence(this_0) ? this_0 : THROW_CCE())) === 'companion object';
         } else {
           tmp_1 = false;
@@ -1355,10 +1398,10 @@ function withBuilder($this, $receiver, target) {
         }
       }
 
-      tmp_0 = listOf($receiver.sx(VOID, VOID, VOID, VOID, plus_0(plus_0(plus_0(destination, Companion_getInstance_1().q32_1), toBuilder($this, model)), builder($this, model, target))));
+      tmp_0 = listOf($receiver.mx(VOID, VOID, VOID, VOID, plus_0(plus_0(plus_0(destination, Companion_getInstance_1().p33_1), toBuilder($this, model)), builder($this, model, target))));
       break;
     case 2:
-      tmp_0 = listOf_0([$receiver.sx(VOID, VOID, VOID, VOID, plus_0($receiver.lx_1, toBuilder($this, model))), new Namespace($receiver.hx_1, listOf_0([entryPoint($this, model), builder($this, model, target)]))]);
+      tmp_0 = listOf_0([$receiver.mx(VOID, VOID, VOID, VOID, plus_0($receiver.fx_1, toBuilder($this, model))), new Namespace($receiver.bx_1, listOf_0([entryPoint($this, model), builder($this, model, target)]))]);
       break;
     default:
       noWhenBranchMatchedException();
@@ -1370,7 +1413,7 @@ function entryPoint($this, $receiver) {
   var tmp = Companion_getInstance().wt('builder');
   var tmp_0 = emptyList();
   // Inline function 'kotlin.collections.associate' call
-  var this_0 = $receiver.n32_1;
+  var this_0 = $receiver.m33_1;
   var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
   // Inline function 'kotlin.collections.associateTo' call
   var destination = LinkedHashMap_init_$Create$(capacity);
@@ -1378,16 +1421,16 @@ function entryPoint($this, $receiver) {
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
     // Inline function 'kotlin.collections.plusAssign' call
-    var pair = to(element.cw_1, NullableEmpty_instance);
+    var pair = to(element.wv_1, NullableEmpty_instance);
     destination.v2(pair.ff_1, pair.gf_1);
   }
-  return new Function(tmp, VOID, tmp_0, $receiver.m32_1, listOf(new ReturnStatement(new ConstructorStatement($receiver.m32_1, destination))), VOID, true);
+  return new Function(tmp, VOID, tmp_0, $receiver.l33_1, listOf(new ReturnStatement(new ConstructorStatement($receiver.l33_1, destination))), VOID, true);
 }
 function toBuilder($this, $receiver) {
   var tmp = Companion_getInstance().wt('toBuilder');
   var tmp_0 = emptyList();
   // Inline function 'kotlin.collections.associate' call
-  var this_0 = $receiver.n32_1;
+  var this_0 = $receiver.m33_1;
   var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
   // Inline function 'kotlin.collections.associateTo' call
   var destination = LinkedHashMap_init_$Create$(capacity);
@@ -1397,7 +1440,7 @@ function toBuilder($this, $receiver) {
     // Inline function 'kotlin.let' call
     var self_1 = self_0($this, element);
     var tmp_1;
-    var tmp_2 = element.dw_1;
+    var tmp_2 = element.xv_1;
     if (tmp_2 instanceof Nullable) {
       tmp_1 = self_1;
     } else {
@@ -1405,26 +1448,26 @@ function toBuilder($this, $receiver) {
     }
     var tmp$ret$3 = tmp_1;
     // Inline function 'kotlin.collections.plusAssign' call
-    var pair = to(element.cw_1, tmp$ret$3);
+    var pair = to(element.wv_1, tmp$ret$3);
     destination.v2(pair.ff_1, pair.gf_1);
   }
-  return new Function(tmp, VOID, tmp_0, $receiver.m32_1, listOf(new ReturnStatement(new ConstructorStatement($receiver.m32_1, destination))));
+  return new Function(tmp, VOID, tmp_0, $receiver.l33_1, listOf(new ReturnStatement(new ConstructorStatement($receiver.l33_1, destination))));
 }
 function builder($this, $receiver, target) {
-  var tmp = Companion_getInstance_1().o32_1;
+  var tmp = Companion_getInstance_1().n33_1;
   // Inline function 'kotlin.collections.map' call
-  var this_0 = $receiver.n32_1;
+  var this_0 = $receiver.m33_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp$ret$2 = new Field(item.cw_1, optional($this, item.dw_1), VOID, VOID, VOID, VOID, VOID, NullableEmpty_instance);
+    var tmp$ret$2 = new Field(item.wv_1, optional($this, item.xv_1), VOID, VOID, VOID, VOID, VOID, NullableEmpty_instance);
     destination.x(tmp$ret$2);
   }
   var tmp_0 = destination;
   // Inline function 'kotlin.collections.map' call
-  var this_1 = $receiver.n32_1;
+  var this_1 = $receiver.m33_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination_0 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_1, 10));
   var _iterator__ex2g4s_0 = this_1.t();
@@ -1436,10 +1479,10 @@ function builder($this, $receiver, target) {
   return new Struct(tmp, tmp_0, VOID, VOID, plus_0(destination_0, build($this, $receiver, target)), VOID, Visibility_PUBLIC_getInstance());
 }
 function wither($this, $receiver, field) {
-  var tmp = new Name(plus(listOf('with'), Companion_getInstance().wt(field.cw_1.xt()).ut_1));
-  var tmp_0 = listOf(new Parameter(Companion_getInstance_1().p32_1, required($this, field.dw_1)));
+  var tmp = new Name(plus(listOf('with'), Companion_getInstance().wt(field.wv_1.xt()).ut_1));
+  var tmp_0 = listOf(new Parameter(Companion_getInstance_1().o33_1, required($this, field.xv_1)));
   // Inline function 'kotlin.collections.associate' call
-  var this_0 = $receiver.n32_1;
+  var this_0 = $receiver.m33_1;
   var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
   // Inline function 'kotlin.collections.associateTo' call
   var destination = LinkedHashMap_init_$Create$(capacity);
@@ -1447,16 +1490,16 @@ function wither($this, $receiver, field) {
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
     // Inline function 'kotlin.collections.plusAssign' call
-    var pair = to(element.cw_1, element.cw_1.equals(field.cw_1) ? new NullableOf(new VariableReference(Companion_getInstance_1().p32_1)) : self_0($this, element));
+    var pair = to(element.wv_1, element.wv_1.equals(field.wv_1) ? new NullableOf(new VariableReference(Companion_getInstance_1().o33_1)) : self_0($this, element));
     destination.v2(pair.ff_1, pair.gf_1);
   }
-  return new Function(tmp, VOID, tmp_0, $receiver.m32_1, listOf(new ReturnStatement(new ConstructorStatement($receiver.m32_1, destination))));
+  return new Function(tmp, VOID, tmp_0, $receiver.l33_1, listOf(new ReturnStatement(new ConstructorStatement($receiver.l33_1, destination))));
 }
 function build($this, $receiver, target) {
   var tmp = Companion_getInstance().wt('build');
   var tmp_0 = emptyList();
   // Inline function 'kotlin.collections.associate' call
-  var this_0 = $receiver.n32_1;
+  var this_0 = $receiver.m33_1;
   var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
   // Inline function 'kotlin.collections.associateTo' call
   var destination = LinkedHashMap_init_$Create$(capacity);
@@ -1464,28 +1507,28 @@ function build($this, $receiver, target) {
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
     var tmp_1;
-    var tmp_2 = element.dw_1;
+    var tmp_2 = element.xv_1;
     if (tmp_2 instanceof Nullable) {
       tmp_1 = self_0($this, element);
     } else {
-      tmp_1 = require_0($this, element, target, $receiver.l32_1);
+      tmp_1 = require_0($this, element, target, $receiver.k33_1);
     }
     // Inline function 'kotlin.collections.plusAssign' call
-    var pair = to(element.cw_1, tmp_1);
+    var pair = to(element.wv_1, tmp_1);
     destination.v2(pair.ff_1, pair.gf_1);
   }
-  return new Function(tmp, VOID, tmp_0, $receiver.l32_1, listOf(new ReturnStatement(new ConstructorStatement($receiver.l32_1, destination))));
+  return new Function(tmp, VOID, tmp_0, $receiver.k33_1, listOf(new ReturnStatement(new ConstructorStatement($receiver.k33_1, destination))));
 }
 function require_0($this, $receiver, target, model) {
   // Inline function 'kotlin.let' call
-  var message = model.qu_1.zt() + '.' + trim_0($receiver.cw_1.xt(), charArrayOf([_Char___init__impl__6a9atx(96)])) + ' is required';
+  var message = model.nu_1.zt() + '.' + trim_0($receiver.wv_1.xt(), charArrayOf([_Char___init__impl__6a9atx(96)])) + ' is required';
   var tmp;
   switch (target.e3_1) {
     case 0:
       tmp = new FunctionCall(self_0($this, $receiver), VOID, Companion_getInstance().wt('orElseThrow'), mapOf(to(Companion_getInstance().wt('exceptionSupplier'), new RawExpression('() -> new IllegalStateException("' + message + '")'))));
       break;
     case 1:
-      tmp = new FunctionCall(VOID, VOID, Companion_getInstance().wt('checkNotNull'), mapOf_0([to(Companion_getInstance_1().p32_1, self_0($this, $receiver)), to(Companion_getInstance().wt('lazyMessage'), new RawExpression('{ "' + message + '" }'))]));
+      tmp = new FunctionCall(VOID, VOID, Companion_getInstance().wt('checkNotNull'), mapOf_0([to(Companion_getInstance_1().o33_1, self_0($this, $receiver)), to(Companion_getInstance().wt('lazyMessage'), new RawExpression('{ "' + message + '" }'))]));
       break;
     case 2:
       tmp = new FunctionCall(self_0($this, $receiver), VOID, Companion_getInstance().wt('getOrElse'), mapOf(to(Companion_getInstance().wt('default'), new RawExpression('throw new IllegalStateException("' + message + '")'))));
@@ -1497,7 +1540,7 @@ function require_0($this, $receiver, target, model) {
   return tmp;
 }
 function self_0($this, $receiver) {
-  return new FieldCall(new RawExpression('this'), $receiver.cw_1);
+  return new FieldCall(new RawExpression('this'), $receiver.wv_1);
 }
 function optional($this, $receiver) {
   var tmp0_elvis_lhs = $receiver instanceof Nullable ? $receiver : null;
@@ -1505,14 +1548,14 @@ function optional($this, $receiver) {
 }
 function required($this, $receiver) {
   var tmp0_safe_receiver = $receiver instanceof Nullable ? $receiver : null;
-  var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.uu_1;
+  var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.ru_1;
   return tmp1_elvis_lhs == null ? $receiver : tmp1_elvis_lhs;
 }
 function Companion_0() {
   Companion_instance_2 = this;
-  this.o32_1 = Companion_getInstance().wt('Builder');
-  this.p32_1 = Companion_getInstance().wt('value');
-  this.q32_1 = new RawElement('companion object {\n  fun builder(): Builder = Builder()\n}');
+  this.n33_1 = Companion_getInstance().wt('Builder');
+  this.o33_1 = Companion_getInstance().wt('value');
+  this.p33_1 = new RawElement('companion object {\n  fun builder(): Builder = Builder()\n}');
 }
 var Companion_instance_2;
 function Companion_getInstance_1() {
@@ -1543,10 +1586,10 @@ function Target_Scala_getInstance() {
 }
 function JvmBuilderExtension(language) {
   Companion_getInstance_1();
-  this.r32_1 = language;
+  this.q33_1 = language;
   var tmp = this;
   var tmp_0;
-  switch (this.r32_1.e3_1) {
+  switch (this.q33_1.e3_1) {
     case 0:
       tmp_0 = Target_Java_getInstance();
       break;
@@ -1571,10 +1614,10 @@ function JvmBuilderExtension(language) {
       noWhenBranchMatchedException();
       break;
   }
-  tmp.s32_1 = tmp_0;
+  tmp.r33_1 = tmp_0;
 }
-protoOf(JvmBuilderExtension).b1b = function (ir, ast) {
-  var tmp0_safe_receiver = this.s32_1;
+protoOf(JvmBuilderExtension).f1b = function (ir, ast) {
+  var tmp0_safe_receiver = this.r33_1;
   var tmp;
   if (tmp0_safe_receiver == null) {
     tmp = null;
@@ -1613,67 +1656,39 @@ protoOf(JvmBuilderExtension).b1b = function (ir, ast) {
 };
 function Companion_1() {
 }
-protoOf(Companion_1).t32 = function (channel, types, refined) {
+protoOf(Companion_1).s33 = function (channel, types, refined) {
   var payloadRef = channel.yq_1;
-  var payloadType = KotlinGenerator_getInstance().m1b(convert(payloadRef));
+  var payloadType = KotlinGenerator_getInstance().l1c(convert(payloadRef));
   var payloadCustom = payloadRef instanceof Custom ? payloadRef : null;
   var tmp;
   if (payloadCustom == null) {
     tmp = null;
   } else {
     // Inline function 'kotlin.let' call
-    tmp = Companion_instance_4.u32(payloadCustom.n19_1, types, refined, emptySet());
+    tmp = Companion_instance_4.t33(payloadCustom.x19_1, types, refined);
   }
   var tmp1_elvis_lhs = tmp;
   var payloadFieldShapes = tmp1_elvis_lhs == null ? emptyList() : tmp1_elvis_lhs;
-  var tmp_0;
-  if (payloadCustom == null) {
-    tmp_0 = null;
-  } else {
-    // Inline function 'kotlin.let' call
-    tmp_0 = types.s2(payloadCustom.n19_1);
-  }
-  var tmp3_safe_receiver = tmp_0;
-  var tmp4_safe_receiver = tmp3_safe_receiver == null ? null : tmp3_safe_receiver.lp_1;
-  var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : get_fields(tmp4_safe_receiver);
-  var tmp_1;
-  if (tmp5_safe_receiver == null) {
-    tmp_1 = null;
-  } else {
-    // Inline function 'kotlin.collections.map' call
-    // Inline function 'kotlin.collections.mapTo' call
-    var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp5_safe_receiver, 10));
-    var _iterator__ex2g4s = tmp5_safe_receiver.t();
-    while (_iterator__ex2g4s.u()) {
-      var item = _iterator__ex2g4s.v();
-      var tmp$ret$6 = item.pp_1;
-      destination.x(tmp$ret$6);
-    }
-    tmp_1 = destination;
-  }
-  var tmp6_elvis_lhs = tmp_1;
-  var directRefs = tmp6_elvis_lhs == null ? emptyList() : tmp6_elvis_lhs;
-  var modelImports = Companion_instance_4.v32(plus(listOf(payloadRef), directRefs), payloadFieldShapes, types);
-  return new ChannelShape(Companion_getInstance().wt(channel.xq_1.o1()).zt(), payloadType, payloadFieldShapes, modelImports);
+  return new ChannelShape(Companion_getInstance().wt(channel.xq_1.o1()).zt(), payloadType, payloadFieldShapes, Companion_instance_4.u33(listOf(payloadRef)));
 };
 var Companion_instance_3;
 function Companion_getInstance_2() {
   return Companion_instance_3;
 }
 function ChannelShape(name, payloadType, payloadFieldShapes, modelImports) {
-  this.w32_1 = name;
-  this.x32_1 = payloadType;
-  this.y32_1 = payloadFieldShapes;
-  this.z32_1 = modelImports;
+  this.v33_1 = name;
+  this.w33_1 = payloadType;
+  this.x33_1 = payloadFieldShapes;
+  this.y33_1 = modelImports;
 }
 protoOf(ChannelShape).toString = function () {
-  return 'ChannelShape(name=' + this.w32_1 + ', payloadType=' + this.x32_1 + ', payloadFieldShapes=' + toString(this.y32_1) + ', modelImports=' + toString(this.z32_1) + ')';
+  return 'ChannelShape(name=' + this.v33_1 + ', payloadType=' + this.w33_1 + ', payloadFieldShapes=' + toString(this.x33_1) + ', modelImports=' + toString(this.y33_1) + ')';
 };
 protoOf(ChannelShape).hashCode = function () {
-  var result = getStringHashCode(this.w32_1);
-  result = imul(result, 31) + getStringHashCode(this.x32_1) | 0;
-  result = imul(result, 31) + hashCode(this.y32_1) | 0;
-  result = imul(result, 31) + hashCode(this.z32_1) | 0;
+  var result = getStringHashCode(this.v33_1);
+  result = imul(result, 31) + getStringHashCode(this.w33_1) | 0;
+  result = imul(result, 31) + hashCode(this.x33_1) | 0;
+  result = imul(result, 31) + hashCode(this.y33_1) | 0;
   return result;
 };
 protoOf(ChannelShape).equals = function (other) {
@@ -1681,52 +1696,46 @@ protoOf(ChannelShape).equals = function (other) {
     return true;
   if (!(other instanceof ChannelShape))
     return false;
-  if (!(this.w32_1 === other.w32_1))
+  if (!(this.v33_1 === other.v33_1))
     return false;
-  if (!(this.x32_1 === other.x32_1))
+  if (!(this.w33_1 === other.w33_1))
     return false;
-  if (!equals(this.y32_1, other.y32_1))
+  if (!equals(this.x33_1, other.x33_1))
     return false;
-  if (!equals(this.z32_1, other.z32_1))
+  if (!equals(this.y33_1, other.y33_1))
     return false;
   return true;
 };
-function ChannelDslFile$build$lambda$lambda$lambda($builder, $arbPayload, $payload, $shape) {
+function ChannelDslFile$build$lambda$lambda$lambda($builder, $arbPayload, $payload) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.o13('block', $this$function.s14(Unit_instance_0, Custom_init_$Create$($builder)), $this$function.t14('{}'));
-    $this$function.j13($arbPayload);
-    $this$function.i14('val builder = ' + $builder + '().apply(block)');
-    $this$function.i14('return channelCall<' + $payload + '>(' + $shape.w32_1 + '::class).messageGen {');
-    // Inline function 'kotlin.text.trimEnd' call
-    var this_0 = RecordBuilder_instance.a33($shape.y32_1, 'builder', emptyList(), '    ');
-    var tmp$ret$0 = toString(trimEnd(isCharSequence(this_0) ? this_0 : THROW_CCE()));
-    $this$function.i14(tmp$ret$0);
-    $this$function.i14('}');
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.y13('block', $this$function.c15(Unit_instance_0, Custom_init_$Create$($builder)), $this$function.d15('{}'));
+    $this$function.t13($arbPayload);
+    $this$function.s14('val builder = ' + $builder + '().apply(block)');
+    $this$function.s14('return generatedGen { generator, rs -> builder.applyTo(' + $payload + 'Generator.generate(generator, emptyList()), rs) }');
     return Unit_instance;
   };
 }
 function ChannelDslFile$build$lambda$lambda$lambda_0($arbPayload, $payload, $shape) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.j13($arbPayload);
-    $this$function.p13($this$function.t14('channelCall<' + $payload + '>(' + $shape.w32_1 + '::class).messageGen()'));
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.t13($arbPayload);
+    $this$function.z13($this$function.d15('channelCall<' + $payload + '>(' + $shape.v33_1 + '::class).messageGen()'));
     return Unit_instance;
   };
 }
-function ChannelDslFile$build$lambda$lambda($shape, $payload, $arbPayload) {
+function ChannelDslFile$build$lambda$lambda($isRecord, $payload, $arbPayload, $shape) {
   return function ($this$struct) {
-    $this$struct.h15();
-    $this$struct.l13(Visibility_PUBLIC_getInstance());
-    $this$struct.i15(Visibility_INTERNAL_getInstance());
+    $this$struct.r15();
+    $this$struct.v13(Visibility_PUBLIC_getInstance());
+    $this$struct.s15(Visibility_INTERNAL_getInstance());
     var tmp;
-    // Inline function 'kotlin.collections.isNotEmpty' call
-    if (!$shape.y32_1.r()) {
-      var builder = RecordBuilder_instance.b33($payload);
-      $this$struct.w15('message', VOID, VOID, ChannelDslFile$build$lambda$lambda$lambda(builder, $arbPayload, $payload, $shape));
+    if ($isRecord) {
+      var builder = RecordBuilder_instance.z33($payload);
+      $this$struct.g16('message', VOID, VOID, ChannelDslFile$build$lambda$lambda$lambda(builder, $arbPayload, $payload));
       tmp = Unit_instance;
     } else {
-      $this$struct.w15('message', VOID, VOID, ChannelDslFile$build$lambda$lambda$lambda_0($arbPayload, $payload, $shape));
+      $this$struct.g16('message', VOID, VOID, ChannelDslFile$build$lambda$lambda$lambda_0($arbPayload, $payload, $shape));
       tmp = Unit_instance;
     }
     return Unit_instance;
@@ -1734,72 +1743,84 @@ function ChannelDslFile$build$lambda$lambda($shape, $payload, $arbPayload) {
 }
 function ChannelDslFile$build$lambda$lambda_0($genPayload, $payload, $shape) {
   return function ($this$asyncFunction) {
-    $this$asyncFunction.l13(Visibility_PUBLIC_getInstance());
-    $this$asyncFunction.k13($genPayload);
-    $this$asyncFunction.o13('topic', new Nullable(String_instance), $this$asyncFunction.t14('null'));
-    $this$asyncFunction.o13('key', new Nullable(String_instance), $this$asyncFunction.t14('null'));
-    $this$asyncFunction.j13(Custom_init_$Create$($payload));
-    $this$asyncFunction.i14('val call = channelCall<' + $payload + '>(' + $shape.w32_1 + '::class)');
-    $this$asyncFunction.i14('topic?.let { call.topic(it) }');
-    $this$asyncFunction.i14('key?.let { call.key(it) }');
-    $this$asyncFunction.p13($this$asyncFunction.t14('call.send(this)'));
+    $this$asyncFunction.v13(Visibility_PUBLIC_getInstance());
+    $this$asyncFunction.u13($genPayload);
+    $this$asyncFunction.y13('topic', new Nullable(String_instance), $this$asyncFunction.d15('null'));
+    $this$asyncFunction.y13('key', new Nullable(String_instance), $this$asyncFunction.d15('null'));
+    $this$asyncFunction.t13(Custom_init_$Create$($payload));
+    $this$asyncFunction.s14('val call = channelCall<' + $payload + '>(' + $shape.v33_1 + '::class)');
+    $this$asyncFunction.s14('topic?.let { call.topic(it) }');
+    $this$asyncFunction.s14('key?.let { call.key(it) }');
+    $this$asyncFunction.z13($this$asyncFunction.d15('call.send(this)'));
     return Unit_instance;
   };
 }
-function ChannelDslFile$build$lambda($kotestPkg, $channelPkg, $shape, $modelPkg, $emitSend, $payload, $arbPayload, $genPayload) {
+function ChannelDslFile$build$lambda($kotestPkg, $shape, $emitSend, $packageName, $payload, $channelPkg, $modelPkg, $arbPayload, $genPayload) {
   return function ($this$file) {
-    $this$file.e17($kotestPkg);
-    $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'channelCall');
-    $this$file.s15('io.kotest.property', 'Arb');
-    $this$file.s15('io.kotest.property', 'Gen');
-    $this$file.s15($channelPkg, $shape.w32_1);
+    $this$file.o17($kotestPkg);
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    var isRecord = !$shape.x33_1.r();
+    var tmp;
+    if ($emitSend || !isRecord) {
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'channelCall');
+      tmp = Unit_instance;
+    }
+    var tmp_0;
+    if (isRecord) {
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'generatedGen');
+      $this$file.c16($packageName.bt_1 + '.generator', $payload + 'Generator');
+      tmp_0 = Unit_instance;
+    }
+    $this$file.c16('io.kotest.property', 'Arb');
+    $this$file.c16('io.kotest.property', 'Gen');
+    $this$file.c16($channelPkg, $shape.v33_1);
     // Inline function 'kotlin.collections.forEach' call
-    var _iterator__ex2g4s = $shape.z32_1.t();
+    var _iterator__ex2g4s = $shape.y33_1.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      $this$file.s15($modelPkg, Companion_getInstance().wt(element).zt());
+      $this$file.c16($modelPkg, Companion_getInstance().wt(element).zt());
     }
-    var tmp = $shape.w32_1 + 'Generate';
-    $this$file.f17(tmp, ChannelDslFile$build$lambda$lambda($shape, $payload, $arbPayload));
-    $this$file.u15('generate', Custom_init_$Create$($shape.w32_1 + 'Generate'), VOID, Visibility_PUBLIC_getInstance(), Custom_init_$Create$($shape.w32_1), VOID, VOID, new FunctionCall(VOID, VOID, Companion_getInstance().wt($shape.w32_1 + 'Generate')));
-    var tmp_0;
+    var tmp_1 = $shape.v33_1 + 'Generate';
+    $this$file.p17(tmp_1, ChannelDslFile$build$lambda$lambda(isRecord, $payload, $arbPayload, $shape));
+    $this$file.e16('generate', Custom_init_$Create$($shape.v33_1 + 'Generate'), VOID, Visibility_PUBLIC_getInstance(), Custom_init_$Create$($shape.v33_1), VOID, VOID, new FunctionCall(VOID, VOID, Companion_getInstance().wt($shape.v33_1 + 'Generate')));
+    var tmp_2;
     if ($emitSend) {
-      $this$file.a16('send', VOID, VOID, ChannelDslFile$build$lambda$lambda_0($genPayload, $payload, $shape));
-      tmp_0 = Unit_instance;
+      $this$file.k16('send', VOID, VOID, ChannelDslFile$build$lambda$lambda_0($genPayload, $payload, $shape));
+      tmp_2 = Unit_instance;
     }
     return Unit_instance;
   };
 }
 function ChannelDslFile() {
 }
-protoOf(ChannelDslFile).c33 = function (channel, packageName, types, refined, emitSend) {
-  var shape = Companion_instance_3.t32(channel, types, refined);
+protoOf(ChannelDslFile).a34 = function (channel, packageName, types, refined, emitSend) {
+  var shape = Companion_instance_3.s33(channel, types, refined);
   var kotestPkg = packageName.bt_1 + '.kotest';
   var channelPkg = packageName.bt_1 + '.channel';
   var modelPkg = packageName.bt_1 + '.model';
-  var fileName = Companion_instance_0.at(kotestPkg).dt() + (shape.w32_1 + 'Dsl');
-  var payload = shape.x32_1;
+  var fileName = Companion_instance_0.at(kotestPkg).dt() + (shape.v33_1 + 'Dsl');
+  var payload = shape.w33_1;
   var genPayload = Custom_init_$Create$('Gen', listOf(Custom_init_$Create$(payload)));
   var arbPayload = Custom_init_$Create$('Arb', listOf(Custom_init_$Create$(payload)));
   var tmp = Companion_getInstance().wt(fileName);
-  return file(tmp, ChannelDslFile$build$lambda(kotestPkg, channelPkg, shape, modelPkg, emitSend, payload, arbPayload, genPayload));
+  return file(tmp, ChannelDslFile$build$lambda(kotestPkg, shape, emitSend, packageName, payload, channelPkg, modelPkg, arbPayload, genPayload));
 };
 var ChannelDslFile_instance;
 function ChannelDslFile_getInstance() {
   return ChannelDslFile_instance;
 }
 function Slot(name, genFn, fields) {
-  this.d33_1 = name;
-  this.e33_1 = genFn;
-  this.f33_1 = fields;
+  this.b34_1 = name;
+  this.c34_1 = genFn;
+  this.d34_1 = fields;
 }
 protoOf(Slot).toString = function () {
-  return 'Slot(name=' + this.d33_1 + ', genFn=' + this.e33_1 + ', fields=' + toString(this.f33_1) + ')';
+  return 'Slot(name=' + this.b34_1 + ', genFn=' + this.c34_1 + ', fields=' + toString(this.d34_1) + ')';
 };
 protoOf(Slot).hashCode = function () {
-  var result = getStringHashCode(this.d33_1);
-  result = imul(result, 31) + getStringHashCode(this.e33_1) | 0;
-  result = imul(result, 31) + hashCode(this.f33_1) | 0;
+  var result = getStringHashCode(this.b34_1);
+  result = imul(result, 31) + getStringHashCode(this.c34_1) | 0;
+  result = imul(result, 31) + hashCode(this.d34_1) | 0;
   return result;
 };
 protoOf(Slot).equals = function (other) {
@@ -1807,24 +1828,24 @@ protoOf(Slot).equals = function (other) {
     return true;
   if (!(other instanceof Slot))
     return false;
-  if (!(this.d33_1 === other.d33_1))
+  if (!(this.b34_1 === other.b34_1))
     return false;
-  if (!(this.e33_1 === other.e33_1))
+  if (!(this.c34_1 === other.c34_1))
     return false;
-  if (!equals(this.f33_1, other.f33_1))
+  if (!equals(this.d34_1, other.d34_1))
     return false;
   return true;
 };
 function presentSlots($this, shape) {
   // Inline function 'kotlin.collections.filter' call
-  var tmp0 = listOf_0([new Slot('path', 'pathGen', shape.h33_1), new Slot('query', 'queryGen', shape.i33_1), new Slot('header', 'headerGen', shape.j33_1)]);
+  var tmp0 = listOf_0([new Slot('path', 'pathGen', shape.f34_1), new Slot('query', 'queryGen', shape.g34_1), new Slot('header', 'headerGen', shape.h34_1)]);
   // 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.collections.isNotEmpty' call
-    if (!element.f33_1.r()) {
+    if (!element.d34_1.r()) {
       destination.x(element);
     }
   }
@@ -1838,7 +1859,7 @@ function requiredSlots($this, shape) {
   var _iterator__ex2g4s = tmp0.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    var tmp0_0 = element.f33_1;
+    var tmp0_0 = element.d34_1;
     var tmp$ret$3;
     $l$block_0: {
       // Inline function 'kotlin.collections.any' call
@@ -1855,7 +1876,7 @@ function requiredSlots($this, shape) {
       var _iterator__ex2g4s_0 = tmp0_0.t();
       while (_iterator__ex2g4s_0.u()) {
         var element_0 = _iterator__ex2g4s_0.v();
-        if (!element_0.s33_1) {
+        if (!element_0.q34_1) {
           tmp$ret$3 = true;
           break $l$block_0;
         }
@@ -1884,7 +1905,7 @@ function cap($this, name) {
   return tmp;
 }
 function slotBuilderName($this, shape, slot) {
-  return shape.g33_1 + cap($this, slot.d33_1) + 'Builder';
+  return shape.e34_1 + cap($this, slot.b34_1) + 'Builder';
 }
 function genOf($this, inner) {
   return Custom_init_$Create$('Gen', listOf(inner));
@@ -1908,26 +1929,26 @@ function suspendScopeType($this, scope) {
   return new Function_0(emptyList(), Unit_instance_0, Custom_init_$Create$(scope), true);
 }
 function buildGenerateWrapper($this, $receiver, shape) {
-  var tmp = shape.g33_1 + 'Generate';
-  $receiver.f17(tmp, EndpointDslFile$buildGenerateWrapper$lambda(shape));
+  var tmp = shape.e34_1 + 'Generate';
+  $receiver.p17(tmp, EndpointDslFile$buildGenerateWrapper$lambda(shape));
 }
 function buildRequestCall($this, $receiver, shape) {
-  $receiver.a16('call', VOID, VOID, EndpointDslFile$buildRequestCall$lambda(shape));
+  $receiver.k16('call', VOID, VOID, EndpointDslFile$buildRequestCall$lambda(shape));
 }
 function buildResponseMock($this, $receiver, shape) {
-  $receiver.a16('mock', VOID, VOID, EndpointDslFile$buildResponseMock$lambda(shape));
+  $receiver.k16('mock', VOID, VOID, EndpointDslFile$buildResponseMock$lambda(shape));
 }
 function buildResponseScope($this, $receiver, shape, variant) {
-  var scopeName = shape.g33_1 + variant.u33_1 + 'Scope';
-  var variantType = shape.g33_1 + '.' + variant.u33_1;
-  var tmp0_safe_receiver = variant.w33_1;
+  var scopeName = shape.e34_1 + variant.s34_1 + 'Scope';
+  var variantType = shape.e34_1 + '.' + variant.s34_1;
+  var tmp0_safe_receiver = variant.u34_1;
   var tmp;
   if (tmp0_safe_receiver == null) {
     tmp = null;
   } else {
     // Inline function 'kotlin.takeIf' call
     var tmp_0;
-    if (!variant.v33_1.equals(BodyKind_None_getInstance())) {
+    if (!variant.t34_1.equals(BodyKind_None_getInstance())) {
       tmp_0 = tmp0_safe_receiver;
     } else {
       tmp_0 = null;
@@ -1935,11 +1956,11 @@ function buildResponseScope($this, $receiver, shape, variant) {
     tmp = tmp_0;
   }
   var bodyType = tmp;
-  $receiver.f17(scopeName, EndpointDslFile$buildResponseScope$lambda(shape, variantType, bodyType, variant));
+  $receiver.p17(scopeName, EndpointDslFile$buildResponseScope$lambda(shape, variantType, bodyType, variant));
 }
 function buildScopeClass($this, $receiver, shape, present, required) {
-  var tmp = shape.g33_1 + 'Scope';
-  $receiver.f17(tmp, EndpointDslFile$buildScopeClass$lambda(shape, present, required));
+  var tmp = shape.e34_1 + 'Scope';
+  $receiver.p17(tmp, EndpointDslFile$buildScopeClass$lambda(shape, present, required));
 }
 function renderFlushBody($this, shape, present, required) {
   // Inline function 'kotlin.text.buildString' call
@@ -1951,7 +1972,7 @@ function renderFlushBody($this, shape, present, required) {
   var _iterator__ex2g4s = required.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp$ret$5 = item.d33_1;
+    var tmp$ret$5 = item.b34_1;
     destination.x(tmp$ret$5);
   }
   var requiredNames = toSet_0(destination);
@@ -1968,14 +1989,14 @@ function renderFlushBody($this, shape, present, required) {
   while (_iterator__ex2g4s_0.u()) {
     var element = _iterator__ex2g4s_0.v();
     var builderClass = slotBuilderName(EndpointDslFile_instance, shape, element);
-    var builderVar = element.d33_1 + 'Builder';
-    if (requiredNames.i1(element.d33_1)) {
+    var builderVar = element.b34_1 + 'Builder';
+    if (requiredNames.i1(element.b34_1)) {
       // Inline function 'kotlin.text.appendLine' call
-      var value_1 = 'val ' + builderVar + ' = ' + builderClass + '().apply(' + element.d33_1 + ' ?: error("' + shape.g33_1 + ': required `' + element.d33_1 + '` block is missing"))';
+      var value_1 = 'val ' + builderVar + ' = ' + builderClass + '().apply(' + element.b34_1 + ' ?: error("' + shape.e34_1 + ': required `' + element.b34_1 + '` block is missing"))';
       // Inline function 'kotlin.text.appendLine' call
       this_0.q(value_1).s(_Char___init__impl__6a9atx(10));
       // Inline function 'kotlin.collections.forEach' call
-      var _iterator__ex2g4s_1 = element.f33_1.t();
+      var _iterator__ex2g4s_1 = element.d34_1.t();
       while (_iterator__ex2g4s_1.u()) {
         var element_0 = _iterator__ex2g4s_1.v();
         // Inline function 'kotlin.text.appendLine' call
@@ -1985,11 +2006,11 @@ function renderFlushBody($this, shape, present, required) {
       }
     } else {
       // Inline function 'kotlin.text.appendLine' call
-      var value_3 = 'val ' + builderVar + ' = ' + element.d33_1 + '?.let { block -> ' + builderClass + '().apply(block) }';
+      var value_3 = 'val ' + builderVar + ' = ' + element.b34_1 + '?.let { block -> ' + builderClass + '().apply(block) }';
       // Inline function 'kotlin.text.appendLine' call
       this_0.q(value_3).s(_Char___init__impl__6a9atx(10));
       // Inline function 'kotlin.collections.forEach' call
-      var _iterator__ex2g4s_2 = element.f33_1.t();
+      var _iterator__ex2g4s_2 = element.d34_1.t();
       while (_iterator__ex2g4s_2.u()) {
         var element_1 = _iterator__ex2g4s_2.v();
         // Inline function 'kotlin.text.appendLine' call
@@ -2000,16 +2021,16 @@ function renderFlushBody($this, shape, present, required) {
     }
   }
   // Inline function 'kotlin.collections.isNotEmpty' call
-  if (!shape.n33_1.r()) {
-    var builderName = RecordBuilder_instance.b33(requireBodyElementType(EndpointDslFile_instance, shape));
-    var isList = shape.k33_1.equals(BodyKind_List_getInstance());
-    var elementType = shape.l33_1;
+  if (!shape.l34_1.r()) {
+    var elementType = requireBodyElementType(EndpointDslFile_instance, shape);
+    var isList = shape.i34_1.equals(BodyKind_List_getInstance());
+    var body = new RecordRef(elementType, isList, false, false);
     // Inline function 'kotlin.text.appendLine' call
     var value_5 = 'body?.let { block ->';
     // Inline function 'kotlin.text.appendLine' call
     this_0.q(value_5).s(_Char___init__impl__6a9atx(10));
     // Inline function 'kotlin.text.appendLine' call
-    var value_6 = '    val builder = ' + builderName + '().apply(block)';
+    var value_6 = '    val builder = ' + RecordBuilder_instance.z33(elementType) + '().apply(block)';
     // Inline function 'kotlin.text.appendLine' call
     this_0.q(value_6).s(_Char___init__impl__6a9atx(10));
     if (isList) {
@@ -2019,46 +2040,22 @@ function renderFlushBody($this, shape, present, required) {
       this_0.q(value_7).s(_Char___init__impl__6a9atx(10));
     }
     // Inline function 'kotlin.text.appendLine' call
-    var value_8 = '    inner.bodyTransform { rawBase, rs ->';
+    var value_8 = '    inner.bodyTransform { base, rs -> ' + body.b35('base', 'builder') + ' }';
     // Inline function 'kotlin.text.appendLine' call
     this_0.q(value_8).s(_Char___init__impl__6a9atx(10));
-    if (isList) {
-      // Inline function 'kotlin.text.appendLine' call
-      var value_9 = '        @Suppress("UNCHECKED_CAST")';
-      // Inline function 'kotlin.text.appendLine' call
-      this_0.q(value_9).s(_Char___init__impl__6a9atx(10));
-      // Inline function 'kotlin.text.appendLine' call
-      var value_10 = '        (rawBase as List<' + elementType + '>).map { base ->';
-      // Inline function 'kotlin.text.appendLine' call
-      this_0.q(value_10).s(_Char___init__impl__6a9atx(10));
-      appendBodyCopy(EndpointDslFile_instance, this_0, 'base', 'builder', shape, '            ');
-      // Inline function 'kotlin.text.appendLine' call
-      var value_11 = '        }';
-      // Inline function 'kotlin.text.appendLine' call
-      this_0.q(value_11).s(_Char___init__impl__6a9atx(10));
-    } else {
-      // Inline function 'kotlin.text.appendLine' call
-      var value_12 = '        val base = rawBase as ' + elementType;
-      // Inline function 'kotlin.text.appendLine' call
-      this_0.q(value_12).s(_Char___init__impl__6a9atx(10));
-      appendBodyCopy(EndpointDslFile_instance, this_0, 'base', 'builder', shape, '        ');
-    }
-    // Inline function 'kotlin.text.appendLine' call
-    // Inline function 'kotlin.text.appendLine' call
-    this_0.q('    }').s(_Char___init__impl__6a9atx(10));
     // Inline function 'kotlin.text.appendLine' call
     // Inline function 'kotlin.text.appendLine' call
     this_0.q('}').s(_Char___init__impl__6a9atx(10));
   }
-  if (shape.k33_1.equals(BodyKind_Primitive_getInstance())) {
+  if (shape.i34_1.equals(BodyKind_Primitive_getInstance())) {
     // Inline function 'kotlin.text.appendLine' call
-    var value_13 = 'body?.let { gen ->';
+    var value_9 = 'body?.let { gen ->';
     // Inline function 'kotlin.text.appendLine' call
-    this_0.q(value_13).s(_Char___init__impl__6a9atx(10));
+    this_0.q(value_9).s(_Char___init__impl__6a9atx(10));
     // Inline function 'kotlin.text.appendLine' call
-    var value_14 = '    inner.bodyTransform { _, rs -> gen.draw(rs) }';
+    var value_10 = '    inner.bodyTransform { _, rs -> gen.draw(rs) }';
     // Inline function 'kotlin.text.appendLine' call
-    this_0.q(value_14).s(_Char___init__impl__6a9atx(10));
+    this_0.q(value_10).s(_Char___init__impl__6a9atx(10));
     // Inline function 'kotlin.text.appendLine' call
     // Inline function 'kotlin.text.appendLine' call
     this_0.q('}').s(_Char___init__impl__6a9atx(10));
@@ -2068,86 +2065,26 @@ function renderFlushBody($this, shape, present, required) {
 function registerLine($this, shape, slot, builderVar, field, indent, nullableBuilder) {
   nullableBuilder = nullableBuilder === VOID ? false : nullableBuilder;
   var access = nullableBuilder ? '?.' : '.';
-  var ref = builderVar + access + escapeKotlinIdentifier(field.q33_1);
+  var ref = builderVar + access + escapeKotlinIdentifier(field.o34_1);
   var tmp;
-  if (field.s33_1) {
+  if (field.q34_1) {
     tmp = 'Arb.constant(null)';
   } else {
-    tmp = 'error("' + shape.g33_1 + '.' + slot.d33_1 + ': required `' + field.q33_1 + '` is missing")';
+    tmp = 'error("' + shape.e34_1 + '.' + slot.b34_1 + ': required `' + field.o34_1 + '` is missing")';
   }
   var fallback = tmp;
-  return indent + 'inner.' + slot.e33_1 + '("' + field.q33_1 + '", ' + ref + ' ?: ' + fallback + ')';
+  return indent + 'inner.' + slot.c34_1 + '("' + field.o34_1 + '", ' + ref + ' ?: ' + fallback + ')';
 }
 function buildSlotBuilder($this, $receiver, shape, slot) {
   var tmp = slotBuilderName($this, shape, slot);
-  $receiver.f17(tmp, EndpointDslFile$buildSlotBuilder$lambda(slot));
-}
-function appendBodyCopy($this, $receiver, baseExpr, receiver, shape, indent) {
-  // Inline function 'kotlin.text.appendLine' call
-  var value = indent + baseExpr + '.copy(';
-  // Inline function 'kotlin.text.appendLine' call
-  $receiver.q(value).s(_Char___init__impl__6a9atx(10));
-  // Inline function 'kotlin.collections.forEach' call
-  var _iterator__ex2g4s = shape.n33_1.t();
-  while (_iterator__ex2g4s.u()) {
-    var element = _iterator__ex2g4s.v();
-    // Inline function 'kotlin.text.appendLine' call
-    var value_0 = indent + '    ' + escapeKotlinIdentifier(element.m()) + ' = ' + copyValueExpr(EndpointDslFile_instance, element, baseExpr, receiver) + ',';
-    // Inline function 'kotlin.text.appendLine' call
-    $receiver.q(value_0).s(_Char___init__impl__6a9atx(10));
-  }
-  // Inline function 'kotlin.text.appendLine' call
-  var value_1 = indent + ')';
-  // Inline function 'kotlin.text.appendLine' call
-  $receiver.q(value_1).s(_Char___init__impl__6a9atx(10));
-}
-function copyValueExpr($this, field, baseExpr, receiver) {
-  var fieldRef = escapeKotlinIdentifier(field.m());
-  var baseField = baseExpr + '.' + fieldRef;
-  var tmp;
-  if (field instanceof Primitive_0) {
-    tmp = receiver + '.' + fieldRef + '.let { gen -> if (gen == null) ' + baseField + ' else ' + wrapDrawn($this, 'gen.draw(rs)', field) + ' }';
-  } else {
-    if (field instanceof NestedObject) {
-      tmp = nestedCopyExpr($this, field.c34_1, field.d34_1, field.e34_1, baseExpr, receiver, false);
-    } else {
-      if (field instanceof NestedList) {
-        tmp = nestedCopyExpr($this, field.z33_1, field.a34_1, field.b34_1, baseExpr, receiver, true);
-      } else {
-        noWhenBranchMatchedException();
-      }
-    }
-  }
-  return tmp;
-}
-function nestedCopyExpr($this, fieldName, nestedTypeName, fields, baseExpr, receiver, isList) {
-  var fieldRef = escapeKotlinIdentifier(fieldName);
-  var blockRef = escapeKotlinIdentifier('_' + fieldName + 'Block');
-  var baseField = baseExpr + '.' + fieldRef;
-  var nestedBuilder = RecordBuilder_instance.b33(nestedTypeName);
-  var nestedVar = escapeKotlinIdentifier('nested_' + fieldName);
-  var elemVar = escapeKotlinIdentifier((isList ? 'elem' : 'base') + '_' + fieldName);
-  var overBase = isList ? '?.map' : '?.let';
-  var subs = joinToString(fields, ', ', VOID, VOID, VOID, VOID, EndpointDslFile$nestedCopyExpr$lambda(elemVar, nestedVar));
-  return receiver + '.' + fieldRef + '.let { gen -> if (gen != null) gen.draw(rs) else ' + (receiver + '.' + blockRef + '?.let { block -> val ' + nestedVar + ' = ' + nestedBuilder + '().apply(block); ') + (baseField + overBase + ' { ' + elemVar + ' -> ' + elemVar + '.copy(' + subs + ') } } ?: ' + baseField + ' }');
-}
-function wrapDrawn($this, drawn, field) {
-  var tmp0_elvis_lhs = field.h34_1;
-  var tmp;
-  if (tmp0_elvis_lhs == null) {
-    return drawn;
-  } else {
-    tmp = tmp0_elvis_lhs;
-  }
-  var refined = tmp;
-  return field.i34_1 && field.j34_1 ? drawn + '?.map { ' + refined + '(it) }' : field.i34_1 ? drawn + '.map { ' + refined + '(it) }' : field.j34_1 ? drawn + '?.let { ' + refined + '(it) }' : refined + '(' + drawn + ')';
+  $receiver.p17(tmp, EndpointDslFile$buildSlotBuilder$lambda(slot));
 }
 function requireBodyElementType($this, $receiver) {
-  var tmp0_elvis_lhs = $receiver.l33_1;
+  var tmp0_elvis_lhs = $receiver.j34_1;
   var tmp;
   if (tmp0_elvis_lhs == null) {
     // Inline function 'kotlin.error' call
-    var message = 'bodyFieldShapes present but no bodyElementType for ' + $receiver.g33_1;
+    var message = 'bodyFieldShapes present but no bodyElementType for ' + $receiver.e34_1;
     throw IllegalStateException_init_$Create$(toString(message));
   } else {
     tmp = tmp0_elvis_lhs;
@@ -2155,11 +2092,11 @@ function requireBodyElementType($this, $receiver) {
   return tmp;
 }
 function requireBodyPrimitiveType($this, $receiver) {
-  var tmp0_elvis_lhs = $receiver.m33_1;
+  var tmp0_elvis_lhs = $receiver.k34_1;
   var tmp;
   if (tmp0_elvis_lhs == null) {
     // Inline function 'kotlin.error' call
-    var message = 'BodyKind.Primitive but no bodyPrimitiveType for ' + $receiver.g33_1;
+    var message = 'BodyKind.Primitive but no bodyPrimitiveType for ' + $receiver.e34_1;
     throw IllegalStateException_init_$Create$(toString(message));
   } else {
     tmp = tmp0_elvis_lhs;
@@ -2168,136 +2105,129 @@ function requireBodyPrimitiveType($this, $receiver) {
 }
 function EndpointDslFile$build$lambda($kotestPkg, $shape, $endpointPkg, $present, $modelPkg, $required) {
   return function ($this$file) {
-    $this$file.e17($kotestPkg);
-    $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'endpointCall');
-    $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'requestCall');
-    $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'WirespecScenarioDsl');
+    $this$file.o17($kotestPkg);
+    $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'endpointCall');
+    $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'requestCall');
+    $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'WirespecScenarioDsl');
     var tmp;
     // Inline function 'kotlin.collections.isNotEmpty' call
-    if (!$shape.o33_1.r()) {
-      $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'responseCall');
-      $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'responseMock');
+    if (!$shape.m34_1.r()) {
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'responseCall');
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'responseMock');
       tmp = Unit_instance;
     }
     var tmp_0;
-    var tmp_1;
-    // Inline function 'kotlin.collections.isNotEmpty' call
-    if (!$shape.n33_1.r()) {
-      tmp_1 = true;
-    } else {
-      tmp_1 = $shape.k33_1.equals(BodyKind_Primitive_getInstance());
-    }
-    if (tmp_1) {
-      $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'draw');
+    if ($shape.i34_1.equals(BodyKind_Primitive_getInstance())) {
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'draw');
       tmp_0 = Unit_instance;
     }
-    $this$file.s15($endpointPkg, $shape.g33_1);
-    $this$file.s15('io.kotest.property', 'Gen');
-    $this$file.s15('io.kotest.property', 'Arb');
-    var isListBody = $shape.k33_1.equals(BodyKind_List_getInstance());
+    $this$file.c16($endpointPkg, $shape.e34_1);
+    $this$file.c16('io.kotest.property', 'Gen');
+    $this$file.c16('io.kotest.property', 'Arb');
+    var isListBody = $shape.i34_1.equals(BodyKind_List_getInstance());
+    var tmp_1;
     var tmp_2;
     var tmp_3;
-    var tmp_4;
-    var tmp0 = plus(plus($shape.h33_1, $shape.i33_1), $shape.j33_1);
-    var tmp$ret$2;
+    var tmp0 = plus(plus($shape.f34_1, $shape.g34_1), $shape.h34_1);
+    var tmp$ret$1;
     $l$block_0: {
       // Inline function 'kotlin.collections.any' call
-      var tmp_5;
+      var tmp_4;
       if (isInterface(tmp0, Collection)) {
-        tmp_5 = tmp0.r();
+        tmp_4 = tmp0.r();
       } else {
-        tmp_5 = false;
+        tmp_4 = false;
       }
-      if (tmp_5) {
-        tmp$ret$2 = false;
+      if (tmp_4) {
+        tmp$ret$1 = false;
         break $l$block_0;
       }
       var _iterator__ex2g4s = tmp0.t();
       while (_iterator__ex2g4s.u()) {
         var element = _iterator__ex2g4s.v();
-        if (element.s33_1) {
-          tmp$ret$2 = true;
+        if (element.q34_1) {
+          tmp$ret$1 = true;
           break $l$block_0;
         }
       }
-      tmp$ret$2 = false;
-    }
-    if (tmp$ret$2) {
-      tmp_4 = true;
-    } else {
-      // Inline function 'kotlin.collections.isNotEmpty' call
-      tmp_4 = !$present.r();
+      tmp$ret$1 = false;
     }
-    if (tmp_4) {
+    if (tmp$ret$1) {
       tmp_3 = true;
     } else {
-      tmp_3 = $shape.k33_1.equals(BodyKind_Primitive_getInstance());
+      // Inline function 'kotlin.collections.isNotEmpty' call
+      tmp_3 = !$present.r();
     }
     if (tmp_3) {
       tmp_2 = true;
     } else {
-      var tmp0_0 = $shape.o33_1;
-      var tmp$ret$5;
+      tmp_2 = $shape.i34_1.equals(BodyKind_Primitive_getInstance());
+    }
+    if (tmp_2) {
+      tmp_1 = true;
+    } else {
+      var tmp0_0 = $shape.m34_1;
+      var tmp$ret$4;
       $l$block_2: {
         // Inline function 'kotlin.collections.any' call
-        var tmp_6;
+        var tmp_5;
         if (isInterface(tmp0_0, Collection)) {
-          tmp_6 = tmp0_0.r();
+          tmp_5 = tmp0_0.r();
         } else {
-          tmp_6 = false;
+          tmp_5 = false;
         }
-        if (tmp_6) {
-          tmp$ret$5 = false;
+        if (tmp_5) {
+          tmp$ret$4 = false;
           break $l$block_2;
         }
         var _iterator__ex2g4s_0 = tmp0_0.t();
         while (_iterator__ex2g4s_0.u()) {
           var element_0 = _iterator__ex2g4s_0.v();
-          var tmp_7;
-          if (!(element_0.w33_1 == null)) {
-            tmp_7 = true;
+          var tmp_6;
+          if (!(element_0.u34_1 == null)) {
+            tmp_6 = true;
           } else {
             // Inline function 'kotlin.collections.isNotEmpty' call
-            tmp_7 = !element_0.y33_1.r();
+            tmp_6 = !element_0.w34_1.r();
           }
-          if (tmp_7) {
-            tmp$ret$5 = true;
+          if (tmp_6) {
+            tmp$ret$4 = true;
             break $l$block_2;
           }
         }
-        tmp$ret$5 = false;
+        tmp$ret$4 = false;
       }
-      tmp_2 = tmp$ret$5;
+      tmp_1 = tmp$ret$4;
     }
-    var needsArbConstant = tmp_2;
-    var tmp_8;
+    var needsArbConstant = tmp_1;
+    var tmp_7;
     if (isListBody) {
-      $this$file.s15('io.kotest.property.arbitrary', 'int');
-      tmp_8 = Unit_instance;
+      $this$file.c16('io.kotest.property.arbitrary', 'int');
+      tmp_7 = Unit_instance;
     }
-    var tmp_9;
+    var tmp_8;
     if (needsArbConstant) {
-      $this$file.s15('io.kotest.property.arbitrary', 'constant');
-      tmp_9 = Unit_instance;
+      $this$file.c16('io.kotest.property.arbitrary', 'constant');
+      tmp_8 = Unit_instance;
     }
     // Inline function 'kotlin.collections.forEach' call
-    var _iterator__ex2g4s_1 = $shape.p33_1.t();
+    var _iterator__ex2g4s_1 = $shape.n34_1.t();
     while (_iterator__ex2g4s_1.u()) {
       var element_1 = _iterator__ex2g4s_1.v();
-      $this$file.s15($modelPkg, Companion_getInstance().wt(element_1).zt());
+      $this$file.c16($modelPkg, Companion_getInstance().wt(element_1).zt());
     }
     buildGenerateWrapper(EndpointDslFile_instance, $this$file, $shape);
-    $this$file.u15('generate', Custom_init_$Create$($shape.g33_1 + 'Generate'), VOID, Visibility_PUBLIC_getInstance(), Custom_init_$Create$($shape.g33_1), VOID, VOID, new FunctionCall(VOID, VOID, Companion_getInstance().wt($shape.g33_1 + 'Generate')));
+    $this$file.e16('generate', Custom_init_$Create$($shape.e34_1 + 'Generate'), VOID, Visibility_PUBLIC_getInstance(), Custom_init_$Create$($shape.e34_1), VOID, VOID, new FunctionCall(VOID, VOID, Companion_getInstance().wt($shape.e34_1 + 'Generate')));
     buildRequestCall(EndpointDslFile_instance, $this$file, $shape);
-    var tmp_10;
+    var tmp_9;
     // Inline function 'kotlin.collections.isNotEmpty' call
-    if (!$shape.o33_1.r()) {
+    if (!$shape.m34_1.r()) {
       buildResponseMock(EndpointDslFile_instance, $this$file, $shape);
-      tmp_10 = Unit_instance;
+      tmp_9 = Unit_instance;
     }
     buildScopeClass(EndpointDslFile_instance, $this$file, $shape, $present, $required);
     // Inline function 'kotlin.collections.forEach' call
-    var _iterator__ex2g4s_2 = $shape.o33_1.t();
+    var _iterator__ex2g4s_2 = $shape.m34_1.t();
     while (_iterator__ex2g4s_2.u()) {
       var element_2 = _iterator__ex2g4s_2.v();
       buildResponseScope(EndpointDslFile_instance, $this$file, $shape, element_2);
@@ -2313,210 +2243,205 @@ function EndpointDslFile$build$lambda($kotestPkg, $shape, $endpointPkg, $present
 }
 function EndpointDslFile$buildGenerateWrapper$lambda$lambda($shape) {
   return function ($this$asyncFunction) {
-    $this$asyncFunction.l13(Visibility_PUBLIC_getInstance());
-    $this$asyncFunction.m13('block', suspendScopeType(EndpointDslFile_instance, $shape.g33_1 + 'Scope'));
-    $this$asyncFunction.j13(arbOf_0(EndpointDslFile_instance, $shape.g33_1 + '.Request'));
-    $this$asyncFunction.q13('scope', new FunctionCall(VOID, VOID, Companion_getInstance().wt($shape.g33_1 + 'Scope')));
-    $this$asyncFunction.a14('block', VariableReference_init_$Create$('scope'));
-    $this$asyncFunction.p13(new FunctionCall(VariableReference_init_$Create$('scope'), VOID, Companion_getInstance().wt('buildRequest')));
+    $this$asyncFunction.v13(Visibility_PUBLIC_getInstance());
+    $this$asyncFunction.w13('block', suspendScopeType(EndpointDslFile_instance, $shape.e34_1 + 'Scope'));
+    $this$asyncFunction.t13(arbOf_0(EndpointDslFile_instance, $shape.e34_1 + '.Request'));
+    $this$asyncFunction.a14('scope', new FunctionCall(VOID, VOID, Companion_getInstance().wt($shape.e34_1 + 'Scope')));
+    $this$asyncFunction.k14('block', VariableReference_init_$Create$('scope'));
+    $this$asyncFunction.z13(new FunctionCall(VariableReference_init_$Create$('scope'), VOID, Companion_getInstance().wt('buildRequest')));
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildGenerateWrapper$lambda$lambda_0($scopeName, $shape, $variant) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.o13('block', blockType(EndpointDslFile_instance, $scopeName), $this$function.t14('{}'));
-    $this$function.j13(arbOf_0(EndpointDslFile_instance, $shape.g33_1 + '.' + $variant.u33_1));
-    $this$function.p13($this$function.t14($scopeName + '().apply(block).build()'));
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.y13('block', blockType(EndpointDslFile_instance, $scopeName), $this$function.d15('{}'));
+    $this$function.t13(arbOf_0(EndpointDslFile_instance, $shape.e34_1 + '.' + $variant.s34_1));
+    $this$function.z13($this$function.d15($scopeName + '().apply(block).build()'));
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildGenerateWrapper$lambda($shape) {
   return function ($this$struct) {
-    $this$struct.h15();
-    $this$struct.l13(Visibility_PUBLIC_getInstance());
-    $this$struct.i15(Visibility_INTERNAL_getInstance());
-    $this$struct.a16('request', VOID, VOID, EndpointDslFile$buildGenerateWrapper$lambda$lambda($shape));
+    $this$struct.r15();
+    $this$struct.v13(Visibility_PUBLIC_getInstance());
+    $this$struct.s15(Visibility_INTERNAL_getInstance());
+    $this$struct.k16('request', VOID, VOID, EndpointDslFile$buildGenerateWrapper$lambda$lambda($shape));
     // Inline function 'kotlin.collections.forEach' call
-    var _iterator__ex2g4s = $shape.o33_1.t();
+    var _iterator__ex2g4s = $shape.m34_1.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      var scopeName = $shape.g33_1 + element.u33_1 + 'Scope';
-      var tmp = 'response' + element.t33_1;
-      $this$struct.w15(tmp, VOID, VOID, EndpointDslFile$buildGenerateWrapper$lambda$lambda_0(scopeName, $shape, element));
+      var scopeName = $shape.e34_1 + element.s34_1 + 'Scope';
+      var tmp = 'response' + element.r34_1;
+      $this$struct.g16(tmp, VOID, VOID, EndpointDslFile$buildGenerateWrapper$lambda$lambda_0(scopeName, $shape, element));
     }
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildRequestCall$lambda($shape) {
   return function ($this$asyncFunction) {
-    $this$asyncFunction.l13(Visibility_PUBLIC_getInstance());
-    $this$asyncFunction.k13(genOf_0(EndpointDslFile_instance, $shape.g33_1 + '.Request'));
-    $this$asyncFunction.j13(Custom_init_$Create$($shape.g33_1 + '.Response<*>'));
-    $this$asyncFunction.p13($this$asyncFunction.t14('requestCall(' + $shape.g33_1 + '.api, ' + $shape.g33_1 + ', this)'));
+    $this$asyncFunction.v13(Visibility_PUBLIC_getInstance());
+    $this$asyncFunction.u13(genOf_0(EndpointDslFile_instance, $shape.e34_1 + '.Request'));
+    $this$asyncFunction.t13(Custom_init_$Create$($shape.e34_1 + '.Response<*>'));
+    $this$asyncFunction.z13($this$asyncFunction.d15('requestCall(' + $shape.e34_1 + '.api, ' + $shape.e34_1 + ', this)'));
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildResponseMock$lambda($shape) {
   return function ($this$asyncFunction) {
-    $this$asyncFunction.l13(Visibility_PUBLIC_getInstance());
-    $this$asyncFunction.k13(genOf_0(EndpointDslFile_instance, $shape.g33_1 + '.Response<*>'));
-    $this$asyncFunction.m13('predicate', new Function_0(listOf(Custom_init_$Create$($shape.g33_1 + '.Request')), Boolean_instance));
-    $this$asyncFunction.j13(Unit_instance_0);
-    $this$asyncFunction.p13($this$asyncFunction.t14('responseMock(' + $shape.g33_1 + '.api, this, predicate)'));
+    $this$asyncFunction.v13(Visibility_PUBLIC_getInstance());
+    $this$asyncFunction.u13(genOf_0(EndpointDslFile_instance, $shape.e34_1 + '.Response<*>'));
+    $this$asyncFunction.w13('predicate', new Function_0(listOf(Custom_init_$Create$($shape.e34_1 + '.Request')), Boolean_instance));
+    $this$asyncFunction.t13(Unit_instance_0);
+    $this$asyncFunction.z13($this$asyncFunction.d15('responseMock(' + $shape.e34_1 + '.api, this, predicate)'));
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildResponseScope$lambda$lambda($variantType, $bodyType, $variant) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.j13(arbOf_0(EndpointDslFile_instance, $variantType));
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.t13(arbOf_0(EndpointDslFile_instance, $variantType));
     var tmp;
     if (!($bodyType == null)) {
-      $this$function.i14('body?.let { inner.body(it) }');
+      $this$function.s14('body?.let { inner.body(it) }');
       tmp = Unit_instance;
     }
     // Inline function 'kotlin.collections.forEach' call
-    var _iterator__ex2g4s = $variant.y33_1.t();
+    var _iterator__ex2g4s = $variant.w34_1.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      $this$function.i14(escapeKotlinIdentifier(element.q33_1) + '?.let { inner.headerGen("' + element.q33_1 + '", it) }');
+      $this$function.s14(escapeKotlinIdentifier(element.o34_1) + '?.let { inner.headerGen("' + element.o34_1 + '", it) }');
     }
-    $this$function.i14('@Suppress("UNCHECKED_CAST")');
-    $this$function.p13($this$function.v14(new FunctionCall(VariableReference_init_$Create$('inner'), VOID, Companion_getInstance().wt('buildGen')), arbOf_0(EndpointDslFile_instance, $variantType)));
+    $this$function.s14('@Suppress("UNCHECKED_CAST")');
+    $this$function.z13($this$function.f15(new FunctionCall(VariableReference_init_$Create$('inner'), VOID, Companion_getInstance().wt('buildGen')), arbOf_0(EndpointDslFile_instance, $variantType)));
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildResponseScope$lambda($shape, $variantType, $bodyType, $variant) {
   return function ($this$struct) {
-    $this$struct.h15();
-    $this$struct.g15('@WirespecScenarioDsl');
-    $this$struct.l13(Visibility_PUBLIC_getInstance());
-    $this$struct.i15(Visibility_INTERNAL_getInstance());
-    $this$struct.i14('private val inner = responseCall(' + $shape.g33_1 + ', ' + $variantType + '::class)');
+    $this$struct.r15();
+    $this$struct.q15('@WirespecScenarioDsl');
+    $this$struct.v13(Visibility_PUBLIC_getInstance());
+    $this$struct.s15(Visibility_INTERNAL_getInstance());
+    $this$struct.s14('private val inner = responseCall(' + $shape.e34_1 + ', ' + $variantType + '::class)');
     var tmp;
     if (!($bodyType == null)) {
-      $this$struct.u15('body', genNullableOf(EndpointDslFile_instance, $bodyType), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.t14('null'));
+      $this$struct.e16('body', genNullableOf(EndpointDslFile_instance, $bodyType), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.d15('null'));
       valueSetter($this$struct, 'body', $bodyType);
       tmp = Unit_instance;
     }
     // Inline function 'kotlin.collections.forEach' call
-    var _iterator__ex2g4s = $variant.y33_1.t();
+    var _iterator__ex2g4s = $variant.w34_1.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      $this$struct.u15(element.q33_1, genNullableOf(EndpointDslFile_instance, element.r33_1), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.t14('null'));
-      valueSetter($this$struct, element.q33_1, element.r33_1);
+      $this$struct.e16(element.o34_1, genNullableOf(EndpointDslFile_instance, element.p34_1), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.d15('null'));
+      valueSetter($this$struct, element.o34_1, element.p34_1);
     }
-    $this$struct.w15('build', VOID, VOID, EndpointDslFile$buildResponseScope$lambda$lambda($variantType, $bodyType, $variant));
+    $this$struct.g16('build', VOID, VOID, EndpointDslFile$buildResponseScope$lambda$lambda($variantType, $bodyType, $variant));
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildScopeClass$lambda$lambda($builderClass, $slot) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.m13('block', blockType(EndpointDslFile_instance, $builderClass));
-    $this$function.i14('this.' + $slot.d33_1 + ' = block');
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.w13('block', blockType(EndpointDslFile_instance, $builderClass));
+    $this$function.s14('this.' + $slot.b34_1 + ' = block');
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildScopeClass$lambda$lambda_0($builderName) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.m13('block', blockType(EndpointDslFile_instance, $builderName));
-    $this$function.i14('this.body = block');
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.w13('block', blockType(EndpointDslFile_instance, $builderName));
+    $this$function.s14('this.body = block');
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildScopeClass$lambda$lambda_1($shape, $present, $required) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PRIVATE_getInstance());
+    $this$function.v13(Visibility_PRIVATE_getInstance());
     // Inline function 'kotlin.text.trimEnd' call
     var this_0 = renderFlushBody(EndpointDslFile_instance, $shape, $present, $required);
     var tmp$ret$0 = toString(trimEnd(isCharSequence(this_0) ? this_0 : THROW_CCE()));
-    $this$function.i14(tmp$ret$0);
+    $this$function.s14(tmp$ret$0);
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildScopeClass$lambda$lambda_2($shape) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.j13(arbOf_0(EndpointDslFile_instance, $shape.g33_1 + '.Request'));
-    $this$function.i14('flush()');
-    $this$function.p13($this$function.t14('inner.buildRequestGen()'));
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.t13(arbOf_0(EndpointDslFile_instance, $shape.e34_1 + '.Request'));
+    $this$function.s14('flush()');
+    $this$function.z13($this$function.d15('inner.buildRequestGen()'));
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildScopeClass$lambda($shape, $present, $required) {
   return function ($this$struct) {
-    $this$struct.h15();
-    $this$struct.g15('@WirespecScenarioDsl');
-    $this$struct.l13(Visibility_PUBLIC_getInstance());
-    $this$struct.i15(Visibility_INTERNAL_getInstance());
-    $this$struct.i14('private val inner = endpointCall(' + $shape.g33_1 + '.api, ' + $shape.g33_1 + ')');
+    $this$struct.r15();
+    $this$struct.q15('@WirespecScenarioDsl');
+    $this$struct.v13(Visibility_PUBLIC_getInstance());
+    $this$struct.s15(Visibility_INTERNAL_getInstance());
+    $this$struct.s14('private val inner = endpointCall(' + $shape.e34_1 + '.api, ' + $shape.e34_1 + ')');
     // Inline function 'kotlin.collections.forEach' call
     var _iterator__ex2g4s = $present.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
       var builderClass = slotBuilderName(EndpointDslFile_instance, $shape, element);
-      $this$struct.u15(element.d33_1, new Nullable(blockType(EndpointDslFile_instance, builderClass)), true, Visibility_PRIVATE_getInstance(), VOID, VOID, $this$struct.t14('null'));
-      $this$struct.w15(element.d33_1, VOID, VOID, EndpointDslFile$buildScopeClass$lambda$lambda(builderClass, element));
+      $this$struct.e16(element.b34_1, new Nullable(blockType(EndpointDslFile_instance, builderClass)), true, Visibility_PRIVATE_getInstance(), VOID, VOID, $this$struct.d15('null'));
+      $this$struct.g16(element.b34_1, VOID, VOID, EndpointDslFile$buildScopeClass$lambda$lambda(builderClass, element));
     }
     var tmp;
     // Inline function 'kotlin.collections.isNotEmpty' call
-    if (!$shape.n33_1.r()) {
-      var builderName = RecordBuilder_instance.b33(requireBodyElementType(EndpointDslFile_instance, $shape));
-      $this$struct.u15('body', new Nullable(blockType(EndpointDslFile_instance, builderName)), true, Visibility_PRIVATE_getInstance(), VOID, VOID, $this$struct.t14('null'));
-      $this$struct.w15('body', VOID, VOID, EndpointDslFile$buildScopeClass$lambda$lambda_0(builderName));
+    if (!$shape.l34_1.r()) {
+      var builderName = RecordBuilder_instance.z33(requireBodyElementType(EndpointDslFile_instance, $shape));
+      $this$struct.e16('body', new Nullable(blockType(EndpointDslFile_instance, builderName)), true, Visibility_PRIVATE_getInstance(), VOID, VOID, $this$struct.d15('null'));
+      $this$struct.g16('body', VOID, VOID, EndpointDslFile$buildScopeClass$lambda$lambda_0(builderName));
       var tmp_0;
-      if ($shape.k33_1.equals(BodyKind_List_getInstance())) {
-        $this$struct.u15('bodyCount', Custom_init_$Create$('IntRange'), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.t14('1..3'));
+      if ($shape.i34_1.equals(BodyKind_List_getInstance())) {
+        $this$struct.e16('bodyCount', Custom_init_$Create$('IntRange'), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.d15('1..3'));
         tmp_0 = Unit_instance;
       }
       tmp = tmp_0;
     }
     var tmp_1;
-    if ($shape.k33_1.equals(BodyKind_Primitive_getInstance())) {
+    if ($shape.i34_1.equals(BodyKind_Primitive_getInstance())) {
       var bodyType = requireBodyPrimitiveType(EndpointDslFile_instance, $shape);
-      $this$struct.u15('body', genNullableOf(EndpointDslFile_instance, bodyType), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.t14('null'));
+      $this$struct.e16('body', genNullableOf(EndpointDslFile_instance, bodyType), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.d15('null'));
       valueSetter($this$struct, 'body', bodyType);
       tmp_1 = Unit_instance;
     }
-    $this$struct.u15('flushed', Boolean_instance, true, Visibility_PRIVATE_getInstance(), VOID, VOID, $this$struct.t14('false'));
-    $this$struct.w15('flush', VOID, VOID, EndpointDslFile$buildScopeClass$lambda$lambda_1($shape, $present, $required));
-    $this$struct.w15('buildRequest', VOID, VOID, EndpointDslFile$buildScopeClass$lambda$lambda_2($shape));
+    $this$struct.e16('flushed', Boolean_instance, true, Visibility_PRIVATE_getInstance(), VOID, VOID, $this$struct.d15('false'));
+    $this$struct.g16('flush', VOID, VOID, EndpointDslFile$buildScopeClass$lambda$lambda_1($shape, $present, $required));
+    $this$struct.g16('buildRequest', VOID, VOID, EndpointDslFile$buildScopeClass$lambda$lambda_2($shape));
     return Unit_instance;
   };
 }
 function EndpointDslFile$buildSlotBuilder$lambda($slot) {
   return function ($this$struct) {
-    $this$struct.h15();
-    $this$struct.g15('@WirespecScenarioDsl');
-    $this$struct.l13(Visibility_PUBLIC_getInstance());
+    $this$struct.r15();
+    $this$struct.q15('@WirespecScenarioDsl');
+    $this$struct.v13(Visibility_PUBLIC_getInstance());
     // Inline function 'kotlin.collections.forEach' call
-    var _iterator__ex2g4s = $slot.f33_1.t();
+    var _iterator__ex2g4s = $slot.d34_1.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      $this$struct.u15(element.q33_1, genNullableOf(EndpointDslFile_instance, element.r33_1), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.t14('null'));
-      valueSetter($this$struct, element.q33_1, element.r33_1);
+      $this$struct.e16(element.o34_1, genNullableOf(EndpointDslFile_instance, element.p34_1), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.d15('null'));
+      valueSetter($this$struct, element.o34_1, element.p34_1);
     }
     return Unit_instance;
   };
 }
-function EndpointDslFile$nestedCopyExpr$lambda($elemVar, $nestedVar) {
-  return function (it) {
-    return escapeKotlinIdentifier(it.m()) + ' = ' + copyValueExpr(EndpointDslFile_instance, it, $elemVar, $nestedVar);
-  };
-}
 function EndpointDslFile() {
 }
-protoOf(EndpointDslFile).k34 = function (endpoint, packageName, types, refined) {
-  var shape = Companion_instance_4.l34(endpoint, types, refined);
+protoOf(EndpointDslFile).c35 = function (endpoint, packageName, types, refined) {
+  var shape = Companion_instance_4.d35(endpoint, types, refined);
   var present = presentSlots(this, shape);
   var required = requiredSlots(this, shape);
   var kotestPkg = packageName.bt_1 + '.kotest';
   var endpointPkg = packageName.bt_1 + '.endpoint';
   var modelPkg = packageName.bt_1 + '.model';
-  var fileName = Companion_instance_0.at(kotestPkg).dt() + (shape.g33_1 + 'Dsl');
+  var fileName = Companion_instance_0.at(kotestPkg).dt() + (shape.e34_1 + 'Dsl');
   var tmp = Companion_getInstance().wt(fileName);
   return file(tmp, EndpointDslFile$build$lambda(kotestPkg, shape, endpointPkg, present, modelPkg, required));
 };
@@ -2538,28 +2463,21 @@ function BodyKind_initEntries() {
   BodyKind_List_instance = new BodyKind('List', 2);
   BodyKind_Primitive_instance = new BodyKind('Primitive', 3);
 }
-function Primitive_0(name, type, refinedTypeName, isList, isNullable) {
-  refinedTypeName = refinedTypeName === VOID ? null : refinedTypeName;
-  isList = isList === VOID ? false : isList;
-  isNullable = isNullable === VOID ? false : isNullable;
-  this.f34_1 = name;
-  this.g34_1 = type;
-  this.h34_1 = refinedTypeName;
-  this.i34_1 = isList;
-  this.j34_1 = isNullable;
+function Primitive_0(name, type, refinement) {
+  this.e35_1 = name;
+  this.f35_1 = type;
+  this.g35_1 = refinement;
 }
 protoOf(Primitive_0).m = function () {
-  return this.f34_1;
+  return this.e35_1;
 };
 protoOf(Primitive_0).toString = function () {
-  return 'Primitive(name=' + this.f34_1 + ', type=' + toString(this.g34_1) + ', refinedTypeName=' + this.h34_1 + ', isList=' + this.i34_1 + ', isNullable=' + this.j34_1 + ')';
+  return 'Primitive(name=' + this.e35_1 + ', type=' + toString(this.f35_1) + ', refinement=' + toString_1(this.g35_1) + ')';
 };
 protoOf(Primitive_0).hashCode = function () {
-  var result = getStringHashCode(this.f34_1);
-  result = imul(result, 31) + hashCode(this.g34_1) | 0;
-  result = imul(result, 31) + (this.h34_1 == null ? 0 : getStringHashCode(this.h34_1)) | 0;
-  result = imul(result, 31) + getBooleanHashCode(this.i34_1) | 0;
-  result = imul(result, 31) + getBooleanHashCode(this.j34_1) | 0;
+  var result = getStringHashCode(this.e35_1);
+  result = imul(result, 31) + hashCode(this.f35_1) | 0;
+  result = imul(result, 31) + (this.g35_1 == null ? 0 : hashCode(this.g35_1)) | 0;
   return result;
 };
 protoOf(Primitive_0).equals = function (other) {
@@ -2567,75 +2485,37 @@ protoOf(Primitive_0).equals = function (other) {
     return true;
   if (!(other instanceof Primitive_0))
     return false;
-  if (!(this.f34_1 === other.f34_1))
-    return false;
-  if (!equals(this.g34_1, other.g34_1))
-    return false;
-  if (!(this.h34_1 == other.h34_1))
-    return false;
-  if (!(this.i34_1 === other.i34_1))
-    return false;
-  if (!(this.j34_1 === other.j34_1))
-    return false;
-  return true;
-};
-function NestedObject(name, typeName, fields) {
-  this.c34_1 = name;
-  this.d34_1 = typeName;
-  this.e34_1 = fields;
-}
-protoOf(NestedObject).m = function () {
-  return this.c34_1;
-};
-protoOf(NestedObject).toString = function () {
-  return 'NestedObject(name=' + this.c34_1 + ', typeName=' + this.d34_1 + ', fields=' + toString(this.e34_1) + ')';
-};
-protoOf(NestedObject).hashCode = function () {
-  var result = getStringHashCode(this.c34_1);
-  result = imul(result, 31) + getStringHashCode(this.d34_1) | 0;
-  result = imul(result, 31) + hashCode(this.e34_1) | 0;
-  return result;
-};
-protoOf(NestedObject).equals = function (other) {
-  if (this === other)
-    return true;
-  if (!(other instanceof NestedObject))
-    return false;
-  if (!(this.c34_1 === other.c34_1))
+  if (!(this.e35_1 === other.e35_1))
     return false;
-  if (!(this.d34_1 === other.d34_1))
+  if (!equals(this.f35_1, other.f35_1))
     return false;
-  if (!equals(this.e34_1, other.e34_1))
+  if (!equals(this.g35_1, other.g35_1))
     return false;
   return true;
 };
-function NestedList(name, elementTypeName, fields) {
-  this.z33_1 = name;
-  this.a34_1 = elementTypeName;
-  this.b34_1 = fields;
+function Nested(name, record) {
+  this.h35_1 = name;
+  this.i35_1 = record;
 }
-protoOf(NestedList).m = function () {
-  return this.z33_1;
+protoOf(Nested).m = function () {
+  return this.h35_1;
 };
-protoOf(NestedList).toString = function () {
-  return 'NestedList(name=' + this.z33_1 + ', elementTypeName=' + this.a34_1 + ', fields=' + toString(this.b34_1) + ')';
+protoOf(Nested).toString = function () {
+  return 'Nested(name=' + this.h35_1 + ', record=' + this.i35_1.toString() + ')';
 };
-protoOf(NestedList).hashCode = function () {
-  var result = getStringHashCode(this.z33_1);
-  result = imul(result, 31) + getStringHashCode(this.a34_1) | 0;
-  result = imul(result, 31) + hashCode(this.b34_1) | 0;
+protoOf(Nested).hashCode = function () {
+  var result = getStringHashCode(this.h35_1);
+  result = imul(result, 31) + this.i35_1.hashCode() | 0;
   return result;
 };
-protoOf(NestedList).equals = function (other) {
+protoOf(Nested).equals = function (other) {
   if (this === other)
     return true;
-  if (!(other instanceof NestedList))
-    return false;
-  if (!(this.z33_1 === other.z33_1))
+  if (!(other instanceof Nested))
     return false;
-  if (!(this.a34_1 === other.a34_1))
+  if (!(this.h35_1 === other.h35_1))
     return false;
-  if (!equals(this.b34_1, other.b34_1))
+  if (!this.i35_1.equals(other.i35_1))
     return false;
   return true;
 };
@@ -2651,7 +2531,7 @@ function classifyBody($this, reference) {
     tmp = to(BodyKind_None_getInstance(), null);
   } else {
     if (reference instanceof Custom) {
-      tmp = to(BodyKind_Object_getInstance(), reference.n19_1);
+      tmp = to(BodyKind_Object_getInstance(), reference.x19_1);
     } else {
       if (reference instanceof Iterable) {
         var tmp_1 = reference.yp_1;
@@ -2661,7 +2541,7 @@ function classifyBody($this, reference) {
           tmp_2 = null;
         } else {
           // Inline function 'kotlin.let' call
-          tmp_2 = to(BodyKind_List_getInstance(), tmp1_safe_receiver.n19_1);
+          tmp_2 = to(BodyKind_List_getInstance(), tmp1_safe_receiver.x19_1);
         }
         var tmp2_elvis_lhs = tmp_2;
         tmp = tmp2_elvis_lhs == null ? to(BodyKind_None_getInstance(), null) : tmp2_elvis_lhs;
@@ -2676,156 +2556,12 @@ function classifyBody($this, reference) {
   }
   return tmp;
 }
-function collectCustomNames($this, reference) {
-  var tmp;
-  if (reference instanceof Custom) {
-    tmp = listOf(reference.n19_1);
-  } else {
-    if (reference instanceof Iterable) {
-      tmp = collectCustomNames($this, reference.yp_1);
-    } else {
-      if (reference instanceof Dict) {
-        tmp = collectCustomNames($this, reference.bq_1);
-      } else {
-        tmp = emptyList();
-      }
-    }
-  }
-  return tmp;
-}
-function _get_nestedTypeName__7gbrsh($this, $receiver) {
-  var tmp;
-  if ($receiver instanceof NestedObject) {
-    tmp = $receiver.d34_1;
-  } else {
-    if ($receiver instanceof NestedList) {
-      tmp = $receiver.a34_1;
-    } else {
-      if ($receiver instanceof Primitive_0) {
-        tmp = null;
-      } else {
-        noWhenBranchMatchedException();
-      }
-    }
-  }
-  return tmp;
-}
-function _get_childFields__pje2ws($this, $receiver) {
-  var tmp;
-  if ($receiver instanceof NestedObject) {
-    tmp = $receiver.e34_1;
-  } else {
-    if ($receiver instanceof NestedList) {
-      tmp = $receiver.b34_1;
-    } else {
-      if ($receiver instanceof Primitive_0) {
-        tmp = emptyList();
-      } else {
-        noWhenBranchMatchedException();
-      }
-    }
-  }
-  return tmp;
-}
-function collectNestedTypeNames($this, fields) {
-  // Inline function 'kotlin.collections.flatMap' call
-  // Inline function 'kotlin.collections.flatMapTo' call
-  var destination = ArrayList_init_$Create$();
-  var _iterator__ex2g4s = fields.t();
-  while (_iterator__ex2g4s.u()) {
-    var element = _iterator__ex2g4s.v();
-    var list = plus(listOfNotNull(_get_nestedTypeName__7gbrsh(Companion_instance_4, element)), collectNestedTypeNames(Companion_instance_4, _get_childFields__pje2ws(Companion_instance_4, element)));
-    addAll(destination, list);
-  }
-  return destination;
-}
-function collectFieldTypeNames($this, fields, types) {
-  // Inline function 'kotlin.collections.flatMap' call
-  // Inline function 'kotlin.collections.flatMapTo' call
-  var destination = ArrayList_init_$Create$();
-  var _iterator__ex2g4s = fields.t();
-  while (_iterator__ex2g4s.u()) {
-    var element = _iterator__ex2g4s.v();
-    var tmp0_safe_receiver = _get_nestedTypeName__7gbrsh(Companion_instance_4, element);
-    var tmp;
-    if (tmp0_safe_receiver == null) {
-      tmp = null;
-    } else {
-      // Inline function 'kotlin.let' call
-      var tmp0_safe_receiver_0 = types.s2(tmp0_safe_receiver);
-      var tmp1_safe_receiver = tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.lp_1;
-      var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : get_fields(tmp1_safe_receiver);
-      var tmp_0;
-      if (tmp2_safe_receiver == null) {
-        tmp_0 = null;
-      } else {
-        // Inline function 'kotlin.collections.flatMap' call
-        // Inline function 'kotlin.collections.flatMapTo' call
-        var destination_0 = ArrayList_init_$Create$();
-        var _iterator__ex2g4s_0 = tmp2_safe_receiver.t();
-        while (_iterator__ex2g4s_0.u()) {
-          var element_0 = _iterator__ex2g4s_0.v();
-          var list = collectCustomNames(Companion_instance_4, element_0.pp_1);
-          addAll(destination_0, list);
-        }
-        tmp_0 = destination_0;
-      }
-      tmp = tmp_0;
-    }
-    var tmp1_elvis_lhs = tmp;
-    var nestedFieldRefs = tmp1_elvis_lhs == null ? emptyList() : tmp1_elvis_lhs;
-    var list_0 = plus(nestedFieldRefs, collectFieldTypeNames(Companion_instance_4, _get_childFields__pje2ws(Companion_instance_4, element), types));
-    addAll(destination, list_0);
-  }
-  return destination;
-}
-function primitiveOf($this, name, ref, refined) {
-  var tmp;
-  var tmp_0;
-  if (ref instanceof Custom) {
-    // Inline function 'kotlin.collections.contains' call
-    // Inline function 'kotlin.collections.containsKey' call
-    var key = ref.n19_1;
-    tmp_0 = (isInterface(refined, KtMap) ? refined : THROW_CCE()).q2(key);
-  } else {
-    tmp_0 = false;
-  }
-  if (tmp_0) {
-    tmp = to(ref.n19_1, false);
-  } else {
-    if (ref instanceof Iterable) {
-      var inner = ref.yp_1;
-      var tmp_1;
-      var tmp_2;
-      if (inner instanceof Custom) {
-        // Inline function 'kotlin.collections.contains' call
-        // Inline function 'kotlin.collections.containsKey' call
-        var key_0 = inner.n19_1;
-        tmp_2 = (isInterface(refined, KtMap) ? refined : THROW_CCE()).q2(key_0);
-      } else {
-        tmp_2 = false;
-      }
-      if (tmp_2) {
-        tmp_1 = to(inner.n19_1, true);
-      } else {
-        tmp_1 = to(null, false);
-      }
-      tmp = tmp_1;
-    } else {
-      tmp = to(null, false);
-    }
-  }
-  var _destruct__k2r9zo = tmp;
-  var refinedTypeName = _destruct__k2r9zo.ze();
-  var isList = _destruct__k2r9zo.af();
-  return new Primitive_0(name, mapWithRefinedUnwrap($this, ref, refined), refinedTypeName, isList, ref.ot());
-}
 function mapWithRefinedUnwrap($this, reference, refined) {
   var tmp;
   if (reference instanceof Custom) {
-    var tmp1_safe_receiver = refined.s2(reference.n19_1);
+    var tmp1_safe_receiver = refined.s2(reference.x19_1);
     var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.ms_1;
-    var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.v1e(VOID, reference.o19_1);
+    var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.u1f(VOID, reference.y19_1);
     var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : convert(tmp3_safe_receiver);
     tmp = tmp4_elvis_lhs == null ? convert(reference) : tmp4_elvis_lhs;
   } else {
@@ -2847,17 +2583,17 @@ function mapWithRefinedUnwrap($this, reference, refined) {
 }
 function NamedTypedField(name, type, isNullable) {
   isNullable = isNullable === VOID ? false : isNullable;
-  this.q33_1 = name;
-  this.r33_1 = type;
-  this.s33_1 = isNullable;
+  this.o34_1 = name;
+  this.p34_1 = type;
+  this.q34_1 = isNullable;
 }
 protoOf(NamedTypedField).toString = function () {
-  return 'NamedTypedField(name=' + this.q33_1 + ', type=' + toString(this.r33_1) + ', isNullable=' + this.s33_1 + ')';
+  return 'NamedTypedField(name=' + this.o34_1 + ', type=' + toString(this.p34_1) + ', isNullable=' + this.q34_1 + ')';
 };
 protoOf(NamedTypedField).hashCode = function () {
-  var result = getStringHashCode(this.q33_1);
-  result = imul(result, 31) + hashCode(this.r33_1) | 0;
-  result = imul(result, 31) + getBooleanHashCode(this.s33_1) | 0;
+  var result = getStringHashCode(this.o34_1);
+  result = imul(result, 31) + hashCode(this.p34_1) | 0;
+  result = imul(result, 31) + getBooleanHashCode(this.q34_1) | 0;
   return result;
 };
 protoOf(NamedTypedField).equals = function (other) {
@@ -2865,32 +2601,32 @@ protoOf(NamedTypedField).equals = function (other) {
     return true;
   if (!(other instanceof NamedTypedField))
     return false;
-  if (!(this.q33_1 === other.q33_1))
+  if (!(this.o34_1 === other.o34_1))
     return false;
-  if (!equals(this.r33_1, other.r33_1))
+  if (!equals(this.p34_1, other.p34_1))
     return false;
-  if (!(this.s33_1 === other.s33_1))
+  if (!(this.q34_1 === other.q34_1))
     return false;
   return true;
 };
 function ResponseVariantShape(status, className, bodyKind, bodyType, bodyElementType, headerFields) {
-  this.t33_1 = status;
-  this.u33_1 = className;
-  this.v33_1 = bodyKind;
-  this.w33_1 = bodyType;
-  this.x33_1 = bodyElementType;
-  this.y33_1 = headerFields;
+  this.r34_1 = status;
+  this.s34_1 = className;
+  this.t34_1 = bodyKind;
+  this.u34_1 = bodyType;
+  this.v34_1 = bodyElementType;
+  this.w34_1 = headerFields;
 }
 protoOf(ResponseVariantShape).toString = function () {
-  return 'ResponseVariantShape(status=' + this.t33_1 + ', className=' + this.u33_1 + ', bodyKind=' + this.v33_1.toString() + ', bodyType=' + toString_1(this.w33_1) + ', bodyElementType=' + this.x33_1 + ', headerFields=' + toString(this.y33_1) + ')';
+  return 'ResponseVariantShape(status=' + this.r34_1 + ', className=' + this.s34_1 + ', bodyKind=' + this.t34_1.toString() + ', bodyType=' + toString_1(this.u34_1) + ', bodyElementType=' + this.v34_1 + ', headerFields=' + toString(this.w34_1) + ')';
 };
 protoOf(ResponseVariantShape).hashCode = function () {
-  var result = getStringHashCode(this.t33_1);
-  result = imul(result, 31) + getStringHashCode(this.u33_1) | 0;
-  result = imul(result, 31) + this.v33_1.hashCode() | 0;
-  result = imul(result, 31) + (this.w33_1 == null ? 0 : hashCode(this.w33_1)) | 0;
-  result = imul(result, 31) + (this.x33_1 == null ? 0 : getStringHashCode(this.x33_1)) | 0;
-  result = imul(result, 31) + hashCode(this.y33_1) | 0;
+  var result = getStringHashCode(this.r34_1);
+  result = imul(result, 31) + getStringHashCode(this.s34_1) | 0;
+  result = imul(result, 31) + this.t34_1.hashCode() | 0;
+  result = imul(result, 31) + (this.u34_1 == null ? 0 : hashCode(this.u34_1)) | 0;
+  result = imul(result, 31) + (this.v34_1 == null ? 0 : getStringHashCode(this.v34_1)) | 0;
+  result = imul(result, 31) + hashCode(this.w34_1) | 0;
   return result;
 };
 protoOf(ResponseVariantShape).equals = function (other) {
@@ -2898,17 +2634,17 @@ protoOf(ResponseVariantShape).equals = function (other) {
     return true;
   if (!(other instanceof ResponseVariantShape))
     return false;
-  if (!(this.t33_1 === other.t33_1))
+  if (!(this.r34_1 === other.r34_1))
     return false;
-  if (!(this.u33_1 === other.u33_1))
+  if (!(this.s34_1 === other.s34_1))
     return false;
-  if (!this.v33_1.equals(other.v33_1))
+  if (!this.t34_1.equals(other.t34_1))
     return false;
-  if (!equals(this.w33_1, other.w33_1))
+  if (!equals(this.u34_1, other.u34_1))
     return false;
-  if (!(this.x33_1 == other.x33_1))
+  if (!(this.v34_1 == other.v34_1))
     return false;
-  if (!equals(this.y33_1, other.y33_1))
+  if (!equals(this.w34_1, other.w34_1))
     return false;
   return true;
 };
@@ -2917,7 +2653,7 @@ function BodyKind(name, ordinal) {
 }
 function Companion_2() {
 }
-protoOf(Companion_2).l34 = function (endpoint, types, refined) {
+protoOf(Companion_2).d35 = function (endpoint, types, refined) {
   // Inline function 'kotlin.collections.filterIsInstance' call
   var tmp0 = endpoint.hr_1;
   // Inline function 'kotlin.collections.filterIsInstanceTo' call
@@ -2989,7 +2725,7 @@ protoOf(Companion_2).l34 = function (endpoint, types, refined) {
     // Inline function 'kotlin.let' call
     var tmp_2;
     if (tmp4_safe_receiver instanceof Nullable) {
-      tmp_2 = tmp4_safe_receiver.uu_1;
+      tmp_2 = tmp4_safe_receiver.ru_1;
     } else {
       tmp_2 = tmp4_safe_receiver;
     }
@@ -3001,7 +2737,7 @@ protoOf(Companion_2).l34 = function (endpoint, types, refined) {
     tmp_3 = null;
   } else {
     // Inline function 'kotlin.let' call
-    tmp_3 = Companion_instance_4.u32(bodyElementType, types, refined, emptySet());
+    tmp_3 = Companion_instance_4.t33(bodyElementType, types, refined);
   }
   var tmp6_elvis_lhs = tmp_3;
   var bodyFieldShapes = tmp6_elvis_lhs == null ? emptyList() : tmp6_elvis_lhs;
@@ -3092,7 +2828,7 @@ protoOf(Companion_2).l34 = function (endpoint, types, refined) {
   var _iterator__ex2g4s_5 = destination_3.t();
   while (_iterator__ex2g4s_5.u()) {
     var e = _iterator__ex2g4s_5.v();
-    var key = e.t33_1;
+    var key = e.r34_1;
     if (set.x(key)) {
       list.x(e);
     }
@@ -3154,106 +2890,61 @@ protoOf(Companion_2).l34 = function (endpoint, types, refined) {
     }
   }
   var refs = this_4.q5();
-  var tmp_9;
-  if (bodyElementType == null) {
-    tmp_9 = null;
-  } else {
-    // Inline function 'kotlin.let' call
-    tmp_9 = types.s2(bodyElementType);
-  }
-  var tmp8_safe_receiver = tmp_9;
-  var tmp9_safe_receiver = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.lp_1;
-  var tmp10_safe_receiver = tmp9_safe_receiver == null ? null : get_fields(tmp9_safe_receiver);
-  var tmp_10;
-  if (tmp10_safe_receiver == null) {
-    tmp_10 = null;
-  } else {
-    // Inline function 'kotlin.collections.map' call
-    // Inline function 'kotlin.collections.mapTo' call
-    var destination_6 = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp10_safe_receiver, 10));
-    var _iterator__ex2g4s_12 = tmp10_safe_receiver.t();
-    while (_iterator__ex2g4s_12.u()) {
-      var item_3 = _iterator__ex2g4s_12.v();
-      var tmp$ret$57 = item_3.pp_1;
-      destination_6.x(tmp$ret$57);
-    }
-    tmp_10 = destination_6;
-  }
-  var tmp11_elvis_lhs = tmp_10;
-  var bodyFieldRefs = tmp11_elvis_lhs == null ? emptyList() : tmp11_elvis_lhs;
-  var modelImports = this.v32(plus(refs, bodyFieldRefs), bodyFieldShapes, types);
+  var modelImports = this.u33(refs);
   return new EndpointShape(Companion_getInstance().wt(endpoint.fr_1.o1()).zt(), pathFields, queryFields, headerFields, bodyKind, bodyElementType, bodyPrimitiveType, bodyFieldShapes, responseVariants, modelImports);
 };
-protoOf(Companion_2).v32 = function (refs, fieldShapes, types) {
+protoOf(Companion_2).u33 = function (refs) {
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = refs.t();
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
-    var list = collectCustomNames(this, element);
+    var list = this.j35(element);
     addAll(destination, list);
   }
-  return distinct(plus(plus(destination, collectNestedTypeNames(this, fieldShapes)), collectFieldTypeNames(this, fieldShapes, types)));
+  return distinct(destination);
 };
-protoOf(Companion_2).u32 = function (typeName, types, refined, visited) {
-  if (visited.i1(typeName))
-    return emptyList();
-  var tmp0_elvis_lhs = types.s2(typeName);
+protoOf(Companion_2).j35 = function (reference) {
   var tmp;
-  if (tmp0_elvis_lhs == null) {
-    return emptyList();
+  if (reference instanceof Custom) {
+    tmp = listOf(reference.x19_1);
   } else {
-    tmp = tmp0_elvis_lhs;
-  }
-  var type = tmp;
-  var nextVisited = plus_1(visited, typeName);
-  // Inline function 'kotlin.collections.map' call
-  var this_0 = get_fields(type.lp_1);
+    if (reference instanceof Iterable) {
+      tmp = this.j35(reference.yp_1);
+    } else {
+      if (reference instanceof Dict) {
+        tmp = this.j35(reference.bq_1);
+      } else {
+        tmp = emptyList();
+      }
+    }
+  }
+  return tmp;
+};
+protoOf(Companion_2).t33 = function (typeName, types, refined) {
+  var tmp0_safe_receiver = types.s2(typeName);
+  var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.lp_1;
+  // Inline function 'kotlin.collections.orEmpty' call
+  var tmp0_elvis_lhs = tmp1_safe_receiver == null ? null : get_fields(tmp1_safe_receiver);
+  // Inline function 'kotlin.collections.map' call
+  var this_0 = tmp0_elvis_lhs == null ? emptyList() : tmp0_elvis_lhs;
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var name = item.op_1.o1();
-    var ref = item.pp_1;
-    var tmp_0;
-    if (ref instanceof Custom) {
-      var tmp_1;
-      // Inline function 'kotlin.collections.contains' call
-      // Inline function 'kotlin.collections.containsKey' call
-      var key = ref.n19_1;
-      if ((isInterface(types, KtMap) ? types : THROW_CCE()).q2(key)) {
-        tmp_1 = new NestedObject(name, ref.n19_1, Companion_instance_4.u32(ref.n19_1, types, refined, nextVisited));
-      } else {
-        tmp_1 = primitiveOf(Companion_instance_4, name, ref, refined);
-      }
-      tmp_0 = tmp_1;
+    var tmp0_safe_receiver_0 = Companion_instance_5.k35(item.pp_1, types);
+    var tmp;
+    if (tmp0_safe_receiver_0 == null) {
+      tmp = null;
     } else {
-      if (ref instanceof Iterable) {
-        var inner = ref.yp_1;
-        var tmp_2;
-        var tmp_3;
-        if (inner instanceof Custom) {
-          // Inline function 'kotlin.collections.contains' call
-          // Inline function 'kotlin.collections.containsKey' call
-          var key_0 = inner.n19_1;
-          tmp_3 = (isInterface(types, KtMap) ? types : THROW_CCE()).q2(key_0);
-        } else {
-          tmp_3 = false;
-        }
-        if (tmp_3) {
-          tmp_2 = new NestedList(name, inner.n19_1, Companion_instance_4.u32(inner.n19_1, types, refined, nextVisited));
-        } else {
-          tmp_2 = primitiveOf(Companion_instance_4, name, ref, refined);
-        }
-        tmp_0 = tmp_2;
-      } else {
-        tmp_0 = primitiveOf(Companion_instance_4, name, ref, refined);
-      }
+      // Inline function 'kotlin.let' call
+      tmp = new Nested(item.op_1.o1(), tmp0_safe_receiver_0);
     }
-    var tmp$ret$2 = tmp_0;
-    destination.x(tmp$ret$2);
+    var tmp1_elvis_lhs = tmp;
+    var tmp$ret$3 = tmp1_elvis_lhs == null ? new Primitive_0(item.op_1.o1(), mapWithRefinedUnwrap(Companion_instance_4, item.pp_1, refined), Companion_instance_6.l35(item.pp_1, refined)) : tmp1_elvis_lhs;
+    destination.x(tmp$ret$3);
   }
   return destination;
 };
@@ -3278,31 +2969,31 @@ function BodyKind_Primitive_getInstance() {
   return BodyKind_Primitive_instance;
 }
 function EndpointShape(name, pathFields, queryFields, headerFields, bodyKind, bodyElementType, bodyPrimitiveType, bodyFieldShapes, responseVariants, modelImports) {
-  this.g33_1 = name;
-  this.h33_1 = pathFields;
-  this.i33_1 = queryFields;
-  this.j33_1 = headerFields;
-  this.k33_1 = bodyKind;
-  this.l33_1 = bodyElementType;
-  this.m33_1 = bodyPrimitiveType;
-  this.n33_1 = bodyFieldShapes;
-  this.o33_1 = responseVariants;
-  this.p33_1 = modelImports;
+  this.e34_1 = name;
+  this.f34_1 = pathFields;
+  this.g34_1 = queryFields;
+  this.h34_1 = headerFields;
+  this.i34_1 = bodyKind;
+  this.j34_1 = bodyElementType;
+  this.k34_1 = bodyPrimitiveType;
+  this.l34_1 = bodyFieldShapes;
+  this.m34_1 = responseVariants;
+  this.n34_1 = modelImports;
 }
 protoOf(EndpointShape).toString = function () {
-  return 'EndpointShape(name=' + this.g33_1 + ', pathFields=' + toString(this.h33_1) + ', queryFields=' + toString(this.i33_1) + ', headerFields=' + toString(this.j33_1) + ', bodyKind=' + this.k33_1.toString() + ', bodyElementType=' + this.l33_1 + ', bodyPrimitiveType=' + toString_1(this.m33_1) + ', bodyFieldShapes=' + toString(this.n33_1) + ', responseVariants=' + toString(this.o33_1) + ', modelImports=' + toString(this.p33_1) + ')';
+  return 'EndpointShape(name=' + this.e34_1 + ', pathFields=' + toString(this.f34_1) + ', queryFields=' + toString(this.g34_1) + ', headerFields=' + toString(this.h34_1) + ', bodyKind=' + this.i34_1.toString() + ', bodyElementType=' + this.j34_1 + ', bodyPrimitiveType=' + toString_1(this.k34_1) + ', bodyFieldShapes=' + toString(this.l34_1) + ', responseVariants=' + toString(this.m34_1) + ', modelImports=' + toString(this.n34_1) + ')';
 };
 protoOf(EndpointShape).hashCode = function () {
-  var result = getStringHashCode(this.g33_1);
-  result = imul(result, 31) + hashCode(this.h33_1) | 0;
-  result = imul(result, 31) + hashCode(this.i33_1) | 0;
-  result = imul(result, 31) + hashCode(this.j33_1) | 0;
-  result = imul(result, 31) + this.k33_1.hashCode() | 0;
-  result = imul(result, 31) + (this.l33_1 == null ? 0 : getStringHashCode(this.l33_1)) | 0;
-  result = imul(result, 31) + (this.m33_1 == null ? 0 : hashCode(this.m33_1)) | 0;
-  result = imul(result, 31) + hashCode(this.n33_1) | 0;
-  result = imul(result, 31) + hashCode(this.o33_1) | 0;
-  result = imul(result, 31) + hashCode(this.p33_1) | 0;
+  var result = getStringHashCode(this.e34_1);
+  result = imul(result, 31) + hashCode(this.f34_1) | 0;
+  result = imul(result, 31) + hashCode(this.g34_1) | 0;
+  result = imul(result, 31) + hashCode(this.h34_1) | 0;
+  result = imul(result, 31) + this.i34_1.hashCode() | 0;
+  result = imul(result, 31) + (this.j34_1 == null ? 0 : getStringHashCode(this.j34_1)) | 0;
+  result = imul(result, 31) + (this.k34_1 == null ? 0 : hashCode(this.k34_1)) | 0;
+  result = imul(result, 31) + hashCode(this.l34_1) | 0;
+  result = imul(result, 31) + hashCode(this.m34_1) | 0;
+  result = imul(result, 31) + hashCode(this.n34_1) | 0;
   return result;
 };
 protoOf(EndpointShape).equals = function (other) {
@@ -3310,25 +3001,25 @@ protoOf(EndpointShape).equals = function (other) {
     return true;
   if (!(other instanceof EndpointShape))
     return false;
-  if (!(this.g33_1 === other.g33_1))
+  if (!(this.e34_1 === other.e34_1))
     return false;
-  if (!equals(this.h33_1, other.h33_1))
+  if (!equals(this.f34_1, other.f34_1))
     return false;
-  if (!equals(this.i33_1, other.i33_1))
+  if (!equals(this.g34_1, other.g34_1))
     return false;
-  if (!equals(this.j33_1, other.j33_1))
+  if (!equals(this.h34_1, other.h34_1))
     return false;
-  if (!this.k33_1.equals(other.k33_1))
+  if (!this.i34_1.equals(other.i34_1))
     return false;
-  if (!(this.l33_1 == other.l33_1))
+  if (!(this.j34_1 == other.j34_1))
     return false;
-  if (!equals(this.m33_1, other.m33_1))
+  if (!equals(this.k34_1, other.k34_1))
     return false;
-  if (!equals(this.n33_1, other.n33_1))
+  if (!equals(this.l34_1, other.l34_1))
     return false;
-  if (!equals(this.o33_1, other.o33_1))
+  if (!equals(this.m34_1, other.m34_1))
     return false;
-  if (!equals(this.p33_1, other.p33_1))
+  if (!equals(this.n34_1, other.n34_1))
     return false;
   return true;
 };
@@ -3338,174 +3029,958 @@ function genNullable($this, element) {
 function blockType_0($this, nested) {
   return new Function_0(emptyList(), Unit_instance_0, Custom_init_$Create$(nested));
 }
-function nestedBlock($this, $receiver, fieldName, nestedTypeName, genType, valueType) {
-  var nested = $this.b33(nestedTypeName);
-  $receiver.u15(fieldName, genType, true, Visibility_PUBLIC_getInstance(), VOID, VOID, $receiver.t14('null'));
-  valueSetter($receiver, fieldName, valueType);
-  $receiver.u15('_' + fieldName + 'Block', new Nullable(blockType_0($this, nested)), true, Visibility_INTERNAL_getInstance(), VOID, listOf('@PublishedApi'), $receiver.t14('null'));
+function blockField($this, fieldName) {
+  return escapeKotlinIdentifier('_' + fieldName + 'Block');
+}
+function nestedBlock($this, $receiver, fieldName, record) {
+  var nested = $this.z33(record.x34_1);
+  $receiver.e16(fieldName, genNullable($this, record.m35()), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $receiver.d15('null'));
+  valueSetter($receiver, fieldName, record.m35());
+  $receiver.e16('_' + fieldName + 'Block', new Nullable(blockType_0($this, nested)), true, Visibility_PRIVATE_getInstance(), VOID, VOID, $receiver.d15('null'));
   var tmp = fieldName + 'Block';
-  $receiver.w15(tmp, VOID, VOID, RecordBuilder$nestedBlock$lambda(nested, fieldName));
+  $receiver.g16(tmp, VOID, VOID, RecordBuilder$nestedBlock$lambda(nested, fieldName));
 }
-function appendNestedBlock($this, $receiver, fieldName, nestedTypeName, fields, receiver, path, indent, listSegment) {
-  var blockRef = receiver + '.' + escapeKotlinIdentifier('_' + fieldName + 'Block');
-  var nestedVar = escapeKotlinIdentifier('nested_' + fieldName);
-  var nextPath = listSegment ? plus_0(plus_0(path, fieldName), '*') : plus_0(path, fieldName);
-  // Inline function 'kotlin.text.appendLine' call
-  var value = indent + blockRef + '?.let { block ->';
-  // Inline function 'kotlin.text.appendLine' call
-  $receiver.q(value).s(_Char___init__impl__6a9atx(10));
-  // Inline function 'kotlin.text.appendLine' call
-  var value_0 = indent + '    val ' + nestedVar + ' = ' + $this.b33(nestedTypeName) + '().apply(block)';
-  // Inline function 'kotlin.text.appendLine' call
-  $receiver.q(value_0).s(_Char___init__impl__6a9atx(10));
-  $receiver.q($this.a33(fields, nestedVar, nextPath, indent + '    '));
-  // Inline function 'kotlin.text.appendLine' call
-  var value_1 = indent + '}';
-  // Inline function 'kotlin.text.appendLine' call
-  $receiver.q(value_1).s(_Char___init__impl__6a9atx(10));
+function copyExpr($this, fields) {
+  return joinToString(fields, ',\n', 'base.copy(\n', ',\n)', VOID, VOID, RecordBuilder$copyExpr$lambda);
+}
+function RecordBuilder$buildBuilderClass$lambda$lambda($model, $fields) {
+  return function ($this$function) {
+    $this$function.v13(Visibility_INTERNAL_getInstance());
+    $this$function.w13('base', $model);
+    $this$function.w13('rs', Custom_init_$Create$('RandomSource'));
+    $this$function.t13($model);
+    // Inline function 'kotlin.takeIf' call
+    var this_0 = $fields;
+    var tmp;
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    if (!this_0.r()) {
+      tmp = this_0;
+    } else {
+      tmp = null;
+    }
+    var tmp0_safe_receiver = tmp;
+    var tmp_0;
+    if (tmp0_safe_receiver == null) {
+      tmp_0 = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      tmp_0 = copyExpr(RecordBuilder_instance, tmp0_safe_receiver);
+    }
+    var tmp1_elvis_lhs = tmp_0;
+    $this$function.z13($this$function.d15(tmp1_elvis_lhs == null ? 'base' : tmp1_elvis_lhs));
+    return Unit_instance;
+  };
 }
-function RecordBuilder$buildBuilderClass$lambda($fields) {
+function RecordBuilder$buildBuilderClass$lambda($fields, $typeName) {
   return function ($this$struct) {
-    $this$struct.h15();
-    $this$struct.g15('@WirespecScenarioDsl');
-    $this$struct.l13(Visibility_PUBLIC_getInstance());
+    $this$struct.r15();
+    $this$struct.q15('@WirespecScenarioDsl');
+    $this$struct.v13(Visibility_PUBLIC_getInstance());
     // Inline function 'kotlin.collections.forEach' call
     var _iterator__ex2g4s = $fields.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
       if (element instanceof Primitive_0) {
-        $this$struct.u15(element.f34_1, genNullable(RecordBuilder_instance, element.g34_1), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.t14('null'));
-        valueSetter($this$struct, element.f34_1, element.g34_1);
+        $this$struct.e16(element.e35_1, genNullable(RecordBuilder_instance, element.f35_1), true, Visibility_PUBLIC_getInstance(), VOID, VOID, $this$struct.d15('null'));
+        valueSetter($this$struct, element.e35_1, element.f35_1);
       } else {
-        if (element instanceof NestedObject) {
-          nestedBlock(RecordBuilder_instance, $this$struct, element.c34_1, element.d34_1, genNullable(RecordBuilder_instance, Custom_init_$Create$(element.d34_1)), Custom_init_$Create$(element.d34_1));
+        if (element instanceof Nested) {
+          nestedBlock(RecordBuilder_instance, $this$struct, element.h35_1, element.i35_1);
         } else {
-          if (element instanceof NestedList) {
-            nestedBlock(RecordBuilder_instance, $this$struct, element.z33_1, element.a34_1, genNullable(RecordBuilder_instance, new Array_0(Custom_init_$Create$(element.a34_1))), new Array_0(Custom_init_$Create$(element.a34_1)));
-          } else {
-            noWhenBranchMatchedException();
-          }
+          noWhenBranchMatchedException();
         }
       }
     }
+    var model = Custom_init_$Create$(Companion_getInstance().wt($typeName).zt());
+    $this$struct.g16('applyTo', VOID, VOID, RecordBuilder$buildBuilderClass$lambda$lambda(model, $fields));
     return Unit_instance;
   };
 }
 function RecordBuilder$nestedBlock$lambda($nested, $fieldName) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.m13('block', blockType_0(RecordBuilder_instance, $nested));
-    $this$function.i14(escapeKotlinIdentifier('_' + $fieldName + 'Block') + ' = block');
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.w13('block', blockType_0(RecordBuilder_instance, $nested));
+    $this$function.s14(blockField(RecordBuilder_instance, $fieldName) + ' = block');
     return Unit_instance;
   };
 }
-function RecordBuilder$renderRegistration$lambda(it) {
-  return '"' + it + '"';
+function RecordBuilder$copyExpr$lambda(f) {
+  var name = escapeKotlinIdentifier(f.m());
+  var pinned = 'this.' + name;
+  var base = 'base.' + name;
+  var tmp;
+  if (f instanceof Primitive_0) {
+    var tmp1_safe_receiver = f.g35_1;
+    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.n35('gen.draw(rs)');
+    tmp = pinned + '.let { gen -> if (gen == null) ' + base + ' else ' + (tmp2_elvis_lhs == null ? 'gen.draw(rs)' : tmp2_elvis_lhs) + ' }';
+  } else {
+    if (f instanceof Nested) {
+      var nested = RecordBuilder_instance.z33(f.i35_1.x34_1) + '().apply(block)';
+      var tmp_0;
+      if (f.i35_1.y34_1) {
+        tmp_0 = '?.let { block -> ' + nested + ' }?.let { nested -> ' + f.i35_1.b35(base, 'nested') + ' }';
+      } else {
+        tmp_0 = '?.let { block -> ' + f.i35_1.b35(base, nested) + ' }';
+      }
+      var viaBlock = tmp_0;
+      tmp = pinned + '?.draw(rs) ?: this.' + blockField(RecordBuilder_instance, f.h35_1) + viaBlock + ' ?: ' + base;
+    } else {
+      noWhenBranchMatchedException();
+    }
+  }
+  var value = tmp;
+  return '  ' + name + ' = ' + value;
 }
 function RecordBuilder() {
 }
-protoOf(RecordBuilder).b33 = function (typeName) {
+protoOf(RecordBuilder).z33 = function (typeName) {
   return Companion_getInstance().wt(typeName).zt() + 'Builder';
 };
-protoOf(RecordBuilder).m34 = function (typeName, fields) {
-  var tmp = this.b33(typeName);
-  return struct(tmp, RecordBuilder$buildBuilderClass$lambda(fields));
+protoOf(RecordBuilder).o35 = function (typeName, fields) {
+  var tmp = this.z33(typeName);
+  return struct(tmp, RecordBuilder$buildBuilderClass$lambda(fields, typeName));
 };
-protoOf(RecordBuilder).a33 = function (fields, receiver, path, indent) {
-  // Inline function 'kotlin.text.buildString' call
-  // Inline function 'kotlin.apply' call
-  var this_0 = StringBuilder_init_$Create$();
-  // Inline function 'kotlin.collections.forEach' call
-  var _iterator__ex2g4s = fields.t();
-  while (_iterator__ex2g4s.u()) {
-    var element = _iterator__ex2g4s.v();
-    var fieldRef = receiver + '.' + escapeKotlinIdentifier(element.m());
-    var tmp = plus_0(path, element.m());
-    var segs = joinToString(tmp, ', ', VOID, VOID, VOID, VOID, RecordBuilder$renderRegistration$lambda);
-    // Inline function 'kotlin.text.appendLine' call
-    var value = indent + fieldRef + '?.let { registerPath(' + segs + ') { it } }';
-    // Inline function 'kotlin.text.appendLine' call
-    this_0.q(value).s(_Char___init__impl__6a9atx(10));
-    if (!(element instanceof Primitive_0)) {
-      if (element instanceof NestedObject) {
-        appendNestedBlock(RecordBuilder_instance, this_0, element.c34_1, element.d34_1, element.e34_1, receiver, path, indent, false);
+var RecordBuilder_instance;
+function RecordBuilder_getInstance() {
+  return RecordBuilder_instance;
+}
+function Companion_3() {
+}
+protoOf(Companion_3).k35 = function (reference, types) {
+  var tmp;
+  if (reference instanceof Custom) {
+    // Inline function 'kotlin.takeIf' call
+    var tmp_0;
+    // Inline function 'kotlin.collections.contains' call
+    // Inline function 'kotlin.collections.containsKey' call
+    var key = reference.x19_1;
+    if ((isInterface(types, KtMap) ? types : THROW_CCE()).q2(key)) {
+      tmp_0 = reference;
+    } else {
+      tmp_0 = null;
+    }
+    var tmp1_safe_receiver = tmp_0;
+    var tmp_1;
+    if (tmp1_safe_receiver == null) {
+      tmp_1 = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      tmp_1 = new RecordRef(tmp1_safe_receiver.x19_1, false, tmp1_safe_receiver.y19_1, false);
+    }
+    tmp = tmp_1;
+  } else {
+    if (reference instanceof Iterable) {
+      var tmp_2 = reference.yp_1;
+      var tmp2_safe_receiver = tmp_2 instanceof Custom ? tmp_2 : null;
+      var tmp_3;
+      if (tmp2_safe_receiver == null) {
+        tmp_3 = null;
       } else {
-        if (element instanceof NestedList) {
-          appendNestedBlock(RecordBuilder_instance, this_0, element.z33_1, element.a34_1, element.b34_1, receiver, path, indent, true);
+        // Inline function 'kotlin.takeIf' call
+        var tmp_4;
+        // Inline function 'kotlin.collections.contains' call
+        // Inline function 'kotlin.collections.containsKey' call
+        var key_0 = tmp2_safe_receiver.x19_1;
+        if ((isInterface(types, KtMap) ? types : THROW_CCE()).q2(key_0)) {
+          tmp_4 = tmp2_safe_receiver;
         } else {
-          noWhenBranchMatchedException();
+          tmp_4 = null;
         }
+        tmp_3 = tmp_4;
+      }
+      var tmp3_safe_receiver = tmp_3;
+      var tmp_5;
+      if (tmp3_safe_receiver == null) {
+        tmp_5 = null;
+      } else {
+        // Inline function 'kotlin.let' call
+        tmp_5 = new RecordRef(tmp3_safe_receiver.x19_1, true, reference.zp_1, tmp3_safe_receiver.y19_1);
       }
+      tmp = tmp_5;
+    } else {
+      tmp = null;
     }
   }
-  return this_0.toString();
+  return tmp;
 };
-var RecordBuilder_instance;
-function RecordBuilder_getInstance() {
-  return RecordBuilder_instance;
+var Companion_instance_5;
+function Companion_getInstance_4() {
+  return Companion_instance_5;
+}
+function RecordRef(typeName, isList, isNullable, isElementNullable) {
+  this.x34_1 = typeName;
+  this.y34_1 = isList;
+  this.z34_1 = isNullable;
+  this.a35_1 = isElementNullable;
+}
+protoOf(RecordRef).m35 = function () {
+  // Inline function 'kotlin.let' call
+  var it = Custom_init_$Create$(this.x34_1);
+  return this.y34_1 ? new Array_0(it) : it;
+};
+protoOf(RecordRef).b35 = function (value, builder) {
+  return this.y34_1 ? value + (this.z34_1 ? '?.' : '.') + 'map { e -> ' + ((this.a35_1 ? 'e?.let { ' + builder + '.applyTo(it, rs) }' : builder + '.applyTo(e, rs)') + ' }') : this.z34_1 ? value + '?.let { ' + builder + '.applyTo(it, rs) }' : builder + '.applyTo(' + value + ', rs)';
+};
+protoOf(RecordRef).toString = function () {
+  return 'RecordRef(typeName=' + this.x34_1 + ', isList=' + this.y34_1 + ', isNullable=' + this.z34_1 + ', isElementNullable=' + this.a35_1 + ')';
+};
+protoOf(RecordRef).hashCode = function () {
+  var result = getStringHashCode(this.x34_1);
+  result = imul(result, 31) + getBooleanHashCode(this.y34_1) | 0;
+  result = imul(result, 31) + getBooleanHashCode(this.z34_1) | 0;
+  result = imul(result, 31) + getBooleanHashCode(this.a35_1) | 0;
+  return result;
+};
+protoOf(RecordRef).equals = function (other) {
+  if (this === other)
+    return true;
+  if (!(other instanceof RecordRef))
+    return false;
+  if (!(this.x34_1 === other.x34_1))
+    return false;
+  if (!(this.y34_1 === other.y34_1))
+    return false;
+  if (!(this.z34_1 === other.z34_1))
+    return false;
+  if (!(this.a35_1 === other.a35_1))
+    return false;
+  return true;
+};
+function Wrap(typeName, isNullable) {
+  this.p35_1 = typeName;
+  this.q35_1 = isNullable;
+}
+protoOf(Wrap).ot = function () {
+  return this.q35_1;
+};
+protoOf(Wrap).toString = function () {
+  return 'Wrap(typeName=' + this.p35_1 + ', isNullable=' + this.q35_1 + ')';
+};
+protoOf(Wrap).hashCode = function () {
+  var result = getStringHashCode(this.p35_1);
+  result = imul(result, 31) + getBooleanHashCode(this.q35_1) | 0;
+  return result;
+};
+protoOf(Wrap).equals = function (other) {
+  if (this === other)
+    return true;
+  if (!(other instanceof Wrap))
+    return false;
+  if (!(this.p35_1 === other.p35_1))
+    return false;
+  if (!(this.q35_1 === other.q35_1))
+    return false;
+  return true;
+};
+function Each(element, isNullable) {
+  this.s35_1 = element;
+  this.t35_1 = isNullable;
+}
+protoOf(Each).ot = function () {
+  return this.t35_1;
+};
+protoOf(Each).toString = function () {
+  return 'Each(element=' + toString(this.s35_1) + ', isNullable=' + this.t35_1 + ')';
+};
+protoOf(Each).hashCode = function () {
+  var result = hashCode(this.s35_1);
+  result = imul(result, 31) + getBooleanHashCode(this.t35_1) | 0;
+  return result;
+};
+protoOf(Each).equals = function (other) {
+  if (this === other)
+    return true;
+  if (!(other instanceof Each))
+    return false;
+  if (!equals(this.s35_1, other.s35_1))
+    return false;
+  if (!(this.t35_1 === other.t35_1))
+    return false;
+  return true;
+};
+function Values(value, isNullable) {
+  this.u35_1 = value;
+  this.v35_1 = isNullable;
+}
+protoOf(Values).ot = function () {
+  return this.v35_1;
+};
+protoOf(Values).toString = function () {
+  return 'Values(value=' + toString(this.u35_1) + ', isNullable=' + this.v35_1 + ')';
+};
+protoOf(Values).hashCode = function () {
+  var result = hashCode(this.u35_1);
+  result = imul(result, 31) + getBooleanHashCode(this.v35_1) | 0;
+  return result;
+};
+protoOf(Values).equals = function (other) {
+  if (this === other)
+    return true;
+  if (!(other instanceof Values))
+    return false;
+  if (!equals(this.u35_1, other.u35_1))
+    return false;
+  if (!(this.v35_1 === other.v35_1))
+    return false;
+  return true;
+};
+function Companion_4() {
+}
+protoOf(Companion_4).l35 = function (reference, refined) {
+  var tmp;
+  if (reference instanceof Custom) {
+    // Inline function 'kotlin.takeIf' call
+    var this_0 = new Wrap(Companion_getInstance().wt(reference.x19_1).zt(), reference.y19_1);
+    var tmp_0;
+    // Inline function 'kotlin.collections.contains' call
+    // Inline function 'kotlin.collections.containsKey' call
+    var key = reference.x19_1;
+    if ((isInterface(refined, KtMap) ? refined : THROW_CCE()).q2(key)) {
+      tmp_0 = this_0;
+    } else {
+      tmp_0 = null;
+    }
+    tmp = tmp_0;
+  } else {
+    if (reference instanceof Iterable) {
+      var tmp1_safe_receiver = this.l35(reference.yp_1, refined);
+      var tmp_1;
+      if (tmp1_safe_receiver == null) {
+        tmp_1 = null;
+      } else {
+        // Inline function 'kotlin.let' call
+        tmp_1 = new Each(tmp1_safe_receiver, reference.zp_1);
+      }
+      tmp = tmp_1;
+    } else {
+      if (reference instanceof Dict) {
+        var tmp2_safe_receiver = this.l35(reference.bq_1, refined);
+        var tmp_2;
+        if (tmp2_safe_receiver == null) {
+          tmp_2 = null;
+        } else {
+          // Inline function 'kotlin.let' call
+          tmp_2 = new Values(tmp2_safe_receiver, reference.cq_1);
+        }
+        tmp = tmp_2;
+      } else {
+        tmp = null;
+      }
+    }
+  }
+  return tmp;
+};
+var Companion_instance_6;
+function Companion_getInstance_5() {
+  return Companion_instance_6;
+}
+function Refinement() {
+}
+function buildRequestClass($this, $receiver, shape) {
+  $receiver.p17(shape.y35_1, RpcDslFile$buildRequestClass$lambda(shape));
+}
+function buildGenerateWrapper_0($this, $receiver, shape) {
+  var tmp = shape.w35_1 + 'Generate';
+  $receiver.p17(tmp, RpcDslFile$buildGenerateWrapper$lambda(shape));
+}
+function outcomeFunction($this, $receiver, name, outcome) {
+  var tmp0_safe_receiver = outcome.i36_1;
+  var tmp;
+  if (tmp0_safe_receiver == null) {
+    tmp = null;
+  } else {
+    // Inline function 'kotlin.let' call
+    tmp = Companion_instance_7.n36(tmp0_safe_receiver.k36_1);
+  }
+  var value = tmp;
+  var wrap = RpcDslFile$outcomeFunction$lambda(outcome);
+  var record = outcome.j36_1;
+  $receiver.g16(name, VOID, VOID, RpcDslFile$outcomeFunction$lambda_0(outcome, value, wrap, record));
+}
+function buildCall($this, $receiver, shape) {
+  var args = joinToString(shape.z35_1, ', ', VOID, VOID, VOID, VOID, RpcDslFile$buildCall$lambda);
+  var request = shape.z35_1.r() ? '_' : 'request';
+  $receiver.k16('call', VOID, VOID, RpcDslFile$buildCall$lambda_0(shape, request, args));
+}
+function buildValueGenerator($this, $receiver, value, module_0) {
+  var tmp = Companion_instance_7.o36(value.m());
+  $receiver.g16(tmp, VOID, VOID, RpcDslFile$buildValueGenerator$lambda(value, module_0));
+}
+function RpcDslFile$build$lambda($kotestPkg, $shape, $packageName, $module) {
+  return function ($this$file) {
+    $this$file.o17($kotestPkg);
+    var tmp;
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    if (!$shape.p36().r()) {
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'generatedGen');
+      $this$file.c16('community.flock.wirespec.kotlin', 'Wirespec');
+      tmp = Unit_instance;
+    }
+    $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'rpcCall');
+    var tmp_0;
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    if (!$shape.a36_1.r()) {
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'WirespecScenarioDsl');
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'draw');
+      $this$file.c16('io.kotest.property', 'RandomSource');
+      tmp_0 = Unit_instance;
+    }
+    $this$file.c16('io.kotest.property.arbitrary', 'constant');
+    var tmp_1;
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    if (!$shape.f36_1.r()) {
+      $this$file.c16('kotlin.reflect', 'typeOf');
+      tmp_1 = Unit_instance;
+    }
+    $this$file.c16('io.kotest.property', 'Arb');
+    $this$file.c16('io.kotest.property', 'Gen');
+    $this$file.c16($packageName.bt_1 + '.rpc', $shape.w35_1);
+    // Inline function 'kotlin.collections.forEach' call
+    var _iterator__ex2g4s = $shape.e36_1.t();
+    while (_iterator__ex2g4s.u()) {
+      var element = _iterator__ex2g4s.v();
+      $this$file.c16($packageName.bt_1 + '.model', Companion_getInstance().wt(element).zt());
+    }
+    // Inline function 'kotlin.collections.forEach' call
+    var _iterator__ex2g4s_0 = $shape.f36_1.t();
+    while (_iterator__ex2g4s_0.u()) {
+      var element_0 = _iterator__ex2g4s_0.v();
+      $this$file.c16($packageName.bt_1 + '.generator', Companion_getInstance().wt(element_0).zt() + 'Generator');
+    }
+    buildRequestClass(RpcDslFile_instance, $this$file, $shape);
+    buildGenerateWrapper_0(RpcDslFile_instance, $this$file, $shape);
+    $this$file.e16('generate', Custom_init_$Create$($shape.w35_1 + 'Generate'), VOID, Visibility_PUBLIC_getInstance(), Custom_init_$Create$($shape.w35_1), VOID, VOID, new FunctionCall(VOID, VOID, Companion_getInstance().wt($shape.w35_1 + 'Generate')));
+    buildCall(RpcDslFile_instance, $this$file, $shape);
+    var tmp_2;
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    if (!$shape.a36_1.r()) {
+      $this$file.n17_1.x(RecordBuilder_instance.o35($shape.y35_1, $shape.a36_1));
+      tmp_2 = Unit_instance;
+    }
+    // Inline function 'kotlin.collections.forEach' call
+    var _iterator__ex2g4s_1 = $shape.p36().t();
+    while (_iterator__ex2g4s_1.u()) {
+      var element_1 = _iterator__ex2g4s_1.v();
+      buildValueGenerator(RpcDslFile_instance, $this$file, element_1, $module);
+    }
+    return Unit_instance;
+  };
+}
+function RpcDslFile$buildRequestClass$lambda$lambda($this$constructo) {
+  return Unit_instance;
+}
+function RpcDslFile$buildRequestClass$lambda($shape) {
+  return function ($this$struct) {
+    $this$struct.v13(Visibility_PUBLIC_getInstance());
+    // Inline function 'kotlin.collections.forEach' call
+    var _iterator__ex2g4s = $shape.z35_1.t();
+    while (_iterator__ex2g4s.u()) {
+      var element = _iterator__ex2g4s.v();
+      $this$struct.x15(new Name(listOf(escapeKotlinIdentifier(element.op_1.o1()))), convert(element.pp_1));
+    }
+    var tmp;
+    if ($shape.z35_1.r()) {
+      $this$struct.y15(RpcDslFile$buildRequestClass$lambda$lambda);
+      tmp = Unit_instance;
+    }
+    return Unit_instance;
+  };
 }
-function TypeDslFile$build$lambda$lambda($receiver, $builder, $model, $shape) {
+function RpcDslFile$buildGenerateWrapper$lambda$lambda($builder, $requestArb, $shape) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.k13(Custom_init_$Create$($receiver));
-    $this$function.o13('block', $this$function.s14(Unit_instance_0, Custom_init_$Create$($builder)), $this$function.t14('{}'));
-    $this$function.j13(Custom_init_$Create$('Arb', listOf(Custom_init_$Create$($model))));
-    $this$function.i14('val builder = ' + $builder + '().apply(block)');
-    $this$function.i14('return recordGen<' + $model + '> {');
-    // Inline function 'kotlin.text.trimEnd' call
-    var this_0 = RecordBuilder_instance.a33($shape.o34_1, 'builder', emptyList(), '    ');
-    var tmp$ret$0 = toString(trimEnd(isCharSequence(this_0) ? this_0 : THROW_CCE()));
-    $this$function.i14(tmp$ret$0);
-    $this$function.i14('}');
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.y13('block', $this$function.c15(Unit_instance_0, Custom_init_$Create$($builder)), $this$function.d15('{}'));
+    $this$function.t13($requestArb);
+    $this$function.s14('val builder = ' + $builder + '().apply(block)');
+    $this$function.s14('return generatedGen { generator, rs -> builder.applyTo(' + Companion_instance_7.n36($shape.y35_1) + ', rs) }');
+    return Unit_instance;
+  };
+}
+function RpcDslFile$buildGenerateWrapper$lambda$lambda_0($requestArb, $shape) {
+  return function ($this$function) {
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.t13($requestArb);
+    $this$function.z13($this$function.d15('Arb.constant(' + $shape.y35_1 + ')'));
+    return Unit_instance;
+  };
+}
+function RpcDslFile$buildGenerateWrapper$lambda($shape) {
+  return function ($this$struct) {
+    $this$struct.r15();
+    $this$struct.v13(Visibility_PUBLIC_getInstance());
+    $this$struct.s15(Visibility_INTERNAL_getInstance());
+    var requestArb = Custom_init_$Create$('Arb', listOf(Custom_init_$Create$($shape.y35_1)));
+    var tmp;
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    if (!$shape.a36_1.r()) {
+      var builder = RecordBuilder_instance.z33($shape.y35_1);
+      $this$struct.g16('request', VOID, VOID, RpcDslFile$buildGenerateWrapper$lambda$lambda(builder, requestArb, $shape));
+      tmp = Unit_instance;
+    } else {
+      $this$struct.g16('request', VOID, VOID, RpcDslFile$buildGenerateWrapper$lambda$lambda_0(requestArb, $shape));
+      tmp = Unit_instance;
+    }
+    outcomeFunction(RpcDslFile_instance, $this$struct, 'result', $shape.b36_1);
+    var tmp0_safe_receiver = $shape.c36_1;
+    if (tmp0_safe_receiver == null)
+      null;
+    else {
+      // Inline function 'kotlin.let' call
+      outcomeFunction(RpcDslFile_instance, $this$struct, 'error', tmp0_safe_receiver);
+    }
+    return Unit_instance;
+  };
+}
+function RpcDslFile$outcomeFunction$lambda($outcome) {
+  return function (drawn) {
+    var tmp0_safe_receiver = $outcome.h36_1;
+    var tmp;
+    if (tmp0_safe_receiver == null) {
+      tmp = null;
+    } else {
+      // Inline function 'kotlin.let' call
+      tmp = tmp0_safe_receiver + '(' + drawn + ')';
+    }
+    var tmp1_elvis_lhs = tmp;
+    return tmp1_elvis_lhs == null ? drawn : tmp1_elvis_lhs;
+  };
+}
+function RpcDslFile$outcomeFunction$lambda_0($outcome, $value, $wrap, $record) {
+  return function ($this$function) {
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.t13(Custom_init_$Create$('Arb', listOf(Custom_init_$Create$($outcome.g36_1))));
+    var tmp;
+    if ($value == null) {
+      $this$function.z13($this$function.d15('Arb.constant(' + $wrap('Unit') + ')'));
+      tmp = Unit_instance;
+    } else if ($record == null) {
+      $this$function.z13($this$function.d15('generatedGen { generator, _ -> ' + $wrap($value) + ' }'));
+      tmp = Unit_instance;
+    } else {
+      var builder = RecordBuilder_instance.z33($record.x34_1);
+      $this$function.y13('block', $this$function.c15(Unit_instance_0, Custom_init_$Create$(builder)), $this$function.d15('{}'));
+      $this$function.s14('val builder = ' + builder + '().apply(block)');
+      $this$function.s14('return generatedGen { generator, rs -> ' + $wrap($record.b35($value, 'builder')) + ' }');
+      tmp = Unit_instance;
+    }
+    return Unit_instance;
+  };
+}
+function RpcDslFile$buildCall$lambda(it) {
+  return 'request.' + escapeKotlinIdentifier(it.op_1.o1());
+}
+function RpcDslFile$buildCall$lambda_0($shape, $request, $args) {
+  return function ($this$asyncFunction) {
+    $this$asyncFunction.v13(Visibility_PUBLIC_getInstance());
+    $this$asyncFunction.u13(Custom_init_$Create$('Gen', listOf(Custom_init_$Create$($shape.y35_1))));
+    $this$asyncFunction.t13(Custom_init_$Create$($shape.d36_1));
+    $this$asyncFunction.z13($this$asyncFunction.d15('rpcCall(' + $shape.w35_1 + '.Service::class, this) { service, ' + $request + ' -> service.' + $shape.x35_1 + '(' + $args + ') }'));
+    return Unit_instance;
+  };
+}
+function RpcDslFile$buildValueGenerator$lambda($value, $module) {
+  return function ($this$function) {
+    $this$function.v13(Visibility_PRIVATE_getInstance());
+    $this$function.w13('generator', Custom_init_$Create$('Wirespec.Generator'));
+    $this$function.w13('path', new Array_0(String_instance));
+    $this$function.t13(Custom_init_$Create$($value.b1i()));
+    $this$function.z13($value.q36($module));
+    return Unit_instance;
+  };
+}
+function RpcDslFile() {
+}
+protoOf(RpcDslFile).r36 = function (rpc, packageName, module_0, types, refined) {
+  var shape = Companion_instance_8.s36(rpc, types, refined);
+  var kotestPkg = packageName.bt_1 + '.kotest';
+  var fileName = Companion_instance_0.at(kotestPkg).dt() + (shape.w35_1 + 'Dsl');
+  var tmp = Companion_getInstance().wt(fileName);
+  return file(tmp, RpcDslFile$build$lambda(kotestPkg, shape, packageName, module_0));
+};
+var RpcDslFile_instance;
+function RpcDslFile_getInstance() {
+  return RpcDslFile_instance;
+}
+function Request(name, parameters) {
+  this.t36_1 = name;
+  this.u36_1 = parameters;
+  this.v36_1 = this.t36_1;
+}
+protoOf(Request).m = function () {
+  return this.t36_1;
+};
+protoOf(Request).b1i = function () {
+  return this.v36_1;
+};
+protoOf(Request).q36 = function (module_0) {
+  // Inline function 'kotlin.let' call
+  var constructed = generatorConstructor(this.t36_1, this.u36_1, module_0);
+  // Inline function 'kotlin.collections.mapKeys' call
+  var this_0 = constructed.du_1;
+  // Inline function 'kotlin.collections.mapKeysTo' call
+  var destination = LinkedHashMap_init_$Create$(mapCapacity(this_0.c1()));
+  // Inline function 'kotlin.collections.associateByTo' call
+  var _iterator__ex2g4s = this_0.m1().t();
+  while (_iterator__ex2g4s.u()) {
+    var element = _iterator__ex2g4s.v();
+    // Inline function 'kotlin.collections.component1' call
+    var key = element.n1();
+    var tmp = new Name(listOf(escapeKotlinIdentifier(key.xt())));
+    var tmp$ret$7 = element.o1();
+    destination.v2(tmp, tmp$ret$7);
+  }
+  return constructed.fu(VOID, destination);
+};
+protoOf(Request).toString = function () {
+  return 'Request(name=' + this.t36_1 + ', parameters=' + toString(this.u36_1) + ')';
+};
+protoOf(Request).hashCode = function () {
+  var result = getStringHashCode(this.t36_1);
+  result = imul(result, 31) + hashCode(this.u36_1) | 0;
+  return result;
+};
+protoOf(Request).equals = function (other) {
+  if (this === other)
+    return true;
+  if (!(other instanceof Request))
+    return false;
+  if (!(this.t36_1 === other.t36_1))
+    return false;
+  if (!equals(this.u36_1, other.u36_1))
+    return false;
+  return true;
+};
+function Value(name, type, reference) {
+  this.k36_1 = name;
+  this.l36_1 = type;
+  this.m36_1 = reference;
+}
+protoOf(Value).m = function () {
+  return this.k36_1;
+};
+protoOf(Value).b1i = function () {
+  return this.l36_1;
+};
+protoOf(Value).q36 = function (module_0) {
+  var tmp = single(generatorConstructor(this.k36_1, listOf(new Field_0(emptyList(), new FieldIdentifier('value'), this.m36_1)), module_0).du_1.u2());
+  // Inline function 'kotlin.let' call
+  var it = tmp instanceof FunctionCall ? tmp : THROW_CCE();
+  return it.qy(VOID, VOID, VOID, plus_1(it.ny_1, to(Companion_getInstance().wt('path'), new VariableReference(Companion_getInstance().wt('path')))));
+};
+protoOf(Value).toString = function () {
+  return 'Value(name=' + this.k36_1 + ', type=' + this.l36_1 + ', reference=' + toString(this.m36_1) + ')';
+};
+protoOf(Value).hashCode = function () {
+  var result = getStringHashCode(this.k36_1);
+  result = imul(result, 31) + getStringHashCode(this.l36_1) | 0;
+  result = imul(result, 31) + hashCode(this.m36_1) | 0;
+  return result;
+};
+protoOf(Value).equals = function (other) {
+  if (this === other)
+    return true;
+  if (!(other instanceof Value))
+    return false;
+  if (!(this.k36_1 === other.k36_1))
+    return false;
+  if (!(this.l36_1 === other.l36_1))
+    return false;
+  if (!equals(this.m36_1, other.m36_1))
+    return false;
+  return true;
+};
+function Companion_5() {
+}
+protoOf(Companion_5).o36 = function (name) {
+  return 'generate' + name;
+};
+protoOf(Companion_5).n36 = function (name) {
+  return this.o36(name) + '(generator, emptyList())';
+};
+var Companion_instance_7;
+function Companion_getInstance_6() {
+  return Companion_instance_7;
+}
+function outcome($this, rpcName, kind, reference, wrapped, types) {
+  var valueType = KotlinGenerator_getInstance().l1c(convert(reference));
+  var tmp = wrapped ? rpcName + '.' + kind : valueType;
+  // Inline function 'kotlin.takeIf' call
+  var this_0 = rpcName + '.' + kind;
+  var tmp_0;
+  if (wrapped) {
+    tmp_0 = this_0;
+  } else {
+    tmp_0 = null;
+  }
+  var tmp_1 = tmp_0;
+  // Inline function 'kotlin.takeIf' call
+  var this_1 = new Value(rpcName + kind, valueType, reference);
+  var tmp_2;
+  if (!(reference instanceof Unit)) {
+    tmp_2 = this_1;
+  } else {
+    tmp_2 = null;
+  }
+  var tmp_3 = tmp_2;
+  var tmp0_safe_receiver = Companion_instance_5.k35(reference, types);
+  var tmp_4;
+  if (tmp0_safe_receiver == null) {
+    tmp_4 = null;
+  } else {
+    // Inline function 'kotlin.takeIf' call
+    var tmp_5;
+    // Inline function 'kotlin.collections.isNotEmpty' call
+    if (!get_fields(getValue(types, tmp0_safe_receiver.x34_1).lp_1).r()) {
+      tmp_5 = tmp0_safe_receiver;
+    } else {
+      tmp_5 = null;
+    }
+    tmp_4 = tmp_5;
+  }
+  return new Outcome(tmp, tmp_1, tmp_3, tmp_4);
+}
+function Outcome(type, wrapper, generated, record) {
+  this.g36_1 = type;
+  this.h36_1 = wrapper;
+  this.i36_1 = generated;
+  this.j36_1 = record;
+}
+protoOf(Outcome).toString = function () {
+  return 'Outcome(type=' + this.g36_1 + ', wrapper=' + this.h36_1 + ', generated=' + toString_1(this.i36_1) + ', record=' + toString_1(this.j36_1) + ')';
+};
+protoOf(Outcome).hashCode = function () {
+  var result = getStringHashCode(this.g36_1);
+  result = imul(result, 31) + (this.h36_1 == null ? 0 : getStringHashCode(this.h36_1)) | 0;
+  result = imul(result, 31) + (this.i36_1 == null ? 0 : this.i36_1.hashCode()) | 0;
+  result = imul(result, 31) + (this.j36_1 == null ? 0 : this.j36_1.hashCode()) | 0;
+  return result;
+};
+protoOf(Outcome).equals = function (other) {
+  if (this === other)
+    return true;
+  if (!(other instanceof Outcome))
+    return false;
+  if (!(this.g36_1 === other.g36_1))
+    return false;
+  if (!(this.h36_1 == other.h36_1))
+    return false;
+  if (!equals(this.i36_1, other.i36_1))
+    return false;
+  if (!equals(this.j36_1, other.j36_1))
+    return false;
+  return true;
+};
+function Companion_6() {
+}
+protoOf(Companion_6).s36 = function (rpc, types, refined) {
+  var name = Companion_getInstance().wt(rpc.rq_1.o1()).zt();
+  var requestName = name + 'Request';
+  var parameters = get_fields(rpc.sq_1);
+  var requestFields = Companion_instance_4.t33(requestName, plus_1(types, to(requestName, syntheticType(requestName, parameters))), refined);
+  var result = outcome(this, name, 'Result', rpc.tq_1, !(rpc.uq_1 == null), types);
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(parameters, 10));
+  var _iterator__ex2g4s = parameters.t();
+  while (_iterator__ex2g4s.u()) {
+    var item = _iterator__ex2g4s.v();
+    var tmp$ret$2 = item.pp_1;
+    destination.x(tmp$ret$2);
+  }
+  var references = plus(destination, listOfNotNull([rpc.tq_1, rpc.uq_1]));
+  var tmp = escapeKotlinIdentifier(Companion_getInstance().wt(rpc.rq_1.o1()).yt());
+  var tmp0_safe_receiver = rpc.uq_1;
+  var tmp_0;
+  if (tmp0_safe_receiver == null) {
+    tmp_0 = null;
+  } else {
+    // Inline function 'kotlin.let' call
+    tmp_0 = outcome(Companion_instance_8, name, 'Error', tmp0_safe_receiver, true, types);
+  }
+  var tmp_1 = tmp_0;
+  var tmp_2 = !(rpc.uq_1 == null) ? name + '.Response' : result.g36_1;
+  var tmp_3 = Companion_instance_4.u33(references);
+  // Inline function 'kotlin.collections.flatMap' call
+  // Inline function 'kotlin.collections.flatMapTo' call
+  var destination_0 = ArrayList_init_$Create$();
+  var _iterator__ex2g4s_0 = references.t();
+  while (_iterator__ex2g4s_0.u()) {
+    var element = _iterator__ex2g4s_0.v();
+    var list = Companion_instance_4.j35(element);
+    addAll(destination_0, list);
+  }
+  return new RpcShape(name, tmp, requestName, parameters, requestFields, result, tmp_1, tmp_2, tmp_3, distinct(destination_0));
+};
+var Companion_instance_8;
+function Companion_getInstance_7() {
+  return Companion_instance_8;
+}
+function RpcShape(name, functionName, requestName, parameters, requestFields, result, error, callReturnType, modelImports, generatorImports) {
+  this.w35_1 = name;
+  this.x35_1 = functionName;
+  this.y35_1 = requestName;
+  this.z35_1 = parameters;
+  this.a36_1 = requestFields;
+  this.b36_1 = result;
+  this.c36_1 = error;
+  this.d36_1 = callReturnType;
+  this.e36_1 = modelImports;
+  this.f36_1 = generatorImports;
+}
+protoOf(RpcShape).p36 = function () {
+  // Inline function 'kotlin.takeIf' call
+  var this_0 = new Request(this.y35_1, this.z35_1);
+  var tmp;
+  // Inline function 'kotlin.collections.isNotEmpty' call
+  if (!this.z35_1.r()) {
+    tmp = this_0;
+  } else {
+    tmp = null;
+  }
+  var tmp_0 = tmp;
+  var tmp0_safe_receiver = this.c36_1;
+  return listOfNotNull([tmp_0, this.b36_1.i36_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.i36_1]);
+};
+protoOf(RpcShape).toString = function () {
+  return 'RpcShape(name=' + this.w35_1 + ', functionName=' + this.x35_1 + ', requestName=' + this.y35_1 + ', parameters=' + toString(this.z35_1) + ', requestFields=' + toString(this.a36_1) + ', result=' + this.b36_1.toString() + ', error=' + toString_1(this.c36_1) + ', callReturnType=' + this.d36_1 + ', modelImports=' + toString(this.e36_1) + ', generatorImports=' + toString(this.f36_1) + ')';
+};
+protoOf(RpcShape).hashCode = function () {
+  var result = getStringHashCode(this.w35_1);
+  result = imul(result, 31) + getStringHashCode(this.x35_1) | 0;
+  result = imul(result, 31) + getStringHashCode(this.y35_1) | 0;
+  result = imul(result, 31) + hashCode(this.z35_1) | 0;
+  result = imul(result, 31) + hashCode(this.a36_1) | 0;
+  result = imul(result, 31) + this.b36_1.hashCode() | 0;
+  result = imul(result, 31) + (this.c36_1 == null ? 0 : this.c36_1.hashCode()) | 0;
+  result = imul(result, 31) + getStringHashCode(this.d36_1) | 0;
+  result = imul(result, 31) + hashCode(this.e36_1) | 0;
+  result = imul(result, 31) + hashCode(this.f36_1) | 0;
+  return result;
+};
+protoOf(RpcShape).equals = function (other) {
+  if (this === other)
+    return true;
+  if (!(other instanceof RpcShape))
+    return false;
+  if (!(this.w35_1 === other.w35_1))
+    return false;
+  if (!(this.x35_1 === other.x35_1))
+    return false;
+  if (!(this.y35_1 === other.y35_1))
+    return false;
+  if (!equals(this.z35_1, other.z35_1))
+    return false;
+  if (!equals(this.a36_1, other.a36_1))
+    return false;
+  if (!this.b36_1.equals(other.b36_1))
+    return false;
+  if (!equals(this.c36_1, other.c36_1))
+    return false;
+  if (!(this.d36_1 === other.d36_1))
+    return false;
+  if (!equals(this.e36_1, other.e36_1))
+    return false;
+  if (!equals(this.f36_1, other.f36_1))
+    return false;
+  return true;
+};
+function generatorConstructor(name, fields, module_0) {
+  // Inline function 'community.flock.wirespec.compiler.core.ir.findAll' call
+  var this_0 = convertToGenerator(syntheticType(name, fields), module_0);
+  // Inline function 'kotlin.collections.buildList' call
+  // Inline function 'kotlin.collections.buildListInternal' call
+  // Inline function 'kotlin.apply' call
+  var this_1 = ArrayList_init_$Create$();
+  forEachElement(this_0, generatorConstructor$lambda(this_1));
+  var tmp$ret$0 = this_1.q5();
+  // Inline function 'kotlin.collections.filterIsInstance' call
+  var tmp0 = single_0(tmp$ret$0).rx_1;
+  // Inline function 'kotlin.collections.filterIsInstanceTo' call
+  var destination = ArrayList_init_$Create$();
+  var _iterator__ex2g4s = tmp0.t();
+  while (_iterator__ex2g4s.u()) {
+    var element = _iterator__ex2g4s.v();
+    if (element instanceof ReturnStatement) {
+      destination.x(element);
+    }
+  }
+  var tmp = single_0(destination).iy_1;
+  return tmp instanceof ConstructorStatement ? tmp : THROW_CCE();
+}
+function syntheticType(name, fields) {
+  return new Type(null, emptyList(), new DefinitionIdentifier(name), new Shape(fields), emptyList());
+}
+function generatorConstructor$lambda($$this$buildList) {
+  return function (element) {
+    var tmp;
+    if (element instanceof Function) {
+      $$this$buildList.x(element);
+      tmp = Unit_instance;
+    }
     return Unit_instance;
   };
 }
-function TypeDslFile$build$lambda($kotestPkg, $shape, $modelPkg, $receiver, $builder, $model) {
+function TypeDslFile$build$lambda$lambda($receiver, $builder, $model) {
+  return function ($this$function) {
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.u13(Custom_init_$Create$($receiver));
+    $this$function.y13('block', $this$function.c15(Unit_instance_0, Custom_init_$Create$($builder)), $this$function.d15('{}'));
+    $this$function.t13(Custom_init_$Create$('Arb', listOf(Custom_init_$Create$($model))));
+    $this$function.s14('val builder = ' + $builder + '().apply(block)');
+    $this$function.s14('return generatedGen { generator, rs -> builder.applyTo(' + $model + 'Generator.generate(generator, emptyList()), rs) }');
+    return Unit_instance;
+  };
+}
+function TypeDslFile$build$lambda($kotestPkg, $shape, $modelPkg, $packageName, $model, $receiver, $builder) {
   return function ($this$file) {
-    $this$file.e17($kotestPkg);
-    $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'recordGen');
-    $this$file.s15('community.flock.wirespec.integration.kotest.dsl', 'WirespecScenarioDsl');
-    $this$file.s15('io.kotest.property', 'Arb');
+    $this$file.o17($kotestPkg);
+    $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'generatedGen');
+    $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'WirespecScenarioDsl');
+    $this$file.c16('io.kotest.property', 'Arb');
+    $this$file.c16('io.kotest.property', 'RandomSource');
     var tmp;
     // Inline function 'kotlin.collections.isNotEmpty' call
-    if (!$shape.o34_1.r()) {
-      $this$file.s15('io.kotest.property', 'Gen');
-      $this$file.s15('io.kotest.property.arbitrary', 'constant');
+    if (!$shape.x36_1.r()) {
+      $this$file.c16('community.flock.wirespec.integration.kotest.dsl', 'draw');
+      $this$file.c16('io.kotest.property', 'Gen');
+      $this$file.c16('io.kotest.property.arbitrary', 'constant');
       tmp = Unit_instance;
     }
     // Inline function 'kotlin.collections.forEach' call
-    var _iterator__ex2g4s = distinct(plus(listOf($shape.n34_1), $shape.p34_1)).t();
+    var _iterator__ex2g4s = distinct(plus(listOf($shape.w36_1), $shape.y36_1)).t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      $this$file.s15($modelPkg, Companion_getInstance().wt(element).zt());
+      $this$file.c16($modelPkg, Companion_getInstance().wt(element).zt());
     }
-    $this$file.w15('generate', VOID, VOID, TypeDslFile$build$lambda$lambda($receiver, $builder, $model, $shape));
-    $this$file.d17_1.x(RecordBuilder_instance.m34($shape.n34_1, $shape.o34_1));
+    $this$file.c16($packageName.bt_1 + '.generator', $model + 'Generator');
+    $this$file.g16('generate', VOID, VOID, TypeDslFile$build$lambda$lambda($receiver, $builder, $model));
+    $this$file.n17_1.x(RecordBuilder_instance.o35($shape.w36_1, $shape.x36_1));
     return Unit_instance;
   };
 }
 function TypeDslFile() {
 }
-protoOf(TypeDslFile).q34 = function (type, packageName, types, refined) {
-  var shape = Companion_instance_5.r34(type, types, refined);
+protoOf(TypeDslFile).z36 = function (type, packageName, types, refined) {
+  var shape = Companion_instance_9.a37(type, types, refined);
   var kotestPkg = packageName.bt_1 + '.kotest';
   var modelPkg = packageName.bt_1 + '.model';
-  var fileName = Companion_instance_0.at(kotestPkg).dt() + (shape.n34_1 + 'Dsl');
-  var model = Companion_getInstance().wt(shape.n34_1).zt();
-  var builder = RecordBuilder_instance.b33(shape.n34_1);
-  var receiver = shape.o34_1.r() ? model : model + '.Companion';
+  var fileName = Companion_instance_0.at(kotestPkg).dt() + (shape.w36_1 + 'Dsl');
+  var model = Companion_getInstance().wt(shape.w36_1).zt();
+  var builder = RecordBuilder_instance.z33(shape.w36_1);
+  var receiver = shape.x36_1.r() ? model : model + '.Companion';
   var tmp = Companion_getInstance().wt(fileName);
-  return file(tmp, TypeDslFile$build$lambda(kotestPkg, shape, modelPkg, receiver, builder, model));
+  return file(tmp, TypeDslFile$build$lambda(kotestPkg, shape, modelPkg, packageName, model, receiver, builder));
 };
 var TypeDslFile_instance;
 function TypeDslFile_getInstance() {
   return TypeDslFile_instance;
 }
-function Companion_3() {
+function Companion_7() {
 }
-protoOf(Companion_3).r34 = function (type, types, refined) {
+protoOf(Companion_7).a37 = function (type, types, refined) {
   var name = type.kp_1.o1();
-  var fields = Companion_instance_4.u32(name, types, refined, emptySet());
+  var fields = Companion_instance_4.t33(name, types, refined);
+  var tmp = Companion_instance_4;
   // Inline function 'kotlin.collections.map' call
   var this_0 = get_fields(type.lp_1);
   // Inline function 'kotlin.collections.mapTo' call
@@ -3516,26 +3991,25 @@ protoOf(Companion_3).r34 = function (type, types, refined) {
     var tmp$ret$2 = item.pp_1;
     destination.x(tmp$ret$2);
   }
-  var directRefs = destination;
-  var modelImports = Companion_instance_4.v32(directRefs, fields, types);
+  var modelImports = tmp.u33(destination);
   return new TypeShape(name, fields, modelImports);
 };
-var Companion_instance_5;
-function Companion_getInstance_4() {
-  return Companion_instance_5;
+var Companion_instance_9;
+function Companion_getInstance_8() {
+  return Companion_instance_9;
 }
 function TypeShape(name, fields, modelImports) {
-  this.n34_1 = name;
-  this.o34_1 = fields;
-  this.p34_1 = modelImports;
+  this.w36_1 = name;
+  this.x36_1 = fields;
+  this.y36_1 = modelImports;
 }
 protoOf(TypeShape).toString = function () {
-  return 'TypeShape(name=' + this.n34_1 + ', fields=' + toString(this.o34_1) + ', modelImports=' + toString(this.p34_1) + ')';
+  return 'TypeShape(name=' + this.w36_1 + ', fields=' + toString(this.x36_1) + ', modelImports=' + toString(this.y36_1) + ')';
 };
 protoOf(TypeShape).hashCode = function () {
-  var result = getStringHashCode(this.n34_1);
-  result = imul(result, 31) + hashCode(this.o34_1) | 0;
-  result = imul(result, 31) + hashCode(this.p34_1) | 0;
+  var result = getStringHashCode(this.w36_1);
+  result = imul(result, 31) + hashCode(this.x36_1) | 0;
+  result = imul(result, 31) + hashCode(this.y36_1) | 0;
   return result;
 };
 protoOf(TypeShape).equals = function (other) {
@@ -3543,23 +4017,23 @@ protoOf(TypeShape).equals = function (other) {
     return true;
   if (!(other instanceof TypeShape))
     return false;
-  if (!(this.n34_1 === other.n34_1))
+  if (!(this.w36_1 === other.w36_1))
     return false;
-  if (!equals(this.o34_1, other.o34_1))
+  if (!equals(this.x36_1, other.x36_1))
     return false;
-  if (!equals(this.p34_1, other.p34_1))
+  if (!equals(this.y36_1, other.y36_1))
     return false;
   return true;
 };
 function valueSetter(_this__u8e3s4, fieldName, type) {
   var escaped = escapeKotlinIdentifier(fieldName);
-  _this__u8e3s4.w15(fieldName, VOID, VOID, valueSetter$lambda(type, escaped));
+  _this__u8e3s4.g16(fieldName, VOID, VOID, valueSetter$lambda(type, escaped));
 }
 function valueSetter$lambda($type, $escaped) {
   return function ($this$function) {
-    $this$function.l13(Visibility_PUBLIC_getInstance());
-    $this$function.m13('value', $type);
-    $this$function.i14('this.' + $escaped + ' = Arb.constant(value)');
+    $this$function.v13(Visibility_PUBLIC_getInstance());
+    $this$function.w13('value', $type);
+    $this$function.s14('this.' + $escaped + ' = Arb.constant(value)');
     return Unit_instance;
   };
 }
@@ -3567,7 +4041,7 @@ function injectRecordCompanion($this, $receiver, recordNames, modelPkg) {
   var tmp;
   var tmp_0;
   if ($receiver instanceof File) {
-    var tmp0 = $receiver.iv_1;
+    var tmp0 = $receiver.cv_1;
     var tmp$ret$0;
     $l$block_0: {
       // Inline function 'kotlin.collections.any' call
@@ -3586,7 +4060,7 @@ function injectRecordCompanion($this, $receiver, recordNames, modelPkg) {
         var element = _iterator__ex2g4s.v();
         var tmp_2;
         if (element instanceof Package) {
-          tmp_2 = element.mv_1 === modelPkg;
+          tmp_2 = element.gv_1 === modelPkg;
         } else {
           tmp_2 = false;
         }
@@ -3603,7 +4077,7 @@ function injectRecordCompanion($this, $receiver, recordNames, modelPkg) {
   }
   if (tmp_0) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = $receiver.iv_1;
+    var this_0 = $receiver.cv_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s_0 = this_0.t();
@@ -3614,7 +4088,7 @@ function injectRecordCompanion($this, $receiver, recordNames, modelPkg) {
       var tmp_5;
       var tmp_6;
       if (item instanceof Struct) {
-        tmp_6 = recordNames.i1(item.hx_1.zt());
+        tmp_6 = recordNames.i1(item.bx_1.zt());
       } else {
         tmp_6 = false;
       }
@@ -3630,21 +4104,21 @@ function injectRecordCompanion($this, $receiver, recordNames, modelPkg) {
         tmp_4 = false;
       }
       if (tmp_4) {
-        tmp_3 = item.sx(VOID, VOID, VOID, VOID, plus_0(item.lx_1, raw('companion object')));
+        tmp_3 = item.mx(VOID, VOID, VOID, VOID, plus_0(item.fx_1, raw('companion object')));
       } else {
         tmp_3 = item;
       }
       var tmp$ret$4 = tmp_3;
       destination.x(tmp$ret$4);
     }
-    tmp = $receiver.lv(VOID, destination);
+    tmp = $receiver.fv(VOID, destination);
   } else {
     tmp = $receiver;
   }
   return tmp;
 }
 function hasCompanion($this, $receiver) {
-  var tmp0 = $receiver.lx_1;
+  var tmp0 = $receiver.fx_1;
   var tmp$ret$0;
   $l$block_0: {
     // Inline function 'kotlin.collections.any' call
@@ -3664,7 +4138,7 @@ function hasCompanion($this, $receiver) {
       var tmp_0;
       if (element instanceof RawElement) {
         // Inline function 'kotlin.text.trimStart' call
-        var this_0 = element.gy_1;
+        var this_0 = element.ay_1;
         var tmp$ret$2 = toString(trimStart(isCharSequence(this_0) ? this_0 : THROW_CCE()));
         tmp_0 = startsWith(tmp$ret$2, 'companion object');
       } else {
@@ -3680,9 +4154,9 @@ function hasCompanion($this, $receiver) {
   return tmp$ret$0;
 }
 function KotestDslExtension(packageName) {
-  this.s34_1 = packageName;
+  this.b37_1 = packageName;
 }
-protoOf(KotestDslExtension).b1b = function (ir, ast) {
+protoOf(KotestDslExtension).f1b = function (ir, ast) {
   var modules = NonEmptyList__toList_impl_t5xcy2(ast.ep_1);
   // Inline function 'kotlin.collections.flatMap' call
   // Inline function 'kotlin.collections.flatMapTo' call
@@ -3765,7 +4239,7 @@ protoOf(KotestDslExtension).b1b = function (ir, ast) {
   var _iterator__ex2g4s_6 = this_0.t();
   while (_iterator__ex2g4s_6.u()) {
     var item = _iterator__ex2g4s_6.v();
-    var tmp$ret$19 = TypeDslFile_instance.q34(item, this.s34_1, types, refined);
+    var tmp$ret$19 = TypeDslFile_instance.z36(item, this.b37_1, types, refined);
     destination_6.x(tmp$ret$19);
   }
   var typeDsl = destination_6;
@@ -3775,7 +4249,7 @@ protoOf(KotestDslExtension).b1b = function (ir, ast) {
   var _iterator__ex2g4s_7 = endpoints.t();
   while (_iterator__ex2g4s_7.u()) {
     var item_0 = _iterator__ex2g4s_7.v();
-    var tmp$ret$22 = EndpointDslFile_instance.k34(item_0, this.s34_1, types, refined);
+    var tmp$ret$22 = EndpointDslFile_instance.c35(item_0, this.b37_1, types, refined);
     destination_7.x(tmp$ret$22);
   }
   var endpointDsl = destination_7;
@@ -3787,41 +4261,71 @@ protoOf(KotestDslExtension).b1b = function (ir, ast) {
   var _iterator__ex2g4s_8 = channels.t();
   while (_iterator__ex2g4s_8.u()) {
     var item_1 = _iterator__ex2g4s_8.v();
-    var payload = Companion_instance_3.t32(item_1, types, refined).x32_1;
-    var tmp$ret$26 = ChannelDslFile_instance.c33(item_1, this.s34_1, types, refined, sendPayloads.x(payload));
+    var payload = Companion_instance_3.s33(item_1, types, refined).w33_1;
+    var tmp$ret$26 = ChannelDslFile_instance.a34(item_1, this.b37_1, types, refined, sendPayloads.x(payload));
     destination_8.x(tmp$ret$26);
   }
   var channelDsl = destination_8;
-  var extra = plus(plus(typeDsl, endpointDsl), channelDsl);
+  // Inline function 'kotlin.collections.flatMap' call
+  // Inline function 'kotlin.collections.flatMapTo' call
+  var destination_9 = ArrayList_init_$Create$();
+  var _iterator__ex2g4s_9 = modules.t();
+  while (_iterator__ex2g4s_9.u()) {
+    var element_6 = _iterator__ex2g4s_9.v();
+    // Inline function 'kotlin.collections.filterIsInstance' call
+    var tmp0 = new NonEmptyList(element_6.gp_1);
+    // Inline function 'kotlin.collections.filterIsInstanceTo' call
+    var destination_10 = ArrayList_init_$Create$();
+    var _iterator__ex2g4s_10 = tmp0.t();
+    while (_iterator__ex2g4s_10.u()) {
+      var element_7 = _iterator__ex2g4s_10.v();
+      if (element_7 instanceof Rpc) {
+        destination_10.x(element_7);
+      }
+    }
+    // Inline function 'kotlin.collections.map' call
+    // Inline function 'kotlin.collections.mapTo' call
+    var destination_11 = ArrayList_init_$Create$_0(collectionSizeOrDefault(destination_10, 10));
+    var _iterator__ex2g4s_11 = destination_10.t();
+    while (_iterator__ex2g4s_11.u()) {
+      var item_2 = _iterator__ex2g4s_11.v();
+      var tmp$ret$34 = RpcDslFile_instance.r36(item_2, this.b37_1, element_6, types, refined);
+      destination_11.x(tmp$ret$34);
+    }
+    var list_0 = destination_11;
+    addAll(destination_9, list_0);
+  }
+  var rpcDsl = destination_9;
+  var extra = plus(plus(plus(typeDsl, endpointDsl), channelDsl), rpcDsl);
   // Inline function 'kotlin.collections.map' call
   var this_1 = types.u2();
   // Inline function 'kotlin.collections.mapTo' call
-  var destination_9 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_1, 10));
-  var _iterator__ex2g4s_9 = this_1.t();
-  while (_iterator__ex2g4s_9.u()) {
-    var item_2 = _iterator__ex2g4s_9.v();
-    var tmp$ret$29 = Companion_getInstance().wt(item_2.kp_1.o1()).zt();
-    destination_9.x(tmp$ret$29);
-  }
-  var recordNames = toSet_0(destination_9);
-  var modelPkg = this.s34_1.bt_1 + '.model';
+  var destination_12 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_1, 10));
+  var _iterator__ex2g4s_12 = this_1.t();
+  while (_iterator__ex2g4s_12.u()) {
+    var item_3 = _iterator__ex2g4s_12.v();
+    var tmp$ret$37 = Companion_getInstance().wt(item_3.kp_1.o1()).zt();
+    destination_12.x(tmp$ret$37);
+  }
+  var recordNames = toSet_0(destination_12);
+  var modelPkg = this.b37_1.bt_1 + '.model';
   // Inline function 'arrow.core.NonEmptyList.map' call
   // Inline function 'kotlin.collections.map' call
   var this_2 = _NonEmptyList___get_all__impl__pmf509(ir);
   // Inline function 'kotlin.collections.mapTo' call
-  var destination_10 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_2, 10));
-  var _iterator__ex2g4s_10 = this_2.t();
-  while (_iterator__ex2g4s_10.u()) {
-    var item_3 = _iterator__ex2g4s_10.v();
-    var tmp$ret$33 = injectRecordCompanion(this, item_3, recordNames, modelPkg);
-    destination_10.x(tmp$ret$33);
-  }
-  var withCompanions = _NonEmptyList___init__impl__fxd0xp(destination_10);
+  var destination_13 = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_2, 10));
+  var _iterator__ex2g4s_13 = this_2.t();
+  while (_iterator__ex2g4s_13.u()) {
+    var item_4 = _iterator__ex2g4s_13.v();
+    var tmp$ret$41 = injectRecordCompanion(this, item_4, recordNames, modelPkg);
+    destination_13.x(tmp$ret$41);
+  }
+  var withCompanions = _NonEmptyList___init__impl__fxd0xp(destination_13);
   return NonEmptyList__plus_impl_xqmb9(withCompanions, extra);
 };
 function annotateSerializable($this, $receiver, serialNames, serializableOnlyNames) {
   // Inline function 'kotlin.collections.flatMap' call
-  var tmp0 = $receiver.iv_1;
+  var tmp0 = $receiver.cv_1;
   // Inline function 'kotlin.collections.flatMapTo' call
   var destination = ArrayList_init_$Create$();
   var _iterator__ex2g4s = tmp0.t();
@@ -3832,13 +4336,13 @@ function annotateSerializable($this, $receiver, serialNames, serializableOnlyNam
     if (element instanceof Struct) {
       // Inline function 'kotlin.collections.contains' call
       // Inline function 'kotlin.collections.containsKey' call
-      var key = element.hx_1.zt();
+      var key = element.bx_1.zt();
       tmp_0 = (isInterface(serialNames, KtMap) ? serialNames : THROW_CCE()).q2(key);
     } else {
       tmp_0 = false;
     }
     if (tmp_0) {
-      tmp = listOf_0([Companion_getInstance_5().t34_1, Companion_getInstance_5().u34(getValue(serialNames, element.hx_1.zt())), element]);
+      tmp = listOf_0([Companion_getInstance_9().c37_1, Companion_getInstance_9().d37(getValue(serialNames, element.bx_1.zt())), element]);
     } else {
       var tmp_1;
       var tmp_2;
@@ -3859,7 +4363,7 @@ function annotateSerializable($this, $receiver, serialNames, serializableOnlyNam
         tmp_1 = false;
       }
       if (tmp_1) {
-        tmp = listOf_0([Companion_getInstance_5().t34_1, element]);
+        tmp = listOf_0([Companion_getInstance_9().c37_1, element]);
       } else {
         tmp = listOf(element);
       }
@@ -3867,25 +4371,25 @@ function annotateSerializable($this, $receiver, serialNames, serializableOnlyNam
     var list = tmp;
     addAll(destination, list);
   }
-  return $receiver.lv(VOID, destination);
+  return $receiver.fv(VOID, destination);
 }
-function Companion_4() {
-  Companion_instance_6 = this;
-  this.t34_1 = new RawElement('@kotlinx.serialization.Serializable');
+function Companion_8() {
+  Companion_instance_10 = this;
+  this.c37_1 = new RawElement('@kotlinx.serialization.Serializable');
 }
-protoOf(Companion_4).u34 = function (name) {
+protoOf(Companion_8).d37 = function (name) {
   return new RawElement('@kotlinx.serialization.SerialName("' + name + '")');
 };
-var Companion_instance_6;
-function Companion_getInstance_5() {
-  if (Companion_instance_6 == null)
-    new Companion_4();
-  return Companion_instance_6;
+var Companion_instance_10;
+function Companion_getInstance_9() {
+  if (Companion_instance_10 == null)
+    new Companion_8();
+  return Companion_instance_10;
 }
 function KotlinxSerializationExtension() {
-  Companion_getInstance_5();
+  Companion_getInstance_9();
 }
-protoOf(KotlinxSerializationExtension).b1b = function (ir, ast) {
+protoOf(KotlinxSerializationExtension).f1b = function (ir, ast) {
   // Inline function 'kotlin.collections.flatMap' call
   var tmp0 = NonEmptyList__toList_impl_t5xcy2(ast.ep_1);
   // Inline function 'kotlin.collections.flatMapTo' call
@@ -3993,7 +4497,7 @@ function annotateEndpointHandler($this, $receiver, endpoints) {
     tmp = tmp0_elvis_lhs;
   }
   var endpoint = tmp;
-  return injectSpringAnnotationBeforeHandler($receiver, springAnnotation(endpoint, $this.v34_1));
+  return injectSpringAnnotationBeforeHandler($receiver, springAnnotation(endpoint, $this.e37_1));
 }
 function containsEndpointNamespace($this, $receiver, endpoint) {
   // Inline function 'community.flock.wirespec.compiler.core.ir.findAll' call
@@ -4020,10 +4524,10 @@ function containsEndpointNamespace($this, $receiver, endpoint) {
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
       var tmp_0;
-      var tmp0_safe_receiver = element.pv_1;
-      var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.qu_1;
+      var tmp0_safe_receiver = element.jv_1;
+      var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.nu_1;
       if ((tmp1_safe_receiver == null ? null : tmp1_safe_receiver.xt()) === 'Wirespec.Endpoint') {
-        tmp_0 = element.nv_1.zt() === Companion_getInstance().wt(endpoint.fr_1.o1()).zt();
+        tmp_0 = element.hv_1.zt() === Companion_getInstance().wt(endpoint.fr_1.o1()).zt();
       } else {
         tmp_0 = false;
       }
@@ -4047,9 +4551,9 @@ function SpringMappingAnnotationsExtension$containsEndpointNamespace$lambda($$th
   };
 }
 function SpringMappingAnnotationsExtension(language) {
-  this.v34_1 = language;
+  this.e37_1 = language;
 }
-protoOf(SpringMappingAnnotationsExtension).b1b = function (ir, ast) {
+protoOf(SpringMappingAnnotationsExtension).f1b = function (ir, ast) {
   // Inline function 'kotlin.collections.flatMap' call
   var tmp0 = NonEmptyList__toList_impl_t5xcy2(ast.ep_1);
   // Inline function 'kotlin.collections.flatMapTo' call
@@ -4097,14 +4601,14 @@ function injectSpringAnnotationBeforeHandler(_this__u8e3s4, annotation) {
   var tmp = scope;
   // Inline function 'community.flock.wirespec.compiler.core.ir.injectBefore' call
   // Inline function 'community.flock.wirespec.compiler.core.ir.transformMatchingElements' call
-  var this_0 = scope.q18_1;
+  var this_0 = scope.a19_1;
   // Inline function 'community.flock.wirespec.compiler.core.ir.transformer' call
   // Inline function 'kotlin.apply' call
   var this_1 = new TransformerBuilder();
-  this_1.k19(injectSpringAnnotationBeforeHandler$lambda(annotation));
-  var tmp$ret$5 = this_1.f19();
-  tmp.q18_1 = transform(this_0, tmp$ret$5);
-  var tmp_0 = scope.q18_1;
+  this_1.u19(injectSpringAnnotationBeforeHandler$lambda(annotation));
+  var tmp$ret$5 = this_1.p19();
+  tmp.a19_1 = transform(this_0, tmp$ret$5);
+  var tmp_0 = scope.a19_1;
   return isInterface(tmp_0, Element) ? tmp_0 : THROW_CCE();
 }
 function springAnnotation(_this__u8e3s4, language) {
@@ -4146,27 +4650,27 @@ function injectSpringAnnotationBeforeHandler$lambda($annotation) {
   return function (element, transformer) {
     var tmp;
     if (element instanceof Interface) {
-      var injected = element.tv_1.equals(Companion_getInstance().wt('Handler')) ? listOf(new RawElement($annotation)) : emptyList();
+      var injected = element.nv_1.equals(Companion_getInstance().wt('Handler')) ? listOf(new RawElement($annotation)) : emptyList();
       var tmp_0;
       // Inline function 'kotlin.collections.isNotEmpty' call
       if (!injected.r()) {
         // Inline function 'community.flock.wirespec.compiler.core.ir.withElements' call
-        var elements = plus(injected, element.jv());
+        var elements = plus(injected, element.dv());
         var tmp_1;
         if (element instanceof File) {
-          tmp_1 = element.lv(VOID, elements);
+          tmp_1 = element.fv(VOID, elements);
         } else {
           if (element instanceof Struct) {
-            tmp_1 = element.sx(VOID, VOID, VOID, VOID, elements);
+            tmp_1 = element.mx(VOID, VOID, VOID, VOID, elements);
           } else {
             if (element instanceof Namespace) {
-              tmp_1 = element.sv(VOID, elements);
+              tmp_1 = element.mv(VOID, elements);
             } else {
               if (element instanceof Interface) {
-                tmp_1 = element.bw(VOID, elements);
+                tmp_1 = element.vv(VOID, elements);
               } else {
                 if (element instanceof Enum_1) {
-                  tmp_1 = element.gx(VOID, VOID, VOID, VOID, VOID, elements);
+                  tmp_1 = element.ax(VOID, VOID, VOID, VOID, VOID, elements);
                 } else {
                   if (element instanceof Main) {
                     tmp_1 = element;
@@ -4194,7 +4698,7 @@ function injectSpringAnnotationBeforeHandler$lambda($annotation) {
 function springAnnotation$lambda(it) {
   var tmp;
   if (it instanceof Literal) {
-    tmp = it.w1a_1;
+    tmp = it.a1b_1;
   } else {
     if (it instanceof Param) {
       tmp = '{' + it.mr_1.o1() + '}';
@@ -4267,13 +4771,13 @@ function nativeHintsFile($this, ast) {
   var endpointNames = destination_3;
   if (modelNames.r() && endpointNames.r())
     return null;
-  var pkg = $this.w34_1.bt_1;
-  var tmp_0 = Companion_getInstance().wt($this.w34_1.dt() + 'WirespecNativeHints');
+  var pkg = $this.f37_1.bt_1;
+  var tmp_0 = Companion_getInstance().wt($this.f37_1.dt() + 'WirespecNativeHints');
   return file(tmp_0, SpringNativeHintsExtension$nativeHintsFile$lambda(pkg, modelNames, endpointNames, $this));
 }
 function nativeHintsClassBody($this, names) {
   var tmp;
-  switch ($this.x34_1.e3_1) {
+  switch ($this.g37_1.e3_1) {
     case 1:
       tmp = kotlinNativeHintsClassBody($this, names);
       break;
@@ -4283,7 +4787,7 @@ function nativeHintsClassBody($this, names) {
     default:
       // Inline function 'kotlin.error' call
 
-      var message = 'SpringNativeHintsExtension supports Kotlin and Java targets only, got ' + toString($this.x34_1);
+      var message = 'SpringNativeHintsExtension supports Kotlin and Java targets only, got ' + toString($this.g37_1);
       throw IllegalStateException_init_$Create$(toString(message));
   }
   return tmp;
@@ -4298,25 +4802,25 @@ function javaNativeHintsClassBody($this, names) {
 }
 function SpringNativeHintsExtension$nativeHintsFile$lambda($pkg, $modelNames, $endpointNames, this$0) {
   return function ($this$file) {
-    $this$file.e17($pkg);
+    $this$file.o17($pkg);
     // Inline function 'kotlin.collections.forEach' call
     var _iterator__ex2g4s = $modelNames.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      $this$file.s15($pkg + '.model', element);
+      $this$file.c16($pkg + '.model', element);
     }
     // Inline function 'kotlin.collections.forEach' call
     var _iterator__ex2g4s_0 = $endpointNames.t();
     while (_iterator__ex2g4s_0.u()) {
       var element_0 = _iterator__ex2g4s_0.v();
-      $this$file.s15($pkg + '.endpoint', element_0);
-    }
-    $this$file.s15('org.springframework.aot.hint', 'MemberCategory');
-    $this$file.s15('org.springframework.aot.hint', 'RuntimeHints');
-    $this$file.s15('org.springframework.aot.hint', 'RuntimeHintsRegistrar');
-    $this$file.s15('org.springframework.context.annotation', 'Configuration');
-    $this$file.s15('org.springframework.context.annotation', 'ImportRuntimeHints');
-    $this$file.i14(nativeHintsClassBody(this$0, plus($modelNames, $endpointNames)));
+      $this$file.c16($pkg + '.endpoint', element_0);
+    }
+    $this$file.c16('org.springframework.aot.hint', 'MemberCategory');
+    $this$file.c16('org.springframework.aot.hint', 'RuntimeHints');
+    $this$file.c16('org.springframework.aot.hint', 'RuntimeHintsRegistrar');
+    $this$file.c16('org.springframework.context.annotation', 'Configuration');
+    $this$file.c16('org.springframework.context.annotation', 'ImportRuntimeHints');
+    $this$file.s14(nativeHintsClassBody(this$0, plus($modelNames, $endpointNames)));
     return Unit_instance;
   };
 }
@@ -4327,20 +4831,33 @@ function SpringNativeHintsExtension$javaNativeHintsClassBody$lambda(it) {
   return '      registerWithInnerClasses(hints, ' + it + '.class, allMembers);';
 }
 function SpringNativeHintsExtension(packageName, language) {
-  this.w34_1 = packageName;
-  this.x34_1 = language;
+  this.f37_1 = packageName;
+  this.g37_1 = language;
 }
-protoOf(SpringNativeHintsExtension).b1b = function (ir, ast) {
-  return NonEmptyList__plus_impl_xqmb9(ir, listOfNotNull(nativeHintsFile(this, ast)));
+protoOf(SpringNativeHintsExtension).f1b = function (ir, ast) {
+  return NonEmptyList__plus_impl_xqmb9(ir, listOfNotNull_0(nativeHintsFile(this, ast)));
 };
+//region block: post-declaration
+protoOf(Wrap).r35 = wrap;
+protoOf(Wrap).n35 = wrap$default;
+protoOf(Each).r35 = wrap;
+protoOf(Each).n35 = wrap$default;
+protoOf(Values).r35 = wrap;
+protoOf(Values).n35 = wrap$default;
+//endregion
 //region block: init
 Companion_instance_3 = new Companion_1();
 ChannelDslFile_instance = new ChannelDslFile();
 EndpointDslFile_instance = new EndpointDslFile();
 Companion_instance_4 = new Companion_2();
 RecordBuilder_instance = new RecordBuilder();
-TypeDslFile_instance = new TypeDslFile();
 Companion_instance_5 = new Companion_3();
+Companion_instance_6 = new Companion_4();
+RpcDslFile_instance = new RpcDslFile();
+Companion_instance_7 = new Companion_5();
+Companion_instance_8 = new Companion_6();
+TypeDslFile_instance = new TypeDslFile();
+Companion_instance_9 = new Companion_7();
 //endregion
 //region block: exports
 export {