rule の name を optional にする

Author: tomoemon

src/assets/rules/jis_kana.json

@@ -3,7 +3,7 @@ import { KeyboardLayout } from "../core/keyboardLayout";
 import {
   findMatchedKeyboardLayout,
   loadPresetKeyboardLayoutQwertyJis
-} from "../impl/defaultKeyboardLayout";
+} from "../impl/presetKeyboardLayout";
 
 export async function detectKeyboardLayout(
   window: any

src/assets/rules/naginatashiki_v15.json

@@ -6,7 +6,6 @@ import { RuleStroke } from "./ruleStroke";
 import { VirtualKeys } from "./virtualKey";
 
 const defaultRule = new Rule(
-  "test-rule",
   [
     new RuleEntry(
       [new RuleStroke(VirtualKeys.A, AndModifier.empty)],

src/assets/rules/nicola.json

@@ -3,7 +3,6 @@ import { StrokeEdge, StrokeNode } from "./builderStrokeGraph";
 import { InputEvent, InputStroke, matchCandidateEdge } from "./inputEvent";
 import { KeyboardState } from "./keyboardState";
 import { AndModifier } from "./modifier";
-import { Rule } from "./rule";
 import { RuleStroke } from "./ruleStroke";
 import { VirtualKeys } from "./virtualKey";
 
@@ -14,7 +13,6 @@ test("シンプルな入力で matched", () => {
 
   const dummyNode1 = new StrokeNode(0, [], []);
   const dummyNode2 = new StrokeNode(0, [], []);
-  const rule = new Rule("dummy-rule", [], (v) => v);
   const edge = new StrokeEdge(
     new RuleStroke(VirtualKeys.A, AndModifier.empty),
     dummyNode1,
@@ -31,7 +29,6 @@ test("シンプルな入力で none", () => {
 
   const dummyNode1 = new StrokeNode(0, [], []);
   const dummyNode2 = new StrokeNode(0, [], []);
-  const rule = new Rule("dummy-rule", [], (v) => v);
   const edge = new StrokeEdge(
     new RuleStroke(VirtualKeys.A, AndModifier.empty),
     dummyNode1,
@@ -47,7 +44,6 @@ test("シフトキー単打で none", () => {
 
   const dummyNode1 = new StrokeNode(0, [], []);
   const dummyNode2 = new StrokeNode(0, [], []);
-  const rule = new Rule("dummy-rule", [], (v) => v);
   const edge = new StrokeEdge(
     new RuleStroke(VirtualKeys.A, AndModifier.empty),
     dummyNode1,

src/browser/osKeyboardLayout.ts

@@ -87,14 +87,14 @@ nk/ん/k
 export class Rule {
   /**
    * 
-   * @param name 入力ルールの名前
    * @param entries 入力ルールのエントリ
    * @param normalize 入力ワードのかな文字を正規化する関数
+   * @param name 入力ルールの名前
    */
   constructor(
-    readonly name: string,
     readonly entries: RuleEntry[],
     readonly normalize: normalizerFunc,
+    readonly name: string = "",
   ) {
     this.entries = extendCommonPrefixOverlappedEntriesDeeply(entries);
 

src/core/builderKanaGraph.test.ts

@@ -1,10 +1,24 @@
 import { Rule, RuleEntry } from "./rule";
 
-// entires と modifierGroups を結合した新しい Rule を返す
+// entries を結合した新しい Rule を返す
 export function mergeRule(
   thisRule: Rule,
-  other: Rule
+  other: Rule,
+  newName: string = "",
 ): Rule {
+  const newRule = new Rule(
+    mergeEntries(thisRule, other),
+    (v: string) => other.normalize(thisRule.normalize(v)),
+    newName,
+  );
+  return newRule;
+}
+
+
+export function mergeEntries(
+  thisRule: Rule,
+  other: Rule
+): RuleEntry[] {
   const thisEntryHashMap = new Map<string, RuleEntry[]>();
   thisRule.entries.forEach((entry) => {
     if (thisEntryHashMap.has(entry.output)) {
@@ -23,10 +37,5 @@ export function mergeRule(
       return true;
     }
   });
-  const newRule = new Rule(
-    thisRule.name,
-    [...thisRule.entries, ...toBeAddedEntries],
-    (v: string) => other.normalize(thisRule.normalize(v))
-  );
-  return newRule;
+  return [...thisRule.entries, ...toBeAddedEntries];
 }

src/core/inputEvent.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "vitest";
 import { newAlphaNumericRuleByLayout } from "./alphaNumericRule";
-import { loadPresetKeyboardLayoutQwertyJis } from "./defaultKeyboardLayout";
+import { loadPresetKeyboardLayoutQwertyJis } from "./presetKeyboardLayout";
 
 test("import alphaNumericRule", () => {
   const alphaNumericRule = newAlphaNumericRuleByLayout(

src/core/rule.ts

@@ -9,8 +9,8 @@ export function newAlphaNumericRuleByLayout(
     ([key, stroke]) => new RuleEntry([stroke], key, [], false)
   );
   return new Rule(
-    "alpha-numeric",
     entries,
-    defaultAlphaNumericNormalize
+    defaultAlphaNumericNormalize,
+    "alphanumeric",
   );
 }