npm - occam-verify-cli - Versions diffs - 0.0.864 → 0.0.866 - Mend

occam-verify-cli 0.0.864 → 0.0.866

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (87) hide show

package/lib/axiomLemmaTheoremConjecture.js +7 -7
package/lib/context/file.js +162 -60
package/lib/context/local.js +4 -4
package/lib/context/release.js +32 -1
package/lib/label.js +6 -6
package/lib/metaConsequent.js +88 -0
package/lib/metaLemma.js +126 -0
package/lib/metaLemmaMetatheorem.js +196 -0
package/lib/metaSupposition.js +140 -0
package/lib/metaType.js +33 -3
package/lib/metaTypeNames.js +13 -4
package/lib/metaTypes.js +9 -4
package/lib/metatheorem.js +126 -0
package/lib/mixins/context.js +30 -22
package/lib/rule.js +7 -7
package/lib/ruleNames.js +5 -1
package/lib/step/metaproof.js +18 -4
package/lib/type.js +9 -1
package/lib/utilities/name.js +52 -0
package/lib/utilities/query.js +1 -38
package/lib/verifier/node/metastatement.js +3 -3
package/lib/verifier/nodes/statementAgainstCombinator.js +4 -4
package/lib/verifier/nodes/termAgainstConstructor.js +3 -3
package/lib/verifier/nodes.js +10 -10
package/lib/verify/declaration/metavariable.js +4 -4
package/lib/verify/declaration/topLevel.js +11 -3
package/lib/verify/givenMetavariable.js +31 -0
package/lib/verify/givenType.js +2 -3
package/lib/verify/label.js +3 -4
package/lib/verify/metaConsequent.js +36 -0
package/lib/verify/metaDerivation.js +111 -0
package/lib/verify/metaLemma.js +51 -0
package/lib/verify/metaSupposition.js +40 -0
package/lib/verify/metaSuppositions.js +28 -0
package/lib/verify/metaproof.js +34 -0
package/lib/verify/metastatement/qualified.js +2 -2
package/lib/verify/metatheorem.js +50 -0
package/lib/verify/metavariable.js +30 -10
package/lib/verify/proof.js +3 -3
package/lib/verify/statement/qualified.js +28 -28
package/lib/verify/termAsConstructor.js +4 -5
package/lib/verify/type.js +18 -20
package/lib/verify/variable.js +13 -16
package/package.json +4 -4
package/src/axiomLemmaTheoremConjecture.js +6 -6
package/src/context/file.js +187 -73
package/src/context/local.js +1 -1
package/src/context/release.js +37 -0
package/src/label.js +4 -6
package/src/metaConsequent.js +58 -0
package/src/metaLemma.js +9 -0
package/src/metaLemmaMetatheorem.js +194 -0
package/src/metaSupposition.js +103 -0
package/src/metaType.js +23 -3
package/src/metaTypeNames.js +1 -0
package/src/metaTypes.js +8 -1
package/src/metatheorem.js +9 -0
package/src/mixins/context.js +20 -14
package/src/rule.js +6 -6
package/src/ruleNames.js +1 -0
package/src/step/metaproof.js +20 -4
package/src/type.js +10 -0
package/src/utilities/name.js +50 -0
package/src/utilities/query.js +0 -47
package/src/verifier/node/metastatement.js +2 -1
package/src/verifier/nodes/statementAgainstCombinator.js +3 -3
package/src/verifier/nodes/termAgainstConstructor.js +3 -4
package/src/verifier/nodes.js +9 -9
package/src/verify/declaration/metavariable.js +4 -3
package/src/verify/declaration/topLevel.js +14 -0
package/src/verify/givenMetavariable.js +31 -0
package/src/verify/givenType.js +1 -4
package/src/verify/label.js +2 -5
package/src/verify/metaConsequent.js +36 -0
package/src/verify/metaDerivation.js +151 -0
package/src/verify/metaLemma.js +67 -0
package/src/verify/metaSupposition.js +44 -0
package/src/verify/metaSuppositions.js +17 -0
package/src/verify/metaproof.js +32 -0
package/src/verify/metastatement/qualified.js +2 -3
package/src/verify/metatheorem.js +62 -0
package/src/verify/metavariable.js +46 -16
package/src/verify/proof.js +2 -2
package/src/verify/statement/qualified.js +27 -23
package/src/verify/termAsConstructor.js +4 -6
package/src/verify/type.js +20 -22
package/src/verify/variable.js +14 -17

package/lib/verify/statement/qualified.js CHANGED Viewed

