@flock/wirespec 0.20.0-RC.10 → 0.20.0-RC.12

package/wirespec-src-compiler-ir.mjs

@@ -211,8 +211,8 @@ initMetadataForObject(NullLiteral, 'NullLiteral', VOID, VOID, [Statement, Expres
 initMetadataForClass(EnumReference, 'EnumReference', VOID, VOID, [Statement, Expression]);
 initMetadataForClass(EnumValueCall, 'EnumValueCall', VOID, VOID, [Statement, Expression]);
 initMetadataForClass(NullableMap, 'NullableMap', VOID, VOID, [Statement, Expression]);
-initMetadataForClass(RegexMatch, 'RegexMatch', VOID, VOID, [Expression, Statement]);
-initMetadataForClass(BoundCheck, 'BoundCheck', VOID, VOID, [Expression, Statement]);
+initMetadataForClass(RegexMatch, 'RegexMatch', VOID, VOID, [Statement, Expression]);
+initMetadataForClass(BoundCheck, 'BoundCheck', VOID, VOID, [Statement, Expression]);
 initMetadataForClass(NullCheck, 'NullCheck', VOID, VOID, [Statement, Expression]);
 initMetadataForClass(Text, 'Text');
 initMetadataForClass(Expr, 'Expr');
@@ -838,7 +838,7 @@ function convertToGenerator_2(_this__u8e3s4) {
   var _iterator__ex2g4s_0 = destination.t();
   while (_iterator__ex2g4s_0.u()) {
     var item = _iterator__ex2g4s_0.v();
-    var tmp$ret$2 = item.cv_1;
+    var tmp$ret$2 = item.fv_1;
     destination_0.x(tmp$ret$2);
   }
   var variantNames = destination_0;
@@ -921,7 +921,7 @@ function toGeneratorExpression(_this__u8e3s4, typeName, fieldNameStr, annotation
   _init_properties_GeneratorConverter_kt__5fy8pf();
   var outerPath = pathPlus(fieldNameStr);
   var tmp;
-  if (_this__u8e3s4.uu()) {
+  if (_this__u8e3s4.xu()) {
     tmp = new FunctionCall(new VariableReference(Companion_getInstance().s1h('generator')), VOID, Companion_getInstance().s1h('generate'), mapOf_0([to(Companion_getInstance().s1h('path'), outerPath), to(Companion_getInstance().s1h('field'), new ConstructorStatement(Custom_init_$Create$('Wirespec.GeneratorFieldNullable'), mapOf(to(Companion_getInstance().s1h('generate'), new Lambda(lambdaPathParam(0), buildLeafExpr(_this__u8e3s4, lambdaPathRef(0), typeName, annotations, module_0, 0))))))]));
   } else {
     tmp = buildLeafExpr(_this__u8e3s4, outerPath, typeName, annotations, module_0, -1);
@@ -948,10 +948,10 @@ function annotationsToIrList(annotations) {
 function toFieldDescriptor(_this__u8e3s4, annotations) {
   _init_properties_GeneratorConverter_kt__5fy8pf();
   var annotationsArg = annotationsToIrList(annotations);
-  var t = _this__u8e3s4.gv_1;
+  var t = _this__u8e3s4.rt_1;
   var tmp;
   if (t instanceof String_0) {
-    var constraint = t.iu_1;
+    var constraint = t.lu_1;
     var tmp_0 = Custom_init_$Create$('Wirespec.GeneratorFieldString');
     var tmp_1 = Companion_getInstance().s1h('regex');
     var tmp_2;
@@ -965,12 +965,12 @@ function toFieldDescriptor(_this__u8e3s4, annotations) {
   } else {
     if (t instanceof Integer) {
       var tmp_4;
-      switch (t.ku_1.b3_1) {
+      switch (t.nu_1.b3_1) {
         case 1:
           var tmp_5 = Custom_init_$Create$('Wirespec.GeneratorFieldInteger64');
           var tmp_6 = Companion_getInstance().s1h('min');
-          var tmp1_safe_receiver = t.lu_1;
-          var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.gu_1;
+          var tmp1_safe_receiver = t.ou_1;
+          var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.ju_1;
           var tmp_7;
           if (tmp2_safe_receiver == null) {
             tmp_7 = null;
@@ -982,8 +982,8 @@ function toFieldDescriptor(_this__u8e3s4, annotations) {
           var tmp3_elvis_lhs = tmp_7;
           var tmp_8 = to(tmp_6, tmp3_elvis_lhs == null ? NullableEmpty_instance : tmp3_elvis_lhs);
           var tmp_9 = Companion_getInstance().s1h('max');
-          var tmp4_safe_receiver = t.lu_1;
-          var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.hu_1;
+          var tmp4_safe_receiver = t.ou_1;
+          var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.ku_1;
           var tmp_10;
           if (tmp5_safe_receiver == null) {
             tmp_10 = null;
@@ -998,8 +998,8 @@ function toFieldDescriptor(_this__u8e3s4, annotations) {
         case 0:
           var tmp_11 = Custom_init_$Create$('Wirespec.GeneratorFieldInteger32');
           var tmp_12 = Companion_getInstance().s1h('min');
-          var tmp7_safe_receiver = t.lu_1;
-          var tmp8_safe_receiver = tmp7_safe_receiver == null ? null : tmp7_safe_receiver.gu_1;
+          var tmp7_safe_receiver = t.ou_1;
+          var tmp8_safe_receiver = tmp7_safe_receiver == null ? null : tmp7_safe_receiver.ju_1;
           var tmp_13;
           if (tmp8_safe_receiver == null) {
             tmp_13 = null;
@@ -1011,8 +1011,8 @@ function toFieldDescriptor(_this__u8e3s4, annotations) {
           var tmp9_elvis_lhs = tmp_13;
           var tmp_14 = to(tmp_12, tmp9_elvis_lhs == null ? NullableEmpty_instance : tmp9_elvis_lhs);
           var tmp_15 = Companion_getInstance().s1h('max');
-          var tmp10_safe_receiver = t.lu_1;
-          var tmp11_safe_receiver = tmp10_safe_receiver == null ? null : tmp10_safe_receiver.hu_1;
+          var tmp10_safe_receiver = t.ou_1;
+          var tmp11_safe_receiver = tmp10_safe_receiver == null ? null : tmp10_safe_receiver.ku_1;
           var tmp_16;
           if (tmp11_safe_receiver == null) {
             tmp_16 = null;
@@ -1032,12 +1032,12 @@ function toFieldDescriptor(_this__u8e3s4, annotations) {
     } else {
       if (t instanceof Number_0) {
         var tmp_17;
-        switch (t.nu_1.b3_1) {
+        switch (t.qu_1.b3_1) {
           case 1:
             var tmp_18 = Custom_init_$Create$('Wirespec.GeneratorFieldNumber64');
             var tmp_19 = Companion_getInstance().s1h('min');
-            var tmp14_safe_receiver = t.ou_1;
-            var tmp15_safe_receiver = tmp14_safe_receiver == null ? null : tmp14_safe_receiver.gu_1;
+            var tmp14_safe_receiver = t.ru_1;
+            var tmp15_safe_receiver = tmp14_safe_receiver == null ? null : tmp14_safe_receiver.ju_1;
             var tmp_20;
             if (tmp15_safe_receiver == null) {
               tmp_20 = null;
@@ -1049,8 +1049,8 @@ function toFieldDescriptor(_this__u8e3s4, annotations) {
             var tmp16_elvis_lhs = tmp_20;
             var tmp_21 = to(tmp_19, tmp16_elvis_lhs == null ? NullableEmpty_instance : tmp16_elvis_lhs);
             var tmp_22 = Companion_getInstance().s1h('max');
-            var tmp17_safe_receiver = t.ou_1;
-            var tmp18_safe_receiver = tmp17_safe_receiver == null ? null : tmp17_safe_receiver.hu_1;
+            var tmp17_safe_receiver = t.ru_1;
+            var tmp18_safe_receiver = tmp17_safe_receiver == null ? null : tmp17_safe_receiver.ku_1;
             var tmp_23;
             if (tmp18_safe_receiver == null) {
               tmp_23 = null;
@@ -1065,8 +1065,8 @@ function toFieldDescriptor(_this__u8e3s4, annotations) {
           case 0:
             var tmp_24 = Custom_init_$Create$('Wirespec.GeneratorFieldNumber32');
             var tmp_25 = Companion_getInstance().s1h('min');
-            var tmp20_safe_receiver = t.ou_1;
-            var tmp21_safe_receiver = tmp20_safe_receiver == null ? null : tmp20_safe_receiver.gu_1;
+            var tmp20_safe_receiver = t.ru_1;
+            var tmp21_safe_receiver = tmp20_safe_receiver == null ? null : tmp20_safe_receiver.ju_1;
             var tmp_26;
             if (tmp21_safe_receiver == null) {
               tmp_26 = null;
@@ -1082,8 +1082,8 @@ function toFieldDescriptor(_this__u8e3s4, annotations) {
             var tmp22_elvis_lhs = tmp_26;
             var tmp_27 = to(tmp_25, tmp22_elvis_lhs == null ? NullableEmpty_instance : tmp22_elvis_lhs);
             var tmp_28 = Companion_getInstance().s1h('max');
-            var tmp23_safe_receiver = t.ou_1;
-            var tmp24_safe_receiver = tmp23_safe_receiver == null ? null : tmp23_safe_receiver.hu_1;
+            var tmp23_safe_receiver = t.ru_1;
+            var tmp24_safe_receiver = tmp23_safe_receiver == null ? null : tmp23_safe_receiver.ku_1;
             var tmp_29;
             if (tmp24_safe_receiver == null) {
               tmp_29 = null;
@@ -1159,7 +1159,7 @@ function buildLeafExpr(ref, pathExpr, typeName, annotations, module_0, depth) {
     tmp = new FunctionCall(new VariableReference(Companion_getInstance().s1h('generator')), VOID, Companion_getInstance().s1h('generate'), mapOf_0([to(Companion_getInstance().s1h('path'), pathExpr), to(Companion_getInstance().s1h('field'), toFieldDescriptor(ref, annotations))]));
   } else {
     if (ref instanceof Custom) {
-      tmp = new FunctionCall(new VariableReference(Companion_getInstance().s1h('generator')), VOID, Companion_getInstance().s1h('generate'), mapOf_0([to(Companion_getInstance().s1h('path'), pathExpr), to(Companion_getInstance().s1h('field'), shapeConstructor(ref.cv_1, targetFieldAnnotationsMap(ref.cv_1, annotations, module_0), depth + 1 | 0))]));
+      tmp = new FunctionCall(new VariableReference(Companion_getInstance().s1h('generator')), VOID, Companion_getInstance().s1h('generate'), mapOf_0([to(Companion_getInstance().s1h('path'), pathExpr), to(Companion_getInstance().s1h('field'), shapeConstructor(ref.fv_1, targetFieldAnnotationsMap(ref.fv_1, annotations, module_0), depth + 1 | 0))]));
     } else {
       if (ref instanceof Iterable) {
         tmp = new FunctionCall(new VariableReference(Companion_getInstance().s1h('generator')), VOID, Companion_getInstance().s1h('generate'), mapOf_0([to(Companion_getInstance().s1h('path'), pathExpr), to(Companion_getInstance().s1h('field'), new ConstructorStatement(Custom_init_$Create$('Wirespec.GeneratorFieldArray'), mapOf(to(Companion_getInstance().s1h('generate'), new Lambda(lambdaPathParam(depth + 1 | 0), buildLeafExpr(ref.po_1, lambdaPathRef(depth + 1 | 0), typeName, annotations, module_0, depth + 1 | 0))))))]));
@@ -1190,9 +1190,9 @@ function lambdaPathRef(depth) {
 }
 function toIrLiteralMap(_this__u8e3s4) {
   _init_properties_GeneratorConverter_kt__5fy8pf();
-  var tmp = to('name', new Literal_0(_this__u8e3s4.eu_1, String_instance));
+  var tmp = to('name', new Literal_0(_this__u8e3s4.hu_1, String_instance));
   // Inline function 'kotlin.collections.associate' call
-  var this_0 = _this__u8e3s4.fu_1;
+  var this_0 = _this__u8e3s4.iu_1;
   var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
   // Inline function 'kotlin.collections.associateTo' call
   var destination = LinkedHashMap_init_$Create$(capacity);
@@ -1200,7 +1200,7 @@ function toIrLiteralMap(_this__u8e3s4) {
   while (_iterator__ex2g4s.u()) {
     var element = _iterator__ex2g4s.v();
     // Inline function 'kotlin.collections.plusAssign' call
-    var pair = to(element.cu_1, annotationValueToIrExpression(element.du_1));
+    var pair = to(element.fu_1, annotationValueToIrExpression(element.gu_1));
     destination.s2(pair.ef_1, pair.ff_1);
   }
   return new LiteralMap(mapOf_0([tmp, to('parameters', new LiteralMap(destination, String_instance, Any_instance))]), String_instance, Any_instance);
@@ -1288,24 +1288,24 @@ function annotationValueToIrExpression(value) {
   _init_properties_GeneratorConverter_kt__5fy8pf();
   var tmp;
   if (value instanceof Single) {
-    tmp = coerceAnnotationValueLiteral(value.zt_1);
+    tmp = coerceAnnotationValueLiteral(value.cu_1);
   } else {
     if (value instanceof Array_0) {
       // Inline function 'kotlin.collections.map' call
-      var this_0 = value.au_1;
+      var this_0 = value.du_1;
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$_0(collectionSizeOrDefault(this_0, 10));
       var _iterator__ex2g4s = this_0.t();
       while (_iterator__ex2g4s.u()) {
         var item = _iterator__ex2g4s.v();
-        var tmp$ret$0 = coerceAnnotationValueLiteral(item.zt_1);
+        var tmp$ret$0 = coerceAnnotationValueLiteral(item.cu_1);
         destination.x(tmp$ret$0);
       }
       tmp = new LiteralList(destination, Any_instance);
     } else {
       if (value instanceof Dict_0) {
         // Inline function 'kotlin.collections.associate' call
-        var this_1 = value.bu_1;
+        var this_1 = value.eu_1;
         var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_1, 10)), 16);
         // Inline function 'kotlin.collections.associateTo' call
         var destination_0 = LinkedHashMap_init_$Create$(capacity);
@@ -1313,7 +1313,7 @@ function annotationValueToIrExpression(value) {
         while (_iterator__ex2g4s_0.u()) {
           var element = _iterator__ex2g4s_0.v();
           // Inline function 'kotlin.collections.plusAssign' call
-          var pair = to(element.cu_1, annotationValueToIrExpression(element.du_1));
+          var pair = to(element.fu_1, annotationValueToIrExpression(element.gu_1));
           destination_0.s2(pair.ef_1, pair.ff_1);
         }
         tmp = new LiteralMap(destination_0, String_instance, Any_instance);
@@ -1559,7 +1559,7 @@ function convert_5(_this__u8e3s4) {
     tmp = Custom_init_$Create$('Any');
   } else {
     if (_this__u8e3s4 instanceof Custom) {
-      tmp = Custom_init_$Create$(Companion_getInstance().s1h(_this__u8e3s4.cv_1).t1h());
+      tmp = Custom_init_$Create$(Companion_getInstance().s1h(_this__u8e3s4.fv_1).t1h());
     } else {
       if (_this__u8e3s4 instanceof Dict) {
         tmp = new Dict_1(String_instance, convert_5(_this__u8e3s4.so_1));
@@ -1568,7 +1568,7 @@ function convert_5(_this__u8e3s4) {
           tmp = new Array_1(convert_5(_this__u8e3s4.po_1));
         } else {
           if (_this__u8e3s4 instanceof Primitive) {
-            var t = _this__u8e3s4.gv_1;
+            var t = _this__u8e3s4.rt_1;
             var tmp_0;
             if (equals(t, Boolean_instance)) {
               tmp_0 = Boolean_instance_0;
@@ -1578,7 +1578,7 @@ function convert_5(_this__u8e3s4) {
               } else {
                 if (t instanceof Integer) {
                   var tmp_1;
-                  switch (t.ku_1.b3_1) {
+                  switch (t.nu_1.b3_1) {
                     case 0:
                       tmp_1 = new Integer_0(Precision_P32_getInstance());
                       break;
@@ -1593,7 +1593,7 @@ function convert_5(_this__u8e3s4) {
                 } else {
                   if (t instanceof Number_0) {
                     var tmp_2;
-                    switch (t.nu_1.b3_1) {
+                    switch (t.qu_1.b3_1) {
                       case 0:
                         tmp_2 = new Number_1(Precision_P32_getInstance());
                         break;
@@ -1629,7 +1629,7 @@ function convert_5(_this__u8e3s4) {
   }
   // Inline function 'kotlin.let' call
   var it = tmp;
-  return _this__u8e3s4.uu() ? new Nullable(it) : it;
+  return _this__u8e3s4.xu() ? new Nullable(it) : it;
 }
 function FieldValidation(fieldName, fieldPath, kind, isNullable, typeName, elementIsNullable) {
   elementIsNullable = elementIsNullable === VOID ? false : elementIsNullable;
@@ -1682,9 +1682,9 @@ function classifyValidatableFields(_this__u8e3s4, module_0) {
     var fieldName = toName(field.rp_1);
     var fieldPath = field.rp_1.l1();
     var ref = field.sp_1;
-    var isNullable = ref.uu();
+    var isNullable = ref.xu();
     if (ref instanceof Custom) {
-      var typeName = ref.cv_1;
+      var typeName = ref.fv_1;
       var tmp0 = new NonEmptyList(module_0.uq_1);
       var tmp$ret$1;
       $l$block: {
@@ -1710,7 +1710,7 @@ function classifyValidatableFields(_this__u8e3s4, module_0) {
       if (ref instanceof Iterable) {
         var inner = ref.po_1;
         if (inner instanceof Custom) {
-          var typeName_0 = inner.cv_1;
+          var typeName_0 = inner.fv_1;
           var tmp0_0 = new NonEmptyList(module_0.uq_1);
           var tmp$ret$3;
           $l$block_0: {
@@ -1727,10 +1727,10 @@ function classifyValidatableFields(_this__u8e3s4, module_0) {
           }
           var def_0 = tmp$ret$3;
           if (def_0 instanceof Type)
-            this_0.x(new FieldValidation(fieldName, fieldPath, Kind_MODEL_ARRAY_getInstance(), isNullable, typeName_0, inner.dv_1));
+            this_0.x(new FieldValidation(fieldName, fieldPath, Kind_MODEL_ARRAY_getInstance(), isNullable, typeName_0, inner.gv_1));
           else {
             if (def_0 instanceof Refined)
-              this_0.x(new FieldValidation(fieldName, fieldPath, Kind_REFINED_ARRAY_getInstance(), isNullable, typeName_0, inner.dv_1));
+              this_0.x(new FieldValidation(fieldName, fieldPath, Kind_REFINED_ARRAY_getInstance(), isNullable, typeName_0, inner.gv_1));
           }
         }
       }
@@ -1739,10 +1739,10 @@ function classifyValidatableFields(_this__u8e3s4, module_0) {
   return this_0.o5();
 }
 function convertConstraint(_this__u8e3s4, value) {
-  var t = _this__u8e3s4.gv_1;
+  var t = _this__u8e3s4.rt_1;
   var tmp;
   if (t instanceof String_0) {
-    var tmp0_safe_receiver = t.iu_1;
+    var tmp0_safe_receiver = t.lu_1;
     var tmp_0;
     var tmp_1 = tmp0_safe_receiver;
     if ((tmp_1 == null ? null : new RegExp_0(tmp_1)) == null) {
@@ -1753,11 +1753,11 @@ function convertConstraint(_this__u8e3s4, value) {
     tmp = tmp_0;
   } else {
     if (t instanceof Integer) {
-      var tmp1_safe_receiver = t.lu_1;
+      var tmp1_safe_receiver = t.ou_1;
       tmp = tmp1_safe_receiver == null ? null : convert_7(tmp1_safe_receiver, value);
     } else {
       if (t instanceof Number_0) {
-        var tmp2_safe_receiver = t.ou_1;
+        var tmp2_safe_receiver = t.ru_1;
         tmp = tmp2_safe_receiver == null ? null : convert_7(tmp2_safe_receiver, value);
       } else {
         if (equals(t, Boolean_instance)) {
@@ -1970,14 +1970,14 @@ function toTypeDescriptor(_this__u8e3s4) {
   return new TypeDescriptor(convert_5(_this__u8e3s4));
 }
 function serializeParamExpression(fieldAccess, field) {
-  var type = field.sp_1.wu(false);
+  var type = field.sp_1.zu(false);
   var tmp0_receiver = new VariableReference(Companion_getInstance().s1h('serialization'));
   var tmp1_name = Name_init_$Create$(['serialize', 'Param']);
   var tmp2_typeArguments = listOf(convert_5(type));
   var tmp3_arguments = mapOf_0([to(Companion_getInstance().s1h('value'), new VariableReference(Companion_getInstance().s1h('it'))), to(Companion_getInstance().s1h('type'), toTypeDescriptor(type))]);
   var serializeCall = new FunctionCall(tmp0_receiver, tmp2_typeArguments, tmp1_name, tmp3_arguments);
   var tmp;
-  if (field.sp_1.uu()) {
+  if (field.sp_1.xu()) {
     tmp = new NullableMap(fieldAccess, serializeCall, new LiteralList(emptyList(), String_instance));
   } else {
     var tmp4_receiver = new VariableReference(Companion_getInstance().s1h('serialization'));
@@ -1990,7 +1990,7 @@ function serializeParamExpression(fieldAccess, field) {
 }
 function deserializeParamExpression(map, fieldName, field, caseSensitive) {
   caseSensitive = caseSensitive === VOID ? true : caseSensitive;
-  var type = field.sp_1.wu(false);
+  var type = field.sp_1.zu(false);
   var getCall = new ArrayIndexCall(map, new Literal_0(fieldName, String_instance), caseSensitive);
   var tmp0_receiver = new VariableReference(Companion_getInstance().s1h('serialization'));
   var tmp1_name = Name_init_$Create$(['deserialize', 'Param']);
@@ -1998,7 +1998,7 @@ function deserializeParamExpression(map, fieldName, field, caseSensitive) {
   var tmp3_arguments = mapOf_0([to(Companion_getInstance().s1h('value'), new VariableReference(Companion_getInstance().s1h('it'))), to(Companion_getInstance().s1h('type'), toTypeDescriptor(type))]);
   var tmp = new FunctionCall(tmp0_receiver, tmp2_typeArguments, tmp1_name, tmp3_arguments);
   var tmp_0;
-  if (field.sp_1.uu()) {
+  if (field.sp_1.xu()) {
     tmp_0 = null;
   } else {
     tmp_0 = new ErrorStatement(new Literal_0('Param ' + fieldName + ' cannot be null', String_instance));
@@ -2028,7 +2028,7 @@ function convert_7(_this__u8e3s4, value) {
     tmp = new RegexMatch(joinToString(dropLast(drop(split(_RegExp___get_value__impl__7o7618(_this__u8e3s4.qt_1), ['/']), 1), 1), '/'), _RegExp___get_value__impl__7o7618(_this__u8e3s4.qt_1), value);
   } else {
     if (_this__u8e3s4 instanceof Bound) {
-      tmp = new BoundCheck(_this__u8e3s4.gu_1, _this__u8e3s4.hu_1, value);
+      tmp = new BoundCheck(_this__u8e3s4.ju_1, _this__u8e3s4.ku_1, value);
     } else {
       noWhenBranchMatchedException();
     }
@@ -2569,7 +2569,7 @@ function convert$lambda$lambda$lambda_36($this_convert) {
   return function ($this$function) {
     $this$function.j1i(String_instance);
     var tmp;
-    var tmp_0 = $this_convert.ur_1.gv_1;
+    var tmp_0 = $this_convert.ur_1.rt_1;
     if (tmp_0 instanceof String_0) {
       tmp = new VariableReference(Companion_getInstance().s1h('value'));
     } else {

package/wirespec-src-compiler-lib.mjs

@@ -883,18 +883,18 @@ function WsReference() {
 function WsAny(isNullable) {
   this.ox_1 = isNullable;
 }
-protoOf(WsAny).uu = function () {
+protoOf(WsAny).xu = function () {
   return this.ox_1;
 };
 protoOf(WsAny).ve = function () {
   return this.ox_1;
 };
-protoOf(WsAny).vu = function (isNullable) {
+protoOf(WsAny).yu = function (isNullable) {
   return new WsAny(isNullable);
 };
 protoOf(WsAny).copy = function (isNullable, $super) {
   isNullable = isNullable === VOID ? this.ox_1 : isNullable;
-  return $super === VOID ? this.vu(isNullable) : $super.vu.call(this, isNullable);
+  return $super === VOID ? this.yu(isNullable) : $super.yu.call(this, isNullable);
 };
 protoOf(WsAny).toString = function () {
   return 'WsAny(isNullable=' + this.ox_1 + ')';
@@ -914,18 +914,18 @@ protoOf(WsAny).equals = function (other) {
 function WsUnit(isNullable) {
   this.px_1 = isNullable;
 }
-protoOf(WsUnit).uu = function () {
+protoOf(WsUnit).xu = function () {
   return this.px_1;
 };
 protoOf(WsUnit).ve = function () {
   return this.px_1;
 };
-protoOf(WsUnit).vu = function (isNullable) {
+protoOf(WsUnit).yu = function (isNullable) {
   return new WsUnit(isNullable);
 };
 protoOf(WsUnit).copy = function (isNullable, $super) {
   isNullable = isNullable === VOID ? this.px_1 : isNullable;
-  return $super === VOID ? this.vu(isNullable) : $super.vu.call(this, isNullable);
+  return $super === VOID ? this.yu(isNullable) : $super.yu.call(this, isNullable);
 };
 protoOf(WsUnit).toString = function () {
   return 'WsUnit(isNullable=' + this.px_1 + ')';
@@ -949,7 +949,7 @@ function WsIterable(reference, isNullable) {
 protoOf(WsIterable).gx = function () {
   return this.reference;
 };
-protoOf(WsIterable).uu = function () {
+protoOf(WsIterable).xu = function () {
   return this.qx_1;
 };
 protoOf(WsIterable).ve = function () {
@@ -992,7 +992,7 @@ function WsDict(reference, isNullable) {
 protoOf(WsDict).gx = function () {
   return this.reference;
 };
-protoOf(WsDict).uu = function () {
+protoOf(WsDict).xu = function () {
   return this.sx_1;
 };
 protoOf(WsDict).ve = function () {
@@ -1035,7 +1035,7 @@ function WsCustom(value, isNullable) {
 protoOf(WsCustom).l1 = function () {
   return this.value;
 };
-protoOf(WsCustom).uu = function () {
+protoOf(WsCustom).xu = function () {
   return this.tx_1;
 };
 protoOf(WsCustom).ve = function () {
@@ -1044,13 +1044,13 @@ protoOf(WsCustom).ve = function () {
 protoOf(WsCustom).we = function () {
   return this.tx_1;
 };
-protoOf(WsCustom).ev = function (value, isNullable) {
+protoOf(WsCustom).hv = function (value, isNullable) {
   return new WsCustom(value, isNullable);
 };
 protoOf(WsCustom).copy = function (value, isNullable, $super) {
   value = value === VOID ? this.value : value;
   isNullable = isNullable === VOID ? this.tx_1 : isNullable;
-  return $super === VOID ? this.ev(value, isNullable) : $super.ev.call(this, value, isNullable);
+  return $super === VOID ? this.hv(value, isNullable) : $super.hv.call(this, value, isNullable);
 };
 protoOf(WsCustom).toString = function () {
   return 'WsCustom(value=' + this.value + ', isNullable=' + this.tx_1 + ')';
@@ -1080,7 +1080,7 @@ function WsPrimitive(type, isNullable, constraint) {
 protoOf(WsPrimitive).vx = function () {
   return this.type;
 };
-protoOf(WsPrimitive).uu = function () {
+protoOf(WsPrimitive).xu = function () {
   return this.ux_1;
 };
 protoOf(WsPrimitive).wx = function () {
@@ -1347,7 +1347,7 @@ protoOf(WsContent).vx = function () {
 protoOf(WsContent).gx = function () {
   return this.reference;
 };
-protoOf(WsContent).uu = function () {
+protoOf(WsContent).xu = function () {
   return this.isNullable;
 };
 protoOf(WsContent).ve = function () {
@@ -1603,16 +1603,16 @@ function produce_5(_this__u8e3s4) {
 function produce_6(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof Any) {
-    tmp = new WsAny(_this__u8e3s4.su_1);
+    tmp = new WsAny(_this__u8e3s4.vu_1);
   } else {
     if (_this__u8e3s4 instanceof Unit) {
-      tmp = new WsUnit(_this__u8e3s4.xu_1);
+      tmp = new WsUnit(_this__u8e3s4.av_1);
     } else {
       if (_this__u8e3s4 instanceof Custom) {
-        tmp = new WsCustom(_this__u8e3s4.cv_1, _this__u8e3s4.dv_1);
+        tmp = new WsCustom(_this__u8e3s4.fv_1, _this__u8e3s4.gv_1);
       } else {
         if (_this__u8e3s4 instanceof Primitive) {
-          tmp = new WsPrimitive(produce_11(_this__u8e3s4.gv_1), _this__u8e3s4.hv_1, produceConstraint(_this__u8e3s4.gv_1));
+          tmp = new WsPrimitive(produce_11(_this__u8e3s4.rt_1), _this__u8e3s4.st_1, produceConstraint(_this__u8e3s4.rt_1));
         } else {
           if (_this__u8e3s4 instanceof Dict) {
             tmp = new WsDict(produce_6(_this__u8e3s4.so_1), _this__u8e3s4.to_1);
@@ -1662,7 +1662,7 @@ function produce_11(_this__u8e3s4) {
   } else {
     if (_this__u8e3s4 instanceof Integer) {
       var tmp_0;
-      switch (_this__u8e3s4.ku_1.b3_1) {
+      switch (_this__u8e3s4.nu_1.b3_1) {
         case 0:
           tmp_0 = WsPrimitiveType_Integer32_getInstance();
           break;
@@ -1677,7 +1677,7 @@ function produce_11(_this__u8e3s4) {
     } else {
       if (_this__u8e3s4 instanceof Number_0) {
         var tmp_1;
-        switch (_this__u8e3s4.nu_1.b3_1) {
+        switch (_this__u8e3s4.qu_1.b3_1) {
           case 0:
             tmp_1 = WsPrimitiveType_Number32_getInstance();
             break;
@@ -1707,7 +1707,7 @@ function produce_11(_this__u8e3s4) {
 function produceConstraint(_this__u8e3s4) {
   var tmp;
   if (_this__u8e3s4 instanceof String_0) {
-    var tmp1_safe_receiver = _this__u8e3s4.iu_1;
+    var tmp1_safe_receiver = _this__u8e3s4.lu_1;
     var tmp_0;
     var tmp_1 = tmp1_safe_receiver;
     if ((tmp_1 == null ? null : new RegExp_0(tmp_1)) == null) {
@@ -1721,24 +1721,24 @@ function produceConstraint(_this__u8e3s4) {
     tmp = tmp_0;
   } else {
     if (_this__u8e3s4 instanceof Integer) {
-      var tmp2_safe_receiver = _this__u8e3s4.lu_1;
+      var tmp2_safe_receiver = _this__u8e3s4.ou_1;
       var tmp_3;
       if (tmp2_safe_receiver == null) {
         tmp_3 = null;
       } else {
         // Inline function 'kotlin.let' call
-        tmp_3 = new WsBoundConstraint(tmp2_safe_receiver.gu_1, tmp2_safe_receiver.hu_1);
+        tmp_3 = new WsBoundConstraint(tmp2_safe_receiver.ju_1, tmp2_safe_receiver.ku_1);
       }
       tmp = tmp_3;
     } else {
       if (_this__u8e3s4 instanceof Number_0) {
-        var tmp3_safe_receiver = _this__u8e3s4.ou_1;
+        var tmp3_safe_receiver = _this__u8e3s4.ru_1;
         var tmp_4;
         if (tmp3_safe_receiver == null) {
           tmp_4 = null;
         } else {
           // Inline function 'kotlin.let' call
-          tmp_4 = new WsBoundConstraint(tmp3_safe_receiver.gu_1, tmp3_safe_receiver.hu_1);
+          tmp_4 = new WsBoundConstraint(tmp3_safe_receiver.ju_1, tmp3_safe_receiver.ku_1);
         }
         tmp = tmp_4;
       } else {
@@ -2746,22 +2746,22 @@ defineProp(protoOf(WsRefined), 'comment', function () {
 defineProp(protoOf(WsMethod), 'name', protoOf(WsMethod).m);
 defineProp(protoOf(WsMethod), 'ordinal', protoOf(WsMethod).c3);
 defineProp(protoOf(WsAny), 'isNullable', function () {
-  return this.uu();
+  return this.xu();
 });
 defineProp(protoOf(WsUnit), 'isNullable', function () {
-  return this.uu();
+  return this.xu();
 });
 defineProp(protoOf(WsIterable), 'isNullable', function () {
-  return this.uu();
+  return this.xu();
 });
 defineProp(protoOf(WsDict), 'isNullable', function () {
-  return this.uu();
+  return this.xu();
 });
 defineProp(protoOf(WsCustom), 'isNullable', function () {
-  return this.uu();
+  return this.xu();
 });
 defineProp(protoOf(WsPrimitive), 'isNullable', function () {
-  return this.uu();
+  return this.xu();
 });
 defineProp(protoOf(WsPrimitiveType), 'name', protoOf(WsPrimitiveType).m);
 defineProp(protoOf(WsPrimitiveType), 'ordinal', protoOf(WsPrimitiveType).c3);

package/wirespec-src-converter-avro.mjs

@@ -470,14 +470,14 @@ protoOf(AvroJsonEmitter).y49 = function (_this__u8e3s4, module_0, hasEmitted) {
       tmp = new ArrayType('array', this.y49(_this__u8e3s4.po_1, module_0, hasEmitted));
     } else {
       if (_this__u8e3s4 instanceof Primitive) {
-        var type = _this__u8e3s4.gv_1;
+        var type = _this__u8e3s4.rt_1;
         var tmp_0;
         if (type instanceof String_0) {
           tmp_0 = new SimpleType('string');
         } else {
           if (type instanceof Integer) {
             var tmp_1;
-            switch (type.ku_1.b3_1) {
+            switch (type.nu_1.b3_1) {
               case 0:
                 tmp_1 = new SimpleType('int');
                 break;
@@ -492,7 +492,7 @@ protoOf(AvroJsonEmitter).y49 = function (_this__u8e3s4, module_0, hasEmitted) {
           } else {
             if (type instanceof Number_0) {
               var tmp_2;
-              switch (type.nu_1.b3_1) {
+              switch (type.qu_1.b3_1) {
                 case 0:
                   tmp_2 = new SimpleType('float');
                   break;
@@ -520,7 +520,7 @@ protoOf(AvroJsonEmitter).y49 = function (_this__u8e3s4, module_0, hasEmitted) {
         tmp = tmp_0;
       } else {
         if (_this__u8e3s4 instanceof Custom) {
-          var def = findType(this, module_0, _this__u8e3s4.cv_1);
+          var def = findType(this, module_0, _this__u8e3s4.fv_1);
           var tmp_3;
           if (def instanceof Type) {
             var tmp_4;
@@ -541,7 +541,7 @@ protoOf(AvroJsonEmitter).y49 = function (_this__u8e3s4, module_0, hasEmitted) {
               if (def instanceof Refined) {
                 tmp_3 = new SimpleType('string');
               } else {
-                tmp_3 = new SimpleType(_this__u8e3s4.cv_1);
+                tmp_3 = new SimpleType(_this__u8e3s4.fv_1);
               }
             }
           }
@@ -583,7 +583,7 @@ protoOf(AvroJsonEmitter).z49 = function (_this__u8e3s4, module_0, hasEmitted) {
     var item = _iterator__ex2g4s.v();
     var tmp = item.rp_1.l1();
     var tmp_0;
-    if (item.sp_1.uu()) {
+    if (item.sp_1.xu()) {
       tmp_0 = new TypeList([new SimpleType('null'), AvroJsonEmitter_getInstance().a4a(item, module_0, hasEmitted)]);
     } else {
       tmp_0 = new TypeList([AvroJsonEmitter_getInstance().a4a(item, module_0, hasEmitted)]);