occam-verify-cli 1.0.21 → 1.0.22

package/lib/dom/assertion/property.js

@@ -90,16 +90,16 @@ function _interop_require_wildcard(obj, nodeInterop) {
     return newObj;
 }
 var _PropertyAssertion;
-var variableNodeQuery = (0, _query.nodeQuery)("/term/variable!"), propertyNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/property"), leftTermNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/term[0]"), rightTermNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/term[1]"), propertyAssertionNodeQuery = (0, _query.nodeQuery)("/statement/propertyAssertion");
+var termNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/term"), variableNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/variable"), propertyNodeQuery = (0, _query.nodeQuery)("/propertyAssertion/property"), propertyAssertionNodeQuery = (0, _query.nodeQuery)("/statement/propertyAssertion");
 var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ function() {
-    function PropertyAssertion(string, node, tokens, property, leftTerm, rightTerm) {
+    function PropertyAssertion(string, node, tokens, property, variable, term) {
         _class_call_check(this, PropertyAssertion);
         this.string = string;
         this.node = node;
         this.tokens = tokens;
         this.property = property;
-        this.leftTerm = leftTerm;
-        this.rightTerm = rightTerm;
+        this.variable = variable;
+        this.term = term;
     }
     _create_class(PropertyAssertion, [
         {
@@ -127,15 +127,15 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
             }
         },
         {
-            key: "getLeftTerm",
-            value: function getLeftTerm() {
-                return this.leftTerm;
+            key: "getVariable",
+            value: function getVariable() {
+                return this.variable;
             }
         },
         {
-            key: "getRightTerm",
-            value: function getRightTerm() {
-                return this.rightTerm;
+            key: "getTerm",
+            value: function getTerm() {
+                return this.term;
             }
         },
         {
@@ -144,10 +144,10 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
                 var verified = false;
                 var propertyAssertionString = this.string; ///
                 context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion..."));
-                var rightTermVerified = this.verifyRightTerm(assignments, stated, context);
-                if (rightTermVerified) {
-                    var leftTermVerified = this.verifyLeftTerm(assignments, stated, context);
-                    if (leftTermVerified) {
+                var variableVerified = this.verifyVariable(assignments, stated, context);
+                if (variableVerified) {
+                    var termVerified = this.verifyTerm(assignments, stated, context);
+                    if (termVerified) {
                         var propertyVerified = this.verifyProperty(assignments, stated, context);
                         if (propertyVerified) {
                             var verifiedWhenStated = false, verifiedWhenDerived = false;
@@ -168,21 +168,50 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
                 return verified;
             }
         },
+        {
+            key: "verifyTerm",
+            value: function verifyTerm(assignments, stated, context) {
+                var termVerified;
+                var termString = this.term.getString(), propertyAssertionString = this.string; ///
+                context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion's '").concat(termString, "' term..."));
+                termVerified = this.term.verify(context, function() {
+                    var verifiedAhead = true;
+                    return verifiedAhead;
+                });
+                if (termVerified) {
+                    context.debug("...verified the '".concat(propertyAssertionString, "' property assertion's '").concat(termString, "' term."));
+                }
+                return termVerified;
+            }
+        },
+        {
+            key: "verifyVariable",
+            value: function verifyVariable(assignments, stated, context) {
+                var variableVerified;
+                var variableString = this.variable.getString(), propertyAssertionString = this.string; ///
+                context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion's '").concat(variableString, "' variable..."));
+                variableVerified = this.variable.verify(context);
+                if (variableVerified) {
+                    context.debug("...verified the '".concat(propertyAssertionString, "' property assertion's '").concat(variableString, "' variable."));
+                }
+                return variableVerified;
+            }
+        },
         {
             key: "verifyProperty",
             value: function verifyProperty(assignments, stated, context) {
                 var propertyVerified;
                 var propertyString = this.property.getString(), propertyAssertionString = this.string; ///
                 context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion's '").concat(propertyString, "' property..."));
-                var rightTermType = this.rightTerm.getType(), propertyName = this.property.getName(), property = rightTermType.findPropertyByPropertyName(propertyName);
+                var termType = this.term.getType(), propertyName = this.property.getName(), property = termType.findPropertyByPropertyName(propertyName);
                 if (property === null) {
-                    var rightTermTypeName = rightTermType.getName();
-                    context.debug("The '".concat(propertyName, "' property is not a property of the right term's '").concat(rightTermTypeName, "' type."));
+                    var termTypeName = termType.getName();
+                    context.debug("The '".concat(propertyName, "' property is not a property of the term's '").concat(termTypeName, "' type."));
                 } else {
-                    var leftTermType = this.leftTerm.getType(), propertyType = property.getType(), leftTermTypeEqualToOrSubTypeOfPropertyType = leftTermType.isEqualToOrSubTypeOf(propertyType);
-                    if (!leftTermTypeEqualToOrSubTypeOfPropertyType) {
-                        var leftTermTypeName = leftTermType.getName(), propertyTypeName = propertyType.getName();
-                        context.debug("The left term's '".concat(leftTermTypeName, "' type is not equal to or a sub-type of the '").concat(propertyName, "' property's '").concat(propertyTypeName, "' type."));
+                    var variableType = this.variable.getType(), propertyType = property.getType(), variableTypeEqualToOrSubTypeOfPropertyType = variableType.isEqualToOrSubTypeOf(propertyType);
+                    if (!variableTypeEqualToOrSubTypeOfPropertyType) {
+                        var variableTypeName = variableType.getName(), propertyTypeName = propertyType.getName();
+                        context.debug("The variable's '".concat(variableTypeName, "' type is not equal to or a sub-type of the '").concat(propertyName, "' property's '").concat(propertyTypeName, "' type."));
                     } else {
                         propertyVerified = true;
                     }
@@ -193,38 +222,6 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
                 return propertyVerified;
             }
         },
-        {
-            key: "verifyLeftTerm",
-            value: function verifyLeftTerm(assignments, stated, context) {
-                var leftTermVerified;
-                var leftTermString = this.leftTerm.getString(), propertyAssertionString = this.string; ///
-                context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion's '").concat(leftTermString, "' left term..."));
-                leftTermVerified = this.leftTerm.verify(context, function() {
-                    var verifiedAhead = true;
-                    return verifiedAhead;
-                });
-                if (leftTermVerified) {
-                    context.debug("...verified the '".concat(propertyAssertionString, "' property assertion's '").concat(leftTermString, "' left term."));
-                }
-                return leftTermVerified;
-            }
-        },
-        {
-            key: "verifyRightTerm",
-            value: function verifyRightTerm(assignments, stated, context) {
-                var rightTermVerified;
-                var rightTermString = this.rightTerm.getString(), propertyAssertionString = this.string; ///
-                context.trace("Verifying the '".concat(propertyAssertionString, "' property assertion's '").concat(rightTermString, "' right term..."));
-                rightTermVerified = this.rightTerm.verify(context, function() {
-                    var verifiedAhead = true;
-                    return verifiedAhead;
-                });
-                if (rightTermVerified) {
-                    context.debug("...verified the '".concat(propertyAssertionString, "' property assertion's '").concat(rightTermString, "' right term."));
-                }
-                return rightTermVerified;
-            }
-        },
         {
             key: "verifyWhenStated",
             value: function verifyWhenStated(assignments, context) {
@@ -232,12 +229,7 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
                 var propertyAssertionString = this.string; ///
                 context.trace("Verifying the '".concat(propertyAssertionString, "' stated property assertion..."));
                 if (assignments !== null) {
-                    var Variable = _dom.default.Variable, leftTermNode = this.leftTerm.getNode(), termNode = leftTermNode, variableNode = variableNodeQuery(termNode);
-                    if (variableNode) variable = Variable.fromVariableNodeAndType(variableNode, this.type, context);
-                    if (variable !== null) {
-                        var variableAssignment = _variable.default.fromVariable(variable), assignment = variableAssignment; ///
-                        assignments.push(assignment);
-                    }
+                    var Variable = _dom.default.Variable, termNode = this.term.getNode(), variableNode = variableNodeQuery(termNode), variable = Variable.fromVariableNodeAndType(variableNode, this.type, context);
                 }
                 verifiedWhenStated = true;
                 if (verifiedWhenStated) {
@@ -266,8 +258,8 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
                 var propertyAssertion = null;
                 var propertyAssertionNode = propertyAssertionNodeQuery(statementNode);
                 if (propertyAssertionNode !== null) {
-                    var Term = _dom.default.Term, Property = _dom.default.Property, node = propertyAssertionNode, string = context.nodeAsString(node), tokens = context.nodeAsTokens(node), propertyNode = propertyNodeQuery(propertyAssertionNode), leftTermNode = leftTermNodeQuery(propertyAssertionNode), rightTermNode = rightTermNodeQuery(propertyAssertionNode), property = Property.fromPropertyNode(propertyNode, context), leftTerm = Term.fromTermNode(leftTermNode, context), rightTerm = Term.fromTermNode(rightTermNode, context);
-                    propertyAssertion = new PropertyAssertion(string, node, tokens, property, leftTerm, rightTerm);
+                    var Term = _dom.default.Term, Variable = _dom.default.Variable, Property = _dom.default.Property, node = propertyAssertionNode, string = context.nodeAsString(node), tokens = context.nodeAsTokens(node), propertyNode = propertyNodeQuery(propertyAssertionNode), variableNode = variableNodeQuery(propertyAssertionNode), termNode = termNodeQuery(propertyAssertionNode), property = Property.fromPropertyNode(propertyNode, context), variable = Variable.fromVariableNode(variableNode, context), term = Term.fromTermNode(termNode, context);
+                    propertyAssertion = new PropertyAssertion(string, node, tokens, property, variable, term);
                 }
                 return propertyAssertion;
             }
@@ -276,4 +268,4 @@ var _default = (0, _dom.domAssigned)((_PropertyAssertion = /*#__PURE__*/ functio
     return PropertyAssertion;
 }(), _define_property(_PropertyAssertion, "name", "PropertyAssertion"), _PropertyAssertion));
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/assertion/property.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../../dom\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { domAssigned } from \"../../dom\";\nimport VariableAssignment from \"../../assignment/variable\";\n\nconst variableNodeQuery = nodeQuery(\"/term/variable!\"),\n      propertyNodeQuery = nodeQuery(\"/propertyAssertion/property\"),\n      leftTermNodeQuery = nodeQuery(\"/propertyAssertion/term[0]\"),\n      rightTermNodeQuery = nodeQuery(\"/propertyAssertion/term[1]\"),\n      propertyAssertionNodeQuery = nodeQuery(\"/statement/propertyAssertion\");\n\nexport default domAssigned(class PropertyAssertion {\n  constructor(string, node, tokens, property, leftTerm, rightTerm) {\n    this.string = string;\n    this.node = node;\n    this.tokens = tokens;\n    this.property = property;\n    this.leftTerm = leftTerm;\n    this.rightTerm = rightTerm;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getTokens() {\n    return this.tokens;\n  }\n\n  getProperty() {\n    return this.property;\n  }\n\n  getLeftTerm() {\n    return this.leftTerm;\n  }\n\n  getRightTerm() {\n    return this.rightTerm;\n  }\n\n  verify(assignments, stated, context) {\n    let verified = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion...`);\n\n    const rightTermVerified = this.verifyRightTerm(assignments, stated, context);\n\n    if (rightTermVerified) {\n      const leftTermVerified = this.verifyLeftTerm(assignments, stated, context);\n\n      if (leftTermVerified) {\n        const propertyVerified = this.verifyProperty(assignments, stated, context);\n\n        if (propertyVerified) {\n          let verifiedWhenStated = false,\n              verifiedWhenDerived = false;\n\n          if (stated) {\n            verifiedWhenStated = this.verifyWhenStated(assignments, context);\n          } else {\n            verifiedWhenDerived = this.verifyWhenDerived(context);\n          }\n\n          if (verifiedWhenStated || verifiedWhenDerived) {\n            verified = true;\n          }\n        }\n      }\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion.`);\n    }\n\n    return verified;\n  }\n\n  verifyProperty(assignments, stated, context) {\n    let propertyVerified;\n\n    const propertyString = this.property.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${propertyString}' property...`);\n\n    const rightTermType = this.rightTerm.getType(),\n          propertyName = this.property.getName(),\n          property = rightTermType.findPropertyByPropertyName(propertyName);\n\n    if (property === null) {\n      const rightTermTypeName = rightTermType.getName();\n\n      context.debug(`The '${propertyName}' property is not a property of the right term's '${rightTermTypeName}' type.`);\n    } else {\n      const leftTermType = this.leftTerm.getType(),\n            propertyType = property.getType(),\n            leftTermTypeEqualToOrSubTypeOfPropertyType = leftTermType.isEqualToOrSubTypeOf(propertyType);\n\n      if (!leftTermTypeEqualToOrSubTypeOfPropertyType) {\n        const leftTermTypeName = leftTermType.getName(),\n              propertyTypeName = propertyType.getName();\n\n        context.debug(`The left term's '${leftTermTypeName}' type is not equal to or a sub-type of the '${propertyName}' property's '${propertyTypeName}' type.`);\n      } else {\n        propertyVerified = true;\n      }\n    }\n\n    if (propertyVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${propertyString}' property.`);\n    }\n\n    return propertyVerified;\n  }\n\n  verifyLeftTerm(assignments, stated, context) {\n    let leftTermVerified;\n\n    const leftTermString = this.leftTerm.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${leftTermString}' left term...`);\n\n    leftTermVerified = this.leftTerm.verify(context, () => {\n      const verifiedAhead = true;\n\n      return verifiedAhead;\n    });\n\n    if (leftTermVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${leftTermString}' left term.`);\n    }\n\n    return leftTermVerified;\n  }\n\n  verifyRightTerm(assignments, stated, context) {\n    let rightTermVerified;\n\n    const rightTermString = this.rightTerm.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${rightTermString}' right term...`);\n\n    rightTermVerified = this.rightTerm.verify(context, () => {\n      const verifiedAhead = true;\n\n      return verifiedAhead;\n    });\n\n    if (rightTermVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${rightTermString}' right term.`);\n    }\n\n    return rightTermVerified;\n  }\n\n  verifyWhenStated(assignments, context) {\n    let verifiedWhenStated = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' stated property assertion...`);\n\n    if (assignments !== null) {\n      const { Variable } = dom,\n            leftTermNode = this.leftTerm.getNode(),\n            termNode = leftTermNode,  ///\n            variableNode = variableNodeQuery(termNode);\n\n      if (variableNode)\n            variable = Variable.fromVariableNodeAndType(variableNode, this.type, context);\n\n      if (variable !== null) {\n        const variableAssignment = VariableAssignment.fromVariable(variable),\n              assignment = variableAssignment;  ///\n\n        assignments.push(assignment);\n      }\n    }\n\n    verifiedWhenStated = true;\n\n    if (verifiedWhenStated) {\n      context.debug(`...verified the '${propertyAssertionString}' stated property assertion.`);\n    }\n\n    return verifiedWhenStated;\n  }\n\n  verifyWhenDerived(assignments, context) {\n    let verifiedWhenDerived = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' derived property assertion...`);\n\n    debugger\n\n    if (verifiedWhenDerived) {\n      context.debug(`...verified the '${propertyAssertionString}' derived property assertion.`);\n    }\n\n    return verifiedWhenDerived;\n  }\n\n  static name = \"PropertyAssertion\";\n\n  static fromStatementNode(statementNode, context) {\n    let propertyAssertion = null;\n\n    const propertyAssertionNode = propertyAssertionNodeQuery(statementNode);\n\n    if (propertyAssertionNode !== null) {\n      const { Term, Property } = dom,\n            node = propertyAssertionNode,  ///\n            string = context.nodeAsString(node),\n            tokens = context.nodeAsTokens(node),\n            propertyNode = propertyNodeQuery(propertyAssertionNode),\n            leftTermNode = leftTermNodeQuery(propertyAssertionNode),\n            rightTermNode = rightTermNodeQuery(propertyAssertionNode),\n            property = Property.fromPropertyNode(propertyNode, context),\n            leftTerm = Term.fromTermNode(leftTermNode, context),\n            rightTerm = Term.fromTermNode(rightTermNode, context);\n\n      propertyAssertion = new PropertyAssertion(string, node, tokens, property, leftTerm, rightTerm);\n    }\n\n    return propertyAssertion;\n  }\n});\n"],"names":["variableNodeQuery","nodeQuery","propertyNodeQuery","leftTermNodeQuery","rightTermNodeQuery","propertyAssertionNodeQuery","domAssigned","PropertyAssertion","string","node","tokens","property","leftTerm","rightTerm","getString","getNode","getTokens","getProperty","getLeftTerm","getRightTerm","verify","assignments","stated","context","verified","propertyAssertionString","trace","rightTermVerified","verifyRightTerm","leftTermVerified","verifyLeftTerm","propertyVerified","verifyProperty","verifiedWhenStated","verifiedWhenDerived","verifyWhenStated","verifyWhenDerived","debug","propertyString","rightTermType","getType","propertyName","getName","findPropertyByPropertyName","rightTermTypeName","leftTermType","propertyType","leftTermTypeEqualToOrSubTypeOfPropertyType","isEqualToOrSubTypeOf","leftTermTypeName","propertyTypeName","leftTermString","verifiedAhead","rightTermString","Variable","dom","leftTermNode","termNode","variableNode","variable","fromVariableNodeAndType","type","variableAssignment","VariableAssignment","fromVariable","assignment","push","fromStatementNode","statementNode","propertyAssertion","propertyAssertionNode","Term","Property","nodeAsString","nodeAsTokens","propertyNode","rightTermNode","fromPropertyNode","fromTermNode","name"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/dom/assertion/property.js"],"sourcesContent":["\"use strict\";\n\nimport dom from \"../../dom\";\n\nimport { nodeQuery } from \"../../utilities/query\";\nimport { domAssigned } from \"../../dom\";\nimport VariableAssignment from \"../../assignment/variable\";\n\nconst termNodeQuery = nodeQuery(\"/propertyAssertion/term\"),\n      variableNodeQuery = nodeQuery(\"/propertyAssertion/variable\"),\n      propertyNodeQuery = nodeQuery(\"/propertyAssertion/property\"),\n      propertyAssertionNodeQuery = nodeQuery(\"/statement/propertyAssertion\");\n\nexport default domAssigned(class PropertyAssertion {\n  constructor(string, node, tokens, property, variable, term) {\n    this.string = string;\n    this.node = node;\n    this.tokens = tokens;\n    this.property = property;\n    this.variable = variable;\n    this.term = term;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getTokens() {\n    return this.tokens;\n  }\n\n  getProperty() {\n    return this.property;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  getTerm() {\n    return this.term;\n  }\n\n  verify(assignments, stated, context) {\n    let verified = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion...`);\n\n    const variableVerified = this.verifyVariable(assignments, stated, context);\n\n    if (variableVerified) {\n      const termVerified = this.verifyTerm(assignments, stated, context);\n\n      if (termVerified) {\n        const propertyVerified = this.verifyProperty(assignments, stated, context);\n\n        if (propertyVerified) {\n          let verifiedWhenStated = false,\n              verifiedWhenDerived = false;\n\n          if (stated) {\n            verifiedWhenStated = this.verifyWhenStated(assignments, context);\n          } else {\n            verifiedWhenDerived = this.verifyWhenDerived(context);\n          }\n\n          if (verifiedWhenStated || verifiedWhenDerived) {\n            verified = true;\n          }\n        }\n      }\n    }\n\n    if (verified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion.`);\n    }\n\n    return verified;\n  }\n\n  verifyTerm(assignments, stated, context) {\n    let termVerified;\n\n    const termString = this.term.getString(),\n      propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${termString}' term...`);\n\n    termVerified = this.term.verify(context, () => {\n      const verifiedAhead = true;\n\n      return verifiedAhead;\n    });\n\n    if (termVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${termString}' term.`);\n    }\n\n    return termVerified;\n  }\n\n  verifyVariable(assignments, stated, context) {\n    let variableVerified;\n\n    const variableString = this.variable.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${variableString}' variable...`);\n\n    variableVerified = this.variable.verify(context);\n\n    if (variableVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${variableString}' variable.`);\n    }\n\n    return variableVerified;\n  }\n\n  verifyProperty(assignments, stated, context) {\n    let propertyVerified;\n\n    const propertyString = this.property.getString(),\n          propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${propertyString}' property...`);\n\n    const termType = this.term.getType(),\n          propertyName = this.property.getName(),\n          property = termType.findPropertyByPropertyName(propertyName);\n\n    if (property === null) {\n      const termTypeName = termType.getName();\n\n      context.debug(`The '${propertyName}' property is not a property of the term's '${termTypeName}' type.`);\n    } else {\n      const variableType = this.variable.getType(),\n            propertyType = property.getType(),\n            variableTypeEqualToOrSubTypeOfPropertyType = variableType.isEqualToOrSubTypeOf(propertyType);\n\n      if (!variableTypeEqualToOrSubTypeOfPropertyType) {\n        const variableTypeName = variableType.getName(),\n              propertyTypeName = propertyType.getName();\n\n        context.debug(`The variable's '${variableTypeName}' type is not equal to or a sub-type of the '${propertyName}' property's '${propertyTypeName}' type.`);\n      } else {\n        propertyVerified = true;\n      }\n    }\n\n    if (propertyVerified) {\n      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${propertyString}' property.`);\n    }\n\n    return propertyVerified;\n  }\n\n  verifyWhenStated(assignments, context) {\n    let verifiedWhenStated = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' stated property assertion...`);\n\n    if (assignments !== null) {\n      const { Variable } = dom,\n            termNode = this.term.getNode(),\n            variableNode = variableNodeQuery(termNode),\n            variable = Variable.fromVariableNodeAndType(variableNode, this.type, context);\n\n    }\n\n    verifiedWhenStated = true;\n\n    if (verifiedWhenStated) {\n      context.debug(`...verified the '${propertyAssertionString}' stated property assertion.`);\n    }\n\n    return verifiedWhenStated;\n  }\n\n  verifyWhenDerived(assignments, context) {\n    let verifiedWhenDerived = false;\n\n    const propertyAssertionString = this.string; ///\n\n    context.trace(`Verifying the '${propertyAssertionString}' derived property assertion...`);\n\n    debugger\n\n    if (verifiedWhenDerived) {\n      context.debug(`...verified the '${propertyAssertionString}' derived property assertion.`);\n    }\n\n    return verifiedWhenDerived;\n  }\n\n  static name = \"PropertyAssertion\";\n\n  static fromStatementNode(statementNode, context) {\n    let propertyAssertion = null;\n\n    const propertyAssertionNode = propertyAssertionNodeQuery(statementNode);\n\n    if (propertyAssertionNode !== null) {\n      const { Term, Variable, Property } = dom,\n            node = propertyAssertionNode,  ///\n            string = context.nodeAsString(node),\n            tokens = context.nodeAsTokens(node),\n            propertyNode = propertyNodeQuery(propertyAssertionNode),\n            variableNode = variableNodeQuery(propertyAssertionNode),\n            termNode = termNodeQuery(propertyAssertionNode),\n            property = Property.fromPropertyNode(propertyNode, context),\n            variable = Variable.fromVariableNode(variableNode, context),\n            term = Term.fromTermNode(termNode, context);\n\n      propertyAssertion = new PropertyAssertion(string, node, tokens, property, variable, term);\n    }\n\n    return propertyAssertion;\n  }\n});\n"],"names":["termNodeQuery","nodeQuery","variableNodeQuery","propertyNodeQuery","propertyAssertionNodeQuery","domAssigned","PropertyAssertion","string","node","tokens","property","variable","term","getString","getNode","getTokens","getProperty","getVariable","getTerm","verify","assignments","stated","context","verified","propertyAssertionString","trace","variableVerified","verifyVariable","termVerified","verifyTerm","propertyVerified","verifyProperty","verifiedWhenStated","verifiedWhenDerived","verifyWhenStated","verifyWhenDerived","debug","termString","verifiedAhead","variableString","propertyString","termType","getType","propertyName","getName","findPropertyByPropertyName","termTypeName","variableType","propertyType","variableTypeEqualToOrSubTypeOfPropertyType","isEqualToOrSubTypeOf","variableTypeName","propertyTypeName","Variable","dom","termNode","variableNode","fromVariableNodeAndType","type","fromStatementNode","statementNode","propertyAssertion","propertyAssertionNode","Term","Property","nodeAsString","nodeAsTokens","propertyNode","fromPropertyNode","fromVariableNode","fromTermNode","name"],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-verify-cli",
   "author": "James Smith",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-verify-cli",
   "description": "Occam's Verifier",
@@ -12,7 +12,7 @@
   "dependencies": {
     "argumentative": "^2.0.32",
     "necessary": "^14.2.1",
-    "occam-custom-grammars": "^5.0.1053",
+    "occam-custom-grammars": "^5.0.1055",
     "occam-entities": "^1.0.276",
     "occam-file-system": "^6.0.298",
     "occam-furtle": "^2.0.42",

package/src/dom/assertion/property.js

@@ -6,20 +6,19 @@ import { nodeQuery } from "../../utilities/query";
 import { domAssigned } from "../../dom";
 import VariableAssignment from "../../assignment/variable";
 
-const variableNodeQuery = nodeQuery("/term/variable!"),
+const termNodeQuery = nodeQuery("/propertyAssertion/term"),
+      variableNodeQuery = nodeQuery("/propertyAssertion/variable"),
       propertyNodeQuery = nodeQuery("/propertyAssertion/property"),
-      leftTermNodeQuery = nodeQuery("/propertyAssertion/term[0]"),
-      rightTermNodeQuery = nodeQuery("/propertyAssertion/term[1]"),
       propertyAssertionNodeQuery = nodeQuery("/statement/propertyAssertion");
 
 export default domAssigned(class PropertyAssertion {
-  constructor(string, node, tokens, property, leftTerm, rightTerm) {
+  constructor(string, node, tokens, property, variable, term) {
     this.string = string;
     this.node = node;
     this.tokens = tokens;
     this.property = property;
-    this.leftTerm = leftTerm;
-    this.rightTerm = rightTerm;
+    this.variable = variable;
+    this.term = term;
   }
 
   getString() {
@@ -38,12 +37,12 @@ export default domAssigned(class PropertyAssertion {
     return this.property;
   }
 
-  getLeftTerm() {
-    return this.leftTerm;
+  getVariable() {
+    return this.variable;
   }
 
-  getRightTerm() {
-    return this.rightTerm;
+  getTerm() {
+    return this.term;
   }
 
   verify(assignments, stated, context) {
@@ -53,12 +52,12 @@ export default domAssigned(class PropertyAssertion {
 
     context.trace(`Verifying the '${propertyAssertionString}' property assertion...`);
 
-    const rightTermVerified = this.verifyRightTerm(assignments, stated, context);
+    const variableVerified = this.verifyVariable(assignments, stated, context);
 
-    if (rightTermVerified) {
-      const leftTermVerified = this.verifyLeftTerm(assignments, stated, context);
+    if (variableVerified) {
+      const termVerified = this.verifyTerm(assignments, stated, context);
 
-      if (leftTermVerified) {
+      if (termVerified) {
         const propertyVerified = this.verifyProperty(assignments, stated, context);
 
         if (propertyVerified) {
@@ -85,6 +84,44 @@ export default domAssigned(class PropertyAssertion {
     return verified;
   }
 
+  verifyTerm(assignments, stated, context) {
+    let termVerified;
+
+    const termString = this.term.getString(),
+      propertyAssertionString = this.string; ///
+
+    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${termString}' term...`);
+
+    termVerified = this.term.verify(context, () => {
+      const verifiedAhead = true;
+
+      return verifiedAhead;
+    });
+
+    if (termVerified) {
+      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${termString}' term.`);
+    }
+
+    return termVerified;
+  }
+
+  verifyVariable(assignments, stated, context) {
+    let variableVerified;
+
+    const variableString = this.variable.getString(),
+          propertyAssertionString = this.string; ///
+
+    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${variableString}' variable...`);
+
+    variableVerified = this.variable.verify(context);
+
+    if (variableVerified) {
+      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${variableString}' variable.`);
+    }
+
+    return variableVerified;
+  }
+
   verifyProperty(assignments, stated, context) {
     let propertyVerified;
 
@@ -93,24 +130,24 @@ export default domAssigned(class PropertyAssertion {
 
     context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${propertyString}' property...`);
 
-    const rightTermType = this.rightTerm.getType(),
+    const termType = this.term.getType(),
           propertyName = this.property.getName(),
-          property = rightTermType.findPropertyByPropertyName(propertyName);
+          property = termType.findPropertyByPropertyName(propertyName);
 
     if (property === null) {
-      const rightTermTypeName = rightTermType.getName();
+      const termTypeName = termType.getName();
 
-      context.debug(`The '${propertyName}' property is not a property of the right term's '${rightTermTypeName}' type.`);
+      context.debug(`The '${propertyName}' property is not a property of the term's '${termTypeName}' type.`);
     } else {
-      const leftTermType = this.leftTerm.getType(),
+      const variableType = this.variable.getType(),
             propertyType = property.getType(),
-            leftTermTypeEqualToOrSubTypeOfPropertyType = leftTermType.isEqualToOrSubTypeOf(propertyType);
+            variableTypeEqualToOrSubTypeOfPropertyType = variableType.isEqualToOrSubTypeOf(propertyType);
 
-      if (!leftTermTypeEqualToOrSubTypeOfPropertyType) {
-        const leftTermTypeName = leftTermType.getName(),
+      if (!variableTypeEqualToOrSubTypeOfPropertyType) {
+        const variableTypeName = variableType.getName(),
               propertyTypeName = propertyType.getName();
 
-        context.debug(`The left term's '${leftTermTypeName}' type is not equal to or a sub-type of the '${propertyName}' property's '${propertyTypeName}' type.`);
+        context.debug(`The variable's '${variableTypeName}' type is not equal to or a sub-type of the '${propertyName}' property's '${propertyTypeName}' type.`);
       } else {
         propertyVerified = true;
       }
@@ -123,48 +160,6 @@ export default domAssigned(class PropertyAssertion {
     return propertyVerified;
   }
 
-  verifyLeftTerm(assignments, stated, context) {
-    let leftTermVerified;
-
-    const leftTermString = this.leftTerm.getString(),
-          propertyAssertionString = this.string; ///
-
-    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${leftTermString}' left term...`);
-
-    leftTermVerified = this.leftTerm.verify(context, () => {
-      const verifiedAhead = true;
-
-      return verifiedAhead;
-    });
-
-    if (leftTermVerified) {
-      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${leftTermString}' left term.`);
-    }
-
-    return leftTermVerified;
-  }
-
-  verifyRightTerm(assignments, stated, context) {
-    let rightTermVerified;
-
-    const rightTermString = this.rightTerm.getString(),
-          propertyAssertionString = this.string; ///
-
-    context.trace(`Verifying the '${propertyAssertionString}' property assertion's '${rightTermString}' right term...`);
-
-    rightTermVerified = this.rightTerm.verify(context, () => {
-      const verifiedAhead = true;
-
-      return verifiedAhead;
-    });
-
-    if (rightTermVerified) {
-      context.debug(`...verified the '${propertyAssertionString}' property assertion's '${rightTermString}' right term.`);
-    }
-
-    return rightTermVerified;
-  }
-
   verifyWhenStated(assignments, context) {
     let verifiedWhenStated = false;
 
@@ -174,19 +169,10 @@ export default domAssigned(class PropertyAssertion {
 
     if (assignments !== null) {
       const { Variable } = dom,
-            leftTermNode = this.leftTerm.getNode(),
-            termNode = leftTermNode,  ///
-            variableNode = variableNodeQuery(termNode);
-
-      if (variableNode)
+            termNode = this.term.getNode(),
+            variableNode = variableNodeQuery(termNode),
             variable = Variable.fromVariableNodeAndType(variableNode, this.type, context);
 
-      if (variable !== null) {
-        const variableAssignment = VariableAssignment.fromVariable(variable),
-              assignment = variableAssignment;  ///
-
-        assignments.push(assignment);
-      }
     }
 
     verifiedWhenStated = true;
@@ -222,18 +208,18 @@ export default domAssigned(class PropertyAssertion {
     const propertyAssertionNode = propertyAssertionNodeQuery(statementNode);
 
     if (propertyAssertionNode !== null) {
-      const { Term, Property } = dom,
+      const { Term, Variable, Property } = dom,
             node = propertyAssertionNode,  ///
             string = context.nodeAsString(node),
             tokens = context.nodeAsTokens(node),
             propertyNode = propertyNodeQuery(propertyAssertionNode),
-            leftTermNode = leftTermNodeQuery(propertyAssertionNode),
-            rightTermNode = rightTermNodeQuery(propertyAssertionNode),
+            variableNode = variableNodeQuery(propertyAssertionNode),
+            termNode = termNodeQuery(propertyAssertionNode),
             property = Property.fromPropertyNode(propertyNode, context),
-            leftTerm = Term.fromTermNode(leftTermNode, context),
-            rightTerm = Term.fromTermNode(rightTermNode, context);
+            variable = Variable.fromVariableNode(variableNode, context),
+            term = Term.fromTermNode(termNode, context);
 
-      propertyAssertion = new PropertyAssertion(string, node, tokens, property, leftTerm, rightTerm);
+      propertyAssertion = new PropertyAssertion(string, node, tokens, property, variable, term);
     }
 
     return propertyAssertion;