feedscout 1.8.0 → 2.0.0-next.1

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.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.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.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.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.d.ts

@@ -1,8 +1,5 @@
-import { DiscoverResolveSiteUrlFn } from "../types.js";
-import { parseFeed } from "feedsmith";
-
+import { FeedMethodData } from "../uris/feed/types.js";
 //#region src/common/discover/utils.d.ts
-declare const getFeedSiteUrl: (parsed: ReturnType<typeof parseFeed>) => string | undefined;
-declare const defaultResolveSiteUrlFn: DiscoverResolveSiteUrlFn;
+declare const getFeedSiteUrl: (parsed: FeedMethodData) => string | undefined;
 //#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.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/uris/feed/types.d.ts

@@ -1,9 +1,9 @@
 import { parseFeed } from "feedsmith";
 
 //#region src/common/uris/feed/types.d.ts
-type FeedMethodData = ReturnType<typeof parseFeed>;
+type FeedMethodData = ReturnType<typeof parseFeed<string>>;
 type FeedMethodOptions = {
   extractUrls: (params: FeedMethodData) => Array<string>;
 };
 //#endregion
-export { FeedMethodOptions };
+export { FeedMethodData, FeedMethodOptions };

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.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.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.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.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,
@@ -24,8 +24,8 @@ const defaultExtractor = ({ content, url }) => {
 			url,
 			isValid: true,
 			format,
-			title: feed.title,
-			description: feed.subtitle,
+			title: feed.title?.value,
+			description: feed.subtitle?.value,
 			siteUrl
 		};
 		if (format === "json") return {
@@ -43,4 +43,4 @@ const defaultExtractor = ({ content, url }) => {
 	};
 };
 //#endregion
-export { defaultExtractor };
+export { defaultExtractFn };

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.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.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.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.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.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.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

@@ -26,74 +26,32 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      }
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     },
     "./feeds": {
-      "import": {
-        "types": "./dist/feeds.d.ts",
-        "default": "./dist/feeds.js"
-      },
-      "require": {
-        "types": "./dist/feeds.d.cts",
-        "default": "./dist/feeds.cjs"
-      }
+      "types": "./dist/feeds.d.ts",
+      "default": "./dist/feeds.js"
     },
     "./blogrolls": {
-      "import": {
-        "types": "./dist/blogrolls.d.ts",
-        "default": "./dist/blogrolls.js"
-      },
-      "require": {
-        "types": "./dist/blogrolls.d.cts",
-        "default": "./dist/blogrolls.cjs"
-      }
+      "types": "./dist/blogrolls.d.ts",
+      "default": "./dist/blogrolls.js"
     },
     "./favicons": {
-      "import": {
-        "types": "./dist/favicons.d.ts",
-        "default": "./dist/favicons.js"
-      },
-      "require": {
-        "types": "./dist/favicons.d.cts",
-        "default": "./dist/favicons.cjs"
-      }
+      "types": "./dist/favicons.d.ts",
+      "default": "./dist/favicons.js"
     },
     "./hubs": {
-      "import": {
-        "types": "./dist/hubs.d.ts",
-        "default": "./dist/hubs.js"
-      },
-      "require": {
-        "types": "./dist/hubs.d.cts",
-        "default": "./dist/hubs.cjs"
-      }
+      "types": "./dist/hubs.d.ts",
+      "default": "./dist/hubs.js"
     },
     "./methods": {
-      "import": {
-        "types": "./dist/methods.d.ts",
-        "default": "./dist/methods.js"
-      },
-      "require": {
-        "types": "./dist/methods.d.cts",
-        "default": "./dist/methods.cjs"
-      }
+      "types": "./dist/methods.d.ts",
+      "default": "./dist/methods.js"
     },
     "./utils": {
-      "import": {
-        "types": "./dist/utils.d.ts",
-        "default": "./dist/utils.js"
-      },
-      "require": {
-        "types": "./dist/utils.d.cts",
-        "default": "./dist/utils.cjs"
-      }
+      "types": "./dist/utils.d.ts",
+      "default": "./dist/utils.js"
     },
     "./package.json": "./package.json"
   },
@@ -102,14 +60,13 @@
   ],
   "scripts": {
     "prepare": "lefthook install",
-    "build": "tsdown src/exports/index.ts src/exports/feeds.ts src/exports/blogrolls.ts src/exports/favicons.ts src/exports/hubs.ts src/exports/methods.ts src/exports/utils.ts --format cjs,esm --dts --clean --unbundle --no-fixed-extension",
+    "build": "tsdown src/exports/index.ts src/exports/feeds.ts src/exports/blogrolls.ts src/exports/favicons.ts src/exports/hubs.ts src/exports/methods.ts src/exports/utils.ts --format esm --dts --clean --unbundle --no-fixed-extension",
     "docs:dev": "vitepress dev docs",
     "docs:build": "vitepress build docs"
   },
   "dependencies": {
-    "feedsmith": "^2.9.1",
-    "htmlparser2": "^10.1.0",
-    "typescript": "^6.0.2"
+    "feedsmith": "^3.0.0-beta.1",
+    "htmlparser2": "^12.0.0"
   },
   "devDependencies": {
     "@types/bun": "^1.3.11",
@@ -117,5 +74,5 @@
     "tsdown": "^0.21.7",
     "vitepress": "^2.0.0-alpha.17"
   },
-  "version": "1.8.0"
+  "version": "2.0.0-next.1"
 }

package/dist/blogrolls/defaults.cjs

@@ -1,51 +0,0 @@
-//#region src/blogrolls/defaults.ts
-const mimeTypes = [
-	"text/x-opml",
-	"application/xml",
-	"text/xml"
-];
-const urisMinimal = [
-	"/.well-known/recommendations.opml",
-	"/blogroll.opml",
-	"/opml.xml"
-];
-const urisBalanced = [
-	...urisMinimal,
-	"/blogroll.xml",
-	"/subscriptions.opml",
-	"/recommendations.opml"
-];
-const urisComprehensive = [
-	...urisBalanced,
-	"/links.opml",
-	"/feeds.opml",
-	"/subscriptions.xml"
-];
-const anchorLabels = [
-	"blogroll",
-	"opml",
-	"subscriptions",
-	"reading list"
-];
-const linkSelectors = [{ rel: "blogroll" }, {
-	rel: "outline",
-	types: mimeTypes
-}];
-const defaultHtmlOptions = {
-	linkSelectors,
-	anchorUris: urisComprehensive,
-	anchorIgnoredUris: [],
-	anchorLabels
-};
-const defaultHeadersOptions = { linkSelectors };
-const defaultGuessOptions = { uris: urisBalanced };
-//#endregion
-exports.anchorLabels = anchorLabels;
-exports.defaultGuessOptions = defaultGuessOptions;
-exports.defaultHeadersOptions = defaultHeadersOptions;
-exports.defaultHtmlOptions = defaultHtmlOptions;
-exports.linkSelectors = linkSelectors;
-exports.mimeTypes = mimeTypes;
-exports.urisBalanced = urisBalanced;
-exports.urisComprehensive = urisComprehensive;
-exports.urisMinimal = urisMinimal;