@discord/intl-loader-core 0.5.2 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discord/intl-loader-core",
-  "version": "0.5.2",
+  "version": "0.6.2",
   "license": "MIT",
   "description": "Core utilities for writing loaders and transformers using @discord/intl",
   "author": "Jon Egeland",
@@ -22,7 +22,7 @@
     "chokidar": "^3.6.0",
     "debug": "^4.3.6",
     "fast-glob": "^3.3.2",
-    "@discord/intl-message-database": "0.5.2"
+    "@discord/intl-message-database": "0.6.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12"

package/src/processing.js

@@ -16,6 +16,26 @@ function debugSourceFile(sourcePath, sourceFile) {
   );
 }
 
+/**
+ *
+ * @param {string} sourcePath Path of the source file being processed, for debug logging
+ * @param {import('@discord/intl-message-database').IntlSourceFile} sourceFile SourceFile object from the database used to find translations.
+ * @param {string} translationsPath Fully-resolved path to the directory for translations.
+ * @returns {Record<string, string>}
+ */
+function buildTranslationsLocaleMap(sourcePath, sourceFile, translationsPath) {
+  if (sourceFile.meta.translate === false) {
+    debug(`[${sourcePath}] translate is set to false, no locale map is needed`);
+    return {};
+  }
+  const map = findAllTranslationFiles(translationsPath);
+  if (map instanceof Error) {
+    debug(`[${sourcePath}] Failed to build locale map: [${map.name}] ${map.message}`);
+    return {};
+  }
+  return map;
+}
+
 /**
  * @param {string} sourcePath
  * @param {string=} sourceContent
@@ -49,13 +69,11 @@ function processDefinitionsFile(sourcePath, sourceContent, options = {}) {
 
   const messageKeys = database.getSourceFileKeyMap(sourcePath);
   const translationsPath = path.resolve(path.dirname(sourcePath), sourceFile.meta.translationsPath);
-  let translationsLocaleMap = findAllTranslationFiles(translationsPath);
-  if (translationsLocaleMap instanceof Error) {
-    debug(
-      `[${sourcePath}] Failed to build translations locale map: [${translationsLocaleMap.name}] ${translationsLocaleMap.message}`,
-    );
-    translationsLocaleMap = {};
-  }
+  const translationsLocaleMap = buildTranslationsLocaleMap(
+    sourcePath,
+    sourceFile,
+    translationsPath,
+  );
 
   if (processTranslations) {
     database.processAllTranslationFiles(translationsLocaleMap);
@@ -121,7 +139,7 @@ function processTranslationsFile(sourcePath, sourceContent, options = {}) {
  * @returns {Buffer | void}
  */
 function precompileFileForLocale(sourcePath, locale, options = {}) {
-  const { format = IntlCompiledMessageFormat.Json, outputFile } = options;
+  const { format = IntlCompiledMessageFormat.KeylessJson, outputFile } = options;
   return outputFile != null
     ? database.precompile(sourcePath, locale, outputFile, format)
     : database.precompileToBuffer(sourcePath, locale, format);

package/src/watcher.js

@@ -35,10 +35,17 @@ function processFile(filePath, assetExtension) {
     // Convert the file name from `.messages.js` to `.compiled.messages.jsona` for output.
     const outputPath = filePath.replace(/\.messages\.js$/, `.compiled.messages.${assetExtension}`);
     const result = processDefinitionsFile(filePath);
-    precompileFileForLocale(filePath, result.locale, { format: IntlCompiledMessageFormat.Json });
+    precompileFileForLocale(filePath, result.locale, {
+      format: IntlCompiledMessageFormat.KeylessJson,
+    });
 
     database.processDefinitionsFile(filePath);
-    database.precompile(filePath, DEFAULT_LOCALE, outputPath, IntlCompiledMessageFormat.Json);
+    database.precompile(
+      filePath,
+      DEFAULT_LOCALE,
+      outputPath,
+      IntlCompiledMessageFormat.KeylessJson,
+    );
     debug(`Wrote definitions to: ${outputPath}`);
   } catch (e) {
     debug('[INTL Error] Failed to compile messages');