@adguard/agtree 3.0.0 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adguard/agtree",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Tool set for working with adblock filter lists",
   "keywords": [
     "adblock",
@@ -27,69 +27,38 @@
   },
   "homepage": "https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme",
   "sideEffects": false,
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.mjs",
+  "type": "module",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/types/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "dist/types/index.d.ts"
-      ],
-      "parser": [
-        "dist/types/parser/index.d.ts"
-      ],
-      "generator": [
-        "dist/types/generator/index.d.ts"
-      ],
-      "serializer": [
-        "dist/types/serializer/index.d.ts"
-      ],
-      "deserializer": [
-        "dist/types/deserializer/index.d.ts"
-      ],
-      "converter": [
-        "dist/types/converter/index.d.ts"
-      ],
-      "utils": [
-        "dist/types/utils/index.d.ts"
-      ]
-    }
-  },
   "exports": {
     ".": {
       "types": "./dist/types/index.d.ts",
-      "import": "./dist/esm/index.mjs",
-      "require": "./dist/cjs/index.js"
+      "import": "./dist/index.js"
     },
     "./parser": {
       "types": "./dist/types/parser/index.d.ts",
-      "import": "./dist/esm/parser/index.mjs",
-      "require": "./dist/cjs/parser/index.js"
+      "import": "./dist/parser/index.js"
     },
     "./generator": {
       "types": "./dist/types/generator/index.d.ts",
-      "import": "./dist/esm/generator/index.mjs",
-      "require": "./dist/cjs/generator/index.js"
+      "import": "./dist/generator/index.js"
     },
     "./serializer": {
       "types": "./dist/types/serializer/index.d.ts",
-      "import": "./dist/esm/serializer/index.mjs",
-      "require": "./dist/cjs/serializer/index.js"
+      "import": "./dist/serializer/index.js"
     },
     "./deserializer": {
       "types": "./dist/types/deserializer/index.d.ts",
-      "import": "./dist/esm/deserializer/index.mjs",
-      "require": "./dist/cjs/deserializer/index.js"
+      "import": "./dist/deserializer/index.js"
     },
     "./converter": {
       "types": "./dist/types/converter/index.d.ts",
-      "import": "./dist/esm/converter/index.mjs",
-      "require": "./dist/cjs/converter/index.js"
+      "import": "./dist/converter/index.js"
     },
     "./utils": {
       "types": "./dist/types/utils/index.d.ts",
-      "import": "./dist/esm/utils/index.mjs",
-      "require": "./dist/cjs/utils/index.js"
+      "import": "./dist/utils/index.js"
     }
   },
   "files": [
@@ -104,15 +73,13 @@
     "clone-deep": "^4.0.1",
     "is-ip": "3.1.0",
     "json5": "^2.2.3",
-    "semver": "^7.5.3",
     "sprintf-js": "^1.1.3",
     "tldts": "^5.7.112",
     "xregexp": "^5.1.1",
     "zod": "3.21.4",
-    "@adguard/css-tokenizer": "^1.1.1"
+    "@adguard/css-tokenizer": "^1.2.0"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.3.0",
@@ -120,65 +87,52 @@
     "@rollup/plugin-typescript": "^12.1.1",
     "@swc/core": "^1.7.36",
     "@swc/helpers": "^0.5.13",
-    "@swc/jest": "^0.2.36",
-    "@types/benchmark": "^2.1.5",
     "@types/clone-deep": "^4.0.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/jest": "^29.5.12",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^20.2.3",
-    "@types/semver": "^7.5.0",
     "@types/sprintf-js": "^1.1.4",
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
-    "benchmark": "^2.1.4",
-    "consola": "^3.2.3",
-    "console-table-printer": "^2.12.0",
-    "date-fns": "^3.3.1",
+    "@vitest/coverage-v8": "2.1.6",
+    "@vitest/expect": "^3.0.5",
     "eslint": "^8.43.0",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^46.4.0",
     "fs-extra": "^11.2.0",
-    "glob": "^9.3.2",
     "javascript-stringify": "^2.1.0",
-    "jest": "^29.5.0",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.2",
-    "lodash": "4.17.21",
     "markdown-table": "^3.0.3",
     "markdownlint": "^0.29.0",
     "markdownlint-cli": "^0.35.0",
-    "node-fetch": "^3.3.2",
-    "object-sizeof": "^2.6.4",
-    "playwright": "^1.41.2",
     "prettier": "^3.3.2",
-    "regenerator-runtime": "^0.14.0",
     "rimraf": "^5.0.1",
-    "rollup": "^4.24.0",
+    "rollup": "^4.26.0",
     "rollup-plugin-node-externals": "^7.1.3",
-    "systeminformation": "^5.22.0",
     "ts-node": "^10.9.2",
-    "tsx": "^4.7.3",
+    "tsx": "^4.9.3",
     "type-fest": "^4.18.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.6.3",
+    "vitest": "^2.1.6"
   },
   "scripts": {
-    "build": "pnpm clean && pnpm build-txt && pnpm build-compatibility-tables-wiki && pnpm rollup --config rollup.config.ts --configPlugin typescript && pnpm build-types",
-    "build-rollup": "pnpm rimraf dist && pnpm rollup --config rollup.config.ts --configPlugin typescript --bundleConfigAsCjs",
+    "build": "pnpm clean && pnpm build-txt && pnpm build-compatibility-tables-wiki && pnpm build-rollup && pnpm build-types",
+    "build-rollup": "rollup --config rollup.config.ts --configPlugin typescript",
     "build-types": "tsc --project tsconfig.build.json",
     "build-txt": "tsx scripts/build-txt.ts",
     "build-compatibility-tables-wiki": "tsx scripts/build-compatibility-tables-wiki.ts",
-    "check-types": "tsc --noEmit",
+    "check-types": "tsc",
     "clean": "rimraf dist",
-    "coverage": "jest --runInBand --coverage",
+    "coverage": "vitest run --coverage",
     "increment": "pnpm version patch --no-git-tag-version",
     "lint": "pnpm check-types && pnpm lint:ts && pnpm lint:md",
     "lint:md": "markdownlint .",
     "lint:ts": "eslint . --cache --ext .ts",
     "precommit": "pnpm check-types && pnpm lint && pnpm test",
-    "test": "jest --runInBand",
-    "test:smoke": "(cd test/smoke/esm && pnpm test) && (cd test/smoke/cjs && pnpm test) && (cd test/smoke/typescript && pnpm test)"
+    "test": "vitest run",
+    "test:smoke": "(cd test/smoke/esm && pnpm test) && (cd test/smoke/exports && pnpm test)"
   }
 }

