Reuse code for finding syntax errors

Demivan · Demivan · commit dd77a09f4b18 · 2024-11-16T17:59:55.000+02:00
diff --git a/src/loader-query.ts b/src/loader-query.ts
@@ -17,13 +17,13 @@ export function parseVueRequest(id: string) {
     ret.type = params.get('type') as VueQuery['type']
 
   if (params.has('blockType'))
-    ret.blockType = params.get('blockType')
+    ret.blockType = params.get('blockType') ?? undefined
 
   if (params.has('index'))
     ret.index = Number(params.get('index'))
 
   if (params.has('locale'))
-    ret.locale = params.get('locale')
+    ret.locale = params.get('locale') ?? undefined
 
   return {
     filename,
diff --git a/src/plugins/external-plugin.ts b/src/plugins/external-plugin.ts
@@ -8,7 +8,6 @@ import MagicString from 'magic-string'
 import { createUnplugin } from 'unplugin'
 import { isCustomBlock, parseVueRequest } from '../loader-query'
 import { getInjectFtl } from './ftl/inject'
-import { getSyntaxErrors } from './ftl/parse'
 
 const isVue = createFilter(['**/*.vue'])
 const isFtl = createFilter(['**/*.ftl'])
@@ -42,6 +41,7 @@ function isFluentCustomBlock(id: string) {
 export const unplugin = createUnplugin((options: ExternalPluginOptions) => {
   const resolvedOptions = {
     checkSyntax: true,
+    parseFtl: false,
     virtualModuleName: 'virtual:ftl-for-file',
     getFtlPath: undefined as ((locale: string, vuePath: string) => string) | undefined,
     ...options,
@@ -132,46 +132,32 @@ export const unplugin = createUnplugin((options: ExternalPluginOptions) => {
       }
 
       if (isFtl(id)) {
-        if (resolvedOptions.checkSyntax) {
-          const errorsText = getSyntaxErrors(source)
-          if (errorsText)
-            this.error(errorsText)
-        }
-
         const injectFtl = getInjectFtl(resolvedOptions)
-
         const result = injectFtl`
 export default /*#__PURE__*/ new FluentResource(${source})
 `
 
-        return {
-          code: result.toString(),
-          map: result.generateMap(),
-        }
+        if (result.error)
+          this.error(result.error)
+
+        return result.code
       }
 
       const query = parseVueRequest(id).query
       if (isFluentCustomBlock(id)) {
-        if (options.checkSyntax) {
-          const errorsText = getSyntaxErrors(source)
-          if (errorsText)
-            this.error(errorsText)
-        }
-
         const injectFtl = getInjectFtl(resolvedOptions)
-
-        const magic = injectFtl`
+        const result = injectFtl`
 export default function (Component) {
   const target = Component.options || Component
   target.fluent = target.fluent || {}
   target.fluent['${query.locale}'] = ${source}
 }
 `
 
-        return {
-          code: magic.toString(),
-          map: magic.generateMap(),
-        }
+        if (result.error)
+          this.error(result.error)
+
+        return result.code
       }
 
       return undefined
diff --git a/src/plugins/ftl/inject.ts b/src/plugins/ftl/inject.ts
@@ -1,13 +1,14 @@
 import { FluentResource } from '@fluent/bundle'
-import MagicString from 'magic-string'
+import MagicString, { type SourceMap } from 'magic-string'
+import { getSyntaxErrors } from './parse'
 
-type InjectFtlFn = (template: TemplateStringsArray, locale?: string, source?: string) => MagicString
+type InjectFtlFn = (template: TemplateStringsArray, locale?: string, source?: string) => { code?: { code: string, map: SourceMap }, error?: string }
 
 function normalize(str: string) {
   return str.replace(/\r\n/g, '\n').trim()
 }
 
-export function getInjectFtl(options: { parseFtl?: boolean }): InjectFtlFn {
+export function getInjectFtl(options: { checkSyntax: boolean, parseFtl: boolean }): InjectFtlFn {
   return (template, locale, source) => {
     if (source == null) {
       source = locale
@@ -17,6 +18,16 @@ export function getInjectFtl(options: { parseFtl?: boolean }): InjectFtlFn {
     if (source == null)
       throw new Error('Missing source')
 
+    if (options.checkSyntax) {
+      const errorsText = getSyntaxErrors(source.replace(/\r\n/g, '\n').trim())
+
+      if (errorsText) {
+        return {
+          error: errorsText,
+        }
+      }
+    }
+
     const magic = new MagicString(source)
     const importString = options.parseFtl === true ? '' : '\nimport { FluentResource } from \'@fluent/bundle\'\n'
     const localeString = locale == null ? '' : locale
@@ -36,6 +47,11 @@ export function getInjectFtl(options: { parseFtl?: boolean }): InjectFtlFn {
     if (template[2] != null)
       magic.append(template[2])
 
-    return magic
+    return {
+      code: {
+        code: magic.toString(),
+        map: magic.generateMap(),
+      },
+    }
   }
 }
diff --git a/src/plugins/sfc-plugin.ts b/src/plugins/sfc-plugin.ts
@@ -5,12 +5,12 @@ import { createUnplugin } from 'unplugin'
 
 import { isCustomBlock, parseVueRequest } from '../loader-query'
 import { getInjectFtl } from './ftl/inject'
-import { getSyntaxErrors } from './ftl/parse'
 
 export const unplugin = createUnplugin((options: SFCPluginOptions, meta) => {
   const resolvedOptions = {
     blockType: 'fluent',
     checkSyntax: true,
+    parseFtl: false,
     ...options,
   }
 
@@ -37,14 +37,7 @@ export const unplugin = createUnplugin((options: SFCPluginOptions, meta) => {
       if (source.includes('FluentResource') || source.includes('unplugin-fluent-vue-sfc') || source.includes('target.fluent'))
         return undefined
 
-      if (resolvedOptions.checkSyntax) {
-        const errorsText = getSyntaxErrors(source.replace(/\r\n/g, '\n').trim())
-        if (errorsText)
-          this.error(errorsText)
-      }
-
       const injectFtl = getInjectFtl(resolvedOptions)
-
       const result = injectFtl`
 export default function (Component) {
   const target = Component.options || Component
@@ -53,10 +46,10 @@ export default function (Component) {
 }
 `
 
-      return {
-        code: result.toString(),
-        map: result.generateMap(),
-      }
+      if (result.error)
+        this.error(result.error)
+
+      return result.code
     },
   }
 })
