pug-site-core 3.0.3 → 3.0.4

package/lib/generate.js

@@ -15,6 +15,7 @@ import {
 import _ from "lodash";
 import async from "async";
 import UglifyJS from "uglify-js";
+import { minify as htmlMinify } from "html-minifier-terser";
 import { paths } from "./paths.js";
 import path from "path";
 
@@ -309,7 +310,10 @@ export async function fetchDataToJsonFile(args) {
             await checkData(data, language, obj.getDataFn);
             let outPutPath = obj.outPutPath.split("/").join(pathSymbol);
             if (Array.isArray(data)) {
-              let name = outPutPath.split(pathSymbol).pop().replace(/\.[^.]*$/, "");
+              let name = outPutPath
+                .split(pathSymbol)
+                .pop()
+                .replace(/\.[^.]*$/, "");
               const regex = /^\[.+\]$/;
               if (regex.test(name)) {
                 let property = name.slice(1, -1);
@@ -497,6 +501,41 @@ export async function buildStatic() {
   let starTime = Date.now();
   let distOutputPath = paths.resolveRoot(config.staticOutput);
 
+  // HTML压缩配置
+  const htmlMinifyOptions = {
+    collapseWhitespace: true,
+    removeComments: true,
+    removeRedundantAttributes: true,
+    removeScriptTypeAttributes: true,
+    removeStyleLinkTypeAttributes: true,
+    minifyCSS: true,
+    minifyJS: true,
+    useShortDoctype: true,
+    removeEmptyAttributes: true,
+    removeOptionalTags: true,
+    caseSensitive: false,
+  };
+
+  /**
+   * 压缩HTML内容
+   * @param {string} html - 原始HTML内容
+   * @param {string} filePath - 文件路径（用于错误报告）
+   * @returns {string} 压缩后的HTML内容
+   */
+  async function compressHtml(html, filePath = "") {
+    // 检查是否启用HTML压缩
+    if (!config.minifyHtml) {
+      return html; // 如果禁用压缩，直接返回原始HTML
+    }
+
+    try {
+      return await htmlMinify(html, htmlMinifyOptions);
+    } catch (error) {
+      console.warn(`HTML压缩失败 [${filePath}]:`, error.message);
+      return html; // 如果压缩失败，返回原始HTML
+    }
+  }
+
   /**
    * 构建HTML文件路径
    * @param {string} lang - 语言代码
@@ -505,24 +544,29 @@ export async function buildStatic() {
    * @returns {string} 完整的HTML文件路径
    */
   function buildHtmlPath(lang, outputPath, fileName = null) {
-    let htmlPath
+    let htmlPath;
     try {
       if (fileName) {
-                  htmlPath = paths.resolveRoot(
-            distOutputPath,
-            lang,
-            outputPath.replace(
-              outputPath.split("/").pop().replace(/\.[^.]*$/, ""),
-              fileName.replace(/\.[^.]*$/, "")
-            )
-          );
+        htmlPath = paths.resolveRoot(
+          distOutputPath,
+          lang,
+          outputPath.replace(
+            outputPath
+              .split("/")
+              .pop()
+              .replace(/\.[^.]*$/, ""),
+            fileName.replace(/\.[^.]*$/, "")
+          )
+        );
       } else {
         htmlPath = paths.resolveRoot(distOutputPath, lang, outputPath);
       }
       console.log(htmlPath);
       return htmlPath;
     } catch (error) {
-      throw new Error(`构建HTML路径失败 [lang: ${lang}, outputPath: ${outputPath}, fileName: ${fileName}]: ${error.message}`);
+      throw new Error(
+        `构建HTML路径失败 [lang: ${lang}, outputPath: ${outputPath}, fileName: ${fileName}]: ${error.message}`
+      );
     }
   }
 
@@ -534,71 +578,111 @@ export async function buildStatic() {
       if (!pagesPugToFn[funName]) {
         throw new Error(`模板函数 ${funName} 不存在`);
       }
-      
+
       return pagesPugToFn[funName]({
         data,
         _pagePath: pagePath,
         common: commonData,
       });
     } catch (error) {
-      throw new Error(`生成HTML失败 [funName: ${funName}, pagePath: ${pagePath}]: ${error.message}`);
+      throw new Error(
+        `生成HTML失败 [funName: ${funName}, pagePath: ${pagePath}]: ${error.message}`
+      );
     }
   }
 
   /**
    * 处理数组数据的HTML输出
    */
-  async function processArrayData(pagesPugToFn, data, obj, funName, pagePath, commonData, lang) {
+  async function processArrayData(
+    pagesPugToFn,
+    data,
+    obj,
+    funName,
+    pagePath,
+    commonData,
+    lang
+  ) {
     try {
-              const name = obj.outPutHtmlPath.split("/").pop().replace(/\.[^.]*$/, "");
+      const name = obj.outPutHtmlPath
+        .split("/")
+        .pop()
+        .replace(/\.[^.]*$/, "");
       const regex = /^\[.+\]$/;
-      
+
       if (regex.test(name)) {
         const property = name.slice(1, -1);
-        
-        await async.eachLimit(data, 64, async (dataItem, index) => {
+
+        await async.eachLimit(data, 128, async (dataItem, index) => {
           try {
             const fileName = dataItem[property];
             if (!fileName) {
-              throw new Error(
-                `数据项索引 ${index} 中缺少属性 ${property} 或值为空`
-              );
+              throw new Error(`数据项索引 ${index} 中缺少属性 ${property} 或值为空`);
             }
-            
+
             const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath, fileName);
-            const html = generateHtml(pagesPugToFn, funName, dataItem, pagePath, commonData);
-            await fse.outputFile(htmlPath, html);
+            const html = generateHtml(
+              pagesPugToFn,
+              funName,
+              dataItem,
+              pagePath,
+              commonData
+            );
+            const compressedHtml = await compressHtml(html, htmlPath);
+            await fse.outputFile(htmlPath, compressedHtml);
           } catch (error) {
-            throw new Error(`处理数组数据项失败 [index: ${index}, property: ${property}]: ${error.message}`);
+            throw new Error(
+              `处理数组数据项失败 [index: ${index}, property: ${property}]: ${error.message}`
+            );
           }
         });
       } else {
         const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath);
         const html = generateHtml(pagesPugToFn, funName, data, pagePath, commonData);
-        await fse.outputFile(htmlPath, html);
+        const compressedHtml = await compressHtml(html, htmlPath);
+        await fse.outputFile(htmlPath, compressedHtml);
       }
     } catch (error) {
-      throw new Error(`处理数组数据失败 [lang: ${lang}, getDataFn: ${obj.getDataFn}]: ${error.message}`);
+      throw new Error(
+        `处理数组数据失败 [lang: ${lang}, getDataFn: ${obj.getDataFn}]: ${error.message}`
+      );
     }
   }
 
   /**
    * 处理对象数据的HTML输出
    */
-  async function processObjectData(pagesPugToFn, data, obj, funName, pagePath, commonData, lang) {
+  async function processObjectData(
+    pagesPugToFn,
+    data,
+    obj,
+    funName,
+    pagePath,
+    commonData,
+    lang
+  ) {
     try {
       const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath);
       const html = generateHtml(pagesPugToFn, funName, data, pagePath, commonData);
-      await fse.outputFile(htmlPath, html);
+      const compressedHtml = await compressHtml(html, htmlPath);
+      await fse.outputFile(htmlPath, compressedHtml);
     } catch (error) {
-      throw new Error(`处理对象数据失败 [lang: ${lang}, getDataFn: ${obj.getDataFn}]: ${error.message}`);
+      throw new Error(
+        `处理对象数据失败 [lang: ${lang}, getDataFn: ${obj.getDataFn}]: ${error.message}`
+      );
     }
   }
 
   /**
    * 处理自定义HTML构建
    */
-  async function processCustomBuildHtml(pagesPugToFn, lang, getData, commonData, dealWithEndFunName) {
+  async function processCustomBuildHtml(
+    pagesPugToFn,
+    lang,
+    getData,
+    commonData,
+    dealWithEndFunName
+  ) {
     if (!config.customBuildHtml?.length) return;
 
     await async.eachLimit(config.customBuildHtml, 3, async (obj) => {
@@ -609,12 +693,15 @@ export async function buildStatic() {
         }
 
         // 获取数据
-        if (!getData[obj.getDataFn] || typeof getData[obj.getDataFn] !== 'function') {
+        if (
+          !getData[obj.getDataFn] ||
+          typeof getData[obj.getDataFn] !== "function"
+        ) {
           throw new Error(`数据获取函数 ${obj.getDataFn} 不存在或不是函数`);
         }
 
         const data = await getData[obj.getDataFn](lang);
-        
+
         // 处理路径和函数名
         obj.inputPugPath = obj.inputPugPath.replace(/^\//, "");
         const funName = obj.inputPugPath.split("/").join("_").slice(0, -4);
@@ -623,14 +710,34 @@ export async function buildStatic() {
 
         // 根据数据类型处理
         if (Array.isArray(data)) {
-          await processArrayData(pagesPugToFn, data, obj, funName, pagePath, commonData, lang);
+          await processArrayData(
+            pagesPugToFn,
+            data,
+            obj,
+            funName,
+            pagePath,
+            commonData,
+            lang
+          );
         } else if (typeof data === "object" && data !== null) {
-          await processObjectData(pagesPugToFn, data, obj, funName, pagePath, commonData, lang);
+          await processObjectData(
+            pagesPugToFn,
+            data,
+            obj,
+            funName,
+            pagePath,
+            commonData,
+            lang
+          );
         } else {
           throw new Error(`数据类型不支持: ${typeof data}`);
         }
       } catch (error) {
-        throw new Error(`处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(obj)}]: ${error.message}`);
+        throw new Error(
+          `处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(obj)}]: ${
+            error.message
+          }`
+        );
       }
     });
   }
@@ -638,28 +745,42 @@ export async function buildStatic() {
   /**
    * 处理页面JSON文件
    */
-  async function processPageJsonFiles(pagesPugToFn, lang, langDataPath, commonData, dealWithEndFunName) {
+  async function processPageJsonFiles(
+    pagesPugToFn,
+    lang,
+    langDataPath,
+    commonData,
+    dealWithEndFunName
+  ) {
     try {
       const pagesAllJsonFileName = (
         await fse.readdir(langDataPath, { recursive: true })
       ).filter((fileName) => fileName.endsWith(".json"));
 
-      await async.eachLimit(pagesAllJsonFileName, 64, async (jsonFileName) => {
+      await async.eachLimit(pagesAllJsonFileName, 128, async (jsonFileName) => {
         try {
-          const data = await fse.readJSON(paths.resolveRoot(langDataPath, jsonFileName));
+          const data = await fse.readJSON(
+            paths.resolveRoot(langDataPath, jsonFileName)
+          );
           const pugTemplate = data._template;
-          
+
           if (!pugTemplate) {
             return;
           }
 
           const funName = pugTemplate.split(pathSymbol).join("_").slice(0, -4);
-          
+
           if (dealWithEndFunName.has(funName)) {
             return;
           }
 
-          const html = generateHtml(pagesPugToFn, funName, data, pugTemplate, commonData);
+          const html = generateHtml(
+            pagesPugToFn,
+            funName,
+            data,
+            pugTemplate,
+            commonData
+          );
 
           // 构建输出路径
           let finalPugTemplate = pugTemplate;
@@ -676,9 +797,12 @@ export async function buildStatic() {
             finalPugTemplate.replace(/\.[^.]*$/, ".html")
           );
           console.log(htmlPath);
-          await fse.outputFile(htmlPath, html);
+          const compressedHtml = await compressHtml(html, htmlPath);
+          await fse.outputFile(htmlPath, compressedHtml);
         } catch (error) {
-          throw new Error(`处理JSON文件失败 [file: ${jsonFileName}]: ${error.message}`);
+          throw new Error(
+            `处理JSON文件失败 [file: ${jsonFileName}]: ${error.message}`
+          );
         }
       });
     } catch (error) {
@@ -718,12 +842,19 @@ export async function buildStatic() {
     await compilePagesPugToFn();
     const PagesPugToFn = await import(paths.pagesPugFn);
 
+    // 显示HTML压缩状态
+    if (config.minifyHtml) {
+      console.log("HTML压缩功能已启用");
+    } else {
+      console.log("HTML压缩功能已禁用");
+    }
+
     // 处理每种语言
     await async.eachSeries(config.languageList, async (lang) => {
       try {
         console.log("开始处理语言:", lang);
         const langDataPath = paths.resolveRoot(jsonDataPath, lang);
-        
+
         // 读取公共数据
         let commonData;
         try {
@@ -738,10 +869,22 @@ export async function buildStatic() {
         const dealWithEndFunName = new Map();
 
         // 处理自定义HTML构建
-        await processCustomBuildHtml(PagesPugToFn, lang, getData, commonData, dealWithEndFunName);
+        await processCustomBuildHtml(
+          PagesPugToFn,
+          lang,
+          getData,
+          commonData,
+          dealWithEndFunName
+        );
 
         // 处理页面JSON文件
-        await processPageJsonFiles(PagesPugToFn, lang, langDataPath, commonData, dealWithEndFunName);
+        await processPageJsonFiles(
+          PagesPugToFn,
+          lang,
+          langDataPath,
+          commonData,
+          dealWithEndFunName
+        );
 
         console.log("处理语言:", lang, "完成");
       } catch (error) {
@@ -763,7 +906,6 @@ export async function buildStatic() {
     }
 
     console.log("打包完成花费:", (Date.now() - starTime) / 1000, "s");
-    
   } catch (error) {
     console.error("HTML文件打包失败:", error);
     throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -30,6 +30,7 @@
     "express-useragent": "^1.0.15",
     "fs-extra": "^11.2.0",
     "glob": "^10.3.10",
+    "html-minifier-terser": "^7.2.0",
     "http-proxy-middleware": "^3.0.5",
     "imagemin": "^8.0.1",
     "imagemin-gifsicle": "^7.0.0",
@@ -51,7 +52,7 @@
     "ws": "^8.18.0"
   },
   "license": "ISC",
-  "description": "修复对带.符号的文件名处理",
+  "description": "增加html文件的压缩功能以及修改并发数",
   "files": [
     "lib/",
     "index.js"