Add a StrippedLocation interface and pipe it through the CommentEnhancers.

nedtwigg · nedtwigg · commit e1d1e7ef3086 · 2025-09-17T14:43:58.000-07:00
diff --git a/browser-extension/src/lib/enhancer.ts b/browser-extension/src/lib/enhancer.ts
@@ -19,6 +19,15 @@ export interface CommentEvent {
   draft?: string
 }
 
+/**
+ * Minimal location information that enhancers need for routing decisions.
+ * Avoids dependency on global window/location objects for better testability.
+ */
+export interface StrippedLocation {
+  domain: string
+  pathname: string
+}
+
 /** Wraps the textareas of a given platform with Gitcasso's enhancements. */
 export interface CommentEnhancer<Spot extends CommentSpot = CommentSpot> {
   /** Guarantees to only return a type within this list. */
@@ -27,7 +36,7 @@ export interface CommentEnhancer<Spot extends CommentSpot = CommentSpot> {
    * Whenever a new `textarea` is added to any webpage, this method is called.
    * If we return non-null, then we become the handler for that text area.
    */
-  tryToEnhance(textarea: HTMLTextAreaElement): Spot | null
+  tryToEnhance(textarea: HTMLTextAreaElement, location: StrippedLocation): Spot | null
   /** This gets called the first time that `tryToEnhance` returns non-null. */
   prepareForFirstEnhancement(): void
   /**
diff --git a/browser-extension/src/lib/enhancers/CommentEnhancerMissing.tsx b/browser-extension/src/lib/enhancers/CommentEnhancerMissing.tsx
@@ -1,6 +1,6 @@
 import type { OverTypeInstance } from 'overtype'
 import type { ReactNode } from 'react'
-import type { CommentEnhancer, CommentSpot } from '../enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '../enhancer'
 
 /** Used when an entry is in the table which we don't recognize. */
 export class CommentEnhancerMissing implements CommentEnhancer {
@@ -40,7 +40,7 @@ export class CommentEnhancerMissing implements CommentEnhancer {
   forSpotTypes(): string[] {
     throw new Error('Method not implemented.')
   }
-  tryToEnhance(_textarea: HTMLTextAreaElement): CommentSpot | null {
+  tryToEnhance(_textarea: HTMLTextAreaElement, _location: StrippedLocation): CommentSpot | null {
     throw new Error('Method not implemented.')
   }
   prepareForFirstEnhancement(): void {
diff --git a/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx b/browser-extension/src/lib/enhancers/github/githubIssueAddComment.tsx
@@ -1,7 +1,7 @@
 import { IssueOpenedIcon } from '@primer/octicons-react'
 import OverType, { type OverTypeInstance } from 'overtype'
 import type React from 'react'
-import type { CommentEnhancer, CommentSpot } from '@/lib/enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '@/lib/enhancer'
 import { logger } from '@/lib/logger'
 import { modifyDOM } from '../modifyDOM'
 import { commonGithubOptions } from './ghOptions'
@@ -20,19 +20,22 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
     return ['GH_ISSUE_ADD_COMMENT']
   }
 
-  tryToEnhance(textarea: HTMLTextAreaElement): GitHubIssueAddCommentSpot | null {
+  tryToEnhance(
+    textarea: HTMLTextAreaElement,
+    location: StrippedLocation,
+  ): GitHubIssueAddCommentSpot | null {
     if (textarea.id === 'feedback') {
       return null
     }
-    if (document.querySelector('meta[name="hostname"]')?.getAttribute('content') !== 'github.com') {
+    if (location.domain !== 'github.com') {
       return null
     }
 
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
-    logger.debug(`${this.constructor.name} examing url`, window.location.pathname)
+    logger.debug(`${this.constructor.name} examing url`, location.pathname)
 
-    const match = window.location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/issues\/(\d+))/)
-    logger.debug(`${this.constructor.name} found match`, window.location.pathname)
+    const match = location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/issues\/(\d+))/)
+    logger.debug(`${this.constructor.name} found match`, location.pathname)
     if (!match) return null
 
     const [, owner, repo, numberStr] = match
@@ -41,7 +44,7 @@ export class GitHubIssueAddCommentEnhancer implements CommentEnhancer<GitHubIssu
     const unique_key = `github.com:${slug}:${number}`
     const title = 'TODO_TITLE'
     return {
-      domain: 'github.com',
+      domain: location.domain,
       number,
       slug,
       title,
diff --git a/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx b/browser-extension/src/lib/enhancers/github/githubIssueNewComment.tsx
@@ -1,5 +1,5 @@
 import OverType, { type OverTypeInstance } from 'overtype'
-import type { CommentEnhancer, CommentSpot } from '../../enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '../../enhancer'
 import { logger } from '../../logger'
 import { modifyDOM } from '../modifyDOM'
 import { commonGithubOptions } from './ghOptions'
@@ -16,23 +16,26 @@ export class GitHubIssueNewCommentEnhancer implements CommentEnhancer<GitHubIssu
     return ['GH_ISSUE_NEW_COMMENT']
   }
 
-  tryToEnhance(_textarea: HTMLTextAreaElement): GitHubIssueNewCommentSpot | null {
-    if (document.querySelector('meta[name="hostname"]')?.getAttribute('content') !== 'github.com') {
+  tryToEnhance(
+    _textarea: HTMLTextAreaElement,
+    location: StrippedLocation,
+  ): GitHubIssueNewCommentSpot | null {
+    if (location.domain !== 'github.com') {
       return null
     }
 
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
-    logger.debug(`${this.constructor.name} examing url`, window.location.pathname)
+    logger.debug(`${this.constructor.name} examing url`, location.pathname)
 
-    const match = window.location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/issues\/new)/)
-    logger.debug(`${this.constructor.name} found match`, window.location.pathname)
+    const match = location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/issues\/new)/)
+    logger.debug(`${this.constructor.name} found match`, location.pathname)
 
     if (!match) return null
     const [, owner, repo] = match
     const slug = `${owner}/${repo}`
     const unique_key = `github.com:${slug}:new`
     return {
-      domain: 'github.com',
+      domain: location.domain,
       slug,
       type: 'GH_ISSUE_NEW_COMMENT',
       unique_key,
diff --git a/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx b/browser-extension/src/lib/enhancers/github/githubPRAddComment.tsx
@@ -1,6 +1,6 @@
 import OverType, { type OverTypeInstance } from 'overtype'
 import type React from 'react'
-import type { CommentEnhancer, CommentSpot } from '@/lib/enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '@/lib/enhancer'
 import { logger } from '@/lib/logger'
 import { modifyDOM } from '../modifyDOM'
 import { commonGithubOptions } from './ghOptions'
@@ -19,28 +19,28 @@ export class GitHubPRAddCommentEnhancer implements CommentEnhancer<GitHubPRAddCo
     return ['GH_PR_ADD_COMMENT']
   }
 
-  tryToEnhance(_textarea: HTMLTextAreaElement): GitHubPRAddCommentSpot | null {
+  tryToEnhance(
+    _textarea: HTMLTextAreaElement,
+    location: StrippedLocation,
+  ): GitHubPRAddCommentSpot | null {
     // Only handle github.com domains TODO: identify GitHub Enterprise somehow
-    if (
-      document.querySelector('meta[name="hostname"]')?.getAttribute('content') !== 'github.com' ||
-      _textarea.id !== 'new_comment_field'
-    ) {
+    if (location.domain !== 'github.com' || _textarea.id !== 'new_comment_field') {
       return null
     }
 
     // Parse GitHub URL structure: /owner/repo/issues/123 or /owner/repo/pull/456
-    logger.debug(`${this.constructor.name} examing url`, window.location.pathname)
+    logger.debug(`${this.constructor.name} examing url`, location.pathname)
 
-    const match = window.location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/pull\/(\d+))/)
-    logger.debug(`${this.constructor.name} found match`, window.location.pathname)
+    const match = location.pathname.match(/^\/([^/]+)\/([^/]+)(?:\/pull\/(\d+))/)
+    logger.debug(`${this.constructor.name} found match`, location.pathname)
     if (!match) return null
     const [, owner, repo, numberStr] = match
     const slug = `${owner}/${repo}`
     const number = parseInt(numberStr!, 10)
     const unique_key = `github.com:${slug}:${number}`
     const title = 'TODO_TITLE'
     return {
-      domain: 'github.com',
+      domain: location.domain,
       number,
       slug,
       title,
diff --git a/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx b/browser-extension/src/lib/enhancers/github/githubPRNewComment.tsx
@@ -1,5 +1,5 @@
 import OverType, { type OverTypeInstance } from 'overtype'
-import type { CommentEnhancer, CommentSpot } from '../../enhancer'
+import type { CommentEnhancer, CommentSpot, StrippedLocation } from '../../enhancer'
 import { logger } from '../../logger'
 import { modifyDOM } from '../modifyDOM'
 import { commonGithubOptions } from './ghOptions'
@@ -16,22 +16,25 @@ export class GitHubPRNewCommentEnhancer implements CommentEnhancer<GitHubPRNewCo
     return ['GH_PR_NEW_COMMENT']
   }
 
-  tryToEnhance(textarea: HTMLTextAreaElement): GitHubPRNewCommentSpot | null {
+  tryToEnhance(
+    textarea: HTMLTextAreaElement,
+    location: StrippedLocation,
+  ): GitHubPRNewCommentSpot | null {
     if (textarea.id === 'feedback') {
       return null
     }
-    if (document.querySelector('meta[name="hostname"]')?.getAttribute('content') !== 'github.com') {
+    if (location.domain !== 'github.com') {
       return null
     }
 
     // /owner/repo/compare/feature/more-enhancers?expand=1
     // or /owner/repo/compare/feat/issue-static-and-dynamic...feature/more-enhancers?expand=1
-    logger.info(`${this.constructor.name} examing url`, window.location.pathname)
+    logger.info(`${this.constructor.name} examing url`, location.pathname)
 
-    const match = window.location.pathname.match(
+    const match = location.pathname.match(
       /^\/([^/]+)\/([^/]+)\/compare\/(?:([^.?]+)\.\.\.)?([^?]+)/,
     )
-    logger.info(`${this.constructor.name} found match`, window.location.pathname, match)
+    logger.info(`${this.constructor.name} found match`, location.pathname, match)
 
     if (!match) return null
     const [, owner, repo, baseBranch, compareBranch] = match
@@ -40,7 +43,7 @@ export class GitHubPRNewCommentEnhancer implements CommentEnhancer<GitHubPRNewCo
       : `${owner}/${repo}/${compareBranch}`
     const unique_key = `github.com:${slug}`
     return {
-      domain: 'github.com',
+      domain: location.domain,
       slug,
       type: 'GH_PR_NEW_COMMENT',
       unique_key,
