Merge pull request #3 from cjhskippy/modulo-based-leap-year

Calculates leap year beyond the previous limit of 2031. Adds a scala modulus operator.

direct-file/backend/src/main/resources/tax/constants.xml

@@ -47,27 +47,67 @@
       <Description>Whether the tax year is a leap year</Description>
       <Derived>
         <Switch>
-          <!-- TODO: replace this with the calc to determine leap year (e.g. divisible by 4, but not 100 unless also divisible by 400) -->
           <Case>
             <When>
-              <Any>
+              <Equal>
-                <Equal>
+                <Left>
-                  <Left>
+                  <Modulo>
-                    <Dependency path="/taxYear" />
+                    <Left>
-                  </Left>
+                      <Dependency path="/taxYear" />
-                  <Right>
+                    </Left>
-                    <Int>2024</Int>
+                    <Right>
-                  </Right>
+                      <Int>400</Int>
-                </Equal>
+                    </Right>
-                <Equal>
+                  </Modulo>
-                  <Left>
+                </Left>
-                    <Dependency path="/taxYear" />
+                <Right>
-                  </Left>
+                  <Int>0</Int>
-                  <Right>
+                </Right>
-                    <Int>2028</Int>
+              </Equal>
-                  </Right>
+            </When>
-                </Equal>
+            <Then>
-              </Any>
+              <True />
+            </Then>
+          </Case>
+          <Case>
+            <When>
+              <Equal>
+                <Left>
+                  <Modulo>
+                    <Left>
+                      <Dependency path="/taxYear" />
+                    </Left>
+                    <Right>
+                      <Int>100</Int>
+                    </Right>
+                  </Modulo>
+                </Left>
+                <Right>
+                  <Int>0</Int>
+                </Right>
+              </Equal>
+            </When>
+            <Then>
+              <False />
+            </Then>
+          </Case>
+          <Case>
+            <When>
+              <Equal>
+                <Left>
+                  <Modulo>
+                    <Left>
+                      <Dependency path="/taxYear" />
+                    </Left>
+                    <Right>
+                      <Int>4</Int>
+                    </Right>
+                  </Modulo>
+                </Left>
+                <Right>
+                  <Int>0</Int>
+                </Right>
+              </Equal>
             </When>
             <Then>
               <True />

direct-file/df-client/js-factgraph-scala/src/main.js

@@ -1593,6 +1593,9 @@ $c_Lgov_irs_factgraph_FactDictionary.prototype.addMeta__Lgov_irs_factgraph_defin
   };
   this.Lgov_irs_factgraph_FactDictionary__f_meta = metaConfigTrait
 });
+$c_Lgov_irs_factgraph_FactDictionary.prototype.getMeta = (function() {
+  return this.Lgov_irs_factgraph_FactDictionary__f_meta
+});
 $c_Lgov_irs_factgraph_FactDictionary.prototype.getOptionsPathForEnum = (function(arg) {
   var prep0 = $as_T(arg);
   return this.getOptionsPathForEnum__T__s_Option(prep0)
@@ -1601,9 +1604,6 @@ $c_Lgov_irs_factgraph_FactDictionary.prototype.getDefinition = (function(arg) {
   var prep0 = $as_T(arg);
   return this.apply__T__Lgov_irs_factgraph_FactDefinition(prep0)
 });
-$c_Lgov_irs_factgraph_FactDictionary.prototype.getMeta = (function() {
-  return this.Lgov_irs_factgraph_FactDictionary__f_meta
-});
 function $as_Lgov_irs_factgraph_FactDictionary(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_FactDictionary) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.FactDictionary"))
 }
@@ -1857,6 +1857,14 @@ $c_Lgov_irs_factgraph_Graph.prototype.getCollectionPaths__T__sci_Seq = (function
   var this$4 = $n(paths);
   return this$4
 });
