feedcanon 1.5.1 → 1.6.0

package/dist/defaults.cjs

@@ -170,8 +170,7 @@ const defaultNormalizeOptions = {
 	stripEmptyQuery: true,
 	lowercaseQuery: false,
 	normalizeEncoding: true,
-	normalizeUnicode: true,
-	convertToPunycode: true
+	normalizeUnicode: true
 };
 const defaultFetch = async (url, options) => {
 	const response = await fetch(url, {
@@ -241,8 +240,7 @@ const defaultTiers = [
 		stripQuery: true,
 		stripEmptyQuery: true,
 		normalizeEncoding: true,
-		normalizeUnicode: true,
-		convertToPunycode: true
+		normalizeUnicode: true
 	},
 	{
 		stripProtocol: false,
@@ -256,8 +254,7 @@ const defaultTiers = [
 		stripQuery: false,
 		stripEmptyQuery: true,
 		normalizeEncoding: true,
-		normalizeUnicode: true,
-		convertToPunycode: true
+		normalizeUnicode: true
 	},
 	{
 		stripProtocol: false,
@@ -271,8 +268,7 @@ const defaultTiers = [
 		stripQuery: false,
 		stripEmptyQuery: true,
 		normalizeEncoding: true,
-		normalizeUnicode: true,
-		convertToPunycode: true
+		normalizeUnicode: true
 	},
 	{
 		stripProtocol: false,
@@ -286,8 +282,7 @@ const defaultTiers = [
 		stripQuery: false,
 		stripEmptyQuery: true,
 		normalizeEncoding: true,
-		normalizeUnicode: true,
-		convertToPunycode: true
+		normalizeUnicode: true
 	}
 ];
 //#endregion

package/dist/defaults.js

@@ -169,8 +169,7 @@ const defaultNormalizeOptions = {
 	stripEmptyQuery: true,
 	lowercaseQuery: false,
 	normalizeEncoding: true,
-	normalizeUnicode: true,
-	convertToPunycode: true
+	normalizeUnicode: true
 };
 const defaultFetch = async (url, options) => {
 	const response = await fetch(url, {
@@ -240,8 +239,7 @@ const defaultTiers = [
 		stripQuery: true,
 		stripEmptyQuery: true,
 		normalizeEncoding: true,
-		normalizeUnicode: true,
-		convertToPunycode: true
+		normalizeUnicode: true
 	},
 	{
 		stripProtocol: false,
@@ -255,8 +253,7 @@ const defaultTiers = [
 		stripQuery: false,
 		stripEmptyQuery: true,
 		normalizeEncoding: true,
-		normalizeUnicode: true,
-		convertToPunycode: true
+		normalizeUnicode: true
 	},
 	{
 		stripProtocol: false,
@@ -270,8 +267,7 @@ const defaultTiers = [
 		stripQuery: false,
 		stripEmptyQuery: true,
 		normalizeEncoding: true,
-		normalizeUnicode: true,
-		convertToPunycode: true
+		normalizeUnicode: true
 	},
 	{
 		stripProtocol: false,
@@ -285,8 +281,7 @@ const defaultTiers = [
 		stripQuery: false,
 		stripEmptyQuery: true,
 		normalizeEncoding: true,
-		normalizeUnicode: true,
-		convertToPunycode: true
+		normalizeUnicode: true
 	}
 ];
 //#endregion

package/dist/exports.cjs

@@ -17,4 +17,5 @@ exports.fixMalformedProtocol = require_utils.fixMalformedProtocol;
 exports.normalizeUrl = require_utils.normalizeUrl;
 exports.resolveFeedProtocol = require_utils.resolveFeedProtocol;
 exports.resolveUrl = require_utils.resolveUrl;
+exports.upgradeProtocol = require_utils.upgradeProtocol;
 exports.wordpressProbe = require_wordpress.wordpressProbe;

package/dist/exports.d.cts

@@ -4,5 +4,5 @@ import { findCanonical } from "./index.cjs";
 import { wordpressProbe } from "./probes/wordpress.cjs";
 import { bloggerRewrite } from "./rewrites/blogger.cjs";
 import { feedburnerRewrite } from "./rewrites/feedburner.cjs";
-import { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl } from "./utils.cjs";
-export { type DefaultParserResult, type ExistsFn, type FetchFn, type FetchFnOptions, type FetchFnResponse, type FindCanonicalOptions, type NormalizeOptions, type OnExistsFn, type OnFetchFn, type OnMatchFn, type ParserAdapter, type Probe, type Rewrite, type Tier, addMissingProtocol, bloggerRewrite, defaultFetch, defaultParser, defaultStrippedParams, defaultTiers, feedburnerRewrite, findCanonical, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, wordpressProbe };
+import { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, upgradeProtocol } from "./utils.cjs";
+export { type DefaultParserResult, type ExistsFn, type FetchFn, type FetchFnOptions, type FetchFnResponse, type FindCanonicalOptions, type NormalizeOptions, type OnExistsFn, type OnFetchFn, type OnMatchFn, type ParserAdapter, type Probe, type Rewrite, type Tier, addMissingProtocol, bloggerRewrite, defaultFetch, defaultParser, defaultStrippedParams, defaultTiers, feedburnerRewrite, findCanonical, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, upgradeProtocol, wordpressProbe };

package/dist/exports.d.ts

@@ -4,5 +4,5 @@ import { findCanonical } from "./index.js";
 import { wordpressProbe } from "./probes/wordpress.js";
 import { bloggerRewrite } from "./rewrites/blogger.js";
 import { feedburnerRewrite } from "./rewrites/feedburner.js";
-import { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl } from "./utils.js";
-export { type DefaultParserResult, type ExistsFn, type FetchFn, type FetchFnOptions, type FetchFnResponse, type FindCanonicalOptions, type NormalizeOptions, type OnExistsFn, type OnFetchFn, type OnMatchFn, type ParserAdapter, type Probe, type Rewrite, type Tier, addMissingProtocol, bloggerRewrite, defaultFetch, defaultParser, defaultStrippedParams, defaultTiers, feedburnerRewrite, findCanonical, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, wordpressProbe };
+import { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, upgradeProtocol } from "./utils.js";
+export { type DefaultParserResult, type ExistsFn, type FetchFn, type FetchFnOptions, type FetchFnResponse, type FindCanonicalOptions, type NormalizeOptions, type OnExistsFn, type OnFetchFn, type OnMatchFn, type ParserAdapter, type Probe, type Rewrite, type Tier, addMissingProtocol, bloggerRewrite, defaultFetch, defaultParser, defaultStrippedParams, defaultTiers, feedburnerRewrite, findCanonical, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, upgradeProtocol, wordpressProbe };

package/dist/exports.js

@@ -1,7 +1,7 @@
-import { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl } from "./utils.js";
+import { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, upgradeProtocol } from "./utils.js";
 import { defaultFetch, defaultParser, defaultStrippedParams, defaultTiers } from "./defaults.js";
 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, upgradeProtocol, wordpressProbe };

package/dist/types.d.cts

@@ -31,7 +31,6 @@ type NormalizeOptions = {
   lowercaseQuery?: boolean;
   normalizeEncoding?: boolean;
   normalizeUnicode?: boolean;
-  convertToPunycode?: boolean;
 };
 type Tier = Omit<NormalizeOptions, 'stripQueryParams'>;
 type OnFetchFn<TResponse extends FetchFnResponse = FetchFnResponse> = (data: {

package/dist/types.d.ts

@@ -31,7 +31,6 @@ type NormalizeOptions = {
   lowercaseQuery?: boolean;
   normalizeEncoding?: boolean;
   normalizeUnicode?: boolean;
-  convertToPunycode?: boolean;
 };
 type Tier = Omit<NormalizeOptions, 'stripQueryParams'>;
 type OnFetchFn<TResponse extends FetchFnResponse = FetchFnResponse> = (data: {

package/dist/utils.cjs

@@ -1,5 +1,4 @@
 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();
@@ -15,9 +14,10 @@ const ipv4Regex = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
 const ipv6Regex = /^([0-9a-f]{0,4}:){2,7}[0-9a-f]{0,4}$/i;
 const safePathCharsRegex = /[a-zA-Z0-9._~!$&'()*+,;=:@-]/;
 const httpsLetterRegex = /s/i;
-const nonAsciiHostnameRegex = /[^a-z0-9.:-]/;
 const protocolPrefixRegex = /^https?:\/\//;
 const wwwPrefixRegex = /^www\./;
+const httpProtocolRegex = /^http:\/\//i;
+const httpsProtocolRegex = /^https:\/\//i;
 const validUrlRegex = /^https?:\/\/(?:www\.|[a-vx-z0-9])/i;
 const doubledProtocolRegex = /^\/?[htps]{2,7}[:\s=.\\/]+([htps]{2,7})[:\s=.\\/]+[.,:/]*(www[./]+)?/i;
 const singleMalformedRegex = /^\/?(?:h[htps():]{1,10}|t{1,2}ps?)[:\s=.\\/]+[.,:/]*(www[./]+)?/i;
@@ -79,6 +79,10 @@ const addMissingProtocol = (url, protocol = "https") => {
 	if (firstChar === " " || firstChar === "	" || firstChar === "\n") return url;
 	return `${protocol}://${url}`;
 };
+const upgradeProtocol = (url, protocol = "https") => {
+	if (protocol === "https") return url.replace(httpProtocolRegex, "https://");
+	return url.replace(httpsProtocolRegex, "http://");
+};
 const resolveUrl = (url, base) => {
 	if (url.startsWith("#") && !base) return;
 	let resolvedUrl;
@@ -115,10 +119,6 @@ const normalizeUrl = (url, options = require_defaults.defaultNormalizeOptions) =
 			parsed.hostname = parsed.hostname.normalize("NFC");
 			parsed.pathname = parsed.pathname.normalize("NFC");
 		}
-		if (options.convertToPunycode && nonAsciiHostnameRegex.test(parsed.hostname)) {
-			const ascii = (0, node_url.domainToASCII)(parsed.hostname);
-			if (ascii) parsed.hostname = ascii;
-		}
 		if (options.stripAuthentication) {
 			parsed.username = "";
 			parsed.password = "";
@@ -212,3 +212,4 @@ exports.neutralizeUrls = neutralizeUrls;
 exports.normalizeUrl = normalizeUrl;
 exports.resolveFeedProtocol = resolveFeedProtocol;
 exports.resolveUrl = resolveUrl;
+exports.upgradeProtocol = upgradeProtocol;

package/dist/utils.d.cts

@@ -4,7 +4,8 @@ import { NormalizeOptions } from "./types.cjs";
 declare const fixMalformedProtocol: (url: string) => string;
 declare const resolveFeedProtocol: (url: string, protocol?: "http" | "https") => string;
 declare const addMissingProtocol: (url: string, protocol?: "http" | "https") => string;
+declare const upgradeProtocol: (url: string, protocol?: "http" | "https") => string;
 declare const resolveUrl: (url: string, base?: string) => string | undefined;
 declare const normalizeUrl: (url: string, options?: NormalizeOptions) => string;
 //#endregion
-export { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl };
+export { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, upgradeProtocol };

package/dist/utils.d.ts

@@ -4,7 +4,8 @@ import { NormalizeOptions } from "./types.js";
 declare const fixMalformedProtocol: (url: string) => string;
 declare const resolveFeedProtocol: (url: string, protocol?: "http" | "https") => string;
 declare const addMissingProtocol: (url: string, protocol?: "http" | "https") => string;
+declare const upgradeProtocol: (url: string, protocol?: "http" | "https") => string;
 declare const resolveUrl: (url: string, base?: string) => string | undefined;
 declare const normalizeUrl: (url: string, options?: NormalizeOptions) => string;
 //#endregion
-export { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl };
+export { addMissingProtocol, fixMalformedProtocol, normalizeUrl, resolveFeedProtocol, resolveUrl, upgradeProtocol };

package/dist/utils.js

@@ -1,5 +1,4 @@
 import { defaultNormalizeOptions } from "./defaults.js";
-import { domainToASCII } from "node:url";
 import { decodeHTML } from "entities";
 //#region src/utils.ts
 const strippedParamsCache = /* @__PURE__ */ new WeakMap();
@@ -15,9 +14,10 @@ const ipv4Regex = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/;
 const ipv6Regex = /^([0-9a-f]{0,4}:){2,7}[0-9a-f]{0,4}$/i;
 const safePathCharsRegex = /[a-zA-Z0-9._~!$&'()*+,;=:@-]/;
 const httpsLetterRegex = /s/i;
-const nonAsciiHostnameRegex = /[^a-z0-9.:-]/;
 const protocolPrefixRegex = /^https?:\/\//;
 const wwwPrefixRegex = /^www\./;
+const httpProtocolRegex = /^http:\/\//i;
+const httpsProtocolRegex = /^https:\/\//i;
 const validUrlRegex = /^https?:\/\/(?:www\.|[a-vx-z0-9])/i;
 const doubledProtocolRegex = /^\/?[htps]{2,7}[:\s=.\\/]+([htps]{2,7})[:\s=.\\/]+[.,:/]*(www[./]+)?/i;
 const singleMalformedRegex = /^\/?(?:h[htps():]{1,10}|t{1,2}ps?)[:\s=.\\/]+[.,:/]*(www[./]+)?/i;
@@ -79,6 +79,10 @@ const addMissingProtocol = (url, protocol = "https") => {
 	if (firstChar === " " || firstChar === "	" || firstChar === "\n") return url;
 	return `${protocol}://${url}`;
 };
+const upgradeProtocol = (url, protocol = "https") => {
+	if (protocol === "https") return url.replace(httpProtocolRegex, "https://");
+	return url.replace(httpsProtocolRegex, "http://");
+};
 const resolveUrl = (url, base) => {
 	if (url.startsWith("#") && !base) return;
 	let resolvedUrl;
@@ -115,10 +119,6 @@ const normalizeUrl = (url, options = defaultNormalizeOptions) => {
 			parsed.hostname = parsed.hostname.normalize("NFC");
 			parsed.pathname = parsed.pathname.normalize("NFC");
 		}
-		if (options.convertToPunycode && nonAsciiHostnameRegex.test(parsed.hostname)) {
-			const ascii = domainToASCII(parsed.hostname);
-			if (ascii) parsed.hostname = ascii;
-		}
 		if (options.stripAuthentication) {
 			parsed.username = "";
 			parsed.password = "";
@@ -203,4 +203,4 @@ const neutralizeUrls = (text, urls) => {
 	return text.replace(new RegExp(`https?://(?:www\\.)?${hostPattern}(?=[/"]|\\\\")(/)?`, "g"), "/").replace(trailingSlashRegex, "$1$2");
 };
 //#endregion
-export { addMissingProtocol, applyProbes, applyRewrites, createSignature, fixMalformedProtocol, neutralizeUrls, normalizeUrl, resolveFeedProtocol, resolveUrl };
+export { addMissingProtocol, applyProbes, applyRewrites, createSignature, fixMalformedProtocol, neutralizeUrls, normalizeUrl, resolveFeedProtocol, resolveUrl, upgradeProtocol };

package/package.json

@@ -55,14 +55,13 @@
   },
   "dependencies": {
     "entities": "^7.0.1",
-    "feedsmith": "^2.9.1",
-    "typescript": "^6.0.2"
+    "feedsmith": "^2.9.4"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.11",
-    "kvalita": "1.12.4",
-    "tsdown": "^0.21.7",
+    "@types/bun": "^1.3.13",
+    "kvalita": "1.13.0",
+    "tsdown": "^0.22.0",
     "vitepress": "^2.0.0-alpha.17"
   },
-  "version": "1.5.1"
+  "version": "1.6.0"
 }