Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .changeset/loud-cougars-sparkle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"lingo.dev": patch
---

fix vue json files
23 changes: 23 additions & 0 deletions packages/cli/src/cli/loaders/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1924,6 +1924,29 @@ ${script}`;
}
</i18n>

${script}`;

mockFileOperations(input);

const vueLoader = createBucketLoader("vue-json", "i18n/App.vue", { isCacheRestore: false, defaultLocale: "en" });
vueLoader.setDefaultLocale("en");
await vueLoader.pull("en");

await vueLoader.push("es", {
hello: "hola mundo!",
});

expect(fs.writeFile).toHaveBeenCalledWith("i18n/App.vue", expectedOutput, { encoding: "utf-8", flag: "w" });
});

it("should ignore vue file without i18n tag", async () => {
setupFileMocks();

const input = `${template}

${script}`;
const expectedOutput = `${template}

${script}`;

mockFileOperations(input);
Expand Down
21 changes: 15 additions & 6 deletions packages/cli/src/cli/loaders/vue-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,29 @@ import { createLoader } from "./_utils";
export default function createVueJsonLoader(): ILoader<string, Record<string, any>> {
return createLoader({
pull: async (locale, input, ctx) => {
const { i18n } = parseVueFile(input);
return i18n[locale] ?? {};
const parsed = parseVueFile(input);
return parsed?.i18n?.[locale] ?? {};
},
push: async (locale, data, originalInput) => {
const { before, i18n, after } = parseVueFile(originalInput ?? "");
i18n[locale] = data;
return `${before}<i18n>\n${JSON.stringify(i18n, null, 2)}\n</i18n>${after}`;
const parsed = parseVueFile(originalInput ?? "");
if (!parsed) {
return originalInput ?? "";
}

parsed.i18n[locale] = data;
return `${parsed.before}<i18n>\n${JSON.stringify(parsed.i18n, null, 2)}\n</i18n>${parsed.after}`;
},
});
}

function parseVueFile(input: string) {
const [, before, jsonString = "{}", after] = input.match(/^([\s\S]*)<i18n>([\s\S]*)<\/i18n>([\s\S]*)$/) || [];
const match = input.match(/^([\s\S]*)<i18n>([\s\S]*)<\/i18n>([\s\S]*)$/);

if (!match) {
return null;
}

const [, before, jsonString = "{}", after] = match;
let i18n: Record<string, any>;
try {
i18n = JSON.parse(jsonString);
Expand Down