Move interfaces around.

Author: nedtwigg

browser-extension/src/entrypoints/background.ts

@@ -1,4 +1,5 @@
 import type { CommentEvent, CommentSpot } from '@/lib/enhancer'
+import type { DraftStats } from '@/lib/enhancers/draftStats'
 import type { GetOpenSpotsResponse, ToBackgroundMessage } from '@/lib/messages'
 import {
   CLOSE_MESSAGE_PORT,
@@ -17,6 +18,18 @@ export interface CommentState {
   spot: CommentSpot
   drafts: [number, string][]
 }
+interface Draft {
+  content: string
+  time: number
+  stats: DraftStats
+}
+export interface CommentTableRow {
+  spot: CommentSpot,
+  latestDraft: Draft
+  isOpenTab: boolean
+  isSent: boolean
+  isTrashed: boolean
+}
 
 export const openSpots = new Map<string, CommentState>()
 
@@ -52,6 +65,7 @@ export function handlePopupMessage(
 ): typeof CLOSE_MESSAGE_PORT | typeof KEEP_PORT_OPEN {
   if (isGetOpenSpotsMessage(message)) {
     const spots: CommentState[] = Array.from(openSpots.values())
+
     const response: GetOpenSpotsResponse = { spots }
     sendResponse(response)
     return KEEP_PORT_OPEN

browser-extension/tests/playground/claude.tsx

@@ -18,11 +18,12 @@ import {
 import { useMemo, useState } from 'react'
 import { twMerge } from 'tailwind-merge'
 import {
-  type CommentTableRow,
   generateMockDrafts,
-  isGitHubDraft,
-  isRedditDraft,
+  RedditSpot
 } from './replicaData'
+import type { CommentTableRow } from '@/entrypoints/background'
+import { CommentSpot } from '@/lib/enhancer'
+import { GitHubIssueAddCommentSpot } from '@/lib/enhancers/github/githubIssueAddComment'
 
 interface FilterState {
   sentFilter: 'both' | 'sent' | 'unsent'
@@ -151,7 +152,7 @@ const MultiSegment = <T,>({ segments, value, onValueChange }: MultiSegmentProps<
 }
 
 // Helper function for relative time
-const timeAgo = (date: Date | number) => {
+function timeAgo(date: Date | number): string {
   const timestamp = typeof date === 'number' ? date : date.getTime()
   const seconds = Math.floor((Date.now() - timestamp) / 1000)
   const intervals = [
@@ -170,6 +171,26 @@ const timeAgo = (date: Date | number) => {
   return 'just now'
 }
 
+/** Returns all leaf values of an arbitrary object as strings. */
+function* allLeafValues(obj: any, visited = new Set()): Generator<string> {
+  if (visited.has(obj) || obj == null) return
+  if (typeof obj === 'string') yield obj
+  else if (typeof obj === 'number') yield String(obj)
+  else if (typeof obj === 'object') {
+    visited.add(obj)
+    for (const key in obj) {
+      yield* allLeafValues(obj[key], visited)
+    }
+  }
+}
+
+function isGitHubDraft(spot: CommentSpot): spot is GitHubIssueAddCommentSpot {
+  return spot.type === 'GH_PR_ADD_COMMENT' || spot.type === 'GH_ISSUE_ADD_COMMENT'
+}
+function isRedditDraft(spot: CommentSpot): spot is RedditSpot {
+  return spot.type === 'REDDIT'
+}
+
 export const ClaudePrototype = () => {
   const [drafts] = useState(generateMockDrafts())
   const [selectedIds, setSelectedIds] = useState(new Set())
@@ -193,11 +214,14 @@ export const ClaudePrototype = () => {
     }
     if (filters.searchQuery) {
       const query = filters.searchQuery.toLowerCase()
-      filtered = filtered.filter((d) =>
-        [d.spot.title, d.latestDraft.content, (d.spot as any).slug, (d.spot as any).subreddit].some(
-          (value) => value && String(value).toLowerCase().includes(query),
-        ),
-      )
+      filtered = filtered.filter((d) => {
+        for (const value of allLeafValues(d)) {
+          if (value.toLowerCase().includes(query)) {
+            return true // Early exit on first match
+          }
+        }
+        return false
+      })
     }
     // sort by newest
     filtered.sort((a, b) => b.latestDraft.time - a.latestDraft.time)
@@ -442,7 +466,7 @@ function commentRow(
           {/* Title */}
           <div className='flex items-center gap-1'>
             <a href='TODO' className='text-sm font-medium  hover:underline truncate'>
-              {row.spot.title}
+              TODO_title
             </a>
             <Badge type={row.isSent ? 'sent' : 'unsent'} />
             {row.isTrashed && <Badge type='trashed' />}

browser-extension/tests/playground/replicaData.tsx

@@ -1,32 +1,14 @@
 import type { CommentSpot } from '@/lib/enhancer'
-import type { DraftStats } from '@/lib/enhancers/draftStats'
+import type { CommentTableRow } from '@/entrypoints/background'
 import type { GitHubIssueAddCommentSpot } from '@/lib/enhancers/github/githubIssueAddComment'
 import type { GitHubPRAddCommentSpot } from '@/lib/enhancers/github/githubPRAddComment'
 
-interface RedditSpot extends CommentSpot {
+export interface RedditSpot extends CommentSpot {
   title: string
   subreddit: string
   type: 'REDDIT'
 }
-interface Draft {
-  content: string
-  time: number
-  stats: DraftStats
-}
-export interface CommentTableRow {
-  spot: GitHubOrReddit
-  latestDraft: Draft
-  isOpenTab: boolean
-  isSent: boolean
-  isTrashed: boolean
-}
-type GitHubOrReddit = GitHubIssueAddCommentSpot | GitHubPRAddCommentSpot | RedditSpot
-export const isGitHubDraft = (spot: GitHubOrReddit): spot is GitHubIssueAddCommentSpot => {
-  return spot.type === 'GH_PR_ADD_COMMENT' || spot.type === 'GH_ISSUE_ADD_COMMENT'
-}
-export const isRedditDraft = (spot: GitHubOrReddit): spot is RedditSpot => {
-  return spot.type === 'REDDIT'
-}
+
 export const generateMockDrafts = (): CommentTableRow[] => [
   {
     isOpenTab: true,