+$c_Lgov_irs_factgraph_Graph.prototype.delete = (function(arg) {
+  var prep0 = $as_T(arg);
+  this.delete__T__V(prep0)
+});
+$c_Lgov_irs_factgraph_Graph.prototype.get = (function(arg) {
+  var prep0 = $as_T(arg);
+  return this.get__T__Lgov_irs_factgraph_monads_Result(prep0)
+});
 $c_Lgov_irs_factgraph_Graph.prototype.explainWithPath = (function(arg) {
   var prep0 = $as_Lgov_irs_factgraph_Path(arg);
   return this.explain__Lgov_irs_factgraph_Path__Lgov_irs_factgraph_Explanation(prep0)
@@ -1865,14 +1873,6 @@ $c_Lgov_irs_factgraph_Graph.prototype.getVectWithPath = (function(arg) {
   var prep0 = $as_Lgov_irs_factgraph_Path(arg);
   return this.getVect__Lgov_irs_factgraph_Path__Lgov_irs_factgraph_monads_MaybeVector(prep0)
 });
-$c_Lgov_irs_factgraph_Graph.prototype.setWithPath = (function(arg, arg$2) {
-  var prep0 = $as_Lgov_irs_factgraph_Path(arg);
-  this.set__Lgov_irs_factgraph_Path__O__V(prep0, arg$2)
-});
-$c_Lgov_irs_factgraph_Graph.prototype.getVect = (function(arg) {
-  var prep0 = $as_T(arg);
-  return this.getVect__T__Lgov_irs_factgraph_monads_MaybeVector(prep0)
-});
 $c_Lgov_irs_factgraph_Graph.prototype.set = (function(arg, arg$2) {
   var prep0 = $as_T(arg);
   this.set__T__O__V(prep0, arg$2)
@@ -1881,14 +1881,6 @@ $c_Lgov_irs_factgraph_Graph.prototype.getWithPath = (function(arg) {
   var prep0 = $as_Lgov_irs_factgraph_Path(arg);
   return this.get__Lgov_irs_factgraph_Path__Lgov_irs_factgraph_monads_Result(prep0)
 });
-$c_Lgov_irs_factgraph_Graph.prototype.get = (function(arg) {
-  var prep0 = $as_T(arg);
-  return this.get__T__Lgov_irs_factgraph_monads_Result(prep0)
-});
-$c_Lgov_irs_factgraph_Graph.prototype.delete = (function(arg) {
-  var prep0 = $as_T(arg);
-  this.delete__T__V(prep0)
-});
 $c_Lgov_irs_factgraph_Graph.prototype.deleteWithPath = (function(arg) {
   var prep0 = $as_Lgov_irs_factgraph_Path(arg);
   this.delete__Lgov_irs_factgraph_Path__V(prep0)
@@ -1900,6 +1892,14 @@ $c_Lgov_irs_factgraph_Graph.prototype.explain = (function(arg) {
   var prep0 = $as_T(arg);
   return this.explain__T__Lgov_irs_factgraph_Explanation(prep0)
 });
+$c_Lgov_irs_factgraph_Graph.prototype.getVect = (function(arg) {
+  var prep0 = $as_T(arg);
+  return this.getVect__T__Lgov_irs_factgraph_monads_MaybeVector(prep0)
+});
+$c_Lgov_irs_factgraph_Graph.prototype.setWithPath = (function(arg, arg$2) {
+  var prep0 = $as_Lgov_irs_factgraph_Path(arg);
+  this.set__Lgov_irs_factgraph_Path__O__V(prep0, arg$2)
+});
 function $as_Lgov_irs_factgraph_Graph(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_Graph) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.Graph"))
 }
@@ -2320,7 +2320,7 @@ function $c_Lgov_irs_factgraph_compnodes_CompNode$() {
   this.Lgov_irs_factgraph_compnodes_CompNode$__f_factories = null;
   $n_Lgov_irs_factgraph_compnodes_CompNode$ = this;
   $n($m_s_package$().s_package$__f_List);
-  var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lgov_irs_factgraph_compnodes_CompNodeFactory.getArrayOf().constr)([$m_Lgov_irs_factgraph_compnodes_BooleanNode$False$(), $m_Lgov_irs_factgraph_compnodes_BooleanNode$True$(), $m_Lgov_irs_factgraph_compnodes_DollarNode$(), $m_Lgov_irs_factgraph_compnodes_IntNode$(), $m_Lgov_irs_factgraph_compnodes_DaysNode$(), $m_Lgov_irs_factgraph_compnodes_RationalNode$(), $m_Lgov_irs_factgraph_compnodes_DayNode$(), $m_Lgov_irs_factgraph_compnodes_StringNode$(), $m_Lgov_irs_factgraph_compnodes_TinNode$(), $m_Lgov_irs_factgraph_compnodes_EinNode$(), $m_Lgov_irs_factgraph_compnodes_EmailAddressNode$(), $m_Lgov_irs_factgraph_compnodes_AddressNode$(), $m_Lgov_irs_factgraph_compnodes_BankAccountNode$(), $m_Lgov_irs_factgraph_compnodes_EnumNode$(), $m_Lgov_irs_factgraph_compnodes_MultiEnumNode$(), $m_Lgov_irs_factgraph_compnodes_PhoneNumberNode$(), $m_Lgov_irs_factgraph_compnodes_Add$(), $m_Lgov_irs_factgraph_compnodes_All$(), $m_Lgov_irs_factgraph_compnodes_Any$(), $m_Lgov_irs_factgraph_compnodes_Today$(), $m_Lgov_irs_factgraph_compnodes_AsString$(), $m_Lgov_irs_factgraph_compnodes_AsDecimalString$(), $m_Lgov_irs_factgraph_compnodes_CollectionSize$(), $m_Lgov_irs_factgraph_compnodes_Count$(), $m_Lgov_irs_factgraph_compnodes_Dependency$(), $m_Lgov_irs_factgraph_compnodes_Divide$(), $m_Lgov_irs_factgraph_compnodes_EnumOptionsContains$(), $m_Lgov_irs_factgraph_compnodes_EnumOptionsSize$(), $m_Lgov_irs_factgraph_compnodes_EnumOptionsNode$(), $m_Lgov_irs_factgraph_compnodes_Equal$(), $m_Lgov_irs_factgraph_compnodes_Filter$(), $m_Lgov_irs_factgraph_compnodes_FirstNCollectionItems$(), $m_Lgov_irs_factgraph_compnodes_Find$(), $m_Lgov_irs_factgraph_compnodes_GreaterOf$(), $m_Lgov_irs_factgraph_compnodes_GreaterThan$(), $m_Lgov_irs_factgraph_compnodes_GreaterThanOrEqual$(), $m_Lgov_irs_factgraph_compnodes_IndexOf$(), $m_Lgov_irs_factgraph_compnodes_IsComplete$(), $m_Lgov_irs_factgraph_compnodes_Length$(), $m_Lgov_irs_factgraph_compnodes_LesserOf$(), $m_Lgov_irs_factgraph_compnodes_LessThan$(), $m_Lgov_irs_factgraph_compnodes_LessThanOrEqual$(), $m_Lgov_irs_factgraph_compnodes_Maximum$(), $m_Lgov_irs_factgraph_compnodes_Minimum$(), $m_Lgov_irs_factgraph_compnodes_Multiply$(), $m_Lgov_irs_factgraph_compnodes_Not$(), $m_Lgov_irs_factgraph_compnodes_NotEqual$(), $m_Lgov_irs_factgraph_compnodes_Paste$(), $m_Lgov_irs_factgraph_compnodes_Placeholder$(), $m_Lgov_irs_factgraph_compnodes_Regex$(), $m_Lgov_irs_factgraph_compnodes_Round$(), $m_Lgov_irs_factgraph_compnodes_RoundToInt$(), $m_Lgov_irs_factgraph_compnodes_StepwiseMultiply$(), $m_Lgov_irs_factgraph_compnodes_StripChars$(), $m_Lgov_irs_factgraph_compnodes_Subtract$(), $m_Lgov_irs_factgraph_compnodes_CollectionSum$(), $m_Lgov_irs_factgraph_compnodes_Switch$(), $m_Lgov_irs_factgraph_compnodes_Trim$(), $m_Lgov_irs_factgraph_compnodes_ToUpper$(), $m_Lgov_irs_factgraph_compnodes_TruncateCents$(), $m_Lgov_irs_factgraph_compnodes_transformations_TruncateNameForMeF$()]));
+  var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lgov_irs_factgraph_compnodes_CompNodeFactory.getArrayOf().constr)([$m_Lgov_irs_factgraph_compnodes_BooleanNode$False$(), $m_Lgov_irs_factgraph_compnodes_BooleanNode$True$(), $m_Lgov_irs_factgraph_compnodes_DollarNode$(), $m_Lgov_irs_factgraph_compnodes_IntNode$(), $m_Lgov_irs_factgraph_compnodes_DaysNode$(), $m_Lgov_irs_factgraph_compnodes_RationalNode$(), $m_Lgov_irs_factgraph_compnodes_DayNode$(), $m_Lgov_irs_factgraph_compnodes_StringNode$(), $m_Lgov_irs_factgraph_compnodes_TinNode$(), $m_Lgov_irs_factgraph_compnodes_EinNode$(), $m_Lgov_irs_factgraph_compnodes_EmailAddressNode$(), $m_Lgov_irs_factgraph_compnodes_AddressNode$(), $m_Lgov_irs_factgraph_compnodes_BankAccountNode$(), $m_Lgov_irs_factgraph_compnodes_EnumNode$(), $m_Lgov_irs_factgraph_compnodes_MultiEnumNode$(), $m_Lgov_irs_factgraph_compnodes_PhoneNumberNode$(), $m_Lgov_irs_factgraph_compnodes_Add$(), $m_Lgov_irs_factgraph_compnodes_All$(), $m_Lgov_irs_factgraph_compnodes_Any$(), $m_Lgov_irs_factgraph_compnodes_Today$(), $m_Lgov_irs_factgraph_compnodes_AsString$(), $m_Lgov_irs_factgraph_compnodes_AsDecimalString$(), $m_Lgov_irs_factgraph_compnodes_CollectionSize$(), $m_Lgov_irs_factgraph_compnodes_Count$(), $m_Lgov_irs_factgraph_compnodes_Dependency$(), $m_Lgov_irs_factgraph_compnodes_Divide$(), $m_Lgov_irs_factgraph_compnodes_EnumOptionsContains$(), $m_Lgov_irs_factgraph_compnodes_EnumOptionsSize$(), $m_Lgov_irs_factgraph_compnodes_EnumOptionsNode$(), $m_Lgov_irs_factgraph_compnodes_Equal$(), $m_Lgov_irs_factgraph_compnodes_Filter$(), $m_Lgov_irs_factgraph_compnodes_FirstNCollectionItems$(), $m_Lgov_irs_factgraph_compnodes_Find$(), $m_Lgov_irs_factgraph_compnodes_GreaterOf$(), $m_Lgov_irs_factgraph_compnodes_GreaterThan$(), $m_Lgov_irs_factgraph_compnodes_GreaterThanOrEqual$(), $m_Lgov_irs_factgraph_compnodes_IndexOf$(), $m_Lgov_irs_factgraph_compnodes_IsComplete$(), $m_Lgov_irs_factgraph_compnodes_Length$(), $m_Lgov_irs_factgraph_compnodes_LesserOf$(), $m_Lgov_irs_factgraph_compnodes_LessThan$(), $m_Lgov_irs_factgraph_compnodes_LessThanOrEqual$(), $m_Lgov_irs_factgraph_compnodes_Maximum$(), $m_Lgov_irs_factgraph_compnodes_Minimum$(), $m_Lgov_irs_factgraph_compnodes_Modulo$(), $m_Lgov_irs_factgraph_compnodes_Multiply$(), $m_Lgov_irs_factgraph_compnodes_Not$(), $m_Lgov_irs_factgraph_compnodes_NotEqual$(), $m_Lgov_irs_factgraph_compnodes_Paste$(), $m_Lgov_irs_factgraph_compnodes_Placeholder$(), $m_Lgov_irs_factgraph_compnodes_Regex$(), $m_Lgov_irs_factgraph_compnodes_Round$(), $m_Lgov_irs_factgraph_compnodes_RoundToInt$(), $m_Lgov_irs_factgraph_compnodes_StepwiseMultiply$(), $m_Lgov_irs_factgraph_compnodes_StripChars$(), $m_Lgov_irs_factgraph_compnodes_Subtract$(), $m_Lgov_irs_factgraph_compnodes_CollectionSum$(), $m_Lgov_irs_factgraph_compnodes_Switch$(), $m_Lgov_irs_factgraph_compnodes_Trim$(), $m_Lgov_irs_factgraph_compnodes_ToUpper$(), $m_Lgov_irs_factgraph_compnodes_TruncateCents$(), $m_Lgov_irs_factgraph_compnodes_transformations_TruncateNameForMeF$()]));
   var defaultFactories = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems);
   var $$x2 = $m_scm_Map$();
   var this$5 = $n(defaultFactories);
@@ -20719,24 +20719,6 @@ $c_Lgov_irs_factgraph_Fact.prototype.apply__Lgov_irs_factgraph_PathItem__Lgov_ir
   var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lgov_irs_factgraph_PathItem.getArrayOf().constr)([key]));
   return $p_Lgov_irs_factgraph_Fact__apply__sci_List__Z__Lgov_irs_factgraph_monads_MaybeVector(this, $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems), true)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_Fact.prototype, "path", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_Fact__f_path
