@twin.org/merge-locales 0.0.1-next.6 → 0.0.1-next.8

package/dist/cjs/index.cjs

@@ -85,13 +85,14 @@ async function mergeLocales(workingDirectory, config) {
     }
     cliCore.CLIDisplay.break();
     const localeDictionaries = {};
-    if (core.Is.stringValue(packageJson.name)) {
-        await mergePackageLocales(path.join(workingDirectory, "locales"), packageJson.name, locales, localeDictionaries);
-    }
     for (const packageName of packageNames) {
         const packageLocalDirectory = path.join(npmRoot, packageName, "locales");
         await mergePackageLocales(packageLocalDirectory, packageName, locales, localeDictionaries);
     }
+    // Merge the main package last so that it can override any other packages.
+    if (core.Is.stringValue(packageJson.name)) {
+        await mergePackageLocales(path.join(workingDirectory, "locales"), packageJson.name, locales, localeDictionaries);
+    }
     cliCore.CLIDisplay.break();
     cliCore.CLIDisplay.task(core.I18n.formatMessage("commands.merge-locales.progress.writingMergedLocales"));
     for (const localeDictionary in localeDictionaries) {
@@ -165,11 +166,11 @@ class CLI extends cliCore.CLIBase {
         return this.execute({
             title: "TWIN Merge Locales",
             appName: "merge-locales",
-            version: "0.0.1-next.6",
+            version: "0.0.1-next.8",
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth
-        }, localesDirectory ?? path.join(path.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)))), "../locales"), argv);
+        }, localesDirectory ?? path.join(path.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)))), "../locales"), argv);
     }
     /**
      * Configure any options or actions at the root program level.

package/dist/esm/index.mjs

@@ -82,13 +82,14 @@ async function mergeLocales(workingDirectory, config) {
     }
     CLIDisplay.break();
     const localeDictionaries = {};
-    if (Is.stringValue(packageJson.name)) {
-        await mergePackageLocales(path.join(workingDirectory, "locales"), packageJson.name, locales, localeDictionaries);
-    }
     for (const packageName of packageNames) {
         const packageLocalDirectory = path.join(npmRoot, packageName, "locales");
         await mergePackageLocales(packageLocalDirectory, packageName, locales, localeDictionaries);
     }
+    // Merge the main package last so that it can override any other packages.
+    if (Is.stringValue(packageJson.name)) {
+        await mergePackageLocales(path.join(workingDirectory, "locales"), packageJson.name, locales, localeDictionaries);
+    }
     CLIDisplay.break();
     CLIDisplay.task(I18n.formatMessage("commands.merge-locales.progress.writingMergedLocales"));
     for (const localeDictionary in localeDictionaries) {
@@ -162,7 +163,7 @@ class CLI extends CLIBase {
         return this.execute({
             title: "TWIN Merge Locales",
             appName: "merge-locales",
-            version: "0.0.1-next.6",
+            version: "0.0.1-next.8",
             icon: "⚙️ ",
             supportsEnvFiles: false,
             overrideOutputWidth: options?.overrideOutputWidth

package/dist/locales/en.json

@@ -1,9 +1,6 @@
 {
   "error": {
     "commands": {
-      "merge-locales": {
-        "configFailed": "Configuration failed to load."
-      },
       "common": {
         "missingEnv": "The \"{option}\" option is configured as an environment variable, but there is no environment variable with the name \"{value}\" set.",
         "optionInvalidHex": "The \"{option}\" does not appear to be hex. \"{value}\"",
@@ -12,6 +9,9 @@
         "optionInvalidBech32": "The \"{option}\" does not appear to be bech32. \"{value}\"",
         "optionMinValue": "The \"{option}\" option must be greater than or equal to {minValue}, it is {value}.",
         "optionMaxValue": "The \"{option}\" option must be less than or equal to {maxValue}, it is {value}."
+      },
+      "merge-locales": {
+        "configFailed": "Configuration failed to load."
       }
     },
     "validation": {
@@ -159,31 +159,6 @@
       "invalidSeed": "The seed is invalid \"{seed}\""
     }
   },
-  "commands": {
-    "merge-locales": {
-      "options": {
-        "config": {
-          "param": "--config '<'file'>'",
-          "description": "Path to the JSON configuration file."
-        }
-      },
-      "progress": {
-        "loadingConfigJson": "Loading Config JSON",
-        "creatingOutputDirectory": "Creating Output Directory",
-        "writingMergedLocales": "Writing Merged Locales",
-        "mergingLocalesForPackage": "Merging Locales for Package"
-      },
-      "labels": {
-        "configJson": "Config JSON",
-        "workingDirectory": "Working Directory",
-        "outputDirectory": "Output Directory",
-        "npmRoot": "NPM Root",
-        "sourcePackages": "Source Packages",
-        "writingLocale": "Writing Locale",
-        "mergingLocale": "Merging Locale"
-      }
-    }
-  },
   "cli": {
     "progress": {
       "done": "Done.",
@@ -240,5 +215,30 @@
   },
   "validation": {
     "defaultFieldName": "The field"
+  },
+  "commands": {
+    "merge-locales": {
+      "options": {
+        "config": {
+          "param": "--config '<'file'>'",
+          "description": "Path to the JSON configuration file."
+        }
+      },
+      "progress": {
+        "loadingConfigJson": "Loading Config JSON",
+        "creatingOutputDirectory": "Creating Output Directory",
+        "writingMergedLocales": "Writing Merged Locales",
+        "mergingLocalesForPackage": "Merging Locales for Package"
+      },
+      "labels": {
+        "configJson": "Config JSON",
+        "workingDirectory": "Working Directory",
+        "outputDirectory": "Output Directory",
+        "npmRoot": "NPM Root",
+        "sourcePackages": "Source Packages",
+        "writingLocale": "Writing Locale",
+        "mergingLocale": "Merging Locale"
+      }
+    }
   }
 }

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/ts-to-openapi - Changelog
 
-## v0.0.1-next.6
+## v0.0.1-next.8
 
 - Initial Release

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/merge-locales",
-	"version": "0.0.1-next.6",
+	"version": "0.0.1-next.8",
 	"description": "Tool to merge locale files from all dependencies",
 	"repository": {
 		"type": "git",
@@ -16,7 +16,7 @@
 	"dependencies": {
 		"@twin.org/cli-core": "next",
 		"@twin.org/core": "next",
-		"@twin.org/nameof": "0.0.1-next.6",
+		"@twin.org/nameof": "0.0.1-next.8",
 		"commander": "12.1.0",
 		"glob": "11.0.0"
 	},