@7mind.io/baboon 0.0.167 → 0.0.171

package/io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl.js

@@ -2,9 +2,13 @@
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024 from "./io.septimalmind.baboon.parser.model.issues.-Baboon-Issue$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024 from "./io.septimalmind.baboon.parser.model.issues.-Baboon-Issue$-W-Evolution-Issue$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType from "./io.septimalmind.baboon.parser.model.issues.-Evolution-Issue$-Unexpected-Diff-Type.js";
-import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024$0024nested$002dInanonfun$0024compute$00244$00241 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$$nested-Inanonfun$compute$4$1.js";
-import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024$0024nested$002dInanonfun$0024compute$00244$00242 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$$nested-Inanonfun$compute$4$2.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024$0024nested$002dInanonfun$0024compute$00249$00241 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$$nested-Inanonfun$compute$9$1.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024$0024nested$002dInanonfun$0024compute$00249$00242 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$$nested-Inanonfun$compute$9$2.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00241 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$1.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$002410 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$10.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$002411 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$11.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$002412 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$12.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$002413 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$13.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00242 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$2.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00243 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$3.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00244 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$4.js";
@@ -12,13 +16,15 @@ import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRule
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00246 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$6.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00247 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$7.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00248 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$8.js";
-import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024compute$00243 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$compute$3.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00249 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$9.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024compute$00248 from "./io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl$$anonfun$compute$8.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dBaboon$002dRuleset from "./io.septimalmind.baboon.typer.model.-Baboon-Ruleset.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dAdt$002dBranch$002dBy$002dName from "./io.septimalmind.baboon.typer.model.-Conversion$-Copy-Adt-Branch-By-Name.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dEnum$002dBy$002dName from "./io.septimalmind.baboon.typer.model.-Conversion$-Copy-Enum-By-Name.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCustom$002dConversion$002dRequired from "./io.septimalmind.baboon.typer.model.-Conversion$-Custom-Conversion-Required.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dDto$002dConversion from "./io.septimalmind.baboon.typer.model.-Conversion$-Dto-Conversion.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dField$002dOp$0024$002dInitialize$002dWith$002dDefault from "./io.septimalmind.baboon.typer.model.-Conversion$-Field-Op$-Initialize-With-Default.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dField$002dOp$0024$002dRename from "./io.septimalmind.baboon.typer.model.-Conversion$-Field-Op$-Rename.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dField$002dOp$0024$002dTransfer from "./io.septimalmind.baboon.typer.model.-Conversion$-Field-Op$-Transfer.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dNon$002dData$002dType$002dType$002dNo$002dConversion from "./io.septimalmind.baboon.typer.model.-Conversion$-Non-Data-Type-Type-No-Conversion.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dRemoved$002dType$002dNo$002dConversion from "./io.septimalmind.baboon.typer.model.-Conversion$-Removed-Type-No-Conversion.js";
@@ -26,6 +32,7 @@ import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDeriv
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dEnum$002dBranch$002dRemoved from "./io.septimalmind.baboon.typer.model.-Derivation-Failure$-Enum-Branch-Removed.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dForeign$0024 from "./io.septimalmind.baboon.typer.model.-Derivation-Failure$-Foreign$.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dIncompatible$002dFields from "./io.septimalmind.baboon.typer.model.-Derivation-Failure$-Incompatible-Fields.js";
+import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dIncompatible$002dRenames from "./io.septimalmind.baboon.typer.model.-Derivation-Failure$-Incompatible-Renames.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser from "./io.septimalmind.baboon.typer.model.-Domain-Member$-User.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dKeep$002dField from "./io.septimalmind.baboon.typer.model.-Dto-Op$-Keep-Field.js";
 import * as $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEvolution$002dStep from "./io.septimalmind.baboon.typer.model.-Evolution-Step.js";
@@ -50,47 +57,96 @@ import * as $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002
 import * as $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dQuote$0024 from "./izumi.fundamentals.platform.strings.-Text-Tree$-Quote$.js";
 import * as $j_java$002elang$002e$002dObject from "./java.lang.-Object.js";
 import * as $j_scala$002e$002dString$002dContext from "./scala.-String-Context.js";
-import * as $j_scala$002e$002dTuple12 from "./scala.-Tuple12.js";
+import * as $j_scala$002e$002dTuple21 from "./scala.-Tuple21.js";
 import * as $j_scala$002ecollection$002eimmutable$002e$002dQueue from "./scala.collection.immutable.-Queue.js";
 var $p;
