pug-site-core 3.0.6 → 3.0.8

package/lib/generate.js

@@ -11,6 +11,7 @@ import {
   pathSymbol,
   obfuscateJavaScript,
   addTemplateScopeIsolation,
+  getJsonData,
 } from "./utils.js";
 import _ from "lodash";
 import async from "async";
@@ -544,29 +545,24 @@ export async function buildStatic() {
    * @returns {string} 完整的HTML文件路径
    */
   function buildHtmlPath(lang, outputPath, fileName = null) {
-    let htmlPath;
-    try {
-      if (fileName) {
-        htmlPath = paths.resolveRoot(
-          distOutputPath,
-          lang,
-          outputPath.replace(
-            outputPath
-              .split("/")
-              .pop()
-              .replace(/\.[^.]*$/, ""),
-            fileName.replace(/\.[^.]*$/, "")
-          )
-        );
-      } else {
-        htmlPath = paths.resolveRoot(distOutputPath, lang, outputPath);
-      }
+    if (fileName) {
+      const htmlPath = paths.resolveRoot(
+        distOutputPath,
+        lang,
+        outputPath.replace(
+          outputPath
+            .split("/")
+            .pop()
+            .replace(/\.[^.]*$/, ""),
+          fileName.replace(/\.[^.]*$/, "")
+        )
+      );
+      console.log(htmlPath);
+      return htmlPath;
+    } else {
+      const htmlPath = paths.resolveRoot(distOutputPath, lang, outputPath);
       console.log(htmlPath);
       return htmlPath;
-    } catch (error) {
-      throw new Error(
-        `构建HTML路径失败 [lang: ${lang}, outputPath: ${outputPath}, fileName: ${fileName}]: ${error}`
-      );
     }
   }
 
@@ -574,21 +570,15 @@ export async function buildStatic() {
    * 生成HTML内容
    */
   function generateHtml(pagesPugToFn, funName, data, pagePath, commonData) {
-    try {
-      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}`
-      );
+    if (!pagesPugToFn[funName]) {
+      throw new Error(`模板函数 ${funName} 不存在`);
     }
+
+    return pagesPugToFn[funName]({
+      data,
+      _pagePath: pagePath,
+      common: commonData,
+    });
   }
 
   /**
@@ -614,27 +604,21 @@ export async function buildStatic() {
         const property = name.slice(1, -1);
 
         await async.eachLimit(data, 128, async (dataItem, index) => {
-          try {
-            const fileName = dataItem[property];
-            if (!fileName) {
-              throw new Error(`数据项索引 ${index} 中缺少属性 ${property} 或值为空`);
-            }
-
-            const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath, fileName);
-            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}`
-            );
+          const fileName = dataItem[property];
+          if (!fileName) {
+            throw new Error(`数据项索引 ${index} 中缺少属性 ${property} 或值为空`);
           }
+
+          const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath, fileName);
+          const html = generateHtml(
+            pagesPugToFn,
+            funName,
+            dataItem,
+            pagePath,
+            commonData
+          );
+          const compressedHtml = await compressHtml(html, htmlPath);
+          await fse.outputFile(htmlPath, compressedHtml);
         });
       } else {
         const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath);
@@ -643,9 +627,10 @@ export async function buildStatic() {
         await fse.outputFile(htmlPath, compressedHtml);
       }
     } catch (error) {
-      throw new Error(
-        `处理数组数据失败 [lang: ${lang}, getDataFn: ${obj.getDataFn}]: ${error}`
+      console.error(
+        `处理数组数据失败 [lang: ${lang}, getDataFn: ${obj.getDataFn}]:`, error
       );
+      throw error;
     }
   }
 
@@ -699,8 +684,14 @@ export async function buildStatic() {
         ) {
           throw new Error(`数据获取函数 ${obj.getDataFn} 不存在或不是函数`);
         }
-
-        const data = await getData[obj.getDataFn](lang);
+        let getDataFn = getData[obj.getDataFn].bind({
+          getR2Data: async (jsonPath) => {
+            jsonPath = paths.join(lang, jsonPath);
+            let data = await getJsonData(jsonPath);
+            return data;
+          },
+        });
+        const data = await getDataFn(lang);
 
         // 处理路径和函数名
         obj.inputPugPath = obj.inputPugPath.replace(/^\//, "");
@@ -733,11 +724,10 @@ export async function buildStatic() {
           throw new Error(`数据类型不支持: ${typeof data}`);
         }
       } catch (error) {
-        throw new Error(
-          `处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(obj)}]: ${
-            error
-          }`
+        console.error(
+          `处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(obj)}]:`,error
         );
+        throw error;
       }
     });
   }
