@xingwangzhe/stalux 1.20.3 → 1.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xingwangzhe/stalux",
-    "version": "1.20.3",
+    "version": "1.21.1",
     "description": "A powerful, modern Astro blog theme — use as template or install as plugin",
     "keywords": [
         "astro",
@@ -84,6 +84,7 @@
         "@waline/client": "^3.15.2",
         "@xingwangzhe/satteri-mermaid": "0.7.3",
         "@xingwangzhe/satteri-photoswipe": "^0.2.2",
+        "@xingwangzhe/stalux": "1.21.0",
         "@xingwangzhe/tags-cloud": "^1.2.5",
         "animejs": "^4.5.0",
         "astro-expressive-code": "^0.44.1",

package/src/components/stalux/layout/head.astro

@@ -8,13 +8,21 @@ import BingClarity from "@components/stalux/analytics/clarity.astro";
 import "@styles/base/init.css";
 import Umami from "@components/stalux/analytics/umami.astro";
 import { langToOpenGraphLocale } from "@utils/i18n";
-import { getAuthorData, getHeadData, getPromoteData, getSiteData } from "@utils/config-utils";
+import {
+  getAuthorData,
+  getHeadData,
+  getMediaLinksData,
+  getPromoteData,
+  getSiteData,
+} from "@utils/config-utils";
+import { getRouteKind } from "@utils/view-transitions";
 
 const configEntries = await getCollection("config");
 const siteConfig = getSiteData(configEntries);
 const authorConfig = getAuthorData(configEntries);
 const headConfig = getHeadData(configEntries);
 const promoteConfig = getPromoteData(configEntries);
+const mediaLinksConfig = getMediaLinksData(configEntries);
 
 // Twitter 卡片类型定义
 type TwitterCardType = "summary" | "summary_large_image";
@@ -34,21 +42,31 @@ interface Props {
 }
 
 const props = Astro.props as Props;
-const effectiveTitle = props.title;
+const effectiveTitle = siteConfig.seoTitle || props.title;
 const effectiveDescription = props.description;
 const isArticle = props.isArticle ?? false;
 
 const canonicalBase = siteConfig.canonical || siteConfig.url;
+const siteUrl = new URL(canonicalBase || Astro.url.origin).href.replace(/\/$/, "");
+const siteName = siteConfig.title || effectiveTitle;
 const canonicalUrl = canonicalBase
-  ? new URL(Astro.url.pathname, canonicalBase).href
-  : Astro.url.href;
+  ? new URL(Astro.url.pathname, `${canonicalBase.replace(/\/$/, "")}/`).href
+  : new URL(Astro.url.pathname, Astro.url).href;
 const faviconPath = siteConfig.favicon || "/favicon.ico";
 // 社交分享图片 / JSON-LD image 必须用绝对 URL
-const baseImgUrl = canonicalBase.replace(/\/$/, "");
-const toAbsolute = (p: string) => !p || p.startsWith("http") ? p : baseImgUrl + (p.startsWith("/") ? p : "/" + p);
+const baseImgUrl = canonicalBase?.replace(/\/$/, "") || Astro.url.origin;
+const toAbsolute = (value?: string) => {
+  if (!value) return undefined;
+  if (/^(?:https?:|data:|\/\/)/i.test(value)) {
+    return value.startsWith("//") ? `${Astro.url.protocol}${value}` : value;
+  }
+  return `${baseImgUrl}/${value.replace(/^\/+/, "")}`;
+};
 const ogImagePath = toAbsolute(props.cover || authorConfig.avatar || faviconPath);
 const isNotFoundPage =
   Astro.url.pathname === "/404" || Astro.url.pathname === "/404/";
+const routeKind = getRouteKind(Astro.url.pathname);
+const isCollectionPage = routeKind.endsWith("-index") || routeKind.endsWith("-detail");
 const resolvedNoindex = Boolean(siteConfig.noindex) || isNotFoundPage || Boolean(props.noindex);
 const resolvedNofollow = Boolean(siteConfig.nofollow) || isNotFoundPage;
 
@@ -62,6 +80,7 @@ const openGraphConfig: Record<string, unknown> = {
   optional: {
     description: effectiveDescription,
     locale: langToOpenGraphLocale(siteConfig.lang || "zh-CN"),
+    siteName,
   },
   image: {
     url: ogImagePath,
@@ -123,6 +142,21 @@ const extendedMeta = [
 ];
 
 let schema: Record<string, unknown>;
+const sameAs = mediaLinksConfig?.items
+  .map((item) => item.link)
+  .filter((link) => /^https?:\/\//i.test(link));
+const authorEntity = {
+  "@type": "Person",
+  name: authorConfig.name,
+  ...(toAbsolute(authorConfig.avatar) ? { image: toAbsolute(authorConfig.avatar) } : {}),
+  ...(sameAs.length ? { sameAs } : {}),
+};
+const publisher = {
+  "@type": "Organization",
+  name: siteName,
+  url: siteUrl,
+  ...(authorConfig.avatar ? { logo: toAbsolute(authorConfig.avatar) } : {}),
+};
 if (isArticle) {
   schema = {
     "@context": "https://schema.org",
@@ -130,28 +164,38 @@ if (isArticle) {
     headline: effectiveTitle,
     description: effectiveDescription,
     url: canonicalUrl,
-    image: ogImagePath,
-    datePublished: props.date,
-    dateModified: props.updated || props.date,
-    keywords: props.tags?.join(", "),
-    author: props.author
-      ? {
-          "@type": "Person",
-          name: props.author,
-        }
-      : undefined,
+    ...(ogImagePath ? { image: ogImagePath } : {}),
+    ...(props.date ? { datePublished: props.date } : {}),
+    ...(props.updated || props.date ? { dateModified: props.updated || props.date } : {}),
+    ...(props.tags?.length ? { keywords: props.tags.join(", ") } : {}),
+    author: props.author ? { ...authorEntity, name: props.author } : authorEntity,
+    publisher,
+    inLanguage: siteConfig.lang || "zh-CN",
     mainEntityOfPage: {
       "@type": "WebPage",
       "@id": canonicalUrl,
     },
   };
-} else {
+} else if (routeKind === "home") {
   schema = {
     "@context": "https://schema.org",
     "@type": "WebSite",
     url: canonicalUrl,
     name: effectiveTitle,
     description: effectiveDescription,
+    inLanguage: siteConfig.lang || "zh-CN",
+    publisher,
+    author: authorEntity,
+  };
+} else {
+  schema = {
+    "@context": "https://schema.org",
+    "@type": isCollectionPage ? "CollectionPage" : routeKind === "about" ? "AboutPage" : "WebPage",
+    url: canonicalUrl,
+    name: effectiveTitle,
+    description: effectiveDescription,
+    inLanguage: siteConfig.lang || "zh-CN",
+    isPartOf: { "@type": "WebSite", url: siteUrl, name: siteName },
   };
 }
 const ldJson = JSON.stringify(schema, null, 2).replace(/<\//g, "<\\/");

package/src/pages/index.astro

@@ -21,6 +21,7 @@ import { getSiteData, getAuthorData, getHeadData, getNavsData, getLinksData, get
     <div class={styles.homeNavs}>
       <Navs />
     </div>
+    <h2 class="sr-only" style="position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0;">关于本站</h2>
     <Author />
     <TextType />
     <DateTime />

package/src/schemas/config.ts

@@ -16,6 +16,7 @@ export const siteSchema = z.object({
     title: z.string().min(1, "site.title is required"),
     url: z.string().url("site.url must be a valid URL"),
     description: z.string().min(1, "site.description is required"),
+    seoTitle: z.string().min(1).optional(),
     timezone: z.string().optional().default("Asia/Shanghai"),
     canonical: z.string().url("site.canonical must be a valid URL").optional(),
     twitterSite: z.string().optional(),