valaxy 0.28.0 → 0.28.1

package/dist/node/cli/index.mjs

@@ -1,7 +1,7 @@
 import 'node:process';
 import 'yargs';
 import 'yargs/helpers';
-export { c as cli, I as registerDevCommand, W as run, Z as startValaxyDev } from '../../shared/valaxy.DQ6HsU2J.mjs';
+export { c as cli, I as registerDevCommand, W as run, Z as startValaxyDev } from '../../shared/valaxy.DFTOADvQ.mjs';
 import 'node:os';
 import 'node:path';
 import 'consola';
@@ -29,6 +29,7 @@ import 'feed';
 import 'markdown-it';
 import 'table';
 import 'hookable';
+import 'node:fs';
 import 'node:child_process';
 import 'node:v8';
 import 'vite-ssg-sitemap';
@@ -57,7 +58,6 @@ import 'p-map';
 import 'node:buffer';
 import 'minisearch';
 import 'lru-cache';
-import 'node:fs';
 import 'jiti';
 import 'unocss';
 import 'pascalcase';

package/dist/node/index.d.mts

@@ -1,7 +1,7 @@
 import { ViteSSGOptions } from 'vite-ssg';
 import * as vite from 'vite';
 import { UserConfig, InlineConfig, ViteDevServer, PluginOption, Plugin } from 'vite';
-import { D as DefaultTheme, R as RuntimeConfig, a as RedirectItem, V as ValaxyConfig, P as PartialDeep, b as ValaxyAddon, S as SiteConfig, U as UserSiteConfig } from '../shared/valaxy.6MW2qn5T.mjs';
+import { S as SiteConfig, D as DefaultTheme, R as RuntimeConfig, a as RedirectItem, V as ValaxyConfig, P as PartialDeep, b as ValaxyAddon, U as UserSiteConfig } from '../shared/valaxy.6MW2qn5T.mjs';
 import Vue from '@vitejs/plugin-vue';
 import { Hookable } from 'hookable';
 import { PluginVisualizerOptions } from 'rollup-plugin-visualizer';
