Merge pull request #187 from IvanoAlvino/fix-ts-parsing

Fix ts extract support
rubenv · Aug 7, 2018 · 3ce45d3 · 3ce45d3
2 parents 7a03fac + 0ab52fb
commit 3ce45d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/lib/extract.js b/lib/extract.js
@@ -203,7 +203,7 @@ var Extractor = (function () {
                     sourceType: 'module',
                     comment: true,
                     ecmaFeatures: {
-                        jsx: true
+                        jsx: extension === 'tsx'
                     }
                 });
             } else {

diff --git a/test/extract_extensions.js b/test/extract_extensions.js
@@ -114,14 +114,18 @@ describe('Extracting files with different extensions', function () {
         ];
         var catalog =  testExtract(files);
 
-        assert.equal(catalog.items.length, 2);
-        assert.equal(catalog.items[0].msgid, 'Hello');
+        assert.equal(catalog.items.length, 3);
+        assert.equal(catalog.items[0].msgid, 'Casted');
         assert.equal(catalog.items[0].msgstr, '');
-        assert.deepEqual(catalog.items[0].references, ['test/fixtures/ts.ts:2']);
+        assert.deepEqual(catalog.items[0].references, ['test/fixtures/ts.ts:6']);
 
-        assert.equal(catalog.items[1].msgid, 'One\nTwo\nThree');
+        assert.equal(catalog.items[1].msgid, 'Hello');
         assert.equal(catalog.items[1].msgstr, '');
-        assert.deepEqual(catalog.items[1].references, ['test/fixtures/ts.ts:3']);
+        assert.deepEqual(catalog.items[1].references, ['test/fixtures/ts.ts:2']);
+
+        assert.equal(catalog.items[2].msgid, 'One\nTwo\nThree');
+        assert.equal(catalog.items[2].msgstr, '');
+        assert.deepEqual(catalog.items[2].references, ['test/fixtures/ts.ts:3']);
     });
 
     it('supports TypeScript .tsx files', function () {

diff --git a/test/fixtures/ts.ts b/test/fixtures/ts.ts
@@ -3,5 +3,6 @@ angular.module("myApp").controller("helloController", (gettext) => {
     var longString: string = gettext(`One
 Two
 Three`);
+    var castedVar: any = <any> gettext("Casted");
     gettext(); // Should be ignored.
 });