@websline/cms-view-utils 1.3.2 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websline/cms-view-utils",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "type": "module",
   "files": [
     "src",
@@ -21,12 +21,12 @@
   "devDependencies": {
     "@eslint/compat": "^2.1.0",
     "@eslint/js": "^10.0.1",
-    "eslint": "^10.5.0",
+    "eslint": "^10.6.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-svelte": "^3.19.0",
-    "globals": "^17.6.0",
-    "prettier": "^3.8.4",
-    "prettier-plugin-svelte": "^3.5.2",
+    "eslint-plugin-svelte": "^3.20.0",
+    "globals": "^17.7.0",
+    "prettier": "^3.9.4",
+    "prettier-plugin-svelte": "^4.1.1",
     "prettier-plugin-tailwindcss": "^0.8.0",
     "tsup": "^8.5.1"
   },

package/src/components/SiteHead.astro

@@ -31,6 +31,9 @@
  * from being indexed by search engines.
  */
 
+import { fetchSiteConfig } from "../cms/fetchSiteConfig.js";
+import { buildAbsoluteUrl } from "../shared/url.js";
+
 const isPreview = Astro.locals._preview ?? false;
 
 const {
@@ -45,6 +48,8 @@ const {
 } = Astro.props;
 
 const {
+	alternates: seoAlternates = [],
+	mainLocale: seoMainLocale,
 	meta: {
 		canonical: seoCanonical,
 		description: seoDescription,
@@ -67,9 +72,13 @@ const finalCanonical = canonicalOverride ?? seoCanonical;
 // For image, use explicit undefined check so null can mean "explicitly no image"
 const finalImage = imageOverride !== undefined ? imageOverride : seoImage;
 
+// The page's real noindex setting drives canonical/hreflang output, so the
+// preview reflects what production emits (preview only forces the robots meta).
+const pageNoIndex = noIndexOverride ?? seoNoIndex ?? false;
+
 // In preview mode, force noindex/nofollow regardless of page settings
 // to prevent unpublished drafts from being indexed
-const finalNoIndex = isPreview ? true : (noIndexOverride ?? seoNoIndex ?? false);
+const finalNoIndex = isPreview ? true : pageNoIndex;
 const finalNoFollow = isPreview ? true : (noFollowOverride ?? seoNoFollow ?? false);
 
 // Build robots string only if at least one directive is active
@@ -81,6 +90,40 @@ const robotsContent =
 
 const finalType = typeOverride ?? "website";
 
+// hreflang: build absolute alternate URLs from the same source the sitemap uses
+// (siteConfig.url + relative alternate path). Only indexable versions belong in
+// the cluster, and a noindex page emits none. Meaningful only with >1 version.
+let hreflangLinks = [];
+const indexableAlternates = seoAlternates.filter((alternate) => !alternate.noIndex);
+if (!pageNoIndex && indexableAlternates.length > 1) {
+	const siteConfig = await fetchSiteConfig(Astro.request).catch(() => null);
+	const siteUrl = siteConfig?.url;
+
+	if (siteUrl) {
+		hreflangLinks = indexableAlternates.map((alternate) => ({
+			hreflang: alternate.locale,
+			href: buildAbsoluteUrl(siteUrl, alternate.url),
+		}));
+
+		// x-default: prefer EN when this page has an indexable EN version,
+		// otherwise fall back to the main locale.
+		const xDefaultLocale = indexableAlternates.some(
+			(alternate) => alternate.locale === "en",
+		)
+			? "en"
+			: seoMainLocale;
+		const xDefaultAlternate = indexableAlternates.find(
+			(alternate) => alternate.locale === xDefaultLocale,
+		);
+		if (xDefaultAlternate) {
+			hreflangLinks.push({
+				hreflang: "x-default",
+				href: buildAbsoluteUrl(siteUrl, xDefaultAlternate.url),
+			});
+		}
+	}
+}
+
 // OG fallbacks (same as meta by default, can be extended via overrides later)
 const ogTitle = finalTitle;
 const ogDescription = finalDescription;
@@ -88,7 +131,12 @@ const ogDescription = finalDescription;
 
 {finalTitle && <title>{finalTitle}</title>}
 {finalDescription && <meta name="description" content={finalDescription} />}
-{finalCanonical && <link rel="canonical" href={finalCanonical} />}
+{finalCanonical && !pageNoIndex && <link rel="canonical" href={finalCanonical} />}
+{
+	hreflangLinks.map((link) => (
+		<link rel="alternate" hreflang={link.hreflang} href={link.href} />
+	))
+}
 {robotsContent && <meta name="robots" content={robotsContent} />}
 
 {/* Open Graph */}

package/src/handlers/sitemapXml.js

@@ -1,3 +1,5 @@
+import { buildAbsoluteUrl } from "../shared/url.js";
+
 const escapeXml = (value) =>
 	String(value).replace(/[<>&'"]/g, (char) => {
 		switch (char) {
@@ -24,7 +26,7 @@ const formatLastmod = (timestamp) => {
 };
 
 const buildUrlBlock = (entry, siteUrl) => {
-	const loc = encodeUrl(`${siteUrl}${entry.path}`);
+	const loc = encodeUrl(buildAbsoluteUrl(siteUrl, entry.path));
 	const lastmod = entry.updatedAt
 		? `\n    <lastmod>${formatLastmod(entry.updatedAt)}</lastmod>`
 		: "";
@@ -32,12 +34,16 @@ const buildUrlBlock = (entry, siteUrl) => {
 	const alternates = (entry.alternates ?? [])
 		.map(
 			(alt) =>
-				`\n    <xhtml:link rel="alternate" hreflang="${escapeXml(alt.locale)}" href="${encodeUrl(`${siteUrl}${alt.path}`)}" />`,
+				`\n    <xhtml:link rel="alternate" hreflang="${escapeXml(alt.locale)}" href="${encodeUrl(buildAbsoluteUrl(siteUrl, alt.path))}" />`,
 		)
 		.join("");
 
+	const xDefault = entry.xDefaultPath
+		? `\n    <xhtml:link rel="alternate" hreflang="x-default" href="${encodeUrl(buildAbsoluteUrl(siteUrl, entry.xDefaultPath))}" />`
+		: "";
+
 	return `  <url>
-    <loc>${loc}</loc>${lastmod}${alternates}
+    <loc>${loc}</loc>${lastmod}${alternates}${xDefault}
   </url>`;
 };
 

package/src/middleware/withRequestFilter.js

@@ -19,6 +19,7 @@ const withRequestFilter = (options = {}) => {
 		const isExcludedPath = additionalExcludePaths.some((p) =>
 			url.pathname.startsWith(p),
 		);
+		const isAstroApiCall = url.pathname.startsWith("/api/");
 
 		return (
 			request.method !== "GET" ||
@@ -26,6 +27,7 @@ const withRequestFilter = (options = {}) => {
 			isErrorRoute ||
 			hasFileExtension ||
 			isExcludedPath ||
+			isAstroApiCall ||
 			customFilter?.(context) === true
 		);
 	};

package/src/shared/url.js

@@ -0,0 +1,12 @@
+/**
+ * Joins the public site URL with a relative path into an absolute URL.
+ *
+ * Keeps URLs free of a trailing slash: the root path ("/") resolves to the
+ * bare site URL, so canonical, sitemap and hreflang all use the same form.
+ */
+const buildAbsoluteUrl = (siteUrl, path) => {
+	const base = siteUrl.replace(/\/+$/, "");
+	return path === "/" ? base : `${base}${path}`;
+};
+
+export { buildAbsoluteUrl };