occam-verify-cli 0.0.1197 → 0.0.1199

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.
package/lib/dom/term.js CHANGED
@@ -97,7 +97,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
97
97
  }
98
98
  var _Term;
99
99
  var filter = _necessary.arrayUtilities.filter, compress = _necessary.arrayUtilities.compress;
100
- var variableNodesQuery = (0, _query.nodesQuery)("//variable"), termVariableNodeQuery = (0, _query.nodeQuery)("/*/term[0]/variable!");
100
+ var variableNodesQuery = (0, _query.nodesQuery)("//variable"), termVariableNodeQuery = (0, _query.nodeQuery)("/term/variable!"), definedAssertionTermNodeQuery = (0, _query.nodeQuery)("/definedAssertion/term"), containedAssertionTermNodeQuery = (0, _query.nodeQuery)("/containedAssertion/term");
101
101
  var _default = (0, _dom.domAssigned)((_Term = /*#__PURE__*/ function() {
102
102
  function Term(string, node, type) {
103
103
  _class_call_check(this, Term);
@@ -323,10 +323,13 @@ var _default = (0, _dom.domAssigned)((_Term = /*#__PURE__*/ function() {
323
323
  key: "fromDefinedAssertionNode",
324
324
  value: function fromDefinedAssertionNode(definedAssertionNode, context) {
325
325
  var term = null;
326
- var termVariableNode = termVariableNodeQuery(definedAssertionNode);
327
- if (termVariableNode !== null) {
328
- var node = termVariableNode, string = context.nodeAsString(node), type = null;
329
- term = new Term(string, node, type);
326
+ var definedAssertionTermNode = definedAssertionTermNodeQuery(definedAssertionNode);
327
+ if (definedAssertionTermNode !== null) {
328
+ var termNode = definedAssertionTermNode, termVariableNode = termVariableNodeQuery(termNode);
329
+ if (termVariableNode !== null) {
330
+ var node = termNode, string = context.nodeAsString(node), type = null;
331
+ term = new Term(string, node, type);
332
+ }
330
333
  }
331
334
  return term;
332
335
  }
@@ -335,10 +338,13 @@ var _default = (0, _dom.domAssigned)((_Term = /*#__PURE__*/ function() {
335
338
  key: "fromContainedAssertionNode",
336
339
  value: function fromContainedAssertionNode(containedAssertionNode, context) {
337
340
  var term = null;
338
- var termVariableNode = termVariableNodeQuery(containedAssertionNode);
339
- if (termVariableNode !== null) {
340
- var node = termVariableNode, string = context.nodeAsString(node), type = null;
341
- term = new Term(string, node, type);
341
+ var containedAssertionTermNode = containedAssertionTermNodeQuery(containedAssertionNode);
342
+ if (containedAssertionTermNode !== null) {
343
+ var termNode = containedAssertionTermNode, termVariableNode = termVariableNodeQuery(termNode);
344
+ if (termVariableNode !== null) {
345
+ var node = termNode, string = context.nodeAsString(node), type = null;
346
+ term = new Term(string, node, type);
347
+ }
342
348
  }
343
349
  return term;
344
350
  }
@@ -347,4 +353,4 @@ var _default = (0, _dom.domAssigned)((_Term = /*#__PURE__*/ function() {
347
353
  return Term;
348
354
  }(), _define_property(_Term, "name", "Term"), _Term));
349
355
 
350
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/dom/term.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nimport dom from \"../dom\";\nimport LocalContext from \"../context/local\";\nimport verifyMixins from \"../mixins/term/verify\";\nimport constructorVerifier from \"../verifier/constructor\";\n\nimport { objectType } from \"./type\";\nimport { domAssigned } from \"../dom\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\"\nimport { termNodeFromTermString } from \"../context/partial/term\";\nimport { typeFromJSON, typeToTypeJSON } from \"../utilities/json\";\n\nconst { filter, compress } = arrayUtilities;\n\nconst variableNodesQuery = nodesQuery(\"//variable\"),\n      termVariableNodeQuery = nodeQuery(\"/*/term[0]/variable!\");\n\nexport default domAssigned(class Term {\n  constructor(string, node, type) {\n    this.string = string;\n    this.node = node;\n    this.type = type;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  getVariable(context) {\n    const { Variable } = dom,\n          termNode = this.node, ///\n          variable = Variable.fromTermNode(termNode, context);\n\n    return variable;\n  }\n\n  getVariables(context) {\n    const variableNodes = variableNodesQuery(this.node),\n          variables = variableNodes.map((variableNode) => {\n            const { Variable } = dom,\n                  variable = Variable.fromVariableNode(variableNode, context);\n\n            return variable;\n          });\n\n    compress(variables, (variableA, variableB) => {\n      const variableAEqualToVariableB = variableA.isEqualTo(variableB);\n\n      if (variableAEqualToVariableB) {\n        return true;\n      }\n    });\n\n    return variables;\n  }\n\n  matchTermNode(termNode) {\n    const termNodeMatches = this.node.match(termNode);\n\n    return termNodeMatches;\n  }\n\n  isEqualTo(term) {\n    let equalTo = false;\n\n    const termString = term.getString();\n\n    if (termString === this.string) {\n      const termType = term.getType();\n\n      if (termType === this.type) {\n        equalTo = true;\n      }\n    }\n\n    return equalTo;\n  }\n\n  isGrounded(definedVariables, context) {\n    const variables = this.getVariables(context);\n\n    filter(variables, (variable) => {\n      const definedVariablesIncludesVariable = definedVariables.includes(variable);\n\n      if (!definedVariablesIncludesVariable) {\n        return true;\n      }\n    });\n\n    const undefinedVariables = variables, ///\n          undefinedVariablesLength = undefinedVariables.length,\n          grounded = (undefinedVariablesLength <= 1);\n\n    return grounded;\n  }\n\n  isInitiallyGrounded(context) {\n    const variables = this.getVariables(context),\n          variablesLength = variables.length,\n          initiallyGrounded = (variablesLength === 0);\n\n    return initiallyGrounded;\n  }\n\n  isImplicitlyGrounded(definedVariables, context) {\n    const grounded = this.isGrounded(definedVariables, context),\n          implicitlyGrounded = grounded;  ///\n\n    return implicitlyGrounded;\n  }\n\n  verify(context, verifyAhead) {\n    let verified;\n\n    const termString = this.string;  ///\n\n    context.trace(`Verifying the '${termString}' term...`);\n\n    verified = verifyMixins.some((verifyMixin) => {\n      const term = this, ///\n            verified = verifyMixin(term, context, verifyAhead);\n\n      if (verified) {\n        return true;\n      }\n    });\n\n    if (verified) {\n      context.debug(`...verified the '${termString}' term.`);\n    }\n\n    return verified;\n  }\n\n  verifyType(fileContext) {\n    let typeVerified;\n\n    if (this.type === objectType) {\n      typeVerified = true;\n    } else {\n      const typeName = this.type.getName();\n\n      fileContext.trace(`Verifying the '${typeName}' type...`);\n\n      const type = fileContext.findTypeByTypeName(typeName);\n\n      if (type === null) {\n        fileContext.debug(`The '${typeName}' type is missing.`);\n      } else {\n        this.type = type; ///\n\n        typeVerified = true;\n      }\n\n      if (typeVerified) {\n        fileContext.debug(`...verified the '${typeName}' type.`);\n      }\n    }\n\n    return typeVerified;\n  }\n\n  verifyGivenType(type, generalContext, specificContext) {\n    let verifiedGivenType;\n\n    const typeName = type.getName(),\n          termString = this.getString();\n\n    specificContext.trace(`Verifying the '${termString}' term given the '${typeName}' type...`);\n\n    const context = specificContext, ///\n          verified = this.verify(context, () => {\n            let verifiedAhead;\n\n            const typeEqualToOrSubTypeOfGivenTypeType = this.type.isEqualToOrSubTypeOf(type);\n\n            if (typeEqualToOrSubTypeOfGivenTypeType) {\n              verifiedAhead = true;\n            }\n\n            return verifiedAhead;\n          });\n\n    verifiedGivenType = verified; ///\n\n    if (verifiedGivenType) {\n      specificContext.debug(`...verified the '${termString}' term given the '${typeName}' type.`);\n    }\n\n    return verifiedGivenType;\n  }\n\n  verifyWhenDeclared(fileContext) {\n    let verifiedWhenDeclared;\n\n    const termString = this.string;  ///\n\n    fileContext.trace(`Verifying the '${termString}' term when declared...`);\n\n    const termNode = this.node, ///\n          termVerifiedAsConstructor = constructorVerifier.verifyTerm(termNode, fileContext);\n\n    if (termVerifiedAsConstructor) {\n      const typeVerified = this.verifyType(fileContext);\n\n      verifiedWhenDeclared = typeVerified;  ///\n    }\n\n    if (verifiedWhenDeclared) {\n      fileContext.debug(`...verified the '${termString}' term when declared.`);\n    }\n\n    return verifiedWhenDeclared;\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          string = this.string,\n          type = typeJSON,  ///\n          json = {\n            type,\n            string\n          };\n\n    return json;\n  }\n\n  static name = \"Term\";\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          localContext = LocalContext.fromFileContext(fileContext),\n          context = localContext,  ///\n          termString = string,  ///\n          termNode = termNodeFromTermString(termString, context),\n          node = termNode,  ///\n          type = typeFromJSON(json, fileContext),\n          term = new Term(string, node, type);\n\n    return term;\n  }\n\n  static fromTermNode(termNode, context) {\n    let term = null;\n\n    if (termNode !== null) {\n      const node = termNode,  ///\n            string = context.nodeAsString(node),\n            type = null;\n\n      term = new Term(string, node, type);\n    }\n\n    return term;\n  }\n\n  static fromTermNodeAndType(termNode, type, context) {\n    const node = termNode,  ///\n          string = context.nodeAsString(node),\n          term = new Term(string, node, type);\n\n    return term;\n  }\n\n  static fromDefinedAssertionNode(definedAssertionNode, context) {\n    let term = null;\n\n    const termVariableNode = termVariableNodeQuery(definedAssertionNode);\n\n    if (termVariableNode !== null) {\n      const node = termVariableNode,  ///\n            string = context.nodeAsString(node),\n            type = null;\n\n      term = new Term(string, node, type);\n    }\n\n    return term;\n  }\n\n  static fromContainedAssertionNode(containedAssertionNode, context) {\n    let term = null;\n\n    const termVariableNode = termVariableNodeQuery(containedAssertionNode);\n\n    if (termVariableNode !== null) {\n      const node = termVariableNode,  ///\n            string = context.nodeAsString(node),\n            type = null;\n\n      term = new Term(string, node, type);\n    }\n\n    return term;\n  }\n});\n"],"names":["filter","arrayUtilities","compress","variableNodesQuery","nodesQuery","termVariableNodeQuery","nodeQuery","domAssigned","Term","string","node","type","getString","getNode","getType","setType","getVariable","context","Variable","dom","termNode","variable","fromTermNode","getVariables","variableNodes","variables","map","variableNode","fromVariableNode","variableA","variableB","variableAEqualToVariableB","isEqualTo","matchTermNode","termNodeMatches","match","term","equalTo","termString","termType","isGrounded","definedVariables","definedVariablesIncludesVariable","includes","undefinedVariables","undefinedVariablesLength","length","grounded","isInitiallyGrounded","variablesLength","initiallyGrounded","isImplicitlyGrounded","implicitlyGrounded","verify","verifyAhead","verified","trace","verifyMixins","some","verifyMixin","debug","verifyType","fileContext","typeVerified","objectType","typeName","getName","findTypeByTypeName","verifyGivenType","generalContext","specificContext","verifiedGivenType","verifiedAhead","typeEqualToOrSubTypeOfGivenTypeType","isEqualToOrSubTypeOf","verifyWhenDeclared","verifiedWhenDeclared","termVerifiedAsConstructor","constructorVerifier","verifyTerm","toJSON","typeJSON","typeToTypeJSON","json","fromJSON","localContext","LocalContext","fromFileContext","termNodeFromTermString","typeFromJSON","nodeAsString","fromTermNodeAndType","fromDefinedAssertionNode","definedAssertionNode","termVariableNode","fromContainedAssertionNode","containedAssertionNode","name"],"mappings":"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"}
356
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/dom/term.js"],"sourcesContent":["\"use strict\";\n\nimport { arrayUtilities } from \"necessary\";\n\nimport dom from \"../dom\";\nimport LocalContext from \"../context/local\";\nimport verifyMixins from \"../mixins/term/verify\";\nimport constructorVerifier from \"../verifier/constructor\";\n\nimport { objectType } from \"./type\";\nimport { domAssigned } from \"../dom\";\nimport { nodeQuery, nodesQuery } from \"../utilities/query\"\nimport { termNodeFromTermString } from \"../context/partial/term\";\nimport { typeFromJSON, typeToTypeJSON } from \"../utilities/json\";\n\nconst { filter, compress } = arrayUtilities;\n\nconst variableNodesQuery = nodesQuery(\"//variable\"),\n      termVariableNodeQuery = nodeQuery(\"/term/variable!\"),\n      definedAssertionTermNodeQuery = nodeQuery(\"/definedAssertion/term\"),\n      containedAssertionTermNodeQuery = nodeQuery(\"/containedAssertion/term\");\n\nexport default domAssigned(class Term {\n  constructor(string, node, type) {\n    this.string = string;\n    this.node = node;\n    this.type = type;\n  }\n\n  getString() {\n    return this.string;\n  }\n\n  getNode() {\n    return this.node;\n  }\n\n  getType() {\n    return this.type;\n  }\n\n  setType(type) {\n    this.type = type;\n  }\n\n  getVariable(context) {\n    const { Variable } = dom,\n          termNode = this.node, ///\n          variable = Variable.fromTermNode(termNode, context);\n\n    return variable;\n  }\n\n  getVariables(context) {\n    const variableNodes = variableNodesQuery(this.node),\n          variables = variableNodes.map((variableNode) => {\n            const { Variable } = dom,\n                  variable = Variable.fromVariableNode(variableNode, context);\n\n            return variable;\n          });\n\n    compress(variables, (variableA, variableB) => {\n      const variableAEqualToVariableB = variableA.isEqualTo(variableB);\n\n      if (variableAEqualToVariableB) {\n        return true;\n      }\n    });\n\n    return variables;\n  }\n\n  matchTermNode(termNode) {\n    const termNodeMatches = this.node.match(termNode);\n\n    return termNodeMatches;\n  }\n\n  isEqualTo(term) {\n    let equalTo = false;\n\n    const termString = term.getString();\n\n    if (termString === this.string) {\n      const termType = term.getType();\n\n      if (termType === this.type) {\n        equalTo = true;\n      }\n    }\n\n    return equalTo;\n  }\n\n  isGrounded(definedVariables, context) {\n    const variables = this.getVariables(context);\n\n    filter(variables, (variable) => {\n      const definedVariablesIncludesVariable = definedVariables.includes(variable);\n\n      if (!definedVariablesIncludesVariable) {\n        return true;\n      }\n    });\n\n    const undefinedVariables = variables, ///\n          undefinedVariablesLength = undefinedVariables.length,\n          grounded = (undefinedVariablesLength <= 1);\n\n    return grounded;\n  }\n\n  isInitiallyGrounded(context) {\n    const variables = this.getVariables(context),\n          variablesLength = variables.length,\n          initiallyGrounded = (variablesLength === 0);\n\n    return initiallyGrounded;\n  }\n\n  isImplicitlyGrounded(definedVariables, context) {\n    const grounded = this.isGrounded(definedVariables, context),\n          implicitlyGrounded = grounded;  ///\n\n    return implicitlyGrounded;\n  }\n\n  verify(context, verifyAhead) {\n    let verified;\n\n    const termString = this.string;  ///\n\n    context.trace(`Verifying the '${termString}' term...`);\n\n    verified = verifyMixins.some((verifyMixin) => {\n      const term = this, ///\n            verified = verifyMixin(term, context, verifyAhead);\n\n      if (verified) {\n        return true;\n      }\n    });\n\n    if (verified) {\n      context.debug(`...verified the '${termString}' term.`);\n    }\n\n    return verified;\n  }\n\n  verifyType(fileContext) {\n    let typeVerified;\n\n    if (this.type === objectType) {\n      typeVerified = true;\n    } else {\n      const typeName = this.type.getName();\n\n      fileContext.trace(`Verifying the '${typeName}' type...`);\n\n      const type = fileContext.findTypeByTypeName(typeName);\n\n      if (type === null) {\n        fileContext.debug(`The '${typeName}' type is missing.`);\n      } else {\n        this.type = type; ///\n\n        typeVerified = true;\n      }\n\n      if (typeVerified) {\n        fileContext.debug(`...verified the '${typeName}' type.`);\n      }\n    }\n\n    return typeVerified;\n  }\n\n  verifyGivenType(type, generalContext, specificContext) {\n    let verifiedGivenType;\n\n    const typeName = type.getName(),\n          termString = this.getString();\n\n    specificContext.trace(`Verifying the '${termString}' term given the '${typeName}' type...`);\n\n    const context = specificContext, ///\n          verified = this.verify(context, () => {\n            let verifiedAhead;\n\n            const typeEqualToOrSubTypeOfGivenTypeType = this.type.isEqualToOrSubTypeOf(type);\n\n            if (typeEqualToOrSubTypeOfGivenTypeType) {\n              verifiedAhead = true;\n            }\n\n            return verifiedAhead;\n          });\n\n    verifiedGivenType = verified; ///\n\n    if (verifiedGivenType) {\n      specificContext.debug(`...verified the '${termString}' term given the '${typeName}' type.`);\n    }\n\n    return verifiedGivenType;\n  }\n\n  verifyWhenDeclared(fileContext) {\n    let verifiedWhenDeclared;\n\n    const termString = this.string;  ///\n\n    fileContext.trace(`Verifying the '${termString}' term when declared...`);\n\n    const termNode = this.node, ///\n          termVerifiedAsConstructor = constructorVerifier.verifyTerm(termNode, fileContext);\n\n    if (termVerifiedAsConstructor) {\n      const typeVerified = this.verifyType(fileContext);\n\n      verifiedWhenDeclared = typeVerified;  ///\n    }\n\n    if (verifiedWhenDeclared) {\n      fileContext.debug(`...verified the '${termString}' term when declared.`);\n    }\n\n    return verifiedWhenDeclared;\n  }\n\n  toJSON() {\n    const typeJSON = typeToTypeJSON(this.type),\n          string = this.string,\n          type = typeJSON,  ///\n          json = {\n            type,\n            string\n          };\n\n    return json;\n  }\n\n  static name = \"Term\";\n\n  static fromJSON(json, fileContext) {\n    const { string } = json,\n          localContext = LocalContext.fromFileContext(fileContext),\n          context = localContext,  ///\n          termString = string,  ///\n          termNode = termNodeFromTermString(termString, context),\n          node = termNode,  ///\n          type = typeFromJSON(json, fileContext),\n          term = new Term(string, node, type);\n\n    return term;\n  }\n\n  static fromTermNode(termNode, context) {\n    let term = null;\n\n    if (termNode !== null) {\n      const node = termNode,  ///\n            string = context.nodeAsString(node),\n            type = null;\n\n      term = new Term(string, node, type);\n    }\n\n    return term;\n  }\n\n  static fromTermNodeAndType(termNode, type, context) {\n    const node = termNode,  ///\n          string = context.nodeAsString(node),\n          term = new Term(string, node, type);\n\n    return term;\n  }\n\n  static fromDefinedAssertionNode(definedAssertionNode, context) {\n    let term = null;\n\n    const definedAssertionTermNode = definedAssertionTermNodeQuery(definedAssertionNode);\n\n    if (definedAssertionTermNode !== null) {\n      const termNode = definedAssertionTermNode,  ///\n            termVariableNode = termVariableNodeQuery(termNode);\n\n      if (termVariableNode !== null) {\n        const node = termNode,  ///\n              string = context.nodeAsString(node),\n              type = null;\n\n        term = new Term(string, node, type);\n      }\n    }\n\n    return term;\n  }\n\n  static fromContainedAssertionNode(containedAssertionNode, context) {\n    let term = null;\n\n    const containedAssertionTermNode = containedAssertionTermNodeQuery(containedAssertionNode);\n\n    if (containedAssertionTermNode !== null) {\n      const termNode = containedAssertionTermNode,  ///\n            termVariableNode = termVariableNodeQuery(termNode);\n\n      if (termVariableNode !== null) {\n        const node = termNode,  ///\n              string = context.nodeAsString(node),\n              type = null;\n\n        term = new Term(string, node, type);\n      }\n    }\n\n    return term;\n  }\n});\n"],"names":["filter","arrayUtilities","compress","variableNodesQuery","nodesQuery","termVariableNodeQuery","nodeQuery","definedAssertionTermNodeQuery","containedAssertionTermNodeQuery","domAssigned","Term","string","node","type","getString","getNode","getType","setType","getVariable","context","Variable","dom","termNode","variable","fromTermNode","getVariables","variableNodes","variables","map","variableNode","fromVariableNode","variableA","variableB","variableAEqualToVariableB","isEqualTo","matchTermNode","termNodeMatches","match","term","equalTo","termString","termType","isGrounded","definedVariables","definedVariablesIncludesVariable","includes","undefinedVariables","undefinedVariablesLength","length","grounded","isInitiallyGrounded","variablesLength","initiallyGrounded","isImplicitlyGrounded","implicitlyGrounded","verify","verifyAhead","verified","trace","verifyMixins","some","verifyMixin","debug","verifyType","fileContext","typeVerified","objectType","typeName","getName","findTypeByTypeName","verifyGivenType","generalContext","specificContext","verifiedGivenType","verifiedAhead","typeEqualToOrSubTypeOfGivenTypeType","isEqualToOrSubTypeOf","verifyWhenDeclared","verifiedWhenDeclared","termVerifiedAsConstructor","constructorVerifier","verifyTerm","toJSON","typeJSON","typeToTypeJSON","json","fromJSON","localContext","LocalContext","fromFileContext","termNodeFromTermString","typeFromJSON","nodeAsString","fromTermNodeAndType","fromDefinedAssertionNode","definedAssertionNode","definedAssertionTermNode","termVariableNode","fromContainedAssertionNode","containedAssertionNode","containedAssertionTermNode","name"],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-verify-cli",
3
3
  "author": "James Smith",
4
- "version": "0.0.1197",
4
+ "version": "0.0.1199",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
package/src/dom/term.js CHANGED
@@ -16,7 +16,9 @@ import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
16
16
  const { filter, compress } = arrayUtilities;
17
17
 
18
18
  const variableNodesQuery = nodesQuery("//variable"),
19
- termVariableNodeQuery = nodeQuery("/*/term[0]/variable!");
19
+ termVariableNodeQuery = nodeQuery("/term/variable!"),
20
+ definedAssertionTermNodeQuery = nodeQuery("/definedAssertion/term"),
21
+ containedAssertionTermNodeQuery = nodeQuery("/containedAssertion/term");
20
22
 
21
23
  export default domAssigned(class Term {
22
24
  constructor(string, node, type) {
@@ -280,14 +282,19 @@ export default domAssigned(class Term {
280
282
  static fromDefinedAssertionNode(definedAssertionNode, context) {
281
283
  let term = null;
282
284
 
283
- const termVariableNode = termVariableNodeQuery(definedAssertionNode);
285
+ const definedAssertionTermNode = definedAssertionTermNodeQuery(definedAssertionNode);
284
286
 
285
- if (termVariableNode !== null) {
286
- const node = termVariableNode, ///
287
- string = context.nodeAsString(node),
288
- type = null;
287
+ if (definedAssertionTermNode !== null) {
288
+ const termNode = definedAssertionTermNode, ///
289
+ termVariableNode = termVariableNodeQuery(termNode);
289
290
 
290
- term = new Term(string, node, type);
291
+ if (termVariableNode !== null) {
292
+ const node = termNode, ///
293
+ string = context.nodeAsString(node),
294
+ type = null;
295
+
296
+ term = new Term(string, node, type);
297
+ }
291
298
  }
292
299
 
293
300
  return term;
@@ -296,14 +303,19 @@ export default domAssigned(class Term {
296
303
  static fromContainedAssertionNode(containedAssertionNode, context) {
297
304
  let term = null;
298
305
 
299
- const termVariableNode = termVariableNodeQuery(containedAssertionNode);
306
+ const containedAssertionTermNode = containedAssertionTermNodeQuery(containedAssertionNode);
300
307
 
301
- if (termVariableNode !== null) {
302
- const node = termVariableNode, ///
303
- string = context.nodeAsString(node),
304
- type = null;
308
+ if (containedAssertionTermNode !== null) {
309
+ const termNode = containedAssertionTermNode, ///
310
+ termVariableNode = termVariableNodeQuery(termNode);
305
311
 
306
- term = new Term(string, node, type);
312
+ if (termVariableNode !== null) {
313
+ const node = termNode, ///
314
+ string = context.nodeAsString(node),
315
+ type = null;
316
+
317
+ term = new Term(string, node, type);
318
+ }
307
319
  }
308
320
 
309
321
  return term;