Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: 'test'

on:
pull_request:
paths:
- '**/*.ts'
- '**/*.js'
- '**/*.po'
- '**/*.snap'
- '.github/workflows/test.yml'
- 'package.json'
- 'package-lock.json'
push:
paths:
- '**/*.ts'
- '**/*.js'
- '**/*.po'
- '**/*.snap'
- '.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@v3'

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: 'Install'
run: 'npm install'

- name: 'Build'
run: 'npm run build'

- name: 'Test'
run: 'npm run test'
29 changes: 22 additions & 7 deletions src/lib/extract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,33 @@ export async function extractAll(
switch (extname(filepath)) {
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;
babel.transformSync(
"\n".repeat(lineCount) + script.content,
{
filename: filepath,
...babelOptions
}
);
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 regex = /(?:{{\s*t\s*`(.*?)`\s*}}|{{\s*t\s*\(\s*'(.*?)'\s*\)\s*}})/g;
let tmparr;
while (
(tmparr = regex.exec(template.content)) !== null
) {
tr += `\n${tmparr[0]}`;
}
}
if (tr) {
jsCodes.push(tr);
babel.transformSync(jsCodes.join("\n"), {
filename: filepath,
...babelOptions
});
}
break;
}
Expand Down
4 changes: 4 additions & 0 deletions tests/commands/__snapshots__/test_extract.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ msgstr \\"\\"
#: tests/fixtures/vueTest/testVueParse.vue:10
msgid \\"test from vue file\\"
msgstr \\"\\"

#: tests/fixtures/vueTest/testVueParse.vue:15
msgid \\"Hello World!\\"
msgstr \\"\\"
"
`;

Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/vueTest/testVueParse.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<h1>Hello World</h1>
<h1>{{ t`Hello World!` }}</h1>
</template>
<script>
import { t } from "ttag";
Expand Down