Merge pull request #198 from zh-lx/fix-multiple-with-surname

fix: 修复 multiple 和 surname 一同使用的情景
zh-lx · Mar 21, 2024 · 2750c1d · 2750c1d
2 parents f09c368 + 57302c8
commit 2750c1d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/lib/core/pinyin/handle.ts b/lib/core/pinyin/handle.ts
@@ -134,11 +134,19 @@ type GetMultiplePinyin = (
 const getMultiplePinyin: GetMultiplePinyin = (word, mode = 'normal') => {
   const wordCode = word.charCodeAt(0);
   const customMultpileDict = getCustomMultpileDict();
-  const pinyin =
-    customMultpileDict[wordCode] ||
-    (mode === 'surname' ? Surnames[word] : '') ||
-    DICT1[wordCode] ||
-    '';
+  let pinyin = DICT1[wordCode] || '';
+  if (customMultpileDict[wordCode]) {
+    pinyin = customMultpileDict[wordCode];
+  } else if (mode === 'surname') {
+    const surnamePinyin = Surnames[word];
+    if (surnamePinyin) {
+      pinyin = [
+        surnamePinyin,
+        pinyin.split(' ').filter(py => py !== surnamePinyin),
+      ].join(' ');
+    }
+  }
+
   if (pinyin) {
     return pinyin.split(' ').map((value) => ({
       origin: word,

diff --git a/test/multiple.test.js b/test/multiple.test.js
@@ -34,11 +34,21 @@ describe('multiple', () => {
 
   it('[multiple]multiple+surname同时使用', () => {
     const result = pinyin('能', { mode: 'surname', multiple: true });
-    expect(result).to.be.equal('nài');
+    expect(result).to.be.equal('nài néng');
+  });
+
+  it('[multiple]multiple+surname同时使用,无surname', () => {
+    const result = pinyin('好', { mode: 'surname', multiple: true });
+    expect(result).to.be.equal('hǎo hào');
   });
 
   it('[multiple]base', () => {
     const result = pinyin('好', { multiple: true });
     expect(result).to.be.equal('hǎo hào');
   });
+
+  it('[multiple]multiple+surname同时使用,多音字优先使用姓氏读音', () => {
+    const result = pinyin('数学家华罗庚', { mode: 'surname', multiple: true });
+    expect(result).to.be.equal('shù xué jiā huà luó gēng');
+  });
 });