pug-site-core 1.0.13 → 2.0.1

package/lib/devServer.js

@@ -5,10 +5,10 @@ import fse from "fs-extra";
 import _ from "lodash";
 import {
   getCompilePugFilter,
-  pagesPathFilter,
   getIdleProt,
   matchESI,
   pathSymbol,
+  getJsonData,
 } from "./utils.js";
 import http from "http";
 import WebSocket, { WebSocketServer } from "ws";
@@ -73,59 +73,46 @@ function setupRoutes(app, wss) {
         device = "mobile";
       }
       let language = config.languageList[0];
-      let lastPath = pagesPathFilter(req.path);
+      let lastPath = req.path;
       let data;
       let jsonDataPath;
       let pugPath;
-      let findPageInfoObj = await matchFileMapTable(lastPath, language, device);
 
-      let otherPath = [language + "/" + device, language, device, ""];
-      if (!findPageInfoObj) {
+      // 构建完整的URL对象
+      const protocol = req.protocol;
+      const host = req.get("host");
+      const fullUrl = `${protocol}://${host}${req.originalUrl}`;
+      const urlObj = new URL(fullUrl);
+      let pageInfoObj = await matchRouter(urlObj, language, device);
+      if (!pageInfoObj) {
         if (lastPath.endsWith(".html")) {
           lastPath = lastPath.slice(0, -5);
         } else {
           lastPath = lastPath + "/index";
         }
-        jsonDataPath =
-          paths.resolveRoot("jsonData", language, lastPath) + ".json";
+        jsonDataPath = paths.resolveRoot("jsonData", language, lastPath) + ".json";
         if (fse.pathExistsSync(jsonDataPath)) {
           data = await fse.readJSON(jsonDataPath);
         } else {
           console.log(jsonDataPath, "不存在此json文件页面data数据将为null");
           jsonDataPath = null;
         }
-        for (let index = 0; index < otherPath.length; index++) {
-          const element = otherPath[index];
-          if (data) {
-            lastPath = pagesPathFilter(data._template[0]).replace(".pug", "");
-          }
-          pugPath =
-            paths.resolveRoot(pagsTemplatePath, element, lastPath) + ".pug";
-          if (fse.pathExistsSync(pugPath)) {
-            break;
-          }
+
+        if (data) {
+          lastPath = data._template.replace(".pug", "");
         }
+        pugPath = paths.resolveRoot(pagsTemplatePath, lastPath) + ".pug";
       } else {
-        for (let index = 0; index < otherPath.length; index++) {
-          const element = otherPath[index];
-          pugPath = paths.resolveRoot(
-            pagsTemplatePath,
-            element,
-            findPageInfoObj.pugPath
-          );
-          if (fse.pathExistsSync(pugPath)) {
-            break;
-          }
-        }
-        data = findPageInfoObj.data;
-        jsonDataPath = findPageInfoObj.getDataFn;
+        pugPath = paths.resolveRoot(pagsTemplatePath, pageInfoObj.pugPath) + ".pug";
+        data = pageInfoObj.data;
+        jsonDataPath = "自定义路由数据";
       }
       if (fse.pathExistsSync(pugPath)) {
         console.log(
-          `请求路径:${req.path}  模版路径:${pugPath}  数据JSON文件路径或getData中的函数名:${jsonDataPath}`
+          `请求路径:${req.path}  模版路径:${pugPath}  数据JSON文件路径:${jsonDataPath}`
         );
         let commonData = {};
-        if (config.langChangeUpdateCommon) {
+        if (config.changeUpdateCommon) {
           commonData = await (
             await import(paths.getData)
           )["get_common_data"](language);
@@ -172,37 +159,24 @@ function setupRoutes(app, wss) {
   });
 }
 
-async function matchFileMapTable(reqPath, language, device) {
-  let fileMapTable = config.fileMapTable.filter((obj) => {
-    let flag = obj.devMatchFn && obj.pugPath && obj.outPutPath && obj.getDataFn;
-    if (obj.languageList && !obj.languageList.includes(language)) {
-      flag = false;
-    }
-    if (obj.deviceList && !obj.deviceList.includes(device)) {
-      flag = false;
-    }
-    return flag;
-  });
-  for (let index = 0; index < fileMapTable.length; index++) {
-    const obj = fileMapTable[index];
-    if (obj.devMatchFn(reqPath, device)) {
-      const getData = await import(paths.getData);
-      let data = await getData[obj.getDataFn](language);
-      if (Array.isArray(data)) {
-        let name = obj.outPutPath.split("/").pop().replace(/\..*$/, "");
-        const regex = /^\[.+\]$/;
-        if (regex.test(name)) {
-          let property = name.slice(1, -1);
-          data = data.find((item) => {
-            let str = String(item[property]);
-            return reqPath.includes(str);
-          });
-        }
-      }
+async function matchRouter(url, language, device) {
+  let router = (await import(paths.router)).router;
+  let getR2Data = async (jsonPath) => {
+    jsonPath = paths.join(language, jsonPath);
+    let data = await getJsonData(jsonPath);
+    return data;
+  };
+  let params = { url, language, device, getR2Data };
+
+  for (let index = 0; index < router.length; index++) {
+    const obj = router[index];
+    if (obj.matchFn.call(params)) {
+      let data = obj.getData.call(params);
+      let pugPath = obj.getPagesFnName.call(params);
+      pugPath = pugPath.split("_").join(pathSymbol);
       return {
-        pugPath: obj.pugPath,
+        pugPath,
         data,
-        getDataFn: obj.getDataFn,
       };
     }
   }

package/lib/generate.js

@@ -5,7 +5,6 @@ import {
   getCompilePugFilter,
   pathIsSame,
   sleep,
-  pagesPathFilter,
   pathSymbol,
   obfuscateJavaScript,
 } from "./utils.js";
@@ -134,238 +133,189 @@ export async function generateGetDataFn() {
 }
 
 /**
- * 调用getData中的函数获取模版数据并写入JSON文件
- * @param {string[]} args - 命令行参数，用于过滤模板和语言
+ * 将数据获取并写入JSON文件
+ * @param {Object[]} args - 过滤参数数组 f=func1,func2 c=jp,en
+ * @returns {Promise<void>}
  */
 export async function fetchDataToJsonFile(args) {
   try {
-    const JsonRootPath = paths.resolveRoot("jsonData");
-
-    // 解析过滤参数
-    let filterFun = [];
-    let filterLang = [];
-    args.forEach((item) => {
-      const [key, value] = item.split("=");
-      if (value) {
-        if (key === "f") {
-          filterFun = value.split(",");
+    // 解析过滤参数，使用对象解构使代码更清晰
+    const { filterFun, filterLang } = args.reduce(
+      (acc, item) => {
+        const [key, value] = item.split("=");
+        if (value) {
+          if (key === "f") acc.filterFun = value.split(",");
+          if (key === "c") acc.filterLang = value.split(",");
         }
-        if (key === "c") {
-          filterLang = value.split(",");
+        return acc;
+      },
+      { filterFun: [], filterLang: [] }
+    );
+
+    let isFillFun = (funName) => {
+      if (filterFun.length) {
+        return filterFun.includes(funName);
+      }
+      return true;
+    };
+
+    let saveJsonData = async (filePath, data) => {
+      let finalPath = paths.resolveRoot("jsonData", filePath);
+      await fse.remove(finalPath);
+      await fse.outputJson(finalPath, data);
+    };
+
+    let checkData = (data, language, funName) => {
+      if (data === null || typeof data !== "object") {
+        return Promise.reject(
+          new Error(`${language} ${funName} 期望返回数组、对象类型返回: ${data}`)
+        );
+      }
+      if (Array.isArray(data)) {
+        if (data.length === 0) {
+          return Promise.reject(new Error(`${language} ${funName} 数据为空数组`));
         }
+        data.forEach((item, index) => {
+          if (item === null || typeof item !== "object" || Array.isArray(item)) {
+            return Promise.reject(
+              new Error(
+                `${language} ${funName} 返回的数据不为对象数组类型返回: ${item} 下标为${index}`
+              )
+            );
+          }
+        });
       }
-    });
+      return Promise.resolve();
+    };
 
     // 如果没有过滤条件，清空输出目录
     if (!filterFun.length && !filterLang.length) {
-      await fse.remove(JsonRootPath);
+      await fse.remove(paths.resolveRoot("jsonData"));
     }
 
     const getData = await import(paths.getData);
-    let arrPagesPugFilePathArr = await getPagesPugFilePathArr();
-    let pagesPugFilePathArr = await getPagesPugFilePathArr(true);
-    let filterFinishArr = arrPagesPugFilePathArr.filter(
-      (item) => !pagesPugFilePathArr.includes(item)
-    );
-    const { languageList, fileMapTable, fetchDataLangLimit } = config;
-    let starTime = Date.now();
+    const pugFilePathList = await getPagesPugFilePathArr();
 
-    await async.eachLimit(
-      languageList,
-      fetchDataLangLimit,
-      async (language) => {
-        // 语言过滤
-        if (filterLang.length && !filterLang.includes(language)) {
-          return;
-        }
+    const { languageList, customBuildData, fetchDataLangLimit } = config;
 
-        // 清空指定语言的数据目录
-        if (filterLang.includes(language) && !filterFun.length) {
-          await fse.remove(paths.resolveRoot("jsonData", language));
-        }
+    await async.eachLimit(languageList, fetchDataLangLimit, async (language) => {
+      // 语言过滤检查
+      if (filterLang.length && !filterLang.includes(language)) return;
 
-        // 处理公共数据
-        const commonFuncName = "get_common_data";
-        if (!filterFun.length || filterFun.includes(commonFuncName)) {
-          const commonData = await getData[commonFuncName](language);
-          console.log(language, commonFuncName, "开始写入json文件");
-          await fse.outputJSON(
-            paths.resolveRoot("jsonData", language, "_common.json"),
-            commonData
-          );
-        }
+      // 清空指定语言的数据目录
+      if (filterLang.includes(language) && !filterFun.length) {
+        await fse.remove(paths.resolveRoot("jsonData", language));
+      }
 
-        // 处理文件映射表数据
-        if (fileMapTable?.length) {
-          await async.each(fileMapTable, async (obj) => {
-            if (
-              obj.getDataFn &&
-              !obj.pugPath &&
-              obj.outPutPath &&
-              obj.outPutPath.endsWith(".json")
-            ) {
-              if (
-                obj.languageList &&
-                obj.languageList.length > 0 &&
-                !obj.languageList.includes(language)
-              ) {
-                return Promise.resolve();
-              }
-              let dataFn = getData[obj.getDataFn];
-              if (!dataFn || typeof dataFn !== "function") {
-                return Promise.reject(dataFn + "获取数据函数不存在!");
-              }
+      // 处理公共数据
+      const commonFuncName = "get_common_data";
+      if (isFillFun(commonFuncName)) {
+        const commonData = await getData[commonFuncName](language);
+        console.log(language, commonFuncName, "开始写入json文件");
+        await fse.outputJSON(
+          paths.resolveRoot("jsonData", language, "_common.json"),
+          commonData
+        );
+      }
 
-              if (filterFun.length && !filterFun.includes(funName)) {
-                return Promise.resolve();
-              }
+      // 处理自定义数据
+      if (customBuildData?.length) {
+        await async.each(customBuildData, async (obj) => {
+          if (
+            obj.includeLang &&
+            obj.includeLang.length > 0 &&
+            !obj.includeLang.includes(language)
+          ) {
+            return;
+          }
+          let dataFn = getData[obj.getDataFn];
+          if (!dataFn || typeof dataFn !== "function") {
+            return Promise.reject(new Error(obj.getDataFn + "获取数据函数不存在"));
+          }
 
-              let data = await dataFn(language);
-              if (!data) {
-                return Promise.reject(dataFn + "获取的数据为null!");
-              }
-              console.log(language, obj.getDataFn, "开始写入json文件");
-              let outPutPath = obj.outPutPath.split("/").join(pathSymbol);
-              let jsonFilePath;
-              if (Array.isArray(data)) {
-                let name = outPutPath
-                  .split(pathSymbol)
-                  .pop()
-                  .replace(/\..*$/, "");
-                const regex = /^\[.+\]$/;
-                if (regex.test(name)) {
-                  let property = name.slice(1, -1);
-                  for (let index = 0; index < data.length; index++) {
-                    const dataItem = data[index];
-                    let fileName = dataItem[property];
-                    if (
-                      fileName === null ||
-                      fileName === undefined ||
-                      fileName === ""
-                    ) {
-                      return Promise.reject(
-                        dataFn +
-                          "获取的数据中期望以" +
-                          property +
-                          `命名但是${index}下标中对象属性不存在`
-                      );
-                    }
-                    jsonFilePath = paths.resolveRoot(
-                      "jsonData",
-                      language,
-                      outPutPath.replace(name, fileName)
-                    );
-                    await fse.remove(jsonFilePath);
-                    await fse.outputJson(jsonFilePath, dataItem);
-                  }
-                } else {
-                  jsonFilePath = paths.resolveRoot(
-                    "jsonData",
-                    language,
-                    outPutPath
+          if (filterFun.length && !filterFun.includes(funName)) {
+            return;
+          }
+
+          let data = await dataFn(language);
+          await checkData(data, language, obj.getDataFn);
+          console.log(language, obj.getDataFn, "开始写入json文件");
+          let outPutPath = obj.outPutPath.split("/").join(pathSymbol);
+          if (Array.isArray(data)) {
+            let name = outPutPath.split(pathSymbol).pop().replace(/\..*$/, "");
+            const regex = /^\[.+\]$/;
+            if (regex.test(name)) {
+              let property = name.slice(1, -1);
+              for (let index = 0; index < data.length; index++) {
+                const dataItem = data[index];
+                let fileName = dataItem[property];
+                if (!fileName) {
+                  return Promise.reject(
+                    new Error(
+                      `${language} ${obj.getDataFn} 获取的数据中期望以${property}属性命名文件但是${index}下标中对象属性不存在或者为空字符串`
+                    )
                   );
-                  await fse.remove(jsonFilePath);
-                  await fse.outputJson(jsonFilePath, data);
                 }
-              } else if (typeof data === "object") {
-                jsonFilePath = paths.resolveRoot(
-                  "jsonData",
-                  language,
-                  outPutPath
+                await saveJsonData(
+                  paths.join(language, outPutPath.replace(name, fileName)),
+                  dataItem
                 );
-                await fse.remove(jsonFilePath);
-                await fse.outputJson(jsonFilePath, data);
               }
+            } else {
+              await saveJsonData(paths.join(language, outPutPath), data);
             }
-          });
-        }
+          } else if (typeof data === "object") {
+            await saveJsonData(paths.join(language, outPutPath), data);
+          }
+        });
+      }
 
-        await async.each(pagesPugFilePathArr, async (fileName) => {
-          let funName =
-            "get_" +
-            fileName.split(pathSymbol).join("_").slice(0, -4) +
-            "_data";
+      await async.each(pugFilePathList, async (fileName) => {
+        let funName =
+          "get_" + fileName.split(pathSymbol).join("_").slice(0, -4) + "_data";
 
-          let jsonFilePath = fileName.slice(0, -4).split(pathSymbol);
-          if (!getData[funName] || typeof getData[funName] !== "function") {
-            console.log(funName, "获取数据函数不存在!");
-            return Promise.reject(funName + "获取数据函数不存在!");
-          }
-          if (filterFun.length && !filterFun.includes(funName)) {
-            return Promise.resolve();
-          }
-          let data = await getData[funName](language);
-          if (Array.isArray(data) && data.length > 0) {
-            console.log(language, funName, "开始写入json文件");
-            await async.eachOfLimit(data, 1000, async (item, index) => {
-              if (typeof item !== "object" || Array.isArray(item)) {
-                let type = Array.isArray(item) ? "array" : typeof item;
-                return Promise.reject(
-                  funName + "返回的数据不为对象数组得到类型" + type + "[]"
-                );
-              }
-              let lastJsonFilePath;
-              if (item.page_name && item.page_name.length > 0) {
-                lastJsonFilePath = paths.resolveRoot(
-                  "jsonData",
-                  language,
-                  ...jsonFilePath.slice(0, -1),
-                  item.page_name
-                );
-              } else {
-                lastJsonFilePath =
-                  paths.resolveRoot("jsonData", language, ...jsonFilePath) +
-                  "_" +
-                  ++index +
-                  ".json";
-              }
-              let templateArr = filterFinishArr.filter(
-                (item) => pagesPathFilter(item) === fileName
-              );
-              if (
-                fse.pathExistsSync(
-                  paths.resolveRoot(paths.template.pages, fileName)
-                )
-              ) {
-                templateArr.unshift(fileName);
-              }
-              item._template = templateArr;
-              await fse.remove(lastJsonFilePath);
-              await fse.outputJson(lastJsonFilePath, item);
-            });
-          } else if (data && typeof data === "object" && !Array.isArray(data)) {
-            console.log(language, funName, "开始写入json文件");
-            if (data.page_name && data.page_name.length > 0) {
-              jsonFilePath = paths.resolveRoot(
-                "jsonData",
+        let jsonFilePath = fileName.slice(0, -4).split(pathSymbol);
+        if (!getData[funName] || typeof getData[funName] !== "function") {
+          return Promise.reject(new Error(`${funName} 获取数据函数不存在`));
+        }
+        if (filterFun.length && !filterFun.includes(funName)) {
+          return Promise;
+        }
+        let data = await getData[funName](language);
+        await checkData(data, language, funName);
+        console.log(language, funName, "开始写入json文件");
+        if (Array.isArray(data)) {
+          await async.eachOfLimit(data, 64, async (item, index) => {
+            let lastJsonFilePath;
+            if (item.page_name) {
+              lastJsonFilePath = paths.join(
                 language,
                 ...jsonFilePath.slice(0, -1),
-                data.page_name
+                item.page_name
               );
             } else {
-              jsonFilePath =
-                paths.resolveRoot("jsonData", language, ...jsonFilePath) +
-                ".json";
+              console.warn("下标:", index, "无page_name属性,使用index作为文件名");
+              lastJsonFilePath =
+                paths.join(language, ...jsonFilePath) + "_" + ++index + ".json";
             }
-            let templateArr = filterFinishArr.filter(
-              (item) => pagesPathFilter(item) === fileName
+            item._template = fileName;
+            await saveJsonData(lastJsonFilePath, item);
+          });
+        } else {
+          if (data.page_name) {
+            jsonFilePath = paths.join(
+              language,
+              ...jsonFilePath.slice(0, -1),
+              data.page_name
             );
-            if (
-              fse.pathExistsSync(
-                paths.resolveRoot(paths.template.pages, fileName)
-              )
-            ) {
-              templateArr.unshift(fileName);
-            }
-            data._template = templateArr;
-            await fse.remove(jsonFilePath);
-            await fse.outputJson(jsonFilePath, data);
           } else {
-            console.log(language, funName, "期望返回数组、对象类型返回:", data);
+            jsonFilePath = paths.join(language, ...jsonFilePath) + ".json";
           }
-        });
-      }
-    );
+          data._template = fileName;
+          await saveJsonData(jsonFilePath, data);
+        }
+      });
+    });
   } catch (error) {
     console.error("获取数据失败:", error);
     throw error;
@@ -376,8 +326,7 @@ export async function buildFn() {
   const jsonDataPath = paths.resolveRoot("jsonData");
   if (!fse.pathExistsSync(jsonDataPath)) {
     return Promise.reject(
-      jsonDataPath,
-      "目录不存在请先执行npm run getData生成数据!"
+      new Error(jsonDataPath + "目录不存在请先执行npm run getData生成数据!")
     );
   }
   console.log("开始打包...");
@@ -393,7 +342,7 @@ export async function buildFn() {
 
   const routerPath = paths.resolveRoot("router.js");
   if (!fse.pathExistsSync(routerPath)) {
-    return Promise.reject("router.js文件不存在!");
+    return Promise.reject(new Error("router.js文件不存在"));
   }
 
   await fse.copy(routerPath, paths.resolveRoot(outputPath, "page/router.js"));
@@ -412,7 +361,7 @@ export async function buildFn() {
   //   filter: (src, dest) => {
   //     // 排除_common.json 文件
   //     return !src.endsWith("_common.json");
-  //   }
+  //   },
   // });
 
   await fse.copy(
@@ -426,9 +375,7 @@ export async function buildFn() {
         }
         if (config.buildStaticDirArr && config.buildStaticDirArr.length > 0) {
           return !!config.buildStaticDirArr.find((item) => {
-            return src.startsWith(
-              paths.resolveRoot(paths.template.static, item)
-            );
+            return src.startsWith(paths.resolveRoot(paths.template.static, item));
           });
         }
         return true;
@@ -458,7 +405,7 @@ export async function buildStatic() {
 
   if (!fse.pathExistsSync(jsonDataPath)) {
     return Promise.reject(
-      jsonDataPath + "目录不存在请先执行npm run getData生成数据!"
+      new Error(jsonDataPath + "目录不存在请先执行npm run getData生成数据!")
     );
   }
   console.log("开始打包...");
@@ -479,9 +426,7 @@ export async function buildStatic() {
         }
         if (config.buildStaticDirArr && config.buildStaticDirArr.length > 0) {
           return !!config.buildStaticDirArr.find((item) => {
-            return src.startsWith(
-              paths.resolveRoot(paths.template.static, item)
-            );
+            return src.startsWith(paths.resolveRoot(paths.template.static, item));
           });
         }
         return true;
@@ -536,24 +481,21 @@ export async function buildStatic() {
               obj.pugPath.split("/").join(pathSymbol)
             );
             if (!fse.pathExistsSync(pugPath)) {
-              return Promise.reject(pugPath + "模版路径不存在!");
+              return Promise.reject(new Error(pugPath + "模版路径不存在"));
             }
             let dataFn = getData[obj.getDataFn];
             if (!dataFn || typeof dataFn !== "function") {
-              return Promise.reject(dataFn + "获取数据函数不存在!");
+              return Promise.reject(new Error(obj.getDataFn + "获取数据函数不存在"));
             }
             let data = await dataFn(lang);
             if (!data) {
-              return Promise.reject(dataFn + "获取的数据为null!");
+              return Promise.reject(new Error(dataFn + "获取的数据为null!"));
             }
             let outPutPath = obj.outPutPath.split("/").join(pathSymbol);
             let htmlPath;
             let html;
             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);
@@ -566,10 +508,12 @@ export async function buildStatic() {
                     fileName === ""
                   ) {
                     return Promise.reject(
-                      dataFn +
-                        "获取的数据中期望以" +
-                        property +
-                        `命名但是${index}下标中对象${property}属性为:${fileName}`
+                      new Error(
+                        dataFn +
+                          "获取的数据中期望以" +
+                          property +
+                          `命名但是${index}下标中对象${property}属性为:${fileName}`
+                      )
                     );
                   }
                   htmlPath = paths.resolveRoot.join(
@@ -639,9 +583,7 @@ export async function buildStatic() {
       })
     ).filter((fileName) => fileName.endsWith(".json"));
     await async.eachLimit(pagesAllJsonFileName, 64, async (jsonFileName) => {
-      let data = await fse.readJSON(
-        paths.resolveRoot(langDataPath, jsonFileName)
-      );
+      let data = await fse.readJSON(paths.resolveRoot(langDataPath, jsonFileName));
       let pugTemplateArr = data._template;
       if (!pugTemplateArr) {
         return;

package/lib/paths.js

@@ -5,19 +5,27 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const projectRoot = process.cwd();
 
+// 定义基础路径
+const templateRoot = path.join(projectRoot, "template");
+
+// 辅助函数，用于生成文件URL
+const fileUrl = (filePath) =>
+  pathToFileURL(path.resolve(projectRoot, filePath)).href;
+
 export const paths = {
   // 项目根目录相关
   projectRoot,
   lib: __dirname,
-  config: pathToFileURL(path.resolve(projectRoot, "config.js")).href,
-  getData: pathToFileURL(path.resolve(projectRoot, "getData.js")).href,
-  pagesPugFn: pathToFileURL(path.resolve(projectRoot, "pagesPugFn/index.js"))
-    .href,
+  config: fileUrl("config.js"),
+  getData: fileUrl("getData.js"),
+  pagesPugFn: fileUrl("pagesPugFn/index.js"),
+  router: fileUrl("router.js"),
+
   // 模板相关路径
   template: {
-    root: path.join(projectRoot, "template"),
-    pages: path.join(projectRoot, "template/pages"),
-    static: path.join(projectRoot, "template/static")
+    root: templateRoot,
+    pages: path.join(templateRoot, "pages"),
+    static: path.join(templateRoot, "static"),
   },
 
   // 公共资源
@@ -27,12 +35,12 @@ export const paths = {
   pugRuntime: path.join(__dirname, "pugRuntime.js"),
 
   // 工具函数
-  resolveRoot: (...args) => {
-    if (args[0].startsWith(projectRoot)) {
-      return path.join(...args);
-    }
-    return path.join(projectRoot, ...args);
-  }
+  join: (...args) => path.join(...args.map(String)),
+
+  resolveRoot: (...args) =>
+    args[0].startsWith(projectRoot)
+      ? path.join(...args)
+      : path.join(projectRoot, ...args),
 };
 
 export default paths;

package/lib/utils.js

@@ -17,7 +17,7 @@ export const pathSymbol = process.platform.startsWith("win") ? "\\" : "/";
 export async function getPagesPugFilePathArr(isFilter) {
   let pagesPugFilePathArr = (
     await fse.readdir(paths.template.pages, {
-      recursive: true
+      recursive: true,
     })
   ).filter((fileName) => fileName.endsWith(".pug"));
 
@@ -262,8 +262,8 @@ export async function obfuscateJavaScript(
       unused: true,
       if_return: true,
       join_vars: true,
-      drop_console: true
-    }
+      drop_console: true,
+    },
   };
 
   // 合并配置选项
@@ -369,3 +369,17 @@ export async function obfuscateJavaScript(
     throw error;
   }
 }
+
+/**
+ * 获取JSON数据
+ * @param {string} jsonDataPath - 基于jsonData目录的JSON数据路径
+ * @returns {Promise<any>} 返回JSON数据
+ */
+export async function getJsonData(jsonDataPath) {
+  let filePath = paths.resolveRoot("jsonData", jsonDataPath);
+  if (!fse.pathExistsSync(filePath)) {
+    return Promise.reject(new Error(`${filePath}的json数据不存在`));
+  }
+  let jsonData = await fse.readJSON(filePath);
+  return jsonData;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "1.0.13",
+  "version": "2.0.1",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -37,7 +37,7 @@
     "axios": "^1.7.7"
   },
   "license": "ISC",
-  "description": "buildFn 取消生成data目录",
+  "description": "注释测试的指令执行",
   "files": [
     "lib/",
     "index.js"