occam-query 4.1.179 → 4.1.180

package/lib/utilities/query.js

@@ -12,10 +12,26 @@ _export(exports, {
     get default () {
         return _default;
     },
+    get nodeFromNodeAndQuery () {
+        return nodeFromNodeAndQuery;
+    },
+    get nodeQuery () {
+        return nodeQuery;
+    },
+    get nodesFromNodeAndQueries () {
+        return nodesFromNodeAndQueries;
+    },
+    get nodesFromNodeAndQuery () {
+        return nodesFromNodeAndQuery;
+    },
+    get nodesQuery () {
+        return nodesQuery;
+    },
     get queryByExpressionString () {
         return queryByExpressionString;
     }
 });
+const _necessary = require("necessary");
 const _query = /*#__PURE__*/ _interop_require_default(require("../query"));
 const _expression = /*#__PURE__*/ _interop_require_default(require("../expression"));
 function _interop_require_default(obj) {
@@ -23,6 +39,39 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
+const { push } = _necessary.arrayUtilities;
+function nodeQuery(expression) {
+    const query = _query.default.fromExpressionString(expression);
+    return function(node) {
+        const nodes = query.execute(node);
+        node = nodes.shift() || null; ///
+        return node;
+    };
+}
+function nodesQuery(expression) {
+    const query = _query.default.fromExpressionString(expression);
+    return function(node) {
+        const nodes = query.execute(node);
+        return nodes;
+    };
+}
+function nodeFromNodeAndQuery(node, query) {
+    const queryNodes = query.execute(node), queryNode = queryNodes.shift() || null;
+    node = queryNode; ///
+    return node;
+}
+function nodesFromNodeAndQuery(node, query, nodes = []) {
+    const queryNodes = query.execute(node);
+    push(nodes, queryNodes);
+    return nodes;
+}
+function nodesFromNodeAndQueries(node, queries, nodes = []) {
+    queries.forEach((query)=>{
+        const queryNodes = query.execute(node);
+        push(nodes, queryNodes);
+    });
+    return nodes;
+}
 function queryByExpressionString(node, expressionString, maximumDepth) {
     let nodes = null;
     const expression = _expression.default.fromExpressionString(expressionString);
@@ -33,7 +82,12 @@ function queryByExpressionString(node, expressionString, maximumDepth) {
     return nodes;
 }
 const _default = {
+    nodeQuery,
+    nodesQuery,
+    nodeFromNodeAndQuery,
+    nodesFromNodeAndQuery,
+    nodesFromNodeAndQueries,
     queryByExpressionString
 };
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcXVlcnkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBRdWVyeSBmcm9tIFwiLi4vcXVlcnlcIjtcbmltcG9ydCBFeHByZXNzaW9uIGZyb20gXCIuLi9leHByZXNzaW9uXCI7XG5cbmV4cG9ydCBmdW5jdGlvbiBxdWVyeUJ5RXhwcmVzc2lvblN0cmluZyhub2RlLCBleHByZXNzaW9uU3RyaW5nLCBtYXhpbXVtRGVwdGgpIHtcbiAgbGV0IG5vZGVzID0gbnVsbDtcblxuICBjb25zdCBleHByZXNzaW9uID0gRXhwcmVzc2lvbi5mcm9tRXhwcmVzc2lvblN0cmluZyhleHByZXNzaW9uU3RyaW5nKTtcblxuICBpZiAoZXhwcmVzc2lvbiAhPT0gbnVsbCkge1xuICAgIGNvbnN0IHF1ZXJ5ID0gUXVlcnkuZnJvbUV4cHJlc3Npb24oZXhwcmVzc2lvbiwgbWF4aW11bURlcHRoKTtcblxuICAgIG5vZGVzID0gcXVlcnkuZXhlY3V0ZShub2RlKTtcbiAgfVxuXG4gIHJldHVybiBub2Rlcztcbn1cblxuZXhwb3J0IGRlZmF1bHQge1xuICBxdWVyeUJ5RXhwcmVzc2lvblN0cmluZ1xufTtcbiJdLCJuYW1lcyI6WyJxdWVyeUJ5RXhwcmVzc2lvblN0cmluZyIsIm5vZGUiLCJleHByZXNzaW9uU3RyaW5nIiwibWF4aW11bURlcHRoIiwibm9kZXMiLCJleHByZXNzaW9uIiwiRXhwcmVzc2lvbiIsImZyb21FeHByZXNzaW9uU3RyaW5nIiwicXVlcnkiLCJRdWVyeSIsImZyb21FeHByZXNzaW9uIiwiZXhlY3V0ZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBbUJBO2VBQUE7O1FBZGdCQTtlQUFBQTs7OzhEQUhFO21FQUNLOzs7Ozs7QUFFaEIsU0FBU0Esd0JBQXdCQyxJQUFJLEVBQUVDLGdCQUFnQixFQUFFQyxZQUFZO0lBQzFFLElBQUlDLFFBQVE7SUFFWixNQUFNQyxhQUFhQyxtQkFBVSxDQUFDQyxvQkFBb0IsQ0FBQ0w7SUFFbkQsSUFBSUcsZUFBZSxNQUFNO1FBQ3ZCLE1BQU1HLFFBQVFDLGNBQUssQ0FBQ0MsY0FBYyxDQUFDTCxZQUFZRjtRQUUvQ0MsUUFBUUksTUFBTUcsT0FBTyxDQUFDVjtJQUN4QjtJQUVBLE9BQU9HO0FBQ1Q7TUFFQSxXQUFlO0lBQ2JKO0FBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvcXVlcnkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5pbXBvcnQgUXVlcnkgZnJvbSBcIi4uL3F1ZXJ5XCI7XG5pbXBvcnQgRXhwcmVzc2lvbiBmcm9tIFwiLi4vZXhwcmVzc2lvblwiO1xuXG5jb25zdCB7IHB1c2ggfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gbm9kZVF1ZXJ5KGV4cHJlc3Npb24pIHtcbiAgY29uc3QgcXVlcnkgPSBRdWVyeS5mcm9tRXhwcmVzc2lvblN0cmluZyhleHByZXNzaW9uKTtcblxuICByZXR1cm4gZnVuY3Rpb24obm9kZSkge1xuICAgIGNvbnN0IG5vZGVzID0gcXVlcnkuZXhlY3V0ZShub2RlKTtcblxuICAgIG5vZGUgPSBub2Rlcy5zaGlmdCgpIHx8IG51bGw7IC8vL1xuXG4gICAgcmV0dXJuIG5vZGU7XG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vZGVzUXVlcnkoZXhwcmVzc2lvbikge1xuICBjb25zdCBxdWVyeSA9IFF1ZXJ5LmZyb21FeHByZXNzaW9uU3RyaW5nKGV4cHJlc3Npb24pO1xuXG4gIHJldHVybiBmdW5jdGlvbihub2RlKSB7XG4gICAgY29uc3Qgbm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gICAgcmV0dXJuIG5vZGVzO1xuICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBub2RlRnJvbU5vZGVBbmRRdWVyeShub2RlLCBxdWVyeSkge1xuICBjb25zdCBxdWVyeU5vZGVzID0gcXVlcnkuZXhlY3V0ZShub2RlKSxcbiAgICAgICAgcXVlcnlOb2RlID0gcXVlcnlOb2Rlcy5zaGlmdCgpIHx8IG51bGw7XG5cbiAgbm9kZSA9IHF1ZXJ5Tm9kZTsgIC8vL1xuXG4gIHJldHVybiBub2RlO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbm9kZXNGcm9tTm9kZUFuZFF1ZXJ5KG5vZGUsIHF1ZXJ5LCBub2RlcyA9IFtdKSB7XG4gIGNvbnN0IHF1ZXJ5Tm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gIHB1c2gobm9kZXMsIHF1ZXJ5Tm9kZXMpO1xuXG4gIHJldHVybiBub2Rlcztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG5vZGVzRnJvbU5vZGVBbmRRdWVyaWVzKG5vZGUsIHF1ZXJpZXMsIG5vZGVzID0gW10pIHtcbiAgcXVlcmllcy5mb3JFYWNoKChxdWVyeSkgPT4ge1xuICAgIGNvbnN0IHF1ZXJ5Tm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuXG4gICAgcHVzaChub2RlcywgcXVlcnlOb2Rlcyk7XG4gIH0pO1xuXG4gIHJldHVybiBub2Rlcztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHF1ZXJ5QnlFeHByZXNzaW9uU3RyaW5nKG5vZGUsIGV4cHJlc3Npb25TdHJpbmcsIG1heGltdW1EZXB0aCkge1xuICBsZXQgbm9kZXMgPSBudWxsO1xuXG4gIGNvbnN0IGV4cHJlc3Npb24gPSBFeHByZXNzaW9uLmZyb21FeHByZXNzaW9uU3RyaW5nKGV4cHJlc3Npb25TdHJpbmcpO1xuXG4gIGlmIChleHByZXNzaW9uICE9PSBudWxsKSB7XG4gICAgY29uc3QgcXVlcnkgPSBRdWVyeS5mcm9tRXhwcmVzc2lvbihleHByZXNzaW9uLCBtYXhpbXVtRGVwdGgpO1xuXG4gICAgbm9kZXMgPSBxdWVyeS5leGVjdXRlKG5vZGUpO1xuICB9XG5cbiAgcmV0dXJuIG5vZGVzO1xufVxuXG5leHBvcnQgZGVmYXVsdCB7XG4gIG5vZGVRdWVyeSxcbiAgbm9kZXNRdWVyeSxcbiAgbm9kZUZyb21Ob2RlQW5kUXVlcnksXG4gIG5vZGVzRnJvbU5vZGVBbmRRdWVyeSxcbiAgbm9kZXNGcm9tTm9kZUFuZFF1ZXJpZXMsXG4gIHF1ZXJ5QnlFeHByZXNzaW9uU3RyaW5nXG59O1xuIl0sIm5hbWVzIjpbIm5vZGVGcm9tTm9kZUFuZFF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwibm9kZXNGcm9tTm9kZUFuZFF1ZXJpZXMiLCJub2Rlc0Zyb21Ob2RlQW5kUXVlcnkiLCJub2Rlc1F1ZXJ5IiwicXVlcnlCeUV4cHJlc3Npb25TdHJpbmciLCJwdXNoIiwiYXJyYXlVdGlsaXRpZXMiLCJleHByZXNzaW9uIiwicXVlcnkiLCJRdWVyeSIsImZyb21FeHByZXNzaW9uU3RyaW5nIiwibm9kZSIsIm5vZGVzIiwiZXhlY3V0ZSIsInNoaWZ0IiwicXVlcnlOb2RlcyIsInF1ZXJ5Tm9kZSIsInF1ZXJpZXMiLCJmb3JFYWNoIiwiZXhwcmVzc2lvblN0cmluZyIsIm1heGltdW1EZXB0aCIsIkV4cHJlc3Npb24iLCJmcm9tRXhwcmVzc2lvbiJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBd0VBO2VBQUE7O1FBekNnQkE7ZUFBQUE7O1FBdEJBQztlQUFBQTs7UUF1Q0FDO2VBQUFBOztRQVJBQztlQUFBQTs7UUFuQkFDO2VBQUFBOztRQXFDQUM7ZUFBQUE7OzsyQkF4RGU7OERBRWI7bUVBQ0s7Ozs7OztBQUV2QixNQUFNLEVBQUVDLElBQUksRUFBRSxHQUFHQyx5QkFBYztBQUV4QixTQUFTTixVQUFVTyxVQUFVO0lBQ2xDLE1BQU1DLFFBQVFDLGNBQUssQ0FBQ0Msb0JBQW9CLENBQUNIO0lBRXpDLE9BQU8sU0FBU0ksSUFBSTtRQUNsQixNQUFNQyxRQUFRSixNQUFNSyxPQUFPLENBQUNGO1FBRTVCQSxPQUFPQyxNQUFNRSxLQUFLLE1BQU0sTUFBTSxHQUFHO1FBRWpDLE9BQU9IO0lBQ1Q7QUFDRjtBQUVPLFNBQVNSLFdBQVdJLFVBQVU7SUFDbkMsTUFBTUMsUUFBUUMsY0FBSyxDQUFDQyxvQkFBb0IsQ0FBQ0g7SUFFekMsT0FBTyxTQUFTSSxJQUFJO1FBQ2xCLE1BQU1DLFFBQVFKLE1BQU1LLE9BQU8sQ0FBQ0Y7UUFFNUIsT0FBT0M7SUFDVDtBQUNGO0FBRU8sU0FBU2IscUJBQXFCWSxJQUFJLEVBQUVILEtBQUs7SUFDOUMsTUFBTU8sYUFBYVAsTUFBTUssT0FBTyxDQUFDRixPQUMzQkssWUFBWUQsV0FBV0QsS0FBSyxNQUFNO0lBRXhDSCxPQUFPSyxXQUFZLEdBQUc7SUFFdEIsT0FBT0w7QUFDVDtBQUVPLFNBQVNULHNCQUFzQlMsSUFBSSxFQUFFSCxLQUFLLEVBQUVJLFFBQVEsRUFBRTtJQUMzRCxNQUFNRyxhQUFhUCxNQUFNSyxPQUFPLENBQUNGO0lBRWpDTixLQUFLTyxPQUFPRztJQUVaLE9BQU9IO0FBQ1Q7QUFFTyxTQUFTWCx3QkFBd0JVLElBQUksRUFBRU0sT0FBTyxFQUFFTCxRQUFRLEVBQUU7SUFDL0RLLFFBQVFDLE9BQU8sQ0FBQyxDQUFDVjtRQUNmLE1BQU1PLGFBQWFQLE1BQU1LLE9BQU8sQ0FBQ0Y7UUFFakNOLEtBQUtPLE9BQU9HO0lBQ2Q7SUFFQSxPQUFPSDtBQUNUO0FBRU8sU0FBU1Isd0JBQXdCTyxJQUFJLEVBQUVRLGdCQUFnQixFQUFFQyxZQUFZO0lBQzFFLElBQUlSLFFBQVE7SUFFWixNQUFNTCxhQUFhYyxtQkFBVSxDQUFDWCxvQkFBb0IsQ0FBQ1M7SUFFbkQsSUFBSVosZUFBZSxNQUFNO1FBQ3ZCLE1BQU1DLFFBQVFDLGNBQUssQ0FBQ2EsY0FBYyxDQUFDZixZQUFZYTtRQUUvQ1IsUUFBUUosTUFBTUssT0FBTyxDQUFDRjtJQUN4QjtJQUVBLE9BQU9DO0FBQ1Q7TUFFQSxXQUFlO0lBQ2JaO0lBQ0FHO0lBQ0FKO0lBQ0FHO0lBQ0FEO0lBQ0FHO0FBQ0YifQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-query",
   "author": "James Smith",
-  "version": "4.1.179",
+  "version": "4.1.180",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-query",
   "description": "Occam's query functionality.",

package/src/utilities/query.js

@@ -1,8 +1,61 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import Query from "../query";
 import Expression from "../expression";
 
+const { push } = arrayUtilities;
+
+export function nodeQuery(expression) {
+  const query = Query.fromExpressionString(expression);
+
+  return function(node) {
+    const nodes = query.execute(node);
+
+    node = nodes.shift() || null; ///
+
+    return node;
+  }
+}
+
+export function nodesQuery(expression) {
+  const query = Query.fromExpressionString(expression);
+
+  return function(node) {
+    const nodes = query.execute(node);
+
+    return nodes;
+  }
+}
+
+export function nodeFromNodeAndQuery(node, query) {
+  const queryNodes = query.execute(node),
+        queryNode = queryNodes.shift() || null;
+
+  node = queryNode;  ///
+
+  return node;
+}
+
+export function nodesFromNodeAndQuery(node, query, nodes = []) {
+  const queryNodes = query.execute(node);
+
+  push(nodes, queryNodes);
+
+  return nodes;
+}
+
+export function nodesFromNodeAndQueries(node, queries, nodes = []) {
+  queries.forEach((query) => {
+    const queryNodes = query.execute(node);
+
+    push(nodes, queryNodes);
+  });
+
+  return nodes;
+}
+
 export function queryByExpressionString(node, expressionString, maximumDepth) {
   let nodes = null;
 
@@ -18,5 +71,10 @@ export function queryByExpressionString(node, expressionString, maximumDepth) {
 }
 
 export default {
+  nodeQuery,
+  nodesQuery,
+  nodeFromNodeAndQuery,
+  nodesFromNodeAndQuery,
+  nodesFromNodeAndQueries,
   queryByExpressionString
 };