-function $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map(targetAdtId, last$1) {
-  var x1 = last$1.b5.aw.x(targetAdtId);
+function $p_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__sci_Map__Lio_septimalmind_baboon_typer_model_Domain__Lio_septimalmind_baboon_typer_model_BaboonDiff__sci_Map($thiz, targetAdtId, renameTargets$1, last$1, diff$1) {
+  _return: {
+    var it = renameTargets$1.p();
+    while (it.f()) {
+      var a = it.e();
+      if ((a === null)) {
+        throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(a);
+      }
+      var newId = a.z();
+      if (((newId === null) ? (targetAdtId === null) : newId.b(targetAdtId))) {
+        var this$1 = new $j_java$002elang$002e$002dObject.$c_s_Some(a);
+        break _return;
+      }
+    }
+    var this$1 = $j_java$002elang$002e$002dObject.$m_s_None$();
+  }
+  var this$2 = (this$1.l() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some(this$1.Z().E()));
+  var oldAdtId = (this$2.l() ? targetAdtId : this$2.Z());
+  var x1 = last$1.ba.az.w(targetAdtId);
   if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
-    var adt = x1.a3;
+    var adt = x1.a4;
     if ((adt instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dAdt.$c_Lio_septimalmind_baboon_typer_model_Typedef$Adt)) {
+      var renamed = diff$1.lZ.sP.xl(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00241.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$1($thiz, targetAdtId, oldAdtId));
       var $x_2 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
-      var this$ = adt.go;
-      var f = ((m$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2.bm.aN, m$2$2));
+      var this$ = adt.fn;
+      var f = ((m$2$2) => $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), m$2$2.bg.aH, m$2$2));
       if ((this$ === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
         var $x_1 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
       } else {
-        var x0 = this$.i();
-        var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+        var x0$1 = this$.i();
+        var h = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
         var t = h;
         var rest = this$.n();
         while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
-          var x0$1 = rest.i();
-          var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$1), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+          var x0$2 = rest.i();
+          var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(f(x0$2), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
           t.L = nx;
           t = nx;
           rest = rest.n();
         }
         var $x_1 = h;
       }
-      return $x_2.al($x_1);
+      return $x_2.ak($x_1).is(renamed);
+    }
+  }
+  return $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$();
+}
+export { $p_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__sci_Map__Lio_septimalmind_baboon_typer_model_Domain__Lio_septimalmind_baboon_typer_model_BaboonDiff__sci_Map as $p_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__sci_Map__Lio_septimalmind_baboon_typer_model_Domain__Lio_septimalmind_baboon_typer_model_BaboonDiff__sci_Map };
+function $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeEnumMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map(targetEnumId, last$1) {
+  var x1 = last$1.ba.az.w(targetEnumId);
+  if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDomain$002dMember$0024$002dUser.$c_Lio_septimalmind_baboon_typer_model_DomainMember$User)) {
+    var enumDef = x1.a4;
+    if ((enumDef instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$0024$002dEnum.$c_Lio_septimalmind_baboon_typer_model_Typedef$Enum)) {
+      var $x_1 = $j_java$002elang$002e$002dObject.$m_sci_Map$();
+      var this$1 = enumDef.fF;
+      var rest = this$1;
+      var h = null;
+      var t = null;
+      while ((rest !== $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
+        var x0 = rest.i();
+        var this$2 = x0.yT;
+        var it = (this$2.l() ? $j_java$002elang$002e$002dObject.$m_s_None$() : new $j_java$002elang$002e$002dObject.$c_s_Some($j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), this$2.Z(), x0.f2))).p();
+        while (it.f()) {
+          var nx = new $j_java$002elang$002e$002dObject.$c_sci_$colon$colon(it.e(), $j_java$002elang$002e$002dObject.$m_sci_Nil$());
+          if ((t === null)) {
+            h = nx;
+          } else {
+            t.L = nx;
+          }
+          t = nx;
+        }
+        rest = rest.n();
+      }
+      return $x_1.ak(((h === null) ? $j_java$002elang$002e$002dObject.$m_sci_Nil$() : h));
     }
   }
   return $j_java$002elang$002e$002dObject.$m_sci_Map$EmptyMap$();
 }
-export { $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map as $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map };
+export { $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeEnumMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map as $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeEnumMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map };
 /** @constructor */
 function $c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl(logger, types, evidence$1) {
-  this.ao2 = null;
-  this.sA = null;
-  this.Et = null;
-  this.ao2 = logger;
-  this.sA = types;
-  this.Et = evidence$1;
+  this.aoH = null;
+  this.kn = null;
+  this.EK = null;
+  this.aoH = logger;
+  this.kn = types;
+  this.EK = evidence$1;
 }
 export { $c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl as $c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl };
 $p = $c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl.prototype = new $j_java$002elang$002e$002dObject.$h_O();
@@ -100,8 +156,8 @@ function $h_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl() {
 }
 export { $h_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl as $h_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl };
 $h_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl.prototype = $p;
