@url-sanitize/cli 1.0.0 → 2.0.0

package/README.md

@@ -1,6 +1,9 @@
 # @url-sanitize/cli
 
-Command-line tool for removing tracking parameters and unwrapping tracking redirects from URLs.
+Command-line tool for removing tracking parameters and unwrapping tracking redirects from URLs with the merged multi-source catalog.
+
+The default catalog combines ClearURLs, AdGuard URL Tracking Protection, Brave
+Debouncer, and Firefox Query Stripping rules.
 
 ## Install
 

package/dist/bin.js

@@ -3,8 +3,8 @@
 // src/bin.ts
 import { readFileSync } from "fs";
 import { createRequire } from "module";
-import { clearurlsCatalog, clearurlsMetadata } from "@url-sanitize/clearurls";
 import { compileSanitizer } from "@url-sanitize/core";
+import { mergedCatalog, mergedMetadata } from "@url-sanitize/merged";
 var args = process.argv.slice(2);
 runTypeScriptCli(args);
 function runTypeScriptCli(rawArgs) {
@@ -14,7 +14,7 @@ function runTypeScriptCli(rawArgs) {
   }
   if (rawArgs.includes("--version")) {
     process.stdout.write(
-      `url-sanitize ${packageVersion()} (catalog ${clearurlsMetadata.hash} ${clearurlsMetadata.fetchedAt})
+      `url-sanitize ${packageVersion()} (catalog ${catalogHash()} ${mergedMetadata.generatedAt})
 `
     );
     process.exit(0);
@@ -26,7 +26,7 @@ function runTypeScriptCli(rawArgs) {
     process.stderr.write("run `url-sanitize --help` for usage\n");
     process.exit(1);
   }
-  const sanitize = compileSanitizer(clearurlsCatalog, parsed.options);
+  const sanitize = compileSanitizer(mergedCatalog, parsed.options);
   let anyBlocked = false;
   for (const url of parsed.urls) {
     anyBlocked = emit(sanitize(url), parsed.json, parsed.explain) || anyBlocked;
@@ -148,12 +148,16 @@ function packageVersion() {
   const pkg = require2("../package.json");
   return pkg.version ?? "0.0.0";
 }
+function catalogHash() {
+  const hashes = mergedCatalog.sources.map((source) => source.hash).filter(Boolean).join(":");
+  return hashes || mergedCatalog.version;
+}
 function printHelp(stream) {
   stream.write(
     [
-      `url-sanitize ${packageVersion()} (catalog ${clearurlsMetadata.hash} ${clearurlsMetadata.fetchedAt})`,
+      `url-sanitize ${packageVersion()} (catalog ${catalogHash()} ${mergedMetadata.generatedAt})`,
       "",
-      "Strip tracking parameters from URLs.",
+      "Strip tracking parameters from URLs with the merged multi-source catalog.",
       "",
       "USAGE:",
       "    url-sanitize [OPTIONS] [URL]...",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@url-sanitize/cli",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Command-line tool to remove tracking parameters and unwrap tracking redirects from URLs.",
   "license": "MIT",
   "type": "module",
@@ -11,8 +11,8 @@
     "dist"
   ],
   "dependencies": {
-    "@url-sanitize/clearurls": "1.0.0",
-    "@url-sanitize/core": "1.0.0"
+    "@url-sanitize/core": "2.0.0",
+    "@url-sanitize/merged": "2.0.0"
   },
   "keywords": [
     "cli",