@gunshi/plugin-i18n 0.29.3 → 0.29.5

package/lib/index.js

@@ -1,16 +1,5 @@
 import { plugin } from "@gunshi/plugin";
-
-//#region ../shared/src/constants.ts
-/**
-* @author kazuya kawaguchi (a.k.a. kazupon)
-* @license MIT
-*/
-const BUILT_IN_PREFIX = "_";
-const PLUGIN_PREFIX = "g";
-const ARG_PREFIX = "arg";
-const BUILT_IN_KEY_SEPARATOR = ":";
-const BUILD_IN_PREFIX_AND_KEY_SEPARATOR = `${BUILT_IN_PREFIX}${BUILT_IN_KEY_SEPARATOR}`;
-const ARG_PREFIX_AND_KEY_SEPARATOR = `${ARG_PREFIX}${BUILT_IN_KEY_SEPARATOR}`;
+const ARG_PREFIX_AND_KEY_SEPARATOR = `arg:`;
 const COMMON_ARGS = {
 	help: {
 		type: "boolean",
@@ -23,7 +12,6 @@ const COMMON_ARGS = {
 		description: "Display this version"
 	}
 };
-
 //#endregion
 //#region ../resources/locales/en-US.json
 var en_US_default = {
@@ -41,7 +29,6 @@ var en_US_default = {
 	help: "Display this help message",
 	version: "Display this version"
 };
-
 //#endregion
 //#region ../shared/src/utils.ts
 /**
@@ -55,7 +42,7 @@ var en_US_default = {
 * @returns Prefixed built-in key.
 */
 function resolveBuiltInKey(key) {
-	return `${BUILT_IN_PREFIX}${BUILT_IN_KEY_SEPARATOR}${key}`;
+	return `_:${key}`;
 }
 /**
 * Resolve a namespaced key for argument resources.
@@ -70,7 +57,7 @@ function resolveBuiltInKey(key) {
 * @returns Prefixed argument key.
 */
 function resolveArgKey(key, name) {
-	return `${name ? `${name}${BUILT_IN_KEY_SEPARATOR}` : ""}${ARG_PREFIX}${BUILT_IN_KEY_SEPARATOR}${key}`;
+	return `${name ? `${name}:` : ""}arg:${key}`;
 }
 /**
 * Resolve a namespaced key for non-built-in resources.
@@ -84,7 +71,7 @@ function resolveArgKey(key, name) {
 * @returns Prefixed non-built-in key.
 */
 function resolveKey(key, name) {
-	return `${name ? `${name}${BUILT_IN_KEY_SEPARATOR}` : ""}${key}`;
+	return `${name ? `${name}:` : ""}${key}`;
 }
 /**
 * Resolve command examples.
@@ -107,9 +94,8 @@ async function resolveExamples(ctx, examples) {
 * @returns A namespaced key for the plugin.
 */
 function namespacedId(id) {
-	return `${PLUGIN_PREFIX}${BUILT_IN_KEY_SEPARATOR}${id}`;
+	return `g:${id}`;
 }
-
 //#endregion
 //#region src/translation.ts
 /**
@@ -183,14 +169,12 @@ var DefaultTranslation = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/types.ts
 /**
 * The unique identifier for the i18n plugin.
 */
 const pluginId = namespacedId("i18n");
-
 //#endregion
 //#region src/helpers.ts
 /**
@@ -284,7 +268,6 @@ function withI18nResource(command, resource) {
 		resource
 	};
 }
-
 //#endregion
 //#region src/index.ts
 /**
@@ -324,7 +307,7 @@ function withI18nResource(command, resource) {
 * The default locale string, which format is BCP 47 language tag.
 */
 const DEFAULT_LOCALE = "en-US";
-const BUILT_IN_PREFIX_CODE = BUILT_IN_PREFIX.codePointAt(0);
+const BUILT_IN_PREFIX_CODE = "_".codePointAt(0);
 /**
 * i18n plugin
 *
@@ -373,7 +356,7 @@ function i18n(options = {}) {
 			}
 			function translate(key, values = Object.create(null)) {
 				const strKey = key;
-				if (strKey.codePointAt(0) === BUILT_IN_PREFIX_CODE) return (localeBuiltinResources.get(localeStr) || localeBuiltinResources.get(DEFAULT_LOCALE))[strKey] || strKey;
+				if (strKey.codePointAt(0) === BUILT_IN_PREFIX_CODE) return (localeBuiltinResources.get(localeStr) || localeBuiltinResources.get("en-US"))[strKey] || strKey;
 				else return adapter.translate(localeStr, strKey, values) || "";
 			}
 			function setResource(locale, resource) {
@@ -403,7 +386,7 @@ function i18n(options = {}) {
 				for (const globalOption of getGlobalOptions()) if (globalOptionResources.has(globalOption)) {
 					const optionResource = globalOptionResources.get(globalOption);
 					const globalOptionKey = resolveArgKey(globalOption, ctx.name);
-					resource[globalOptionKey] = optionResource[localeStr] || optionResource[DEFAULT_LOCALE] || Object.values(optionResource)[0] || "";
+					resource[globalOptionKey] = optionResource[localeStr] || optionResource["en-US"] || Object.values(optionResource)[0] || "";
 				}
 				adapter.setResource(localeStr, Object.assign(Object.create(null), adapter.getResource(localeStr), resource));
 				return loaded;
@@ -460,6 +443,5 @@ async function normalizeResource(resource, ctx) {
 	else ret[resolveKey(key, ctx.name)] = value;
 	return ret;
 }
-
 //#endregion
-export { DEFAULT_LOCALE, DefaultTranslation, createTranslationAdapter, i18n as default, defineI18n, defineI18nWithTypes, pluginId, resolveArgKey, resolveBuiltInKey, resolveKey, withI18nResource };
+export { DEFAULT_LOCALE, DefaultTranslation, createTranslationAdapter, i18n as default, defineI18n, defineI18nWithTypes, pluginId, resolveArgKey, resolveBuiltInKey, resolveKey, withI18nResource };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gunshi/plugin-i18n",
   "description": "internationalization plugin for gunshi",
-  "version": "0.29.3",
+  "version": "0.29.5",
   "author": {
     "name": "kazuya kawaguchi",
     "email": "kawakazu80@gmail.com"
@@ -53,10 +53,10 @@
     }
   },
   "dependencies": {
-    "@gunshi/plugin": "0.29.3"
+    "@gunshi/plugin": "0.29.5"
   },
   "peerDependencies": {
-    "@gunshi/plugin-global": "0.29.3"
+    "@gunshi/plugin-global": "0.29.5"
   },
   "peerDependenciesMeta": {
     "@gunshi/plugin-global": {
@@ -65,20 +65,20 @@
   },
   "devDependencies": {
     "@intlify/core": "next",
-    "deno": "^2.7.4",
-    "jsr": "^0.13.5",
+    "deno": "^2.7.11",
+    "jsr": "^0.14.3",
     "jsr-exports-lint": "^0.4.2",
     "messageformat": "4.0.0",
     "publint": "^0.3.18",
     "tsdown": "0.15.12",
-    "typedoc": "^0.28.17",
-    "typedoc-plugin-markdown": "^4.10.0",
-    "@gunshi/plugin-global": "0.29.3",
-    "@gunshi/bone": "0.29.3",
-    "@gunshi/plugin-renderer": "0.29.3",
-    "@gunshi/resources": "0.29.3",
-    "@gunshi/shared": "0.29.3",
-    "gunshi": "0.29.3"
+    "typedoc": "^0.28.18",
+    "typedoc-plugin-markdown": "^4.11.0",
+    "@gunshi/plugin-global": "0.29.5",
+    "@gunshi/plugin-renderer": "0.29.5",
+    "@gunshi/bone": "0.29.5",
+    "@gunshi/resources": "0.29.5",
+    "gunshi": "0.29.5",
+    "@gunshi/shared": "0.29.5"
   },
   "scripts": {
     "build": "tsdown",