@midwayjs/i18n 3.20.5 → 4.0.0-beta.1

package/dist/configuration.js

@@ -22,11 +22,12 @@ let I18nConfiguration = class I18nConfiguration {
         });
     }
 };
+exports.I18nConfiguration = I18nConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayApplicationManager)
 ], I18nConfiguration.prototype, "applicationManager", void 0);
-I18nConfiguration = __decorate([
+exports.I18nConfiguration = I18nConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'i18n',
         importConfigs: [
@@ -36,5 +37,4 @@ I18nConfiguration = __decorate([
         ],
     })
 ], I18nConfiguration);
-exports.I18nConfiguration = I18nConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/i18nService.d.ts

@@ -3,6 +3,7 @@ import { TranslateOptions } from './interface';
 export declare class MidwayI18nServiceSingleton {
     private i18nConfig;
     private localeTextMap;
+    private localeJSONMap;
     private defaultLocale;
     private fallbackMatch;
     private localeMatchCache;
@@ -35,7 +36,17 @@ export declare class MidwayI18nServiceSingleton {
      * @param locale
      * @param group
      */
-    getLocaleMapping(locale: string, group?: string): any;
+    getLocaleMapping(locale: string, group?: string): Map<string, any> | undefined;
+    /**
+     * get locale list by group
+     * @since 4.0.0
+     */
+    getLocaleList(group?: string): any[];
+    /**
+     * get origin locale json
+     * @since 4.0.0
+     */
+    getOriginLocaleJSON(locale: string, group?: string): any;
     /**
      * get current default language
      */
@@ -57,7 +68,7 @@ export declare class MidwayI18nService {
      * @param locale
      * @param group
      */
-    getLocaleMapping(locale: any, group?: string): any;
+    getLocaleMapping(locale: any, group?: string): Map<string, any>;
     /**
      * get current default language
      */

package/dist/i18nService.js

@@ -17,6 +17,7 @@ const utils_1 = require("./utils");
 let MidwayI18nServiceSingleton = class MidwayI18nServiceSingleton {
     constructor() {
         this.localeTextMap = new Map();
+        this.localeJSONMap = new Map();
         this.fallbackMatch = [];
         this.localeMatchCache = {};
     }
@@ -39,7 +40,9 @@ let MidwayI18nServiceSingleton = class MidwayI18nServiceSingleton {
      * @param localeTextMapping
      */
     addLocale(locale, localeTextMapping) {
-        const currentLangMap = getMap(this.localeTextMap, locale, true);
+        locale = (0, utils_1.formatLocale)(locale);
+        const currentLangMap = getMap(this.localeTextMap, locale);
+        // set to text map
         for (const key in localeTextMapping) {
             if (typeof localeTextMapping[key] === 'string') {
                 // set to default
@@ -52,6 +55,8 @@ let MidwayI18nServiceSingleton = class MidwayI18nServiceSingleton {
                 }
             }
         }
+        // set to origin json map
+        this.localeJSONMap.set(locale, localeTextMapping);
     }
     /**
      * translate a message
@@ -59,10 +64,9 @@ let MidwayI18nServiceSingleton = class MidwayI18nServiceSingleton {
      * @param options
      */
     translate(message, options = {}) {
-        var _a, _b, _c;
-        const useLocale = (0, utils_1.formatLocale)((_a = options.locale) !== null && _a !== void 0 ? _a : this.defaultLocale);
-        const args = (_b = options.args) !== null && _b !== void 0 ? _b : [];
-        const group = (_c = options.group) !== null && _c !== void 0 ? _c : 'default';
+        const useLocale = (0, utils_1.formatLocale)(options.locale ?? this.defaultLocale);
+        const args = options.args ?? [];
+        const group = options.group ?? 'default';
         let msg = this.getLocaleMappingText(useLocale, message, group, args);
         if (!msg && useLocale !== this.defaultLocale) {
             if (this.fallbackMatch.length) {
@@ -144,10 +148,31 @@ let MidwayI18nServiceSingleton = class MidwayI18nServiceSingleton {
     getLocaleMapping(locale, group = 'default') {
         locale = (0, utils_1.formatLocale)(locale);
         const langMap = this.localeTextMap.get(locale);
-        if (langMap) {
+        if (langMap && langMap.size > 0) {
             return langMap.get(group);
         }
     }
+    /**
+     * get locale list by group
+     * @since 4.0.0
+     */
+    getLocaleList(group = 'default') {
+        const list = [];
+        for (const key of this.localeTextMap.keys()) {
+            if (this.localeTextMap.get(key).has(group)) {
+                list.push(key);
+            }
+        }
+        return list;
+    }
+    /**
+     * get origin locale json
+     * @since 4.0.0
+     */
+    getOriginLocaleJSON(locale, group = 'default') {
+        locale = (0, utils_1.formatLocale)(locale);
+        return this.localeJSONMap.get(locale)?.[group];
+    }
     /**
      * get current default language
      */
@@ -167,6 +192,7 @@ let MidwayI18nServiceSingleton = class MidwayI18nServiceSingleton {
         }
     }
 };
+exports.MidwayI18nServiceSingleton = MidwayI18nServiceSingleton;
 __decorate([
     (0, core_1.Config)('i18n'),
     __metadata("design:type", Object)
@@ -177,11 +203,10 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], MidwayI18nServiceSingleton.prototype, "init", null);
-MidwayI18nServiceSingleton = __decorate([
+exports.MidwayI18nServiceSingleton = MidwayI18nServiceSingleton = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], MidwayI18nServiceSingleton);
-exports.MidwayI18nServiceSingleton = MidwayI18nServiceSingleton;
 let MidwayI18nService = class MidwayI18nService {
     translate(message, options = {}) {
         if (!options.locale) {
@@ -215,12 +240,11 @@ let MidwayI18nService = class MidwayI18nService {
      * save current context lang to flag, middleware will be set it to cookie
      */
     saveRequestLocale(locale) {
-        var _a, _b;
         if (locale) {
-            (_a = this.ctx) === null || _a === void 0 ? void 0 : _a.setAttr(interface_1.I18N_ATTR_KEY, (0, utils_1.formatLocale)(locale));
+            this.ctx?.setAttr(interface_1.I18N_ATTR_KEY, (0, utils_1.formatLocale)(locale));
         }
         else {
-            (_b = this.ctx) === null || _b === void 0 ? void 0 : _b.setAttr(interface_1.I18N_ATTR_KEY, (0, utils_1.formatLocale)(this.getDefaultLocale()));
+            this.ctx?.setAttr(interface_1.I18N_ATTR_KEY, (0, utils_1.formatLocale)(this.getDefaultLocale()));
         }
     }
     /**
@@ -239,6 +263,7 @@ let MidwayI18nService = class MidwayI18nService {
         return this.i18nServiceSingleton.hasAvailableLocale(locale);
     }
 };
+exports.MidwayI18nService = MidwayI18nService;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", MidwayI18nServiceSingleton)
@@ -247,10 +272,9 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], MidwayI18nService.prototype, "ctx", void 0);
-MidwayI18nService = __decorate([
+exports.MidwayI18nService = MidwayI18nService = __decorate([
     (0, core_1.Provide)()
 ], MidwayI18nService);
-exports.MidwayI18nService = MidwayI18nService;
 function formatText(message, args) {
     if (Array.isArray(args)) {
         return (0, utils_1.formatWithArray)(message, args);
@@ -267,8 +291,7 @@ function getES6Object(o) {
     }
     return o;
 }
-function getMap(o, key, formatKey = false) {
-    key = formatKey ? (0, utils_1.formatLocale)(key) : key;
+function getMap(o, key) {
     if (!o.has(key)) {
         o.set(key, new Map());
     }

package/dist/middleware.js

@@ -34,6 +34,7 @@ let I18nFilter = class I18nFilter {
         return value;
     }
 };
+exports.I18nFilter = I18nFilter;
 __decorate([
     (0, core_1.Config)('i18n.resolver'),
     __metadata("design:type", Object)
@@ -42,13 +43,12 @@ __decorate([
     (0, core_1.Config)('i18n'),
     __metadata("design:type", Object)
 ], I18nFilter.prototype, "i18nConfig", void 0);
-I18nFilter = __decorate([
+exports.I18nFilter = I18nFilter = __decorate([
     (0, core_1.Match)()
 ], I18nFilter);
-exports.I18nFilter = I18nFilter;
 let I18nMiddleware = class I18nMiddleware {
     resolve(app) {
-        if (app.getFrameworkType() === core_1.MidwayFrameworkType.WEB_EXPRESS) {
+        if ('express' === app.getNamespace()) {
             // add a filter for i18n cookie
             app.useFilter(I18nFilter);
             return async (req, res, next) => {
@@ -172,6 +172,7 @@ let I18nMiddleware = class I18nMiddleware {
         return 'i18n';
     }
 };
+exports.I18nMiddleware = I18nMiddleware;
 __decorate([
     (0, core_1.Config)('i18n.resolver'),
     __metadata("design:type", Object)
@@ -180,8 +181,7 @@ __decorate([
     (0, core_1.Config)('i18n'),
     __metadata("design:type", Object)
 ], I18nMiddleware.prototype, "i18nConfig", void 0);
-I18nMiddleware = __decorate([
+exports.I18nMiddleware = I18nMiddleware = __decorate([
     (0, core_1.Middleware)()
 ], I18nMiddleware);
-exports.I18nMiddleware = I18nMiddleware;
 //# sourceMappingURL=middleware.js.map

package/dist/utils.js

@@ -26,7 +26,9 @@ function formatWithObject(text, values) {
 }
 exports.formatWithObject = formatWithObject;
 function formatLocale(locale) {
-    // support zh_CN, en_US => zh-CN, en-US
+    if (!locale)
+        return locale;
+    // support zh_CN, en_US => zh-cn, en-us
     return locale.replace('_', '-').toLowerCase();
 }
 exports.formatLocale = formatLocale;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/i18n",
   "description": "midway i18n component",
-  "version": "3.20.5",
+  "version": "4.0.0-beta.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -13,10 +13,10 @@
     "picomatch": "2.3.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/express": "^3.20.4",
-    "@midwayjs/koa": "^3.20.5",
-    "@midwayjs/mock": "^3.20.4"
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/express": "^4.0.0-beta.1",
+    "@midwayjs/koa": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1"
   },
   "keywords": [
     "midway",
@@ -26,8 +26,8 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "ci": "npm run test",
     "lint": "mwts check"
   },
@@ -38,5 +38,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "7ce57281bd3ef5d18dc50b47ff9bffb8a27c071e"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.