@adguard/agtree 1.1.0 → 1.1.2

package/CHANGELOG.md

@@ -2,13 +2,22 @@
 
 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].
+The format is based on [Keep a Changelog][keepachangelog], and this project adheres to [Semantic Versioning][semver].
 
-[keepachangelog]: https://keepachangelog.com/en/1.0.0/
-[semver]: https://semver.org/spec/v2.0.0.html
+## 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
 
-## [1.1.0] - 2023-08-10
+### Fixed
+
+- Validation of assignable modifiers which may be used without a value
+
+## 1.1.0 - 2023-08-10
 
 ### Added
 
@@ -34,8 +43,11 @@ adheres to [Semantic Versioning][semver].
 - Scriptlet parsing
 - Metadata parsing
 
-## [1.0.1] - 2023-05-24
+## 1.0.1 - 2023-05-24
 
 ### Added
 
 - Migrated parser from AGLint to a separate package.
+
+[keepachangelog]: https://keepachangelog.com/en/1.0.0/
+[semver]: https://semver.org/spec/v2.0.0.html

package/README.md

@@ -1,56 +1,34 @@
 <!-- markdownlint-disable -->
-
 &nbsp;
-
 <p align="center">
     <picture>
-        <source
-            media="(prefers-color-scheme: dark)"
-            srcset="https://cdn.adtidy.org/website/github.com/AGTree/agtree_darkmode.svg"
-        />
-        <img
-            alt="AGTree"
-            src="https://cdn.adtidy.org/website/github.com/AGTree/agtree_lightmode.svg"
-            width="350px"
-        />
+        <source media="(prefers-color-scheme: dark)" srcset="https://cdn.adtidy.org/website/github.com/AGTree/agtree_darkmode.svg" />
+        <img alt="AGTree" src="https://cdn.adtidy.org/website/github.com/AGTree/agtree_lightmode.svg" width="350px" />
     </picture>
 </p>
 <h3 align="center">Universal adblock filter list parser</h3>
 <p align="center">Supported syntaxes:</p>
 <p align="center">
     <a href="https://adguard.com">
-        <img
-            src="https://cdn.adguard.com/website/github.com/AGLint/adg_logo.svg"
-            width="14px"
-        />
+        <img src="https://cdn.adguard.com/website/github.com/AGLint/adg_logo.svg" width="14px" />
         AdGuard
     </a>
     |
     <a href="https://github.com/gorhill/uBlock">
-        <img
-            src="https://cdn.adguard.com/website/github.com/AGLint/ubo_logo.svg"
-            width="14px"
-        />
+        <img src="https://cdn.adguard.com/website/github.com/AGLint/ubo_logo.svg" width="14px" />
         uBlock Origin
     </a>
     |
     <a href="https://getadblock.com">
-        <img
-            src="https://cdn.adguard.com/website/github.com/AGLint/ab_logo.svg"
-            width="14px"
-        />
+        <img src="https://cdn.adguard.com/website/github.com/AGLint/ab_logo.svg" width="14px" />
         AdBlock
     </a>
     |
     <a href="https://adblockplus.org">
-        <img
-            src="https://cdn.adguard.com/website/github.com/AGLint/abp_logo.svg"
-            width="14px"
-        />
+        <img src="https://cdn.adguard.com/website/github.com/AGLint/abp_logo.svg" width="14px" />
         Adblock Plus
     </a>
 </p>
-
 <p align="center">
     <a href="https://www.npmjs.com/package/@adguard/agtree">
         <img src="https://img.shields.io/npm/v/@adguard/agtree" alt="NPM version" />
@@ -74,8 +52,7 @@ Table of Contents:
 
 ## Introduction
 
-AGTree is a universal tool for working with adblock filter lists. It contains
-the following modules:
+AGTree is a universal tool for working with adblock filter lists. It contains the following modules:
 
 - [Adblock rule converter][converter-url]
 - [Adblock rule parser][parser-url]
@@ -88,41 +65,23 @@ AGTree supports all syntaxes currently in use:
 - <img src="https://cdn.adguard.com/website/github.com/AGLint/abp_logo.svg" width="14px"> [Adblock Plus][abp-url]
 - <img src="https://cdn.adguard.com/website/github.com/AGLint/ab_logo.svg" width="14px"> [AdBlock][ab-url]
 
