occam-verify-cli 0.0.538 → 0.0.540

package/bin/action/verify.js

@@ -1,16 +1,15 @@
 "use strict";
 
 const { Dependency } = require("occam-file-system"),
-      { Log, verifyRelease, releaseContextUtilities } = require("../../lib/index");  ///
+      { verifyRelease, releaseContextUtilities } = require("../../lib/index");  ///
 
 const { trimTrailingSlash } = require("../utilities/string"),
       { releaseContextFromDependencyAndDependentNames } = require("../utilities/releaseContext");
 
 const { createReleaseContext, initialiseReleaseContext } = releaseContextUtilities;
 
-function verifyAction(argument, tail, follow, logLevel) {
-  const log = Log.fromFollowAndLogLevel(follow, logLevel),
-        name = trimTrailingSlash(argument), ///
+function verifyAction(argument, log) {
+  const name = trimTrailingSlash(argument), ///
         context = {},
         dependency = Dependency.fromName(name),
         dependentNames = [],
@@ -26,8 +25,6 @@ function verifyAction(argument, tail, follow, logLevel) {
     if (error) {
       log.error(error);
 
-      tailLogMessages();
-
       return;
     }
 
@@ -40,33 +37,19 @@ function verifyAction(argument, tail, follow, logLevel) {
       if (error) {
         log.error(error);
 
-        tailLogMessages();
-
         return;
       }
 
       delete context.releaseContextMap;
       delete context.releaseContextFromDependencyAndDependentNames;
 
-      verifyRelease(releaseName, releaseContextMap);
+      const releaseVerified = verifyRelease(releaseName, releaseContextMap);
 
-      tailLogMessages();
+      if (releaseVerified) {
+        releaseContext.toJSON();
+      }
     });
   });
-
-  function tailLogMessages() {
-    if (!follow) {
-      let logMessages = log.getMessages()
-
-      const start = - tail;
-
-      logMessages = logMessages.slice(start);
-
-      logMessages.forEach((logMessage) => {
-        console.log(logMessage);
-      });
-    }
-  }
 }
 
 module.exports = verifyAction;

package/bin/actions.js

@@ -1,13 +1,13 @@
 "use strict";
 
+const { Log } = require("../lib/index"); ///
+
 const helpAction = require("./action/help"),
       verifyAction = require("./action/verify"),
       versionAction = require("./action/version");
 
-const { DEFAULT_HELP, DEFAULT_TAIL, DEFAULT_FOLLOW, DEFAULT_VERSION, DEFAULT_LOG_LEVEL } = require("./defaults"),
-      { HELP_COMMAND,
-        VERIFY_COMMAND,
-        VERSION_COMMAND } = require("./commands");
+const { HELP_COMMAND, VERIFY_COMMAND, VERSION_COMMAND } = require("./commands"),
+      { DEFAULT_HELP, DEFAULT_TAIL, DEFAULT_FOLLOW, DEFAULT_VERSION, DEFAULT_LOG_LEVEL } = require("./defaults");
 
 function actions(command, argument, options) {
   const commandMissing = (command === null),
@@ -27,19 +27,33 @@ function actions(command, argument, options) {
     command = HELP_COMMAND;
   }
 
+  const log = Log.fromFollowAndLogLevel(follow, logLevel);
+
   switch (command) {
     case HELP_COMMAND: helpAction(); break;
-    case VERIFY_COMMAND: verifyAction(argument, tail, follow, logLevel); break;
+    case VERIFY_COMMAND: { verifyAction(argument, log); break; }
     case VERSION_COMMAND: versionAction(); break;
 
     default: {
       argument = command; ///
 
-      verifyAction(argument, tail, follow, logLevel);
+      verifyAction(argument, log);
 
       break;
     }
   }
+
+  if (!follow) {
+    const start = - tail;
+
+    let logMessages = log.getMessages()
+
+    logMessages = logMessages.slice(start); ///
+
+    logMessages.forEach((logMessage) => {
+      console.log(logMessage);
+    });
+  }
 }
 
 module.exports = actions;

package/lib/axiom.js

