occam-furtle 2.0.279 → 2.0.282

package/lib/utilities/context.js

@@ -2,10 +2,21 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "chainContext", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get chainContext () {
         return chainContext;
+    },
+    get default () {
+        return _default;
+    },
+    get lineIndexFromNodeAndTokens () {
+        return lineIndexFromNodeAndTokens;
     }
 });
 var _constants = require("../constants");
@@ -16,13 +27,43 @@ function _type_of(obj) {
 function chainContext(context) {
     return new Proxy(context, {
         get: function(instance, name, receiver) {
+            var levelsIncludeName = _constants.LEVELS.includes(name);
+            if (levelsIncludeName) {
+                return function(message) {
+                    var node = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : null;
+                    var level = name, depth = instance.getDepth(), indent = _constants.DOUBLE_SPACE.repeat(depth);
+                    message = "".concat(indent).concat(message);
+                    var fileContext = instance.getFileContext();
+                    fileContext.writeToLog(level, message, node);
+                };
+            }
             if (name in instance) {
                 return Reflect.get(instance, name, receiver);
             }
-            var _$context = instance.context, value = _$context[name];
+            var _$context = instance.getContext(), value = _$context[name];
             return (typeof value === "undefined" ? "undefined" : _type_of(value)) === _constants.FUNCTION ? value.bind(_$context) : value;
         }
     });
 }
+function lineIndexFromNodeAndTokens(node, tokens, lineIndex) {
+    if (node !== null) {
+        lineIndex = 0;
+        var firstSignificantTokenIndex = node.getFirstSignificantTokenIndex(tokens);
+        tokens.some(function(token, tokenIndex) {
+            var tokenEndOfLineToken = token.isEndOfLineToken();
+            if (tokenEndOfLineToken) {
+                lineIndex += 1;
+            }
+            if (tokenIndex === firstSignificantTokenIndex) {
+                return true;
+            }
+        });
+    }
+    return lineIndex;
+}
+var _default = {
+    chainContext: chainContext,
+    lineIndexFromNodeAndTokens: lineIndexFromNodeAndTokens
+};
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY29udGV4dC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRlVOQ1RJT04gfSBmcm9tIFwiLi4vY29uc3RhbnRzXCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBjaGFpbkNvbnRleHQoY29udGV4dCkge1xuICByZXR1cm4gbmV3IFByb3h5KGNvbnRleHQsIHtcbiAgICBnZXQ6IChpbnN0YW5jZSwgbmFtZSwgcmVjZWl2ZXIpID0+IHtcbiAgICAgIGlmIChuYW1lIGluIGluc3RhbmNlKSB7XG4gICAgICAgIHJldHVybiBSZWZsZWN0LmdldChpbnN0YW5jZSwgbmFtZSwgcmVjZWl2ZXIpO1xuICAgICAgfVxuXG4gICAgICBjb25zdCBjb250ZXh0ID0gaW5zdGFuY2UuY29udGV4dCxcbiAgICAgICAgICAgIHZhbHVlID0gY29udGV4dFtuYW1lXTtcblxuICAgICAgcmV0dXJuICh0eXBlb2YgdmFsdWUgPT09IEZVTkNUSU9OKSA/XG4gICAgICAgICAgICAgICB2YWx1ZS5iaW5kKGNvbnRleHQpIDpcbiAgICAgICAgICAgICAgICAgdmFsdWU7XG4gICAgfVxuICB9KTtcbn1cbiJdLCJuYW1lcyI6WyJjaGFpbkNvbnRleHQiLCJjb250ZXh0IiwiUHJveHkiLCJnZXQiLCJpbnN0YW5jZSIsIm5hbWUiLCJyZWNlaXZlciIsIlJlZmxlY3QiLCJ2YWx1ZSIsIkZVTkNUSU9OIiwiYmluZCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBSWdCQTs7O2VBQUFBOzs7eUJBRlM7Ozs7O0FBRWxCLFNBQVNBLGFBQWFDLE9BQU87SUFDbEMsT0FBTyxJQUFJQyxNQUFNRCxTQUFTO1FBQ3hCRSxLQUFLLFNBQUNDLFVBQVVDLE1BQU1DO1lBQ3BCLElBQUlELFFBQVFELFVBQVU7Z0JBQ3BCLE9BQU9HLFFBQVFKLEdBQUcsQ0FBQ0MsVUFBVUMsTUFBTUM7WUFDckM7WUFFQSxJQUFNTCxZQUFVRyxTQUFTSCxPQUFPLEVBQzFCTyxRQUFRUCxTQUFPLENBQUNJLEtBQUs7WUFFM0IsT0FBTyxBQUFDLENBQUEsT0FBT0csc0NBQVAsU0FBT0EsTUFBSSxNQUFNQyxtQkFBUSxHQUN4QkQsTUFBTUUsSUFBSSxDQUFDVCxhQUNUTztRQUNiO0lBQ0Y7QUFDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvY29udGV4dC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgTEVWRUxTLCBGVU5DVElPTiwgRE9VQkxFX1NQQUNFIH0gZnJvbSBcIi4uL2NvbnN0YW50c1wiO1xuXG5leHBvcnQgZnVuY3Rpb24gY2hhaW5Db250ZXh0KGNvbnRleHQpIHtcbiAgcmV0dXJuIG5ldyBQcm94eShjb250ZXh0LCB7XG4gICAgZ2V0OiAoaW5zdGFuY2UsIG5hbWUsIHJlY2VpdmVyKSA9PiB7XG4gICAgICBjb25zdCBsZXZlbHNJbmNsdWRlTmFtZSA9IExFVkVMUy5pbmNsdWRlcyhuYW1lKTtcblxuICAgICAgaWYgKGxldmVsc0luY2x1ZGVOYW1lKSB7XG4gICAgICAgIHJldHVybiAobWVzc2FnZSwgbm9kZSA9IG51bGwpID0+IHtcbiAgICAgICAgICBjb25zdCBsZXZlbCA9IG5hbWUsIC8vL1xuICAgICAgICAgICAgICAgIGRlcHRoID0gaW5zdGFuY2UuZ2V0RGVwdGgoKSxcbiAgICAgICAgICAgICAgICBpbmRlbnQgPSBET1VCTEVfU1BBQ0UucmVwZWF0KGRlcHRoKTtcblxuICAgICAgICAgIG1lc3NhZ2UgPSBgJHtpbmRlbnR9JHttZXNzYWdlfWA7XG5cbiAgICAgICAgICBjb25zdCBmaWxlQ29udGV4dCA9IGluc3RhbmNlLmdldEZpbGVDb250ZXh0KCk7XG5cbiAgICAgICAgICBmaWxlQ29udGV4dC53cml0ZVRvTG9nKGxldmVsLCBtZXNzYWdlLCBub2RlKTtcbiAgICAgICAgfVxuICAgICAgfVxuXG4gICAgICBpZiAobmFtZSBpbiBpbnN0YW5jZSkge1xuICAgICAgICByZXR1cm4gUmVmbGVjdC5nZXQoaW5zdGFuY2UsIG5hbWUsIHJlY2VpdmVyKTtcbiAgICAgIH1cblxuICAgICAgY29uc3QgY29udGV4dCA9IGluc3RhbmNlLmdldENvbnRleHQoKSxcbiAgICAgICAgICAgIHZhbHVlID0gY29udGV4dFtuYW1lXTtcblxuICAgICAgcmV0dXJuICh0eXBlb2YgdmFsdWUgPT09IEZVTkNUSU9OKSA/XG4gICAgICAgICAgICAgICB2YWx1ZS5iaW5kKGNvbnRleHQpIDpcbiAgICAgICAgICAgICAgICAgdmFsdWU7XG4gICAgfVxuICB9KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGxpbmVJbmRleEZyb21Ob2RlQW5kVG9rZW5zKG5vZGUsIHRva2VucywgbGluZUluZGV4KSB7XG4gIGlmIChub2RlICE9PSBudWxsKSB7XG4gICAgbGluZUluZGV4ID0gMDtcblxuICAgIGNvbnN0IGZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4ID0gbm9kZS5nZXRGaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCh0b2tlbnMpO1xuXG4gICAgdG9rZW5zLnNvbWUoKHRva2VuLCB0b2tlbkluZGV4KSA9PiB7XG4gICAgICBjb25zdCB0b2tlbkVuZE9mTGluZVRva2VuID0gdG9rZW4uaXNFbmRPZkxpbmVUb2tlbigpO1xuXG4gICAgICBpZiAodG9rZW5FbmRPZkxpbmVUb2tlbikge1xuICAgICAgICBsaW5lSW5kZXggKz0gMTtcbiAgICAgIH1cblxuICAgICAgaWYgKHRva2VuSW5kZXggPT09IGZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4KSB7XG4gICAgICAgIHJldHVybiB0cnVlO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgcmV0dXJuIGxpbmVJbmRleDtcbn1cblxuZXhwb3J0IGRlZmF1bHQge1xuICBjaGFpbkNvbnRleHQsXG4gIGxpbmVJbmRleEZyb21Ob2RlQW5kVG9rZW5zXG59O1xuIl0sIm5hbWVzIjpbImNoYWluQ29udGV4dCIsImxpbmVJbmRleEZyb21Ob2RlQW5kVG9rZW5zIiwiY29udGV4dCIsIlByb3h5IiwiZ2V0IiwiaW5zdGFuY2UiLCJuYW1lIiwicmVjZWl2ZXIiLCJsZXZlbHNJbmNsdWRlTmFtZSIsIkxFVkVMUyIsImluY2x1ZGVzIiwibWVzc2FnZSIsIm5vZGUiLCJsZXZlbCIsImRlcHRoIiwiZ2V0RGVwdGgiLCJpbmRlbnQiLCJET1VCTEVfU1BBQ0UiLCJyZXBlYXQiLCJmaWxlQ29udGV4dCIsImdldEZpbGVDb250ZXh0Iiwid3JpdGVUb0xvZyIsIlJlZmxlY3QiLCJnZXRDb250ZXh0IiwidmFsdWUiLCJGVU5DVElPTiIsImJpbmQiLCJ0b2tlbnMiLCJsaW5lSW5kZXgiLCJmaXJzdFNpZ25pZmljYW50VG9rZW5JbmRleCIsImdldEZpcnN0U2lnbmlmaWNhbnRUb2tlbkluZGV4Iiwic29tZSIsInRva2VuIiwidG9rZW5JbmRleCIsInRva2VuRW5kT2ZMaW5lVG9rZW4iLCJpc0VuZE9mTGluZVRva2VuIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUFJZ0JBO2VBQUFBOztRQXVEaEI7ZUFBQTs7UUF0QmdCQztlQUFBQTs7O3lCQW5DK0I7Ozs7O0FBRXhDLFNBQVNELGFBQWFFLE9BQU87SUFDbEMsT0FBTyxJQUFJQyxNQUFNRCxTQUFTO1FBQ3hCRSxLQUFLLFNBQUNDLFVBQVVDLE1BQU1DO1lBQ3BCLElBQU1DLG9CQUFvQkMsaUJBQU0sQ0FBQ0MsUUFBUSxDQUFDSjtZQUUxQyxJQUFJRSxtQkFBbUI7Z0JBQ3JCLE9BQU8sU0FBQ0c7d0JBQVNDLHdFQUFPO29CQUN0QixJQUFNQyxRQUFRUCxNQUNSUSxRQUFRVCxTQUFTVSxRQUFRLElBQ3pCQyxTQUFTQyx1QkFBWSxDQUFDQyxNQUFNLENBQUNKO29CQUVuQ0gsVUFBVSxBQUFDLEdBQVdBLE9BQVRLLFFBQWlCLE9BQVJMO29CQUV0QixJQUFNUSxjQUFjZCxTQUFTZSxjQUFjO29CQUUzQ0QsWUFBWUUsVUFBVSxDQUFDUixPQUFPRixTQUFTQztnQkFDekM7WUFDRjtZQUVBLElBQUlOLFFBQVFELFVBQVU7Z0JBQ3BCLE9BQU9pQixRQUFRbEIsR0FBRyxDQUFDQyxVQUFVQyxNQUFNQztZQUNyQztZQUVBLElBQU1MLFlBQVVHLFNBQVNrQixVQUFVLElBQzdCQyxRQUFRdEIsU0FBTyxDQUFDSSxLQUFLO1lBRTNCLE9BQU8sQUFBQyxDQUFBLE9BQU9rQixzQ0FBUCxTQUFPQSxNQUFJLE1BQU1DLG1CQUFRLEdBQ3hCRCxNQUFNRSxJQUFJLENBQUN4QixhQUNUc0I7UUFDYjtJQUNGO0FBQ0Y7QUFFTyxTQUFTdkIsMkJBQTJCVyxJQUFJLEVBQUVlLE1BQU0sRUFBRUMsU0FBUztJQUNoRSxJQUFJaEIsU0FBUyxNQUFNO1FBQ2pCZ0IsWUFBWTtRQUVaLElBQU1DLDZCQUE2QmpCLEtBQUtrQiw2QkFBNkIsQ0FBQ0g7UUFFdEVBLE9BQU9JLElBQUksQ0FBQyxTQUFDQyxPQUFPQztZQUNsQixJQUFNQyxzQkFBc0JGLE1BQU1HLGdCQUFnQjtZQUVsRCxJQUFJRCxxQkFBcUI7Z0JBQ3ZCTixhQUFhO1lBQ2Y7WUFFQSxJQUFJSyxlQUFlSiw0QkFBNEI7Z0JBQzdDLE9BQU87WUFDVDtRQUNGO0lBQ0Y7SUFFQSxPQUFPRDtBQUNUO0lBRUEsV0FBZTtJQUNiNUIsY0FBQUE7SUFDQUMsNEJBQUFBO0FBQ0YifQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-furtle",
   "author": "James Smith",
-  "version": "2.0.279",
+  "version": "2.0.282",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-furtle",
   "description": "Occam's Furtle language.",
@@ -15,8 +15,10 @@
   },
   "devDependencies": {
     "@swc/core": "1.13.20",
+    "chai": "^4.1.0",
     "express": "^5.1.0",
     "lively-cli": "^2.0.77",
+    "mocha": "^6.0.2",
     "occam-custom-grammars": "^5.0.1340",
     "occam-entities": "^1.0.444",
     "occam-query": "^4.1.142",

package/src/constants.js

@@ -1,5 +1,17 @@
 "use strict";
 
+import { levels } from "necessary";
+
+const { TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL } = levels;
+
+export const LEVELS = [
+  TRACE_LEVEL,
+  DEBUG_LEVEL,
+  INFO_LEVEL,
+  WARNING_LEVEL,
+  ERROR_LEVEL
+];
+
 export const NULL = "null";
 export const TRUE = "true";
 export const FALSE = "false";
@@ -9,4 +21,8 @@ export const UNDERSCORE = "_";
 export const CONJUNCTION = "&&";
 export const DISJUNCTION = "||";
 export const EMPTY_STRING = "";
+export const SINGLE_SPACE = " ";
+export const DOUBLE_SPACE = "  ";
 export const NOT_EQUAL_TO = "!=";
+export const LEVEL_MAXIMUM_LENGTH = 7;
+export const LINE_INDEX_MAXIMUM_LENGTH = 4;

package/src/context/block.js

@@ -74,6 +74,16 @@ export default class BlockContext {
     this.variables.push(variable);
   }
 
+  getFileContext() { return this.context.getFileContext(); }
+
+  getDepth() {
+    let depth = this.context.getDepth();
+
+    depth++;
+
+    return depth;
+  }
+
   static fromVariables(variables, context) {
     const blockContext = new BlockContext(context, variables);
 

package/src/context/file.js

@@ -3,26 +3,24 @@
 import { arrayUtilities } from "necessary";
 import { lexersUtilities, parsersUtilities } from "occam-grammars";
 
-import dom from "../dom";
-
-import { nodesQuery } from "../utilities/query";
-import { chainContext } from "../utilities/context";
+import { LEVELS } from "../constants";
+import { verifyFile } from "../process/verify";
 import { nodeAsString, nodesAsString } from "../utilities/string";
+import { chainContext, lineIndexFromNodeAndTokens } from "../utilities/context";
 
 const { push } = arrayUtilities,
       { furtleLexerFromNothing } = lexersUtilities,
-      { furtleParserFromNothing } = parsersUtilities;
+      { furtleParserFromNothing } = parsersUtilities,
+      [ TRACE_LEVEL, DEBUG_LEVEL, INFO_LEVEL, WARNING_LEVEL, ERROR_LEVEL ] = LEVELS;
 
 const furtleLexer = furtleLexerFromNothing(),
       furtleParser = furtleParserFromNothing();
 
-const errorNodesQuery = nodesQuery("/document/error"),
-      procedureDeclarationNodesQuery = nodesQuery("/document/procedureDeclaration");
-
 export default class FileContext {
-  constructor(context, filePath, node, tokens, procedures) {
+  constructor(context, filePath, lineIndex, node, tokens, procedures) {
     this.context = context;
     this.filePath = filePath;
+    this.lineIndex = lineIndex;
     this.node = node;
     this.tokens = tokens;
     this.procedures = procedures;
@@ -38,6 +36,10 @@ export default class FileContext {
     return this.filePath;
   }
 
+  getLineIndex() {
+    return this.lineIndex;
+  }
+
   getNode() {
     return this.node;
   }
@@ -150,27 +152,18 @@ export default class FileContext {
     return metavariables;
   }
 
-  getVariables() {
-    const variables = [];
+  addProcedure(procedure) {
+    const procedureString = procedure.getString();
 
-    return variables;
-  }
-
-  addProcedures() {
-    const context = this; ///
-
-    const { ProcedureDeclaration } = dom,
-          procedureDeclarationNodes = procedureDeclarationNodesQuery(this.node);
+    this.procedures.push(procedure);
 
-    procedureDeclarationNodes.forEach((procedureDeclarationNode) => {
-      const procedureDeclaration = ProcedureDeclaration.fromProcedureDeclarationNode(procedureDeclarationNode, context),
-            procedure = procedureDeclaration.getProcedure(),
-            procedureString = procedure.getString();
+    this.debug(`Added the '${procedureString}' procedure to the context.`);
+  }
 
-      this.debug(`Adding the '${procedureString}' procedure.`);
+  getVariables() {
+    const variables = [];
 
-      this.procedures.push(procedure);
-    });
+    return variables;
   }
 
   nodeAsString(node) {
@@ -185,49 +178,86 @@ export default class FileContext {
     return string;
   }
 
-  trace(message) { this.context.trace(message, this.filePath); }
+  trace(message, node = null) {
+    const level = TRACE_LEVEL;
 
-  debug(message) { this.context.debug(message, this.filePath); }
+    this.writeToLog(level, message, node);
+  }
 
-  info(message) { this.context.info(message, this.filePath); }
+  debug(message, node = null) {
+    const level = DEBUG_LEVEL;
 
-  warning(message) { this.context.warning(message, this.filePath); }
+    this.writeToLog(level, message, node);
+  }
 
-  error(message) { this.context.error(message, this.filePath); }
+  info(message, node = null) {
+    const level = INFO_LEVEL;
 
-  verify() {
-    let verified = false;
+    this.writeToLog(level, message, node);
+  }
+
+  warning(message, node = null) {
+    const level = WARNING_LEVEL;
+
+    this.writeToLog(level, message, node);
+  }
+
+  error(message, node = null) {
+    const level = ERROR_LEVEL;
+
+    this.writeToLog(level, message, node);
+  }
+
+  writeToLog(level, message, node) {
+    const lineIndex = lineIndexFromNodeAndTokens(node, this.tokens, this.lineIndex),
+          filePath = (lineIndex === null) ?
+                       this.filePath :
+                         null;
+
+    this.context.writeToLog(level, message, filePath, lineIndex);
 
-    this.debug(`Verifying the '${this.filePath}' file...`);
+    this.lineIndex = lineIndex;
+  }
+
+  getFileContext() {
+    const fileContext = this; ///
+
+    return fileContext;
+  }
+
+  getDepth() {
+    let depth = this.context.getDepth();
+
+    depth++;
+
+    return depth;
+  }
+
+  verify() {
+    let verifies = false;
 
     this.prepare();
 
     if (this.node === null) {
       this.warning(`Unable to verify the '${this.filePath}' file because it cannot be parsed.`);
     } else {
-      const errorNodes = errorNodesQuery(this.node),
-            errorNodesLength = errorNodes.length;
+      this.debug(`Verifying the '${this.filePath}' file...`);
 
-      if (errorNodesLength === 0) {
-        this.addProcedures();
+      const context = this, ///
+            fileNode = this.node; ///
 
-        verified = true;
-      } else {
-        this.warning(`The '${this.filePath}' file cannot be verified because there are errors.`);
+      verifies = verifyFile(fileNode, context);
 
-        this.clear();
-      }
-    }
+      verifies ?
+        this.complete() :
+          this.clear();
 
-    if (verified) {
-      this.info(`...verified the '${this.filePath}' file.`);
+      if (verifies) {
+        this.info(`...verified the '${this.filePath}' file.`);
+      }
     }
 
-    return verified;
-  }
-
-  clear() {
-    this.procedures = [];
+    return verifies;
   }
 
   prepare() {
@@ -245,6 +275,16 @@ export default class FileContext {
     this.node = parser.parse(this.tokens);
   }
 
+  clear() {
+    this.lineIndex = null;
+
+    this.procedures = [];
+  }
+
+  complete() {
+    this.lineIndex = null;
+  }
+
   initialise(json) {
     const { content } = json,
           lexer = this.getLexer(),
@@ -273,19 +313,21 @@ export default class FileContext {
 
   static fromFile(file, context) {
     const filePath = file.getPath(),
+          lineIndex = null,
           tokens = null,
           node = null,
           procedures = [],
-          fileContext = new FileContext(context, filePath, node, tokens, procedures);
+          fileContext = new FileContext(context, filePath, lineIndex, node, tokens, procedures);
 
     return fileContext;
   }
 
   static fromFilePath(filePath, context) {
-    const tokens = null,
+    const lineIndex = null,
+          tokens = null,
           node = null,
           procedures = null,
-          fileContext = new FileContext(context, filePath, node, tokens, procedures);
+          fileContext = new FileContext(context, filePath, lineIndex, node, tokens, procedures);
 
     return fileContext;
   }

package/src/{dom → element}/assignment/array.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 { NODE_TYPE, NODES_TYPE } from "../../types";
 
 const stepArrayAssignmentNodeQuery = nodeQuery("/step/arrayAssignment");
 
-export default domAssigned(class ArrayAssigment {
+export default define(class ArrayAssigment {
   constructor(string, variable, parameters) {
     this.string = string;
     this.variable = variable;
@@ -59,7 +59,7 @@ export default domAssigned(class ArrayAssigment {
 
     this.parameters.forEachParameter((parameter, index) => {
       if (parameter !== null) {
-        const { Expression } = dom,
+        const { Expression } = elements,
               node = nodes[index],
               expression = Expression.fromNode(node, context);
 
@@ -85,7 +85,7 @@ export default domAssigned(class ArrayAssigment {
       throw exception;
     }
 
-    const { Variable } = dom,
+    const { Variable } = elements,
           variable = Variable.fromParameter(parameter, context);
 
     variable.assign(expression, context);
@@ -111,7 +111,7 @@ export default domAssigned(class ArrayAssigment {
 });
 
 function arrayAssignmentFromArrayAssignmentNode(arrayAssignmentNode, context) {
-  const { Variable, Parameters, ArrayAssignment } = dom,
+  const { Variable, Parameters, ArrayAssignment } = elements,
         parameters = Parameters.fromArrayAssignmentNode(arrayAssignmentNode, context),
         variable = Variable.fromArrayAssignmentNode(arrayAssignmentNode, context),
         string = stringFromVariableAndParameters(variable, parameters, context),

package/src/{dom → element}/assignment/object.js

@@ -1,17 +1,17 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 import nodeProperties from "../../nodeProperties";
 
+import { define } from "../../elements";
 import { nodeQuery } from "../../utilities/query";
-import { domAssigned } from "../../dom";
 import { NODE_TYPE, NODES_TYPE, STRING_TYPE, BOOLEAN_TYPE } from "../../types";
 import { CONTENT_PARAMETER_NAME, TERMINAL_PARAMETER_NAME, CHILD_NODES_PARAMETER_NAME } from "../../parameterNames";
 
 const stepObjectAssignmentNodeQuery = nodeQuery("/step/objectAssignment");
 
-export default domAssigned(class ObjectAssigment {
+export default define(class ObjectAssigment {
   constructor(string, variable, namedParameters) {
     this.string = string;
     this.variable = variable;
@@ -83,7 +83,7 @@ export default domAssigned(class ObjectAssigment {
       }
     }
 
-    const { Variable } = dom,
+    const { Variable } = elements,
           variable = Variable.fromNamedParameter(namedParameter, context);
 
     variable.assign(expression, context);
@@ -113,7 +113,7 @@ export default domAssigned(class ObjectAssigment {
       throw exception;
     }
 
-    const { Expression } = dom,
+    const { Expression } = elements,
           terminalNode = node,  ///
           content = terminalNode.getContent(),
           string = content;  ///
@@ -138,7 +138,7 @@ export default domAssigned(class ObjectAssigment {
           nodeTerminalNode = node.isTerminalNode(),
           terminal = nodeTerminalNode;  ///
 
-    const { Expression } = dom,
+    const { Expression } = elements,
           boolean = terminal; ///
 
     expression = Expression.fromBoolean(boolean, context);  ///
@@ -168,7 +168,7 @@ export default domAssigned(class ObjectAssigment {
       throw exception;
     }
 
-    const { Expression } = dom,
+    const { Expression } = elements,
           nonTerminalNode = node,  ///
           childNodes = nonTerminalNode.getChildNodes(),
           nodes = childNodes;  ///
@@ -196,7 +196,7 @@ export default domAssigned(class ObjectAssigment {
 });
 
 function objectAssignmentFromObjectAssignmentNode(objectAssignmentNode, context) {
-  const { Variable, NamedParameters, ObjectAssigment } = dom,
+  const { Variable, NamedParameters, ObjectAssigment } = elements,
         namedParameters = NamedParameters.fromObjectAssignmentNode(objectAssignmentNode, context),
         variable = Variable.fromObjectAssignmentNode(objectAssignmentNode, context),
         string = stringFromVariableAndNamesParameters(variable, namedParameters, context),

package/src/{dom → element}/assignment/variable.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 VariableAssignment {
+export default define(class VariableAssignment {
   constructor(string, variable, expression) {
     this.string = string;
     this.variable = variable;
@@ -49,7 +49,7 @@ export default domAssigned(class VariableAssignment {
 });
 
 function variableAssignmentFromTypeAndVariableAssignmentNode(type, variableAssignmentNode, context) {
-  const { Variable, Expression, VariableAssignment } = dom,
+  const { Variable, Expression, VariableAssignment } = elements,
         expression = Expression.fromVariableAssignmentNode(variableAssignmentNode, context),
         variable = Variable.fromTypeAndVariableAssignmentNode(type, variableAssignmentNode, context),
         string = stringFromExpressionAndVariable(expression, variable, context),

package/src/{dom → element}/assignments/variable.js

@@ -1,15 +1,15 @@
 "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 typeTerminalNodeQuery = nodeQuery("/variableAssignments/@type"),
       variableAssignmentNodesQuery = nodesQuery("/variableAssignments/variableAssignment"),
       stepVariableAssignmentsNodeQuery = nodeQuery("/step/variableAssignments");
 
-export default domAssigned(class VariableAssignments {
+export default define(class VariableAssignments {
   constructor(string, array) {
     this.string = string;
     this.array = array;
@@ -53,7 +53,7 @@ export default domAssigned(class VariableAssignments {
 });
 
 function variableAssignmentsFromVariableAssignmentsNode(variableAssignmentsNode, context) {
-  const { VariableAssignments } = dom,
+  const { VariableAssignments } = elements,
         type = typeFromVariableAssignmentsNode(variableAssignmentsNode, context),
         array = arrayFromTypeAndVariableAssignmentsNode(type, variableAssignmentsNode, context),
         string = stringFromArray(array, context),
@@ -88,7 +88,7 @@ function typeFromVariableAssignmentsNode(variableAssignmentsNode, context) {
 function arrayFromTypeAndVariableAssignmentsNode(type, variableAssignmentsNode, context) {
   const variableAssignmentNodes = variableAssignmentNodesQuery(variableAssignmentsNode),
         array = variableAssignmentNodes.map((variableAssignmentNode) => {
-          const { VariableAssignment } = dom,
+          const { VariableAssignment } = elements,
                 variableAssignment = VariableAssignment.fromTypeAndVariableAssignmentNode(type, variableAssignmentNode, context);
 
           return variableAssignment;

package/src/{dom → element}/block/return.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import dom from "../../dom";
+import elements from "../../elements";
 import Exception from "../../exception";
 import BlockContext from "../../context/block";
 
-import { domAssigned } from "../../dom";
+import { define } from "../../elements";
 import { nodeQuery, nodesQuery } from "../../utilities/query";
 
 const stepNodesQuery = nodesQuery("/returnBlock/step"),
@@ -13,7 +13,7 @@ const stepNodesQuery = nodesQuery("/returnBlock/step"),
       anonymousProcedureReturnBlockNodeQuery = nodeQuery("/anonymousProcedure/returnBlock"),
       procedureDeclarationReturnBlockNodeQuery = nodeQuery("/procedureDeclaration/returnBlock");
 
-export default domAssigned(class ReturnBlock {
+export default define(class ReturnBlock {
   constructor(string, steps, nonsensical, returnStatement) {
     this.string = string;
     this.steps = steps;
@@ -105,7 +105,7 @@ function stringFromReturnStatement(returnStatement, context) {
 }
 
 function stepsFromReturnBlockNode(returnBlockNode, context) {
-  const { Step } = dom,
+  const { Step } = elements,
         stepNodes = stepNodesQuery(returnBlockNode),
         steps = stepNodes.map((stepNode) => {
           const step = Step.fromStepNode(stepNode, context);
@@ -117,7 +117,7 @@ function stepsFromReturnBlockNode(returnBlockNode, context) {
 }
 
 function returnBlockFromReturnBlockNode(returnBlockNode, context) {
-  const { ReturnBlock, ReturnStatement } = dom,
+  const { ReturnBlock, ReturnStatement } = elements,
         returnStatement = ReturnStatement.fromReturnBlockNode(returnBlockNode, context),
         nonsensical = nonsensicalFromReturnBlockNode(returnBlockNode, context),
         steps = stepsFromReturnBlockNode(returnBlockNode, context),

package/src/{dom → element}/comparison.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 { EQUAL_TO, NOT_EQUAL_TO } from "../constants";
 
 const terminalNodeQuery = nodeQuery("/comparison/@*"),
@@ -12,7 +12,7 @@ const terminalNodeQuery = nodeQuery("/comparison/@*"),
       rightExpressionNodeQuery = nodeQuery("/comparison/expression[1]"),
       expressionComparisonNodeQuery = nodeQuery("/expression/comparison");
 
-export default domAssigned(class Comparison {
+export default define(class Comparison {
   constructor(string, negated, leftExpression, rightExpression) {
     this.string = string;
     this.negated = negated;
@@ -65,7 +65,7 @@ export default domAssigned(class Comparison {
       boolean = !boolean; ///
     }
 
-    const { Expression } = dom;
+    const { Expression } = elements;
 
     expression = Expression.fromBoolean(boolean, context);
 
@@ -100,7 +100,7 @@ function negatedFromComparisonNode(comparisonNode) {
 }
 
 function comparisonFromComparisonNode(comparisonNode, context) {
-  const { Expression, Comparison } = dom,
+  const { Expression, Comparison } = elements,
         leftExpressionNode = leftExpressionNodeQuery(comparisonNode),
         rightExpressionNode = rightExpressionNodeQuery(comparisonNode),
         rightExpression = Expression.fromExpressionNode(rightExpressionNode, context),