-[ab-url]: https://getadblock.com
-[abp-url]: https://adblockplus.org
-[adg-url]: https://adguard.com
-[compatibility-tables-url]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/src/compatibility-tables
-[converter-url]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/src/converter
-[parser-url]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/src/parser
-[ubo-url]: https://github.com/gorhill/uBlock
-
 ## Development & Contribution
 
-Please read the [CONTRIBUTING.md][contributing-url] file for details on how to
-contribute to this project.
-
-[contributing-url]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/CONTRIBUTING.md
+Please read the [CONTRIBUTING.md][contributing-url] file for details on how to contribute to this project.
 
 ## Ideas & Questions
 
-If you have any questions or ideas for new features, please
-[open an issue][new-issue-url] or a [discussion][discussions-url]. We will be
-happy to discuss it with you.
-
-[discussions-url]: https://github.com/AdguardTeam/tsurlfilter/discussions
-[new-issue-url]: https://github.com/AdguardTeam/tsurlfilter/issues/new
+If you have any questions or ideas for new features, please [open an issue][new-issue-url] or a
+[discussion][discussions-url]. We will be happy to discuss it with you.
 
 ## License
 
-AGTree is licensed under the MIT License. See the [LICENSE][license-url] file
-for details.
-
-[license-url]: https://github.com/AdguardTeam/tsurlfilter/blob/master/packages/agtree/LICENSE
+AGTree is licensed under the MIT License. See the [LICENSE][license-url] file for details.
 
 ## References
 
-Here are some useful links to help you write adblock rules. This list is not
-exhaustive, so if you know any other useful resources, please let us know.
+Here are some useful links to help you write adblock rules. This list is not exhaustive, so if you know any other useful
+resources, please let us know.
 
 <!--markdownlint-disable MD013-->
 - Syntax documentation:
