feedcanon 1.3.0 → 1.4.0

package/README.md

@@ -54,7 +54,7 @@ Feedcanon is designed to be flexible. Every major component can be replaced or e
 - **Custom fetch** — use your own HTTP client (Axios, Got, Ky, etc.)
 - **Custom parser** — bring your own parser (Feedsmith by default).
 - **Custom tiers** — define your own URL normalization tiers.
-- **Custom platforms** — add handlers to normalize domain aliases (like FeedBurner).
+- **Custom rewrites** — add rewrites to normalize domain aliases (like FeedBurner).
 
 ## Quick Start
 

package/dist/defaults.cjs

@@ -1,6 +1,6 @@
-const require_utils = require('./utils.cjs');
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_utils = require("./utils.cjs");
 let feedsmith = require("feedsmith");
-
 //#region src/defaults.ts
 const defaultStrippedParams = [
 	"utm_source",
@@ -168,6 +168,7 @@ const defaultNormalizeOptions = {
 	stripQueryParams: defaultStrippedParams,
 	stripQuery: false,
 	stripEmptyQuery: true,
+	lowercaseQuery: false,
 	normalizeEncoding: true,
 	normalizeUnicode: true,
 	convertToPunycode: true
@@ -289,10 +290,9 @@ const defaultTiers = [
 		convertToPunycode: true
 	}
 ];
-
 //#endregion
 exports.defaultFetch = defaultFetch;
 exports.defaultNormalizeOptions = defaultNormalizeOptions;
 exports.defaultParser = defaultParser;
 exports.defaultStrippedParams = defaultStrippedParams;
-exports.defaultTiers = defaultTiers;
+exports.defaultTiers = defaultTiers;

package/dist/defaults.js

@@ -1,6 +1,5 @@
 import { createSignature, neutralizeUrls } from "./utils.js";
 import { parseFeed } from "feedsmith";
-
 //#region src/defaults.ts
 const defaultStrippedParams = [
 	"utm_source",
@@ -168,6 +167,7 @@ const defaultNormalizeOptions = {
 	stripQueryParams: defaultStrippedParams,
 	stripQuery: false,
 	stripEmptyQuery: true,
+	lowercaseQuery: false,
 	normalizeEncoding: true,
 	normalizeUnicode: true,
 	convertToPunycode: true
@@ -289,6 +289,5 @@ const defaultTiers = [
 		convertToPunycode: true
 	}
 ];
-
 //#endregion
-export { defaultFetch, defaultNormalizeOptions, defaultParser, defaultStrippedParams, defaultTiers };
+export { defaultFetch, defaultNormalizeOptions, defaultParser, defaultStrippedParams, defaultTiers };

package/dist/exports.cjs

@@ -1,10 +1,10 @@
-const require_utils = require('./utils.cjs');
-const require_defaults = require('./defaults.cjs');
-const require_index = require('./index.cjs');
-const require_wordpress = require('./probes/wordpress.cjs');
-const require_blogger = require('./rewrites/blogger.cjs');
-const require_feedburner = require('./rewrites/feedburner.cjs');
-
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_utils = require("./utils.cjs");
+const require_defaults = require("./defaults.cjs");
+const require_index = require("./index.cjs");
+const require_wordpress = require("./probes/wordpress.cjs");
+const require_blogger = require("./rewrites/blogger.cjs");
+const require_feedburner = require("./rewrites/feedburner.cjs");
 exports.addMissingProtocol = require_utils.addMissingProtocol;
 exports.bloggerRewrite = require_blogger.bloggerRewrite;
 exports.defaultFetch = require_defaults.defaultFetch;
@@ -17,4 +17,4 @@ exports.fixMalformedProtocol = require_utils.fixMalformedProtocol;
 exports.normalizeUrl = require_utils.normalizeUrl;
 exports.resolveFeedProtocol = require_utils.resolveFeedProtocol;
 exports.resolveUrl = require_utils.resolveUrl;
-exports.wordpressProbe = require_wordpress.wordpressProbe;
+exports.wordpressProbe = require_wordpress.wordpressProbe;

package/dist/exports.js

@@ -4,5 +4,4 @@ import { findCanonical } from "./index.js";
 import { wordpressProbe } from "./probes/wordpress.js";
 import { bloggerRewrite } from "./rewrites/blogger.js";
 import { feedburnerRewrite } from "./rewrites/feedburner.js";
-
-export { addMissingProtocol, bloggerRewrite, defaultFetch, defaultParser, defaultStrippedParams, defaultTiers, feedburnerRewrite, findCanonical, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, wordpressProbe };
+export { addMissingProtocol, bloggerRewrite, defaultFetch, defaultParser, defaultStrippedParams, defaultTiers, feedburnerRewrite, findCanonical, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, wordpressProbe };

package/dist/index.cjs

@@ -1,6 +1,5 @@
-const require_utils = require('./utils.cjs');
-const require_defaults = require('./defaults.cjs');
-
+const require_utils = require("./utils.cjs");
+const require_defaults = require("./defaults.cjs");
 //#region src/index.ts
 async function findCanonical(inputUrl, options) {
 	const { parser = require_defaults.defaultParser, fetchFn = require_defaults.defaultFetch, existsFn, tiers = require_defaults.defaultTiers, rewrites, probes, stripQueryParams = require_defaults.defaultStrippedParams, onFetch, onMatch, onExists } = options ?? {};
@@ -150,6 +149,5 @@ async function findCanonical(inputUrl, options) {
 	}
 	return winningUrl;
 }
-
 //#endregion
-exports.findCanonical = findCanonical;
+exports.findCanonical = findCanonical;

package/dist/index.js

@@ -1,6 +1,5 @@
 import { applyProbes, applyRewrites, normalizeUrl, resolveUrl } from "./utils.js";
 import { defaultFetch, defaultParser, defaultStrippedParams, defaultTiers } from "./defaults.js";
-
 //#region src/index.ts
 async function findCanonical(inputUrl, options) {
 	const { parser = defaultParser, fetchFn = defaultFetch, existsFn, tiers = defaultTiers, rewrites, probes, stripQueryParams = defaultStrippedParams, onFetch, onMatch, onExists } = options ?? {};
@@ -150,6 +149,5 @@ async function findCanonical(inputUrl, options) {
 	}
 	return winningUrl;
 }
-
 //#endregion
-export { findCanonical };
+export { findCanonical };

package/dist/probes/wordpress.cjs

@@ -1,4 +1,3 @@
-
 //#region src/probes/wordpress.ts
 const feedTypes = [
 	"atom",
@@ -24,10 +23,10 @@ const wordpressProbe = {
 			withoutSlash.pathname = url.pathname.replace(/\/$/, "");
 			withoutSlash.searchParams.delete("feed");
 			candidates.push(withoutSlash.href);
-			const withSlash$1 = new URL(url);
-			withSlash$1.pathname = url.pathname.replace(/\/?$/, "/");
-			withSlash$1.searchParams.delete("feed");
-			candidates.push(withSlash$1.href);
+			const withSlash = new URL(url);
+			withSlash.pathname = url.pathname.replace(/\/?$/, "/");
+			withSlash.searchParams.delete("feed");
+			candidates.push(withSlash.href);
 			return candidates;
 		}
 		const basePath = url.pathname.replace(/\/$/, "");
@@ -44,6 +43,5 @@ const wordpressProbe = {
 		return candidates;
 	}
 };
-
 //#endregion
-exports.wordpressProbe = wordpressProbe;
+exports.wordpressProbe = wordpressProbe;

package/dist/probes/wordpress.js

@@ -23,10 +23,10 @@ const wordpressProbe = {
 			withoutSlash.pathname = url.pathname.replace(/\/$/, "");
 			withoutSlash.searchParams.delete("feed");
 			candidates.push(withoutSlash.href);
-			const withSlash$1 = new URL(url);
-			withSlash$1.pathname = url.pathname.replace(/\/?$/, "/");
-			withSlash$1.searchParams.delete("feed");
-			candidates.push(withSlash$1.href);
+			const withSlash = new URL(url);
+			withSlash.pathname = url.pathname.replace(/\/?$/, "/");
+			withSlash.searchParams.delete("feed");
+			candidates.push(withSlash.href);
 			return candidates;
 		}
 		const basePath = url.pathname.replace(/\/$/, "");
@@ -43,6 +43,5 @@ const wordpressProbe = {
 		return candidates;
 	}
 };
-
 //#endregion
-export { wordpressProbe };
+export { wordpressProbe };

package/dist/rewrites/blogger.cjs

@@ -1,5 +1,4 @@
-const require_utils = require('../utils.cjs');
-
+const require_utils = require("../utils.cjs");
 //#region src/rewrites/blogger.ts
 const bloggerPattern = /^(www\.|beta\.)?blogger\.com$/;
 const blogspotPattern = /\.blogspot\.[a-z]{2,3}(\.[a-z]{2})?$/i;
@@ -44,6 +43,5 @@ const bloggerRewrite = {
 		return new URL(normalized);
 	}
 };