-  }),
-  "configurable": true
-});
-Object.defineProperty($c_Lgov_irs_factgraph_Fact.prototype, "graph", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_Fact__f_graph
-  }),
-  "configurable": true
-});
-Object.defineProperty($c_Lgov_irs_factgraph_Fact.prototype, "parent", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_Fact__f_parent
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_Fact.prototype, "value", {
   "get": (function() {
     return this.Lgov_irs_factgraph_Fact__f_value
@@ -20755,6 +20737,24 @@ Object.defineProperty($c_Lgov_irs_factgraph_Fact.prototype, "limits", {
   }),
   "configurable": true
 });
+Object.defineProperty($c_Lgov_irs_factgraph_Fact.prototype, "graph", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_Fact__f_graph
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_Fact.prototype, "parent", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_Fact__f_parent
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_Fact.prototype, "path", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_Fact__f_path
+  }),
+  "configurable": true
+});
 function $as_Lgov_irs_factgraph_Fact(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_Fact) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.Fact"))
 }
@@ -21158,18 +21158,18 @@ Object.defineProperty($c_Lgov_irs_factgraph_FactDefinition.prototype, "value", {
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_FactDefinition.prototype, "meta", {
-  "get": (function() {
-    return this.meta__Lgov_irs_factgraph_Factual$Meta()
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_FactDefinition.prototype, "abstractPath", {
   "get": (function() {
     return this.Lgov_irs_factgraph_FactDefinition__f_path
   }),
   "configurable": true
 });
+Object.defineProperty($c_Lgov_irs_factgraph_FactDefinition.prototype, "meta", {
+  "get": (function() {
+    return this.meta__Lgov_irs_factgraph_Factual$Meta()
+  }),
+  "configurable": true
+});
 Object.defineProperty($c_Lgov_irs_factgraph_FactDefinition.prototype, "limits", {
   "get": (function() {
     return this.limits__sci_Seq()
@@ -21323,15 +21323,22 @@ $c_Lgov_irs_factgraph_JSGraph.prototype.jsCheckPersister__sjs_js_Array = (functi
   }))));
   return $m_sjs_js_JSConverters$JSRichIterableOnce$().toJSArray$extension__sc_IterableOnce__sjs_js_Array(col)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_JSGraph.prototype, "persister", {
+$c_Lgov_irs_factgraph_JSGraph.prototype.explainAndSolve = (function(arg) {
+  var prep0 = $as_T(arg);
+  return this.explainAndSolve__T__sjs_js_Array(prep0)
+});
+$c_Lgov_irs_factgraph_JSGraph.prototype.save = (function() {
+  return this.jsSave__Lgov_irs_factgraph_SaveReturnValue()
+});
+Object.defineProperty($c_Lgov_irs_factgraph_JSGraph.prototype, "toJson$default$1", {
   "get": (function() {
-    return this.Lgov_irs_factgraph_JSGraph__f_persister
+    return (-1)
   }),
   "configurable": true
 });
-$c_Lgov_irs_factgraph_JSGraph.prototype.getFact = (function(arg) {
+$c_Lgov_irs_factgraph_JSGraph.prototype.toJSON = (function(...rest) {
-  var prep0 = $as_T(arg);
+  var prep0 = ((rest[0] === (void 0)) ? (-1) : $uI(rest[0]));
-  return this.getFact__T__Lgov_irs_factgraph_Fact(prep0)
+  return $n(this.Lgov_irs_factgraph_JSGraph__f_persister).toJson__I__T(prep0)
 });
 Object.defineProperty($c_Lgov_irs_factgraph_JSGraph.prototype, "dictionary", {
   "get": (function() {
@@ -21339,30 +21346,9 @@ Object.defineProperty($c_Lgov_irs_factgraph_JSGraph.prototype, "dictionary", {
   }),
   "configurable": true
 });
-$c_Lgov_irs_factgraph_JSGraph.prototype.save = (function() {
+Object.defineProperty($c_Lgov_irs_factgraph_JSGraph.prototype, "persister", {
-  return this.jsSave__Lgov_irs_factgraph_SaveReturnValue()
-});
-$c_Lgov_irs_factgraph_JSGraph.prototype.jsSave = (function() {
-  return this.jsSave__Lgov_irs_factgraph_SaveReturnValue()
-});
-$c_Lgov_irs_factgraph_JSGraph.prototype.explainAndSolve = (function(arg) {
-  var prep0 = $as_T(arg);
-  return this.explainAndSolve__T__sjs_js_Array(prep0)
-});
-$c_Lgov_irs_factgraph_JSGraph.prototype.toJson = (function(...rest) {
-  var prep0 = ((rest[0] === (void 0)) ? (-1) : $uI(rest[0]));
-  return $n(this.Lgov_irs_factgraph_JSGraph__f_persister).toJson__I__T(prep0)
-});
-$c_Lgov_irs_factgraph_JSGraph.prototype.toJSON = (function(...rest) {
-  var prep0 = ((rest[0] === (void 0)) ? (-1) : $uI(rest[0]));
-  return $n(this.Lgov_irs_factgraph_JSGraph__f_persister).toJson__I__T(prep0)
-});
-$c_Lgov_irs_factgraph_JSGraph.prototype.toStringDictionary = (function() {
-  return this.toStringDictionary__sjs_js_Dictionary()
-});
-Object.defineProperty($c_Lgov_irs_factgraph_JSGraph.prototype, "toJson$default$1", {
   "get": (function() {
-    return (-1)
+    return this.Lgov_irs_factgraph_JSGraph__f_persister
   }),
   "configurable": true
 });
@@ -21372,6 +21358,20 @@ $c_Lgov_irs_factgraph_JSGraph.prototype.jsCheckPersister = (function() {
 $c_Lgov_irs_factgraph_JSGraph.prototype.checkPersister = (function() {
   return this.jsCheckPersister__sjs_js_Array()
 });
+$c_Lgov_irs_factgraph_JSGraph.prototype.jsSave = (function() {
+  return this.jsSave__Lgov_irs_factgraph_SaveReturnValue()
+});
+$c_Lgov_irs_factgraph_JSGraph.prototype.toJson = (function(...rest) {
+  var prep0 = ((rest[0] === (void 0)) ? (-1) : $uI(rest[0]));
+  return $n(this.Lgov_irs_factgraph_JSGraph__f_persister).toJson__I__T(prep0)
+});
+$c_Lgov_irs_factgraph_JSGraph.prototype.getFact = (function(arg) {
+  var prep0 = $as_T(arg);
+  return this.getFact__T__Lgov_irs_factgraph_Fact(prep0)
+});
+$c_Lgov_irs_factgraph_JSGraph.prototype.toStringDictionary = (function() {
+  return this.toStringDictionary__sjs_js_Dictionary()
+});
 var $d_Lgov_irs_factgraph_JSGraph = new $TypeData().initClass({
   Lgov_irs_factgraph_JSGraph: 0
 }, false, "gov.irs.factgraph.JSGraph", {
@@ -23672,6 +23672,61 @@ function $m_Lgov_irs_factgraph_compnodes_Minimum$() {
   };
   return $n_Lgov_irs_factgraph_compnodes_Minimum$
 }
+/** @constructor */
+function $c_Lgov_irs_factgraph_compnodes_Modulo$() {
+  this.Lgov_irs_factgraph_compnodes_Modulo$__f_Key = null;
+  this.Lgov_irs_factgraph_compnodes_Modulo$__f_operator = null;
+  $n_Lgov_irs_factgraph_compnodes_Modulo$ = this;
+  this.Lgov_irs_factgraph_compnodes_Modulo$__f_Key = "Modulo";
+  this.Lgov_irs_factgraph_compnodes_Modulo$__f_operator = new $c_Lgov_irs_factgraph_compnodes_ModuloOperator()
+}
+$c_Lgov_irs_factgraph_compnodes_Modulo$.prototype = new $h_O();
+$c_Lgov_irs_factgraph_compnodes_Modulo$.prototype.constructor = $c_Lgov_irs_factgraph_compnodes_Modulo$;
+/** @constructor */
+function $h_Lgov_irs_factgraph_compnodes_Modulo$() {
+  /*<skip>*/
+}
+$h_Lgov_irs_factgraph_compnodes_Modulo$.prototype = $c_Lgov_irs_factgraph_compnodes_Modulo$.prototype;
+$c_Lgov_irs_factgraph_compnodes_Modulo$.prototype.Key__T = (function() {
+  return this.Lgov_irs_factgraph_compnodes_Modulo$__f_Key
+});
+$c_Lgov_irs_factgraph_compnodes_Modulo$.prototype.apply__Lgov_irs_factgraph_compnodes_CompNode__Lgov_irs_factgraph_compnodes_CompNode__Lgov_irs_factgraph_compnodes_IntNode = (function(lhs, rhs) {
+  if ((lhs instanceof $c_Lgov_irs_factgraph_compnodes_IntNode)) {
+    var l = $as_Lgov_irs_factgraph_compnodes_IntNode(lhs);
+    if ((rhs instanceof $c_Lgov_irs_factgraph_compnodes_IntNode)) {
+      var r = $as_Lgov_irs_factgraph_compnodes_IntNode(rhs);
+      var lhs$1 = $n(l).Lgov_irs_factgraph_compnodes_IntNode__f_expr;
+      var rhs$1 = $n(r).Lgov_irs_factgraph_compnodes_IntNode__f_expr;
+      var op = this.Lgov_irs_factgraph_compnodes_Modulo$__f_operator;
+      var expr = new $c_Lgov_irs_factgraph_Expression$Binary(lhs$1, rhs$1, op);
+      return new $c_Lgov_irs_factgraph_compnodes_IntNode(expr)
+    }
+  };
+  var this$4 = $n(lhs);
+  var $$x1 = $objectGetClass(this$4).getName__T();
+  var this$5 = $n(rhs);
+  throw $ct_jl_UnsupportedOperationException__T__(new $c_jl_UnsupportedOperationException(), ((("cannot modulate a " + $$x1) + " and a ") + $objectGetClass(this$5).getName__T()))
+});
+$c_Lgov_irs_factgraph_compnodes_Modulo$.prototype.fromDerivedConfig__Lgov_irs_factgraph_definitions_fact_CompNodeConfigTrait__Lgov_irs_factgraph_Factual__Lgov_irs_factgraph_FactDictionary__Lgov_irs_factgraph_compnodes_CompNode = (function(e, x$2, x$3) {
+  var lhs = $m_Lgov_irs_factgraph_compnodes_CompNode$().getConfigChildNode__Lgov_irs_factgraph_definitions_fact_CompNodeConfigTrait__T__Lgov_irs_factgraph_Factual__Lgov_irs_factgraph_FactDictionary__Lgov_irs_factgraph_compnodes_CompNode(e, "Left", x$2, x$3);
+  var rhs = $m_Lgov_irs_factgraph_compnodes_CompNode$().getConfigChildNode__Lgov_irs_factgraph_definitions_fact_CompNodeConfigTrait__T__Lgov_irs_factgraph_Factual__Lgov_irs_factgraph_FactDictionary__Lgov_irs_factgraph_compnodes_CompNode(e, "Right", x$2, x$3);
+  return this.apply__Lgov_irs_factgraph_compnodes_CompNode__Lgov_irs_factgraph_compnodes_CompNode__Lgov_irs_factgraph_compnodes_IntNode(lhs, rhs)
+});
+var $d_Lgov_irs_factgraph_compnodes_Modulo$ = new $TypeData().initClass({
+  Lgov_irs_factgraph_compnodes_Modulo$: 0
+}, false, "gov.irs.factgraph.compnodes.Modulo$", {
+  Lgov_irs_factgraph_compnodes_Modulo$: 1,
+  O: 1,
+  Lgov_irs_factgraph_compnodes_CompNodeFactory: 1
+});
+$c_Lgov_irs_factgraph_compnodes_Modulo$.prototype.$classData = $d_Lgov_irs_factgraph_compnodes_Modulo$;
+var $n_Lgov_irs_factgraph_compnodes_Modulo$;
+function $m_Lgov_irs_factgraph_compnodes_Modulo$() {
+  if ((!$n_Lgov_irs_factgraph_compnodes_Modulo$)) {
+    $n_Lgov_irs_factgraph_compnodes_Modulo$ = new $c_Lgov_irs_factgraph_compnodes_Modulo$()
+  };
+  return $n_Lgov_irs_factgraph_compnodes_Modulo$
+}
 function $p_Lgov_irs_factgraph_compnodes_Multiply$__reduceMultiply__sci_Seq__Lgov_irs_factgraph_compnodes_CompNode($thiz, nodes) {
   matchResult1: {
     var $$x1;
@@ -37579,6 +37634,38 @@ var $d_Lgov_irs_factgraph_compnodes_MinimumOperator = new $TypeData().initClass(
 });
 $c_Lgov_irs_factgraph_compnodes_MinimumOperator.prototype.$classData = $d_Lgov_irs_factgraph_compnodes_MinimumOperator;
 /** @constructor */
+function $c_Lgov_irs_factgraph_compnodes_ModuloOperator() {
+  /*<skip>*/
+}
+$c_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype = new $h_O();
+$c_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype.constructor = $c_Lgov_irs_factgraph_compnodes_ModuloOperator;
+/** @constructor */
+function $h_Lgov_irs_factgraph_compnodes_ModuloOperator() {
+  /*<skip>*/
+}
+$h_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype = $c_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype;
+$c_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype.apply__Lgov_irs_factgraph_monads_Result__Lgov_irs_factgraph_monads_Thunk__Lgov_irs_factgraph_monads_Result = (function(lhs, rhs) {
+  return $f_Lgov_irs_factgraph_operators_BinaryOperator__apply__Lgov_irs_factgraph_monads_Result__Lgov_irs_factgraph_monads_Thunk__Lgov_irs_factgraph_monads_Result(this, lhs, rhs)
+});
+$c_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype.explain__Lgov_irs_factgraph_Expression__Lgov_irs_factgraph_Expression__Lgov_irs_factgraph_Factual__Lgov_irs_factgraph_monads_MaybeVector = (function(lhs, rhs, x$3) {
+  return $f_Lgov_irs_factgraph_operators_BinaryOperator__explain__Lgov_irs_factgraph_Expression__Lgov_irs_factgraph_Expression__Lgov_irs_factgraph_Factual__Lgov_irs_factgraph_monads_MaybeVector(this, lhs, rhs, x$3)
+});
+$c_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype.operation__I__I__I = (function(x, y) {
+  return $intMod(x, y)
+});
+$c_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype.operation__O__O__O = (function(lhs, rhs) {
+  return this.operation__I__I__I($uI(lhs), $uI(rhs))
+});
+var $d_Lgov_irs_factgraph_compnodes_ModuloOperator = new $TypeData().initClass({
+  Lgov_irs_factgraph_compnodes_ModuloOperator: 0
+}, false, "gov.irs.factgraph.compnodes.ModuloOperator", {
+  Lgov_irs_factgraph_compnodes_ModuloOperator: 1,
+  O: 1,
+  Lgov_irs_factgraph_operators_Operator: 1,
+  Lgov_irs_factgraph_operators_BinaryOperator: 1
+});
+$c_Lgov_irs_factgraph_compnodes_ModuloOperator.prototype.$classData = $d_Lgov_irs_factgraph_compnodes_ModuloOperator;
+/** @constructor */
 function $c_Lgov_irs_factgraph_compnodes_MultiEnumContainsOperator() {
   /*<skip>*/
 }
@@ -56163,11 +56250,11 @@ $c_Lgov_irs_factgraph_types_Address.prototype.toString__T = (function() {
   var streetLines = $f_sc_IterableOnceOps__mkString__T__T__T__T(this$3, "", "\n", "");
   return ((((((((streetLines + "\n") + this.Lgov_irs_factgraph_types_Address__f_city) + ", ") + this.Lgov_irs_factgraph_types_Address__f_stateOrProvence) + " ") + this.Lgov_irs_factgraph_types_Address__f_postalCode) + "\n") + this.Lgov_irs_factgraph_types_Address__f_country)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "country", {
+$c_Lgov_irs_factgraph_types_Address.prototype.toString = (function() {
-  "get": (function() {
+  return this.toString__T()
-    return this.Lgov_irs_factgraph_types_Address__f_country
+});
-  }),
+$c_Lgov_irs_factgraph_types_Address.prototype.foreignAddress = (function() {
-  "configurable": true
+  return this.foreignAddress__Z()
 });
 Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "addressErrors", {
   "get": (function() {
@@ -56179,21 +56266,15 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "addressErr
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "postalCode", {
+Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "StatePattern", {
   "get": (function() {
-    return this.Lgov_irs_factgraph_types_Address__f_postalCode
+    return this.Lgov_irs_factgraph_types_Address__f_StatePattern
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "CityPattern", {
+Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "country", {
   "get": (function() {
-    return this.Lgov_irs_factgraph_types_Address__f_CityPattern
+    return this.Lgov_irs_factgraph_types_Address__f_country
-  }),
-  "configurable": true
-});
-Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "city", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_Address__f_city
   }),
   "configurable": true
 });
@@ -56203,9 +56284,27 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "StreetPatt
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "StatePattern", {
+Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "postalCode", {
   "get": (function() {
-    return this.Lgov_irs_factgraph_types_Address__f_StatePattern
+    return this.Lgov_irs_factgraph_types_Address__f_postalCode
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "stateOrProvence", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_Address__f_stateOrProvence
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "streetAddress", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_Address__f_streetAddress
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "ZipCodePattern", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_Address__f_ZipCodePattern
   }),
   "configurable": true
 });
@@ -56221,30 +56320,18 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "StreetPatt
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "ZipCodePattern", {
+Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "city", {
   "get": (function() {
-    return this.Lgov_irs_factgraph_types_Address__f_ZipCodePattern
+    return this.Lgov_irs_factgraph_types_Address__f_city
   }),
   "configurable": true
 });
-$c_Lgov_irs_factgraph_types_Address.prototype.foreignAddress = (function() {
+Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "CityPattern", {
-  return this.foreignAddress__Z()
-});
-Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "stateOrProvence", {
   "get": (function() {
-    return this.Lgov_irs_factgraph_types_Address__f_stateOrProvence
+    return this.Lgov_irs_factgraph_types_Address__f_CityPattern
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Address.prototype, "streetAddress", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_Address__f_streetAddress
-  }),
-  "configurable": true
-});
-$c_Lgov_irs_factgraph_types_Address.prototype.toString = (function() {
-  return this.toString__T()
-});
 function $as_Lgov_irs_factgraph_types_Address(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_Address) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.Address"))
 }
@@ -56698,18 +56785,6 @@ $c_Lgov_irs_factgraph_types_BankAccount.prototype.productElement__I__O = (functi
     }
   }
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_BankAccount.prototype, "AllowedAccountTypes", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_BankAccount__f_AllowedAccountTypes
-  }),
-  "configurable": true
-});
-Object.defineProperty($c_Lgov_irs_factgraph_types_BankAccount.prototype, "accountNumber", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_BankAccount__f_accountNumber
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_types_BankAccount.prototype, "accountType", {
   "get": (function() {
     return this.Lgov_irs_factgraph_types_BankAccount__f_accountType
@@ -56722,6 +56797,18 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_BankAccount.prototype, "routin
   }),
   "configurable": true
 });
+Object.defineProperty($c_Lgov_irs_factgraph_types_BankAccount.prototype, "accountNumber", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_BankAccount__f_accountNumber
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_types_BankAccount.prototype, "AllowedAccountTypes", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_BankAccount__f_AllowedAccountTypes
+  }),
+  "configurable": true
+});
 function $as_Lgov_irs_factgraph_types_BankAccount(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_BankAccount) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.BankAccount"))
 }
@@ -57168,13 +57255,6 @@ $c_Lgov_irs_factgraph_types_Day.prototype.month__I = (function() {
 $c_Lgov_irs_factgraph_types_Day.prototype.toString__T = (function() {
   return $n(this.Lgov_irs_factgraph_types_Day__f_date).toString__T()
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Day.prototype, "day", {
-  "get": (function() {
-    var this$1 = $n(this.Lgov_irs_factgraph_types_Day__f_date);
-    return this$1.Ljava_time_LocalDate__f_day
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_types_Day.prototype, "year", {
   "get": (function() {
     var this$1 = $n(this.Lgov_irs_factgraph_types_Day__f_date);
@@ -57188,6 +57268,13 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_Day.prototype, "month", {
   }),
   "configurable": true
 });
+Object.defineProperty($c_Lgov_irs_factgraph_types_Day.prototype, "day", {
+  "get": (function() {
+    var this$1 = $n(this.Lgov_irs_factgraph_types_Day__f_date);
+    return this$1.Ljava_time_LocalDate__f_day
+  }),
+  "configurable": true
+});
 function $as_Lgov_irs_factgraph_types_Day(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_Day) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.Day"))
 }
@@ -57525,11 +57612,8 @@ $c_Lgov_irs_factgraph_types_Ein.prototype.productElement__I__O = (function(n) {
 $c_Lgov_irs_factgraph_types_Ein.prototype.toString__T = (function() {
   return ((this.Lgov_irs_factgraph_types_Ein__f_prefix + "-") + this.Lgov_irs_factgraph_types_Ein__f_serial)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Ein.prototype, "serial", {
+$c_Lgov_irs_factgraph_types_Ein.prototype.toString = (function() {
-  "get": (function() {
+  return this.toString__T()
-    return this.Lgov_irs_factgraph_types_Ein__f_serial
-  }),
-  "configurable": true
 });
 Object.defineProperty($c_Lgov_irs_factgraph_types_Ein.prototype, "prefix", {
   "get": (function() {
@@ -57537,8 +57621,11 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_Ein.prototype, "prefix", {
   }),
   "configurable": true
 });
-$c_Lgov_irs_factgraph_types_Ein.prototype.toString = (function() {
+Object.defineProperty($c_Lgov_irs_factgraph_types_Ein.prototype, "serial", {
-  return this.toString__T()
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_Ein__f_serial
+  }),
+  "configurable": true
 });
 function $as_Lgov_irs_factgraph_types_Ein(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_Ein) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.Ein"))
@@ -57819,12 +57906,12 @@ $c_Lgov_irs_factgraph_types_Enum.prototype.getValue__T = (function() {
   };
   throw new $c_s_MatchError(x5)
 });
-$c_Lgov_irs_factgraph_types_Enum.prototype.getEnumOptionsPath = (function() {
-  return this.Lgov_irs_factgraph_types_Enum__f_enumOptionsPath
-});
 $c_Lgov_irs_factgraph_types_Enum.prototype.getValue = (function() {
   return this.getValue__T()
 });
+$c_Lgov_irs_factgraph_types_Enum.prototype.getEnumOptionsPath = (function() {
+  return this.Lgov_irs_factgraph_types_Enum__f_enumOptionsPath
+});
 function $as_Lgov_irs_factgraph_types_Enum(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_Enum) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.Enum"))
 }
@@ -58015,15 +58102,15 @@ $c_Lgov_irs_factgraph_types_IpPin.prototype.productElement__I__O = (function(n)
 $c_Lgov_irs_factgraph_types_IpPin.prototype.toString__T = (function() {
   return ("" + this.Lgov_irs_factgraph_types_IpPin__f_pin)
 });
+$c_Lgov_irs_factgraph_types_IpPin.prototype.toString = (function() {
+  return this.toString__T()
+});
 Object.defineProperty($c_Lgov_irs_factgraph_types_IpPin.prototype, "pin", {
   "get": (function() {
     return this.Lgov_irs_factgraph_types_IpPin__f_pin
   }),
   "configurable": true
 });
-$c_Lgov_irs_factgraph_types_IpPin.prototype.toString = (function() {
-  return this.toString__T()
-});
 function $as_Lgov_irs_factgraph_types_IpPin(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_IpPin) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.IpPin"))
 }
@@ -58156,12 +58243,12 @@ $c_Lgov_irs_factgraph_types_MultiEnum.prototype.equals__O__Z = (function(obj) {
 $c_Lgov_irs_factgraph_types_MultiEnum.prototype.getValue__sci_Set = (function() {
   return this.Lgov_irs_factgraph_types_MultiEnum__f_values
 });
-$c_Lgov_irs_factgraph_types_MultiEnum.prototype.getEnumOptionsPath = (function() {
-  return this.Lgov_irs_factgraph_types_MultiEnum__f_enumOptionsPath
-});
 $c_Lgov_irs_factgraph_types_MultiEnum.prototype.getValue = (function() {
   return this.getValue__sci_Set()
 });
+$c_Lgov_irs_factgraph_types_MultiEnum.prototype.getEnumOptionsPath = (function() {
+  return this.Lgov_irs_factgraph_types_MultiEnum__f_enumOptionsPath
+});
 function $as_Lgov_irs_factgraph_types_MultiEnum(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_MultiEnum) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.MultiEnum"))
 }
@@ -58352,15 +58439,15 @@ $c_Lgov_irs_factgraph_types_Pin.prototype.productElement__I__O = (function(n) {
 $c_Lgov_irs_factgraph_types_Pin.prototype.toString__T = (function() {
   return ("" + this.Lgov_irs_factgraph_types_Pin__f_pin)
 });
+$c_Lgov_irs_factgraph_types_Pin.prototype.toString = (function() {
+  return this.toString__T()
+});
 Object.defineProperty($c_Lgov_irs_factgraph_types_Pin.prototype, "pin", {
   "get": (function() {
     return this.Lgov_irs_factgraph_types_Pin__f_pin
   }),
   "configurable": true
 });
-$c_Lgov_irs_factgraph_types_Pin.prototype.toString = (function() {
-  return this.toString__T()
-});
 function $as_Lgov_irs_factgraph_types_Pin(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_Pin) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.Pin"))
 }
@@ -58772,11 +58859,8 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "area", {
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "isITIN", {
+$c_Lgov_irs_factgraph_types_Tin.prototype.toString = (function() {
-  "get": (function() {
+  return this.toString__T()
-    return this.isITIN__Z()
-  }),
-  "configurable": true
 });
 Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "isATIN", {
   "get": (function() {
@@ -58784,32 +58868,35 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "isATIN", {
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "allowAllZeros", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_Tin__f_allowAllZeros
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "isSSN", {
   "get": (function() {
     return this.isSSN__Z()
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "group", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_Tin__f_group
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "serial", {
   "get": (function() {
     return this.Lgov_irs_factgraph_types_Tin__f_serial
   }),
   "configurable": true
 });
-$c_Lgov_irs_factgraph_types_Tin.prototype.toString = (function() {
+Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "isITIN", {
-  return this.toString__T()
+  "get": (function() {
+    return this.isITIN__Z()
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "allowAllZeros", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_Tin__f_allowAllZeros
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_types_Tin.prototype, "group", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_Tin__f_group
+  }),
+  "configurable": true
 });
 function $as_Lgov_irs_factgraph_types_Tin(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_Tin) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.Tin"))
@@ -71708,28 +71795,28 @@ $c_Lgov_irs_factgraph_compnodes_TinNode.prototype.extract__Lgov_irs_factgraph_Pa
   };
   return $m_s_None$()
 });
-Object.defineProperty($c_Lgov_irs_factgraph_compnodes_TinNode.prototype, "allowAllZeros", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_compnodes_TinNode__f_allowAllZeros
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_compnodes_TinNode.prototype, "expr", {
   "get": (function() {
     return this.Lgov_irs_factgraph_compnodes_TinNode__f_expr
   }),
   "configurable": true
 });
+$c_Lgov_irs_factgraph_compnodes_TinNode.prototype.extract = (function(arg) {
+  var prep0 = $as_Lgov_irs_factgraph_PathItem(arg);
+  return this.extract__Lgov_irs_factgraph_PathItem__s_Option(prep0)
+});
+Object.defineProperty($c_Lgov_irs_factgraph_compnodes_TinNode.prototype, "allowAllZeros", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_compnodes_TinNode__f_allowAllZeros
+  }),
+  "configurable": true
+});
 Object.defineProperty($c_Lgov_irs_factgraph_compnodes_TinNode.prototype, "ValueClass", {
   "get": (function() {
     return $d_Lgov_irs_factgraph_types_Tin.getClassOf()
   }),
   "configurable": true
 });
-$c_Lgov_irs_factgraph_compnodes_TinNode.prototype.extract = (function(arg) {
-  var prep0 = $as_Lgov_irs_factgraph_PathItem(arg);
-  return this.extract__Lgov_irs_factgraph_PathItem__s_Option(prep0)
-});
 function $as_Lgov_irs_factgraph_compnodes_TinNode(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_compnodes_TinNode) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.compnodes.TinNode"))
 }
@@ -72931,18 +73018,18 @@ $c_Lgov_irs_factgraph_monads_JSEither.prototype.mapLeftRight__sjs_js_Function1__
   };
   throw new $c_s_MatchError(this)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_monads_JSEither.prototype, "right", {
-  "get": (function() {
-    return this.right__O()
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_monads_JSEither.prototype, "left", {
   "get": (function() {
     return this.left__O()
   }),
   "configurable": true
 });
+Object.defineProperty($c_Lgov_irs_factgraph_monads_JSEither.prototype, "right", {
+  "get": (function() {
+    return this.right__O()
+  }),
+  "configurable": true
+});
 $c_Lgov_irs_factgraph_monads_JSEither.prototype.mapLeftRight = (function(arg, arg$2) {
   return this.mapLeftRight__sjs_js_Function1__sjs_js_Function1__sjs_js_Object(arg, arg$2)
 });
@@ -73366,33 +73453,23 @@ $c_Lgov_irs_factgraph_monads_Result.prototype.typeName__T = (function() {
   };
   throw new $c_s_MatchError(this)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "toString", {
+$c_Lgov_irs_factgraph_monads_Result.prototype.flatMap = (function(arg) {
+  var prep0 = $as_F1(arg);
+  return this.flatMap__F1__Lgov_irs_factgraph_monads_Result(prep0)
+});
+Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "get", {
   "get": (function() {
-    return this.toString__T()
+    return this.get__O()
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "asPlaceholder", {
-  "get": (function() {
-    return this.asPlaceholder__Lgov_irs_factgraph_monads_Result()
-  }),
-  "configurable": true
-});
-$c_Lgov_irs_factgraph_monads_Result.prototype.orElse = (function(arg) {
-  var prep0 = $as_F0(arg);
-  return this.orElse__F0__Lgov_irs_factgraph_monads_Result(prep0)
-});
-$c_Lgov_irs_factgraph_monads_Result.prototype.getOrElse = (function(arg) {
-  var prep0 = $as_F0(arg);
-  return this.getOrElse__F0__O(prep0)
-});
 $c_Lgov_irs_factgraph_monads_Result.prototype.foreach = (function(arg) {
   var prep0 = $as_F1(arg);
   this.foreach__F1__V(prep0)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "typeName", {
+Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "hasValue", {
   "get": (function() {
-    return this.typeName__T()
+    return this.hasValue__Z()
   }),
   "configurable": true
 });
@@ -73402,11 +73479,9 @@ Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "value", {
   }),
   "configurable": true
 });
-Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "hasValue", {
+$c_Lgov_irs_factgraph_monads_Result.prototype.orElse = (function(arg) {
-  "get": (function() {
+  var prep0 = $as_F0(arg);
-    return this.hasValue__Z()
+  return this.orElse__F0__Lgov_irs_factgraph_monads_Result(prep0)
-  }),
-  "configurable": true
 });
 Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "complete", {
   "get": (function() {
@@ -73414,17 +73489,29 @@ Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "complete",
   }),
   "configurable": true
 });
+Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "typeName", {
+  "get": (function() {
+    return this.typeName__T()
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "toString", {
+  "get": (function() {
+    return this.toString__T()
+  }),
+  "configurable": true
+});
 $c_Lgov_irs_factgraph_monads_Result.prototype.map = (function(arg) {
   var prep0 = $as_F1(arg);
   return this.map__F1__Lgov_irs_factgraph_monads_Result(prep0)
 });
-$c_Lgov_irs_factgraph_monads_Result.prototype.flatMap = (function(arg) {
+$c_Lgov_irs_factgraph_monads_Result.prototype.getOrElse = (function(arg) {
-  var prep0 = $as_F1(arg);
+  var prep0 = $as_F0(arg);
-  return this.flatMap__F1__Lgov_irs_factgraph_monads_Result(prep0)
+  return this.getOrElse__F0__O(prep0)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "get", {
+Object.defineProperty($c_Lgov_irs_factgraph_monads_Result.prototype, "asPlaceholder", {
   "get": (function() {
-    return this.get__O()
+    return this.asPlaceholder__Lgov_irs_factgraph_monads_Result()
   }),
   "configurable": true
 });
@@ -75056,27 +75143,6 @@ $c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype.subscriberNumber__T = (funct
 $c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype.getFormatted__T = (function() {
   return ((((this.Lgov_irs_factgraph_types_UsPhoneNumber__f_areaCode + "-") + this.Lgov_irs_factgraph_types_UsPhoneNumber__f_officeCode) + "-") + this.Lgov_irs_factgraph_types_UsPhoneNumber__f_lineNumber)
 });
-Object.defineProperty($c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype, "officeCode", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_UsPhoneNumber__f_officeCode
-  }),
-  "configurable": true
-});
-Object.defineProperty($c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype, "countryCode", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_UsPhoneNumber__f_countryCode
-  }),
-  "configurable": true
-});
-$c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype.getFormatted = (function() {
-  return this.getFormatted__T()
-});
-Object.defineProperty($c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype, "areaCode", {
-  "get": (function() {
-    return this.Lgov_irs_factgraph_types_UsPhoneNumber__f_areaCode
-  }),
-  "configurable": true
-});
 Object.defineProperty($c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype, "lineNumber", {
   "get": (function() {
     return this.Lgov_irs_factgraph_types_UsPhoneNumber__f_lineNumber
@@ -75089,6 +75155,27 @@ Object.defineProperty($c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype, "subs
   }),
   "configurable": true
 });
+Object.defineProperty($c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype, "areaCode", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_UsPhoneNumber__f_areaCode
+  }),
+  "configurable": true
+});
+Object.defineProperty($c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype, "officeCode", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_UsPhoneNumber__f_officeCode
+  }),
+  "configurable": true
+});
+$c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype.getFormatted = (function() {
+  return this.getFormatted__T()
+});
+Object.defineProperty($c_Lgov_irs_factgraph_types_UsPhoneNumber.prototype, "countryCode", {
+  "get": (function() {
+    return this.Lgov_irs_factgraph_types_UsPhoneNumber__f_countryCode
+  }),
+  "configurable": true
+});
 function $as_Lgov_irs_factgraph_types_UsPhoneNumber(obj) {
   return (((obj instanceof $c_Lgov_irs_factgraph_types_UsPhoneNumber) || (obj === null)) ? obj : $throwClassCastException(obj, "gov.irs.factgraph.types.UsPhoneNumber"))
 }
@@ -105083,12 +105170,12 @@ class $c_Lgov_irs_factgraph_types_AddressValidationFailure extends $c_jl_Illegal
   $js$exported$prop$message__O() {
     return this.Lgov_irs_factgraph_types_AddressValidationFailure__f_message
   };
-  get "addressErrors"() {
-    return this.Lgov_irs_factgraph_types_AddressValidationFailure__f_addressErrors
-  };
   get "message"() {
     return this.Lgov_irs_factgraph_types_AddressValidationFailure__f_message
   };
+  get "addressErrors"() {
+    return this.Lgov_irs_factgraph_types_AddressValidationFailure__f_addressErrors
+  };
   get "validationMessage"() {
     return this.Lgov_irs_factgraph_types_AddressValidationFailure__f_validationMessage
   };

direct-file/fact-graph-scala/shared/src/main/scala/gov/irs/factgraph/compnodes/CompNode.scala

@@ -89,6 +89,7 @@ object CompNode:
     LessThanOrEqual,
     Maximum,
     Minimum,
+    Modulo,
     Multiply,
     Not,
     NotEqual,

direct-file/fact-graph-scala/shared/src/main/scala/gov/irs/factgraph/compnodes/Modulo.scala

@@ -0,0 +1,35 @@
+package gov.irs.factgraph.compnodes
+
+import gov.irs.factgraph.{Expression, FactDictionary, Factual}
+import gov.irs.factgraph.definitions.fact.CompNodeConfigTrait
+import gov.irs.factgraph.operators.BinaryOperator
+
+object Modulo extends CompNodeFactory:
+  override val Key: String = "Modulo"
+
+  private val operator = ModuloOperator()
+
+  def apply(lhs: CompNode, rhs: CompNode): IntNode = (lhs, rhs) match
+    case (l: IntNode, r: IntNode) =>
+      IntNode(
+        Expression.Binary(
+          l.expr,
+          r.expr,
+          operator,
+        ),
+      )
+    case _ =>
+      throw new UnsupportedOperationException(
+        s"cannot modulate a ${lhs.getClass.getName} and a ${rhs.getClass.getName}",
+      )
+
+  override def fromDerivedConfig(e: CompNodeConfigTrait)(using Factual)(using
+      FactDictionary,
+  ): CompNode =
+    val lhs = CompNode.getConfigChildNode(e, "Left")
+    val rhs = CompNode.getConfigChildNode(e, "Right")
+
+    this(lhs, rhs)
+
+private final class ModuloOperator extends BinaryOperator[Int, Int, Int]:
+  override protected def operation(x: Int, y: Int): Int = x % y

direct-file/fact-graph-scala/shared/src/test/scala/gov/irs/factgraph/compnodes/ModuloSpec.scala

@@ -0,0 +1,45 @@
+package gov.irs.factgraph.compnodes
+
+import gov.irs.factgraph.FactDictionary
+import gov.irs.factgraph.definitions.fact.{
+  CommonOptionConfigTraits,
+  CompNodeConfigElement
+}
+import org.scalatest.funspec.AnyFunSpec
+import gov.irs.factgraph.monads.Result
+import gov.irs.factgraph.types.*
+
+class ModuloSpec extends AnyFunSpec:
+  describe("Modulo") {
+    it("reduces Int modulo Int") {
+      val node = CompNode.fromDerivedConfig(
+        new CompNodeConfigElement(
+          "Modulo",
+          Seq(
+            new CompNodeConfigElement(
+              "Left",
+              Seq(
+                new CompNodeConfigElement(
+                  "Int",
+                  Seq.empty,
+                  CommonOptionConfigTraits.value("8")
+                )
+              )
+            ),
+            new CompNodeConfigElement(
+              "Right",
+              Seq(
+                new CompNodeConfigElement(
+                  "Int",
+                  Seq.empty,
+                  CommonOptionConfigTraits.value("3")
+                )
+              )
+            )
+          )
+        )
+      )
+
+      assert(node.get(0) == Result.Complete(2))
+    }
+  }