@adguard/filters-compiler 3.3.0-beta.1 → 3.3.1

package/dist/index.cjs

@@ -17,7 +17,8 @@ var util = require('util');
 var module$1 = require('module');
 var jsdom = require('jsdom');
 var crypto = require('crypto');
-var moment = require('moment');
+var dateFns = require('date-fns');
+var utc = require('@date-fns/utc');
 var fs$1 = require('fs/promises');
 var tldts = require('tldts');
 var Ajv = require('ajv');
@@ -1604,7 +1605,7 @@ const RULES_SEPARATOR = '\r\n';
 let filterIdsPool = [];
 let metadataFilterIdsPool = [];
 
-const OPTIMIZED_PLATFORMS_LIST = ['ext_safari', 'android', 'ios'];
+const OPTIMIZED_PLATFORMS_LIST = ['ext_safari', 'android', 'ios', 'ext_android_cb'];
 
 const PLATFORM_FILTERS_DIR = 'filters';
 const FILTERS_METADATA_FILE_JSON = 'filters.json';
@@ -1704,7 +1705,7 @@ const makeHeader = function (metadataFile, revisionFile, platformsJsonExpires) {
         `! Title: ${metadata.name}`,
         `! Description: ${metadata.description}`,
         `! Version: ${revision.version}`,
-        `! TimeUpdated: ${moment(revision.timeUpdated).format()}`,
+        `! TimeUpdated: ${dateFns.format(revision.timeUpdated, 'yyyy-MM-dd\'T\'HH:mm:ssxxx', { in: utc.utc })}`,
         `! Expires: ${expires} (update frequency)`,
     ];
 };
