feedscout 1.1.0 → 1.3.0

package/dist/hubs/discover/index.js

@@ -1,4 +1,5 @@
-import { createNativeFetchAdapter } from "../../common/discover/adapters.js";
+import { normalizeUrl } from "../../common/utils.js";
+import { defaultFetchFn } from "../../common/discover/utils.js";
 import { discoverHubsFromFeed } from "../feed/index.js";
 import { discoverHubsFromHeaders } from "../headers/index.js";
 import { discoverHubsFromHtml } from "../html/index.js";
@@ -10,11 +11,11 @@ const discoverHubs = async (input, options = {}) => {
 		"headers",
 		"feed",
 		"html"
-	], fetchFn = createNativeFetchAdapter() } = options;
+	], fetchFn = defaultFetchFn, normalizeUrlFn = normalizeUrl } = options;
 	const normalizedInput = await normalizeInput(input, fetchFn);
 	const results = [];
 	if (methods.includes("headers") && normalizedInput.headers) {
-		const headerHubs = discoverHubsFromHeaders(normalizedInput.headers, normalizedInput.url);
+		const headerHubs = discoverHubsFromHeaders(normalizedInput.headers, normalizedInput.url, normalizeUrlFn);
 		results.push(...headerHubs);
 	}
 	if (methods.includes("feed") && normalizedInput.content) {
@@ -22,7 +23,7 @@ const discoverHubs = async (input, options = {}) => {
 		results.push(...feedHubs);
 	}
 	if (methods.includes("html") && normalizedInput.content) {
-		const htmlHubs = discoverHubsFromHtml(normalizedInput.content, normalizedInput.url);
+		const htmlHubs = discoverHubsFromHtml(normalizedInput.content, normalizedInput.url, normalizeUrlFn);
 		results.push(...htmlHubs);
 	}
 	return results;

package/dist/hubs/discover/types.d.cts

@@ -1,4 +1,4 @@
-import { DiscoverFetchFn } from "../../common/types.cjs";
+import { DiscoverFetchFn, DiscoverNormalizeUrlFn } from "../../common/types.cjs";
 
 //#region src/hubs/discover/types.d.ts
 type HubResult = {
@@ -9,6 +9,7 @@ type DiscoverHubsMethodsConfig = Array<'headers' | 'html' | 'feed'>;
 type DiscoverHubsOptions = {
   methods?: DiscoverHubsMethodsConfig;
   fetchFn?: DiscoverFetchFn;
+  normalizeUrlFn?: DiscoverNormalizeUrlFn;
 };
 //#endregion
 export { DiscoverHubsMethodsConfig, DiscoverHubsOptions, HubResult };

package/dist/hubs/discover/types.d.ts

@@ -1,4 +1,4 @@
-import { DiscoverFetchFn } from "../../common/types.js";
+import { DiscoverFetchFn, DiscoverNormalizeUrlFn } from "../../common/types.js";
 
 //#region src/hubs/discover/types.d.ts
 type HubResult = {
@@ -9,6 +9,7 @@ type DiscoverHubsMethodsConfig = Array<'headers' | 'html' | 'feed'>;
 type DiscoverHubsOptions = {
   methods?: DiscoverHubsMethodsConfig;
   fetchFn?: DiscoverFetchFn;
+  normalizeUrlFn?: DiscoverNormalizeUrlFn;
 };
 //#endregion
 export { DiscoverHubsMethodsConfig, DiscoverHubsOptions, HubResult };

package/dist/hubs/headers/index.cjs

@@ -4,13 +4,13 @@ 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) => {
+const discoverHubsFromHeaders = (headers, baseUrl, normalizeUrlFn = require_utils.normalizeUrl) => {
 	const hubUris = require_index.discoverUrisFromHeaders(headers, { linkSelectors: hubSelector });
 	if (hubUris.length === 0) return [];
 	const selfUris = require_index.discoverUrisFromHeaders(headers, { linkSelectors: selfSelector });
-	const topic = selfUris[0] ? require_utils.normalizeUrl(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? normalizeUrlFn(selfUris[0], baseUrl) : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: require_utils.normalizeUrl(hub, baseUrl),
+		hub: normalizeUrlFn(hub, baseUrl),
 		topic
 	}));
 };

package/dist/hubs/headers/index.js

@@ -4,13 +4,13 @@ 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) => {
+const discoverHubsFromHeaders = (headers, baseUrl, normalizeUrlFn = normalizeUrl) => {
 	const hubUris = discoverUrisFromHeaders(headers, { linkSelectors: hubSelector });
 	if (hubUris.length === 0) return [];
 	const selfUris = discoverUrisFromHeaders(headers, { linkSelectors: selfSelector });
-	const topic = selfUris[0] ? normalizeUrl(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? normalizeUrlFn(selfUris[0], baseUrl) : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: normalizeUrl(hub, baseUrl),
+		hub: normalizeUrlFn(hub, baseUrl),
 		topic
 	}));
 };