-
 //#endregion
-exports.bloggerRewrite = bloggerRewrite;
+exports.bloggerRewrite = bloggerRewrite;

package/dist/rewrites/blogger.js

@@ -1,5 +1,4 @@
 import { normalizeUrl } from "../utils.js";
-
 //#region src/rewrites/blogger.ts
 const bloggerPattern = /^(www\.|beta\.)?blogger\.com$/;
 const blogspotPattern = /\.blogspot\.[a-z]{2,3}(\.[a-z]{2})?$/i;
@@ -44,6 +43,5 @@ const bloggerRewrite = {
 		return new URL(normalized);
 	}
 };
-
 //#endregion
-export { bloggerRewrite };
+export { bloggerRewrite };

package/dist/rewrites/feedburner.cjs

@@ -1,5 +1,4 @@
-const require_utils = require('../utils.cjs');
-
+const require_utils = require("../utils.cjs");
 //#region src/rewrites/feedburner.ts
 const hosts = [
 	"feeds.feedburner.com",
@@ -24,6 +23,5 @@ const feedburnerRewrite = {
 		return new URL(normalized);
 	}
 };
-
 //#endregion
-exports.feedburnerRewrite = feedburnerRewrite;
+exports.feedburnerRewrite = feedburnerRewrite;

package/dist/rewrites/feedburner.js