@@ -23,7 +23,7 @@ function verifyQualifiedStatement(qualifiedStatementNode, assignments, derived,
     if (statementNode !== null) {
         var qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
         localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement..."), qualifiedStatementNode);
-        var referenceNode = referenceNodeQuery(qualifiedStatementNode), referenceName = (0, _query.referenceNameFromReferenceNode)(referenceNode), verifyQualifiedStatementFunctions = [
+        var referenceNode = referenceNodeQuery(qualifiedStatementNode), verifyQualifiedStatementFunctions = [
             verifyQualifiedStatementAAgainstRule,
             verifyQualifiedStatementAAgainstAxiom,
             verifyQualifiedStatementAAgainstLemma,
@@ -31,7 +31,7 @@ function verifyQualifiedStatement(qualifiedStatementNode, assignments, derived,
             verifyQualifiedStatementAAgainstConjecture
         ];
         qualifiedStatementVerified = verifyQualifiedStatementFunctions.some(function(verifyQualifiedStatementFunction) {
-            var qualifiedStatementVerified = verifyQualifiedStatementFunction(qualifiedStatementNode, referenceName, localContext);
+            var qualifiedStatementVerified = verifyQualifiedStatementFunction(qualifiedStatementNode, referenceNode, localContext);
             if (qualifiedStatementVerified) {
                 return true;
             }
@@ -58,72 +58,72 @@ function verifyQualifiedStatement(qualifiedStatementNode, assignments, derived,
     }
     return qualifiedStatementVerified;
 }
-function verifyQualifiedStatementAAgainstRule(qualifiedStatementNode, referenceName, localContext) {
+function verifyQualifiedStatementAAgainstRule(qualifiedStatementNode, referenceNode, localContext) {
     var qualifiedStatementVerifiedAgainstRule = false;
-    var rule = localContext.findRuleByReferenceName(referenceName);
+    var rule = localContext.findRuleByReferenceNode(referenceNode);
     if (rule !== null) {
-        var statementNode = statementNodeQuery(qualifiedStatementNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' rule..."), statementNode);
+        var statementNode = statementNodeQuery(qualifiedStatementNode), referenceString = localContext.nodeAsString(referenceNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
+        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' rule..."), statementNode);
         var ruleMatchesStatement = rule.matchStatement(statementNode, statementLocalContext);
         qualifiedStatementVerifiedAgainstRule = ruleMatchesStatement; ///
         if (qualifiedStatementVerifiedAgainstRule) {
-            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' rule."), statementNode);
+            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' rule."), statementNode);
         }
     }
     return qualifiedStatementVerifiedAgainstRule;
 }
-function verifyQualifiedStatementAAgainstAxiom(qualifiedStatementNode, referenceName, localContext) {
+function verifyQualifiedStatementAAgainstAxiom(qualifiedStatementNode, referenceNode, localContext) {
     var qualifiedStatementVerifiedAgainstAxiom = false;
-    var axiom = localContext.findAxiomByReferenceName(referenceName);
+    var axiom = localContext.findAxiomByReferenceNode(referenceNode);
     if (axiom !== null) {
-        var statementNode = statementNodeQuery(qualifiedStatementNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' axiom..."), statementNode);
+        var statementNode = statementNodeQuery(qualifiedStatementNode), referenceString = localContext.nodeAsString(referenceNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
+        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' axiom..."), statementNode);
         var axiomMatchesStatement = axiom.matchStatement(statementNode, statementLocalContext);
         qualifiedStatementVerifiedAgainstAxiom = axiomMatchesStatement; ///
         if (qualifiedStatementVerifiedAgainstAxiom) {
-            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' axiom."), statementNode);
+            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' axiom."), statementNode);
         }
     }
     return qualifiedStatementVerifiedAgainstAxiom;
 }
-function verifyQualifiedStatementAAgainstLemma(qualifiedStatementNode, referenceName, localContext) {
+function verifyQualifiedStatementAAgainstLemma(qualifiedStatementNode, referenceNode, localContext) {
     var qualifiedStatementVerifiedAgainstLemma = false;
-    var lemma = localContext.findLemmaByReferenceName(referenceName);
+    var lemma = localContext.findLemmaByReferenceNode(referenceNode);
     if (lemma !== null) {
-        var statementNode = statementNodeQuery(qualifiedStatementNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' lemma..."), statementNode);
+        var statementNode = statementNodeQuery(qualifiedStatementNode), referenceString = localContext.nodeAsString(referenceNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
+        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' lemma..."), statementNode);
         var lemmaMatchesStatement = lemma.matchStatement(statementNode, statementLocalContext);
         qualifiedStatementVerifiedAgainstLemma = lemmaMatchesStatement; ///
         if (qualifiedStatementVerifiedAgainstLemma) {
-            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' lemma."), statementNode);
+            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' lemma."), statementNode);
         }
     }
     return qualifiedStatementVerifiedAgainstLemma;
 }
-function verifyQualifiedStatementAAgainstTheorem(qualifiedStatementNode, referenceName, localContext) {
+function verifyQualifiedStatementAAgainstTheorem(qualifiedStatementNode, referenceNode, localContext) {
     var qualifiedStatementVerifiedAgainstTheorem = false;
-    var theorem = localContext.findTheoremByReferenceName(referenceName);
+    var theorem = localContext.findTheoremByReferenceNode(referenceNode);
     if (theorem !== null) {
-        var statementNode = statementNodeQuery(qualifiedStatementNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' theorem..."), statementNode);
+        var statementNode = statementNodeQuery(qualifiedStatementNode), referenceString = localContext.nodeAsString(referenceNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
+        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' theorem..."), statementNode);
         var theoremMatchesStatement = theorem.matchStatement(statementNode, statementLocalContext);
         qualifiedStatementVerifiedAgainstTheorem = theoremMatchesStatement; ///
         if (qualifiedStatementVerifiedAgainstTheorem) {
-            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' theorem."), statementNode);
+            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' theorem."), statementNode);
         }
     }
     return qualifiedStatementVerifiedAgainstTheorem;
 }
-function verifyQualifiedStatementAAgainstConjecture(qualifiedStatementNode, referenceName, localContext) {
+function verifyQualifiedStatementAAgainstConjecture(qualifiedStatementNode, referenceNode, localContext) {
     var qualifiedStatementVerifiedAgainstConjecture = false;
-    var conjecture = localContext.findConjectureByReferenceName(referenceName);
+    var conjecture = localContext.findConjectureByReferenceNode(referenceNode);
     if (conjecture !== null) {
-        var statementNode = statementNodeQuery(qualifiedStatementNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
-        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' conjecture..."), statementNode);
+        var statementNode = statementNodeQuery(qualifiedStatementNode), referenceString = localContext.nodeAsString(referenceNode), statementLocalContext = localContext, qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);
+        localContext.trace("Verifying the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' conjecture..."), statementNode);
         var conjectureMatchesStatement = conjecture.matchStatement(statementNode, statementLocalContext);
         qualifiedStatementVerifiedAgainstConjecture = conjectureMatchesStatement; ///
         if (qualifiedStatementVerifiedAgainstConjecture) {
-            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceName, "' conjecture."), statementNode);
+            localContext.debug("...verified the '".concat(qualifiedStatementString, "' qualified statement against the '").concat(referenceString, "' conjecture."), statementNode);
         }
     }
     return qualifiedStatementVerifiedAgainstConjecture;
@@ -157,4 +157,4 @@ function verifyQualifiedStatementAsTypeAssertion(qualifiedStatementNode, assignm
     return statementVerifiedAsTypeAssertion;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verify/statement/qualified.js"],"sourcesContent":["\"use strict\";\n\nimport verifyEquality from \"../equality\";\nimport verifyTypeAssertion from \"../typeAssertion\";\n\nimport { nodeQuery, referenceNameFromReferenceNode } from \"../../utilities/query\";\n\nconst equalityNodeQuery = nodeQuery(\"/qualifiedStatement/statement/equality!\"),\n      referenceNodeQuery = nodeQuery(\"/qualifiedStatement/qualification!/reference!\"),\n      statementNodeQuery = nodeQuery(\"/qualifiedStatement/statement!\"),\n      typeAssertionNodeQuery = nodeQuery(\"/qualifiedStatement/statement/typeAssertion!\");\n\nexport default function verifyQualifiedStatement(qualifiedStatementNode, assignments, derived, localContext) {\n  let qualifiedStatementVerified = false;\n\n  const statementNode = statementNodeQuery(qualifiedStatementNode);\n\n  if (statementNode !== null) {\n    const qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement...`, qualifiedStatementNode);\n\n    const referenceNode = referenceNodeQuery(qualifiedStatementNode),\n          referenceName = referenceNameFromReferenceNode(referenceNode),\n          verifyQualifiedStatementFunctions = [\n            verifyQualifiedStatementAAgainstRule,\n            verifyQualifiedStatementAAgainstAxiom,\n            verifyQualifiedStatementAAgainstLemma,\n            verifyQualifiedStatementAAgainstTheorem,\n            verifyQualifiedStatementAAgainstConjecture\n          ];\n\n    qualifiedStatementVerified = verifyQualifiedStatementFunctions.some((verifyQualifiedStatementFunction) => {  ///\n      const qualifiedStatementVerified = verifyQualifiedStatementFunction(qualifiedStatementNode, referenceName, localContext);\n\n      if (qualifiedStatementVerified) {\n        return true;\n      }\n    });\n\n    if (qualifiedStatementVerified) {\n      derived = false;  ///\n\n      const verifyQualifiedStatementFunctions = [\n              verifyQualifiedStatementAsEquality,\n              verifyQualifiedStatementAsTypeAssertion\n            ];\n\n      qualifiedStatementVerified = verifyQualifiedStatementFunctions.every((verifyQualifiedStatementFunction) => { ///\n        const qualifiedStatementVerified = verifyQualifiedStatementFunction(qualifiedStatementNode, assignments, derived, localContext, () => {\n          const verifiedAhead = true;\n\n          return verifiedAhead;\n        });\n\n        if (qualifiedStatementVerified) {\n          return true;\n        }\n      });\n    }\n\n    if (qualifiedStatementVerified) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement.`, qualifiedStatementNode);\n    }\n  }\n\n  return qualifiedStatementVerified;\n}\n\nfunction verifyQualifiedStatementAAgainstRule(qualifiedStatementNode, referenceName, localContext) {\n  let qualifiedStatementVerifiedAgainstRule = false;\n\n  const rule = localContext.findRuleByReferenceName(referenceName);\n\n  if (rule !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceName}' rule...`, statementNode);\n\n    const ruleMatchesStatement = rule.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstRule = ruleMatchesStatement;  ///\n\n    if (qualifiedStatementVerifiedAgainstRule) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceName}' rule.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstRule;\n}\n\nfunction verifyQualifiedStatementAAgainstAxiom(qualifiedStatementNode, referenceName, localContext) {\n  let qualifiedStatementVerifiedAgainstAxiom = false;\n\n  const axiom = localContext.findAxiomByReferenceName(referenceName);\n\n  if (axiom !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceName}' axiom...`, statementNode);\n\n    const axiomMatchesStatement = axiom.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstAxiom = axiomMatchesStatement; ///\n\n    if (qualifiedStatementVerifiedAgainstAxiom) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceName}' axiom.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstAxiom;\n}\n\nfunction verifyQualifiedStatementAAgainstLemma(qualifiedStatementNode, referenceName, localContext) {\n  let qualifiedStatementVerifiedAgainstLemma = false;\n\n  const lemma = localContext.findLemmaByReferenceName(referenceName);\n\n  if (lemma !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceName}' lemma...`, statementNode);\n\n    const lemmaMatchesStatement = lemma.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstLemma = lemmaMatchesStatement; ///\n\n    if (qualifiedStatementVerifiedAgainstLemma) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceName}' lemma.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstLemma;\n}\n\nfunction verifyQualifiedStatementAAgainstTheorem(qualifiedStatementNode, referenceName, localContext) {\n  let qualifiedStatementVerifiedAgainstTheorem = false;\n\n  const theorem = localContext.findTheoremByReferenceName(referenceName);\n\n  if (theorem !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceName}' theorem...`, statementNode);\n\n    const theoremMatchesStatement = theorem.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstTheorem = theoremMatchesStatement; ///\n\n    if (qualifiedStatementVerifiedAgainstTheorem) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceName}' theorem.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstTheorem;\n}\n\nfunction verifyQualifiedStatementAAgainstConjecture(qualifiedStatementNode, referenceName, localContext) {\n  let qualifiedStatementVerifiedAgainstConjecture = false;\n\n  const conjecture = localContext.findConjectureByReferenceName(referenceName);\n\n  if (conjecture !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceName}' conjecture...`, statementNode);\n\n    const conjectureMatchesStatement = conjecture.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstConjecture = conjectureMatchesStatement; ///\n\n    if (qualifiedStatementVerifiedAgainstConjecture) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceName}' conjecture.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstConjecture;\n}\n\nfunction verifyQualifiedStatementAsEquality(qualifiedStatementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAsEquality = true; ///\n\n  const equalityNode = equalityNodeQuery(qualifiedStatementNode);\n\n  if (equalityNode !== null) {\n    const qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement as an equality...`, qualifiedStatementNode);\n\n    const equalityVerified = verifyEquality(equalityNode, assignments, derived, localContext, verifyAhead);\n\n    statementVerifiedAsEquality = equalityVerified; ///\n\n    if (statementVerifiedAsEquality) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement as an equality.`, qualifiedStatementNode);\n    }\n  }\n\n  return statementVerifiedAsEquality;\n}\n\nfunction verifyQualifiedStatementAsTypeAssertion(qualifiedStatementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAsTypeAssertion = true;  ///\n\n  const typeAssertionNode = typeAssertionNodeQuery(qualifiedStatementNode);\n\n  if (typeAssertionNode !== null) {\n    const qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement as a type assertion...`, qualifiedStatementNode);\n\n    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, derived, localContext, verifyAhead);\n\n    statementVerifiedAsTypeAssertion = typeAssertionVerified; ///\n\n    if (statementVerifiedAsTypeAssertion) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement as a type assertion.`, qualifiedStatementNode);\n    }\n  }\n\n  return statementVerifiedAsTypeAssertion;\n}\n"],"names":["verifyQualifiedStatement","equalityNodeQuery","nodeQuery","referenceNodeQuery","statementNodeQuery","typeAssertionNodeQuery","qualifiedStatementNode","assignments","derived","localContext","qualifiedStatementVerified","statementNode","qualifiedStatementString","nodeAsString","trace","referenceNode","referenceName","referenceNameFromReferenceNode","verifyQualifiedStatementFunctions","verifyQualifiedStatementAAgainstRule","verifyQualifiedStatementAAgainstAxiom","verifyQualifiedStatementAAgainstLemma","verifyQualifiedStatementAAgainstTheorem","verifyQualifiedStatementAAgainstConjecture","some","verifyQualifiedStatementFunction","verifyQualifiedStatementAsEquality","verifyQualifiedStatementAsTypeAssertion","every","verifiedAhead","debug","qualifiedStatementVerifiedAgainstRule","rule","findRuleByReferenceName","statementLocalContext","ruleMatchesStatement","matchStatement","qualifiedStatementVerifiedAgainstAxiom","axiom","findAxiomByReferenceName","axiomMatchesStatement","qualifiedStatementVerifiedAgainstLemma","lemma","findLemmaByReferenceName","lemmaMatchesStatement","qualifiedStatementVerifiedAgainstTheorem","theorem","findTheoremByReferenceName","theoremMatchesStatement","qualifiedStatementVerifiedAgainstConjecture","conjecture","findConjectureByReferenceName","conjectureMatchesStatement","verifyAhead","statementVerifiedAsEquality","equalityNode","equalityVerified","verifyEquality","statementVerifiedAsTypeAssertion","typeAssertionNode","typeAssertionVerified","verifyTypeAssertion"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/verify/statement/qualified.js"],"sourcesContent":["\"use strict\";\n\nimport verifyEquality from \"../equality\";\nimport verifyTypeAssertion from \"../typeAssertion\";\n\nimport { nodeQuery } from \"../../utilities/query\";\n\nconst equalityNodeQuery = nodeQuery(\"/qualifiedStatement/statement/equality!\"),\n      referenceNodeQuery = nodeQuery(\"/qualifiedStatement/qualification!/reference!\"),\n      statementNodeQuery = nodeQuery(\"/qualifiedStatement/statement!\"),\n      typeAssertionNodeQuery = nodeQuery(\"/qualifiedStatement/statement/typeAssertion!\");\n\nexport default function verifyQualifiedStatement(qualifiedStatementNode, assignments, derived, localContext) {\n  let qualifiedStatementVerified = false;\n\n  const statementNode = statementNodeQuery(qualifiedStatementNode);\n\n  if (statementNode !== null) {\n    const qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement...`, qualifiedStatementNode);\n\n    const referenceNode = referenceNodeQuery(qualifiedStatementNode),\n          verifyQualifiedStatementFunctions = [\n            verifyQualifiedStatementAAgainstRule,\n            verifyQualifiedStatementAAgainstAxiom,\n            verifyQualifiedStatementAAgainstLemma,\n            verifyQualifiedStatementAAgainstTheorem,\n            verifyQualifiedStatementAAgainstConjecture\n          ];\n\n    qualifiedStatementVerified = verifyQualifiedStatementFunctions.some((verifyQualifiedStatementFunction) => {  ///\n      const qualifiedStatementVerified = verifyQualifiedStatementFunction(qualifiedStatementNode, referenceNode, localContext);\n\n      if (qualifiedStatementVerified) {\n        return true;\n      }\n    });\n\n    if (qualifiedStatementVerified) {\n      derived = false;  ///\n\n      const verifyQualifiedStatementFunctions = [\n              verifyQualifiedStatementAsEquality,\n              verifyQualifiedStatementAsTypeAssertion\n            ];\n\n      qualifiedStatementVerified = verifyQualifiedStatementFunctions.every((verifyQualifiedStatementFunction) => { ///\n        const qualifiedStatementVerified = verifyQualifiedStatementFunction(qualifiedStatementNode, assignments, derived, localContext, () => {\n          const verifiedAhead = true;\n\n          return verifiedAhead;\n        });\n\n        if (qualifiedStatementVerified) {\n          return true;\n        }\n      });\n    }\n\n    if (qualifiedStatementVerified) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement.`, qualifiedStatementNode);\n    }\n  }\n\n  return qualifiedStatementVerified;\n}\n\nfunction verifyQualifiedStatementAAgainstRule(qualifiedStatementNode, referenceNode, localContext) {\n  let qualifiedStatementVerifiedAgainstRule = false;\n\n  const rule = localContext.findRuleByReferenceNode(referenceNode);\n\n  if (rule !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          referenceString = localContext.nodeAsString(referenceNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceString}' rule...`, statementNode);\n\n    const ruleMatchesStatement = rule.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstRule = ruleMatchesStatement;  ///\n\n    if (qualifiedStatementVerifiedAgainstRule) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceString}' rule.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstRule;\n}\n\nfunction verifyQualifiedStatementAAgainstAxiom(qualifiedStatementNode, referenceNode, localContext) {\n  let qualifiedStatementVerifiedAgainstAxiom = false;\n\n  const axiom = localContext.findAxiomByReferenceNode(referenceNode);\n\n  if (axiom !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          referenceString = localContext.nodeAsString(referenceNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceString}' axiom...`, statementNode);\n\n    const axiomMatchesStatement = axiom.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstAxiom = axiomMatchesStatement; ///\n\n    if (qualifiedStatementVerifiedAgainstAxiom) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceString}' axiom.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstAxiom;\n}\n\nfunction verifyQualifiedStatementAAgainstLemma(qualifiedStatementNode, referenceNode, localContext) {\n  let qualifiedStatementVerifiedAgainstLemma = false;\n\n  const lemma = localContext.findLemmaByReferenceNode(referenceNode);\n\n  if (lemma !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          referenceString = localContext.nodeAsString(referenceNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceString}' lemma...`, statementNode);\n\n    const lemmaMatchesStatement = lemma.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstLemma = lemmaMatchesStatement; ///\n\n    if (qualifiedStatementVerifiedAgainstLemma) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceString}' lemma.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstLemma;\n}\n\nfunction verifyQualifiedStatementAAgainstTheorem(qualifiedStatementNode, referenceNode, localContext) {\n  let qualifiedStatementVerifiedAgainstTheorem = false;\n\n  const theorem = localContext.findTheoremByReferenceNode(referenceNode);\n\n  if (theorem !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          referenceString = localContext.nodeAsString(referenceNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceString}' theorem...`, statementNode);\n\n    const theoremMatchesStatement = theorem.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstTheorem = theoremMatchesStatement; ///\n\n    if (qualifiedStatementVerifiedAgainstTheorem) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceString}' theorem.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstTheorem;\n}\n\nfunction verifyQualifiedStatementAAgainstConjecture(qualifiedStatementNode, referenceNode, localContext) {\n  let qualifiedStatementVerifiedAgainstConjecture = false;\n\n  const conjecture = localContext.findConjectureByReferenceNode(referenceNode);\n\n  if (conjecture !== null) {\n    const statementNode = statementNodeQuery(qualifiedStatementNode),\n          referenceString = localContext.nodeAsString(referenceNode),\n          statementLocalContext = localContext, ///\n          qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement against the '${referenceString}' conjecture...`, statementNode);\n\n    const conjectureMatchesStatement = conjecture.matchStatement(statementNode, statementLocalContext);\n\n    qualifiedStatementVerifiedAgainstConjecture = conjectureMatchesStatement; ///\n\n    if (qualifiedStatementVerifiedAgainstConjecture) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement against the '${referenceString}' conjecture.`, statementNode);\n    }\n  }\n\n  return qualifiedStatementVerifiedAgainstConjecture;\n}\n\nfunction verifyQualifiedStatementAsEquality(qualifiedStatementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAsEquality = true; ///\n\n  const equalityNode = equalityNodeQuery(qualifiedStatementNode);\n\n  if (equalityNode !== null) {\n    const qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement as an equality...`, qualifiedStatementNode);\n\n    const equalityVerified = verifyEquality(equalityNode, assignments, derived, localContext, verifyAhead);\n\n    statementVerifiedAsEquality = equalityVerified; ///\n\n    if (statementVerifiedAsEquality) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement as an equality.`, qualifiedStatementNode);\n    }\n  }\n\n  return statementVerifiedAsEquality;\n}\n\nfunction verifyQualifiedStatementAsTypeAssertion(qualifiedStatementNode, assignments, derived, localContext, verifyAhead) {\n  let statementVerifiedAsTypeAssertion = true;  ///\n\n  const typeAssertionNode = typeAssertionNodeQuery(qualifiedStatementNode);\n\n  if (typeAssertionNode !== null) {\n    const qualifiedStatementString = localContext.nodeAsString(qualifiedStatementNode);\n\n    localContext.trace(`Verifying the '${qualifiedStatementString}' qualified statement as a type assertion...`, qualifiedStatementNode);\n\n    const typeAssertionVerified = verifyTypeAssertion(typeAssertionNode, assignments, derived, localContext, verifyAhead);\n\n    statementVerifiedAsTypeAssertion = typeAssertionVerified; ///\n\n    if (statementVerifiedAsTypeAssertion) {\n      localContext.debug(`...verified the '${qualifiedStatementString}' qualified statement as a type assertion.`, qualifiedStatementNode);\n    }\n  }\n\n  return statementVerifiedAsTypeAssertion;\n}\n"],"names":["verifyQualifiedStatement","equalityNodeQuery","nodeQuery","referenceNodeQuery","statementNodeQuery","typeAssertionNodeQuery","qualifiedStatementNode","assignments","derived","localContext","qualifiedStatementVerified","statementNode","qualifiedStatementString","nodeAsString","trace","referenceNode","verifyQualifiedStatementFunctions","verifyQualifiedStatementAAgainstRule","verifyQualifiedStatementAAgainstAxiom","verifyQualifiedStatementAAgainstLemma","verifyQualifiedStatementAAgainstTheorem","verifyQualifiedStatementAAgainstConjecture","some","verifyQualifiedStatementFunction","verifyQualifiedStatementAsEquality","verifyQualifiedStatementAsTypeAssertion","every","verifiedAhead","debug","qualifiedStatementVerifiedAgainstRule","rule","findRuleByReferenceNode","referenceString","statementLocalContext","ruleMatchesStatement","matchStatement","qualifiedStatementVerifiedAgainstAxiom","axiom","findAxiomByReferenceNode","axiomMatchesStatement","qualifiedStatementVerifiedAgainstLemma","lemma","findLemmaByReferenceNode","lemmaMatchesStatement","qualifiedStatementVerifiedAgainstTheorem","theorem","findTheoremByReferenceNode","theoremMatchesStatement","qualifiedStatementVerifiedAgainstConjecture","conjecture","findConjectureByReferenceNode","conjectureMatchesStatement","verifyAhead","statementVerifiedAsEquality","equalityNode","equalityVerified","verifyEquality","statementVerifiedAsTypeAssertion","typeAssertionNode","typeAssertionVerified","verifyTypeAssertion"],"mappings":"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"}

package/lib/verify/termAsConstructor.js CHANGED Viewed

@@ -11,7 +11,6 @@ Object.defineProperty(exports, "default", {
 var _constructor = /*#__PURE__*/ _interop_require_default(require("../constructor"));
 var _local = /*#__PURE__*/ _interop_require_default(require("../context/local"));
 var _termAsConstructor = /*#__PURE__*/ _interop_require_default(require("../verifier/node/termAsConstructor"));
-var _query = require("../utilities/query");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -30,12 +29,12 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
         if (typeNode === null) {
             termVerifiedAsConstructor = true;
         } else {
-            var typeName = (0, _query.typeNameFromTypeNode)(typeNode);
-            type = fileContext.findTypeByTypeName(typeName);
+            type = fileContext.findTypeByTypeNode(typeNode);
             if (type !== null) {
                 termVerifiedAsConstructor = true;
             } else {
-                fileContext.debug("The '".concat(termString, "' constructor's '").concat(typeName, "' type is not present."), termNode);
+                var typeString = fileContext.nodeAsString(typeNode);
+                fileContext.debug("The '".concat(termString, "' constructor's '").concat(typeString, "' type is not present."), termNode);
             }
         }
         if (termVerifiedAsConstructor) {
@@ -49,4 +48,4 @@ function verifyTermAsConstructor(termNode, typeNode, fileContext) {
     return termVerifiedAsConstructor;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXIvbm9kZS90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5pbXBvcnQgeyB0eXBlTmFtZUZyb21UeXBlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VGVybUFzQ29uc3RydWN0b3IodGVybU5vZGUsIHR5cGVOb2RlLCBmaWxlQ29udGV4dCkge1xuICBsZXQgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IGZhbHNlO1xuXG4gIGNvbnN0IHRlcm1TdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodGVybU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LmRlYnVnKGBWZXJpZnlpbmcgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuLi5gLCB0ZXJtTm9kZSk7XG5cbiAgY29uc3Qgbm9uVGVybWluYWxOb2RlID0gdGVybU5vZGUsIC8vL1xuICAgICAgICBjaGlsZE5vZGVzID0gbm9uVGVybWluYWxOb2RlLmdldENoaWxkTm9kZXMoKSxcbiAgICAgICAgbG9jYWxDb250ZXh0ID0gTG9jYWxDb250ZXh0LmZyb21GaWxlQ29udGV4dChmaWxlQ29udGV4dCksXG4gICAgICAgIGNoaWxkTm9kZXNWZXJpZmllZCA9IHRlcm1Bc0NvbnN0cnVjdG9yTm9kZVZlcmlmaWVyLnZlcmlmeUNoaWxkTm9kZXMoY2hpbGROb2RlcywgbG9jYWxDb250ZXh0LCAoKSA9PiB7XG4gICAgICAgICAgY29uc3QgdmVyaWZpZWRBaGVhZCA9IHRydWU7XG5cbiAgICAgICAgICByZXR1cm4gdmVyaWZpZWRBaGVhZDtcbiAgICAgICAgfSk7XG5cbiAgaWYgKGNoaWxkTm9kZXNWZXJpZmllZCkge1xuICAgIGxldCB0eXBlID0gbnVsbDtcblxuICAgIGlmICh0eXBlTm9kZSA9PT0gbnVsbCkge1xuICAgICAgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IHRydWU7XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUodHlwZU5vZGUpO1xuXG4gICAgICB0eXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOYW1lKHR5cGVOYW1lKTtcblxuICAgICAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICAgICAgdGVybVZlcmlmaWVkQXNDb25zdHJ1Y3RvciA9IHRydWU7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgVGhlICcke3Rlcm1TdHJpbmd9JyBjb25zdHJ1Y3RvcidzICcke3R5cGVOYW1lfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCB0ZXJtTm9kZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICAgIGNvbnN0IHRva2VucyA9IGZpbGVDb250ZXh0LmdldFRva2VucygpLFxuICAgICAgICAgICAgY29uc3RydWN0b3IgPSBDb25zdHJ1Y3Rvci5mcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpO1xuXG4gICAgICBmaWxlQ29udGV4dC5hZGRDb25zdHJ1Y3Rvcihjb25zdHJ1Y3Rvcik7XG4gICAgfVxuICB9XG5cbiAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuYCwgdGVybU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3I7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VGVybUFzQ29uc3RydWN0b3IiLCJ0ZXJtTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yIiwidGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsImRlYnVnIiwibm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJsb2NhbENvbnRleHQiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJjaGlsZE5vZGVzVmVyaWZpZWQiLCJ0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciIsInZlcmlmeUNoaWxkTm9kZXMiLCJ2ZXJpZmllZEFoZWFkIiwidHlwZSIsInR5cGVOYW1lIiwidHlwZU5hbWVGcm9tVHlwZU5vZGUiLCJmaW5kVHlwZUJ5VHlwZU5hbWUiLCJ0b2tlbnMiLCJnZXRUb2tlbnMiLCJjb25zdHJ1Y3RvciIsIkNvbnN0cnVjdG9yIiwiZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2VucyIsImFkZENvbnN0cnVjdG9yIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFRQTs7O2VBQXdCQTs7O2tFQU5BOzREQUNDO3dFQUNpQjtxQkFFTDs7Ozs7O0FBRXRCLFNBQVNBLHdCQUF3QkMsUUFBUSxFQUFFQyxRQUFRLEVBQUVDLFdBQVc7SUFDN0UsSUFBSUMsNEJBQTRCO0lBRWhDLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLCtCQUE2Qko7SUFFNUUsSUFBTU8sa0JBQWtCUCxVQUNsQlEsYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQyxlQUFlQyxjQUFZLENBQUNDLGVBQWUsQ0FBQ1YsY0FDNUNXLHFCQUFxQkMsMEJBQTZCLENBQUNDLGdCQUFnQixDQUFDUCxZQUFZRSxjQUFjO1FBQzVGLElBQU1NLGdCQUFnQjtRQUV0QixPQUFPQTtJQUNUO0lBRU4sSUFBSUgsb0JBQW9CO1FBQ3RCLElBQUlJLE9BQU87UUFFWCxJQUFJaEIsYUFBYSxNQUFNO1lBQ3JCRSw0QkFBNEI7UUFDOUIsT0FBTztZQUNMLElBQU1lLFdBQVdDLElBQUFBLDJCQUFvQixFQUFDbEI7WUFFdENnQixPQUFPZixZQUFZa0Isa0JBQWtCLENBQUNGO1lBRXRDLElBQUlELFNBQVMsTUFBTTtnQkFDakJkLDRCQUE0QjtZQUM5QixPQUFPO2dCQUNMRCxZQUFZSSxLQUFLLENBQUMsQUFBQyxRQUFxQ1ksT0FBOUJkLFlBQVcscUJBQTRCLE9BQVRjLFVBQVMsMkJBQXlCbEI7WUFDNUY7UUFDRjtRQUVBLElBQUlHLDJCQUEyQjtZQUM3QixJQUFNa0IsU0FBU25CLFlBQVlvQixTQUFTLElBQzlCQyxjQUFjQyxvQkFBVyxDQUFDQyx5QkFBeUIsQ0FBQ3pCLFVBQVVpQixNQUFNSTtZQUUxRW5CLFlBQVl3QixjQUFjLENBQUNIO1FBQzdCO0lBQ0Y7SUFFQSxJQUFJcEIsMkJBQTJCO1FBQzdCRCxZQUFZSSxLQUFLLENBQUMsQUFBQyxvQkFBOEIsT0FBWEYsWUFBVyw2QkFBMkJKO0lBQzlFO0lBRUEsT0FBT0c7QUFDVCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdGVybUFzQ29uc3RydWN0b3IuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBDb25zdHJ1Y3RvciBmcm9tIFwiLi4vY29uc3RydWN0b3JcIjtcbmltcG9ydCBMb2NhbENvbnRleHQgZnJvbSBcIi4uL2NvbnRleHQvbG9jYWxcIjtcbmltcG9ydCB0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXIvbm9kZS90ZXJtQXNDb25zdHJ1Y3RvclwiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiB2ZXJpZnlUZXJtQXNDb25zdHJ1Y3Rvcih0ZXJtTm9kZSwgdHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gZmFsc2U7XG5cbiAgY29uc3QgdGVybVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0ZXJtTm9kZSk7XG5cbiAgZmlsZUNvbnRleHQuZGVidWcoYFZlcmlmeWluZyB0aGUgJyR7dGVybVN0cmluZ30nIHRlcm0gYXMgYSBjb25zdHJ1Y3Rvci4uLmAsIHRlcm1Ob2RlKTtcblxuICBjb25zdCBub25UZXJtaW5hbE5vZGUgPSB0ZXJtTm9kZSwgLy8vXG4gICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICBsb2NhbENvbnRleHQgPSBMb2NhbENvbnRleHQuZnJvbUZpbGVDb250ZXh0KGZpbGVDb250ZXh0KSxcbiAgICAgICAgY2hpbGROb2Rlc1ZlcmlmaWVkID0gdGVybUFzQ29uc3RydWN0b3JOb2RlVmVyaWZpZXIudmVyaWZ5Q2hpbGROb2RlcyhjaGlsZE5vZGVzLCBsb2NhbENvbnRleHQsICgpID0+IHtcbiAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICB9KTtcblxuICBpZiAoY2hpbGROb2Rlc1ZlcmlmaWVkKSB7XG4gICAgbGV0IHR5cGUgPSBudWxsO1xuXG4gICAgaWYgKHR5cGVOb2RlID09PSBudWxsKSB7XG4gICAgICB0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yID0gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICAgIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IgPSB0cnVlO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgY29uc3QgdHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSAnJHt0ZXJtU3RyaW5nfScgY29uc3RydWN0b3IncyAnJHt0eXBlU3RyaW5nfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCB0ZXJtTm9kZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICAgIGNvbnN0IHRva2VucyA9IGZpbGVDb250ZXh0LmdldFRva2VucygpLFxuICAgICAgICAgICAgY29uc3RydWN0b3IgPSBDb25zdHJ1Y3Rvci5mcm9tVGVybU5vZGVUeXBlQW5kVG9rZW5zKHRlcm1Ob2RlLCB0eXBlLCB0b2tlbnMpO1xuXG4gICAgICBmaWxlQ29udGV4dC5hZGRDb25zdHJ1Y3Rvcihjb25zdHJ1Y3Rvcik7XG4gICAgfVxuICB9XG5cbiAgaWYgKHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3IpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3Rlcm1TdHJpbmd9JyB0ZXJtIGFzIGEgY29uc3RydWN0b3IuYCwgdGVybU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHRlcm1WZXJpZmllZEFzQ29uc3RydWN0b3I7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VGVybUFzQ29uc3RydWN0b3IiLCJ0ZXJtTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0ZXJtVmVyaWZpZWRBc0NvbnN0cnVjdG9yIiwidGVybVN0cmluZyIsIm5vZGVBc1N0cmluZyIsImRlYnVnIiwibm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlcyIsImdldENoaWxkTm9kZXMiLCJsb2NhbENvbnRleHQiLCJMb2NhbENvbnRleHQiLCJmcm9tRmlsZUNvbnRleHQiLCJjaGlsZE5vZGVzVmVyaWZpZWQiLCJ0ZXJtQXNDb25zdHJ1Y3Rvck5vZGVWZXJpZmllciIsInZlcmlmeUNoaWxkTm9kZXMiLCJ2ZXJpZmllZEFoZWFkIiwidHlwZSIsImZpbmRUeXBlQnlUeXBlTm9kZSIsInR5cGVTdHJpbmciLCJ0b2tlbnMiLCJnZXRUb2tlbnMiLCJjb25zdHJ1Y3RvciIsIkNvbnN0cnVjdG9yIiwiZnJvbVRlcm1Ob2RlVHlwZUFuZFRva2VucyIsImFkZENvbnN0cnVjdG9yIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNQTs7O2VBQXdCQTs7O2tFQUpBOzREQUNDO3dFQUNpQjs7Ozs7O0FBRTNCLFNBQVNBLHdCQUF3QkMsUUFBUSxFQUFFQyxRQUFRLEVBQUVDLFdBQVc7SUFDN0UsSUFBSUMsNEJBQTRCO0lBRWhDLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLCtCQUE2Qko7SUFFNUUsSUFBTU8sa0JBQWtCUCxVQUNsQlEsYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQyxlQUFlQyxjQUFZLENBQUNDLGVBQWUsQ0FBQ1YsY0FDNUNXLHFCQUFxQkMsMEJBQTZCLENBQUNDLGdCQUFnQixDQUFDUCxZQUFZRSxjQUFjO1FBQzVGLElBQU1NLGdCQUFnQjtRQUV0QixPQUFPQTtJQUNUO0lBRU4sSUFBSUgsb0JBQW9CO1FBQ3RCLElBQUlJLE9BQU87UUFFWCxJQUFJaEIsYUFBYSxNQUFNO1lBQ3JCRSw0QkFBNEI7UUFDOUIsT0FBTztZQUNMYyxPQUFPZixZQUFZZ0Isa0JBQWtCLENBQUNqQjtZQUV0QyxJQUFJZ0IsU0FBUyxNQUFNO2dCQUNqQmQsNEJBQTRCO1lBQzlCLE9BQU87Z0JBQ0wsSUFBTWdCLGFBQWFqQixZQUFZRyxZQUFZLENBQUNKO2dCQUU1Q0MsWUFBWUksS0FBSyxDQUFDLEFBQUMsUUFBcUNhLE9BQTlCZixZQUFXLHFCQUE4QixPQUFYZSxZQUFXLDJCQUF5Qm5CO1lBQzlGO1FBQ0Y7UUFFQSxJQUFJRywyQkFBMkI7WUFDN0IsSUFBTWlCLFNBQVNsQixZQUFZbUIsU0FBUyxJQUM5QkMsY0FBY0Msb0JBQVcsQ0FBQ0MseUJBQXlCLENBQUN4QixVQUFVaUIsTUFBTUc7WUFFMUVsQixZQUFZdUIsY0FBYyxDQUFDSDtRQUM3QjtJQUNGO0lBRUEsSUFBSW5CLDJCQUEyQjtRQUM3QkQsWUFBWUksS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhGLFlBQVcsNkJBQTJCSjtJQUM5RTtJQUVBLE9BQU9HO0FBQ1QifQ==

package/lib/verify/type.js CHANGED Viewed

@@ -17,7 +17,8 @@ _export(exports, {
     }
 });
 var _type = /*#__PURE__*/ _interop_require_default(require("../type"));
-var _query = require("../utilities/query");
+var _givenType = /*#__PURE__*/ _interop_require_default(require("../verify/givenType"));
+var _name = require("../utilities/name");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -27,18 +28,20 @@ function verifyType(typeNode, superTypeNode, fileContext) {
     var typeVerified = false;
     var typeString = fileContext.nodeAsString(typeNode);
     fileContext.trace("Verifying the '".concat(typeString, "' type..."), typeNode);
-    var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
+    var typePresent = fileContext.isTypePresentByTypeNode(typeNode);
     if (typePresent) {
-        fileContext.debug("The type '".concat(typeName, "' is already present."), typeNode);
+        var typeString1 = fileContext.nodeAsString(typeNode);
+        fileContext.debug("The type '".concat(typeString1, "' is already present."), typeNode);
     } else {
         var type;
-        var superTypeName = (0, _query.typeNameFromTypeNode)(superTypeNode);
-        if (superTypeName === null) {
+        var typeName = (0, _name.typeNameFromTypeNode)(typeNode);
+        if (superTypeNode === null) {
             type = _type.default.fromTypeName(typeName);
         } else {
-            var superType = fileContext.findTypeByTypeName(superTypeName);
+            var superType = fileContext.findTypeByTypeNode(superTypeNode);
             if (superType === null) {
-                fileContext.debug("The super-type '".concat(superTypeName, "' is not present."), typeNode);
+                var superTypeString = fileContext.nodeAsString(superTypeNode);
+                fileContext.debug("The super-type '".concat(superTypeString, "' is not present."), typeNode);
             } else {
                 type = _type.default.fromTypeNameAndSuperType(typeName, superType);
             }
@@ -53,21 +56,16 @@ function verifyType(typeNode, superTypeNode, fileContext) {
     }
     return typeVerified;
 }
-function verifyStandaloneType(typeNode, fileContext, verifyAhead) {
-    var standaloneTypeVerified = false;
-    var typeString = fileContext.nodeAsString(typeNode);
-    fileContext.trace("Verifying the '".concat(typeString, "' standalone type..."), typeNode);
-    var typeName = (0, _query.typeNameFromTypeNode)(typeNode), typePresent = fileContext.isTypePresentByTypeName(typeName);
-    if (!typePresent) {
-        fileContext.debug("The type '".concat(typeName, "' is not present."), typeNode);
-    } else {
-        var verifiedAhead = verifyAhead();
-        standaloneTypeVerified = verifiedAhead; ///
-    }
+function verifyStandaloneType(typeNode, localContext, verifyAhead) {
+    var standaloneTypeVerified;
+    var typeString = localContext.nodeAsString(typeNode);
+    localContext.trace("Verifying the '".concat(typeString, "' standalone type..."), typeNode);
+    var types = [], givenTypeVerified = (0, _givenType.default)(typeNode, types, localContext, verifyAhead);
+    standaloneTypeVerified = givenTypeVerified; ///
     if (standaloneTypeVerified) {
-        fileContext.debug("...verified the '".concat(typeString, "' standalone type."), typeNode);
+        localContext.debug("...verified the '".concat(typeString, "' standalone type."), typeNode);
     }
     return standaloneTypeVerified;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcblxuaW1wb3J0IHsgdHlwZU5hbWVGcm9tVHlwZU5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3F1ZXJ5XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIHZlcmlmeVR5cGUodHlwZU5vZGUsIHN1cGVyVHlwZU5vZGUsIGZpbGVDb250ZXh0KSB7XG4gIGxldCB0eXBlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB0eXBlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKHR5cGVOb2RlKTtcblxuICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHt0eXBlU3RyaW5nfScgdHlwZS4uLmAsIHR5cGVOb2RlKTtcblxuICBjb25zdCB0eXBlTmFtZSA9IHR5cGVOYW1lRnJvbVR5cGVOb2RlKHR5cGVOb2RlKSxcbiAgICAgICAgdHlwZVByZXNlbnQgPSBmaWxlQ29udGV4dC5pc1R5cGVQcmVzZW50QnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgaWYgKHR5cGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSB0eXBlICcke3R5cGVOYW1lfScgaXMgYWxyZWFkeSBwcmVzZW50LmAsIHR5cGVOb2RlKTtcbiAgfSBlbHNlIHtcbiAgICBsZXQgdHlwZTtcblxuICAgIGNvbnN0IHN1cGVyVHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZShzdXBlclR5cGVOb2RlKTtcblxuICAgIGlmIChzdXBlclR5cGVOYW1lID09PSBudWxsKSB7XG4gICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWUodHlwZU5hbWUpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBzdXBlclR5cGUgPSBmaWxlQ29udGV4dC5maW5kVHlwZUJ5VHlwZU5hbWUoc3VwZXJUeXBlTmFtZSk7XG5cbiAgICAgIGlmIChzdXBlclR5cGUgPT09IG51bGwpIHtcbiAgICAgICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSBzdXBlci10eXBlICcke3N1cGVyVHlwZU5hbWV9JyBpcyBub3QgcHJlc2VudC5gLCB0eXBlTm9kZSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB0eXBlID0gVHlwZS5mcm9tVHlwZU5hbWVBbmRTdXBlclR5cGUodHlwZU5hbWUsIHN1cGVyVHlwZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHR5cGUgIT09IG51bGwpIHtcbiAgICAgIGZpbGVDb250ZXh0LmFkZFR5cGUodHlwZSk7XG5cbiAgICAgIHR5cGVWZXJpZmllZCA9IHRydWU7XG4gICAgfVxuICB9XG5cbiAgaWYgKHR5cGVWZXJpZmllZCkge1xuICAgIGZpbGVDb250ZXh0LmRlYnVnKGAuLi52ZXJpZmllZCB0aGUgJyR7dHlwZVN0cmluZ30nIHR5cGUuYCwgdHlwZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHR5cGVWZXJpZmllZDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHZlcmlmeVN0YW5kYWxvbmVUeXBlKHR5cGVOb2RlLCBmaWxlQ29udGV4dCwgdmVyaWZ5QWhlYWQpIHtcbiAgbGV0IHN0YW5kYWxvbmVUeXBlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB0eXBlU3RyaW5nID0gZmlsZUNvbnRleHQubm9kZUFzU3RyaW5nKHR5cGVOb2RlKTtcblxuICBmaWxlQ29udGV4dC50cmFjZShgVmVyaWZ5aW5nIHRoZSAnJHt0eXBlU3RyaW5nfScgc3RhbmRhbG9uZSB0eXBlLi4uYCwgdHlwZU5vZGUpO1xuXG4gIGNvbnN0IHR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUodHlwZU5vZGUpLFxuICAgICAgICB0eXBlUHJlc2VudCA9IGZpbGVDb250ZXh0LmlzVHlwZVByZXNlbnRCeVR5cGVOYW1lKHR5cGVOYW1lKTtcblxuICBpZiAoIXR5cGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSB0eXBlICcke3R5cGVOYW1lfScgaXMgbm90IHByZXNlbnQuYCwgdHlwZU5vZGUpO1xuICB9IGVsc2Uge1xuICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB2ZXJpZnlBaGVhZCgpO1xuXG4gICAgc3RhbmRhbG9uZVR5cGVWZXJpZmllZCA9IHZlcmlmaWVkQWhlYWQ7ICAvLy9cbiAgfVxuXG4gIGlmIChzdGFuZGFsb25lVHlwZVZlcmlmaWVkKSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt0eXBlU3RyaW5nfScgc3RhbmRhbG9uZSB0eXBlLmAsIHR5cGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiBzdGFuZGFsb25lVHlwZVZlcmlmaWVkO1xufVxuIl0sIm5hbWVzIjpbInZlcmlmeVR5cGUiLCJ2ZXJpZnlTdGFuZGFsb25lVHlwZSIsInR5cGVOb2RlIiwic3VwZXJUeXBlTm9kZSIsImZpbGVDb250ZXh0IiwidHlwZVZlcmlmaWVkIiwidHlwZVN0cmluZyIsIm5vZGVBc1N0cmluZyIsInRyYWNlIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGVQcmVzZW50IiwiaXNUeXBlUHJlc2VudEJ5VHlwZU5hbWUiLCJkZWJ1ZyIsInR5cGUiLCJzdXBlclR5cGVOYW1lIiwiVHlwZSIsImZyb21UeXBlTmFtZSIsInN1cGVyVHlwZSIsImZpbmRUeXBlQnlUeXBlTmFtZSIsImZyb21UeXBlTmFtZUFuZFN1cGVyVHlwZSIsImFkZFR5cGUiLCJ2ZXJpZnlBaGVhZCIsInN0YW5kYWxvbmVUeXBlVmVyaWZpZWQiLCJ2ZXJpZmllZEFoZWFkIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7SUFNQSxPQXlDQztlQXpDdUJBOztJQTJDUkMsb0JBQW9CO2VBQXBCQTs7OzJEQS9DQztxQkFFb0I7Ozs7OztBQUV0QixTQUFTRCxXQUFXRSxRQUFRLEVBQUVDLGFBQWEsRUFBRUMsV0FBVztJQUNyRSxJQUFJQyxlQUFlO0lBRW5CLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLGNBQVlKO0lBRTNELElBQU1PLFdBQVdDLElBQUFBLDJCQUFvQixFQUFDUixXQUNoQ1MsY0FBY1AsWUFBWVEsdUJBQXVCLENBQUNIO0lBRXhELElBQUlFLGFBQWE7UUFDZlAsWUFBWVMsS0FBSyxDQUFDLEFBQUMsYUFBcUIsT0FBVEosVUFBUywwQkFBd0JQO0lBQ2xFLE9BQU87UUFDTCxJQUFJWTtRQUVKLElBQU1DLGdCQUFnQkwsSUFBQUEsMkJBQW9CLEVBQUNQO1FBRTNDLElBQUlZLGtCQUFrQixNQUFNO1lBQzFCRCxPQUFPRSxhQUFJLENBQUNDLFlBQVksQ0FBQ1I7UUFDM0IsT0FBTztZQUNMLElBQU1TLFlBQVlkLFlBQVllLGtCQUFrQixDQUFDSjtZQUVqRCxJQUFJRyxjQUFjLE1BQU07Z0JBQ3RCZCxZQUFZUyxLQUFLLENBQUMsQUFBQyxtQkFBZ0MsT0FBZEUsZUFBYyxzQkFBb0JiO1lBQ3pFLE9BQU87Z0JBQ0xZLE9BQU9FLGFBQUksQ0FBQ0ksd0JBQXdCLENBQUNYLFVBQVVTO1lBQ2pEO1FBQ0Y7UUFFQSxJQUFJSixTQUFTLE1BQU07WUFDakJWLFlBQVlpQixPQUFPLENBQUNQO1lBRXBCVCxlQUFlO1FBQ2pCO0lBQ0Y7SUFFQSxJQUFJQSxjQUFjO1FBQ2hCRCxZQUFZUyxLQUFLLENBQUMsQUFBQyxvQkFBOEIsT0FBWFAsWUFBVyxZQUFVSjtJQUM3RDtJQUVBLE9BQU9HO0FBQ1Q7QUFFTyxTQUFTSixxQkFBcUJDLFFBQVEsRUFBRUUsV0FBVyxFQUFFa0IsV0FBVztJQUNyRSxJQUFJQyx5QkFBeUI7SUFFN0IsSUFBTWpCLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLHlCQUF1Qko7SUFFdEUsSUFBTU8sV0FBV0MsSUFBQUEsMkJBQW9CLEVBQUNSLFdBQ2hDUyxjQUFjUCxZQUFZUSx1QkFBdUIsQ0FBQ0g7SUFFeEQsSUFBSSxDQUFDRSxhQUFhO1FBQ2hCUCxZQUFZUyxLQUFLLENBQUMsQUFBQyxhQUFxQixPQUFUSixVQUFTLHNCQUFvQlA7SUFDOUQsT0FBTztRQUNMLElBQU1zQixnQkFBZ0JGO1FBRXRCQyx5QkFBeUJDLGVBQWdCLEdBQUc7SUFDOUM7SUFFQSxJQUFJRCx3QkFBd0I7UUFDMUJuQixZQUFZUyxLQUFLLENBQUMsQUFBQyxvQkFBOEIsT0FBWFAsWUFBVyx1QkFBcUJKO0lBQ3hFO0lBRUEsT0FBT3FCO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdHlwZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IFR5cGUgZnJvbSBcIi4uL3R5cGVcIjtcbmltcG9ydCB2ZXJpZnlHaXZlblR5cGUgZnJvbSBcIi4uL3ZlcmlmeS9naXZlblR5cGVcIjtcblxuaW1wb3J0IHsgdHlwZU5hbWVGcm9tVHlwZU5vZGUgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL25hbWVcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VHlwZSh0eXBlTm9kZSwgc3VwZXJUeXBlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHR5cGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IHR5cGVTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3R5cGVTdHJpbmd9JyB0eXBlLi4uYCwgdHlwZU5vZGUpO1xuXG4gIGNvbnN0IHR5cGVQcmVzZW50ID0gZmlsZUNvbnRleHQuaXNUeXBlUHJlc2VudEJ5VHlwZU5vZGUodHlwZU5vZGUpO1xuXG4gIGlmICh0eXBlUHJlc2VudCkge1xuICAgIGNvbnN0IHR5cGVTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSB0eXBlICcke3R5cGVTdHJpbmd9JyBpcyBhbHJlYWR5IHByZXNlbnQuYCwgdHlwZU5vZGUpO1xuICB9IGVsc2Uge1xuICAgIGxldCB0eXBlO1xuXG4gICAgY29uc3QgdHlwZU5hbWUgPSB0eXBlTmFtZUZyb21UeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICBpZiAoc3VwZXJUeXBlTm9kZSA9PT0gbnVsbCkge1xuICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lKHR5cGVOYW1lKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3Qgc3VwZXJUeXBlID0gZmlsZUNvbnRleHQuZmluZFR5cGVCeVR5cGVOb2RlKHN1cGVyVHlwZU5vZGUpO1xuXG4gICAgICBpZiAoc3VwZXJUeXBlID09PSBudWxsKSB7XG4gICAgICAgIGNvbnN0IHN1cGVyVHlwZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyhzdXBlclR5cGVOb2RlKTtcblxuICAgICAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgVGhlIHN1cGVyLXR5cGUgJyR7c3VwZXJUeXBlU3RyaW5nfScgaXMgbm90IHByZXNlbnQuYCwgdHlwZU5vZGUpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdHlwZSA9IFR5cGUuZnJvbVR5cGVOYW1lQW5kU3VwZXJUeXBlKHR5cGVOYW1lLCBzdXBlclR5cGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh0eXBlICE9PSBudWxsKSB7XG4gICAgICBmaWxlQ29udGV4dC5hZGRUeXBlKHR5cGUpO1xuXG4gICAgICB0eXBlVmVyaWZpZWQgPSB0cnVlO1xuICAgIH1cbiAgfVxuXG4gIGlmICh0eXBlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3R5cGVTdHJpbmd9JyB0eXBlLmAsIHR5cGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiB0eXBlVmVyaWZpZWQ7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB2ZXJpZnlTdGFuZGFsb25lVHlwZSh0eXBlTm9kZSwgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgc3RhbmRhbG9uZVR5cGVWZXJpZmllZDtcblxuICBjb25zdCB0eXBlU3RyaW5nID0gbG9jYWxDb250ZXh0Lm5vZGVBc1N0cmluZyh0eXBlTm9kZSk7XG5cbiAgbG9jYWxDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3R5cGVTdHJpbmd9JyBzdGFuZGFsb25lIHR5cGUuLi5gLCB0eXBlTm9kZSk7XG5cbiAgY29uc3QgdHlwZXMgPSBbXSxcbiAgICAgICAgZ2l2ZW5UeXBlVmVyaWZpZWQgPSB2ZXJpZnlHaXZlblR5cGUodHlwZU5vZGUsIHR5cGVzLCBsb2NhbENvbnRleHQsIHZlcmlmeUFoZWFkKTtcblxuICBzdGFuZGFsb25lVHlwZVZlcmlmaWVkID0gZ2l2ZW5UeXBlVmVyaWZpZWQ7ICAvLy9cblxuICBpZiAoc3RhbmRhbG9uZVR5cGVWZXJpZmllZCkge1xuICAgIGxvY2FsQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3R5cGVTdHJpbmd9JyBzdGFuZGFsb25lIHR5cGUuYCwgdHlwZU5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIHN0YW5kYWxvbmVUeXBlVmVyaWZpZWQ7XG59XG4iXSwibmFtZXMiOlsidmVyaWZ5VHlwZSIsInZlcmlmeVN0YW5kYWxvbmVUeXBlIiwidHlwZU5vZGUiLCJzdXBlclR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ0eXBlVmVyaWZpZWQiLCJ0eXBlU3RyaW5nIiwibm9kZUFzU3RyaW5nIiwidHJhY2UiLCJ0eXBlUHJlc2VudCIsImlzVHlwZVByZXNlbnRCeVR5cGVOb2RlIiwiZGVidWciLCJ0eXBlIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsIlR5cGUiLCJmcm9tVHlwZU5hbWUiLCJzdXBlclR5cGUiLCJmaW5kVHlwZUJ5VHlwZU5vZGUiLCJzdXBlclR5cGVTdHJpbmciLCJmcm9tVHlwZU5hbWVBbmRTdXBlclR5cGUiLCJhZGRUeXBlIiwibG9jYWxDb250ZXh0IiwidmVyaWZ5QWhlYWQiLCJzdGFuZGFsb25lVHlwZVZlcmlmaWVkIiwidHlwZXMiLCJnaXZlblR5cGVWZXJpZmllZCIsInZlcmlmeUdpdmVuVHlwZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBT0EsT0E0Q0M7ZUE1Q3VCQTs7SUE4Q1JDLG9CQUFvQjtlQUFwQkE7OzsyREFuREM7Z0VBQ1c7b0JBRVM7Ozs7OztBQUV0QixTQUFTRCxXQUFXRSxRQUFRLEVBQUVDLGFBQWEsRUFBRUMsV0FBVztJQUNyRSxJQUFJQyxlQUFlO0lBRW5CLElBQU1DLGFBQWFGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFNUNFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUE0QixPQUFYRixZQUFXLGNBQVlKO0lBRTNELElBQU1PLGNBQWNMLFlBQVlNLHVCQUF1QixDQUFDUjtJQUV4RCxJQUFJTyxhQUFhO1FBQ2YsSUFBTUgsY0FBYUYsWUFBWUcsWUFBWSxDQUFDTDtRQUU1Q0UsWUFBWU8sS0FBSyxDQUFDLEFBQUMsYUFBdUIsT0FBWEwsYUFBVywwQkFBd0JKO0lBQ3BFLE9BQU87UUFDTCxJQUFJVTtRQUVKLElBQU1DLFdBQVdDLElBQUFBLDBCQUFvQixFQUFDWjtRQUV0QyxJQUFJQyxrQkFBa0IsTUFBTTtZQUMxQlMsT0FBT0csYUFBSSxDQUFDQyxZQUFZLENBQUNIO1FBQzNCLE9BQU87WUFDTCxJQUFNSSxZQUFZYixZQUFZYyxrQkFBa0IsQ0FBQ2Y7WUFFakQsSUFBSWMsY0FBYyxNQUFNO2dCQUN0QixJQUFNRSxrQkFBa0JmLFlBQVlHLFlBQVksQ0FBQ0o7Z0JBRWpEQyxZQUFZTyxLQUFLLENBQUMsQUFBQyxtQkFBa0MsT0FBaEJRLGlCQUFnQixzQkFBb0JqQjtZQUMzRSxPQUFPO2dCQUNMVSxPQUFPRyxhQUFJLENBQUNLLHdCQUF3QixDQUFDUCxVQUFVSTtZQUNqRDtRQUNGO1FBRUEsSUFBSUwsU0FBUyxNQUFNO1lBQ2pCUixZQUFZaUIsT0FBTyxDQUFDVDtZQUVwQlAsZUFBZTtRQUNqQjtJQUNGO0lBRUEsSUFBSUEsY0FBYztRQUNoQkQsWUFBWU8sS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhMLFlBQVcsWUFBVUo7SUFDN0Q7SUFFQSxPQUFPRztBQUNUO0FBRU8sU0FBU0oscUJBQXFCQyxRQUFRLEVBQUVvQixZQUFZLEVBQUVDLFdBQVc7SUFDdEUsSUFBSUM7SUFFSixJQUFNbEIsYUFBYWdCLGFBQWFmLFlBQVksQ0FBQ0w7SUFFN0NvQixhQUFhZCxLQUFLLENBQUMsQUFBQyxrQkFBNEIsT0FBWEYsWUFBVyx5QkFBdUJKO0lBRXZFLElBQU11QixRQUFRLEVBQUUsRUFDVkMsb0JBQW9CQyxJQUFBQSxrQkFBZSxFQUFDekIsVUFBVXVCLE9BQU9ILGNBQWNDO0lBRXpFQyx5QkFBeUJFLG1CQUFvQixHQUFHO0lBRWhELElBQUlGLHdCQUF3QjtRQUMxQkYsYUFBYVgsS0FBSyxDQUFDLEFBQUMsb0JBQThCLE9BQVhMLFlBQVcsdUJBQXFCSjtJQUN6RTtJQUVBLE9BQU9zQjtBQUNUIn0=

package/lib/verify/variable.js CHANGED Viewed

@@ -18,8 +18,8 @@ _export(exports, {
 });
 var _variable = /*#__PURE__*/ _interop_require_default(require("../variable"));
 var _variable1 = /*#__PURE__*/ _interop_require_default(require("../assignment/variable"));
+var _givenVariable = /*#__PURE__*/ _interop_require_default(require("../verify/givenVariable"));
 var _type = require("../type");
-var _query = require("../utilities/query");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -34,14 +34,14 @@ function verifyVariable(variableNode, typeNode, fileContext) {
         fileContext.debug("The variable '".concat(variableString, "' is already present."), variableNode);
     } else {
         var variable;
-        var typeName = (0, _query.typeNameFromTypeNode)(typeNode);
-        if (typeName === null) {
+        if (typeNode === null) {
             var type = _type.objectType;
             variable = _variable.default.fromVariableNodeAndType(variableNode, type);
         } else {
-            var type1 = fileContext.findTypeByTypeName(typeName);
+            var type1 = fileContext.findTypeByTypeNode(typeNode);
             if (type1 === null) {
-                fileContext.debug("The '".concat(variableString, "' variable's '").concat(typeName, "' type is not present."), variableNode);
+                var typeString = fileContext.nodeAsString(typeNode);
+                fileContext.debug("The '".concat(variableString, "' variable's '").concat(typeString, "' type is not present."), variableNode);
             } else {
                 variable = _variable.default.fromVariableNodeAndType(variableNode, type1);
             }
@@ -58,19 +58,16 @@ function verifyVariable(variableNode, typeNode, fileContext) {
     }
     return variableVerified;
 }
-function verifyStandaloneVariable(variableNode, localMetaContext, verifyAhead) {
-    var standaloneVariableVerified = false;
-    var variableString = localMetaContext.nodeAsString(variableNode);
-    localMetaContext.trace("Verifying the '".concat(variableString, "' standalone variable..."), variableNode);
-    var variablePresent = localMetaContext.isVariablePresentByVariableNode(variableNode);
-    if (variablePresent) {
-        var verifiedAhead = verifyAhead();
-        standaloneVariableVerified = verifiedAhead; ///
-    }
+function verifyStandaloneVariable(variableNode, localContext, verifyAhead) {
+    var standaloneVariableVerified;
+    var variableString = localContext.nodeAsString(variableNode);
+    localContext.trace("Verifying the '".concat(variableString, "' standalone variable..."), variableNode);
+    var variables = [], givenVariableVerified = (0, _givenVariable.default)(variableNode, variables, localContext, verifyAhead);
+    standaloneVariableVerified = givenVariableVerified; ///
     if (standaloneVariableVerified) {
-        localMetaContext.debug("...verified the '".concat(variableString, "' standalone variable."), variableNode);
+        localContext.debug("...verified the '".concat(variableString, "' standalone variable."), variableNode);
     }
     return standaloneVariableVerified;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcbmltcG9ydCBWYXJpYWJsZUFzc2lnbm1lbnQgZnJvbSBcIi4uL2Fzc2lnbm1lbnQvdmFyaWFibGVcIjtcblxuaW1wb3J0IHsgb2JqZWN0VHlwZSB9IGZyb20gXCIuLi90eXBlXCI7XG5pbXBvcnQgeyB0eXBlTmFtZUZyb21UeXBlTm9kZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VmFyaWFibGUodmFyaWFibGVOb2RlLCB0eXBlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHZhcmlhYmxlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB2YXJpYWJsZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh2YXJpYWJsZU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgdmFyaWFibGUuLi5gLCB2YXJpYWJsZU5vZGUpO1xuXG4gIGNvbnN0IHZhcmlhYmxlUHJlc2VudCA9IGZpbGVDb250ZXh0LmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5vZGUodmFyaWFibGVOb2RlKTtcblxuICBpZiAodmFyaWFibGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSB2YXJpYWJsZSAnJHt2YXJpYWJsZVN0cmluZ30nIGlzIGFscmVhZHkgcHJlc2VudC5gLCB2YXJpYWJsZU5vZGUpO1xuICB9IGVsc2Uge1xuICAgIGxldCB2YXJpYWJsZTtcblxuICAgIGNvbnN0IHR5cGVOYW1lID0gdHlwZU5hbWVGcm9tVHlwZU5vZGUodHlwZU5vZGUpO1xuICAgIFxuICAgIGlmICh0eXBlTmFtZSA9PT0gbnVsbCkge1xuICAgICAgY29uc3QgdHlwZSA9IG9iamVjdFR5cGU7XG5cbiAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbVZhcmlhYmxlTm9kZUFuZFR5cGUodmFyaWFibGVOb2RlLCB0eXBlKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTmFtZSh0eXBlTmFtZSk7XG5cbiAgICAgIGlmICh0eXBlID09PSBudWxsKSB7XG4gICAgICAgIGZpbGVDb250ZXh0LmRlYnVnKGBUaGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSdzICcke3R5cGVOYW1lfScgdHlwZSBpcyBub3QgcHJlc2VudC5gLCB2YXJpYWJsZU5vZGUpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdmFyaWFibGUgPSBWYXJpYWJsZS5mcm9tVmFyaWFibGVOb2RlQW5kVHlwZSh2YXJpYWJsZU5vZGUsIHR5cGUpO1xuICAgICAgfVxuICAgIH1cblxuICAgIGlmICh2YXJpYWJsZSAhPT0gbnVsbCkge1xuICAgICAgY29uc3QgdmFyaWFibGVBc3NpZ25tZW50ID0gVmFyaWFibGVBc3NpZ25tZW50LmZyb21WYXJpYWJsZSh2YXJpYWJsZSksXG4gICAgICAgICAgICB2YXJpYWJsZUFzc2lnbmVkID0gdmFyaWFibGVBc3NpZ25tZW50LmFzc2lnbihmaWxlQ29udGV4dCk7XG5cbiAgICAgIGlmICh2YXJpYWJsZUFzc2lnbmVkKSB7XG4gICAgICAgIHZhcmlhYmxlVmVyaWZpZWQgPSB0cnVlO1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIGlmICh2YXJpYWJsZVZlcmlmaWVkKSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHZhcmlhYmxlLmAsIHZhcmlhYmxlTm9kZSk7XG4gIH1cblxuICByZXR1cm4gdmFyaWFibGVWZXJpZmllZDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHZlcmlmeVN0YW5kYWxvbmVWYXJpYWJsZSh2YXJpYWJsZU5vZGUsIGxvY2FsTWV0YUNvbnRleHQsIHZlcmlmeUFoZWFkKSB7XG4gIGxldCBzdGFuZGFsb25lVmFyaWFibGVWZXJpZmllZCA9IGZhbHNlO1xuXG4gIGNvbnN0IHZhcmlhYmxlU3RyaW5nID0gbG9jYWxNZXRhQ29udGV4dC5ub2RlQXNTdHJpbmcodmFyaWFibGVOb2RlKTtcblxuICBsb2NhbE1ldGFDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgc3RhbmRhbG9uZSB2YXJpYWJsZS4uLmAsIHZhcmlhYmxlTm9kZSk7XG5cbiAgY29uc3QgdmFyaWFibGVQcmVzZW50ID0gbG9jYWxNZXRhQ29udGV4dC5pc1ZhcmlhYmxlUHJlc2VudEJ5VmFyaWFibGVOb2RlKHZhcmlhYmxlTm9kZSk7XG5cbiAgaWYgKHZhcmlhYmxlUHJlc2VudCkge1xuICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB2ZXJpZnlBaGVhZCgpO1xuXG4gICAgc3RhbmRhbG9uZVZhcmlhYmxlVmVyaWZpZWQgPSB2ZXJpZmllZEFoZWFkOyAvLy9cbiAgfVxuXG4gIGlmIChzdGFuZGFsb25lVmFyaWFibGVWZXJpZmllZCkge1xuICAgIGxvY2FsTWV0YUNvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHN0YW5kYWxvbmUgdmFyaWFibGUuYCwgdmFyaWFibGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiBzdGFuZGFsb25lVmFyaWFibGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlWYXJpYWJsZSIsInZlcmlmeVN0YW5kYWxvbmVWYXJpYWJsZSIsInZhcmlhYmxlTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ2YXJpYWJsZVZlcmlmaWVkIiwidmFyaWFibGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0cmFjZSIsInZhcmlhYmxlUHJlc2VudCIsImlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5vZGUiLCJkZWJ1ZyIsInZhcmlhYmxlIiwidHlwZU5hbWUiLCJ0eXBlTmFtZUZyb21UeXBlTm9kZSIsInR5cGUiLCJvYmplY3RUeXBlIiwiVmFyaWFibGUiLCJmcm9tVmFyaWFibGVOb2RlQW5kVHlwZSIsImZpbmRUeXBlQnlUeXBlTmFtZSIsInZhcmlhYmxlQXNzaWdubWVudCIsIlZhcmlhYmxlQXNzaWdubWVudCIsImZyb21WYXJpYWJsZSIsInZhcmlhYmxlQXNzaWduZWQiLCJhc3NpZ24iLCJsb2NhbE1ldGFDb250ZXh0IiwidmVyaWZ5QWhlYWQiLCJzdGFuZGFsb25lVmFyaWFibGVWZXJpZmllZCIsInZlcmlmaWVkQWhlYWQiXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7OztJQVFBLE9BNkNDO2VBN0N1QkE7O0lBK0NSQyx3QkFBd0I7ZUFBeEJBOzs7K0RBckRLO2dFQUNVO29CQUVKO3FCQUNVOzs7Ozs7QUFFdEIsU0FBU0QsZUFBZUUsWUFBWSxFQUFFQyxRQUFRLEVBQUVDLFdBQVc7SUFDeEUsSUFBSUMsbUJBQW1CO0lBRXZCLElBQU1DLGlCQUFpQkYsWUFBWUcsWUFBWSxDQUFDTDtJQUVoREUsWUFBWUksS0FBSyxDQUFDLEFBQUMsa0JBQWdDLE9BQWZGLGdCQUFlLGtCQUFnQko7SUFFbkUsSUFBTU8sa0JBQWtCTCxZQUFZTSwrQkFBK0IsQ0FBQ1I7SUFFcEUsSUFBSU8saUJBQWlCO1FBQ25CTCxZQUFZTyxLQUFLLENBQUMsQUFBQyxpQkFBK0IsT0FBZkwsZ0JBQWUsMEJBQXdCSjtJQUM1RSxPQUFPO1FBQ0wsSUFBSVU7UUFFSixJQUFNQyxXQUFXQyxJQUFBQSwyQkFBb0IsRUFBQ1g7UUFFdEMsSUFBSVUsYUFBYSxNQUFNO1lBQ3JCLElBQU1FLE9BQU9DLGdCQUFVO1lBRXZCSixXQUFXSyxpQkFBUSxDQUFDQyx1QkFBdUIsQ0FBQ2hCLGNBQWNhO1FBQzVELE9BQU87WUFDTCxJQUFNQSxRQUFPWCxZQUFZZSxrQkFBa0IsQ0FBQ047WUFFNUMsSUFBSUUsVUFBUyxNQUFNO2dCQUNqQlgsWUFBWU8sS0FBSyxDQUFDLEFBQUMsUUFBc0NFLE9BQS9CUCxnQkFBZSxrQkFBeUIsT0FBVE8sVUFBUywyQkFBeUJYO1lBQzdGLE9BQU87Z0JBQ0xVLFdBQVdLLGlCQUFRLENBQUNDLHVCQUF1QixDQUFDaEIsY0FBY2E7WUFDNUQ7UUFDRjtRQUVBLElBQUlILGFBQWEsTUFBTTtZQUNyQixJQUFNUSxxQkFBcUJDLGtCQUFrQixDQUFDQyxZQUFZLENBQUNWLFdBQ3JEVyxtQkFBbUJILG1CQUFtQkksTUFBTSxDQUFDcEI7WUFFbkQsSUFBSW1CLGtCQUFrQjtnQkFDcEJsQixtQkFBbUI7WUFDckI7UUFDRjtJQUNGO0lBRUEsSUFBSUEsa0JBQWtCO1FBQ3BCRCxZQUFZTyxLQUFLLENBQUMsQUFBQyxvQkFBa0MsT0FBZkwsZ0JBQWUsZ0JBQWNKO0lBQ3JFO0lBRUEsT0FBT0c7QUFDVDtBQUVPLFNBQVNKLHlCQUF5QkMsWUFBWSxFQUFFdUIsZ0JBQWdCLEVBQUVDLFdBQVc7SUFDbEYsSUFBSUMsNkJBQTZCO0lBRWpDLElBQU1yQixpQkFBaUJtQixpQkFBaUJsQixZQUFZLENBQUNMO0lBRXJEdUIsaUJBQWlCakIsS0FBSyxDQUFDLEFBQUMsa0JBQWdDLE9BQWZGLGdCQUFlLDZCQUEyQko7SUFFbkYsSUFBTU8sa0JBQWtCZ0IsaUJBQWlCZiwrQkFBK0IsQ0FBQ1I7SUFFekUsSUFBSU8saUJBQWlCO1FBQ25CLElBQU1tQixnQkFBZ0JGO1FBRXRCQyw2QkFBNkJDLGVBQWUsR0FBRztJQUNqRDtJQUVBLElBQUlELDRCQUE0QjtRQUM5QkYsaUJBQWlCZCxLQUFLLENBQUMsQUFBQyxvQkFBa0MsT0FBZkwsZ0JBQWUsMkJBQXlCSjtJQUNyRjtJQUVBLE9BQU95QjtBQUNUIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZnkvdmFyaWFibGUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBWYXJpYWJsZSBmcm9tIFwiLi4vdmFyaWFibGVcIjtcbmltcG9ydCBWYXJpYWJsZUFzc2lnbm1lbnQgZnJvbSBcIi4uL2Fzc2lnbm1lbnQvdmFyaWFibGVcIjtcbmltcG9ydCB2ZXJpZnlHaXZlblZhcmlhYmxlIGZyb20gXCIuLi92ZXJpZnkvZ2l2ZW5WYXJpYWJsZVwiO1xuXG5pbXBvcnQgeyBvYmplY3RUeXBlIH0gZnJvbSBcIi4uL3R5cGVcIjtcblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gdmVyaWZ5VmFyaWFibGUodmFyaWFibGVOb2RlLCB0eXBlTm9kZSwgZmlsZUNvbnRleHQpIHtcbiAgbGV0IHZhcmlhYmxlVmVyaWZpZWQgPSBmYWxzZTtcblxuICBjb25zdCB2YXJpYWJsZVN0cmluZyA9IGZpbGVDb250ZXh0Lm5vZGVBc1N0cmluZyh2YXJpYWJsZU5vZGUpO1xuXG4gIGZpbGVDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgdmFyaWFibGUuLi5gLCB2YXJpYWJsZU5vZGUpO1xuXG4gIGNvbnN0IHZhcmlhYmxlUHJlc2VudCA9IGZpbGVDb250ZXh0LmlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5vZGUodmFyaWFibGVOb2RlKTtcblxuICBpZiAodmFyaWFibGVQcmVzZW50KSB7XG4gICAgZmlsZUNvbnRleHQuZGVidWcoYFRoZSB2YXJpYWJsZSAnJHt2YXJpYWJsZVN0cmluZ30nIGlzIGFscmVhZHkgcHJlc2VudC5gLCB2YXJpYWJsZU5vZGUpO1xuICB9IGVsc2Uge1xuICAgIGxldCB2YXJpYWJsZTtcblxuICAgIGlmICh0eXBlTm9kZSA9PT0gbnVsbCkge1xuICAgICAgY29uc3QgdHlwZSA9IG9iamVjdFR5cGU7XG5cbiAgICAgIHZhcmlhYmxlID0gVmFyaWFibGUuZnJvbVZhcmlhYmxlTm9kZUFuZFR5cGUodmFyaWFibGVOb2RlLCB0eXBlKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uc3QgdHlwZSA9IGZpbGVDb250ZXh0LmZpbmRUeXBlQnlUeXBlTm9kZSh0eXBlTm9kZSk7XG5cbiAgICAgIGlmICh0eXBlID09PSBudWxsKSB7XG4gICAgICAgIGNvbnN0IHR5cGVTdHJpbmcgPSBmaWxlQ29udGV4dC5ub2RlQXNTdHJpbmcodHlwZU5vZGUpO1xuXG4gICAgICAgIGZpbGVDb250ZXh0LmRlYnVnKGBUaGUgJyR7dmFyaWFibGVTdHJpbmd9JyB2YXJpYWJsZSdzICcke3R5cGVTdHJpbmd9JyB0eXBlIGlzIG5vdCBwcmVzZW50LmAsIHZhcmlhYmxlTm9kZSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICB2YXJpYWJsZSA9IFZhcmlhYmxlLmZyb21WYXJpYWJsZU5vZGVBbmRUeXBlKHZhcmlhYmxlTm9kZSwgdHlwZSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgaWYgKHZhcmlhYmxlICE9PSBudWxsKSB7XG4gICAgICBjb25zdCB2YXJpYWJsZUFzc2lnbm1lbnQgPSBWYXJpYWJsZUFzc2lnbm1lbnQuZnJvbVZhcmlhYmxlKHZhcmlhYmxlKSxcbiAgICAgICAgICAgIHZhcmlhYmxlQXNzaWduZWQgPSB2YXJpYWJsZUFzc2lnbm1lbnQuYXNzaWduKGZpbGVDb250ZXh0KTtcblxuICAgICAgaWYgKHZhcmlhYmxlQXNzaWduZWQpIHtcbiAgICAgICAgdmFyaWFibGVWZXJpZmllZCA9IHRydWU7XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgaWYgKHZhcmlhYmxlVmVyaWZpZWQpIHtcbiAgICBmaWxlQ29udGV4dC5kZWJ1ZyhgLi4udmVyaWZpZWQgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgdmFyaWFibGUuYCwgdmFyaWFibGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiB2YXJpYWJsZVZlcmlmaWVkO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdmVyaWZ5U3RhbmRhbG9uZVZhcmlhYmxlKHZhcmlhYmxlTm9kZSwgbG9jYWxDb250ZXh0LCB2ZXJpZnlBaGVhZCkge1xuICBsZXQgc3RhbmRhbG9uZVZhcmlhYmxlVmVyaWZpZWQ7XG5cbiAgY29uc3QgdmFyaWFibGVTdHJpbmcgPSBsb2NhbENvbnRleHQubm9kZUFzU3RyaW5nKHZhcmlhYmxlTm9kZSk7XG5cbiAgbG9jYWxDb250ZXh0LnRyYWNlKGBWZXJpZnlpbmcgdGhlICcke3ZhcmlhYmxlU3RyaW5nfScgc3RhbmRhbG9uZSB2YXJpYWJsZS4uLmAsIHZhcmlhYmxlTm9kZSk7XG5cbiAgY29uc3QgdmFyaWFibGVzID0gW10sXG4gICAgICAgIGdpdmVuVmFyaWFibGVWZXJpZmllZCA9IHZlcmlmeUdpdmVuVmFyaWFibGUodmFyaWFibGVOb2RlLCB2YXJpYWJsZXMsIGxvY2FsQ29udGV4dCwgdmVyaWZ5QWhlYWQpO1xuXG4gIHN0YW5kYWxvbmVWYXJpYWJsZVZlcmlmaWVkID0gZ2l2ZW5WYXJpYWJsZVZlcmlmaWVkOyAvLy9cblxuICBpZiAoc3RhbmRhbG9uZVZhcmlhYmxlVmVyaWZpZWQpIHtcbiAgICBsb2NhbENvbnRleHQuZGVidWcoYC4uLnZlcmlmaWVkIHRoZSAnJHt2YXJpYWJsZVN0cmluZ30nIHN0YW5kYWxvbmUgdmFyaWFibGUuYCwgdmFyaWFibGVOb2RlKTtcbiAgfVxuXG4gIHJldHVybiBzdGFuZGFsb25lVmFyaWFibGVWZXJpZmllZDtcbn1cbiJdLCJuYW1lcyI6WyJ2ZXJpZnlWYXJpYWJsZSIsInZlcmlmeVN0YW5kYWxvbmVWYXJpYWJsZSIsInZhcmlhYmxlTm9kZSIsInR5cGVOb2RlIiwiZmlsZUNvbnRleHQiLCJ2YXJpYWJsZVZlcmlmaWVkIiwidmFyaWFibGVTdHJpbmciLCJub2RlQXNTdHJpbmciLCJ0cmFjZSIsInZhcmlhYmxlUHJlc2VudCIsImlzVmFyaWFibGVQcmVzZW50QnlWYXJpYWJsZU5vZGUiLCJkZWJ1ZyIsInZhcmlhYmxlIiwidHlwZSIsIm9iamVjdFR5cGUiLCJWYXJpYWJsZSIsImZyb21WYXJpYWJsZU5vZGVBbmRUeXBlIiwiZmluZFR5cGVCeVR5cGVOb2RlIiwidHlwZVN0cmluZyIsInZhcmlhYmxlQXNzaWdubWVudCIsIlZhcmlhYmxlQXNzaWdubWVudCIsImZyb21WYXJpYWJsZSIsInZhcmlhYmxlQXNzaWduZWQiLCJhc3NpZ24iLCJsb2NhbENvbnRleHQiLCJ2ZXJpZnlBaGVhZCIsInN0YW5kYWxvbmVWYXJpYWJsZVZlcmlmaWVkIiwidmFyaWFibGVzIiwiZ2l2ZW5WYXJpYWJsZVZlcmlmaWVkIiwidmVyaWZ5R2l2ZW5WYXJpYWJsZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBUUEsT0E2Q0M7ZUE3Q3VCQTs7SUErQ1JDLHdCQUF3QjtlQUF4QkE7OzsrREFyREs7Z0VBQ1U7b0VBQ0M7b0JBRUw7Ozs7OztBQUVaLFNBQVNELGVBQWVFLFlBQVksRUFBRUMsUUFBUSxFQUFFQyxXQUFXO0lBQ3hFLElBQUlDLG1CQUFtQjtJQUV2QixJQUFNQyxpQkFBaUJGLFlBQVlHLFlBQVksQ0FBQ0w7SUFFaERFLFlBQVlJLEtBQUssQ0FBQyxBQUFDLGtCQUFnQyxPQUFmRixnQkFBZSxrQkFBZ0JKO0lBRW5FLElBQU1PLGtCQUFrQkwsWUFBWU0sK0JBQStCLENBQUNSO0lBRXBFLElBQUlPLGlCQUFpQjtRQUNuQkwsWUFBWU8sS0FBSyxDQUFDLEFBQUMsaUJBQStCLE9BQWZMLGdCQUFlLDBCQUF3Qko7SUFDNUUsT0FBTztRQUNMLElBQUlVO1FBRUosSUFBSVQsYUFBYSxNQUFNO1lBQ3JCLElBQU1VLE9BQU9DLGdCQUFVO1lBRXZCRixXQUFXRyxpQkFBUSxDQUFDQyx1QkFBdUIsQ0FBQ2QsY0FBY1c7UUFDNUQsT0FBTztZQUNMLElBQU1BLFFBQU9ULFlBQVlhLGtCQUFrQixDQUFDZDtZQUU1QyxJQUFJVSxVQUFTLE1BQU07Z0JBQ2pCLElBQU1LLGFBQWFkLFlBQVlHLFlBQVksQ0FBQ0o7Z0JBRTVDQyxZQUFZTyxLQUFLLENBQUMsQUFBQyxRQUFzQ08sT0FBL0JaLGdCQUFlLGtCQUEyQixPQUFYWSxZQUFXLDJCQUF5QmhCO1lBQy9GLE9BQU87Z0JBQ0xVLFdBQVdHLGlCQUFRLENBQUNDLHVCQUF1QixDQUFDZCxjQUFjVztZQUM1RDtRQUNGO1FBRUEsSUFBSUQsYUFBYSxNQUFNO1lBQ3JCLElBQU1PLHFCQUFxQkMsa0JBQWtCLENBQUNDLFlBQVksQ0FBQ1QsV0FDckRVLG1CQUFtQkgsbUJBQW1CSSxNQUFNLENBQUNuQjtZQUVuRCxJQUFJa0Isa0JBQWtCO2dCQUNwQmpCLG1CQUFtQjtZQUNyQjtRQUNGO0lBQ0Y7SUFFQSxJQUFJQSxrQkFBa0I7UUFDcEJELFlBQVlPLEtBQUssQ0FBQyxBQUFDLG9CQUFrQyxPQUFmTCxnQkFBZSxnQkFBY0o7SUFDckU7SUFFQSxPQUFPRztBQUNUO0FBRU8sU0FBU0oseUJBQXlCQyxZQUFZLEVBQUVzQixZQUFZLEVBQUVDLFdBQVc7SUFDOUUsSUFBSUM7SUFFSixJQUFNcEIsaUJBQWlCa0IsYUFBYWpCLFlBQVksQ0FBQ0w7SUFFakRzQixhQUFhaEIsS0FBSyxDQUFDLEFBQUMsa0JBQWdDLE9BQWZGLGdCQUFlLDZCQUEyQko7SUFFL0UsSUFBTXlCLFlBQVksRUFBRSxFQUNkQyx3QkFBd0JDLElBQUFBLHNCQUFtQixFQUFDM0IsY0FBY3lCLFdBQVdILGNBQWNDO0lBRXpGQyw2QkFBNkJFLHVCQUF1QixHQUFHO0lBRXZELElBQUlGLDRCQUE0QjtRQUM5QkYsYUFBYWIsS0FBSyxDQUFDLEFBQUMsb0JBQWtDLE9BQWZMLGdCQUFlLDJCQUF5Qko7SUFDakY7SUFFQSxPQUFPd0I7QUFDVCJ9

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "0.0.864",
+  "version": "0.0.866",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,9 +12,9 @@
   "dependencies": {
     "argumentative": "^2.0.28",
     "necessary": "^14.0.1",
-    "occam-custom-grammars": "^5.0.768",
-    "occam-entities": "^1.0.129",
-    "occam-file-system": "^6.0.171",
+    "occam-custom-grammars": "^5.0.771",
+    "occam-entities": "^1.0.132",
+    "occam-file-system": "^6.0.174",
     "occam-grammar-utilities": "^8.0.205",
     "occam-query": "^3.1.174"
   },

package/src/axiomLemmaTheoremConjecture.js CHANGED Viewed

@@ -32,17 +32,17 @@ export default class AxiomLemmaTheoremConjecture {
     return this.localContext;
   }
-  matchLabelName(labelName) {
-    const labelNameMatches = this.labels.some((label) => {
-      const name = labelName, ///
-            labelMatchesName = label.matchName(name);
+  matchLabelNode(labelNode) {
+    const labelNodeMatches = this.labels.some((label) => {
+      const node = labelNode, ///
+            labelMatchesNode = label.matchNode(node);
-      if (labelMatchesName) {
+      if (labelMatchesNode) {
         return true;
       }
     });
-    return labelNameMatches;
+    return labelNodeMatches;
   }
   matchStatement(statementNode, statementLocalContext) {