@@ -143,15 +102,26 @@ exhaustive, so if you know any other useful resources, please let us know.
 - <img src="https://cdn.adguard.com/website/github.com/AGLint/adg_logo.svg" width="14px"> [AdGuard's compatibility table][adg-compatibility-table]
 <!--markdownlint-enable MD013-->
 
+[ab-url]: https://getadblock.com
 [abp-ext-css]: https://help.eyeo.com/adblockplus/how-to-write-filters#elemhide-emulation
 [abp-filters]: https://help.eyeo.com/adblockplus/how-to-write-filters
 [abp-snippets]: https://help.eyeo.com/adblockplus/snippet-filters-tutorial#snippets-ref
+[abp-url]: https://adblockplus.org
 [adg-compatibility-table]: https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/compatibility-table.md
 [adg-ext-css]: https://github.com/AdguardTeam/ExtendedCss/blob/master/README.md
 [adg-filters]: https://kb.adguard.com/en/general/how-to-create-your-own-ad-filters
 [adg-scriptlets]: https://github.com/AdguardTeam/Scriptlets/blob/master/wiki/about-scriptlets.md#scriptlets
+[adg-url]: https://adguard.com
+[compatibility-tables-url]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/src/compatibility-tables
+[contributing-url]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/CONTRIBUTING.md
+[converter-url]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/src/converter
 [css-tree-docs]: https://github.com/csstree/csstree/tree/master/docs
+[discussions-url]: https://github.com/AdguardTeam/tsurlfilter/discussions
+[license-url]: https://github.com/AdguardTeam/tsurlfilter/blob/master/packages/agtree/LICENSE
 [mdn-css-selectors]: https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors
+[new-issue-url]: https://github.com/AdguardTeam/tsurlfilter/issues/new
+[parser-url]: https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree/src/parser
 [ubo-filters]: https://github.com/gorhill/uBlock/wiki/Static-filter-syntax
 [ubo-procedural]: https://github.com/gorhill/uBlock/wiki/Procedural-cosmetic-filters
 [ubo-scriptlets]: https://github.com/gorhill/uBlock/wiki/Resources-Library#available-general-purpose-scriptlets
+[ubo-url]: https://github.com/gorhill/uBlock

package/dist/agtree.cjs

@@ -1,5 +1,5 @@
 /*
- * AGTree v1.1.0 (build date: Thu, 10 Aug 2023 15:16:26 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
@@ -5837,12 +5831,14 @@ var data$O = { adg_os_any:{ name:"cookie",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#cookie-modifier",
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"^([^;=\\s]*?)((?:;(maxAge=\\d+;?)?|(sameSite=(lax|none|strict);?)?){1,3})(?<!;)$" },
   adg_ext_any:{ name:"cookie",
     description:"The `$cookie` modifier completely changes rule behavior.\nInstead of blocking a request, this modifier makes us suppress or modify the Cookie and Set-Cookie headers.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#cookie-modifier",
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"^([^;=\\s]*?)((?:;(maxAge=\\d+;?)?|(sameSite=(lax|none|strict);?)?){1,3})(?<!;)$" } };
 
 var data$N = { adg_os_any:{ name:"csp",
@@ -5855,6 +5851,7 @@ var data$N = { adg_os_any:{ name:"csp",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"/[^,$]+/" },
   adg_ext_any:{ name:"csp",
     description:"This modifier completely changes the rule behavior.\nIf it is applied to a rule, it will not block the matching request.\nThe response headers are going to be modified instead.",
@@ -5866,6 +5863,7 @@ var data$N = { adg_os_any:{ name:"csp",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"/[^,$]+/" },
   abp_ext_any:{ name:"csp",
     description:"This modifier completely changes the rule behavior.\nIf it is applied to a rule, it will not block the matching request.\nThe response headers are going to be modified instead.",
@@ -5875,6 +5873,7 @@ var data$N = { adg_os_any:{ name:"csp",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"/[^,$]+/" },
   ubo_ext_any:{ name:"csp",
     description:"This modifier completely changes the rule behavior.\nIf it is applied to a rule, it will not block the matching request.\nThe response headers are going to be modified instead.",
@@ -5886,6 +5885,7 @@ var data$N = { adg_os_any:{ name:"csp",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"/[^,$]+/" } };
 
 var data$M = { adg_os_any:{ name:"denyallow",
@@ -6451,6 +6451,7 @@ var data$h = { adg_os_any:{ name:"redirect-rule",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"(?x)\n  ^(\n    1x1-transparent\\.gif|\n    2x2-transparent\\.png|\n    3x2-transparent\\.png|\n    32x32-transparent\\.png|\n    noopframe|\n    noopcss|\n    noopjs|\n    noopjson|\n    nooptext|\n    empty|\n    noopvmap-1\\.0|\n    noopvast-2\\.0|\n    noopvast-3\\.0|\n    noopvast-4\\.0|\n    noopmp3-0\\.1s|\n    noopmp4-1s|\n    amazon-apstag|\n    ati-smarttag|\n    didomi-loader|\n    fingerprintjs2|\n    fingerprintjs3|\n    gemius|\n    google-analytics-ga|\n    google-analytics|\n    google-ima3|\n    googlesyndication-adsbygoogle|\n    googletagservices-gpt|\n    matomo|\n    metrika-yandex-tag|\n    metrika-yandex-watch|\n    naver-wcslog|\n    noeval|\n    pardot-1\\.0|\n    prebid-ads|\n    prebid|\n    prevent-bab|\n    prevent-bab2|\n    prevent-fab-3\\.2\\.0|\n    prevent-popads-net|\n    scorecardresearch-beacon|\n    set-popads-dummy|\n    click2load\\.html|\n  )?$" },
   adg_ext_any:{ name:"redirect-rule",
     description:"This is basically an alias to `$redirect`\nsince it has the same \"redirection\" values and the logic is almost similar.\nThe difference is that `$redirect-rule` is applied only in the case\nwhen the target request is blocked by a different basic rule.",
@@ -6480,6 +6481,7 @@ var data$h = { adg_os_any:{ name:"redirect-rule",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"(?x)\n  ^(\n    1x1-transparent\\.gif|\n    2x2-transparent\\.png|\n    3x2-transparent\\.png|\n    32x32-transparent\\.png|\n    noopframe|\n    noopcss|\n    noopjs|\n    noopjson|\n    nooptext|\n    empty|\n    noopvmap-1\\.0|\n    noopvast-2\\.0|\n    noopvast-3\\.0|\n    noopvast-4\\.0|\n    noopmp3-0\\.1s|\n    noopmp4-1s|\n    amazon-apstag|\n    ati-smarttag|\n    didomi-loader|\n    fingerprintjs2|\n    fingerprintjs3|\n    gemius|\n    google-analytics-ga|\n    google-analytics|\n    google-ima3|\n    googlesyndication-adsbygoogle|\n    googletagservices-gpt|\n    matomo|\n    metrika-yandex-tag|\n    metrika-yandex-watch|\n    naver-wcslog|\n    noeval|\n    pardot-1\\.0|\n    prebid-ads|\n    prebid|\n    prevent-bab|\n    prevent-bab2|\n    prevent-fab-3\\.2\\.0|\n    prevent-popads-net|\n    scorecardresearch-beacon|\n    set-popads-dummy|\n    click2load\\.html|\n  )?$" },
   ubo_ext_any:{ name:"redirect-rule",
     description:"This is basically an alias to `$redirect`\nsince it has the same \"redirection\" values and the logic is almost similar.\nThe difference is that `$redirect-rule` is applied only in the case\nwhen the target request is blocked by a different basic rule.",
@@ -6516,19 +6518,28 @@ var data$g = { adg_os_any:{ name:"redirect",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#redirect-modifier",
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"(?x)\n  ^(\n    1x1-transparent\\.gif|\n    2x2-transparent\\.png|\n    3x2-transparent\\.png|\n    32x32-transparent\\.png|\n    noopframe|\n    noopcss|\n    noopjs|\n    noopjson|\n    nooptext|\n    empty|\n    noopvmap-1\\.0|\n    noopvast-2\\.0|\n    noopvast-3\\.0|\n    noopvast-4\\.0|\n    noopmp3-0\\.1s|\n    noopmp4-1s|\n    amazon-apstag|\n    ati-smarttag|\n    didomi-loader|\n    fingerprintjs2|\n    fingerprintjs3|\n    gemius|\n    google-analytics-ga|\n    google-analytics|\n    google-ima3|\n    googlesyndication-adsbygoogle|\n    googletagservices-gpt|\n    matomo|\n    metrika-yandex-tag|\n    metrika-yandex-watch|\n    naver-wcslog|\n    noeval|\n    pardot-1\\.0|\n    prebid-ads|\n    prebid|\n    prevent-bab|\n    prevent-bab2|\n    prevent-fab-3\\.2\\.0|\n    prevent-popads-net|\n    scorecardresearch-beacon|\n    set-popads-dummy|\n    click2load\\.html\n  )?$" },
   adg_ext_any:{ name:"redirect",
     description:"Used to redirect web requests to a local \"resource\".",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#redirect-modifier",
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"(?x)\n  ^(\n    1x1-transparent\\.gif|\n    2x2-transparent\\.png|\n    3x2-transparent\\.png|\n    32x32-transparent\\.png|\n    noopframe|\n    noopcss|\n    noopjs|\n    noopjson|\n    nooptext|\n    empty|\n    noopvmap-1\\.0|\n    noopvast-2\\.0|\n    noopvast-3\\.0|\n    noopvast-4\\.0|\n    noopmp3-0\\.1s|\n    noopmp4-1s|\n    amazon-apstag|\n    ati-smarttag|\n    didomi-loader|\n    fingerprintjs2|\n    fingerprintjs3|\n    gemius|\n    google-analytics-ga|\n    google-analytics|\n    google-ima3|\n    googlesyndication-adsbygoogle|\n    googletagservices-gpt|\n    matomo|\n    metrika-yandex-tag|\n    metrika-yandex-watch|\n    naver-wcslog|\n    noeval|\n    pardot-1\\.0|\n    prebid-ads|\n    prebid|\n    prevent-bab|\n    prevent-bab2|\n    prevent-fab-3\\.2\\.0|\n    prevent-popads-net|\n    scorecardresearch-beacon|\n    set-popads-dummy|\n    click2load\\.html\n  )?$" },
   ubo_ext_any:{ name:"redirect",
     description:"Used to redirect web requests to a local \"resource\".",
     docs:"https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#redirect",
     assignable:true,
     negatable:false,
-    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_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]+)?$" },
+  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.",
@@ -6555,6 +6566,7 @@ var data$f = { adg_os_any:{ name:"removeheader",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"(?xi)\n  ^\n    # Value may start with \"request:\"\n    (request:)?\n\n    # Forbidden header names\n    (?!\n      (\n        access-control-allow-origin|\n        access-control-allow-credentials|\n        access-control-allow-headers|\n        access-control-allow-methods|\n        access-control-expose-headers|\n        access-control-max-age|\n        access-control-request-headers|\n        access-control-request-method|\n        origin|\n        timing-allow-origin|\n        allow|\n        cross-origin-embedder-policy|\n        cross-origin-opener-policy|\n        cross-origin-resource-policy|\n        content-security-policy|\n        content-security-policy-report-only|\n        expect-ct|\n        feature-policy|\n        origin-isolation|\n        strict-transport-security|\n        upgrade-insecure-requests|\n        x-content-type-options|\n        x-download-options|\n        x-frame-options|\n        x-permitted-cross-domain-policies|\n        x-powered-by|\n        x-xss-protection|\n        public-key-pins|\n        public-key-pins-report-only|\n        sec-websocket-key|\n        sec-websocket-extensions|\n        sec-websocket-accept|\n        sec-websocket-protocol|\n        sec-websocket-version|\n        p3p|\n        sec-fetch-mode|\n        sec-fetch-dest|\n        sec-fetch-site|\n        sec-fetch-user|\n        referrer-policy|\n        content-type|\n        content-length|\n        accept|\n        accept-encoding|\n        host|\n        connection|\n        transfer-encoding|\n        upgrade\n      )\n    $)\n\n    # Any other header name is allowed, if it matches the following regex\n    [A-z0-9-]+\n  $" },
   adg_ext_any:{ name:"removeheader",
     description:"Rules with the `$removeheader` modifier are intended to remove headers from HTTP requests and responses.",
@@ -6581,6 +6593,7 @@ var data$f = { adg_os_any:{ name:"removeheader",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"(?xi)\n  ^\n    # Value may start with \"request:\"\n    (request:)?\n\n    # Forbidden header names\n    (?!\n      (\n        access-control-allow-origin|\n        access-control-allow-credentials|\n        access-control-allow-headers|\n        access-control-allow-methods|\n        access-control-expose-headers|\n        access-control-max-age|\n        access-control-request-headers|\n        access-control-request-method|\n        origin|\n        timing-allow-origin|\n        allow|\n        cross-origin-embedder-policy|\n        cross-origin-opener-policy|\n        cross-origin-resource-policy|\n        content-security-policy|\n        content-security-policy-report-only|\n        expect-ct|\n        feature-policy|\n        origin-isolation|\n        strict-transport-security|\n        upgrade-insecure-requests|\n        x-content-type-options|\n        x-download-options|\n        x-frame-options|\n        x-permitted-cross-domain-policies|\n        x-powered-by|\n        x-xss-protection|\n        public-key-pins|\n        public-key-pins-report-only|\n        sec-websocket-key|\n        sec-websocket-extensions|\n        sec-websocket-accept|\n        sec-websocket-protocol|\n        sec-websocket-version|\n        p3p|\n        sec-fetch-mode|\n        sec-fetch-dest|\n        sec-fetch-site|\n        sec-fetch-user|\n        referrer-policy|\n        content-type|\n        content-length|\n        accept|\n        accept-encoding|\n        host|\n        connection|\n        transfer-encoding|\n        upgrade\n      )\n    $)\n\n    # Any other header name is allowed, if it matches the following regex\n    [A-z0-9-]+\n  $" } };
 
 var data$e = { adg_os_any:{ name:"removeparam",
@@ -6588,12 +6601,14 @@ var data$e = { adg_os_any:{ name:"removeparam",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#removeparam-modifier",
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"/^(?!.*([^\\\\](,|\\$|\\/))).*$/" },
   adg_ext_any:{ name:"removeparam",
     description:"Rules with the `$removeparam` modifier are intended to strip query parameters from requests' URLs.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#removeparam-modifier",
     assignable:true,
     negatable:false,
+    value_optional:true,
     value_format:"/^(?!.*([^\\\\](,|\\$|\\/))).*$/" },
   ubo_ext_any:{ name:"removeparam",
     description:"Rules with the `$removeparam` modifier are intended to strip query parameters from requests' URLs.",
@@ -6681,6 +6696,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     assignable:true,
     negatable:false,
     exception_only:true,
+    value_optional:true,
     value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    3p-cache|\n    3p-auth|\n    webrtc|\n    push|\n    location|\n    flash|\n    java|\n    referrer|\n    useragent|\n    ip|\n    xclientdata|\n    dpi|\n    \\|?\n  )\\b)+(?<!\\|)$" },
   adg_ext_chrome:{ name:"stealth",
     description:"Disables the Stealth Mode module for all corresponding pages and requests.",
@@ -6688,6 +6704,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     assignable:true,
     negatable:false,
     exception_only:true,
+    value_optional:true,
     value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    webrtc|\n    referrer|\n    xclientdata\n    |\\|?\n  )\\b)+(?<!\\|)$" },
   adg_ext_firefox:{ name:"stealth",
     description:"Disables the Stealth Mode module for all corresponding pages and requests.",
@@ -6695,6 +6712,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     assignable:true,
     negatable:false,
     exception_only:true,
+    value_optional:true,
     value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    webrtc|\n    referrer|\n    |\\|?\n  )\\b)+(?<!\\|)$" },
   adg_ext_opera:{ name:"stealth",
     description:"Disables the Stealth Mode module for all corresponding pages and requests.",
@@ -6702,6 +6720,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     assignable:true,
     negatable:false,
     exception_only:true,
+    value_optional:true,
     value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    webrtc|\n    referrer|\n    |\\|?\n  )\\b)+(?<!\\|)$" },
   adg_ext_edge:{ name:"stealth",
     description:"Disables the Stealth Mode module for all corresponding pages and requests.",
@@ -6709,6 +6728,7 @@ var data$a = { adg_os_any:{ name:"stealth",
     assignable:true,
     negatable:false,
     exception_only:true,
+    value_optional:true,
     value_format:"(?x)\n  ^(?!\\|)\\b(?:(\n    searchqueries|\n    donottrack|\n    3p-cookie|\n    1p-cookie|\n    webrtc|\n    referrer|\n    |\\|?\n  )\\b)+(?<!\\|)$" } };
 
 var data$9 = { ubo_any:{ name:"strict1p",
@@ -6912,6 +6932,9 @@ var SpecificKey;
     SpecificKey["Negatable"] = "negatable";
     SpecificKey["BlockOnly"] = "block_only";
     SpecificKey["ExceptionOnly"] = "exception_only";
+    // TODO: consider removing this field
+    // and handle whether the value is optional by `value_format`. AG-24028
+    SpecificKey["ValueOptional"] = "value_optional";
     SpecificKey["ValueFormat"] = "value_format";
     // TODO: following fields should be handled later
     // VersionAdded = 'version_added',
@@ -6950,6 +6973,7 @@ const prepareBlockerData = (blockerId, rawModifierData) => {
             : rawData[SpecificKey.Negatable],
         [SpecificKey.BlockOnly]: rawData[SpecificKey.BlockOnly] || false,
         [SpecificKey.ExceptionOnly]: rawData[SpecificKey.ExceptionOnly] || false,
+        [SpecificKey.ValueOptional]: rawData[SpecificKey.ValueOptional] || false,
         [SpecificKey.ValueFormat]: rawData[SpecificKey.ValueFormat] || null,
     };
     return blockerData;
@@ -7110,18 +7134,20 @@ const validateForSpecificSyntax = (modifiersData, syntax, modifier, isException)
     // e.g. 'domain'
     if (specificBlockerData.assignable) {
         /**
-         * exception_only modifier 'stealth' is assignable
-         * but it also may be used without value as well -- `$stealth` or `$stealth=dpi`
+         * Some assignable modifiers can be used without a value,
+         * e.g. '@@||example.com^$cookie'.
          */
         if (!modifier.value
-            /**
-             * TODO: consider to return `{ ok: true, warn: 'Modifier value may be specified' }` (???)
-             * after the extension will support stealth mode with value
-             * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2107
-             */
-            && !specificBlockerData.exception_only) {
+            // value should be specified if it is not optional
+            && !specificBlockerData.value_optional) {
             return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.VALUE_REQUIRED}: '${modifierName}'`);
         }
+        /**
+         * TODO: consider to return `{ ok: true, warn: 'Modifier value may be specified' }` (???)
+         * for $stealth modifier without a value
+         * but only after the extension will support value for $stealth:
+         * https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2107
+         */
     }
     else if (modifier?.value) {
         return getInvalidValidationResult(`${INVALID_ERROR_PREFIX.VALUE_FORBIDDEN}: '${modifierName}'`);
@@ -8868,7 +8894,7 @@ class LogicalExpressionUtils {
     }
 }
 
-const version$1 = "1.1.0";
+const version$1 = "1.1.2";
 
 /**
  * @file AGTree version

package/dist/agtree.d.ts

@@ -1,5 +1,5 @@
 /*
- * AGTree v1.1.0 (build date: Thu, 10 Aug 2023 15:16:26 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