@flock/wirespec 0.21.0 → 0.22.0

package/wirespec-src-converter-avro.mjs

@@ -1,10 +1,10 @@
 import {
-  Boolean_instance237vwt01w3hs8 as Boolean_instance,
-  Precision_P32_getInstance14q7j3bd2fxd5 as Precision_P32_getInstance,
+  Boolean_instance15wa4iqeayn6f as Boolean_instance,
+  Precision_P32_getInstance1wn9hty3a2xeu as Precision_P32_getInstance,
   Integer39lqx4uc63u28 as Integer,
-  Precision_P64_getInstanceoi1ashg00his as Precision_P64_getInstance,
+  Precision_P64_getInstance1kka8j79p47e9 as Precision_P64_getInstance,
   Number1mui0heypwdhp as Number_0,
-  Bytes_instance1o9u095wd3kx6 as Bytes_instance,
+  Bytes_instance1cqd1xiwjq94x as Bytes_instance,
   String1czvr8pxnm6on as String_0,
   Custom1lu6o8txpimqz as Custom,
   Dict3g7w5wia7rncj as Dict,
@@ -18,12 +18,15 @@ import {
   Type12n1gx16iqtcu as Type,
   Enum3l2iuc342kle6 as Enum,
   Unionccsavx6nrdr2 as Union,
-  FileExtension_JSON_getInstance34944ido213py as FileExtension_JSON_getInstance,
+  NullValue_instance1ek1wzdv4iv3a as NullValue_instance,
+  FileExtension_JSON_getInstancel2q389n0axuc as FileExtension_JSON_getInstance,
   Emitted12h24rpo4uifw as Emitted,
   Anyv7qdq63z63rc as Any,
   Refined1lkzc0dg6wey7 as Refined,
   Bytes3eoc50vgt1uem as Bytes,
   Boolean1fpfi8m5jt3fg as Boolean_0,
+  get_fields25a89ltbcl7gz as get_fields,
+  Emitterpslsvv25okcl as Emitter,
   Channel2fhxi4a4pwb64 as Channel,
   Module3a9i9fqinyump as Module,
   Root195zt6zclzd3o as Root,
@@ -35,21 +38,22 @@ import {
   Collection1k04j3hzsbod0 as Collection,
   isInterface3d6p8outrmvmk as isInterface,
   checkCountOverflow1ro2fe1r4xvgf as checkCountOverflow,
-  Unit_instance28fytmsmm6r23 as Unit_instance,
+  Unit_instancev9v8hjid95df as Unit_instance,
   first58ocm7j58k3q as first,
   toString1pkumu07cwy4m as toString,
-  IllegalStateException_init_$Create$2429fvs1h56dm as IllegalStateException_init_$Create$,
+  IllegalStateException_init_$Create$1h4bcfod21ri0 as IllegalStateException_init_$Create$,
   emptyList1g2z5xcrvp2zy as emptyList,
   collectionSizeOrDefault36dulx8yinfqm as collectionSizeOrDefault,
-  ArrayList_init_$Create$3ivpeip4ouddx as ArrayList_init_$Create$,
+  ArrayList_init_$Create$2byt5m5yn22yy as ArrayList_init_$Create$,
   toSet2orjxp16sotqu as toSet,
   listOfvhqybd2zx248 as listOf,
-  ArrayList_init_$Create$1jemgvhi5v0js as ArrayList_init_$Create$_0,
+  ArrayList_init_$Create$37gc04va6yfo2 as ArrayList_init_$Create$_0,
   addAll1k27qatfgp3k5 as addAll,
   plus310ted5e4i90h as plus,
   protoOf180f3jzyo7rfj as protoOf,
   VOID3gxj6tk5isa35 as VOID,
   initMetadataForObject1cxne3s9w65el as initMetadataForObject,
+  equals2au1ep9vhcato as equals,
   KtList3hktaavzmj137 as KtList,
   getKClass3t8tygqu4lcxf as getKClass,
   arrayOf1akklvh2at202 as arrayOf,
@@ -59,31 +63,43 @@ import {
   toList3jhuyej2anx2q as toList,
   plus20p0vtfmu0596 as plus_0,
   initMetadataForCompanion1wyw17z38v6ac as initMetadataForCompanion,
-  objectCreate1ve4bgxiu4x98 as objectCreate,
   copyToArray2j022khrow2yi as copyToArray,
-  LazyThreadSafetyMode_PUBLICATION_getInstance1vspt3xrdob1a as LazyThreadSafetyMode_PUBLICATION_getInstance,
+  objectCreate1ve4bgxiu4x98 as objectCreate,
+  LazyThreadSafetyMode_PUBLICATION_getInstance3qslfm3vqg6y3 as LazyThreadSafetyMode_PUBLICATION_getInstance,
   lazy1261dae0bgscp as lazy,
+  toString30pk9tzaqopn as toString_0,
   getStringHashCode26igk1bx568vk as getStringHashCode,
+  hashCodeq5arwsb9dgti as hashCode,
   initMetadataForClassbxx6q50dy2s7 as initMetadataForClass,
   AbstractList3ck35puwbp1e9 as AbstractList,
   toList383f556t1dixk as toList_0,
   initMetadataForInterface1egvbzx539z91 as initMetadataForInterface,
-  hashCodeq5arwsb9dgti as hashCode,
-  equals2au1ep9vhcato as equals,
-  StringCompanionObject_instance3sox3h548pjra as StringCompanionObject_instance,
+  getValue48kllevslyh6 as getValue,
+  StringCompanionObject_instance1v0ht40fz3tq0 as StringCompanionObject_instance,
 } from './kotlin-kotlin-stdlib.mjs';
 import {
-  NonEmptyList__toList_impl_t5xcy2362qtlja6arn8 as NonEmptyList__toList_impl_t5xcy2,
-  _NonEmptyList___get_all__impl__pmf5092svcdxelgy1aa as _NonEmptyList___get_all__impl__pmf509,
-  _NonEmptyList___init__impl__fxd0xp3qwfhfa83yk9f as _NonEmptyList___init__impl__fxd0xp,
+  toDefaultValue3275mygjoueae as toDefaultValue,
+  toJsonElement1kac8qrfwiq85 as toJsonElement,
+  withValidEnumDefaults1a27sgh5tk9q4 as withValidEnumDefaults,
+} from './wirespec-src-converter-common.mjs';
+import {
+  NonEmptyList__toList_impl_t5xcy266xhxpenbpfx as NonEmptyList__toList_impl_t5xcy2,
+  _NonEmptyList___get_all__impl__pmf5092xnz0i2teaa6d as _NonEmptyList___get_all__impl__pmf509,
+  _NonEmptyList___init__impl__fxd0xprpnd63likgzm as _NonEmptyList___init__impl__fxd0xp,
   toNonEmptyListOrNull2ovnnazjb3msz as toNonEmptyListOrNull,
   NonEmptyList3ak25ihy2gcvs as NonEmptyList,
   nonEmptyListOf17xawqyzwrlrt as nonEmptyListOf,
 } from './arrow-arrow-core.mjs';
 import {
-  Default_getInstancejkv49nkel8hp as Default_getInstance,
+  Default_getInstancejyc493d440j2 as Default_getInstance,
   Jsonsmkyu9xjl7fv as Json,
+  JsonEncoder1qlse6simkfi1 as JsonEncoder,
+  JsonObjectBuilder2nl6rv6vdayuk as JsonObjectBuilder,
+  put2xyujhcf0ewjd as put,
   JsonDecoder1rijst5ne6qla as JsonDecoder,
+  get_jsonObject2u4z2ch1uuca9 as get_jsonObject,
+  get_jsonPrimitivez17tyd5rw1ql as get_jsonPrimitive,
+  get_contentOrNull35s97cgi8z9eo as get_contentOrNull,
   JsonObjectee06ihoeeiqj as JsonObject,
   JsonArray2urf8ey7u44sd as JsonArray,
   JsonPrimitive3ttzjh2ft5dnx as JsonPrimitive,
@@ -91,66 +107,68 @@ import {
 import {
   serializer1i4e9ym37oxmo as serializer,
   KSerializerzf77vz1967fq as KSerializer,
+  SerializerFactory1qv9hivitncuv as SerializerFactory,
   PluginGeneratedSerialDescriptorqdzeg5asqhfg as PluginGeneratedSerialDescriptor,
-  StringSerializer_getInstance2hpyx1v3alnih as StringSerializer_getInstance,
-  UnknownFieldException_init_$Create$2dwzk7svpmqo1 as UnknownFieldException_init_$Create$,
-  get_nullable197rfua9r7fsz as get_nullable,
+  UnknownFieldException_init_$Create$29petggjjaptk as UnknownFieldException_init_$Create$,
+  StringSerializer_getInstance11v9md0a7d9yk as StringSerializer_getInstance,
   typeParametersSerializers2likxjr48tr7y as typeParametersSerializers,
   GeneratedSerializer1f7t7hssdd2ws as GeneratedSerializer,
   throwMissingFieldException2cmke0v3ynf14 as throwMissingFieldException,
-  SerializerFactory1qv9hivitncuv as SerializerFactory,
   ArrayListSerializer7k5wnrulb3y6 as ArrayListSerializer,
-  IntSerializer_getInstance3pev8isxtkhc2 as IntSerializer_getInstance,
-  SEALED_getInstance1vxvpfzfxmg5m as SEALED_getInstance,
+  get_nullable197rfua9r7fsz as get_nullable,
+  IntSerializer_getInstanceuhm8c1wku08l as IntSerializer_getInstance,
+  buildClassSerialDescriptors2a6xdp6mrtw as buildClassSerialDescriptor,
+  SerializationException_init_$Create$2snijnm3rk5ru as SerializationException_init_$Create$,
+  SEALED_getInstance2urch17m532zf as SEALED_getInstance,
   buildSerialDescriptor2873qmkp8r2ib as buildSerialDescriptor,
   ListSerializer1hxuk9dx5n9du as ListSerializer,
-  SerializationException_init_$Create$2gf2fbfh3gfxm as SerializationException_init_$Create$,
   serializer1x79l67jvwntn as serializer_0,
+  SerializableWithd2dap36updxd as SerializableWith,
 } from './kotlinx-serialization-kotlinx-serialization-core.mjs';
 //region block: imports
 var imul = Math.imul;
 //endregion
 //region block: pre-declaration
 initMetadataForObject(AvroConverter, 'AvroConverter');
-initMetadataForObject(AvroJsonEmitter, 'AvroJsonEmitter');
+initMetadataForObject(AvroJsonEmitter, 'AvroJsonEmitter', VOID, VOID, [Emitter]);
 initMetadataForObject(AvroJsonParser, 'AvroJsonParser');
 initMetadataForCompanion(Companion);
-initMetadataForObject($serializer, '$serializer', VOID, VOID, [GeneratedSerializer]);
 initMetadataForCompanion(Companion_0);
 initMetadataForCompanion(Companion_1, VOID, [SerializerFactory]);
 initMetadataForCompanion(Companion_2);
-initMetadataForObject($serializer_0, '$serializer', VOID, VOID, [GeneratedSerializer]);
+initMetadataForObject($serializer, '$serializer', VOID, VOID, [GeneratedSerializer]);
 initMetadataForCompanion(Companion_3);
-initMetadataForObject($serializer_1, '$serializer', VOID, VOID, [GeneratedSerializer]);
+initMetadataForObject($serializer_0, '$serializer', VOID, VOID, [GeneratedSerializer]);
 initMetadataForCompanion(Companion_4);
-initMetadataForObject($serializer_2, '$serializer', VOID, VOID, [GeneratedSerializer]);
+initMetadataForObject($serializer_1, '$serializer', VOID, VOID, [GeneratedSerializer]);
 initMetadataForCompanion(Companion_5);
-initMetadataForObject($serializer_3, '$serializer', VOID, VOID, [GeneratedSerializer]);
+initMetadataForObject($serializer_2, '$serializer', VOID, VOID, [GeneratedSerializer]);
 initMetadataForCompanion(Companion_6);
-initMetadataForObject($serializer_4, '$serializer', VOID, VOID, [GeneratedSerializer]);
+initMetadataForObject($serializer_3, '$serializer', VOID, VOID, [GeneratedSerializer]);
 initMetadataForCompanion(Companion_7);
-initMetadataForObject($serializer_5, '$serializer', VOID, VOID, [GeneratedSerializer]);
+initMetadataForObject($serializer_4, '$serializer', VOID, VOID, [GeneratedSerializer]);
 initMetadataForCompanion(Companion_8);
-initMetadataForObject($serializer_6, '$serializer', VOID, VOID, [GeneratedSerializer]);
-initMetadataForClass(Field_0, 'Field', VOID, VOID, VOID, VOID, VOID, {0: $serializer_getInstance});
+initMetadataForObject($serializer_5, '$serializer', VOID, VOID, [GeneratedSerializer]);
+initMetadataForClass(Field_0, 'Field', VOID, VOID, VOID, VOID, VOID, {0: FieldSerializer_getInstance});
 initMetadataForClass(TypeList, 'TypeList', VOID, AbstractList, VOID, VOID, VOID, {0: TypeListSerializer_getInstance});
 initMetadataForInterface(Type_0, 'Type', VOID, VOID, VOID, VOID, VOID, {0: TypeSerializer_getInstance});
-initMetadataForClass(SimpleType, 'SimpleType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_0});
-initMetadataForClass(RecordType, 'RecordType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_1});
-initMetadataForClass(ArrayType, 'ArrayType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_2});
-initMetadataForClass(MapType, 'MapType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_3});
-initMetadataForClass(EnumType, 'EnumType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_4});
-initMetadataForClass(UnionType, 'UnionType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_5});
-initMetadataForClass(LogicalType, 'LogicalType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_6});
+initMetadataForClass(SimpleType, 'SimpleType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance});
+initMetadataForClass(RecordType, 'RecordType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_0});
+initMetadataForClass(ArrayType, 'ArrayType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_1});
+initMetadataForClass(MapType, 'MapType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_2});
+initMetadataForClass(EnumType, 'EnumType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_3});
+initMetadataForClass(UnionType, 'UnionType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_4});
+initMetadataForClass(LogicalType, 'LogicalType', VOID, VOID, [Type_0], VOID, VOID, {0: $serializer_getInstance_5});
+initMetadataForObject(FieldSerializer, 'FieldSerializer', VOID, VOID, [KSerializer]);
 initMetadataForObject(TypeListSerializer, 'TypeListSerializer', VOID, VOID, [KSerializer]);
 initMetadataForObject(TypeSerializer, 'TypeSerializer', VOID, VOID, [KSerializer]);
 //endregion
-function isNullable($this, _this__u8e3s4) {
-  return _this__u8e3s4.v1($this.p46_1);
+function isNullable($this, $receiver) {
+  return $receiver.v1($this.c48_1);
 }
-function toPrimitive($this, _this__u8e3s4) {
+function toPrimitive($this, $receiver) {
   var tmp;
-  switch (_this__u8e3s4.q46_1) {
+  switch ($receiver.d48_1) {
     case 'boolean':
       tmp = Boolean_instance;
       break;
@@ -173,15 +191,17 @@ function toPrimitive($this, _this__u8e3s4) {
       tmp = new String_0(null);
       break;
     default:
-      var reason = 'primitive not mapped ' + _this__u8e3s4.q46_1;
+      // Inline function 'kotlin.TODO' call
+
+      var reason = 'primitive not mapped ' + $receiver.d48_1;
       throw new NotImplementedError('An operation is not implemented: ' + reason);
   }
   return tmp;
 }
-function toReference($this, _this__u8e3s4, isNullable) {
+function toReference($this, $receiver, isNullable) {
   var tmp;
-  if (_this__u8e3s4 instanceof SimpleType) {
-    switch (_this__u8e3s4.q46_1) {
+  if ($receiver instanceof SimpleType) {
+    switch ($receiver.d48_1) {
       case 'null':
         tmp = new Unit(isNullable);
         break;
@@ -192,30 +212,30 @@ function toReference($this, _this__u8e3s4, isNullable) {
       case 'double':
       case 'bytes':
       case 'string':
-        tmp = new Primitive(toPrimitive($this, _this__u8e3s4), isNullable);
+        tmp = new Primitive(toPrimitive($this, $receiver), isNullable);
         break;
       default:
-        tmp = new Custom(_this__u8e3s4.q46_1, isNullable);
+        tmp = new Custom($receiver.d48_1, isNullable);
         break;
     }
   } else {
-    if (_this__u8e3s4 instanceof ArrayType) {
-      tmp = new Iterable(toReference($this, _this__u8e3s4.j47_1, false), isNullable);
+    if ($receiver instanceof ArrayType) {
+      tmp = new Iterable(toReference($this, $receiver.w48_1, false), isNullable);
     } else {
-      if (_this__u8e3s4 instanceof RecordType) {
-        tmp = new Custom(_this__u8e3s4.e47_1, isNullable);
+      if ($receiver instanceof RecordType) {
+        tmp = new Custom($receiver.r48_1, isNullable);
       } else {
-        if (_this__u8e3s4 instanceof EnumType) {
-          tmp = new Custom(_this__u8e3s4.a47_1, isNullable);
+        if ($receiver instanceof EnumType) {
+          tmp = new Custom($receiver.n48_1, isNullable);
         } else {
-          if (_this__u8e3s4 instanceof LogicalType) {
-            tmp = toReference($this, new SimpleType(_this__u8e3s4.v46_1), isNullable);
+          if ($receiver instanceof LogicalType) {
+            tmp = toReference($this, new SimpleType($receiver.i48_1), isNullable);
           } else {
-            if (_this__u8e3s4 instanceof MapType) {
-              tmp = new Dict(toReference($this, _this__u8e3s4.u46_1, false), isNullable);
+            if ($receiver instanceof MapType) {
+              tmp = new Dict(toReference($this, $receiver.h48_1, false), isNullable);
             } else {
-              if (_this__u8e3s4 instanceof UnionType) {
-                tmp = new Custom(_this__u8e3s4.r46_1, isNullable);
+              if ($receiver instanceof UnionType) {
+                tmp = new Custom($receiver.e48_1, isNullable);
               } else {
                 noWhenBranchMatchedException();
               }
@@ -227,11 +247,11 @@ function toReference($this, _this__u8e3s4, isNullable) {
   }
   return tmp;
 }
-function toReference_0($this, _this__u8e3s4) {
-  var list = minus(_this__u8e3s4, $this.p46_1);
+function toReference_0($this, $receiver) {
+  var list = minus($receiver, $this.c48_1);
   var tmp;
   if (list.b1() === 1) {
-    tmp = toReference($this, first(list), isNullable($this, _this__u8e3s4));
+    tmp = toReference($this, first(list), isNullable($this, $receiver));
   } else {
     var tmp$ret$0;
     $l$block: {
@@ -258,57 +278,61 @@ function toReference_0($this, _this__u8e3s4) {
       tmp$ret$0 = count;
     }
     if (tmp$ret$0 > 1) {
+      // Inline function 'kotlin.error' call
       var message = 'Cannot have multiple SimpleTypes in Union';
       throw IllegalStateException_init_$Create$(toString(message));
     } else {
-      tmp = toReference($this, first(list), isNullable($this, _this__u8e3s4));
+      tmp = toReference($this, first(list), isNullable($this, $receiver));
     }
   }
   return tmp;
 }
-function toType($this, _this__u8e3s4) {
+function toType($this, $receiver) {
   var tmp0_annotations = emptyList();
-  var tmp1_identifier = new DefinitionIdentifier(_this__u8e3s4.e47_1);
+  var tmp1_identifier = new DefinitionIdentifier($receiver.r48_1);
   var tmp2_extends = emptyList();
   // Inline function 'kotlin.collections.map' call
-  var this_0 = _this__u8e3s4.g47_1;
+  var this_0 = $receiver.t48_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp0_identifier = new FieldIdentifier(item.k47_1);
-    var tmp1_annotations = emptyList();
-    var tmp2_reference = toReference_0(AvroConverter_getInstance(), item.l47_1);
-    var tmp$ret$0 = new Field(tmp1_annotations, tmp0_identifier, tmp2_reference);
-    destination.x(tmp$ret$0);
+    // Inline function 'kotlin.let' call
+    var reference = toReference_0(AvroConverter_getInstance(), item.y48_1);
+    var tmp1_identifier_0 = new FieldIdentifier(item.x48_1);
+    var tmp2_annotations = emptyList();
+    var tmp0_safe_receiver = item.a49_1;
+    var tmp3_defaultValue = tmp0_safe_receiver == null ? null : toDefaultValue(tmp0_safe_receiver, reference);
+    var tmp$ret$2 = new Field(tmp2_annotations, tmp1_identifier_0, reference, tmp3_defaultValue);
+    destination.x(tmp$ret$2);
   }
   var tmp3_shape = new Shape(destination);
   return new Type(null, tmp0_annotations, tmp1_identifier, tmp3_shape, tmp2_extends);
 }
-function toEnum($this, _this__u8e3s4) {
-  return new Enum(null, emptyList(), new DefinitionIdentifier(_this__u8e3s4.a47_1), toSet(_this__u8e3s4.c47_1));
+function toEnum($this, $receiver) {
+  return new Enum(null, emptyList(), new DefinitionIdentifier($receiver.n48_1), toSet($receiver.p48_1));
 }
-function toUnion($this, _this__u8e3s4, name) {
+function toUnion($this, $receiver, name) {
   var tmp = emptyList();
   var tmp_0 = new DefinitionIdentifier(name);
   // Inline function 'kotlin.collections.map' call
-  var this_0 = _this__u8e3s4.s46_1;
+  var this_0 = $receiver.f48_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp$ret$0 = toReference(AvroConverter_getInstance(), item, false);
-    destination.x(tmp$ret$0);
+    var tmp$ret$2 = toReference(AvroConverter_getInstance(), item, false);
+    destination.x(tmp$ret$2);
   }
   return new Union(null, tmp, tmp_0, toSet(destination));
 }
 function AvroConverter() {
   AvroConverter_instance = this;
-  this.p46_1 = new SimpleType('null');
+  this.c48_1 = new SimpleType('null');
 }
-protoOf(AvroConverter).o47 = function (_this__u8e3s4, name) {
+protoOf(AvroConverter).b49 = function (_this__u8e3s4, name) {
   var tmp;
   if (_this__u8e3s4 instanceof SimpleType) {
     tmp = emptyList();
@@ -316,20 +340,20 @@ protoOf(AvroConverter).o47 = function (_this__u8e3s4, name) {
     if (_this__u8e3s4 instanceof RecordType) {
       var tmp_0 = listOf(toType(this, _this__u8e3s4));
       // Inline function 'kotlin.collections.flatMap' call
-      var tmp0 = _this__u8e3s4.g47_1;
+      var tmp0 = _this__u8e3s4.t48_1;
       // Inline function 'kotlin.collections.flatMapTo' call
       var destination = ArrayList_init_$Create$_0();
       var _iterator__ex2g4s = tmp0.t();
       while (_iterator__ex2g4s.u()) {
         var element = _iterator__ex2g4s.v();
         // Inline function 'kotlin.collections.flatMap' call
-        var tmp0_0 = element.l47_1;
+        var tmp0_0 = element.y48_1;
         // Inline function 'kotlin.collections.flatMapTo' call
         var destination_0 = ArrayList_init_$Create$_0();
         var _iterator__ex2g4s_0 = tmp0_0.t();
         while (_iterator__ex2g4s_0.u()) {
           var element_0 = _iterator__ex2g4s_0.v();
-          var list = AvroConverter_getInstance().o47(element_0, name);
+          var list = AvroConverter_getInstance().b49(element_0, name);
           addAll(destination_0, list);
         }
         var list_0 = destination_0;
@@ -338,7 +362,7 @@ protoOf(AvroConverter).o47 = function (_this__u8e3s4, name) {
       tmp = plus(tmp_0, destination);
     } else {
       if (_this__u8e3s4 instanceof ArrayType) {
-        tmp = this.o47(_this__u8e3s4.j47_1, name);
+        tmp = this.b49(_this__u8e3s4.w48_1, name);
       } else {
         if (_this__u8e3s4 instanceof EnumType) {
           tmp = listOf(toEnum(this, _this__u8e3s4));
@@ -347,7 +371,7 @@ protoOf(AvroConverter).o47 = function (_this__u8e3s4, name) {
             tmp = emptyList();
           } else {
             if (_this__u8e3s4 instanceof MapType) {
-              tmp = this.o47(_this__u8e3s4.u46_1, name);
+              tmp = this.b49(_this__u8e3s4.h48_1, name);
             } else {
               if (_this__u8e3s4 instanceof UnionType) {
                 tmp = listOf(toUnion(this, _this__u8e3s4, name));
@@ -362,9 +386,9 @@ protoOf(AvroConverter).o47 = function (_this__u8e3s4, name) {
   }
   return tmp;
 };
-protoOf(AvroConverter).p47 = function (_this__u8e3s4, name, $super) {
+protoOf(AvroConverter).c49 = function (_this__u8e3s4, name, $super) {
   name = name === VOID ? '' : name;
-  return $super === VOID ? this.o47(_this__u8e3s4, name) : $super.o47.call(this, _this__u8e3s4, name);
+  return $super === VOID ? this.b49(_this__u8e3s4, name) : $super.b49.call(this, _this__u8e3s4, name);
 };
 var AvroConverter_instance;
 function AvroConverter_getInstance() {
@@ -372,16 +396,19 @@ function AvroConverter_getInstance() {
     new AvroConverter();
   return AvroConverter_instance;
 }
-function findType($this, _this__u8e3s4, name) {
+function isNonNull($this, $receiver) {
+  return !($receiver == null) && !equals($receiver, NullValue_instance);
+}
+function findType($this, $receiver, name) {
   // Inline function 'kotlin.collections.find' call
-  var tmp0 = NonEmptyList__toList_impl_t5xcy2(_this__u8e3s4.gr_1);
+  var tmp0 = NonEmptyList__toList_impl_t5xcy2($receiver.zo_1);
   var tmp$ret$1;
   $l$block: {
     // Inline function 'kotlin.collections.firstOrNull' call
     var _iterator__ex2g4s = tmp0.t();
     while (_iterator__ex2g4s.u()) {
       var element = _iterator__ex2g4s.v();
-      if (element.mr().m1() === name) {
+      if (element.tr().m1() === name) {
         tmp$ret$1 = element;
         break $l$block;
       }
@@ -392,14 +419,18 @@ function findType($this, _this__u8e3s4, name) {
 }
 function AvroJsonEmitter() {
   AvroJsonEmitter_instance = this;
-  this.q47_1 = FileExtension_JSON_getInstance();
+  this.d49_1 = FileExtension_JSON_getInstance();
+  this.e49_1 = true;
 }
-protoOf(AvroJsonEmitter).kr = function () {
-  return this.q47_1;
+protoOf(AvroJsonEmitter).op = function () {
+  return this.d49_1;
 };
-protoOf(AvroJsonEmitter).no = function (ast, logger) {
+protoOf(AvroJsonEmitter).np = function () {
+  return this.e49_1;
+};
+protoOf(AvroJsonEmitter).mo = function (ast, logger) {
   // Inline function 'arrow.core.NonEmptyList.map' call
-  var this_0 = ast.hr_1;
+  var this_0 = ast.xo_1;
   // Inline function 'kotlin.collections.map' call
   var this_1 = _NonEmptyList___get_all__impl__pmf509(this_0);
   // Inline function 'kotlin.collections.mapTo' call
@@ -407,9 +438,9 @@ protoOf(AvroJsonEmitter).no = function (ast, logger) {
   var _iterator__ex2g4s = this_1.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    logger.ir('Emitting Nodes from ' + item.fr_1.co_1 + ' ');
-    var tmp$ret$0 = AvroJsonEmitter_getInstance().r47(item);
-    destination.x(tmp$ret$0);
+    logger.qr('Emitting Nodes from ' + item.yo_1.bo_1 + ' ');
+    var tmp$ret$3 = AvroJsonEmitter_getInstance().f49(item);
+    destination.x(tmp$ret$3);
   }
   // Inline function 'arrow.core.NonEmptyList.map' call
   var this_2 = _NonEmptyList___init__impl__fxd0xp(destination);
@@ -423,11 +454,11 @@ protoOf(AvroJsonEmitter).no = function (ast, logger) {
     // Inline function 'kotlinx.serialization.encodeToString' call
     var this_4 = Default_getInstance();
     // Inline function 'kotlinx.serialization.serializer' call
-    var this_5 = this_4.w23();
+    var this_5 = this_4.c25();
     // Inline function 'kotlinx.serialization.internal.cast' call
     var this_6 = serializer(this_5, createKType(getKClass(KtList), arrayOf([createInvariantKTypeProjection(createKType(getKClass(Type_0), arrayOf([]), false))]), false));
-    var tmp$ret$5 = isInterface(this_6, KSerializer) ? this_6 : THROW_CCE();
-    var tmp$ret$7 = this_4.b2l(tmp$ret$5, item_0);
+    var tmp$ret$9 = isInterface(this_6, KSerializer) ? this_6 : THROW_CCE();
+    var tmp$ret$7 = this_4.h2m(tmp$ret$9, item_0);
     destination_0.x(tmp$ret$7);
   }
   // Inline function 'arrow.core.NonEmptyList.map' call
@@ -439,45 +470,45 @@ protoOf(AvroJsonEmitter).no = function (ast, logger) {
   var _iterator__ex2g4s_1 = this_8.t();
   while (_iterator__ex2g4s_1.u()) {
     var item_1 = _iterator__ex2g4s_1.v();
-    var tmp$ret$11 = new Emitted('schema.avsc', item_1);
-    destination_1.x(tmp$ret$11);
+    var tmp$ret$14 = new Emitted('schema.avsc', item_1);
+    destination_1.x(tmp$ret$14);
   }
   return _NonEmptyList___init__impl__fxd0xp(destination_1);
 };
-protoOf(AvroJsonEmitter).s47 = function (_this__u8e3s4) {
-  return new EnumType('enum', _this__u8e3s4.yr_1.m1(), VOID, toList(_this__u8e3s4.zr_1));
+protoOf(AvroJsonEmitter).g49 = function (_this__u8e3s4) {
+  return new EnumType('enum', _this__u8e3s4.gs_1.m1(), VOID, toList(_this__u8e3s4.hs_1));
 };
-protoOf(AvroJsonEmitter).t47 = function (_this__u8e3s4) {
-  var tmp = _this__u8e3s4.aq_1.m1();
+protoOf(AvroJsonEmitter).h49 = function (_this__u8e3s4) {
+  var tmp = _this__u8e3s4.rq_1.m1();
   // Inline function 'kotlin.collections.map' call
-  var this_0 = _this__u8e3s4.bq_1;
+  var this_0 = _this__u8e3s4.sq_1;
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp$ret$0 = new SimpleType(item.m1());
-    destination.x(tmp$ret$0);
+    var tmp$ret$2 = new SimpleType(item.m1());
+    destination.x(tmp$ret$2);
   }
   return new UnionType(tmp, TypeList_init_$Create$(destination));
 };
-protoOf(AvroJsonEmitter).u47 = function (_this__u8e3s4, module_0, hasEmitted) {
+protoOf(AvroJsonEmitter).i49 = function (_this__u8e3s4, module_0, hasEmitted) {
   var tmp;
   if (_this__u8e3s4 instanceof Dict) {
-    tmp = new MapType('map', this.u47(_this__u8e3s4.bp_1, module_0, hasEmitted));
+    tmp = new MapType('map', this.i49(_this__u8e3s4.tp_1, module_0, hasEmitted));
   } else {
     if (_this__u8e3s4 instanceof Iterable) {
-      tmp = new ArrayType('array', this.u47(_this__u8e3s4.yo_1, module_0, hasEmitted));
+      tmp = new ArrayType('array', this.i49(_this__u8e3s4.qp_1, module_0, hasEmitted));
     } else {
       if (_this__u8e3s4 instanceof Primitive) {
-        var type = _this__u8e3s4.wt_1;
+        var type = _this__u8e3s4.j18_1;
         var tmp_0;
         if (type instanceof String_0) {
           tmp_0 = new SimpleType('string');
         } else {
           if (type instanceof Integer) {
             var tmp_1;
-            switch (type.tu_1.c3_1) {
+            switch (type.r18_1.c3_1) {
               case 0:
                 tmp_1 = new SimpleType('int');
                 break;
@@ -492,7 +523,7 @@ protoOf(AvroJsonEmitter).u47 = function (_this__u8e3s4, module_0, hasEmitted) {
           } else {
             if (type instanceof Number_0) {
               var tmp_2;
-              switch (type.wu_1.c3_1) {
+              switch (type.m18_1.c3_1) {
                 case 0:
                   tmp_2 = new SimpleType('float');
                   break;
@@ -520,37 +551,39 @@ protoOf(AvroJsonEmitter).u47 = function (_this__u8e3s4, module_0, hasEmitted) {
         tmp = tmp_0;
       } else {
         if (_this__u8e3s4 instanceof Custom) {
-          var def = findType(this, module_0, _this__u8e3s4.lv_1);
+          var def = findType(this, module_0, _this__u8e3s4.h18_1);
           var tmp_3;
           if (def instanceof Type) {
             var tmp_4;
-            if (hasEmitted.v1(def.eq_1.m1())) {
+            if (hasEmitted.v1(def.cp_1.m1())) {
               // Inline function 'kotlin.let' call
-              var p0 = def.eq_1.m1();
+              var p0 = def.cp_1.m1();
               tmp_4 = new SimpleType(p0);
             } else {
               // Inline function 'kotlin.also' call
-              hasEmitted.x(def.eq_1.m1());
-              tmp_4 = this.v47(def, module_0, hasEmitted);
+              hasEmitted.x(def.cp_1.m1());
+              tmp_4 = this.j49(def, module_0, hasEmitted);
             }
             tmp_3 = tmp_4;
           } else {
             if (def instanceof Enum) {
-              tmp_3 = new SimpleType(def.yr_1.m1());
+              tmp_3 = new SimpleType(def.gs_1.m1());
             } else {
               if (def instanceof Refined) {
                 tmp_3 = new SimpleType('string');
               } else {
-                tmp_3 = new SimpleType(_this__u8e3s4.lv_1);
+                tmp_3 = new SimpleType(_this__u8e3s4.h18_1);
               }
             }
           }
           tmp = tmp_3;
         } else {
           if (_this__u8e3s4 instanceof Any) {
+            // Inline function 'kotlin.TODO' call
             throw new NotImplementedError();
           } else {
             if (_this__u8e3s4 instanceof Unit) {
+              // Inline function 'kotlin.TODO' call
               throw new NotImplementedError();
             } else {
               noWhenBranchMatchedException();
@@ -562,42 +595,40 @@ protoOf(AvroJsonEmitter).u47 = function (_this__u8e3s4, module_0, hasEmitted) {
   }
   return tmp;
 };
-protoOf(AvroJsonEmitter).w47 = function (_this__u8e3s4, module_0, hasEmitted) {
-  var ref = _this__u8e3s4.tp_1;
+protoOf(AvroJsonEmitter).k49 = function (_this__u8e3s4, module_0, hasEmitted) {
+  var ref = _this__u8e3s4.hp_1;
   var tmp;
   if (ref instanceof Iterable) {
-    tmp = new ArrayType('array', this.u47(ref.yo_1, module_0, hasEmitted));
+    tmp = new ArrayType('array', this.i49(ref.qp_1, module_0, hasEmitted));
   } else {
-    tmp = this.u47(ref, module_0, hasEmitted);
+    tmp = this.i49(ref, module_0, hasEmitted);
   }
   return tmp;
 };
-protoOf(AvroJsonEmitter).v47 = function (_this__u8e3s4, module_0, hasEmitted) {
-  var tmp0_name = _this__u8e3s4.eq_1.m1();
+protoOf(AvroJsonEmitter).j49 = function (_this__u8e3s4, module_0, hasEmitted) {
+  var tmp0_name = _this__u8e3s4.cp_1.m1();
   // Inline function 'kotlin.collections.map' call
-  var this_0 = _this__u8e3s4.fq_1.kp_1;
+  var this_0 = get_fields(_this__u8e3s4.dp_1);
   // Inline function 'kotlin.collections.mapTo' call
   var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
   var _iterator__ex2g4s = this_0.t();
   while (_iterator__ex2g4s.u()) {
     var item = _iterator__ex2g4s.v();
-    var tmp = item.sp_1.m1();
-    var tmp_0;
-    if (item.tp_1.dv()) {
-      tmp_0 = new TypeList([new SimpleType('null'), AvroJsonEmitter_getInstance().w47(item, module_0, hasEmitted)]);
-    } else {
-      tmp_0 = new TypeList([AvroJsonEmitter_getInstance().w47(item, module_0, hasEmitted)]);
-    }
-    var tmp$ret$0 = new Field_0(tmp, tmp_0);
-    destination.x(tmp$ret$0);
+    var tmp = item.gp_1.m1();
+    // Inline function 'kotlin.let' call
+    var type = AvroJsonEmitter_getInstance().k49(item, module_0, hasEmitted);
+    var tmp_0 = !item.hp_1.et() ? new TypeList([type]) : isNonNull(AvroJsonEmitter_getInstance(), item.ip_1) ? new TypeList([type, new SimpleType('null')]) : new TypeList([new SimpleType('null'), type]);
+    var tmp0_safe_receiver = item.ip_1;
+    var tmp$ret$2 = new Field_0(tmp, tmp_0, VOID, tmp0_safe_receiver == null ? null : toJsonElement(tmp0_safe_receiver));
+    destination.x(tmp$ret$2);
   }
   return new RecordType('record', tmp0_name, VOID, destination);
 };
-protoOf(AvroJsonEmitter).r47 = function (module_0) {
+protoOf(AvroJsonEmitter).f49 = function (module_0) {
   // Inline function 'kotlin.collections.mutableListOf' call
   var hasEmitted = ArrayList_init_$Create$_0();
   // Inline function 'kotlin.collections.mapNotNull' call
-  var tmp0 = NonEmptyList__toList_impl_t5xcy2(module_0.gr_1);
+  var tmp0 = NonEmptyList__toList_impl_t5xcy2(module_0.zo_1);
   // Inline function 'kotlin.collections.mapNotNullTo' call
   var destination = ArrayList_init_$Create$_0();
   // Inline function 'kotlin.collections.forEach' call
@@ -606,13 +637,13 @@ protoOf(AvroJsonEmitter).r47 = function (module_0) {
     var element = _iterator__ex2g4s.v();
     var tmp;
     if (element instanceof Type) {
-      tmp = AvroJsonEmitter_getInstance().v47(element, module_0, hasEmitted);
+      tmp = AvroJsonEmitter_getInstance().j49(element, module_0, hasEmitted);
     } else {
       if (element instanceof Enum) {
-        tmp = AvroJsonEmitter_getInstance().s47(element);
+        tmp = AvroJsonEmitter_getInstance().g49(element);
       } else {
         if (element instanceof Union) {
-          tmp = AvroJsonEmitter_getInstance().t47(element);
+          tmp = AvroJsonEmitter_getInstance().h49(element);
         } else {
           tmp = null;
         }
@@ -635,43 +666,49 @@ function AvroJsonEmitter_getInstance() {
   return AvroJsonEmitter_instance;
 }
 function AvroJsonParser$parse$lambda($this$Json) {
-  $this$Json.w2l_1 = true;
-  $this$Json.x2l_1 = true;
+  $this$Json.c2n_1 = true;
+  $this$Json.d2n_1 = true;
   return Unit_instance;
 }
 function AvroJsonParser() {
 }
-protoOf(AvroJsonParser).j46 = function (moduleContent, strict) {
+protoOf(AvroJsonParser).v47 = function (moduleContent, strict) {
   var json = Json(VOID, AvroJsonParser$parse$lambda);
   // Inline function 'kotlinx.serialization.json.Json.decodeFromString' call
-  var string = moduleContent.xn_1;
+  var string = moduleContent.wn_1;
   // Inline function 'kotlinx.serialization.serializer' call
-  var this_0 = json.w23();
+  var this_0 = json.c25();
   // Inline function 'kotlinx.serialization.internal.cast' call
   var this_1 = serializer(this_0, createKType(getKClass(Type_0), arrayOf([]), false));
   var tmp$ret$1 = isInterface(this_1, KSerializer) ? this_1 : THROW_CCE();
-  var avro = json.c2l(tmp$ret$1, string);
-  var tmp = AvroConverter_getInstance().p47(avro);
+  var avro = json.i2m(tmp$ret$1, string);
+  var tmp = AvroConverter_getInstance().c49(avro);
   var tmp_0;
   if (avro instanceof RecordType) {
-    tmp_0 = new Channel(null, emptyList(), new DefinitionIdentifier(avro.e47_1), new Custom(avro.e47_1, false));
+    tmp_0 = new Channel(null, emptyList(), new DefinitionIdentifier(avro.r48_1), new Custom(avro.r48_1, false));
   } else {
     if (avro instanceof ArrayType) {
+      // Inline function 'kotlin.TODO' call
       throw new NotImplementedError();
     } else {
       if (avro instanceof EnumType) {
+        // Inline function 'kotlin.TODO' call
         throw new NotImplementedError();
       } else {
         if (avro instanceof SimpleType) {
+          // Inline function 'kotlin.TODO' call
           throw new NotImplementedError();
         } else {
           if (avro instanceof LogicalType) {
+            // Inline function 'kotlin.TODO' call
             throw new NotImplementedError();
           } else {
             if (avro instanceof MapType) {
+              // Inline function 'kotlin.TODO' call
               throw new NotImplementedError();
             } else {
               if (avro instanceof UnionType) {
+                // Inline function 'kotlin.TODO' call
                 throw new NotImplementedError();
               } else {
                 noWhenBranchMatchedException();
@@ -683,16 +720,27 @@ protoOf(AvroJsonParser).j46 = function (moduleContent, strict) {
     }
   }
   var result = plus_0(tmp, tmp_0);
-  var tmp1_elvis_lhs = toNonEmptyListOrNull(result);
+  // Inline function 'kotlin.collections.map' call
+  // Inline function 'kotlin.collections.mapTo' call
+  var destination = ArrayList_init_$Create$(collectionSizeOrDefault(result, 10));
+  var _iterator__ex2g4s = result.t();
+  while (_iterator__ex2g4s.u()) {
+    var item = _iterator__ex2g4s.v();
+    var tmp$ret$11 = withValidEnumDefaults(item, result);
+    destination.x(tmp$ret$11);
+  }
+  var definitions = destination;
+  var tmp1_elvis_lhs = toNonEmptyListOrNull(definitions);
   var tmp_1;
   var tmp_2 = tmp1_elvis_lhs;
   if ((tmp_2 == null ? null : new NonEmptyList(tmp_2)) == null) {
+    // Inline function 'kotlin.error' call
     var message = 'Cannot yield non empty AST';
     throw IllegalStateException_init_$Create$(toString(message));
   } else {
     tmp_1 = tmp1_elvis_lhs;
   }
-  return new Root(nonEmptyListOf(new Module(moduleContent.wn_1, tmp_1), []));
+  return new Root(nonEmptyListOf(new Module(moduleContent.vn_1, tmp_1), []));
 };
 var AvroJsonParser_instance;
 function AvroJsonParser_getInstance() {
@@ -704,114 +752,6 @@ var Companion_instance;
 function Companion_getInstance() {
   return Companion_instance;
 }
-function $serializer() {
-  $serializer_instance = this;
-  var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('community.flock.wirespec.converter.avro.AvroModel.Field', this, 4);
-  tmp0_serialDesc.v2a('name', false);
-  tmp0_serialDesc.v2a('type', false);
-  tmp0_serialDesc.v2a('doc', true);
-  tmp0_serialDesc.v2a('default', true);
-  this.x47_1 = tmp0_serialDesc;
-}
-protoOf($serializer).y47 = function (encoder, value) {
-  var tmp0_desc = this.x47_1;
-  var tmp1_output = encoder.h23(tmp0_desc);
-  tmp1_output.w24(tmp0_desc, 0, value.k47_1);
-  tmp1_output.y24(tmp0_desc, 1, TypeListSerializer_getInstance(), value.l47_1);
-  if (tmp1_output.e25(tmp0_desc, 2) ? true : !(value.m47_1 == null)) {
-    tmp1_output.a25(tmp0_desc, 2, StringSerializer_getInstance(), value.m47_1);
-  }
-  if (tmp1_output.e25(tmp0_desc, 3) ? true : !(value.n47_1 == null)) {
-    tmp1_output.a25(tmp0_desc, 3, StringSerializer_getInstance(), value.n47_1);
-  }
-  tmp1_output.i23(tmp0_desc);
-};
-protoOf($serializer).i20 = function (encoder, value) {
-  return this.y47(encoder, value instanceof Field_0 ? value : THROW_CCE());
-};
-protoOf($serializer).j20 = function (decoder) {
-  var tmp0_desc = this.x47_1;
-  var tmp1_flag = true;
-  var tmp2_index = 0;
-  var tmp3_bitMask0 = 0;
-  var tmp4_local0 = null;
-  var tmp5_local1 = null;
-  var tmp6_local2 = null;
-  var tmp7_local3 = null;
-  var tmp8_input = decoder.h23(tmp0_desc);
-  if (tmp8_input.x23()) {
-    tmp4_local0 = tmp8_input.r23(tmp0_desc, 0);
-    tmp3_bitMask0 = tmp3_bitMask0 | 1;
-    tmp5_local1 = tmp8_input.t23(tmp0_desc, 1, TypeListSerializer_getInstance(), tmp5_local1);
-    tmp3_bitMask0 = tmp3_bitMask0 | 2;
-    tmp6_local2 = tmp8_input.v23(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
-    tmp3_bitMask0 = tmp3_bitMask0 | 4;
-    tmp7_local3 = tmp8_input.v23(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
-    tmp3_bitMask0 = tmp3_bitMask0 | 8;
-  } else
-    while (tmp1_flag) {
-      tmp2_index = tmp8_input.y23(tmp0_desc);
-      switch (tmp2_index) {
-        case -1:
-          tmp1_flag = false;
-          break;
-        case 0:
-          tmp4_local0 = tmp8_input.r23(tmp0_desc, 0);
-          tmp3_bitMask0 = tmp3_bitMask0 | 1;
-          break;
-        case 1:
-          tmp5_local1 = tmp8_input.t23(tmp0_desc, 1, TypeListSerializer_getInstance(), tmp5_local1);
-          tmp3_bitMask0 = tmp3_bitMask0 | 2;
-          break;
-        case 2:
-          tmp6_local2 = tmp8_input.v23(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
-          tmp3_bitMask0 = tmp3_bitMask0 | 4;
-          break;
-        case 3:
-          tmp7_local3 = tmp8_input.v23(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
-          tmp3_bitMask0 = tmp3_bitMask0 | 8;
-          break;
-        default:
-          throw UnknownFieldException_init_$Create$(tmp2_index);
-      }
-    }
-  tmp8_input.i23(tmp0_desc);
-  return Field_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
-};
-protoOf($serializer).h20 = function () {
-  return this.x47_1;
-};
-protoOf($serializer).k2b = function () {
-  // Inline function 'kotlin.arrayOf' call
-  // Inline function 'kotlin.js.unsafeCast' call
-  // Inline function 'kotlin.js.asDynamic' call
-  return [StringSerializer_getInstance(), TypeListSerializer_getInstance(), get_nullable(StringSerializer_getInstance()), get_nullable(StringSerializer_getInstance())];
-};
-var $serializer_instance;
-function $serializer_getInstance() {
-  if ($serializer_instance == null)
-    new $serializer();
-  return $serializer_instance;
-}
-function Field_init_$Init$(seen0, name, type, doc, default_0, serializationConstructorMarker, $this) {
-  if (!(3 === (3 & seen0))) {
-    throwMissingFieldException(seen0, 3, $serializer_getInstance().x47_1);
-  }
-  $this.k47_1 = name;
-  $this.l47_1 = type;
-  if (0 === (seen0 & 4))
-    $this.m47_1 = null;
-  else
-    $this.m47_1 = doc;
-  if (0 === (seen0 & 8))
-    $this.n47_1 = null;
-  else
-    $this.n47_1 = default_0;
-  return $this;
-}
-function Field_init_$Create$(seen0, name, type, doc, default_0, serializationConstructorMarker) {
-  return Field_init_$Init$(seen0, name, type, doc, default_0, serializationConstructorMarker, objectCreate(protoOf(Field_0)));
-}
 function TypeList_init_$Init$(type, $this) {
   // Inline function 'kotlin.collections.toTypedArray' call
   var tmp$ret$0 = copyToArray(type);
@@ -829,11 +769,11 @@ function Companion_getInstance_0() {
 }
 function Companion_1() {
 }
-protoOf(Companion_1).i2n = function () {
+protoOf(Companion_1).p2o = function () {
   return TypeSerializer_getInstance();
 };
-protoOf(Companion_1).v2b = function (typeParamsSerializers) {
-  return this.i2n();
+protoOf(Companion_1).b2d = function (typeParamsSerializers) {
+  return this.p2o();
 };
 var Companion_instance_1;
 function Companion_getInstance_1() {
@@ -845,76 +785,76 @@ var Companion_instance_2;
 function Companion_getInstance_2() {
   return Companion_instance_2;
 }
-function $serializer_0() {
-  $serializer_instance_0 = this;
+function $serializer() {
+  $serializer_instance = this;
   var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('community.flock.wirespec.converter.avro.AvroModel.SimpleType', this, 1);
-  tmp0_serialDesc.v2a('value', false);
-  this.z47_1 = tmp0_serialDesc;
+  tmp0_serialDesc.b2c('value', false);
+  this.l49_1 = tmp0_serialDesc;
 }
-protoOf($serializer_0).a48 = function (encoder, value) {
-  var tmp0_desc = this.z47_1;
-  var tmp1_output = encoder.h23(tmp0_desc);
-  tmp1_output.w24(tmp0_desc, 0, value.q46_1);
-  tmp1_output.i23(tmp0_desc);
+protoOf($serializer).m49 = function (encoder, value) {
+  var tmp0_desc = this.l49_1;
+  var tmp1_output = encoder.n24(tmp0_desc);
+  tmp1_output.c26(tmp0_desc, 0, value.d48_1);
+  tmp1_output.o24(tmp0_desc);
 };
-protoOf($serializer_0).i20 = function (encoder, value) {
-  return this.a48(encoder, value instanceof SimpleType ? value : THROW_CCE());
+protoOf($serializer).o21 = function (encoder, value) {
+  return this.m49(encoder, value instanceof SimpleType ? value : THROW_CCE());
 };
-protoOf($serializer_0).j20 = function (decoder) {
-  var tmp0_desc = this.z47_1;
+protoOf($serializer).p21 = function (decoder) {
+  var tmp0_desc = this.l49_1;
   var tmp1_flag = true;
   var tmp2_index = 0;
   var tmp3_bitMask0 = 0;
   var tmp4_local0 = null;
-  var tmp5_input = decoder.h23(tmp0_desc);
-  if (tmp5_input.x23()) {
-    tmp4_local0 = tmp5_input.r23(tmp0_desc, 0);
+  var tmp5_input = decoder.n24(tmp0_desc);
+  if (tmp5_input.d25()) {
+    tmp4_local0 = tmp5_input.x24(tmp0_desc, 0);
     tmp3_bitMask0 = tmp3_bitMask0 | 1;
   } else
     while (tmp1_flag) {
-      tmp2_index = tmp5_input.y23(tmp0_desc);
+      tmp2_index = tmp5_input.e25(tmp0_desc);
       switch (tmp2_index) {
         case -1:
           tmp1_flag = false;
           break;
         case 0:
-          tmp4_local0 = tmp5_input.r23(tmp0_desc, 0);
+          tmp4_local0 = tmp5_input.x24(tmp0_desc, 0);
           tmp3_bitMask0 = tmp3_bitMask0 | 1;
           break;
         default:
           throw UnknownFieldException_init_$Create$(tmp2_index);
       }
     }
-  tmp5_input.i23(tmp0_desc);
+  tmp5_input.o24(tmp0_desc);
   return SimpleType_init_$Create$(tmp3_bitMask0, tmp4_local0, null);
 };
-protoOf($serializer_0).h20 = function () {
-  return this.z47_1;
+protoOf($serializer).n21 = function () {
+  return this.l49_1;
 };
-protoOf($serializer_0).k2b = function () {
+protoOf($serializer).q2c = function () {
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
   return [StringSerializer_getInstance()];
 };
-var $serializer_instance_0;
-function $serializer_getInstance_0() {
-  if ($serializer_instance_0 == null)
-    new $serializer_0();
-  return $serializer_instance_0;
+var $serializer_instance;
+function $serializer_getInstance() {
+  if ($serializer_instance == null)
+    new $serializer();
+  return $serializer_instance;
 }
 function SimpleType_init_$Init$(seen0, value, serializationConstructorMarker, $this) {
   if (!(1 === (1 & seen0))) {
-    throwMissingFieldException(seen0, 1, $serializer_getInstance_0().z47_1);
+    throwMissingFieldException(seen0, 1, $serializer_getInstance().l49_1);
   }
-  $this.q46_1 = value;
+  $this.d48_1 = value;
   return $this;
 }
 function SimpleType_init_$Create$(seen0, value, serializationConstructorMarker) {
   return SimpleType_init_$Init$(seen0, value, serializationConstructorMarker, objectCreate(protoOf(SimpleType)));
 }
 function AvroModel$RecordType$Companion$$childSerializers$_anonymous__y3fmeq() {
-  return new ArrayListSerializer($serializer_getInstance());
+  return new ArrayListSerializer(FieldSerializer_getInstance());
 }
 function Companion_3() {
   Companion_instance_3 = this;
@@ -923,10 +863,10 @@ function Companion_3() {
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
-  tmp.b48_1 = [null, null, null, lazy(tmp_0, AvroModel$RecordType$Companion$$childSerializers$_anonymous__y3fmeq), null];
+  tmp.n49_1 = [null, null, null, lazy(tmp_0, AvroModel$RecordType$Companion$$childSerializers$_anonymous__y3fmeq), null];
 }
-protoOf(Companion_3).i2n = function () {
-  return $serializer_getInstance_1();
+protoOf(Companion_3).p2o = function () {
+  return $serializer_getInstance_0();
 };
 var Companion_instance_3;
 function Companion_getInstance_3() {
@@ -934,36 +874,36 @@ function Companion_getInstance_3() {
     new Companion_3();
   return Companion_instance_3;
 }
-function $serializer_1() {
-  $serializer_instance_1 = this;
+function $serializer_0() {
+  $serializer_instance_0 = this;
   var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('community.flock.wirespec.converter.avro.AvroModel.RecordType', this, 5);
-  tmp0_serialDesc.v2a('type', false);
-  tmp0_serialDesc.v2a('name', false);
-  tmp0_serialDesc.v2a('namespace', true);
-  tmp0_serialDesc.v2a('fields', false);
-  tmp0_serialDesc.v2a('doc', true);
-  this.c48_1 = tmp0_serialDesc;
-}
-protoOf($serializer_1).d48 = function (encoder, value) {
-  var tmp0_desc = this.c48_1;
-  var tmp1_output = encoder.h23(tmp0_desc);
-  var tmp2_cached = Companion_getInstance_3().b48_1;
-  tmp1_output.w24(tmp0_desc, 0, value.d47_1);
-  tmp1_output.w24(tmp0_desc, 1, value.e47_1);
-  if (tmp1_output.e25(tmp0_desc, 2) ? true : !(value.f47_1 == null)) {
-    tmp1_output.a25(tmp0_desc, 2, StringSerializer_getInstance(), value.f47_1);
+  tmp0_serialDesc.b2c('type', false);
+  tmp0_serialDesc.b2c('name', false);
+  tmp0_serialDesc.b2c('namespace', true);
+  tmp0_serialDesc.b2c('fields', false);
+  tmp0_serialDesc.b2c('doc', true);
+  this.o49_1 = tmp0_serialDesc;
+}
+protoOf($serializer_0).p49 = function (encoder, value) {
+  var tmp0_desc = this.o49_1;
+  var tmp1_output = encoder.n24(tmp0_desc);
+  var tmp2_cached = Companion_getInstance_3().n49_1;
+  tmp1_output.c26(tmp0_desc, 0, value.q48_1);
+  tmp1_output.c26(tmp0_desc, 1, value.r48_1);
+  if (tmp1_output.k26(tmp0_desc, 2) ? true : !(value.s48_1 == null)) {
+    tmp1_output.g26(tmp0_desc, 2, StringSerializer_getInstance(), value.s48_1);
   }
-  tmp1_output.y24(tmp0_desc, 3, tmp2_cached[3].m1(), value.g47_1);
-  if (tmp1_output.e25(tmp0_desc, 4) ? true : !(value.h47_1 == null)) {
-    tmp1_output.a25(tmp0_desc, 4, StringSerializer_getInstance(), value.h47_1);
+  tmp1_output.e26(tmp0_desc, 3, tmp2_cached[3].m1(), value.t48_1);
+  if (tmp1_output.k26(tmp0_desc, 4) ? true : !(value.u48_1 == null)) {
+    tmp1_output.g26(tmp0_desc, 4, StringSerializer_getInstance(), value.u48_1);
   }
-  tmp1_output.i23(tmp0_desc);
+  tmp1_output.o24(tmp0_desc);
 };
-protoOf($serializer_1).i20 = function (encoder, value) {
-  return this.d48(encoder, value instanceof RecordType ? value : THROW_CCE());
+protoOf($serializer_0).o21 = function (encoder, value) {
+  return this.p49(encoder, value instanceof RecordType ? value : THROW_CCE());
 };
-protoOf($serializer_1).j20 = function (decoder) {
-  var tmp0_desc = this.c48_1;
+protoOf($serializer_0).p21 = function (decoder) {
+  var tmp0_desc = this.o49_1;
   var tmp1_flag = true;
   var tmp2_index = 0;
   var tmp3_bitMask0 = 0;
@@ -972,84 +912,84 @@ protoOf($serializer_1).j20 = function (decoder) {
   var tmp6_local2 = null;
   var tmp7_local3 = null;
   var tmp8_local4 = null;
-  var tmp9_input = decoder.h23(tmp0_desc);
-  var tmp10_cached = Companion_getInstance_3().b48_1;
-  if (tmp9_input.x23()) {
-    tmp4_local0 = tmp9_input.r23(tmp0_desc, 0);
+  var tmp9_input = decoder.n24(tmp0_desc);
+  var tmp10_cached = Companion_getInstance_3().n49_1;
+  if (tmp9_input.d25()) {
+    tmp4_local0 = tmp9_input.x24(tmp0_desc, 0);
     tmp3_bitMask0 = tmp3_bitMask0 | 1;
-    tmp5_local1 = tmp9_input.r23(tmp0_desc, 1);
+    tmp5_local1 = tmp9_input.x24(tmp0_desc, 1);
     tmp3_bitMask0 = tmp3_bitMask0 | 2;
-    tmp6_local2 = tmp9_input.v23(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+    tmp6_local2 = tmp9_input.b25(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
     tmp3_bitMask0 = tmp3_bitMask0 | 4;
-    tmp7_local3 = tmp9_input.t23(tmp0_desc, 3, tmp10_cached[3].m1(), tmp7_local3);
+    tmp7_local3 = tmp9_input.z24(tmp0_desc, 3, tmp10_cached[3].m1(), tmp7_local3);
     tmp3_bitMask0 = tmp3_bitMask0 | 8;
-    tmp8_local4 = tmp9_input.v23(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+    tmp8_local4 = tmp9_input.b25(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
     tmp3_bitMask0 = tmp3_bitMask0 | 16;
   } else
     while (tmp1_flag) {
-      tmp2_index = tmp9_input.y23(tmp0_desc);
+      tmp2_index = tmp9_input.e25(tmp0_desc);
       switch (tmp2_index) {
         case -1:
           tmp1_flag = false;
           break;
         case 0:
-          tmp4_local0 = tmp9_input.r23(tmp0_desc, 0);
+          tmp4_local0 = tmp9_input.x24(tmp0_desc, 0);
           tmp3_bitMask0 = tmp3_bitMask0 | 1;
           break;
         case 1:
-          tmp5_local1 = tmp9_input.r23(tmp0_desc, 1);
+          tmp5_local1 = tmp9_input.x24(tmp0_desc, 1);
           tmp3_bitMask0 = tmp3_bitMask0 | 2;
           break;
         case 2:
-          tmp6_local2 = tmp9_input.v23(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+          tmp6_local2 = tmp9_input.b25(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
           tmp3_bitMask0 = tmp3_bitMask0 | 4;
           break;
         case 3:
-          tmp7_local3 = tmp9_input.t23(tmp0_desc, 3, tmp10_cached[3].m1(), tmp7_local3);
+          tmp7_local3 = tmp9_input.z24(tmp0_desc, 3, tmp10_cached[3].m1(), tmp7_local3);
           tmp3_bitMask0 = tmp3_bitMask0 | 8;
           break;
         case 4:
-          tmp8_local4 = tmp9_input.v23(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+          tmp8_local4 = tmp9_input.b25(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
           tmp3_bitMask0 = tmp3_bitMask0 | 16;
           break;
         default:
           throw UnknownFieldException_init_$Create$(tmp2_index);
       }
     }
-  tmp9_input.i23(tmp0_desc);
+  tmp9_input.o24(tmp0_desc);
   return RecordType_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, null);
 };
-protoOf($serializer_1).h20 = function () {
-  return this.c48_1;
+protoOf($serializer_0).n21 = function () {
+  return this.o49_1;
 };
-protoOf($serializer_1).k2b = function () {
-  var tmp0_cached = Companion_getInstance_3().b48_1;
+protoOf($serializer_0).q2c = function () {
+  var tmp0_cached = Companion_getInstance_3().n49_1;
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
   return [StringSerializer_getInstance(), StringSerializer_getInstance(), get_nullable(StringSerializer_getInstance()), tmp0_cached[3].m1(), get_nullable(StringSerializer_getInstance())];
 };
-var $serializer_instance_1;
-function $serializer_getInstance_1() {
-  if ($serializer_instance_1 == null)
-    new $serializer_1();
-  return $serializer_instance_1;
+var $serializer_instance_0;
+function $serializer_getInstance_0() {
+  if ($serializer_instance_0 == null)
+    new $serializer_0();
+  return $serializer_instance_0;
 }
 function RecordType_init_$Init$(seen0, type, name, namespace, fields, doc, serializationConstructorMarker, $this) {
   if (!(11 === (11 & seen0))) {
-    throwMissingFieldException(seen0, 11, $serializer_getInstance_1().c48_1);
+    throwMissingFieldException(seen0, 11, $serializer_getInstance_0().o49_1);
   }
-  $this.d47_1 = type;
-  $this.e47_1 = name;
+  $this.q48_1 = type;
+  $this.r48_1 = name;
   if (0 === (seen0 & 4))
-    $this.f47_1 = null;
+    $this.s48_1 = null;
   else
-    $this.f47_1 = namespace;
-  $this.g47_1 = fields;
+    $this.s48_1 = namespace;
+  $this.t48_1 = fields;
   if (0 === (seen0 & 16))
-    $this.h47_1 = null;
+    $this.u48_1 = null;
   else
-    $this.h47_1 = doc;
+    $this.u48_1 = doc;
   return $this;
 }
 function RecordType_init_$Create$(seen0, type, name, namespace, fields, doc, serializationConstructorMarker) {
@@ -1057,86 +997,86 @@ function RecordType_init_$Create$(seen0, type, name, namespace, fields, doc, ser
 }
 function Companion_4() {
 }
-protoOf(Companion_4).i2n = function () {
-  return $serializer_getInstance_2();
+protoOf(Companion_4).p2o = function () {
+  return $serializer_getInstance_1();
 };
 var Companion_instance_4;
 function Companion_getInstance_4() {
   return Companion_instance_4;
 }
-function $serializer_2() {
-  $serializer_instance_2 = this;
+function $serializer_1() {
+  $serializer_instance_1 = this;
   var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('community.flock.wirespec.converter.avro.AvroModel.ArrayType', this, 2);
-  tmp0_serialDesc.v2a('type', false);
-  tmp0_serialDesc.v2a('items', false);
-  this.e48_1 = tmp0_serialDesc;
-}
-protoOf($serializer_2).f48 = function (encoder, value) {
-  var tmp0_desc = this.e48_1;
-  var tmp1_output = encoder.h23(tmp0_desc);
-  tmp1_output.w24(tmp0_desc, 0, value.i47_1);
-  tmp1_output.y24(tmp0_desc, 1, TypeSerializer_getInstance(), value.j47_1);
-  tmp1_output.i23(tmp0_desc);
-};
-protoOf($serializer_2).i20 = function (encoder, value) {
-  return this.f48(encoder, value instanceof ArrayType ? value : THROW_CCE());
-};
-protoOf($serializer_2).j20 = function (decoder) {
-  var tmp0_desc = this.e48_1;
+  tmp0_serialDesc.b2c('type', false);
+  tmp0_serialDesc.b2c('items', false);
+  this.q49_1 = tmp0_serialDesc;
+}
+protoOf($serializer_1).r49 = function (encoder, value) {
+  var tmp0_desc = this.q49_1;
+  var tmp1_output = encoder.n24(tmp0_desc);
+  tmp1_output.c26(tmp0_desc, 0, value.v48_1);
+  tmp1_output.e26(tmp0_desc, 1, TypeSerializer_getInstance(), value.w48_1);
+  tmp1_output.o24(tmp0_desc);
+};
+protoOf($serializer_1).o21 = function (encoder, value) {
+  return this.r49(encoder, value instanceof ArrayType ? value : THROW_CCE());
+};
+protoOf($serializer_1).p21 = function (decoder) {
+  var tmp0_desc = this.q49_1;
   var tmp1_flag = true;
   var tmp2_index = 0;
   var tmp3_bitMask0 = 0;
   var tmp4_local0 = null;
   var tmp5_local1 = null;
-  var tmp6_input = decoder.h23(tmp0_desc);
-  if (tmp6_input.x23()) {
-    tmp4_local0 = tmp6_input.r23(tmp0_desc, 0);
+  var tmp6_input = decoder.n24(tmp0_desc);
+  if (tmp6_input.d25()) {
+    tmp4_local0 = tmp6_input.x24(tmp0_desc, 0);
     tmp3_bitMask0 = tmp3_bitMask0 | 1;
-    tmp5_local1 = tmp6_input.t23(tmp0_desc, 1, TypeSerializer_getInstance(), tmp5_local1);
+    tmp5_local1 = tmp6_input.z24(tmp0_desc, 1, TypeSerializer_getInstance(), tmp5_local1);
     tmp3_bitMask0 = tmp3_bitMask0 | 2;
   } else
     while (tmp1_flag) {
-      tmp2_index = tmp6_input.y23(tmp0_desc);
+      tmp2_index = tmp6_input.e25(tmp0_desc);
       switch (tmp2_index) {
         case -1:
           tmp1_flag = false;
           break;
         case 0:
-          tmp4_local0 = tmp6_input.r23(tmp0_desc, 0);
+          tmp4_local0 = tmp6_input.x24(tmp0_desc, 0);
           tmp3_bitMask0 = tmp3_bitMask0 | 1;
           break;
         case 1:
-          tmp5_local1 = tmp6_input.t23(tmp0_desc, 1, TypeSerializer_getInstance(), tmp5_local1);
+          tmp5_local1 = tmp6_input.z24(tmp0_desc, 1, TypeSerializer_getInstance(), tmp5_local1);
           tmp3_bitMask0 = tmp3_bitMask0 | 2;
           break;
         default:
           throw UnknownFieldException_init_$Create$(tmp2_index);
       }
     }
-  tmp6_input.i23(tmp0_desc);
+  tmp6_input.o24(tmp0_desc);
   return ArrayType_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
 };
-protoOf($serializer_2).h20 = function () {
-  return this.e48_1;
+protoOf($serializer_1).n21 = function () {
+  return this.q49_1;
 };
-protoOf($serializer_2).k2b = function () {
+protoOf($serializer_1).q2c = function () {
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
   return [StringSerializer_getInstance(), TypeSerializer_getInstance()];
 };
-var $serializer_instance_2;
-function $serializer_getInstance_2() {
-  if ($serializer_instance_2 == null)
-    new $serializer_2();
-  return $serializer_instance_2;
+var $serializer_instance_1;
+function $serializer_getInstance_1() {
+  if ($serializer_instance_1 == null)
+    new $serializer_1();
+  return $serializer_instance_1;
 }
 function ArrayType_init_$Init$(seen0, type, items, serializationConstructorMarker, $this) {
   if (!(3 === (3 & seen0))) {
-    throwMissingFieldException(seen0, 3, $serializer_getInstance_2().e48_1);
+    throwMissingFieldException(seen0, 3, $serializer_getInstance_1().q49_1);
   }
-  $this.i47_1 = type;
-  $this.j47_1 = items;
+  $this.v48_1 = type;
+  $this.w48_1 = items;
   return $this;
 }
 function ArrayType_init_$Create$(seen0, type, items, serializationConstructorMarker) {
@@ -1144,86 +1084,86 @@ function ArrayType_init_$Create$(seen0, type, items, serializationConstructorMar
 }
 function Companion_5() {
 }
-protoOf(Companion_5).i2n = function () {
-  return $serializer_getInstance_3();
+protoOf(Companion_5).p2o = function () {
+  return $serializer_getInstance_2();
 };
 var Companion_instance_5;
 function Companion_getInstance_5() {
   return Companion_instance_5;
 }
-function $serializer_3() {
-  $serializer_instance_3 = this;
+function $serializer_2() {
+  $serializer_instance_2 = this;
   var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('community.flock.wirespec.converter.avro.AvroModel.MapType', this, 2);
-  tmp0_serialDesc.v2a('type', false);
-  tmp0_serialDesc.v2a('values', false);
-  this.g48_1 = tmp0_serialDesc;
-}
-protoOf($serializer_3).h48 = function (encoder, value) {
-  var tmp0_desc = this.g48_1;
-  var tmp1_output = encoder.h23(tmp0_desc);
-  tmp1_output.w24(tmp0_desc, 0, value.t46_1);
-  tmp1_output.y24(tmp0_desc, 1, TypeSerializer_getInstance(), value.u46_1);
-  tmp1_output.i23(tmp0_desc);
-};
-protoOf($serializer_3).i20 = function (encoder, value) {
-  return this.h48(encoder, value instanceof MapType ? value : THROW_CCE());
-};
-protoOf($serializer_3).j20 = function (decoder) {
-  var tmp0_desc = this.g48_1;
+  tmp0_serialDesc.b2c('type', false);
+  tmp0_serialDesc.b2c('values', false);
+  this.s49_1 = tmp0_serialDesc;
+}
+protoOf($serializer_2).t49 = function (encoder, value) {
+  var tmp0_desc = this.s49_1;
+  var tmp1_output = encoder.n24(tmp0_desc);
+  tmp1_output.c26(tmp0_desc, 0, value.g48_1);
+  tmp1_output.e26(tmp0_desc, 1, TypeSerializer_getInstance(), value.h48_1);
+  tmp1_output.o24(tmp0_desc);
+};
+protoOf($serializer_2).o21 = function (encoder, value) {
+  return this.t49(encoder, value instanceof MapType ? value : THROW_CCE());
+};
+protoOf($serializer_2).p21 = function (decoder) {
+  var tmp0_desc = this.s49_1;
   var tmp1_flag = true;
   var tmp2_index = 0;
   var tmp3_bitMask0 = 0;
   var tmp4_local0 = null;
   var tmp5_local1 = null;
-  var tmp6_input = decoder.h23(tmp0_desc);
-  if (tmp6_input.x23()) {
-    tmp4_local0 = tmp6_input.r23(tmp0_desc, 0);
+  var tmp6_input = decoder.n24(tmp0_desc);
+  if (tmp6_input.d25()) {
+    tmp4_local0 = tmp6_input.x24(tmp0_desc, 0);
     tmp3_bitMask0 = tmp3_bitMask0 | 1;
-    tmp5_local1 = tmp6_input.t23(tmp0_desc, 1, TypeSerializer_getInstance(), tmp5_local1);
+    tmp5_local1 = tmp6_input.z24(tmp0_desc, 1, TypeSerializer_getInstance(), tmp5_local1);
     tmp3_bitMask0 = tmp3_bitMask0 | 2;
   } else
     while (tmp1_flag) {
-      tmp2_index = tmp6_input.y23(tmp0_desc);
+      tmp2_index = tmp6_input.e25(tmp0_desc);
       switch (tmp2_index) {
         case -1:
           tmp1_flag = false;
           break;
         case 0:
-          tmp4_local0 = tmp6_input.r23(tmp0_desc, 0);
+          tmp4_local0 = tmp6_input.x24(tmp0_desc, 0);
           tmp3_bitMask0 = tmp3_bitMask0 | 1;
           break;
         case 1:
-          tmp5_local1 = tmp6_input.t23(tmp0_desc, 1, TypeSerializer_getInstance(), tmp5_local1);
+          tmp5_local1 = tmp6_input.z24(tmp0_desc, 1, TypeSerializer_getInstance(), tmp5_local1);
           tmp3_bitMask0 = tmp3_bitMask0 | 2;
           break;
         default:
           throw UnknownFieldException_init_$Create$(tmp2_index);
       }
     }
-  tmp6_input.i23(tmp0_desc);
+  tmp6_input.o24(tmp0_desc);
   return MapType_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
 };
-protoOf($serializer_3).h20 = function () {
-  return this.g48_1;
+protoOf($serializer_2).n21 = function () {
+  return this.s49_1;
 };
-protoOf($serializer_3).k2b = function () {
+protoOf($serializer_2).q2c = function () {
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
   return [StringSerializer_getInstance(), TypeSerializer_getInstance()];
 };
-var $serializer_instance_3;
-function $serializer_getInstance_3() {
-  if ($serializer_instance_3 == null)
-    new $serializer_3();
-  return $serializer_instance_3;
+var $serializer_instance_2;
+function $serializer_getInstance_2() {
+  if ($serializer_instance_2 == null)
+    new $serializer_2();
+  return $serializer_instance_2;
 }
 function MapType_init_$Init$(seen0, type, values, serializationConstructorMarker, $this) {
   if (!(3 === (3 & seen0))) {
-    throwMissingFieldException(seen0, 3, $serializer_getInstance_3().g48_1);
+    throwMissingFieldException(seen0, 3, $serializer_getInstance_2().s49_1);
   }
-  $this.t46_1 = type;
-  $this.u46_1 = values;
+  $this.g48_1 = type;
+  $this.h48_1 = values;
   return $this;
 }
 function MapType_init_$Create$(seen0, type, values, serializationConstructorMarker) {
@@ -1239,10 +1179,10 @@ function Companion_6() {
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
-  tmp.i48_1 = [null, null, null, lazy(tmp_0, AvroModel$EnumType$Companion$$childSerializers$_anonymous__vqfr9a)];
+  tmp.u49_1 = [null, null, null, lazy(tmp_0, AvroModel$EnumType$Companion$$childSerializers$_anonymous__vqfr9a)];
 }
-protoOf(Companion_6).i2n = function () {
-  return $serializer_getInstance_4();
+protoOf(Companion_6).p2o = function () {
+  return $serializer_getInstance_3();
 };
 var Companion_instance_6;
 function Companion_getInstance_6() {
@@ -1250,32 +1190,32 @@ function Companion_getInstance_6() {
     new Companion_6();
   return Companion_instance_6;
 }
-function $serializer_4() {
-  $serializer_instance_4 = this;
+function $serializer_3() {
+  $serializer_instance_3 = this;
   var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('community.flock.wirespec.converter.avro.AvroModel.EnumType', this, 4);
-  tmp0_serialDesc.v2a('type', false);
-  tmp0_serialDesc.v2a('name', false);
-  tmp0_serialDesc.v2a('doc', true);
-  tmp0_serialDesc.v2a('symbols', false);
-  this.j48_1 = tmp0_serialDesc;
-}
-protoOf($serializer_4).k48 = function (encoder, value) {
-  var tmp0_desc = this.j48_1;
-  var tmp1_output = encoder.h23(tmp0_desc);
-  var tmp2_cached = Companion_getInstance_6().i48_1;
-  tmp1_output.w24(tmp0_desc, 0, value.z46_1);
-  tmp1_output.w24(tmp0_desc, 1, value.a47_1);
-  if (tmp1_output.e25(tmp0_desc, 2) ? true : !(value.b47_1 == null)) {
-    tmp1_output.a25(tmp0_desc, 2, StringSerializer_getInstance(), value.b47_1);
+  tmp0_serialDesc.b2c('type', false);
+  tmp0_serialDesc.b2c('name', false);
+  tmp0_serialDesc.b2c('doc', true);
+  tmp0_serialDesc.b2c('symbols', false);
+  this.v49_1 = tmp0_serialDesc;
+}
+protoOf($serializer_3).w49 = function (encoder, value) {
+  var tmp0_desc = this.v49_1;
+  var tmp1_output = encoder.n24(tmp0_desc);
+  var tmp2_cached = Companion_getInstance_6().u49_1;
+  tmp1_output.c26(tmp0_desc, 0, value.m48_1);
+  tmp1_output.c26(tmp0_desc, 1, value.n48_1);
+  if (tmp1_output.k26(tmp0_desc, 2) ? true : !(value.o48_1 == null)) {
+    tmp1_output.g26(tmp0_desc, 2, StringSerializer_getInstance(), value.o48_1);
   }
-  tmp1_output.y24(tmp0_desc, 3, tmp2_cached[3].m1(), value.c47_1);
-  tmp1_output.i23(tmp0_desc);
+  tmp1_output.e26(tmp0_desc, 3, tmp2_cached[3].m1(), value.p48_1);
+  tmp1_output.o24(tmp0_desc);
 };
-protoOf($serializer_4).i20 = function (encoder, value) {
-  return this.k48(encoder, value instanceof EnumType ? value : THROW_CCE());
+protoOf($serializer_3).o21 = function (encoder, value) {
+  return this.w49(encoder, value instanceof EnumType ? value : THROW_CCE());
 };
-protoOf($serializer_4).j20 = function (decoder) {
-  var tmp0_desc = this.j48_1;
+protoOf($serializer_3).p21 = function (decoder) {
+  var tmp0_desc = this.v49_1;
   var tmp1_flag = true;
   var tmp2_index = 0;
   var tmp3_bitMask0 = 0;
@@ -1283,74 +1223,74 @@ protoOf($serializer_4).j20 = function (decoder) {
   var tmp5_local1 = null;
   var tmp6_local2 = null;
   var tmp7_local3 = null;
-  var tmp8_input = decoder.h23(tmp0_desc);
-  var tmp9_cached = Companion_getInstance_6().i48_1;
-  if (tmp8_input.x23()) {
-    tmp4_local0 = tmp8_input.r23(tmp0_desc, 0);
+  var tmp8_input = decoder.n24(tmp0_desc);
+  var tmp9_cached = Companion_getInstance_6().u49_1;
+  if (tmp8_input.d25()) {
+    tmp4_local0 = tmp8_input.x24(tmp0_desc, 0);
     tmp3_bitMask0 = tmp3_bitMask0 | 1;
-    tmp5_local1 = tmp8_input.r23(tmp0_desc, 1);
+    tmp5_local1 = tmp8_input.x24(tmp0_desc, 1);
     tmp3_bitMask0 = tmp3_bitMask0 | 2;
-    tmp6_local2 = tmp8_input.v23(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+    tmp6_local2 = tmp8_input.b25(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
     tmp3_bitMask0 = tmp3_bitMask0 | 4;
-    tmp7_local3 = tmp8_input.t23(tmp0_desc, 3, tmp9_cached[3].m1(), tmp7_local3);
+    tmp7_local3 = tmp8_input.z24(tmp0_desc, 3, tmp9_cached[3].m1(), tmp7_local3);
     tmp3_bitMask0 = tmp3_bitMask0 | 8;
   } else
     while (tmp1_flag) {
-      tmp2_index = tmp8_input.y23(tmp0_desc);
+      tmp2_index = tmp8_input.e25(tmp0_desc);
       switch (tmp2_index) {
         case -1:
           tmp1_flag = false;
           break;
         case 0:
-          tmp4_local0 = tmp8_input.r23(tmp0_desc, 0);
+          tmp4_local0 = tmp8_input.x24(tmp0_desc, 0);
           tmp3_bitMask0 = tmp3_bitMask0 | 1;
           break;
         case 1:
-          tmp5_local1 = tmp8_input.r23(tmp0_desc, 1);
+          tmp5_local1 = tmp8_input.x24(tmp0_desc, 1);
           tmp3_bitMask0 = tmp3_bitMask0 | 2;
           break;
         case 2:
-          tmp6_local2 = tmp8_input.v23(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+          tmp6_local2 = tmp8_input.b25(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
           tmp3_bitMask0 = tmp3_bitMask0 | 4;
           break;
         case 3:
-          tmp7_local3 = tmp8_input.t23(tmp0_desc, 3, tmp9_cached[3].m1(), tmp7_local3);
+          tmp7_local3 = tmp8_input.z24(tmp0_desc, 3, tmp9_cached[3].m1(), tmp7_local3);
           tmp3_bitMask0 = tmp3_bitMask0 | 8;
           break;
         default:
           throw UnknownFieldException_init_$Create$(tmp2_index);
       }
     }
-  tmp8_input.i23(tmp0_desc);
+  tmp8_input.o24(tmp0_desc);
   return EnumType_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
 };
-protoOf($serializer_4).h20 = function () {
-  return this.j48_1;
+protoOf($serializer_3).n21 = function () {
+  return this.v49_1;
 };
-protoOf($serializer_4).k2b = function () {
-  var tmp0_cached = Companion_getInstance_6().i48_1;
+protoOf($serializer_3).q2c = function () {
+  var tmp0_cached = Companion_getInstance_6().u49_1;
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
   return [StringSerializer_getInstance(), StringSerializer_getInstance(), get_nullable(StringSerializer_getInstance()), tmp0_cached[3].m1()];
 };
-var $serializer_instance_4;
-function $serializer_getInstance_4() {
-  if ($serializer_instance_4 == null)
-    new $serializer_4();
-  return $serializer_instance_4;
+var $serializer_instance_3;
+function $serializer_getInstance_3() {
+  if ($serializer_instance_3 == null)
+    new $serializer_3();
+  return $serializer_instance_3;
 }
 function EnumType_init_$Init$(seen0, type, name, doc, symbols, serializationConstructorMarker, $this) {
   if (!(11 === (11 & seen0))) {
-    throwMissingFieldException(seen0, 11, $serializer_getInstance_4().j48_1);
+    throwMissingFieldException(seen0, 11, $serializer_getInstance_3().v49_1);
   }
-  $this.z46_1 = type;
-  $this.a47_1 = name;
+  $this.m48_1 = type;
+  $this.n48_1 = name;
   if (0 === (seen0 & 4))
-    $this.b47_1 = null;
+    $this.o48_1 = null;
   else
-    $this.b47_1 = doc;
-  $this.c47_1 = symbols;
+    $this.o48_1 = doc;
+  $this.p48_1 = symbols;
   return $this;
 }
 function EnumType_init_$Create$(seen0, type, name, doc, symbols, serializationConstructorMarker) {
@@ -1358,86 +1298,86 @@ function EnumType_init_$Create$(seen0, type, name, doc, symbols, serializationCo
 }
 function Companion_7() {
 }
-protoOf(Companion_7).i2n = function () {
-  return $serializer_getInstance_5();
+protoOf(Companion_7).p2o = function () {
+  return $serializer_getInstance_4();
 };
 var Companion_instance_7;
 function Companion_getInstance_7() {
   return Companion_instance_7;
 }
-function $serializer_5() {
-  $serializer_instance_5 = this;
+function $serializer_4() {
+  $serializer_instance_4 = this;
   var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('community.flock.wirespec.converter.avro.AvroModel.UnionType', this, 2);
-  tmp0_serialDesc.v2a('name', false);
-  tmp0_serialDesc.v2a('type', false);
-  this.l48_1 = tmp0_serialDesc;
-}
-protoOf($serializer_5).m48 = function (encoder, value) {
-  var tmp0_desc = this.l48_1;
-  var tmp1_output = encoder.h23(tmp0_desc);
-  tmp1_output.w24(tmp0_desc, 0, value.r46_1);
-  tmp1_output.y24(tmp0_desc, 1, TypeListSerializer_getInstance(), value.s46_1);
-  tmp1_output.i23(tmp0_desc);
-};
-protoOf($serializer_5).i20 = function (encoder, value) {
-  return this.m48(encoder, value instanceof UnionType ? value : THROW_CCE());
-};
-protoOf($serializer_5).j20 = function (decoder) {
-  var tmp0_desc = this.l48_1;
+  tmp0_serialDesc.b2c('name', false);
+  tmp0_serialDesc.b2c('type', false);
+  this.x49_1 = tmp0_serialDesc;
+}
+protoOf($serializer_4).y49 = function (encoder, value) {
+  var tmp0_desc = this.x49_1;
+  var tmp1_output = encoder.n24(tmp0_desc);
+  tmp1_output.c26(tmp0_desc, 0, value.e48_1);
+  tmp1_output.e26(tmp0_desc, 1, TypeListSerializer_getInstance(), value.f48_1);
+  tmp1_output.o24(tmp0_desc);
+};
+protoOf($serializer_4).o21 = function (encoder, value) {
+  return this.y49(encoder, value instanceof UnionType ? value : THROW_CCE());
+};
+protoOf($serializer_4).p21 = function (decoder) {
+  var tmp0_desc = this.x49_1;
   var tmp1_flag = true;
   var tmp2_index = 0;
   var tmp3_bitMask0 = 0;
   var tmp4_local0 = null;
   var tmp5_local1 = null;
-  var tmp6_input = decoder.h23(tmp0_desc);
-  if (tmp6_input.x23()) {
-    tmp4_local0 = tmp6_input.r23(tmp0_desc, 0);
+  var tmp6_input = decoder.n24(tmp0_desc);
+  if (tmp6_input.d25()) {
+    tmp4_local0 = tmp6_input.x24(tmp0_desc, 0);
     tmp3_bitMask0 = tmp3_bitMask0 | 1;
-    tmp5_local1 = tmp6_input.t23(tmp0_desc, 1, TypeListSerializer_getInstance(), tmp5_local1);
+    tmp5_local1 = tmp6_input.z24(tmp0_desc, 1, TypeListSerializer_getInstance(), tmp5_local1);
     tmp3_bitMask0 = tmp3_bitMask0 | 2;
   } else
     while (tmp1_flag) {
-      tmp2_index = tmp6_input.y23(tmp0_desc);
+      tmp2_index = tmp6_input.e25(tmp0_desc);
       switch (tmp2_index) {
         case -1:
           tmp1_flag = false;
           break;
         case 0:
-          tmp4_local0 = tmp6_input.r23(tmp0_desc, 0);
+          tmp4_local0 = tmp6_input.x24(tmp0_desc, 0);
           tmp3_bitMask0 = tmp3_bitMask0 | 1;
           break;
         case 1:
-          tmp5_local1 = tmp6_input.t23(tmp0_desc, 1, TypeListSerializer_getInstance(), tmp5_local1);
+          tmp5_local1 = tmp6_input.z24(tmp0_desc, 1, TypeListSerializer_getInstance(), tmp5_local1);
           tmp3_bitMask0 = tmp3_bitMask0 | 2;
           break;
         default:
           throw UnknownFieldException_init_$Create$(tmp2_index);
       }
     }
-  tmp6_input.i23(tmp0_desc);
+  tmp6_input.o24(tmp0_desc);
   return UnionType_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
 };
-protoOf($serializer_5).h20 = function () {
-  return this.l48_1;
+protoOf($serializer_4).n21 = function () {
+  return this.x49_1;
 };
-protoOf($serializer_5).k2b = function () {
+protoOf($serializer_4).q2c = function () {
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
   return [StringSerializer_getInstance(), TypeListSerializer_getInstance()];
 };
-var $serializer_instance_5;
-function $serializer_getInstance_5() {
-  if ($serializer_instance_5 == null)
-    new $serializer_5();
-  return $serializer_instance_5;
+var $serializer_instance_4;
+function $serializer_getInstance_4() {
+  if ($serializer_instance_4 == null)
+    new $serializer_4();
+  return $serializer_instance_4;
 }
 function UnionType_init_$Init$(seen0, name, type, serializationConstructorMarker, $this) {
   if (!(3 === (3 & seen0))) {
-    throwMissingFieldException(seen0, 3, $serializer_getInstance_5().l48_1);
+    throwMissingFieldException(seen0, 3, $serializer_getInstance_4().x49_1);
   }
-  $this.r46_1 = name;
-  $this.s46_1 = type;
+  $this.e48_1 = name;
+  $this.f48_1 = type;
   return $this;
 }
 function UnionType_init_$Create$(seen0, name, type, serializationConstructorMarker) {
@@ -1445,40 +1385,40 @@ function UnionType_init_$Create$(seen0, name, type, serializationConstructorMark
 }
 function Companion_8() {
 }
-protoOf(Companion_8).i2n = function () {
-  return $serializer_getInstance_6();
+protoOf(Companion_8).p2o = function () {
+  return $serializer_getInstance_5();
 };
 var Companion_instance_8;
 function Companion_getInstance_8() {
   return Companion_instance_8;
 }
-function $serializer_6() {
-  $serializer_instance_6 = this;
+function $serializer_5() {
+  $serializer_instance_5 = this;
   var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('community.flock.wirespec.converter.avro.AvroModel.LogicalType', this, 4);
-  tmp0_serialDesc.v2a('type', false);
-  tmp0_serialDesc.v2a('logicalType', false);
-  tmp0_serialDesc.v2a('precision', true);
-  tmp0_serialDesc.v2a('scale', true);
-  this.n48_1 = tmp0_serialDesc;
-}
-protoOf($serializer_6).o48 = function (encoder, value) {
-  var tmp0_desc = this.n48_1;
-  var tmp1_output = encoder.h23(tmp0_desc);
-  tmp1_output.w24(tmp0_desc, 0, value.v46_1);
-  tmp1_output.w24(tmp0_desc, 1, value.w46_1);
-  if (tmp1_output.e25(tmp0_desc, 2) ? true : !(value.x46_1 == null)) {
-    tmp1_output.a25(tmp0_desc, 2, IntSerializer_getInstance(), value.x46_1);
+  tmp0_serialDesc.b2c('type', false);
+  tmp0_serialDesc.b2c('logicalType', false);
+  tmp0_serialDesc.b2c('precision', true);
+  tmp0_serialDesc.b2c('scale', true);
+  this.z49_1 = tmp0_serialDesc;
+}
+protoOf($serializer_5).a4a = function (encoder, value) {
+  var tmp0_desc = this.z49_1;
+  var tmp1_output = encoder.n24(tmp0_desc);
+  tmp1_output.c26(tmp0_desc, 0, value.i48_1);
+  tmp1_output.c26(tmp0_desc, 1, value.j48_1);
+  if (tmp1_output.k26(tmp0_desc, 2) ? true : !(value.k48_1 == null)) {
+    tmp1_output.g26(tmp0_desc, 2, IntSerializer_getInstance(), value.k48_1);
   }
-  if (tmp1_output.e25(tmp0_desc, 3) ? true : !(value.y46_1 == null)) {
-    tmp1_output.a25(tmp0_desc, 3, IntSerializer_getInstance(), value.y46_1);
+  if (tmp1_output.k26(tmp0_desc, 3) ? true : !(value.l48_1 == null)) {
+    tmp1_output.g26(tmp0_desc, 3, IntSerializer_getInstance(), value.l48_1);
   }
-  tmp1_output.i23(tmp0_desc);
+  tmp1_output.o24(tmp0_desc);
 };
-protoOf($serializer_6).i20 = function (encoder, value) {
-  return this.o48(encoder, value instanceof LogicalType ? value : THROW_CCE());
+protoOf($serializer_5).o21 = function (encoder, value) {
+  return this.a4a(encoder, value instanceof LogicalType ? value : THROW_CCE());
 };
-protoOf($serializer_6).j20 = function (decoder) {
-  var tmp0_desc = this.n48_1;
+protoOf($serializer_5).p21 = function (decoder) {
+  var tmp0_desc = this.z49_1;
   var tmp1_flag = true;
   var tmp2_index = 0;
   var tmp3_bitMask0 = 0;
@@ -1486,75 +1426,75 @@ protoOf($serializer_6).j20 = function (decoder) {
   var tmp5_local1 = null;
   var tmp6_local2 = null;
   var tmp7_local3 = null;
-  var tmp8_input = decoder.h23(tmp0_desc);
-  if (tmp8_input.x23()) {
-    tmp4_local0 = tmp8_input.r23(tmp0_desc, 0);
+  var tmp8_input = decoder.n24(tmp0_desc);
+  if (tmp8_input.d25()) {
+    tmp4_local0 = tmp8_input.x24(tmp0_desc, 0);
     tmp3_bitMask0 = tmp3_bitMask0 | 1;
-    tmp5_local1 = tmp8_input.r23(tmp0_desc, 1);
+    tmp5_local1 = tmp8_input.x24(tmp0_desc, 1);
     tmp3_bitMask0 = tmp3_bitMask0 | 2;
-    tmp6_local2 = tmp8_input.v23(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
+    tmp6_local2 = tmp8_input.b25(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
     tmp3_bitMask0 = tmp3_bitMask0 | 4;
-    tmp7_local3 = tmp8_input.v23(tmp0_desc, 3, IntSerializer_getInstance(), tmp7_local3);
+    tmp7_local3 = tmp8_input.b25(tmp0_desc, 3, IntSerializer_getInstance(), tmp7_local3);
     tmp3_bitMask0 = tmp3_bitMask0 | 8;
   } else
     while (tmp1_flag) {
-      tmp2_index = tmp8_input.y23(tmp0_desc);
+      tmp2_index = tmp8_input.e25(tmp0_desc);
       switch (tmp2_index) {
         case -1:
           tmp1_flag = false;
           break;
         case 0:
-          tmp4_local0 = tmp8_input.r23(tmp0_desc, 0);
+          tmp4_local0 = tmp8_input.x24(tmp0_desc, 0);
           tmp3_bitMask0 = tmp3_bitMask0 | 1;
           break;
         case 1:
-          tmp5_local1 = tmp8_input.r23(tmp0_desc, 1);
+          tmp5_local1 = tmp8_input.x24(tmp0_desc, 1);
           tmp3_bitMask0 = tmp3_bitMask0 | 2;
           break;
         case 2:
-          tmp6_local2 = tmp8_input.v23(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
+          tmp6_local2 = tmp8_input.b25(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
           tmp3_bitMask0 = tmp3_bitMask0 | 4;
           break;
         case 3:
-          tmp7_local3 = tmp8_input.v23(tmp0_desc, 3, IntSerializer_getInstance(), tmp7_local3);
+          tmp7_local3 = tmp8_input.b25(tmp0_desc, 3, IntSerializer_getInstance(), tmp7_local3);
           tmp3_bitMask0 = tmp3_bitMask0 | 8;
           break;
         default:
           throw UnknownFieldException_init_$Create$(tmp2_index);
       }
     }
-  tmp8_input.i23(tmp0_desc);
+  tmp8_input.o24(tmp0_desc);
   return LogicalType_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
 };
-protoOf($serializer_6).h20 = function () {
-  return this.n48_1;
+protoOf($serializer_5).n21 = function () {
+  return this.z49_1;
 };
-protoOf($serializer_6).k2b = function () {
+protoOf($serializer_5).q2c = function () {
   // Inline function 'kotlin.arrayOf' call
   // Inline function 'kotlin.js.unsafeCast' call
   // Inline function 'kotlin.js.asDynamic' call
   return [StringSerializer_getInstance(), StringSerializer_getInstance(), get_nullable(IntSerializer_getInstance()), get_nullable(IntSerializer_getInstance())];
 };
-var $serializer_instance_6;
-function $serializer_getInstance_6() {
-  if ($serializer_instance_6 == null)
-    new $serializer_6();
-  return $serializer_instance_6;
+var $serializer_instance_5;
+function $serializer_getInstance_5() {
+  if ($serializer_instance_5 == null)
+    new $serializer_5();
+  return $serializer_instance_5;
 }
 function LogicalType_init_$Init$(seen0, type, logicalType, precision, scale, serializationConstructorMarker, $this) {
   if (!(3 === (3 & seen0))) {
-    throwMissingFieldException(seen0, 3, $serializer_getInstance_6().n48_1);
+    throwMissingFieldException(seen0, 3, $serializer_getInstance_5().z49_1);
   }
-  $this.v46_1 = type;
-  $this.w46_1 = logicalType;
+  $this.i48_1 = type;
+  $this.j48_1 = logicalType;
   if (0 === (seen0 & 4))
-    $this.x46_1 = null;
+    $this.k48_1 = null;
   else
-    $this.x46_1 = precision;
+    $this.k48_1 = precision;
   if (0 === (seen0 & 8))
-    $this.y46_1 = null;
+    $this.l48_1 = null;
   else
-    $this.y46_1 = scale;
+    $this.l48_1 = scale;
   return $this;
 }
 function LogicalType_init_$Create$(seen0, type, logicalType, precision, scale, serializationConstructorMarker) {
@@ -1563,19 +1503,19 @@ function LogicalType_init_$Create$(seen0, type, logicalType, precision, scale, s
 function Field_0(name, type, doc, default_0) {
   doc = doc === VOID ? null : doc;
   default_0 = default_0 === VOID ? null : default_0;
-  this.k47_1 = name;
-  this.l47_1 = type;
-  this.m47_1 = doc;
-  this.n47_1 = default_0;
+  this.x48_1 = name;
+  this.y48_1 = type;
+  this.z48_1 = doc;
+  this.a49_1 = default_0;
 }
 protoOf(Field_0).toString = function () {
-  return 'Field(name=' + this.k47_1 + ', type=' + this.l47_1.toString() + ', doc=' + this.m47_1 + ', default=' + this.n47_1 + ')';
+  return 'Field(name=' + this.x48_1 + ', type=' + this.y48_1.toString() + ', doc=' + this.z48_1 + ', default=' + toString_0(this.a49_1) + ')';
 };
 protoOf(Field_0).hashCode = function () {
-  var result = getStringHashCode(this.k47_1);
-  result = imul(result, 31) + this.l47_1.hashCode() | 0;
-  result = imul(result, 31) + (this.m47_1 == null ? 0 : getStringHashCode(this.m47_1)) | 0;
-  result = imul(result, 31) + (this.n47_1 == null ? 0 : getStringHashCode(this.n47_1)) | 0;
+  var result = getStringHashCode(this.x48_1);
+  result = imul(result, 31) + this.y48_1.hashCode() | 0;
+  result = imul(result, 31) + (this.z48_1 == null ? 0 : getStringHashCode(this.z48_1)) | 0;
+  result = imul(result, 31) + (this.a49_1 == null ? 0 : hashCode(this.a49_1)) | 0;
   return result;
 };
 protoOf(Field_0).equals = function (other) {
@@ -1583,44 +1523,44 @@ protoOf(Field_0).equals = function (other) {
     return true;
   if (!(other instanceof Field_0))
     return false;
-  if (!(this.k47_1 === other.k47_1))
+  if (!(this.x48_1 === other.x48_1))
     return false;
-  if (!this.l47_1.equals(other.l47_1))
+  if (!this.y48_1.equals(other.y48_1))
     return false;
-  if (!(this.m47_1 == other.m47_1))
+  if (!(this.z48_1 == other.z48_1))
     return false;
-  if (!(this.n47_1 == other.n47_1))
+  if (!equals(this.a49_1, other.a49_1))
     return false;
   return true;
 };
 function TypeList(type) {
   AbstractList.call(this);
-  this.p48_1 = toList_0(type);
-  this.q48_1 = this.p48_1.b1();
+  this.b4a_1 = toList_0(type);
+  this.c4a_1 = this.b4a_1.b1();
 }
 protoOf(TypeList).b1 = function () {
-  return this.q48_1;
+  return this.c4a_1;
 };
 protoOf(TypeList).c1 = function (index) {
-  return this.p48_1.c1(index);
+  return this.b4a_1.c1(index);
 };
 function Type_0() {
 }
 function SimpleType(value) {
-  this.q46_1 = value;
+  this.d48_1 = value;
 }
 protoOf(SimpleType).toString = function () {
-  return 'SimpleType(value=' + this.q46_1 + ')';
+  return 'SimpleType(value=' + this.d48_1 + ')';
 };
 protoOf(SimpleType).hashCode = function () {
-  return getStringHashCode(this.q46_1);
+  return getStringHashCode(this.d48_1);
 };
 protoOf(SimpleType).equals = function (other) {
   if (this === other)
     return true;
   if (!(other instanceof SimpleType))
     return false;
-  if (!(this.q46_1 === other.q46_1))
+  if (!(this.d48_1 === other.d48_1))
     return false;
   return true;
 };
@@ -1628,21 +1568,21 @@ function RecordType(type, name, namespace, fields, doc) {
   Companion_getInstance_3();
   namespace = namespace === VOID ? null : namespace;
   doc = doc === VOID ? null : doc;
-  this.d47_1 = type;
-  this.e47_1 = name;
-  this.f47_1 = namespace;
-  this.g47_1 = fields;
-  this.h47_1 = doc;
+  this.q48_1 = type;
+  this.r48_1 = name;
+  this.s48_1 = namespace;
+  this.t48_1 = fields;
+  this.u48_1 = doc;
 }
 protoOf(RecordType).toString = function () {
-  return 'RecordType(type=' + this.d47_1 + ', name=' + this.e47_1 + ', namespace=' + this.f47_1 + ', fields=' + toString(this.g47_1) + ', doc=' + this.h47_1 + ')';
+  return 'RecordType(type=' + this.q48_1 + ', name=' + this.r48_1 + ', namespace=' + this.s48_1 + ', fields=' + toString(this.t48_1) + ', doc=' + this.u48_1 + ')';
 };
 protoOf(RecordType).hashCode = function () {
-  var result = getStringHashCode(this.d47_1);
-  result = imul(result, 31) + getStringHashCode(this.e47_1) | 0;
-  result = imul(result, 31) + (this.f47_1 == null ? 0 : getStringHashCode(this.f47_1)) | 0;
-  result = imul(result, 31) + hashCode(this.g47_1) | 0;
-  result = imul(result, 31) + (this.h47_1 == null ? 0 : getStringHashCode(this.h47_1)) | 0;
+  var result = getStringHashCode(this.q48_1);
+  result = imul(result, 31) + getStringHashCode(this.r48_1) | 0;
+  result = imul(result, 31) + (this.s48_1 == null ? 0 : getStringHashCode(this.s48_1)) | 0;
+  result = imul(result, 31) + hashCode(this.t48_1) | 0;
+  result = imul(result, 31) + (this.u48_1 == null ? 0 : getStringHashCode(this.u48_1)) | 0;
   return result;
 };
 protoOf(RecordType).equals = function (other) {
@@ -1650,28 +1590,28 @@ protoOf(RecordType).equals = function (other) {
     return true;
   if (!(other instanceof RecordType))
     return false;
-  if (!(this.d47_1 === other.d47_1))
+  if (!(this.q48_1 === other.q48_1))
     return false;
-  if (!(this.e47_1 === other.e47_1))
+  if (!(this.r48_1 === other.r48_1))
     return false;
-  if (!(this.f47_1 == other.f47_1))
+  if (!(this.s48_1 == other.s48_1))
     return false;
-  if (!equals(this.g47_1, other.g47_1))
+  if (!equals(this.t48_1, other.t48_1))
     return false;
-  if (!(this.h47_1 == other.h47_1))
+  if (!(this.u48_1 == other.u48_1))
     return false;
   return true;
 };
 function ArrayType(type, items) {
-  this.i47_1 = type;
-  this.j47_1 = items;
+  this.v48_1 = type;
+  this.w48_1 = items;
 }
 protoOf(ArrayType).toString = function () {
-  return 'ArrayType(type=' + this.i47_1 + ', items=' + toString(this.j47_1) + ')';
+  return 'ArrayType(type=' + this.v48_1 + ', items=' + toString(this.w48_1) + ')';
 };
 protoOf(ArrayType).hashCode = function () {
-  var result = getStringHashCode(this.i47_1);
-  result = imul(result, 31) + hashCode(this.j47_1) | 0;
+  var result = getStringHashCode(this.v48_1);
+  result = imul(result, 31) + hashCode(this.w48_1) | 0;
   return result;
 };
 protoOf(ArrayType).equals = function (other) {
@@ -1679,22 +1619,22 @@ protoOf(ArrayType).equals = function (other) {
     return true;
   if (!(other instanceof ArrayType))
     return false;
-  if (!(this.i47_1 === other.i47_1))
+  if (!(this.v48_1 === other.v48_1))
     return false;
-  if (!equals(this.j47_1, other.j47_1))
+  if (!equals(this.w48_1, other.w48_1))
     return false;
   return true;
 };
 function MapType(type, values) {
-  this.t46_1 = type;
-  this.u46_1 = values;
+  this.g48_1 = type;
+  this.h48_1 = values;
 }
 protoOf(MapType).toString = function () {
-  return 'MapType(type=' + this.t46_1 + ', values=' + toString(this.u46_1) + ')';
+  return 'MapType(type=' + this.g48_1 + ', values=' + toString(this.h48_1) + ')';
 };
 protoOf(MapType).hashCode = function () {
-  var result = getStringHashCode(this.t46_1);
-  result = imul(result, 31) + hashCode(this.u46_1) | 0;
+  var result = getStringHashCode(this.g48_1);
+  result = imul(result, 31) + hashCode(this.h48_1) | 0;
   return result;
 };
 protoOf(MapType).equals = function (other) {
@@ -1702,28 +1642,28 @@ protoOf(MapType).equals = function (other) {
     return true;
   if (!(other instanceof MapType))
     return false;
-  if (!(this.t46_1 === other.t46_1))
+  if (!(this.g48_1 === other.g48_1))
     return false;
-  if (!equals(this.u46_1, other.u46_1))
+  if (!equals(this.h48_1, other.h48_1))
     return false;
   return true;
 };
 function EnumType(type, name, doc, symbols) {
   Companion_getInstance_6();
   doc = doc === VOID ? null : doc;
-  this.z46_1 = type;
-  this.a47_1 = name;
-  this.b47_1 = doc;
-  this.c47_1 = symbols;
+  this.m48_1 = type;
+  this.n48_1 = name;
+  this.o48_1 = doc;
+  this.p48_1 = symbols;
 }
 protoOf(EnumType).toString = function () {
-  return 'EnumType(type=' + this.z46_1 + ', name=' + this.a47_1 + ', doc=' + this.b47_1 + ', symbols=' + toString(this.c47_1) + ')';
+  return 'EnumType(type=' + this.m48_1 + ', name=' + this.n48_1 + ', doc=' + this.o48_1 + ', symbols=' + toString(this.p48_1) + ')';
 };
 protoOf(EnumType).hashCode = function () {
-  var result = getStringHashCode(this.z46_1);
-  result = imul(result, 31) + getStringHashCode(this.a47_1) | 0;
-  result = imul(result, 31) + (this.b47_1 == null ? 0 : getStringHashCode(this.b47_1)) | 0;
-  result = imul(result, 31) + hashCode(this.c47_1) | 0;
+  var result = getStringHashCode(this.m48_1);
+  result = imul(result, 31) + getStringHashCode(this.n48_1) | 0;
+  result = imul(result, 31) + (this.o48_1 == null ? 0 : getStringHashCode(this.o48_1)) | 0;
+  result = imul(result, 31) + hashCode(this.p48_1) | 0;
   return result;
 };
 protoOf(EnumType).equals = function (other) {
@@ -1731,26 +1671,26 @@ protoOf(EnumType).equals = function (other) {
     return true;
   if (!(other instanceof EnumType))
     return false;
-  if (!(this.z46_1 === other.z46_1))
+  if (!(this.m48_1 === other.m48_1))
     return false;
-  if (!(this.a47_1 === other.a47_1))
+  if (!(this.n48_1 === other.n48_1))
     return false;
-  if (!(this.b47_1 == other.b47_1))
+  if (!(this.o48_1 == other.o48_1))
     return false;
-  if (!equals(this.c47_1, other.c47_1))
+  if (!equals(this.p48_1, other.p48_1))
     return false;
   return true;
 };
 function UnionType(name, type) {
-  this.r46_1 = name;
-  this.s46_1 = type;
+  this.e48_1 = name;
+  this.f48_1 = type;
 }
 protoOf(UnionType).toString = function () {
-  return 'UnionType(name=' + this.r46_1 + ', type=' + this.s46_1.toString() + ')';
+  return 'UnionType(name=' + this.e48_1 + ', type=' + this.f48_1.toString() + ')';
 };
 protoOf(UnionType).hashCode = function () {
-  var result = getStringHashCode(this.r46_1);
-  result = imul(result, 31) + this.s46_1.hashCode() | 0;
+  var result = getStringHashCode(this.e48_1);
+  result = imul(result, 31) + this.f48_1.hashCode() | 0;
   return result;
 };
 protoOf(UnionType).equals = function (other) {
@@ -1758,22 +1698,22 @@ protoOf(UnionType).equals = function (other) {
     return true;
   if (!(other instanceof UnionType))
     return false;
-  if (!(this.r46_1 === other.r46_1))
+  if (!(this.e48_1 === other.e48_1))
     return false;
-  if (!this.s46_1.equals(other.s46_1))
+  if (!this.f48_1.equals(other.f48_1))
     return false;
   return true;
 };
 function LogicalType() {
 }
 protoOf(LogicalType).toString = function () {
-  return 'LogicalType(type=' + this.v46_1 + ', logicalType=' + this.w46_1 + ', precision=' + this.x46_1 + ', scale=' + this.y46_1 + ')';
+  return 'LogicalType(type=' + this.i48_1 + ', logicalType=' + this.j48_1 + ', precision=' + this.k48_1 + ', scale=' + this.l48_1 + ')';
 };
 protoOf(LogicalType).hashCode = function () {
-  var result = getStringHashCode(this.v46_1);
-  result = imul(result, 31) + getStringHashCode(this.w46_1) | 0;
-  result = imul(result, 31) + (this.x46_1 == null ? 0 : this.x46_1) | 0;
-  result = imul(result, 31) + (this.y46_1 == null ? 0 : this.y46_1) | 0;
+  var result = getStringHashCode(this.i48_1);
+  result = imul(result, 31) + getStringHashCode(this.j48_1) | 0;
+  result = imul(result, 31) + (this.k48_1 == null ? 0 : this.k48_1) | 0;
+  result = imul(result, 31) + (this.l48_1 == null ? 0 : this.l48_1) | 0;
   return result;
 };
 protoOf(LogicalType).equals = function (other) {
@@ -1781,34 +1721,98 @@ protoOf(LogicalType).equals = function (other) {
     return true;
   if (!(other instanceof LogicalType))
     return false;
-  if (!(this.v46_1 === other.v46_1))
+  if (!(this.i48_1 === other.i48_1))
     return false;
-  if (!(this.w46_1 === other.w46_1))
+  if (!(this.j48_1 === other.j48_1))
     return false;
-  if (!(this.x46_1 == other.x46_1))
+  if (!(this.k48_1 == other.k48_1))
     return false;
-  if (!(this.y46_1 == other.y46_1))
+  if (!(this.l48_1 == other.l48_1))
     return false;
   return true;
 };
+function FieldSerializer() {
+  FieldSerializer_instance = this;
+  this.d4a_1 = buildClassSerialDescriptor('Field', []);
+}
+protoOf(FieldSerializer).n21 = function () {
+  return this.d4a_1;
+};
+protoOf(FieldSerializer).e4a = function (encoder, value) {
+  var tmp0_elvis_lhs = isInterface(encoder, JsonEncoder) ? encoder : null;
+  var tmp;
+  if (tmp0_elvis_lhs == null) {
+    throw SerializationException_init_$Create$('This class can be saved only by Json');
+  } else {
+    tmp = tmp0_elvis_lhs;
+  }
+  var output = tmp;
+  // Inline function 'kotlinx.serialization.json.buildJsonObject' call
+  var builder = new JsonObjectBuilder();
+  put(builder, 'name', value.x48_1);
+  builder.z2o('type', output.k2o().j2m(TypeListSerializer_getInstance(), value.y48_1));
+  var tmp0_safe_receiver = value.z48_1;
+  if (tmp0_safe_receiver == null)
+    null;
+  else {
+    // Inline function 'kotlin.let' call
+    put(builder, 'doc', tmp0_safe_receiver);
+  }
+  var tmp1_safe_receiver = value.a49_1;
+  if (tmp1_safe_receiver == null)
+    null;
+  else {
+    // Inline function 'kotlin.let' call
+    builder.z2o('default', tmp1_safe_receiver);
+  }
+  // Inline function 'kotlin.let' call
+  var p0 = builder.s2n();
+  output.r2p(p0);
+};
+protoOf(FieldSerializer).o21 = function (encoder, value) {
+  return this.e4a(encoder, value instanceof Field_0 ? value : THROW_CCE());
+};
+protoOf(FieldSerializer).p21 = function (decoder) {
+  var tmp0_elvis_lhs = isInterface(decoder, JsonDecoder) ? decoder : null;
+  var tmp;
+  if (tmp0_elvis_lhs == null) {
+    throw SerializationException_init_$Create$('This class can be loaded only by Json');
+  } else {
+    tmp = tmp0_elvis_lhs;
+  }
+  var input = tmp;
+  // Inline function 'kotlin.let' call
+  var field = get_jsonObject(input.l2o());
+  var tmp_0 = get_jsonPrimitive(getValue(field, 'name')).n1f();
+  var tmp_1 = input.k2o().k2m(TypeListSerializer_getInstance(), getValue(field, 'type'));
+  var tmp0_safe_receiver = field.id('doc');
+  var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : get_jsonPrimitive(tmp0_safe_receiver);
+  return new Field_0(tmp_0, tmp_1, tmp1_safe_receiver == null ? null : get_contentOrNull(tmp1_safe_receiver), field.id('default'));
+};
+var FieldSerializer_instance;
+function FieldSerializer_getInstance() {
+  if (FieldSerializer_instance == null)
+    new FieldSerializer();
+  return FieldSerializer_instance;
+}
 function TypeListSerializer() {
   TypeListSerializer_instance = this;
-  this.r48_1 = buildSerialDescriptor('TypeListSerializer', SEALED_getInstance(), []);
+  this.f4a_1 = buildSerialDescriptor('TypeListSerializer', SEALED_getInstance(), []);
 }
-protoOf(TypeListSerializer).h20 = function () {
-  return this.r48_1;
+protoOf(TypeListSerializer).n21 = function () {
+  return this.f4a_1;
 };
-protoOf(TypeListSerializer).s48 = function (encoder, value) {
-  if (value.q48_1 > 1) {
-    encoder.z24(ListSerializer(Companion_instance_1.i2n()), value);
+protoOf(TypeListSerializer).g4a = function (encoder, value) {
+  if (value.c4a_1 > 1) {
+    encoder.f26(ListSerializer(Companion_instance_1.p2o()), value);
   } else {
-    encoder.z24(Companion_instance_1.i2n(), first(value));
+    encoder.f26(Companion_instance_1.p2o(), first(value));
   }
 };
-protoOf(TypeListSerializer).i20 = function (encoder, value) {
-  return this.s48(encoder, value instanceof TypeList ? value : THROW_CCE());
+protoOf(TypeListSerializer).o21 = function (encoder, value) {
+  return this.g4a(encoder, value instanceof TypeList ? value : THROW_CCE());
 };
-protoOf(TypeListSerializer).j20 = function (decoder) {
+protoOf(TypeListSerializer).p21 = function (decoder) {
   var tmp0_elvis_lhs = isInterface(decoder, JsonDecoder) ? decoder : null;
   var tmp;
   if (tmp0_elvis_lhs == null) {
@@ -1817,10 +1821,10 @@ protoOf(TypeListSerializer).j20 = function (decoder) {
     tmp = tmp0_elvis_lhs;
   }
   var input = tmp;
-  var element = input.f2n();
+  var element = input.l2o();
   var tmp_0;
   if (element instanceof JsonPrimitive) {
-    tmp_0 = new TypeList([input.e2n().e2l(Companion_instance_1.i2n(), element)]);
+    tmp_0 = new TypeList([input.k2o().k2m(Companion_instance_1.p2o(), element)]);
   } else {
     if (element instanceof JsonArray) {
       // Inline function 'kotlin.collections.map' call
@@ -1829,15 +1833,15 @@ protoOf(TypeListSerializer).j20 = function (decoder) {
       var _iterator__ex2g4s = element.t();
       while (_iterator__ex2g4s.u()) {
         var item = _iterator__ex2g4s.v();
-        var tmp$ret$0 = input.e2n().e2l(Companion_instance_1.i2n(), item);
-        destination.x(tmp$ret$0);
+        var tmp$ret$2 = input.k2o().k2m(Companion_instance_1.p2o(), item);
+        destination.x(tmp$ret$2);
       }
       // Inline function 'kotlin.collections.toTypedArray' call
       var tmp$ret$3 = copyToArray(destination);
       tmp_0 = new TypeList(tmp$ret$3.slice());
     } else {
       if (element instanceof JsonObject) {
-        tmp_0 = new TypeList([input.e2n().e2l(Companion_instance_1.i2n(), element)]);
+        tmp_0 = new TypeList([input.k2o().k2m(Companion_instance_1.p2o(), element)]);
       } else {
         noWhenBranchMatchedException();
       }
@@ -1853,29 +1857,29 @@ function TypeListSerializer_getInstance() {
 }
 function TypeSerializer() {
   TypeSerializer_instance = this;
-  this.t48_1 = buildSerialDescriptor('TypeSerializer', SEALED_getInstance(), []);
+  this.h4a_1 = buildSerialDescriptor('TypeSerializer', SEALED_getInstance(), []);
 }
-protoOf(TypeSerializer).h20 = function () {
-  return this.t48_1;
+protoOf(TypeSerializer).n21 = function () {
+  return this.h4a_1;
 };
-protoOf(TypeSerializer).u48 = function (encoder, value) {
+protoOf(TypeSerializer).i4a = function (encoder, value) {
   if (value instanceof SimpleType) {
-    encoder.z24(serializer_0(StringCompanionObject_instance), value.q46_1);
+    encoder.f26(serializer_0(StringCompanionObject_instance), value.d48_1);
   } else {
     if (value instanceof RecordType) {
-      encoder.z24(Companion_getInstance_3().i2n(), value);
+      encoder.f26(Companion_getInstance_3().p2o(), value);
     } else {
       if (value instanceof ArrayType) {
-        encoder.z24(Companion_instance_4.i2n(), value);
+        encoder.f26(Companion_instance_4.p2o(), value);
       } else {
         if (value instanceof MapType) {
-          encoder.z24(Companion_instance_5.i2n(), value);
+          encoder.f26(Companion_instance_5.p2o(), value);
         } else {
           if (value instanceof EnumType) {
-            encoder.z24(Companion_getInstance_6().i2n(), value);
+            encoder.f26(Companion_getInstance_6().p2o(), value);
           } else {
             if (value instanceof UnionType) {
-              encoder.z24(Companion_instance_7.i2n(), value);
+              encoder.f26(Companion_instance_7.p2o(), value);
             } else {
               if (value instanceof LogicalType) {
                 // Inline function 'kotlin.TODO' call
@@ -1890,10 +1894,10 @@ protoOf(TypeSerializer).u48 = function (encoder, value) {
     }
   }
 };
-protoOf(TypeSerializer).i20 = function (encoder, value) {
-  return this.u48(encoder, (!(value == null) ? isInterface(value, Type_0) : false) ? value : THROW_CCE());
+protoOf(TypeSerializer).o21 = function (encoder, value) {
+  return this.i4a(encoder, (!(value == null) ? isInterface(value, Type_0) : false) ? value : THROW_CCE());
 };
-protoOf(TypeSerializer).j20 = function (decoder) {
+protoOf(TypeSerializer).p21 = function (decoder) {
   var tmp0_elvis_lhs = isInterface(decoder, JsonDecoder) ? decoder : null;
   var tmp;
   if (tmp0_elvis_lhs == null) {
@@ -1902,28 +1906,30 @@ protoOf(TypeSerializer).j20 = function (decoder) {
     tmp = tmp0_elvis_lhs;
   }
   var input = tmp;
-  var element = input.f2n();
+  var element = input.l2o();
   var tmp_0;
   if (element instanceof JsonObject) {
     var tmp_1;
-    if (element.m2n('items')) {
-      tmp_1 = input.e2n().e2l(Companion_instance_4.i2n(), element);
-    } else if (element.m2n('fields')) {
-      tmp_1 = input.e2n().e2l(Companion_getInstance_3().i2n(), element);
-    } else if (element.m2n('symbols')) {
-      tmp_1 = input.e2n().e2l(Companion_getInstance_6().i2n(), element);
-    } else if (element.m2n('logicalType')) {
-      tmp_1 = input.e2n().e2l(Companion_instance_8.i2n(), element);
+    if (element.r2o('items')) {
+      tmp_1 = input.k2o().k2m(Companion_instance_4.p2o(), element);
+    } else if (element.r2o('fields')) {
+      tmp_1 = input.k2o().k2m(Companion_getInstance_3().p2o(), element);
+    } else if (element.r2o('symbols')) {
+      tmp_1 = input.k2o().k2m(Companion_getInstance_6().p2o(), element);
+    } else if (element.r2o('logicalType')) {
+      tmp_1 = input.k2o().k2m(Companion_instance_8.p2o(), element);
     } else {
+      // Inline function 'kotlin.TODO' call
       var reason = 'Unknown object type: ' + element.toString();
       throw new NotImplementedError('An operation is not implemented: ' + reason);
     }
     tmp_0 = tmp_1;
   } else {
     if (element instanceof JsonPrimitive) {
-      tmp_0 = new SimpleType(element.vx());
+      tmp_0 = new SimpleType(element.n1f());
     } else {
       if (element instanceof JsonArray) {
+        // Inline function 'kotlin.TODO' call
         var reason_0 = 'Type can never be an array';
         throw new NotImplementedError('An operation is not implemented: ' + reason_0);
       } else {
@@ -1940,14 +1946,13 @@ function TypeSerializer_getInstance() {
   return TypeSerializer_instance;
 }
 //region block: post-declaration
-protoOf($serializer).l2b = typeParametersSerializers;
-protoOf($serializer_0).l2b = typeParametersSerializers;
-protoOf($serializer_1).l2b = typeParametersSerializers;
-protoOf($serializer_2).l2b = typeParametersSerializers;
-protoOf($serializer_3).l2b = typeParametersSerializers;
-protoOf($serializer_4).l2b = typeParametersSerializers;
-protoOf($serializer_5).l2b = typeParametersSerializers;
-protoOf($serializer_6).l2b = typeParametersSerializers;
+protoOf($serializer).r2c = typeParametersSerializers;
+protoOf($serializer_0).r2c = typeParametersSerializers;
+protoOf($serializer_1).r2c = typeParametersSerializers;
+protoOf($serializer_2).r2c = typeParametersSerializers;
+protoOf($serializer_3).r2c = typeParametersSerializers;
+protoOf($serializer_4).r2c = typeParametersSerializers;
+protoOf($serializer_5).r2c = typeParametersSerializers;
 //endregion
 //region block: init
 AvroJsonParser_instance = new AvroJsonParser();
@@ -1963,8 +1968,8 @@ Companion_instance_8 = new Companion_8();
 //region block: exports
 export {
   Type_0 as Typel89stdvlxo83,
-  AvroJsonEmitter_getInstance as AvroJsonEmitter_getInstancef4slytin56up,
-  AvroJsonParser_instance as AvroJsonParser_instance1463wx3c6teur,
+  AvroJsonEmitter_getInstance as AvroJsonEmitter_getInstanceqxb8ioshyd02,
+  AvroJsonParser_instance as AvroJsonParser_instance5zz3bwjsci7v,
 };
 //endregion