feedscout 1.4.0 → 1.5.0

package/dist/common/discover/index.cjs

@@ -1,3 +1,4 @@
+const require_types = require('../types.cjs');
 const require_utils = require('../utils.cjs');
 const require_index = require('../uris/index.cjs');
 const require_utils$1 = require('./utils.cjs');
@@ -13,40 +14,70 @@ const discover = async (input, options, defaults) => {
 		});
 		if (result.isValid) return [result];
 	}
-	const rawUris = require_index.discoverUris(require_utils$1.normalizeMethodsConfig(normalizedInput, methods, defaults), stopOnFirstMethod);
-	const uris = [...new Set(rawUris.map((uri) => normalizeUrlFn(uri, normalizedInput.url)))];
+	const urisByMethod = require_index.discoverUris(require_utils$1.normalizeMethodsConfig(normalizedInput, methods, defaults));
+	const seen = /* @__PURE__ */ new Set();
+	const methodGroups = [];
+	for (const method of require_types.discoverMethodOrder) {
+		const rawUris = urisByMethod[method];
+		if (!rawUris?.length) continue;
+		const unique = rawUris.map((entry) => {
+			return require_utils$1.normalizeUriEntry(entry, normalizeUrlFn, normalizedInput.url);
+		}).filter((entry) => {
+			const key = typeof entry.uri === "string" ? entry.uri : entry.uri.join("\0");
+			if (seen.has(key)) return false;
+			seen.add(key);
+			return true;
+		});
+		if (unique.length > 0) methodGroups.push(unique);
+	}
+	const total = methodGroups.reduce((sum, group) => sum + group.length, 0);
 	const results = [];
 	let tested = 0;
 	let found = 0;
