@ycookiey/yfuzzy 0.3.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. package/README.md +191 -176
  2. package/THIRD_PARTY_NOTICES.md +49 -3
  3. package/dist/entry.d.ts +6 -1
  4. package/dist/entry.d.ts.map +1 -1
  5. package/dist/entry.js +31 -1
  6. package/dist/entry.js.map +1 -1
  7. package/dist/expand.d.ts +1 -1
  8. package/dist/expand.js +3 -3
  9. package/dist/expand.js.map +1 -1
  10. package/dist/index.d.ts +1 -1
  11. package/dist/index.d.ts.map +1 -1
  12. package/dist/index.js +4 -2
  13. package/dist/index.js.map +1 -1
  14. package/dist/keystroke.d.ts +5 -0
  15. package/dist/keystroke.d.ts.map +1 -0
  16. package/dist/keystroke.js +79 -0
  17. package/dist/keystroke.js.map +1 -0
  18. package/dist/lattice.d.ts +54 -0
  19. package/dist/lattice.d.ts.map +1 -0
  20. package/dist/lattice.js +241 -0
  21. package/dist/lattice.js.map +1 -0
  22. package/dist/pipeline.d.ts +2 -0
  23. package/dist/pipeline.d.ts.map +1 -1
  24. package/dist/pipeline.js +26 -2
  25. package/dist/pipeline.js.map +1 -1
  26. package/dist/query.d.ts +13 -9
  27. package/dist/query.d.ts.map +1 -1
  28. package/dist/query.js +11 -7
  29. package/dist/query.js.map +1 -1
  30. package/dist/tiers/tier1-exact.d.ts.map +1 -1
  31. package/dist/tiers/tier1-exact.js +240 -49
  32. package/dist/tiers/tier1-exact.js.map +1 -1
  33. package/dist/tiers/tier2-flexible.d.ts.map +1 -1
  34. package/dist/tiers/tier2-flexible.js +45 -1
  35. package/dist/tiers/tier2-flexible.js.map +1 -1
  36. package/dist/tiers/tier3-typo.d.ts.map +1 -1
  37. package/dist/tiers/tier3-typo.js +112 -1
  38. package/dist/tiers/tier3-typo.js.map +1 -1
  39. package/dist/tiers/tier4-structural.d.ts.map +1 -1
  40. package/dist/tiers/tier4-structural.js +2 -0
  41. package/dist/tiers/tier4-structural.js.map +1 -1
  42. package/dist/types.d.ts +7 -0
  43. package/dist/types.d.ts.map +1 -1
  44. package/dist/vendor/wanakana/romaji-to-kana.d.ts +5 -0
  45. package/dist/vendor/wanakana/romaji-to-kana.d.ts.map +1 -1
  46. package/dist/vendor/wanakana/romaji-to-kana.js +21 -0
  47. package/dist/vendor/wanakana/romaji-to-kana.js.map +1 -1
  48. package/dist/yfuzzy.min.js +2 -2
  49. package/package.json +61 -61
  50. package/dist/ablate.d.ts +0 -8
  51. package/dist/ablate.d.ts.map +0 -1
  52. package/dist/ablate.js +0 -11
  53. package/dist/ablate.js.map +0 -1
package/dist/query.js CHANGED
@@ -1,29 +1,33 @@
1
1
  // クエリ正規化の束ね(spec 2.2 / 2.3)。1経路分の文字列を NormalizedQuery にする。
2
2
  // 経路展開(expand.ts)は呼び出し側で行い、各経路文字列を本モジュールへ渡す。
3
3
  //
4
- // 正規化順(spec 2.2): preKana(手順1-3)→ toKana(ローマ字→かな、常時有効)→
5
- // postKana(手順4-5)。toKana は romaji オプションと無関係(入力利便のため常時)。
4
+ // 正規化順(spec 2.2): preKana(手順1-3)→ toKana(ローマ字→かな、phonetic 経路のみ)→
5
+ // postKana(手順4-5)。literal 経路は toKana を通さず、データ側と同じ正規化になる。
6
6
  import { applyTransforms } from './normalize.js';
