Merge pull request #817 from 2Pacalypse-/master

Add support for string concatenation in default values

Author: karellm

src/lexers/javascript-lexer.js

@@ -256,14 +256,28 @@ export default class JavascriptLexer extends BaseLexer {
 
       let optionsArgument = node.arguments.shift()
 
-      // Second argument could be a string default value
+      // Second argument could be a (concatenated) string default value
       if (
         optionsArgument &&
         (optionsArgument.kind === ts.SyntaxKind.StringLiteral ||
           optionsArgument.kind === ts.SyntaxKind.NoSubstitutionTemplateLiteral)
       ) {
         entry.defaultValue = optionsArgument.text
         optionsArgument = node.arguments.shift()
+      } else if (
+        optionsArgument &&
+        optionsArgument.kind === ts.SyntaxKind.BinaryExpression
+      ) {
+        const concatenatedString = this.concatenateString(optionsArgument)
+        if (!concatenatedString) {
+          this.emit(
+            'warning',
+            `Default value is not a string literal: ${optionsArgument.text}`
+          )
+          return null
+        }
+        entry.defaultValue = concatenatedString
+        optionsArgument = node.arguments.shift()
       }
 
       if (

test/lexers/javascript-lexer.test.js

@@ -27,6 +27,15 @@ describe('JavascriptLexer', () => {
     done()
   })
 
+  it('extracts the second argument string concatenation as defaultValue', (done) => {
+    const Lexer = new JavascriptLexer()
+    const content = 'i18n.t("first", "bla" + "bla" + "bla")'
+    assert.deepEqual(Lexer.extract(content), [
+      { key: 'first', defaultValue: 'blablabla' },
+    ])
+    done()
+  })
+
   it('extracts the defaultValue/context options', (done) => {
     const Lexer = new JavascriptLexer()
     const content = 'i18n.t("first", {defaultValue: "foo", context: \'bar\'})'