Merge branch 'Usualminds-fix-passport-u'

Author: hotoo

apps/website/rspress.config.ts

@@ -106,7 +106,7 @@ export default defineConfig({
       {
         icon: "discord",
         mode: "link",
-        content: "https://discord.gg/zqUS5uke",
+        content: "https://discord.gg/cxapDFhy",
       }
     ],
     footer: {

packages/pinyin/src/format.ts

@@ -46,8 +46,14 @@ export function toFixed(pinyin: string, style: ENUM_PINYIN_STYLE): string {
     });
 
   case ENUM_PINYIN_STYLE.PASSPORT:
+    // Normalize tones to plain letters first (like NORMAL), then apply
+    // passport-specific ü rules:
+    // - "lü"/"nü" -> "LYU"/"NYU"
+    // - "lüe"/"nüe" -> "LUE"/"NUE" (i.e., ü before 'e' maps to 'U')
     return pinyin.replace(RE_PHONETIC_SYMBOL, function($0: string, $1_phonetic: string) {
-      return PHONETIC_SYMBOL[$1_phonetic].replace(RE_TONE2, "$1").replace("v", "YU");
+      return PHONETIC_SYMBOL[$1_phonetic].replace(RE_TONE2, "$1");
+    }).replace(/v(e)?$/, function($0: string, $1_is_ve: string) {
+      return $1_is_ve ? "UE" : "YU";
     }).toUpperCase();
 
   case ENUM_PINYIN_STYLE.TO3NE:

packages/pinyin/test/format.test.ts

@@ -0,0 +1,44 @@
+import { toFixed } from "../src/format";
+import { ENUM_PINYIN_STYLE } from "../src/constant";
+
+describe.only("toFixed function", () => {
+  test("should return initials for ENUM_PINYIN_STYLE.INITIALS", () => {
+    expect(toFixed("zhong", ENUM_PINYIN_STYLE.INITIALS)).toBe("zh");
+    expect(toFixed("guo", ENUM_PINYIN_STYLE.INITIALS)).toBe("g");
+  });
+
+  test("should return first letter for ENUM_PINYIN_STYLE.FIRST_LETTER", () => {
+    expect(toFixed("zhong", ENUM_PINYIN_STYLE.FIRST_LETTER)).toBe("z");
+    expect(toFixed("guo", ENUM_PINYIN_STYLE.FIRST_LETTER)).toBe("g");
+  });
+
+  test("should return normal style for ENUM_PINYIN_STYLE.NORMAL", () => {
+    expect(toFixed("zhōng", ENUM_PINYIN_STYLE.NORMAL)).toBe("zhong");
+    expect(toFixed("guó", ENUM_PINYIN_STYLE.NORMAL)).toBe("guo");
+  });
+
+  test("should return passport style for ENUM_PINYIN_STYLE.PASSPORT", () => {
+    expect(toFixed("lǜ", ENUM_PINYIN_STYLE.PASSPORT)).toBe("LYU");
+    expect(toFixed("nǚ", ENUM_PINYIN_STYLE.PASSPORT)).toBe("NYU");
+    expect(toFixed("lüe", ENUM_PINYIN_STYLE.PASSPORT)).toBe("LUE");
+  });
+
+  test("should return tone3 style for ENUM_PINYIN_STYLE.TO3NE", () => {
+    expect(toFixed("zhōng", ENUM_PINYIN_STYLE.TO3NE)).toBe("zho1ng");
+    expect(toFixed("guó", ENUM_PINYIN_STYLE.TO3NE)).toBe("guo2");
+  });
+
+  test("should return tone2 style for ENUM_PINYIN_STYLE.TONE2", () => {
+    expect(toFixed("zhōng", ENUM_PINYIN_STYLE.TONE2)).toBe("zhong1");
+    expect(toFixed("guó", ENUM_PINYIN_STYLE.TONE2)).toBe("guo2");
+  });
+
+  test("should return tone style for ENUM_PINYIN_STYLE.TONE", () => {
+    expect(toFixed("zhōng", ENUM_PINYIN_STYLE.TONE)).toBe("zhōng");
+    expect(toFixed("guó", ENUM_PINYIN_STYLE.TONE)).toBe("guó");
+  });
+
+  test("should return original pinyin for unknown style", () => {
+    expect(toFixed("zhong", -1)).toBe("zhong");
+  });
+});

packages/pinyin/test/test.ts

@@ -71,6 +71,18 @@ const cases: any[] = [
     STYLE_INITIALS:     [["l"]],
     STYLE_FIRST_LETTER: [["l"]],
   } ],
+  ["略", {
+    STYLE_NORMAL:       [["lve"]],
+    STYLE_PASSPORT:     [["LUE"]],
+    STYLE_TONE:         [["lüè"]],
+    STYLE_TONE2:        [["lve4"]],
+  } ],
+  ["虐", {
+    STYLE_NORMAL:       [["nve"]],
+    STYLE_PASSPORT:     [["NUE"]],
+    STYLE_TONE:         [["nüè"]],
+    STYLE_TONE2:        [["nve4"]],
+  } ],
 
   // 单音词
   [ "我是谁", {
@@ -304,7 +316,7 @@ function makeTest(han: string, opt: any, style: string){
     pys = py.segment;
     py = py.normal;
   }
-  const single_pinyin = [];
+  const single_pinyin: string[][] = [];
   for(let i = 0, l = py.length; i < l; i++){
     single_pinyin[i] = [py[i][0]];
   }