@sugarat/theme 0.4.2 → 0.4.3

package/node.js

@@ -210,6 +210,7 @@ var import_vitepress_markdown_timeline = __toESM(require("vitepress-markdown-tim
 // src/utils/node/index.ts
 var import_node_child_process = require("child_process");
 var import_node_path = __toESM(require("path"));
+var import_node_fs = __toESM(require("fs"));
 function getDefaultTitle(content) {
   const match = content.match(/^(#+)\s+(.+)/m);
   return match?.[2] || "";
@@ -224,16 +225,30 @@ function getFileBirthTime(url) {
     const child = (0, import_node_child_process.spawn)("git", ["log", "-1", '--pretty="%ai"', url]);
     let output = "";
     child.stdout.on("data", (d) => output += String(d));
-    child.on("close", () => {
-      const date = new Date(output);
+    child.on("close", async () => {
+      let date;
+      if (output.trim()) {
+        date = new Date(output);
+      } else {
+        date = await getFileBirthTimeByFs(url);
+      }
       cache.set(url, date);
       resolve(date);
     });
-    child.on("error", () => {
-      resolve(void 0);
+    child.on("error", async () => {
+      const fsDate = await getFileBirthTimeByFs(url);
+      resolve(fsDate);
     });
   });
 }
+async function getFileBirthTimeByFs(url) {
+  try {
+    const fsStat = await import_node_fs.default.promises.stat(url);
+    return fsStat.birthtime;
+  } catch {
+    return void 0;
+  }
+}
 function getTextSummary(text, count = 100) {
   return text?.replace(/^#+\s+.*/, "")?.replace(/#/g, "")?.replace(/!\[.*?\]\(.*?\)/g, "")?.replace(/\[(.*?)\]\(.*?\)/g, "$1")?.replace(/\*\*(.*?)\*\*/g, "$1")?.split("\n")?.filter((v) => !!v)?.join("\n")?.replace(/>(.*)/, "")?.replace(/</g, "&lt;").replace(/>/g, "&gt;")?.trim()?.slice(0, count);
 }
@@ -358,7 +373,7 @@ function patchOptimizeDeps(config) {
 }
 
 // src/utils/node/theme.ts
-var import_node_fs = __toESM(require("fs"));
+var import_node_fs2 = __toESM(require("fs"));
 var import_node_path2 = __toESM(require("path"));
 var import_node_process = __toESM(require("process"));
 var import_node_os = __toESM(require("os"));
@@ -537,7 +552,7 @@ function getPageRoute(filepath, srcDir) {
 }
 var defaultTimeZoneOffset = (/* @__PURE__ */ new Date()).getTimezoneOffset() / -60;
 async function getArticleMeta(filepath, route, timeZone = defaultTimeZoneOffset) {
-  const fileContent = await import_node_fs.default.promises.readFile(filepath, "utf-8");
+  const fileContent = await import_node_fs2.default.promises.readFile(filepath, "utf-8");
   const { data: frontmatter, excerpt, content } = (0, import_gray_matter.default)(fileContent, {
     excerpt: true
   });
@@ -548,9 +563,7 @@ async function getArticleMeta(filepath, route, timeZone = defaultTimeZoneOffset)
     meta.title = getDefaultTitle(content);
   }
   const date = await (meta.date && /* @__PURE__ */ new Date(`${new Date(meta.date).toUTCString()}+${timeZone}`) || getFileBirthTime(filepath));
-  if (date) {
-    meta.date = formatDate(date);
-  }
+  meta.date = formatDate(date || /* @__PURE__ */ new Date());
   meta.categories = typeof meta.categories === "string" ? [meta.categories] : meta.categories;
   meta.tags = typeof meta.tags === "string" ? [meta.tags] : meta.tags;
   meta.tag = [meta.tag || []].flat().concat([
@@ -610,7 +623,7 @@ function checkConfig(cfg) {
 
 // src/utils/node/vitePlugins.ts
 var import_node_path3 = __toESM(require("path"));
-var import_node_fs2 = require("fs");
+var import_node_fs3 = require("fs");
 var import_node_buffer = require("buffer");
 var import_vitepress_plugin_pagefind = require("vitepress-plugin-pagefind");
 var import_vitepress_plugin_rss = require("vitepress-plugin-rss");
@@ -736,10 +749,10 @@ function coverImgTransform() {
         }
         try {
           const realPath = import_node_path3.default.join(vitepressConfig.root, cover);
-          if (!(0, import_node_fs2.existsSync)(realPath)) {
+          if (!(0, import_node_fs3.existsSync)(realPath)) {
             continue;
           }
-          const fileBuffer = (0, import_node_fs2.readFileSync)(realPath);
+          const fileBuffer = (0, import_node_fs3.readFileSync)(realPath);
           const matchAsset = assetsMap.find((v) => import_node_buffer.Buffer.compare(fileBuffer, v.source) === 0);
           if (matchAsset) {
             page.meta.cover = joinPath("/", matchAsset.fileName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sugarat/theme",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "简约风的 Vitepress 博客主题，sugarat vitepress blog theme",
   "author": "sugar",
   "license": "MIT",

package/src/components/BlogArticleAnalyze.vue

@@ -12,7 +12,7 @@ import {
   UserFilled
 } from '@element-plus/icons-vue'
 import { useBlogConfig, useCurrentArticle, useDocMetaInsertPosition, useDocMetaInsertSelector } from '../composables/config/blog'
-import countWord, { formatShowDate } from '../utils/client'
+import countWord, { formatDate, formatShowDate } from '../utils/client'
 import type { Theme } from '../composables/config'
 import BlogDocCover from './BlogDocCover.vue'
 
@@ -108,6 +108,10 @@ const publishDate = computed(() => {
   return formatShowDate(currentArticle.value?.meta?.date || '')
 })
 
+const hoverDate = computed(() => {
+  return currentArticle.value?.meta?.date ? `: ${formatDate(currentArticle.value?.meta?.date)}` : ''
+})
+
 const timeTitle = computed(() =>
   frontmatter.value.date ? '发布时间' : '最近修改时间'
 )
@@ -164,7 +168,7 @@ watch(
         {{ author }}
       </template>
     </span>
-    <span v-if="publishDate && !hiddenTime" class="publishDate" :title="timeTitle">
+    <span v-if="publishDate && !hiddenTime" class="publishDate" :title="timeTitle + hoverDate">
       <ElIcon><Clock /></ElIcon>
       {{ publishDate }}
     </span>

package/src/utils/node/index.ts

@@ -1,7 +1,8 @@
 /* eslint-disable global-require */
 /* eslint-disable prefer-rest-params */
-import { spawn, spawnSync } from 'node:child_process'
+import { spawn } from 'node:child_process'
 import path from 'node:path'
+import fs from 'node:fs'
 
 export function clearMatterContent(content: string) {
   let first___: unknown
@@ -36,7 +37,7 @@ export function getDefaultTitle(content: string) {
   return match?.[2] || ''
 }
 
-const cache = new Map<string, Date>()
+const cache = new Map<string, Date | undefined>()
 export function getFileBirthTime(url: string): Promise<Date | undefined> | Date {
   const cached = cache.get(url)
   if (cached) {
@@ -48,17 +49,34 @@ export function getFileBirthTime(url: string): Promise<Date | undefined> | Date
     const child = spawn('git', ['log', '-1', '--pretty="%ai"', url])
     let output = ''
     child.stdout.on('data', d => (output += String(d)))
-    child.on('close', () => {
-      const date = new Date(output)
+    child.on('close', async () => {
+      let date: Date | undefined
+      if (output.trim()) {
+        date = new Date(output)
+      }
+      else {
+        date = await getFileBirthTimeByFs(url)
+      }
       cache.set(url, date)
       resolve(date)
     })
-    child.on('error', () => {
-      resolve(undefined)
+    child.on('error', async () => {
+      const fsDate = await getFileBirthTimeByFs(url)
+      resolve(fsDate)
     })
   })
 }
 
+export async function getFileBirthTimeByFs(url: string) {
+  try {
+    const fsStat = await fs.promises.stat(url)
+    return fsStat.birthtime
+  }
+  catch {
+    return undefined
+  }
+}
+
 export function getGitTimestamp(file: string) {
   return new Promise((resolve, reject) => {
     const child = spawn('git', ['log', '-1', '--pretty="%ci"', file])

package/src/utils/node/theme.ts

@@ -70,9 +70,8 @@ export async function getArticleMeta(filepath: string, route: string, timeZone =
        && new Date(`${new Date(meta.date).toUTCString()}+${timeZone}`))
      || getFileBirthTime(filepath)
   )
-  if (date) {
-    meta.date = formatDate(date)
-  }
+  // 无法获取时兜底当前时间
+  meta.date = formatDate(date || new Date())
 
   // 处理tags和categories,兼容历史文章
   meta.categories