@adguard/agtree 1.1.1 → 1.1.2

package/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog], and this project adheres to [Semantic Versioning][semver].
 
+## 1.1.2 - 2023-08-14
+
+### Fixed
+
+- Compatibility tables validation of ABP syntax `$rewrite`
+- Detecting closing parenthesis in ADG/uBO scriptlets while parsing
+
 ## 1.1.1 - 2023-08-11
 
 ### Fixed

package/dist/agtree.cjs

@@ -1,5 +1,5 @@
 /*
- * AGTree v1.1.1 (build date: Fri, 11 Aug 2023 13:11:01 GMT)
+ * AGTree v1.1.2 (build date: Mon, 14 Aug 2023 13:52:06 GMT)
  * (c) 2023 AdGuard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -4327,21 +4327,15 @@ class ScriptletInjectionBodyParser {
         }
         // Save the offset of the opening parentheses
         const openingParenthesesIndex = offset;
-        // Find closing parentheses
-        // eslint-disable-next-line max-len
-        const closingParenthesesIndex = StringUtils.findUnescapedNonStringNonRegexChar(raw, CLOSE_PARENTHESIS, openingParenthesesIndex + 1);
+        // Skip whitespace from the end
+        const closingParenthesesIndex = StringUtils.skipWSBack(raw, raw.length - 1);
         // Closing parentheses should be present
-        if (closingParenthesesIndex === -1) {
+        if (raw[closingParenthesesIndex] !== CLOSE_PARENTHESIS
+            || raw[closingParenthesesIndex - 1] === ESCAPE_CHARACTER) {
             throw new AdblockSyntaxError(
             // eslint-disable-next-line max-len
             `Invalid AdGuard/uBlock scriptlet call, no closing parentheses '${CLOSE_PARENTHESIS}' found`, locRange(loc, offset, raw.length));
         }
-        // Shouldn't have any characters after the closing parentheses
-        if (StringUtils.skipWSBack(raw) !== closingParenthesesIndex) {
-            throw new AdblockSyntaxError(
-            // eslint-disable-next-line max-len
-            `Invalid AdGuard/uBlock scriptlet call, unexpected characters after the closing parentheses '${CLOSE_PARENTHESIS}'`, locRange(loc, closingParenthesesIndex + 1, raw.length));
-        }
         // Parse parameter list
         const params = ParameterListParser.parse(raw.substring(openingParenthesesIndex + 1, closingParenthesesIndex), COMMA, shiftLoc(loc, openingParenthesesIndex + 1));
         // Allow empty scritptlet call: js() or //scriptlet(), but not allow parameters
@@ -6539,7 +6533,13 @@ var data$g = { adg_os_any:{ name:"redirect",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"(?x)\n  ^(\n    1x1\\.gif|\n    2x2\\.png|\n    3x2\\.png|\n    32x32\\.png|\n    noop\\.css|\n    noop\\.html|\n    noopframe|\n    noop\\.js|\n    noop\\.txt|\n    noop-0\\.1s\\.mp3|\n    noop-0\\.5s\\.mp3|\n    noop-1s\\.mp4|\n    none|\n    click2load\\.html|\n    addthis_widget\\.js|\n    amazon_ads\\.js|\n    amazon_apstag\\.js|\n    monkeybroker\\.js|\n    doubleclick_instream_ad_status|\n    google-analytics_ga\\.js|\n    google-analytics_analytics\\.js|\n    google-analytics_inpage_linkid\\.js|\n    google-analytics_cx_api\\.js|\n    google-ima\\.js|\n    googletagservices_gpt\\.js|\n    googletagmanager_gtm\\.js|\n    googlesyndication_adsbygoogle\\.js|\n    scorecardresearch_beacon\\.js|\n    outbrain-widget\\.js|\n    hd-main\\.js\n  )\n  (:[0-9]+)?$" } };
+    value_format:"(?x)\n  ^(\n    1x1\\.gif|\n    2x2\\.png|\n    3x2\\.png|\n    32x32\\.png|\n    noop\\.css|\n    noop\\.html|\n    noopframe|\n    noop\\.js|\n    noop\\.txt|\n    noop-0\\.1s\\.mp3|\n    noop-0\\.5s\\.mp3|\n    noop-1s\\.mp4|\n    none|\n    click2load\\.html|\n    addthis_widget\\.js|\n    amazon_ads\\.js|\n    amazon_apstag\\.js|\n    monkeybroker\\.js|\n    doubleclick_instream_ad_status|\n    google-analytics_ga\\.js|\n    google-analytics_analytics\\.js|\n    google-analytics_inpage_linkid\\.js|\n    google-analytics_cx_api\\.js|\n    google-ima\\.js|\n    googletagservices_gpt\\.js|\n    googletagmanager_gtm\\.js|\n    googlesyndication_adsbygoogle\\.js|\n    scorecardresearch_beacon\\.js|\n    outbrain-widget\\.js|\n    hd-main\\.js\n  )\n  (:[0-9]+)?$" },
+  abp_ext_any:{ name:"rewrite",
+    description:"The `rewrite=` option allows the rewriting of URLs (or redirecting requests) to an internal\nresource in order to deactivate it without causing an error. Indicate the internal resource\nby name and prefix `abp-resource:` in order to be recognized. For example\n`$rewrite=abp-resource:blank-js` sends an empty JavaScript.",
+    docs:"https://help.adblockplus.org/hc/en-us/articles/360062733293#rewrite",
+    assignable:true,
+    negatable:false,
+    value_format:"(?x)\n  # ABP resources always starts with the `abp-resource:` prefix\n  ^abp-resource:\n  # Possible resource names\n  (\n    blank-text|\n    blank-css|\n    blank-js|\n    blank-html|\n    blank-mp3|\n    1x1-transparent-gif|\n    2x2-transparent-png|\n    3x2-transparent-png|\n    32x32-transparent-png\n  )$" } };
 
 var data$f = { adg_os_any:{ name:"removeheader",
     description:"Rules with the `$removeheader` modifier are intended to remove headers from HTTP requests and responses.",
@@ -8894,7 +8894,7 @@ class LogicalExpressionUtils {
     }
 }
 
-const version$1 = "1.1.1";
+const version$1 = "1.1.2";
 
 /**
  * @file AGTree version

package/dist/agtree.d.ts

@@ -1,5 +1,5 @@
 /*
- * AGTree v1.1.1 (build date: Fri, 11 Aug 2023 13:11:01 GMT)
+ * AGTree v1.1.2 (build date: Mon, 14 Aug 2023 13:52:06 GMT)
  * (c) 2023 AdGuard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme

package/dist/agtree.esm.js

@@ -1,5 +1,5 @@
 /*
- * AGTree v1.1.1 (build date: Fri, 11 Aug 2023 13:11:01 GMT)
+ * AGTree v1.1.2 (build date: Mon, 14 Aug 2023 13:52:06 GMT)
  * (c) 2023 AdGuard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -4308,21 +4308,15 @@ class ScriptletInjectionBodyParser {
         }
         // Save the offset of the opening parentheses
         const openingParenthesesIndex = offset;
-        // Find closing parentheses
-        // eslint-disable-next-line max-len
-        const closingParenthesesIndex = StringUtils.findUnescapedNonStringNonRegexChar(raw, CLOSE_PARENTHESIS, openingParenthesesIndex + 1);
+        // Skip whitespace from the end
+        const closingParenthesesIndex = StringUtils.skipWSBack(raw, raw.length - 1);
         // Closing parentheses should be present
-        if (closingParenthesesIndex === -1) {
+        if (raw[closingParenthesesIndex] !== CLOSE_PARENTHESIS
+            || raw[closingParenthesesIndex - 1] === ESCAPE_CHARACTER) {
             throw new AdblockSyntaxError(
             // eslint-disable-next-line max-len
             `Invalid AdGuard/uBlock scriptlet call, no closing parentheses '${CLOSE_PARENTHESIS}' found`, locRange(loc, offset, raw.length));
         }
-        // Shouldn't have any characters after the closing parentheses
-        if (StringUtils.skipWSBack(raw) !== closingParenthesesIndex) {
-            throw new AdblockSyntaxError(
-            // eslint-disable-next-line max-len
-            `Invalid AdGuard/uBlock scriptlet call, unexpected characters after the closing parentheses '${CLOSE_PARENTHESIS}'`, locRange(loc, closingParenthesesIndex + 1, raw.length));
-        }
         // Parse parameter list
         const params = ParameterListParser.parse(raw.substring(openingParenthesesIndex + 1, closingParenthesesIndex), COMMA, shiftLoc(loc, openingParenthesesIndex + 1));
         // Allow empty scritptlet call: js() or //scriptlet(), but not allow parameters
@@ -6520,7 +6514,13 @@ var data$g = { adg_os_any:{ name:"redirect",
     assignable:true,
     negatable:false,
     value_optional:true,
-    value_format:"(?x)\n  ^(\n    1x1\\.gif|\n    2x2\\.png|\n    3x2\\.png|\n    32x32\\.png|\n    noop\\.css|\n    noop\\.html|\n    noopframe|\n    noop\\.js|\n    noop\\.txt|\n    noop-0\\.1s\\.mp3|\n    noop-0\\.5s\\.mp3|\n    noop-1s\\.mp4|\n    none|\n    click2load\\.html|\n    addthis_widget\\.js|\n    amazon_ads\\.js|\n    amazon_apstag\\.js|\n    monkeybroker\\.js|\n    doubleclick_instream_ad_status|\n    google-analytics_ga\\.js|\n    google-analytics_analytics\\.js|\n    google-analytics_inpage_linkid\\.js|\n    google-analytics_cx_api\\.js|\n    google-ima\\.js|\n    googletagservices_gpt\\.js|\n    googletagmanager_gtm\\.js|\n    googlesyndication_adsbygoogle\\.js|\n    scorecardresearch_beacon\\.js|\n    outbrain-widget\\.js|\n    hd-main\\.js\n  )\n  (:[0-9]+)?$" } };
+    value_format:"(?x)\n  ^(\n    1x1\\.gif|\n    2x2\\.png|\n    3x2\\.png|\n    32x32\\.png|\n    noop\\.css|\n    noop\\.html|\n    noopframe|\n    noop\\.js|\n    noop\\.txt|\n    noop-0\\.1s\\.mp3|\n    noop-0\\.5s\\.mp3|\n    noop-1s\\.mp4|\n    none|\n    click2load\\.html|\n    addthis_widget\\.js|\n    amazon_ads\\.js|\n    amazon_apstag\\.js|\n    monkeybroker\\.js|\n    doubleclick_instream_ad_status|\n    google-analytics_ga\\.js|\n    google-analytics_analytics\\.js|\n    google-analytics_inpage_linkid\\.js|\n    google-analytics_cx_api\\.js|\n    google-ima\\.js|\n    googletagservices_gpt\\.js|\n    googletagmanager_gtm\\.js|\n    googlesyndication_adsbygoogle\\.js|\n    scorecardresearch_beacon\\.js|\n    outbrain-widget\\.js|\n    hd-main\\.js\n  )\n  (:[0-9]+)?$" },
+  abp_ext_any:{ name:"rewrite",
+    description:"The `rewrite=` option allows the rewriting of URLs (or redirecting requests) to an internal\nresource in order to deactivate it without causing an error. Indicate the internal resource\nby name and prefix `abp-resource:` in order to be recognized. For example\n`$rewrite=abp-resource:blank-js` sends an empty JavaScript.",
+    docs:"https://help.adblockplus.org/hc/en-us/articles/360062733293#rewrite",
+    assignable:true,
+    negatable:false,
+    value_format:"(?x)\n  # ABP resources always starts with the `abp-resource:` prefix\n  ^abp-resource:\n  # Possible resource names\n  (\n    blank-text|\n    blank-css|\n    blank-js|\n    blank-html|\n    blank-mp3|\n    1x1-transparent-gif|\n    2x2-transparent-png|\n    3x2-transparent-png|\n    32x32-transparent-png\n  )$" } };
 
 var data$f = { adg_os_any:{ name:"removeheader",
     description:"Rules with the `$removeheader` modifier are intended to remove headers from HTTP requests and responses.",
@@ -8875,7 +8875,7 @@ class LogicalExpressionUtils {
     }
 }
 
-const version$1 = "1.1.1";
+const version$1 = "1.1.2";
 
 /**
  * @file AGTree version