@eggjs/i18n 4.0.0-beta.35 → 4.0.0-beta.36

package/dist/locales.js

@@ -1,65 +1,52 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { debuglog } from 'node:util';
-import { importModule } from '@eggjs/utils';
-import ini from 'ini';
-import yaml from 'js-yaml';
-import { exists, readJSON } from 'utility';
 import { formatLocale, isObject } from "./utils.js";
-const debug = debuglog('egg/i18n/locales');
-export async function loadLocaleResources(app, options) {
-    const localeDirs = options.dirs;
-    const resources = {};
-    if (options.dir && !localeDirs.includes(options.dir)) {
-        app.deprecate('[@eggjs/i18n] `config.i18n.dir` is deprecated, please use `config.i18n.dirs` instead');
-        localeDirs.push(options.dir);
-    }
-    for (const dir of localeDirs) {
-        if (!(await exists(dir))) {
-            continue;
-        }
-        const names = await fs.readdir(dir);
-        for (const name of names) {
-            const filepath = path.join(dir, name);
-            // support en_US.js => en-US.js
-            const locale = formatLocale(name.split('.')[0]);
-            let resource = {};
-            if (name.endsWith('.js') || name.endsWith('.ts')) {
-                resource = flattening(await importModule(filepath, {
-                    importDefaultOnly: true,
-                }));
-            }
-            else if (name.endsWith('.json')) {
-                resource = flattening(await readJSON(filepath));
-            }
-            else if (name.endsWith('.properties')) {
-                resource = ini.parse(await fs.readFile(filepath, 'utf8'));
-            }
-            else if (name.endsWith('.yml') || name.endsWith('.yaml')) {
-                resource = flattening(yaml.load(await fs.readFile(filepath, 'utf8')));
-            }
-            resources[locale] = resources[locale] || {};
-            Object.assign(resources[locale], resource);
-        }
-    }
-    debug('Init locales with %j, got %j resources', options, Object.keys(resources));
-    app._I18N_RESOURCES = resources;
+import path from "node:path";
+import { debuglog } from "node:util";
+import { exists, readJSON } from "utility";
+import fs from "node:fs/promises";
+import { importModule } from "@eggjs/utils";
+import ini from "ini";
+import yaml from "js-yaml";
+
+//#region src/locales.ts
+const debug = debuglog("egg/i18n/locales");
+async function loadLocaleResources(app, options) {
+	const localeDirs = options.dirs;
+	const resources = {};
+	if (options.dir && !localeDirs.includes(options.dir)) {
+		app.deprecate("[@eggjs/i18n] `config.i18n.dir` is deprecated, please use `config.i18n.dirs` instead");
+		localeDirs.push(options.dir);
+	}
+	for (const dir of localeDirs) {
+		if (!await exists(dir)) continue;
+		const names = await fs.readdir(dir);
+		for (const name of names) {
+			const filepath = path.join(dir, name);
+			const locale = formatLocale(name.split(".")[0]);
+			let resource = {};
+			if (name.endsWith(".js") || name.endsWith(".ts")) resource = flattening(await importModule(filepath, { importDefaultOnly: true }));
+			else if (name.endsWith(".json")) resource = flattening(await readJSON(filepath));
+			else if (name.endsWith(".properties")) resource = ini.parse(await fs.readFile(filepath, "utf8"));
+			else if (name.endsWith(".yml") || name.endsWith(".yaml")) resource = flattening(yaml.load(await fs.readFile(filepath, "utf8")));
+			resources[locale] = resources[locale] || {};
+			Object.assign(resources[locale], resource);
+		}
+	}
+	debug("Init locales with %j, got %j resources", options, Object.keys(resources));
+	app._I18N_RESOURCES = resources;
 }
 function flattening(data) {
-    const result = {};
-    function deepFlat(data, prefix) {
-        for (const key in data) {
-            const value = data[key];
-            const k = prefix ? prefix + '.' + key : key;
-            if (isObject(value)) {
-                deepFlat(value, k);
-            }
-            else {
-                result[k] = String(value);
-            }
-        }
-    }
-    deepFlat(data, '');
-    return result;
+	const result = {};
+	function deepFlat(data$1, prefix) {
+		for (const key in data$1) {
+			const value = data$1[key];
+			const k = prefix ? prefix + "." + key : key;
+			if (isObject(value)) deepFlat(value, k);
+			else result[k] = String(value);
+		}
+	}
+	deepFlat(data, "");
+	return result;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWxlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9sb2NhbGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2xDLE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBRXJDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDNUMsT0FBTyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQ3RCLE9BQU8sSUFBSSxNQUFNLFNBQVMsQ0FBQztBQUMzQixPQUFPLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUkzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUVwRCxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsa0JBQWtCLENBQUMsQ0FBQztBQUUzQyxNQUFNLENBQUMsS0FBSyxVQUFVLG1CQUFtQixDQUFDLEdBQW9CLEVBQUUsT0FBbUI7SUFDakYsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztJQUNoQyxNQUFNLFNBQVMsR0FBMkMsRUFBRSxDQUFDO0lBRTdELElBQUksT0FBTyxDQUFDLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDckQsR0FBRyxDQUFDLFNBQVMsQ0FBQyxzRkFBc0YsQ0FBQyxDQUFDO1FBQ3RHLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFRCxLQUFLLE1BQU0sR0FBRyxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQzdCLElBQUksQ0FBQyxDQUFDLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUN6QixTQUFTO1FBQ1gsQ0FBQztRQUVELE1BQU0sS0FBSyxHQUFHLE1BQU0sRUFBRSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNwQyxLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ3pCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ3RDLCtCQUErQjtZQUMvQixNQUFNLE1BQU0sR0FBRyxZQUFZLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2hELElBQUksUUFBUSxHQUEyQixFQUFFLENBQUM7WUFFMUMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDakQsUUFBUSxHQUFHLFVBQVUsQ0FDbkIsTUFBTSxZQUFZLENBQUMsUUFBUSxFQUFFO29CQUMzQixpQkFBaUIsRUFBRSxJQUFJO2lCQUN4QixDQUFDLENBQ0gsQ0FBQztZQUNKLENBQUM7aUJBQU0sSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7Z0JBQ2xDLFFBQVEsR0FBRyxVQUFVLENBQUMsTUFBTSxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztZQUNsRCxDQUFDO2lCQUFNLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDO2dCQUN4QyxRQUFRLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsQ0FBQyxRQUFRLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDNUQsQ0FBQztpQkFBTSxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO2dCQUMzRCxRQUFRLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDeEUsQ0FBQztZQUVELFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxTQUFTLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQzVDLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQzdDLENBQUM7SUFDSCxDQUFDO0lBRUQsS0FBSyxDQUFDLHdDQUF3QyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDakYsR0FBRyxDQUFDLGVBQWUsR0FBRyxTQUFTLENBQUM7QUFDbEMsQ0FBQztBQUVELFNBQVMsVUFBVSxDQUFDLElBQVM7SUFDM0IsTUFBTSxNQUFNLEdBQTJCLEVBQUUsQ0FBQztJQUUxQyxTQUFTLFFBQVEsQ0FBQyxJQUFTLEVBQUUsTUFBYztRQUN6QyxLQUFLLE1BQU0sR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3ZCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUN4QixNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sR0FBRyxHQUFHLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7WUFDNUMsSUFBSSxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDcEIsUUFBUSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQztZQUNyQixDQUFDO2lCQUFNLENBQUM7Z0JBQ04sTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUM1QixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRCxRQUFRLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRW5CLE9BQU8sTUFBTSxDQUFDO0FBQ2hCLENBQUMifQ==
+
+//#endregion
+export { loadLocaleResources };

package/dist/types.d.ts

@@ -1,27 +1,29 @@
-import type { I18nConfig } from './config/config.default.ts';
-declare module 'egg' {
-    interface EggAppConfig {
-        /**
-         * I18n options
-         * @member Config#i18n
-         */
-        i18n: I18nConfig;
-    }
-    interface Application {
-        isSupportLocale(locale: string): boolean;
-        gettext(locale: string, key: string, value?: any, ...args: any[]): string;
-        __(locale: string, key: string, value?: any, ...args: any[]): string;
-    }
-    interface Context {
-        /**
-         * get and set current request locale
-         * @member Context#locale
-         * @return {String} lower case locale string, e.g.: 'zh-cn', 'en-us'
-         */
-        locale: string;
-        gettext(key: string, value?: any, ...args: any[]): string;
-        __(key: string, value?: any, ...args: any[]): string;
-        __getLocale(): string;
-        __setLocale(l: string): void;
-    }
-}
+import { I18nConfig } from "./config/config.default.js";
+
+//#region src/types.d.ts
+declare module "egg" {
+  interface EggAppConfig {
+    /**
+    * I18n options
+    * @member Config#i18n
+    */
+    i18n: I18nConfig;
+  }
+  interface Application {
+    isSupportLocale(locale: string): boolean;
+    gettext(locale: string, key: string, value?: any, ...args: any[]): string;
+    __(locale: string, key: string, value?: any, ...args: any[]): string;
+  }
+  interface Context {
+    /**
+    * get and set current request locale
+    * @member Context#locale
+    * @return {String} lower case locale string, e.g.: 'zh-cn', 'en-us'
+    */
+    locale: string;
+    gettext(key: string, value?: any, ...args: any[]): string;
+    __(key: string, value?: any, ...args: any[]): string;
+    __getLocale(): string;
+    __setLocale(l: string): void;
+  }
+}

package/dist/types.js

@@ -1,2 +1 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
+export {  };

package/dist/utils.d.ts

@@ -1,2 +1,5 @@
-export declare function isObject(obj: any): boolean;
-export declare function formatLocale(locale: string): string;
+//#region src/utils.d.ts
+declare function isObject(obj: any): boolean;
+declare function formatLocale(locale: string): string;
+//#endregion
+export { formatLocale, isObject };

package/dist/utils.js

@@ -1,8 +1,10 @@
-export function isObject(obj) {
-    return Object.prototype.toString.call(obj) === '[object Object]';
+//#region src/utils.ts
+function isObject(obj) {
+	return Object.prototype.toString.call(obj) === "[object Object]";
 }
-export function formatLocale(locale) {
-    // support zh_CN, en_US, zh_Hans_CN, zh_Hant_CN => zh-CN, en-US, zh-hans-cn, zh-hant-cn
-    return locale.replaceAll('_', '-').toLowerCase();
+function formatLocale(locale) {
+	return locale.replaceAll("_", "-").toLowerCase();
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxVQUFVLFFBQVEsQ0FBQyxHQUFRO0lBQy9CLE9BQU8sTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLGlCQUFpQixDQUFDO0FBQ25FLENBQUM7QUFFRCxNQUFNLFVBQVUsWUFBWSxDQUFDLE1BQWM7SUFDekMsdUZBQXVGO0lBQ3ZGLE9BQU8sTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUM7QUFDbkQsQ0FBQyJ9
+
+//#endregion
+export { formatLocale, isObject };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/i18n",
-  "version": "4.0.0-beta.35",
+  "version": "4.0.0-beta.36",
   "description": "i18n plugin for egg",
   "keywords": [
     "egg",
@@ -8,21 +8,24 @@
     "eggPlugin",
     "i18n"
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/eggjs/egg.git",
-    "directory": "plugins/i18n"
-  },
+  "homepage": "https://github.com/eggjs/egg/tree/next/plugins/i18n#readme",
   "bugs": {
     "url": "https://github.com/eggjs/egg/issues"
   },
-  "homepage": "https://github.com/eggjs/egg/tree/next/plugins/i18n#readme",
-  "author": "gxcsoccer <gxcsoccer@126.com>",
   "license": "MIT",
-  "engines": {
-    "node": ">= 22.18.0"
+  "author": "gxcsoccer <gxcsoccer@126.com>",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/eggjs/egg.git",
+    "directory": "plugins/i18n"
   },
+  "files": [
+    "dist"
+  ],
   "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
     "./app": "./dist/app.js",
@@ -42,34 +45,24 @@
     "ini": "^6.0.0",
     "js-yaml": "^4.1.1",
     "utility": "^2.5.0",
-    "@eggjs/utils": "5.0.0-beta.35"
-  },
-  "peerDependencies": {
-    "egg": "4.1.0-beta.35"
+    "@eggjs/utils": "5.0.0-beta.36"
   },
   "devDependencies": {
     "@types/ini": "^4.1.1",
-    "@types/js-yaml": "4",
-    "@types/node": "^24.10.1",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^24.10.2",
     "egg-view-nunjucks": "^2.3.0",
-    "tsdown": "^0.17.0",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.15",
-    "egg": "4.1.0-beta.35",
-    "@eggjs/tsconfig": "3.1.0-beta.35",
-    "@eggjs/mock": "7.0.0-beta.35"
+    "@eggjs/mock": "7.0.0-beta.36",
+    "egg": "4.1.0-beta.36"
+  },
+  "peerDependencies": {
+    "egg": "4.1.0-beta.36"
+  },
+  "engines": {
+    "node": ">= 22.18.0"
   },
-  "files": [
-    "dist"
-  ],
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsdown && rimraf dist *.tsbuildinfo && tsc -p tsconfig.build.json",
-    "typecheck": "tsc --noEmit",
-    "lint": "oxlint --type-aware",
-    "lint:fix": "npm run lint -- --fix",
-    "test": "vitest run"
+    "typecheck": "tsgo --noEmit"
   }
 }