@vocab/core 1.2.3 → 1.2.5

package/dist/vocab-core.cjs.dev.js

@@ -449,36 +449,36 @@ function extractHasTags(ast) {
     return icuMessageformatParser.isTagElement(element);
   });
 }
-function extractParamTypes(ast) {
-  let params = {};
+function extractParamTypes(ast, currentParams) {
+  let params = {
+    ...currentParams
+  };
   let vocabTypesImports = new Set();
   for (const element of ast) {
     if (icuMessageformatParser.isArgumentElement(element)) {
-      params[element.value] = 'string';
+      if (!(element.value in params)) {
+        // Preserve existing types for parameters that we've already parsed
+        // This applies to self-referential parameters, for example `{foo, plural, 1 {{foo} thing} other {{foo} things}}`
+        params[element.value] = 'string';
+      }
     } else if (icuMessageformatParser.isNumberElement(element)) {
       params[element.value] = 'number';
     } else if (icuMessageformatParser.isPluralElement(element)) {
       params[element.value] = 'number';
       const children = Object.values(element.options).map(o => o.value);
       for (const child of children) {
-        const [subParams, subImports] = extractParamTypes(child);
+        const [newParams, subImports] = extractParamTypes(child, params);
         vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-        params = {
-          ...params,
-          ...subParams
-        };
+        params = newParams;
       }
     } else if (icuMessageformatParser.isDateElement(element) || icuMessageformatParser.isTimeElement(element)) {
       params[element.value] = 'Date | number';
     } else if (icuMessageformatParser.isTagElement(element)) {
       params[element.value] = 'FormatXMLElementFn<T>';
       vocabTypesImports.add('FormatXMLElementFn');
-      const [subParams, subImports] = extractParamTypes(element.children);
+      const [newParams, subImports] = extractParamTypes(element.children, params);
       vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-      params = {
-        ...params,
-        ...subParams
-      };
+      params = newParams;
     } else if (icuMessageformatParser.isSelectElement(element)) {
       const options = Object.keys(element.options);
 
@@ -489,12 +489,9 @@ function extractParamTypes(ast) {
       vocabTypesImports.add('StringWithSuggestions');
       const children = Object.values(element.options).map(o => o.value);
       for (const child of children) {
-        const [subParams, subImports] = extractParamTypes(child);
+        const [newParams, subImports] = extractParamTypes(child, params);
         vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-        params = {
-          ...params,
-          ...subParams
-        };
+        params = newParams;
       }
     }
   }
@@ -513,6 +510,9 @@ function serialiseObjectToType(v) {
 }
 const banner = `// This file is automatically generated by Vocab.\n// To make changes update translation.json files directly.`;
 const serializeModuleImports = (imports, moduleName) => {
+  if (imports.size === 0) {
+    return '';
+  }
   const importNames = Array.from(imports);
   return `import { ${Array.from(importNames).join(', ')} } from '${moduleName}'`;
 };
@@ -536,8 +536,8 @@ function serialiseTranslationRuntime(value, imports, loadedTranslation) {
   const languagesUnionAsString = Object.keys(loadedTranslation.languages).map(l => `'${l}'`).join(' | ');
   return `${banner}
 
-  ${serializeModuleImports(imports, '@vocab/types')}
   import { createLanguage, createTranslationFile } from '@vocab/core/runtime';
+  ${serializeModuleImports(imports, '@vocab/types')}
 
   const translations = createTranslationFile<${languagesUnionAsString}, ${serialiseObjectToType(translationsType)}>({${content}});
 
@@ -559,12 +559,9 @@ async function generateRuntime(loadedTranslation) {
       if (translatedLanguage[key]) {
         const ast = icuMessageformatParser.parse(translatedLanguage[key].message);
         hasTags = hasTags || extractHasTags(ast);
-        const [parsedParams, vocabTypesImports] = extractParamTypes(ast);
+        const [parsedParams, vocabTypesImports] = extractParamTypes(ast, params);
         imports = new Set([...imports, ...vocabTypesImports]);
-        params = {
-          ...params,
-          ...parsedParams
-        };
+        params = parsedParams;
         messages.add(`'${encodeWithinSingleQuotes(translatedLanguage[key].message)}'`);
       }
     }

package/dist/vocab-core.cjs.prod.js

@@ -449,36 +449,36 @@ function extractHasTags(ast) {
     return icuMessageformatParser.isTagElement(element);
   });
 }
-function extractParamTypes(ast) {
-  let params = {};
+function extractParamTypes(ast, currentParams) {
+  let params = {
+    ...currentParams
+  };
   let vocabTypesImports = new Set();
   for (const element of ast) {
     if (icuMessageformatParser.isArgumentElement(element)) {
-      params[element.value] = 'string';
+      if (!(element.value in params)) {
+        // Preserve existing types for parameters that we've already parsed
+        // This applies to self-referential parameters, for example `{foo, plural, 1 {{foo} thing} other {{foo} things}}`
+        params[element.value] = 'string';
+      }
     } else if (icuMessageformatParser.isNumberElement(element)) {
       params[element.value] = 'number';
     } else if (icuMessageformatParser.isPluralElement(element)) {
       params[element.value] = 'number';
       const children = Object.values(element.options).map(o => o.value);
       for (const child of children) {
-        const [subParams, subImports] = extractParamTypes(child);
+        const [newParams, subImports] = extractParamTypes(child, params);
         vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-        params = {
-          ...params,
-          ...subParams
-        };
+        params = newParams;
       }
     } else if (icuMessageformatParser.isDateElement(element) || icuMessageformatParser.isTimeElement(element)) {
       params[element.value] = 'Date | number';
     } else if (icuMessageformatParser.isTagElement(element)) {
       params[element.value] = 'FormatXMLElementFn<T>';
       vocabTypesImports.add('FormatXMLElementFn');
-      const [subParams, subImports] = extractParamTypes(element.children);
+      const [newParams, subImports] = extractParamTypes(element.children, params);
       vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-      params = {
-        ...params,
-        ...subParams
-      };
+      params = newParams;
     } else if (icuMessageformatParser.isSelectElement(element)) {
       const options = Object.keys(element.options);
 
@@ -489,12 +489,9 @@ function extractParamTypes(ast) {
       vocabTypesImports.add('StringWithSuggestions');
       const children = Object.values(element.options).map(o => o.value);
       for (const child of children) {
-        const [subParams, subImports] = extractParamTypes(child);
+        const [newParams, subImports] = extractParamTypes(child, params);
         vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-        params = {
-          ...params,
-          ...subParams
-        };
+        params = newParams;
       }
     }
   }
@@ -513,6 +510,9 @@ function serialiseObjectToType(v) {
 }
 const banner = `// This file is automatically generated by Vocab.\n// To make changes update translation.json files directly.`;
 const serializeModuleImports = (imports, moduleName) => {
+  if (imports.size === 0) {
+    return '';
+  }
   const importNames = Array.from(imports);
   return `import { ${Array.from(importNames).join(', ')} } from '${moduleName}'`;
 };
@@ -536,8 +536,8 @@ function serialiseTranslationRuntime(value, imports, loadedTranslation) {
   const languagesUnionAsString = Object.keys(loadedTranslation.languages).map(l => `'${l}'`).join(' | ');
   return `${banner}
 
-  ${serializeModuleImports(imports, '@vocab/types')}
   import { createLanguage, createTranslationFile } from '@vocab/core/runtime';
+  ${serializeModuleImports(imports, '@vocab/types')}
 
   const translations = createTranslationFile<${languagesUnionAsString}, ${serialiseObjectToType(translationsType)}>({${content}});
 
@@ -559,12 +559,9 @@ async function generateRuntime(loadedTranslation) {
       if (translatedLanguage[key]) {
         const ast = icuMessageformatParser.parse(translatedLanguage[key].message);
         hasTags = hasTags || extractHasTags(ast);
-        const [parsedParams, vocabTypesImports] = extractParamTypes(ast);
+        const [parsedParams, vocabTypesImports] = extractParamTypes(ast, params);
         imports = new Set([...imports, ...vocabTypesImports]);
-        params = {
-          ...params,
-          ...parsedParams
-        };
+        params = parsedParams;
         messages.add(`'${encodeWithinSingleQuotes(translatedLanguage[key].message)}'`);
       }
     }

package/dist/vocab-core.esm.js

@@ -433,36 +433,36 @@ function extractHasTags(ast) {
     return isTagElement(element);
   });
 }
-function extractParamTypes(ast) {
-  let params = {};
+function extractParamTypes(ast, currentParams) {
+  let params = {
+    ...currentParams
+  };
   let vocabTypesImports = new Set();
   for (const element of ast) {
     if (isArgumentElement(element)) {
-      params[element.value] = 'string';
+      if (!(element.value in params)) {
+        // Preserve existing types for parameters that we've already parsed
+        // This applies to self-referential parameters, for example `{foo, plural, 1 {{foo} thing} other {{foo} things}}`
+        params[element.value] = 'string';
+      }
     } else if (isNumberElement(element)) {
       params[element.value] = 'number';
     } else if (isPluralElement(element)) {
       params[element.value] = 'number';
       const children = Object.values(element.options).map(o => o.value);
       for (const child of children) {
-        const [subParams, subImports] = extractParamTypes(child);
+        const [newParams, subImports] = extractParamTypes(child, params);
         vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-        params = {
-          ...params,
-          ...subParams
-        };
+        params = newParams;
       }
     } else if (isDateElement(element) || isTimeElement(element)) {
       params[element.value] = 'Date | number';
     } else if (isTagElement(element)) {
       params[element.value] = 'FormatXMLElementFn<T>';
       vocabTypesImports.add('FormatXMLElementFn');
-      const [subParams, subImports] = extractParamTypes(element.children);
+      const [newParams, subImports] = extractParamTypes(element.children, params);
       vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-      params = {
-        ...params,
-        ...subParams
-      };
+      params = newParams;
     } else if (isSelectElement(element)) {
       const options = Object.keys(element.options);
 
@@ -473,12 +473,9 @@ function extractParamTypes(ast) {
       vocabTypesImports.add('StringWithSuggestions');
       const children = Object.values(element.options).map(o => o.value);
       for (const child of children) {
-        const [subParams, subImports] = extractParamTypes(child);
+        const [newParams, subImports] = extractParamTypes(child, params);
         vocabTypesImports = new Set([...vocabTypesImports, ...subImports]);
-        params = {
-          ...params,
-          ...subParams
-        };
+        params = newParams;
       }
     }
   }
@@ -497,6 +494,9 @@ function serialiseObjectToType(v) {
 }
 const banner = `// This file is automatically generated by Vocab.\n// To make changes update translation.json files directly.`;
 const serializeModuleImports = (imports, moduleName) => {
+  if (imports.size === 0) {
+    return '';
+  }
   const importNames = Array.from(imports);
   return `import { ${Array.from(importNames).join(', ')} } from '${moduleName}'`;
 };
@@ -520,8 +520,8 @@ function serialiseTranslationRuntime(value, imports, loadedTranslation) {
   const languagesUnionAsString = Object.keys(loadedTranslation.languages).map(l => `'${l}'`).join(' | ');
   return `${banner}
 
-  ${serializeModuleImports(imports, '@vocab/types')}
   import { createLanguage, createTranslationFile } from '@vocab/core/runtime';
+  ${serializeModuleImports(imports, '@vocab/types')}
 
   const translations = createTranslationFile<${languagesUnionAsString}, ${serialiseObjectToType(translationsType)}>({${content}});
 
@@ -543,12 +543,9 @@ async function generateRuntime(loadedTranslation) {
       if (translatedLanguage[key]) {
         const ast = parse(translatedLanguage[key].message);
         hasTags = hasTags || extractHasTags(ast);
-        const [parsedParams, vocabTypesImports] = extractParamTypes(ast);
+        const [parsedParams, vocabTypesImports] = extractParamTypes(ast, params);
         imports = new Set([...imports, ...vocabTypesImports]);
-        params = {
-          ...params,
-          ...parsedParams
-        };
+        params = parsedParams;
         messages.add(`'${encodeWithinSingleQuotes(translatedLanguage[key].message)}'`);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vocab/core",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "main": "dist/vocab-core.cjs.js",
   "module": "dist/vocab-core.esm.js",
   "exports": {