pug-site-core 2.0.4 → 2.0.6

package/lib/generate.js

@@ -44,7 +44,7 @@ export async function compilePagesPugToFn(pugPath) {
       pagesPugFilePathArr.filter(
         (fileName) => !pugPath || pathIsSame(pugPath, fileName)
       ),
-      10, // 限制并发数为10
+      12, // 限制并发数为10
       async (fileName) => {
         const filePath = paths.resolveRoot(paths.template.pages, fileName);
         const funName = fileName.split(pathSymbol).join("_").slice(0, -4);
@@ -201,7 +201,7 @@ export async function fetchDataToJsonFile(args) {
     // 创建一个全局任务队列控制整体并发数
     const queue = async.queue(async (task) => {
       await task();
-    }, fetchDataConcurrencyLimit || 10);
+    }, fetchDataConcurrencyLimit || 12);
 
     // 收集所有需要执行的任务
     const allTasks = [];
@@ -221,8 +221,8 @@ export async function fetchDataToJsonFile(args) {
       const commonFuncName = "get_common_data";
       if (isFillFun(commonFuncName)) {
         allTasks.push(async () => {
-          const commonData = await getData[commonFuncName](language);
           console.log(language, commonFuncName, "开始写入json文件");
+          const commonData = await getData[commonFuncName](language);
           await fse.outputJSON(
             paths.resolveRoot("jsonData", language, "_common.json"),
             commonData
@@ -251,17 +251,17 @@ export async function fetchDataToJsonFile(args) {
           }
 
           allTasks.push(async () => {
+            console.log(language, obj.getDataFn, "开始写入json文件");
             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];
+                // 使用async.eachLimit替换for循环，并发写入
+                await async.eachLimit(data, 12, async (dataItem, index) => {
                   let fileName = dataItem[property];
                   if (!fileName) {
                     return Promise.reject(
@@ -274,7 +274,7 @@ export async function fetchDataToJsonFile(args) {
                     paths.join(language, outPutPath.replace(name, fileName)),
                     dataItem
                   );
-                }
+                });
               } else {
                 await saveJsonData(paths.join(language, outPutPath), data);
               }
@@ -300,12 +300,11 @@ export async function fetchDataToJsonFile(args) {
         }
 
         allTasks.push(async () => {
+          console.log(language, funName, "开始写入json文件");
           let data = await getData[funName](language);
           await checkData(data, language, funName);
-          console.log(language, funName, "开始写入json文件");
           if (Array.isArray(data)) {
-            for (let index = 0; index < data.length; index++) {
-              const item = data[index];
+            await async.eachLimit(data, 12, async (item, index) => {
               let lastJsonFilePath;
               if (item.page_name) {
                 lastJsonFilePath = paths.join(
@@ -323,7 +322,7 @@ export async function fetchDataToJsonFile(args) {
               }
               item._template = fileName;
               await saveJsonData(lastJsonFilePath, item);
-            }
+            });
           } else {
             if (data.page_name) {
               jsonFilePath = paths.join(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -37,7 +37,7 @@
     "axios": "^1.7.7"
   },
   "license": "ISC",
-  "description": "去掉调试log",
+  "description": "优化并发写入json文件",
   "files": [
     "lib/",
     "index.js"