package/dist/cjs/ast-utils/clone.js

@@ -1,65 +0,0 @@
-/*
- * AGTree v3.0.0 (build date: Tue, 12 Nov 2024 14:05:06 GMT)
- * (c) 2024 Adguard Software Ltd.
- * Released under the MIT license
- * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
- */
-'use strict';
-
-var typeGuards = require('../utils/type-guards.js');
-
-/**
- * @file Custom clone functions for AST nodes, this is probably the most efficient way to clone AST nodes.
- * @todo Maybe move them to parser classes as 'clone' methods
- */
-/**
- * Clones a scriptlet rule node.
- *
- * @param node Node to clone
- * @returns Cloned node
- */
-function cloneScriptletRuleNode(node) {
-    return {
-        type: node.type,
-        children: node.children.map((child) => (typeGuards.isNull(child) ? null : { ...child })),
-    };
-}
-/**
- * Clones a domain list node.
- *
- * @param node Node to clone
- * @returns Cloned node
- */
-function cloneDomainListNode(node) {
-    return {
-        type: node.type,
-        separator: node.separator,
-        children: node.children.map((domain) => ({ ...domain })),
-    };
-}
-/**
- * Clones a modifier list node.
- *
- * @param node Node to clone
- * @returns Cloned node
- */
-function cloneModifierListNode(node) {
-    return {
-        type: node.type,
-        children: node.children.map((modifier) => {
-            const res = {
-                type: modifier.type,
-                exception: modifier.exception,
-                name: { ...modifier.name },
-            };
-            if (modifier.value) {
-                res.value = { ...modifier.value };
-            }
-            return res;
-        }),
-    };
-}
-
-exports.cloneDomainListNode = cloneDomainListNode;
-exports.cloneModifierListNode = cloneModifierListNode;
-exports.cloneScriptletRuleNode = cloneScriptletRuleNode;

package/dist/cjs/ast-utils/modifiers.js

