@midwayjs/i18n 3.19.0 → 4.0.0-alpha.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.js

@@ -59,10 +59,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) {
@@ -167,6 +166,7 @@ let MidwayI18nServiceSingleton = class MidwayI18nServiceSingleton {
         }
     }
 };
+exports.MidwayI18nServiceSingleton = MidwayI18nServiceSingleton;
 __decorate([
     (0, core_1.Config)('i18n'),
     __metadata("design:type", Object)
@@ -177,11 +177,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 +214,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 +237,7 @@ let MidwayI18nService = class MidwayI18nService {
         return this.i18nServiceSingleton.hasAvailableLocale(locale);
     }
 };
+exports.MidwayI18nService = MidwayI18nService;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", MidwayI18nServiceSingleton)
@@ -247,10 +246,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);

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/i18n",
   "description": "midway i18n component",
-  "version": "3.19.0",
+  "version": "4.0.0-alpha.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -13,10 +13,10 @@
     "picomatch": "2.3.1"
   },
   "devDependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/express": "^3.19.0",
-    "@midwayjs/koa": "^3.19.0",
-    "@midwayjs/mock": "^3.19.0"
+    "@midwayjs/core": "^4.0.0-alpha.1",
+    "@midwayjs/express": "^4.0.0-alpha.1",
+    "@midwayjs/koa": "^4.0.0-alpha.1",
+    "@midwayjs/mock": "^4.0.0-alpha.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": "437e92d9375b0e375f83aa363f3e6a60187c7109"
+  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
 }