Merge pull request #388 from brave/next

Release v0.9.0

Author: antonok-edm

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "adblock"
-version = "0.8.12"
+version = "0.9.0"
 authors = ["Anton Lazarev <[email protected]>", "Andrius Aucinas"]
 edition = "2021"
 
@@ -39,14 +39,13 @@ rmp-serde = "0.15"
 lifeguard = { version = "^ 0.6.1", optional = true }
 cssparser = { version = "0.28", optional = true }
 selectors = { version = "0.23", optional = true }
-serde_json = { version = "1.0", optional = true }
+serde_json = "1.0"
 thiserror = "1.0"
 
 [dev-dependencies]
 criterion = "0.5"
 csv = "1"
 mock_instant = { version = "0.5" }
-serde_json = "1.0"
 # By default, reqwest builds openssl from source, which fails on missing/incompatible system dependencies
 reqwest = { version = "0.11", features = ["rustls-tls"], default-features = false }
 futures = "0.3"
@@ -91,6 +90,6 @@ object-pooling = ["lifeguard"] # disables `Send` and `Sync` on `Engine`.
 unsync-regex-caching = [] # disables `Send` and `Sync` on `Engine`.
 regex-debug-info = []
 css-validation = ["cssparser", "selectors"]
-content-blocking = ["serde_json"]
+content-blocking = []
 embedded-domain-resolver = ["addr"] # Requires setting an external domain resolver if disabled.
-resource-assembler = ["serde_json"]
+resource-assembler = []

Cargo.toml

@@ -29,7 +29,7 @@ It may be a good fit for yours, too!
 
 See [docs.rs](https://docs.rs/adblock) for detailed API documentation.
 
-Also check the [Rust example](./examples/example.rs) or the [NodeJS example](./js/example.js).
+Also check the [Rust example](./examples/example.rs) or the [NodeJS example](./js/example.mjs).
 
 ### Optional features
 

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "adblock-rs"
-version = "0.8.12"
+version = "0.9.0"
 authors = ["Anton Lazarev <[email protected]>", "Andrius Aucinas"]
 edition = "2018"
 license = "MPL-2.0"

fuzz/Cargo.lock

@@ -1,5 +1,5 @@
-const adblockRust = require('adblock-rs');
-const fs = require('fs');
+import adblockRust from 'adblock-rs';
+import fs from 'node:fs';
 const dataPath = '../data/'
 
 const debugInfo = true;

js/Cargo.lock

@@ -1,6 +1,6 @@
 {
   "name": "adblock-rs",
-  "version": "0.8.12",
+  "version": "0.9.0",
   "description": "Very fast, Rust-based, native implementation of ad-blocker engine for Node",
   "keywords": [
     "adblock",

js/Cargo.toml

@@ -204,6 +204,8 @@ pub enum CbRuleCreationFailure {
     RuleContainsNonASCII,
     /// `from` as a `domain` alias is not currently supported in content blocking syntax.
     FromNotSupported,
+    /// Content blocking rules cannot support procedural cosmetic filter operators.
+    ProceduralCosmeticFiltersUnsupported,
 }
 
 impl TryFrom<ParsedFilter> for CbRuleEquivalent {
@@ -567,7 +569,7 @@ impl TryFrom<CosmeticFilter> for CbRule {
             return Err(CbRuleCreationFailure::ScriptletInjectionsNotSupported);
         }
 
-        if let Some(raw_line) = v.raw_line {
+        if let Some(raw_line) = &v.raw_line {
             let mut hostnames_vec = vec![];
             let mut not_hostnames_vec = vec![];
 
@@ -609,10 +611,16 @@ impl TryFrom<CosmeticFilter> for CbRule {
                 (not_hostnames_vec, hostnames_vec)
             };
 
+            let selector = if let Some(selector) = v.plain_css_selector() {
+                selector.to_string()
+            } else {
+                return Err(CbRuleCreationFailure::ProceduralCosmeticFiltersUnsupported);
+            };
+
             let rule = Self {
                 action: CbAction {
                     typ: CbType::CssDisplayNone,
-                    selector: Some(v.selector),
+                    selector: Some(selector),
                 },
                 trigger: CbTrigger {
                     url_filter: ".*".to_string(),