Pull request #83: AG-17273 Consider :has() as a standard pseudo-class if ExtendedCss usage is not forced by #?# rule marker

Merge in ADGUARD-IOS/safari-converter from feature/AG-17273 to master

* commit 'aa8b1a334d6ede45c7bc1adbc305bd5adf9b5d2b':
  fixed SafariService
  added test to CosmeticRuleTests
  fixed performance test
  check safari version to handle pseudo-class :has()
  fixed testPerformanceSingleRun and testPerformance
  fixed testCompileExtendedCssRule
  handle rules with ## marker and :has() as simple rules

Author: Oleg Labudko

Sources/ContentBlockerConverter/Compiler/BlockerEntryFactory.swift

@@ -282,7 +282,7 @@ class BlockerEntryFactory {
         var rawAdded = false
         if rule.hasContentType(contentType: NetworkRule.ContentType.XMLHTTPREQUEST) {
             // `fetch` resource type is supported since Safari 15
-            if SafariService.current.version.isSafari15() {
+            if SafariService.current.version.isSafari15orGreater() {
                 types.append("fetch")
             } else if !rawAdded {
                 rawAdded = true
@@ -292,7 +292,7 @@ class BlockerEntryFactory {
 
         if rule.hasContentType(contentType: NetworkRule.ContentType.OTHER) {
             // `other` resource type is supported since Safari 15
-            if SafariService.current.version.isSafari15() {
+            if SafariService.current.version.isSafari15orGreater() {
                 types.append("other")
             } else if !rawAdded {
                 rawAdded = true
@@ -302,7 +302,7 @@ class BlockerEntryFactory {
 
         if rule.hasContentType(contentType: NetworkRule.ContentType.WEBSOCKET) {
             // `websocket` resource type is supported since Safari 15
-            if SafariService.current.version.isSafari15() {
+            if SafariService.current.version.isSafari15orGreater() {
                 types.append("websocket")
             } else if !rawAdded {
                 rawAdded = true
@@ -326,7 +326,7 @@ class BlockerEntryFactory {
             types.append("document")
         }
         if !documentAdded && rule.hasContentType(contentType: NetworkRule.ContentType.SUBDOCUMENT) {
-            if !SafariService.current.version.isSafari15() {
+            if !SafariService.current.version.isSafari15orGreater() {
                 documentAdded = true
                 types.append("document")
             }
@@ -358,7 +358,7 @@ class BlockerEntryFactory {
     private func addLoadContext(rule: NetworkRule, trigger: inout BlockerEntry.Trigger) -> Void {
         var context = [String]();
         // `child-frame` and `top-frame` contexts are supported since Safari 15
-        if SafariService.current.version.isSafari15() {
+        if SafariService.current.version.isSafari15orGreater() {
             if rule.hasContentType(contentType: NetworkRule.ContentType.SUBDOCUMENT)
                 && !rule.isContentType(contentType:NetworkRule.ContentType.ALL) {
                 context.append("child-frame");

Sources/ContentBlockerConverter/Rules/CosmeticRule.swift

@@ -4,12 +4,13 @@ import Foundation
  * Cosmetic rule class
  */
 class CosmeticRule: Rule {
+    private static let EXT_CSS_PSEUDO_INDICATOR_HAS = ":has("
     /**
      * Pseudo class indicators. They are used to detect if rule is extended or not even if rule does not
      * have extended css marker
      */
     private static let EXT_CSS_PSEUDO_INDICATORS = [
-        ":has(",
+        CosmeticRule.EXT_CSS_PSEUDO_INDICATOR_HAS,
         ":has-text(",
         ":contains(",
         ":matches-css",
@@ -122,6 +123,12 @@ class CosmeticRule: Rule {
             } else if c == ":".utf16.first! {
                 for indicator in CosmeticRule.EXT_CSS_PSEUDO_INDICATORS {
                     if nsContent.substring(from: i).starts(with: indicator) {
+                        // the rule with `##` marker and `:has()` pseudo-class should not be considered as ExtendedCss,
+                        // because `:has()` pseudo-class has native implementation since Safari 16 (15.4)
+                        // https://github.com/AdguardTeam/SafariConverterLib/issues/43
+                        if indicator == EXT_CSS_PSEUDO_INDICATOR_HAS && SafariService.current.version.isSafari16orGreater()  {
+                            continue
+                        }
                         return true
                     }
                 }

Sources/ContentBlockerConverter/SafariService.swift

@@ -11,20 +11,23 @@ public enum SafariVersion: Int {
     case safari13 = 13;
     case safari14 = 14;
     case safari15 = 15;
+    case safari16 = 16;
 
     /**
      * Returns rules limit for current Safari version
      * Safari allows up to 50k rules by default, but starting from 15 version it allows up to 150k rules
      */
     var rulesLimit: Int {
-        switch self {
-            case .safari11, .safari12, .safari13, .safari14: return 50000
-            case .safari15: return 150000
-        }
+        self.rawValue >= SafariVersion.safari15.rawValue ? 150000 : 50000
+    }
+    
+    func isSafari15orGreater() -> Bool {
+        return self.rawValue >= SafariVersion.safari15.rawValue;
+        
     }
 
-    func isSafari15() -> Bool {
-        return self == SafariVersion.safari15;
+    func isSafari16orGreater() -> Bool {
+        return self.rawValue >= SafariVersion.safari16.rawValue;
     }
 }
 

Tests/ContentBlockerConverterTests/AdvancedBlockingTests.swift

@@ -317,7 +317,7 @@ final class AdvancedBlockingTests: XCTestCase {
             errorsCounter: ErrorsCounter()
         );
 
-        let rule = try! CosmeticRule(ruleText: "test.com##.content:has(> .test_selector)");
+        let rule = try! CosmeticRule(ruleText: "test.com#?#.content:has(> .test_selector)");
         let result = compiler.compileRules(rules: [rule as Rule]);
 
         XCTAssertNotNil(result)

Tests/ContentBlockerConverterTests/ContentBlockerConverterTests.swift

@@ -2263,6 +2263,48 @@ final class ContentBlockerConverterTests: XCTestCase {
         XCTAssertEqual(decoded[0].trigger.loadType, ["third-party"]);
         XCTAssertEqual(decoded[0].action.type, "ignore-previous-rules");
     }
+    
+    func testConvertRulesWithPseudoClassHas() {
+        let rules = [
+            "test.com##div:has(.banner)",
+            "example.org#?#div:has(.adv)",
+        ]
+
+        var result = converter.convertArray(rules: rules, safariVersion: .safari15 ,advancedBlocking: true)
+        XCTAssertEqual(result.convertedCount, 0)
+        XCTAssertEqual(result.advancedBlockingConvertedCount, 2)
+        XCTAssertEqual(result.totalConvertedCount, 2)
+        XCTAssertEqual(result.errorsCount, 0)
+        
+        let decoded = try! parseJsonString(json: result.advancedBlocking!);
+        XCTAssertEqual(decoded.count, 2);
+
+        XCTAssertEqual(decoded[0].trigger.ifDomain, ["*test.com"]);
+        XCTAssertEqual(decoded[0].action.type, "css-extended");
+        XCTAssertEqual(decoded[0].action.css, "div:has(.banner)");
+
+        XCTAssertEqual(decoded[1].trigger.ifDomain, ["*example.org"]);
+        XCTAssertEqual(decoded[1].action.type, "css-extended");
+        XCTAssertEqual(decoded[1].action.css, "div:has(.adv)");
+        
+        result = converter.convertArray(rules: rules, safariVersion: .safari16 ,advancedBlocking: true)
+        XCTAssertEqual(result.convertedCount, 1)
+        XCTAssertEqual(result.advancedBlockingConvertedCount, 1)
+        XCTAssertEqual(result.totalConvertedCount, 2)
+        XCTAssertEqual(result.errorsCount, 0)
+        
+        let decodedSimpleRules = try! parseJsonString(json: result.converted);
+        XCTAssertEqual(decodedSimpleRules.count, 1);
+        XCTAssertEqual(decodedSimpleRules[0].trigger.ifDomain, ["*test.com"]);
+        XCTAssertEqual(decodedSimpleRules[0].action.type, "css-display-none");
+        XCTAssertEqual(decodedSimpleRules[0].action.selector, "div:has(.banner)");
+        
+        let decodedAdvancedRules = try! parseJsonString(json: result.advancedBlocking!);
+        XCTAssertEqual(decodedAdvancedRules.count, 1);
+        XCTAssertEqual(decodedAdvancedRules[0].trigger.ifDomain, ["*example.org"]);
+        XCTAssertEqual(decodedAdvancedRules[0].action.type, "css-extended");
+        XCTAssertEqual(decodedAdvancedRules[0].action.css, "div:has(.adv)");
+    }
 
     static var allTests = [
         ("testEmpty", testEmpty),
@@ -2322,5 +2364,6 @@ final class ContentBlockerConverterTests: XCTestCase {
         ("testUnicodeRules", testUnicodeRules),
         ("testAdvancedCosmeticRulesWithDomainModifier", testAdvancedCosmeticRulesWithDomainModifier),
         ("testBlockingRulesWithNonAsciiCharacters", testBlockingRulesWithNonAsciiCharacters),
+        ("testConvertRulesWithPseudoClassHas", testConvertRulesWithPseudoClassHas),
     ]
 }

Tests/ContentBlockerConverterTests/Rules/CosmeticRuleTests.swift

@@ -333,6 +333,24 @@ final class CosmeticRuleTests: XCTestCase {
         XCTAssertEqual(result.content, "//scriptlet(\"abort-on-property-read\", \"alert\")");
     }
 
+    func testRulesWithPseudoClassHas() {
+        SafariService.current.version = SafariVersion.safari15;
+
+        var result = try! CosmeticRule(ruleText: "##.banner:has(.ads)");
+        XCTAssertEqual(result.isExtendedCss, true);
+
+        result = try! CosmeticRule(ruleText: "#?#.banner:has(.ads)");
+        XCTAssertEqual(result.isExtendedCss, true);
+
+        SafariService.current.version = SafariVersion.safari16;
+
+        result = try! CosmeticRule(ruleText: "##.banner:has(.ads)");
+        XCTAssertEqual(result.isExtendedCss, false);
+
+        result = try! CosmeticRule(ruleText: "#?#.banner:has(.ads)");
+        XCTAssertEqual(result.isExtendedCss, true);
+    }
+    
     static var allTests = [
         ("testElemhidingRules", testElemhidingRules),
         ("testElemhidingRulesWhitelist", testElemhidingRulesWhitelist),
@@ -345,6 +363,7 @@ final class CosmeticRuleTests: XCTestCase {
         ("testScriptletRulesWhitelist", testScriptletRulesWhitelist),
         ("testDomains", testDomains),
         ("testGenericWildcardRules", testGenericWildcardRules),
+        ("testRulesWithPseudoClassHas", testRulesWithPseudoClassHas),
     ]
 }