Typecheck

justinsilvestre · Dec 8, 2023 · 8149f8a · 8149f8a
1 parent 7a7d212
commit 8149f8a
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 139 deletions.
diff --git a/app/features/dictionary/DictionaryEntryComponentsTree.tsx b/app/features/dictionary/DictionaryEntryComponentsTree.tsx
@@ -73,7 +73,6 @@ function DictionaryEntryComponentsTreeMember({
   return (
     <div className="relative flex flex-col">
       <FigurePopoverBadge
-        id={componentFigure.id}
         badgeProps={getBadgeProps(componentFigure)}
         width={size === "large" ? 6 : 5}
         className="mx-auto "

diff --git a/app/features/dictionary/transcribeSbgyXiaoyun.test.ts b/app/features/dictionary/transcribeSbgyXiaoyun.test.ts
@@ -1,6 +1,7 @@
 import { appendFileSync, writeFileSync } from "fs";
 
 import { getYuntuJson } from "prisma/external/getYuntuJson";
+import { overrides } from "prisma/external/yuntuOverrides";
 import { files, readJsonSync } from "~/lib/files.server";
 
 import { transcribeSbgyXiaoyun } from "./transcribeSbgyXiaoyun";
@@ -9,7 +10,7 @@ const logOutputPath = __dirname + "/transcribeSbgyXiaoyun.test.log";
 
 describe("transcribeSbgyXiaoyun", () => {
   it("works with each xiaoyun of Guangyun", async () => {
-    const yuntuJsons = await getYuntuJson();
+    const yuntuJsons = await getYuntuJson(overrides);
     const sbgyJson = readJsonSync<
       [
         syllableNumber: number,

diff --git a/app/isComponentFirstClass.test.ts b/app/isComponentFirstClass.test.ts
@@ -2,7 +2,38 @@ import { isComponentFirstClass } from "prisma/kanjisense/isComponentFirstClass";
 import { getFiguresToVariantGroups } from "prisma/kanjisense/seedKanjisenseFigures";
 import { prisma } from "~/db.server";
 
+import { ComponentUse } from "./features/dictionary/ComponentUse";
+
 describe("isComponentFirstClass", () => {
+  const figuresToComponentTrees = new Map<string, ComponentUse[]>(
+    (
+      [
+        [
+          "歸",
+          [
+            ["歸", "CDP-8CAB"],
+            ["CDP-8CAB", "𠂤"],
+            ["𠂤", "丿"],
+            ["𠂤", "㠯"],
+            ["CDP-8CAB", "止"],
+            ["歸", "帚"],
+            ["帚", "⺕"],
+            ["帚", "冖"],
+            ["帚", "巾"],
+          ],
+        ],
+        [
+          "𠚍",
+          [
+            ["𠚍", "𠂭"],
+            ["𠚍", "凵"],
+          ],
+        ],
+        ["旡", []],
+      ] as [string, [string, string][]][]
+    ).map(([id, ct]) => [id, ct.map((c) => new ComponentUse(c[0], c[1]))]),
+  );
+
   it("works with CDP-8CAB (left of 歸)", async () => {
     const priorityFiguresIds = await prisma.kanjisenseFigure
       .findMany({
@@ -23,6 +54,7 @@ describe("isComponentFirstClass", () => {
       component,
       componentsToDirectUsesPrimaryVariants,
       figuresToVariantGroups,
+      figuresToComponentTrees,
     );
     expect(result).toEqual(false);
   });
@@ -48,6 +80,7 @@ describe("isComponentFirstClass", () => {
       component,
       componentsToDirectUsesPrimaryVariants,
       figuresToVariantGroups,
+      figuresToComponentTrees,
     );
     expect(result).toEqual(false);
   });
@@ -73,6 +106,7 @@ describe("isComponentFirstClass", () => {
       component,
       componentsToDirectUsesPrimaryVariants,
       figuresToVariantGroups,
+      figuresToComponentTrees,
     );
     expect(result).toEqual(true);
   });

diff --git a/app/routes/browse.atomic-components.tsx b/app/routes/browse.atomic-components.tsx
@@ -374,7 +374,7 @@ function FigureBadgeLink({
 }) {
   return (
     <DictLink figureId={figureId} className={className}>
-      <FigureBadge id={figureId} badgeProps={badgeProps} />
+      <FigureBadge badgeProps={badgeProps} />
     </DictLink>
   );
 }

diff --git a/app/routes/browse.compound-components.tsx b/app/routes/browse.compound-components.tsx
@@ -222,7 +222,7 @@ function FigureBadgeLink({
 }) {
   return (
     <DictLink figureId={figureId}>
-      <FigureBadge id={figureId} badgeProps={badgeProps} />
+      <FigureBadge badgeProps={badgeProps} />
     </DictLink>
   );
 }

diff --git a/app/routes/browse.sound-components.tsx b/app/routes/browse.sound-components.tsx
@@ -561,7 +561,7 @@ function FigureBadgeLink({
 }) {
   return (
     <DictLink figureId={figureId}>
-      <FigureBadge id={figureId} badgeProps={badgeProps} />
+      <FigureBadge badgeProps={badgeProps} />
     </DictLink>
   );
 }

diff --git a/prisma/external/seedSbgy.ts b/prisma/external/seedSbgy.ts
@@ -4,7 +4,8 @@ import { files, readJsonSync } from "~/lib/files.server";
 
 import { registerSeeded } from "../seedUtils";
 
-import { getYuntuJson, XiaoyunCategoriesJson } from "./getYuntuJson";
+import { getYuntuJson } from "./getYuntuJson";
+import { overrides } from "./yuntuOverrides";
 
 // mostly ocr and xml structure corrections
 const replacementFanqie = {
@@ -127,30 +128,3 @@ async function getDbInput() {
   }
   return dbInput;
 }
-
-export const overrides: Record<number, XiaoyunCategoriesJson> = {
-  // no homophones so no fanqie was given
-  1919: ["章", "蒸", "上", null, null], // 拯
-  3177: ["影", "銜", "去", null, null], // 𪒠
-
-  // rhyme classes differ from http://suzukish.s252.xrea.com/search/inkyo/yunzi/<CHARACTER>
-  // and in ytenx.org guangyun scans
-  392: ["並", "咍", "平", null, null], // 𤗏
-  400: ["滂", "咍", "平", null, null], // 𡜊
-  1452: ["滂", "咍", "上", null, null], // 啡 listed as homophonous to 俖; see next line
-  1458: ["幫", "咍", "上", null, null], // 俖 has unaspirated P yunjing, also Jiyun lists that as possible reading.
-  1456: ["明", "咍", "上", null, null], // 䆀
-  1465: ["並", "咍", "上", null, null], // 倍
-  2530: ["明", "咍", "去", null, null], // 䆀
-  2381: ["透", "齊", "去", "開", "三"], // 𥱻
-
-  // some atypical initial/final combos
-  // were made more typical
-  1310: ["泥", "之", "上", null, null], // 伱
-  2886: ["泥", "麻", "去", "開", "二"], //䏧
-  1871: ["端", "庚", "上", "開", "二"], // 打
-  574: ["從", "山", "平", "開", null], // 虥
-
-  // apparently corrections, judging by unt  https://www.zhihu.com/question/490585553/answer/2157640006
-  1763: ["精", "歌", "上", "合", "一"], // 硰,
-};
diff --git a/prisma/external/yuntuOverrides.ts b/prisma/external/yuntuOverrides.ts
@@ -0,0 +1,28 @@
+import { XiaoyunCategoriesJson } from "./getYuntuJson";
+
+export const overrides: Record<number, XiaoyunCategoriesJson> = {
+  // no homophones so no fanqie was given
+  1919: ["章", "蒸", "上", null, null], // 拯
+  3177: ["影", "銜", "去", null, null], // 𪒠
+
+  // rhyme classes differ from http://suzukish.s252.xrea.com/search/inkyo/yunzi/<CHARACTER>
+  // and in ytenx.org guangyun scans
+  392: ["並", "咍", "平", null, null], // 𤗏
+  400: ["滂", "咍", "平", null, null], // 𡜊
+  1452: ["滂", "咍", "上", null, null], // 啡 listed as homophonous to 俖; see next line
+  1458: ["幫", "咍", "上", null, null], // 俖 has unaspirated P yunjing, also Jiyun lists that as possible reading.
+  1456: ["明", "咍", "上", null, null], // 䆀
+  1465: ["並", "咍", "上", null, null], // 倍
+  2530: ["明", "咍", "去", null, null], // 䆀
+  2381: ["透", "齊", "去", "開", "三"], // 𥱻
+
+  // some atypical initial/final combos
+  // were made more typical
+  1310: ["泥", "之", "上", null, null], // 伱
+  2886: ["泥", "麻", "去", "開", "二"], //䏧
+  1871: ["端", "庚", "上", "開", "二"], // 打
+  574: ["從", "山", "平", "開", null], // 虥
+
+  // apparently corrections, judging by unt  https://www.zhihu.com/question/490585553/answer/2157640006
+  1763: ["精", "歌", "上", "合", "一"], // 硰,
+};
diff --git a/prisma/kanjisense/ComponentUseWithSignificance.ts b/prisma/kanjisense/ComponentUseWithSignificance.ts