@adguard/agtree 2.0.0 → 2.0.2

package/dist/{agtree.esm.js → agtree.mjs}

@@ -1,5 +1,5 @@
 /*
- * AGTree v2.0.0 (build date: Thu, 15 Aug 2024 15:06:58 GMT)
+ * AGTree v2.0.2 (build date: Tue, 10 Sep 2024 15:46:27 GMT)
  * (c) 2024 Adguard Software Ltd.
  * Released under the MIT license
  * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
@@ -192,6 +192,7 @@ const NUMBERS = new Set([NUMBER_0, NUMBER_1, NUMBER_2, NUMBER_3, NUMBER_4, NUMBE
 const REGEX_MARKER = '/';
 const ADG_SCRIPTLET_MASK = '//scriptlet';
 const UBO_SCRIPTLET_MASK = '+js';
+const UBO_SCRIPTLET_MASK_LEGACY = 'script:inject';
 const UBO_HTML_MASK = '^';
 // Modifiers are separated by ",". For example: "script,domain=example.com"
 const MODIFIERS_SEPARATOR = ',';
@@ -1128,6 +1129,15 @@ const isUndefined = value => {
 const isNull = value => {
   return value === null;
 };
+/**
+ * Checks whether the given value is a string.
+ *
+ * @param value Value to check.
+ * @returns `true` if the value is a string, `false` otherwise.
+ */
+const isString = value => {
+  return typeof value === 'string';
+};
 /**
  * Checks whether the given value is an array of Uint8Arrays.
  *
@@ -6318,11 +6328,17 @@ class UboScriptletInjectionBodyParser extends ParserBase {
     let offset = 0;
     // Skip leading spaces
     offset = StringUtils.skipWS(raw, offset);
+    let scriptletMaskLength = 0;
+    if (raw.startsWith(UBO_SCRIPTLET_MASK, offset)) {
+      scriptletMaskLength = UBO_SCRIPTLET_MASK.length;
+    } else if (raw.startsWith(UBO_SCRIPTLET_MASK_LEGACY, offset)) {
+      scriptletMaskLength = UBO_SCRIPTLET_MASK_LEGACY.length;
+    }
     // Scriptlet call should start with "+js"
-    if (!raw.startsWith(UBO_SCRIPTLET_MASK, offset)) {
+    if (!scriptletMaskLength) {
       throw new AdblockSyntaxError(this.ERROR_MESSAGES.NO_SCRIPTLET_MASK, baseOffset + offset, baseOffset + raw.length);
     }
-    offset += UBO_SCRIPTLET_MASK.length;
+    offset += scriptletMaskLength;
     // Whitespace is not allowed after the mask
     if (raw[offset] === SPACE) {
       throw new AdblockSyntaxError(this.ERROR_MESSAGES.WHITESPACE_AFTER_MASK, baseOffset + offset, baseOffset + raw.length);
@@ -6367,6 +6383,7 @@ class UboScriptletInjectionBodyParser extends ParserBase {
     if (node.children.length > 1) {
       throw new Error(this.ERROR_MESSAGES.NO_MULTIPLE_SCRIPTLET_CALLS);
     }
+    // During generation, we only support the modern scriptlet mask
     result.push(UBO_SCRIPTLET_MASK);
     result.push(OPEN_PARENTHESIS);
     if (node.children.length > 0) {
@@ -6904,7 +6921,7 @@ class CosmeticRuleParser extends ParserBase {
       };
     };
     const parseUboScriptletInjection = () => {
-      if (!rawBody.startsWith(UBO_SCRIPTLET_MASK)) {
+      if (!rawBody.startsWith(UBO_SCRIPTLET_MASK) && !rawBody.startsWith(UBO_SCRIPTLET_MASK_LEGACY)) {
         return null;
       }
       if (!options.parseUboSpecificRules) {
@@ -13859,7 +13876,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "1x1.gif",
       aliases: null,
@@ -13871,7 +13889,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["image"]
     }, {
       name: "1x1-transparent-gif",
       aliases: null,
@@ -13883,7 +13902,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -13914,7 +13934,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "2x2.png",
       aliases: null,
@@ -13926,7 +13947,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["image"]
     }, {
       name: "2x2-transparent-png",
       aliases: null,
@@ -13938,7 +13960,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -13969,7 +13992,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "32x32.png",
       aliases: null,
@@ -13981,7 +14005,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["image"]
     }, {
       name: "32x32-transparent-png",
       aliases: null,
@@ -13993,7 +14018,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14024,7 +14050,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "3x2.png",
       aliases: null,
@@ -14036,7 +14063,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["image"]
     }, {
       name: "3x2-transparent-png",
       aliases: null,
@@ -14048,7 +14076,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14079,7 +14108,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "amazon_apstag.js",
       aliases: null,
@@ -14091,7 +14121,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14118,7 +14149,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1024": 0,
@@ -14138,7 +14170,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1024": 0,
@@ -14158,7 +14191,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14181,7 +14215,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1024": 0,
@@ -14201,7 +14236,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: true
+      isBlocking: true,
+      resourceTypes: []
     }, {
       name: "click2load.html",
       aliases: null,
@@ -14213,7 +14249,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: true
+      isBlocking: true,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14240,7 +14277,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14263,7 +14301,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "empty",
       aliases: null,
@@ -14275,7 +14314,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14302,7 +14342,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "fingerprint2.js",
       aliases: null,
@@ -14314,7 +14355,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14341,7 +14383,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "fingerprint3.js",
       aliases: null,
@@ -14353,7 +14396,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14380,7 +14424,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14403,7 +14448,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "google-analytics_ga.js",
       aliases: null,
@@ -14415,7 +14461,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14442,7 +14489,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "google-analytics_analytics.js",
       aliases: null,
@@ -14454,7 +14502,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14481,7 +14530,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1024": 0,
@@ -14501,7 +14551,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1024": 0,
@@ -14521,7 +14572,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "google-ima.js",
       aliases: null,
@@ -14533,7 +14585,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14551,7 +14604,7 @@ const redirectsCompatibilityTableData = {
   }, {
     shared: [{
       name: "googlesyndication-adsbygoogle",
-      aliases: ["ubo-googlesyndication_adsbygoogle.js", "googlesyndication_adsbygoogle.js"],
+      aliases: ["ubo-googlesyndication_adsbygoogle.js", "ubo-googlesyndication.com/adsbygoogle.js", "googlesyndication_adsbygoogle.js"],
       description: "Mocks Google AdSense API.",
       docs: null,
       versionAdded: null,
@@ -14560,10 +14613,11 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "googlesyndication_adsbygoogle.js",
-      aliases: null,
+      aliases: ["googlesyndication.com/adsbygoogle.js"],
       description: "Mocks Google AdSense API.",
       docs: null,
       versionAdded: null,
@@ -14572,7 +14626,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14599,7 +14654,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "googletagservices_gpt.js",
       aliases: null,
@@ -14611,7 +14667,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14638,7 +14695,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1024": 0,
@@ -14658,7 +14716,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14681,7 +14740,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14704,7 +14764,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14727,7 +14788,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14750,7 +14812,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14773,7 +14836,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14796,7 +14860,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noeval.js",
       aliases: null,
@@ -14808,7 +14873,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -14835,7 +14901,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["media"]
     }],
     map: {
       "1024": 0,
@@ -14855,7 +14922,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noop.css",
       aliases: null,
@@ -14867,7 +14935,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["stylesheet"]
     }, {
       name: "blank-css",
       aliases: null,
@@ -14879,7 +14948,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14910,7 +14980,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noop.html",
       aliases: null,
@@ -14922,7 +14993,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["sub_frame"]
     }, {
       name: "blank-html",
       aliases: null,
@@ -14934,7 +15006,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -14965,7 +15038,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noop.js",
       aliases: null,
@@ -14977,7 +15051,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }, {
       name: "blank-js",
       aliases: null,
@@ -14989,7 +15064,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15020,7 +15096,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noop.json",
       aliases: null,
@@ -15032,7 +15109,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15059,7 +15137,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noop-0.1s.mp3",
       aliases: null,
@@ -15071,7 +15150,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["media"]
     }, {
       name: "blank-mp3",
       aliases: null,
@@ -15083,7 +15163,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15114,7 +15195,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noop-1s.mp4",
       aliases: null,
@@ -15126,7 +15208,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["media"]
     }, {
       name: "blank-mp4",
       aliases: null,
@@ -15138,7 +15221,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15169,7 +15253,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noop.txt",
       aliases: null,
@@ -15181,7 +15266,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["image", "media", "sub_frame", "stylesheet", "script", "xmlhttprequest", "other"]
     }, {
       name: "blank-text",
       aliases: null,
@@ -15193,7 +15279,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15224,7 +15311,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15247,7 +15335,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15270,7 +15359,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15293,7 +15383,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "noop-vmap1.0.xml",
       aliases: null,
@@ -15305,7 +15396,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["media"]
     }],
     map: {
       "1": 0,
@@ -15332,7 +15424,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "nowebrtc.js",
       aliases: null,
@@ -15344,7 +15437,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["other"]
     }],
     map: {
       "1": 0,
@@ -15371,7 +15465,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1024": 0,
@@ -15391,7 +15486,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15414,7 +15510,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "prebid-ads.js",
       aliases: null,
@@ -15426,7 +15523,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -15453,7 +15551,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }],
     map: {
       "1": 0,
@@ -15476,7 +15575,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "nobab.js",
       aliases: null,
@@ -15488,7 +15588,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -15515,7 +15616,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "nobab2.js",
       aliases: null,
@@ -15527,7 +15629,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -15554,10 +15657,11 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "nofab.js",
-      aliases: null,
+      aliases: ["fuckadblock.js-3.2.0", "fuckadblock.js-3.2.0.js"],
       description: "Mocks FAB script v3.2.0.",
       docs: null,
       versionAdded: null,
@@ -15566,7 +15670,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -15593,7 +15698,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "popads.js",
       aliases: null,
@@ -15605,7 +15711,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -15632,7 +15739,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "scorecardresearch_beacon.js",
       aliases: null,
@@ -15644,7 +15752,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -15671,7 +15780,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: []
     }, {
       name: "popads-dummy.js",
       aliases: null,
@@ -15683,7 +15793,8 @@ const redirectsCompatibilityTableData = {
       deprecationMessage: null,
       removed: false,
       removalMessage: null,
-      isBlocking: false
+      isBlocking: false,
+      resourceTypes: ["script"]
     }],
     map: {
       "1": 0,
@@ -15744,7 +15855,9 @@ const redirectsCompatibilityTableData = {
     "google-ima.js": 19,
     "googlesyndication-adsbygoogle": 20,
     "ubo-googlesyndication_adsbygoogle.js": 20,
+    "ubo-googlesyndication.com/adsbygoogle.js": 20,
     "googlesyndication_adsbygoogle.js": 20,
+    "googlesyndication.com/adsbygoogle.js": 20,
     "googletagservices-gpt": 21,
     "ubo-googletagservices_gpt.js": 21,
     "googletagservices_gpt.js": 21,
@@ -15803,6 +15916,8 @@ const redirectsCompatibilityTableData = {
     "nobab2.js": 48,
     "prevent-fab-3.2.0": 49,
     "nofab.js": 49,
+    "fuckadblock.js-3.2.0": 49,
+    "fuckadblock.js-3.2.0.js": 49,
     "prevent-popads-net": 50,
     "popads.js": 50,
     "scorecardresearch-beacon": 51,
@@ -18510,7 +18625,7 @@ const scriptletsCompatibilityTableData = {
       }]
     }, {
       name: "remove-attr.js",
-      aliases: ["ra.js"],
+      aliases: ["ra.js", "ra", "remove-attr"],
       description: null,
       docs: "https://github.com/gorhill/uBlock/wiki/Resources-Library#remove-attrjs-",
       versionAdded: null,
@@ -18591,7 +18706,7 @@ const scriptletsCompatibilityTableData = {
       }]
     }, {
       name: "remove-class.js",
-      aliases: ["rc.js"],
+      aliases: ["rc.js", "rc", "remove-class"],
       description: null,
       docs: "https://github.com/gorhill/uBlock/wiki/Resources-Library#remove-classjs-",
       versionAdded: null,
@@ -20448,6 +20563,7 @@ const scriptletsCompatibilityTableData = {
     "ubo-ra.js": 59,
     "ubo-remove-attr": 59,
     "ubo-ra": 59,
+    ra: 59,
     "remove-class": 60,
     "remove-class.js": 60,
     "ubo-remove-class.js": 60,
@@ -20455,6 +20571,7 @@ const scriptletsCompatibilityTableData = {
     "ubo-rc.js": 60,
     "ubo-remove-class": 60,
     "ubo-rc": 60,
+    rc: 60,
     "remove-cookie": 61,
     "cookie-remover.js": 61,
     "ubo-cookie-remover.js": 61,
@@ -21521,8 +21638,22 @@ function getScriptletName(scriptletNode) {
  */
 function transformNthScriptletArgument(scriptletNode, index, transform) {
   const child = scriptletNode.children[index];
-  if (!isUndefined(child) && !isNull(child)) {
-    child.value = transform(child.value);
+  if (!isUndefined(child)) {
+    const transformed = transform(child?.value ?? null);
+    if (isNull(transformed)) {
+      // eslint-disable-next-line no-param-reassign
+      scriptletNode.children[index] = null;
+      return;
+    }
+    if (isNull(child)) {
+      // eslint-disable-next-line no-param-reassign
+      scriptletNode.children[index] = {
+        type: 'Value',
+        value: transformed
+      };
+      return;
+    }
+    child.value = transformed;
   }
 }
 /**
@@ -21553,9 +21684,89 @@ function setScriptletName(scriptletNode, name) {
  * @param quoteType Preferred quote type
  */
 function setScriptletQuoteType(scriptletNode, quoteType) {
-  transformAllScriptletArguments(scriptletNode, value => QuoteUtils.setStringQuoteType(value, quoteType));
+  // null is a special value that means "no value", but we can't change its quote type,
+  // so we need to convert it to empty string
+  transformAllScriptletArguments(scriptletNode, value => QuoteUtils.setStringQuoteType(value ?? EMPTY, quoteType));
 }
 
+/**
+ * @file Resource type schema.
+ */
+/**
+ * Resource type.
+ *
+ * @see {@link https://developer.chrome.com/docs/extensions/reference/declarativeNetRequest/#type-ResourceType}
+ */
+var ResourceType;
+(function (ResourceType) {
+  ResourceType["MainFrame"] = "main_frame";
+  ResourceType["SubFrame"] = "sub_frame";
+  ResourceType["Stylesheet"] = "stylesheet";
+  ResourceType["Script"] = "script";
+  ResourceType["Image"] = "image";
+  ResourceType["Font"] = "font";
+  ResourceType["Object"] = "object";
+  ResourceType["XmlHttpRequest"] = "xmlhttprequest";
+  ResourceType["Ping"] = "ping";
+  ResourceType["Media"] = "media";
+  ResourceType["WebSocket"] = "websocket";
+  ResourceType["Other"] = "other";
+})(ResourceType || (ResourceType = {}));
+/**
+ * Resource type schema.
+ */
+const resourceTypeSchema = zod.nativeEnum(ResourceType);
+
+/**
+ * Map of resource types to their corresponding adblock modifier names.
+ *
+ * @note Record type is used to ensure that all resource types are present in the map.
+ */
+const RESOURCE_TYPE_MODIFIER_MAP = Object.freeze({
+  [ResourceType.MainFrame]: 'document',
+  [ResourceType.SubFrame]: 'subdocument',
+  [ResourceType.Stylesheet]: 'stylesheet',
+  [ResourceType.Script]: 'script',
+  [ResourceType.Image]: 'image',
+  [ResourceType.Font]: 'font',
+  [ResourceType.Object]: 'object',
+  [ResourceType.XmlHttpRequest]: 'xmlhttprequest',
+  [ResourceType.Ping]: 'ping',
+  [ResourceType.Media]: 'media',
+  [ResourceType.WebSocket]: 'websocket',
+  [ResourceType.Other]: 'other'
+});
+/**
+ * Gets the adblock modifier name for the given resource type.
+ *
+ * @param resourceType Resource type to get the modifier name for.
+ * @param platform Platform to get the modifier for.
+ *
+ * @returns A string containing the adblock modifier name for the given resource type
+ * or `null` if the modifier could not be found.
+ */
+const getResourceTypeModifier = (resourceType, platform) => {
+  const modifierName = RESOURCE_TYPE_MODIFIER_MAP[resourceType];
+  if (!modifierName) {
+    return null;
+  }
+  const modifierData = modifiersCompatibilityTable.getFirst(modifierName, platform);
+  if (isNull(modifierData)) {
+    return null;
+  }
+  return modifierData.name;
+};
+/**
+ * Checks if the given resource type is valid.
+ *
+ * @param resourceType Resource type to check.
+ *
+ * @returns `true` if the resource type is valid, `false` otherwise.
+ */
+const isValidResourceType = resourceType => {
+  return Object.values(ResourceType).includes(resourceType);
+};
+
 /**
  * @file Compatibility tables for redirects.
  */
@@ -21565,19 +21776,29 @@ function setScriptletQuoteType(scriptletNode, quoteType) {
 const ABP_RESOURCE_PREFIX = 'abp-resource:';
 const ABP_RESOURCE_PREFIX_LENGTH = ABP_RESOURCE_PREFIX.length;
 /**
- * Transforms the name of an ABP redirect to a normalized form.
+ * Normalizes the redirect name.
  *
  * @param name Redirect name to normalize.
  *
  * @returns Normalized redirect name.
  *
  * @example
- * abpRedirectNameNormalizer('abp-resource:my-resource') // => 'my-resource'
+ * redirectNameNormalizer('abp-resource:my-resource') // => 'my-resource'
+ * redirectNameNormalizer('noop.js:99') // => 'noop.js'
  */
-const abpRedirectNameNormalizer = name => {
+const redirectNameNormalizer = name => {
+  // Remove ABP resource prefix, if present
   if (name.startsWith(ABP_RESOURCE_PREFIX)) {
     return name.slice(ABP_RESOURCE_PREFIX_LENGTH);
   }
+  // Remove :[integer] priority suffix from the name, if present
+  // See:
+  // - https://github.com/AdguardTeam/tsurlfilter/issues/59
+  // - https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#redirect
+  const colonIndex = name.lastIndexOf(COLON);
+  if (colonIndex !== -1 && /^\d+$/.test(name.slice(colonIndex + 1))) {
+    return name.slice(0, colonIndex);
+  }
   return name;
 };
 /**
@@ -21590,7 +21811,36 @@ class RedirectsCompatibilityTable extends CompatibilityTableBase {
    * @param data Compatibility table data.
    */
   constructor(data) {
-    super(data, abpRedirectNameNormalizer);
+    super(data, redirectNameNormalizer);
+  }
+  /**
+   * Gets the resource type adblock modifiers for the redirect for the given platform
+   * based on the `resourceTypes` field.
+   *
+   * @param redirect Redirect name or redirect data.
+   * @param platform Platform to get the modifiers for.
+   *
+   * @returns Set of resource type modifiers or an empty set if the redirect is not found or has no resource types.
+   */
+  getResourceTypeModifiers(redirect, platform) {
+    let redirectData = null;
+    if (isString(redirect)) {
+      redirectData = this.getFirst(redirect, platform);
+    } else {
+      redirectData = redirect;
+    }
+    const modifierNames = new Set();
+    if (isNull(redirectData) || isUndefined(redirectData.resourceTypes)) {
+      return modifierNames;
+    }
+    for (const resourceType of redirectData.resourceTypes) {
+      const modifierName = getResourceTypeModifier(resourceType, platform);
+      if (isNull(modifierName)) {
+        continue;
+      }
+      modifierNames.add(modifierName);
+    }
+    return modifierNames;
   }
 }
 /**
@@ -22225,7 +22475,13 @@ zodToCamelCase(baseCompatibilityDataSchema.extend({
   /**
    * Whether the redirect is blocking.
    */
-  is_blocking: booleanSchema.default(false)
+  is_blocking: booleanSchema.default(false),
+  /**
+   * Resource type(s) belonging to the redirect.
+   *
+   * @see {@link https://developer.chrome.com/docs/extensions/reference/declarativeNetRequest/#type-ResourceType}
+   */
+  resource_types: zod.array(resourceTypeSchema).default([])
 }).superRefine(baseRefineLogic));
 
 /**
@@ -22318,11 +22574,14 @@ const ADG_PREVENT_FETCH_NAME = 'prevent-fetch';
 const ADG_PREVENT_FETCH_EMPTY_STRING = '';
 const ADG_PREVENT_FETCH_WILDCARD = '*';
 const UBO_NO_FETCH_IF_WILDCARD = '/^/';
+const UBO_REMOVE_CLASS_NAME = 'remove-class.js';
+const UBO_REMOVE_ATTR_NAME = 'remove-attr.js';
 const setConstantAdgToUboMap = {
   [ADG_SET_CONSTANT_EMPTY_STRING]: UBO_SET_CONSTANT_EMPTY_STRING,
   [ADG_SET_CONSTANT_EMPTY_ARRAY]: UBO_SET_CONSTANT_EMPTY_ARRAY,
   [ADG_SET_CONSTANT_EMPTY_OBJECT]: UBO_SET_CONSTANT_EMPTY_OBJECT
 };
+const REMOVE_ATTR_CLASS_APPLYING = new Set(['asap', 'stay', 'complete']);
 /**
  * Scriptlet injection rule converter class
  *
@@ -22358,12 +22617,18 @@ class ScriptletRuleConverter extends RuleConverterBase {
         const scriptletName = QuoteUtils.setStringQuoteType(getScriptletName(scriptletClone), QuoteType.None);
         // Add prefix if it's not already there
         let prefix;
+        // In uBO / ABP syntax, if a parameter contains the separator character, it should be escaped,
+        // but during the conversion, we need to unescape them, because AdGuard syntax uses quotes to
+        // distinguish between parameters.
+        let charToUnescape;
         switch (rule.syntax) {
           case AdblockSyntax.Abp:
             prefix = ABP_SCRIPTLET_PREFIX;
+            charToUnescape = SPACE;
             break;
           case AdblockSyntax.Ubo:
             prefix = UBO_SCRIPTLET_PREFIX;
+            charToUnescape = COMMA_SEPARATOR;
             break;
           default:
             prefix = EMPTY;
@@ -22371,6 +22636,59 @@ class ScriptletRuleConverter extends RuleConverterBase {
         if (!scriptletName.startsWith(prefix)) {
           setScriptletName(scriptletClone, `${prefix}${scriptletName}`);
         }
+        if (!isUndefined(charToUnescape)) {
+          transformAllScriptletArguments(scriptletClone, value => {
+            if (!isNull(value)) {
+              return QuoteUtils.unescapeSingleEscapedOccurrences(value, charToUnescape);
+            }
+            return value;
+          });
+        }
+        if (rule.syntax === AdblockSyntax.Ubo) {
+          const scriptletData = scriptletsCompatibilityTable.getFirst(scriptletName, GenericPlatform.UboAny);
+          // Some scriptlets have special values that need to be converted
+          if (scriptletData && (scriptletData.name === UBO_REMOVE_CLASS_NAME || scriptletData.name === UBO_REMOVE_ATTR_NAME) && scriptletClone.children.length > 2) {
+            const selectors = [];
+            let applying = null;
+            let lastArg = scriptletClone.children.pop();
+            // The very last argument might be the 'applying' parameter
+            if (lastArg) {
+              if (REMOVE_ATTR_CLASS_APPLYING.has(lastArg.value)) {
+                applying = lastArg.value;
+              } else {
+                selectors.push(lastArg.value);
+              }
+            }
+            while (scriptletClone.children.length > 2) {
+              lastArg = scriptletClone.children.pop();
+              if (lastArg) {
+                selectors.push(lastArg.value.trim());
+              }
+            }
+            // Set last arg to be the combined selectors (in reverse order, because we popped them)
+            if (selectors.length > 0) {
+              scriptletClone.children.push({
+                type: 'Value',
+                value: selectors.reverse().join(', ')
+              });
+            }
+            // Push back the 'applying' parameter if it was found previously
+            if (!isNull(applying)) {
+              // If we don't have any selectors,
+              // we need to add an empty parameter before the 'applying' one
+              if (selectors.length === 0) {
+                scriptletClone.children.push({
+                  type: 'Value',
+                  value: EMPTY
+                });
+              }
+              scriptletClone.children.push({
+                type: 'Value',
+                value: applying
+              });
+            }
+          }
+        }
         // ADG scriptlet parameters should be quoted, and single quoted are preferred
         setScriptletQuoteType(scriptletClone, QuoteType.Single);
         convertedScriptlets.push(scriptletClone);
@@ -22455,13 +22773,28 @@ class ScriptletRuleConverter extends RuleConverterBase {
         // and we need to escape the comma in the second argument to prevent it from being treated
         // as two separate arguments.
         transformAllScriptletArguments(scriptletClone, value => {
-          return QuoteUtils.escapeUnescapedOccurrences(value, COMMA_SEPARATOR);
+          if (!isNull(value)) {
+            return QuoteUtils.escapeUnescapedOccurrences(value, COMMA_SEPARATOR);
+          }
+          return value;
         });
+        // Unescape spaces in parameters, because uBlock Origin doesn't treat them as separators.
+        if (rule.syntax === AdblockSyntax.Abp) {
+          transformAllScriptletArguments(scriptletClone, value => {
+            if (!isNull(value)) {
+              return QuoteUtils.unescapeSingleEscapedOccurrences(value, SPACE);
+            }
+            return value;
+          });
+        }
         // Some scriptlets have special values that need to be converted
         switch (scriptletName) {
           case ADG_SET_CONSTANT_NAME:
             transformNthScriptletArgument(scriptletClone, 2, value => {
-              return setConstantAdgToUboMap[value] ?? value;
+              if (!isNull(value)) {
+                return setConstantAdgToUboMap[value] ?? value;
+              }
+              return value;
             });
             break;
           case ADG_PREVENT_FETCH_NAME:
@@ -23132,6 +23465,10 @@ const REDIRECT_MODIFIER = 'redirect';
  * @see {@link https://adguard.com/kb/general/ad-filtering/create-own-filters/#redirect-rule-modifier}
  */
 const REDIRECT_RULE_MODIFIER = 'redirect-rule';
