fix(expressions): fixed indexing issues for identical expressions in …

…a template string
skolmer · Jul 4, 2018 · 1bb1c25 · 1bb1c25
1 parent dcbbafc
commit 1bb1c25
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 19 deletions.
diff --git a/__tests__/data/schema.json b/__tests__/data/schema.json
@@ -22,10 +22,10 @@
         "custom group": {
             "type": "object",
             "properties": {
-                "Hello ${0}, Hello ${0}.": {
+                "Hello ${0}, Hello ${1}.": {
                     "type": "string",
                     "minLength": 1,
-                    "pattern": "(?=.*?\\$\\{0\\})"
+                    "pattern": "(?=.*?\\$\\{0\\})(?=.*?\\$\\{1\\})"
                 },
                 "Hello ${0}, you have ${1} in your bank account.": {
                     "type": "string",
@@ -34,7 +34,7 @@
                 }
             },
             "required": [
-                "Hello ${0}, Hello ${0}.",
+                "Hello ${0}, Hello ${1}.",
                 "Hello ${0}, you have ${1} in your bank account."
             ]
         },

diff --git a/__tests__/data/translation.json b/__tests__/data/translation.json
@@ -6,7 +6,7 @@
     "unknown": "unknown",
     "custom group": {
         "Hello ${0}, you have ${1} in your bank account.": "hello${0}, you have ${1} §{0}",
-        "Hello ${0}, Hello ${0}.": "Hello ${0}, Hello ${0}."
+        "Hello ${0}, Hello ${1}.": "Hello ${0}, Hello ${1}."
     },
     "grouped.js": {
         "Hello ${0}, you have ${1} in your bank account.": "sad"

diff --git a/__tests__/data/translation.valid.json b/__tests__/data/translation.valid.json
@@ -5,7 +5,7 @@
     "${0} ${1}": "${0} ${1}",
     "custom group": {
         "Hello ${0}, you have ${1} in your bank account.": "Hello ${0}, you have ${1} in your bank account.",
-        "Hello ${0}, Hello ${0}.": "Hello ${0}, Hello ${0}."
+        "Hello ${0}, Hello ${1}.": "Hello ${0}, Hello ${1}."
     },
     "custom group 2": {
         "Hello ${0}, you have ${1} in your bank account.": "Hello ${0}, you have ${1} in your bank account."

diff --git a/__tests__/data/translations/translation.valid.1.json b/__tests__/data/translations/translation.valid.1.json
@@ -5,7 +5,7 @@
     "${0} ${1}": "${0} ${1}",
     "custom group": {
         "Hello ${0}, you have ${1} in your bank account.": "Hello ${0}, you have ${1} in your bank account.",
-        "Hello ${0}, Hello ${0}.": "Hello ${0}, Hello ${0}."
+        "Hello ${0}, Hello ${1}.": "Hello ${0}, Hello ${1}."
     },
     "custom group 2": {
         "Hello ${0}, you have ${1} in your bank account.": "Hello ${0}, you have in your bank account."

diff --git a/__tests__/data/translations/translation.valid.json b/__tests__/data/translations/translation.valid.json
@@ -5,7 +5,7 @@
     "${0} ${1}": "${0} ${1}",
     "custom group": {
         "Hello ${0}, you have ${1} in your bank account.": "Hello ${0}, you have ${1} in your bank account.",
-        "Hello ${0}, Hello ${0}.": "Hello ${0}, Hello ${0}."
+        "Hello ${0}, Hello ${1}.": "Hello ${0}, Hello ${1}."
     },
     "custom group 2": {
         "Hello ${0}, you have ${1} in your bank account.": "Hello ${0}, you have ${1} in your bank account."

diff --git a/__tests__/exportTranslationKeys.test.js b/__tests__/exportTranslationKeys.test.js
@@ -43,7 +43,7 @@ describe('exportTranslationKeys', () => {
       {
         'group': 'custom group',
         'items': [
-          'Hello ${0}, Hello ${0}.',
+          'Hello ${0}, Hello ${1}.',
           'Hello ${0}, you have ${1} in your bank account.'
         ]
       },
@@ -102,7 +102,7 @@ describe('exportTranslationKeys', () => {
       {
         'group': 'custom group',
         'items': [
-          'Hello ${0}, Hello ${0}.',
+          'Hello ${0}, Hello ${1}.',
           'Hello ${0}, you have ${1} in your bank account.'
         ]
       },
@@ -190,7 +190,7 @@ msgid "\\n    <users>\\n    \${0}\\n    </users>\\n"
 msgstr ""
 
 msgctxt "custom group"
-msgid "Hello \${0}, Hello \${0}."
+msgid "Hello \${0}, Hello \${1}."
 msgstr ""
 
 msgctxt "custom group"

diff --git a/__tests__/generateTranslationSchema.test.js b/__tests__/generateTranslationSchema.test.js
@@ -29,9 +29,9 @@ const expected = {
     'custom group': {
       'type': 'object',
       'properties': {
-        'Hello ${0}, Hello ${0}.': {
+        'Hello ${0}, Hello ${1}.': {
           'minLength': 1,
-          'pattern': '(?=.*?\\$\\{0\\})',
+          'pattern': '(?=.*?\\$\\{0\\})(?=.*?\\$\\{1\\})',
           'type': 'string'
         },
         'Hello ${0}, you have ${1} in your bank account.': {
@@ -41,7 +41,7 @@ const expected = {
         }
       },
       'required': [
-        'Hello ${0}, Hello ${0}.',
+        'Hello ${0}, Hello ${1}.',
         'Hello ${0}, you have ${1} in your bank account.'
       ]
     },

diff --git a/lib/traversal.js b/lib/traversal.js
@@ -15,12 +15,9 @@ const traverseTemplateExpressions = {
       node.quasi.expressions.forEach((exp) => {
         const expression = source.substring(exp.start, exp.end)
         const expExpression = escapeStringRegexp(expression).replace(/\r/gm, '\\r').replace(/\n/gm, '\\n').replace(/\t/gm, '\\t').replace(/\s/gm, '\\s').replace(/"/gm, '\\"')
-        const regExp = new RegExp(`\\\${\\s*${expExpression}\\s*}(:([a-z])(\\(([^\\)]+)\\))?)?`, 'gm')
-        const newMatch = match.replace(regExp, `\${${count}}`)
-        if(match !== newMatch) {
-          match = newMatch
-          count++
-        }
+        const regExp = new RegExp(`\\\${\\s*${expExpression}\\s*}(:([a-z])(\\(([^\\)]+)\\))?)?`, 'm')
+        match = match.replace(regExp, `\${${count}}`)
+        count++
       })
       let template = match.replace(/\r\n/g, '\n')
       if(template) {