pug-site-core 3.0.18 → 3.0.19

package/index.js

@@ -7,7 +7,7 @@ import {
   fetchDataToJsonFile,
   buildFn,
   buildStatic,
-  createDebugTemplate,
+  createDebugTemplate
 } from "./lib/generate.js";
 
 export const pugSiteCore = {
@@ -19,7 +19,7 @@ export const pugSiteCore = {
   buildStatic,
   translateLanguageData,
   processImagemin,
-  createDebugTemplate,
+  createDebugTemplate
 };
 
 let curCmd = process.env.npm_lifecycle_event;

package/lib/generate.js

@@ -11,7 +11,9 @@ import {
   pathSymbol,
   obfuscateJavaScript,
   addTemplateScopeIsolation,
-  getJsonData
+  getJsonData,
+  isLinux,
+  getLanguageListFromApi
 } from "./utils.js";
 import _ from "lodash";
 import async from "async";
@@ -265,7 +267,14 @@ export async function fetchDataToJsonFile(args) {
 
     const pugFilePathList = await getPagesPugFilePathArr();
 
-    const { languageList, customBuildData, fetchDataConcurrencyLimit } = config;
+    let languageList;
+    if (isLinux()) {
+      languageList = await getLanguageListFromApi();
+    } else {
+      languageList = config.languageList;
+    }
+
+    const { customBuildData, fetchDataConcurrencyLimit } = config;
 
     // 创建一个全局任务队列控制整体并发数
     const queue = async.queue(async (task) => {

package/lib/translate.js

@@ -19,9 +19,15 @@ let translate = new v2.Translate({ projectId, key });
 
 let orginLang = "us";
 
+// 命令行参数说明：
+// k=key1,key2 - 指定要翻译的键
+// c=us,kr,jp - 指定目标国家/语言
+// all=true - 使用 allLang 中的所有语言进行翻译
 let args = process.argv.slice(2);
 let filParms = [];
 let filCountry = [];
+let useAllLang = false;
+
 args.forEach((item) => {
   const [key, value] = item.split("=");
   if (value) {
@@ -32,9 +38,42 @@ args.forEach((item) => {
       filCountry = value.split(",");
     }
   }
+  if (key === "all" && value === "true") {
+    useAllLang = true;
+  }
 });
 
-let targetLangList = filCountry.length > 0 ? filCountry : config.languageList;
+const allLang = [
+  "us",
+  "us2",
+  "ar",
+  "br",
+  "de",
+  "es",
+  "fr",
+  "id",
+  "it",
+  "jp",
+  "kr",
+  "nl",
+  "pl",
+  "th",
+  "tr",
+  "tw",
+  "vn",
+  "ru",
+  "pt",
+  "sv",
+  "fi",
+  "ms",
+  "in"
+];
+
+let targetLangList = useAllLang
+  ? allLang
+  : filCountry.length > 0
+  ? filCountry
+  : config.languageList;
 
 //国家映射到语言
 const countryLanguageMap = {
@@ -48,7 +87,7 @@ const countryLanguageMap = {
   tw: "zh-TW",
   gb: "en",
   br: "pt",
-  in: "hi",
+  in: "hi"
 };
 
 async function translateStr(str, targetLanguage) {

package/lib/utils.js

@@ -5,12 +5,19 @@ import { paths } from "./paths.js";
 import detectPort from "detect-port";
 import axios from "axios";
 
-
 const { config } = await import(paths.config);
 
 // 根据操作系统设置路径分隔符
 export const pathSymbol = process.platform.startsWith("win") ? "\\" : "/";
 
+/**
+ * 判断当前环境是否为Linux系统
+ * @returns {boolean} 如果是Linux系统返回true，否则返回false
+ */
+export function isLinux() {
+  return process.platform === "linux";
+}
+
 /**
  * 获取pages目录下所有pug文件的路径数组
  * @returns {Promise<string[]>} 返回pug文件路径数组
@@ -18,7 +25,7 @@ export const pathSymbol = process.platform.startsWith("win") ? "\\" : "/";
 export async function getPagesPugFilePathArr() {
   let pagesPugFilePathArr = (
     await fse.readdir(paths.template.pages, {
-      recursive: true,
+      recursive: true
     })
   ).filter((fileName) => fileName.endsWith(".pug"));
 
@@ -262,8 +269,8 @@ export async function obfuscateJavaScript(
       unused: true,
       if_return: true,
       join_vars: true,
-      drop_console: true,
-    },
+      drop_console: true
+    }
   };
 
   // 合并配置选项
@@ -393,14 +400,21 @@ export async function getJsonData(jsonDataPath) {
  * @param {boolean} options.preserveComments - 是否保留注释，默认为true
  * @returns {string} 处理后的HTML字符串
  */
-export function addTemplateScopeIsolation(htmlString, scopePrefix = "xy", options = {}) {
+export function addTemplateScopeIsolation(
+  htmlString,
+  scopePrefix = "xy",
+  options = {}
+) {
   // 参数验证
   if (!htmlString || typeof htmlString !== "string") {
     return htmlString;
   }
 
   // 快速检查，避免不必要的处理
-  if (!htmlString.includes("<template>") || !htmlString.includes("</template>")) {
+  if (
+    !htmlString.includes("<template>") ||
+    !htmlString.includes("</template>")
+  ) {
     return htmlString;
   }
 
@@ -424,15 +438,15 @@ export function addTemplateScopeIsolation(htmlString, scopePrefix = "xy", option
     if (!selector || !selector.trim()) {
       return selector;
     }
-    
+
     selector = selector.trim();
-    
+
     // 处理伪类和伪元素（更完善的正则）
     const pseudoMatch = selector.match(/^([^:]+?)(::?[^[]+)?$/);
     if (pseudoMatch) {
-      const [, base, pseudo = ''] = pseudoMatch;
+      const [, base, pseudo = ""] = pseudoMatch;
       // 处理属性选择器
-      if (base.includes('[')) {
+      if (base.includes("[")) {
         const attrMatch = base.match(/^([^[]+)(\[.+\])$/);
         if (attrMatch) {
           return `${attrMatch[1]}[data-${scopeId}]${attrMatch[2]}${pseudo}`;
@@ -440,7 +454,7 @@ export function addTemplateScopeIsolation(htmlString, scopePrefix = "xy", option
       }
       return `${base}[data-${scopeId}]${pseudo}`;
     }
-    
+
     return `${selector}[data-${scopeId}]`;
   }
 
@@ -448,52 +462,57 @@ export function addTemplateScopeIsolation(htmlString, scopePrefix = "xy", option
   function parseHTML(html, depth = 0) {
     // 检查递归深度
     if (depth >= config.maxDepth) {
-      console.warn(`Maximum recursion depth (${config.maxDepth}) reached in template processing`);
+      console.warn(
+        `Maximum recursion depth (${config.maxDepth}) reached in template processing`
+      );
       return html;
     }
-    
+
     // 使用更精确的模板匹配（避免贪婪匹配问题）
     const templates = [];
     let tempHtml = html;
     let placeholder = 0;
-    
+
     // 先收集所有template标签的位置和内容
     const templateRegex = /<template([^>]*)>([\s\S]*?)<\/template>/gi;
     let match;
-    
+
     while ((match = templateRegex.exec(html)) !== null) {
       templates.push({
         full: match[0],
-        attributes: match[1] || '',
-        content: match[2] || '',
+        attributes: match[1] || "",
+        content: match[2] || "",
         start: match.index,
         placeholder: `__TEMPLATE_PLACEHOLDER_${placeholder++}__`
       });
     }
-    
+
     // 从后往前替换，避免索引偏移问题
     for (let i = templates.length - 1; i >= 0; i--) {
       const template = templates[i];
       const scopeId = generateScopeId(scopePrefix);
-      
+
       // 处理内容
       const processedContent = addScopeToHTML(template.content, scopeId);
-      
+
       // 创建新的div标签，保留原有属性
-      const attributesStr = template.attributes ? ` ${template.attributes.trim()}` : '';
+      const attributesStr = template.attributes
+        ? ` ${template.attributes.trim()}`
+        : "";
       const newDiv = `<div data-${scopeId}=""${attributesStr}>${processedContent}</div>`;
-      
+
       // 替换原始template
-      tempHtml = tempHtml.substring(0, template.start) + 
-                 newDiv + 
-                 tempHtml.substring(template.start + template.full.length);
+      tempHtml =
+        tempHtml.substring(0, template.start) +
+        newDiv +
+        tempHtml.substring(template.start + template.full.length);
     }
-    
+
     // 检查是否还有嵌套的template需要处理
-    if (tempHtml.includes('<template>') && depth < config.maxDepth - 1) {
+    if (tempHtml.includes("<template>") && depth < config.maxDepth - 1) {
       return parseHTML(tempHtml, depth + 1);
     }
-    
+
     return tempHtml;
   }
 
@@ -501,41 +520,45 @@ export function addTemplateScopeIsolation(htmlString, scopePrefix = "xy", option
   function addScopeToHTML(html, scopeId) {
     // 处理HTML标签（改进的正则，支持自闭合标签）
     let processedHtml = html.replace(
-      /<(\w+)([^>]*?)(\/?)>/g, 
+      /<(\w+)([^>]*?)(\/?)>/g,
       (match, tagName, attributes, selfClosing) => {
         // 跳过已经有作用域属性的标签
-        if (attributes.includes('data-v-') || 
-            attributes.includes(`data-${scopeId}`) ||
-            attributes.includes(`data-${scopePrefix}-`)) {
+        if (
+          attributes.includes("data-v-") ||
+          attributes.includes(`data-${scopeId}`) ||
+          attributes.includes(`data-${scopePrefix}-`)
+        ) {
           return match;
         }
-        
+
         // 处理特殊标签（不需要作用域的）
-        const skipTags = ['script', 'style', 'template'];
+        const skipTags = ["script", "style", "template"];
         if (skipTags.includes(tagName.toLowerCase())) {
           return match;
         }
-        
+
         // 为标签添加作用域属性
         return `<${tagName} data-${scopeId}=""${attributes}${selfClosing}>`;
       }
     );
-    
+
     // 处理style标签中的CSS
     processedHtml = processedHtml.replace(
-      /<style([^>]*?)>([\s\S]*?)<\/style>/gi, 
+      /<style([^>]*?)>([\s\S]*?)<\/style>/gi,
       (match, styleAttrs, cssContent) => {
         // 跳过已处理的CSS
-        if (cssContent.includes(`[data-${scopeId}]`) || 
-            cssContent.includes(`[data-${scopePrefix}-`)) {
+        if (
+          cssContent.includes(`[data-${scopeId}]`) ||
+          cssContent.includes(`[data-${scopePrefix}-`)
+        ) {
           return match;
         }
-        
+
         const scopedCSS = addScopeToCSS(cssContent, scopeId);
         return `<style${styleAttrs}>${scopedCSS}</style>`;
       }
     );
-    
+
     return processedHtml;
   }
 
@@ -544,7 +567,7 @@ export function addTemplateScopeIsolation(htmlString, scopePrefix = "xy", option
     // 保存注释
     const comments = [];
     let commentIndex = 0;
-    
+
     if (config.preserveComments) {
       cssContent = cssContent.replace(/\/\*[\s\S]*?\*\//g, (match) => {
         const placeholder = `__CSS_COMMENT_${commentIndex++}__`;
@@ -552,86 +575,91 @@ export function addTemplateScopeIsolation(htmlString, scopePrefix = "xy", option
         return placeholder;
       });
     }
-    
+
     // 改进的CSS规则处理
     function processCSS(css, level = 0) {
       if (level > 5) return css; // 防止过深的嵌套
-      
+
       // 匹配CSS规则块
       const ruleRegex = /([^{}]+)\s*\{([^{}]*(?:\{[^{}]*\}[^{}]*)*)\}/g;
-      
+
       return css.replace(ruleRegex, (match, selectors, content) => {
         const trimmedSelectors = selectors.trim();
-        
+
         // 处理@规则
-        if (trimmedSelectors.startsWith('@')) {
+        if (trimmedSelectors.startsWith("@")) {
           // @keyframes不需要作用域
-          if (trimmedSelectors.startsWith('@keyframes')) {
+          if (trimmedSelectors.startsWith("@keyframes")) {
             return match;
           }
-          
+
           // @media, @supports等需要递归处理内部规则
-          if (content.includes('{')) {
+          if (content.includes("{")) {
             const processedContent = processCSS(content, level + 1);
             return `${selectors} {${processedContent}}`;
           }
-          
+
           return match;
         }
-        
+
         // 处理普通选择器
         const processedSelectors = trimmedSelectors
-          .split(',')
-          .map(selector => {
+          .split(",")
+          .map((selector) => {
             selector = selector.trim();
-            
+
             // 跳过特殊情况
-            if (!selector || 
-                selector.startsWith('@') || 
-                /^(from|to|\d+%)$/.test(selector) ||
-                selector.includes(`[data-${scopeId}]`)) {
+            if (
+              !selector ||
+              selector.startsWith("@") ||
+              /^(from|to|\d+%)$/.test(selector) ||
+              selector.includes(`[data-${scopeId}]`)
+            ) {
               return selector;
             }
-            
+
             // 清理现有的作用域属性
-            selector = selector.replace(/\[data-[a-z0-9-]+\]/gi, '').trim();
-            
+            selector = selector.replace(/\[data-[a-z0-9-]+\]/gi, "").trim();
+
             // 处理复杂选择器
             const selectorParts = selector.split(/\s+/);
-            
+
             // 处理第一个选择器部分
             if (selectorParts.length > 0) {
               // 处理组合选择器（如 .class1.class2）
               const firstPart = selectorParts[0];
               const combinedSelectors = firstPart.split(/(?=[.#[])/);
-              
+
               if (combinedSelectors.length > 1) {
                 // 在第一个实际选择器后添加作用域
-                combinedSelectors[0] = addScopeToSimpleSelector(combinedSelectors[0], scopeId);
-                selectorParts[0] = combinedSelectors.join('');
+                combinedSelectors[0] = addScopeToSimpleSelector(
+                  combinedSelectors[0],
+                  scopeId
+                );
+                selectorParts[0] = combinedSelectors.join("");
               } else {
                 selectorParts[0] = addScopeToSimpleSelector(firstPart, scopeId);
               }
             }
-            
-            return selectorParts.join(' ');
+
+            return selectorParts.join(" ");
           })
-          .join(', ');
-        
+          .join(", ");
+
         return `${processedSelectors} {${content}}`;
       });
     }
-    
+
     // 处理CSS
     let processedCSS = processCSS(cssContent);
-    
+
     // 恢复注释
     if (config.preserveComments) {
       comments.forEach(({ placeholder, content }) => {
         processedCSS = processedCSS.replace(placeholder, content);
       });
     }
-    
+
     return processedCSS;
   }
 
@@ -639,7 +667,7 @@ export function addTemplateScopeIsolation(htmlString, scopePrefix = "xy", option
   try {
     return parseHTML(htmlString);
   } catch (error) {
-    console.error('Error in addTemplateScopeIsolation:', error);
+    console.error("Error in addTemplateScopeIsolation:", error);
     return htmlString; // 出错时返回原始内容
   }
 }
@@ -653,14 +681,14 @@ export async function getFilePathByFunctionName(functionName) {
   try {
     // 获取所有pug文件路径
     const pagesPugFilePathArr = await getPagesPugFilePathArr();
-    
+
     // 清理函数名，移除get_前缀和_data后缀（如果存在）
     let cleanFunctionName = functionName;
     if (functionName.startsWith("get_") && functionName.endsWith("_data")) {
       // 数据获取函数名格式：get_xxx_data
       cleanFunctionName = functionName.slice(4, -5); // 移除 "get_" 和 "_data"
     }
-    
+
     // 遍历所有pug文件，找到匹配的文件
     for (const fileName of pagesPugFilePathArr) {
       // 根据fileName生成函数名（与generate.js中的逻辑保持一致）
@@ -669,13 +697,16 @@ export async function getFilePathByFunctionName(functionName) {
         .join("_")
         .slice(0, -4) // 移除.pug扩展名
         .replaceAll(/[-]/g, "_");
-      
+
       // 检查是否匹配
-      if (generatedFunctionName === cleanFunctionName || generatedFunctionName === functionName) {
+      if (
+        generatedFunctionName === cleanFunctionName ||
+        generatedFunctionName === functionName
+      ) {
         return fileName;
       }
     }
-    
+
     return null;
   } catch (error) {
     console.error("根据函数名查找文件路径失败:", error);
@@ -691,11 +722,43 @@ export async function getFilePathByFunctionName(functionName) {
 export async function fetchABTestInfo(siteAbbr) {
   try {
     const res = await axios.get("http://new.sp.com/open-api/abtest-info", {
-      params: { site: siteAbbr },
+      params: { site: siteAbbr }
     });
-    return (res && res.data && res.data.result) ? res.data.result : null;
+    return res && res.data && res.data.result ? res.data.result : null;
   } catch (error) {
     console.error("获取ABTestInfo失败:", error);
     return null;
   }
-}
+}
+
+/**
+ * 从接口获取语言列表
+ * @returns {Promise<string[]>} 返回语言列表
+ */
+export async function getLanguageListFromApi() {
+  try {
+    console.log("正在从接口获取语言列表...");
+    const response = await axios.get(
+      `http://new.sp.com/open-api/get_site_online_languages?site=${config.siteConfig.siteName}`
+    );
+
+    if (
+      response.data &&
+      response.data.success &&
+      response.data.result?.length
+    ) {
+      const languageList = response.data.result;
+      console.log("成功获取语言列表:", languageList);
+      return languageList;
+    } else {
+      console.warn(
+        "接口返回数据格式不正确:",
+        response.data,
+        "将使用config中的语言列表"
+      );
+      return config.languageList;
+    }
+  } catch (error) {
+    throw new Error("从接口获取语言列表失败:" + error);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "3.0.18",
+  "version": "3.0.19",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -52,7 +52,7 @@
     "ws": "^8.18.0"
   },
   "license": "ISC",
-  "description": "siteAbbr可选配置,添加会在common.langCommon.ABTestInfo中添加ABTestInfo数据开启abtest,否则不会添加",
+  "description": "增加从接口获取语言列表、增加翻译所有语言指令、增加linux系统判断",
   "files": [
     "lib/",
     "index.js"