feat: add prefix suffix config of args

locales/en.json

@@ -105,6 +105,8 @@
   "config.translate_override_existing": "Override existing messages on translating",
   "config.translate_save_as_candidates": "Save translations result to \"Translation Candidates\" instead of writting to the locale files.",
   "config.usage.scanning_ignore": "Ignore glob patterns for scanning key usage",
+  "config.args_prefix": "Set prefix of args in hard code",
+  "config.args_suffix": "Set suffix of args in hard code",
   "editor.add_description": "Add description...",
   "editor.empty": "(empty)",
   "editor.title": "i18n Ally Editor",

package.json

@@ -1273,6 +1273,16 @@
           "type": "string",
           "description": "%config.default_namespace%"
         },
+        "i18n-ally.argsPrefix": {
+          "type": "string",
+          "default": "{",
+          "description": "%config.args_prefix%"
+        },
+        "i18n-ally.argsSuffix": {
+          "type": "string",
+          "default": "}",
+          "description": "%config.args_suffix%"
+        },
         "i18n-ally.derivedKeyRules": {
           "deprecationMessage": "Deprecated. Use \"i18n-ally.usage.derivedKeyRules\" instead."
         },

src/commands/extractString.ts

@@ -3,7 +3,7 @@ import { commands, window, QuickPickItem, Range, TextDocument } from 'vscode'
 import { trim } from 'lodash'
 import { overrideConfirm } from './overrideConfirm'
 import { Commands } from './commands'
-import { keypathValidate, Log, promptTemplates } from '~/utils'
+import { keypathValidate, Log, preSufArgString, promptTemplates } from '~/utils'
 import { ExtensionModule } from '~/modules'
 import { extractHardStrings, generateKeyFromText, Config, CurrentFile, DetectionResult, Telemetry, TelemetryKey } from '~/core'
 import i18n from '~/i18n'
@@ -53,7 +53,7 @@ async function ExtractOrInsertCommnad(options?: ExtractTextOptions, detection?:
   const loader = CurrentFile.loader
 
   if (options.rawText && !options.text) {
-    const result = parseHardString(options.rawText, options.document?.languageId, options.isDynamic)
+    const result = parseHardString(options.rawText, options.document?.languageId, options.isDynamic, preSufArgString)
     options.text = result?.text || ''
     options.args = result?.args
   }

src/commands/extractStringBulk.ts

@@ -8,7 +8,7 @@ import { extractHardStrings, generateKeyFromText } from '~/core/Extract'
 import { Config, Global } from '~/core'
 import { parseHardString } from '~/extraction/parseHardString'
 import { DetectionResultToExtraction } from '~/editor/extract'
-import { Log } from '~/utils'
+import { Log, preSufArgString } from '~/utils'
 import { gitignoredGlob } from '~/utils/glob'
 import { ActionSource, Telemetry, TelemetryKey } from '~/core/Telemetry'
 
@@ -72,7 +72,7 @@ export async function BatchHardStringExtraction(...args: any[]) {
           const options = DetectionResultToExtraction(i, document)
 
           if (options.rawText && !options.text) {
-            const result = parseHardString(options.rawText, options.document.languageId, options.isDynamic)
+            const result = parseHardString(options.rawText, options.document.languageId, options.isDynamic, preSufArgString)
             options.text = result?.text || ''
             options.args = result?.args
           }

src/core/Config.ts

@@ -587,4 +587,12 @@ export class Config {
   static get telemetry(): boolean {
     return workspace.getConfiguration().get('telemetry.enableTelemetry') as boolean
   }
+
+  static get argsSuffix() {
+    return this.getConfig<string>('argsSuffix')
+  }
+
+  static get argsPrefix() {
+    return this.getConfig<string>('argsPrefix')
+  }
 }

src/core/Global.ts

@@ -129,7 +129,7 @@ export class Global {
         }
         return true
       })
-    const argsString = args?.length ? `,${args?.join(',')}` : ''
+    const argsString = args?.length ? `${args?.join(',')}` : ''
 
     const customReplacers = customTemplates
       .flatMap(i => i.templates)

src/editor/extract.ts

@@ -7,6 +7,7 @@ import i18n from '~/i18n'
 import { parseHardString } from '~/extraction/parseHardString'
 import { ExtractTextOptions } from '~/commands/extractString'
 import { DetectionResult } from '~/core/types'
+import { preSufArgString } from '~/utils'
 
 export function DetectionResultToExtraction(detection: DetectionResult, document: TextDocument): ExtractTextOptions {
   return {
@@ -80,7 +81,7 @@ class ExtractProvider implements CodeActionProvider {
     if (!(selection instanceof Selection))
       return []
 
-    const result = parseHardString(document.getText(selection), document.languageId)
+    const result = parseHardString(document.getText(selection), document.languageId, false, preSufArgString)
     if (!result)
       return []
 

src/extraction/parseHardString.ts

@@ -1,4 +1,3 @@
-
 /**
  * 'foo' + bar() + ' is cool' -> `foo${bar()} is cool`
  */
@@ -23,7 +22,7 @@ export function stringConcatenationToTemplate(text: string) {
   return text
 }
 
-export function parseHardString(text = '', languageId?: string, isDynamic = false) {
+export function parseHardString(text = '', languageId?: string, isDynamic = false, argsToStringCallback = (args:string[])=>`{${args.length - 1}}`) {
   const trimmed = text.trim().replace(/\s*\r?\n\s*/g, ' ')
   let processed = trimmed
   const args: string[] = []
@@ -35,7 +34,7 @@ export function parseHardString(text = '', languageId?: string, isDynamic = fals
 
   processed = processed.replace(/(?:\{\{(.*?)\}\}|\$\{(.*?)\})/g, (full, content, content2) => {
     args.push((content ?? content2 ?? '').trim())
-    return `{${args.length - 1}}`
+    return argsToStringCallback(args)
   })
 
   return {

src/frameworks/react-i18next.ts

@@ -91,11 +91,11 @@ class ReactI18nextFramework extends Framework {
     }
   }
 
-  refactorTemplates(keypath: string) {
+  refactorTemplates(keypath: string, args: string[]) {
     return [
-      `{t('${keypath}')}`,
-      `t('${keypath}')`,
-      `<Trans i18nKey="${keypath}"></Trans>`,
+      `t('${keypath}'${args.length ? `, [${args.join(', ')}]` : ''})`,
+      `{t('${keypath}'${args.length ? `, [${args.join(', ')}]` : ''})}`,
+      `<Trans i18nKey="${keypath}"${args.length ? ` values={[${args.join(', ')}]}` : ''}></Trans>`,
       keypath,
     ]
   }

src/utils/utils.ts

@@ -107,3 +107,7 @@ export function getLocaleCompare(
   const sortLocale = sortLocaleSetting ? sortLocaleSetting : fileLocale;
   return new Intl.Collator(sortLocale).compare;
 }
+
+export function preSufArgString(args: string[]){
+  return `${Config.argsPrefix}${args.length - 1}${Config.argsSuffix}`
+}