+/**
+ * @see {@link https://github.com/gorhill/uBlock/wiki/Resources-Library#empty-redirect-resources}
+ */
+const UBO_NOOP_TEXT_RESOURCE = 'noop.txt';
 /**
  * Redirect-related modifiers.
  */
@@ -23281,6 +23618,112 @@ class NetworkRuleModifierListConverter extends ConverterBase {
     }
     return createConversionResult(modifierList, false);
   }
+  /**
+   * Converts a network rule modifier list to uBlock format, if possible.
+   *
+   * @param modifierList Network rule modifier list node to convert
+   * @param isException If `true`, the rule is an exception rule
+   * @returns An object which follows the {@link ConversionResult} interface. Its `result` property contains
+   * the converted node, and its `isConverted` flag indicates whether the original node was converted.
+   * If the node was not converted, the result will contain the original node with the same object reference
+   * @throws If the conversion is not possible
+   */
+  // TODO: Optimize
+  static convertToUbo(modifierList, isException = false) {
+    const conversionMap = new MultiValueMap();
+    const resourceTypeModifiersToAdd = new Set();
+    modifierList.children.forEach((modifierNode, index) => {
+      const originalModifierName = modifierNode.name.value;
+      const modifierData = modifiersCompatibilityTable.getFirst(originalModifierName, GenericPlatform.UboAny);
+      // Handle special case: resource redirection modifiers
+      if (REDIRECT_MODIFIERS.has(originalModifierName)) {
+        // Redirect modifiers cannot be negated
+        if (modifierNode.exception === true) {
+          throw new RuleConversionError(`Modifier '${modifierNode.name.value}' cannot be negated`);
+        }
+        // Convert the redirect resource name to uBO format
+        const redirectResourceName = modifierNode.value?.value;
+        // Special case: for exception rules, $redirect without value is allowed,
+        // and in this case it means an exception for all redirects
+        if (!redirectResourceName && !isException) {
+          throw new RuleConversionError(`No redirect resource specified for '${modifierNode.name.value}' modifier`);
+        }
+        if (!redirectResourceName) {
+          // Jump to the next modifier if the redirect resource is not specified
+          return;
+        }
+        // Leave $redirect and $redirect-rule modifiers as is, but convert $rewrite to $redirect
+        const modifierName = modifierNode.name.value === ABP_REWRITE_MODIFIER ? REDIRECT_MODIFIER : modifierNode.name.value;
+        const convertedRedirectResourceData = redirectsCompatibilityTable.getFirst(redirectResourceName, GenericPlatform.UboAny);
+        const convertedRedirectResourceName = convertedRedirectResourceData?.name ?? redirectResourceName;
+        // uBlock requires the $redirect modifier to have a resource type
+        // https://github.com/AdguardTeam/Scriptlets/issues/101
+        if (convertedRedirectResourceData?.resourceTypes?.length) {
+          // Convert the resource types to uBO modifiers
+          const uboResourceTypeModifiers = redirectsCompatibilityTable.getResourceTypeModifiers(convertedRedirectResourceData, GenericPlatform.UboAny);
+          // Special case: noop text resource
+          // If any of resource type is already present, we don't need to add other resource types,
+          // otherwise, add all resource types
+          // TODO: Optimize this logic
+          // Check if the current resource is the noop text resource
+          const isNoopTextResource = convertedRedirectResourceName === UBO_NOOP_TEXT_RESOURCE;
+          // Determine if there are any valid resource types already present
+          const hasValidResourceType = modifierList.children.some(modifier => {
+            const name = modifier.name.value;
+            if (!isValidResourceType(name)) {
+              return false;
+            }
+            const convertedModifierData = modifiersCompatibilityTable.getFirst(name, GenericPlatform.UboAny);
+            return uboResourceTypeModifiers.has(convertedModifierData?.name ?? name);
+          });
+          // If it's not the noop text resource or if no valid resource types are present
+          if (!isNoopTextResource || !hasValidResourceType) {
+            uboResourceTypeModifiers.forEach(resourceType => {
+              resourceTypeModifiersToAdd.add(resourceType);
+            });
+          }
+        }
+        // Check if the modifier name or the redirect resource name is different from the original modifier.
+        // If so, add the converted modifier to the list
+        if (modifierName !== originalModifierName || !isUndefined(convertedRedirectResourceName) && convertedRedirectResourceName !== redirectResourceName) {
+          conversionMap.add(index, createModifierNode(modifierName,
+          // If the redirect resource name is unknown, fall back to the original one
+          // Later, the validator will throw an error if the resource name is invalid
+          convertedRedirectResourceName || redirectResourceName, modifierNode.exception));
+        }
+        return;
+      }
+      // Generic modifier conversion
+      if (modifierData && modifierData.name !== originalModifierName) {
+        conversionMap.add(index, createModifierNode(modifierData.name, modifierNode.value?.value, modifierNode.exception));
+      }
+    });
+    // Prepare the result if there are any converted modifiers or $csp modifiers
+    if (conversionMap.size || resourceTypeModifiersToAdd.size) {
+      const modifierListClone = cloneModifierListNode(modifierList);
+      // Replace the original modifiers with the converted ones
+      // One modifier may be replaced with multiple modifiers, so we need to flatten the array
+      modifierListClone.children = modifierListClone.children.map((modifierNode, index) => {
+        const conversionRecord = conversionMap.get(index);
+        if (conversionRecord) {
+          return conversionRecord;
+        }
+        return modifierNode;
+      }).flat();
+      // Before returning the result, remove duplicated modifiers
+      modifierListClone.children = modifierListClone.children.filter((modifierNode, index, self) => self.findIndex(m => m.name.value === modifierNode.name.value && m.exception === modifierNode.exception && m.value?.value === modifierNode.value?.value) === index);
+      if (resourceTypeModifiersToAdd.size) {
+        const modifierNameSet = new Set(modifierList.children.map(m => m.name.value));
+        resourceTypeModifiersToAdd.forEach(resourceType => {
+          if (!modifierNameSet.has(resourceType)) {
+            modifierListClone.children.push(createModifierNode(resourceType));
+          }
+        });
+      }
+      return createConversionResult(modifierListClone, true);
+    }
+    return createConversionResult(modifierList, false);
+  }
 }
 
 /**
@@ -23330,6 +23773,44 @@ class NetworkRuleConverter extends RuleConverterBase {
     // If the modifiers were not converted, return the original rule
     return createNodeConversionResult([rule], false);
   }
+  /**
+   * Converts a network rule to uBlock format, if possible.
+   *
+   * @param rule Rule node to convert
+   * @returns An object which follows the {@link NodeConversionResult} interface. Its `result` property contains
+   * the array of converted rule nodes, and its `isConverted` flag indicates whether the original rule was converted.
+   * If the rule was not converted, the result array will contain the original node with the same object reference
+   * @throws If the rule is invalid or cannot be converted
+   */
+  static convertToUbo(rule) {
+    // TODO: add support for host rules
+    if (rule.type !== NetworkRuleType.NetworkRule) {
+      throw new Error(`Invalid rule type: ${rule.type}`);
+    }
+    if (rule.modifiers) {
+      const modifiers = NetworkRuleModifierListConverter.convertToUbo(rule.modifiers, rule.exception);
+      // If the object reference is different, it means that the modifiers were converted
+      // In this case, we should clone the entire rule and replace the modifiers with the converted ones
+      if (modifiers.isConverted) {
+        return {
+          result: [{
+            category: RuleCategory.Network,
+            type: NetworkRuleType.NetworkRule,
+            syntax: rule.syntax,
+            exception: rule.exception,
+            pattern: {
+              type: 'Value',
+              value: rule.pattern.value
+            },
+            modifiers: modifiers.result
+          }],
+          isConverted: true
+        };
+      }
+    }
+    // If the modifiers were not converted, return the original rule
+    return createNodeConversionResult([rule], false);
+  }
 }
 
 /**
@@ -23391,6 +23872,9 @@ class RuleConverter extends RuleConverterBase {
     if (rule.category === RuleCategory.Cosmetic) {
       return CosmeticRuleConverter.convertToUbo(rule);
     }
+    if (rule.category === RuleCategory.Network) {
+      return NetworkRuleConverter.convertToUbo(rule);
+    }
     return createConversionResult([rule], false);
   }
 }
@@ -23669,12 +24153,14 @@ class PositionProvider {
       if (sourceCode[i] === LF || sourceCode[i] === FF || sourceCode[i] === CR) {
         currentLine += 1;
         this.lineStartOffsets[currentLine] = sourceCode[i] === CR && sourceCode[i + 1] === LF ? i + 2 : i + 1;
-        if (sourceCode[i] === CR) {
+        if (sourceCode[i] === CR && sourceCode[i + 1] === LF) {
           // Skip the '\n' in a '\r\n' sequence
           i += 1;
         }
       }
     }
+    // Handle the case where the last offset is at the end of the source code
+    this.offsetToLine[sourceCode.length] = currentLine;
   }
   /**
    * Converts a character offset to a line and column position.
@@ -23683,7 +24169,7 @@ class PositionProvider {
    * @returns A Position object containing the 1-based line and column number, or null if the offset is out of range.
    */
   convertOffsetToPosition(offset) {
-    if (offset < 0 || offset >= this.offsetToLine.length) {
+    if (offset < 0 || offset > this.offsetToLine.length - 1) {
       return null;
     }
     const line = this.offsetToLine[offset];
@@ -24440,7 +24926,7 @@ class RuleCategorizer {
     }
   }
 }