@@ -122,15 +122,15 @@ var Axiom = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
     }
     _createClass(Axiom, null, [
         {
-            key: "fromJSON",
-            value: function fromJSON(json, context) {
-                return _axiomLemmaTheoremConjecture.default.fromJSON(Axiom, json, context);
+            key: "fromJSONAndFileContext",
+            value: function fromJSONAndFileContext(json, fileContexct) {
+                return _axiomLemmaTheoremConjecture.default.fromJSONAndFileContext(Axiom, json, fileContexct);
             }
         },
         {
-            key: "fromLabelsSuppositionsAndConsequence",
-            value: function fromLabelsSuppositionsAndConsequence(labels, suppositions, consequence) {
-                return _axiomLemmaTheoremConjecture.default.fromLabelsSuppositionsAndConsequence(Axiom, labels, suppositions, consequence);
+            key: "fromLabelsSuppositionsConsequenceAndProofContext",
+            value: function fromLabelsSuppositionsConsequenceAndProofContext(labels, suppositions, consequence, proofContext) {
+                return _axiomLemmaTheoremConjecture.default.fromLabelsSuppositionsConsequenceAndProofContext(Axiom, labels, suppositions, consequence, proofContext);
             }
         }
     ]);
@@ -138,4 +138,4 @@ var Axiom = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
 }(_axiomLemmaTheoremConjecture.default);
 _defineProperty(Axiom, "kind", _kinds.AXIOM_KIND);
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9heGlvbS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZSBmcm9tIFwiLi9heGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmVcIjtcblxuaW1wb3J0IHsgQVhJT01fS0lORCB9IGZyb20gXCIuL2tpbmRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIEF4aW9tIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBBWElPTV9LSU5EO1xuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBjb250ZXh0KSB7IHJldHVybiBBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUuZnJvbUpTT04oQXhpb20sIGpzb24sIGNvbnRleHQpOyB9XG5cbiAgc3RhdGljIGZyb21MYWJlbHNTdXBwb3NpdGlvbnNBbmRDb25zZXF1ZW5jZShsYWJlbHMsIHN1cHBvc2l0aW9ucywgY29uc2VxdWVuY2UpIHsgcmV0dXJuIEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZS5mcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UoQXhpb20sIGxhYmVscywgc3VwcG9zaXRpb25zLCBjb25zZXF1ZW5jZSk7IH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQXhpb20iLCJmcm9tSlNPTiIsImpzb24iLCJjb250ZXh0IiwiQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIiwiZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0FuZENvbnNlcXVlbmNlIiwibGFiZWxzIiwic3VwcG9zaXRpb25zIiwiY29uc2VxdWVuY2UiLCJraW5kIiwiQVhJT01fS0lORCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFNcUJBOzs7Z0ZBSm1CO3FCQUViOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVaLElBQUEsQUFBTUEsc0JBQU47Y0FBTUE7OEJBQUFBO2FBQUFBOzhCQUFBQTs7O2lCQUFBQTs7WUFHWkMsS0FBQUE7bUJBQVAsU0FBT0EsU0FBU0MsSUFBSSxFQUFFQyxPQUFPLEVBQUU7Z0JBQUUsT0FBT0Msb0NBQTJCLENBQUNILFFBQVEsQ0FIekRELE9BR2lFRSxNQUFNQztZQUFVOzs7WUFFN0ZFLEtBQUFBO21CQUFQLFNBQU9BLHFDQUFxQ0MsTUFBTSxFQUFFQyxZQUFZLEVBQUVDLFdBQVcsRUFBRTtnQkFBRSxPQUFPSixvQ0FBMkIsQ0FBQ0Msb0NBQW9DLENBTHJJTCxPQUs2SU0sUUFBUUMsY0FBY0M7WUFBYzs7O1dBTGpMUjtFQUFjSSxvQ0FBMkI7QUFDNUQsZ0JBRG1CSixPQUNaUyxRQUFPQyxpQkFBVSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9heGlvbS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZSBmcm9tIFwiLi9heGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmVcIjtcblxuaW1wb3J0IHsgQVhJT01fS0lORCB9IGZyb20gXCIuL2tpbmRzXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIEF4aW9tIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBBWElPTV9LSU5EO1xuXG4gIHN0YXRpYyBmcm9tSlNPTkFuZEZpbGVDb250ZXh0KGpzb24sIGZpbGVDb250ZXhjdCkgeyByZXR1cm4gQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlLmZyb21KU09OQW5kRmlsZUNvbnRleHQoQXhpb20sIGpzb24sIGZpbGVDb250ZXhjdCk7IH1cblxuICBzdGF0aWMgZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbmNlQW5kUHJvb2ZDb250ZXh0KGxhYmVscywgc3VwcG9zaXRpb25zLCBjb25zZXF1ZW5jZSwgcHJvb2ZDb250ZXh0KSB7IHJldHVybiBBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUuZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbmNlQW5kUHJvb2ZDb250ZXh0KEF4aW9tLCBsYWJlbHMsIHN1cHBvc2l0aW9ucywgY29uc2VxdWVuY2UsIHByb29mQ29udGV4dCk7IH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQXhpb20iLCJmcm9tSlNPTkFuZEZpbGVDb250ZXh0IiwianNvbiIsImZpbGVDb250ZXhjdCIsIkF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZSIsImZyb21MYWJlbHNTdXBwb3NpdGlvbnNDb25zZXF1ZW5jZUFuZFByb29mQ29udGV4dCIsImxhYmVscyIsInN1cHBvc2l0aW9ucyIsImNvbnNlcXVlbmNlIiwicHJvb2ZDb250ZXh0Iiwia2luZCIsIkFYSU9NX0tJTkQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O2dGQUptQjtxQkFFYjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFWixJQUFBLEFBQU1BLHNCQUFOO2NBQU1BOzhCQUFBQTthQUFBQTs4QkFBQUE7OztpQkFBQUE7O1lBR1pDLEtBQUFBO21CQUFQLFNBQU9BLHVCQUF1QkMsSUFBSSxFQUFFQyxZQUFZLEVBQUU7Z0JBQUUsT0FBT0Msb0NBQTJCLENBQUNILHNCQUFzQixDQUgxRkQsT0FHa0dFLE1BQU1DO1lBQWU7OztZQUVuSUUsS0FBQUE7bUJBQVAsU0FBT0EsaURBQWlEQyxNQUFNLEVBQUVDLFlBQVksRUFBRUMsV0FBVyxFQUFFQyxZQUFZLEVBQUU7Z0JBQUUsT0FBT0wsb0NBQTJCLENBQUNDLGdEQUFnRCxDQUwzS0wsT0FLbUxNLFFBQVFDLGNBQWNDLGFBQWFDO1lBQWU7OztXQUxyT1Q7RUFBY0ksb0NBQTJCO0FBQzVELGdCQURtQkosT0FDWlUsUUFBT0MsaUJBQVUifQ==

package/lib/axiomLemmaTheoremConjecture.js

@@ -37,11 +37,12 @@ function _interopRequireDefault(obj) {
     };
 }
 var AxiomLemmaTheoremConjecture = /*#__PURE__*/ function() {
-    function AxiomLemmaTheoremConjecture(labels, suppositions, consequence) {
+    function AxiomLemmaTheoremConjecture(labels, suppositions, consequence, proofContext) {
         _classCallCheck(this, AxiomLemmaTheoremConjecture);
         this.labels = labels;
         this.suppositions = suppositions;
         this.consequence = consequence;
+        this.proofContext = proofContext;
     }
     _createClass(AxiomLemmaTheoremConjecture, [
         {
@@ -62,6 +63,12 @@ var AxiomLemmaTheoremConjecture = /*#__PURE__*/ function() {
                 return this.consequence;
             }
         },
+        {
+            key: "getProofContext",
+            value: function getProofContext() {
+                return this.proofContext;
+            }
+        },
         {
             key: "matchLabelName",
             value: function matchLabelName(labelName) {
@@ -76,17 +83,22 @@ var AxiomLemmaTheoremConjecture = /*#__PURE__*/ function() {
         },
         {
             key: "matchStatement",
-            value: function matchStatement(statementNode, proofContext) {
+            value: function matchStatement(statementNode, statementProofContext) {
                 var _this = this;
                 var statementNatches;
                 var suppositionsLength = this.suppositions.length;
                 if (suppositionsLength === 0) {
-                    var substitutions = [], consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions);
+                    var substitutions = [], consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions, this.proofContext, statementProofContext);
                     statementNatches = consequenceMatches; ///
                 } else {
-                    var proofSteps = proofContext.getProofSteps();
+                    var proofSteps = statementProofContext.getProofSteps();
                     statementNatches = (0, _array.someSubArray)(proofSteps, suppositionsLength, function(proofSteps) {
-                        var suppositionsMatchConsequence = matchSuppositionsAndConsequence(_this.suppositions, _this.consequence, proofSteps, statementNode);
+                        var suppositionsMatchConsequence = false;
+                        var substitutions = [], suppositionsMatch = matchSuppositions(_this.suppositions, proofSteps, substitutions, _this.proofContext, statementProofContext);
+                        if (suppositionsMatch) {
+                            var consequenceMatches = matchConsequence(_this.consequence, statementNode, substitutions, _this.proofContext, statementProofContext);
+                            suppositionsMatchConsequence = consequenceMatches; ///
+                        }
                         if (suppositionsMatchConsequence) {
                             return true;
                         }
@@ -115,47 +127,47 @@ var AxiomLemmaTheoremConjecture = /*#__PURE__*/ function() {
         }
     ], [
         {
-            key: "fromJSON",
-            value: function fromJSON(Class, json, context) {
+            key: "fromJSONAndFileContext",
+            value: function fromJSONAndFileContext(Class, json, fileContext) {
                 var labels = json.labels;
                 var labelsJSON = labels; ///
                 labels = labelsJSON.map(function(labelJSON) {
-                    var _$json = labelJSON, label = _label.default.fromJSON(_$json, context);
+                    var _$json = labelJSON, label = _label.default.fromJSONAndFileContext(_$json, fileContext);
                     return label;
                 });
                 var suppositions = json.suppositions;
                 var suppositionsJSON = suppositions; ///
                 suppositions = suppositionsJSON.map(function(suppositionJSON) {
-                    var _$json = suppositionJSON, supposition = _supposition.default.fromJSON(_$json, context);
+                    var _$json = suppositionJSON, supposition = _supposition.default.fromJSONAndFileContext(_$json, fileContext);
                     return supposition;
                 });
                 var consequence = json.consequence;
                 var consequenceJSON = consequence; ///
                 json = consequenceJSON; ///
-                consequence = _consequence.default.fromJSON(json, context);
+                consequence = _consequence.default.fromJSONAndFileContext(json, fileContext);
                 return new Class(labels, suppositions, consequence); ///
             }
         },
         {
-            key: "fromLabelsSuppositionsAndConsequence",
-            value: function fromLabelsSuppositionsAndConsequence(Class, labels, suppositions, consequence) {
-                return new Class(labels, suppositions, consequence);
+            key: "fromLabelsSuppositionsConsequenceAndProofContext",
+            value: function fromLabelsSuppositionsConsequenceAndProofContext(Class, labels, suppositions, consequence, proofContext) {
+                return new Class(labels, suppositions, consequence, proofContext);
             }
         }
     ]);
     return AxiomLemmaTheoremConjecture;
 }();
-function matchSupposition(supposition, proofSteps, substitutions) {
+function matchSupposition(supposition, proofSteps, substitutions, proofContext, statementProofContext) {
     var proofStep = (0, _array.prune)(proofSteps, function(proofStep) {
         var subproofNode = proofStep.getSubproofNode(), statementNode = proofStep.getStatementNode();
         if (subproofNode !== null) {
-            var subProofMatches = supposition.matchSubproofNode(subproofNode, substitutions);
+            var subProofMatches = supposition.matchSubproofNode(subproofNode, substitutions, proofContext, statementProofContext);
             if (!subProofMatches) {
                 return true;
             }
         }
         if (statementNode !== null) {
-            var statementMatches = supposition.matchStatementNode(statementNode, substitutions);
+            var statementMatches = supposition.matchStatementNode(statementNode, substitutions, proofContext, statementProofContext);
             if (!statementMatches) {
                 return true;
             }
@@ -164,27 +176,18 @@ function matchSupposition(supposition, proofSteps, substitutions) {
     var suppositionMatches = proofStep !== null;
     return suppositionMatches;
 }
-function matchSuppositions(supposition, proofSteps, substitutions) {
+function matchSuppositions(supposition, proofSteps, substitutions, proofContext, statementProofContext) {
     var suppositionsMatch = supposition.every(function(supposition) {
-        var suppositionMatches = matchSupposition(supposition, proofSteps, substitutions);
+        var suppositionMatches = matchSupposition(supposition, proofSteps, substitutions, proofContext, statementProofContext);
         if (suppositionMatches) {
             return true;
         }
     });
     return suppositionsMatch;
 }
-function matchConsequence(consequence, statementNode, substitutions) {
-    var nonTerminalNodeMatches = consequence.matchStatementNode(statementNode, substitutions), consequenceMatches = nonTerminalNodeMatches; ///
+function matchConsequence(consequence, statementNode, substitutions, proofContext, statementProofContext) {
+    var nonTerminalNodeMatches = consequence.matchStatementNode(statementNode, substitutions, proofContext, statementProofContext), consequenceMatches = nonTerminalNodeMatches; ///
     return consequenceMatches;
 }
-function matchSuppositionsAndConsequence(suppositions, consequence, proofSteps, statementNode) {
-    var suppositionsMatchConsequence = false;
-    var substitutions = [], suppositionsMatch = matchSuppositions(suppositions, proofSteps, substitutions);
-    if (suppositionsMatch) {
-        var consequenceMatches = matchConsequence(consequence, statementNode, substitutions);
-        suppositionsMatchConsequence = consequenceMatches; ///
-    }
-    return suppositionsMatchConsequence;
-}
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/axiomLemmaTheoremConjecture.js"],"sourcesContent":["\"use strict\";\n\nimport Label from \"./label\";\nimport Supposition from \"./supposition\";\nimport Consequence from \"./consequence\";\n\nimport { prune } from \"./utilities/array\";\nimport { someSubArray } from \"./utilities/array\";\n\nexport default class AxiomLemmaTheoremConjecture {\n  constructor(labels, suppositions, consequence) {\n    this.labels = labels;\n    this.suppositions = suppositions;\n    this.consequence = consequence;\n  }\n\n  getLabels() {\n    return this.labels;\n  }\n\n  getSuppositions() {\n    return this.suppositions;\n  }\n\n  getConsequence() {\n    return this.consequence;\n  }\n\n  matchLabelName(labelName) {\n    const matchesLabelName = this.labels.some((label) => {\n      const name = labelName, ///\n            labelMatchesName = label.matchName(name);\n\n      if (labelMatchesName) {\n        return true;\n      }\n    });\n\n    return matchesLabelName;\n  }\n\n  matchStatement(statementNode, proofContext) {\n    let statementNatches;\n\n    const suppositionsLength = this.suppositions.length;\n\n    if (suppositionsLength === 0) {\n      const substitutions = [],\n            consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions);\n\n      statementNatches = consequenceMatches; ///\n    } else {\n      const proofSteps = proofContext.getProofSteps();\n\n      statementNatches = someSubArray(proofSteps, suppositionsLength, (proofSteps) => {\n        const suppositionsMatchConsequence = matchSuppositionsAndConsequence(this.suppositions, this.consequence, proofSteps, statementNode);\n\n        if (suppositionsMatchConsequence) {\n          return true;\n        }\n      });\n    }\n\n    return statementNatches;\n  }\n\n  toJSON(tokens) {\n    const { kind } = this.constructor,\n          labelsJSON = this.labels.map((label) => {\n            const labelJSON = label.toJSON(tokens);\n\n            return labelJSON;\n          }),\n          suppositionsJSON = this.suppositions.map((supposition) => {\n            const suppositionJSON = supposition.toJSON(tokens);\n\n            return suppositionJSON;\n          }),\n          consequenceJSON = this.consequence.toJSON(tokens),\n          labels = labelsJSON,  ///\n          suppositions = suppositionsJSON,  ///\n          consequence = consequenceJSON,  ///\n          json = {\n            kind,\n            labels,\n            suppositions,\n            consequence\n          };\n\n    return json;\n  }\n\n  static fromJSON(Class, json, context) {\n    let { labels } = json;\n\n    const labelsJSON = labels;  ///\n\n    labels = labelsJSON.map((labelJSON) => {\n      const json = labelJSON, ///\n            label = Label.fromJSON(json, context);\n\n      return label;\n    });\n\n    let { suppositions } = json;\n\n    const suppositionsJSON = suppositions;  ///\n\n    suppositions = suppositionsJSON.map((suppositionJSON) => {\n      const json = suppositionJSON, ///\n            supposition = Supposition.fromJSON(json, context);\n\n      return supposition;\n    });\n\n    let { consequence } = json;\n\n    const consequenceJSON = consequence;  ///\n\n    json = consequenceJSON;  ///\n\n    consequence = Consequence.fromJSON(json, context);\n\n    return new Class(labels, suppositions, consequence);  ///\n  }\n\n  static fromLabelsSuppositionsAndConsequence(Class, labels, suppositions, consequence) { return new Class(labels, suppositions, consequence); }\n}\n\nfunction matchSupposition(supposition, proofSteps, substitutions) {\n  const proofStep = prune(proofSteps, (proofStep) => {\n    const subproofNode = proofStep.getSubproofNode(),\n          statementNode = proofStep.getStatementNode();\n\n    if (subproofNode !== null) {\n      const subProofMatches = supposition.matchSubproofNode(subproofNode, substitutions);\n\n      if (!subProofMatches) {  ///\n        return true;\n      }\n    }\n\n    if (statementNode !== null) {\n      const statementMatches = supposition.matchStatementNode(statementNode, substitutions);\n\n      if (!statementMatches) {  ///\n        return true;\n      }\n    }\n\n  }) || null;\n\n  const suppositionMatches = (proofStep !== null);\n\n  return suppositionMatches;\n}\n\nfunction matchSuppositions(supposition, proofSteps, substitutions) {\n  const suppositionsMatch = supposition.every((supposition) => {\n    const suppositionMatches = matchSupposition(supposition, proofSteps, substitutions);\n\n    if (suppositionMatches) {\n      return true;\n    }\n  });\n\n  return suppositionsMatch;\n}\n\nfunction matchConsequence(consequence, statementNode, substitutions) {\n  const nonTerminalNodeMatches = consequence.matchStatementNode(statementNode, substitutions),\n        consequenceMatches = nonTerminalNodeMatches; ///\n\n  return consequenceMatches;\n}\n\nfunction matchSuppositionsAndConsequence(suppositions, consequence, proofSteps, statementNode) {\n  let suppositionsMatchConsequence = false;\n\n  const substitutions = [],\n        suppositionsMatch = matchSuppositions(suppositions, proofSteps, substitutions);\n\n  if (suppositionsMatch) {\n    const consequenceMatches = matchConsequence(consequence, statementNode, substitutions);\n\n    suppositionsMatchConsequence = consequenceMatches;  ///\n  }\n\n  return suppositionsMatchConsequence;\n}\n"],"names":["AxiomLemmaTheoremConjecture","labels","suppositions","consequence","getLabels","getSuppositions","getConsequence","matchLabelName","labelName","matchesLabelName","some","label","name","labelMatchesName","matchName","matchStatement","statementNode","proofContext","statementNatches","suppositionsLength","length","substitutions","consequenceMatches","matchConsequence","proofSteps","getProofSteps","someSubArray","suppositionsMatchConsequence","matchSuppositionsAndConsequence","toJSON","tokens","kind","constructor","labelsJSON","map","labelJSON","suppositionsJSON","supposition","suppositionJSON","consequenceJSON","json","fromJSON","Class","context","Label","Supposition","Consequence","fromLabelsSuppositionsAndConsequence","matchSupposition","proofStep","prune","subproofNode","getSubproofNode","getStatementNode","subProofMatches","matchSubproofNode","statementMatches","matchStatementNode","suppositionMatches","matchSuppositions","suppositionsMatch","every","nonTerminalNodeMatches"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/axiomLemmaTheoremConjecture.js"],"sourcesContent":["\"use strict\";\n\nimport Label from \"./label\";\nimport Supposition from \"./supposition\";\nimport Consequence from \"./consequence\";\n\nimport { prune } from \"./utilities/array\";\nimport { someSubArray } from \"./utilities/array\";\n\nexport default class AxiomLemmaTheoremConjecture {\n  constructor(labels, suppositions, consequence, proofContext) {\n    this.labels = labels;\n    this.suppositions = suppositions;\n    this.consequence = consequence;\n    this.proofContext = proofContext;\n  }\n\n  getLabels() {\n    return this.labels;\n  }\n\n  getSuppositions() {\n    return this.suppositions;\n  }\n\n  getConsequence() {\n    return this.consequence;\n  }\n\n  getProofContext() {\n    return this.proofContext;\n  }\n\n  matchLabelName(labelName) {\n    const matchesLabelName = this.labels.some((label) => {\n      const name = labelName, ///\n            labelMatchesName = label.matchName(name);\n\n      if (labelMatchesName) {\n        return true;\n      }\n    });\n\n    return matchesLabelName;\n  }\n\n  matchStatement(statementNode, statementProofContext) {\n    let statementNatches;\n\n    const suppositionsLength = this.suppositions.length;\n\n    if (suppositionsLength === 0) {\n      const substitutions = [],\n            consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions, this.proofContext, statementProofContext);\n\n      statementNatches = consequenceMatches; ///\n    } else {\n      const proofSteps = statementProofContext.getProofSteps();\n\n      statementNatches = someSubArray(proofSteps, suppositionsLength, (proofSteps) => {\n        let suppositionsMatchConsequence = false;\n\n        const substitutions = [],\n              suppositionsMatch = matchSuppositions(this.suppositions, proofSteps, substitutions, this.proofContext, statementProofContext);\n\n        if (suppositionsMatch) {\n          const consequenceMatches = matchConsequence(this.consequence, statementNode, substitutions, this.proofContext, statementProofContext);\n\n          suppositionsMatchConsequence = consequenceMatches;  ///\n        }\n\n        if (suppositionsMatchConsequence) {\n          return true;\n        }\n      });\n    }\n\n    return statementNatches;\n  }\n\n  toJSON(tokens) {\n    const { kind } = this.constructor,\n          labelsJSON = this.labels.map((label) => {\n            const labelJSON = label.toJSON(tokens);\n\n            return labelJSON;\n          }),\n          suppositionsJSON = this.suppositions.map((supposition) => {\n            const suppositionJSON = supposition.toJSON(tokens);\n\n            return suppositionJSON;\n          }),\n          consequenceJSON = this.consequence.toJSON(tokens),\n          labels = labelsJSON,  ///\n          suppositions = suppositionsJSON,  ///\n          consequence = consequenceJSON,  ///\n          json = {\n            kind,\n            labels,\n            suppositions,\n            consequence\n          };\n\n    return json;\n  }\n\n  static fromJSONAndFileContext(Class, json, fileContext) {\n    let { labels } = json;\n\n    const labelsJSON = labels;  ///\n\n    labels = labelsJSON.map((labelJSON) => {\n      const json = labelJSON, ///\n            label = Label.fromJSONAndFileContext(json, fileContext);\n\n      return label;\n    });\n\n    let { suppositions } = json;\n\n    const suppositionsJSON = suppositions;  ///\n\n    suppositions = suppositionsJSON.map((suppositionJSON) => {\n      const json = suppositionJSON, ///\n            supposition = Supposition.fromJSONAndFileContext(json, fileContext);\n\n      return supposition;\n    });\n\n    let { consequence } = json;\n\n    const consequenceJSON = consequence;  ///\n\n    json = consequenceJSON;  ///\n\n    consequence = Consequence.fromJSONAndFileContext(json, fileContext);\n\n    return new Class(labels, suppositions, consequence);  ///\n  }\n\n  static fromLabelsSuppositionsConsequenceAndProofContext(Class, labels, suppositions, consequence, proofContext) { return new Class(labels, suppositions, consequence, proofContext); }\n}\n\nfunction matchSupposition(supposition, proofSteps, substitutions, proofContext, statementProofContext) {\n  const proofStep = prune(proofSteps, (proofStep) => {\n    const subproofNode = proofStep.getSubproofNode(),\n          statementNode = proofStep.getStatementNode();\n\n    if (subproofNode !== null) {\n      const subProofMatches = supposition.matchSubproofNode(subproofNode, substitutions, proofContext, statementProofContext);\n\n      if (!subProofMatches) {  ///\n        return true;\n      }\n    }\n\n    if (statementNode !== null) {\n      const statementMatches = supposition.matchStatementNode(statementNode, substitutions, proofContext, statementProofContext);\n\n      if (!statementMatches) {  ///\n        return true;\n      }\n    }\n\n  }) || null;\n\n  const suppositionMatches = (proofStep !== null);\n\n  return suppositionMatches;\n}\n\nfunction matchSuppositions(supposition, proofSteps, substitutions, proofContext, statementProofContext) {\n  const suppositionsMatch = supposition.every((supposition) => {\n    const suppositionMatches = matchSupposition(supposition, proofSteps, substitutions, proofContext, statementProofContext);\n\n    if (suppositionMatches) {\n      return true;\n    }\n  });\n\n  return suppositionsMatch;\n}\n\nfunction matchConsequence(consequence, statementNode, substitutions, proofContext, statementProofContext) {\n  const nonTerminalNodeMatches = consequence.matchStatementNode(statementNode, substitutions, proofContext, statementProofContext),\n        consequenceMatches = nonTerminalNodeMatches; ///\n\n  return consequenceMatches;\n}\n"],"names":["AxiomLemmaTheoremConjecture","labels","suppositions","consequence","proofContext","getLabels","getSuppositions","getConsequence","getProofContext","matchLabelName","labelName","matchesLabelName","some","label","name","labelMatchesName","matchName","matchStatement","statementNode","statementProofContext","statementNatches","suppositionsLength","length","substitutions","consequenceMatches","matchConsequence","proofSteps","getProofSteps","someSubArray","suppositionsMatchConsequence","suppositionsMatch","matchSuppositions","toJSON","tokens","kind","constructor","labelsJSON","map","labelJSON","suppositionsJSON","supposition","suppositionJSON","consequenceJSON","json","fromJSONAndFileContext","Class","fileContext","Label","Supposition","Consequence","fromLabelsSuppositionsConsequenceAndProofContext","matchSupposition","proofStep","prune","subproofNode","getSubproofNode","getStatementNode","subProofMatches","matchSubproofNode","statementMatches","matchStatementNode","suppositionMatches","every","nonTerminalNodeMatches"],"mappings":"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"}

package/lib/combinator.js

@@ -63,9 +63,9 @@ var Combinator = /*#__PURE__*/ function() {
         }
     ], [
         {
-            key: "fromJSON",
-            value: function fromJSON(json, context) {
-                var statement = json.statement, statementString = statement, lexer = context.getLexer(), parser = context.getParser(), statementNode = (0, _node.statementNodeFromStatementString)(statementString, lexer, parser), combinator = new Combinator(statementNode);
+            key: "fromJSONAndFileContext",
+            value: function fromJSONAndFileContext(json, fileContext) {
+                var statement = json.statement, statementString = statement, lexer = fileContext.getLexer(), parser = fileContext.getParser(), statementNode = (0, _node.statementNodeFromStatementString)(statementString, lexer, parser), combinator = new Combinator(statementNode);
                 return combinator;
             }
         },
@@ -80,4 +80,4 @@ var Combinator = /*#__PURE__*/ function() {
     return Combinator;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21iaW5hdG9yLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBDT01CSU5BVE9SX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb21iaW5hdG9yIHtcbiAgY29uc3RydWN0b3Ioc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMuc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLnN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBhc1N0cmluZyh0b2tlbnMpIHtcbiAgICBsZXQgc3RyaW5nO1xuXG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKHRoaXMuc3RhdGVtZW50Tm9kZSwgdG9rZW5zKTtcblxuICAgIHN0cmluZyA9IGAke3N0YXRlbWVudFN0cmluZ31gO1xuXG4gICAgcmV0dXJuIHN0cmluZztcbiAgfVxuXG4gIHRvSlNPTih0b2tlbnMpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5zdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICAgIGtpbmQgPSBDT01CSU5BVE9SX0tJTkQsXG4gICAgICAgICAgc3RhdGVtZW50ID0gc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIGtpbmQsXG4gICAgICAgICAgICBzdGF0ZW1lbnRcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgY29udGV4dCkge1xuICAgIGNvbnN0IHsgc3RhdGVtZW50IH0gPSBqc29uLFxuICAgICAgICAgIHN0YXRlbWVudFN0cmluZyA9IHN0YXRlbWVudCwgIC8vL1xuICAgICAgICAgIGxleGVyID0gY29udGV4dC5nZXRMZXhlcigpLFxuICAgICAgICAgIHBhcnNlciA9IGNvbnRleHQuZ2V0UGFyc2VyKCksXG4gICAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nKHN0YXRlbWVudFN0cmluZywgbGV4ZXIsIHBhcnNlciksXG4gICAgICAgICAgY29tYmluYXRvciA9IG5ldyBDb21iaW5hdG9yKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbWJpbmF0b3I7XG4gIH1cblxuICBzdGF0aWMgZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSkge1xuICAgIGNvbnN0IGNvbWJpbmF0b3IgPSBuZXcgQ29tYmluYXRvcihzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb21iaW5hdG9yO1xuICB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIkNvbWJpbmF0b3IiLCJzdGF0ZW1lbnROb2RlIiwiZ2V0U3RhdGVtZW50Tm9kZSIsImFzU3RyaW5nIiwidG9rZW5zIiwic3RyaW5nIiwic3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwidG9KU09OIiwia2luZCIsIkNPTUJJTkFUT1JfS0lORCIsInN0YXRlbWVudCIsImpzb24iLCJmcm9tSlNPTiIsImNvbnRleHQiLCJsZXhlciIsImdldExleGVyIiwicGFyc2VyIiwiZ2V0UGFyc2VyIiwic3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmciLCJjb21iaW5hdG9yIiwiZnJvbVN0YXRlbWVudE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O3NCQUpRO3FCQUNHO29CQUNpQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFbEMsSUFBQSxBQUFNQSwyQkFBTjthQUFNQSxXQUNQQyxhQUFhOzhCQURORDtRQUVqQixJQUFJLENBQUNDLGFBQWEsR0FBR0E7O2lCQUZKRDs7WUFLbkJFLEtBQUFBO21CQUFBQSxTQUFBQSxtQkFBbUI7Z0JBQ2pCLE9BQU8sSUFBSSxDQUFDRCxhQUFhO1lBQzNCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLFNBQVNDLE1BQU0sRUFBRTtnQkFDZixJQUFJQztnQkFFSixJQUFNQyxrQkFBa0JDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDTixhQUFhLEVBQUVHO2dCQUV6REMsU0FBUyxBQUFDLEdBQWtCLE9BQWhCQztnQkFFWixPQUFPRDtZQUNUOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9KLE1BQU0sRUFBRTtnQkFDYixJQUFNRSxrQkFBa0JDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDTixhQUFhLEVBQUVHLFNBQ25ESyxPQUFPQyxzQkFBZSxFQUN0QkMsWUFBWUwsaUJBQ1pNLE9BQU87b0JBQ0xILE1BQUFBO29CQUNBRSxXQUFBQTtnQkFDRjtnQkFFTixPQUFPQztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLFNBQVNELElBQUksRUFBRUUsT0FBTyxFQUFFO2dCQUM3QixJQUFNLEFBQUVILFlBQWNDLEtBQWRELFdBQ0ZMLGtCQUFrQkssV0FDbEJJLFFBQVFELFFBQVFFLFFBQVEsSUFDeEJDLFNBQVNILFFBQVFJLFNBQVMsSUFDMUJqQixnQkFBZ0JrQixJQUFBQSxzQ0FBZ0MsRUFBQ2IsaUJBQWlCUyxPQUFPRSxTQUN6RUcsYUFBYSxJQXJDRnBCLFdBcUNpQkM7Z0JBRWxDLE9BQU9tQjtZQUNUOzs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0Esa0JBQWtCcEIsYUFBYSxFQUFFO2dCQUN0QyxJQUFNbUIsYUFBYSxJQTNDRnBCLFdBMkNpQkM7Z0JBRWxDLE9BQU9tQjtZQUNUOzs7V0E5Q21CcEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb21iaW5hdG9yLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBDT01CSU5BVE9SX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb21iaW5hdG9yIHtcbiAgY29uc3RydWN0b3Ioc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMuc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBnZXRTdGF0ZW1lbnROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLnN0YXRlbWVudE5vZGU7XG4gIH1cblxuICBhc1N0cmluZyh0b2tlbnMpIHtcbiAgICBsZXQgc3RyaW5nO1xuXG4gICAgY29uc3Qgc3RhdGVtZW50U3RyaW5nID0gbm9kZUFzU3RyaW5nKHRoaXMuc3RhdGVtZW50Tm9kZSwgdG9rZW5zKTtcblxuICAgIHN0cmluZyA9IGAke3N0YXRlbWVudFN0cmluZ31gO1xuXG4gICAgcmV0dXJuIHN0cmluZztcbiAgfVxuXG4gIHRvSlNPTih0b2tlbnMpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5zdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICAgIGtpbmQgPSBDT01CSU5BVE9SX0tJTkQsXG4gICAgICAgICAgc3RhdGVtZW50ID0gc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIGtpbmQsXG4gICAgICAgICAgICBzdGF0ZW1lbnRcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT05BbmRGaWxlQ29udGV4dChqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHsgc3RhdGVtZW50IH0gPSBqc29uLFxuICAgICAgICAgIHN0YXRlbWVudFN0cmluZyA9IHN0YXRlbWVudCwgIC8vL1xuICAgICAgICAgIGxleGVyID0gZmlsZUNvbnRleHQuZ2V0TGV4ZXIoKSxcbiAgICAgICAgICBwYXJzZXIgPSBmaWxlQ29udGV4dC5nZXRQYXJzZXIoKSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcoc3RhdGVtZW50U3RyaW5nLCBsZXhlciwgcGFyc2VyKSxcbiAgICAgICAgICBjb21iaW5hdG9yID0gbmV3IENvbWJpbmF0b3Ioc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29tYmluYXRvcjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSB7XG4gICAgY29uc3QgY29tYmluYXRvciA9IG5ldyBDb21iaW5hdG9yKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbWJpbmF0b3I7XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQ29tYmluYXRvciIsInN0YXRlbWVudE5vZGUiLCJnZXRTdGF0ZW1lbnROb2RlIiwiYXNTdHJpbmciLCJ0b2tlbnMiLCJzdHJpbmciLCJzdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0b0pTT04iLCJraW5kIiwiQ09NQklOQVRPUl9LSU5EIiwic3RhdGVtZW50IiwianNvbiIsImZyb21KU09OQW5kRmlsZUNvbnRleHQiLCJmaWxlQ29udGV4dCIsImxleGVyIiwiZ2V0TGV4ZXIiLCJwYXJzZXIiLCJnZXRQYXJzZXIiLCJzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyIsImNvbWJpbmF0b3IiLCJmcm9tU3RhdGVtZW50Tm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFNcUJBOzs7c0JBSlE7cUJBQ0c7b0JBQ2lCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVsQyxJQUFBLEFBQU1BLDJCQUFOO2FBQU1BLFdBQ1BDLGFBQWE7OEJBRE5EO1FBRWpCLElBQUksQ0FBQ0MsYUFBYSxHQUFHQTs7aUJBRkpEOztZQUtuQkUsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQjtnQkFDakIsT0FBTyxJQUFJLENBQUNELGFBQWE7WUFDM0I7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUEsU0FBU0MsTUFBTSxFQUFFO2dCQUNmLElBQUlDO2dCQUVKLElBQU1DLGtCQUFrQkMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUNOLGFBQWEsRUFBRUc7Z0JBRXpEQyxTQUFTLEFBQUMsR0FBa0IsT0FBaEJDO2dCQUVaLE9BQU9EO1lBQ1Q7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0osTUFBTSxFQUFFO2dCQUNiLElBQU1FLGtCQUFrQkMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUNOLGFBQWEsRUFBRUcsU0FDbkRLLE9BQU9DLHNCQUFlLEVBQ3RCQyxZQUFZTCxpQkFDWk0sT0FBTztvQkFDTEgsTUFBQUE7b0JBQ0FFLFdBQUFBO2dCQUNGO2dCQUVOLE9BQU9DO1lBQ1Q7Ozs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0EsdUJBQXVCRCxJQUFJLEVBQUVFLFdBQVcsRUFBRTtnQkFDL0MsSUFBTSxBQUFFSCxZQUFjQyxLQUFkRCxXQUNGTCxrQkFBa0JLLFdBQ2xCSSxRQUFRRCxZQUFZRSxRQUFRLElBQzVCQyxTQUFTSCxZQUFZSSxTQUFTLElBQzlCakIsZ0JBQWdCa0IsSUFBQUEsc0NBQWdDLEVBQUNiLGlCQUFpQlMsT0FBT0UsU0FDekVHLGFBQWEsSUFyQ0ZwQixXQXFDaUJDO2dCQUVsQyxPQUFPbUI7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGtCQUFrQnBCLGFBQWEsRUFBRTtnQkFDdEMsSUFBTW1CLGFBQWEsSUEzQ0ZwQixXQTJDaUJDO2dCQUVsQyxPQUFPbUI7WUFDVDs7O1dBOUNtQnBCIn0=

package/lib/conclusion.js

@@ -45,15 +45,15 @@ var Conclusion = /*#__PURE__*/ function() {
         },
         {
             key: "matchStatementNode",
-            value: function matchStatementNode(statementNode, substitutions) {
-                var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = statementNode, nonTerminalNodeVerified = _conclusion.conclusionStatementForMetavariableVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), statementNodeMatches = nonTerminalNodeVerified; ///
+            value: function matchStatementNode(statementNode, substitutions, fileContext, statementProofContext) {
+                var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = statementNode, fileContextA = fileContext, proofContextB = statementProofContext, nonTerminalNodeVerified = _conclusion.conclusionStatementForMetavariableVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, proofContextB), statementNodeMatches = nonTerminalNodeVerified; ///
                 return statementNodeMatches;
             }
         },
         {
             key: "matchMetastatementNode",
-            value: function matchMetastatementNode(metastatementNode, substitutions) {
-                var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = metastatementNode, nonTerminalNodeVerified = _conclusion1.conclusionMetastatementForMetavariableVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), metastatementNodeMatches = nonTerminalNodeVerified; ///
+            value: function matchMetastatementNode(metastatementNode, substitutions, fileContext, metastatementMetaproofContext) {
+                var nonTerminalNodeA = this.metastatementNode, nonTerminalNodeB = metastatementNode, fileContextA = fileContext, metaproofContextB = metastatementMetaproofContext, nonTerminalNodeVerified = _conclusion1.conclusionMetastatementForMetavariableVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, fileContextA, metaproofContextB), metastatementNodeMatches = nonTerminalNodeVerified; ///
                 return metastatementNodeMatches;
             }
         },
@@ -68,9 +68,9 @@ var Conclusion = /*#__PURE__*/ function() {
         }
     ], [
         {
-            key: "fromJSON",
-            value: function fromJSON(json, context) {
-                var metastatement = json.metastatement, metastatementString = metastatement, lexer = context.getLexer(), parser = context.getParser(), metastatementNode = (0, _node.metastatementNodeFromMetastatementString)(metastatementString, lexer, parser), conclusion = new Conclusion(metastatementNode);
+            key: "fromJSONAndFileContext",
+            value: function fromJSONAndFileContext(json, fileContext) {
+                var metastatement = json.metastatement, metastatementString = metastatement, lexer = fileContext.getLexer(), parser = fileContext.getParser(), metastatementNode = (0, _node.metastatementNodeFromMetastatementString)(metastatementString, lexer, parser), conclusion = new Conclusion(metastatementNode);
                 return conclusion;
             }
         },
@@ -85,4 +85,4 @@ var Conclusion = /*#__PURE__*/ function() {
     return Conclusion;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25jbHVzaW9uLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBtZXRhc3RhdGVtZW50Tm9kZUZyb21NZXRhc3RhdGVtZW50U3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL25vZGVcIjtcbmltcG9ydCB7IGNvbmNsdXNpb25TdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVWZXJpZmllciB9IGZyb20gXCIuL3ZlcmlmaWVyL3N0YXRlbWVudEZvck1ldGF2YXJpYWJsZS9jb25jbHVzaW9uXCI7XG5pbXBvcnQgeyBjb25jbHVzaW9uTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVZlcmlmaWVyIH0gZnJvbSBcIi4vdmVyaWZpZXIvbWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZS9jb25jbHVzaW9uXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENvbmNsdXNpb24ge1xuICBjb25zdHJ1Y3RvcihtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMubWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGdldE1ldGFzdGF0ZW1lbnROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgbWF0Y2hTdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMpIHtcbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5tZXRhc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZUIgPSBzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlVmVyaWZpZWQgPSBjb25jbHVzaW9uU3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlVmVyaWZpZXIudmVyaWZ5Tm9uVGVybWluYWxOb2RlKG5vblRlcm1pbmFsTm9kZUEsIG5vblRlcm1pbmFsTm9kZUIsIHN1YnN0aXR1dGlvbnMpLFxuICAgICAgICAgIHN0YXRlbWVudE5vZGVNYXRjaGVzID0gbm9uVGVybWluYWxOb2RlVmVyaWZpZWQ7IC8vL1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgbWF0Y2hNZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSwgc3Vic3RpdHV0aW9ucykge1xuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZUEgPSB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IG1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlVmVyaWZpZWQgPSBjb25jbHVzaW9uTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVZlcmlmaWVyLnZlcmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGVBLCBub25UZXJtaW5hbE5vZGVCLCBzdWJzdGl0dXRpb25zKSxcbiAgICAgICAgICBtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXMgPSBub25UZXJtaW5hbE5vZGVWZXJpZmllZDsgLy8vXG5cbiAgICByZXR1cm4gbWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgdG9KU09OKHRva2Vucykge1xuICAgIGNvbnN0IG1ldGFzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5tZXRhc3RhdGVtZW50Tm9kZSwgdG9rZW5zKSxcbiAgICAgICAgICBtZXRhc3RhdGVtZW50ID0gbWV0YXN0YXRlbWVudFN0cmluZywgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBtZXRhc3RhdGVtZW50XG4gICAgICAgICAgfTtcblxuICAgIHJldHVybiBqc29uO1xuICB9XG5cbiAgc3RhdGljIGZyb21KU09OKGpzb24sIGNvbnRleHQpIHtcbiAgICBjb25zdCB7IG1ldGFzdGF0ZW1lbnQgfSA9IGpzb24sXG4gICAgICAgICAgbWV0YXN0YXRlbWVudFN0cmluZyA9IG1ldGFzdGF0ZW1lbnQsICAvLy9cbiAgICAgICAgICBsZXhlciA9IGNvbnRleHQuZ2V0TGV4ZXIoKSxcbiAgICAgICAgICBwYXJzZXIgPSBjb250ZXh0LmdldFBhcnNlcigpLFxuICAgICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlID0gbWV0YXN0YXRlbWVudE5vZGVGcm9tTWV0YXN0YXRlbWVudFN0cmluZyhtZXRhc3RhdGVtZW50U3RyaW5nLCBsZXhlciwgcGFyc2VyKSxcbiAgICAgICAgICBjb25jbHVzaW9uID0gbmV3IENvbmNsdXNpb24obWV0YXN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbmNsdXNpb247XG4gIH1cblxuICBzdGF0aWMgZnJvbU1ldGFzdGF0ZW1lbnROb2RlKG1ldGFzdGF0ZW1lbnROb2RlKSB7XG4gICAgY29uc3QgY29uY2x1c2lvbiA9IG5ldyBDb25jbHVzaW9uKG1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb25jbHVzaW9uO1xuICB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIkNvbmNsdXNpb24iLCJtZXRhc3RhdGVtZW50Tm9kZSIsImdldE1ldGFzdGF0ZW1lbnROb2RlIiwibWF0Y2hTdGF0ZW1lbnROb2RlIiwic3RhdGVtZW50Tm9kZSIsInN1YnN0aXR1dGlvbnMiLCJub25UZXJtaW5hbE5vZGVBIiwibm9uVGVybWluYWxOb2RlQiIsIm5vblRlcm1pbmFsTm9kZVZlcmlmaWVkIiwiY29uY2x1c2lvblN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVZlcmlmaWVyIiwidmVyaWZ5Tm9uVGVybWluYWxOb2RlIiwic3RhdGVtZW50Tm9kZU1hdGNoZXMiLCJtYXRjaE1ldGFzdGF0ZW1lbnROb2RlIiwiY29uY2x1c2lvbk1ldGFzdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVWZXJpZmllciIsIm1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hlcyIsInRvSlNPTiIsInRva2VucyIsIm1ldGFzdGF0ZW1lbnRTdHJpbmciLCJub2RlQXNTdHJpbmciLCJtZXRhc3RhdGVtZW50IiwianNvbiIsImZyb21KU09OIiwiY29udGV4dCIsImxleGVyIiwiZ2V0TGV4ZXIiLCJwYXJzZXIiLCJnZXRQYXJzZXIiLCJtZXRhc3RhdGVtZW50Tm9kZUZyb21NZXRhc3RhdGVtZW50U3RyaW5nIiwiY29uY2x1c2lvbiIsImZyb21NZXRhc3RhdGVtZW50Tm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFPcUJBOzs7c0JBTFE7b0JBQzRCOzBCQUNFOzJCQUNJOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVoRCxJQUFBLEFBQU1BLDJCQUFOO2FBQU1BLFdBQ1BDLGlCQUFpQjs4QkFEVkQ7UUFFakIsSUFBSSxDQUFDQyxpQkFBaUIsR0FBR0E7O2lCQUZSRDs7WUFLbkJFLEtBQUFBO21CQUFBQSxTQUFBQSx1QkFBdUI7Z0JBQ3JCLE9BQU8sSUFBSSxDQUFDRCxpQkFBaUI7WUFDL0I7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CQyxhQUFhLEVBQUVDLGFBQWEsRUFBRTtnQkFDL0MsSUFBTUMsbUJBQW1CLElBQUksQ0FBQ0wsaUJBQWlCLEVBQ3pDTSxtQkFBbUJILGVBQ25CSSwwQkFBMEJDLHNEQUEwQyxDQUFDQyxxQkFBcUIsQ0FBQ0osa0JBQWtCQyxrQkFBa0JGLGdCQUMvSE0sdUJBQXVCSCx5QkFBeUIsR0FBRztnQkFFekQsT0FBT0c7WUFDVDs7O1lBRUFDLEtBQUFBO21CQUFBQSxTQUFBQSx1QkFBdUJYLGlCQUFpQixFQUFFSSxhQUFhLEVBQUU7Z0JBQ3ZELElBQU1DLG1CQUFtQixJQUFJLENBQUNMLGlCQUFpQixFQUN6Q00sbUJBQW1CTixtQkFDbkJPLDBCQUEwQkssMkRBQThDLENBQUNILHFCQUFxQixDQUFDSixrQkFBa0JDLGtCQUFrQkYsZ0JBQ25JUywyQkFBMkJOLHlCQUF5QixHQUFHO2dCQUU3RCxPQUFPTTtZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9DLE1BQU0sRUFBRTtnQkFDYixJQUFNQyxzQkFBc0JDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDakIsaUJBQWlCLEVBQUVlLFNBQzNERyxnQkFBZ0JGLHFCQUNoQkcsT0FBTztvQkFDTEQsZUFBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT0M7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTRCxJQUFJLEVBQUVFLE9BQU8sRUFBRTtnQkFDN0IsSUFBTSxBQUFFSCxnQkFBa0JDLEtBQWxCRCxlQUNGRixzQkFBc0JFLGVBQ3RCSSxRQUFRRCxRQUFRRSxRQUFRLElBQ3hCQyxTQUFTSCxRQUFRSSxTQUFTLElBQzFCekIsb0JBQW9CMEIsSUFBQUEsOENBQXdDLEVBQUNWLHFCQUFxQk0sT0FBT0UsU0FDekZHLGFBQWEsSUEzQ0Y1QixXQTJDaUJDO2dCQUVsQyxPQUFPMkI7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLHNCQUFzQjVCLGlCQUFpQixFQUFFO2dCQUM5QyxJQUFNMkIsYUFBYSxJQWpERjVCLFdBaURpQkM7Z0JBRWxDLE9BQU8yQjtZQUNUOzs7V0FwRG1CNUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25jbHVzaW9uLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBtZXRhc3RhdGVtZW50Tm9kZUZyb21NZXRhc3RhdGVtZW50U3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL25vZGVcIjtcbmltcG9ydCB7IGNvbmNsdXNpb25TdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVWZXJpZmllciB9IGZyb20gXCIuL3ZlcmlmaWVyL3N0YXRlbWVudEZvck1ldGF2YXJpYWJsZS9jb25jbHVzaW9uXCI7XG5pbXBvcnQgeyBjb25jbHVzaW9uTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVZlcmlmaWVyIH0gZnJvbSBcIi4vdmVyaWZpZXIvbWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZS9jb25jbHVzaW9uXCI7XG5cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIENvbmNsdXNpb24ge1xuICBjb25zdHJ1Y3RvcihtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIHRoaXMubWV0YXN0YXRlbWVudE5vZGUgPSBtZXRhc3RhdGVtZW50Tm9kZTtcbiAgfVxuXG4gIGdldE1ldGFzdGF0ZW1lbnROb2RlKCkge1xuICAgIHJldHVybiB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgbWF0Y2hTdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMsIGZpbGVDb250ZXh0LCBzdGF0ZW1lbnRQcm9vZkNvbnRleHQpIHtcbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5tZXRhc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZUIgPSBzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgZmlsZUNvbnRleHRBID0gZmlsZUNvbnRleHQsIC8vL1xuICAgICAgICAgIHByb29mQ29udGV4dEIgPSBzdGF0ZW1lbnRQcm9vZkNvbnRleHQsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVWZXJpZmllZCA9IGNvbmNsdXNpb25TdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVWZXJpZmllci52ZXJpZnlOb25UZXJtaW5hbE5vZGUobm9uVGVybWluYWxOb2RlQSwgbm9uVGVybWluYWxOb2RlQiwgc3Vic3RpdHV0aW9ucywgZmlsZUNvbnRleHRBLCBwcm9vZkNvbnRleHRCKSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAvLy9cblxuICAgIHJldHVybiBzdGF0ZW1lbnROb2RlTWF0Y2hlcztcbiAgfVxuXG4gIG1hdGNoTWV0YXN0YXRlbWVudE5vZGUobWV0YXN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMsIGZpbGVDb250ZXh0LCBtZXRhc3RhdGVtZW50TWV0YXByb29mQ29udGV4dCkge1xuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZUEgPSB0aGlzLm1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IG1ldGFzdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgZmlsZUNvbnRleHRBID0gZmlsZUNvbnRleHQsIC8vL1xuICAgICAgICAgIG1ldGFwcm9vZkNvbnRleHRCID0gbWV0YXN0YXRlbWVudE1ldGFwcm9vZkNvbnRleHQsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVWZXJpZmllZCA9IGNvbmNsdXNpb25NZXRhc3RhdGVtZW50Rm9yTWV0YXZhcmlhYmxlVmVyaWZpZXIudmVyaWZ5Tm9uVGVybWluYWxOb2RlKG5vblRlcm1pbmFsTm9kZUEsIG5vblRlcm1pbmFsTm9kZUIsIHN1YnN0aXR1dGlvbnMsIGZpbGVDb250ZXh0QSwgbWV0YXByb29mQ29udGV4dEIpLFxuICAgICAgICAgIG1ldGFzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAvLy9cblxuICAgIHJldHVybiBtZXRhc3RhdGVtZW50Tm9kZU1hdGNoZXM7XG4gIH1cblxuICB0b0pTT04odG9rZW5zKSB7XG4gICAgY29uc3QgbWV0YXN0YXRlbWVudFN0cmluZyA9IG5vZGVBc1N0cmluZyh0aGlzLm1ldGFzdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICAgIG1ldGFzdGF0ZW1lbnQgPSBtZXRhc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIG1ldGFzdGF0ZW1lbnRcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT05BbmRGaWxlQ29udGV4dChqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHsgbWV0YXN0YXRlbWVudCB9ID0ganNvbixcbiAgICAgICAgICBtZXRhc3RhdGVtZW50U3RyaW5nID0gbWV0YXN0YXRlbWVudCwgIC8vL1xuICAgICAgICAgIGxleGVyID0gZmlsZUNvbnRleHQuZ2V0TGV4ZXIoKSxcbiAgICAgICAgICBwYXJzZXIgPSBmaWxlQ29udGV4dC5nZXRQYXJzZXIoKSxcbiAgICAgICAgICBtZXRhc3RhdGVtZW50Tm9kZSA9IG1ldGFzdGF0ZW1lbnROb2RlRnJvbU1ldGFzdGF0ZW1lbnRTdHJpbmcobWV0YXN0YXRlbWVudFN0cmluZywgbGV4ZXIsIHBhcnNlciksXG4gICAgICAgICAgY29uY2x1c2lvbiA9IG5ldyBDb25jbHVzaW9uKG1ldGFzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb25jbHVzaW9uO1xuICB9XG5cbiAgc3RhdGljIGZyb21NZXRhc3RhdGVtZW50Tm9kZShtZXRhc3RhdGVtZW50Tm9kZSkge1xuICAgIGNvbnN0IGNvbmNsdXNpb24gPSBuZXcgQ29uY2x1c2lvbihtZXRhc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uY2x1c2lvbjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJDb25jbHVzaW9uIiwibWV0YXN0YXRlbWVudE5vZGUiLCJnZXRNZXRhc3RhdGVtZW50Tm9kZSIsIm1hdGNoU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25zIiwiZmlsZUNvbnRleHQiLCJzdGF0ZW1lbnRQcm9vZkNvbnRleHQiLCJub25UZXJtaW5hbE5vZGVBIiwibm9uVGVybWluYWxOb2RlQiIsImZpbGVDb250ZXh0QSIsInByb29mQ29udGV4dEIiLCJub25UZXJtaW5hbE5vZGVWZXJpZmllZCIsImNvbmNsdXNpb25TdGF0ZW1lbnRGb3JNZXRhdmFyaWFibGVWZXJpZmllciIsInZlcmlmeU5vblRlcm1pbmFsTm9kZSIsInN0YXRlbWVudE5vZGVNYXRjaGVzIiwibWF0Y2hNZXRhc3RhdGVtZW50Tm9kZSIsIm1ldGFzdGF0ZW1lbnRNZXRhcHJvb2ZDb250ZXh0IiwibWV0YXByb29mQ29udGV4dEIiLCJjb25jbHVzaW9uTWV0YXN0YXRlbWVudEZvck1ldGF2YXJpYWJsZVZlcmlmaWVyIiwibWV0YXN0YXRlbWVudE5vZGVNYXRjaGVzIiwidG9KU09OIiwidG9rZW5zIiwibWV0YXN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsIm1ldGFzdGF0ZW1lbnQiLCJqc29uIiwiZnJvbUpTT05BbmRGaWxlQ29udGV4dCIsImxleGVyIiwiZ2V0TGV4ZXIiLCJwYXJzZXIiLCJnZXRQYXJzZXIiLCJtZXRhc3RhdGVtZW50Tm9kZUZyb21NZXRhc3RhdGVtZW50U3RyaW5nIiwiY29uY2x1c2lvbiIsImZyb21NZXRhc3RhdGVtZW50Tm9kZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFPcUJBOzs7c0JBTFE7b0JBQzRCOzBCQUNFOzJCQUNJOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVoRCxJQUFBLEFBQU1BLDJCQUFOO2FBQU1BLFdBQ1BDLGlCQUFpQjs4QkFEVkQ7UUFFakIsSUFBSSxDQUFDQyxpQkFBaUIsR0FBR0E7O2lCQUZSRDs7WUFLbkJFLEtBQUFBO21CQUFBQSxTQUFBQSx1QkFBdUI7Z0JBQ3JCLE9BQU8sSUFBSSxDQUFDRCxpQkFBaUI7WUFDL0I7OztZQUVBRSxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CQyxhQUFhLEVBQUVDLGFBQWEsRUFBRUMsV0FBVyxFQUFFQyxxQkFBcUIsRUFBRTtnQkFDbkYsSUFBTUMsbUJBQW1CLElBQUksQ0FBQ1AsaUJBQWlCLEVBQ3pDUSxtQkFBbUJMLGVBQ25CTSxlQUFlSixhQUNmSyxnQkFBZ0JKLHVCQUNoQkssMEJBQTBCQyxzREFBMEMsQ0FBQ0MscUJBQXFCLENBQUNOLGtCQUFrQkMsa0JBQWtCSixlQUFlSyxjQUFjQyxnQkFDNUpJLHVCQUF1QkgseUJBQXlCLEdBQUc7Z0JBRXpELE9BQU9HO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsdUJBQXVCZixpQkFBaUIsRUFBRUksYUFBYSxFQUFFQyxXQUFXLEVBQUVXLDZCQUE2QixFQUFFO2dCQUNuRyxJQUFNVCxtQkFBbUIsSUFBSSxDQUFDUCxpQkFBaUIsRUFDekNRLG1CQUFtQlIsbUJBQ25CUyxlQUFlSixhQUNmWSxvQkFBb0JELCtCQUNwQkwsMEJBQTBCTywyREFBOEMsQ0FBQ0wscUJBQXFCLENBQUNOLGtCQUFrQkMsa0JBQWtCSixlQUFlSyxjQUFjUSxvQkFDaEtFLDJCQUEyQlIseUJBQXlCLEdBQUc7Z0JBRTdELE9BQU9RO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTSxFQUFFO2dCQUNiLElBQU1DLHNCQUFzQkMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUN2QixpQkFBaUIsRUFBRXFCLFNBQzNERyxnQkFBZ0JGLHFCQUNoQkcsT0FBTztvQkFDTEQsZUFBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT0M7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSx1QkFBdUJELElBQUksRUFBRXBCLFdBQVcsRUFBRTtnQkFDL0MsSUFBTSxBQUFFbUIsZ0JBQWtCQyxLQUFsQkQsZUFDRkYsc0JBQXNCRSxlQUN0QkcsUUFBUXRCLFlBQVl1QixRQUFRLElBQzVCQyxTQUFTeEIsWUFBWXlCLFNBQVMsSUFDOUI5QixvQkFBb0IrQixJQUFBQSw4Q0FBd0MsRUFBQ1QscUJBQXFCSyxPQUFPRSxTQUN6RkcsYUFBYSxJQS9DRmpDLFdBK0NpQkM7Z0JBRWxDLE9BQU9nQztZQUNUOzs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0Esc0JBQXNCakMsaUJBQWlCLEVBQUU7Z0JBQzlDLElBQU1nQyxhQUFhLElBckRGakMsV0FxRGlCQztnQkFFbEMsT0FBT2dDO1lBQ1Q7OztXQXhEbUJqQyJ9

package/lib/conjecture.js

@@ -122,15 +122,15 @@ var Conjecture = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
     }
     _createClass(Conjecture, null, [
         {
-            key: "fromJSON",
-            value: function fromJSON(json, context) {
-                return _axiomLemmaTheoremConjecture.default.fromJSON(Conjecture, json, context);
+            key: "fromJSONAndFileContext",
+            value: function fromJSONAndFileContext(json, fileContext) {
+                return _axiomLemmaTheoremConjecture.default.fromJSONAndFileContext(Conjecture, json, fileContext);
             }
         },
         {
-            key: "fromLabelsSuppositionsAndConsequence",
-            value: function fromLabelsSuppositionsAndConsequence(labels, suppositions, consequence) {
-                return _axiomLemmaTheoremConjecture.default.fromLabelsSuppositionsAndConsequence(Conjecture, labels, suppositions, consequence);
+            key: "fromLabelsSuppositionsConsequenceAndProofContext",
+            value: function fromLabelsSuppositionsConsequenceAndProofContext(labels, suppositions, consequence, proofContext) {
+                return _axiomLemmaTheoremConjecture.default.fromLabelsSuppositionsConsequenceAndProofContext(Conjecture, labels, suppositions, consequence, proofContext);
             }
         }
     ]);
@@ -138,4 +138,4 @@ var Conjecture = /*#__PURE__*/ function(AxiomLemmaTheoremConjecture) {
 }(_axiomLemmaTheoremConjecture.default);
 _defineProperty(Conjecture, "kind", _kinds.CONJECTURE_KIND);
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25qZWN0dXJlLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIGZyb20gXCIuL2F4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZVwiO1xuXG5pbXBvcnQgeyBDT05KRUNUVVJFX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25qZWN0dXJlIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBDT05KRUNUVVJFX0tJTkQ7XG5cbiAgc3RhdGljIGZyb21KU09OKGpzb24sIGNvbnRleHQpIHsgcmV0dXJuIEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZS5mcm9tSlNPTihDb25qZWN0dXJlLCBqc29uLCBjb250ZXh0KTsgfVxuXG4gIHN0YXRpYyBmcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UobGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbmNlKSB7IHJldHVybiBBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUuZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0FuZENvbnNlcXVlbmNlKENvbmplY3R1cmUsIGxhYmVscywgc3VwcG9zaXRpb25zLCBjb25zZXF1ZW5jZSk7IH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQ29uamVjdHVyZSIsImZyb21KU09OIiwianNvbiIsImNvbnRleHQiLCJBeGlvbUxlbW1hVGhlb3JlbUNvbmplY3R1cmUiLCJmcm9tTGFiZWxzU3VwcG9zaXRpb25zQW5kQ29uc2VxdWVuY2UiLCJsYWJlbHMiLCJzdXBwb3NpdGlvbnMiLCJjb25zZXF1ZW5jZSIsImtpbmQiLCJDT05KRUNUVVJFX0tJTkQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O2dGQUptQjtxQkFFUjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFakIsSUFBQSxBQUFNQSwyQkFBTjtjQUFNQTs4QkFBQUE7YUFBQUE7OEJBQUFBOzs7aUJBQUFBOztZQUdaQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTQyxJQUFJLEVBQUVDLE9BQU8sRUFBRTtnQkFBRSxPQUFPQyxvQ0FBMkIsQ0FBQ0gsUUFBUSxDQUh6REQsWUFHc0VFLE1BQU1DO1lBQVU7OztZQUVsR0UsS0FBQUE7bUJBQVAsU0FBT0EscUNBQXFDQyxNQUFNLEVBQUVDLFlBQVksRUFBRUMsV0FBVyxFQUFFO2dCQUFFLE9BQU9KLG9DQUEyQixDQUFDQyxvQ0FBb0MsQ0FMcklMLFlBS2tKTSxRQUFRQyxjQUFjQztZQUFjOzs7V0FMdExSO0VBQW1CSSxvQ0FBMkI7QUFDakUsZ0JBRG1CSixZQUNaUyxRQUFPQyxzQkFBZSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25qZWN0dXJlLmpzIiwiPDxqc3gtY29uZmlnLXByYWdtYS5qcz4+Il0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIGZyb20gXCIuL2F4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZVwiO1xuXG5pbXBvcnQgeyBDT05KRUNUVVJFX0tJTkQgfSBmcm9tIFwiLi9raW5kc1wiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25qZWN0dXJlIGV4dGVuZHMgQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIHtcbiAgc3RhdGljIGtpbmQgPSBDT05KRUNUVVJFX0tJTkQ7XG5cbiAgc3RhdGljIGZyb21KU09OQW5kRmlsZUNvbnRleHQoanNvbiwgZmlsZUNvbnRleHQpIHsgcmV0dXJuIEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZS5mcm9tSlNPTkFuZEZpbGVDb250ZXh0KENvbmplY3R1cmUsIGpzb24sIGZpbGVDb250ZXh0KTsgfVxuXG4gIHN0YXRpYyBmcm9tTGFiZWxzU3VwcG9zaXRpb25zQ29uc2VxdWVuY2VBbmRQcm9vZkNvbnRleHQobGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbmNlLCBwcm9vZkNvbnRleHQpIHsgcmV0dXJuIEF4aW9tTGVtbWFUaGVvcmVtQ29uamVjdHVyZS5mcm9tTGFiZWxzU3VwcG9zaXRpb25zQ29uc2VxdWVuY2VBbmRQcm9vZkNvbnRleHQoQ29uamVjdHVyZSwgbGFiZWxzLCBzdXBwb3NpdGlvbnMsIGNvbnNlcXVlbmNlLCBwcm9vZkNvbnRleHQpOyB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIkNvbmplY3R1cmUiLCJmcm9tSlNPTkFuZEZpbGVDb250ZXh0IiwianNvbiIsImZpbGVDb250ZXh0IiwiQXhpb21MZW1tYVRoZW9yZW1Db25qZWN0dXJlIiwiZnJvbUxhYmVsc1N1cHBvc2l0aW9uc0NvbnNlcXVlbmNlQW5kUHJvb2ZDb250ZXh0IiwibGFiZWxzIiwic3VwcG9zaXRpb25zIiwiY29uc2VxdWVuY2UiLCJwcm9vZkNvbnRleHQiLCJraW5kIiwiQ09OSkVDVFVSRV9LSU5EIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQU1xQkE7OztnRkFKbUI7cUJBRVI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWpCLElBQUEsQUFBTUEsMkJBQU47Y0FBTUE7OEJBQUFBO2FBQUFBOzhCQUFBQTs7O2lCQUFBQTs7WUFHWkMsS0FBQUE7bUJBQVAsU0FBT0EsdUJBQXVCQyxJQUFJLEVBQUVDLFdBQVcsRUFBRTtnQkFBRSxPQUFPQyxvQ0FBMkIsQ0FBQ0gsc0JBQXNCLENBSHpGRCxZQUdzR0UsTUFBTUM7WUFBYzs7O1lBRXRJRSxLQUFBQTttQkFBUCxTQUFPQSxpREFBaURDLE1BQU0sRUFBRUMsWUFBWSxFQUFFQyxXQUFXLEVBQUVDLFlBQVksRUFBRTtnQkFBRSxPQUFPTCxvQ0FBMkIsQ0FBQ0MsZ0RBQWdELENBTDNLTCxZQUt3TE0sUUFBUUMsY0FBY0MsYUFBYUM7WUFBZTs7O1dBTDFPVDtFQUFtQkksb0NBQTJCO0FBQ2pFLGdCQURtQkosWUFDWlUsUUFBT0Msc0JBQWUifQ==

package/lib/consequence.js

@@ -44,8 +44,8 @@ var Consequence = /*#__PURE__*/ function() {
         },
         {
             key: "matchStatementNode",
-            value: function matchStatementNode(statementNode, substitutions) {
-                var nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, nonTerminalNodeVerified = _consequence.consequenceTermForVariableVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions), statementNodeMatches = nonTerminalNodeVerified; ///
+            value: function matchStatementNode(statementNode, substitutions, proofContext) {
+                var nonTerminalNodeA = this.statementNode, nonTerminalNodeB = statementNode, nonTerminalNodeVerified = _consequence.consequenceTermForVariableVerifier.verifyNonTerminalNode(nonTerminalNodeA, nonTerminalNodeB, substitutions, proofContext), statementNodeMatches = nonTerminalNodeVerified; ///
                 return statementNodeMatches;
             }
         },
@@ -77,4 +77,4 @@ var Consequence = /*#__PURE__*/ function() {
     return Consequence;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zZXF1ZW5jZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuaW1wb3J0IHsgY29uc2VxdWVuY2VUZXJtRm9yVmFyaWFibGVWZXJpZmllciB9IGZyb20gXCIuL3ZlcmlmaWVyL3Rlcm1Gb3JWYXJpYWJsZS9jb25zZXF1ZW5jZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25zZXF1ZW5jZSB7XG4gIGNvbnN0cnVjdG9yKHN0YXRlbWVudE5vZGUpIHtcbiAgICB0aGlzLnN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgZ2V0U3RhdGVtZW50Tm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy5zdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgbWF0Y2hTdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMpIHtcbiAgICBjb25zdCBub25UZXJtaW5hbE5vZGVBID0gdGhpcy5zdGF0ZW1lbnROb2RlLCAgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlQiA9IHN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVWZXJpZmllZCA9IGNvbnNlcXVlbmNlVGVybUZvclZhcmlhYmxlVmVyaWZpZXIudmVyaWZ5Tm9uVGVybWluYWxOb2RlKG5vblRlcm1pbmFsTm9kZUEsIG5vblRlcm1pbmFsTm9kZUIsIHN1YnN0aXR1dGlvbnMpLFxuICAgICAgICAgIHN0YXRlbWVudE5vZGVNYXRjaGVzID0gbm9uVGVybWluYWxOb2RlVmVyaWZpZWQ7IC8vL1xuXG4gICAgcmV0dXJuIHN0YXRlbWVudE5vZGVNYXRjaGVzO1xuICB9XG5cbiAgdG9KU09OKHRva2Vucykge1xuICAgIGNvbnN0IHN0YXRlbWVudFN0cmluZyA9IG5vZGVBc1N0cmluZyh0aGlzLnN0YXRlbWVudE5vZGUsIHRva2VucyksXG4gICAgICAgICAgc3RhdGVtZW50ID0gc3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgICAganNvbiA9IHtcbiAgICAgICAgICAgIHN0YXRlbWVudFxuICAgICAgICAgIH07XG5cbiAgICByZXR1cm4ganNvbjtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tSlNPTihqc29uLCBjb250ZXh0KSB7XG4gICAgY29uc3QgeyBzdGF0ZW1lbnQgfSA9IGpzb24sXG4gICAgICAgICAgc3RhdGVtZW50U3RyaW5nID0gc3RhdGVtZW50LCAgLy8vXG4gICAgICAgICAgbGV4ZXIgPSBjb250ZXh0LmdldExleGVyKCksXG4gICAgICAgICAgcGFyc2VyID0gY29udGV4dC5nZXRQYXJzZXIoKSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlID0gc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcoc3RhdGVtZW50U3RyaW5nLCBsZXhlciwgcGFyc2VyKSxcbiAgICAgICAgICBjb25zZXF1ZW5jZSA9IG5ldyBDb25zZXF1ZW5jZShzdGF0ZW1lbnROb2RlKTtcblxuICAgIHJldHVybiBjb25zZXF1ZW5jZTtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlKSB7XG4gICAgY29uc3QgY29uc2VxdWVuY2UgPSBuZXcgQ29uc2VxdWVuY2Uoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uc2VxdWVuY2U7XG4gIH1cbn1cbiIsIlJlYWN0LmNyZWF0ZUVsZW1lbnQiXSwibmFtZXMiOlsiQ29uc2VxdWVuY2UiLCJzdGF0ZW1lbnROb2RlIiwiZ2V0U3RhdGVtZW50Tm9kZSIsIm1hdGNoU3RhdGVtZW50Tm9kZSIsInN1YnN0aXR1dGlvbnMiLCJub25UZXJtaW5hbE5vZGVBIiwibm9uVGVybWluYWxOb2RlQiIsIm5vblRlcm1pbmFsTm9kZVZlcmlmaWVkIiwiY29uc2VxdWVuY2VUZXJtRm9yVmFyaWFibGVWZXJpZmllciIsInZlcmlmeU5vblRlcm1pbmFsTm9kZSIsInN0YXRlbWVudE5vZGVNYXRjaGVzIiwidG9KU09OIiwidG9rZW5zIiwic3RhdGVtZW50U3RyaW5nIiwibm9kZUFzU3RyaW5nIiwic3RhdGVtZW50IiwianNvbiIsImZyb21KU09OIiwiY29udGV4dCIsImxleGVyIiwiZ2V0TGV4ZXIiLCJwYXJzZXIiLCJnZXRQYXJzZXIiLCJzdGF0ZW1lbnROb2RlRnJvbVN0YXRlbWVudFN0cmluZyIsImNvbnNlcXVlbmNlIiwiZnJvbVN0YXRlbWVudE5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7O2VBTXFCQTs7O3NCQUpRO29CQUNvQjsyQkFDRTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFcEMsSUFBQSxBQUFNQSw0QkFBTjthQUFNQSxZQUNQQyxhQUFhOzhCQURORDtRQUVqQixJQUFJLENBQUNDLGFBQWEsR0FBR0E7O2lCQUZKRDs7WUFLbkJFLEtBQUFBO21CQUFBQSxTQUFBQSxtQkFBbUI7Z0JBQ2pCLE9BQU8sSUFBSSxDQUFDRCxhQUFhO1lBQzNCOzs7WUFFQUUsS0FBQUE7bUJBQUFBLFNBQUFBLG1CQUFtQkYsYUFBYSxFQUFFRyxhQUFhLEVBQUU7Z0JBQy9DLElBQU1DLG1CQUFtQixJQUFJLENBQUNKLGFBQWEsRUFDckNLLG1CQUFtQkwsZUFDbkJNLDBCQUEwQkMsK0NBQWtDLENBQUNDLHFCQUFxQixDQUFDSixrQkFBa0JDLGtCQUFrQkYsZ0JBQ3ZITSx1QkFBdUJILHlCQUF5QixHQUFHO2dCQUV6RCxPQUFPRztZQUNUOzs7WUFFQUMsS0FBQUE7bUJBQUFBLFNBQUFBLE9BQU9DLE1BQU0sRUFBRTtnQkFDYixJQUFNQyxrQkFBa0JDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDYixhQUFhLEVBQUVXLFNBQ25ERyxZQUFZRixpQkFDWkcsT0FBTztvQkFDTEQsV0FBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT0M7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTRCxJQUFJLEVBQUVFLE9BQU8sRUFBRTtnQkFDN0IsSUFBTSxBQUFFSCxZQUFjQyxLQUFkRCxXQUNGRixrQkFBa0JFLFdBQ2xCSSxRQUFRRCxRQUFRRSxRQUFRLElBQ3hCQyxTQUFTSCxRQUFRSSxTQUFTLElBQzFCckIsZ0JBQWdCc0IsSUFBQUEsc0NBQWdDLEVBQUNWLGlCQUFpQk0sT0FBT0UsU0FDekVHLGNBQWMsSUFsQ0h4QixZQWtDbUJDO2dCQUVwQyxPQUFPdUI7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLGtCQUFrQnhCLGFBQWEsRUFBRTtnQkFDdEMsSUFBTXVCLGNBQWMsSUF4Q0h4QixZQXdDbUJDO2dCQUVwQyxPQUFPdUI7WUFDVDs7O1dBM0NtQnhCIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zZXF1ZW5jZS5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgbm9kZUFzU3RyaW5nIH0gZnJvbSBcIi4vdXRpbGl0aWVzL3N0cmluZ1wiO1xuaW1wb3J0IHsgc3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuaW1wb3J0IHsgY29uc2VxdWVuY2VUZXJtRm9yVmFyaWFibGVWZXJpZmllciB9IGZyb20gXCIuL3ZlcmlmaWVyL3Rlcm1Gb3JWYXJpYWJsZS9jb25zZXF1ZW5jZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25zZXF1ZW5jZSB7XG4gIGNvbnN0cnVjdG9yKHN0YXRlbWVudE5vZGUpIHtcbiAgICB0aGlzLnN0YXRlbWVudE5vZGUgPSBzdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgZ2V0U3RhdGVtZW50Tm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy5zdGF0ZW1lbnROb2RlO1xuICB9XG5cbiAgbWF0Y2hTdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIHN1YnN0aXR1dGlvbnMsIHByb29mQ29udGV4dCkge1xuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZUEgPSB0aGlzLnN0YXRlbWVudE5vZGUsICAvLy9cbiAgICAgICAgICBub25UZXJtaW5hbE5vZGVCID0gc3RhdGVtZW50Tm9kZSwgIC8vL1xuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gY29uc2VxdWVuY2VUZXJtRm9yVmFyaWFibGVWZXJpZmllci52ZXJpZnlOb25UZXJtaW5hbE5vZGUobm9uVGVybWluYWxOb2RlQSwgbm9uVGVybWluYWxOb2RlQiwgc3Vic3RpdHV0aW9ucywgcHJvb2ZDb250ZXh0KSxcbiAgICAgICAgICBzdGF0ZW1lbnROb2RlTWF0Y2hlcyA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAvLy9cblxuICAgIHJldHVybiBzdGF0ZW1lbnROb2RlTWF0Y2hlcztcbiAgfVxuXG4gIHRvSlNPTih0b2tlbnMpIHtcbiAgICBjb25zdCBzdGF0ZW1lbnRTdHJpbmcgPSBub2RlQXNTdHJpbmcodGhpcy5zdGF0ZW1lbnROb2RlLCB0b2tlbnMpLFxuICAgICAgICAgIHN0YXRlbWVudCA9IHN0YXRlbWVudFN0cmluZywgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBzdGF0ZW1lbnRcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgY29udGV4dCkge1xuICAgIGNvbnN0IHsgc3RhdGVtZW50IH0gPSBqc29uLFxuICAgICAgICAgIHN0YXRlbWVudFN0cmluZyA9IHN0YXRlbWVudCwgIC8vL1xuICAgICAgICAgIGxleGVyID0gY29udGV4dC5nZXRMZXhlcigpLFxuICAgICAgICAgIHBhcnNlciA9IGNvbnRleHQuZ2V0UGFyc2VyKCksXG4gICAgICAgICAgc3RhdGVtZW50Tm9kZSA9IHN0YXRlbWVudE5vZGVGcm9tU3RhdGVtZW50U3RyaW5nKHN0YXRlbWVudFN0cmluZywgbGV4ZXIsIHBhcnNlciksXG4gICAgICAgICAgY29uc2VxdWVuY2UgPSBuZXcgQ29uc2VxdWVuY2Uoc3RhdGVtZW50Tm9kZSk7XG5cbiAgICByZXR1cm4gY29uc2VxdWVuY2U7XG4gIH1cblxuICBzdGF0aWMgZnJvbVN0YXRlbWVudE5vZGUoc3RhdGVtZW50Tm9kZSkge1xuICAgIGNvbnN0IGNvbnNlcXVlbmNlID0gbmV3IENvbnNlcXVlbmNlKHN0YXRlbWVudE5vZGUpO1xuXG4gICAgcmV0dXJuIGNvbnNlcXVlbmNlO1xuICB9XG59XG4iLCJSZWFjdC5jcmVhdGVFbGVtZW50Il0sIm5hbWVzIjpbIkNvbnNlcXVlbmNlIiwic3RhdGVtZW50Tm9kZSIsImdldFN0YXRlbWVudE5vZGUiLCJtYXRjaFN0YXRlbWVudE5vZGUiLCJzdWJzdGl0dXRpb25zIiwicHJvb2ZDb250ZXh0Iiwibm9uVGVybWluYWxOb2RlQSIsIm5vblRlcm1pbmFsTm9kZUIiLCJub25UZXJtaW5hbE5vZGVWZXJpZmllZCIsImNvbnNlcXVlbmNlVGVybUZvclZhcmlhYmxlVmVyaWZpZXIiLCJ2ZXJpZnlOb25UZXJtaW5hbE5vZGUiLCJzdGF0ZW1lbnROb2RlTWF0Y2hlcyIsInRvSlNPTiIsInRva2VucyIsInN0YXRlbWVudFN0cmluZyIsIm5vZGVBc1N0cmluZyIsInN0YXRlbWVudCIsImpzb24iLCJmcm9tSlNPTiIsImNvbnRleHQiLCJsZXhlciIsImdldExleGVyIiwicGFyc2VyIiwiZ2V0UGFyc2VyIiwic3RhdGVtZW50Tm9kZUZyb21TdGF0ZW1lbnRTdHJpbmciLCJjb25zZXF1ZW5jZSIsImZyb21TdGF0ZW1lbnROb2RlIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQU1xQkE7OztzQkFKUTtvQkFDb0I7MkJBQ0U7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRXBDLElBQUEsQUFBTUEsNEJBQU47YUFBTUEsWUFDUEMsYUFBYTs4QkFETkQ7UUFFakIsSUFBSSxDQUFDQyxhQUFhLEdBQUdBOztpQkFGSkQ7O1lBS25CRSxLQUFBQTttQkFBQUEsU0FBQUEsbUJBQW1CO2dCQUNqQixPQUFPLElBQUksQ0FBQ0QsYUFBYTtZQUMzQjs7O1lBRUFFLEtBQUFBO21CQUFBQSxTQUFBQSxtQkFBbUJGLGFBQWEsRUFBRUcsYUFBYSxFQUFFQyxZQUFZLEVBQUU7Z0JBQzdELElBQU1DLG1CQUFtQixJQUFJLENBQUNMLGFBQWEsRUFDckNNLG1CQUFtQk4sZUFDbkJPLDBCQUEwQkMsK0NBQWtDLENBQUNDLHFCQUFxQixDQUFDSixrQkFBa0JDLGtCQUFrQkgsZUFBZUMsZUFDdElNLHVCQUF1QkgseUJBQXlCLEdBQUc7Z0JBRXpELE9BQU9HO1lBQ1Q7OztZQUVBQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsTUFBTSxFQUFFO2dCQUNiLElBQU1DLGtCQUFrQkMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUNkLGFBQWEsRUFBRVksU0FDbkRHLFlBQVlGLGlCQUNaRyxPQUFPO29CQUNMRCxXQUFBQTtnQkFDRjtnQkFFTixPQUFPQztZQUNUOzs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLFNBQVNELElBQUksRUFBRUUsT0FBTyxFQUFFO2dCQUM3QixJQUFNLEFBQUVILFlBQWNDLEtBQWRELFdBQ0ZGLGtCQUFrQkUsV0FDbEJJLFFBQVFELFFBQVFFLFFBQVEsSUFDeEJDLFNBQVNILFFBQVFJLFNBQVMsSUFDMUJ0QixnQkFBZ0J1QixJQUFBQSxzQ0FBZ0MsRUFBQ1YsaUJBQWlCTSxPQUFPRSxTQUN6RUcsY0FBYyxJQWxDSHpCLFlBa0NtQkM7Z0JBRXBDLE9BQU93QjtZQUNUOzs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0Esa0JBQWtCekIsYUFBYSxFQUFFO2dCQUN0QyxJQUFNd0IsY0FBYyxJQXhDSHpCLFlBd0NtQkM7Z0JBRXBDLE9BQU93QjtZQUNUOzs7V0EzQ21CekIifQ==

package/lib/constructor.js

@@ -82,16 +82,16 @@ var Constructor = /*#__PURE__*/ function() {
         }
     ], [
         {
-            key: "fromJSON",
-            value: function fromJSON(json, context) {
-                var term = json.term, termString = term, lexer = context.getLexer(), parser = context.getParser(), termNode = (0, _node.termNodeFromTermString)(termString, lexer, parser);
+            key: "fromJSONAndFileContext",
+            value: function fromJSONAndFileContext(json, fileContext) {
+                var term = json.term, termString = term, lexer = fileContext.getLexer(), parser = fileContext.getParser(), termNode = (0, _node.termNodeFromTermString)(termString, lexer, parser);
                 var type = json.type;
                 if (type !== null) {
                     var typeJSON = type; ///
                     json = typeJSON; ///
-                    type = _type.default.fromJSON(json, context);
+                    type = _type.default.fromJSONAndFileContext(json, fileContext);
                     var typeName = type.getName();
-                    type = context.findTypeByTypeName(typeName); ///
+                    type = fileContext.findTypeByTypeName(typeName); ///
                 }
                 var constructor = new Constructor(termNode, type);
                 return constructor;
@@ -108,4 +108,4 @@ var Constructor = /*#__PURE__*/ function() {
     return Constructor;
 }();
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdHJ1Y3Rvci5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4vdHlwZVwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBDT05TVFJVQ1RPUl9LSU5EIH0gZnJvbSBcIi4va2luZHNcIjtcbmltcG9ydCB7IHRlcm1Ob2RlRnJvbVRlcm1TdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25zdHJ1Y3RvciB7XG4gIGNvbnN0cnVjdG9yKHRlcm1Ob2RlLCB0eXBlKSB7XG4gICAgdGhpcy50ZXJtTm9kZSA9IHRlcm1Ob2RlO1xuICAgIHRoaXMudHlwZSA9IHR5cGU7XG4gIH1cblxuICBnZXRUZXJtTm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy50ZXJtTm9kZTtcbiAgfVxuXG4gIGdldFR5cGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudHlwZTtcbiAgfVxuXG4gIGFzU3RyaW5nKHRva2Vucykge1xuICAgIGxldCBzdHJpbmc7XG5cbiAgICBjb25zdCB0ZXJtU3RyaW5nID0gbm9kZUFzU3RyaW5nKHRoaXMudGVybU5vZGUsIHRva2Vucyk7XG5cbiAgICBpZiAodGhpcy50eXBlID09PSBudWxsKSB7XG4gICAgICBzdHJpbmcgPSBgJHt0ZXJtU3RyaW5nfWA7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IG5vU3VwZXJUeXBlID0gdHJ1ZSxcbiAgICAgICAgICAgIHR5cGVTdHJpbmcgPSB0aGlzLnR5cGUuYXNTdHJpbmcodG9rZW5zLCBub1N1cGVyVHlwZSk7XG5cbiAgICAgIHN0cmluZyA9IGAke3Rlcm1TdHJpbmd9OiR7dHlwZVN0cmluZ31gO1xuICAgIH1cblxuICAgIHJldHVybiBzdHJpbmc7XG4gIH1cblxuICB0b0pTT04odG9rZW5zKSB7XG4gICAgY29uc3QgdGVybVN0cmluZyA9IG5vZGVBc1N0cmluZyh0aGlzLnRlcm1Ob2RlLCB0b2tlbnMpLFxuICAgICAgICAgIHR5cGVKU09OID0gKHRoaXMudHlwZSA9PT0gbnVsbCkgP1xuICAgICAgICAgICAgICAgICAgICAgICAgbnVsbCA6XG4gICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMudHlwZS50b0pTT04odG9rZW5zKSxcbiAgICAgICAgICBraW5kID0gQ09OU1RSVUNUT1JfS0lORCxcbiAgICAgICAgICB0ZXJtID0gdGVybVN0cmluZywgIC8vL1xuICAgICAgICAgIHR5cGUgPSB0eXBlSlNPTiwgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBraW5kLFxuICAgICAgICAgICAgdGVybSxcbiAgICAgICAgICAgIHR5cGVcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT04oanNvbiwgY29udGV4dCkge1xuICAgIGNvbnN0IHsgdGVybSB9ID0ganNvbixcbiAgICAgICAgICB0ZXJtU3RyaW5nID0gdGVybSwgIC8vL1xuICAgICAgICAgIGxleGVyID0gY29udGV4dC5nZXRMZXhlcigpLFxuICAgICAgICAgIHBhcnNlciA9IGNvbnRleHQuZ2V0UGFyc2VyKCksXG4gICAgICAgICAgdGVybU5vZGUgPSB0ZXJtTm9kZUZyb21UZXJtU3RyaW5nKHRlcm1TdHJpbmcsIGxleGVyLCBwYXJzZXIpO1xuXG4gICAgbGV0IHsgdHlwZSB9ID0ganNvbjtcblxuICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCB0eXBlSlNPTiA9IHR5cGU7ICAvLy9cblxuICAgICAganNvbiA9IHR5cGVKU09OOyAgLy8vXG5cbiAgICAgIHR5cGUgPSBUeXBlLmZyb21KU09OKGpzb24sIGNvbnRleHQpO1xuXG4gICAgICBjb25zdCB0eXBlTmFtZSA9IHR5cGUuZ2V0TmFtZSgpO1xuXG4gICAgICB0eXBlID0gY29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUodHlwZU5hbWUpOyAvLy9cbiAgICB9XG5cbiAgICBjb25zdCBjb25zdHJ1Y3RvciA9IG5ldyBDb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgdHlwZSk7XG5cbiAgICByZXR1cm4gY29uc3RydWN0b3I7XG4gIH1cblxuICBzdGF0aWMgZnJvbVRlcm1Ob2RlQW5kVHlwZSh0ZXJtTm9kZSwgdHlwZSkge1xuICAgIGNvbnN0IGNvbnN0cnVjdG9yID0gbmV3IENvbnN0cnVjdG9yKHRlcm1Ob2RlLCB0eXBlKTtcblxuICAgIHJldHVybiBjb25zdHJ1Y3RvcjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJDb25zdHJ1Y3RvciIsInRlcm1Ob2RlIiwidHlwZSIsImdldFRlcm1Ob2RlIiwiZ2V0VHlwZSIsImFzU3RyaW5nIiwidG9rZW5zIiwic3RyaW5nIiwidGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsIm5vU3VwZXJUeXBlIiwidHlwZVN0cmluZyIsInRvSlNPTiIsInR5cGVKU09OIiwia2luZCIsIkNPTlNUUlVDVE9SX0tJTkQiLCJ0ZXJtIiwianNvbiIsImZyb21KU09OIiwiY29udGV4dCIsImxleGVyIiwiZ2V0TGV4ZXIiLCJwYXJzZXIiLCJnZXRQYXJzZXIiLCJ0ZXJtTm9kZUZyb21UZXJtU3RyaW5nIiwiVHlwZSIsInR5cGVOYW1lIiwiZ2V0TmFtZSIsImZpbmRUeXBlQnlUeXBlTmFtZSIsImNvbnN0cnVjdG9yIiwiZnJvbVRlcm1Ob2RlQW5kVHlwZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFRcUJBOzs7eURBTko7c0JBRVk7cUJBQ0k7b0JBQ007Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFeEIsSUFBQSxBQUFNQSw0QkFBTjthQUFNQSxZQUNQQyxRQUFRLEVBQUVDLElBQUk7OEJBRFBGO1FBRWpCLElBQUksQ0FBQ0MsUUFBUSxHQUFHQTtRQUNoQixJQUFJLENBQUNDLElBQUksR0FBR0E7O2lCQUhLRjs7WUFNbkJHLEtBQUFBO21CQUFBQSxTQUFBQSxjQUFjO2dCQUNaLE9BQU8sSUFBSSxDQUFDRixRQUFRO1lBQ3RCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLFVBQVU7Z0JBQ1IsT0FBTyxJQUFJLENBQUNGLElBQUk7WUFDbEI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsU0FBU0MsTUFBTSxFQUFFO2dCQUNmLElBQUlDO2dCQUVKLElBQU1DLGFBQWFDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDUixRQUFRLEVBQUVLO2dCQUUvQyxJQUFJLElBQUksQ0FBQ0osSUFBSSxLQUFLLElBQUksRUFBRTtvQkFDdEJLLFNBQVMsQUFBQyxHQUFhLE9BQVhDO2dCQUNkLE9BQU87b0JBQ0wsSUFBTUUsY0FBYyxJQUFJLEVBQ2xCQyxhQUFhLElBQUksQ0FBQ1QsSUFBSSxDQUFDRyxRQUFRLENBQUNDLFFBQVFJO29CQUU5Q0gsU0FBUyxBQUFDLEdBQWdCSSxPQUFkSCxZQUFXLEtBQWMsT0FBWEc7Z0JBQzVCLENBQUM7Z0JBRUQsT0FBT0o7WUFDVDs7O1lBRUFLLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPTixNQUFNLEVBQUU7Z0JBQ2IsSUFBTUUsYUFBYUMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUNSLFFBQVEsRUFBRUssU0FDekNPLFdBQVcsQUFBQyxJQUFJLENBQUNYLElBQUksS0FBSyxJQUFJLEdBQ2hCLElBQUksR0FDRixJQUFJLENBQUNBLElBQUksQ0FBQ1UsTUFBTSxDQUFDTixPQUFPLEVBQ3hDUSxPQUFPQyx1QkFBZ0IsRUFDdkJDLE9BQU9SLFlBQ1BOLE9BQU9XLFVBQ1BJLE9BQU87b0JBQ0xILE1BQUFBO29CQUNBRSxNQUFBQTtvQkFDQWQsTUFBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT2U7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxTQUFTRCxJQUFJLEVBQUVFLE9BQU8sRUFBRTtnQkFDN0IsSUFBTSxBQUFFSCxPQUFTQyxLQUFURCxNQUNGUixhQUFhUSxNQUNiSSxRQUFRRCxRQUFRRSxRQUFRLElBQ3hCQyxTQUFTSCxRQUFRSSxTQUFTLElBQzFCdEIsV0FBV3VCLElBQUFBLDRCQUFzQixFQUFDaEIsWUFBWVksT0FBT0U7Z0JBRTNELElBQUksQUFBRXBCLE9BQVNlLEtBQVRmO2dCQUVOLElBQUlBLFNBQVMsSUFBSSxFQUFFO29CQUNqQixJQUFNVyxXQUFXWCxNQUFPLEdBQUc7b0JBRTNCZSxPQUFPSixVQUFXLEdBQUc7b0JBRXJCWCxPQUFPdUIsYUFBSSxDQUFDUCxRQUFRLENBQUNELE1BQU1FO29CQUUzQixJQUFNTyxXQUFXeEIsS0FBS3lCLE9BQU87b0JBRTdCekIsT0FBT2lCLFFBQVFTLGtCQUFrQixDQUFDRixXQUFXLEdBQUc7Z0JBQ2xELENBQUM7Z0JBRUQsSUFBTUcsY0FBYyxJQXJFSDdCLFlBcUVtQkMsVUFBVUM7Z0JBRTlDLE9BQU8yQjtZQUNUOzs7WUFFT0MsS0FBQUE7bUJBQVAsU0FBT0Esb0JBQW9CN0IsUUFBUSxFQUFFQyxJQUFJLEVBQUU7Z0JBQ3pDLElBQU0yQixjQUFjLElBM0VIN0IsWUEyRW1CQyxVQUFVQztnQkFFOUMsT0FBTzJCO1lBQ1Q7OztXQTlFbUI3QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9jb25zdHJ1Y3Rvci5qcyIsIjw8anN4LWNvbmZpZy1wcmFnbWEuanM+PiJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4vdHlwZVwiO1xuXG5pbXBvcnQgeyBub2RlQXNTdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvc3RyaW5nXCI7XG5pbXBvcnQgeyBDT05TVFJVQ1RPUl9LSU5EIH0gZnJvbSBcIi4va2luZHNcIjtcbmltcG9ydCB7IHRlcm1Ob2RlRnJvbVRlcm1TdHJpbmcgfSBmcm9tIFwiLi91dGlsaXRpZXMvbm9kZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBDb25zdHJ1Y3RvciB7XG4gIGNvbnN0cnVjdG9yKHRlcm1Ob2RlLCB0eXBlKSB7XG4gICAgdGhpcy50ZXJtTm9kZSA9IHRlcm1Ob2RlO1xuICAgIHRoaXMudHlwZSA9IHR5cGU7XG4gIH1cblxuICBnZXRUZXJtTm9kZSgpIHtcbiAgICByZXR1cm4gdGhpcy50ZXJtTm9kZTtcbiAgfVxuXG4gIGdldFR5cGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudHlwZTtcbiAgfVxuXG4gIGFzU3RyaW5nKHRva2Vucykge1xuICAgIGxldCBzdHJpbmc7XG5cbiAgICBjb25zdCB0ZXJtU3RyaW5nID0gbm9kZUFzU3RyaW5nKHRoaXMudGVybU5vZGUsIHRva2Vucyk7XG5cbiAgICBpZiAodGhpcy50eXBlID09PSBudWxsKSB7XG4gICAgICBzdHJpbmcgPSBgJHt0ZXJtU3RyaW5nfWA7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IG5vU3VwZXJUeXBlID0gdHJ1ZSxcbiAgICAgICAgICAgIHR5cGVTdHJpbmcgPSB0aGlzLnR5cGUuYXNTdHJpbmcodG9rZW5zLCBub1N1cGVyVHlwZSk7XG5cbiAgICAgIHN0cmluZyA9IGAke3Rlcm1TdHJpbmd9OiR7dHlwZVN0cmluZ31gO1xuICAgIH1cblxuICAgIHJldHVybiBzdHJpbmc7XG4gIH1cblxuICB0b0pTT04odG9rZW5zKSB7XG4gICAgY29uc3QgdGVybVN0cmluZyA9IG5vZGVBc1N0cmluZyh0aGlzLnRlcm1Ob2RlLCB0b2tlbnMpLFxuICAgICAgICAgIHR5cGVKU09OID0gKHRoaXMudHlwZSA9PT0gbnVsbCkgP1xuICAgICAgICAgICAgICAgICAgICAgICAgbnVsbCA6XG4gICAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMudHlwZS50b0pTT04odG9rZW5zKSxcbiAgICAgICAgICBraW5kID0gQ09OU1RSVUNUT1JfS0lORCxcbiAgICAgICAgICB0ZXJtID0gdGVybVN0cmluZywgIC8vL1xuICAgICAgICAgIHR5cGUgPSB0eXBlSlNPTiwgIC8vL1xuICAgICAgICAgIGpzb24gPSB7XG4gICAgICAgICAgICBraW5kLFxuICAgICAgICAgICAgdGVybSxcbiAgICAgICAgICAgIHR5cGVcbiAgICAgICAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUpTT05BbmRGaWxlQ29udGV4dChqc29uLCBmaWxlQ29udGV4dCkge1xuICAgIGNvbnN0IHsgdGVybSB9ID0ganNvbixcbiAgICAgICAgICB0ZXJtU3RyaW5nID0gdGVybSwgIC8vL1xuICAgICAgICAgIGxleGVyID0gZmlsZUNvbnRleHQuZ2V0TGV4ZXIoKSxcbiAgICAgICAgICBwYXJzZXIgPSBmaWxlQ29udGV4dC5nZXRQYXJzZXIoKSxcbiAgICAgICAgICB0ZXJtTm9kZSA9IHRlcm1Ob2RlRnJvbVRlcm1TdHJpbmcodGVybVN0cmluZywgbGV4ZXIsIHBhcnNlcik7XG5cbiAgICBsZXQgeyB0eXBlIH0gPSBqc29uO1xuXG4gICAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICAgIGNvbnN0IHR5cGVKU09OID0gdHlwZTsgIC8vL1xuXG4gICAgICBqc29uID0gdHlwZUpTT047ICAvLy9cblxuICAgICAgdHlwZSA9IFR5cGUuZnJvbUpTT05BbmRGaWxlQ29udGV4dChqc29uLCBmaWxlQ29udGV4dCk7XG5cbiAgICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZS5nZXROYW1lKCk7XG5cbiAgICAgIHR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUodHlwZU5hbWUpOyAvLy9cbiAgICB9XG5cbiAgICBjb25zdCBjb25zdHJ1Y3RvciA9IG5ldyBDb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgdHlwZSk7XG5cbiAgICByZXR1cm4gY29uc3RydWN0b3I7XG4gIH1cblxuICBzdGF0aWMgZnJvbVRlcm1Ob2RlQW5kVHlwZSh0ZXJtTm9kZSwgdHlwZSkge1xuICAgIGNvbnN0IGNvbnN0cnVjdG9yID0gbmV3IENvbnN0cnVjdG9yKHRlcm1Ob2RlLCB0eXBlKTtcblxuICAgIHJldHVybiBjb25zdHJ1Y3RvcjtcbiAgfVxufVxuIiwiUmVhY3QuY3JlYXRlRWxlbWVudCJdLCJuYW1lcyI6WyJDb25zdHJ1Y3RvciIsInRlcm1Ob2RlIiwidHlwZSIsImdldFRlcm1Ob2RlIiwiZ2V0VHlwZSIsImFzU3RyaW5nIiwidG9rZW5zIiwic3RyaW5nIiwidGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsIm5vU3VwZXJUeXBlIiwidHlwZVN0cmluZyIsInRvSlNPTiIsInR5cGVKU09OIiwia2luZCIsIkNPTlNUUlVDVE9SX0tJTkQiLCJ0ZXJtIiwianNvbiIsImZyb21KU09OQW5kRmlsZUNvbnRleHQiLCJmaWxlQ29udGV4dCIsImxleGVyIiwiZ2V0TGV4ZXIiLCJwYXJzZXIiLCJnZXRQYXJzZXIiLCJ0ZXJtTm9kZUZyb21UZXJtU3RyaW5nIiwiVHlwZSIsInR5cGVOYW1lIiwiZ2V0TmFtZSIsImZpbmRUeXBlQnlUeXBlTmFtZSIsImNvbnN0cnVjdG9yIiwiZnJvbVRlcm1Ob2RlQW5kVHlwZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFRcUJBOzs7eURBTko7c0JBRVk7cUJBQ0k7b0JBQ007Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFeEIsSUFBQSxBQUFNQSw0QkFBTjthQUFNQSxZQUNQQyxRQUFRLEVBQUVDLElBQUk7OEJBRFBGO1FBRWpCLElBQUksQ0FBQ0MsUUFBUSxHQUFHQTtRQUNoQixJQUFJLENBQUNDLElBQUksR0FBR0E7O2lCQUhLRjs7WUFNbkJHLEtBQUFBO21CQUFBQSxTQUFBQSxjQUFjO2dCQUNaLE9BQU8sSUFBSSxDQUFDRixRQUFRO1lBQ3RCOzs7WUFFQUcsS0FBQUE7bUJBQUFBLFNBQUFBLFVBQVU7Z0JBQ1IsT0FBTyxJQUFJLENBQUNGLElBQUk7WUFDbEI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsU0FBU0MsTUFBTSxFQUFFO2dCQUNmLElBQUlDO2dCQUVKLElBQU1DLGFBQWFDLElBQUFBLG9CQUFZLEVBQUMsSUFBSSxDQUFDUixRQUFRLEVBQUVLO2dCQUUvQyxJQUFJLElBQUksQ0FBQ0osSUFBSSxLQUFLLElBQUksRUFBRTtvQkFDdEJLLFNBQVMsQUFBQyxHQUFhLE9BQVhDO2dCQUNkLE9BQU87b0JBQ0wsSUFBTUUsY0FBYyxJQUFJLEVBQ2xCQyxhQUFhLElBQUksQ0FBQ1QsSUFBSSxDQUFDRyxRQUFRLENBQUNDLFFBQVFJO29CQUU5Q0gsU0FBUyxBQUFDLEdBQWdCSSxPQUFkSCxZQUFXLEtBQWMsT0FBWEc7Z0JBQzVCLENBQUM7Z0JBRUQsT0FBT0o7WUFDVDs7O1lBRUFLLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPTixNQUFNLEVBQUU7Z0JBQ2IsSUFBTUUsYUFBYUMsSUFBQUEsb0JBQVksRUFBQyxJQUFJLENBQUNSLFFBQVEsRUFBRUssU0FDekNPLFdBQVcsQUFBQyxJQUFJLENBQUNYLElBQUksS0FBSyxJQUFJLEdBQ2hCLElBQUksR0FDRixJQUFJLENBQUNBLElBQUksQ0FBQ1UsTUFBTSxDQUFDTixPQUFPLEVBQ3hDUSxPQUFPQyx1QkFBZ0IsRUFDdkJDLE9BQU9SLFlBQ1BOLE9BQU9XLFVBQ1BJLE9BQU87b0JBQ0xILE1BQUFBO29CQUNBRSxNQUFBQTtvQkFDQWQsTUFBQUE7Z0JBQ0Y7Z0JBRU4sT0FBT2U7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSx1QkFBdUJELElBQUksRUFBRUUsV0FBVyxFQUFFO2dCQUMvQyxJQUFNLEFBQUVILE9BQVNDLEtBQVRELE1BQ0ZSLGFBQWFRLE1BQ2JJLFFBQVFELFlBQVlFLFFBQVEsSUFDNUJDLFNBQVNILFlBQVlJLFNBQVMsSUFDOUJ0QixXQUFXdUIsSUFBQUEsNEJBQXNCLEVBQUNoQixZQUFZWSxPQUFPRTtnQkFFM0QsSUFBSSxBQUFFcEIsT0FBU2UsS0FBVGY7Z0JBRU4sSUFBSUEsU0FBUyxJQUFJLEVBQUU7b0JBQ2pCLElBQU1XLFdBQVdYLE1BQU8sR0FBRztvQkFFM0JlLE9BQU9KLFVBQVcsR0FBRztvQkFFckJYLE9BQU91QixhQUFJLENBQUNQLHNCQUFzQixDQUFDRCxNQUFNRTtvQkFFekMsSUFBTU8sV0FBV3hCLEtBQUt5QixPQUFPO29CQUU3QnpCLE9BQU9pQixZQUFZUyxrQkFBa0IsQ0FBQ0YsV0FBVyxHQUFHO2dCQUN0RCxDQUFDO2dCQUVELElBQU1HLGNBQWMsSUFyRUg3QixZQXFFbUJDLFVBQVVDO2dCQUU5QyxPQUFPMkI7WUFDVDs7O1lBRU9DLEtBQUFBO21CQUFQLFNBQU9BLG9CQUFvQjdCLFFBQVEsRUFBRUMsSUFBSSxFQUFFO2dCQUN6QyxJQUFNMkIsY0FBYyxJQTNFSDdCLFlBMkVtQkMsVUFBVUM7Z0JBRTlDLE9BQU8yQjtZQUNUOzs7V0E5RW1CN0IifQ==