@@ -758,55 +748,50 @@ export async function buildStatic() {
       ).filter((fileName) => fileName.endsWith(".json"));
 
       await async.eachLimit(pagesAllJsonFileName, 128, async (jsonFileName) => {
-        try {
-          const data = await fse.readJSON(
-            paths.resolveRoot(langDataPath, jsonFileName)
-          );
-          const pugTemplate = data._template;
-
-          if (!pugTemplate) {
-            return;
-          }
+        const data = await fse.readJSON(
+          paths.resolveRoot(langDataPath, jsonFileName)
+        );
+        const pugTemplate = data._template;
 
-          const funName = pugTemplate.split(pathSymbol).join("_").slice(0, -4);
+        if (!pugTemplate) {
+          return;
+        }
 
-          if (dealWithEndFunName.has(funName)) {
-            return;
-          }
+        const funName = pugTemplate.split(pathSymbol).join("_").slice(0, -4);
 
-          const html = generateHtml(
-            pagesPugToFn,
-            funName,
-            data,
-            pugTemplate,
-            commonData
-          );
+        if (dealWithEndFunName.has(funName)) {
+          return;
+        }
 
-          // 构建输出路径
-          let finalPugTemplate = pugTemplate;
-          if (data.page_name) {
-            finalPugTemplate =
-              pugTemplate.split(pathSymbol).slice(0, -1).join(pathSymbol) +
-              pathSymbol +
-              data.page_name;
-          }
+        const html = generateHtml(
+          pagesPugToFn,
+          funName,
+          data,
+          pugTemplate,
+          commonData
+        );
 
-          const htmlPath = paths.resolveRoot(
-            distOutputPath,
-            lang,
-            finalPugTemplate.replace(/\.[^.]*$/, ".html")
-          );
-          console.log(htmlPath);
-          const compressedHtml = await compressHtml(html, htmlPath);
-          await fse.outputFile(htmlPath, compressedHtml);
-        } catch (error) {
-          throw new Error(
-            `处理JSON文件失败 [file: ${jsonFileName}]: ${error.message}`
-          );
+        // 构建输出路径
+        let finalPugTemplate = pugTemplate;
+        if (data.page_name) {
+          finalPugTemplate =
+            pugTemplate.split(pathSymbol).slice(0, -1).join(pathSymbol) +
+            pathSymbol +
+            data.page_name;
         }
+
+        const htmlPath = paths.resolveRoot(
+          distOutputPath,
+          lang,
+          finalPugTemplate.replace(/\.[^.]*$/, ".html")
+        );
+        console.log(htmlPath);
+        const compressedHtml = await compressHtml(html, htmlPath);
+        await fse.outputFile(htmlPath, compressedHtml);
       });
     } catch (error) {
-      throw new Error(`处理页面JSON文件失败 [lang: ${lang}]: ${error.message}`);
+      console.error(`处理页面JSON文件失败 [lang: ${lang}]:`, error);
+      throw error;
     }
   }
 
@@ -897,7 +882,8 @@ export async function buildStatic() {
 
         console.log("处理语言:", lang, "完成");
       } catch (error) {
-        throw new Error(`处理语言 ${lang} 失败: ${error.message}`);
+        console.error(`处理语言 ${lang} 失败:`, error);
+        throw error;
       }
     });
 
@@ -910,7 +896,8 @@ export async function buildStatic() {
         const costTime = (Date.now() - startTime) / 1000;
         console.log("混淆js文件耗时:", costTime, "s");
       } catch (error) {
-        throw new Error(`混淆JavaScript文件失败: ${error.message}`);
+        console.error(`混淆JavaScript文件失败:`, error);
+        throw error;
       }
     }
 

package/lib/utils.js

@@ -383,7 +383,6 @@ export async function getJsonData(jsonDataPath) {
   return jsonData;
 }
 
-
 /**
  * 为HTML字符串中的template标签添加作用域隔离（优化版本）
  * @param {string} htmlString - HTML字符串

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -52,7 +52,7 @@
     "ws": "^8.18.0"
   },
   "license": "ISC",
-  "description": "静态打包增加初始化函数的调用",
+  "description": "增加getR2Data方法",
   "files": [
     "lib/",
     "index.js"