@nocobase/server 0.16.0-alpha.3 → 0.16.0-alpha.4

package/lib/application.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="koa-bodyparser" />
 import { ACL } from '@nocobase/acl';
 import { AuthManager, AuthManagerOptions } from '@nocobase/auth';
-import { CacheManagerOptions, Cache, CacheManager } from '@nocobase/cache';
+import { Cache, CacheManager, CacheManagerOptions } from '@nocobase/cache';
 import Database, { CollectionOptions, IDatabaseOptions } from '@nocobase/database';
 import { AppLoggerOptions, Logger } from '@nocobase/logger';
 import { ResourceOptions, Resourcer } from '@nocobase/resourcer';
@@ -13,11 +13,11 @@ import { i18n, InitOptions } from 'i18next';
 import Koa, { DefaultContext as KoaDefaultContext, DefaultState as KoaDefaultState } from 'koa';
 import { AppCommand } from './app-command';
 import { AppSupervisor } from './app-supervisor';
+import { CronJobManager } from './cron/cron-job-manager';
 import { ApplicationVersion } from './helpers/application-version';
 import { Locale } from './locale';
 import { Plugin } from './plugin';
 import { InstallOptions, PluginManager } from './plugin-manager';
-import { CronJobManager } from './cron/cron-job-manager';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];
 export interface ResourcerOptions {
@@ -118,6 +118,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get authManager(): AuthManager;
     protected _locales: Locale;
     get locales(): Locale;
+    get localeManager(): Locale;
     protected _version: ApplicationVersion;
     get version(): ApplicationVersion;
     get log(): Logger;

package/lib/application.js

@@ -44,14 +44,14 @@ var import_lodash = __toESM(require("lodash"));
 var import_acl2 = require("./acl");
 var import_app_command = require("./app-command");
 var import_app_supervisor = require("./app-supervisor");
+var import_cache2 = require("./cache");
 var import_commands = require("./commands");
+var import_cron_job_manager = require("./cron/cron-job-manager");
 var import_application_not_install = require("./errors/application-not-install");
 var import_helper = require("./helper");
 var import_application_version = require("./helpers/application-version");
 var import_locale = require("./locale");
 var import_plugin_manager = require("./plugin-manager");
-var import_cron_job_manager = require("./cron/cron-job-manager");
-var import_cache2 = require("./cache");
 const packageJson = require("../package.json");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
@@ -134,6 +134,9 @@ const _Application = class _Application extends import_koa.default {
   get locales() {
     return this._locales;
   }
+  get localeManager() {
+    return this._locales;
+  }
   _version;
   get version() {
     return this._version;

package/lib/locale/locale.d.ts

@@ -5,6 +5,7 @@ export declare class Locale {
     cache: Cache;
     defaultLang: string;
     localeFn: Map<any, any>;
+    resourceCached: Map<any, any>;
     constructor(app: Application);
     load(): Promise<void>;
     setLocaleFn(name: string, fn: (lang: string) => Promise<any>): void;
@@ -12,6 +13,7 @@ export declare class Locale {
         resources: any;
     }>;
     wrapCache(key: string, fn: () => any): Promise<any>;
+    loadResourcesByLang(lang: string): Promise<void>;
     getCacheResources(lang: string): Promise<any>;
     getResources(lang: string): {};
 }

package/lib/locale/locale.js

@@ -28,6 +28,7 @@ const _Locale = class _Locale {
   cache;
   defaultLang = "en-US";
   localeFn = /* @__PURE__ */ new Map();
+  resourceCached = /* @__PURE__ */ new Map();
   constructor(app) {
     this.app = app;
     this.app.on("afterLoad", async () => {
@@ -66,7 +67,16 @@ const _Locale = class _Locale {
       isCacheable: (val) => !import_utils.lodash.isEmpty(val)
     });
   }
+  async loadResourcesByLang(lang) {
+    if (!this.cache) {
+      return;
+    }
+    if (!this.resourceCached.has(lang)) {
+      await this.getCacheResources(lang);
+    }
+  }
   async getCacheResources(lang) {
+    this.resourceCached.set(lang, true);
     return await this.wrapCache(`resources:${lang}`, () => this.getResources(lang));
   }
   getResources(lang) {
@@ -90,6 +100,9 @@ const _Locale = class _Locale {
       } catch (err) {
       }
     }
+    Object.keys(resources).forEach((name) => {
+      this.app.i18n.addResources(lang, name, resources[name]);
+    });
     return resources;
   }
 };

package/lib/middlewares/i18n.js

@@ -32,6 +32,7 @@ async function i18n(ctx, next) {
   const lng = ctx.getCurrentLocale();
   if (lng !== "*" && lng) {
     i18n2.changeLanguage(lng);
+    await ctx.app.localeManager.loadResourcesByLang(lng);
   }
   await next();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.16.0-alpha.3",
+  "version": "0.16.0-alpha.4",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,16 +10,16 @@
     "@koa/cors": "^3.1.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.16.0-alpha.3",
-    "@nocobase/actions": "0.16.0-alpha.3",
-    "@nocobase/auth": "0.16.0-alpha.3",
-    "@nocobase/cache": "0.16.0-alpha.3",
-    "@nocobase/database": "0.16.0-alpha.3",
-    "@nocobase/evaluators": "0.16.0-alpha.3",
-    "@nocobase/logger": "0.16.0-alpha.3",
-    "@nocobase/resourcer": "0.16.0-alpha.3",
-    "@nocobase/sdk": "0.16.0-alpha.3",
-    "@nocobase/utils": "0.16.0-alpha.3",
+    "@nocobase/acl": "0.16.0-alpha.4",
+    "@nocobase/actions": "0.16.0-alpha.4",
+    "@nocobase/auth": "0.16.0-alpha.4",
+    "@nocobase/cache": "0.16.0-alpha.4",
+    "@nocobase/database": "0.16.0-alpha.4",
+    "@nocobase/evaluators": "0.16.0-alpha.4",
+    "@nocobase/logger": "0.16.0-alpha.4",
+    "@nocobase/resourcer": "0.16.0-alpha.4",
+    "@nocobase/sdk": "0.16.0-alpha.4",
+    "@nocobase/utils": "0.16.0-alpha.4",
     "@types/decompress": "4.2.4",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -52,5 +52,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "198052634f520e19410275eac726d6d9e6949265"
+  "gitHead": "98d65186a22281e59209d11a6756712a62667c07"
 }