fluent-transpiler 0.1.2 → 0.2.0

package/index.js

@@ -68,8 +68,15 @@ export const compile = (src, opts) => {
   }
 
   const types = {
-    Identifier: (data) => {
-      const value = variableNotation[options.variableNotation](data.name)
+    Identifier: (data, parent) => {
+      const value =
+        parent === 'Attribute'
+          ? data.name
+          : variableNotation[options.variableNotation](data.name)
+
+      if (value.includes('-')) {
+        return `'${value}'`
+      }
       // Check for reserved words - TODO add in rest
       if (['const', 'default', 'enum', 'if'].includes(value)) {
         return '_' + value
@@ -77,7 +84,7 @@ export const compile = (src, opts) => {
       return value
     },
     Attribute: (data) => {
-      const key = compileType(data.id)
+      const key = compileType(data.id, data.type)
       const value = compileType(data.value, data.type)
       return `  ${key}: ${value}`
     },
@@ -360,44 +367,44 @@ const formatTime = (value) => {
 */
   if (functions.__formatRelativeTime) {
     output += `
-  const __relativeTimeDiff = (d) => {
-	const msPerMinute = 60 * 1000
-	const msPerHour = msPerMinute * 60
-	const msPerDay = msPerHour * 24
-	const msPerWeek = msPerDay * 7
-	const msPerMonth = msPerDay * 30
-	const msPerYear = msPerDay * 365.25
-	const elapsed = d - new Date()
-  
-	if (Math.abs(elapsed) < msPerMinute) {
-	  return [Math.round(elapsed / 1000), 'second']
-	}
-	if (Math.abs(elapsed) < msPerHour) {
-	  return [Math.round(elapsed / msPerMinute), 'minute']
-	}
-	if (Math.abs(elapsed) < msPerDay) {
-	  return [Math.round(elapsed / msPerHour), 'hour']
-	}
-	if (Math.abs(elapsed) < msPerWeek * 2) {
-	  return [Math.round(elapsed / msPerDay), 'day']
-	}
-	if (Math.abs(elapsed) < msPerMonth) {
-	  return [Math.round(elapsed / msPerWeek), 'week']
-	}
-	if (Math.abs(elapsed) < msPerYear) {
-	  return [Math.round(elapsed / msPerMonth), 'month']
-	}
-	return [Math.round(elapsed / msPerYear), 'year']
+const __relativeTimeDiff = (d) => {
+  const msPerMinute = 60 * 1000
+  const msPerHour = msPerMinute * 60
+  const msPerDay = msPerHour * 24
+  const msPerWeek = msPerDay * 7
+  const msPerMonth = msPerDay * 30
+  const msPerYear = msPerDay * 365.25
+  const elapsed = d - new Date()
+	
+  if (Math.abs(elapsed) < msPerMinute) {
+    return [Math.round(elapsed / 1000), 'second']
+  }
+  if (Math.abs(elapsed) < msPerHour) {
+  	return [Math.round(elapsed / msPerMinute), 'minute']
+  }
+  if (Math.abs(elapsed) < msPerDay) {
+  	return [Math.round(elapsed / msPerHour), 'hour']
+  }
+  if (Math.abs(elapsed) < msPerWeek * 2) {
+  	return [Math.round(elapsed / msPerDay), 'day']
   }
-  const __formatRelativeTime = (value, options) => {
-	  if (typeof value === 'string') value = new Date(value)
-	  if (isNaN(value.getTime())) return value
-	  try {
-		const [duration, unit] = __relativeTimeDiff(value)
-		return new Intl.RelativeTimeFormat(lang, options).format(duration, unit)
-	  } catch (e) {}
-	  return new Intl.DateTimeFormat(__locales, options).format(value)
+  if (Math.abs(elapsed) < msPerMonth) {
+  	return [Math.round(elapsed / msPerWeek), 'week']
   }
+  if (Math.abs(elapsed) < msPerYear) {
+  	return [Math.round(elapsed / msPerMonth), 'month']
+  }
+  return [Math.round(elapsed / msPerYear), 'year']
+}
+const __formatRelativeTime = (value, options) => {
+  if (typeof value === 'string') value = new Date(value)
+  if (isNaN(value.getTime())) return value
+  try {
+	const [duration, unit] = __relativeTimeDiff(value)
+	return new Intl.RelativeTimeFormat(__locales, options).format(duration, unit)
+  } catch (e) {}
+  return new Intl.DateTimeFormat(__locales, options).format(value)
+}
   `
   }
   if (functions.__formatDateTime) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fluent-transpiler",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Transpile Fluent (ftl) files into optimized, tree-shakable, JavaScript EcmaScript Modules (esm).",
   "main": "index.js",
   "type": "module",