Refactor around just sendEvent

Author: nedtwigg

src/entrypoints/content.ts

@@ -1,4 +1,4 @@
-import type { CommentEvent, CommentSpot, StrippedLocation } from '../lib/enhancer'
+import type { CommentEvent, StrippedLocation } from '../lib/enhancer'
 import { logger } from '../lib/logger'
 import { EnhancerRegistry, TextareaRegistry } from '../lib/registries'
 
@@ -20,27 +20,13 @@ function detectLocation(): StrippedLocation {
   return result
 }
 
-function sendEventToBackground(
-  type: 'ENHANCED' | 'DESTROYED',
-  spot: CommentSpot,
-  draft: string,
-): void {
-  const message: CommentEvent = {
-    draft,
-    spot,
-    type,
-  }
+function sendEventToBackground(message: CommentEvent): void {
   browser.runtime.sendMessage(message).catch((error) => {
     logger.error('Failed to send event to background:', error)
   })
 }
 
-enhancedTextareas.setEventHandlers(
-  (textareaInfo) =>
-    sendEventToBackground('ENHANCED', textareaInfo.spot, textareaInfo.textarea.value),
-  (textareaInfo) =>
-    sendEventToBackground('DESTROYED', textareaInfo.spot, textareaInfo.textarea.value),
-)
+enhancedTextareas.setCommentEventSender(sendEventToBackground)
 
 export default defineContentScript({
   main() {

src/lib/registries.ts

@@ -1,6 +1,6 @@
 import type { OverTypeInstance } from 'overtype'
 import OverType from 'overtype'
-import type { CommentEnhancer, CommentSpot, StrippedLocation } from './enhancer'
+import type { CommentEnhancer, CommentEvent, CommentSpot, StrippedLocation } from './enhancer'
 import { CommentEnhancerMissing } from './enhancers/CommentEnhancerMissing'
 import { GitHubEditEnhancer } from './enhancers/github/GitHubEditEnhancer'
 import { GitHubIssueAppendEnhancer } from './enhancers/github/GitHubIssueAppendEnhancer'
@@ -104,12 +104,19 @@ export class TextareaRegistry {
   private onEnhanced?: (textareaInfo: EnhancedTextarea) => void
   private onDestroyed?: (textareaInfo: EnhancedTextarea) => void
 
-  setEventHandlers(
-    onEnhanced: (textareaInfo: EnhancedTextarea) => void,
-    onDestroyed: (textareaInfo: EnhancedTextarea) => void,
-  ): void {
-    this.onEnhanced = onEnhanced
-    this.onDestroyed = onDestroyed
+  setCommentEventSender(sendEvent: (event: CommentEvent) => void): void {
+    this.onEnhanced = (textareaInfo) =>
+      sendEvent({
+        draft: textareaInfo.textarea.value,
+        spot: textareaInfo.spot,
+        type: 'ENHANCED',
+      })
+    this.onDestroyed = (textareaInfo) =>
+      sendEvent({
+        draft: textareaInfo.textarea.value,
+        spot: textareaInfo.spot,
+        type: 'DESTROYED',
+      })
   }
 
   register<T extends CommentSpot>(textareaInfo: EnhancedTextarea<T>): void {