package/dist/hubs/html/index.cjs

@@ -9,7 +9,7 @@ const htmlOptions = {
 	anchorIgnoredUris: [],
 	anchorLabels: []
 };
-const discoverHubsFromHtml = (content, baseUrl) => {
+const discoverHubsFromHtml = (content, baseUrl, normalizeUrlFn = require_utils.normalizeUrl) => {
 	const hubUris = require_index.discoverUrisFromHtml(content, {
 		...htmlOptions,
 		linkSelectors: hubSelector
@@ -19,9 +19,9 @@ const discoverHubsFromHtml = (content, baseUrl) => {
 		...htmlOptions,
 		linkSelectors: selfSelector
 	});
-	const topic = selfUris[0] ? require_utils.normalizeUrl(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? normalizeUrlFn(selfUris[0], baseUrl) : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: require_utils.normalizeUrl(hub, baseUrl),
+		hub: normalizeUrlFn(hub, baseUrl),
 		topic
 	}));
 };

package/dist/hubs/html/index.js

@@ -9,7 +9,7 @@ const htmlOptions = {
 	anchorIgnoredUris: [],
 	anchorLabels: []
 };
-const discoverHubsFromHtml = (content, baseUrl) => {
+const discoverHubsFromHtml = (content, baseUrl, normalizeUrlFn = normalizeUrl) => {
 	const hubUris = discoverUrisFromHtml(content, {
 		...htmlOptions,
 		linkSelectors: hubSelector
@@ -19,9 +19,9 @@ const discoverHubsFromHtml = (content, baseUrl) => {
 		...htmlOptions,
 		linkSelectors: selfSelector
 	});
-	const topic = selfUris[0] ? normalizeUrl(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? normalizeUrlFn(selfUris[0], baseUrl) : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: normalizeUrl(hub, baseUrl),
+		hub: normalizeUrlFn(hub, baseUrl),
 		topic
 	}));
 };

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/index.d.cts

@@ -1,5 +1,5 @@
-import { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOptions, DiscoverProgress, DiscoverProgressFn, DiscoverResult } from "./common/types.cjs";
+import { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResult } from "./common/types.cjs";
 import { discoverBlogrolls } from "./blogrolls/index.cjs";
 import { discoverFeeds } from "./feeds/index.cjs";
 import { discoverHubs } from "./hubs/discover/index.cjs";
-export { type DiscoverExtractFn, type DiscoverFetchFn, type DiscoverFetchFnOptions, type DiscoverFetchFnResponse, type DiscoverInput, type DiscoverInputObject, type DiscoverMethodsConfig, type DiscoverNormalizeUrlFn, type DiscoverOptions, type DiscoverProgress, type DiscoverProgressFn, type DiscoverResult, discoverBlogrolls, discoverFeeds, discoverHubs };
+export { type DiscoverExtractFn, type DiscoverFetchFn, type DiscoverFetchFnOptions, type DiscoverFetchFnResponse, type DiscoverInput, type DiscoverInputObject, type DiscoverMethodsConfig, type DiscoverNormalizeUrlFn, type DiscoverOnProgressFn, type DiscoverOptions, type DiscoverProgress, type DiscoverResult, discoverBlogrolls, discoverFeeds, discoverHubs };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOptions, DiscoverProgress, DiscoverProgressFn, DiscoverResult } from "./common/types.js";
+import { DiscoverExtractFn, DiscoverFetchFn, DiscoverFetchFnOptions, DiscoverFetchFnResponse, DiscoverInput, DiscoverInputObject, DiscoverMethodsConfig, DiscoverNormalizeUrlFn, DiscoverOnProgressFn, DiscoverOptions, DiscoverProgress, DiscoverResult } from "./common/types.js";
 import { discoverBlogrolls } from "./blogrolls/index.js";
 import { discoverFeeds } from "./feeds/index.js";
 import { discoverHubs } from "./hubs/discover/index.js";
-export { type DiscoverExtractFn, type DiscoverFetchFn, type DiscoverFetchFnOptions, type DiscoverFetchFnResponse, type DiscoverInput, type DiscoverInputObject, type DiscoverMethodsConfig, type DiscoverNormalizeUrlFn, type DiscoverOptions, type DiscoverProgress, type DiscoverProgressFn, type DiscoverResult, discoverBlogrolls, discoverFeeds, discoverHubs };
+export { type DiscoverExtractFn, type DiscoverFetchFn, type DiscoverFetchFnOptions, type DiscoverFetchFnResponse, type DiscoverInput, type DiscoverInputObject, type DiscoverMethodsConfig, type DiscoverNormalizeUrlFn, type DiscoverOnProgressFn, type DiscoverOptions, type DiscoverProgress, type DiscoverResult, discoverBlogrolls, discoverFeeds, discoverHubs };

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

