occam-furtle 2.0.279 → 2.0.282

package/src/{dom → element}/declaration/procedure.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../elements";
 
-export default domAssigned(class ProcedureDeclaration {
+export default define(class ProcedureDeclaration {
   constructor(string, procedure) {
     this.string = string;
     this.procedure = procedure;
@@ -18,6 +18,24 @@ export default domAssigned(class ProcedureDeclaration {
     return this.procedure;
   }
 
+  verify(context) {
+    const verifies = true;
+
+    const procedureDeclarationString = this.getString();
+
+    context.trace(`Verifying the '${procedureDeclarationString}' procedure declaration...`)
+
+    const procedure = this.getProcedure();
+
+    context.addProcedure(procedure);
+
+    if (verifies) {
+      context.debug(`...verified the '${procedureDeclarationString}' procedure declaration.`)
+    }
+
+    return verifies;
+  }
+
   static name = "ProcedureDeclaration";
 
   static fromProcedureDeclarationNode(procedureDeclarationNode, context) {
@@ -28,7 +46,7 @@ export default domAssigned(class ProcedureDeclaration {
 });
 
 function procedureFromProcedureDeclarationNode(procedureDeclarationNode, context) {
-  const { Procedure, ProcedureDeclaration } = dom,
+  const { Procedure, ProcedureDeclaration } = elements,
         procedure = Procedure.fromProcedureDeclarationNode(procedureDeclarationNode, context),
         string = stringFromProcedure(procedure, context),
         procedureDeclaration = new ProcedureDeclaration(string, procedure);

package/src/{dom → element}/error.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../dom";
+import elements from "../elements";
 
-import { domAssigned } from "../dom";
+import { define } from "../elements";
 
-export default domAssigned(class Error {
+export default define(class Error {
   constructor(string) {
     this.string = string;
   }
@@ -13,6 +13,15 @@ export default domAssigned(class Error {
     return this.string;
   }
 
+  verify(context) {
+    const verifies = false,
+          errorString = this.getString();  ///
+
+    context.warning(`The '${errorString}' error cannot be verified.`);
+
+    return verifies;
+  }
+
   static name = "Error";
 
   static fromErrorNode(errorNode, context) {
@@ -23,7 +32,7 @@ export default domAssigned(class Error {
 });
 
 function errorFromErrorNode(errorNode, context) {
-  const {Error} = dom,
+  const { Error } = elements,
         node = errorNode, ///
         string = context.nodeAsString(node),
         error = new Error(string);

package/src/{dom → element}/every.js

@@ -1,15 +1,15 @@
 "use strict";
 
-import dom from "../dom";
+import elements from "../elements";
 import Exception from "../exception";
 
+import { define } from "../elements";
 import { nodeQuery } from "../utilities/query";
-import { domAssigned } from "../dom";
 import { NODES_TYPE, BOOLEAN_TYPE } from "../types";
 
 const expressionEveryNodeQuery = nodeQuery("/expression/every");
 
-export default domAssigned(class Every {
+export default define(class Every {
   constructor(string, variable, anonymousProcedure) {
     this.string = string;
     this.variable = variable;
@@ -51,7 +51,7 @@ export default domAssigned(class Every {
           boolean = nodes.every((node) => {
             let expression;
 
-            const { Expression, Expressions } = dom;
+            const { Expression, Expressions } = elements;
 
             expression = Expression.fromNode(node, context);
 
@@ -74,7 +74,7 @@ export default domAssigned(class Every {
             return boolean;
           });
 
-    const { Expression } = dom;
+    const { Expression } = elements;
 
     expression = Expression.fromBoolean(boolean, context);
 
@@ -101,7 +101,7 @@ export default domAssigned(class Every {
 });
 
 function everyFromEveryNode(everyNode, context) {
-  const { Every, Variable, AnonymousProcedure } = dom,
+  const { Every, Variable, AnonymousProcedure } = elements,
         anonymousProcedure = AnonymousProcedure.fromEveryNode(everyNode, context),
         variable = Variable.fromEveryNode(everyNode, context),
         string = stringFromVariableAndAnonymousProcedure(variable, anonymousProcedure, context),

package/src/{dom → element}/expression/bitwise.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 
+import { define } from "../../elements";
 import { nodeQuery } from "../../utilities/query";
-import { domAssigned } from "../../dom";
 import { BOOLEAN_TYPE } from "../../types";
 import { CONJUNCTION, DISJUNCTION } from "../../constants";
 
@@ -13,7 +13,7 @@ const terminalNodeQuery = nodeQuery("/bitwiseExpression/@*"),
       rightExpressionNodeQuery = nodeQuery("/bitwiseExpression/expression[1]"),
       expressionBitwiseExpressionNodeQuery = nodeQuery("/expression/bitwiseExpression");
 
-export default domAssigned(class BitwiseExpression {
+export default define(class BitwiseExpression {
   constructor(string, type, disjoint, leftExpression, rightExpression) {
     this.string = string;
     this.type = type;
@@ -49,7 +49,7 @@ export default domAssigned(class BitwiseExpression {
 
     context.trace(`Evaluating the '${bitwiseExpressionString}' bitwise expression...`);
 
-    const { Expression } = dom,
+    const { Expression } = elements,
           leftExpression = this.leftExpression.evaluate(context),
           rightExpression = this.rightExpression.evaluate(context),
           leftExpressionType = leftExpression.getType(),
@@ -102,7 +102,7 @@ export default domAssigned(class BitwiseExpression {
 });
 
 function bitwiseExpressionFromBitwiseExpressionNode(bitwiseExpressionNode, context) {
-  const { Expression, BitwiseExpression } = dom,
+  const { Expression, BitwiseExpression } = elements,
         leftExpressionNode = leftExpressionNodeQuery(bitwiseExpressionNode),
         rightExpressionNode = rightExpressionNodeQuery(bitwiseExpressionNode),
         type = BOOLEAN_TYPE,

package/src/{dom → element}/expression/bracketed.js

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 
+import { define } from "../../elements";
 import { nodeQuery } from "../../utilities/query";
-import { domAssigned } from "../../dom";
 
 const expressionNodeQuery = nodeQuery("/bracketedExpression/expression"),
       expressionBracketedExpressionNodeQuery = nodeQuery("/expression/bracketedExpression");
 
-export default domAssigned(class BracketedExpression {
+export default define(class BracketedExpression {
   constructor(string, expression) {
     this.string = string;
     this.expression = expression;
@@ -56,7 +56,7 @@ export default domAssigned(class BracketedExpression {
 });
 
 function bracketedExpressionFromBracketedExpressionNode(bracketedExpressionNode, context) {
-  const { Expression, BracketedExpression } = dom,
+  const { Expression, BracketedExpression } = elements,
         expressionNode = expressionNodeQuery(bracketedExpressionNode),
         expression = Expression.fromExpressionNode(expressionNode, context),
         string = stringFromExpression(expression, context),

package/src/{dom → element}/expression/negated.js

@@ -1,16 +1,16 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 
+import { define } from "../../elements";
 import { nodeQuery } from "../../utilities/query";
-import { domAssigned } from "../../dom";
 import { BOOLEAN_TYPE } from "../../types";
 
 const expressionNodeQuery = nodeQuery("/negatedExpression/expression"),
       expressionNegatedExpressionNodeQuery = nodeQuery("/expression/negatedExpression");
 
-export default domAssigned(class NegatedExpression {
+export default define(class NegatedExpression {
   constructor(string, type, expression) {
     this.string = string;
     this.type = type;
@@ -52,7 +52,7 @@ export default domAssigned(class NegatedExpression {
 
     boolean = !boolean;
 
-    const { Expression } = dom;
+    const { Expression } = elements;
 
     expression = Expression.fromBoolean(boolean, context);  ///
 
@@ -79,7 +79,7 @@ export default domAssigned(class NegatedExpression {
 });
 
 function negatedExpressionFromNegatedExpressionNode(negatedExpressionNode, context) {
-  const { Expression, NegatedExpression } = dom,
+  const { Expression, NegatedExpression } = elements,
         expressionNode = expressionNodeQuery(negatedExpressionNode),
         expression = Expression.fromExpressionNode(expressionNode, context),
         type = BOOLEAN_TYPE,

package/src/{dom → element}/expression.js

@@ -2,11 +2,11 @@
 
 import { arrayUtilities } from "necessary";
 
-import dom from "../dom";
+import elements from "../elements";
 import nullNode from "../nullNode";
 
+import { define } from "../elements";
 import { nodeQuery } from "../utilities/query";
-import { domAssigned } from "../dom";
 import { NULL, TRUE, FALSE, EMPTY_STRING } from "../constants";
 import { NODE_TYPE, NODES_TYPE, NUMBER_TYPE, STRING_TYPE, BOOLEAN_TYPE } from "../types";
 
@@ -20,7 +20,7 @@ const numberTerminalNodeQuery = nodeQuery("/expression/@number"),
       returnStatementExpressionNodeQuery = nodeQuery("/returnStatement/expression"),
       variableAssignmentExpressionNodeQuery = nodeQuery("/variableAssignment/expression");
 
-export default domAssigned(class Expression {
+export default define(class Expression {
   constructor(node, nodes, number, string, boolean, some, every, reduce, ternary, variable, nodeQuery, nodesQuery, comparison, returnBlock, procedureCall, negatedExpression, bitwiseExpression, bracketedExpression) {
     this.node = node;
     this.nodes = nodes;
@@ -506,7 +506,7 @@ function booleanAsString(boolean) {
 }
 
 function expressionFromExpressionNode(expressionNode, context) {
-  const { Some, Every, Reduce, Expression, Ternary, Variable, NodeQuery, NodesQuery, Comparison, ReturnBlock, ProcedureCall, NegatedExpression, BitwiseExpression, BracketedExpression } = dom,
+  const { Some, Every, Reduce, Expression, Ternary, Variable, NodeQuery, NodesQuery, Comparison, ReturnBlock, ProcedureCall, NegatedExpression, BitwiseExpression, BracketedExpression } = elements,
         node = nodeFromExpressionNode(expressionNode, context),
         nodes = nodesFromExpressionNode(expressionNode, context),
         number = numberFromExpressionNode(expressionNode, context),

package/src/{dom → element}/expressions.js

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../dom";
+import elements from "../elements";
 
-import { domAssigned } from "../dom";
+import { define } from "../elements";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const expressionNodesQuery = nodesQuery("/expressions/expression"),
       procedureCallExpressionsNodeQuery = nodeQuery("/procedureCall/expressions");
 
-export default domAssigned(class Expressions {
+export default define(class Expressions {
   constructor(string, array) {
     this.string = string;
     this.array = array;
@@ -90,7 +90,7 @@ export default domAssigned(class Expressions {
 });
 
 function arrayFromNodes(nodes, context) {
-  const { Expression } = dom,
+  const { Expression } = elements,
         array = nodes.map((node) => { ///
           const expression = Expression.fromNode(node, context);
 
@@ -116,7 +116,7 @@ function stringFromArray(array, context) {
 }
 
 function arrayFromExpressionNodes(expressionNodes, context) {
-  const { Expression } = dom,
+  const { Expression } = elements,
         array = expressionNodes.map((expressionNode) => { ///
           const expression = Expression.fromExpressionNode(expressionNode, context);
 
@@ -127,7 +127,7 @@ function arrayFromExpressionNodes(expressionNodes, context) {
 }
 
 function expressionsFromExpressionsNode(expressionsNode, context) {
-  const { Expressions } = dom,
+  const { Expressions } = elements,
         node = expressionsNode, ///
         string = context.nodeAsString(node),
         expressionNodes = expressionNodesQuery(expressionsNode),

package/src/{dom → element}/label.js

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../dom";
+import elements from "../elements";
 
+import { define } from "../elements";
 import { nodeQuery } from "../utilities/query";
-import { domAssigned } from "../dom";
 
 const nameTerminalNodeQuery = nodeQuery("/label/@name"),
       procedureDeclarationLabelNodeQuery = nodeQuery("/procedureDeclaration/label");
 
-export default domAssigned(class Label {
+export default define(class Label {
   constructor(string, name) {
     this.string = string;
     this.name = name;
@@ -40,7 +40,7 @@ export default domAssigned(class Label {
 });
 
 function labelFromLabelNode(labelNode, context) {
-  const { Label } = dom,
+  const { Label } = elements,
         name = nameFromLabelNode(labelNode, context),
         string = stringFromName(name, context),
         label = new Label(string, name);

package/src/{dom → element}/parameter/named.js

@@ -1,16 +1,16 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 
+import { define } from "../../elements";
 import { nodeQuery } from "../../utilities/query";
-import { domAssigned } from "../../dom";
 
 const typeTerminalNodeQuery = nodeQuery("/namedParameter/@type"),
       nameTerminalNodeQuery = nodeQuery("/namedParameter/@name[0]"),
       asNameTerminalNodeQuery = nodeQuery("/namedParameter/@name[1]");
 
-export default domAssigned(class NamedParameter {
+export default define(class NamedParameter {
   constructor(string, type, name, asName) {
     this.string = string;
     this.type = type;
@@ -85,7 +85,7 @@ export default domAssigned(class NamedParameter {
 });
 
 function namedParameterFromNamedParameterNode(namedParameterNode, context) {
-  const { NamedParameter } = dom,
+  const { NamedParameter } = elements,
         type = typeFromNamedParameterNode(namedParameterNode, context),
         name = nameFromNamedParameterNode(namedParameterNode, context),
         asName = asNameFromNamedParameterNode(namedParameterNode, context),

package/src/{dom → element}/parameter.js

@@ -1,16 +1,16 @@
 "use strict";
 
-import dom from "../dom";
+import elements from "../elements";
 import Exception from "../exception";
 
-import { domAssigned } from "../dom";
+import { define } from "../elements";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const terminalNodesQuery = nodesQuery("/parameter/@*"),
       nameTerminalNodeQuery = nodeQuery("/parameter/@name"),
       typeTerminalNodeQuery = nodeQuery("/parameter/@type");
 
-export default domAssigned(class Parameter {
+export default define(class Parameter {
   constructor(string, type, name) {
     this.string = string;
     this.type = type;
@@ -64,7 +64,7 @@ export default domAssigned(class Parameter {
 });
 
 function parameterFromParameterNode(parameterNode, context) {
-  const { Parameter } = dom,
+  const { Parameter } = elements,
         name = nameFromParameterNode(parameterNode, context),
         type = typeFromParameterNode(parameterNode, context),
         string = stringFromNameAndType(name, type, context),

package/src/{dom → element}/parameters/named.js

@@ -1,15 +1,15 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../elements";
 import { nodeQuery, nodesQuery } from "../../utilities/query";
 
 const namedParameterNodesQuery = nodesQuery("/namedParameters/namedParameter"),
       objectAssignmentNamedParametersNodeQuery = nodeQuery("/objectAssignment/namedParameters");
 
-export default domAssigned(class NamedParameters {
+export default define(class NamedParameters {
   constructor(string, array) {
     this.string = string;
     this.array = array;
@@ -114,7 +114,7 @@ export default domAssigned(class NamedParameters {
 });
 
 function namedParametersFromNamedParametersNode(namedParametersNode, context) {
-  const { NamedParameters } = dom,
+  const { NamedParameters } = elements,
         namedParameterNodes = namedParameterNodesQuery(namedParametersNode),
         array = arrayFromNamedParameterNodes(namedParameterNodes, context),
         string = stringFromArray(array, context),
@@ -124,7 +124,7 @@ function namedParametersFromNamedParametersNode(namedParametersNode, context) {
 }
 
 function arrayFromNamedParameterNodes(namedParameterNodes, context) {
-  const { NamedParameter } = dom,
+  const { NamedParameter } = elements,
         array = namedParameterNodes.map((namedParameterNode) => { ///
           const namedParameter = NamedParameter.fromNamedParameterNode(namedParameterNode, context);
 

package/src/{dom → element}/parameters.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../dom";
+import elements from "../elements";
 import Exception from "../exception";
 
+import { define } from "../elements";
 import { UNDERSCORE } from "../constants";
-import { domAssigned } from "../dom";
 import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const parameterNodesQuery = nodesQuery("/parameters/parameter"),
@@ -12,7 +12,7 @@ const parameterNodesQuery = nodesQuery("/parameters/parameter"),
       anonymousProcedureParametersNodeQuery = nodeQuery("/anonymousProcedure/parameters"),
       procedureDeclarationParametersNodeQuery = nodeQuery("/procedureDeclaration/parameters");
 
-export default domAssigned(class Parameters {
+export default define(class Parameters {
   constructor(string, array) {
     this.string = string;
     this.array = array;
@@ -95,7 +95,7 @@ export default domAssigned(class Parameters {
 });
 
 function parametersFromParametersNode(parametersNode, context) {
-  const { Parameters } = dom,
+  const { Parameters } = elements,
         array = arrayFromParametersNode(parametersNode, context),
         string = stringFromArray(array, context),
         parameters = new Parameters(string, array);
@@ -106,7 +106,7 @@ function parametersFromParametersNode(parametersNode, context) {
 function arrayFromParametersNode(parametersNode, context) {
   const parameterNodes = parameterNodesQuery(parametersNode),
         array = parameterNodes.map((parameterNode) => { ///
-          const { Parameter } = dom,
+          const { Parameter } = elements,
                 parameter = Parameter.fromParameterNode(parameterNode, context);
 
           return parameter;

package/src/{dom → element}/procedure/anonymous.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 
+import { define } from "../../elements";
 import { nodeQuery } from "../../utilities/query";
-import { domAssigned } from "../../dom";
 import { variablesFromExpressionsAndParameters } from "../procedure";
 
 const typeTerminalNodeQuery = nodeQuery("/anonymousProcedure/@type"),
@@ -12,7 +12,7 @@ const typeTerminalNodeQuery = nodeQuery("/anonymousProcedure/@type"),
       everyAnonymousProcedureNodeQuery = nodeQuery("/every/anonymousProcedure"),
       reduceAnonymousProcedureNodeQuery = nodeQuery("/reduce/anonymousProcedure");
 
-export default domAssigned(class AnonymousProcedure {
+export default define(class AnonymousProcedure {
   constructor(string, type, parameters, returnBlock) {
     this.string = string;
     this.type = type;
@@ -88,7 +88,7 @@ export default domAssigned(class AnonymousProcedure {
 });
 
 function anonymousProcedureFromAnonymousProcedureNode(anonymousProcedureNode, context) {
-  const { Parameters, ReturnBlock, AnonymousProcedure } = dom,
+  const { Parameters, ReturnBlock, AnonymousProcedure } = elements,
         returnBlock = ReturnBlock.fromAnonymousProcedureNode(anonymousProcedureNode, context),
         parameters = Parameters.fromAnonymousProcedureNode(anonymousProcedureNode, context),
         type = typeFromProcedureAnonymousProcedureNode(anonymousProcedureNode, context),

package/src/{dom → element}/procedure.js

@@ -1,15 +1,15 @@
 "use strict";
 
-import dom from "../dom";
+import elements from "../elements";
 import Exception from "../exception";
 
+import { define } from "../elements";
 import { nodeQuery } from "../utilities/query";
-import { domAssigned } from "../dom";
 import { BOOLEAN_TYPE } from "../types";
 
 const typeTerminalNodeQuery = nodeQuery("/procedureDeclaration/@type");
 
-export default domAssigned(class Procedure {
+export default define(class Procedure {
   constructor(string, type, label, parameters, returnBlock) {
     this.string = string;
     this.type = type;
@@ -86,7 +86,7 @@ export function variablesFromExpressionsAndParameters(expressions, parameters, c
   const variables = [];
 
   expressions.forEachExpression((expression, index) => {
-    const { Variable } = dom,
+    const { Variable } = elements,
           parameter = parameters.getParameter(index);
 
     if (parameter !== null) {
@@ -100,7 +100,7 @@ export function variablesFromExpressionsAndParameters(expressions, parameters, c
 }
 
 function procedureDeclarationFromProcedureDeclarationNode(procedureDeclarationNode, context) {
-  const { Label, ReturnBlock, Parameters, Procedure } = dom,
+  const { Label, ReturnBlock, Parameters, Procedure } = elements,
         returnBlock = ReturnBlock.fromProcedureDeclarationNode(procedureDeclarationNode, context),
         parameters = Parameters.fromProcedureDeclarationNode(procedureDeclarationNode, context),
         label = Label.fromProcedureDeclarationNode(procedureDeclarationNode, context),

package/src/{dom → element}/procedureCall.js

@@ -1,14 +1,14 @@
 "use strict";
 
-import dom from "../dom";
+import elements from "../elements";
 import Exception from "../exception";
 
+import { define } from "../elements";
 import { nodeQuery } from "../utilities/query";
-import { domAssigned } from "../dom";
 
 const expressionProcedureCallNodeQuery = nodeQuery("/expression/procedureCall");
 
-export default domAssigned(class ProcedureCall {
+export default define(class ProcedureCall {
   constructor(string, reference, expressions) {
     this.string = string;
     this.reference = reference;
@@ -71,7 +71,7 @@ export default domAssigned(class ProcedureCall {
 });
 
 function procedureCallFromProcedureCallNode(procedureCallNode, context) {
-  const { Reference, Expressions, ProcedureCall } = dom,
+  const { Reference, Expressions, ProcedureCall } = elements,
         expressions = Expressions.fromProcedureCallNode(procedureCallNode, context),
         reference = Reference.fromProcedureCallNode(procedureCallNode, context),
         string = stringFromReferenceAndExpressions(reference, expressions, context),

package/src/{dom → element}/query/node.js

@@ -4,12 +4,12 @@ import { Query } from "occam-query";
 import { arrayUtilities } from "necessary";
 import { contentUtilities } from "occam-entities";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 
+import { define } from "../../elements";
 import { NODE_TYPE } from "../../types";
 import { nodeQuery } from "../../utilities/query";
-import { domAssigned } from "../../dom";
 
 const { first } = arrayUtilities,
       { trimDoubleQuotes } = contentUtilities;
@@ -17,7 +17,7 @@ const { first } = arrayUtilities,
 const expressionNodeQueryNodeQuery = nodeQuery("/expression/nodeQuery"),
       stringLiteralTerminalNodeQuery = nodeQuery("/nodeQuery/@string-literal");
 
-export default domAssigned(class NodeQuery {
+export default define(class NodeQuery {
   constructor(string, variable, query) {
     this.string = string;
     this.variable = variable;
@@ -90,7 +90,7 @@ export default domAssigned(class NodeQuery {
 
     node = firstNode; ///
 
-    const { Expression } = dom;
+    const { Expression } = elements;
 
     expression = Expression.fromNode(node, context);
 
@@ -117,7 +117,7 @@ export default domAssigned(class NodeQuery {
 });
 
 function nodeQueryFromNodeQueryNode(nodeQueryNode, context) {
-  const { Variable, NodeQuery } = dom,
+  const { Variable, NodeQuery } = elements,
         node = nodeQueryNode, ///
         string = context.nodeAsString(node),
         expressionString = expressionStringFromNodeQueryNode(nodeQueryNode, context),

package/src/{dom → element}/query/nodes.js

@@ -3,19 +3,19 @@
 import { Query } from "occam-query";
 import { contentUtilities } from "occam-entities";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 
+import { define } from "../../elements";
 import { nodeQuery } from "../../utilities/query";
 import { NODE_TYPE } from "../../types";
-import { domAssigned } from "../../dom";
 
 const { trimDoubleQuotes } = contentUtilities;
 
 const expressionNodesQueryNodeQuery = nodeQuery("/expression/nodesQuery"),
       stringLiteralTerminalNodesQuery = nodeQuery("/nodesQuery/@string-literal");
 
-export default domAssigned(class NodesQuery {
+export default define(class NodesQuery {
   constructor(string, variable, query) {
     this.string = string;
     this.variable = variable;
@@ -76,7 +76,7 @@ export default domAssigned(class NodesQuery {
 
     const nodes = this.query.execute(node);
 
-    const { Expression } = dom;
+    const { Expression } = elements;
 
     expression = Expression.fromNodes(nodes, context);
 
@@ -103,7 +103,7 @@ export default domAssigned(class NodesQuery {
 });
 
 function nodesQueryFromNodesQueryNode(nodesQueryNode, context) {
-  const { Variable, NodesQuery } = dom,
+  const { Variable, NodesQuery } = elements,
         node = nodesQueryNode,  ///
         string = context.nodeAsString(node),
         expressionString = expressionStringFromNodesQueryNode(nodesQueryNode, context),