@midwayjs/i18n 3.0.0-beta.3 → 3.0.0-beta.7

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+**Note:** Version bump only for package @midwayjs/i18n
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+**Note:** Version bump only for package @midwayjs/i18n
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/i18n
+
+
+
+
+
 # [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
 
 

package/LICENSE

@@ -0,0 +1,21 @@
+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.

package/dist/config.default.d.ts

@@ -1,5 +1,9 @@
 export declare const i18n: {
-    currentLocale: string;
-    localeMap: {};
+    defaultLanguage: string;
+    languageTable: {
+        en: {};
+    };
+    fallbackLanguage: string;
+    fallbacks: {};
 };
 //# sourceMappingURL=config.default.d.ts.map

package/dist/config.default.js

@@ -2,7 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.i18n = void 0;
 exports.i18n = {
-    currentLocale: 'en',
-    localeMap: {},
+    defaultLanguage: 'en',
+    languageTable: {
+        en: {},
+    },
+    fallbackLanguage: 'en',
+    fallbacks: {
+    //   'en-CA': 'fr',
+    //   'en-*': 'en',
+    //   'fr-*': 'fr',
+    //   pt: 'pt-BR',
+    },
 };
 //# sourceMappingURL=config.default.js.map

package/dist/i18nService.d.ts

@@ -1,10 +1,10 @@
 import { TranslateOptions } from './interface';
 export declare class MidwayI18nService {
     i18nConfig: any;
-    private localeTextMap;
-    private currentLocale;
+    private languageTextMap;
+    private defaultLanguage;
     init(): Promise<void>;
-    addLocale(lang: string, langTextMapping: Record<string, string>): void;
-    translate(message: string, options: TranslateOptions): string;
+    addLanguage(lang: string, langTextMapping: Record<string, string>): void;
+    translate(message: string, options?: TranslateOptions): any;
 }
 //# sourceMappingURL=i18nService.d.ts.map

package/dist/i18nService.js

@@ -12,32 +12,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayI18nService = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
-const util_1 = require("util");
+const utils_1 = require("./utils");
 let MidwayI18nService = class MidwayI18nService {
     constructor() {
-        this.localeTextMap = new Map();
+        this.languageTextMap = new Map();
     }
     async init() {
-        this.currentLocale = this.i18nConfig.currentLocale;
+        this.defaultLanguage = this.i18nConfig.defaultLanguage;
+        for (const lang in this.i18nConfig.languageTable) {
+            this.addLanguage(lang, getES6Object(this.i18nConfig.languageTable[lang]));
+        }
     }
-    addLocale(lang, langTextMapping) {
-        if (!this.localeTextMap.has(lang)) {
-            this.localeTextMap.set(lang, new Map());
+    addLanguage(lang, langTextMapping) {
+        if (!this.languageTextMap.has(lang)) {
+            this.languageTextMap.set(lang, {});
         }
-        const currentMap = this.localeTextMap.get(lang);
+        const currentMap = this.languageTextMap.get(lang);
         for (const key in langTextMapping) {
-            currentMap.set(key, langTextMapping[key]);
+            currentMap[key] = langTextMapping[key];
         }
     }
-    translate(message, options) {
-        var _a;
-        const useLang = (_a = options.lang) !== null && _a !== void 0 ? _a : this.currentLocale;
-        const langMap = this.localeTextMap.get(useLang);
-        if (langMap && langMap.has(message)) {
-            return (0, util_1.format)(langMap.get(message), options.args);
+    translate(message, options = {}) {
+        var _a, _b;
+        const useLang = (_a = options.lang) !== null && _a !== void 0 ? _a : this.defaultLanguage;
+        const args = (_b = options.args) !== null && _b !== void 0 ? _b : [];
+        const langMap = this.languageTextMap.get(useLang);
+        if (langMap) {
+            const msg = (0, core_1.safelyGet)(message, langMap);
+            if (msg) {
+                return formatText(msg, args);
+            }
+            else {
+                // fallback
+                const fallbackLanguage = this.i18nConfig.fallbackLanguage;
+                const fallbackMap = this.languageTextMap.get(fallbackLanguage);
+                const msg = (0, core_1.safelyGet)(message, fallbackMap);
+                if (msg) {
+                    return formatText(msg, args);
+                }
+            }
         }
         else {
-            throw new core_1.MidwayCommonError('locale mapping not found');
+            throw new core_1.MidwayCommonError(`Language ${useLang} mapping not found`);
         }
     }
 };
@@ -56,4 +72,20 @@ MidwayI18nService = __decorate([
     (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
 ], MidwayI18nService);
 exports.MidwayI18nService = MidwayI18nService;
+function formatText(message, args) {
+    if (Array.isArray(args)) {
+        return (0, utils_1.formatWithArray)(message, args);
+    }
+    else {
+        return (0, utils_1.formatWithObject)(message, args);
+    }
+}
+function getES6Object(o) {
+    for (const key in o) {
+        if (o[key]['default'] && Object.keys(o[key]).length === 1) {
+            o[key] = o[key].default;
+        }
+    }
+    return o;
+}
 //# sourceMappingURL=i18nService.js.map

package/dist/interface.d.ts

@@ -1,7 +1,7 @@
 import { i18n } from './config.default';
 export interface TranslateOptions {
     lang?: string;
-    args: any;
+    args?: any;
 }
 declare module '@midwayjs/core/dist/interface' {
     interface MidwayConfig {

package/dist/utils.d.ts

@@ -0,0 +1,3 @@
+export declare function formatWithArray(text: any, values: any): any;
+export declare function formatWithObject(text: any, values: any): any;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatWithObject = exports.formatWithArray = void 0;
+const ARRAY_INDEX_RE = /\{(\d+)\}/g;
+function formatWithArray(text, values) {
+    return text.replace(ARRAY_INDEX_RE, (orignal, matched) => {
+        const index = parseInt(matched);
+        if (index < values.length) {
+            return values[index];
+        }
+        // not match index, return original text
+        return orignal;
+    });
+}
+exports.formatWithArray = formatWithArray;
+const Object_INDEX_RE = /\{(.+?)\}/g;
+function formatWithObject(text, values) {
+    return text.replace(Object_INDEX_RE, (orignal, matched) => {
+        const value = values[matched];
+        if (value) {
+            return value;
+        }
+        // not match index, return original text
+        return orignal;
+    });
+}
+exports.formatWithObject = formatWithObject;
+//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/i18n",
   "description": "midway i18n compoennet",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.7",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "files": [
@@ -9,9 +9,9 @@
     "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.0.0-beta.4",
-    "@midwayjs/decorator": "^3.0.0-beta.4",
-    "@midwayjs/mock": "^3.0.0-beta.4"
+    "@midwayjs/core": "^3.0.0-beta.7",
+    "@midwayjs/decorator": "^3.0.0-beta.7",
+    "@midwayjs/mock": "^3.0.0-beta.7"
   },
   "keywords": [
     "midway",
@@ -32,5 +32,6 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
-  }
+  },
+  "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
 }