@@ -1,56 +0,0 @@
-/*
- * AGTree v3.0.0 (build date: Tue, 12 Nov 2024 14:05:06 GMT)
- * (c) 2024 Adguard Software Ltd.
- * Released under the MIT license
- * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
- */
-'use strict';
-
-var typeGuards = require('../utils/type-guards.js');
-var clone = require('../utils/clone.js');
-
-/**
- * @file Utility functions for working with modifier nodes
- */
-/**
- * Creates a modifier node
- *
- * @param name Name of the modifier
- * @param value Value of the modifier
- * @param exception Whether the modifier is an exception
- * @returns Modifier node
- */
-function createModifierNode(name, value = undefined, exception = false) {
-    const result = {
-        type: 'Modifier',
-        exception,
-        name: {
-            type: 'Value',
-            value: name,
-        },
-    };
-    if (!typeGuards.isUndefined(value)) {
-        result.value = {
-            type: 'Value',
-            value,
-        };
-    }
-    return result;
-}
-/**
- * Creates a modifier list node
- *
- * @param modifiers Modifiers to put in the list (optional, defaults to an empty list)
- * @returns Modifier list node
- */
-function createModifierListNode(modifiers = []) {
-    const result = {
-        type: 'ModifierList',
-        // We need to clone the modifiers to avoid side effects
-        children: modifiers.length ? clone.clone(modifiers) : [],
-    };
-    return result;
-}
-
-exports.createModifierListNode = createModifierListNode;
-exports.createModifierNode = createModifierNode;

package/dist/cjs/ast-utils/network-rules.js

@@ -1,43 +0,0 @@
-/*
- * AGTree v3.0.0 (build date: Tue, 12 Nov 2024 14:05:06 GMT)
- * (c) 2024 Adguard Software Ltd.
- * Released under the MIT license
- * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
- */
-'use strict';
-
-var typeGuards = require('../utils/type-guards.js');
-var index = require('../nodes/index.js');
-var adblockers = require('../utils/adblockers.js');
-var clone = require('../utils/clone.js');
-
-/**
- * @file Utility functions for working with network rule nodes
- */
-/**
- * Creates a network rule node
- *
- * @param pattern Rule pattern
- * @param modifiers Rule modifiers (optional, default: undefined)
- * @param exception Exception rule flag (optional, default: false)
- * @param syntax Adblock syntax (optional, default: Common)
- * @returns Network rule node
- */
-function createNetworkRuleNode(pattern, modifiers = undefined, exception = false, syntax = adblockers.AdblockSyntax.Common) {
-    const result = {
-        category: index.RuleCategory.Network,
-        type: index.NetworkRuleType.NetworkRule,
-        syntax,
-        exception,
-        pattern: {
-            type: 'Value',
-            value: pattern,
-        },
-    };
-    if (!typeGuards.isUndefined(modifiers)) {
-        result.modifiers = clone.clone(modifiers);
-    }
-    return result;
-}
-
-exports.createNetworkRuleNode = createNetworkRuleNode;

package/dist/cjs/ast-utils/scriptlets.js

@@ -1,93 +0,0 @@
-/*
- * AGTree v3.0.0 (build date: Tue, 12 Nov 2024 14:05:06 GMT)
- * (c) 2024 Adguard Software Ltd.
- * Released under the MIT license
- * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
- */
-'use strict';
-
-var constants = require('../utils/constants.js');
-var quotes = require('../utils/quotes.js');
-var typeGuards = require('../utils/type-guards.js');
-
-/**
- * @file Utility functions for working with scriptlet nodes
- */
-/**
- * Get name of the scriptlet from the scriptlet node
- *
- * @param scriptletNode Scriptlet node to get name of
- * @returns Name of the scriptlet
- * @throws If the scriptlet is empty
- */
-function getScriptletName(scriptletNode) {
-    if (scriptletNode.children.length === 0) {
-        throw new Error('Empty scriptlet');
-    }
-    return scriptletNode.children[0]?.value ?? constants.EMPTY;
-}
-/**
- * Transform the nth argument of the scriptlet node
- *
- * @param scriptletNode Scriptlet node to transform argument of
- * @param index Index of the argument to transform (index 0 is the scriptlet name)
- * @param transform Function to transform the argument
- */
-function transformNthScriptletArgument(scriptletNode, index, transform) {
-    const child = scriptletNode.children[index];
-    if (!typeGuards.isUndefined(child)) {
-        const transformed = transform(child?.value ?? null);
-        if (typeGuards.isNull(transformed)) {
-            // eslint-disable-next-line no-param-reassign
-            scriptletNode.children[index] = null;
-            return;
-        }
-        if (typeGuards.isNull(child)) {
-            // eslint-disable-next-line no-param-reassign
-            scriptletNode.children[index] = {
-                type: 'Value',
-                value: transformed,
-            };
-            return;
-        }
-        child.value = transformed;
-    }
-}
-/**
- * Transform all arguments of the scriptlet node
- *
- * @param scriptletNode Scriptlet node to transform arguments of
- * @param transform Function to transform the arguments
- */
-function transformAllScriptletArguments(scriptletNode, transform) {
-    for (let i = 0; i < scriptletNode.children.length; i += 1) {
-        transformNthScriptletArgument(scriptletNode, i, transform);
-    }
-}
-/**
- * Set name of the scriptlet.
- * Modifies input `scriptletNode` if needed.
- *
- * @param scriptletNode Scriptlet node to set name of
- * @param name Name to set
- */
-function setScriptletName(scriptletNode, name) {
-    transformNthScriptletArgument(scriptletNode, 0, () => name);
-}
-/**
- * Set quote type of the scriptlet parameters
- *
- * @param scriptletNode Scriptlet node to set quote type of
- * @param quoteType Preferred quote type
- */
-function setScriptletQuoteType(scriptletNode, 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) => quotes.QuoteUtils.setStringQuoteType(value ?? constants.EMPTY, quoteType));
-}
-
-exports.getScriptletName = getScriptletName;
-exports.setScriptletName = setScriptletName;
-exports.setScriptletQuoteType = setScriptletQuoteType;
-exports.transformAllScriptletArguments = transformAllScriptletArguments;
-exports.transformNthScriptletArgument = transformNthScriptletArgument;

