pug-site-core 2.0.7 → 2.0.9

package/lib/generate.js

@@ -105,12 +105,23 @@ export async function generateGetDataFn() {
     const getDataFile = await fse.readFile(getDataPath, "utf8");
     const pagesPugFilePathArr = await getPagesPugFilePathArr(true);
 
-    // 注入公共数据获取函数
-    if (!getDataFile.includes("get_common_data")) {
+    // 使用正则表达式检查init函数是否存在
+    const initFunctionRegex = /export\s+async\s+function\s+init\s*\(\s*\)/;
+    if (!initFunctionRegex.test(getDataFile)) {
+      const initFn = `export async function init() {
+  //初始化操作,在获取页面数据前执行
+}`;
+      await fse.appendFile(getDataPath, initFn + "\n");
+    }
+
+    // 使用正则表达式检查公共数据获取函数是否存在
+    const commonDataFnRegex =
+      /export\s+async\s+function\s+get_common_data\s*\(\s*language\s*\)/;
+    if (!commonDataFnRegex.test(getDataFile)) {
       const commonDataFn = `export async function get_common_data(language) {
-        return {}
-      }\n`;
-      await fse.appendFile(getDataPath, commonDataFn);
+  return {}
+}`;
+      await fse.appendFile(getDataPath, commonDataFn + "\n");
     }
 
     // 为每个页面注入数据获取函数
@@ -118,12 +129,14 @@ export async function generateGetDataFn() {
       const funName =
         "get_" + fileName.split(pathSymbol).join("_").slice(0, -4) + "_data";
 
-      if (!getDataFile.includes(funName)) {
-        const template = config.getDataFnTemplate
-          .toString()
-          .replace("template", funName);
-        const dataFn = `\nexport async ${template}`;
-        await fse.appendFile(getDataPath, dataFn);
+      // 使用正则表达式检查特定的数据获取函数是否存在
+      const dataFnRegex = new RegExp(
+        `export\\s+async\\s+function\\s+${funName}\\s*\\(\\s*language\\s*\\)`
+      );
+      if (!dataFnRegex.test(getDataFile)) {
+        const templateFn = config.getDataFnTemplate.toString();
+        const dataFn = `export async ${templateFn.replace("template", funName)}`;
+        await fse.appendFile(getDataPath, dataFn + "\n");
       }
     });
   } catch (error) {
@@ -197,6 +210,16 @@ export async function fetchDataToJsonFile(args) {
     }
 
     const getData = await import(paths.getData);
+
+    // 执行初始化函数
+    if (getData.init && typeof getData.init === "function") {
+      console.log("开始执行init初始化函数");
+      const initStartTime = Date.now();
+      await getData.init();
+      const initCostTime = (Date.now() - initStartTime) / 1000;
+      console.log("初始化函数执行完成，耗时:", initCostTime, "s");
+    }
+
     const pugFilePathList = await getPagesPugFilePathArr();
 
     const { languageList, customBuildData, fetchDataConcurrencyLimit } = config;
@@ -392,9 +415,7 @@ export async function buildFn() {
   let totalCommonData = {};
   totalCommonData.langCommon = config.commonData;
   await async.each(config.languageList, async (lang) => {
-    let commonData = await fse.readJSON(
-      paths.resolveRoot("jsonData", lang, "_common.json")
-    );
+    let commonData = await (await import(paths.getData))["get_common_data"](lang);
     totalCommonData[lang] = commonData;
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -37,7 +37,7 @@
     "axios": "^1.7.7"
   },
   "license": "ISC",
-  "description": "增加获取数据的log",
+  "description": "优化注入函数的判断、添加init函数",
   "files": [
     "lib/",
     "index.js"