@peaske7/readit 0.1.8 → 0.2.0

package/src/lib/highlight/resolver.ts

@@ -0,0 +1,112 @@
+import type { HighlightComment, TextPosition } from "./types";
+
+export function findTextPosition(
+  textContent: string,
+  selectedText: string,
+  hintOffset?: number,
+): TextPosition | undefined {
+  if (!selectedText || !textContent) return undefined;
+
+  const occurrences: number[] = [];
+  let idx = 0;
+  for (;;) {
+    idx = textContent.indexOf(selectedText, idx);
+    if (idx === -1) break;
+    occurrences.push(idx);
+    idx += 1;
+  }
+
+  if (occurrences.length === 0) return undefined;
+  if (occurrences.length === 1) {
+    return { start: occurrences[0], end: occurrences[0] + selectedText.length };
+  }
+
+  const target = hintOffset ?? 0;
+  let closest = occurrences[0];
+  let minDist = Math.abs(closest - target);
+  for (const occ of occurrences) {
+    const dist = Math.abs(occ - target);
+    if (dist < minDist) {
+      minDist = dist;
+      closest = occ;
+    }
+  }
+  return { start: closest, end: closest + selectedText.length };
+}
+
+export class Resolver {
+  private worker: Worker | null = null;
+  private seq = 0;
+  private pending = new Map<
+    number,
+    (results: Map<string, TextPosition>) => void
+  >();
+
+  constructor() {
+    try {
+      this.worker = new Worker(new URL("./worker.ts", import.meta.url), {
+        type: "module",
+      });
+      this.worker.onmessage = this.onMessage;
+      this.worker.onerror = () => {
+        this.worker?.terminate();
+        this.worker = null;
+      };
+    } catch {
+      this.worker = null;
+    }
+  }
+
+  resolve(
+    text: string,
+    comments: HighlightComment[],
+  ): Promise<Map<string, TextPosition>> {
+    if (!this.worker || comments.length === 0) {
+      return Promise.resolve(this.sync(text, comments));
+    }
+
+    return new Promise((resolve) => {
+      const id = this.seq++;
+      this.pending.set(id, resolve);
+      this.worker!.postMessage({
+        id,
+        textContent: text,
+        comments: comments.map((c) => ({
+          id: c.id,
+          selectedText: c.selectedText,
+          startOffset: c.startOffset,
+        })),
+      });
+    });
+  }
+
+  dispose() {
+    this.worker?.terminate();
+    this.worker = null;
+    for (const resolve of this.pending.values()) resolve(new Map());
+    this.pending.clear();
+  }
+
+  private onMessage = (e: MessageEvent) => {
+    const { id, results } = e.data;
+    const resolve = this.pending.get(id);
+    if (!resolve) return;
+
+    this.pending.delete(id);
+    const map = new Map<string, TextPosition>();
+    for (const r of results) map.set(r.id, { start: r.start, end: r.end });
+    resolve(map);
+  };
+
+  private sync(
+    text: string,
+    comments: HighlightComment[],
+  ): Map<string, TextPosition> {
+    const map = new Map<string, TextPosition>();
+    for (const c of comments) {
+      const pos = findTextPosition(text, c.selectedText, c.startOffset);
+      if (pos) map.set(c.id, pos);
+    }
+    return map;
+  }
+}

package/src/lib/highlight/types.ts

@@ -1,34 +1,13 @@
-/**
- * Shared types for the highlighting system.
- */
-
-/**
- * Style configuration for highlight marks.
- */
 export interface HighlightStyle {
   attribute: string;
   attributeValue: string;
 }
 
-/**
- * Text range with character offsets.
- */
-export interface TextRange {
-  startOffset: number;
-  endOffset: number;
-}
-
-/**
- * Resolved text position in content.
- */
 export interface TextPosition {
   start: number;
   end: number;
 }
 