package/dist/cjs/common/abp-snippet-injection-body-common.js

@@ -1,18 +0,0 @@
-/*
- * AGTree v3.0.0 (build date: Tue, 12 Nov 2024 14:05:06 GMT)
- * (c) 2024 Adguard Software Ltd.
- * Released under the MIT license
- * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
- */
-'use strict';
-
-class AbpSnippetInjectionBodyCommon {
-    /**
-     * Error messages used by the parser and generator.
-     */
-    static ERROR_MESSAGES = {
-        EMPTY_SCRIPTLET_CALL: 'Empty ABP snippet call',
-    };
-}
-
-exports.AbpSnippetInjectionBodyCommon = AbpSnippetInjectionBodyCommon;

package/dist/cjs/common/agent-common.js

@@ -1,58 +0,0 @@
-/*
- * AGTree v3.0.0 (build date: Tue, 12 Nov 2024 14:05:06 GMT)
- * (c) 2024 Adguard Software Ltd.
- * Released under the MIT license
- * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
- */
-'use strict';
-
-var adblockers = require('../utils/adblockers.js');
-
-/**
- * Possible AdGuard agent markers.
- */
-const ADG_NAME_MARKERS = new Set([
-    'adguard',
-    'adg',
-]);
-/**
- * Possible uBlock Origin agent markers.
- */
-const UBO_NAME_MARKERS = new Set([
-    'ublock',
-    'ublock origin',
-    'ubo',
-]);
-/**
- * Possible Adblock Plus agent markers.
- */
-const ABP_NAME_MARKERS = new Set([
-    'adblock',
-    'adblock plus',
-    'adblockplus',
-    'abp',
-]);
-/**
- * Returns the adblock syntax based on the adblock name parsed from the agent type comment.
- * Needed for modifiers validation of network rules by AGLint.
- *
- * @param name Adblock name.
- *
- * @returns Adblock syntax.
- */
-const getAdblockSyntax = (name) => {
-    let syntax = adblockers.AdblockSyntax.Common;
-    const lowerCaseName = name.toLowerCase();
-    if (ADG_NAME_MARKERS.has(lowerCaseName)) {
-        syntax = adblockers.AdblockSyntax.Adg;
-    }
-    else if (UBO_NAME_MARKERS.has(lowerCaseName)) {
-        syntax = adblockers.AdblockSyntax.Ubo;
-    }
-    else if (ABP_NAME_MARKERS.has(lowerCaseName)) {
-        syntax = adblockers.AdblockSyntax.Abp;
-    }
-    return syntax;
-};
-
-exports.getAdblockSyntax = getAdblockSyntax;

package/dist/cjs/common/ubo-selector-common.js

@@ -1,18 +0,0 @@
-/*
- * AGTree v3.0.0 (build date: Tue, 12 Nov 2024 14:05:06 GMT)
- * (c) 2024 Adguard Software Ltd.
- * Released under the MIT license
- * https://github.com/AdguardTeam/tsurlfilter/tree/master/packages/agtree#readme
- */
-'use strict';
-
-/**
- * Known uBO-specific pseudo-class names.
- */
-exports.UboPseudoName = void 0;
-(function (UboPseudoName) {
-    UboPseudoName["MatchesMedia"] = "matches-media";
-    UboPseudoName["MatchesPath"] = "matches-path";
-    UboPseudoName["Remove"] = "remove";
-    UboPseudoName["Style"] = "style";
-})(exports.UboPseudoName || (exports.UboPseudoName = {}));