@@ -1,5 +1,4 @@
 import { normalizeUrl } from "../utils.js";
-
 //#region src/rewrites/feedburner.ts
 const hosts = [
 	"feeds.feedburner.com",
@@ -24,6 +23,5 @@ const feedburnerRewrite = {
 		return new URL(normalized);
 	}
 };
-
 //#endregion
-export { feedburnerRewrite };
+export { feedburnerRewrite };

package/dist/types.d.cts

@@ -1,7 +1,7 @@
-import * as feedsmith0 from "feedsmith";
+import * as feedsmith from "feedsmith";
 
 //#region src/types.d.ts
-type DefaultParserResult = ReturnType<typeof feedsmith0.parseFeed>;
+type DefaultParserResult = ReturnType<typeof feedsmith.parseFeed>;
 type ParserAdapter<T> = {
   parse: (body: string) => Promise<T | undefined> | T | undefined;
   getSelfUrl: (parsed: T) => string | undefined;
@@ -27,6 +27,7 @@ type NormalizeOptions = {
   stripQueryParams?: Array<string>;
   stripQuery?: boolean;
   stripEmptyQuery?: boolean;
+  lowercaseQuery?: boolean;
   normalizeEncoding?: boolean;
   normalizeUnicode?: boolean;
   convertToPunycode?: boolean;

package/dist/types.d.ts

@@ -1,7 +1,7 @@
-import * as feedsmith0 from "feedsmith";
+import * as feedsmith from "feedsmith";
 
 //#region src/types.d.ts
-type DefaultParserResult = ReturnType<typeof feedsmith0.parseFeed>;
+type DefaultParserResult = ReturnType<typeof feedsmith.parseFeed>;
 type ParserAdapter<T> = {
   parse: (body: string) => Promise<T | undefined> | T | undefined;
   getSelfUrl: (parsed: T) => string | undefined;
@@ -27,6 +27,7 @@ type NormalizeOptions = {
   stripQueryParams?: Array<string>;
   stripQuery?: boolean;
   stripEmptyQuery?: boolean;
+  lowercaseQuery?: boolean;
   normalizeEncoding?: boolean;
   normalizeUnicode?: boolean;
   convertToPunycode?: boolean;

package/dist/utils.cjs

@@ -1,7 +1,6 @@
-const require_defaults = require('./defaults.cjs');
+const require_defaults = require("./defaults.cjs");
 let node_url = require("node:url");
 let entities = require("entities");
-
 //#region src/utils.ts
 const strippedParamsCache = /* @__PURE__ */ new WeakMap();
 const getStrippedParamsSet = (params) => {
@@ -76,6 +75,7 @@ const addMissingProtocol = (url, protocol = "https") => {
 	return `${protocol}://${url}`;
 };
 const resolveUrl = (url, base) => {
+	if (url.startsWith("#")) return;
 	let resolvedUrl;
 	resolvedUrl = url.includes("&") ? (0, entities.decodeHTML)(url) : url;
 	resolvedUrl = resolveFeedProtocol(resolvedUrl);
@@ -133,6 +133,11 @@ const normalizeUrl = (url, options = require_defaults.defaultNormalizeOptions) =
 			for (const [key] of parsed.searchParams) if (strippedSet.has(key.toLowerCase())) paramsToDelete.push(key);
 			for (const param of paramsToDelete) parsed.searchParams.delete(param);
 		}
+		if (options.lowercaseQuery && parsed.search) {
+			const entries = [...parsed.searchParams.entries()];
+			parsed.search = "";
+			for (const [key, value] of entries) parsed.searchParams.append(key.toLowerCase(), value.toLowerCase());
+		}
 		if (options.sortQueryParams) parsed.searchParams.sort();
 		if (options.stripEmptyQuery && parsed.href.endsWith("?")) parsed.search = "";
 		let result = parsed.href;
@@ -190,9 +195,8 @@ const neutralizeUrls = (text, urls) => {
 	const hosts = urls.map(escapeHost).filter(Boolean);
 	if (hosts.length === 0) return text;
 	const hostPattern = hosts.length === 1 ? hosts[0] : `(?:${hosts.join("|")})`;
-	return text.replace(new RegExp(`https?://(?:www\\.)?${hostPattern}(?=[/"])(/)?`, "g"), "/").replace(trailingSlashPattern, "$1$2");
+	return text.replace(new RegExp(`https?://(?:www\\.)?${hostPattern}(?=[/"]|\\\\")(/)?`, "g"), "/").replace(trailingSlashPattern, "$1$2");
 };
-
 //#endregion
 exports.addMissingProtocol = addMissingProtocol;
 exports.applyProbes = applyProbes;
@@ -202,4 +206,4 @@ exports.fixMalformedProtocol = fixMalformedProtocol;
 exports.neutralizeUrls = neutralizeUrls;
 exports.normalizeUrl = normalizeUrl;
 exports.resolveFeedProtocol = resolveFeedProtocol;
-exports.resolveUrl = resolveUrl;
+exports.resolveUrl = resolveUrl;

package/dist/utils.js

@@ -1,7 +1,6 @@
 import { defaultNormalizeOptions } from "./defaults.js";
 import { domainToASCII } from "node:url";
 import { decodeHTML } from "entities";
-
 //#region src/utils.ts
 const strippedParamsCache = /* @__PURE__ */ new WeakMap();
 const getStrippedParamsSet = (params) => {
@@ -76,6 +75,7 @@ const addMissingProtocol = (url, protocol = "https") => {
 	return `${protocol}://${url}`;
 };
 const resolveUrl = (url, base) => {
+	if (url.startsWith("#")) return;
 	let resolvedUrl;
 	resolvedUrl = url.includes("&") ? decodeHTML(url) : url;
 	resolvedUrl = resolveFeedProtocol(resolvedUrl);
@@ -133,6 +133,11 @@ const normalizeUrl = (url, options = defaultNormalizeOptions) => {
 			for (const [key] of parsed.searchParams) if (strippedSet.has(key.toLowerCase())) paramsToDelete.push(key);
 			for (const param of paramsToDelete) parsed.searchParams.delete(param);
 		}
+		if (options.lowercaseQuery && parsed.search) {
+			const entries = [...parsed.searchParams.entries()];
+			parsed.search = "";
+			for (const [key, value] of entries) parsed.searchParams.append(key.toLowerCase(), value.toLowerCase());
+		}
 		if (options.sortQueryParams) parsed.searchParams.sort();
 		if (options.stripEmptyQuery && parsed.href.endsWith("?")) parsed.search = "";
 		let result = parsed.href;
@@ -190,8 +195,7 @@ const neutralizeUrls = (text, urls) => {
 	const hosts = urls.map(escapeHost).filter(Boolean);
 	if (hosts.length === 0) return text;
 	const hostPattern = hosts.length === 1 ? hosts[0] : `(?:${hosts.join("|")})`;
-	return text.replace(new RegExp(`https?://(?:www\\.)?${hostPattern}(?=[/"])(/)?`, "g"), "/").replace(trailingSlashPattern, "$1$2");
+	return text.replace(new RegExp(`https?://(?:www\\.)?${hostPattern}(?=[/"]|\\\\")(/)?`, "g"), "/").replace(trailingSlashPattern, "$1$2");
 };
-
 //#endregion
-export { addMissingProtocol, applyProbes, applyRewrites, createSignature, fixMalformedProtocol, neutralizeUrls, normalizeUrl, resolveFeedProtocol, resolveUrl };
+export { addMissingProtocol, applyProbes, applyRewrites, createSignature, fixMalformedProtocol, neutralizeUrls, normalizeUrl, resolveFeedProtocol, resolveUrl };

package/package.json

@@ -54,14 +54,14 @@
     "docs:build": "vitepress build docs"
   },
   "dependencies": {
-    "entities": "^7.0.0",
-    "feedsmith": "^2.8.0"
+    "entities": "^7.0.1",
+    "feedsmith": "^2.9.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.5",
-    "kvalita": "1.9.0",
-    "tsdown": "^0.18.4",
+    "@types/bun": "^1.3.10",
+    "kvalita": "1.10.0",
+    "tsdown": "^0.21.0",
     "vitepress": "^1.6.4"
   },
-  "version": "1.3.0"
+  "version": "1.4.0"
 }