-const version = "2.0.0";
+const version = "2.0.2";
 
 /**
  * @file AGTree version
@@ -24450,4 +24936,4 @@ const version = "2.0.0";
 // `tsc` in the root directory, it will generate `dist/types/src/version.d.ts`
 // with wrong relative path to `package.json`. So we need this little "hack"
 const AGTREE_VERSION = version;
-export { ADBLOCK_URL_SEPARATOR, ADBLOCK_URL_SEPARATOR_REGEX, ADBLOCK_URL_START, ADBLOCK_URL_START_REGEX, ADBLOCK_WILDCARD, ADBLOCK_WILDCARD_REGEX, ADG_SCRIPTLET_MASK, AGLINT_COMMAND_PREFIX, AGTREE_VERSION, AdblockSyntax, AdblockSyntaxError, AgentCommentRuleParser, AgentParser, AppListParser, BINARY_SCHEMA_VERSION, BinarySchemaMismatchError, ByteBuffer, COMMA_DOMAIN_LIST_SEPARATOR, CommentMarker, CommentRuleParser, CommentRuleType, ConfigCommentRuleParser, CosmeticRuleParser, CosmeticRuleSeparator, CosmeticRuleSeparatorUtils, CosmeticRuleType, DomainListParser, DomainUtils, EXT_CSS_LEGACY_ATTRIBUTES, EXT_CSS_PSEUDO_CLASSES, FORBIDDEN_CSS_FUNCTIONS, FilterListConverter, FilterListParser, GenericPlatform, HINT_MARKER, HintCommentRuleParser, HintParser, HostRuleParser, IF, INCLUDE, InputByteBuffer, KNOWN_METADATA_HEADERS, LogicalExpressionParser, LogicalExpressionUtils, MODIFIERS_SEPARATOR, MODIFIER_ASSIGN_OPERATOR, MetadataCommentRuleParser, MethodListParser, ModifierListParser, ModifierParser, NEGATION_MARKER, NETWORK_RULE_EXCEPTION_MARKER, NETWORK_RULE_SEPARATOR, NetworkRuleParser, NetworkRuleType, NotImplementedError, OutputByteBuffer, PIPE_MODIFIER_SEPARATOR, PREPROCESSOR_MARKER, ParameterListParser, PositionProvider, PreProcessorCommentRuleParser, QuoteType, QuoteUtils, RawFilterListConverter, RawRuleConverter, RegExpUtils, RuleCategorizer, RuleCategory, RuleConversionError, RuleConverter, RuleParser, SAFARI_CB_AFFINITY, SPECIAL_REGEX_SYMBOLS, SpecificPlatform, StealthOptionListParser, UBO_SCRIPTLET_MASK, decodeTextPolyfill, defaultParserOptions, encodeIntoPolyfill, getPlatformId, getSpecificPlatformName, isGenericPlatform, modifierValidator, modifiersCompatibilityTable, parseRawPlatforms, redirectsCompatibilityTable, scriptletsCompatibilityTable };
+export { ADBLOCK_URL_SEPARATOR, ADBLOCK_URL_SEPARATOR_REGEX, ADBLOCK_URL_START, ADBLOCK_URL_START_REGEX, ADBLOCK_WILDCARD, ADBLOCK_WILDCARD_REGEX, ADG_SCRIPTLET_MASK, AGLINT_COMMAND_PREFIX, AGTREE_VERSION, AdblockSyntax, AdblockSyntaxError, AgentCommentRuleParser, AgentParser, AppListParser, BINARY_SCHEMA_VERSION, BinarySchemaMismatchError, ByteBuffer, COMMA_DOMAIN_LIST_SEPARATOR, CommentMarker, CommentRuleParser, CommentRuleType, ConfigCommentRuleParser, CosmeticRuleParser, CosmeticRuleSeparator, CosmeticRuleSeparatorUtils, CosmeticRuleType, DomainListParser, DomainUtils, EXT_CSS_LEGACY_ATTRIBUTES, EXT_CSS_PSEUDO_CLASSES, FORBIDDEN_CSS_FUNCTIONS, FilterListConverter, FilterListParser, GenericPlatform, HINT_MARKER, HintCommentRuleParser, HintParser, HostRuleParser, IF, INCLUDE, InputByteBuffer, KNOWN_METADATA_HEADERS, LogicalExpressionParser, LogicalExpressionUtils, MODIFIERS_SEPARATOR, MODIFIER_ASSIGN_OPERATOR, MetadataCommentRuleParser, MethodListParser, ModifierListParser, ModifierParser, NEGATION_MARKER, NETWORK_RULE_EXCEPTION_MARKER, NETWORK_RULE_SEPARATOR, NetworkRuleParser, NetworkRuleType, NotImplementedError, OutputByteBuffer, PIPE_MODIFIER_SEPARATOR, PREPROCESSOR_MARKER, ParameterListParser, PositionProvider, PreProcessorCommentRuleParser, QuoteType, QuoteUtils, RawFilterListConverter, RawRuleConverter, RegExpUtils, ResourceType, RuleCategorizer, RuleCategory, RuleConversionError, RuleConverter, RuleParser, SAFARI_CB_AFFINITY, SPECIAL_REGEX_SYMBOLS, SpecificPlatform, StealthOptionListParser, UBO_SCRIPTLET_MASK, decodeTextPolyfill, defaultParserOptions, encodeIntoPolyfill, getPlatformId, getResourceTypeModifier, getSpecificPlatformName, isGenericPlatform, isValidResourceType, modifierValidator, modifiersCompatibilityTable, parseRawPlatforms, redirectsCompatibilityTable, scriptletsCompatibilityTable };