-	const processUri = async (url) => {
+	const fetchAndExtract = async (url) => {
 		try {
 			const fetchResult = await fetchFn(url);
-			const extractResult = await extractFn({
+			return await extractFn({
 				url: fetchResult.url,
 				content: typeof fetchResult.body === "string" ? fetchResult.body : ""
 			});
-			results.push(extractResult);
-			if (extractResult.isValid) found += 1;
 		} catch (error) {
-			results.push({
+			return {
 				url,
 				isValid: false,
 				error
-			});
-		} finally {
+			};
+		}
+	};
+	const processUri = async (entry) => {
+		const alternatives = typeof entry.uri === "string" ? [entry.uri] : entry.uri;
+		for (const url of alternatives) {
+			const result = await fetchAndExtract(url);
+			results.push(entry.hint ? {
+				...result,
+				hint: entry.hint
+			} : result);
 			tested += 1;
+			if (result.isValid) found += 1;
 			onProgress?.({
 				tested,
-				total: uris.length,
+				total,
 				found,
 				current: url
 			});
+			if (result.isValid) break;
 		}
 	};
-	await require_utils.processConcurrently(uris, processUri, {
-		concurrency,
-		shouldStop: () => stopOnFirstResult && found > 0
-	});
+	for (const group of methodGroups) {
+		const foundBefore = found;
+		await require_utils.processConcurrently(group, processUri, {
+			concurrency,
+			shouldStop: () => {
+				return stopOnFirstResult && found > 0;
+			}
+		});
+		if (stopOnFirstMethod && found > foundBefore) break;
+	}
 	return includeInvalid ? results : results.filter((result) => result.isValid);
 };
 

package/dist/common/discover/index.js

@@ -1,6 +1,7 @@
+import { discoverMethodOrder } from "../types.js";
 import { processConcurrently } from "../utils.js";
 import { discoverUris } from "../uris/index.js";
-import { normalizeInput, normalizeMethodsConfig } from "./utils.js";
+import { normalizeInput, normalizeMethodsConfig, normalizeUriEntry } from "./utils.js";
 
 //#region src/common/discover/index.ts
 const discover = async (input, options, defaults) => {
@@ -13,40 +14,70 @@ const discover = async (input, options, defaults) => {
 		});
 		if (result.isValid) return [result];
 	}
-	const rawUris = discoverUris(normalizeMethodsConfig(normalizedInput, methods, defaults), stopOnFirstMethod);
-	const uris = [...new Set(rawUris.map((uri) => normalizeUrlFn(uri, normalizedInput.url)))];
+	const urisByMethod = discoverUris(normalizeMethodsConfig(normalizedInput, methods, defaults));
+	const seen = /* @__PURE__ */ new Set();
+	const methodGroups = [];
+	for (const method of discoverMethodOrder) {
+		const rawUris = urisByMethod[method];
+		if (!rawUris?.length) continue;
+		const unique = rawUris.map((entry) => {
+			return normalizeUriEntry(entry, normalizeUrlFn, normalizedInput.url);
+		}).filter((entry) => {
+			const key = typeof entry.uri === "string" ? entry.uri : entry.uri.join("\0");
+			if (seen.has(key)) return false;
+			seen.add(key);
+			return true;
+		});
+		if (unique.length > 0) methodGroups.push(unique);
+	}
+	const total = methodGroups.reduce((sum, group) => sum + group.length, 0);
 	const results = [];
 	let tested = 0;
 	let found = 0;
-	const processUri = async (url) => {
+	const fetchAndExtract = async (url) => {
 		try {
 			const fetchResult = await fetchFn(url);
-			const extractResult = await extractFn({
+			return await extractFn({
 				url: fetchResult.url,
 				content: typeof fetchResult.body === "string" ? fetchResult.body : ""
 			});
-			results.push(extractResult);
-			if (extractResult.isValid) found += 1;
 		} catch (error) {
-			results.push({
+			return {
 				url,
 				isValid: false,
 				error
-			});
-		} finally {
+			};
+		}
+	};
+	const processUri = async (entry) => {
+		const alternatives = typeof entry.uri === "string" ? [entry.uri] : entry.uri;
+		for (const url of alternatives) {
+			const result = await fetchAndExtract(url);
+			results.push(entry.hint ? {
+				...result,
+				hint: entry.hint
+			} : result);
 			tested += 1;
+			if (result.isValid) found += 1;
 			onProgress?.({
 				tested,
-				total: uris.length,
+				total,
 				found,
 				current: url
 			});
+			if (result.isValid) break;
 		}
 	};
-	await processConcurrently(uris, processUri, {
-		concurrency,
-		shouldStop: () => stopOnFirstResult && found > 0
-	});
+	for (const group of methodGroups) {
+		const foundBefore = found;
+		await processConcurrently(group, processUri, {
+			concurrency,
+			shouldStop: () => {
+				return stopOnFirstResult && found > 0;
+			}
+		});
+		if (stopOnFirstMethod && found > foundBefore) break;
+	}
 	return includeInvalid ? results : results.filter((result) => result.isValid);
 };
 

package/dist/common/discover/utils.cjs

@@ -23,6 +23,16 @@ const normalizeInput = async (input, fetchFn) => {
 		headers: response.headers
 	};
 };
+const normalizeUriEntry = (entry, normalizeUrlFn, baseUrl) => {
+	if (typeof entry.uri === "string") return {
+		...entry,
+		uri: normalizeUrlFn(entry.uri, baseUrl)
+	};
+	return {
+		...entry,
+		uri: entry.uri.map((uri) => normalizeUrlFn(uri, baseUrl))
+	};
+};
 const normalizeMethodsConfig = (input, methods, defaults) => {
 	const methodsObj = Array.isArray(methods) ? Object.fromEntries(methods.map((method) => [method, true])) : methods;
 	const methodsConfig = {};
@@ -77,4 +87,5 @@ const normalizeMethodsConfig = (input, methods, defaults) => {
 //#endregion
 exports.defaultFetchFn = defaultFetchFn;
 exports.normalizeInput = normalizeInput;
-exports.normalizeMethodsConfig = normalizeMethodsConfig;
+exports.normalizeMethodsConfig = normalizeMethodsConfig;
+exports.normalizeUriEntry = normalizeUriEntry;

package/dist/common/discover/utils.js

@@ -23,6 +23,16 @@ const normalizeInput = async (input, fetchFn) => {
 		headers: response.headers
 	};
 };
+const normalizeUriEntry = (entry, normalizeUrlFn, baseUrl) => {
+	if (typeof entry.uri === "string") return {
+		...entry,
+		uri: normalizeUrlFn(entry.uri, baseUrl)
+	};
+	return {
+		...entry,
+		uri: entry.uri.map((uri) => normalizeUrlFn(uri, baseUrl))
+	};
+};
 const normalizeMethodsConfig = (input, methods, defaults) => {
 	const methodsObj = Array.isArray(methods) ? Object.fromEntries(methods.map((method) => [method, true])) : methods;
 	const methodsConfig = {};
@@ -75,4 +85,4 @@ const normalizeMethodsConfig = (input, methods, defaults) => {
 };
 
 //#endregion
-export { defaultFetchFn, normalizeInput, normalizeMethodsConfig };
+export { defaultFetchFn, normalizeInput, normalizeMethodsConfig, normalizeUriEntry };

package/dist/common/locales.cjs

@@ -6,6 +6,75 @@ var errors = {
 	"headersMethodRequiresHeaders": "Headers method requires headers to be provided in input",
 	"guessMethodRequiresUrl": "Guess method requires url to be provided in input"
 };
+var hints = {
+	"youtube:all": "All uploads",
+	"youtube:videos": "Videos only",
+	"youtube:shorts": "Shorts only",
+	"youtube:playlist": "Playlist",
+	"github:activity": "Activity",
+	"github:releases": "Releases",
+	"github:commits": "Commits",
+	"github:tags": "Tags",
+	"github:wiki": "Wiki",
+	"github:discussions": "Discussions",
+	"github:branch-commits": "Branch commits",
+	"github:file-history": "File history",
+	"reddit:posts": "Posts",
+	"reddit:post-comments": "Post comments",
+	"reddit:comments": "Comments",
+	"reddit:multireddit": "Multireddit",
+	"gitlab:activity": "Activity",
+	"gitlab:releases": "Releases",
+	"gitlab:tags": "Tags",
+	"wordpress:category": "Category",
+	"wordpress:tag": "Tag",
+	"wordpress:author": "Author",
+	"wordpress:posts-rss2": "Posts (RSS 2.0)",
+	"wordpress:posts-rss2-alt": "Posts (RSS 2.0)",
+	"wordpress:posts-rdf": "Posts (RDF)",
+	"wordpress:posts-atom": "Posts (Atom)",
+	"wordpress:comments": "Comments",
+	"wordpress:comments-rss2": "Comments (RSS 2.0)",
+	"wordpress:comments-rdf": "Comments (RDF)",
+	"wordpress:comments-atom": "Comments (Atom)",
+	"blogspot:label": "Label",
+	"blogspot:posts-atom": "Posts (Atom)",
+	"blogspot:posts-rss": "Posts (RSS)",
+	"behance:portfolio": "Portfolio",
+	"behance:appreciated": "Appreciated",
+	"bluesky:posts": "Posts",
+	"dailymotion:videos": "Videos",
+	"dailymotion:playlist": "Playlist",
+	"deviantart:tag": "Tag",
+	"deviantart:favorites": "Favorites",
+	"deviantart:gallery": "Gallery",
+	"deviantart:deviations": "Deviations",
+	"devto:posts": "Posts",
+	"devto:tag": "Tag",
+	"github-gist:gists": "Gists",
+	"github-gist:starred": "Starred",
+	"kickstarter:updates": "Updates",
+	"kickstarter:projects": "Projects",
+	"lobsters:tag": "Tag",
+	"lobsters:domain": "Domain",
+	"lobsters:stories": "Stories",
+	"lobsters:top": "Top stories",
+	"lobsters:newest": "Newest",
+	"lobsters:comments": "Comments",
+	"medium:posts": "Posts",
+	"medium:tag": "Tag",
+	"medium:tagged": "Tagged",
+	"medium:publication": "Publication",
+	"pinterest:pins": "Pins",
+	"pinterest:board": "Board",
+	"producthunt:topic": "Topic",
+	"producthunt:category": "Category",
+	"producthunt:products": "Products",
+	"soundcloud:tracks": "Tracks",
+	"substack:newsletter": "Newsletter",
+	"tumblr:posts": "Posts",
+	"tumblr:tag": "Tag"
+};
 
 //#endregion
 Object.defineProperty(exports, 'errors', {
@@ -13,4 +82,10 @@ Object.defineProperty(exports, 'errors', {
   get: function () {
     return errors;
   }
+});
+Object.defineProperty(exports, 'hints', {
+  enumerable: true,
+  get: function () {
+    return hints;
+  }
 });

package/dist/common/locales.js

@@ -5,6 +5,75 @@ var errors = {
 	"headersMethodRequiresHeaders": "Headers method requires headers to be provided in input",
 	"guessMethodRequiresUrl": "Guess method requires url to be provided in input"
 };
+var hints = {
+	"youtube:all": "All uploads",
+	"youtube:videos": "Videos only",
+	"youtube:shorts": "Shorts only",
+	"youtube:playlist": "Playlist",
+	"github:activity": "Activity",
+	"github:releases": "Releases",
+	"github:commits": "Commits",
+	"github:tags": "Tags",
+	"github:wiki": "Wiki",
+	"github:discussions": "Discussions",
+	"github:branch-commits": "Branch commits",
+	"github:file-history": "File history",
+	"reddit:posts": "Posts",
+	"reddit:post-comments": "Post comments",
+	"reddit:comments": "Comments",
+	"reddit:multireddit": "Multireddit",
+	"gitlab:activity": "Activity",
+	"gitlab:releases": "Releases",
+	"gitlab:tags": "Tags",
+	"wordpress:category": "Category",
+	"wordpress:tag": "Tag",
+	"wordpress:author": "Author",
+	"wordpress:posts-rss2": "Posts (RSS 2.0)",
+	"wordpress:posts-rss2-alt": "Posts (RSS 2.0)",
+	"wordpress:posts-rdf": "Posts (RDF)",
+	"wordpress:posts-atom": "Posts (Atom)",
+	"wordpress:comments": "Comments",
+	"wordpress:comments-rss2": "Comments (RSS 2.0)",
+	"wordpress:comments-rdf": "Comments (RDF)",
+	"wordpress:comments-atom": "Comments (Atom)",
+	"blogspot:label": "Label",
+	"blogspot:posts-atom": "Posts (Atom)",
+	"blogspot:posts-rss": "Posts (RSS)",
+	"behance:portfolio": "Portfolio",
+	"behance:appreciated": "Appreciated",
+	"bluesky:posts": "Posts",
+	"dailymotion:videos": "Videos",
+	"dailymotion:playlist": "Playlist",
+	"deviantart:tag": "Tag",
+	"deviantart:favorites": "Favorites",
+	"deviantart:gallery": "Gallery",
+	"deviantart:deviations": "Deviations",
+	"devto:posts": "Posts",
+	"devto:tag": "Tag",
+	"github-gist:gists": "Gists",
+	"github-gist:starred": "Starred",
+	"kickstarter:updates": "Updates",
+	"kickstarter:projects": "Projects",
+	"lobsters:tag": "Tag",
+	"lobsters:domain": "Domain",
+	"lobsters:stories": "Stories",
+	"lobsters:top": "Top stories",
+	"lobsters:newest": "Newest",
+	"lobsters:comments": "Comments",
+	"medium:posts": "Posts",
+	"medium:tag": "Tag",
+	"medium:tagged": "Tagged",
+	"medium:publication": "Publication",
+	"pinterest:pins": "Pins",
+	"pinterest:board": "Board",
+	"producthunt:topic": "Topic",
+	"producthunt:category": "Category",
+	"producthunt:products": "Products",
+	"soundcloud:tracks": "Tracks",
+	"substack:newsletter": "Newsletter",
+	"tumblr:posts": "Posts",
+	"tumblr:tag": "Tag"
+};
 
 //#endregion
-export { errors };
+export { errors, hints };

package/dist/common/types.cjs

@@ -0,0 +1,11 @@
+
+//#region src/common/types.ts
+const discoverMethodOrder = [
+	"platform",
+	"html",
+	"headers",
+	"guess"
+];
+
+//#endregion
+exports.discoverMethodOrder = discoverMethodOrder;

package/dist/common/types.d.cts

@@ -4,6 +4,17 @@ import { HtmlMethodOptions } from "./uris/html/types.cjs";
 import { PlatformMethodOptions } from "./uris/platform/types.cjs";
 
 //#region src/common/types.d.ts
+type UriEntry = string | Array<string>;
+type DiscoverUriHint = {
+  key: string;
+  label: string;
+};
+type DiscoverUriEntry = {
+  uri: UriEntry;
+  hint?: DiscoverUriHint;
+};
+declare const discoverMethodOrder: readonly ["platform", "html", "headers", "guess"];
+type DiscoverMethod = (typeof discoverMethodOrder)[number];
 type LinkSelector = {
   rel: string;
   types?: Array<string>;
@@ -31,9 +42,11 @@ type DiscoverOnProgressFn = (progress: DiscoverProgress) => void;
 type DiscoverResult<TValid = object> = ({
   url: string;
   isValid: true;
+  hint?: DiscoverUriHint;
 } & TValid) | {
   url: string;
   isValid: false;
+  hint?: DiscoverUriHint;
   error?: unknown;
 };
 type DiscoverExtractFn<TValid> = (input: {
@@ -47,7 +60,7 @@ type DiscoverInputObject = {
   headers?: Headers;
 };
 type DiscoverInput = string | DiscoverInputObject;
-type DiscoverMethodsConfig = Array<'platform' | 'html' | 'headers' | 'guess'> | {
+type DiscoverMethodsConfig = Array<DiscoverMethod> | {
   platform?: true | Partial<PlatformMethodOptions>;
   html?: true | Partial<Omit<HtmlMethodOptions, 'baseUrl'>>;
   headers?: true | Partial<Omit<HeadersMethodOptions, 'baseUrl'>>;
@@ -65,4 +78,4 @@ type DiscoverOptions<TValid> = {
   includeInvalid?: boolean;
 };
 //#endregion
-export { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResult, LinkSelector };
+export { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResult, DiscoverUriEntry, DiscoverUriHint, LinkSelector, UriEntry };

package/dist/common/types.d.ts

@@ -4,6 +4,17 @@ import { HtmlMethodOptions } from "./uris/html/types.js";
 import { PlatformMethodOptions } from "./uris/platform/types.js";
 
 //#region src/common/types.d.ts
+type UriEntry = string | Array<string>;
+type DiscoverUriHint = {
+  key: string;
+  label: string;
+};
+type DiscoverUriEntry = {
+  uri: UriEntry;
+  hint?: DiscoverUriHint;
+};
+declare const discoverMethodOrder: readonly ["platform", "html", "headers", "guess"];
+type DiscoverMethod = (typeof discoverMethodOrder)[number];
 type LinkSelector = {
   rel: string;
   types?: Array<string>;
@@ -31,9 +42,11 @@ type DiscoverOnProgressFn = (progress: DiscoverProgress) => void;
 type DiscoverResult<TValid = object> = ({
   url: string;
   isValid: true;
+  hint?: DiscoverUriHint;
 } & TValid) | {
   url: string;
   isValid: false;
+  hint?: DiscoverUriHint;
   error?: unknown;
 };
 type DiscoverExtractFn<TValid> = (input: {
@@ -47,7 +60,7 @@ type DiscoverInputObject = {
   headers?: Headers;
 };
 type DiscoverInput = string | DiscoverInputObject;
-type DiscoverMethodsConfig = Array<'platform' | 'html' | 'headers' | 'guess'> | {
+type DiscoverMethodsConfig = Array<DiscoverMethod> | {
   platform?: true | Partial<PlatformMethodOptions>;
   html?: true | Partial<Omit<HtmlMethodOptions, 'baseUrl'>>;
   headers?: true | Partial<Omit<HeadersMethodOptions, 'baseUrl'>>;
@@ -65,4 +78,4 @@ type DiscoverOptions<TValid> = {
   includeInvalid?: boolean;
 };
 //#endregion
-export { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResult, LinkSelector };
+export { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResult, DiscoverUriEntry, DiscoverUriHint, LinkSelector, UriEntry };

package/dist/common/types.js

@@ -0,0 +1,10 @@
+//#region src/common/types.ts
+const discoverMethodOrder = [
+	"platform",
+	"html",
+	"headers",
+	"guess"
+];
+
+//#endregion
+export { discoverMethodOrder };

package/dist/common/uris/guess/index.d.cts

@@ -1,6 +1,7 @@
 import { GuessMethodOptions } from "./types.cjs";
+import { UriEntry } from "../../types.cjs";
 
 //#region src/common/uris/guess/index.d.ts
-declare const discoverUrisFromGuess: (options: GuessMethodOptions) => Array<string>;
+declare const discoverUrisFromGuess: (options: GuessMethodOptions) => Array<UriEntry>;
 //#endregion
 export { discoverUrisFromGuess };

package/dist/common/uris/guess/index.d.ts

@@ -1,6 +1,7 @@
 import { GuessMethodOptions } from "./types.js";
+import { UriEntry } from "../../types.js";
 
 //#region src/common/uris/guess/index.d.ts
-declare const discoverUrisFromGuess: (options: GuessMethodOptions) => Array<string>;
+declare const discoverUrisFromGuess: (options: GuessMethodOptions) => Array<UriEntry>;
 //#endregion
 export { discoverUrisFromGuess };

package/dist/common/uris/guess/types.d.cts

@@ -1,7 +1,9 @@
+import { UriEntry } from "../../types.cjs";
+
 //#region src/common/uris/guess/types.d.ts
 type GuessMethodOptions = {
   baseUrl: string;
-  uris: Array<string>;
+  uris: Array<UriEntry>;
   additionalBaseUrls?: Array<string>;
 };
 //#endregion

package/dist/common/uris/guess/types.d.ts

@@ -1,7 +1,9 @@
+import { UriEntry } from "../../types.js";
+
 //#region src/common/uris/guess/types.d.ts
 type GuessMethodOptions = {
   baseUrl: string;
-  uris: Array<string>;
+  uris: Array<UriEntry>;
   additionalBaseUrls?: Array<string>;
 };
 //#endregion

package/dist/common/uris/guess/utils.cjs

@@ -3,7 +3,10 @@
 const generateUrlCombinations = (baseUrls, uris) => {
 	return baseUrls.flatMap((base) => {
 		return uris.map((uri) => {
-			return new URL(uri, base).toString();
+			if (typeof uri === "string") return new URL(uri, base).toString();
+			return uri.map((alternative) => {
+				return new URL(alternative, base).toString();
+			});
 		});
 	});
 };

package/dist/common/uris/guess/utils.d.cts

@@ -1,5 +1,7 @@
+import { UriEntry } from "../../types.cjs";
+
 //#region src/common/uris/guess/utils.d.ts
-declare const generateUrlCombinations: (baseUrls: Array<string>, uris: Array<string>) => Array<string>;
+declare const generateUrlCombinations: (baseUrls: Array<string>, uris: Array<UriEntry>) => Array<UriEntry>;
 declare const getWwwCounterpart: (baseUrl: string) => string;
 declare const getSubdomainVariants: (baseUrl: string, prefixes: Array<string>) => Array<string>;
 //#endregion

package/dist/common/uris/guess/utils.d.ts

@@ -1,5 +1,7 @@
+import { UriEntry } from "../../types.js";
+
 //#region src/common/uris/guess/utils.d.ts
-declare const generateUrlCombinations: (baseUrls: Array<string>, uris: Array<string>) => Array<string>;
+declare const generateUrlCombinations: (baseUrls: Array<string>, uris: Array<UriEntry>) => Array<UriEntry>;
 declare const getWwwCounterpart: (baseUrl: string) => string;
 declare const getSubdomainVariants: (baseUrl: string, prefixes: Array<string>) => Array<string>;
 //#endregion

package/dist/common/uris/guess/utils.js

@@ -2,7 +2,10 @@
 const generateUrlCombinations = (baseUrls, uris) => {
 	return baseUrls.flatMap((base) => {
 		return uris.map((uri) => {
-			return new URL(uri, base).toString();
+			if (typeof uri === "string") return new URL(uri, base).toString();
+			return uri.map((alternative) => {
+				return new URL(alternative, base).toString();
+			});
 		});
 	});
 };

package/dist/common/uris/index.cjs

@@ -4,22 +4,25 @@ const require_index$2 = require('./html/index.cjs');
 const require_index$3 = require('./platform/index.cjs');
 
 //#region src/common/uris/index.ts
-const discoverUris = (config, stopOnFirstMethod = false) => {
-	const uris = /* @__PURE__ */ new Set();
+const discoverUris = (config) => {
+	const result = {};
 	if (config.platform) {
-		for (const uri of require_index$3.discoverUrisFromPlatform(config.platform.html, config.platform.options)) uris.add(uri);
-		if (stopOnFirstMethod && uris.size > 0) return Array.from(uris);
+		const uris = require_index$3.discoverUrisFromPlatform(config.platform.html, config.platform.options);
+		if (uris.length > 0) result.platform = uris;
 	}
 	if (config.html) {
-		for (const uri of require_index$2.discoverUrisFromHtml(config.html.html, config.html.options)) uris.add(uri);
-		if (stopOnFirstMethod && uris.size > 0) return Array.from(uris);
+		const uris = require_index$2.discoverUrisFromHtml(config.html.html, config.html.options);
+		if (uris.length > 0) result.html = uris.map((uri) => ({ uri }));
 	}
 	if (config.headers) {
-		for (const uri of require_index$1.discoverUrisFromHeaders(config.headers.headers, config.headers.options)) uris.add(uri);
-		if (stopOnFirstMethod && uris.size > 0) return Array.from(uris);
+		const uris = require_index$1.discoverUrisFromHeaders(config.headers.headers, config.headers.options);
+		if (uris.length > 0) result.headers = uris.map((uri) => ({ uri }));
 	}
-	if (config.guess) for (const uri of require_index.discoverUrisFromGuess(config.guess.options)) uris.add(uri);
-	return Array.from(uris);
+	if (config.guess) {
+		const uris = require_index.discoverUrisFromGuess(config.guess.options);
+		if (uris.length > 0) result.guess = uris.map((uri) => ({ uri }));
+	}
+	return result;
 };
 
 //#endregion