Merge pull request #186 from cedricvoinnet/ignore-dynamic-keypath

Ignore dynamic keypath as dynamic path in i18n-t
Spittal · Nov 3, 2022 · 382f5e5 · 382f5e5
2 parents cb406ac + c39ee5c
commit 382f5e5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 12 deletions.
diff --git a/dist/vue-i18n-extract.modern.mjs b/dist/vue-i18n-extract.modern.mjs
@@ -140,7 +140,7 @@ function extractMethodMatches(file) {
 }
 
 function extractComponentMatches(file) {
-  const componentRegExp = /(?:(?:<|h\()(?:i18n|Translation))(?:.|\n)*?(?:[^:]path(?:=|: )("|'))((?:[^\\]|\\.)*?)\1/gi;
+  const componentRegExp = /(?:(?:<|h\()(?:i18n|Translation))(?:.|\n)*?(?:\s(?:(?:key)?)path(?:=|: )("|'))((?:[^\\]|\\.)*?)\1/gi;
   return [...getMatches(file, componentRegExp, 2)];
 }
 

diff --git a/dist/vue-i18n-extract.modern.mjs.map b/dist/vue-i18n-extract.modern.mjs.map
diff --git a/dist/vue-i18n-extract.umd.js b/dist/vue-i18n-extract.umd.js
diff --git a/dist/vue-i18n-extract.umd.js.map b/dist/vue-i18n-extract.umd.js.map
diff --git a/src/create-report/vue-files.ts b/src/create-report/vue-files.ts
@@ -76,7 +76,7 @@ function* getMatches (file: SimpleFile, regExp: RegExp, captureGroup = 1): Itera
 }
 
 function extractComponentMatches (file: SimpleFile): I18NItemWithBounding[] {
-  const componentRegExp = /(?:(?:<|h\()(?:i18n|Translation))(?:.|\n)*?(?:[^:]path(?:=|: )("|'))((?:[^\\]|\\.)*?)\1/gi;
+  const componentRegExp = /(?:(?:<|h\()(?:i18n|Translation))(?:.|\n)*?(?:\s(?:(?:key)?)path(?:=|: )("|'))((?:[^\\]|\\.)*?)\1/gi;
   return [ ...getMatches(file, componentRegExp, 2) ];
 }
 

diff --git a/tests/fixtures/expected-values.ts b/tests/fixtures/expected-values.ts
@@ -46,21 +46,21 @@ export const expectedFromParsedVueFiles = [
     previousCharacter: "'",
     nextCharacter: "'",
     file: './tests/fixtures/vue-files/Basic.vue',
-    line: 12
+    line: 16
   },
   {
     path: 'content.link.b',
     previousCharacter: "'",
     nextCharacter: "'",
     file: './tests/fixtures/vue-files/Basic.vue',
-    line: 15
+    line: 23
   },
   {
     path: 'header.title',
     previousCharacter: "'",
     nextCharacter: "'",
     file: './tests/fixtures/vue-files/Basic.vue',
-    line: 19
+    line: 27
   },
   {
     path: 'content.link.a',
@@ -74,28 +74,28 @@ export const expectedFromParsedVueFiles = [
     previousCharacter: '"',
     nextCharacter: '"',
     file: './tests/fixtures/vue-files/Basic.vue',
-    line: 11
+    line: 12
   },
   {
     path: 'content.link.a',
     previousCharacter: '"',
     nextCharacter: '"',
     file: './tests/fixtures/vue-files/Basic.vue',
-    line: 14
+    line: 19
   },
   {
     path: 'header.title',
     previousCharacter: "'",
     nextCharacter: "'",
     file: './tests/fixtures/vue-files/Basic.vue',
-    line: 17
+    line: 25
   },
   {
     path: 'header.title',
     previousCharacter: "'",
     nextCharacter: "'",
     file: './tests/fixtures/vue-files/Basic.vue',
-    line: 18
+    line: 26
   },
   {
     path: "single \\' quote",

diff --git a/tests/fixtures/vue-files/Basic.vue b/tests/fixtures/vue-files/Basic.vue
@@ -8,9 +8,17 @@
     <i18n path="content.link.a">
       <a place="link" href="#">{{ $t('content.link.b') }}</a>
     </i18n>
+    <!-- Should not match -- dynamic path is ignored -->
+    <i18n :path="dynamicPath">
+      <span place="icon" class="icon" />
+    </i18n>
     <i18n-t keypath="content.link.a">
       <a place="link" href="#">{{ $t('content.link.b') }}</a>
     </i18n-t>
+    <!-- Should not match -- dynamic keypath is ignored -->
+    <i18n-t :keypath="dynamicPath">
+      <span place="icon" class="icon" />
+    </i18n-t>
     <Translation keypath="content.link.a">
       <a place="link" href="#">{{ $t('content.link.b') }}</a>
     </Translation>