Correctly handle importing external FTL files

Demivan · Demivan · commit fc9ed8d384ac · 2024-11-16T18:40:39.000+02:00
diff --git a/__tests__/frameworks/vite/external.spec.ts b/__tests__/frameworks/vite/external.spec.ts
@@ -129,4 +129,57 @@ describe('Vite external', () => {
       "
     `)
   })
+
+  it('can import FTL files', async () => {
+    // Arrange
+    // Act
+    const code = await compile({
+      plugins: [
+        vue3({
+          compiler,
+        }),
+        ExternalFluentPlugin({
+          baseDir: resolve(baseDir, 'fixtures'),
+          ftlDir: resolve(baseDir, 'fixtures/ftl'),
+          locales: ['en', 'da'],
+        }),
+      ],
+    }, '/fixtures/ftl/en/importer.js.ftl')
+
+    // Assert
+    expect(code).toMatchInlineSnapshot(`
+      "=== /fixtures/ftl/en/importer.js.ftl ===
+
+      import { FluentResource } from "/@id/virtual:empty:fluent-bundle"
+
+      export default /*#__PURE__*/ new FluentResource("key = Translations for js file")
+      "
+    `)
+  })
+
+  it('can parse FTL files', async () => {
+    // Arrange
+    // Act
+    const code = await compile({
+      plugins: [
+        vue3({
+          compiler,
+        }),
+        ExternalFluentPlugin({
+          baseDir: resolve(baseDir, 'fixtures'),
+          ftlDir: resolve(baseDir, 'fixtures/ftl'),
+          locales: ['en', 'da'],
+          parseFtl: true,
+        }),
+      ],
+    }, '/fixtures/ftl/en/importer.js.ftl')
+
+    // Assert
+    expect(code).toMatchInlineSnapshot(`
+      "=== /fixtures/ftl/en/importer.js.ftl ===
+
+      export default /*#__PURE__*/ {"body":[{"id":"key","value":"Translations for js file","attributes":{}}]}
+      "
+    `)
+  })
 })
diff --git a/src/plugins/external-plugin.ts b/src/plugins/external-plugin.ts
@@ -134,7 +134,7 @@ export const unplugin = createUnplugin((options: ExternalPluginOptions) => {
       if (isFtl(id)) {
         const injectFtl = getInjectFtl(resolvedOptions)
         const result = injectFtl`
-export default /*#__PURE__*/ new FluentResource(${source})
+export default /*#__PURE__*/ ${source}
 `
 
         if (result.error)
diff --git a/src/plugins/ftl/inject.ts b/src/plugins/ftl/inject.ts
@@ -19,7 +19,7 @@ export function getInjectFtl(options: { checkSyntax: boolean, parseFtl: boolean
       throw new Error('Missing source')
 
     if (options.checkSyntax) {
-      const errorsText = getSyntaxErrors(source.replace(/\r\n/g, '\n').trim())
+      const errorsText = getSyntaxErrors(normalize(source))
 
       if (errorsText) {
         return {
@@ -30,7 +30,6 @@ export function getInjectFtl(options: { checkSyntax: boolean, parseFtl: boolean
 
     const magic = new MagicString(source)
     const importString = options.parseFtl === true ? '' : '\nimport { FluentResource } from \'@fluent/bundle\'\n'
-    const localeString = locale == null ? '' : locale
 
     if (source.length === 0) {
       magic.append('undefined')
@@ -43,9 +42,14 @@ export function getInjectFtl(options: { checkSyntax: boolean, parseFtl: boolean
       magic.overwrite(0, source.length, `new FluentResource(${JSON.stringify(normalize(source))})`)
     }
 
-    magic.prepend(importString + template[0] + localeString + template[1])
-    if (template[2] != null)
+    if (template.length === 2) {
+      magic.prepend(importString + template[0])
+      magic.append(template[1])
+    }
+    else if (template.length === 3) {
+      magic.prepend(importString + template[0] + locale + template[1])
       magic.append(template[2])
+    }
 
     return {
       code: {

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ export const unplugin = createUnplugin((options: ExternalPluginOptions) => {`
`134`	`134`	`if (isFtl(id)) {`
`135`	`135`	`const injectFtl = getInjectFtl(resolvedOptions)`
`136`	`136`	const result = injectFtl`
`137`		`-export default /#__PURE__/ new FluentResource(${source})`
	`137`	`+export default /#__PURE__/ ${source}`
`138`	`138`	`
`139`	`139`
`140`	`140`	`if (result.error)`