@@ -2424,8 +2425,8 @@ const loadFilterMetadata = function (filterDir, includedFilterIds, excludedFilte
 
     const result = JSON.parse(metadataString);
     result.version = revision.version;
-    result.timeUpdated = moment(revision.timeUpdated).format('YYYY-MM-DDTHH:mm:ssZZ');
-    result.timeAdded = moment(result.timeAdded).format('YYYY-MM-DDTHH:mm:ssZZ');
+    result.timeUpdated = dateFns.format(revision.timeUpdated, 'yyyy-MM-dd\'T\'HH:mm:ssxx', { in: utc.utc });
+    result.timeAdded = dateFns.format(result.timeAdded, 'yyyy-MM-dd\'T\'HH:mm:ssxx', { in: utc.utc });
     delete result.disabled;
 
     const { filterId } = result;
@@ -4398,6 +4399,25 @@ const REPLACE_MODIFIER_PATTERNS = [
     '\\$(?!#|(path|domain)=.*]|.*removeparam=).*replace(,|=|$)',
 ];
 
+/**
+ * Pattern to check if rule contains `$urltransform` modifier
+ * and does not contain non-basic modifiers like `$domain` or `$path`.
+ *
+ * Pattern parts:
+ * - `\\$` — modifiers divider
+ * - `(?!#|(path|domain)=.*]|.*removeparam=).*` — negative lookahead to exclude CSS rules (#$#) and rules like
+ *   `[$path=...]##.textad,[urltransform="ads"]` and rules with `$removeparam` modifier like `$removeparam=urltransform`
+ * - `.*urltransform` — urltransform modifier itself
+ * - `(,|=|$)` — end of line or modifiers divider, as `$urltransform` can be followed by other modifiers (`,`),
+ *   it may have a value (`=`), or it may be the last modifier in the rule (`$`).
+ *
+ * @example
+ * ```||example.com^$urltransform=/firstpath/secondpath/```
+ */
+const URLTRANSFORM_MODIFIER_PATTERNS = [
+    '\\$(?!#|(path|domain)=.*]|.*removeparam=).*urltransform(,|=|$)',
+];
+
 /* eslint-disable max-len */
 
 /**
@@ -4676,6 +4696,7 @@ const SAFARI_BASED_EXTENSION_PATTERNS = [
     ...REMOVEHEADER_MODIFIER_PATTERNS,
     ...MP4_MODIFIER_PATTERNS,
     ...REPLACE_MODIFIER_PATTERNS,
+    ...URLTRANSFORM_MODIFIER_PATTERNS,
     ...STEALTH_MODIFIER_PATTERNS,
     ...COOKIE_MODIFIER_PATTERNS,
     ...APP_MODIFIER_PATTERNS,
@@ -4939,6 +4960,7 @@ const platformsConfig = {
                 ...CSS_RULES_PATTERNS,
                 ...MP4_MODIFIER_PATTERNS,
                 ...REPLACE_MODIFIER_PATTERNS,
+                ...URLTRANSFORM_MODIFIER_PATTERNS,
                 ...STEALTH_MODIFIER_PATTERNS,
                 ...COOKIE_MODIFIER_PATTERNS,
                 ...EMPTY_MODIFIER_PATTERNS,
@@ -4972,6 +4994,7 @@ const platformsConfig = {
                 ...HTML_FILTERING_MODIFIER_PATTERNS,
                 ...MP4_MODIFIER_PATTERNS,
                 ...REPLACE_MODIFIER_PATTERNS,
+                ...URLTRANSFORM_MODIFIER_PATTERNS,
                 ...STEALTH_MODIFIER_PATTERNS,
                 ...COOKIE_MODIFIER_PATTERNS,
                 ...APP_MODIFIER_PATTERNS,

package/dist/index.js

@@ -15,7 +15,8 @@ import { TextEncoder, TextDecoder } from 'util';
 import { createRequire } from 'module';
 import { JSDOM } from 'jsdom';
 import crypto from 'crypto';
-import moment from 'moment';
+import { format } from 'date-fns';
+import { utc } from '@date-fns/utc';
 import fs$1 from 'fs/promises';
 import { parse as parse$1 } from 'tldts';
 import Ajv from 'ajv';
@@ -1601,7 +1602,7 @@ const RULES_SEPARATOR = '\r\n';
 let filterIdsPool = [];
 let metadataFilterIdsPool = [];
 
-const OPTIMIZED_PLATFORMS_LIST = ['ext_safari', 'android', 'ios'];
+const OPTIMIZED_PLATFORMS_LIST = ['ext_safari', 'android', 'ios', 'ext_android_cb'];
 
 const PLATFORM_FILTERS_DIR = 'filters';
 const FILTERS_METADATA_FILE_JSON = 'filters.json';
@@ -1701,7 +1702,7 @@ const makeHeader = function (metadataFile, revisionFile, platformsJsonExpires) {
         `! Title: ${metadata.name}`,
         `! Description: ${metadata.description}`,
         `! Version: ${revision.version}`,
-        `! TimeUpdated: ${moment(revision.timeUpdated).format()}`,
+        `! TimeUpdated: ${format(revision.timeUpdated, 'yyyy-MM-dd\'T\'HH:mm:ssxxx', { in: utc })}`,
         `! Expires: ${expires} (update frequency)`,
     ];
 };
@@ -2421,8 +2422,8 @@ const loadFilterMetadata = function (filterDir, includedFilterIds, excludedFilte
 
     const result = JSON.parse(metadataString);
     result.version = revision.version;
-    result.timeUpdated = moment(revision.timeUpdated).format('YYYY-MM-DDTHH:mm:ssZZ');
-    result.timeAdded = moment(result.timeAdded).format('YYYY-MM-DDTHH:mm:ssZZ');
+    result.timeUpdated = format(revision.timeUpdated, 'yyyy-MM-dd\'T\'HH:mm:ssxx', { in: utc });
+    result.timeAdded = format(result.timeAdded, 'yyyy-MM-dd\'T\'HH:mm:ssxx', { in: utc });
     delete result.disabled;
 
     const { filterId } = result;
@@ -4395,6 +4396,25 @@ const REPLACE_MODIFIER_PATTERNS = [
     '\\$(?!#|(path|domain)=.*]|.*removeparam=).*replace(,|=|$)',
 ];
 
+/**
+ * Pattern to check if rule contains `$urltransform` modifier
+ * and does not contain non-basic modifiers like `$domain` or `$path`.
+ *
+ * Pattern parts:
+ * - `\\$` — modifiers divider
+ * - `(?!#|(path|domain)=.*]|.*removeparam=).*` — negative lookahead to exclude CSS rules (#$#) and rules like
+ *   `[$path=...]##.textad,[urltransform="ads"]` and rules with `$removeparam` modifier like `$removeparam=urltransform`
+ * - `.*urltransform` — urltransform modifier itself
+ * - `(,|=|$)` — end of line or modifiers divider, as `$urltransform` can be followed by other modifiers (`,`),
+ *   it may have a value (`=`), or it may be the last modifier in the rule (`$`).
+ *
+ * @example
+ * ```||example.com^$urltransform=/firstpath/secondpath/```
+ */
+const URLTRANSFORM_MODIFIER_PATTERNS = [
+    '\\$(?!#|(path|domain)=.*]|.*removeparam=).*urltransform(,|=|$)',
+];
+
 /* eslint-disable max-len */
 
 /**
@@ -4673,6 +4693,7 @@ const SAFARI_BASED_EXTENSION_PATTERNS = [
     ...REMOVEHEADER_MODIFIER_PATTERNS,
     ...MP4_MODIFIER_PATTERNS,
     ...REPLACE_MODIFIER_PATTERNS,
+    ...URLTRANSFORM_MODIFIER_PATTERNS,
     ...STEALTH_MODIFIER_PATTERNS,
     ...COOKIE_MODIFIER_PATTERNS,
     ...APP_MODIFIER_PATTERNS,
@@ -4936,6 +4957,7 @@ const platformsConfig = {
                 ...CSS_RULES_PATTERNS,
                 ...MP4_MODIFIER_PATTERNS,
                 ...REPLACE_MODIFIER_PATTERNS,
+                ...URLTRANSFORM_MODIFIER_PATTERNS,
                 ...STEALTH_MODIFIER_PATTERNS,
                 ...COOKIE_MODIFIER_PATTERNS,
                 ...EMPTY_MODIFIER_PATTERNS,
@@ -4969,6 +4991,7 @@ const platformsConfig = {
                 ...HTML_FILTERING_MODIFIER_PATTERNS,
                 ...MP4_MODIFIER_PATTERNS,
                 ...REPLACE_MODIFIER_PATTERNS,
+                ...URLTRANSFORM_MODIFIER_PATTERNS,
                 ...STEALTH_MODIFIER_PATTERNS,
                 ...COOKIE_MODIFIER_PATTERNS,
                 ...APP_MODIFIER_PATTERNS,

package/dist/utils/trust-levels/exclusions-full.txt

@@ -5,6 +5,7 @@
 ! ##+js
 ! #$#
 ! $replace
+! $urltransform
 ! #%#
 ! #@%#
 !

package/dist/utils/trust-levels/exclusions-high.txt

@@ -9,5 +9,6 @@
 #%#//scriptlet('trusted-
 #%#//scriptlet("trusted-
 $replace
+$urltransform
 #%#
-#@%#
+#@%#

package/dist/utils/trust-levels/exclusions-low.txt

@@ -7,5 +7,6 @@
 ##+js
 #$#
 $replace
+$urltransform
 #%#
-#@%#
+#@%#

package/package.json

@@ -21,20 +21,21 @@
     "pnpm": ">=10.33.4 <11"
   },
   "dependencies": {
-    "@adguard/agtree": "4.1.2",
+    "@adguard/agtree": "4.2.1",
     "@adguard/css-tokenizer": "1.2.0",
     "@adguard/ecss-tree": "2.0.1",
-    "@adguard/extended-css": "2.1.1",
+    "@adguard/extended-css": "2.2.0",
     "@adguard/filters-downloader": "2.4.4",
     "@adguard/logger": "2.0.0",
-    "@adguard/scriptlets": "2.3.1",
-    "@adguard/tsurlfilter": "4.0.5",
+    "@adguard/scriptlets": "2.5.1",
+    "@adguard/tsurlfilter": "6.0.3",
+    "@date-fns/utc": "2.1.1",
     "@eslint/css-tree": "3.6.6",
     "ajv": "8.17.1",
     "child_process": "1.0.2",
+    "date-fns": "^4.4.0",
     "jsdom": "21.1.2",
     "md5": "2.3.0",
-    "moment": "2.30.1",
     "tldts": "5.7.112",
     "utf8": "3.0.0"
   },
@@ -58,7 +59,7 @@
     "typescript": "6.0.3",
     "vitest": "3.0.5"
   },
-  "version": "3.3.0-beta.1",
+  "version": "3.3.1",
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "rollup --config rollup.config.js --silent",