fix ubo-adg conversion of remove param

AdguardTeam · Feb 21, 2024 · 20dbb9d · 20dbb9d
1 parent b273341
commit 20dbb9d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,12 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 - Validation of scriptlet rules with no name and args for multiple scriptlet exception rules [#377]
 
+### Fixed
+
+- UBO→ADG conversion of `$remove$` scriptlet param [#404]
+
 [Unreleased]: https://github.com/AdguardTeam/Scriptlets/compare/v1.10.1...HEAD
+[#404]: https://github.com/AdguardTeam/Scriptlets/issues/404
 [#377]: https://github.com/AdguardTeam/Scriptlets/issues/377
 
 ## [v1.10.1] - 2024-02-12

diff --git a/src/helpers/converter.ts b/src/helpers/converter.ts
@@ -258,6 +258,10 @@ export const convertUboScriptletToAdg = (rule: string): string[] => {
             if (arg === '$') {
                 outputArg = '$$';
             }
+            // https://github.com/AdguardTeam/Scriptlets/issues/404
+            if (arg === '$remove$') {
+                outputArg = '$$remove$$';
+            }
             return outputArg;
         })
         .map((arg) => wrapInSingleQuotes(arg))

diff --git a/tests/api/index.spec.js b/tests/api/index.spec.js
@@ -220,6 +220,11 @@ describe('Test scriptlet api methods', () => {
                 // eslint-disable-next-line max-len
                 expected: "example.com#%#//scriptlet('ubo-spoof-css.js', '.adsbygoogle, #ads, .adTest', 'visibility', 'visible')",
             },
+            // https://github.com/AdguardTeam/Scriptlets/issues/404
+            {
+                actual: 'example.com##+js(set-local-storage-item, mode, $remove$)',
+                expected: "example.com#%#//scriptlet('ubo-set-local-storage-item.js', 'mode', '$remove$')",
+            },
         ];
         test.each(validTestCases)('$actual', ({ actual, expected }) => {
             expect(convertScriptletToAdg(actual)[0]).toStrictEqual(expected);
@@ -351,6 +356,11 @@ describe('Test scriptlet api methods', () => {
                     actual: "example.com#%#//scriptlet('set-cookie-reload', 'consent', 'true')",
                     expected: 'example.com##+js(set-cookie-reload, consent, true)',
                 },
+                // https://github.com/AdguardTeam/Scriptlets/issues/404
+                {
+                    actual: "example.com#%#//scriptlet('set-local-storage-item', 'mode', '$remove$')",
+                    expected: 'example.com##+js(set-local-storage-item, mode, $remove$)',
+                },
             ];
             test.each(testCases)('$actual', ({ actual, expected }) => {
                 expect(convertAdgScriptletToUbo(actual)).toStrictEqual(expected);