Merge pull request #279 from zh-lx/feature-first-consistent

feat: keep consistent for first
zh-lx · Nov 2, 2024 · fa07de9 · fa07de9
2 parents 77d8ae9 + 5179bc1
commit fa07de9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/lib/core/pinyin/handle.ts b/lib/core/pinyin/handle.ts
@@ -12,9 +12,7 @@ import { getCustomMultpileDict } from "@/core/custom";
 import { SingleWordResult } from "../../common/type";
 import type { SurnameMode } from "../../common/type";
 import { acTree, MatchPattern, TokenizationAlgorithm } from "../../common/segmentit";
-import {
-  Priority,
-} from "@/common/constant";
+import {  Priority } from "@/common/constant";
 import { splitString } from "@/common/utils";
 
 /**
@@ -275,12 +273,12 @@ const getPinyinWithNum: GetPinyinWithNum = (pinyin, originPinyin) => {
  * @param {string} pinyin
  * @return {string}
  */
-type GetFirstLetter = (pinyin: string) => string;
-const getFirstLetter: GetFirstLetter = (pinyin) => {
+type GetFirstLetter = (pinyin: string, isZh: boolean) => string;
+const getFirstLetter: GetFirstLetter = (pinyin: string, isZh: boolean) => {
   const first_letter_arr: string[] = [];
   const pinyin_arr = pinyin.split(" ");
   pinyin_arr.forEach((pinyin) => {
-    first_letter_arr.push(pinyin[0]);
+    first_letter_arr.push(isZh ? pinyin[0] : pinyin);
   });
   return first_letter_arr.join(" ");
 };

diff --git a/lib/core/pinyin/middlewares.ts b/lib/core/pinyin/middlewares.ts
@@ -95,8 +95,7 @@ export const middlewarePattern = (
       break;
     case "first":
       list.forEach((item) => {
-        // todo: first 暂时不作为拼音一部分，不进行 isZh 识别
-        item.result = getFirstLetter(item.result);
+        item.result = getFirstLetter(item.result, item.isZh);
       });
       break;
     case "finalHead":
@@ -199,7 +198,7 @@ export const middlewareType = (
         pinyin,
         initial,
         final,
-        first: item.isZh ? getFirstLetter(item.result) : "",
+        first: getFirstLetter(item.result, item.isZh),
         finalHead: head,
         finalBody: body,
         finalTail: tail,

diff --git a/lib/core/polyphonic/index.ts b/lib/core/polyphonic/index.ts
@@ -249,7 +249,7 @@ export const handleType = (
         pinyin,
         initial,
         final,
-        first: item.isZh ? getFirstLetter(item.result) : '',
+        first: getFirstLetter(item.result, item.isZh),
         finalHead: head,
         finalBody: body,
         finalTail: tail,

diff --git a/test/all.test.js b/test/all.test.js
@@ -99,7 +99,7 @@ describe('all', () => {
         pinyin: '',
         initial: '',
         final: '',
-        first: '',
+        first: 'a',
         finalHead: '',
         finalBody: '',
         finalTail: '',
@@ -114,7 +114,7 @@ describe('all', () => {
         pinyin: '',
         initial: '',
         final: '',
-        first: '',
+        first: '𧒽',
         finalHead: '',
         finalBody: '',
         finalTail: '',
@@ -207,7 +207,7 @@ describe('all', () => {
         pinyin: '',
         initial: '',
         final: '',
-        first: '',
+        first: 'a𧒽',
         finalHead: '',
         finalBody: '',
         finalTail: '',

diff --git a/test/polyphonic.test.js b/test/polyphonic.test.js
@@ -220,7 +220,7 @@ describe('polyphonic', () => {
           finalBody: '',
           finalHead: '',
           finalTail: '',
-          first: '',
+          first: 's',
           initial: '',
           isZh: false,
           num: 0,