Integrate ExpressionSet

Author: amitguptagwl

docs/CHECK_LIST.md

@@ -1,5 +1,6 @@
 Pre release
 * [ ] npm audit and yarn audit is done
+* [ ] change in local package installation
 * [ ] update pem.d.ts when there is any change path-expression-matcher package
 * [ ] Change log has been updated
 * [ ] Added/updated documentation for new properties/features
@@ -15,7 +16,7 @@ Pre release
 * [ ] ReadMe file or docs are updated for any change, user list, performance report, links etc.
 * [ ] Single test is not running `fit`
 * [ ] `npm run checkReadiness` is used to check the files being published
-* [ ] tags are assigned to latest commit `git tag -a v3.20.0 -m "summary msg"`
+* [ ] tags are assigned to latest commit `git tag -a v5.5.11 -m "ExpressionSet"`
 
 In general
 * [ ] tests are added/updated

package-lock.json

@@ -88,7 +88,7 @@
   ],
   "dependencies": {
     "fast-xml-builder": "^1.1.4",
-    "path-expression-matcher": "^1.2.1",
+    "path-expression-matcher": "^1.3.0",
     "strnum": "^2.2.2"
   }
-}
+}

package.json

@@ -7,6 +7,7 @@ import DocTypeReader from './DocTypeReader.js';
 import toNumber from "strnum";
 import getIgnoreAttributesFn from "../ignoreAttributes.js";
 import { Expression, Matcher } from 'path-expression-matcher';
+import { ExpressionSet } from 'path-expression-matcher';
 
 // const regx =
 //   '<((!\\[CDATA\\[([\\s\\S]*?)(]]>))|((NAME:)?(NAME))([^>]*)>|((\\/)(NAME)\\s*>))([^<]*)'
@@ -121,19 +122,20 @@ export default class OrderedObjParser {
     this.isCurrentNodeStopNode = false;
 
     // Pre-compile stopNodes expressions
+    this.stopNodeExpressionsSet = new ExpressionSet();
     const stopNodesOpts = this.options.stopNodes;
     if (stopNodesOpts && stopNodesOpts.length > 0) {
-      this.stopNodeExpressions = [];
       for (let i = 0; i < stopNodesOpts.length; i++) {
         const stopNodeExp = stopNodesOpts[i];
         if (typeof stopNodeExp === 'string') {
           // Convert string to Expression object
-          this.stopNodeExpressions.push(new Expression(stopNodeExp));
+          this.stopNodeExpressionsSet.add(new Expression(stopNodeExp));
         } else if (stopNodeExp instanceof Expression) {
           // Already an Expression object
-          this.stopNodeExpressions.push(stopNodeExp);
+          this.stopNodeExpressionsSet.add(stopNodeExp);
         }
       }
+      this.stopNodeExpressionsSet.seal();
     }
   }
 
@@ -494,7 +496,7 @@ const parseXml = function (xmlData) {
 
         // Now check if this is a stop node (after attributes are set)
         if (tagName !== xmlObj.tagname) {
-          this.isCurrentNodeStopNode = this.isItStopNode(this.stopNodeExpressions, this.matcher);
+          this.isCurrentNodeStopNode = this.isItStopNode();
         }
 
         const startIndex = i;
@@ -727,15 +729,10 @@ function saveTextToParentTag(textData, parentNode, matcher, isLeafNode) {
  * @param {Array<Expression>} stopNodeExpressions - Array of compiled Expression objects
  * @param {Matcher} matcher - Current path matcher
  */
-function isItStopNode(stopNodeExpressions, matcher) {
-  if (!stopNodeExpressions || stopNodeExpressions.length === 0) return false;
+function isItStopNode() {
+  if (this.stopNodeExpressionsSet.size === 0) return false;
 
-  for (let i = 0; i < stopNodeExpressions.length; i++) {
-    if (matcher.matches(stopNodeExpressions[i])) {
-      return true;
-    }
-  }
-  return false;
+  return this.matcher.matchesAny(this.stopNodeExpressionsSet);
 }
 
 /**

src/xmlparser/OrderedObjParser.js

@@ -3149,10 +3149,10 @@ path-exists@^4.0.0:
   resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-expression-matcher@^1.1.3, path-expression-matcher@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.2.1.tgz"
-  integrity sha512-d7gQQmLvAKXKXE2GeP9apIGbMYKz88zWdsn/BN2HRWVQsDFdUY36WSLTY0Jvd4HWi7Fb30gQ62oAOzdgJA6fZw==
+path-expression-matcher@^1.1.3, path-expression-matcher@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.3.0.tgz"
+  integrity sha512-tkolHg8cWjEFA8+TqYGk0w6aNEZVcb7pVxW8KXZpU+ebaBr3s1ogbLssjK1cL74TtEuKl/qy6cb90RnwTFt3kw==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"