-$p.aGK = (function(prev, last, diff) {
-  var renameTargets = diff.mI.yw.hZ(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
+$p.aHo = (function(prev, last, diff) {
+  var renameTargets = diff.lZ.sP.hw(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x0$1$2$2) => {
     if ((x0$1$2$2 !== null)) {
       var newId = x0$1$2$2.E();
       return $j_java$002elang$002e$002dObject.$ct_T2__O__O__(new $j_java$002elang$002e$002dObject.$c_T2(), x0$1$2$2.z(), newId);
@@ -109,12 +165,12 @@ $p.aGK = (function(prev, last, diff) {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x0$1$2$2);
     }
   })));
-  var col = prev.b5.aw.Im(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024compute$00243.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$compute$3(this)).aC();
+  var col = prev.ba.az.xl(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024compute$00248.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$compute$8(this)).aC();
   var buildR = new $j_java$002elang$002e$002dObject.$c_sc_IterableFactory$ToFactory($j_java$002elang$002e$002dObject.$m_sci_List$());
   var buildL = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1($j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$m_Lizumi_fundamentals_collections_nonempty_NEList$());
   var init = $j_scala$002ecollection$002eimmutable$002e$002dQueue.$m_sci_Queue$EmptyQueue$();
   var bad = new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList$002dInstances$0024$0024anon$00241$0024$0024anon$00242.$c_Lizumi_fundamentals_collections_nonempty_NEListInstances$$anon$1$$anon$2(buildL);
-  var iterator = col.o();
+  var iterator = col.p();
   var good = init;
   var allGood = true;
   while (iterator.f()) {
@@ -124,14 +180,14 @@ $p.aGK = (function(prev, last, diff) {
     }
     var id = x0.E();
     var defn = x0.z();
-    var maybeTargetTpe = renameTargets.b2(id);
-    var isRenamed = (!maybeTargetTpe.m());
-    var targetTpe = (maybeTargetTpe.m() ? id : maybeTargetTpe.a0());
-    var unmodified = diff.mI.v8.a5(id);
-    var deepChanged = diff.mI.v5.a5(id);
-    var hasDiff = diff.qV.a5(id);
+    var maybeTargetTpe = renameTargets.b1(id);
+    var isRenamed = (!maybeTargetTpe.l());
+    var targetTpe = (maybeTargetTpe.l() ? id : maybeTargetTpe.Z());
+    var unmodified = diff.lZ.vj.a5(id);
+    var deepChanged = diff.lZ.vg.a5(id);
+    var hasDiff = diff.r9.a5(id);
     var sameLocalStruct = (((unmodified || deepChanged) && (!isRenamed)) || (isRenamed && (!hasDiff)));
-    var shallowChanged = ((diff.mI.v7.a5(id) || diff.mI.v6.a5(id)) || (isRenamed && hasDiff));
+    var shallowChanged = ((diff.lZ.vi.a5(id) || diff.lZ.vh.a5(id)) || (isRenamed && hasDiff));
     var rc13 = false;
     var x2 = null;
     var rc14 = false;
@@ -146,7 +202,7 @@ $p.aGK = (function(prev, last, diff) {
         rc13 = true;
         x2 = defn;
         if (sameLocalStruct) {
-          var this$7 = x2.cS;
+          var this$7 = x2.cF;
           var f = ((f$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dField$002dOp$0024$002dTransfer.$c_Lio_septimalmind_baboon_typer_model_Conversion$FieldOp$Transfer(f$2$2));
           if ((this$7 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
             var $x_2 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
@@ -180,7 +236,7 @@ $p.aGK = (function(prev, last, diff) {
         rc14 = true;
         x5 = defn;
         if (sameLocalStruct) {
-          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dEnum$002dBy$002dName.$c_Lio_septimalmind_baboon_typer_model_Conversion$CopyEnumByName(id, targetTpe));
+          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dEnum$002dBy$002dName.$c_Lio_septimalmind_baboon_typer_model_Conversion$CopyEnumByName(id, targetTpe, $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeEnumMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map(targetTpe, last)));
           break matchEnd17;
         }
       }
@@ -188,11 +244,11 @@ $p.aGK = (function(prev, last, diff) {
         rc15 = true;
         x6 = defn;
         if (sameLocalStruct) {
-          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dAdt$002dBranch$002dBy$002dName.$c_Lio_septimalmind_baboon_typer_model_Conversion$CopyAdtBranchByName(id, x6, targetTpe, $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map(targetTpe, last)));
+          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dAdt$002dBranch$002dBy$002dName.$c_Lio_septimalmind_baboon_typer_model_Conversion$CopyAdtBranchByName(id, x6, targetTpe, $p_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__sci_Map__Lio_septimalmind_baboon_typer_model_Domain__Lio_septimalmind_baboon_typer_model_BaboonDiff__sci_Map(this, targetTpe, renameTargets, last, diff)));
           break matchEnd17;
         }
       }
-      if ((diff.mI.yv.a5(id) && (!isRenamed))) {
+      if ((diff.lZ.yI.a5(id) && (!isRenamed))) {
         var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dRemoved$002dType$002dNo$002dConversion.$c_Lio_septimalmind_baboon_typer_model_Conversion$RemovedTypeNoConversion(id));
         break matchEnd17;
       }
@@ -209,12 +265,12 @@ $p.aGK = (function(prev, last, diff) {
         break matchEnd17;
       }
       if (rc13) {
-        $j_java$002elang$002e$002dObject.$m_s_Predef$().cd((shallowChanged || isRenamed));
+        $j_java$002elang$002e$002dObject.$m_s_Predef$().cg((shallowChanged || isRenamed));
         var rc9 = false;
         var x2$2 = null;
         var rc10 = false;
         var x6$2 = null;
-        var x1$3 = diff.qV.b2(id);
+        var x1$3 = diff.r9.b1(id);
         matchEnd11: {
           var $x_3;
           if ((x1$3 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
@@ -222,20 +278,20 @@ $p.aGK = (function(prev, last, diff) {
             x2$2 = x1$3;
             var p3 = x2$2.af;
             if ((p3 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dDto$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$DtoDiff)) {
-              var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(p3.EW);
+              var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(p3.Fe);
               break matchEnd11;
             }
           }
           if (rc9) {
-            var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(x2$2.af, "DTODiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+            var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(x2$2.af, "DTODiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
             break matchEnd11;
           }
           if (($j_java$002elang$002e$002dObject.$m_s_None$() === x1$3)) {
             rc10 = true;
             x6$2 = x1$3;
             if (isRenamed) {
-              var newDefn = last.b5.aw.x(targetTpe).a3;
-              var this$19 = newDefn.cS;
+              var newDefn = last.ba.az.w(targetTpe).a4;
+              var this$19 = newDefn.cF;
               var f$1 = ((f$2$2$1) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDto$002dOp$0024$002dKeep$002dField.$c_Lio_septimalmind_baboon_typer_model_DtoOp$KeepField(f$2$2$1, $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dRef$002dModification$0024$002dUnchanged$0024.$m_Lio_septimalmind_baboon_typer_model_RefModification$Unchanged$()));
               if ((this$19 === $j_java$002elang$002e$002dObject.$m_sci_Nil$())) {
                 var $x_4 = $j_java$002elang$002e$002dObject.$m_sci_Nil$();
@@ -258,56 +314,77 @@ $p.aGK = (function(prev, last, diff) {
             }
           }
           if (rc10) {
-            var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dDto$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$DtoDiff($j_java$002elang$002e$002dObject.$m_sci_Nil$()), "DTODiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+            var $x_3 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dDto$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$DtoDiff($j_java$002elang$002e$002dObject.$m_sci_Nil$()), "DTODiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
             break matchEnd11;
           }
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$3);
         }
-        var this$23 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_3, this.Et);
+        var this$23 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_3, this.EK);
         var r = this$23.a1;
         if ((r instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b = r.H;
-          var additions = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(b.ft(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00241.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$1(this)));
-          var removals = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(b.ft(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00242.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$2(this)));
-          var incompatibleAdditions = additions.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2) => {
-            var x1 = op$2$2.EJ.bi;
+          var additions = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(b.en(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00242.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$2(this)));
+          var removals = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(b.en(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00243.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$3(this)));
+          var incompatibleAdditions = additions.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2) => {
+            var x1 = op$2$2.F1.aY;
             if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dRef$0024$002dScalar.$c_Lio_septimalmind_baboon_typer_model_TypeRef$Scalar)) {
               return true;
             } else if ((x1 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dType$002dRef$0024$002dConstructor.$c_Lio_septimalmind_baboon_typer_model_TypeRef$Constructor)) {
-              return (!this.sA.a4N.a5(x1.bD));
+              return (!this.kn.a5u.a5(x1.bu));
             } else {
               throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1);
             }
           })));
-          var compatibleAdditions = additions.c1(incompatibleAdditions);
-          var changes = $j_java$002elang$002e$002dObject.$m_sci_Set$().a4(b.ft(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00243.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$3(this)));
-          var $x_5 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple12.$c_T12(b, additions, removals, incompatibleAdditions, compatibleAdditions, changes, changes.b8(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$1) => {
+          var compatibleAdditions = additions.bF(incompatibleAdditions);
+          var changes = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(b.en(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00244.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$4(this)));
+          var incompatibleChanges = changes.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$1) => {
             var $x_6 = $j_java$002elang$002e$002dObject.$m_s_Predef$();
-            var x$1 = op$2$2$1.mJ.bi;
-            var x$2 = op$2$2$1.sI;
-            $x_6.cd((!((x$1 === null) ? (x$2 === null) : x$1.b(x$2))));
-            return (!this.sA.ah0(op$2$2$1.mJ.bi, op$2$2$1.sI));
-          }))), compatibleAdditions.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((a$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dField$002dOp$0024$002dInitialize$002dWith$002dDefault.$c_Lio_septimalmind_baboon_typer_model_Conversion$FieldOp$InitializeWithDefault(a$2$2.EJ)))), changes.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$2) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$2.mJ.bi, op$2$2$2.sI, op$2$2$2.mJ.cg)))).bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00244.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$4(this)), changes.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$3) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$3.mJ.bi, op$2$2$3.sI, op$2$2$3.mJ.cg)))).bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00245.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$5(this)), changes.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$4) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$4.mJ.bi, op$2$2$4.sI, op$2$2$4.mJ.cg)))).bG(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00246.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$6(this)), b.ft(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00247.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$7(this))));
+            var x$1 = op$2$2$1.mR.aY;
+            var x$2 = op$2$2$1.sY;
+            $x_6.cg((!((x$1 === null) ? (x$2 === null) : x$1.b(x$2))));
+            return (!this.kn.a1K(op$2$2$1.mR.aY, op$2$2$1.sY));
+          })));
+          var initWithDefaults = compatibleAdditions.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((a$2$2) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dField$002dOp$0024$002dInitialize$002dWith$002dDefault.$c_Lio_septimalmind_baboon_typer_model_Conversion$FieldOp$InitializeWithDefault(a$2$2.F1))));
+          var wrap = changes.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$2) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$2.mR.aY, op$2$2$2.sY, op$2$2$2.mR.bG)))).bE(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00245.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$5(this));
+          var precex = changes.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$3) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$3.mR.aY, op$2$2$3.sY, op$2$2$3.mR.bG)))).bE(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00246.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$6(this));
+          var swap = changes.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$4) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$4.mR.aY, op$2$2$4.sY, op$2$2$4.mR.bG)))).bE(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00247.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$7(this));
+          var keepFields = b.en(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00248.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$8(this));
+          var renames = $j_java$002elang$002e$002dObject.$m_sci_Set$().a2(b.en(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00249.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$9(this)));
+          var pureRenames = renames.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$5) => {
+            var x$3 = op$2$2$5.mS.aY;
+            var x$2$1 = op$2$2$5.kp.aY;
+            return ((x$3 === null) ? (x$2$1 === null) : x$3.b(x$2$1));
+          })));
+          var renamesWithTypeChange = renames.bF(pureRenames);
+          var incompatibleRenames = renamesWithTypeChange.b7(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$6) => (!this.kn.a1K(op$2$2$6.mS.aY, op$2$2$6.kp.aY)))));
+          var pureRenameOps = pureRenames.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$7) => new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dField$002dOp$0024$002dRename.$c_Lio_septimalmind_baboon_typer_model_Conversion$FieldOp$Rename(op$2$2$7.mS.bG, op$2$2$7.kp))));
+          var redefWrap = renamesWithTypeChange.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$8) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$8.mS.aY, op$2$2$8.kp.aY, op$2$2$8)))).bE(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$002410.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$10(this));
+          var redefPrecex = renamesWithTypeChange.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$9) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$9.mS.aY, op$2$2$9.kp.aY, op$2$2$9)))).bE(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$002411.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$11(this));
+          var redefSwap = renamesWithTypeChange.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((op$2$2$10) => new $j_java$002elang$002e$002dObject.$c_T3(op$2$2$10.mS.aY, op$2$2$10.kp.aY, op$2$2$10)))).bE(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$002412.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$12(this));
+          var $x_5 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_scala$002e$002dTuple21.$c_T21(b, additions, removals, incompatibleAdditions, compatibleAdditions, changes, incompatibleChanges, initWithDefaults, wrap, precex, swap, keepFields, renames, pureRenames, renamesWithTypeChange, incompatibleRenames, pureRenameOps, redefWrap, redefPrecex, redefSwap, redefWrap.b6(redefPrecex).b6(redefSwap)));
         } else {
           var $x_5 = r;
         }
