fluent-transpiler 0.0.0 → 0.0.1

package/index.js

@@ -82,7 +82,7 @@ export const compile = (src, opts) => {
 		Term: (data) => {
 			const  assignment = compileAssignment(data.id)
 			const templateStringLiteral = compileType(data.value)
-			metadata[variable].term = true
+			metadata[assignment].term = true
 			if (metadata[assignment].params) {
 				return `const ${assignment} = (${options.params}) => ${templateStringLiteral}\n`
 			}
@@ -185,14 +185,25 @@ export const compile = (src, opts) => {
 		},
 		TermReference: (data) => {
 			const termName = compileType(data.id)
-			const {named} = compileFunctionArguments(data)
+			metadata[variable].params ||= metadata[termName].params
+			
+			let params
+			if (metadata[termName].params) {
+				let {named} = compileFunctionArguments(data)
+				named = JSON.stringify(named)
+				if (named) {
+					params = `{ ...${options.params}, ${named.substring(1, named.length-1)} }`
+				} else {
+					params = options.params
+				}
+			}
 			if (!options.disableMinify) {
 				if (metadata[termName].params) {
-					return `${termName}(${JSON.stringify(named)})`
+					return `${termName}(${params})`
 				}
 				return `${termName}`
 			}
-			return `${termName}(${named ? JSON.stringify(named) : ''})`
+			return `${termName}(${params ? params : ''})`
 		},
 		NamedArgument:(data) => {
 			// Inconsistent: `NamedArgument` uses `name` instead of `id` for Identifier
@@ -245,7 +256,6 @@ export const compile = (src, opts) => {
 	}
 	
 	const {body} = parse(src)
-	
 	let translations = ``
 	for(const data of body) {
 		translations += compileType(data)

package/package.json

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

package/test/files/index.ftl

@@ -15,6 +15,10 @@ replaceTerm = term: { -term }.
     }
 parameterized-terms = Informacje o { -brand-name(case: "locative") }.
 
+
+-term-with-var = {$number}
+termWithVariable = {-term-with-var}
+
 ### Message References
 messageValue = message: { replaceTerm }
 messageNestedParamValue = message: { replaceParam }
@@ -105,6 +109,8 @@ selectorNumberOrdinal =
    *[other] There are { $number } (other).
 }
 
+subSelector = {selectorNumberOrdinal}
+
 ## Attributes
 loginInput = Predefined value
   .placeholder = email@example.com

package/test/files/index.mjs

@@ -33,7 +33,9 @@ const brandName = (params) => `${__select(
     },
     `Firefox`
   )}`
-export const parameterizedTerms = `Informacje o ${brandName({"case":"locative"})}.`
+export const parameterizedTerms = (params) => `Informacje o ${brandName({ ...params, "case":"locative" })}.`
+const termWithVar = (params) => `${params?.number}`
+export const termWithVariable = (params) => `${termWithVar(params)}`
 // ### Message References
 export const messageValue = `message: ${replaceTerm}`
 export const messageNestedParamValue = (params) => `message: ${replaceParam(params)}`
@@ -96,6 +98,7 @@ export const selectorNumberOrdinal = (params) => `${__select(
     },
     `There are ${__formatVariable(params?.number)} (other).`
   )}`
+export const subSelector = (params) => `${selectorNumberOrdinal(params)}`
 // ## Attributes
 export const loginInput = {
   value: `Predefined value`,
@@ -112,7 +115,7 @@ ${".attr = Value"} on a new line.`,
     attr: `An actual attribute (not part of the text value above)`
   }
 }
-const __exports = {text, replaceParam, replaceTerm, 'parameterized-terms':parameterizedTerms, messageValue, messageNestedParamValue, openingBrace, closingBrace, blankIsRemoved, blankIsPreserved, leadingBracket, literalQuote, literalEscapedQuote, privacyLabel, dash, dashUnicode, emoji, emojiUnicode, singleLine, multiLine, block, leadingBlankSpaces, leadingBlankLines, blankLines, multiLineIndent, timeElapsed, todayIs, selectorNumberCardinal, selectorNumberOrdinal, loginInput, attributeHowTo}
+const __exports = {text, replaceParam, replaceTerm, 'parameterized-terms':parameterizedTerms, termWithVariable, messageValue, messageNestedParamValue, openingBrace, closingBrace, blankIsRemoved, blankIsPreserved, leadingBracket, literalQuote, literalEscapedQuote, privacyLabel, dash, dashUnicode, emoji, emojiUnicode, singleLine, multiLine, block, leadingBlankSpaces, leadingBlankLines, blankLines, multiLineIndent, timeElapsed, todayIs, selectorNumberCardinal, selectorNumberOrdinal, subSelector, loginInput, attributeHowTo}
 
 export default (id, params) => {
 	const source = __exports[id] ?? __exports['_'+id]