AG-48788 fix support of negative values in ubo redirect rules [scriptlets]

Squashed commit of the following:

commit a473be8
Author: slvvko <v.leleka@adguard.com>
Date:   Tue Nov 25 00:40:38 2025 -0500

    update changelog

commit bcd973e
Author: slvvko <v.leleka@adguard.com>
Date:   Tue Nov 25 00:40:07 2025 -0500

    update agtree to 3.3.1

commit 68b956f
Merge: 31858a5 59bf85f
Author: slvvko <v.leleka@adguard.com>
Date:   Tue Nov 25 00:37:02 2025 -0500

    merge parent branch into current one, resolve conflicts

commit 31858a5
Merge: 30fd0c3 b9773c6
Author: slvvko <v.leleka@adguard.com>
Date:   Tue Nov 25 00:32:30 2025 -0500

    merge parent branch into current one, resolve conflicts

commit 30fd0c3
Author: slvvko <v.leleka@adguard.com>
Date:   Mon Nov 24 22:48:41 2025 -0500

    AG-48788 fix support of negative values in ubo redirect rules

Author: slvvko

CHANGELOG.md

@@ -10,17 +10,23 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 <!-- TODO: change `@added unknown` tag due to the actual version -->
 <!--       during new scriptlets or redirects releasing -->
 
-## Unreleased
+## [v2.2.13] - 2025-11-25
 
 ### Added
 
 - New value to `set-cookie` and `set-cookie-reload` scriptlets: `denied` [#512].
 
+### Changed
+
+- Updated [@adguard/agtree] to `3.3.1`.
+
 ### Fixed
 
 - Determination of string values more precisely
   for `trusted-set-constant` scriptlet [#499].
+- Support for negative priority suffix in UBO redirects rules.
 
+[v2.2.13]: https://github.com/AdguardTeam/Scriptlets/compare/v2.2.12...v2.2.13
 [#499]: https://github.com/AdguardTeam/Scriptlets/issues/499
 [#512]: https://github.com/AdguardTeam/Scriptlets/issues/512
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@adguard/scriptlets",
-    "version": "2.2.12",
+    "version": "2.2.13",
     "description": "AdGuard's JavaScript library of Scriptlets and Redirect resources",
     "type": "module",
     "scripts": {
@@ -64,7 +64,7 @@
         "neverBuiltDependencies": []
     },
     "dependencies": {
-        "@adguard/agtree": "^3.2.5",
+        "@adguard/agtree": "^3.3.1",
         "@types/trusted-types": "^2.0.7",
         "js-yaml": "^3.14.1"
     },

pnpm-lock.yaml

@@ -76,6 +76,11 @@ describe('validators', () => {
             // $redirect-rule
             '||example.org$xmlhttprequest,redirect-rule=noopvast-2.0',
             '||example.org/script.js$script,redirect-rule=googletagmanager-gtm',
+            // with positive priority
+            '||example.org^$xmlhttprequest,redirect=nooptext:1',
+            '||example.org^$xmlhttprequest,redirect-rule=nooptext:100',
+            // with negative priority
+            '||example.org^$xmlhttprequest,redirect=nooptext:-1',
         ];
         test.each(validRules)('%s', (rule: string) => {
             expect(isValidAdgRedirectRule(rule)).toBeTruthy();
@@ -89,6 +94,9 @@ describe('validators', () => {
             // invalid adg redirect name
             '||example.com/banner$image,redirect=redirect.png',
             '||example.com/banner$image,redirect-rule=redirect.png',
+            // invalid redirect resource with priority
+            '||example.com/banner$image,redirect=invalid:1',
+            '||example.com/banner$image,redirect-rule=invalid:-1',
         ];
         test.each(invalidRules)('%s', (rule: string) => {
             expect(isValidAdgRedirectRule(rule)).toBeFalsy();
@@ -99,6 +107,11 @@ describe('validators', () => {
         const validRedirectNames = [
             'noopvast-4.0', // adg only
             'empty', // adg/ubo
+            // with positive priority
+            'nooptext:1',
+            'nooptext:100',
+            // with negative priority
+            'nooptext:-1',
         ];
         test.each(validRedirectNames)('%s', (name: string) => {
             expect(isRedirectResourceCompatibleWithAdg(name)).toBeTruthy();
@@ -107,6 +120,8 @@ describe('validators', () => {
         const invalidRedirectNames = [
             'outbrain-widget.js', // ubo only
             'stylesheet', // ubo only
+            'invalid:1', // invalid resource even with priority
+            'invalid:-1', // invalid resource even with negative priority
         ];
         test.each(invalidRedirectNames)('%s', (name: string) => {
             expect(isRedirectResourceCompatibleWithAdg(name)).toBeFalsy();