@adguard/agtree 1.1.3 → 1.1.4

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.4 - 2023-08-30
+
+### Fixed
+
+- Validation of `$redirect` and `$replace` modifiers by `ModifierValidator.validate()`
+
+
 ## 1.1.3 - 2023-08-28
 
 ### Added

package/dist/agtree.cjs

@@ -1,5 +1,5 @@
 /*
- * AGTree v1.1.3 (build date: Mon, 28 Aug 2023 16:19:09 GMT)
+ * AGTree v1.1.4 (build date: Wed, 30 Aug 2023 10:02:46 GMT)
  * (c) 2023 AdGuard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -6813,14 +6813,14 @@ var data$g = { adg_os_any:{ name:"redirect",
     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  )?$" },
+    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    googletagmanager-gtm|\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  )?$" },
+    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    googletagmanager-gtm|\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",
@@ -6929,7 +6929,7 @@ var data$d = { adg_os_any:{ name:"replace",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
-    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+?)\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" },
+    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+)?\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" },
   adg_ext_firefox:{ name:"replace",
     description:"This modifier completely changes the rule behavior.\nIf it is applied, the rule will not block the request. The response is going to be modified instead.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#replace-modifier",
@@ -6947,7 +6947,7 @@ var data$d = { adg_os_any:{ name:"replace",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
-    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+?)\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" } };
+    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+)?\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" } };
 
 var data$c = { adg_any:{ name:"script",
     description:"The rule corresponds to script requests, e.g. javascript, vbscript.",
@@ -7954,9 +7954,8 @@ const validateValue = (modifier, valueFormat) => {
         return validator(modifier);
     }
     const modifierName = modifier.modifier.value;
-    const defaultInvalidValueResult = getValueRequiredValidationResult(modifierName);
     if (!modifier.value?.value) {
-        return defaultInvalidValueResult;
+        return getValueRequiredValidationResult(modifierName);
     }
     let xRegExp;
     try {
@@ -7967,7 +7966,7 @@ const validateValue = (modifier, valueFormat) => {
     }
     const isValid = xRegExp.test(modifier.value?.value);
     if (!isValid) {
-        return defaultInvalidValueResult;
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.VALUE_INVALID}: '${modifierName}'`);
     }
     return { valid: true };
 };
@@ -9616,7 +9615,7 @@ class LogicalExpressionUtils {
     }
 }
 
-const version$1 = "1.1.3";
+const version$1 = "1.1.4";
 
 /**
  * @file AGTree version

package/dist/agtree.d.ts

@@ -1,5 +1,5 @@
 /*
- * AGTree v1.1.3 (build date: Mon, 28 Aug 2023 16:19:09 GMT)
+ * AGTree v1.1.4 (build date: Wed, 30 Aug 2023 10:02:46 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.3 (build date: Mon, 28 Aug 2023 16:19:09 GMT)
+ * AGTree v1.1.4 (build date: Wed, 30 Aug 2023 10:02:46 GMT)
  * (c) 2023 AdGuard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -6794,14 +6794,14 @@ var data$g = { adg_os_any:{ name:"redirect",
     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  )?$" },
+    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    googletagmanager-gtm|\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  )?$" },
+    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    googletagmanager-gtm|\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",
@@ -6910,7 +6910,7 @@ var data$d = { adg_os_any:{ name:"replace",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
-    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+?)\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" },
+    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+)?\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" },
   adg_ext_firefox:{ name:"replace",
     description:"This modifier completely changes the rule behavior.\nIf it is applied, the rule will not block the request. The response is going to be modified instead.",
     docs:"https://adguard.app/kb/general/ad-filtering/create-own-filters/#replace-modifier",
@@ -6928,7 +6928,7 @@ var data$d = { adg_os_any:{ name:"replace",
     inverse_conflicts:true,
     assignable:true,
     negatable:false,
-    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+?)\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" } };
+    value_format:"(?xi)\n  ^\n    \\/\n      # the regexp to match by\n      (.+)\n    # separator\n    \\/\n      # replacement\n      (.+)?\n    \\/\n      # flags\n      ([gimuy]*)?\n  $" } };
 
 var data$c = { adg_any:{ name:"script",
     description:"The rule corresponds to script requests, e.g. javascript, vbscript.",
@@ -7935,9 +7935,8 @@ const validateValue = (modifier, valueFormat) => {
         return validator(modifier);
     }
     const modifierName = modifier.modifier.value;
-    const defaultInvalidValueResult = getValueRequiredValidationResult(modifierName);
     if (!modifier.value?.value) {
-        return defaultInvalidValueResult;
+        return getValueRequiredValidationResult(modifierName);
     }
     let xRegExp;
     try {
@@ -7948,7 +7947,7 @@ const validateValue = (modifier, valueFormat) => {
     }
     const isValid = xRegExp.test(modifier.value?.value);
     if (!isValid) {
-        return defaultInvalidValueResult;
+        return getInvalidValidationResult(`${VALIDATION_ERROR_PREFIX.VALUE_INVALID}: '${modifierName}'`);
     }
     return { valid: true };
 };
@@ -9597,7 +9596,7 @@ class LogicalExpressionUtils {
     }
 }
 
-const version$1 = "1.1.3";
+const version$1 = "1.1.4";
 
 /**
  * @file AGTree version