feedscout 1.2.0 → 1.4.0

package/dist/blogrolls.cjs

@@ -1,3 +1,4 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_defaults = require('./blogrolls/defaults.cjs');
 const require_extractors = require('./blogrolls/extractors.cjs');
 

package/dist/common/discover/index.cjs

@@ -4,7 +4,7 @@ const require_utils$1 = require('./utils.cjs');
 
 //#region src/common/discover/index.ts
 const discover = async (input, options, defaults) => {
-	const { methods, fetchFn, extractFn, normalizeUrlFn, concurrency = 3, stopOnFirstResult = false, includeInvalid = false, onProgress } = options;
+	const { methods, fetchFn, extractFn, normalizeUrlFn, stopOnFirstMethod = false, stopOnFirstResult = false, concurrency = 3, includeInvalid = false, onProgress } = options;
 	const normalizedInput = await require_utils$1.normalizeInput(input, fetchFn);
 	if (normalizedInput.content) {
 		const result = await extractFn({
@@ -13,7 +13,7 @@ const discover = async (input, options, defaults) => {
 		});
 		if (result.isValid) return [result];
 	}
-	const rawUris = require_index.discoverUris(require_utils$1.normalizeMethodsConfig(normalizedInput, methods, defaults));
+	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 results = [];
 	let tested = 0;

package/dist/common/discover/index.js

@@ -4,7 +4,7 @@ import { normalizeInput, normalizeMethodsConfig } from "./utils.js";
 
 //#region src/common/discover/index.ts
 const discover = async (input, options, defaults) => {
-	const { methods, fetchFn, extractFn, normalizeUrlFn, concurrency = 3, stopOnFirstResult = false, includeInvalid = false, onProgress } = options;
+	const { methods, fetchFn, extractFn, normalizeUrlFn, stopOnFirstMethod = false, stopOnFirstResult = false, concurrency = 3, includeInvalid = false, onProgress } = options;
 	const normalizedInput = await normalizeInput(input, fetchFn);
 	if (normalizedInput.content) {
 		const result = await extractFn({
@@ -13,7 +13,7 @@ const discover = async (input, options, defaults) => {
 		});
 		if (result.isValid) return [result];
 	}
-	const rawUris = discoverUris(normalizeMethodsConfig(normalizedInput, methods, defaults));
+	const rawUris = discoverUris(normalizeMethodsConfig(normalizedInput, methods, defaults), stopOnFirstMethod);
 	const uris = [...new Set(rawUris.map((uri) => normalizeUrlFn(uri, normalizedInput.url)))];
 	const results = [];
 	let tested = 0;

package/dist/common/types.d.cts

@@ -58,10 +58,11 @@ type DiscoverOptions<TValid> = {
   fetchFn?: DiscoverFetchFn;
   extractFn?: DiscoverExtractFn<TValid>;
   normalizeUrlFn?: DiscoverNormalizeUrlFn;
-  concurrency?: number;
+  stopOnFirstMethod?: boolean;
   stopOnFirstResult?: boolean;
-  includeInvalid?: boolean;
+  concurrency?: number;
   onProgress?: DiscoverOnProgressFn;
+  includeInvalid?: boolean;
 };
 //#endregion
 export { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResult, LinkSelector };

package/dist/common/types.d.ts

@@ -58,10 +58,11 @@ type DiscoverOptions<TValid> = {
   fetchFn?: DiscoverFetchFn;
   extractFn?: DiscoverExtractFn<TValid>;
   normalizeUrlFn?: DiscoverNormalizeUrlFn;
-  concurrency?: number;
+  stopOnFirstMethod?: boolean;
   stopOnFirstResult?: boolean;
-  includeInvalid?: boolean;
+  concurrency?: number;
   onProgress?: DiscoverOnProgressFn;
+  includeInvalid?: boolean;
 };
 //#endregion
 export { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResult, LinkSelector };

package/dist/common/uris/index.cjs

@@ -4,11 +4,20 @@ 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) => {
+const discoverUris = (config, stopOnFirstMethod = false) => {
 	const uris = /* @__PURE__ */ new Set();
-	if (config.platform) for (const uri of require_index$3.discoverUrisFromPlatform(config.platform.html, config.platform.options)) uris.add(uri);
-	if (config.html) for (const uri of require_index$2.discoverUrisFromHtml(config.html.html, config.html.options)) uris.add(uri);
-	if (config.headers) for (const uri of require_index$1.discoverUrisFromHeaders(config.headers.headers, config.headers.options)) uris.add(uri);
+	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);
+	}
+	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);
+	}
+	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);
+	}
 	if (config.guess) for (const uri of require_index.discoverUrisFromGuess(config.guess.options)) uris.add(uri);
 	return Array.from(uris);
 };

