mtranserver 4.0.31 → 4.0.32

package/dist/index.js

@@ -5557,10 +5557,10 @@ function formatChinesePunctuation(text, toLang, isHTML, enabled) {
   if (!enabled || isHTML || !toLang.startsWith("zh")) {
     return text;
   }
-  if (!zhPunctTest.test(text)) {
+  if (!zhCommaTest.test(text)) {
     return text;
   }
-  return text.replace(zhPunctGlobal, (ch) => String.fromCharCode(ch.charCodeAt(0) + 65248));
+  return text.replace(zhCommaGlobal, "，");
 }
 function needsPivotTranslation(fromLang, toLang) {
   if (fromLang === "en" || toLang === "en") {
@@ -5696,63 +5696,66 @@ async function translateSegment(fromLang, toLang, text, isHTML) {
 }
 async function translateWithPivot(fromLang, toLang, text, isHTML = false) {
   debug(`TranslateWithPivot: ${fromLang} -> ${toLang}, text length: ${text.length}, isHTML: ${isHTML}`);
-  const config2 = getConfig();
-  const shouldFullwidth = config2.fullwidthZhPunctuation ?? true;
+  let config2 = null;
+  let result = text;
   if (fromLang !== "auto" && fromLang === toLang) {
-    return formatChinesePunctuation(text, toLang, isHTML, shouldFullwidth);
-  }
-  if (fromLang !== "auto" && text.length <= 512) {
-    const translated = await translateSegment(fromLang, toLang, text, isHTML);
-    return formatChinesePunctuation(translated, toLang, isHTML, shouldFullwidth);
-  }
-  const segments = await detectMultipleLanguages(text);
-  if (segments.length <= 1) {
-    let effectiveFromLang;
-    if (segments.length === 1) {
-      effectiveFromLang = segments[0].language;
-    } else if (fromLang === "auto") {
-      const detected = await detectLanguage(text);
-      if (!detected) {
-        throw new Error("Failed to detect source language");
-      }
-      effectiveFromLang = detected;
-    } else {
-      effectiveFromLang = fromLang;
-    }
-    if (effectiveFromLang === toLang) {
-      return formatChinesePunctuation(text, toLang, isHTML, shouldFullwidth);
-    }
-    if (text.length > config2.maxSentenceLength && !isHTML) {
-      const translated2 = await translateLongText(effectiveFromLang, toLang, text);
-      return formatChinesePunctuation(translated2, toLang, isHTML, shouldFullwidth);
-    }
-    const translated = await translateSegment(effectiveFromLang, toLang, text, isHTML);
-    return formatChinesePunctuation(translated, toLang, isHTML, shouldFullwidth);
-  }
-  debug(`Detected ${segments.length} language segments`);
-  let result = "";
-  let lastEnd = 0;
-  for (const seg of segments) {
-    if (seg.start > lastEnd) {
-      result += text.substring(lastEnd, seg.start);
-    }
-    if (seg.language === toLang) {
-      result += seg.text;
+    result = text;
+  } else if (fromLang !== "auto" && text.length <= 512) {
+    result = await translateSegment(fromLang, toLang, text, isHTML);
+  } else {
+    const segments = await detectMultipleLanguages(text);
+    if (segments.length <= 1) {
+      let effectiveFromLang;
+      if (segments.length === 1) {
+        effectiveFromLang = segments[0].language;
+      } else if (fromLang === "auto") {
+        const detected = await detectLanguage(text);
+        if (!detected) {
+          throw new Error("Failed to detect source language");
+        }
+        effectiveFromLang = detected;
+      } else {
+        effectiveFromLang = fromLang;
+      }
+      if (effectiveFromLang === toLang) {
+        result = text;
+      } else if (!isHTML) {
+        config2 = config2 ?? getConfig();
+        result = text.length > config2.maxSentenceLength ? await translateLongText(effectiveFromLang, toLang, text) : await translateSegment(effectiveFromLang, toLang, text, isHTML);
+      } else {
+        result = await translateSegment(effectiveFromLang, toLang, text, isHTML);
+      }
     } else {
-      try {
-        const translated = await translateSegment(seg.language, toLang, seg.text, isHTML);
-        result += translated;
-      } catch (error2) {
-        error(`Failed to translate segment: ${error2}`);
-        result += seg.text;
+      debug(`Detected ${segments.length} language segments`);
+      result = "";
+      let lastEnd = 0;
+      for (const seg of segments) {
+        if (seg.start > lastEnd) {
+          result += text.substring(lastEnd, seg.start);
+        }
+        if (seg.language === toLang) {
+          result += seg.text;
+        } else {
+          try {
+            const translated = await translateSegment(seg.language, toLang, seg.text, isHTML);
+            result += translated;
+          } catch (error2) {
+            error(`Failed to translate segment: ${error2}`);
+            result += seg.text;
+          }
+        }
+        lastEnd = seg.end;
+      }
+      if (lastEnd < text.length) {
+        result += text.substring(lastEnd);
       }
     }
-    lastEnd = seg.end;
   }
-  if (lastEnd < text.length) {
-    result += text.substring(lastEnd);
+  if (!toLang.startsWith("zh")) {
+    return result;
   }
-  return formatChinesePunctuation(result, toLang, isHTML, shouldFullwidth);
+  config2 = config2 ?? getConfig();
+  return formatChinesePunctuation(result, toLang, isHTML, config2.fullwidthZhPunctuation);
 }
 async function translateLongText(fromLang, toLang, text) {
   debug(`Splitting long text (${text.length} chars) into sentences`);
@@ -5787,7 +5790,7 @@ function cleanupAllEngines() {
   engines.clear();
   info("All engines cleaned up successfully");
 }
-var import_bergamot_translator, engines, loadingPromises, zhPunctTest, zhPunctGlobal;
+var import_bergamot_translator, engines, loadingPromises, zhCommaTest, zhCommaGlobal;
 var init_engine2 = __esm(() => {
   init_engine();
   init_factory();
@@ -5800,8 +5803,8 @@ var init_engine2 = __esm(() => {
   import_bergamot_translator = __toESM(require_bergamot_translator(), 1);
   engines = new Map;
   loadingPromises = new Map;
-  zhPunctTest = /[!-/:-@[-`{-~]/;
-  zhPunctGlobal = /[!-/:-@[-`{-~]/g;
+  zhCommaTest = /,/;
+  zhCommaGlobal = /,/g;
 });
 
 // src/services/index.ts

package/dist/main.js

@@ -5558,10 +5558,10 @@ function formatChinesePunctuation(text, toLang, isHTML, enabled) {
   if (!enabled || isHTML || !toLang.startsWith("zh")) {
     return text;
   }
-  if (!zhPunctTest.test(text)) {
+  if (!zhCommaTest.test(text)) {
     return text;
   }
-  return text.replace(zhPunctGlobal, (ch) => String.fromCharCode(ch.charCodeAt(0) + 65248));
+  return text.replace(zhCommaGlobal, "，");
 }
 function needsPivotTranslation(fromLang, toLang) {
   if (fromLang === "en" || toLang === "en") {
@@ -5697,63 +5697,66 @@ async function translateSegment(fromLang, toLang, text, isHTML) {
 }
 async function translateWithPivot(fromLang, toLang, text, isHTML = false) {
   debug(`TranslateWithPivot: ${fromLang} -> ${toLang}, text length: ${text.length}, isHTML: ${isHTML}`);
-  const config2 = getConfig();
-  const shouldFullwidth = config2.fullwidthZhPunctuation ?? true;
+  let config2 = null;
+  let result = text;
   if (fromLang !== "auto" && fromLang === toLang) {
-    return formatChinesePunctuation(text, toLang, isHTML, shouldFullwidth);
-  }
-  if (fromLang !== "auto" && text.length <= 512) {
-    const translated = await translateSegment(fromLang, toLang, text, isHTML);
-    return formatChinesePunctuation(translated, toLang, isHTML, shouldFullwidth);
-  }
-  const segments = await detectMultipleLanguages(text);
-  if (segments.length <= 1) {
-    let effectiveFromLang;
-    if (segments.length === 1) {
-      effectiveFromLang = segments[0].language;
-    } else if (fromLang === "auto") {
-      const detected = await detectLanguage(text);
-      if (!detected) {
-        throw new Error("Failed to detect source language");
-      }
-      effectiveFromLang = detected;
-    } else {
-      effectiveFromLang = fromLang;
-    }
-    if (effectiveFromLang === toLang) {
-      return formatChinesePunctuation(text, toLang, isHTML, shouldFullwidth);
-    }
-    if (text.length > config2.maxSentenceLength && !isHTML) {
-      const translated2 = await translateLongText(effectiveFromLang, toLang, text);
-      return formatChinesePunctuation(translated2, toLang, isHTML, shouldFullwidth);
-    }
-    const translated = await translateSegment(effectiveFromLang, toLang, text, isHTML);
-    return formatChinesePunctuation(translated, toLang, isHTML, shouldFullwidth);
-  }
-  debug(`Detected ${segments.length} language segments`);
-  let result = "";
-  let lastEnd = 0;
-  for (const seg of segments) {
-    if (seg.start > lastEnd) {
-      result += text.substring(lastEnd, seg.start);
-    }
-    if (seg.language === toLang) {
-      result += seg.text;
+    result = text;
+  } else if (fromLang !== "auto" && text.length <= 512) {
+    result = await translateSegment(fromLang, toLang, text, isHTML);
+  } else {
+    const segments = await detectMultipleLanguages(text);
+    if (segments.length <= 1) {
+      let effectiveFromLang;
+      if (segments.length === 1) {
+        effectiveFromLang = segments[0].language;
+      } else if (fromLang === "auto") {
+        const detected = await detectLanguage(text);
+        if (!detected) {
+          throw new Error("Failed to detect source language");
+        }
+        effectiveFromLang = detected;
+      } else {
+        effectiveFromLang = fromLang;
+      }
+      if (effectiveFromLang === toLang) {
+        result = text;
+      } else if (!isHTML) {
+        config2 = config2 ?? getConfig();
+        result = text.length > config2.maxSentenceLength ? await translateLongText(effectiveFromLang, toLang, text) : await translateSegment(effectiveFromLang, toLang, text, isHTML);
+      } else {
+        result = await translateSegment(effectiveFromLang, toLang, text, isHTML);
+      }
     } else {
-      try {
-        const translated = await translateSegment(seg.language, toLang, seg.text, isHTML);
-        result += translated;
-      } catch (error2) {
-        error(`Failed to translate segment: ${error2}`);
-        result += seg.text;
+      debug(`Detected ${segments.length} language segments`);
+      result = "";
+      let lastEnd = 0;
+      for (const seg of segments) {
+        if (seg.start > lastEnd) {
+          result += text.substring(lastEnd, seg.start);
+        }
+        if (seg.language === toLang) {
+          result += seg.text;
+        } else {
+          try {
+            const translated = await translateSegment(seg.language, toLang, seg.text, isHTML);
+            result += translated;
+          } catch (error2) {
+            error(`Failed to translate segment: ${error2}`);
+            result += seg.text;
+          }
+        }
+        lastEnd = seg.end;
+      }
+      if (lastEnd < text.length) {
+        result += text.substring(lastEnd);
       }
     }
-    lastEnd = seg.end;
   }
-  if (lastEnd < text.length) {
-    result += text.substring(lastEnd);
+  if (!toLang.startsWith("zh")) {
+    return result;
   }
-  return formatChinesePunctuation(result, toLang, isHTML, shouldFullwidth);
+  config2 = config2 ?? getConfig();
+  return formatChinesePunctuation(result, toLang, isHTML, config2.fullwidthZhPunctuation);
 }
 async function translateLongText(fromLang, toLang, text) {
   debug(`Splitting long text (${text.length} chars) into sentences`);
@@ -5788,7 +5791,7 @@ function cleanupAllEngines() {
   engines.clear();
   info("All engines cleaned up successfully");
 }
-var import_bergamot_translator, engines, loadingPromises, zhPunctTest, zhPunctGlobal;
+var import_bergamot_translator, engines, loadingPromises, zhCommaTest, zhCommaGlobal;
 var init_engine2 = __esm(() => {
   init_engine();
   init_factory();
@@ -5801,8 +5804,8 @@ var init_engine2 = __esm(() => {
   import_bergamot_translator = __toESM(require_bergamot_translator(), 1);
   engines = new Map;
   loadingPromises = new Map;
-  zhPunctTest = /[!-/:-@[-`{-~]/;
-  zhPunctGlobal = /[!-/:-@[-`{-~]/g;
+  zhCommaTest = /,/;
+  zhCommaGlobal = /,/g;
 });
 
 // src/services/index.ts
@@ -213930,7 +213933,7 @@ __export(exports_version, {
 function getVersion() {
   return VERSION;
 }
-var VERSION = "4.0.31";
+var VERSION = "4.0.32";
 
 // src/server/index.ts
 init_config();
@@ -215732,7 +215735,7 @@ var swagger_default = {
   },
   info: {
     title: "MTranServer API",
-    version: "4.0.31",
+    version: "4.0.32",
     description: "Translation server API",
     license: {
       name: "Apache-2.0"

package/dist/services/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../src/services/engine.ts"],"names":[],"mappings":"AAkOA,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,MAAM,CAAC,CA0EjB;AAkCD,wBAAgB,iBAAiB,SAahC"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../src/services/engine.ts"],"names":[],"mappings":"AAiOA,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,MAAM,CAAC,CA0EjB;AAkCD,wBAAgB,iBAAiB,SAahC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mtranserver",
-  "version": "4.0.31",
+  "version": "4.0.32",
   "type": "module",
   "description": "Translation server",
   "main": "./dist/index.js",