feedscout 1.6.0 → 1.6.1

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

@@ -1,23 +1,25 @@
 //#region src/common/uris/guess/utils.ts
+const resolveUri = (uri, base, origin, pathname) => {
+	if (uri.startsWith("/")) return `${origin}${uri}`;
+	if (uri.startsWith("?")) return `${origin}${pathname}${uri}`;
+	return new URL(uri, base).toString();
+};
 const generateUrlCombinations = (baseUrls, uris) => {
 	return baseUrls.flatMap((base) => {
+		const parsed = new URL(base);
+		const origin = parsed.origin;
+		const pathname = parsed.pathname;
 		return uris.map((uri) => {
-			if (typeof uri === "string") return new URL(uri, base).toString();
-			return uri.map((alternative) => {
-				return new URL(alternative, base).toString();
-			});
+			if (typeof uri === "string") return resolveUri(uri, base, origin, pathname);
+			return uri.map((alternative) => resolveUri(alternative, base, origin, pathname));
 		});
 	});
 };
 const getWwwCounterpart = (baseUrl) => {
 	const url = new URL(baseUrl);
-	const counterpart = new URL(url);
-	if (url.hostname.startsWith("www.")) {
-		counterpart.hostname = url.hostname.replace(/^www\./, "");
-		return counterpart.origin;
-	}
-	counterpart.hostname = `www.${url.hostname}`;
-	return counterpart.origin;
+	const port = url.port ? `:${url.port}` : "";
+	if (url.hostname.startsWith("www.")) return `${url.protocol}//${url.hostname.slice(4)}${port}`;
+	return `${url.protocol}//www.${url.hostname}${port}`;
 };
 const getSubdomainVariants = (baseUrl, prefixes) => {
 	const url = new URL(baseUrl);

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

@@ -1,23 +1,25 @@
 //#region src/common/uris/guess/utils.ts
+const resolveUri = (uri, base, origin, pathname) => {
+	if (uri.startsWith("/")) return `${origin}${uri}`;
+	if (uri.startsWith("?")) return `${origin}${pathname}${uri}`;
+	return new URL(uri, base).toString();
+};
 const generateUrlCombinations = (baseUrls, uris) => {
 	return baseUrls.flatMap((base) => {
+		const parsed = new URL(base);
+		const origin = parsed.origin;
+		const pathname = parsed.pathname;
 		return uris.map((uri) => {
-			if (typeof uri === "string") return new URL(uri, base).toString();
-			return uri.map((alternative) => {
-				return new URL(alternative, base).toString();
-			});
+			if (typeof uri === "string") return resolveUri(uri, base, origin, pathname);
+			return uri.map((alternative) => resolveUri(alternative, base, origin, pathname));
 		});
 	});
 };
 const getWwwCounterpart = (baseUrl) => {
 	const url = new URL(baseUrl);
-	const counterpart = new URL(url);
-	if (url.hostname.startsWith("www.")) {
-		counterpart.hostname = url.hostname.replace(/^www\./, "");
-		return counterpart.origin;
-	}
-	counterpart.hostname = `www.${url.hostname}`;
-	return counterpart.origin;
+	const port = url.port ? `:${url.port}` : "";
+	if (url.hostname.startsWith("www.")) return `${url.protocol}//${url.hostname.slice(4)}${port}`;
+	return `${url.protocol}//www.${url.hostname}${port}`;
 };
 const getSubdomainVariants = (baseUrl, prefixes) => {
 	const url = new URL(baseUrl);

package/dist/common/uris/headers/index.cjs

@@ -19,7 +19,7 @@ const discoverUrisFromHeaders = (headers, options) => {
 		if (!rel) continue;
 		if (require_utils.matchesAnyOfLinkSelectors(rel, type, options.linkSelectors)) uris.add(url);
 	}
-	return Array.from(uris);
+	return [...uris];
 };
 //#endregion
 exports.discoverUrisFromHeaders = discoverUrisFromHeaders;

package/dist/common/uris/headers/index.js

@@ -19,7 +19,7 @@ const discoverUrisFromHeaders = (headers, options) => {
 		if (!rel) continue;
 		if (matchesAnyOfLinkSelectors(rel, type, options.linkSelectors)) uris.add(url);
 	}
-	return Array.from(uris);
+	return [...uris];
 };
 //#endregion
 export { discoverUrisFromHeaders };

