@shaxpir/duiduidui-models 1.17.0 → 1.17.2

package/dist/util/PinyinParser.js

@@ -59,8 +59,8 @@ exports.PinyinParser = {
         if (!text || text.length === 0)
             return [];
         let normalized = this.normalizeApostrophes(text.toLowerCase().trim());
-        // Expand 'r (erhua via apostrophe) to 'er before splitting
-        normalized = normalized.replace(/'r/g, "'er");
+        // Expand 'r (erhua via apostrophe) to 'er, but not when followed by a vowel
+        normalized = normalized.replace(/'r(?![aeiouāáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜüv])/gi, "'er");
         if (normalized.includes("'")) {
             return this._parseApostropheSplit(normalized, true);
         }
@@ -87,8 +87,9 @@ exports.PinyinParser = {
     ensurePinyinSpacing(text) {
         // Normalize apostrophes and lowercase
         text = this.normalizeApostrophes(text).toLowerCase();
-        // Expand 'r (erhua via apostrophe) to 'er, then replace apostrophes with spaces
-        text = text.replace(/'r/g, "'er");
+        // Expand 'r (erhua via apostrophe) to 'er, but not when 'r is followed by
+        // a vowel (which would mean 'r starts a syllable like 'rén, not erhua).
+        text = text.replace(/'r(?![aeiouāáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜüv])/gi, "'er");
         text = text.replace(/'/g, ' ');
         text = text.replace(/ +/g, ' ');
         const parts = [];

package/dist/util/PinyinValidator.d.ts

@@ -24,7 +24,10 @@ export declare const PinyinValidator: {
      */
     removeAccentMarks(text: string): string;
     /**
-     * Check if a string is a valid pinyin syllable (with or without tone marks)
+     * Check if a string is a valid pinyin syllable (with or without tone marks).
+     * A valid single syllable has at most one tone mark — two tone marks means
+     * two syllables have been merged (e.g. "zhùān" looks like "zhuan" after
+     * stripping tones, but the two marks prove it's "zhù" + "ān").
      */
     isValidPinyin(text: string): boolean;
     /**

package/dist/util/PinyinValidator.js

@@ -19,6 +19,7 @@ const VALID_SYLLABLES = new Set([
     // === Zero-initial (standalone vowel syllables) ===
     'a', 'ai', 'an', 'ang', 'ao',
     'e', 'ei', 'en', 'eng', 'er',
+    'ng', // 嗯 (nasal interjection, sometimes written ǹg or ńg)
     'o', 'ou',
     // === y- initial (represents i-/ü- standalone) ===
     'ya', 'yao', 'yan', 'yang',
@@ -188,14 +189,15 @@ const UMLAUT_VARIANT_MAP = (() => {
     return map;
 })();
 // Tone marks that might appear in pinyin (including v with combining tone marks)
-const TONE_MARKS = /[āáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜ]|v[\u0301\u030C\u0300]?/g;
+const TONE_MARKS = /[āáǎàēéěèīíǐìōóǒòūúǔùǖǘǚǜńňǹ]|v[\u0301\u030C\u0300]?/g;
 const TONE_MAP = {
     'ā': 'a', 'á': 'a', 'ǎ': 'a', 'à': 'a',
     'ē': 'e', 'é': 'e', 'ě': 'e', 'è': 'e',
     'ī': 'i', 'í': 'i', 'ǐ': 'i', 'ì': 'i',
     'ō': 'o', 'ó': 'o', 'ǒ': 'o', 'ò': 'o',
     'ū': 'u', 'ú': 'u', 'ǔ': 'u', 'ù': 'u',
-    'ǖ': 'ü', 'ǘ': 'ü', 'ǚ': 'ü', 'ǜ': 'ü'
+    'ǖ': 'ü', 'ǘ': 'ü', 'ǚ': 'ü', 'ǜ': 'ü',
+    'ń': 'n', 'ň': 'n', 'ǹ': 'n'
 };
 // Maps toned vowels to base letters with ü→v (pipeline convention)
 // Includes both lowercase and uppercase variants.
@@ -244,11 +246,18 @@ exports.PinyinValidator = {
         });
     },
     /**
-     * Check if a string is a valid pinyin syllable (with or without tone marks)
+     * Check if a string is a valid pinyin syllable (with or without tone marks).
+     * A valid single syllable has at most one tone mark — two tone marks means
+     * two syllables have been merged (e.g. "zhùān" looks like "zhuan" after
+     * stripping tones, but the two marks prove it's "zhù" + "ān").
      */
     isValidPinyin(text) {
         if (!text || text.length === 0)
             return false;
+        // Count tone marks: a single syllable can have at most one
+        const toneCount = (text.match(TONE_MARKS) || []).length;
+        if (toneCount > 1)
+            return false;
         const normalized = stripToneMarks(text);
         return VALID_SYLLABLES.has(normalized);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.17.0",
+  "version": "1.17.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"