pug-site-core 3.0.1 → 3.0.3

package/lib/generate.js

@@ -309,7 +309,7 @@ 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);
@@ -508,14 +508,14 @@ export async function buildStatic() {
     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);
       }
@@ -550,13 +550,13 @@ export async function buildStatic() {
    */
   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, 12, async (dataItem, index) => {
+        await async.eachLimit(data, 64, async (dataItem, index) => {
           try {
             const fileName = dataItem[property];
             if (!fileName) {
@@ -601,11 +601,11 @@ export async function buildStatic() {
   async function processCustomBuildHtml(pagesPugToFn, lang, getData, commonData, dealWithEndFunName) {
     if (!config.customBuildHtml?.length) return;
 
-    for (const obj of config.customBuildHtml) {
+    await async.eachLimit(config.customBuildHtml, 3, async (obj) => {
       try {
         // 检查语言过滤
         if (obj.includeLang?.length > 0 && !obj.includeLang.includes(lang)) {
-          continue;
+          return;
         }
 
         // 获取数据
@@ -632,7 +632,7 @@ export async function buildStatic() {
       } catch (error) {
         throw new Error(`处理自定义HTML构建失败 [lang: ${lang}, config: ${JSON.stringify(obj)}]: ${error.message}`);
       }
-    }
+    });
   }
 
   /**
@@ -644,7 +644,7 @@ export async function buildStatic() {
         await fse.readdir(langDataPath, { recursive: true })
       ).filter((fileName) => fileName.endsWith(".json"));
 
-      await async.eachLimit(pagesAllJsonFileName, 12, async (jsonFileName) => {
+      await async.eachLimit(pagesAllJsonFileName, 64, async (jsonFileName) => {
         try {
           const data = await fse.readJSON(paths.resolveRoot(langDataPath, jsonFileName));
           const pugTemplate = data._template;
@@ -673,9 +673,9 @@ export async function buildStatic() {
           const htmlPath = paths.resolveRoot(
             distOutputPath,
             lang,
-            finalPugTemplate.replace(/\..*$/, ".html")
+            finalPugTemplate.replace(/\.[^.]*$/, ".html")
           );
-          
+          console.log(htmlPath);
           await fse.outputFile(htmlPath, html);
         } catch (error) {
           throw new Error(`处理JSON文件失败 [file: ${jsonFileName}]: ${error.message}`);
@@ -719,7 +719,7 @@ export async function buildStatic() {
     const PagesPugToFn = await import(paths.pagesPugFn);
 
     // 处理每种语言
-    await async.each(config.languageList, async (lang) => {
+    await async.eachSeries(config.languageList, async (lang) => {
       try {
         console.log("开始处理语言:", lang);
         const langDataPath = paths.resolveRoot(jsonDataPath, lang);
@@ -743,6 +743,7 @@ export async function buildStatic() {
         // 处理页面JSON文件
         await processPageJsonFiles(PagesPugToFn, lang, langDataPath, commonData, dealWithEndFunName);
 
+        console.log("处理语言:", lang, "完成");
       } catch (error) {
         throw new Error(`处理语言 ${lang} 失败: ${error.message}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -51,7 +51,7 @@
     "ws": "^8.18.0"
   },
   "license": "ISC",
-  "description": "修复并优化静态html打包功能、并将默认下载数据线程12->3",
+  "description": "修复对带.符号的文件名处理",
   "files": [
     "lib/",
     "index.js"