fop-cli 3.9.4 → 3.9.6

package/README.md

@@ -6,15 +6,36 @@ A Rust port of the EasyList FOP tool for sorting and cleaning ad-blocking filter
 
 - **Filter sorting**: Alphabetically sorts blocking rules and element hiding rules
 - **Domain combining**: Merges rules with identical selectors/patterns but different domains
-- **Option normalization**: Converts uBO-specific options to standard ABP format
+- **Option normalization**: Converts uBO-specific options to standard ABP format (can be disabled)
 - **Wildcard cleanup**: Removes unnecessary wildcards from filters
 - **Validation**: Removes invalid/overly-broad rules (TLD-only, too short, etc.)
-- **Git/Hg integration**: Commit changes directly to repositories (can be disabled)
+- **Git integration**: Commit changes directly to repositories (can be disabled)
 - **easylist_adservers.txt validation**: Ensures rules start with `|` or `/`
+- **Parallel processing**: Uses all CPU cores for faster processing via Rayon
+
+## Extended Syntax Support
+
+FOP preserves extended filter syntax from various adblockers:
+
+### uBlock Origin
+- Scriptlet injection: `##+js(...)`, `##^script:has-text(...)`
+- Procedural cosmetics: `:has-text()`, `:has()`, `:upward()`, `:remove()`, `:style()`, `:matches-css()`, `:xpath()`, `:remove-attr()`, `:remove-class()`, `:watch-attr()`, `:min-text-length()`, `:others()`
+- Network options: `redirect=`, `redirect-rule=`, `removeparam=`, `denyallow=`, `replace=`, `header=`, `permissions=`, `to=`, `from=`, `method=`
+- Regex domain rules: `/regex/##+js(...)`
+
+### AdGuard
+- Scriptlet injection: `#%#//scriptlet(...)`
+- CSS injection: `#$#body { ... }`
+- Exceptions: `#@%#`, `#@$#`
+
+### Adblock Plus
+- Extended selectors: `:-abp-has()`, `:-abp-contains()`, `:-abp-properties()`
+- Action syntax: `{remove: true;}`, `{height:...}`, `{display:...}`
+- Snippets: `#$#hide-if-contains`, `#$#simulate-mouse-event`
 
 ## Requirements
 
-- Rust 1.75+ (install from https://rustup.rs)
+- Rust 1.80+ (install from https://rustup.rs)
 
 ## Building
 
@@ -31,6 +52,14 @@ cargo build --release
 
 ## Installation
 
+### From npm (recommended)
+
+```bash
+npm install -g fop-cli
+```
+
+### From source
+
 ```bash
 # Install to /usr/local/bin (may need sudo)
 make install
@@ -55,6 +84,9 @@ fop /path/to/easylist
 fop --no-commit /path/to/easylist
 fop -n .
 
+# Sort without converting uBO options to ABP format
+fop --no-ubo-convert /path/to/ublock-filters
+
 # Sort multiple directories
 fop -n ~/easylist ~/easyprivacy ~/fanboy-addon
 ```
@@ -63,8 +95,10 @@ fop -n ~/easylist ~/easyprivacy ~/fanboy-addon
 
 | Option | Description |
 |--------|-------------|
-| `-n, --no-commit` | Just sort files, skip Git/Hg commit prompts |
+| `-n, --no-commit` | Just sort files, skip Git commit prompts |
 | `--just-sort` | Alias for `--no-commit` |
+| `--no-ubo-convert` | Skip uBO to ABP option conversion (keep `xhr`, `3p`, `1p`, etc.) |
+| `--no-msg-check` | Skip commit message format validation (M:/A:/P:) |
 | `-h, --help` | Show help message |
 | `-V, --version` | Show version number |
 
@@ -98,6 +132,14 @@ This Rust version is a drop-in replacement for both `FOP.py` and `FOP-nocommit.p
 | `python3 FOP.py` | `fop` |
 | `python3 FOP-nocommit.py` | `fop --no-commit` or `fop -n` |
 
+## Performance
+
+The Rust version is significantly faster than Python FOP due to:
+- Compiled native code
+- Parallel file processing with Rayon
+- Optimized regex handling
+- Efficient memory management
+
 ## License
 
 GPL-3.0 (same as original Python FOP)
@@ -105,4 +147,4 @@ GPL-3.0 (same as original Python FOP)
 ## Credits
 
 - Original Python FOP by Michael (EasyList project)
-- Rust port maintains feature parity with Python version 3.9
+- Rust port maintains feature parity with Python version 3.9

package/install.js

@@ -7,16 +7,16 @@ const path = require('path');
 const { execSync } = require('child_process');
 
 // Configuration - UPDATE THESE FOR YOUR RELEASE
-const VERSION = '3.9.4';
+const VERSION = '3.9.6';
 const GITHUB_REPO = 'ryanbr/fop-rs'; // Change to your repo
 const BINARY_NAME = 'fop';
 
 // Platform mapping
 const PLATFORMS = {
-  'darwin-x64': 'fop-macos-x86_64',
-  'darwin-arm64': 'fop-macos-arm64',
-  'linux-x64': 'fop-linux-x86_64',
-  'linux-arm64': 'fop-linux-arm64',
+  'darwin-x64': `-macos-x86_64`,
+  'darwin-arm64': `-macos-arm64`,
+  'linux-x64': `-linux-x86_64`,
+  'linux-arm64': `-linux-arm64`,
 };
 
 function getPlatformBinary() {
@@ -24,14 +24,14 @@ function getPlatformBinary() {
   const arch = process.arch;
   const key = `${platform}-${arch}`;
   
-  const binary = PLATFORMS[key];
-  if (!binary) {
+  const suffix = PLATFORMS[key];
+  if (!suffix) {
     console.error(`Unsupported platform: ${platform}-${arch}`);
     console.error('Supported platforms:', Object.keys(PLATFORMS).join(', '));
     process.exit(1);
   }
   
-  return binary;
+  return `fop-${VERSION}${suffix}`;
 }
 
 function getDownloadUrl(binaryName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fop-cli",
-  "version": "3.9.4",
+  "version": "3.9.6",
   "description": "Filter Orderer and Preener - A tool for sorting and cleaning ad-blocking filter lists",
   "keywords": [
     "adblock",