Refactor

spec/component.spec.ts

@@ -1,8 +1,8 @@
 import { describe, expect, it } from "vitest";
-import { listToObject } from "~/lib/utils";
+import { listToObject } from "~/lib";
 import rawrepertoire from "../public/cache/repertoire.json";
-import type { PrimitveCharacter, PrimitiveRepertoire } from "~/lib/data";
-import { determine } from "~/lib/repertoire";
+import type { PrimitiveCharacter, PrimitiveRepertoire } from "~/lib";
+import { determine } from "~/lib";
 
 describe("recursive render component", () => {
   const repertoire: PrimitiveRepertoire = listToObject(rawrepertoire);

spec/degenerator.spec.ts

@@ -1,15 +1,15 @@
-import _degenerate, {
+import {
+  degenerate as _degenerate,
   indicesToBinary,
   binaryToIndices,
-  generateSliceBinaries,
   defaultDegenerator,
-} from "~/lib/degenerator";
+} from "~/lib";
 import { describe, it, expect } from "vitest";
 import { create, all } from "mathjs";
 import { computedGlyphs2 as computedGlyphs } from "./mock";
-import { RenderedGlyph } from "~/lib/topology";
+import { RenderedGlyph } from "~/lib";
 
-const { randomInt } = create(all, {
+const { randomInt } = create(all!, {
   randomSeed: "a",
 });
 
@@ -58,7 +58,7 @@ const hasroot = (a: RenderedGlyph, indices: number[], root: RenderedGlyph) => {
 
 describe("degenerate cross tests", () => {
   const { 大, 天, 九, 丸, 山, 出, 冖, 农, 赤, 以, 人, 氺, 丆, 疌, 龰 } =
-    computedGlyphs;
+    computedGlyphs as any;
   it("says 天 has 大", () => {
     expect(degenerate(大)).toEqual(degenerate(slice(天, [1, 2, 3])));
   });
@@ -88,8 +88,8 @@ describe("degenerate cross tests", () => {
 });
 
 describe("degenerate cross tests 2", () => {
-  const { 豕, 彖, 豖, 㒸, 豙 } = computedGlyphs;
-  const 蒙下 = computedGlyphs["\ue0b3"];
+  const { 豕, 彖, 豖, 㒸, 豙 } = computedGlyphs as any;
+  const 蒙下 = computedGlyphs["\ue0b3"]!;
   const base = slice(豕, [1, 2, 3, 4, 5, 6]);
   it("says 彖 has 豕下", () => {
     hasroot(彖, [3, 4, 5, 6, 7, 8], base);
@@ -109,7 +109,7 @@ describe("degenerate cross tests 2", () => {
 });
 
 describe("degenerate cross tests 3", () => {
-  const { 永, 承, 氶 } = computedGlyphs;
+  const { 永, 承, 氶 } = computedGlyphs as any;
   const base = slice(承, [5, 6, 7]);
   it("says 承 has 水", () => {
     hasroot(承, [5, 6, 7], base);
@@ -123,7 +123,7 @@ describe("degenerate cross tests 3", () => {
 });
 
 describe("degenerate cross tests 4", () => {
-  const { 隶, 氺 } = computedGlyphs;
+  const { 隶, 氺 } = computedGlyphs as any;
   it("says 承 has 水", () => {
     hasroot(隶, [3, 4, 5, 6, 7], 氺);
   });

spec/form.spec.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from "vitest";
-import { generateSchemes } from "~/lib/component";
+import { generateSchemes } from "~/lib";
 
 describe("generate schemes", () => {
   it("works for a simple case", () => {

spec/mock.ts

@@ -1,12 +1,12 @@
-import { listToObject } from "~/lib/utils";
+import { listToObject } from "~/lib";
 import rawrepertoire from "../public/cache/repertoire.json";
 import type {
-  PrimitveCharacter,
+  PrimitiveCharacter,
   BasicComponent,
   PrimitiveRepertoire,
-} from "~/lib/data";
-import { determine } from "~/lib/repertoire";
-import { computeComponent } from "~/lib/component";
+} from "~/lib";
+import { determine } from "~/lib";
+import { computeComponent } from "~/lib";
 
 export const repertoire = determine(listToObject(rawrepertoire));
 export const computedGlyphs = Object.fromEntries(

spec/selector.spec.ts

@@ -1,27 +1,18 @@
 import { describe, expect, it } from "vitest";
-import {
-  length,
-  bias,
-  order,
-  crossing,
-  attaching,
-  Scheme,
-} from "~/lib/selector";
-import select from "~/lib/selector";
+import { length, bias, order, crossing, attaching, Scheme } from "~/lib";
+import { select } from "~/lib";
 import { computedGlyphs, repertoire } from "./mock";
-import { defaultKeyboard } from "~/lib/templates";
-import { Config } from "~/lib/config";
+import { createConfig, defaultKeyboard } from "~/lib";
+import { Config } from "~/lib";
 
-const config: Config = {
-  source: null,
-  form: defaultKeyboard,
-  encoder: {
-    sources: {},
-    conditions: {},
-  },
-};
+const config: Config = createConfig({
+  name: "",
+  data: "国标五分类",
+  keyboard: "米十五笔字根",
+  encoder: "形音码",
+});
 
-const { 天 } = computedGlyphs;
+const { 天 } = computedGlyphs as any;
 
 const rootMap = new Map<number, string>();
 

spec/topology.spec.ts

@@ -1,10 +1,10 @@
 import { expect, describe, it } from "vitest";
-import type { StrokeRelation } from "~/lib/topology";
-import findTopology, { curveRelation, renderSVGGlyph } from "~/lib/topology";
-import { CubicCurve, LinearCurve, area, render } from "~/lib/bezier";
-import type { Draw, Point } from "~/lib/data";
+import type { StrokeRelation } from "~/lib";
+import { findTopology, curveRelation, renderSVGGlyph } from "~/lib";
+import { CubicCurve, LinearCurve, area, render } from "~/lib";
+import type { Draw, Point } from "~/lib";
 import { computedGlyphs2 as computedGlyphs } from "./mock";
-import { getIntervalPosition, makeCurve } from "~/lib/bezier";
+import { getIntervalPosition, makeCurve } from "~/lib";
 
 describe("interval position", () => {
   it("works for easy cases", () => {
@@ -24,7 +24,14 @@ describe("interval position", () => {
 
 describe("linear relation", () => {
   const { 田 } = computedGlyphs;
-  const [l, t, r, h, v, b] = 田.map((x) => x.curveList).flat() as LinearCurve[];
+  const [l, t, r, h, v, b] = 田!.map((x) => x.curveList).flat() as [
+    LinearCurve,
+    LinearCurve,
+    LinearCurve,
+    LinearCurve,
+    LinearCurve,
+    LinearCurve,
+  ];
   it("figures out all relations in 田", () => {
     expect(curveRelation(l, t)).toEqual({
       type: "连",
@@ -62,7 +69,11 @@ describe("linear relation", () => {
 
 describe("linear relation 2", () => {
   const { 艹 } = computedGlyphs;
-  const [_, s1, s2] = 艹.map((x) => x.curveList).flat() as LinearCurve[];
+  const [_, s1, s2] = 艹!.map((x) => x.curveList).flat() as [
+    LinearCurve,
+    LinearCurve,
+    LinearCurve,
+  ];
   it("figures out all relations in 艹", () => {
     expect(curveRelation(s1, s2)).toEqual({
       type: "平行",
@@ -75,7 +86,12 @@ describe("linear relation 2", () => {
 describe("curve relation", () => {
   it("figures out all relations in 天", () => {
     const { 天 } = computedGlyphs;
-    const [c1, c2, c3, c4] = 天.map((x) => x.curveList).flat();
+    const [c1, c2, c3, c4] = 天!.map((x) => x.curveList).flat() as [
+      LinearCurve,
+      LinearCurve,
+      CubicCurve,
+      CubicCurve,
+    ];
     expect(curveRelation(c1, c3)).toEqual({
       type: "连",
       first: "中",
@@ -96,7 +112,11 @@ describe("curve relation", () => {
   });
   it("figures out all relations in 义", () => {
     const { 义 } = computedGlyphs;
-    const [c1, c2, c3] = 义.map((x) => x.curveList).flat();
+    const [c1, c2, c3] = 义!.map((x) => x.curveList).flat() as [
+      CubicCurve,
+      CubicCurve,
+      CubicCurve,
+    ];
     expect(curveRelation(c1, c2)).toEqual({
       type: "平行",
       crossAxis: 0,
@@ -111,7 +131,12 @@ describe("curve relation", () => {
   });
   it("figures out all relations in 升", () => {
     const { 升 } = computedGlyphs;
-    const [c1, c2, c3, c4] = 升.map((x) => x.curveList).flat();
+    const [c1, c2, c3, c4] = 升!.map((x) => x.curveList).flat() as [
+      CubicCurve,
+      LinearCurve,
+      CubicCurve,
+      LinearCurve,
+    ];
     expect(curveRelation(c1, c2)).toEqual({
       type: "平行",
       mainAxis: 0,
@@ -183,7 +208,7 @@ describe("find topology interface", () => {
         [],
       ],
     ];
-    expect(findTopology(土)).toEqual({
+    expect(findTopology(土!)).toEqual({
       matrix: array,
       orientedPairs: [[2, 0]],
     });

src/lib/api.ts → src/api.ts

@@ -1,4 +1,4 @@
-import type { PrimitveCharacter } from "./data";
+import type { PrimitiveCharacter } from "./lib/data";
 
 export const endpoint = "https://api.chaifen.app/";
 
@@ -28,7 +28,7 @@ const template =
   };
 
 export const list = async () =>
-  await template("GET")<PrimitveCharacter[], undefined>("repertoire/all");
+  await template("GET")<PrimitiveCharacter[], undefined>("repertoire/all");
 
 export const post = template("POST");
 
@@ -45,20 +45,20 @@ interface Mutation {
 export const remoteCreateWithoutUnicode = (payload: PUA) =>
   template("POST")<number, PUA>(`repertoire`, payload);
 
-export const remoteCreate = (payload: PrimitveCharacter) =>
-  template("POST")<number, PrimitveCharacter>(
+export const remoteCreate = (payload: PrimitiveCharacter) =>
+  template("POST")<number, PrimitiveCharacter>(
     `repertoire/${payload.unicode}`,
     payload,
   );
 
-export const remoteUpdate = (payload: PrimitveCharacter) =>
-  template("PUT")<boolean, PrimitveCharacter>(
+export const remoteUpdate = (payload: PrimitiveCharacter) =>
+  template("PUT")<boolean, PrimitiveCharacter>(
     `repertoire/${payload.unicode}`,
     payload,
   );
 
 export const remoteRemove = (unicode: number) =>
-  template("DELETE")<boolean, PrimitveCharacter>(`repertoire/${unicode}`);
+  template("DELETE")<boolean, PrimitiveCharacter>(`repertoire/${unicode}`);
 
 export const remoteMutate = (payload: Mutation) =>
   template("PUT")<boolean, Mutation>(`repertoire`, payload);

src/atoms/analysis.ts

@@ -1,7 +1,7 @@
-import type { Analysis, Degenerator, Selector, SieveName } from "~/lib/config";
+import type { Analysis, Degenerator, Selector, SieveName } from "~/lib";
 import { focusAtom } from "jotai-optics";
 import { analysisAtom } from "./config";
-import classifier, { Feature } from "~/lib/classifier";
+import { Feature, mergeClassifier } from "~/lib";
 import { atom } from "jotai";
 
 export const degeneratorAtom = focusAtom(analysisAtom, (o) =>
@@ -38,5 +38,5 @@ export const classifierCustomizationAtom = focusAtom(analysisAtom, (o) =>
 
 export const customClassifierAtom = atom((get) => {
   const customization = get(classifierCustomizationAtom);
-  return { ...classifier, ...customization };
+  return mergeClassifier(customization);
 });

src/atoms/cache.ts

@@ -1,6 +1,6 @@
 import { atom } from "jotai";
-import { AssemblyResult } from "~/lib/assembly";
-import { AnalysisResult } from "~/lib/repertoire";
+import { AssemblyResult } from "~/lib";
+import { AnalysisResult } from "~/lib";
 
 export const analysisResultAtom = atom<AnalysisResult | null>(null);
 

src/atoms/config.ts

@@ -7,7 +7,7 @@ import {
   type Info,
   Analysis,
   UserData,
-} from "~/lib/config";
+} from "~/lib";
 import { focusAtom } from "jotai-optics";
 
 /** 需要在根组件里提前修改它 */

src/atoms/constants.ts

@@ -1,5 +1,5 @@
 import { atom } from "jotai";
-import type { PrimitiveRepertoire } from "~/lib/data";
+import type { PrimitiveRepertoire } from "~/lib";
 import { produce } from "immer";
 import { Equivalence, Frequency } from "~/components/Optimizer";
 import {

src/atoms/data.ts

@@ -1,13 +1,13 @@
 import { atom, useAtomValue } from "jotai";
 import { primitiveRepertoireAtom } from "./constants";
-import { isPUA } from "~/lib/utils";
-import { recursiveRenderCompound } from "~/lib/component";
+import { isPUA } from "~/lib";
+import { recursiveRenderCompound } from "~/lib";
 import { dataAtom } from ".";
 import { focusAtom } from "jotai-optics";
-import { PrimitiveRepertoire, SVGGlyph } from "~/lib/data";
-import { CustomGlyph } from "~/lib/config";
-import { determine } from "~/lib/repertoire";
-import classifier from "~/lib/classifier";
+import { PrimitiveRepertoire, SVGGlyph } from "~/lib";
+import { CustomGlyph } from "~/lib";
+import { determine } from "~/lib";
+import { classifier } from "~/lib";
 
 export const userRepertoireAtom = focusAtom(dataAtom, (o) =>
   o.prop("repertoire").valueOr({} as PrimitiveRepertoire),

src/atoms/encoder.ts

@@ -1,6 +1,6 @@
 import { focusAtom } from "jotai-optics";
 import { encoderAtom } from ".";
-import { ShortCodeScheme, WordRule } from "~/lib/config";
+import { ShortCodeScheme, WordRule } from "~/lib";
 
 export const maxLengthAtom = focusAtom(encoderAtom, (o) =>
   o.prop("max_length"),