@@ -0,0 +1,9 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_utils = require('./common/utils.cjs');
+
+exports.anyWordMatchesAnyOf = require_utils.anyWordMatchesAnyOf;
+exports.endsWithAnyOf = require_utils.endsWithAnyOf;
+exports.includesAnyOf = require_utils.includesAnyOf;
+exports.isAnyOf = require_utils.isAnyOf;
+exports.isHostOf = require_utils.isHostOf;
+exports.isSubdomainOf = require_utils.isSubdomainOf;

package/dist/utils.d.cts

@@ -0,0 +1,2 @@
+import { anyWordMatchesAnyOf, endsWithAnyOf, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf } from "./common/utils.cjs";
+export { anyWordMatchesAnyOf, endsWithAnyOf, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf };

package/dist/utils.d.ts

@@ -0,0 +1,2 @@
+import { anyWordMatchesAnyOf, endsWithAnyOf, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf } from "./common/utils.js";
+export { anyWordMatchesAnyOf, endsWithAnyOf, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf };

package/dist/utils.js

@@ -0,0 +1,3 @@
+import { anyWordMatchesAnyOf, endsWithAnyOf, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf } from "./common/utils.js";
+
+export { anyWordMatchesAnyOf, endsWithAnyOf, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf };

package/package.json

@@ -65,16 +65,6 @@
         "default": "./dist/hubs.cjs"
       }
     },
-    "./adapters": {
-      "import": {
-        "types": "./dist/adapters.d.ts",
-        "default": "./dist/adapters.js"
-      },
-      "require": {
-        "types": "./dist/adapters.d.cts",
-        "default": "./dist/adapters.cjs"
-      }
-    },
     "./methods": {
       "import": {
         "types": "./dist/methods.d.ts",
@@ -85,6 +75,16 @@
         "default": "./dist/methods.cjs"
       }
     },
+    "./utils": {
+      "import": {
+        "types": "./dist/utils.d.ts",
+        "default": "./dist/utils.js"
+      },
+      "require": {
+        "types": "./dist/utils.d.cts",
+        "default": "./dist/utils.cjs"
+      }
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -92,20 +92,19 @@
   ],
   "scripts": {
     "prepare": "lefthook install",
-    "build": "tsdown src/exports/index.ts src/exports/feeds.ts src/exports/blogrolls.ts src/exports/hubs.ts src/exports/adapters.ts src/exports/methods.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/hubs.ts src/exports/methods.ts src/exports/utils.ts --format cjs,esm --dts --clean --unbundle --no-fixed-extension",
     "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
+    "docs:build": "vitepress build docs"
   },
   "dependencies": {
-    "feedsmith": "^2.7.0",
-    "htmlparser2": "^10.0.0"
+    "feedsmith": "^2.9.0",
+    "htmlparser2": "^10.1.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.4",
-    "kvalita": "1.8.0",
-    "tsdown": "^0.17.2",
+    "@types/bun": "^1.3.8",
+    "kvalita": "1.10.0",
+    "tsdown": "^0.20.3",
     "vitepress": "^1.6.4"
   },
-  "version": "1.1.0"
+  "version": "1.3.0"
 }

package/dist/adapters.cjs

@@ -1,6 +0,0 @@
-const require_adapters = require('./common/discover/adapters.cjs');
-
-exports.createAxiosAdapter = require_adapters.createAxiosAdapter;
-exports.createGotAdapter = require_adapters.createGotAdapter;
-exports.createKyAdapter = require_adapters.createKyAdapter;
-exports.createNativeFetchAdapter = require_adapters.createNativeFetchAdapter;

package/dist/adapters.d.cts

@@ -1,2 +0,0 @@
-import { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter } from "./common/discover/adapters.cjs";
-export { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter };

package/dist/adapters.d.ts

@@ -1,2 +0,0 @@
-import { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter } from "./common/discover/adapters.js";
-export { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter };

package/dist/adapters.js

@@ -1,3 +0,0 @@
-import { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter } from "./common/discover/adapters.js";
-
-export { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter };

package/dist/common/discover/adapters.cjs