@@ -445,6 +445,14 @@ interface ValaxyHooks {
     'md:afterRender': (ctx: MdAfterRenderContext) => HookResult;
     'build:before': () => HookResult;
     'build:after': () => HookResult;
+    /**
+     * Called to compute statistics (word count, reading time) for a markdown route.
+     * Default implementation uses `presetStatistics`; addons/themes can hook to override.
+     */
+    'statistics': (ctx: {
+        route: EditableTreeNode;
+        options: SiteConfig['statistics'];
+    }) => HookResult;
     /**
      * @experimental
      * Called before content loaders start fetching.

package/dist/node/index.mjs

@@ -1,4 +1,4 @@
-export { A as ALL_ROUTE, E as EXCERPT_SEPARATOR, G as GLOBAL_STATE, P as PATHNAME_PROTOCOL_RE, V as ViteValaxyPlugins, b as build, c as cli, a as createServer, d as createValaxyPlugin, e as customElements, f as defaultSiteConfig, g as defaultValaxyConfig, h as defaultViteConfig, i as defineAddon, j as defineConfig, k as defineSiteConfig, l as defineTheme, m as defineValaxyAddon, n as defineValaxyConfig, o as defineValaxyTheme, p as encryptContent, q as generateClientRedirects, r as getGitTimestamp, s as getIndexHtml, t as getServerInfoText, u as isExternal, v as isInstalledGlobally, w as isKatexEnabled, x as isKatexPluginNeeded, y as isMathJaxEnabled, z as isPath, B as loadConfigFromFile, C as mergeValaxyConfig, D as mergeViteConfigs, F as postProcessForSSG, H as processValaxyOptions, I as registerDevCommand, J as resolveAddonsConfig, K as resolveImportPath, L as resolveImportUrl, M as resolveOptions, N as resolveSiteConfig, O as resolveSiteConfigFromRoot, Q as resolveThemeConfigFromRoot, R as resolveThemeValaxyConfig, S as resolveUserThemeConfig, T as resolveValaxyConfig, U as resolveValaxyConfigFromRoot, W as run, X as ssgBuild, Y as ssgBuildLegacy, Z as startValaxyDev, _ as toAtFS, $ as transformObject, a0 as version } from '../shared/valaxy.DQ6HsU2J.mjs';
+export { A as ALL_ROUTE, E as EXCERPT_SEPARATOR, G as GLOBAL_STATE, P as PATHNAME_PROTOCOL_RE, V as ViteValaxyPlugins, b as build, c as cli, a as createServer, d as createValaxyPlugin, e as customElements, f as defaultSiteConfig, g as defaultValaxyConfig, h as defaultViteConfig, i as defineAddon, j as defineConfig, k as defineSiteConfig, l as defineTheme, m as defineValaxyAddon, n as defineValaxyConfig, o as defineValaxyTheme, p as encryptContent, q as generateClientRedirects, r as getGitTimestamp, s as getIndexHtml, t as getServerInfoText, u as isExternal, v as isInstalledGlobally, w as isKatexEnabled, x as isKatexPluginNeeded, y as isMathJaxEnabled, z as isPath, B as loadConfigFromFile, C as mergeValaxyConfig, D as mergeViteConfigs, F as postProcessForSSG, H as processValaxyOptions, I as registerDevCommand, J as resolveAddonsConfig, K as resolveImportPath, L as resolveImportUrl, M as resolveOptions, N as resolveSiteConfig, O as resolveSiteConfigFromRoot, Q as resolveThemeConfigFromRoot, R as resolveThemeValaxyConfig, S as resolveUserThemeConfig, T as resolveValaxyConfig, U as resolveValaxyConfigFromRoot, W as run, X as ssgBuild, Y as ssgBuildLegacy, Z as startValaxyDev, _ as toAtFS, $ as transformObject, a0 as version } from '../shared/valaxy.DFTOADvQ.mjs';
 import 'node:path';
 import 'fs-extra';
 import 'consola/utils';
@@ -29,6 +29,7 @@ import 'feed';
 import 'markdown-it';
 import 'table';
 import 'hookable';
+import 'node:fs';
 import 'node:child_process';
 import 'node:v8';
 import 'vite-ssg-sitemap';
@@ -57,7 +58,6 @@ import 'p-map';
 import 'node:buffer';
 import 'minisearch';
 import 'lru-cache';
-import 'node:fs';
 import 'jiti';
 import 'unocss';
 import 'pascalcase';

package/dist/shared/{valaxy.DQ6HsU2J.mjs → valaxy.DFTOADvQ.mjs}

@@ -28,6 +28,7 @@ import { Feed } from 'feed';
 import MarkdownIt from 'markdown-it';
 import { table, getBorderCharacters } from 'table';
 import { createHooks } from 'hookable';
+import { existsSync, readFileSync } from 'node:fs';
 import { execFileSync, execSync, exec } from 'node:child_process';
 import v8 from 'node:v8';
 import generateSitemap from 'vite-ssg-sitemap';
@@ -56,14 +57,13 @@ import pMap from 'p-map';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import MiniSearch from 'minisearch';
 import { LRUCache } from 'lru-cache';
-import { existsSync, readFileSync } from 'node:fs';
 import { createJiti } from 'jiti';
 import { transformerDirectives, transformerVariantGroup, presetWind4, presetAttributify, presetIcons, presetTypography } from 'unocss';
 import pascalCase from 'pascalcase';
 import { convert } from 'html-to-text';
 import VueRouter from 'vue-router/vite';
 import { renderSSRHead } from '@unhead/vue/server';
-import { intro, confirm, select, outro } from '@clack/prompts';
+import { intro, confirm, isCancel, cancel, select, outro } from '@clack/prompts';
 import net from 'node:net';
 import * as readline from 'node:readline';
 import qrcode from 'qrcode';
@@ -1721,7 +1721,7 @@ async function setupMarkdownPlugins(md, options, base = "/") {
   return md;
 }
 
-const version = "0.28.0";
+const version = "0.28.1";
 
 const GLOBAL_STATE = {
   valaxyApp: void 0,
@@ -3109,12 +3109,68 @@ function clearHtmlTags(str) {
   return str.replace(/<[^>]*>/g, "").replace(/\s+/g, " ");
 }
 
+function count(content) {
+  const cn = (content.match(/[\u4E00-\u9FA5]/g) || []).length;
+  const en = (content.replace(/[\u4E00-\u9FA5]/g, "").match(/[\w\u0392-\u03C9\u0400-\u04FF]+|[\u4E00-\u9FFF\u3400-\u4DBF\uF900-\uFAFF\u3040-\u309F\uAC00-\uD7AF\u0400-\u04FF]+|[\u00E4\u00C4\u00E5\u00C5\u00F6\u00D6]+/g) || []).length;
+  return {
+    cn,
+    en
+  };
+}
+function readTime({ cn, en }, options) {
+  const readingTime = cn / (options.speed.cn || 300) + en / (options.speed.en || 100);
+  return readingTime < 1 ? 1 : Math.ceil(readingTime);
+}
+function wordCount({ cn, en }) {
+  const num = cn + en;
+  if (num < 1e3)
+    return num.toString();
+  return `${Math.round(num / 100) / 10}k`;
+}
+function statistics(content, options) {
+  const countData = count(content);
+  return {
+    countData,
+    wordCount: wordCount(countData),
+    readingTime: readTime(countData, options.readTime)
+  };
+}
+function presetStatistics({
+  route,
+  options
+}) {
+  const absolutePath = route.components.get("default") || "";
+  if (existsSync(absolutePath)) {
+    const file = readFileSync(absolutePath, "utf-8");
+    const { wordCount: wordCount2, readingTime } = statistics(file, {
+      readTime: {
+        ...options.readTime,
+        speed: {
+          cn: options.readTime?.speed?.cn || 300,
+          en: options.readTime?.speed?.en || 100
+        }
+      }
+    });
+    const { frontmatter } = route.meta;
+    if (frontmatter && typeof frontmatter === "object" && !Array.isArray(frontmatter)) {
+      const fm = frontmatter;
+      if (!fm.wordCount)
+        fm.wordCount = wordCount2;
+      if (!fm.readingTime)
+        fm.readingTime = readingTime;
+    }
+  }
+}
+
 const buildHooks = [
   "build:before",
   "build:after"
 ];
 function createValaxyNode(options) {
   const hooks = createHooks();
+  hooks.hook("statistics", ({ route, options: statsOptions }) => {
+    presetStatistics({ route, options: statsOptions });
+  });
   if (typeof options.config.hooks === "object") {
     Object.keys(options.config.hooks).forEach((name) => {
       const hookName = name;
@@ -4302,59 +4358,6 @@ async function createValaxyPlugin(options, serverOptions = {}) {
   ];
 }
 
-function count(content) {
-  const cn = (content.match(/[\u4E00-\u9FA5]/g) || []).length;
-  const en = (content.replace(/[\u4E00-\u9FA5]/g, "").match(/[\w\u0392-\u03C9\u0400-\u04FF]+|[\u4E00-\u9FFF\u3400-\u4DBF\uF900-\uFAFF\u3040-\u309F\uAC00-\uD7AF\u0400-\u04FF]+|[\u00E4\u00C4\u00E5\u00C5\u00F6\u00D6]+/g) || []).length;
-  return {
-    cn,
-    en
-  };
-}
-function readTime({ cn, en }, options) {
-  const readingTime = cn / (options.speed.cn || 300) + en / (options.speed.en || 100);
-  return readingTime < 1 ? 1 : Math.ceil(readingTime);
-}
-function wordCount({ cn, en }) {
-  const num = cn + en;
-  if (num < 1e3)
-    return num.toString();
-  return `${Math.round(num / 100) / 10}k`;
-}
-function statistics(content, options) {
-  const countData = count(content);
-  return {
-    countData,
-    wordCount: wordCount(countData),
-    readingTime: readTime(countData, options.readTime)
-  };
-}
-function presetStatistics({
-  route,
-  options
-}) {
-  const absolutePath = route.components.get("default") || "";
-  if (existsSync(absolutePath)) {
-    const file = readFileSync(absolutePath, "utf-8");
-    const { wordCount: wordCount2, readingTime } = statistics(file, {
-      readTime: {
-        ...options.readTime,
-        speed: {
-          cn: options.readTime?.speed?.cn || 300,
-          en: options.readTime?.speed?.en || 100
-        }
-      }
-    });
-    const { frontmatter } = route.meta;
-    if (frontmatter && typeof frontmatter === "object" && !Array.isArray(frontmatter)) {
-      const fm = frontmatter;
-      if (!fm.wordCount)
-        fm.wordCount = wordCount2;
-      if (!fm.readingTime)
-        fm.readingTime = readingTime;
-    }
-  }
-}
-
 async function getExcerptByType(excerpt = "", type = "html", mdIt) {
   switch (type) {
     case "ai":
@@ -4433,7 +4436,7 @@ async function createRouterPlugin(valaxyApp) {
         const md = await fs.readFile(path, "utf-8");
         const { data, excerpt, content } = matter(md, matterOptions);
         const mdFm = data;
-        const lastUpdated = options.config.siteConfig.lastUpdated;
+        const lastUpdated = valaxyConfig.siteConfig.lastUpdated;
         delete mdFm.password;
         if (mdFm.gallery_password) {
           delete mdFm.gallery_password;
@@ -4471,8 +4474,7 @@ async function createRouterPlugin(valaxyApp) {
         ];
         const routerFM = {
           ...mdFm,
-          // 主题有新的字段需要主动设置
-          // @TODO 添加文档和配置项，或者反过来允许用户自行优化
+          // Normalize tags: ensure always an array for consistent consumption
           tags: typeof mdFm.tags === "string" ? [mdFm.tags] : mdFm.tags,
           // set default updated to date if not present
           updated: mdFm.updated ?? mdFm.date
@@ -4497,7 +4499,7 @@ async function createRouterPlugin(valaxyApp) {
           });
         }
         if (valaxyConfig.siteConfig.statistics.enable) {
-          presetStatistics({
+          await valaxyApp.hooks.callHook("statistics", {
             options: valaxyConfig.siteConfig.statistics,
             route
           });
@@ -6205,48 +6207,81 @@ function registerDebugCommand(cli) {
 }
 
 function registerDeployCommand(cli) {
-  cli.command("deploy", "deploy your blog to the cloud", async () => {
-    intro("Deploying Your Blog");
-    const shouldBuild = await confirm({
-      message: "Do you want to build your blog before deploying?"
-    });
-    if (shouldBuild) {
-      await execBuild({ ssg: true, ssgEngine: "valaxy", root: process.cwd(), output: "dist", log: "info" });
-    }
-    const deployType = await select({
-      message: "Where do you want to deploy?",
-      options: [
-        { label: "GitHub Pages", value: "gh-pages", hint: "You need install `gh-pages` dependencies." },
-        { label: "Your Own Server", value: "server" }
-      ]
-    });
-    if (deployType === "gh-pages") {
-      let isGhPagesInstalled = false;
-      try {
-        await import('gh-pages');
-        isGhPagesInstalled = true;
-      } catch (e) {
-        console.error(e);
-        const installGhPages = await confirm({
-          message: "Do you want to install `gh-pages` now?"
-        });
-        if (installGhPages) {
-          await import('@antfu/install-pkg').then((i) => i.installPackage("gh-pages", { dev: true }));
+  cli.command(
+    "deploy [root]",
+    "deploy your blog to the cloud",
+    (args) => commonOptions(args).option("type", {
+      type: "string",
+      choices: ["gh-pages", "remote"],
+      describe: "deploy type, overrides `deploy.type` in config"
+    }).option("output", {
+      alias: "o",
+      type: "string",
+      default: "dist",
+      describe: "output dir"
+    }).strict().help(),
+    async ({ root, type, output }) => {
+      intro("Deploying Your Blog");
+      const shouldBuild = await confirm({
+        message: "Do you want to build your blog before deploying?"
+      });
+      if (isCancel(shouldBuild)) {
+        cancel("Operation cancelled.");
+        process.exit(0);
+      }
+      if (shouldBuild) {
+        await execBuild({ ssg: true, ssgEngine: "valaxy", root, output, log: "info" });
+      }
+      const options = await resolveOptions({ userRoot: root }, "build");
+      const configDeployType = type ?? options.config.deploy?.type;
+      const deployType = configDeployType ?? await select({
+        message: "Where do you want to deploy?",
+        options: [
+          { label: "GitHub Pages", value: "gh-pages", hint: "You need install `gh-pages` dependencies." },
+          { label: "Your Own Server", value: "remote" }
+        ]
+      });
+      if (isCancel(deployType)) {
+        cancel("Operation cancelled.");
+        process.exit(0);
+      }
+      if (deployType === "gh-pages") {
+        let isGhPagesInstalled = false;
+        try {
+          await import('gh-pages');
           isGhPagesInstalled = true;
-        } else {
-          outro("Please install `gh-pages` before deploying to GitHub Pages.");
+        } catch {
+          const installGhPages = await confirm({
+            message: "Do you want to install `gh-pages` now?"
+          });
+          if (isCancel(installGhPages)) {
+            cancel("Operation cancelled.");
+            process.exit(0);
+          }
+          if (installGhPages) {
+            try {
+              await import('@antfu/install-pkg').then((i) => i.installPackage("gh-pages", { dev: true }));
+              isGhPagesInstalled = true;
+            } catch (e) {
+              consola.error("Failed to install `gh-pages`:", e);
+            }
+          } else {
+            outro("Please install `gh-pages` before deploying to GitHub Pages.");
+          }
         }
-      }
-      if (isGhPagesInstalled) {
-        const { publish } = await import('gh-pages');
-        await publish("dist", {
-          branch: "gh-pages",
-          message: "chore: deploy by valaxy"
-        });
-        outro("Done!");
+        if (isGhPagesInstalled) {
+          const { publish } = await import('gh-pages');
+          await publish(output, {
+            branch: "gh-pages",
+            message: "chore: deploy by valaxy"
+          });
+          outro("Done!");
+        }
+      } else if (deployType === "remote") {
+        outro("Remote deployment is not yet implemented.");
       }
     }
-  });
+  );
 }
 
 async function findFreePort(start) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "0.28.0",
+  "version": "0.28.1",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -139,8 +139,8 @@
     "vue-i18n": "^11.3.0",
     "vue-router": "^5.0.4",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "0.28.0",
-    "@valaxyjs/utils": "0.28.0"
+    "@valaxyjs/devtools": "0.28.1",
+    "@valaxyjs/utils": "0.28.1"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^3.0.2",