-/**
- * Comment data needed for highlighting (subset of full Comment type).
- */
 export interface HighlightComment {
   id: string;
   selectedText: string;
@@ -36,20 +15,6 @@ export interface HighlightComment {
   endOffset: number;
 }
 
-/**
- * Highlight positions for margin note alignment and minimap.
- * - positions: Y-position relative to container (for margin notes)
- * - documentPositions: Y-position from document top (for minimap)
- */
-export interface HighlightPositions {
-  positions: Record<string, number>;
-  documentPositions: Record<string, number>;
-  pendingTop?: number;
-}
-
-/**
- * Text node with its cumulative offset range in the document.
- */
 export interface TextNodeInfo {
   node: Text;
   start: number;

package/src/lib/highlight/worker.ts

@@ -0,0 +1,45 @@
+// Inlined to avoid module import issues in Worker context
+function find(
+  text: string,
+  needle: string,
+  hint?: number,
+): { start: number; end: number } | undefined {
+  if (!needle || !text) return undefined;
+
+  const hits: number[] = [];
+  let i = 0;
+  for (;;) {
+    i = text.indexOf(needle, i);
+    if (i === -1) break;
+    hits.push(i);
+    i += 1;
+  }
+
+  if (hits.length === 0) return undefined;
+  if (hits.length === 1)
+    return { start: hits[0], end: hits[0] + needle.length };
+
+  const target = hint ?? 0;
+  let best = hits[0];
+  let bestDist = Math.abs(best - target);
+  for (const h of hits) {
+    const d = Math.abs(h - target);
+    if (d < bestDist) {
+      bestDist = d;
+      best = h;
+    }
+  }
+  return { start: best, end: best + needle.length };
+}
+
+self.onmessage = (e: MessageEvent) => {
+  const { id, textContent, comments } = e.data;
+  const results: { id: string; start: number; end: number }[] = [];
+
+  for (const c of comments) {
+    const pos = find(textContent, c.selectedText, c.startOffset);
+    if (pos) results.push({ id: c.id, ...pos });
+  }
+
+  self.postMessage({ id, results });
+};

package/src/lib/i18n/en.ts

@@ -13,14 +13,9 @@ export const en: Translations = {
 
   // Actions menu
   "actions.ariaLabel": "Actions menu",
-  "actions.centered": "Centered",
-  "actions.fullscreen": "Fullscreen",
   "actions.settings": "Settings",
   "actions.reload": "Reload",
-  "actions.copyAllAI": "Copy All (AI)",
-  "actions.copyAllAITitle": "Copy in prompt format for AI assistants",
-  "actions.copyAllRaw": "Copy All (Raw)",
-  "actions.copyAllRawTitle": "Copy as plain text",
+  "actions.copyAll": "Copy All",
   "actions.exportJson": "Export JSON",
   "actions.viewRaw": "View Raw",
 
@@ -29,37 +24,23 @@ export const en: Translations = {
   "settings.theme": "Theme",
   "settings.font": "Font",
   "settings.language": "Language",
-  "settings.keyboardShortcuts": "Keyboard Shortcuts",
-  "settings.clickToRebind": "Click a key to rebind",
   "settings.theme.system": "System",
   "settings.theme.light": "Light",
   "settings.theme.dark": "Dark",
   "settings.font.serif": "Serif",
   "settings.font.sansSerif": "Sans-serif",
-  "settings.editor": "Editor",
-  "settings.editor.none": "None",
-  "settings.editor.vscode": "VS Code",
-  "settings.editor.vscodeInsiders": "VS Code Insiders",
-  "settings.editor.cursor": "Cursor",
 
   // Comment input
   "comment.placeholder": "Add your comment...",
   "comment.cancel": "Cancel",
   "comment.addNote": "Add Note",
   "comment.highlight": "Highlight",
-  "comment.copyRawTitle": "Copy raw text (⌘C)",
-  "comment.copyRawLabel": "Copy raw text",
-  "comment.copyLLMTitle": "Copy with context for LLM (⌘⇧C)",
-  "comment.copyLLMLabel": "Copy for LLM",
 
   // Margin note
   "marginNote.addNote": "Add note",
   "marginNote.delete": "Delete",
   "marginNote.edit": "Edit",
   "marginNote.copy": "Copy",
-  "marginNote.copyTitle": "Copy raw text (⌘C)",
-  "marginNote.llm": "LLM",
-  "marginNote.llmTitle": "Copy with context for LLM (⌘⇧C)",
 
   // Comment manager
   "commentManager.unresolved": "unresolved",
@@ -99,39 +80,9 @@ export const en: Translations = {
   "rawModal.copiedToClipboard": "Copied to clipboard",
   "rawModal.failedToCopy": "Failed to copy",
 
-  // Shortcut groups
-  "shortcutGroup.copy": "Copy",
-  "shortcutGroup.navigate": "Navigate",
-  "shortcutGroup.other": "Other",
-  "shortcuts.resetToDefaults": "Reset to defaults",
-  "shortcuts.enableDisable": "Enable/disable shortcut",
-  "shortcutCapture.pressKeys": "Press keys...",
-
-  // Shortcut labels
-  "shortcut.copyAll.label": "Copy All (AI)",
-  "shortcut.copyAll.description": "Copy all comments in AI prompt format",
-  "shortcut.copyAllRaw.label": "Copy All (Raw)",
-  "shortcut.copyAllRaw.description": "Copy all comments as raw text",
-  "shortcut.navigateNext.label": "Next Comment",
-  "shortcut.navigateNext.description": "Navigate to next comment",
-  "shortcut.navigatePrevious.label": "Previous Comment",
-  "shortcut.navigatePrevious.description": "Navigate to previous comment",
-  "shortcut.copySelectionRaw.label": "Copy Selection",
-  "shortcut.copySelectionRaw.description": "Copy selected text",
-  "shortcut.copySelectionLLM.label": "Copy Selection (LLM)",
-  "shortcut.copySelectionLLM.description":
-    "Copy selected text with context for LLM",
-  "shortcut.clearSelection.label": "Clear Selection",
-  "shortcut.clearSelection.description": "Clear text selection",
-
   // Toast messages
   "toast.copied": 'Copied: "{{text}}"',
-  "toast.copiedForLLM": 'Copied for LLM: "{{text}}"',
   "toast.copiedAllComments": "Copied all comments",
-  "toast.copiedAllRaw": "Copied all comments as raw text",
-
-  // Floating TOC
-  "floatingTOC.label": "Table of Contents",
 
   // Comment badge
   "commentBadge.title": "{{count}} comment",

package/src/lib/i18n/ja.ts

@@ -13,14 +13,9 @@ export const ja: Translations = {
 
   // Actions menu
   "actions.ariaLabel": "操作メニュー",
-  "actions.centered": "中央揃え",
-  "actions.fullscreen": "全画面",
   "actions.settings": "設定",
   "actions.reload": "再読み込み",
-  "actions.copyAllAI": "全てコピー (AI)",
-  "actions.copyAllAITitle": "AIアシスタント用プロンプト形式でコピー",
-  "actions.copyAllRaw": "全てコピー (テキスト)",
-  "actions.copyAllRawTitle": "プレーンテキストとしてコピー",
+  "actions.copyAll": "全てコピー",
   "actions.exportJson": "JSONエクスポート",
   "actions.viewRaw": "生データを表示",
 
@@ -29,37 +24,23 @@ export const ja: Translations = {
   "settings.theme": "テーマ",
   "settings.font": "フォント",
   "settings.language": "言語",
-  "settings.keyboardShortcuts": "キーボードショートカット",
-  "settings.clickToRebind": "キーをクリックして変更",
   "settings.theme.system": "システム",
   "settings.theme.light": "ライト",
   "settings.theme.dark": "ダーク",
   "settings.font.serif": "明朝体",
   "settings.font.sansSerif": "ゴシック体",
-  "settings.editor": "エディター",
-  "settings.editor.none": "なし",
-  "settings.editor.vscode": "VS Code",
-  "settings.editor.vscodeInsiders": "VS Code Insiders",
-  "settings.editor.cursor": "Cursor",
 
   // Comment input
   "comment.placeholder": "コメントを入力...",
   "comment.cancel": "キャンセル",
   "comment.addNote": "メモを追加",
   "comment.highlight": "ハイライト",
-  "comment.copyRawTitle": "テキストをコピー (⌘C)",
-  "comment.copyRawLabel": "テキストをコピー",
-  "comment.copyLLMTitle": "LLM用にコンテキスト付きでコピー (⌘⇧C)",
-  "comment.copyLLMLabel": "LLM用にコピー",
 
   // Margin note
   "marginNote.addNote": "メモを追加",
   "marginNote.delete": "削除",
   "marginNote.edit": "編集",
   "marginNote.copy": "コピー",
-  "marginNote.copyTitle": "テキストをコピー (⌘C)",
-  "marginNote.llm": "LLM",
-  "marginNote.llmTitle": "LLM用にコンテキスト付きでコピー (⌘⇧C)",
 
   // Comment manager
   "commentManager.unresolved": "未解決",
@@ -101,39 +82,9 @@ export const ja: Translations = {
   "rawModal.copiedToClipboard": "クリップボードにコピーしました",
   "rawModal.failedToCopy": "コピーに失敗しました",
 
-  // Shortcut groups
-  "shortcutGroup.copy": "コピー",
-  "shortcutGroup.navigate": "ナビゲーション",
-  "shortcutGroup.other": "その他",
-  "shortcuts.resetToDefaults": "初期設定に戻す",
-  "shortcuts.enableDisable": "ショートカットの有効/無効",
-  "shortcutCapture.pressKeys": "キーを入力...",
-
-  // Shortcut labels
-  "shortcut.copyAll.label": "全てコピー (AI)",
-  "shortcut.copyAll.description": "全コメントをAIプロンプト形式でコピー",
-  "shortcut.copyAllRaw.label": "全てコピー (テキスト)",
-  "shortcut.copyAllRaw.description": "全コメントをテキストとしてコピー",
-  "shortcut.navigateNext.label": "次のコメント",
-  "shortcut.navigateNext.description": "次のコメントに移動",
-  "shortcut.navigatePrevious.label": "前のコメント",
-  "shortcut.navigatePrevious.description": "前のコメントに移動",
-  "shortcut.copySelectionRaw.label": "選択をコピー",
-  "shortcut.copySelectionRaw.description": "選択テキストをコピー",
-  "shortcut.copySelectionLLM.label": "選択をコピー (LLM)",
-  "shortcut.copySelectionLLM.description":
-    "選択テキストをLLM用コンテキスト付きでコピー",
-  "shortcut.clearSelection.label": "選択を解除",
-  "shortcut.clearSelection.description": "テキスト選択を解除",
-
   // Toast messages
   "toast.copied": 'コピーしました: "{{text}}"',
-  "toast.copiedForLLM": 'LLM用にコピーしました: "{{text}}"',
   "toast.copiedAllComments": "全てのコメントをコピーしました",
-  "toast.copiedAllRaw": "全てのコメントをテキストとしてコピーしました",
-
-  // Floating TOC
-  "floatingTOC.label": "目次",
 
   // Comment badge
   "commentBadge.title": "{{count}}件のコメント",

package/src/lib/i18n/types.ts

@@ -18,14 +18,9 @@ export interface Translations {
 
   // Actions menu
   "actions.ariaLabel": string;
-  "actions.centered": string;
-  "actions.fullscreen": string;
   "actions.settings": string;
   "actions.reload": string;
-  "actions.copyAllAI": string;
-  "actions.copyAllAITitle": string;
-  "actions.copyAllRaw": string;
-  "actions.copyAllRawTitle": string;
+  "actions.copyAll": string;
   "actions.exportJson": string;
   "actions.viewRaw": string;
 
@@ -34,37 +29,23 @@ export interface Translations {
   "settings.theme": string;
   "settings.font": string;
   "settings.language": string;
-  "settings.keyboardShortcuts": string;
-  "settings.clickToRebind": string;
   "settings.theme.system": string;
   "settings.theme.light": string;
   "settings.theme.dark": string;
   "settings.font.serif": string;
   "settings.font.sansSerif": string;
-  "settings.editor": string;
-  "settings.editor.none": string;
-  "settings.editor.vscode": string;
-  "settings.editor.vscodeInsiders": string;
-  "settings.editor.cursor": string;
 
   // Comment input
   "comment.placeholder": string;
   "comment.cancel": string;
   "comment.addNote": string;
   "comment.highlight": string;
-  "comment.copyRawTitle": string;
-  "comment.copyRawLabel": string;
-  "comment.copyLLMTitle": string;
-  "comment.copyLLMLabel": string;
 
   // Margin note
   "marginNote.addNote": string;
   "marginNote.delete": string;
   "marginNote.edit": string;
   "marginNote.copy": string;
-  "marginNote.copyTitle": string;
-  "marginNote.llm": string;
-  "marginNote.llmTitle": string;
 
   // Comment manager
   "commentManager.unresolved": string;
@@ -104,38 +85,9 @@ export interface Translations {
   "rawModal.copiedToClipboard": string;
   "rawModal.failedToCopy": string;
 
-  // Shortcut groups
-  "shortcutGroup.copy": string;
-  "shortcutGroup.navigate": string;
-  "shortcutGroup.other": string;
-  "shortcuts.resetToDefaults": string;
-  "shortcuts.enableDisable": string;
-  "shortcutCapture.pressKeys": string;
-
-  // Shortcut labels (rendered in ShortcutList)
-  "shortcut.copyAll.label": string;
-  "shortcut.copyAll.description": string;
-  "shortcut.copyAllRaw.label": string;
-  "shortcut.copyAllRaw.description": string;
-  "shortcut.navigateNext.label": string;
-  "shortcut.navigateNext.description": string;
-  "shortcut.navigatePrevious.label": string;
-  "shortcut.navigatePrevious.description": string;
-  "shortcut.copySelectionRaw.label": string;
-  "shortcut.copySelectionRaw.description": string;
-  "shortcut.copySelectionLLM.label": string;
-  "shortcut.copySelectionLLM.description": string;
-  "shortcut.clearSelection.label": string;
-  "shortcut.clearSelection.description": string;
-
   // Toast messages
   "toast.copied": string;
-  "toast.copiedForLLM": string;
   "toast.copiedAllComments": string;
-  "toast.copiedAllRaw": string;
-
-  // Floating TOC
-  "floatingTOC.label": string;
 
   // Comment badge
   "commentBadge.title": string;

package/src/lib/margin-layout.ts

@@ -1,7 +1,5 @@
-import {
-  COMMENT_INPUT_HEIGHT_PX,
-  MARGIN_NOTE_MIN_GAP_PX,
-} from "./layout-constants";
+const MARGIN_NOTE_MIN_GAP_PX = 150;
+const COMMENT_INPUT_HEIGHT_PX = 160;
 
 interface NotePosition {
   commentId: string;
@@ -10,18 +8,7 @@ interface NotePosition {
 
 /**
  * Resolves margin note positions to avoid overlaps.
- *
- * Algorithm:
- * 1. Build initial positions from highlight positions
- * 2. Handle input zone collision (push notes up or down to avoid input)
- * 3. Resolve note-to-note overlaps:
- *    - Pass 1: Notes above input zone → push UP
- *    - Pass 2: Notes at/below input zone → push DOWN
- *
- * @param commentIds - Comment IDs in document order (sorted by startOffset)
- * @param highlightPositions - Map of comment ID to top position
- * @param pendingSelectionTop - Top position of input zone (if any)
- * @returns Map of comment ID to resolved top position
+ * Pass 1: push notes above input zone UP. Pass 2: push notes at/below DOWN.
  */
 export function resolveMarginNotePositions(
   commentIds: string[],
@@ -36,10 +23,8 @@ export function resolveMarginNotePositions(
       top: highlightPositions[id],
     }));
 
-  // Sort by top position
   positions.sort((a, b) => a.top - b.top);
 
-  // Handle input zone collision - check visual overlap, not just top position
   if (pendingSelectionTop !== null && pendingSelectionTop !== undefined) {
     const inputStart = pendingSelectionTop;
     const inputEnd = pendingSelectionTop + COMMENT_INPUT_HEIGHT_PX;
@@ -47,48 +32,41 @@ export function resolveMarginNotePositions(
     for (const pos of positions) {
       const noteBottom = pos.top + MARGIN_NOTE_MIN_GAP_PX;
 
-      // Check if note visually overlaps with input zone
       const overlaps = noteBottom > inputStart && pos.top < inputEnd;
 
       if (overlaps) {
         if (pos.top < inputStart) {
-          // Note is above input but overlaps - push UP
           pos.top = Math.max(0, inputStart - MARGIN_NOTE_MIN_GAP_PX);
         } else {
-          // Note is within/below input zone - push DOWN
           pos.top = inputEnd;
         }
       }
     }
-    // Re-sort after potential position changes
     positions.sort((a, b) => a.top - b.top);
   }
 
-  // Resolve note-to-note overlaps
   const inputStartForOverlap = pendingSelectionTop ?? Infinity;
   const inputEndForOverlap =
     pendingSelectionTop != null
       ? pendingSelectionTop + COMMENT_INPUT_HEIGHT_PX
       : Infinity;
 
-  // Pass 1: Notes ABOVE input - resolve by pushing UP (bottom to top)
+  // Pass 1: push notes above input UP (bottom to top)
   for (let i = positions.length - 2; i >= 0; i--) {
     const curr = positions[i];
     const next = positions[i + 1];
-    // Only process if next note is above the input zone
     if (next.top >= inputStartForOverlap) continue;
     if (next.top - curr.top < MARGIN_NOTE_MIN_GAP_PX) {
       curr.top = Math.max(0, next.top - MARGIN_NOTE_MIN_GAP_PX);
     }
   }
 
-  // Pass 2: Notes at/below input - resolve by pushing DOWN (top to bottom)
+  // Pass 2: push notes at/below input DOWN (top to bottom)
   for (let i = 1; i < positions.length; i++) {
     const prev = positions[i - 1];
     const curr = positions[i];
     if (curr.top - prev.top < MARGIN_NOTE_MIN_GAP_PX) {
       let newTop = prev.top + MARGIN_NOTE_MIN_GAP_PX;
-      // If new position lands in input zone, skip to below input
       if (newTop >= inputStartForOverlap && newTop < inputEndForOverlap) {
         newTop = inputEndForOverlap;
       }