fix(pattern-extractor): ensure extracted values are strings and handle undefined keys

Author: tonyhu-012

entrypoints/content/components/GmailTools/GmailComposeCard.vue

@@ -484,11 +484,11 @@ const start = async () => {
     // Fallback: try to extract from raw text if structured extraction failed
     if (!optimizedSubject.value) {
       const extractSubjectMatch = extractValueOfKeyByPattern(text, 'subject')
-      if (extractSubjectMatch) optimizedSubject.value = extractSubjectMatch
+      if (extractSubjectMatch && typeof extractSubjectMatch === 'string') optimizedSubject.value = extractSubjectMatch
     }
     if (!optimizedBody.value) {
       const extractBodyMatch = extractValueOfKeyByPattern(text, 'body')
-      if (extractBodyMatch) optimizedBody.value = extractBodyMatch
+      if (extractBodyMatch && typeof extractBodyMatch === 'string') optimizedBody.value = extractBodyMatch
     }
 
     logger.debug('Gmail compose structured response:', {

utils/json/parser/pattern-extractor.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest'
+
+import { extractValueOfKeyByPattern } from './pattern-extractor'
+
+describe('json key-value pattern extractor', () => {
+  it('should extract values correctly', async () => {
+    const testString = JSON.stringify({
+      a: 'this is a test string with a "quote" and a newline\ncharacter',
+      b: 123,
+      c: true,
+      d: null,
+      e: false,
+    })
+    const a = extractValueOfKeyByPattern(testString, 'a')
+    expect(a).toBe('this is a test string with a "quote" and a newline\ncharacter')
+    const b = extractValueOfKeyByPattern(testString, 'b')
+    expect(b).toBe(123)
+    const c = extractValueOfKeyByPattern(testString, 'c')
+    expect(c).toBe(true)
+    const d = extractValueOfKeyByPattern(testString, 'd')
+    expect(d).toBe(null)
+    const e = extractValueOfKeyByPattern(testString, 'e')
+    expect(e).toBe(false)
+    const undefinedKey = extractValueOfKeyByPattern(testString, 'undefinedKey')
+    expect(undefinedKey).toBe(undefined)
+  })
+
+  it('should extract values correctly for pretty-printed JSON', async () => {
+    const testString = JSON.stringify({
+      a: 'this is a test string with a "quote" and a newline\ncharacter',
+      b: 123,
+      c: true,
+      d: null,
+      e: false,
+      f: {
+        nested: 'value',
+      },
+    }, null, 2)
+    const a = extractValueOfKeyByPattern(testString, 'a')
+    expect(a).toBe('this is a test string with a "quote" and a newline\ncharacter')
+    const b = extractValueOfKeyByPattern(testString, 'b')
+    expect(b).toBe(123)
+    const c = extractValueOfKeyByPattern(testString, 'c')
+    expect(c).toBe(true)
+    const d = extractValueOfKeyByPattern(testString, 'd')
+    expect(d).toBe(null)
+    const e = extractValueOfKeyByPattern(testString, 'e')
+    expect(e).toBe(false)
+    const f = extractValueOfKeyByPattern(testString, 'f')
+    expect(f).toEqual(undefined)
+    const nested = extractValueOfKeyByPattern(testString, 'nested')
+    expect(nested).toBe('value')
+  })
+})

utils/json/parser/pattern-extractor.ts

@@ -1,15 +1,28 @@
-export function extractValueOfKeyByPattern(json: string, key: string): string | null {
-  const regex = new RegExp(`"${key}"\\s*:\\s*("(.*?)"|\\d+|true|false|null)`, 'is')
+export function extractRawValueOfKeyByPattern(json: string, key: string): string | undefined {
+  const regex = new RegExp(`"${key}"\\s*:\\s*("(?:\\\\.|[^"\\\\])*"|\\d+|true|false|null)`, 'is')
 
   const match = json.match(regex)
   if (match && match[1]) {
-    let value = match[1].trim()
-    if (value.startsWith('"') && value.endsWith('"')) {
-      value = value.slice(1, -1)
-      const unescapedValue = value.replace(/\\"/g, '"').replace(/\\\\/g, '\\').replace(/\\n/g, '\n')
-      return unescapedValue
-    }
+    const value = match[1].trim()
     return value
   }
-  return null
+  return undefined
+}
+
+type JSONValue = string | number | boolean | null
+
+export function extractValueOfKeyByPattern(json: string, key: string): JSONValue | undefined {
+  const rawValue = extractRawValueOfKeyByPattern(json, key)
+  if (rawValue === null) return null
+
+  if (rawValue === 'true') return true
+  if (rawValue === 'false') return false
+  if (rawValue === 'null') return null
+  if (!isNaN(Number(rawValue))) return Number(rawValue)
+  if (rawValue && rawValue.startsWith('"') && rawValue.endsWith('"')) {
+    const value = rawValue.slice(1, -1)
+    const unescapedValue = value.replace(/\\"/g, '"').replace(/\\n/g, '\n').replace(/\\\\/g, '\\')
+    return unescapedValue
+  }
+  return undefined
 }