package/dist/common/uris/html/index.cjs

@@ -13,7 +13,7 @@ const discoverUrisFromHtml = (html, options) => {
 	const parser = new htmlparser2.Parser(require_handlers.createHtmlUrisHandlers(context), { decodeEntities: true });
 	parser.write(html);
 	parser.end();
-	return Array.from(context.discoveredUris);
+	return [...context.discoveredUris];
 };
 //#endregion
 exports.discoverUrisFromHtml = discoverUrisFromHtml;

package/dist/common/uris/html/index.js

@@ -13,7 +13,7 @@ const discoverUrisFromHtml = (html, options) => {
 	const parser = new Parser(createHtmlUrisHandlers(context), { decodeEntities: true });
 	parser.write(html);
 	parser.end();
-	return Array.from(context.discoveredUris);
+	return [...context.discoveredUris];
 };
 //#endregion
 export { discoverUrisFromHtml };

package/dist/common/utils.cjs

@@ -23,7 +23,7 @@ const isHostOf = (url, hosts) => {
 };
 const includesAnyOf = (value, patterns, parser) => {
 	const parsedValue = parser ? parser(value) : value?.toLowerCase();
-	return patterns.map((pattern) => pattern.toLowerCase()).some((pattern) => pattern && parsedValue?.includes(pattern));
+	return patterns.some((pattern) => pattern && parsedValue?.includes(pattern.toLowerCase()));
 };
 const isAnyOf = (value, patterns, parser) => {
 	const parsedValue = parser ? parser(value) : value?.toLowerCase()?.trim();
@@ -42,7 +42,9 @@ const isOfAllowedMimeType = (type, allowedTypes) => {
 	return isAnyOf(type, allowedTypes, normalizeMimeType);
 };
 const omitEmpty = (array) => {
-	return array.filter((item) => item != null && item !== "");
+	const result = [];
+	for (const item of array) if (item != null && item !== "") result.push(item);
+	return result;
 };
 const normalizeUrl = (url, baseUrl) => {
 	return baseUrl ? new URL(url, baseUrl).href : url;

package/dist/common/utils.js

@@ -23,7 +23,7 @@ const isHostOf = (url, hosts) => {
 };
 const includesAnyOf = (value, patterns, parser) => {
 	const parsedValue = parser ? parser(value) : value?.toLowerCase();
-	return patterns.map((pattern) => pattern.toLowerCase()).some((pattern) => pattern && parsedValue?.includes(pattern));
+	return patterns.some((pattern) => pattern && parsedValue?.includes(pattern.toLowerCase()));
 };
 const isAnyOf = (value, patterns, parser) => {
 	const parsedValue = parser ? parser(value) : value?.toLowerCase()?.trim();
@@ -42,7 +42,9 @@ const isOfAllowedMimeType = (type, allowedTypes) => {
 	return isAnyOf(type, allowedTypes, normalizeMimeType);
 };
 const omitEmpty = (array) => {
-	return array.filter((item) => item != null && item !== "");
+	const result = [];
+	for (const item of array) if (item != null && item !== "") result.push(item);
+	return result;
 };
 const normalizeUrl = (url, baseUrl) => {
 	return baseUrl ? new URL(url, baseUrl).href : url;

package/package.json

@@ -112,9 +112,9 @@
   },
   "devDependencies": {
     "@types/bun": "^1.3.10",
-    "kvalita": "1.10.0",
-    "tsdown": "^0.21.1",
+    "kvalita": "1.11.0",
+    "tsdown": "^0.21.4",
     "vitepress": "^1.6.4"
   },
-  "version": "1.6.0"
+  "version": "1.6.1"
 }