npm - @adguard/agtree - Versions diffs - 3.0.1 → 3.1.1 - Mend

@@ -1,5 +1,5 @@
 /*
- * AGTree v3.0.1 (build date: Fri, 28 Feb 2025 15:31:12 GMT)
+ * AGTree v3.1.1 (build date: Thu, 17 Apr 2025 18:03:50 GMT)
  * (c) 2025 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -67,6 +67,36 @@ class RegExpUtils {
             && trimmedPattern.endsWith(REGEX_MARKER)
             && trimmedPattern[REGEX_MARKER.length - 2] !== ESCAPE_CHARACTER;
     }
+    /**
+     * Checks whether a string is a negated RegExp pattern.
+     *
+     * @param pattern - Pattern to check
+     * @returns `true` if the string is a negated RegExp pattern, `false` otherwise
+     */
+    static isNegatedRegexPattern(pattern) {
+        if (pattern.startsWith(REGEX_MARKER) && pattern.endsWith(REGEX_MARKER)) {
+            const innerPattern = pattern.slice(REGEX_MARKER.length, pattern.length - REGEX_MARKER.length);
+            return innerPattern.startsWith(REGEX_NEGATION_PREFIX) && innerPattern.endsWith(REGEX_NEGATION_SUFFIX);
+        }
+        return pattern.startsWith(REGEX_NEGATION_PREFIX) && pattern.endsWith(REGEX_NEGATION_SUFFIX);
+    }
+    /**
+     * Removes negation from a RegExp pattern.
+     *
+     * @param pattern - RegExp pattern to remove negation from
+     * @returns RegExp pattern without negation
+     */
+    static removeNegationFromRegexPattern(pattern) {
+        let result = pattern.trim();
+        const slashes = RegExpUtils.isRegexPattern(result);
+        if (slashes) {
+            result = result.substring(REGEX_MARKER.length, result.length - REGEX_MARKER.length);
+        }
+        if (result.startsWith(REGEX_NEGATION_PREFIX) && result.endsWith(REGEX_NEGATION_SUFFIX)) {
+            result = result.substring(REGEX_NEGATION_PREFIX.length, result.length - REGEX_NEGATION_SUFFIX.length);
+        }
+        return slashes ? `${REGEX_MARKER}${result}${REGEX_MARKER}` : result;
+    }
     /**
      * Negates a RegExp pattern. Technically, this method wraps the pattern in `^((?!` and `).)*$`.
      *
@@ -102,6 +132,22 @@ class RegExpUtils {
         }
         return result;
     }
+    /**
+     * Ensures that a pattern is wrapped in slashes.
+     *
+     * @param pattern Pattern to ensure slashes for
+     * @returns Pattern with slashes
+     */
+    static ensureSlashes(pattern) {
+        let result = pattern;
+        if (!result.startsWith(REGEX_MARKER)) {
+            result = `${REGEX_MARKER}${result}`;
+        }
+        if (!result.endsWith(REGEX_MARKER)) {
+            result += REGEX_MARKER;
+        }
+        return result;
+    }
     /**
      * Converts a basic adblock rule pattern to a RegExp pattern. Based on
      * https://github.com/AdguardTeam/tsurlfilter/blob/9b26e0b4a0e30b87690bc60f7cf377d112c3085c/packages/tsurlfilter/src/rules/simple-regex.ts#L219

@@ -1,6 +1,6 @@
 {
   "name": "@adguard/agtree",
-  "version": "3.0.1",
+  "version": "3.1.1",
   "description": "Tool set for working with adblock filter lists",
   "keywords": [
     "adblock",
@@ -66,7 +66,7 @@
     "!dist/build.txt"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "dependencies": {
     "camelcase-keys": "^7.0.2",

@adguard/agtree 3.0.1 → 3.1.1