occam-verify-cli 1.0.207 → 1.0.211

package/src/mixins/step/unify.js

@@ -2,7 +2,6 @@
 
 import dom from "../../dom";
 import Substitutions from "../../substitutions";
-import StatementSubstitution from "../../substitution/statement";
 
 import { equalityFromStatement,
          judgementFromStatement,
@@ -48,7 +47,8 @@ function unifyAWithReference(statement, reference, substitutions, context) {
 
       context.trace(`Unifying the '${statementString}' statement with the '${referenceString}' reference...`);
 
-      const metavariable = reference.getMetavariable(),
+      const { StatementSubstitution } = dom,
+            metavariable = reference.getMetavariable(),
             specificContext = context,  ///
             statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),
             substitution = statementSubstitution; ///
@@ -123,7 +123,8 @@ function unifyAWithAxiomLemmaTheoremOrConjecture(statement, reference, substitut
       const statementAndStepsUnified = axiomLemmaTheoremConjecture.unifyStatementAndStepsOrSubproofs(statement, stepsOrSubproofs, substitutions, context);
 
       if (statementAndStepsUnified) {
-        const metavariable = reference.getMetavariable(),
+        const { StatementSubstitution } = dom,
+              metavariable = reference.getMetavariable(),
               specificContext = context,  ///
               statementSubstitution = StatementSubstitution.fromStatementAndMetavariable(statement, metavariable, context),
               substitution = statementSubstitution;  ///

package/src/node/assertion/satisfies.js

@@ -2,14 +2,14 @@
 
 import NonTerminalNode from "../../node/nonTerminal";
 
-import { TERM_RULE_NAME, METAVARIABLE_RULE_NAME } from "../../ruleNames";
+import { SIGNATURE_RULE_NAME, METAVARIABLE_RULE_NAME } from "../../ruleNames";
 
 export default class SatisfiesAssertionNode extends NonTerminalNode {
-  getTermNodes() {
-    const ruleName = TERM_RULE_NAME,
-          termNodes = this.getNodesByRuleName(ruleName);
+  getSignatureNode() {
+    const ruleName = SIGNATURE_RULE_NAME,
+          signatureNode = this.getNodeByRuleName(ruleName);
 
-    return termNodes;
+    return signatureNode;
   }
 
   getMetavariableNode() {

package/src/node/signature.js

@@ -0,0 +1,16 @@
+"use strict";
+
+import NonTerminalNode from "../node/nonTerminal";
+
+import { TERM_RULE_NAME } from "../ruleNames";
+
+export default class SignatureNode extends NonTerminalNode {
+  getTermNodes() {
+    const ruleName = TERM_RULE_NAME,
+          termNodes = this.getNodesByRuleName(ruleName);
+
+    return termNodes;
+  }
+
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(SignatureNode, ruleName, childNodes, opacity, precedence); }
+}

package/src/node/topLevelAssertion.js

@@ -2,33 +2,13 @@
 
 import NonTerminalNode from "../node/nonTerminal";
 
-import { SATISFIABLE } from "../constants";
 import { PROOF_RULE_NAME,
          DEDUCTION_RULE_NAME,
+         SIGNATURE_RULE_NAME,
          SUPPOSITION_RULE_NAME,
          PARENTHESISED_LABELS_RULE_NAME } from "../ruleNames";
 
 export default class TopLevelAssertionNode extends NonTerminalNode {
-  isSatisfiable() {
-    let satisfiable = false;
-
-    this.someChildNode((childNode, index) => {
-      const terminalNode = childNode,
-            content = terminalNode.getContent(),
-            contentSatisfiable = (content === SATISFIABLE);
-
-      if (contentSatisfiable) {
-        satisfiable = true;
-      }
-
-      if (index === 0) {
-        return true;
-      }
-    });
-
-    return satisfiable;
-  }
-
   getLabelNodes() {
     let labelNodes = [];
 
@@ -55,6 +35,13 @@ export default class TopLevelAssertionNode extends NonTerminalNode {
     return deductionNode;
   }
 
+  getSignatureNode() {
+    const ruleName = SIGNATURE_RULE_NAME,
+          signatureNode = this.getNodeByRuleName(ruleName);
+
+    return signatureNode;
+  }
+
   getSuppositionNodes() {
     const ruleName = SUPPOSITION_RULE_NAME,
           suppositionNodes = this.getNodesByRuleName(ruleName);

package/src/nonTerminalNodeMap.js

@@ -26,6 +26,7 @@ import DeductionNode from "./node/deduction";
 import JudgementNode from "./node/judgement";
 import MetaLemmaNode from "./node/metaLemma";
 import ParameterNode from "./node/parameter";
+import SignatureNode from "./node/signature";
 import DerivationNode from "./node/derivation";
 import CombinatorNode from "./node/combinator";
 import ConclusionNode from "./node/conclusion";
@@ -79,6 +80,7 @@ import { RULE_RULE_NAME,
          EQUALITY_RULE_NAME,
          VARIABLE_RULE_NAME,
          META_TYPE_RULE_NAME,
+         SIGNATURE_RULE_NAME,
          DEDUCTION_RULE_NAME,
          JUDGEMENT_RULE_NAME,
          PARAMETER_RULE_NAME,
@@ -138,9 +140,10 @@ const nonTerminalNodeMap = {
   [SUBPROOF_RULE_NAME]: SubproofNode,
   [EQUALITY_RULE_NAME]: EqualityNode,
   [VARIABLE_RULE_NAME]: VariableNode,
+  [META_TYPE_RULE_NAME]: MetaTypeNode,
+  [SIGNATURE_RULE_NAME]: SignatureNode,
   [REFERENCE_RULE_NAME]: ReferenceNode,
   [JUDGEMENT_RULE_NAME]: JudgementNode,
-  [META_TYPE_RULE_NAME]: MetaTypeNode,
   [DEDUCTION_RULE_NAME]: DeductionNode,
   [PARAMETER_RULE_NAME]: ParameterNode,
   [STATEMENT_RULE_NAME]: StatementNode,

package/src/ruleNames.js

@@ -19,6 +19,7 @@ export const PROPERTY_RULE_NAME = "property";
 export const EQUALITY_RULE_NAME = "equality";
 export const VARIABLE_RULE_NAME = "variable";
 export const SUBPROOF_RULE_NAME = "subproof";
+export const SIGNATURE_RULE_NAME = "signature";
 export const META_TYPE_RULE_NAME = "metaType";
 export const PARAMETER_RULE_NAME = "parameter";
 export const DEDUCTION_RULE_NAME = "deduction";

package/src/substitutions.js

@@ -202,7 +202,9 @@ export default class Substitutions {
 
   matchSubstitutions(substitutions) {
     const array = substitutions.getArray(),
-          correlates = correlate(array, this.array, (substitutionA, substitutionB) => {
+          arrayA = array, ///
+          arrayB = this.array,  ///
+          correlates = correlate(arrayA, arrayB, (substitutionA, substitutionB) => {
             const substitutionAMatchesSubstitutionB = substitutionA.match(substitutionB);
 
             if (substitutionAMatchesSubstitutionB) {
@@ -214,20 +216,6 @@ export default class Substitutions {
     return match;
   }
 
-  matchTerms(terms) {
-    const correlates = correlate(terms, this.array, (term, substitution) => {
-            const substitutionTerm = substitution.getTerm(),
-                  substitutionTermEqualToTerm = substitutionTerm.isEqualTo(term);
-
-            if (substitutionTermEqualToTerm) {
-              return true;
-            }
-          }),
-          termsMatch = correlates; ///
-
-    return termsMatch;
-  }
-
   clear() {
     clear(this.array);
 

package/src/unifier/metaLevel.js

@@ -2,8 +2,6 @@
 
 import dom from "../dom";
 import Unifier from "../unifier";
-import TermSubstitution from "../substitution/term";
-import FrameSubstitution from "../substitution/frame";
 
 import { nodeQuery } from "../utilities/query";
 
@@ -45,7 +43,8 @@ class MetaLevelUnifier extends Unifier {
 
           statementNode = generalStatementNode; ///
 
-          const frameSubstitution = FrameSubstitution.fromStatementNode(statementNode, context),
+          const { TermSubstitution, FrameSubstitution } = dom,
+                frameSubstitution = FrameSubstitution.fromStatementNode(statementNode, context),
                 termSubstitution = TermSubstitution.fromStatementNode(statementNode, context),
                 metavariable = Metavariable.fromStatementNode(statementNode, context),
                 substitution = (frameSubstitution || termSubstitution);

package/src/utilities/json.js

@@ -1,7 +1,6 @@
 "use strict";
 
 import dom from "../dom";
-import StatementSubstitution from "../substitution/statement";
 
 export function termFromJSON(json, fileContext) {
   let { term } = json;
@@ -84,10 +83,19 @@ export function deductionFromJSON(json, fileContext) {
   return deduction;
 }
 
-export function satisfiableFromJSON(json, fileContext) {
-  const { satisfiable } = json;
+export function signatureFromJSON(json, fileContext) {
+  let { signature = null } = json;
 
-  return satisfiable;
+  if (signature !== null) {
+    const { Signature } = dom,
+          signatureJSON = signature;  ///
+
+    json = signatureJSON; ///
+
+    signature = Signature.fromJSON(json, fileContext);
+  }
+
+  return signature;
 }
 
 export function conclusionFromJSON(json, fileContext) {
@@ -144,15 +152,31 @@ export function typesFromJSON(json, types, fileContext) {
   });
 }
 
+export function termsFromJSON(json, fileContext) {
+  let { terms } = json;
+
+  const { Term } = dom,
+        termsJSON = terms; ///
+
+  terms = termsJSON.map((termJSON) => {
+    const json = termJSON,  ///
+          term = Term.fromJSON(json, fileContext);
+
+    return term;
+  });
+
+  return terms;
+}
+
 export function rulesFromJSON(json, fileContext) {
   let { rules } = json;
 
   const { Rule } = dom,
-        rulesJSON = rules; ///
+    rulesJSON = rules; ///
 
   rules = rulesJSON.map((ruleJSON) => {
     const json = ruleJSON,  ///
-          rule = Rule.fromJSON(json, fileContext);
+      rule = Rule.fromJSON(json, fileContext);
 
     return rule;
   });
@@ -383,7 +407,8 @@ export function suppositionsFromJSON(json, fileContext) {
 export function substitutionsFromJSON(json, fileContext) {
   let { substitutions = [] } = json;  ///
 
-  const substitutionsJSON = substitutions,  ///
+  const { StatementSubstitution } = dom,
+        substitutionsJSON = substitutions,  ///
         Substitution = StatementSubstitution; ///
 
   substitutions = substitutionsJSON.map((substitutionJSON) => {
@@ -461,18 +486,28 @@ export function statementToStatementJSON(statement) {
   return statementJSON;
 }
 
-export function conclusionToConclusionJSON(conclusion) {
-  const conclusionJSON = conclusion.toJSON();
-
-  return conclusionJSON;
-}
-
 export function deductionToDeductionJSON(deduction) {
   const deductionJSON = deduction.toJSON();
 
   return deductionJSON;
 }
 
+export function signatureToSignatureJSON(signature) {
+  let signatureJSON = null;
+
+  if (signature !== null) {
+    signatureJSON = signature.toJSON();
+  }
+
+  return signatureJSON;
+}
+
+export function conclusionToConclusionJSON(conclusion) {
+  const conclusionJSON = conclusion.toJSON();
+
+  return conclusionJSON;
+}
+
 export function metavariableToMetavariableJSON(metavariable) {
   const metavariableJSON = metavariable.toJSON();
 
@@ -501,6 +536,18 @@ export function typesToTypesJSON(types) {
   return typesJSON;
 }
 
+export function termsToTermsJSON(terms) {
+  const termsJSON = terms.map((term) => {
+    const termJSON = term.toJSON();
+
+    term = termJSON; ///
+
+    return term;
+  });
+
+  return termsJSON;
+}
+
 export function rulesToRulesJSON(rules) {
   const rulesJSON = rules.map((rule) => {
     const ruleJSON = rule.toJSON();

package/src/utilities/node.js

@@ -43,3 +43,48 @@ export function statementFromStatementNode(statementNode, context) {
 
   return statement;
 }
+
+export function termsFromTermNodes(termNodes, context) {
+  const terms = termNodes.map((termNode) => {
+          const term = termFromTermNode(termNode, context);
+
+          return term;
+        });
+
+  return terms;
+}
+
+export function variableFromTerm(term, context) {
+  let variable = null;
+
+  const termNode = term.getNode(),
+        singularVariableNode = termNode.getSingularVariableNode();
+
+  if (singularVariableNode !== null) {
+    const { Variable } = dom,
+          variableNode = singularVariableNode;  ///
+
+    variable = Variable.fromVariableNode(variableNode, context);
+
+    const type = term.getType();
+
+    variable.setType(type);
+  }
+
+  return variable;
+}
+
+export function stringFromTerms(terms) {
+  const termsString = terms.reduce((termsString, term) => {
+          const termString = term.getString();
+
+          termsString = (termsString !== null) ?
+                         `${termsString}, ${termString}` :
+                           termString;
+
+          return termsString;
+        }, null),
+        string = `[${termsString}]`;
+
+  return string;
+}

package/src/utilities/substitutions.js

@@ -1,8 +1,6 @@
 "use strict";
 
 import dom from "../dom";
-import TermSubstitution from "../substitution/term";
-import FrameSubstitution from "../substitution/frame";
 
 export function termFromTermAndSubstitutions(term, substitutions, context) {
   if (term !== null) {
@@ -57,7 +55,8 @@ export function statementFromStatementAndSubstitutions(statement, substitutions,
     if (metavariable !== null) {
       let substitution;
 
-      const termSubstitution = TermSubstitution.fromStatementNode(statementNode, context),
+      const { TermSubstitution, FrameSubstitution } = dom,
+            termSubstitution = TermSubstitution.fromStatementNode(statementNode, context),
             frameSubstitution = FrameSubstitution.fromStatementNode(statementNode, context);
 
       substitution = (termSubstitution || frameSubstitution);

package/lib/substitution/frame.js

@@ -1,175 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
-        return FrameSubstitution;
-    }
-});
-var _dom = /*#__PURE__*/ _interop_require_default(require("../dom"));
-var _substitution = /*#__PURE__*/ _interop_require_default(require("../substitution"));
-var _frame = /*#__PURE__*/ _interop_require_default(require("../context/partial/substitution/frame"));
-function _assert_this_initialized(self) {
-    if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
-}
-function _call_super(_this, derived, args) {
-    derived = _get_prototype_of(derived);
-    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
-}
-function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-function _get_prototype_of(o) {
-    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
-        return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _get_prototype_of(o);
-}
-function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-        throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-        constructor: {
-            value: subClass,
-            writable: true,
-            configurable: true
-        }
-    });
-    if (superClass) _set_prototype_of(subClass, superClass);
-}
-function _interop_require_default(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function _possible_constructor_return(self, call) {
-    if (call && (_type_of(call) === "object" || typeof call === "function")) {
-        return call;
-    }
-    return _assert_this_initialized(self);
-}
-function _set_prototype_of(o, p) {
-    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
-        o.__proto__ = p;
-        return o;
-    };
-    return _set_prototype_of(o, p);
-}
-function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-}
-function _is_native_reflect_construct() {
-    try {
-        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-    } catch (_) {}
-    return (_is_native_reflect_construct = function() {
-        return !!result;
-    })();
-}
-var FrameSubstitution = /*#__PURE__*/ function(Substitution) {
-    _inherits(FrameSubstitution, Substitution);
-    function FrameSubstitution(string, node, tokens, frame, metavariable) {
-        _class_call_check(this, FrameSubstitution);
-        var _this;
-        _this = _call_super(this, FrameSubstitution, [
-            string,
-            node,
-            tokens
-        ]);
-        _this.frame = frame;
-        _this.metavariable = metavariable;
-        return _this;
-    }
-    _create_class(FrameSubstitution, [
-        {
-            key: "getFrame",
-            value: function getFrame() {
-                return this.frame;
-            }
-        },
-        {
-            key: "getMetavariable",
-            value: function getMetavariable() {
-                return this.metavariable;
-            }
-        },
-        {
-            key: "isFrameEqualTo",
-            value: function isFrameEqualTo(frame) {
-                return this.frame.isEqualTo(frame);
-            }
-        },
-        {
-            key: "isMetavariableEqualTo",
-            value: function isMetavariableEqualTo(metavariable) {
-                return this.metavariable.isEqualTo(metavariable);
-            }
-        },
-        {
-            key: "matchName",
-            value: function matchName(name) {
-                return this.metavariable.matchName(name);
-            }
-        },
-        {
-            key: "getReplacementNode",
-            value: function getReplacementNode() {
-                var frameNode = this.frame.getNode(), replacementNode = frameNode; ///
-                return replacementNode;
-            }
-        }
-    ], [
-        {
-            key: "fromStatementNode",
-            value: function fromStatementNode(statementNode, context) {
-                var frameSubstitution = null;
-                var frameSubstitutionNode = statementNode.getFrameSubstitutionNode();
-                if (frameSubstitutionNode !== null) {
-                    var lastFrameNode = frameSubstitutionNode.getLastFrameNode(), firstFrameNode = frameSubstitutionNode.getFirstFrameNode(), singularMetavariableNode = lastFrameNode.getSingularMetavariableNode();
-                    if (singularMetavariableNode !== null) {
-                        var Frame = _dom.default.Frame, Metavariable = _dom.default.Metavariable, frameNode = firstFrameNode, metavariableNode = singularMetavariableNode, frame = Frame.fromFrameNode(frameNode, context), metavariable = Metavariable.fromMetavariableNode(metavariableNode, context), node = frameSubstitutionNode, tokens = context.nodeAsTokens(node), string = stringFromFrameAndMetavariable(frame, metavariable);
-                        frameSubstitution = new FrameSubstitution(string, node, tokens, frame, metavariable);
-                    }
-                }
-                return frameSubstitution;
-            }
-        },
-        {
-            key: "fromFrameAndMetavariable",
-            value: function fromFrameAndMetavariable(frame, metavariable, context) {
-                var string = stringFromFrameAndMetavariable(frame, metavariable), lexer = context.getLexer(), parser = context.getParser(), frameSubstitutionPartialContext = _frame.default.fromStringLexerAndParser(string, lexer, parser), node = frameSubstitutionPartialContext.getNode(), tokens = frameSubstitutionPartialContext.getTokens(), frameSubstitution = new FrameSubstitution(string, node, tokens, frame, metavariable);
-                return frameSubstitution;
-            }
-        }
-    ]);
-    return FrameSubstitution;
-}(_substitution.default);
-function stringFromFrameAndMetavariable(frame, metavariable) {
-    var frameString = frame.getString(), metavariableString = metavariable.getString(), string = "[".concat(frameString, " for [").concat(metavariableString, "]]");
-    return string;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdWJzdGl0dXRpb24vZnJhbWUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBkb20gZnJvbSBcIi4uL2RvbVwiO1xuaW1wb3J0IFN1YnN0aXR1dGlvbiBmcm9tIFwiLi4vc3Vic3RpdHV0aW9uXCI7XG5pbXBvcnQgRnJhbWVTdWJzdGl0dXRpb25QYXJ0aWFsQ29udGV4dCBmcm9tIFwiLi4vY29udGV4dC9wYXJ0aWFsL3N1YnN0aXR1dGlvbi9mcmFtZVwiO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBGcmFtZVN1YnN0aXR1dGlvbiBleHRlbmRzIFN1YnN0aXR1dGlvbiB7XG4gIGNvbnN0cnVjdG9yKHN0cmluZywgbm9kZSwgdG9rZW5zLCBmcmFtZSwgbWV0YXZhcmlhYmxlKSB7XG4gICAgc3VwZXIoc3RyaW5nLCBub2RlLCB0b2tlbnMpO1xuXG4gICAgdGhpcy5mcmFtZSA9IGZyYW1lO1xuICAgIHRoaXMubWV0YXZhcmlhYmxlID0gbWV0YXZhcmlhYmxlO1xuICB9XG5cbiAgZ2V0RnJhbWUoKSB7XG4gICAgcmV0dXJuIHRoaXMuZnJhbWU7XG4gIH1cblxuICBnZXRNZXRhdmFyaWFibGUoKSB7XG4gICAgcmV0dXJuIHRoaXMubWV0YXZhcmlhYmxlO1xuICB9XG5cbiAgaXNGcmFtZUVxdWFsVG8oZnJhbWUpIHsgcmV0dXJuIHRoaXMuZnJhbWUuaXNFcXVhbFRvKGZyYW1lKTsgfVxuXG4gIGlzTWV0YXZhcmlhYmxlRXF1YWxUbyhtZXRhdmFyaWFibGUpIHsgcmV0dXJuIHRoaXMubWV0YXZhcmlhYmxlLmlzRXF1YWxUbyhtZXRhdmFyaWFibGUpOyB9XG5cbiAgbWF0Y2hOYW1lKG5hbWUpIHsgcmV0dXJuIHRoaXMubWV0YXZhcmlhYmxlLm1hdGNoTmFtZShuYW1lKTsgfVxuXG4gIGdldFJlcGxhY2VtZW50Tm9kZSgpIHtcbiAgICBjb25zdCBmcmFtZU5vZGUgPSB0aGlzLmZyYW1lLmdldE5vZGUoKSxcbiAgICAgICAgICByZXBsYWNlbWVudE5vZGUgPSBmcmFtZU5vZGU7IC8vL1xuXG4gICAgcmV0dXJuIHJlcGxhY2VtZW50Tm9kZTtcbiAgfVxuXG4gIHN0YXRpYyBmcm9tU3RhdGVtZW50Tm9kZShzdGF0ZW1lbnROb2RlLCBjb250ZXh0KSB7XG4gICAgbGV0IGZyYW1lU3Vic3RpdHV0aW9uID0gbnVsbDtcblxuICAgIGNvbnN0IGZyYW1lU3Vic3RpdHV0aW9uTm9kZSA9IHN0YXRlbWVudE5vZGUuZ2V0RnJhbWVTdWJzdGl0dXRpb25Ob2RlKCk7XG5cbiAgICBpZiAoZnJhbWVTdWJzdGl0dXRpb25Ob2RlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCBsYXN0RnJhbWVOb2RlID0gZnJhbWVTdWJzdGl0dXRpb25Ob2RlLmdldExhc3RGcmFtZU5vZGUoKSxcbiAgICAgICAgICAgIGZpcnN0RnJhbWVOb2RlID0gZnJhbWVTdWJzdGl0dXRpb25Ob2RlLmdldEZpcnN0RnJhbWVOb2RlKCksXG4gICAgICAgICAgICBzaW5ndWxhck1ldGF2YXJpYWJsZU5vZGUgPSBsYXN0RnJhbWVOb2RlLmdldFNpbmd1bGFyTWV0YXZhcmlhYmxlTm9kZSgpO1xuXG4gICAgICBpZiAoc2luZ3VsYXJNZXRhdmFyaWFibGVOb2RlICE9PSBudWxsKSB7XG4gICAgICAgIGNvbnN0IHsgRnJhbWUsIE1ldGF2YXJpYWJsZSB9ID0gZG9tLFxuICAgICAgICAgICAgICBmcmFtZU5vZGUgPSBmaXJzdEZyYW1lTm9kZSwgLy8vXG4gICAgICAgICAgICAgIG1ldGF2YXJpYWJsZU5vZGUgPSBzaW5ndWxhck1ldGF2YXJpYWJsZU5vZGUsICAvLy9cbiAgICAgICAgICAgICAgZnJhbWUgPSBGcmFtZS5mcm9tRnJhbWVOb2RlKGZyYW1lTm9kZSwgY29udGV4dCksXG4gICAgICAgICAgICAgIG1ldGF2YXJpYWJsZSA9IE1ldGF2YXJpYWJsZS5mcm9tTWV0YXZhcmlhYmxlTm9kZShtZXRhdmFyaWFibGVOb2RlLCBjb250ZXh0KSxcbiAgICAgICAgICAgICAgbm9kZSA9IGZyYW1lU3Vic3RpdHV0aW9uTm9kZSwgIC8vL1xuICAgICAgICAgICAgICB0b2tlbnMgPSBjb250ZXh0Lm5vZGVBc1Rva2Vucyhub2RlKSxcbiAgICAgICAgICAgICAgc3RyaW5nID0gc3RyaW5nRnJvbUZyYW1lQW5kTWV0YXZhcmlhYmxlKGZyYW1lLCBtZXRhdmFyaWFibGUpO1xuXG4gICAgICAgIGZyYW1lU3Vic3RpdHV0aW9uID0gbmV3IEZyYW1lU3Vic3RpdHV0aW9uKHN0cmluZywgbm9kZSwgdG9rZW5zLCBmcmFtZSwgbWV0YXZhcmlhYmxlKTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICByZXR1cm4gZnJhbWVTdWJzdGl0dXRpb247XG4gIH1cblxuICBzdGF0aWMgZnJvbUZyYW1lQW5kTWV0YXZhcmlhYmxlKGZyYW1lLCBtZXRhdmFyaWFibGUsIGNvbnRleHQpIHtcbiAgICBjb25zdCBzdHJpbmcgPSBzdHJpbmdGcm9tRnJhbWVBbmRNZXRhdmFyaWFibGUoZnJhbWUsIG1ldGF2YXJpYWJsZSksXG4gICAgICAgICAgbGV4ZXIgPSBjb250ZXh0LmdldExleGVyKCksXG4gICAgICAgICAgcGFyc2VyID0gY29udGV4dC5nZXRQYXJzZXIoKSxcbiAgICAgICAgICBmcmFtZVN1YnN0aXR1dGlvblBhcnRpYWxDb250ZXh0ID0gRnJhbWVTdWJzdGl0dXRpb25QYXJ0aWFsQ29udGV4dC5mcm9tU3RyaW5nTGV4ZXJBbmRQYXJzZXIoc3RyaW5nLCBsZXhlciwgcGFyc2VyKSxcbiAgICAgICAgICBub2RlID0gZnJhbWVTdWJzdGl0dXRpb25QYXJ0aWFsQ29udGV4dC5nZXROb2RlKCksXG4gICAgICAgICAgdG9rZW5zID0gZnJhbWVTdWJzdGl0dXRpb25QYXJ0aWFsQ29udGV4dC5nZXRUb2tlbnMoKSxcbiAgICAgICAgICBmcmFtZVN1YnN0aXR1dGlvbiA9IG5ldyBGcmFtZVN1YnN0aXR1dGlvbihzdHJpbmcsIG5vZGUsIHRva2VucywgZnJhbWUsIG1ldGF2YXJpYWJsZSk7XG5cbiAgICByZXR1cm4gZnJhbWVTdWJzdGl0dXRpb247XG4gIH1cbn1cblxuZnVuY3Rpb24gc3RyaW5nRnJvbUZyYW1lQW5kTWV0YXZhcmlhYmxlKGZyYW1lLCBtZXRhdmFyaWFibGUpIHtcbiAgY29uc3QgZnJhbWVTdHJpbmcgPSBmcmFtZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgbWV0YXZhcmlhYmxlU3RyaW5nID0gbWV0YXZhcmlhYmxlLmdldFN0cmluZygpLFxuICAgICAgICBzdHJpbmcgPSBgWyR7ZnJhbWVTdHJpbmd9IGZvciBbJHttZXRhdmFyaWFibGVTdHJpbmd9XV1gO1xuXG4gIHJldHVybiBzdHJpbmc7XG59XG4iXSwibmFtZXMiOlsiRnJhbWVTdWJzdGl0dXRpb24iLCJzdHJpbmciLCJub2RlIiwidG9rZW5zIiwiZnJhbWUiLCJtZXRhdmFyaWFibGUiLCJnZXRGcmFtZSIsImdldE1ldGF2YXJpYWJsZSIsImlzRnJhbWVFcXVhbFRvIiwiaXNFcXVhbFRvIiwiaXNNZXRhdmFyaWFibGVFcXVhbFRvIiwibWF0Y2hOYW1lIiwibmFtZSIsImdldFJlcGxhY2VtZW50Tm9kZSIsImZyYW1lTm9kZSIsImdldE5vZGUiLCJyZXBsYWNlbWVudE5vZGUiLCJmcm9tU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudE5vZGUiLCJjb250ZXh0IiwiZnJhbWVTdWJzdGl0dXRpb24iLCJmcmFtZVN1YnN0aXR1dGlvbk5vZGUiLCJnZXRGcmFtZVN1YnN0aXR1dGlvbk5vZGUiLCJsYXN0RnJhbWVOb2RlIiwiZ2V0TGFzdEZyYW1lTm9kZSIsImZpcnN0RnJhbWVOb2RlIiwiZ2V0Rmlyc3RGcmFtZU5vZGUiLCJzaW5ndWxhck1ldGF2YXJpYWJsZU5vZGUiLCJnZXRTaW5ndWxhck1ldGF2YXJpYWJsZU5vZGUiLCJGcmFtZSIsImRvbSIsIk1ldGF2YXJpYWJsZSIsIm1ldGF2YXJpYWJsZU5vZGUiLCJmcm9tRnJhbWVOb2RlIiwiZnJvbU1ldGF2YXJpYWJsZU5vZGUiLCJub2RlQXNUb2tlbnMiLCJzdHJpbmdGcm9tRnJhbWVBbmRNZXRhdmFyaWFibGUiLCJmcm9tRnJhbWVBbmRNZXRhdmFyaWFibGUiLCJsZXhlciIsImdldExleGVyIiwicGFyc2VyIiwiZ2V0UGFyc2VyIiwiZnJhbWVTdWJzdGl0dXRpb25QYXJ0aWFsQ29udGV4dCIsIkZyYW1lU3Vic3RpdHV0aW9uUGFydGlhbENvbnRleHQiLCJmcm9tU3RyaW5nTGV4ZXJBbmRQYXJzZXIiLCJnZXRUb2tlbnMiLCJTdWJzdGl0dXRpb24iLCJmcmFtZVN0cmluZyIsImdldFN0cmluZyIsIm1ldGF2YXJpYWJsZVN0cmluZyJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7ZUFNcUJBOzs7MERBSkw7bUVBQ1M7NERBQ21COzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTdCLElBQUEsQUFBTUEsa0NBQU47Y0FBTUE7YUFBQUEsa0JBQ1BDLE1BQU0sRUFBRUMsSUFBSSxFQUFFQyxNQUFNLEVBQUVDLEtBQUssRUFBRUMsWUFBWTtnQ0FEbENMOztnQkFFakIsa0JBRmlCQTtZQUVYQztZQUFRQztZQUFNQzs7UUFFcEIsTUFBS0MsS0FBSyxHQUFHQTtRQUNiLE1BQUtDLFlBQVksR0FBR0E7OztrQkFMSEw7O1lBUW5CTSxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNGLEtBQUs7WUFDbkI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUE7Z0JBQ0UsT0FBTyxJQUFJLENBQUNGLFlBQVk7WUFDMUI7OztZQUVBRyxLQUFBQTttQkFBQUEsU0FBQUEsZUFBZUosS0FBSztnQkFBSSxPQUFPLElBQUksQ0FBQ0EsS0FBSyxDQUFDSyxTQUFTLENBQUNMO1lBQVE7OztZQUU1RE0sS0FBQUE7bUJBQUFBLFNBQUFBLHNCQUFzQkwsWUFBWTtnQkFBSSxPQUFPLElBQUksQ0FBQ0EsWUFBWSxDQUFDSSxTQUFTLENBQUNKO1lBQWU7OztZQUV4Rk0sS0FBQUE7bUJBQUFBLFNBQUFBLFVBQVVDLElBQUk7Z0JBQUksT0FBTyxJQUFJLENBQUNQLFlBQVksQ0FBQ00sU0FBUyxDQUFDQztZQUFPOzs7WUFFNURDLEtBQUFBO21CQUFBQSxTQUFBQTtnQkFDRSxJQUFNQyxZQUFZLElBQUksQ0FBQ1YsS0FBSyxDQUFDVyxPQUFPLElBQzlCQyxrQkFBa0JGLFdBQVcsR0FBRztnQkFFdEMsT0FBT0U7WUFDVDs7OztZQUVPQyxLQUFBQTttQkFBUCxTQUFPQSxrQkFBa0JDLGFBQWEsRUFBRUMsT0FBTztnQkFDN0MsSUFBSUMsb0JBQW9CO2dCQUV4QixJQUFNQyx3QkFBd0JILGNBQWNJLHdCQUF3QjtnQkFFcEUsSUFBSUQsMEJBQTBCLE1BQU07b0JBQ2xDLElBQU1FLGdCQUFnQkYsc0JBQXNCRyxnQkFBZ0IsSUFDdERDLGlCQUFpQkosc0JBQXNCSyxpQkFBaUIsSUFDeERDLDJCQUEyQkosY0FBY0ssMkJBQTJCO29CQUUxRSxJQUFJRCw2QkFBNkIsTUFBTTt3QkFDckMsSUFBUUUsUUFBd0JDLFlBQUcsQ0FBM0JELE9BQU9FLGVBQWlCRCxZQUFHLENBQXBCQyxjQUNUakIsWUFBWVcsZ0JBQ1pPLG1CQUFtQkwsMEJBQ25CdkIsUUFBUXlCLE1BQU1JLGFBQWEsQ0FBQ25CLFdBQVdLLFVBQ3ZDZCxlQUFlMEIsYUFBYUcsb0JBQW9CLENBQUNGLGtCQUFrQmIsVUFDbkVqQixPQUFPbUIsdUJBQ1BsQixTQUFTZ0IsUUFBUWdCLFlBQVksQ0FBQ2pDLE9BQzlCRCxTQUFTbUMsK0JBQStCaEMsT0FBT0M7d0JBRXJEZSxvQkFBb0IsSUFqRFBwQixrQkFpRDZCQyxRQUFRQyxNQUFNQyxRQUFRQyxPQUFPQztvQkFDekU7Z0JBQ0Y7Z0JBRUEsT0FBT2U7WUFDVDs7O1lBRU9pQixLQUFBQTttQkFBUCxTQUFPQSx5QkFBeUJqQyxLQUFLLEVBQUVDLFlBQVksRUFBRWMsT0FBTztnQkFDMUQsSUFBTWxCLFNBQVNtQywrQkFBK0JoQyxPQUFPQyxlQUMvQ2lDLFFBQVFuQixRQUFRb0IsUUFBUSxJQUN4QkMsU0FBU3JCLFFBQVFzQixTQUFTLElBQzFCQyxrQ0FBa0NDLGNBQStCLENBQUNDLHdCQUF3QixDQUFDM0MsUUFBUXFDLE9BQU9FLFNBQzFHdEMsT0FBT3dDLGdDQUFnQzNCLE9BQU8sSUFDOUNaLFNBQVN1QyxnQ0FBZ0NHLFNBQVMsSUFDbER6QixvQkFBb0IsSUEvRFRwQixrQkErRCtCQyxRQUFRQyxNQUFNQyxRQUFRQyxPQUFPQztnQkFFN0UsT0FBT2U7WUFDVDs7O1dBbEVtQnBCO0VBQTBCOEMscUJBQVk7QUFxRTNELFNBQVNWLCtCQUErQmhDLEtBQUssRUFBRUMsWUFBWTtJQUN6RCxJQUFNMEMsY0FBYzNDLE1BQU00QyxTQUFTLElBQzdCQyxxQkFBcUI1QyxhQUFhMkMsU0FBUyxJQUMzQy9DLFNBQVMsQUFBQyxJQUF1QmdELE9BQXBCRixhQUFZLFVBQTJCLE9BQW5CRSxvQkFBbUI7SUFFMUQsT0FBT2hEO0FBQ1QifQ==