occam-languages 0.0.248 → 0.0.249

package/lib/utilities/pass.js

@@ -17,9 +17,9 @@ _export(exports, {
     }
 });
 const _necessary = require("necessary");
-const _query = require("../utilities/query");
-const { match } = _necessary.arrayUtilities;
-const nonTerminalNodeQuery = (0, _query.nodeQuery)("/*");
+const _occamdom = require("occam-dom");
+const { match } = _necessary.arrayUtilities, { nodeQuery } = _occamdom.queryUtilities;
+const nonTerminalNodeQuery = nodeQuery("/*");
 function areChildNodesCongruent(childNodesA, childNodesB) {
     const childNodesCongruent = match(childNodesA, childNodesB, (childNodeA, childNodeB)=>{
         const childNodeCongruent = isChildNodeCongruent(childNodeA, childNodeB);
@@ -46,4 +46,4 @@ function isChildNodeCongruent(childNodeA, childNodeB) {
     return childNodeCongruent;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcGFzcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgeyBtYXRjaCB9ID0gYXJyYXlVdGlsaXRpZXM7XG5cbmV4cG9ydCBjb25zdCBub25UZXJtaW5hbE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi8qXCIpO1xuXG5leHBvcnQgZnVuY3Rpb24gYXJlQ2hpbGROb2Rlc0NvbmdydWVudChjaGlsZE5vZGVzQSwgY2hpbGROb2Rlc0IpIHtcbiAgY29uc3QgY2hpbGROb2Rlc0NvbmdydWVudCA9IG1hdGNoKGNoaWxkTm9kZXNBLCBjaGlsZE5vZGVzQiwgKGNoaWxkTm9kZUEsIGNoaWxkTm9kZUIpID0+IHtcbiAgICBjb25zdCBjaGlsZE5vZGVDb25ncnVlbnQgPSBpc0NoaWxkTm9kZUNvbmdydWVudChjaGlsZE5vZGVBLCBjaGlsZE5vZGVCKTtcblxuICAgIGlmIChjaGlsZE5vZGVDb25ncnVlbnQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIGNoaWxkTm9kZXNDb25ncnVlbnQ7XG59XG5cbmZ1bmN0aW9uIGlzQ2hpbGROb2RlQ29uZ3J1ZW50KGNoaWxkTm9kZUEsIGNoaWxkTm9kZUIpIHtcbiAgbGV0IGNoaWxkTm9kZUNvbmdydWVudCA9IGZhbHNlO1xuXG4gIGNvbnN0IGNoaWxkTm9kZUFOb25UZXJtaW5hbE5vZGUgPSBjaGlsZE5vZGVBLmlzTm9uVGVybWluYWxOb2RlKCksXG4gICAgICAgIGNoaWxkTm9kZUJOb25UZXJtaW5hbE5vZGUgPSBjaGlsZE5vZGVCLmlzTm9uVGVybWluYWxOb2RlKCk7XG5cbiAgaWYgKGNoaWxkTm9kZUFOb25UZXJtaW5hbE5vZGUgJiYgY2hpbGROb2RlQk5vblRlcm1pbmFsTm9kZSkge1xuICAgIGNoaWxkTm9kZUNvbmdydWVudCA9IHRydWU7XG4gIH0gZWxzZSB7XG4gICAgY29uc3QgY2hpbGROb2RlQVRlcm1pbmFsTm9kZSA9ICFjaGlsZE5vZGVBTm9uVGVybWluYWxOb2RlLFxuICAgICAgICAgIGNoaWxkTm9kZUJUZXJtaW5hbE5vZGUgPSAhY2hpbGROb2RlQk5vblRlcm1pbmFsTm9kZTtcblxuICAgIGlmIChjaGlsZE5vZGVBVGVybWluYWxOb2RlICYmIGNoaWxkTm9kZUJUZXJtaW5hbE5vZGUpIHtcbiAgICAgIGNvbnN0IHRlcm1pbmFsTm9kZUEgPSBjaGlsZE5vZGVBLCAvLy9cbiAgICAgICAgICAgIHRlcm1pbmFsTm9kZUIgPSBjaGlsZE5vZGVCLCAvLy9cbiAgICAgICAgICAgIHRlcm1pbmFsTm9kZUFNYXRjaGVzVGVybWluYWxOb2RlQiA9IHRlcm1pbmFsTm9kZUEubWF0Y2godGVybWluYWxOb2RlQik7XG5cbiAgICAgIGlmICh0ZXJtaW5hbE5vZGVBTWF0Y2hlc1Rlcm1pbmFsTm9kZUIpIHtcbiAgICAgICAgY2hpbGROb2RlQ29uZ3J1ZW50ID0gdHJ1ZTtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICByZXR1cm4gY2hpbGROb2RlQ29uZ3J1ZW50O1xufVxuIl0sIm5hbWVzIjpbImFyZUNoaWxkTm9kZXNDb25ncnVlbnQiLCJub25UZXJtaW5hbE5vZGVRdWVyeSIsIm1hdGNoIiwiYXJyYXlVdGlsaXRpZXMiLCJub2RlUXVlcnkiLCJjaGlsZE5vZGVzQSIsImNoaWxkTm9kZXNCIiwiY2hpbGROb2Rlc0NvbmdydWVudCIsImNoaWxkTm9kZUEiLCJjaGlsZE5vZGVCIiwiY2hpbGROb2RlQ29uZ3J1ZW50IiwiaXNDaGlsZE5vZGVDb25ncnVlbnQiLCJjaGlsZE5vZGVBTm9uVGVybWluYWxOb2RlIiwiaXNOb25UZXJtaW5hbE5vZGUiLCJjaGlsZE5vZGVCTm9uVGVybWluYWxOb2RlIiwiY2hpbGROb2RlQVRlcm1pbmFsTm9kZSIsImNoaWxkTm9kZUJUZXJtaW5hbE5vZGUiLCJ0ZXJtaW5hbE5vZGVBIiwidGVybWluYWxOb2RlQiIsInRlcm1pbmFsTm9kZUFNYXRjaGVzVGVybWluYWxOb2RlQiJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBVWdCQTtlQUFBQTs7UUFGSEM7ZUFBQUE7OzsyQkFOa0I7dUJBRUw7QUFFMUIsTUFBTSxFQUFFQyxLQUFLLEVBQUUsR0FBR0MseUJBQWM7QUFFekIsTUFBTUYsdUJBQXVCRyxJQUFBQSxnQkFBUyxFQUFDO0FBRXZDLFNBQVNKLHVCQUF1QkssV0FBVyxFQUFFQyxXQUFXO0lBQzdELE1BQU1DLHNCQUFzQkwsTUFBTUcsYUFBYUMsYUFBYSxDQUFDRSxZQUFZQztRQUN2RSxNQUFNQyxxQkFBcUJDLHFCQUFxQkgsWUFBWUM7UUFFNUQsSUFBSUMsb0JBQW9CO1lBQ3RCLE9BQU87UUFDVDtJQUNGO0lBRUEsT0FBT0g7QUFDVDtBQUVBLFNBQVNJLHFCQUFxQkgsVUFBVSxFQUFFQyxVQUFVO0lBQ2xELElBQUlDLHFCQUFxQjtJQUV6QixNQUFNRSw0QkFBNEJKLFdBQVdLLGlCQUFpQixJQUN4REMsNEJBQTRCTCxXQUFXSSxpQkFBaUI7SUFFOUQsSUFBSUQsNkJBQTZCRSwyQkFBMkI7UUFDMURKLHFCQUFxQjtJQUN2QixPQUFPO1FBQ0wsTUFBTUsseUJBQXlCLENBQUNILDJCQUMxQkkseUJBQXlCLENBQUNGO1FBRWhDLElBQUlDLDBCQUEwQkMsd0JBQXdCO1lBQ3BELE1BQU1DLGdCQUFnQlQsWUFDaEJVLGdCQUFnQlQsWUFDaEJVLG9DQUFvQ0YsY0FBY2YsS0FBSyxDQUFDZ0I7WUFFOUQsSUFBSUMsbUNBQW1DO2dCQUNyQ1QscUJBQXFCO1lBQ3ZCO1FBQ0Y7SUFDRjtJQUVBLE9BQU9BO0FBQ1QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcGFzcy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5pbXBvcnQgeyBxdWVyeVV0aWxpdGllcyB9IGZyb20gXCJvY2NhbS1kb21cIjtcblxuY29uc3QgeyBtYXRjaCB9ID0gYXJyYXlVdGlsaXRpZXMsXG4gICAgICB7IG5vZGVRdWVyeSB9ID0gcXVlcnlVdGlsaXRpZXM7XG5cbmV4cG9ydCBjb25zdCBub25UZXJtaW5hbE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi8qXCIpO1xuXG5leHBvcnQgZnVuY3Rpb24gYXJlQ2hpbGROb2Rlc0NvbmdydWVudChjaGlsZE5vZGVzQSwgY2hpbGROb2Rlc0IpIHtcbiAgY29uc3QgY2hpbGROb2Rlc0NvbmdydWVudCA9IG1hdGNoKGNoaWxkTm9kZXNBLCBjaGlsZE5vZGVzQiwgKGNoaWxkTm9kZUEsIGNoaWxkTm9kZUIpID0+IHtcbiAgICBjb25zdCBjaGlsZE5vZGVDb25ncnVlbnQgPSBpc0NoaWxkTm9kZUNvbmdydWVudChjaGlsZE5vZGVBLCBjaGlsZE5vZGVCKTtcblxuICAgIGlmIChjaGlsZE5vZGVDb25ncnVlbnQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIGNoaWxkTm9kZXNDb25ncnVlbnQ7XG59XG5cbmZ1bmN0aW9uIGlzQ2hpbGROb2RlQ29uZ3J1ZW50KGNoaWxkTm9kZUEsIGNoaWxkTm9kZUIpIHtcbiAgbGV0IGNoaWxkTm9kZUNvbmdydWVudCA9IGZhbHNlO1xuXG4gIGNvbnN0IGNoaWxkTm9kZUFOb25UZXJtaW5hbE5vZGUgPSBjaGlsZE5vZGVBLmlzTm9uVGVybWluYWxOb2RlKCksXG4gICAgICAgIGNoaWxkTm9kZUJOb25UZXJtaW5hbE5vZGUgPSBjaGlsZE5vZGVCLmlzTm9uVGVybWluYWxOb2RlKCk7XG5cbiAgaWYgKGNoaWxkTm9kZUFOb25UZXJtaW5hbE5vZGUgJiYgY2hpbGROb2RlQk5vblRlcm1pbmFsTm9kZSkge1xuICAgIGNoaWxkTm9kZUNvbmdydWVudCA9IHRydWU7XG4gIH0gZWxzZSB7XG4gICAgY29uc3QgY2hpbGROb2RlQVRlcm1pbmFsTm9kZSA9ICFjaGlsZE5vZGVBTm9uVGVybWluYWxOb2RlLFxuICAgICAgICAgIGNoaWxkTm9kZUJUZXJtaW5hbE5vZGUgPSAhY2hpbGROb2RlQk5vblRlcm1pbmFsTm9kZTtcblxuICAgIGlmIChjaGlsZE5vZGVBVGVybWluYWxOb2RlICYmIGNoaWxkTm9kZUJUZXJtaW5hbE5vZGUpIHtcbiAgICAgIGNvbnN0IHRlcm1pbmFsTm9kZUEgPSBjaGlsZE5vZGVBLCAvLy9cbiAgICAgICAgICAgIHRlcm1pbmFsTm9kZUIgPSBjaGlsZE5vZGVCLCAvLy9cbiAgICAgICAgICAgIHRlcm1pbmFsTm9kZUFNYXRjaGVzVGVybWluYWxOb2RlQiA9IHRlcm1pbmFsTm9kZUEubWF0Y2godGVybWluYWxOb2RlQik7XG5cbiAgICAgIGlmICh0ZXJtaW5hbE5vZGVBTWF0Y2hlc1Rlcm1pbmFsTm9kZUIpIHtcbiAgICAgICAgY2hpbGROb2RlQ29uZ3J1ZW50ID0gdHJ1ZTtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICByZXR1cm4gY2hpbGROb2RlQ29uZ3J1ZW50O1xufVxuIl0sIm5hbWVzIjpbImFyZUNoaWxkTm9kZXNDb25ncnVlbnQiLCJub25UZXJtaW5hbE5vZGVRdWVyeSIsIm1hdGNoIiwiYXJyYXlVdGlsaXRpZXMiLCJub2RlUXVlcnkiLCJxdWVyeVV0aWxpdGllcyIsImNoaWxkTm9kZXNBIiwiY2hpbGROb2Rlc0IiLCJjaGlsZE5vZGVzQ29uZ3J1ZW50IiwiY2hpbGROb2RlQSIsImNoaWxkTm9kZUIiLCJjaGlsZE5vZGVDb25ncnVlbnQiLCJpc0NoaWxkTm9kZUNvbmdydWVudCIsImNoaWxkTm9kZUFOb25UZXJtaW5hbE5vZGUiLCJpc05vblRlcm1pbmFsTm9kZSIsImNoaWxkTm9kZUJOb25UZXJtaW5hbE5vZGUiLCJjaGlsZE5vZGVBVGVybWluYWxOb2RlIiwiY2hpbGROb2RlQlRlcm1pbmFsTm9kZSIsInRlcm1pbmFsTm9kZUEiLCJ0ZXJtaW5hbE5vZGVCIiwidGVybWluYWxOb2RlQU1hdGNoZXNUZXJtaW5hbE5vZGVCIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUFVZ0JBO2VBQUFBOztRQUZIQztlQUFBQTs7OzJCQU5rQjswQkFDQTtBQUUvQixNQUFNLEVBQUVDLEtBQUssRUFBRSxHQUFHQyx5QkFBYyxFQUMxQixFQUFFQyxTQUFTLEVBQUUsR0FBR0Msd0JBQWM7QUFFN0IsTUFBTUosdUJBQXVCRyxVQUFVO0FBRXZDLFNBQVNKLHVCQUF1Qk0sV0FBVyxFQUFFQyxXQUFXO0lBQzdELE1BQU1DLHNCQUFzQk4sTUFBTUksYUFBYUMsYUFBYSxDQUFDRSxZQUFZQztRQUN2RSxNQUFNQyxxQkFBcUJDLHFCQUFxQkgsWUFBWUM7UUFFNUQsSUFBSUMsb0JBQW9CO1lBQ3RCLE9BQU87UUFDVDtJQUNGO0lBRUEsT0FBT0g7QUFDVDtBQUVBLFNBQVNJLHFCQUFxQkgsVUFBVSxFQUFFQyxVQUFVO0lBQ2xELElBQUlDLHFCQUFxQjtJQUV6QixNQUFNRSw0QkFBNEJKLFdBQVdLLGlCQUFpQixJQUN4REMsNEJBQTRCTCxXQUFXSSxpQkFBaUI7SUFFOUQsSUFBSUQsNkJBQTZCRSwyQkFBMkI7UUFDMURKLHFCQUFxQjtJQUN2QixPQUFPO1FBQ0wsTUFBTUsseUJBQXlCLENBQUNILDJCQUMxQkkseUJBQXlCLENBQUNGO1FBRWhDLElBQUlDLDBCQUEwQkMsd0JBQXdCO1lBQ3BELE1BQU1DLGdCQUFnQlQsWUFDaEJVLGdCQUFnQlQsWUFDaEJVLG9DQUFvQ0YsY0FBY2hCLEtBQUssQ0FBQ2lCO1lBRTlELElBQUlDLG1DQUFtQztnQkFDckNULHFCQUFxQjtZQUN2QjtRQUNGO0lBQ0Y7SUFFQSxPQUFPQTtBQUNUIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-languages",
   "author": "James Smith",
-  "version": "0.0.248",
+  "version": "0.0.249",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-languages",
   "description": "Occam's common language functionality.",
@@ -12,6 +12,7 @@
   "dependencies": {
     "necessary": "^17.2.10",
     "occam-custom-grammars": "^6.0.60",
+    "occam-dom": "^6.0.2",
     "occam-model": "^1.0.524",
     "occam-parsers": "^23.1.77"
   },

package/src/utilities/pass.js

@@ -1,10 +1,10 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
+import { queryUtilities } from "occam-dom";
 
-import { nodeQuery } from "../utilities/query";
-
-const { match } = arrayUtilities;
+const { match } = arrayUtilities,
+      { nodeQuery } = queryUtilities;
 
 export const nonTerminalNodeQuery = nodeQuery("/*");
 

package/lib/utilities/query.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: Object.getOwnPropertyDescriptor(all, name).get
-    });
-}
-_export(exports, {
-    get default () {
-        return _default;
-    },
-    get nodeQuery () {
-        return nodeQuery;
-    },
-    get nodesQuery () {
-        return nodesQuery;
-    }
-});
-const _occamquery = require("occam-query");
-function nodeQuery(expressionString) {
-    const query = _occamquery.Query.fromExpressionString(expressionString);
-    return function(node) {
-        const nodes = query.execute(node);
-        node = nodes.shift() || null; ///
-        return node;
-    };
-}
-function nodesQuery(expressionString) {
-    const query = _occamquery.Query.fromExpressionString(expressionString);
-    return function(node) {
-        const nodes = query.execute(node);
-        return nodes;
-    };
-}
-const _default = {
-    nodeQuery,
-    nodesQuery
-};
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcXVlcnkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IFF1ZXJ5IH0gZnJvbSBcIm9jY2FtLXF1ZXJ5XCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBub2RlUXVlcnkoZXhwcmVzc2lvblN0cmluZykge1xuICBjb25zdCBxdWVyeSA9IFF1ZXJ5LmZyb21FeHByZXNzaW9uU3RyaW5nKGV4cHJlc3Npb25TdHJpbmcpO1xuXG4gIHJldHVybiBmdW5jdGlvbihub2RlKSB7XG4gICAgY29uc3Qgbm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gICAgbm9kZSA9IG5vZGVzLnNoaWZ0KCkgfHwgbnVsbDsgLy8vXG5cbiAgICByZXR1cm4gbm9kZTtcbiAgfTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vZGVzUXVlcnkoZXhwcmVzc2lvblN0cmluZykge1xuICBjb25zdCBxdWVyeSA9IFF1ZXJ5LmZyb21FeHByZXNzaW9uU3RyaW5nKGV4cHJlc3Npb25TdHJpbmcpO1xuXG4gIHJldHVybiBmdW5jdGlvbihub2RlKSB7XG4gICAgY29uc3Qgbm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gICAgcmV0dXJuIG5vZGVzO1xuICB9O1xufVxuXG5leHBvcnQgZGVmYXVsdCB7XG4gIG5vZGVRdWVyeSxcbiAgbm9kZXNRdWVyeSxcbn1cbiJdLCJuYW1lcyI6WyJub2RlUXVlcnkiLCJub2Rlc1F1ZXJ5IiwiZXhwcmVzc2lvblN0cmluZyIsInF1ZXJ5IiwiUXVlcnkiLCJmcm9tRXhwcmVzc2lvblN0cmluZyIsIm5vZGUiLCJub2RlcyIsImV4ZWN1dGUiLCJzaGlmdCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBMEJBO2VBQUE7O1FBdEJnQkE7ZUFBQUE7O1FBWUFDO2VBQUFBOzs7NEJBZE07QUFFZixTQUFTRCxVQUFVRSxnQkFBZ0I7SUFDeEMsTUFBTUMsUUFBUUMsaUJBQUssQ0FBQ0Msb0JBQW9CLENBQUNIO0lBRXpDLE9BQU8sU0FBU0ksSUFBSTtRQUNsQixNQUFNQyxRQUFRSixNQUFNSyxPQUFPLENBQUNGO1FBRTVCQSxPQUFPQyxNQUFNRSxLQUFLLE1BQU0sTUFBTSxHQUFHO1FBRWpDLE9BQU9IO0lBQ1Q7QUFDRjtBQUVPLFNBQVNMLFdBQVdDLGdCQUFnQjtJQUN6QyxNQUFNQyxRQUFRQyxpQkFBSyxDQUFDQyxvQkFBb0IsQ0FBQ0g7SUFFekMsT0FBTyxTQUFTSSxJQUFJO1FBQ2xCLE1BQU1DLFFBQVFKLE1BQU1LLE9BQU8sQ0FBQ0Y7UUFFNUIsT0FBT0M7SUFDVDtBQUNGO01BRUEsV0FBZTtJQUNiUDtJQUNBQztBQUNGIn0=

package/src/utilities/query.js

@@ -1,30 +0,0 @@
-"use strict";
-
-import { Query } from "occam-query";
-
-export function nodeQuery(expressionString) {
-  const query = Query.fromExpressionString(expressionString);
-
-  return function(node) {
-    const nodes = query.execute(node);
-
-    node = nodes.shift() || null; ///
-
-    return node;
-  };
-}
-
-export function nodesQuery(expressionString) {
-  const query = Query.fromExpressionString(expressionString);
-
-  return function(node) {
-    const nodes = query.execute(node);
-
-    return nodes;
-  };
-}
-
-export default {
-  nodeQuery,
-  nodesQuery,
-}