pug-site-core 3.0.17 → 3.0.18

package/lib/generate.js

@@ -11,7 +11,7 @@ import {
   pathSymbol,
   obfuscateJavaScript,
   addTemplateScopeIsolation,
-  getJsonData,
+  getJsonData
 } from "./utils.js";
 import _ from "lodash";
 import async from "async";
@@ -73,7 +73,7 @@ export async function compilePagesPugToFn(pugPath) {
           basedir: paths.template.root,
           compileDebug: true,
           name: funName,
-          filters: getCompilePugFilter(),
+          filters: getCompilePugFilter()
         });
 
         // 提取函数定义部分
@@ -154,7 +154,11 @@ export async function generateGetDataFn() {
     await async.each(pagesPugFilePathArr, async (fileName) => {
       const funName =
         "get_" +
-        fileName.split(pathSymbol).join("_").slice(0, -4).replaceAll(/[-]/g, "_") +
+        fileName
+          .split(pathSymbol)
+          .join("_")
+          .slice(0, -4)
+          .replaceAll(/[-]/g, "_") +
         "_data";
 
       // 使用正则表达式检查特定的数据获取函数是否存在
@@ -163,7 +167,10 @@ export async function generateGetDataFn() {
       );
       if (!dataFnRegex.test(getDataFile)) {
         const templateFn = config.getDataFnTemplate.toString();
-        const dataFn = `export async ${templateFn.replace("template", funName)}`;
+        const dataFn = `export async ${templateFn.replace(
+          "template",
+          funName
+        )}`;
         await fse.appendFile(getDataPath, dataFn + "\n");
       }
     });
@@ -212,15 +219,23 @@ export async function fetchDataToJsonFile(args) {
     let checkData = (data, language, funName) => {
       if (data === null || typeof data !== "object") {
         return Promise.reject(
-          new Error(`${language} ${funName} 期望返回数组、对象类型返回: ${data}`)
+          new Error(
+            `${language} ${funName} 期望返回数组、对象类型返回: ${data}`
+          )
         );
       }
       if (Array.isArray(data)) {
         if (data.length === 0) {
-          return Promise.reject(new Error(`${language} ${funName} 数据为空数组`));
+          return Promise.reject(
+            new Error(`${language} ${funName} 数据为空数组`)
+          );
         }
         data.forEach((item, index) => {
-          if (item === null || typeof item !== "object" || Array.isArray(item)) {
+          if (
+            item === null ||
+            typeof item !== "object" ||
+            Array.isArray(item)
+          ) {
             return Promise.reject(
               new Error(
                 `${language} ${funName} 返回的数据不为对象数组类型返回: ${item} 下标为${index}`
@@ -277,7 +292,9 @@ export async function fetchDataToJsonFile(args) {
         allTasks.push(async () => {
           console.log(language, commonFuncName, "开始写入json文件");
           const commonData = await getData[commonFuncName](language);
-          let languageData = (await import(paths.languageData)).default[language];
+          let languageData = (await import(paths.languageData)).default[
+            language
+          ];
           commonData.lang = _.merge(commonData.lang, languageData);
           await fse.outputJSON(
             paths.resolveRoot("jsonData", language, "_common.json"),
@@ -299,7 +316,9 @@ export async function fetchDataToJsonFile(args) {
 
           let dataFn = getData[obj.getDataFn];
           if (!dataFn || typeof dataFn !== "function") {
-            return Promise.reject(new Error(obj.getDataFn + "获取数据函数不存在"));
+            return Promise.reject(
+              new Error(obj.getDataFn + "获取数据函数不存在")
+            );
           }
 
           if (!isFillFun(obj.getDataFn)) {
@@ -347,7 +366,11 @@ export async function fetchDataToJsonFile(args) {
       for (const fileName of pugFilePathList) {
         let funName =
           "get_" +
-          fileName.split(pathSymbol).join("_").slice(0, -4).replaceAll(/[-]/g, "_") +
+          fileName
+            .split(pathSymbol)
+            .join("_")
+            .slice(0, -4)
+            .replaceAll(/[-]/g, "_") +
           "_data";
 
         let jsonFilePath = fileName.slice(0, -4).split(pathSymbol);
@@ -373,7 +396,11 @@ export async function fetchDataToJsonFile(args) {
                   item.page_name
                 );
               } else {
-                console.warn("下标:", index, "无page_name属性,使用index作为文件名");
+                console.warn(
+                  "下标:",
+                  index,
+                  "无page_name属性,使用index作为文件名"
+                );
                 lastJsonFilePath =
                   paths.join(language, ...jsonFilePath) +
                   "_" +
@@ -406,7 +433,11 @@ export async function fetchDataToJsonFile(args) {
     // 等待所有任务完成
     return new Promise((resolve, reject) => {
       queue.drain(() => {
-        console.log("获取数据并写入完成花费:", (Date.now() - starTime) / 1000, "s");
+        console.log(
+          "获取数据并写入完成花费:",
+          (Date.now() - starTime) / 1000,
+          "s"
+        );
         resolve();
       });
 
@@ -450,14 +481,22 @@ export async function buildFn() {
   totalCommonData.langCommon = config.commonData;
   let languageData = (await import(paths.languageData)).default;
   await async.each(config.languageList, async (lang) => {
-    let commonData = await (await import(paths.getData))["get_common_data"](lang);
+    let commonData = await (
+      await import(paths.getData)
+    )["get_common_data"](lang);
     commonData.lang = _.merge(commonData.lang, languageData[lang]);
     totalCommonData[lang] = commonData;
   });
 
-  const ABTestInfo = await fetchABTestInfo(config.siteConfig.siteAbbr);
-  if (ABTestInfo) {
-    totalCommonData.langCommon.ABTestInfo = ABTestInfo;
+  if (config.siteConfig?.siteAbbr?.length > 0) {
+    const ABTestInfo = await fetchABTestInfo(config.siteConfig.siteAbbr);
+    if (ABTestInfo) {
+      totalCommonData.langCommon.ABTestInfo = ABTestInfo;
+    }
+  } else {
+    console.warn(
+      "config.siteConfig.siteAbbr 配置不存在,无法获取ABTestInfo 将不会开启abtest"
+    );
   }
 
   // await fse.copy(jsonDataPath, paths.resolveRoot(outputPath, "data"), {
@@ -478,11 +517,13 @@ 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;
-      },
+      }
     }
   );
 
@@ -522,7 +563,7 @@ export async function buildStatic() {
     useShortDoctype: true,
     removeEmptyAttributes: true,
     removeOptionalTags: true,
-    caseSensitive: false,
+    caseSensitive: false
   };
 
   /**
@@ -585,7 +626,7 @@ export async function buildStatic() {
     return pagesPugToFn[funName]({
       data,
       _pagePath: pagePath,
-      common: commonData,
+      common: commonData
     });
   }
 
@@ -614,7 +655,9 @@ export async function buildStatic() {
         await async.eachLimit(data, 128, async (dataItem, index) => {
           const fileName = dataItem[property];
           if (!fileName) {
-            throw new Error(`数据项索引 ${index} 中缺少属性 ${property} 或值为空`);
+            throw new Error(
+              `数据项索引 ${index} 中缺少属性 ${property} 或值为空`
+            );
           }
 
           const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath, fileName);
@@ -630,7 +673,13 @@ export async function buildStatic() {
         });
       } else {
         const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath);
-        const html = generateHtml(pagesPugToFn, funName, data, pagePath, commonData);
+        const html = generateHtml(
+          pagesPugToFn,
+          funName,
+          data,
+          pagePath,
+          commonData
+        );
         const compressedHtml = await compressHtml(html, htmlPath);
         await fse.outputFile(htmlPath, compressedHtml);
       }
@@ -657,7 +706,13 @@ export async function buildStatic() {
   ) {
     try {
       const htmlPath = buildHtmlPath(lang, obj.outPutHtmlPath);
-      const html = generateHtml(pagesPugToFn, funName, data, pagePath, commonData);
+      const html = generateHtml(
+        pagesPugToFn,
+        funName,
+        data,
+        pagePath,
+        commonData
+      );
       const compressedHtml = await compressHtml(html, htmlPath);
       await fse.outputFile(htmlPath, compressedHtml);
     } catch (error) {
@@ -698,7 +753,7 @@ export async function buildStatic() {
             jsonPath = paths.join(lang, jsonPath);
             let data = await getJsonData(jsonPath);
             return data;
-          },
+          }
         });
         const data = await getDataFn(lang);
 
@@ -734,7 +789,9 @@ export async function buildStatic() {
         }
       } catch (error) {
         console.error(
-          `处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(obj)}]:`,
+          `处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(
+            obj
+          )}]:`,
           error
         );
         throw error;
@@ -826,11 +883,13 @@ 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;
-        },
+        }
       }
     );
 
@@ -992,7 +1051,7 @@ export async function createDebugTemplate() {
         /[+\-*/%]/,
         /\brandom\b|\bfloor\b|\bceil\b|\bround\b/,
         /\.\w+\(/, // 方法调用
-        /\$\{[^}]*[+\-*/%.][^}]*\}/, // 模板字符串中的计算
+        /\$\{[^}]*[+\-*/%.][^}]*\}/ // 模板字符串中的计算
       ];
 
       return dynamicPatterns.some((pattern) => pattern.test(code));
@@ -1017,7 +1076,9 @@ export async function createDebugTemplate() {
       }
 
       // 匹配带反引号的模板字符串 `${common.lang.xxx}`
-      const backquoteLangMatch = code.match(/`.*\$\{common\.lang\.([^}]+)\}.*`/);
+      const backquoteLangMatch = code.match(
+        /`.*\$\{common\.lang\.([^}]+)\}.*`/
+      );
       if (backquoteLangMatch) {
         return backquoteLangMatch[1];
       }
@@ -1048,7 +1109,7 @@ export async function createDebugTemplate() {
               textContent: "",
               langPath: "",
               hasStaticText: false,
-              hasLangText: false,
+              hasLangText: false
             };
 
             // 分析标签的子节点来确定文本内容
@@ -1144,7 +1205,7 @@ export async function createDebugTemplate() {
           "script",
           "base",
           "noscript",
-          "template",
+          "template"
         ]);
 
         // 处理每一行
@@ -1175,7 +1236,7 @@ export async function createDebugTemplate() {
             // 构建调试属性
             const debugAttrs = [
               `data-debug-file="${relativePath}"`,
-              `data-debug-line="${lineNumber}"`,
+              `data-debug-line="${lineNumber}"`
             ];
 
             // 只有可编辑的元素才添加 data-debug-editable 属性
@@ -1217,8 +1278,12 @@ export async function createDebugTemplate() {
                 const lastParenIndex = afterFirstParen.lastIndexOf(")");
 
                 if (lastParenIndex !== -1) {
-                  const existingAttrs = afterFirstParen.substring(0, lastParenIndex);
-                  const afterLastParen = afterFirstParen.substring(lastParenIndex);
+                  const existingAttrs = afterFirstParen.substring(
+                    0,
+                    lastParenIndex
+                  );
+                  const afterLastParen =
+                    afterFirstParen.substring(lastParenIndex);
 
                   const separator = existingAttrs.trim() ? ", " : "";
                   processedLine = `${indent}${beforeParen}${existingAttrs}${separator}${debugAttrsString}${afterLastParen}`;
@@ -1244,7 +1309,10 @@ export async function createDebugTemplate() {
                 const parenEnd = findMatchingParen(trimmedLine, tagEndIndex);
 
                 if (parenEnd !== -1) {
-                  const tagWithModifiers = trimmedLine.substring(0, tagEndIndex);
+                  const tagWithModifiers = trimmedLine.substring(
+                    0,
+                    tagEndIndex
+                  );
                   const existingAttrs = trimmedLine.substring(
                     tagEndIndex + 1,
                     parenEnd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "3.0.17",
+  "version": "3.0.18",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -52,7 +52,7 @@
     "ws": "^8.18.0"
   },
   "license": "ISC",
-  "description": "修改ABTest数据获取的接口",
+  "description": "siteAbbr可选配置,添加会在common.langCommon.ABTestInfo中添加ABTestInfo数据开启abtest,否则不会添加",
   "files": [
     "lib/",
     "index.js"
@@ -60,4 +60,4 @@
   "exports": {
     ".": "./index.js"
   }
-}
+}