From 7241f979bfc4a37785b6165524792d872809053a Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 12:40:48 +0200
Subject: [PATCH 1/9] feat: parse template tag for vue files

---
 src/lib/extract.ts                                | 13 +++++++++++++
 tests/commands/__snapshots__/test_extract.ts.snap |  6 ++++++
 tests/fixtures/vueTest/testVueParse.vue           |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/lib/extract.ts b/src/lib/extract.ts
index 3c72676..49eabdb 100644
--- a/src/lib/extract.ts
+++ b/src/lib/extract.ts
@@ -38,6 +38,19 @@ export async function extractAll(
             switch (extname(filepath)) {
                 case ".vue": {
                     const source = fs.readFileSync(filepath).toString();
+                    const template = parseComponent(source).template;
+                    if (template) {
+                        const lineCount =
+                            source.slice(0, template.start).split(/\r\n|\r|\n/)
+                                .length - 1;
+                        babel.transformSync(
+                            "\n".repeat(lineCount) + template.content,
+                            {
+                                filename: filepath,
+                                ...babelOptions
+                            }
+                        );
+                    }
                     const script = parseComponent(source).script;
                     if (script) {
                         const lineCount =
diff --git a/tests/commands/__snapshots__/test_extract.ts.snap b/tests/commands/__snapshots__/test_extract.ts.snap
index 02c1cba..ab81528 100644
--- a/tests/commands/__snapshots__/test_extract.ts.snap
+++ b/tests/commands/__snapshots__/test_extract.ts.snap
@@ -161,6 +161,12 @@ msgstr \\"\\"
 \\"Content-Type: text/plain; charset=utf-8\\\\n\\"
 \\"Plural-Forms: nplurals=2; plural=(n!=1);\\\\n\\"
 
+#: tests/fixtures/vueTest/testVueParse.vue:2
+msgid \\"test from vue file (template)\\"
+msgstr \\"\\"
+"
+`;
+
 #: tests/fixtures/vueTest/testVueParse.vue:10
 msgid \\"test from vue file\\"
 msgstr \\"\\"
diff --git a/tests/fixtures/vueTest/testVueParse.vue b/tests/fixtures/vueTest/testVueParse.vue
index 5593cfc..3cdfb41 100644
--- a/tests/fixtures/vueTest/testVueParse.vue
+++ b/tests/fixtures/vueTest/testVueParse.vue
@@ -1,5 +1,5 @@
 <template>
-    <h1>Hello World</h1>
+    <h1>{{ t`test from vue file (template)` }}</h1>
 </template>
 <script>
 import { t } from "ttag";

From bb256ad6cf4ca8332897a402a0f5685042d55d4c Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 14:15:40 +0200
Subject: [PATCH 2/9] feat: github workflow for test

---
 .github/workflows/test.yml | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..1236058
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,46 @@
+name: 'test'
+
+on:
+  pull_request:
+    paths:
+      - '**/*.ts'
+      - '**/*.js'
+      - '**/*.po'
+      - '.github/workflows/test.yml'
+      - 'package.json'
+      - 'package-lock.json'
+  push:
+    paths:
+      - '**/*.ts'
+      - '**/*.js'
+      - '**/*.po'
+      - '.github/workflows/test.yml'
+      - 'package.json'
+      - 'package-lock.json'
+
+jobs:
+  install-build-test:
+    name: 'Check install, build, test'
+    runs-on: 'ubuntu-latest'
+
+    strategy:
+      matrix:
+        node-version: [14.x, 16.x, 18.x]
+
+    steps:
+      - name: 'Checkout current revision'
+        uses: 'actions/checkout@v2'
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: 'npm install'
+        run: 'npm install'
+
+      - name: 'npm build'
+        run: 'npm run build'
+
+      - name: 'npm test'
+        run: 'npm run test'

From 8c013bcbbd7193b944bd757eaf55be59dd1a7f3b Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 14:16:46 +0200
Subject: [PATCH 3/9] fix: restore extract.ts

---
 src/lib/extract.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/lib/extract.ts b/src/lib/extract.ts
index 49eabdb..3c72676 100644
--- a/src/lib/extract.ts
+++ b/src/lib/extract.ts
@@ -38,19 +38,6 @@ export async function extractAll(
             switch (extname(filepath)) {
                 case ".vue": {
                     const source = fs.readFileSync(filepath).toString();
-                    const template = parseComponent(source).template;
-                    if (template) {
-                        const lineCount =
-                            source.slice(0, template.start).split(/\r\n|\r|\n/)
-                                .length - 1;
-                        babel.transformSync(
-                            "\n".repeat(lineCount) + template.content,
-                            {
-                                filename: filepath,
-                                ...babelOptions
-                            }
-                        );
-                    }
                     const script = parseComponent(source).script;
                     if (script) {
                         const lineCount =

From 0d27fdaa9bacf88be44133e4b9597df70eda95be Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 14:23:15 +0200
Subject: [PATCH 4/9] fix: remove case test

---
 tests/commands/__snapshots__/test_extract.ts.snap | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/commands/__snapshots__/test_extract.ts.snap b/tests/commands/__snapshots__/test_extract.ts.snap
index ab81528..02c1cba 100644
--- a/tests/commands/__snapshots__/test_extract.ts.snap
+++ b/tests/commands/__snapshots__/test_extract.ts.snap
@@ -161,12 +161,6 @@ msgstr \\"\\"
 \\"Content-Type: text/plain; charset=utf-8\\\\n\\"
 \\"Plural-Forms: nplurals=2; plural=(n!=1);\\\\n\\"
 
-#: tests/fixtures/vueTest/testVueParse.vue:2
-msgid \\"test from vue file (template)\\"
-msgstr \\"\\"
-"
-`;
-
 #: tests/fixtures/vueTest/testVueParse.vue:10
 msgid \\"test from vue file\\"
 msgstr \\"\\"

From ca08648e6540065cb84f911534cc22b10800607b Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 14:24:17 +0200
Subject: [PATCH 5/9] fix: update github workflow

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1236058..bbef8aa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,6 +6,7 @@ on:
       - '**/*.ts'
       - '**/*.js'
       - '**/*.po'
+      - '**/*.snap'
       - '.github/workflows/test.yml'
       - 'package.json'
       - 'package-lock.json'
@@ -14,6 +15,7 @@ on:
       - '**/*.ts'
       - '**/*.js'
       - '**/*.po'
+      - '**/*.snap'
       - '.github/workflows/test.yml'
       - 'package.json'
       - 'package-lock.json'

From b056638ddc123fe9ea0cee407b21d0d22d483007 Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 14:28:38 +0200
Subject: [PATCH 6/9] feat: update workflow + testVueParse.vue

---
 .github/workflows/test.yml              | 6 +++---
 tests/fixtures/vueTest/testVueParse.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bbef8aa..6f4904c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,11 +38,11 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: 'npm install'
+      - name: 'Install'
         run: 'npm install'
 
-      - name: 'npm build'
+      - name: 'Build'
         run: 'npm run build'
 
-      - name: 'npm test'
+      - name: 'Test'
         run: 'npm run test'
diff --git a/tests/fixtures/vueTest/testVueParse.vue b/tests/fixtures/vueTest/testVueParse.vue
index 3cdfb41..6614276 100644
--- a/tests/fixtures/vueTest/testVueParse.vue
+++ b/tests/fixtures/vueTest/testVueParse.vue
@@ -1,5 +1,5 @@
 <template>
-    <h1>{{ t`test from vue file (template)` }}</h1>
+    <h1>{{ t`Hello World!` }}</h1>
 </template>
 <script>
 import { t } from "ttag";

From e262535de3c759710aab7ba9d57097d5f888c464 Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 15:34:34 +0200
Subject: [PATCH 7/9] feat: parse vue template

---
 src/lib/extract.ts                              | 17 +++++++++++++++++
 .../commands/__snapshots__/test_extract.ts.snap |  2 +-
 tests/fixtures/vueTest/testVueParse.vue         |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/lib/extract.ts b/src/lib/extract.ts
index 3c72676..d87d283 100644
--- a/src/lib/extract.ts
+++ b/src/lib/extract.ts
@@ -38,6 +38,23 @@ export async function extractAll(
             switch (extname(filepath)) {
                 case ".vue": {
                     const source = fs.readFileSync(filepath).toString();
+                    const template = parseComponent(source).template;
+                    if (template) {
+                        const jsCodes: string[] = [];
+                        const regex = /(?:{{\s*t\s*`(.*?)`\s*}}|{{\s*t\s*\(\s*'(.*?)'\s*\)\s*}})/g;
+                        let tmparr;
+                        while (
+                            (tmparr = regex.exec(template.content)) !== null
+                        ) {
+                            jsCodes.push(tmparr[0]);
+                        }
+                        if (jsCodes.length > 0) {
+                            babel.transformSync(jsCodes.join("\n"), {
+                                filename: filepath,
+                                ...babelOptions
+                            });
+                        }
+                    }
                     const script = parseComponent(source).script;
                     if (script) {
                         const lineCount =
diff --git a/tests/commands/__snapshots__/test_extract.ts.snap b/tests/commands/__snapshots__/test_extract.ts.snap
index 02c1cba..e11ecc3 100644
--- a/tests/commands/__snapshots__/test_extract.ts.snap
+++ b/tests/commands/__snapshots__/test_extract.ts.snap
@@ -161,7 +161,7 @@ msgstr \\"\\"
 \\"Content-Type: text/plain; charset=utf-8\\\\n\\"
 \\"Plural-Forms: nplurals=2; plural=(n!=1);\\\\n\\"
 
-#: tests/fixtures/vueTest/testVueParse.vue:10
+#: tests/fixtures/vueTest/testVueParse.vue:11
 msgid \\"test from vue file\\"
 msgstr \\"\\"
 "
diff --git a/tests/fixtures/vueTest/testVueParse.vue b/tests/fixtures/vueTest/testVueParse.vue
index 6614276..36f66b8 100644
--- a/tests/fixtures/vueTest/testVueParse.vue
+++ b/tests/fixtures/vueTest/testVueParse.vue
@@ -1,5 +1,6 @@
 <template>
     <h1>{{ t`Hello World!` }}</h1>
+    <h2>{{ t('Hi!') }}</h2>
 </template>
 <script>
 import { t } from "ttag";

From 6d8c1ab665e82fb79efe24739ed6a4f8f27ff295 Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 16:18:49 +0200
Subject: [PATCH 8/9] fix: test

---
 src/lib/extract.ts                            | 38 +++++++++----------
 .../__snapshots__/test_extract.ts.snap        |  6 ++-
 tests/fixtures/vueTest/testVueParse.vue       |  1 -
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/lib/extract.ts b/src/lib/extract.ts
index d87d283..9a3f5e0 100644
--- a/src/lib/extract.ts
+++ b/src/lib/extract.ts
@@ -39,34 +39,32 @@ export async function extractAll(
                 case ".vue": {
                     const source = fs.readFileSync(filepath).toString();
                     const template = parseComponent(source).template;
+                    let tr = "";
+                    let jsCodes: string[] = [];
+                    const script = parseComponent(source).script;
+                    if (script) {
+                        const lineCount =
+                            source.slice(0, script.start).split(/\r\n|\r|\n/)
+                                .length - 1;
+                        tr += "\n".repeat(lineCount) + script.content;
+                    }
+                    // FIXME: Because we need to put imports first,
+                    // the extracted line numbers will be messed up.
                     if (template) {
-                        const jsCodes: string[] = [];
                         const regex = /(?:{{\s*t\s*`(.*?)`\s*}}|{{\s*t\s*\(\s*'(.*?)'\s*\)\s*}})/g;
                         let tmparr;
                         while (
                             (tmparr = regex.exec(template.content)) !== null
                         ) {
-                            jsCodes.push(tmparr[0]);
-                        }
-                        if (jsCodes.length > 0) {
-                            babel.transformSync(jsCodes.join("\n"), {
-                                filename: filepath,
-                                ...babelOptions
-                            });
+                            tr += `\n${tmparr[0]}`;
                         }
                     }
-                    const script = parseComponent(source).script;
-                    if (script) {
-                        const lineCount =
-                            source.slice(0, script.start).split(/\r\n|\r|\n/)
-                                .length - 1;
-                        babel.transformSync(
-                            "\n".repeat(lineCount) + script.content,
-                            {
-                                filename: filepath,
-                                ...babelOptions
-                            }
-                        );
+                    if (tr) {
+                        jsCodes.push(tr);
+                        babel.transformSync(jsCodes.join("\n"), {
+                            filename: filepath,
+                            ...babelOptions
+                        });
                     }
                     break;
                 }
diff --git a/tests/commands/__snapshots__/test_extract.ts.snap b/tests/commands/__snapshots__/test_extract.ts.snap
index e11ecc3..c01ffbe 100644
--- a/tests/commands/__snapshots__/test_extract.ts.snap
+++ b/tests/commands/__snapshots__/test_extract.ts.snap
@@ -161,9 +161,13 @@ msgstr \\"\\"
 \\"Content-Type: text/plain; charset=utf-8\\\\n\\"
 \\"Plural-Forms: nplurals=2; plural=(n!=1);\\\\n\\"
 
-#: tests/fixtures/vueTest/testVueParse.vue:11
+#: tests/fixtures/vueTest/testVueParse.vue:10
 msgid \\"test from vue file\\"
 msgstr \\"\\"
+
+#: tests/fixtures/vueTest/testVueParse.vue:15
+msgid \\"Hello World!\\"
+msgstr \\"\\"
 "
 `;
 
diff --git a/tests/fixtures/vueTest/testVueParse.vue b/tests/fixtures/vueTest/testVueParse.vue
index 36f66b8..6614276 100644
--- a/tests/fixtures/vueTest/testVueParse.vue
+++ b/tests/fixtures/vueTest/testVueParse.vue
@@ -1,6 +1,5 @@
 <template>
     <h1>{{ t`Hello World!` }}</h1>
-    <h2>{{ t('Hi!') }}</h2>
 </template>
 <script>
 import { t } from "ttag";

From 5802c691150dee1b360f39d701654f4857686316 Mon Sep 17 00:00:00 2001
From: dante di domenico <dante@didoda.com>
Date: Fri, 31 Mar 2023 16:23:59 +0200
Subject: [PATCH 9/9] fix: github action

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6f4904c..f4bcc56 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,10 +31,10 @@ jobs:
 
     steps:
       - name: 'Checkout current revision'
-        uses: 'actions/checkout@v2'
+        uses: 'actions/checkout@v3'
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}