chore: replace @fluent/bundle to @fluent/syntax

Author: macabeus

package-lock.json

@@ -17,7 +17,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@fluent/bundle": "0.15.1",
+    "@fluent/syntax": "0.15.0",
     "chokidar": "3.4.0",
     "dedent-js": "1.0.1",
     "loader-utils": "2.0.0"

package.json

@@ -1,6 +1,9 @@
-const buildTypeMessagesKey = (resource) => {
-  const interfaceFields = resource
-    .map(message => `'${message.id}'`)
+const buildTypeMessagesKey = (ast) => {
+  const messages = ast.body
+    .filter(node => node.type === 'Message')
+
+  const interfaceFields = messages
+    .map(message => `'${message.id.name}'`)
     .join(' |\n')
 
   return `type MessagesKey = ${interfaceFields}`

src/build-type-messages-key.js

@@ -1,38 +1,30 @@
 import dedent from 'dedent-js'
 
-const messageVariables = (message) => {
-  if (typeof message.value === 'string') {
-    return []
-  }
-
-  const variables = message.value.reduce(
-    (acc, current) => current.type === 'var'
-      ? [...acc, current.name]
-      : acc
-    , []
-  )
-
-  return variables
-}
+const messageVariablesName = (message) =>
+  message.value.elements
+    .filter(element => element.type === 'Placeable')
+    .filter(placeable => placeable.expression.type === 'VariableReference')
+    .map(placeable => placeable.expression.id.name)
 
 const wrapVariables = variables => variables.map(i => `'${i}': string | number`)
 
 const hasVariables = variables => variables.length > 0
 
-const buildTypePatternArguments = (resource) => {
-  const options = resource
+const buildTypePatternArguments = (ast) => {
+  const messages = ast.body
+  const options = messages
     .map(message => {
-      const variables = messageVariables(message)
+      const variablesName = messageVariablesName(message)
 
-      if (hasVariables(variables)) {
+      if (hasVariables(variablesName)) {
         return dedent`
-          T extends '${message.id}'
-            ? [{ ${wrapVariables(messageVariables(message)).join(',')} }]
+          T extends '${message.id.name}'
+            ? [{ ${wrapVariables(variablesName).join(',')} }]
         `
       }
 
       return dedent`
-        T extends '${message.id}'
+        T extends '${message.id.name}'
           ? []
       `
     }).join(':\n')

src/build-type-pattern-arguments.js

@@ -1,15 +1,17 @@
-import { FluentResource } from '@fluent/bundle'
+import { FluentParser } from '@fluent/syntax'
 import dedent from 'dedent-js'
 import buildHeader from './build-header'
 import buildTypeMessagesKey from './build-type-messages-key'
 import buildTypePatternArguments from './build-type-pattern-arguments'
 
 const buildFluentTypeModule = (content) => {
-  const resource = (new FluentResource(content)).body
+  const parser = new FluentParser({ withSpans: false })
+  const ast = parser.parse(content)
+
   const fluentTypeModule = dedent`
     ${buildHeader()}
-    ${buildTypeMessagesKey(resource)}
-    ${buildTypePatternArguments(resource)}
+    ${buildTypeMessagesKey(ast)}
+    ${buildTypePatternArguments(ast)}
   `
 
   return fluentTypeModule