occam-query 4.1.203 → 4.1.205

package/lib/query.js

@@ -18,17 +18,16 @@ function _interop_require_default(obj) {
 }
 const { WILDCARD_CHARACTER } = _necessary.characters;
 class Query {
-    constructor(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes){
+    constructor(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent){
         this.spread = spread;
         this.subQuery = subQuery;
         this.ruleNames = ruleNames;
         this.tokenTypes = tokenTypes;
         this.maximumDepth = maximumDepth;
         this.infiniteDescent = infiniteDescent;
-        this.intermediateNodes = intermediateNodes;
     }
     getSpread() {
-        return this.sprea;
+        return this.spread;
     }
     getSubQuery() {
         return this.subQuery;
@@ -45,80 +44,71 @@ class Query {
     isInfiniteDescent() {
         return this.infiniteDescent;
     }
-    getIntermediateNodes() {
-        return this.intermediateNodes;
-    }
     execute(node, depth = 0, maximumDepth = this.maximumDepth) {
         const nodes = [];
-        this.clear();
-        this.find(node, depth, maximumDepth);
-        this.apply(nodes, depth, maximumDepth);
+        const intermediateNodes = this.find(node, depth, maximumDepth);
+        this.apply(nodes, depth, maximumDepth, intermediateNodes);
         return nodes;
     }
-    clear() {
-        (0, _array.clear)(this.intermediateNodes);
-    }
-    find(node, depth, maximumDepth) {
-        if (depth > maximumDepth) {
-            return;
-        }
-        const nodeTerminalNode = node.isTerminalNode(), nodeNonTerminalNode = !nodeTerminalNode;
-        let found;
-        if (nodeTerminalNode) {
-            const terminalNode = node, types = this.tokenTypes, type = terminalNode.getType();
-            found = (0, _array.includes)(types, type, WILDCARD_CHARACTER);
-        }
-        if (nodeNonTerminalNode) {
-            const nonTerminalNode = node, ruleName = nonTerminalNode.getRuleName();
-            found = (0, _array.includes)(this.ruleNames, ruleName, WILDCARD_CHARACTER);
-        }
-        if (found) {
-            const intermediateNode = node; ///
-            this.intermediateNodes.push(intermediateNode);
-        }
-        if (this.infiniteDescent) {
-            if (nodeNonTerminalNode) {
-                depth++;
-                const nonTerminalNode = node; ///
-                nonTerminalNode.forEachChildNode((childNode)=>{
-                    this.find(childNode, depth, maximumDepth);
-                });
+    find(node, depth, maximumDepth, intermediateNodes = []) {
+        if (depth <= maximumDepth) {
+            const nodeTerminalNode = node.isTerminalNode(), nodeNonTerminalNode = !nodeTerminalNode;
+            if (nodeTerminalNode) {
+                const terminalNode = node, type = terminalNode.getType(), tokenType = type, found = (0, _array.includes)(this.tokenTypes, tokenType, WILDCARD_CHARACTER);
+                if (found) {
+                    const intermediateNode = terminalNode; ///
+                    intermediateNodes.push(intermediateNode);
+                }
             }
-        }
-    }
-    apply(nodes, depth, maximumDepth) {
-        this.spread.adjustNodes(this.intermediateNodes);
-        if (this.subQuery === null) {
-            (0, _array.push)(nodes, this.intermediateNodes);
-        } else {
-            this.intermediateNodes.forEach((intermediateNode)=>{
-                const intermediateNodeNonTerminalNode = intermediateNode.isNonTerminalNode();
-                if (intermediateNodeNonTerminalNode) {
+            if (nodeNonTerminalNode) {
+                const nonTerminalNode = node, ruleName = nonTerminalNode.getRuleName(), found = (0, _array.includes)(this.ruleNames, ruleName, WILDCARD_CHARACTER);
+                if (found) {
+                    const intermediateNode = nonTerminalNode; ///
+                    intermediateNodes.push(intermediateNode);
+                }
+                if (this.infiniteDescent) {
                     depth++;
-                    const nonTerminalNode = intermediateNode; ///
-                    this.subQuery.clear();
                     nonTerminalNode.forEachChildNode((childNode)=>{
-                        this.subQuery.find(childNode, depth, maximumDepth);
+                        this.find(childNode, depth, maximumDepth, intermediateNodes);
                     });
-                    this.subQuery.apply(nodes, depth, maximumDepth);
                 }
-            });
+            }
+        }
+        return intermediateNodes;
+    }
+    apply(nodes, depth, maximumDepth, intermediateNodes) {
+        this.spread.adjustNodes(intermediateNodes);
+        if (this.subQuery === null) {
+            (0, _array.push)(nodes, intermediateNodes);
+            return;
         }
+        depth++;
+        intermediateNodes.forEach((intermediateNode)=>{
+            const intermedidateNodeNonTerminalNode = intermediateNode.isNonTerminalNode();
+            if (intermedidateNodeNonTerminalNode) {
+                const nonTerminalNode = intermediateNode, intermediateNodes = [];
+                nonTerminalNode.forEachChildNode((childNode)=>{
+                    const node = childNode; ///
+                    this.subQuery.find(node, depth, maximumDepth, intermediateNodes);
+                });
+                this.subQuery.apply(nodes, depth, maximumDepth, intermediateNodes);
+            }
+        });
     }
     static fromExpression(expression, maximumDepth = Infinity) {
         const spread = expression.getSpread(), subQuery = subQueryFromExpression(expression), ruleNames = expression.getRuleNames(), tokenTypes = expression.getTokenTypes(), infiniteDescent = expression.isInfiniteDescent(), intermediateNodes = [], query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);
         return query;
     }
     static fromSubExpression(subExpression) {
-        const spread = subExpression.getSpread(), subQuery = subQueryFromSubExpression(subExpression), ruleNames = subExpression.getRuleNames(), tokenTypes = subExpression.getTokenTypes(), maximumDepth = Infinity, infiniteDescent = subExpression.isInfiniteDescent(), intermediateNodes = [], query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);
+        const spread = subExpression.getSpread(), subQuery = subQueryFromSubExpression(subExpression), ruleNames = subExpression.getRuleNames(), tokenTypes = subExpression.getTokenTypes(), maximumDepth = Infinity, infiniteDescent = subExpression.isInfiniteDescent(), query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent);
         return query;
     }
     static fromExpressionString(expressionString, maximumDepth = Infinity) {
         let query = null;
         const expression = _expression.default.fromExpressionString(expressionString);
         if (expression !== null) {
-            const spread = expression.getSpread(), subQuery = subQueryFromExpression(expression), ruleNames = expression.getRuleNames(), tokenTypes = expression.getTokenTypes(), infiniteDescent = expression.isInfiniteDescent(), intermediateNodes = [];
-            query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);
+            const spread = expression.getSpread(), subQuery = subQueryFromExpression(expression), ruleNames = expression.getRuleNames(), tokenTypes = expression.getTokenTypes(), infiniteDescent = expression.isInfiniteDescent();
+            query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent);
         }
         return query;
     }
@@ -142,4 +132,4 @@ function subQueryFromSubExpression(subExpression) {
     return subQuery;
 }
 
-//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/query.js"],"sourcesContent":["\"use strict\";\n\nimport { characters } from \"necessary\";\n\nimport Expression from \"./expression\";\n\nimport { push, clear, includes } from \"./utilities/array\";\n\nconst { WILDCARD_CHARACTER } = characters;\n\nexport default class Query {\n  constructor(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes) {\n    this.spread = spread;\n    this.subQuery = subQuery;\n    this.ruleNames = ruleNames;\n    this.tokenTypes = tokenTypes;\n    this.maximumDepth = maximumDepth;\n    this.infiniteDescent = infiniteDescent;\n    this.intermediateNodes = intermediateNodes;\n  }\n\n  getSpread() {\n    return this.sprea;\n  }\n\n  getSubQuery() {\n    return this.subQuery;\n  }\n\n  getRuleNames() {\n    return this.ruleNames;\n  }\n\n  getTokenTypes() {\n    return this.tokenTypes;\n  }\n\n  getMaximumDepth() {\n    return this.maximumDepth;\n  }\n\n  isInfiniteDescent() {\n    return this.infiniteDescent;\n  }\n\n  getIntermediateNodes() {\n    return this.intermediateNodes;\n  }\n\n  execute(node, depth = 0, maximumDepth = this.maximumDepth) {\n    const nodes = [];\n\n    this.clear();\n\n    this.find(node, depth, maximumDepth);\n\n    this.apply(nodes, depth, maximumDepth);\n\n    return nodes;\n  }\n\n  clear() {\n    clear(this.intermediateNodes);\n  }\n\n  find(node, depth, maximumDepth) {\n    if (depth > maximumDepth) {\n      return;\n    }\n\n    const nodeTerminalNode = node.isTerminalNode(),\n          nodeNonTerminalNode = !nodeTerminalNode;\n\n    let found;\n\n    if (nodeTerminalNode) {\n      const terminalNode = node,  ///\n            types = this.tokenTypes,  ///\n            type = terminalNode.getType();\n\n      found = includes(types, type, WILDCARD_CHARACTER);\n    }\n\n    if (nodeNonTerminalNode) {\n      const nonTerminalNode = node, ///\n            ruleName = nonTerminalNode.getRuleName();\n\n      found = includes(this.ruleNames, ruleName, WILDCARD_CHARACTER);\n    }\n\n    if (found) {\n      const intermediateNode = node; ///\n\n      this.intermediateNodes.push(intermediateNode);\n    }\n\n    if (this.infiniteDescent) {\n      if (nodeNonTerminalNode) {\n        depth++;\n\n        const nonTerminalNode = node; ///\n\n        nonTerminalNode.forEachChildNode((childNode) => {\n          this.find(childNode, depth, maximumDepth);\n        });\n      }\n    }\n  }\n\n  apply(nodes, depth, maximumDepth) {\n    this.spread.adjustNodes(this.intermediateNodes);\n\n    if (this.subQuery === null) {\n      push(nodes, this.intermediateNodes);\n    } else {\n      this.intermediateNodes.forEach((intermediateNode) => {\n        const intermediateNodeNonTerminalNode = intermediateNode.isNonTerminalNode();\n\n        if (intermediateNodeNonTerminalNode) {\n          depth++;\n\n          const nonTerminalNode = intermediateNode; ///\n\n          this.subQuery.clear();\n\n          nonTerminalNode.forEachChildNode((childNode) => {\n            this.subQuery.find(childNode, depth, maximumDepth);\n          });\n\n          this.subQuery.apply(nodes, depth, maximumDepth);\n        }\n      });\n    }\n  }\n\n  static fromExpression(expression, maximumDepth = Infinity) {\n    const spread = expression.getSpread(),\n          subQuery = subQueryFromExpression(expression),\n          ruleNames = expression.getRuleNames(),\n          tokenTypes = expression.getTokenTypes(),\n          infiniteDescent = expression.isInfiniteDescent(),\n          intermediateNodes = [],\n          query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);\n\n    return query;\n  }\n\n  static fromSubExpression(subExpression) {\n    const spread = subExpression.getSpread(),\n          subQuery = subQueryFromSubExpression(subExpression),\n          ruleNames = subExpression.getRuleNames(),\n          tokenTypes = subExpression.getTokenTypes(),\n          maximumDepth = Infinity,\n          infiniteDescent = subExpression.isInfiniteDescent(),\n          intermediateNodes = [],\n          query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);\n\n    return query;\n  }\n\n  static fromExpressionString(expressionString, maximumDepth = Infinity) {\n    let query = null;\n\n    const expression = Expression.fromExpressionString(expressionString);\n\n    if (expression !== null) {\n      const spread = expression.getSpread(),\n            subQuery = subQueryFromExpression(expression),\n            ruleNames = expression.getRuleNames(),\n            tokenTypes = expression.getTokenTypes(),\n            infiniteDescent = expression.isInfiniteDescent(),\n            intermediateNodes = [];\n\n      query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);\n    }\n\n    return query;\n  }\n}\n\nfunction subQueryFromExpression(expression) {\n  let subQuery = null;\n\n  const subExpression = expression.getSubExpression();\n\n  if (subExpression !== null) {\n    const query = Query.fromSubExpression(subExpression);\n\n    subQuery = query; ///\n  }\n\n  return subQuery;\n}\n\nfunction subQueryFromSubExpression(subExpression) {\n  let subQuery = null;\n\n  subExpression = subExpression.getSubExpression(); ///\n\n  if (subExpression !== null) {\n    const query = Query.fromSubExpression(subExpression);\n\n    subQuery = query; ///\n  }\n\n  return subQuery;\n}\n"],"names":["Query","WILDCARD_CHARACTER","characters","spread","subQuery","ruleNames","tokenTypes","maximumDepth","infiniteDescent","intermediateNodes","getSpread","sprea","getSubQuery","getRuleNames","getTokenTypes","getMaximumDepth","isInfiniteDescent","getIntermediateNodes","execute","node","depth","nodes","clear","find","apply","nodeTerminalNode","isTerminalNode","nodeNonTerminalNode","found","terminalNode","types","type","getType","includes","nonTerminalNode","ruleName","getRuleName","intermediateNode","push","forEachChildNode","childNode","adjustNodes","forEach","intermediateNodeNonTerminalNode","isNonTerminalNode","fromExpression","expression","Infinity","subQueryFromExpression","query","fromSubExpression","subExpression","subQueryFromSubExpression","fromExpressionString","expressionString","Expression","getSubExpression"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../src/query.js"],"sourcesContent":["\"use strict\";\n\nimport { characters } from \"necessary\";\n\nimport Expression from \"./expression\";\n\nimport { push, includes } from \"./utilities/array\";\n\nconst { WILDCARD_CHARACTER } = characters;\n\nexport default class Query {\n  constructor(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent) {\n    this.spread = spread;\n    this.subQuery = subQuery;\n    this.ruleNames = ruleNames;\n    this.tokenTypes = tokenTypes;\n    this.maximumDepth = maximumDepth;\n    this.infiniteDescent = infiniteDescent;\n  }\n\n  getSpread() {\n    return this.spread;\n  }\n\n  getSubQuery() {\n    return this.subQuery;\n  }\n\n  getRuleNames() {\n    return this.ruleNames;\n  }\n\n  getTokenTypes() {\n    return this.tokenTypes;\n  }\n\n  getMaximumDepth() {\n    return this.maximumDepth;\n  }\n\n  isInfiniteDescent() {\n    return this.infiniteDescent;\n  }\n\n  execute(node, depth = 0, maximumDepth = this.maximumDepth) {\n    const nodes = [];\n\n    const intermediateNodes = this.find(node, depth, maximumDepth);\n\n    this.apply(nodes, depth, maximumDepth, intermediateNodes);\n\n    return nodes;\n  }\n\n  find(node, depth, maximumDepth, intermediateNodes = []) {\n    if (depth <= maximumDepth) {\n      const nodeTerminalNode = node.isTerminalNode(),\n            nodeNonTerminalNode = !nodeTerminalNode;\n\n      if (nodeTerminalNode) {\n        const terminalNode = node,  ///\n              type = terminalNode.getType(),\n              tokenType = type,\n              found = includes(this.tokenTypes, tokenType, WILDCARD_CHARACTER);\n\n        if (found) {\n          const intermediateNode = terminalNode; ///\n\n          intermediateNodes.push(intermediateNode);\n        }\n      }\n\n      if (nodeNonTerminalNode) {\n        const nonTerminalNode = node, ///\n              ruleName = nonTerminalNode.getRuleName(),\n              found = includes(this.ruleNames, ruleName, WILDCARD_CHARACTER);\n\n        if (found) {\n          const intermediateNode = nonTerminalNode; ///\n\n          intermediateNodes.push(intermediateNode);\n        }\n\n        if (this.infiniteDescent) {\n          depth++;\n\n          nonTerminalNode.forEachChildNode((childNode) => {\n            this.find(childNode, depth, maximumDepth, intermediateNodes);\n          });\n        }\n      }\n    }\n\n    return intermediateNodes;\n  }\n\n  apply(nodes, depth, maximumDepth, intermediateNodes) {\n    this.spread.adjustNodes(intermediateNodes);\n\n    if (this.subQuery === null) {\n      push(nodes, intermediateNodes);\n\n      return;\n    }\n\n    depth++;\n\n    intermediateNodes.forEach((intermediateNode) => {\n      const intermedidateNodeNonTerminalNode = intermediateNode.isNonTerminalNode();\n\n      if (intermedidateNodeNonTerminalNode) {\n        const nonTerminalNode = intermediateNode, ///\n              intermediateNodes = [];\n\n        nonTerminalNode.forEachChildNode((childNode) => {\n          const node = childNode; ///\n\n          this.subQuery.find(node, depth, maximumDepth, intermediateNodes);\n        });\n\n        this.subQuery.apply(nodes, depth, maximumDepth, intermediateNodes);\n      }\n    });\n  }\n\n  static fromExpression(expression, maximumDepth = Infinity) {\n    const spread = expression.getSpread(),\n          subQuery = subQueryFromExpression(expression),\n          ruleNames = expression.getRuleNames(),\n          tokenTypes = expression.getTokenTypes(),\n          infiniteDescent = expression.isInfiniteDescent(),\n          intermediateNodes = [],\n          query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);\n\n    return query;\n  }\n\n  static fromSubExpression(subExpression) {\n    const spread = subExpression.getSpread(),\n          subQuery = subQueryFromSubExpression(subExpression),\n          ruleNames = subExpression.getRuleNames(),\n          tokenTypes = subExpression.getTokenTypes(),\n          maximumDepth = Infinity,\n          infiniteDescent = subExpression.isInfiniteDescent(),\n          query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent);\n\n    return query;\n  }\n\n  static fromExpressionString(expressionString, maximumDepth = Infinity) {\n    let query = null;\n\n    const expression = Expression.fromExpressionString(expressionString);\n\n    if (expression !== null) {\n      const spread = expression.getSpread(),\n            subQuery = subQueryFromExpression(expression),\n            ruleNames = expression.getRuleNames(),\n            tokenTypes = expression.getTokenTypes(),\n            infiniteDescent = expression.isInfiniteDescent();\n\n      query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent);\n    }\n\n    return query;\n  }\n}\n\nfunction subQueryFromExpression(expression) {\n  let subQuery = null;\n\n  const subExpression = expression.getSubExpression();\n\n  if (subExpression !== null) {\n    const query = Query.fromSubExpression(subExpression);\n\n    subQuery = query; ///\n  }\n\n  return subQuery;\n}\n\nfunction subQueryFromSubExpression(subExpression) {\n  let subQuery = null;\n\n  subExpression = subExpression.getSubExpression(); ///\n\n  if (subExpression !== null) {\n    const query = Query.fromSubExpression(subExpression);\n\n    subQuery = query; ///\n  }\n\n  return subQuery;\n}\n"],"names":["Query","WILDCARD_CHARACTER","characters","spread","subQuery","ruleNames","tokenTypes","maximumDepth","infiniteDescent","getSpread","getSubQuery","getRuleNames","getTokenTypes","getMaximumDepth","isInfiniteDescent","execute","node","depth","nodes","intermediateNodes","find","apply","nodeTerminalNode","isTerminalNode","nodeNonTerminalNode","terminalNode","type","getType","tokenType","found","includes","intermediateNode","push","nonTerminalNode","ruleName","getRuleName","forEachChildNode","childNode","adjustNodes","forEach","intermedidateNodeNonTerminalNode","isNonTerminalNode","fromExpression","expression","Infinity","subQueryFromExpression","query","fromSubExpression","subExpression","subQueryFromSubExpression","fromExpressionString","expressionString","Expression","getSubExpression"],"mappings":"AAAA;;;;+BAUA;;;eAAqBA;;;2BARM;mEAEJ;uBAEQ;;;;;;AAE/B,MAAM,EAAEC,kBAAkB,EAAE,GAAGC,qBAAU;AAE1B,MAAMF;IACnB,YAAYG,MAAM,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,UAAU,EAAEC,YAAY,EAAEC,eAAe,CAAE;QAClF,IAAI,CAACL,MAAM,GAAGA;QACd,IAAI,CAACC,QAAQ,GAAGA;QAChB,IAAI,CAACC,SAAS,GAAGA;QACjB,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,YAAY,GAAGA;QACpB,IAAI,CAACC,eAAe,GAAGA;IACzB;IAEAC,YAAY;QACV,OAAO,IAAI,CAACN,MAAM;IACpB;IAEAO,cAAc;QACZ,OAAO,IAAI,CAACN,QAAQ;IACtB;IAEAO,eAAe;QACb,OAAO,IAAI,CAACN,SAAS;IACvB;IAEAO,gBAAgB;QACd,OAAO,IAAI,CAACN,UAAU;IACxB;IAEAO,kBAAkB;QAChB,OAAO,IAAI,CAACN,YAAY;IAC1B;IAEAO,oBAAoB;QAClB,OAAO,IAAI,CAACN,eAAe;IAC7B;IAEAO,QAAQC,IAAI,EAAEC,QAAQ,CAAC,EAAEV,eAAe,IAAI,CAACA,YAAY,EAAE;QACzD,MAAMW,QAAQ,EAAE;QAEhB,MAAMC,oBAAoB,IAAI,CAACC,IAAI,CAACJ,MAAMC,OAAOV;QAEjD,IAAI,CAACc,KAAK,CAACH,OAAOD,OAAOV,cAAcY;QAEvC,OAAOD;IACT;IAEAE,KAAKJ,IAAI,EAAEC,KAAK,EAAEV,YAAY,EAAEY,oBAAoB,EAAE,EAAE;QACtD,IAAIF,SAASV,cAAc;YACzB,MAAMe,mBAAmBN,KAAKO,cAAc,IACtCC,sBAAsB,CAACF;YAE7B,IAAIA,kBAAkB;gBACpB,MAAMG,eAAeT,MACfU,OAAOD,aAAaE,OAAO,IAC3BC,YAAYF,MACZG,QAAQC,IAAAA,eAAQ,EAAC,IAAI,CAACxB,UAAU,EAAEsB,WAAW3B;gBAEnD,IAAI4B,OAAO;oBACT,MAAME,mBAAmBN,cAAc,GAAG;oBAE1CN,kBAAkBa,IAAI,CAACD;gBACzB;YACF;YAEA,IAAIP,qBAAqB;gBACvB,MAAMS,kBAAkBjB,MAClBkB,WAAWD,gBAAgBE,WAAW,IACtCN,QAAQC,IAAAA,eAAQ,EAAC,IAAI,CAACzB,SAAS,EAAE6B,UAAUjC;gBAEjD,IAAI4B,OAAO;oBACT,MAAME,mBAAmBE,iBAAiB,GAAG;oBAE7Cd,kBAAkBa,IAAI,CAACD;gBACzB;gBAEA,IAAI,IAAI,CAACvB,eAAe,EAAE;oBACxBS;oBAEAgB,gBAAgBG,gBAAgB,CAAC,CAACC;wBAChC,IAAI,CAACjB,IAAI,CAACiB,WAAWpB,OAAOV,cAAcY;oBAC5C;gBACF;YACF;QACF;QAEA,OAAOA;IACT;IAEAE,MAAMH,KAAK,EAAED,KAAK,EAAEV,YAAY,EAAEY,iBAAiB,EAAE;QACnD,IAAI,CAAChB,MAAM,CAACmC,WAAW,CAACnB;QAExB,IAAI,IAAI,CAACf,QAAQ,KAAK,MAAM;YAC1B4B,IAAAA,WAAI,EAACd,OAAOC;YAEZ;QACF;QAEAF;QAEAE,kBAAkBoB,OAAO,CAAC,CAACR;YACzB,MAAMS,mCAAmCT,iBAAiBU,iBAAiB;YAE3E,IAAID,kCAAkC;gBACpC,MAAMP,kBAAkBF,kBAClBZ,oBAAoB,EAAE;gBAE5Bc,gBAAgBG,gBAAgB,CAAC,CAACC;oBAChC,MAAMrB,OAAOqB,WAAW,GAAG;oBAE3B,IAAI,CAACjC,QAAQ,CAACgB,IAAI,CAACJ,MAAMC,OAAOV,cAAcY;gBAChD;gBAEA,IAAI,CAACf,QAAQ,CAACiB,KAAK,CAACH,OAAOD,OAAOV,cAAcY;YAClD;QACF;IACF;IAEA,OAAOuB,eAAeC,UAAU,EAAEpC,eAAeqC,QAAQ,EAAE;QACzD,MAAMzC,SAASwC,WAAWlC,SAAS,IAC7BL,WAAWyC,uBAAuBF,aAClCtC,YAAYsC,WAAWhC,YAAY,IACnCL,aAAaqC,WAAW/B,aAAa,IACrCJ,kBAAkBmC,WAAW7B,iBAAiB,IAC9CK,oBAAoB,EAAE,EACtB2B,QAAQ,IAAI9C,MAAMG,QAAQC,UAAUC,WAAWC,YAAYC,cAAcC,iBAAiBW;QAEhG,OAAO2B;IACT;IAEA,OAAOC,kBAAkBC,aAAa,EAAE;QACtC,MAAM7C,SAAS6C,cAAcvC,SAAS,IAChCL,WAAW6C,0BAA0BD,gBACrC3C,YAAY2C,cAAcrC,YAAY,IACtCL,aAAa0C,cAAcpC,aAAa,IACxCL,eAAeqC,UACfpC,kBAAkBwC,cAAclC,iBAAiB,IACjDgC,QAAQ,IAAI9C,MAAMG,QAAQC,UAAUC,WAAWC,YAAYC,cAAcC;QAE/E,OAAOsC;IACT;IAEA,OAAOI,qBAAqBC,gBAAgB,EAAE5C,eAAeqC,QAAQ,EAAE;QACrE,IAAIE,QAAQ;QAEZ,MAAMH,aAAaS,mBAAU,CAACF,oBAAoB,CAACC;QAEnD,IAAIR,eAAe,MAAM;YACvB,MAAMxC,SAASwC,WAAWlC,SAAS,IAC7BL,WAAWyC,uBAAuBF,aAClCtC,YAAYsC,WAAWhC,YAAY,IACnCL,aAAaqC,WAAW/B,aAAa,IACrCJ,kBAAkBmC,WAAW7B,iBAAiB;YAEpDgC,QAAQ,IAAI9C,MAAMG,QAAQC,UAAUC,WAAWC,YAAYC,cAAcC;QAC3E;QAEA,OAAOsC;IACT;AACF;AAEA,SAASD,uBAAuBF,UAAU;IACxC,IAAIvC,WAAW;IAEf,MAAM4C,gBAAgBL,WAAWU,gBAAgB;IAEjD,IAAIL,kBAAkB,MAAM;QAC1B,MAAMF,QAAQ9C,MAAM+C,iBAAiB,CAACC;QAEtC5C,WAAW0C,OAAO,GAAG;IACvB;IAEA,OAAO1C;AACT;AAEA,SAAS6C,0BAA0BD,aAAa;IAC9C,IAAI5C,WAAW;IAEf4C,gBAAgBA,cAAcK,gBAAgB,IAAI,GAAG;IAErD,IAAIL,kBAAkB,MAAM;QAC1B,MAAMF,QAAQ9C,MAAM+C,iBAAiB,CAACC;QAEtC5C,WAAW0C,OAAO,GAAG;IACvB;IAEA,OAAO1C;AACT"}

package/lib/utilities/array.js

@@ -43,9 +43,11 @@ _export(exports, {
 const _necessary = require("necessary");
 const { clear, push, first, second, third, fourth, fifth, last } = _necessary.arrayUtilities;
 function trim(array, startIndex, endIndex) {
+    const length = array.length; ///
     if (startIndex < 0) {
-        const length = array.length; ///
         startIndex = length + startIndex; ///
+    }
+    if (endIndex < 0) {
         endIndex = length + endIndex; ///
     }
     if (endIndex !== Infinity) {
@@ -56,7 +58,13 @@ function trim(array, startIndex, endIndex) {
     array.splice(start, deleteCount);
 }
 function includes(array, ...elements) {
-    return elements.some((element)=>array.includes(element));
+    const found = elements.some((element)=>{
+        const found = array.includes(element);
+        if (found) {
+            return true;
+        }
+    });
+    return found;
 }
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYXJyYXkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5leHBvcnQgY29uc3QgeyBjbGVhciwgcHVzaCwgZmlyc3QsIHNlY29uZCwgdGhpcmQsIGZvdXJ0aCwgZmlmdGgsIGxhc3QgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gdHJpbShhcnJheSwgc3RhcnRJbmRleCwgZW5kSW5kZXgpIHtcbiAgaWYgKHN0YXJ0SW5kZXggPCAwKSB7XG4gICAgY29uc3QgbGVuZ3RoID0gYXJyYXkubGVuZ3RoOyAvLy9cblxuICAgIHN0YXJ0SW5kZXggPSBsZW5ndGggKyBzdGFydEluZGV4OyAvLy9cblxuICAgIGVuZEluZGV4ID0gbGVuZ3RoICsgZW5kSW5kZXg7IC8vL1xuICB9XG5cbiAgaWYgKGVuZEluZGV4ICE9PSBJbmZpbml0eSkge1xuICAgIGNvbnN0IHN0YXJ0ID0gZW5kSW5kZXggKyAxO1xuXG4gICAgYXJyYXkuc3BsaWNlKHN0YXJ0KTtcbiAgfVxuXG4gIGNvbnN0IHN0YXJ0ID0gMCxcbiAgICAgICAgZGVsZXRlQ291bnQgPSBzdGFydEluZGV4OyAvLy9cblxuICBhcnJheS5zcGxpY2Uoc3RhcnQsIGRlbGV0ZUNvdW50KTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGluY2x1ZGVzKGFycmF5LCAuLi5lbGVtZW50cykge1xuICByZXR1cm4gZWxlbWVudHMuc29tZSgoZWxlbWVudCkgPT4gYXJyYXkuaW5jbHVkZXMoZWxlbWVudCkpO1xufVxuIl0sIm5hbWVzIjpbImNsZWFyIiwiZmlmdGgiLCJmaXJzdCIsImZvdXJ0aCIsImluY2x1ZGVzIiwibGFzdCIsInB1c2giLCJzZWNvbmQiLCJ0aGlyZCIsInRyaW0iLCJhcnJheVV0aWxpdGllcyIsImFycmF5Iiwic3RhcnRJbmRleCIsImVuZEluZGV4IiwibGVuZ3RoIiwiSW5maW5pdHkiLCJzdGFydCIsInNwbGljZSIsImRlbGV0ZUNvdW50IiwiZWxlbWVudHMiLCJzb21lIiwiZWxlbWVudCJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O1FBSWVBO2VBQUFBOztRQUEyQ0M7ZUFBQUE7O1FBQTlCQztlQUFBQTs7UUFBc0JDO2VBQUFBOztRQXVCbENDO2VBQUFBOztRQXZCaURDO2VBQUFBOztRQUEzQ0M7ZUFBQUE7O1FBQWFDO2VBQUFBOztRQUFRQztlQUFBQTs7UUFFM0JDO2VBQUFBOzs7MkJBSmU7QUFFeEIsTUFBTSxFQUFFVCxLQUFLLEVBQUVNLElBQUksRUFBRUosS0FBSyxFQUFFSyxNQUFNLEVBQUVDLEtBQUssRUFBRUwsTUFBTSxFQUFFRixLQUFLLEVBQUVJLElBQUksRUFBRSxHQUFHSyx5QkFBYztBQUVqRixTQUFTRCxLQUFLRSxLQUFLLEVBQUVDLFVBQVUsRUFBRUMsUUFBUTtJQUM5QyxJQUFJRCxhQUFhLEdBQUc7UUFDbEIsTUFBTUUsU0FBU0gsTUFBTUcsTUFBTSxFQUFFLEdBQUc7UUFFaENGLGFBQWFFLFNBQVNGLFlBQVksR0FBRztRQUVyQ0MsV0FBV0MsU0FBU0QsVUFBVSxHQUFHO0lBQ25DO0lBRUEsSUFBSUEsYUFBYUUsVUFBVTtRQUN6QixNQUFNQyxRQUFRSCxXQUFXO1FBRXpCRixNQUFNTSxNQUFNLENBQUNEO0lBQ2Y7SUFFQSxNQUFNQSxRQUFRLEdBQ1JFLGNBQWNOLFlBQVksR0FBRztJQUVuQ0QsTUFBTU0sTUFBTSxDQUFDRCxPQUFPRTtBQUN0QjtBQUVPLFNBQVNkLFNBQVNPLEtBQUssRUFBRSxHQUFHUSxRQUFRO0lBQ3pDLE9BQU9BLFNBQVNDLElBQUksQ0FBQyxDQUFDQyxVQUFZVixNQUFNUCxRQUFRLENBQUNpQjtBQUNuRCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvYXJyYXkuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCB7IGFycmF5VXRpbGl0aWVzIH0gZnJvbSBcIm5lY2Vzc2FyeVwiO1xuXG5leHBvcnQgY29uc3QgeyBjbGVhciwgcHVzaCwgZmlyc3QsIHNlY29uZCwgdGhpcmQsIGZvdXJ0aCwgZmlmdGgsIGxhc3QgfSA9IGFycmF5VXRpbGl0aWVzO1xuXG5leHBvcnQgZnVuY3Rpb24gdHJpbShhcnJheSwgc3RhcnRJbmRleCwgZW5kSW5kZXgpIHtcbiAgY29uc3QgbGVuZ3RoID0gYXJyYXkubGVuZ3RoOyAvLy9cblxuICBpZiAoc3RhcnRJbmRleCA8IDApIHtcbiAgICBzdGFydEluZGV4ID0gbGVuZ3RoICsgc3RhcnRJbmRleDsgLy8vXG4gIH1cblxuICBpZiAoZW5kSW5kZXggPCAwKSB7XG4gICAgZW5kSW5kZXggPSBsZW5ndGggKyBlbmRJbmRleDsgLy8vXG4gIH1cblxuICBpZiAoZW5kSW5kZXggIT09IEluZmluaXR5KSB7XG4gICAgY29uc3Qgc3RhcnQgPSBlbmRJbmRleCArIDE7XG5cbiAgICBhcnJheS5zcGxpY2Uoc3RhcnQpO1xuICB9XG5cbiAgY29uc3Qgc3RhcnQgPSAwLFxuICAgICAgICBkZWxldGVDb3VudCA9IHN0YXJ0SW5kZXg7IC8vL1xuXG4gIGFycmF5LnNwbGljZShzdGFydCwgZGVsZXRlQ291bnQpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gaW5jbHVkZXMoYXJyYXksIC4uLmVsZW1lbnRzKSB7XG4gIGNvbnN0IGZvdW5kID0gZWxlbWVudHMuc29tZSgoZWxlbWVudCkgPT4ge1xuICAgIGNvbnN0IGZvdW5kID0gYXJyYXkuaW5jbHVkZXMoZWxlbWVudCk7XG5cbiAgICBpZiAoZm91bmQpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgcmV0dXJuIGZvdW5kO1xufVxuIl0sIm5hbWVzIjpbImNsZWFyIiwiZmlmdGgiLCJmaXJzdCIsImZvdXJ0aCIsImluY2x1ZGVzIiwibGFzdCIsInB1c2giLCJzZWNvbmQiLCJ0aGlyZCIsInRyaW0iLCJhcnJheVV0aWxpdGllcyIsImFycmF5Iiwic3RhcnRJbmRleCIsImVuZEluZGV4IiwibGVuZ3RoIiwiSW5maW5pdHkiLCJzdGFydCIsInNwbGljZSIsImRlbGV0ZUNvdW50IiwiZWxlbWVudHMiLCJmb3VuZCIsInNvbWUiLCJlbGVtZW50Il0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7UUFJZUE7ZUFBQUE7O1FBQTJDQztlQUFBQTs7UUFBOUJDO2VBQUFBOztRQUFzQkM7ZUFBQUE7O1FBeUJsQ0M7ZUFBQUE7O1FBekJpREM7ZUFBQUE7O1FBQTNDQztlQUFBQTs7UUFBYUM7ZUFBQUE7O1FBQVFDO2VBQUFBOztRQUUzQkM7ZUFBQUE7OzsyQkFKZTtBQUV4QixNQUFNLEVBQUVULEtBQUssRUFBRU0sSUFBSSxFQUFFSixLQUFLLEVBQUVLLE1BQU0sRUFBRUMsS0FBSyxFQUFFTCxNQUFNLEVBQUVGLEtBQUssRUFBRUksSUFBSSxFQUFFLEdBQUdLLHlCQUFjO0FBRWpGLFNBQVNELEtBQUtFLEtBQUssRUFBRUMsVUFBVSxFQUFFQyxRQUFRO0lBQzlDLE1BQU1DLFNBQVNILE1BQU1HLE1BQU0sRUFBRSxHQUFHO0lBRWhDLElBQUlGLGFBQWEsR0FBRztRQUNsQkEsYUFBYUUsU0FBU0YsWUFBWSxHQUFHO0lBQ3ZDO0lBRUEsSUFBSUMsV0FBVyxHQUFHO1FBQ2hCQSxXQUFXQyxTQUFTRCxVQUFVLEdBQUc7SUFDbkM7SUFFQSxJQUFJQSxhQUFhRSxVQUFVO1FBQ3pCLE1BQU1DLFFBQVFILFdBQVc7UUFFekJGLE1BQU1NLE1BQU0sQ0FBQ0Q7SUFDZjtJQUVBLE1BQU1BLFFBQVEsR0FDUkUsY0FBY04sWUFBWSxHQUFHO0lBRW5DRCxNQUFNTSxNQUFNLENBQUNELE9BQU9FO0FBQ3RCO0FBRU8sU0FBU2QsU0FBU08sS0FBSyxFQUFFLEdBQUdRLFFBQVE7SUFDekMsTUFBTUMsUUFBUUQsU0FBU0UsSUFBSSxDQUFDLENBQUNDO1FBQzNCLE1BQU1GLFFBQVFULE1BQU1QLFFBQVEsQ0FBQ2tCO1FBRTdCLElBQUlGLE9BQU87WUFDVCxPQUFPO1FBQ1Q7SUFDRjtJQUVBLE9BQU9BO0FBQ1QifQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-query",
   "author": "James Smith",
-  "version": "4.1.203",
+  "version": "4.1.205",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-query",
   "description": "Occam's query functionality.",
@@ -17,14 +17,14 @@
   "devDependencies": {
     "@swc/core": "1.13.20",
     "easy": "^25.0.8",
-    "easy-layout": "^6.0.334",
-    "easy-with-style": "^3.0.575",
+    "easy-layout": "^6.0.335",
+    "easy-with-style": "^3.0.576",
     "esbuild": "0.11.14",
     "express": "^4.17.1",
     "juxtapose": "^4.0.143",
     "lively-cli": "^3.0.3",
     "watchful-cli": "^1.7.102",
-    "with-style": "^5.0.322"
+    "with-style": "^5.0.325"
   },
   "scripts": {
     "start": "node ./bin/main.js",

package/src/query.js

@@ -4,23 +4,22 @@ import { characters } from "necessary";
 
 import Expression from "./expression";
 
-import { push, clear, includes } from "./utilities/array";
+import { push, includes } from "./utilities/array";
 
 const { WILDCARD_CHARACTER } = characters;
 
 export default class Query {
-  constructor(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes) {
+  constructor(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent) {
     this.spread = spread;
     this.subQuery = subQuery;
     this.ruleNames = ruleNames;
     this.tokenTypes = tokenTypes;
     this.maximumDepth = maximumDepth;
     this.infiniteDescent = infiniteDescent;
-    this.intermediateNodes = intermediateNodes;
   }
 
   getSpread() {
-    return this.sprea;
+    return this.spread;
   }
 
   getSubQuery() {
@@ -43,94 +42,85 @@ export default class Query {
     return this.infiniteDescent;
   }
 
-  getIntermediateNodes() {
-    return this.intermediateNodes;
-  }
-
   execute(node, depth = 0, maximumDepth = this.maximumDepth) {
     const nodes = [];
 
-    this.clear();
-
-    this.find(node, depth, maximumDepth);
+    const intermediateNodes = this.find(node, depth, maximumDepth);
 
-    this.apply(nodes, depth, maximumDepth);
+    this.apply(nodes, depth, maximumDepth, intermediateNodes);
 
     return nodes;
   }
 
-  clear() {
-    clear(this.intermediateNodes);
-  }
-
-  find(node, depth, maximumDepth) {
-    if (depth > maximumDepth) {
-      return;
-    }
-
-    const nodeTerminalNode = node.isTerminalNode(),
-          nodeNonTerminalNode = !nodeTerminalNode;
-
-    let found;
-
-    if (nodeTerminalNode) {
-      const terminalNode = node,  ///
-            types = this.tokenTypes,  ///
-            type = terminalNode.getType();
+  find(node, depth, maximumDepth, intermediateNodes = []) {
+    if (depth <= maximumDepth) {
+      const nodeTerminalNode = node.isTerminalNode(),
+            nodeNonTerminalNode = !nodeTerminalNode;
 
-      found = includes(types, type, WILDCARD_CHARACTER);
-    }
+      if (nodeTerminalNode) {
+        const terminalNode = node,  ///
+              type = terminalNode.getType(),
+              tokenType = type,
+              found = includes(this.tokenTypes, tokenType, WILDCARD_CHARACTER);
 
-    if (nodeNonTerminalNode) {
-      const nonTerminalNode = node, ///
-            ruleName = nonTerminalNode.getRuleName();
+        if (found) {
+          const intermediateNode = terminalNode; ///
 
-      found = includes(this.ruleNames, ruleName, WILDCARD_CHARACTER);
-    }
+          intermediateNodes.push(intermediateNode);
+        }
+      }
 
-    if (found) {
-      const intermediateNode = node; ///
+      if (nodeNonTerminalNode) {
+        const nonTerminalNode = node, ///
+              ruleName = nonTerminalNode.getRuleName(),
+              found = includes(this.ruleNames, ruleName, WILDCARD_CHARACTER);
 
-      this.intermediateNodes.push(intermediateNode);
-    }
+        if (found) {
+          const intermediateNode = nonTerminalNode; ///
 
-    if (this.infiniteDescent) {
-      if (nodeNonTerminalNode) {
-        depth++;
+          intermediateNodes.push(intermediateNode);
+        }
 
-        const nonTerminalNode = node; ///
+        if (this.infiniteDescent) {
+          depth++;
 
-        nonTerminalNode.forEachChildNode((childNode) => {
-          this.find(childNode, depth, maximumDepth);
-        });
+          nonTerminalNode.forEachChildNode((childNode) => {
+            this.find(childNode, depth, maximumDepth, intermediateNodes);
+          });
+        }
       }
     }
+
+    return intermediateNodes;
   }
 
-  apply(nodes, depth, maximumDepth) {
-    this.spread.adjustNodes(this.intermediateNodes);
+  apply(nodes, depth, maximumDepth, intermediateNodes) {
+    this.spread.adjustNodes(intermediateNodes);
 
     if (this.subQuery === null) {
-      push(nodes, this.intermediateNodes);
-    } else {
-      this.intermediateNodes.forEach((intermediateNode) => {
-        const intermediateNodeNonTerminalNode = intermediateNode.isNonTerminalNode();
+      push(nodes, intermediateNodes);
 
-        if (intermediateNodeNonTerminalNode) {
-          depth++;
+      return;
+    }
 
-          const nonTerminalNode = intermediateNode; ///
+    depth++;
 
-          this.subQuery.clear();
+    intermediateNodes.forEach((intermediateNode) => {
+      const intermedidateNodeNonTerminalNode = intermediateNode.isNonTerminalNode();
 
-          nonTerminalNode.forEachChildNode((childNode) => {
-            this.subQuery.find(childNode, depth, maximumDepth);
-          });
+      if (intermedidateNodeNonTerminalNode) {
+        const nonTerminalNode = intermediateNode, ///
+              intermediateNodes = [];
 
-          this.subQuery.apply(nodes, depth, maximumDepth);
-        }
-      });
-    }
+        nonTerminalNode.forEachChildNode((childNode) => {
+          const node = childNode; ///
+
+          this.subQuery.find(node, depth, maximumDepth, intermediateNodes);
+        });
+
+        this.subQuery.apply(nodes, depth, maximumDepth, intermediateNodes);
+      }
+    });
   }
 
   static fromExpression(expression, maximumDepth = Infinity) {
@@ -152,8 +142,7 @@ export default class Query {
           tokenTypes = subExpression.getTokenTypes(),
           maximumDepth = Infinity,
           infiniteDescent = subExpression.isInfiniteDescent(),
-          intermediateNodes = [],
-          query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);
+          query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent);
 
     return query;
   }
@@ -168,10 +157,9 @@ export default class Query {
             subQuery = subQueryFromExpression(expression),
             ruleNames = expression.getRuleNames(),
             tokenTypes = expression.getTokenTypes(),
-            infiniteDescent = expression.isInfiniteDescent(),
-            intermediateNodes = [];
+            infiniteDescent = expression.isInfiniteDescent();
 
-      query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent, intermediateNodes);
+      query = new Query(spread, subQuery, ruleNames, tokenTypes, maximumDepth, infiniteDescent);
     }
 
     return query;

package/src/utilities/array.js

@@ -5,11 +5,13 @@ import { arrayUtilities } from "necessary";
 export const { clear, push, first, second, third, fourth, fifth, last } = arrayUtilities;
 
 export function trim(array, startIndex, endIndex) {
-  if (startIndex < 0) {
-    const length = array.length; ///
+  const length = array.length; ///
 
+  if (startIndex < 0) {
     startIndex = length + startIndex; ///
+  }
 
+  if (endIndex < 0) {
     endIndex = length + endIndex; ///
   }
 
@@ -26,5 +28,13 @@ export function trim(array, startIndex, endIndex) {
 }
 
 export function includes(array, ...elements) {
-  return elements.some((element) => array.includes(element));
+  const found = elements.some((element) => {
+    const found = array.includes(element);
+
+    if (found) {
+      return true;
+    }
+  });
+
+  return found;
 }