7
7
  import { toKana } from './to-kana.js';
8
8
  import { KUNREI, HEPBURN, kunreiEnabled, hepburnEnabled, } from './romaji/convert.js';
9
9
  import { kanaToRomaji } from './syllable.js';
10
10
  import { generateBigrams } from './bigram.js';
11
11
  import { charMask } from './charmask.js';
12
+ import { buildLattice } from './lattice.js';
12
13
  /** クエリ文字列(1経路分)を正規化する */
13
- export function normalizeQuery(raw, romaji) {
14
+ export function normalizeQuery(raw, romaji, mode = 'phonetic') {
14
15
  const pre = applyTransforms(raw, 'preKana');
15
- const kana = applyTransforms(toKana(pre), 'postKana');
16
- const kunrei = kunreiEnabled(romaji) ? kanaToRomaji(kana, KUNREI) : null;
17
- const hepburn = hepburnEnabled(romaji) ? kanaToRomaji(kana, HEPBURN) : null;
16
+ const kana = applyTransforms(mode === 'phonetic' ? toKana(pre) : pre, 'postKana');
17
+ // literal 経路の kana はデータ側 kana と同空間。romaji 化してもかな以外は同一文字列になるため生成しない
18
+ const phonetic = mode === 'phonetic';
19
+ const kunrei = phonetic && kunreiEnabled(romaji) ? kanaToRomaji(kana, KUNREI) : null;
20
+ const hepburn = phonetic && hepburnEnabled(romaji) ? kanaToRomaji(kana, HEPBURN) : null;
18
21
  return {
19
22
  kana,
20
23
  singleChar: isSingleCodePoint(kana),
21
- literal: /^[a-z0-9]$/.test(pre) && pre !== kana ? pre : null,
22
24
  kunrei,
23
25
  hepburn,
24
26
  kanaMask: charMask(kana),
25
27
  kunreiMask: kunrei !== null ? charMask(kunrei) : 0,
26
28
  hepburnMask: hepburn !== null ? charMask(hepburn) : 0,
29
+ lattice: phonetic ? null : buildLattice(kana),
30
+ shadowed: false,
27
31
  bigrams: null,
28
32
  };
29
33
  }
package/dist/query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,6CAA6C;AAC7C,EAAE;AACF,wDAAwD;AACxD,wDAAwD;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,MAAM,EACN,OAAO,EACP,aAAa,EACb,cAAc,GAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AA0BzC,yBAAyB;AACzB,MAAM,UAAU,cAAc,CAAC,GAAW,EAAE,MAAoB;IAC9D,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzE,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5E,OAAO;QACL,IAAI;QACJ,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC;QACnC,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;QAC5D,MAAM;QACN,OAAO;QACP,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC;QACxB,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,WAAW,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAS;IAClC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACjC,OAAO,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC;AACrE,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,kBAAkB,CAAC,CAAkB;IACnD,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI;QAAE,CAAC,CAAC,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5D,OAAO,CAAC,CAAC,OAAO,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,6CAA6C;AAC7C,EAAE;AACF,iEAAiE;AACjE,yDAAyD;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EACL,MAAM,EACN,OAAO,EACP,aAAa,EACb,cAAc,GAEf,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAgB,MAAM,cAAc,CAAC;AA8B1D,yBAAyB;AACzB,MAAM,UAAU,cAAc,CAC5B,GAAW,EACX,MAAoB,EACpB,OAAkB,UAAU;IAE5B,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAClF,mEAAmE;IACnE,MAAM,QAAQ,GAAG,IAAI,KAAK,UAAU,CAAC;IACrC,MAAM,MAAM,GAAG,QAAQ,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACrF,MAAM,OAAO,GAAG,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACxF,OAAO;QACL,IAAI;QACJ,UAAU,EAAE,iBAAiB,CAAC,IAAI,CAAC;QACnC,MAAM;QACN,OAAO;QACP,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC;QACxB,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,WAAW,EAAE,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;QAC7C,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAS;IAClC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACjC,OAAO,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC,CAAC,MAAM,CAAC;AACrE,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,kBAAkB,CAAC,CAAkB;IACnD,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI;QAAE,CAAC,CAAC,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC5D,OAAO,CAAC,CAAC,OAAO,CAAC;AACnB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"tier1-exact.d.ts","sourceRoot":"","sources":["../../src/tiers/tier1-exact.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,YAAY,CAAC;AA8DjD,eAAO,MAAM,UAAU,EAAE,OA+BxB,CAAC"}
1
+ {"version":3,"file":"tier1-exact.d.ts","sourceRoot":"","sources":["../../src/tiers/tier1-exact.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,YAAY,CAAC;AA8QjD,eAAO,MAAM,UAAU,EAAE,OAqBxB,CAAC"}
@@ -1,77 +1,268 @@
1
- // tier 1: 完全マッチ層(spec 4.1)。クエリ文字列がデータに連続して現れる。
2
- // サブマッチを固定優先順で評価し、intraScore 最大を採用(同点は先順位=表の記載順)。
3
- // 優先順(spec 5章タイブレーク): かな前方 > かな部分 > リテラル前方 > リテラル部分 >
4
- // romaji前方(訓令>ヘボン) > romaji部分(訓令>ヘボン)。
1
+ // tier 1: 完全マッチ層(spec 4.1)。クエリ文字列がデータに連続して現れる、または各単語の頭文字に並ぶ。
2
+ // 一致の位置で4段に分け(item の先頭 > 単語の頭 > 頭文字 > 単語の途中)、段の中は coverage × 係数。
3
+ // intraScore = (段 + 素点) / 4。サブマッチを固定順で評価し最大を採用(同点は先の評価)。
4
+ // 評価順(spec 5章タイブレーク): かな(打鍵ラティスでは入力文字のまま → 打鍵経由)> 訓令 > ヘボン、
5
+ // 各空間で 先頭 > 単語の頭 > 頭文字 > 単語の途中。打鍵を経由した経路は romaji の係数・最小長を取る。
6
+ import { contiguousAt, expandByDepth, latticeFeasible } from '../lattice.js';
5
7
  const KANA_PREFIX = 1.0;
6
8
  const KANA_SUBSTRING = 0.9;
7
9
  const ROMAJI_PREFIX = 0.97;
8
10
  const ROMAJI_SUBSTRING = 0.87;
9
11
  const HEPBURN_PENALTY = 0.99; // 訓令優先(両式同時マッチ時の決定性)
12
+ // 段(spec 4.1)。値が大きいほど上
13
+ const PREFIX = 3; // item の先頭から
14
+ const WORD = 2; // 単語の頭から
15
+ const INITIALS = 1; // 各単語の頭文字(単語の中で続け、後ろの単語の頭へ飛ぶ)
16
+ const INNER = 0; // 単語の途中
17
+ /** 段と素点(coverage × 係数 ∈ (0, 1])から intraScore を作る。完全一致は (3 + 1) / 4 = 1 */
18
+ function grade(cls, raw) {
19
+ return (cls + raw) / 4;
20
+ }
21
+ function contiguous(cls, raw, space, offset, len) {
22
+ return { intraScore: grade(cls, raw), space, offset, len, positions: null };
23
+ }
10
24
  function range(len, offset) {
11
25
  const p = [];
12
26
  for (let i = 0; i < len; i++)
13
27
  p.push(offset + i);
14
28
  return p;
15
29
  }
16
- // 1文字クエリ(正規化後1コードポイント)のレンジ分離(spec 4.1):
17
- // 前方一致系 = 0.5 + raw/2 ∈ (0.5, 1]、部分一致系 = raw/2 ∈ (0, 0.5]。
18
- // coverage 差で短いデータの部分一致が長いデータの前方一致を逆転しないことを保証する。
19
- // 完全一致(coverage 1.0 の前方)は 1.0 のまま。
20
- function mapScore(raw, isPrefix, single) {
21
- if (!single)
22
- return raw;
23
- return isPrefix ? 0.5 + raw / 2 : raw / 2;
24
- }
25
- function prefix(query, data, space, factor, single) {
30
+ function prefix(query, data, space, factor) {
26
31
  if (query.length === 0 || data.length === 0)
27
32
  return null;
28
33
  if (!data.startsWith(query))
29
34
  return null;
30
- const raw = (query.length / data.length) * factor;
31
- return { intraScore: mapScore(raw, true, single), space, offset: 0, len: query.length };
35
+ return contiguous(PREFIX, (query.length / data.length) * factor, space, 0, query.length);
32
36
  }
33
- function substring(query, data, space, factor, minLen, single) {
37
+ /** 先頭以外の連続一致。単語の頭から始まる出現があればそれ(単語の頭の段)、無ければ最初の出現(単語の途中の段) */
38
+ function substring(query, data, heads, space, factor, minLen) {
34
39
  if (query.length < minLen || data.length === 0)
35
40
  return null;
36
- const idx = data.indexOf(query);
37
- if (idx <= 0)
38
- return null; // 0 = 前方一致(別サブマッチが担当)、<0 = 非一致
41
+ const first = data.indexOf(query, 1);
42
+ if (first < 0)
43
+ return null;
39
44
  const raw = (query.length / data.length) * factor;
40
- return { intraScore: mapScore(raw, false, single), space, offset: idx, len: query.length };
45
+ for (let i = first; i >= 0; i = data.indexOf(query, i + 1)) {
46
+ if (heads.has(i))
47
+ return contiguous(WORD, raw, space, i, query.length);
48
+ }
49
+ return contiguous(INNER, raw, space, first, query.length);
41
50
  }
42
- export const tier1Exact = (q, e) => {
43
- let best = null;
44
- // strict > により、同点では先に評価した(=優先順が上の)候補が残る
45
- const consider = (c) => {
46
- if (c !== null && (best === null || c.intraScore > best.intraScore))
47
- best = c;
51
+ /**
52
+ * 頭文字の一致: クエリの各文字を、単語の頭から始め、直前の続き(+1)か後ろの単語の頭に置けるか。
53
+ * 置き方は先頭寄り・続き優先で決める。単語の頭が先頭だけのデータは前方一致と同じため扱わない。
54
+ */
55
+ function initials(query, data, heads, space, factor) {
56
+ const m = query.length;
57
+ const n = data.length;
58
+ if (m < 2 || n === 0 || heads.size < 2)
59
+ return null;
60
+ // ok[i*n + p]: query[i] を p に置いて query[i..] を並べ切れる
61
+ const ok = new Uint8Array(m * n);
62
+ for (let i = m - 1; i >= 0; i--) {
63
+ let headAfter = false; // p より後ろに query[i+1] を置ける単語の頭がある
64
+ for (let p = n - 1; p >= 0; p--) {
65
+ if (data[p] === query[i]) {
66
+ ok[i * n + p] = i === m - 1 || (p + 1 < n && ok[(i + 1) * n + p + 1] === 1) || headAfter ? 1 : 0;
67
+ }
68
+ if (i < m - 1 && heads.has(p) && ok[(i + 1) * n + p])
69
+ headAfter = true;
70
+ }
71
+ }
72
+ let p = -1;
73
+ for (let s = 0; s < n; s++) {
74
+ if (heads.has(s) && ok[s]) {
75
+ p = s;
76
+ break;
77
+ }
78
+ }
79
+ if (p < 0)
80
+ return null;
81
+ const positions = [p];
82
+ for (let i = 1; i < m; i++) {
83
+ if (p + 1 < n && ok[i * n + p + 1])
84
+ p = p + 1;
85
+ else {
86
+ let q = p + 1;
87
+ while (!(heads.has(q) && ok[i * n + q]))
88
+ q++;
89
+ p = q;
90
+ }
91
+ positions.push(p);
92
+ }
93
+ return { intraScore: grade(INITIALS, (m / n) * factor), space, offset: 0, len: 0, positions };
94
+ }
95
+ const scratchMatch = { plain: 0, ks: 0 };
96
+ /**
97
+ * ラティスの連続一致・頭文字の候補を評価順(入力文字のまま → 打鍵経由、各々 先頭 > 単語の頭 > 頭文字 > 途中)で渡す。
98
+ * 長さは一致した経路の長さ。同じ段では最長、同長は最も前の位置。
99
+ */
100
+ function latticeCandidates(lat, data, heads, consider) {
101
+ const N = data.length;
102
+ if (N === 0)
103
+ return;
104
+ // [打鍵経由か][段] → 最長の長さと位置
105
+ const len = [new Int32Array(4), new Int32Array(4)];
106
+ const at = [new Int32Array(4), new Int32Array(4)];
107
+ const take = (f, cls, l, s) => {
108
+ if (l > len[f][cls]) {
109
+ len[f][cls] = l;
110
+ at[f][cls] = s;
111
+ }
48
112
  };
113
+ for (let s = 0; s < N; s++) {
114
+ if (!lat.firstChars.has(data[s]))
115
+ continue;
116
+ contiguousAt(lat, data, s, scratchMatch);
117
+ const cls = s === 0 ? PREFIX : heads.has(s) ? WORD : INNER;
118
+ take(0, cls, scratchMatch.plain, s);
119
+ if (cls === PREFIX || scratchMatch.ks >= 2)
120
+ take(1, cls, scratchMatch.ks, s); // 打鍵の部分一致は2文字以上
121
+ }
122
+ const ini = heads.size >= 2 ? latticeInitials(lat, data, heads) : null;
123
+ const factors = [
124
+ [KANA_PREFIX, KANA_SUBSTRING],
125
+ [ROMAJI_PREFIX, ROMAJI_SUBSTRING],
126
+ ];
127
+ for (let f = 0; f < 2; f++) {
128
+ const [pf, sf] = factors[f];
129
+ if (len[f][PREFIX] > 0)
130
+ consider(contiguous(PREFIX, (len[f][PREFIX] / N) * pf, 'kana', 0, len[f][PREFIX]));
131
+ if (len[f][WORD] > 0)
132
+ consider(contiguous(WORD, (len[f][WORD] / N) * sf, 'kana', at[f][WORD], len[f][WORD]));
133
+ const hit = ini?.[f];
134
+ if (hit)
135
+ consider({ intraScore: grade(INITIALS, (hit.length / N) * sf), space: 'kana', offset: 0, len: 0, positions: hit });
136
+ if (len[f][INNER] > 0)
137
+ consider(contiguous(INNER, (len[f][INNER] / N) * sf, 'kana', at[f][INNER], len[f][INNER]));
138
+ }
139
+ }
140
+ /**
141
+ * 頭文字の一致のラティス版。展開状態 × 打鍵経由フラグ × 置いた位置で到達を解き、
142
+ * フラグごとに最長の経路(経路長 2 以上)の位置列を返す。
143
+ */
144
+ function latticeInitials(lat, data, heads) {
145
+ const ex = expandByDepth(lat);
146
+ const { X, inStart, inFrom, inCh, inKs } = ex;
147
+ const n = data.length;
148
+ // reach[(x*2+f)*n + p]: 状態 x・フラグ f の経路の最後の文字を p に置ける
149
+ const reach = new Uint8Array(X * 2 * n);
150
+ const minPos = new Int32Array(X * 2).fill(n); // reach が立つ最小の p
151
+ for (let x = 1; x < X; x++) {
152
+ for (let k = inStart[x]; k < inStart[x + 1]; k++) {
153
+ const y = inFrom[k];
154
+ const c = inCh[k];
155
+ const ks = inKs[k];
156
+ for (let fy = 0; fy < 2; fy++) {
157
+ if (y !== 0 && minPos[y * 2 + fy] >= n)
158
+ continue;
159
+ if (y === 0 && fy === 1)
160
+ continue;
161
+ const f = fy | ks;
162
+ const base = (x * 2 + f) * n;
163
+ const ybase = (y * 2 + fy) * n;
164
+ for (let p = 0; p < n; p++) {
165
+ if (data.charCodeAt(p) !== c || reach[base + p])
166
+ continue;
167
+ const can = y === 0 ? heads.has(p) : (p > 0 && reach[ybase + p - 1] === 1) || (heads.has(p) && minPos[y * 2 + fy] < p);
168
+ if (can) {
169
+ reach[base + p] = 1;
170
+ if (p < minPos[x * 2 + f])
171
+ minPos[x * 2 + f] = p;
172
+ }
173
+ }
174
+ }
175
+ }
176
+ }
177
+ const out = [null, null];
178
+ for (let f = 0; f < 2; f++) {
179
+ for (let i = ex.finals.length - 1; i >= 0 && out[f] === null; i--) {
180
+ const [xf, m] = ex.finals[i];
181
+ if (m < 2 || minPos[xf * 2 + f] >= n)
182
+ continue;
183
+ out[f] = traceInitials(ex, reach, data, heads, xf, f, minPos[xf * 2 + f]);
184
+ }
185
+ }
186
+ return out;
187
+ }
188
+ /** latticeInitials の到達表から位置列を後ろ向きに復元する(続き優先) */
189
+ function traceInitials(ex, reach, data, heads, x0, f0, p0) {
190
+ const { inStart, inFrom, inCh, inKs } = ex;
191
+ const n = data.length;
192
+ const positions = [p0];
193
+ let x = x0;
194
+ let f = f0;
195
+ let p = p0;
196
+ while (x !== 0) {
197
+ let next = null;
198
+ for (let k = inStart[x]; k < inStart[x + 1] && next === null; k++) {
199
+ if (inCh[k] !== data.charCodeAt(p))
200
+ continue;
201
+ const y = inFrom[k];
202
+ if (y === 0) {
203
+ if (inKs[k] === f && heads.has(p))
204
+ next = [0, 0, -1];
205
+ continue;
206
+ }
207
+ for (let fy = 0; fy < 2 && next === null; fy++) {
208
+ if ((fy | inKs[k]) !== f)
209
+ continue;
210
+ const ybase = (y * 2 + fy) * n;
211
+ if (p > 0 && reach[ybase + p - 1])
212
+ next = [y, fy, p - 1];
213
+ else if (heads.has(p)) {
214
+ for (let q = p - 1; q >= 0; q--) {
215
+ if (reach[ybase + q]) {
216
+ next = [y, fy, q];
217
+ break;
218
+ }
219
+ }
220
+ }
221
+ }
222
+ }
223
+ if (next === null || next[0] === 0)
224
+ break;
225
+ [x, f, p] = next;
226
+ positions.push(p);
227
+ }
228
+ return positions.reverse();
229
+ }
230
+ // 照合中の最良候補(1 回の tier1Exact 呼び出し内で使う。JS は単一スレッド・同期実行のため安全)。
231
+ // strict > により、同点では先に評価した(=優先順が上の)候補が残る
232
+ let best = null;
233
+ function consider(c) {
234
+ if (c !== null && (best === null || c.intraScore > best.intraScore))
235
+ best = c;
236
+ }
237
+ /** 文字列クエリ1空間分のサブマッチ(単語の頭が先頭だけなら頭文字は前方一致と同じため省く) */
238
+ function considerSpace(query, data, heads, space, prefixFactor, substringFactor, minLen) {
239
+ consider(prefix(query, data, space, prefixFactor));
240
+ consider(substring(query, data, heads, space, substringFactor, minLen));
241
+ if (heads.size >= 2)
242
+ consider(initials(query, data, heads, space, substringFactor));
243
+ }
244
+ export const tier1Exact = (q, e) => {
245
+ best = null;
49
246
  const kana = e.kana.text;
50
- const kunrei = e.kunrei?.text ?? '';
51
- const hepburn = e.hepburn?.text ?? '';
52
- const single = q.singleChar;
53
- // 1. かな前方一致
54
- consider(prefix(q.kana, kana, 'kana', KANA_PREFIX, single));
55
- // 2. かな部分一致(かなは1文字でも可)
56
- consider(substring(q.kana, kana, 'kana', KANA_SUBSTRING, 1, single));
57
- // 3. リテラル前方/部分一致(かな変換で形が変わった英数1文字クエリのみ。かな空間)
58
- if (q.literal !== null) {
59
- consider(prefix(q.literal, kana, 'kana', KANA_PREFIX, single));
60
- consider(substring(q.literal, kana, 'kana', KANA_SUBSTRING, 1, single));
247
+ if (q.lattice !== null && e.hasKeystrokeChar) {
248
+ // データに打鍵の文字が無ければ打鍵経路は一致し得ないため文字列照合(else)と同値
249
+ if (latticeFeasible(q.lattice, e.kanaMask))
250
+ latticeCandidates(q.lattice, kana, e.kanaBoundaries, consider);
251
+ }
252
+ else if (!q.shadowed) {
253
+ considerSpace(q.kana, kana, e.kanaBoundaries, 'kana', KANA_PREFIX, KANA_SUBSTRING, 1);
254
+ }
255
+ if (q.kunrei !== null && e.kunrei !== null) {
256
+ considerSpace(q.kunrei, e.kunrei.text, e.kunreiHeads, 'kunrei', ROMAJI_PREFIX, ROMAJI_SUBSTRING, 2);
257
+ }
258
+ if (q.hepburn !== null && e.hepburn !== null) {
259
+ const f = HEPBURN_PENALTY;
260
+ considerSpace(q.hepburn, e.hepburn.text, e.hepburnHeads, 'hepburn', ROMAJI_PREFIX * f, ROMAJI_SUBSTRING * f, 2);
61
261
  }
62
- // 4. romaji 前方一致(訓令 → ヘボン。前方は最小長条件なし)
63
- if (q.kunrei !== null)
64
- consider(prefix(q.kunrei, kunrei, 'kunrei', ROMAJI_PREFIX, single));
65
- if (q.hepburn !== null)
66
- consider(prefix(q.hepburn, hepburn, 'hepburn', ROMAJI_PREFIX * HEPBURN_PENALTY, single));
67
- // 5. romaji 部分一致(訓令 → ヘボン。クエリ romaji 2文字以上)
68
- if (q.kunrei !== null)
69
- consider(substring(q.kunrei, kunrei, 'kunrei', ROMAJI_SUBSTRING, 2, single));
70
- if (q.hepburn !== null)
71
- consider(substring(q.hepburn, hepburn, 'hepburn', ROMAJI_SUBSTRING * HEPBURN_PENALTY, 2, single));
72
262
  if (best === null)
73
263
  return null;
74
264
  const c = best;
75
- return { tier: 1, intraScore: c.intraScore, space: c.space, positions: range(c.len, c.offset) };
265
+ best = null;
266
+ return { tier: 1, intraScore: c.intraScore, space: c.space, positions: c.positions ?? range(c.len, c.offset) };
76
267
  };
77
268
  //# sourceMappingURL=tier1-exact.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tier1-exact.js","sourceRoot":"","sources":["../../src/tiers/tier1-exact.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tier1-exact.js","sourceRoot":"","sources":["../../src/tiers/tier1-exact.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"tier2-flexible.d.ts","sourceRoot":"","sources":["../../src/tiers/tier2-flexible.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,YAAY,CAAC;AA+JjD,eAAO,MAAM,aAAa,EAAE,OA2B3B,CAAC"}
1
+ {"version":3,"file":"tier2-flexible.d.ts","sourceRoot":"","sources":["../../src/tiers/tier2-flexible.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,YAAY,CAAC;AAoMjD,eAAO,MAAM,aAAa,EAAE,OAgC3B,CAAC"}
@@ -1,6 +1,7 @@
1
1
  // tier 2: 柔軟マッチ層(spec 4.2)。クエリがデータの subsequence(順序保存・飛び石)。
2
2
  // 旧 subsequence + acronym + vowel-stripped の統合。
3
3
  // 線形存在チェック → 位置選択 DP(境界/連続を優先)→ rate ベース intraScore。
4
+ import { latticeFeasible, latticeIsSubsequence } from '../lattice.js';
4
5
  // DP 定数(spec 4.2、【調整対象】)
5
6
  const MATCH = 16;
6
7
  const GAP_START = -3;
@@ -140,6 +141,42 @@ function scoreFromPositions(positions, queryLen, dataLen, boundaries) {
140
141
  const startTerm = 1 - positions[0] / dataLen;
141
142
  return W_BOUNDARY * boundaryRate + W_CONTINUITY * continuity + W_START * startTerm;
142
143
  }
144
+ /**
145
+ * ラティス版: 始点→終端の各経路を文字列クエリとして位置選択 DP にかけ、intraScore 最大を返す
146
+ * (同点は先に辿った経路)。データの subsequence になり得ない経路は辿る途中で打ち切る
147
+ * (経路の接頭辞が subsequence かは最左一致の位置で判定でき、これは厳密)。経路長 MIN_LEN 未満は対象外。
148
+ */
149
+ function latticeBest(lat, t, dMask, boundaries, single) {
150
+ if (t.length === 0)
151
+ return null;
152
+ if (!latticeFeasible(lat, dMask))
153
+ return null;
154
+ if (!latticeIsSubsequence(lat, t, single))
155
+ return null;
156
+ let best = null;
157
+ const walk = (v, path, next) => {
158
+ if (v === lat.final) {
159
+ if (path.length < MIN_LEN)
160
+ return;
161
+ const positions = selectPositions(path, t, boundaries);
162
+ if (positions === null)
163
+ return;
164
+ const intraScore = scoreFromPositions(positions, path.length, t.length, boundaries);
165
+ if (best === null || intraScore > best.intraScore)
166
+ best = { intraScore, positions };
167
+ return;
168
+ }
169
+ for (let k = lat.outStart[v]; k < lat.outStart[v + 1]; k++) {
170
+ const e = lat.outEdges[k];
171
+ const c = lat.ch[e];
172
+ const at = t.indexOf(c, next);
173
+ if (at >= 0)
174
+ walk(lat.to[e], path + c, at + 1);
175
+ }
176
+ };
177
+ walk(0, '', 0);
178
+ return best;
179
+ }
143
180
  export const tier2Flexible = (q, e) => {
144
181
  let best = null;
145
182
  // 評価順 かな > 訓令 > ヘボン。strict > で同点は先順位が残る(spec 5章)
@@ -156,7 +193,14 @@ export const tier2Flexible = (q, e) => {
156
193
  if (best === null || intraScore > best.intraScore)
157
194
  best = { intraScore, space, positions };
158
195
  };
159
- consider(q.kana, q.kanaMask, e.kana.text, e.kanaMask, e.kanaBoundaries, 'kana');
196
+ if (q.lattice !== null && e.hasKeystrokeChar) {
197
+ const r = latticeBest(q.lattice, e.kana.text, e.kanaMask, e.kanaBoundaries, q.singleChar);
198
+ if (r !== null)
199
+ best = { intraScore: r.intraScore, space: 'kana', positions: r.positions };
200
+ }
201
+ else if (!q.shadowed) {
202
+ consider(q.kana, q.kanaMask, e.kana.text, e.kanaMask, e.kanaBoundaries, 'kana');
203
+ }
160
204
  if (e.kunrei)
161
205
  consider(q.kunrei, q.kunreiMask, e.kunrei.text, e.kunreiMask, e.kunrei.boundaries, 'kunrei');
162
206
  if (e.hepburn)
@@ -1 +1 @@
1
- {"version":3,"file":"tier2-flexible.js","sourceRoot":"","sources":["../../src/tiers/tier2-flexible.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tier2-flexible.js","sourceRoot":"","sources":["../../src/tiers/tier2-flexible.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"tier3-typo.d.ts","sourceRoot":"","sources":["../../src/tiers/tier3-typo.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,YAAY,CAAC;AAwEjD,eAAO,MAAM,SAAS,EAAE,OAsBvB,CAAC"}
1
+ {"version":3,"file":"tier3-typo.d.ts","sourceRoot":"","sources":["../../src/tiers/tier3-typo.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAS,MAAM,YAAY,CAAC;AAoKjD,eAAO,MAAM,SAAS,EAAE,OA2BvB,CAAC"}