fix: improve locale normalization logic in BCP47 class & improve regex comments for JSX attributes

src/core/KeyDetector.ts

@@ -55,11 +55,9 @@ export class KeyDetector {
     return keyRange?.key
   }
 
-  static getScopedKey(document: TextDocument, position: Position)
-  {
+  static getScopedKey(document: TextDocument, position: Position) {
     const scopes = Global.enabledFrameworks.flatMap(f => f.getScopeRange(document) || [])
-    if (scopes.length > 0)
-    {
+    if (scopes.length > 0) {
       const offset = document.offsetAt(position)
       return scopes.filter(s => s.start < offset && offset < s.end).map(s => s.namespace).join('.')
     }

src/core/Translator.ts

@@ -136,7 +136,7 @@ export class Translator {
         catch (err) {
           // eslint-disable-next-line no-console
           console.error(err)
-          failedJobs.push([job, err])
+          failedJobs.push([job, err as Error])
         }
         finished += 1
         progress.report({ increment, message })
@@ -318,7 +318,7 @@ export class Translator {
         break
       }
       catch (e) {
-        errors.push(e)
+        errors.push(e as Error)
       }
     }
 

src/frameworks/react-intl.ts

@@ -7,7 +7,7 @@ class ReactFramework extends Framework {
 
   detection= {
     packageJSON: [
-      'react-intl'
+      'react-intl',
     ],
   }
 
@@ -21,8 +21,11 @@ class ReactFramework extends Framework {
 
   // for visualize the regex, you can use https://regexper.com/
   usageMatchRegex = [
-    // general jsx attrs
-    '[^\\w\\d](?:i18nKey=|FormattedMessage[ (]\\s*id=|t\\(\\s*)[\'"`]({key})[\'"`]',
+    // Support for i18nKey= and t( calls, key supports single, double, and back quotes
+    '[^\\w\\d](?:i18nKey=|t\\(\\s*)[\'"`]({key})[\'"`]',
+    // Since <FormattedMessage ... id=... /> may have multiple attributes and line breaks, handle it separately
+    // Allow attribute line breaks and whitespace, support id="xxx.xxx", id={'xxx.xxx'}, etc.
+    '<FormattedMessage[\\s\\S]*?id=\\s*\\{?\\s*[\'"`]([a-zA-Z0-9_.\\-]+)[\'"`]\\s*\\}?',
     // useIntl() hooks, https://github.com/formatjs/react-intl/blob/master/docs/API.md#useintl-hook
     '[^\\w\\d](?:formatPlural|formatNumber|formatDate|formatTime|formatHTMLMessage|formatMessage|formatRelativeTime)\\(.*?[\'"`]?id[\'"`]?:\\s*[\'"`]({key})[\'"`]',
     '<Trans>({key})<\\/Trans>',

src/tagSystems/bcp47.ts

@@ -8,7 +8,22 @@ export class BCP47 extends BaseTagSystem {
     if (!locale)
       return fallback
 
-    return bcp47.stringify(bcp47.parse(locale, { normalize: strict, forgiving: !strict })) || fallback
+    // First, parse with bcp47
+    const parsed = bcp47.parse(locale, { normalize: strict, forgiving: !strict })
+    // If the parsed result has a region, or language+region can restore the original locale, use stringify
+    if (parsed && parsed.language) {
+      if (parsed.region)
+        return bcp47.stringify(parsed)
+        // Compatible with underscore formats like zh_CN, zh_TW, en_US
+      if (locale.match(/^[a-z]{2,3}[_-][A-Z]{2,4}$/)) {
+        // Convert to standard BCP47 format zh-CN
+        return locale.replace('_', '-')
+      }
+      // Compatible with cases where only the main language is present
+      return parsed.language
+    }
+    // If parsing fails, return the original locale directly
+    return locale || fallback
   }
 
   toBCP47(locale: string) {