package/dist/common/uris/index.js

@@ -4,11 +4,20 @@ import { discoverUrisFromHtml } from "./html/index.js";
 import { discoverUrisFromPlatform } from "./platform/index.js";
 
 //#region src/common/uris/index.ts
-const discoverUris = (config) => {
+const discoverUris = (config, stopOnFirstMethod = false) => {
 	const uris = /* @__PURE__ */ new Set();
-	if (config.platform) for (const uri of discoverUrisFromPlatform(config.platform.html, config.platform.options)) uris.add(uri);
-	if (config.html) for (const uri of discoverUrisFromHtml(config.html.html, config.html.options)) uris.add(uri);
-	if (config.headers) for (const uri of discoverUrisFromHeaders(config.headers.headers, config.headers.options)) uris.add(uri);
+	if (config.platform) {
+		for (const uri of discoverUrisFromPlatform(config.platform.html, config.platform.options)) uris.add(uri);
+		if (stopOnFirstMethod && uris.size > 0) return Array.from(uris);
+	}
+	if (config.html) {
+		for (const uri of discoverUrisFromHtml(config.html.html, config.html.options)) uris.add(uri);
+		if (stopOnFirstMethod && uris.size > 0) return Array.from(uris);
+	}
+	if (config.headers) {
+		for (const uri of discoverUrisFromHeaders(config.headers.headers, config.headers.options)) uris.add(uri);
+		if (stopOnFirstMethod && uris.size > 0) return Array.from(uris);
+	}
 	if (config.guess) for (const uri of discoverUrisFromGuess(config.guess.options)) uris.add(uri);
 	return Array.from(uris);
 };

package/dist/feeds/defaults.cjs

@@ -53,26 +53,38 @@ const urisBalanced = [
 const urisComprehensive = [
 	...urisBalanced,
 	"/atom",
+	"/rss/",
+	"/rss2.xml",
 	"/feed.rss",
 	"/feed.atom",
 	"/feed.rss.xml",
 	"/feed.atom.xml",
+	"/feed/atom/",
+	"/feed/rss/",
+	"/feed/rss2/",
+	"/feed/rdf",
+	"/feed/rdf/",
 	"/index.rss.xml",
 	"/index.atom.xml",
-	"/?feed=rss",
-	"/?feed=rss2",
-	"/?feed=atom",
-	"/?format=rss",
-	"/?format=atom",
-	"/?rss=1",
-	"/?atom=1",
+	"?feed=rss",
+	"?feed=rss2",
+	"?feed=atom",
+	"?feed=rdf",
+	"?feed=comments-rss2",
+	"?feed=comments-atom",
+	"?format=rss",
+	"?format=atom",
+	"?rss=1",
+	"?atom=1",
 	"/.rss",
 	"/f.json",
 	"/f.rss",
 	"/json",
 	"/.feed",
 	"/comments/feed",
-	"/feeds/posts/default"
+	"/feeds/posts/default",
+	"/feeds/posts/default?alt=rss",
+	"/feeds/comments/default"
 ];
 const ignoredUris = ["wp-json/oembed/", "wp-json/wp/"];
 const anchorLabels = [
@@ -81,6 +93,7 @@ const anchorLabels = [
 	"atom",
 	"subscribe",
 	"syndicate",
+	"syndication",
 	"json feed"
 ];
 const linkSelectors = [{

package/dist/feeds/defaults.js

@@ -53,26 +53,38 @@ const urisBalanced = [
 const urisComprehensive = [
 	...urisBalanced,
 	"/atom",
+	"/rss/",
+	"/rss2.xml",
 	"/feed.rss",
 	"/feed.atom",
 	"/feed.rss.xml",
 	"/feed.atom.xml",
+	"/feed/atom/",
+	"/feed/rss/",
+	"/feed/rss2/",
+	"/feed/rdf",
+	"/feed/rdf/",
 	"/index.rss.xml",
 	"/index.atom.xml",
-	"/?feed=rss",
-	"/?feed=rss2",
-	"/?feed=atom",
-	"/?format=rss",
-	"/?format=atom",
-	"/?rss=1",
-	"/?atom=1",
+	"?feed=rss",
+	"?feed=rss2",
+	"?feed=atom",
+	"?feed=rdf",
+	"?feed=comments-rss2",
+	"?feed=comments-atom",
+	"?format=rss",
+	"?format=atom",
+	"?rss=1",
+	"?atom=1",
 	"/.rss",
 	"/f.json",
 	"/f.rss",
 	"/json",
 	"/.feed",
 	"/comments/feed",
-	"/feeds/posts/default"
+	"/feeds/posts/default",
+	"/feeds/posts/default?alt=rss",
+	"/feeds/comments/default"
 ];
 const ignoredUris = ["wp-json/oembed/", "wp-json/wp/"];
 const anchorLabels = [
@@ -81,6 +93,7 @@ const anchorLabels = [
 	"atom",
 	"subscribe",
 	"syndicate",
+	"syndication",
 	"json feed"
 ];
 const linkSelectors = [{

package/dist/feeds/platform/handlers/youtube.cjs

@@ -8,7 +8,7 @@ const hosts = [
 	"youtu.be",
 	"www.youtu.be"
 ];
-const channelIdRegex = /"channelId":"(UC[a-zA-Z0-9_-]+)"/;
+const channelIdRegex = /"(?:channelId|externalId)":"(UC[a-zA-Z0-9_-]+)"/;
 const channelPathRegex = /^\/channel\/(UC[a-zA-Z0-9_-]+)/;
 const handlePathRegex = /^\/@([^/]+)/;
 const userPathRegex = /^\/user\/([^/]+)/;

package/dist/feeds/platform/handlers/youtube.js

@@ -8,7 +8,7 @@ const hosts = [
 	"youtu.be",
 	"www.youtu.be"
 ];
-const channelIdRegex = /"channelId":"(UC[a-zA-Z0-9_-]+)"/;
+const channelIdRegex = /"(?:channelId|externalId)":"(UC[a-zA-Z0-9_-]+)"/;
 const channelPathRegex = /^\/channel\/(UC[a-zA-Z0-9_-]+)/;
 const handlePathRegex = /^\/@([^/]+)/;
 const userPathRegex = /^\/user\/([^/]+)/;

package/dist/feeds.cjs

@@ -1,3 +1,4 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_defaults = require('./feeds/defaults.cjs');
 const require_extractors = require('./feeds/extractors.cjs');
 

package/dist/index.cjs

@@ -1,3 +1,4 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_index = require('./blogrolls/index.cjs');
 const require_index$1 = require('./feeds/index.cjs');
 const require_index$2 = require('./hubs/discover/index.cjs');

package/dist/methods.cjs

@@ -1,3 +1,4 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_utils = require('./common/uris/guess/utils.cjs');
 const require_index = require('./common/uris/guess/index.cjs');
 const require_index$1 = require('./common/uris/headers/index.cjs');

package/dist/utils.cjs

@@ -1,3 +1,4 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_utils = require('./common/utils.cjs');
 
 exports.anyWordMatchesAnyOf = require_utils.anyWordMatchesAnyOf;

package/package.json

@@ -101,10 +101,10 @@
     "htmlparser2": "^10.1.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.6",
-    "kvalita": "1.9.0",
-    "tsdown": "^0.20.1",
+    "@types/bun": "^1.3.8",
+    "kvalita": "1.10.0",
+    "tsdown": "^0.20.3",
     "vitepress": "^1.6.4"
   },
-  "version": "1.2.0"
+  "version": "1.4.0"
 }