@@ -1,76 +0,0 @@
-
-//#region src/common/discover/adapters.ts
-const createNativeFetchAdapter = (baseOptions) => {
-	return async (url, options) => {
-		const response = await fetch(url, {
-			...baseOptions,
-			method: options?.method || "GET",
-			headers: {
-				...baseOptions?.headers,
-				...options?.headers
-			}
-		});
-		return {
-			headers: response.headers,
-			body: await response.text(),
-			url: response.url,
-			status: response.status,
-			statusText: response.statusText
-		};
-	};
-};
-const createGotAdapter = (gotInstance) => {
-	return async (url, options) => {
-		const response = await gotInstance(url, {
-			method: options?.method || "GET",
-			headers: options?.headers,
-			throwHttpErrors: false
-		});
-		return {
-			headers: new Headers(response.headers),
-			body: response.body,
-			url: response.url,
-			status: response.statusCode,
-			statusText: response.statusMessage
-		};
-	};
-};
-const createAxiosAdapter = (axiosInstance) => {
-	return async (url, options) => {
-		const response = await axiosInstance({
-			url,
-			method: options?.method || "GET",
-			headers: options?.headers,
-			validateStatus: () => true
-		});
-		return {
-			headers: new Headers(response.headers),
-			body: response.data,
-			url: response.request?.res?.responseUrl || url,
-			status: response.status,
-			statusText: response.statusText
-		};
-	};
-};
-const createKyAdapter = (kyInstance) => {
-	return async (url, options) => {
-		const response = await kyInstance(url, {
-			method: options?.method || "GET",
-			headers: options?.headers,
-			throwHttpErrors: false
-		});
-		return {
-			headers: response.headers,
-			body: await response.text(),
-			url: response.url,
-			status: response.status,
-			statusText: response.statusText
-		};
-	};
-};
-
-//#endregion
-exports.createAxiosAdapter = createAxiosAdapter;
-exports.createGotAdapter = createGotAdapter;
-exports.createKyAdapter = createKyAdapter;
-exports.createNativeFetchAdapter = createNativeFetchAdapter;

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

@@ -1,10 +0,0 @@
-import { DiscoverFetchFn } from "../types.cjs";
-
-//#region src/common/discover/adapters.d.ts
-type AnyInstance = any;
-declare const createNativeFetchAdapter: (baseOptions?: RequestInit) => DiscoverFetchFn;
-declare const createGotAdapter: (gotInstance: AnyInstance) => DiscoverFetchFn;
-declare const createAxiosAdapter: (axiosInstance: AnyInstance) => DiscoverFetchFn;
-declare const createKyAdapter: (kyInstance: AnyInstance) => DiscoverFetchFn;
-//#endregion
-export { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter };

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

@@ -1,10 +0,0 @@
-import { DiscoverFetchFn } from "../types.js";
-
-//#region src/common/discover/adapters.d.ts
-type AnyInstance = any;
-declare const createNativeFetchAdapter: (baseOptions?: RequestInit) => DiscoverFetchFn;
-declare const createGotAdapter: (gotInstance: AnyInstance) => DiscoverFetchFn;
-declare const createAxiosAdapter: (axiosInstance: AnyInstance) => DiscoverFetchFn;
-declare const createKyAdapter: (kyInstance: AnyInstance) => DiscoverFetchFn;
-//#endregion
-export { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter };

package/dist/common/discover/adapters.js

@@ -1,72 +0,0 @@
-//#region src/common/discover/adapters.ts
-const createNativeFetchAdapter = (baseOptions) => {
-	return async (url, options) => {
-		const response = await fetch(url, {
-			...baseOptions,
-			method: options?.method || "GET",
-			headers: {
-				...baseOptions?.headers,
-				...options?.headers
-			}
-		});
-		return {
-			headers: response.headers,
-			body: await response.text(),
-			url: response.url,
-			status: response.status,
-			statusText: response.statusText
-		};
-	};
-};
-const createGotAdapter = (gotInstance) => {
-	return async (url, options) => {
-		const response = await gotInstance(url, {
-			method: options?.method || "GET",
-			headers: options?.headers,
-			throwHttpErrors: false
-		});
-		return {
-			headers: new Headers(response.headers),
-			body: response.body,
-			url: response.url,
-			status: response.statusCode,
-			statusText: response.statusMessage
-		};
-	};
-};
-const createAxiosAdapter = (axiosInstance) => {
-	return async (url, options) => {
-		const response = await axiosInstance({
-			url,
-			method: options?.method || "GET",
-			headers: options?.headers,
-			validateStatus: () => true
-		});
-		return {
-			headers: new Headers(response.headers),
-			body: response.data,
-			url: response.request?.res?.responseUrl || url,
-			status: response.status,
-			statusText: response.statusText
-		};
-	};
-};
-const createKyAdapter = (kyInstance) => {
-	return async (url, options) => {
-		const response = await kyInstance(url, {
-			method: options?.method || "GET",
-			headers: options?.headers,
-			throwHttpErrors: false
-		});
-		return {
-			headers: response.headers,
-			body: await response.text(),
-			url: response.url,
-			status: response.status,
-			statusText: response.statusText
-		};
-	};
-};
-
-//#endregion
-export { createAxiosAdapter, createGotAdapter, createKyAdapter, createNativeFetchAdapter };