feedscout 1.8.0 → 1.8.1

package/dist/blogrolls/extractors.cjs

@@ -1,6 +1,6 @@
 let feedsmith = require("feedsmith");
 //#region src/blogrolls/extractors.ts
-const defaultExtractor = ({ content, url }) => {
+const defaultExtractFn = ({ content, url }) => {
 	if (!content) return {
 		url,
 		isValid: false
@@ -18,4 +18,4 @@ const defaultExtractor = ({ content, url }) => {
 	};
 };
 //#endregion
-exports.defaultExtractor = defaultExtractor;
+exports.defaultExtractFn = defaultExtractFn;

package/dist/blogrolls/extractors.d.cts

@@ -2,6 +2,6 @@ import { DiscoverExtractFn } from "../common/types.cjs";
 import { BlogrollResult } from "./types.cjs";
 
 //#region src/blogrolls/extractors.d.ts
-declare const defaultExtractor: DiscoverExtractFn<BlogrollResult>;
+declare const defaultExtractFn: DiscoverExtractFn<BlogrollResult>;
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/blogrolls/extractors.d.ts

@@ -2,6 +2,6 @@ import { DiscoverExtractFn } from "../common/types.js";
 import { BlogrollResult } from "./types.js";
 
 //#region src/blogrolls/extractors.d.ts
-declare const defaultExtractor: DiscoverExtractFn<BlogrollResult>;
+declare const defaultExtractFn: DiscoverExtractFn<BlogrollResult>;
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/blogrolls/extractors.js

@@ -1,6 +1,6 @@
 import { parseOpml } from "feedsmith";
 //#region src/blogrolls/extractors.ts
-const defaultExtractor = ({ content, url }) => {
+const defaultExtractFn = ({ content, url }) => {
 	if (!content) return {
 		url,
 		isValid: false
@@ -18,4 +18,4 @@ const defaultExtractor = ({ content, url }) => {
 	};
 };
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/blogrolls/index.cjs

@@ -1,7 +1,6 @@
-const require_utils = require("../common/utils.cjs");
-const require_utils$1 = require("../common/discover/utils.cjs");
+const require_defaults = require("../common/discover/defaults.cjs");
 const require_index = require("../common/discover/index.cjs");
-const require_defaults = require("./defaults.cjs");
+const require_defaults$1 = require("./defaults.cjs");
 const require_extractors = require("./extractors.cjs");
 //#region src/blogrolls/index.ts
 const discoverBlogrolls = (input, options = {}) => {
@@ -12,14 +11,14 @@ const discoverBlogrolls = (input, options = {}) => {
 			"headers",
 			"guess"
 		],
-		fetchFn: options.fetchFn ?? require_utils$1.defaultFetchFn,
-		extractFn: options.extractFn ?? require_extractors.defaultExtractor,
-		resolveUrlFn: options.resolveUrlFn ?? require_utils.resolveUrl,
-		resolveSiteUrlFn: options.resolveSiteUrlFn ?? require_utils$1.defaultResolveSiteUrlFn
+		fetchFn: options.fetchFn ?? require_defaults.defaultFetchFn,
+		extractFn: options.extractFn ?? require_extractors.defaultExtractFn,
+		resolveUrlFn: options.resolveUrlFn ?? require_defaults.defaultResolveUrlFn,
+		resolveSiteUrlFn: options.resolveSiteUrlFn ?? require_defaults.defaultResolveSiteUrlFn
 	}, {
-		html: require_defaults.defaultHtmlOptions,
-		headers: require_defaults.defaultHeadersOptions,
-		guess: require_defaults.defaultGuessOptions
+		html: require_defaults$1.defaultHtmlOptions,
+		headers: require_defaults$1.defaultHeadersOptions,
+		guess: require_defaults$1.defaultGuessOptions
 	});
 };
 //#endregion

package/dist/blogrolls/index.js

@@ -1,8 +1,7 @@
-import { resolveUrl } from "../common/utils.js";
-import { defaultFetchFn, defaultResolveSiteUrlFn } from "../common/discover/utils.js";
+import { defaultFetchFn, defaultResolveSiteUrlFn, defaultResolveUrlFn } from "../common/discover/defaults.js";
 import { discover } from "../common/discover/index.js";
 import { defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions } from "./defaults.js";
-import { defaultExtractor } from "./extractors.js";
+import { defaultExtractFn } from "./extractors.js";
 //#region src/blogrolls/index.ts
 const discoverBlogrolls = (input, options = {}) => {
 	return discover(input, {
@@ -13,8 +12,8 @@ const discoverBlogrolls = (input, options = {}) => {
 			"guess"
 		],
 		fetchFn: options.fetchFn ?? defaultFetchFn,
-		extractFn: options.extractFn ?? defaultExtractor,
-		resolveUrlFn: options.resolveUrlFn ?? resolveUrl,
+		extractFn: options.extractFn ?? defaultExtractFn,
+		resolveUrlFn: options.resolveUrlFn ?? defaultResolveUrlFn,
 		resolveSiteUrlFn: options.resolveSiteUrlFn ?? defaultResolveSiteUrlFn
 	}, {
 		html: defaultHtmlOptions,

package/dist/blogrolls.cjs

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_defaults = require("./blogrolls/defaults.cjs");
 const require_extractors = require("./blogrolls/extractors.cjs");
 exports.anchorLabels = require_defaults.anchorLabels;
-exports.defaultExtractor = require_extractors.defaultExtractor;
+exports.defaultExtractFn = require_extractors.defaultExtractFn;
 exports.defaultGuessOptions = require_defaults.defaultGuessOptions;
 exports.defaultHeadersOptions = require_defaults.defaultHeadersOptions;
 exports.defaultHtmlOptions = require_defaults.defaultHtmlOptions;

package/dist/blogrolls.d.cts

@@ -1,4 +1,4 @@
 import { anchorLabels, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal } from "./blogrolls/defaults.cjs";
 import { BlogrollResult } from "./blogrolls/types.cjs";
-import { defaultExtractor } from "./blogrolls/extractors.cjs";
-export { BlogrollResult, anchorLabels, defaultExtractor, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };
+import { defaultExtractFn } from "./blogrolls/extractors.cjs";
+export { BlogrollResult, anchorLabels, defaultExtractFn, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };

package/dist/blogrolls.d.ts

@@ -1,4 +1,4 @@
 import { anchorLabels, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal } from "./blogrolls/defaults.js";
 import { BlogrollResult } from "./blogrolls/types.js";
-import { defaultExtractor } from "./blogrolls/extractors.js";
-export { BlogrollResult, anchorLabels, defaultExtractor, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };
+import { defaultExtractFn } from "./blogrolls/extractors.js";
+export { BlogrollResult, anchorLabels, defaultExtractFn, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };

package/dist/blogrolls.js

@@ -1,3 +1,3 @@
 import { anchorLabels, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal } from "./blogrolls/defaults.js";
-import { defaultExtractor } from "./blogrolls/extractors.js";
-export { anchorLabels, defaultExtractor, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };
+import { defaultExtractFn } from "./blogrolls/extractors.js";
+export { anchorLabels, defaultExtractFn, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };

package/dist/common/discover/defaults.cjs

@@ -0,0 +1,46 @@
+const require_utils = require("./utils.cjs");
+let feedsmith = require("feedsmith");
+//#region src/common/discover/defaults.ts
+const defaultFetchFn = async (url, options) => {
+	const response = await fetch(url, {
+		method: options?.method ?? "GET",
+		headers: options?.headers
+	});
+	return {
+		headers: response.headers,
+		body: await response.text(),
+		url: response.url,
+		status: response.status,
+		statusText: response.statusText
+	};
+};
+const defaultResolveUrlFn = (url, baseUrl) => {
+	try {
+		return new URL(url, baseUrl).href;
+	} catch {
+		return;
+	}
+};
+const defaultResolveSiteUrlFn = (input, resolveUrlFn) => {
+	if (!input.content) return;
+	try {
+		let siteUrl = require_utils.getFeedSiteUrl((0, feedsmith.parseFeed)(input.content));
+		if (siteUrl) {
+			siteUrl = resolveUrlFn(siteUrl, input.url);
+			if (siteUrl) {
+				const parsed = new URL(siteUrl);
+				parsed.hash = "";
+				siteUrl = parsed.href;
+			}
+		}
+		if (!siteUrl || siteUrl === new URL(input.url).href) try {
+			siteUrl = new URL(input.url).origin;
+		} catch {}
+		if (siteUrl && new URL(siteUrl).href === new URL(input.url).href) return;
+		return siteUrl;
+	} catch {}
+};
+//#endregion
+exports.defaultFetchFn = defaultFetchFn;
+exports.defaultResolveSiteUrlFn = defaultResolveSiteUrlFn;
+exports.defaultResolveUrlFn = defaultResolveUrlFn;

package/dist/common/discover/defaults.d.cts

@@ -0,0 +1,6 @@
+import { DiscoverResolveSiteUrlFn } from "../types.cjs";
+
+//#region src/common/discover/defaults.d.ts
+declare const defaultResolveSiteUrlFn: DiscoverResolveSiteUrlFn;
+//#endregion
+export { defaultResolveSiteUrlFn };

package/dist/common/discover/defaults.d.ts

@@ -0,0 +1,6 @@
+import { DiscoverResolveSiteUrlFn } from "../types.js";
+
+//#region src/common/discover/defaults.d.ts
+declare const defaultResolveSiteUrlFn: DiscoverResolveSiteUrlFn;
+//#endregion
+export { defaultResolveSiteUrlFn };

package/dist/common/discover/defaults.js

@@ -0,0 +1,44 @@
+import { getFeedSiteUrl } from "./utils.js";
+import { parseFeed } from "feedsmith";
+//#region src/common/discover/defaults.ts
+const defaultFetchFn = async (url, options) => {
+	const response = await fetch(url, {
+		method: options?.method ?? "GET",
+		headers: options?.headers
+	});
+	return {
+		headers: response.headers,
+		body: await response.text(),
+		url: response.url,
+		status: response.status,
+		statusText: response.statusText
+	};
+};
+const defaultResolveUrlFn = (url, baseUrl) => {
+	try {
+		return new URL(url, baseUrl).href;
+	} catch {
+		return;
+	}
+};
+const defaultResolveSiteUrlFn = (input, resolveUrlFn) => {
+	if (!input.content) return;
+	try {
+		let siteUrl = getFeedSiteUrl(parseFeed(input.content));
+		if (siteUrl) {
+			siteUrl = resolveUrlFn(siteUrl, input.url);
+			if (siteUrl) {
+				const parsed = new URL(siteUrl);
+				parsed.hash = "";
+				siteUrl = parsed.href;
+			}
+		}
+		if (!siteUrl || siteUrl === new URL(input.url).href) try {
+			siteUrl = new URL(input.url).origin;
+		} catch {}
+		if (siteUrl && new URL(siteUrl).href === new URL(input.url).href) return;
+		return siteUrl;
+	} catch {}
+};
+//#endregion
+export { defaultFetchFn, defaultResolveSiteUrlFn, defaultResolveUrlFn };

package/dist/common/discover/index.cjs

@@ -1,11 +1,11 @@
+const require_utils = require("./utils.cjs");
 const require_types = require("../types.cjs");
-const require_utils = require("../utils.cjs");
+const require_utils$1 = require("../utils.cjs");
 const require_index = require("../uris/index.cjs");
-const require_utils$1 = require("./utils.cjs");
 //#region src/common/discover/index.ts
 const discover = async (input, options, defaults) => {
 	const { methods, fetchFn, extractFn, resolveUrlFn, resolveSiteUrlFn, stopOnFirstMethod = false, stopOnFirstResult = false, concurrency = 3, includeInvalid = false, onProgress } = options;
-	const sourceInput = await require_utils$1.normalizeInput(input, fetchFn);
+	const sourceInput = await require_utils.normalizeInput(input, fetchFn);
 	if (sourceInput.content) {
 		const result = await extractFn({
 			url: sourceInput.url,
@@ -16,7 +16,7 @@ const discover = async (input, options, defaults) => {
 	}
 	let siteInput;
 	if (resolveSiteUrlFn) {
-		const siteUrl = resolveSiteUrlFn(sourceInput);
+		const siteUrl = resolveSiteUrlFn(sourceInput, resolveUrlFn);
 		if (siteUrl) try {
 			const response = await fetchFn(siteUrl);
 			siteInput = {
@@ -26,14 +26,14 @@ const discover = async (input, options, defaults) => {
 			};
 		} catch {}
 	}
-	const urisByMethod = await require_index.discoverUris(require_utils$1.normalizeMethodsConfig(sourceInput, siteInput, methods, defaults), fetchFn);
+	const urisByMethod = await require_index.discoverUris(require_utils.normalizeMethodsConfig(sourceInput, siteInput, methods, defaults), fetchFn);
 	const seen = /* @__PURE__ */ new Set();
 	const methodGroups = [];
 	for (const method of require_types.discoverMethodOrder) {
 		const rawUris = urisByMethod[method];
 		if (!rawUris || rawUris.length === 0) continue;
 		const unique = rawUris.map((entry) => {
-			return require_utils$1.normalizeUriEntry(entry, resolveUrlFn, sourceInput.url);
+			return require_utils.normalizeUriEntry(entry, resolveUrlFn, sourceInput.url);
 		}).filter((entry) => {
 			const key = typeof entry.uri === "string" ? entry.uri : entry.uri.join("\0");
 			if (seen.has(key)) return false;
@@ -91,7 +91,7 @@ const discover = async (input, options, defaults) => {
 	};
 	for (const { method, entries } of methodGroups) {
 		const foundBefore = found;
-		await require_utils.processConcurrently(entries, (entry) => processUri(entry, method), {
+		await require_utils$1.processConcurrently(entries, (entry) => processUri(entry, method), {
 			concurrency,
 			shouldStop: () => {
 				return stopOnFirstResult && found > 0;

package/dist/common/discover/index.js

@@ -1,7 +1,7 @@
+import { normalizeInput, normalizeMethodsConfig, normalizeUriEntry } from "./utils.js";
 import { discoverMethodOrder } from "../types.js";
 import { processConcurrently } from "../utils.js";
 import { discoverUris } from "../uris/index.js";
-import { normalizeInput, normalizeMethodsConfig, normalizeUriEntry } from "./utils.js";
 //#region src/common/discover/index.ts
 const discover = async (input, options, defaults) => {
 	const { methods, fetchFn, extractFn, resolveUrlFn, resolveSiteUrlFn, stopOnFirstMethod = false, stopOnFirstResult = false, concurrency = 3, includeInvalid = false, onProgress } = options;
@@ -16,7 +16,7 @@ const discover = async (input, options, defaults) => {
 	}
 	let siteInput;
 	if (resolveSiteUrlFn) {
-		const siteUrl = resolveSiteUrlFn(sourceInput);
+		const siteUrl = resolveSiteUrlFn(sourceInput, resolveUrlFn);
 		if (siteUrl) try {
 			const response = await fetchFn(siteUrl);
 			siteInput = {

package/dist/common/discover/utils.cjs

@@ -1,20 +1,5 @@
 const require_locales = require("../locales.cjs");
-const require_utils = require("../utils.cjs");
-let feedsmith = require("feedsmith");
 //#region src/common/discover/utils.ts
-const defaultFetchFn = async (url, options) => {
-	const response = await fetch(url, {
-		method: options?.method ?? "GET",
-		headers: options?.headers
-	});
-	return {
-		headers: response.headers,
-		body: await response.text(),
-		url: response.url,
-		status: response.status,
-		statusText: response.statusText
-	};
-};
 const normalizeInput = async (input, fetchFn) => {
 	if (typeof input === "object") return input;
 	try {
@@ -36,18 +21,6 @@ const getFeedSiteUrl = (parsed) => {
 	if (format === "atom") return getLinkOfType(feed.links, "alternate")?.href;
 	if (format === "json") return feed.home_page_url;
 };
-const defaultResolveSiteUrlFn = (input) => {
-	if (!input.content) return;
-	try {
-		let siteUrl = getFeedSiteUrl((0, feedsmith.parseFeed)(input.content));
-		if (!siteUrl) try {
-			siteUrl = new URL(input.url).origin;
-		} catch {}
-		else siteUrl = require_utils.resolveUrl(siteUrl, input.url);
-		if (siteUrl && new URL(siteUrl).href === new URL(input.url).href) return;
-		return siteUrl;
-	} catch {}
-};
 const normalizeUriEntry = (entry, resolveUrlFn, baseUrl) => {
 	if (typeof entry.uri === "string") return {
 		...entry,
@@ -122,8 +95,6 @@ const normalizeMethodsConfig = (sourceInput, siteInput, methods, defaults) => {
 	return methodsConfig;
 };
 //#endregion
-exports.defaultFetchFn = defaultFetchFn;
-exports.defaultResolveSiteUrlFn = defaultResolveSiteUrlFn;
 exports.getFeedSiteUrl = getFeedSiteUrl;
 exports.normalizeInput = normalizeInput;
 exports.normalizeMethodsConfig = normalizeMethodsConfig;

package/dist/common/discover/utils.d.cts

@@ -1,8 +1,6 @@
-import { DiscoverResolveSiteUrlFn } from "../types.cjs";
 import { parseFeed } from "feedsmith";
 
 //#region src/common/discover/utils.d.ts
 declare const getFeedSiteUrl: (parsed: ReturnType<typeof parseFeed>) => string | undefined;
-declare const defaultResolveSiteUrlFn: DiscoverResolveSiteUrlFn;
 //#endregion
-export { defaultResolveSiteUrlFn, getFeedSiteUrl };
+export { getFeedSiteUrl };

package/dist/common/discover/utils.d.ts

@@ -1,8 +1,6 @@
-import { DiscoverResolveSiteUrlFn } from "../types.js";
 import { parseFeed } from "feedsmith";
 
 //#region src/common/discover/utils.d.ts
 declare const getFeedSiteUrl: (parsed: ReturnType<typeof parseFeed>) => string | undefined;
-declare const defaultResolveSiteUrlFn: DiscoverResolveSiteUrlFn;
 //#endregion
-export { defaultResolveSiteUrlFn, getFeedSiteUrl };
+export { getFeedSiteUrl };

package/dist/common/discover/utils.js

@@ -1,20 +1,5 @@
 import { errors } from "../locales.js";
-import { resolveUrl } from "../utils.js";
-import { parseFeed } from "feedsmith";
 //#region src/common/discover/utils.ts
-const defaultFetchFn = async (url, options) => {
-	const response = await fetch(url, {
-		method: options?.method ?? "GET",
-		headers: options?.headers
-	});
-	return {
-		headers: response.headers,
-		body: await response.text(),
-		url: response.url,
-		status: response.status,
-		statusText: response.statusText
-	};
-};
 const normalizeInput = async (input, fetchFn) => {
 	if (typeof input === "object") return input;
 	try {
@@ -36,18 +21,6 @@ const getFeedSiteUrl = (parsed) => {
 	if (format === "atom") return getLinkOfType(feed.links, "alternate")?.href;
 	if (format === "json") return feed.home_page_url;
 };
-const defaultResolveSiteUrlFn = (input) => {
-	if (!input.content) return;
-	try {
-		let siteUrl = getFeedSiteUrl(parseFeed(input.content));
-		if (!siteUrl) try {
-			siteUrl = new URL(input.url).origin;
-		} catch {}
-		else siteUrl = resolveUrl(siteUrl, input.url);
-		if (siteUrl && new URL(siteUrl).href === new URL(input.url).href) return;
-		return siteUrl;
-	} catch {}
-};
 const normalizeUriEntry = (entry, resolveUrlFn, baseUrl) => {
 	if (typeof entry.uri === "string") return {
 		...entry,
@@ -122,4 +95,4 @@ const normalizeMethodsConfig = (sourceInput, siteInput, methods, defaults) => {
 	return methodsConfig;
 };
 //#endregion
-export { defaultFetchFn, defaultResolveSiteUrlFn, getFeedSiteUrl, normalizeInput, normalizeMethodsConfig, normalizeUriEntry };
+export { getFeedSiteUrl, normalizeInput, normalizeMethodsConfig, normalizeUriEntry };

package/dist/common/types.d.cts

@@ -22,7 +22,7 @@ type LinkSelector = {
   types?: Array<string>;
 };
 type DiscoverResolveUrlFn = (url: string, baseUrl: string | undefined) => string | undefined;
-type DiscoverResolveSiteUrlFn = (input: DiscoverInputObject) => string | undefined;
+type DiscoverResolveSiteUrlFn = (input: DiscoverInputObject, resolveUrlFn: DiscoverResolveUrlFn) => string | undefined;
 type DiscoverFetchFnOptions = {
   method?: 'GET' | 'HEAD';
   headers?: Record<string, string>;

package/dist/common/types.d.ts

@@ -22,7 +22,7 @@ type LinkSelector = {
   types?: Array<string>;
 };
 type DiscoverResolveUrlFn = (url: string, baseUrl: string | undefined) => string | undefined;
-type DiscoverResolveSiteUrlFn = (input: DiscoverInputObject) => string | undefined;
+type DiscoverResolveSiteUrlFn = (input: DiscoverInputObject, resolveUrlFn: DiscoverResolveUrlFn) => string | undefined;
 type DiscoverFetchFnOptions = {
   method?: 'GET' | 'HEAD';
   headers?: Record<string, string>;

package/dist/common/utils.cjs

@@ -52,13 +52,6 @@ const omitEmpty = (array) => {
 	for (const item of array) if (item != null && item !== "") result.push(item);
 	return result;
 };
-const resolveUrl = (url, baseUrl) => {
-	try {
-		return new URL(url, baseUrl).href;
-	} catch {
-		return;
-	}
-};
 const matchesAnyOfLinkSelectors = (rel, type, selectors) => {
 	return selectors.some((selector) => {
 		if (!anyWordMatchesAnyOf(rel, [selector.rel])) return false;
@@ -94,4 +87,3 @@ exports.isSubdomainOf = isSubdomainOf;
 exports.matchesAnyOfLinkSelectors = matchesAnyOfLinkSelectors;
 exports.omitEmpty = omitEmpty;
 exports.processConcurrently = processConcurrently;
-exports.resolveUrl = resolveUrl;

package/dist/common/utils.js

@@ -52,13 +52,6 @@ const omitEmpty = (array) => {
 	for (const item of array) if (item != null && item !== "") result.push(item);
 	return result;
 };
-const resolveUrl = (url, baseUrl) => {
-	try {
-		return new URL(url, baseUrl).href;
-	} catch {
-		return;
-	}
-};
 const matchesAnyOfLinkSelectors = (rel, type, selectors) => {
 	return selectors.some((selector) => {
 		if (!anyWordMatchesAnyOf(rel, [selector.rel])) return false;
@@ -83,4 +76,4 @@ const processConcurrently = async (items, processFn, options) => {
 	}
 };
 //#endregion
-export { anyWordMatchesAnyOf, composeHint, endsWithAnyOf, hasMetaContent, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf, matchesAnyOfLinkSelectors, omitEmpty, processConcurrently, resolveUrl };
+export { anyWordMatchesAnyOf, composeHint, endsWithAnyOf, hasMetaContent, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf, matchesAnyOfLinkSelectors, omitEmpty, processConcurrently };

package/dist/favicons/extractors.cjs

@@ -11,7 +11,7 @@ const isImageContent = (content) => {
 const isSuccessStatus = (status) => {
 	return status !== void 0 && status >= 200 && status < 400;
 };
-const defaultExtractor = (input) => {
+const defaultExtractFn = (input) => {
 	if (isImageContentType(input.headers) || isImageContent(input.content) || isSuccessStatus(input.status)) return {
 		url: input.url,
 		isValid: true
@@ -22,4 +22,4 @@ const defaultExtractor = (input) => {
 	};
 };
 //#endregion
-exports.defaultExtractor = defaultExtractor;
+exports.defaultExtractFn = defaultExtractFn;

package/dist/favicons/extractors.d.cts

@@ -2,6 +2,6 @@ import { DiscoverExtractFn } from "../common/types.cjs";
 import { FaviconResult } from "./types.cjs";
 
 //#region src/favicons/extractors.d.ts
-declare const defaultExtractor: DiscoverExtractFn<FaviconResult>;
+declare const defaultExtractFn: DiscoverExtractFn<FaviconResult>;
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/favicons/extractors.d.ts

@@ -2,6 +2,6 @@ import { DiscoverExtractFn } from "../common/types.js";
 import { FaviconResult } from "./types.js";
 
 //#region src/favicons/extractors.d.ts
-declare const defaultExtractor: DiscoverExtractFn<FaviconResult>;
+declare const defaultExtractFn: DiscoverExtractFn<FaviconResult>;
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/favicons/extractors.js

@@ -11,7 +11,7 @@ const isImageContent = (content) => {
 const isSuccessStatus = (status) => {
 	return status !== void 0 && status >= 200 && status < 400;
 };
-const defaultExtractor = (input) => {
+const defaultExtractFn = (input) => {
 	if (isImageContentType(input.headers) || isImageContent(input.content) || isSuccessStatus(input.status)) return {
 		url: input.url,
 		isValid: true
@@ -22,4 +22,4 @@ const defaultExtractor = (input) => {
 	};
 };
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/favicons/index.cjs

@@ -1,7 +1,6 @@
-const require_utils = require("../common/utils.cjs");
-const require_utils$1 = require("../common/discover/utils.cjs");
+const require_defaults = require("../common/discover/defaults.cjs");
 const require_index = require("../common/discover/index.cjs");
-const require_defaults = require("./defaults.cjs");
+const require_defaults$1 = require("./defaults.cjs");
 const require_extractors = require("./extractors.cjs");
 //#region src/favicons/index.ts
 const discoverFavicons = (input, options = {}) => {
@@ -14,16 +13,16 @@ const discoverFavicons = (input, options = {}) => {
 			"headers",
 			"guess"
 		],
-		fetchFn: options.fetchFn ?? require_utils$1.defaultFetchFn,
-		extractFn: options.extractFn ?? require_extractors.defaultExtractor,
-		resolveUrlFn: options.resolveUrlFn ?? require_utils.resolveUrl,
-		resolveSiteUrlFn: options.resolveSiteUrlFn ?? require_utils$1.defaultResolveSiteUrlFn
+		fetchFn: options.fetchFn ?? require_defaults.defaultFetchFn,
+		extractFn: options.extractFn ?? require_extractors.defaultExtractFn,
+		resolveUrlFn: options.resolveUrlFn ?? require_defaults.defaultResolveUrlFn,
+		resolveSiteUrlFn: options.resolveSiteUrlFn ?? require_defaults.defaultResolveSiteUrlFn
 	}, {
-		platform: require_defaults.defaultPlatformOptions,
-		feed: require_defaults.defaultFeedOptions,
-		html: require_defaults.defaultHtmlOptions,
-		headers: require_defaults.defaultHeadersOptions,
-		guess: require_defaults.defaultGuessOptions
+		platform: require_defaults$1.defaultPlatformOptions,
+		feed: require_defaults$1.defaultFeedOptions,
+		html: require_defaults$1.defaultHtmlOptions,
+		headers: require_defaults$1.defaultHeadersOptions,
+		guess: require_defaults$1.defaultGuessOptions
 	});
 };
 //#endregion

package/dist/favicons/index.js

@@ -1,8 +1,7 @@
-import { resolveUrl } from "../common/utils.js";
-import { defaultFetchFn, defaultResolveSiteUrlFn } from "../common/discover/utils.js";
+import { defaultFetchFn, defaultResolveSiteUrlFn, defaultResolveUrlFn } from "../common/discover/defaults.js";
 import { discover } from "../common/discover/index.js";
 import { defaultFeedOptions, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions } from "./defaults.js";
-import { defaultExtractor } from "./extractors.js";
+import { defaultExtractFn } from "./extractors.js";
 //#region src/favicons/index.ts
 const discoverFavicons = (input, options = {}) => {
 	return discover(input, {
@@ -15,8 +14,8 @@ const discoverFavicons = (input, options = {}) => {
 			"guess"
 		],
 		fetchFn: options.fetchFn ?? defaultFetchFn,
-		extractFn: options.extractFn ?? defaultExtractor,
-		resolveUrlFn: options.resolveUrlFn ?? resolveUrl,
+		extractFn: options.extractFn ?? defaultExtractFn,
+		resolveUrlFn: options.resolveUrlFn ?? defaultResolveUrlFn,
 		resolveSiteUrlFn: options.resolveSiteUrlFn ?? defaultResolveSiteUrlFn
 	}, {
 		platform: defaultPlatformOptions,

package/dist/favicons.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_defaults = require("./favicons/defaults.cjs");
 const require_extractors = require("./favicons/extractors.cjs");
-exports.defaultExtractor = require_extractors.defaultExtractor;
+exports.defaultExtractFn = require_extractors.defaultExtractFn;
 exports.defaultFeedOptions = require_defaults.defaultFeedOptions;
 exports.defaultGuessOptions = require_defaults.defaultGuessOptions;
 exports.defaultGuessPaths = require_defaults.defaultGuessPaths;

package/dist/favicons.d.cts

@@ -1,4 +1,4 @@
 import { defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors } from "./favicons/defaults.cjs";
 import { FaviconResult } from "./favicons/types.cjs";
-import { defaultExtractor } from "./favicons/extractors.cjs";
-export { FaviconResult, defaultExtractor, defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors };
+import { defaultExtractFn } from "./favicons/extractors.cjs";
+export { FaviconResult, defaultExtractFn, defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors };

package/dist/favicons.d.ts

@@ -1,4 +1,4 @@
 import { defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors } from "./favicons/defaults.js";
 import { FaviconResult } from "./favicons/types.js";
-import { defaultExtractor } from "./favicons/extractors.js";
-export { FaviconResult, defaultExtractor, defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors };
+import { defaultExtractFn } from "./favicons/extractors.js";
+export { FaviconResult, defaultExtractFn, defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors };

package/dist/favicons.js

@@ -1,3 +1,3 @@
 import { defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors } from "./favicons/defaults.js";
-import { defaultExtractor } from "./favicons/extractors.js";
-export { defaultExtractor, defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors };
+import { defaultExtractFn } from "./favicons/extractors.js";
+export { defaultExtractFn, defaultFeedOptions, defaultGuessOptions, defaultGuessPaths, defaultHeadersOptions, defaultHtmlOptions, defaultIconRels, defaultPlatformOptions, linkSelectors };

package/dist/feeds/extractors.cjs

@@ -1,8 +1,8 @@
-const require_utils = require("../common/utils.cjs");
-const require_utils$1 = require("../common/discover/utils.cjs");
+const require_utils = require("../common/discover/utils.cjs");
+const require_defaults = require("../common/discover/defaults.cjs");
 let feedsmith = require("feedsmith");
 //#region src/feeds/extractors.ts
-const defaultExtractor = ({ content, url }) => {
+const defaultExtractFn = ({ content, url }) => {
 	if (!content) return {
 		url,
 		isValid: false
@@ -10,8 +10,8 @@ const defaultExtractor = ({ content, url }) => {
 	try {
 		const parsed = (0, feedsmith.parseFeed)(content);
 		const { format, feed } = parsed;
-		const rawSiteUrl = require_utils$1.getFeedSiteUrl(parsed);
-		const siteUrl = rawSiteUrl ? require_utils.resolveUrl(rawSiteUrl, url) : void 0;
+		const rawSiteUrl = require_utils.getFeedSiteUrl(parsed);
+		const siteUrl = rawSiteUrl ? require_defaults.defaultResolveUrlFn(rawSiteUrl, url) : void 0;
 		if (format === "rss" || format === "rdf") return {
 			url,
 			isValid: true,
@@ -43,4 +43,4 @@ const defaultExtractor = ({ content, url }) => {
 	};
 };
 //#endregion
-exports.defaultExtractor = defaultExtractor;
+exports.defaultExtractFn = defaultExtractFn;

package/dist/feeds/extractors.d.cts

@@ -2,6 +2,6 @@ import { DiscoverExtractFn } from "../common/types.cjs";
 import { FeedResult } from "./types.cjs";
 
 //#region src/feeds/extractors.d.ts
-declare const defaultExtractor: DiscoverExtractFn<FeedResult>;
+declare const defaultExtractFn: DiscoverExtractFn<FeedResult>;
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/feeds/extractors.d.ts

@@ -2,6 +2,6 @@ import { DiscoverExtractFn } from "../common/types.js";
 import { FeedResult } from "./types.js";
 
 //#region src/feeds/extractors.d.ts
-declare const defaultExtractor: DiscoverExtractFn<FeedResult>;
+declare const defaultExtractFn: DiscoverExtractFn<FeedResult>;
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/feeds/extractors.js

@@ -1,8 +1,8 @@
-import { resolveUrl } from "../common/utils.js";
 import { getFeedSiteUrl } from "../common/discover/utils.js";
+import { defaultResolveUrlFn } from "../common/discover/defaults.js";
 import { parseFeed } from "feedsmith";
 //#region src/feeds/extractors.ts
-const defaultExtractor = ({ content, url }) => {
+const defaultExtractFn = ({ content, url }) => {
 	if (!content) return {
 		url,
 		isValid: false
@@ -11,7 +11,7 @@ const defaultExtractor = ({ content, url }) => {
 		const parsed = parseFeed(content);
 		const { format, feed } = parsed;
 		const rawSiteUrl = getFeedSiteUrl(parsed);
-		const siteUrl = rawSiteUrl ? resolveUrl(rawSiteUrl, url) : void 0;
+		const siteUrl = rawSiteUrl ? defaultResolveUrlFn(rawSiteUrl, url) : void 0;
 		if (format === "rss" || format === "rdf") return {
 			url,
 			isValid: true,
@@ -43,4 +43,4 @@ const defaultExtractor = ({ content, url }) => {
 	};
 };
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

package/dist/feeds/index.cjs

@@ -1,7 +1,6 @@
-const require_utils = require("../common/utils.cjs");
-const require_utils$1 = require("../common/discover/utils.cjs");
+const require_defaults = require("../common/discover/defaults.cjs");
 const require_index = require("../common/discover/index.cjs");
-const require_defaults = require("./defaults.cjs");
+const require_defaults$1 = require("./defaults.cjs");
 const require_extractors = require("./extractors.cjs");
 //#region src/feeds/index.ts
 const discoverFeeds = (input, options = {}) => {
@@ -13,14 +12,14 @@ const discoverFeeds = (input, options = {}) => {
 			"headers",
 			"guess"
 		],
-		fetchFn: options.fetchFn ?? require_utils$1.defaultFetchFn,
-		extractFn: options.extractFn ?? require_extractors.defaultExtractor,
-		resolveUrlFn: options.resolveUrlFn ?? require_utils.resolveUrl
+		fetchFn: options.fetchFn ?? require_defaults.defaultFetchFn,
+		extractFn: options.extractFn ?? require_extractors.defaultExtractFn,
+		resolveUrlFn: options.resolveUrlFn ?? require_defaults.defaultResolveUrlFn
 	}, {
-		platform: require_defaults.defaultPlatformOptions,
-		html: require_defaults.defaultHtmlOptions,
-		headers: require_defaults.defaultHeadersOptions,
-		guess: require_defaults.defaultGuessOptions
+		platform: require_defaults$1.defaultPlatformOptions,
+		html: require_defaults$1.defaultHtmlOptions,
+		headers: require_defaults$1.defaultHeadersOptions,
+		guess: require_defaults$1.defaultGuessOptions
 	});
 };
 //#endregion

package/dist/feeds/index.js

@@ -1,8 +1,7 @@
-import { resolveUrl } from "../common/utils.js";
-import { defaultFetchFn } from "../common/discover/utils.js";
+import { defaultFetchFn, defaultResolveUrlFn } from "../common/discover/defaults.js";
 import { discover } from "../common/discover/index.js";
 import { defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions } from "./defaults.js";
-import { defaultExtractor } from "./extractors.js";
+import { defaultExtractFn } from "./extractors.js";
 //#region src/feeds/index.ts
 const discoverFeeds = (input, options = {}) => {
 	return discover(input, {
@@ -14,8 +13,8 @@ const discoverFeeds = (input, options = {}) => {
 			"guess"
 		],
 		fetchFn: options.fetchFn ?? defaultFetchFn,
-		extractFn: options.extractFn ?? defaultExtractor,
-		resolveUrlFn: options.resolveUrlFn ?? resolveUrl
+		extractFn: options.extractFn ?? defaultExtractFn,
+		resolveUrlFn: options.resolveUrlFn ?? defaultResolveUrlFn
 	}, {
 		platform: defaultPlatformOptions,
 		html: defaultHtmlOptions,

package/dist/feeds.cjs

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_defaults = require("./feeds/defaults.cjs");
 const require_extractors = require("./feeds/extractors.cjs");
 exports.anchorLabels = require_defaults.anchorLabels;
-exports.defaultExtractor = require_extractors.defaultExtractor;
+exports.defaultExtractFn = require_extractors.defaultExtractFn;
 exports.defaultGuessOptions = require_defaults.defaultGuessOptions;
 exports.defaultHeadersOptions = require_defaults.defaultHeadersOptions;
 exports.defaultHtmlOptions = require_defaults.defaultHtmlOptions;

package/dist/feeds.d.cts

@@ -1,4 +1,4 @@
 import { anchorLabels, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal } from "./feeds/defaults.cjs";
 import { FeedResult } from "./feeds/types.cjs";
-import { defaultExtractor } from "./feeds/extractors.cjs";
-export { FeedResult, anchorLabels, defaultExtractor, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };
+import { defaultExtractFn } from "./feeds/extractors.cjs";
+export { FeedResult, anchorLabels, defaultExtractFn, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };

package/dist/feeds.d.ts

@@ -1,4 +1,4 @@
 import { anchorLabels, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal } from "./feeds/defaults.js";
 import { FeedResult } from "./feeds/types.js";
-import { defaultExtractor } from "./feeds/extractors.js";
-export { FeedResult, anchorLabels, defaultExtractor, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };
+import { defaultExtractFn } from "./feeds/extractors.js";
+export { FeedResult, anchorLabels, defaultExtractFn, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };

package/dist/feeds.js

@@ -1,3 +1,3 @@
 import { anchorLabels, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal } from "./feeds/defaults.js";
-import { defaultExtractor } from "./feeds/extractors.js";
-export { anchorLabels, defaultExtractor, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };
+import { defaultExtractFn } from "./feeds/extractors.js";
+export { anchorLabels, defaultExtractFn, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions, ignoredUris, linkSelectors, mimeTypes, urisBalanced, urisComprehensive, urisMinimal };

package/dist/hubs/discover/index.cjs

@@ -1,5 +1,5 @@
-const require_utils = require("../../common/utils.cjs");
-const require_utils$1 = require("../../common/discover/utils.cjs");
+const require_utils = require("../../common/discover/utils.cjs");
+const require_defaults = require("../../common/discover/defaults.cjs");
 const require_index = require("../feed/index.cjs");
 const require_index$1 = require("../headers/index.cjs");
 const require_index$2 = require("../html/index.cjs");
@@ -9,8 +9,8 @@ const discoverHubs = async (input, options = {}) => {
 		"headers",
 		"feed",
 		"html"
-	], fetchFn = require_utils$1.defaultFetchFn, resolveUrlFn = require_utils.resolveUrl } = options;
-	const normalizedInput = await require_utils$1.normalizeInput(input, fetchFn);
+	], fetchFn = require_defaults.defaultFetchFn, resolveUrlFn = require_defaults.defaultResolveUrlFn } = options;
+	const normalizedInput = await require_utils.normalizeInput(input, fetchFn);
 	const results = [];
 	if (methods.includes("headers") && normalizedInput.headers) {
 		const headerHubs = require_index$1.discoverHubsFromHeaders(normalizedInput.headers, normalizedInput.url, resolveUrlFn);

package/dist/hubs/discover/index.js

@@ -1,5 +1,5 @@
-import { resolveUrl } from "../../common/utils.js";
-import { defaultFetchFn, normalizeInput } from "../../common/discover/utils.js";
+import { normalizeInput } from "../../common/discover/utils.js";
+import { defaultFetchFn, defaultResolveUrlFn } from "../../common/discover/defaults.js";
 import { discoverHubsFromFeed } from "../feed/index.js";
 import { discoverHubsFromHeaders } from "../headers/index.js";
 import { discoverHubsFromHtml } from "../html/index.js";
@@ -9,7 +9,7 @@ const discoverHubs = async (input, options = {}) => {
 		"headers",
 		"feed",
 		"html"
-	], fetchFn = defaultFetchFn, resolveUrlFn = resolveUrl } = options;
+	], fetchFn = defaultFetchFn, resolveUrlFn = defaultResolveUrlFn } = options;
 	const normalizedInput = await normalizeInput(input, fetchFn);
 	const results = [];
 	if (methods.includes("headers") && normalizedInput.headers) {

package/dist/hubs/feed/index.cjs

@@ -1,10 +1,10 @@
-const require_utils = require("../../common/utils.cjs");
+const require_defaults = require("../../common/discover/defaults.cjs");
 let feedsmith = require("feedsmith");
 //#region src/hubs/feed/index.ts
 const getLinksWithRel = (links, rel) => {
 	return links?.filter((link) => link.rel === rel && link.href).map((link) => link.href) ?? [];
 };
-const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = require_utils.resolveUrl) => {
+const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = require_defaults.defaultResolveUrlFn) => {
 	try {
 		const { format, feed } = (0, feedsmith.parseFeed)(content);
 		if (format === "json") {

package/dist/hubs/feed/index.js

@@ -1,10 +1,10 @@
-import { resolveUrl } from "../../common/utils.js";
+import { defaultResolveUrlFn } from "../../common/discover/defaults.js";
 import { parseFeed } from "feedsmith";
 //#region src/hubs/feed/index.ts
 const getLinksWithRel = (links, rel) => {
 	return links?.filter((link) => link.rel === rel && link.href).map((link) => link.href) ?? [];
 };
-const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = resolveUrl) => {
+const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = defaultResolveUrlFn) => {
 	try {
 		const { format, feed } = parseFeed(content);
 		if (format === "json") {

package/dist/hubs/headers/index.cjs

@@ -1,9 +1,9 @@
-const require_utils = require("../../common/utils.cjs");
+const require_defaults = require("../../common/discover/defaults.cjs");
 const require_index = require("../../common/uris/headers/index.cjs");
 //#region src/hubs/headers/index.ts
 const hubSelector = [{ rel: "hub" }];
 const selfSelector = [{ rel: "self" }];
-const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = require_utils.resolveUrl) => {
+const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = require_defaults.defaultResolveUrlFn) => {
 	const hubUris = require_index.discoverUrisFromHeaders(headers, { linkSelectors: hubSelector });
 	if (hubUris.length === 0) return [];
 	const selfUris = require_index.discoverUrisFromHeaders(headers, { linkSelectors: selfSelector });

package/dist/hubs/headers/index.js

@@ -1,9 +1,9 @@
-import { resolveUrl } from "../../common/utils.js";
+import { defaultResolveUrlFn } from "../../common/discover/defaults.js";
 import { discoverUrisFromHeaders } from "../../common/uris/headers/index.js";
 //#region src/hubs/headers/index.ts
 const hubSelector = [{ rel: "hub" }];
 const selfSelector = [{ rel: "self" }];
-const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = resolveUrl) => {
+const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = defaultResolveUrlFn) => {
 	const hubUris = discoverUrisFromHeaders(headers, { linkSelectors: hubSelector });
 	if (hubUris.length === 0) return [];
 	const selfUris = discoverUrisFromHeaders(headers, { linkSelectors: selfSelector });

package/dist/hubs/html/index.cjs

@@ -1,4 +1,4 @@
-const require_utils = require("../../common/utils.cjs");
+const require_defaults = require("../../common/discover/defaults.cjs");
 const require_index = require("../../common/uris/html/index.cjs");
 //#region src/hubs/html/index.ts
 const hubSelector = [{ rel: "hub" }];
@@ -8,7 +8,7 @@ const htmlOptions = {
 	anchorIgnoredUris: [],
 	anchorLabels: []
 };
-const discoverHubsFromHtml = (content, baseUrl, resolveUrlFn = require_utils.resolveUrl) => {
+const discoverHubsFromHtml = (content, baseUrl, resolveUrlFn = require_defaults.defaultResolveUrlFn) => {
 	const hubUris = require_index.discoverUrisFromHtml(content, {
 		...htmlOptions,
 		linkSelectors: hubSelector

package/dist/hubs/html/index.js

@@ -1,4 +1,4 @@
-import { resolveUrl } from "../../common/utils.js";
+import { defaultResolveUrlFn } from "../../common/discover/defaults.js";
 import { discoverUrisFromHtml } from "../../common/uris/html/index.js";
 //#region src/hubs/html/index.ts
 const hubSelector = [{ rel: "hub" }];
@@ -8,7 +8,7 @@ const htmlOptions = {
 	anchorIgnoredUris: [],
 	anchorLabels: []
 };
-const discoverHubsFromHtml = (content, baseUrl, resolveUrlFn = resolveUrl) => {
+const discoverHubsFromHtml = (content, baseUrl, resolveUrlFn = defaultResolveUrlFn) => {
 	const hubUris = discoverUrisFromHtml(content, {
 		...htmlOptions,
 		linkSelectors: hubSelector

package/dist/index.cjs

@@ -1,10 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_utils = require("./common/discover/utils.cjs");
+const require_defaults = require("./common/discover/defaults.cjs");
 const require_index = require("./blogrolls/index.cjs");
 const require_index$1 = require("./favicons/index.cjs");
 const require_index$2 = require("./feeds/index.cjs");
 const require_index$3 = require("./hubs/discover/index.cjs");
-exports.defaultResolveSiteUrlFn = require_utils.defaultResolveSiteUrlFn;
+exports.defaultResolveSiteUrlFn = require_defaults.defaultResolveSiteUrlFn;
 exports.discoverBlogrolls = require_index.discoverBlogrolls;
 exports.discoverFavicons = require_index$1.discoverFavicons;
 exports.discoverFeeds = require_index$2.discoverFeeds;

package/dist/index.d.cts

@@ -1,6 +1,7 @@
 import { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethod, DiscoverMethodsConfig, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResolveSiteUrlFn, DiscoverResolveUrlFn, DiscoverResult, DiscoverUriEntry, DiscoverUriHint, UriEntry } from "./common/types.cjs";
 import { discoverBlogrolls } from "./blogrolls/index.cjs";
-import { defaultResolveSiteUrlFn, getFeedSiteUrl } from "./common/discover/utils.cjs";
+import { defaultResolveSiteUrlFn } from "./common/discover/defaults.cjs";
+import { getFeedSiteUrl } from "./common/discover/utils.cjs";
 import { discoverFavicons } from "./favicons/index.cjs";
 import { discoverFeeds } from "./feeds/index.cjs";
 import { discoverHubs } from "./hubs/discover/index.cjs";

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethod, DiscoverMethodsConfig, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResolveSiteUrlFn, DiscoverResolveUrlFn, DiscoverResult, DiscoverUriEntry, DiscoverUriHint, UriEntry } from "./common/types.js";
 import { discoverBlogrolls } from "./blogrolls/index.js";
-import { defaultResolveSiteUrlFn, getFeedSiteUrl } from "./common/discover/utils.js";
+import { defaultResolveSiteUrlFn } from "./common/discover/defaults.js";
+import { getFeedSiteUrl } from "./common/discover/utils.js";
 import { discoverFavicons } from "./favicons/index.js";
 import { discoverFeeds } from "./feeds/index.js";
 import { discoverHubs } from "./hubs/discover/index.js";

package/dist/index.js

@@ -1,4 +1,5 @@
-import { defaultResolveSiteUrlFn, getFeedSiteUrl } from "./common/discover/utils.js";
+import { getFeedSiteUrl } from "./common/discover/utils.js";
+import { defaultResolveSiteUrlFn } from "./common/discover/defaults.js";
 import { discoverBlogrolls } from "./blogrolls/index.js";
 import { discoverFavicons } from "./favicons/index.js";
 import { discoverFeeds } from "./feeds/index.js";

package/package.json

@@ -117,5 +117,5 @@
     "tsdown": "^0.21.7",
     "vitepress": "^2.0.0-alpha.17"
   },
-  "version": "1.8.0"
+  "version": "1.8.1"
 }