-        var this$32 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_5, this.Et);
-        var r$1 = this$32.a1;
+        var this$35 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_5, this.EK);
+        var r$1 = this$35.a1;
         if ((r$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$1 = r$1.H;
           if ((b$1 === null)) {
             throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(b$1);
           }
-          var removals$1 = b$1.Hk;
-          var incompatibleAdditions$1 = b$1.Hl;
-          var incompatibleChanges$1 = b$1.Hm;
-          var initWithDefaults$1 = b$1.Hn;
-          var wrap$1 = b$1.Ho;
-          var precex$1 = b$1.Hh;
-          var swap$1 = b$1.Hi;
-          var keepFields$1 = b$1.Hj;
-          $j_java$002elang$002e$002dObject.$m_s_Predef$().cd(wrap$1.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$1$2$2) => x$1$2$2.yA))).fc(incompatibleChanges$1.O(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$2$2$2) => x$2$2$2.mJ.cg)))).m());
-          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right((((!incompatibleChanges$1.m()) || (!incompatibleAdditions$1.m())) ? new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCustom$002dConversion$002dRequired.$c_Lio_septimalmind_baboon_typer_model_Conversion$CustomConversionRequired(id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dIncompatible$002dFields.$c_Lio_septimalmind_baboon_typer_model_DerivationFailure$IncompatibleFields(incompatibleChanges$1, incompatibleAdditions$1), targetTpe) : new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dDto$002dConversion.$c_Lio_septimalmind_baboon_typer_model_Conversion$DtoConversion(id, keepFields$1.aY($j_java$002elang$002e$002dObject.$m_sci_Nil$().A($j_java$002elang$002e$002dObject.$f_sc_IterableOps__concat__sc_IterableOnce__O(wrap$1, precex$1).b7(swap$1).b7(initWithDefaults$1))), removals$1, targetTpe)));
+          var removals$1 = b$1.HF;
+          var incompatibleAdditions$1 = b$1.HG;
+          var incompatibleChanges$1 = b$1.HH;
+          var initWithDefaults$1 = b$1.HI;
+          var wrap$1 = b$1.HJ;
+          var precex$1 = b$1.Hz;
+          var swap$1 = b$1.HA;
+          var keepFields$1 = b$1.HB;
+          var incompatibleRenames$1 = b$1.HC;
+          var pureRenameOps$1 = b$1.HD;
+          var redefOps$1 = b$1.HE;
+          $j_java$002elang$002e$002dObject.$m_s_Predef$().cg(wrap$1.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$2$2$2) => x$2$2$2.yQ))).fe(incompatibleChanges$1.N(new $j_java$002elang$002e$002dObject.$c_sr_AbstractFunction1_$$Lambda$70e1780b84463d18653aacefee3ab989ac625f28(((x$3$2$2) => x$3$2$2.mR.bG)))).l());
+          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right((((!incompatibleChanges$1.l()) || (!incompatibleAdditions$1.l())) ? new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCustom$002dConversion$002dRequired.$c_Lio_septimalmind_baboon_typer_model_Conversion$CustomConversionRequired(id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dIncompatible$002dFields.$c_Lio_septimalmind_baboon_typer_model_DerivationFailure$IncompatibleFields(incompatibleChanges$1, incompatibleAdditions$1), targetTpe) : ((!incompatibleRenames$1.l()) ? new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCustom$002dConversion$002dRequired.$c_Lio_septimalmind_baboon_typer_model_Conversion$CustomConversionRequired(id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dIncompatible$002dRenames.$c_Lio_septimalmind_baboon_typer_model_DerivationFailure$IncompatibleRenames(incompatibleRenames$1), targetTpe) : new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dDto$002dConversion.$c_Lio_septimalmind_baboon_typer_model_Conversion$DtoConversion(id, keepFields$1.aZ($j_java$002elang$002e$002dObject.$m_sci_Nil$().A(pureRenameOps$1)).aZ($j_java$002elang$002e$002dObject.$m_sci_Nil$().A(redefOps$1)).aZ($j_java$002elang$002e$002dObject.$f_sc_IterableOps__concat__sc_IterableOnce__O($j_java$002elang$002e$002dObject.$f_sc_IterableOps__concat__sc_IterableOnce__O(wrap$1, precex$1).b6(swap$1), initWithDefaults$1).aC()), removals$1, targetTpe))));
           break matchEnd17;
         } else {
           var $x_1 = r$1;
@@ -315,12 +392,12 @@ $p.aGK = (function(prev, last, diff) {
         }
       }
       if (rc14) {
-        $j_java$002elang$002e$002dObject.$m_s_Predef$().cd((shallowChanged || isRenamed));
+        $j_java$002elang$002e$002dObject.$m_s_Predef$().cg((shallowChanged || isRenamed));
         var rc9$2 = false;
         var x2$3 = null;
         var rc10$2 = false;
         var x6$3 = null;
-        var x1$4 = diff.qV.b2(id);
+        var x1$4 = diff.r9.b1(id);
         matchEnd11$2: {
           var $x_7;
           if ((x1$4 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
@@ -328,12 +405,12 @@ $p.aGK = (function(prev, last, diff) {
             x2$3 = x1$4;
             var p3$2 = x2$3.af;
             if ((p3$2 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dEnum$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$EnumDiff)) {
-              var $x_7 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(p3$2.EX.ft(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024$0024nested$002dInanonfun$0024compute$00244$00241.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$$nestedInanonfun$compute$4$1(this)));
+              var $x_7 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(p3$2.Ff.en(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024$0024nested$002dInanonfun$0024compute$00249$00241.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$$nestedInanonfun$compute$9$1(this)));
               break matchEnd11$2;
             }
           }
           if (rc9$2) {
-            var $x_7 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(x2$3.af, "EnumDiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+            var $x_7 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(x2$3.af, "EnumDiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
             break matchEnd11$2;
           }
           if (($j_java$002elang$002e$002dObject.$m_s_None$() === x1$4)) {
@@ -345,16 +422,16 @@ $p.aGK = (function(prev, last, diff) {
             }
           }
           if (rc10$2) {
-            var $x_7 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dEnum$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$EnumDiff($j_java$002elang$002e$002dObject.$m_sci_Nil$()), "EnumDiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+            var $x_7 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dEnum$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$EnumDiff($j_java$002elang$002e$002dObject.$m_sci_Nil$()), "EnumDiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
             break matchEnd11$2;
           }
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$4);
         }
-        var this$45 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_7, this.Et);
-        var r$2 = this$45.a1;
+        var this$50 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_7, this.EK);
+        var r$2 = this$50.a1;
         if ((r$2 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$2 = r$2.H;
-          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right((b$2.m() ? new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dEnum$002dBy$002dName.$c_Lio_septimalmind_baboon_typer_model_Conversion$CopyEnumByName(id, targetTpe) : new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCustom$002dConversion$002dRequired.$c_Lio_septimalmind_baboon_typer_model_Conversion$CustomConversionRequired(id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dEnum$002dBranch$002dRemoved.$c_Lio_septimalmind_baboon_typer_model_DerivationFailure$EnumBranchRemoved(b$2), targetTpe)));
+          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right((b$2.l() ? new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dEnum$002dBy$002dName.$c_Lio_septimalmind_baboon_typer_model_Conversion$CopyEnumByName(id, targetTpe, $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeEnumMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map(targetTpe, last)) : new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCustom$002dConversion$002dRequired.$c_Lio_septimalmind_baboon_typer_model_Conversion$CustomConversionRequired(id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dEnum$002dBranch$002dRemoved.$c_Lio_septimalmind_baboon_typer_model_DerivationFailure$EnumBranchRemoved(b$2), targetTpe)));
           break matchEnd17;
         } else {
           var $x_1 = r$2;
@@ -362,12 +439,12 @@ $p.aGK = (function(prev, last, diff) {
         }
       }
       if (rc15) {
-        $j_java$002elang$002e$002dObject.$m_s_Predef$().cd((shallowChanged || isRenamed));
+        $j_java$002elang$002e$002dObject.$m_s_Predef$().cg((shallowChanged || isRenamed));
         var rc9$3 = false;
         var x2$4 = null;
         var rc10$3 = false;
         var x6$4 = null;
-        var x1$5 = diff.qV.b2(id);
+        var x1$5 = diff.r9.b1(id);
         matchEnd11$3: {
           var $x_8;
           if ((x1$5 instanceof $j_java$002elang$002e$002dObject.$c_s_Some)) {
@@ -375,12 +452,12 @@ $p.aGK = (function(prev, last, diff) {
             x2$4 = x1$5;
             var p3$3 = x2$4.af;
             if ((p3$3 instanceof $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dAdt$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$AdtDiff)) {
-              var $x_8 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(p3$3.EV.ft(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024$0024nested$002dInanonfun$0024compute$00244$00242.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$$nestedInanonfun$compute$4$2(this)));
+              var $x_8 = new $j_java$002elang$002e$002dObject.$c_s_util_Right(p3$3.Fd.en(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$0024$0024nested$002dInanonfun$0024compute$00249$00242.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$$nestedInanonfun$compute$9$2(this)));
               break matchEnd11$3;
             }
           }
           if (rc9$3) {
-            var $x_8 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(x2$4.af, "ADTDiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+            var $x_8 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(x2$4.af, "ADTDiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
             break matchEnd11$3;
           }
           if (($j_java$002elang$002e$002dObject.$m_s_None$() === x1$5)) {
@@ -392,17 +469,17 @@ $p.aGK = (function(prev, last, diff) {
             }
           }
           if (rc10$3) {
-            var $x_8 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aM(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dAdt$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$AdtDiff($j_java$002elang$002e$002dObject.$m_sci_Nil$()), "ADTDiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
+            var $x_8 = new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList($j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$().aL(new $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dEvolution$002dIssue$0024$002dUnexpected$002dDiff$002dType.$c_Lio_septimalmind_baboon_parser_model_issues_EvolutionIssue$UnexpectedDiffType(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dTypedef$002dDiff$0024$002dAdt$002dDiff.$c_Lio_septimalmind_baboon_typer_model_TypedefDiff$AdtDiff($j_java$002elang$002e$002dObject.$m_sci_Nil$()), "ADTDiff"), $j_java$002elang$002e$002dObject.$m_sci_Nil$(), $j_io$002eseptimalmind$002ebaboon$002eparser$002emodel$002eissues$002e$002dBaboon$002dIssue$0024$002dW$002dEvolution$002dIssue$0024.$m_Lio_septimalmind_baboon_parser_model_issues_BaboonIssue$WEvolutionIssue$())));
             break matchEnd11$3;
           }
           throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$5);
         }
-        var this$54 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_8, this.Et);
+        var this$59 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps($x_8, this.EK);
         var x6$1 = x6;
-        var r$3 = this$54.a1;
+        var r$3 = this$59.a1;
         if ((r$3 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
           var b$3 = r$3.H;
-          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right((b$3.m() ? new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dAdt$002dBranch$002dBy$002dName.$c_Lio_septimalmind_baboon_typer_model_Conversion$CopyAdtBranchByName(id, x6$1, targetTpe, $ps_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__Lio_septimalmind_baboon_typer_model_Domain__sci_Map(targetTpe, last)) : new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCustom$002dConversion$002dRequired.$c_Lio_septimalmind_baboon_typer_model_Conversion$CustomConversionRequired(id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dAdt$002dBranch$002dRemoved.$c_Lio_septimalmind_baboon_typer_model_DerivationFailure$AdtBranchRemoved(b$3), targetTpe)));
+          var $x_1 = new $j_java$002elang$002e$002dObject.$c_s_util_Right((b$3.l() ? new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCopy$002dAdt$002dBranch$002dBy$002dName.$c_Lio_septimalmind_baboon_typer_model_Conversion$CopyAdtBranchByName(id, x6$1, targetTpe, $p_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl__computeBranchMapping$1__Lio_septimalmind_baboon_typer_model_TypeId$User__sci_Map__Lio_septimalmind_baboon_typer_model_Domain__Lio_septimalmind_baboon_typer_model_BaboonDiff__sci_Map(this, targetTpe, renameTargets, last, diff)) : new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dConversion$0024$002dCustom$002dConversion$002dRequired.$c_Lio_septimalmind_baboon_typer_model_Conversion$CustomConversionRequired(id, new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dDerivation$002dFailure$0024$002dAdt$002dBranch$002dRemoved.$c_Lio_septimalmind_baboon_typer_model_DerivationFailure$AdtBranchRemoved(b$3), targetTpe)));
           break matchEnd17;
         } else {
           var $x_1 = r$3;
@@ -413,32 +490,32 @@ $p.aGK = (function(prev, last, diff) {
     }
     var x1$1 = $x_1;
     if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Left)) {
-      var e = x1$1.aj;
+      var e = x1$1.ah;
       allGood = false;
-      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.ay);
+      $j_java$002elang$002e$002dObject.$f_scm_Growable__addAll__sc_IterableOnce__scm_Growable(bad, e.av);
     } else if ((x1$1 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
       var v = x1$1.H;
-      good = good.gA(v);
+      good = good.gm(v);
     } else {
       throw new $j_java$002elang$002e$002dObject.$c_s_MatchError(x1$1);
     }
   }
-  var this$59 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aS(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bc()))), this.Et);
-  var r$4 = this$59.a1;
+  var this$64 = new $j_izumi$002efunctional$002ebio$002esyntax$002e$002dSyntax2$0024$002dError$002dOps.$c_Lizumi_functional_bio_syntax_Syntax2$ErrorOps((allGood ? new $j_java$002elang$002e$002dObject.$c_s_util_Right(buildR.aT(good)) : new $j_java$002elang$002e$002dObject.$c_s_util_Left(new $j_izumi$002efundamentals$002ecollections$002enonempty$002e$002dN$002dE$002dList.$c_Lizumi_fundamentals_collections_nonempty_NEList(bad.bf()))), this.EK);
+  var r$4 = this$64.a1;
   if ((r$4 instanceof $j_java$002elang$002e$002dObject.$c_s_util_Right)) {
     var b$4 = r$4.H;
     var total = b$4.y();
-    var user = b$4.ft(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$00248.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$8(this)).y();
+    var user = b$4.en(new $j_io$002eseptimalmind$002ebaboon$002etyper$002e$002dBaboon$002dRules$0024$002dBaboon$002dRules$002dImpl$0024$0024anonfun$002413.$c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl$$anonfun$13(this)).y();
     var trivial = ((total - user) | 0);
-    this.ao2.ahE($j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(last.cr.fj, "", ".", ""), $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dQuote$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$Quote$().l(new $j_scala$002e$002dString$002dContext.$c_s_StringContext($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["", "->", ": conversions: ", ", derived: ", ", to be implemented: ", ""])), $j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), prev.ba), new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), last.ba), new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), total), new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), trivial), new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), user)])));
-    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dBaboon$002dRuleset.$c_Lio_septimalmind_baboon_typer_model_BaboonRuleset(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEvolution$002dStep.$c_Lio_septimalmind_baboon_typer_model_EvolutionStep(prev.ba, last.ba), b$4));
+    this.aoH.aih($j_java$002elang$002e$002dObject.$f_sc_IterableOnceOps__mkString__T__T__T__T(last.ct.fm, "", ".", ""), $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dQuote$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$Quote$().m(new $j_scala$002e$002dString$002dContext.$c_s_StringContext($j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), ["", "->", ": conversions: ", ", derived: ", ", to be implemented: ", ""])), $j_java$002elang$002e$002dObject.$ct_sjsr_WrappedVarArgs__sjs_js_Array__(new $j_java$002elang$002e$002dObject.$c_sjsr_WrappedVarArgs(), [new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), prev.bc), new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), last.bc), new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), total), new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), trivial), new $j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dLow$002dPrio$002dInterpolation$002dArg$005f2$0024$0024anon$00243.$c_Lizumi_fundamentals_platform_strings_TextTree$LowPrioInterpolationArg\uff3f2$$anon$3($j_izumi$002efundamentals$002eplatform$002estrings$002e$002dText$002dTree$0024$002dInterpolation$002dArg$0024.$m_Lizumi_fundamentals_platform_strings_TextTree$InterpolationArg$(), user)])));
+    return new $j_java$002elang$002e$002dObject.$c_s_util_Right(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dBaboon$002dRuleset.$c_Lio_septimalmind_baboon_typer_model_BaboonRuleset(new $j_io$002eseptimalmind$002ebaboon$002etyper$002emodel$002e$002dEvolution$002dStep.$c_Lio_septimalmind_baboon_typer_model_EvolutionStep(prev.bc, last.bc), b$4));
   } else {
     return r$4;
   }
 });
 var $d_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl = new $j_java$002elang$002e$002dObject.$TypeData().i($c_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl, "io.septimalmind.baboon.typer.BaboonRules$BaboonRulesImpl", ({
-  xg: 1,
-  jg: 1
+  xq: 1,
+  jj: 1
 }));
 export { $d_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl as $d_Lio_septimalmind_baboon_typer_BaboonRules$BaboonRulesImpl };
 //# sourceMappingURL=io.septimalmind.baboon.typer.-Baboon-Rules$-Baboon-Rules-Impl.js.map