@nocobase/server 1.2.7-alpha → 1.2.9-alpha

package/lib/locale/locale.d.ts

@@ -7,7 +7,13 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Cache } from '@nocobase/cache';
+import { Registry } from '@nocobase/utils';
 import Application from '../application';
+export interface ResourceStorer {
+    getResources(lang: string): Promise<{
+        [ns: string]: Record<string, string>;
+    }>;
+}
 export declare class Locale {
     app: Application;
     cache: Cache;
@@ -15,15 +21,18 @@ export declare class Locale {
     localeFn: Map<any, any>;
     resourceCached: Map<any, any>;
     i18nInstances: Map<any, any>;
+    resourceStorers: Registry<ResourceStorer>;
     constructor(app: Application);
     load(): Promise<void>;
+    reload(): Promise<void>;
     setLocaleFn(name: string, fn: (lang: string) => Promise<any>): void;
+    registerResourceStorer(name: string, storer: ResourceStorer): void;
     get(lang: string): Promise<{
         resources: any;
     }>;
     wrapCache(key: string, fn: () => any): Promise<any>;
     loadResourcesByLang(lang: string): Promise<void>;
     getCacheResources(lang: string): Promise<any>;
-    getResources(lang: string): {};
+    getResources(lang: string): Promise<{}>;
     getI18nInstance(lang: string): Promise<any>;
 }

package/lib/locale/locale.js

@@ -7,9 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -24,6 +26,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var locale_exports = {};
 __export(locale_exports, {
@@ -33,6 +43,7 @@ module.exports = __toCommonJS(locale_exports);
 var import_utils = require("@nocobase/utils");
 var import_resource = require("./resource");
 var import__ = require("..");
+var import_deepmerge = __toESM(require("deepmerge"));
 const _Locale = class _Locale {
   app;
   cache;
@@ -40,6 +51,7 @@ const _Locale = class _Locale {
   localeFn = /* @__PURE__ */ new Map();
   resourceCached = /* @__PURE__ */ new Map();
   i18nInstances = /* @__PURE__ */ new Map();
+  resourceStorers = new import_utils.Registry();
   constructor(app) {
     this.app = app;
     this.app.on("afterLoad", async () => {
@@ -58,9 +70,15 @@ const _Locale = class _Locale {
     });
     await this.get(this.defaultLang);
   }
+  async reload() {
+    await this.cache.reset();
+  }
   setLocaleFn(name, fn) {
     this.localeFn.set(name, fn);
   }
+  registerResourceStorer(name, storer) {
+    this.resourceStorers.register(name, storer);
+  }
   async get(lang) {
     const defaults = {
       resources: await this.getCacheResources(lang)
@@ -89,11 +107,11 @@ const _Locale = class _Locale {
   async getCacheResources(lang) {
     this.resourceCached.set(lang, true);
     if (process.env.APP_ENV !== "production") {
-      await this.cache.reset();
+      await this.reload();
     }
     return await this.wrapCache(`resources:${lang}`, () => this.getResources(lang));
   }
-  getResources(lang) {
+  async getResources(lang) {
     var _a;
     const resources = {};
     const names = this.app.pm.getPlugins().keys();
@@ -117,6 +135,20 @@ const _Locale = class _Locale {
       } catch (err) {
       }
     }
+    const storers = this.resourceStorers.getValues();
+    for (const storer of storers) {
+      const custom = await storer.getResources(lang);
+      Object.keys(custom).forEach((key) => {
+        const module2 = key.replace("resources.", "");
+        const resource = resources[module2];
+        const customResource = custom[key];
+        resources[module2] = resource ? (0, import_deepmerge.default)(resource, customResource) : customResource;
+        const pkgName = `${import__.OFFICIAL_PLUGIN_PREFIX}${module2}`;
+        if (resources[pkgName]) {
+          resources[pkgName] = { ...resources[module2] };
+        }
+      });
+    }
     Object.keys(resources).forEach((name) => {
       this.app.i18n.addResources(lang, name, resources[name]);
     });

package/package.json

@@ -1,27 +1,27 @@
 {
     "name": "@nocobase/server",
-    "version": "1.2.7-alpha",
+    "version": "1.2.9-alpha",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
     "dependencies": {
-        "@formily/json-schema": "2.2.27",
+        "@formily/json-schema": "2.x",
         "@hapi/topo": "^6.0.0",
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.2.7-alpha",
-        "@nocobase/actions": "1.2.7-alpha",
-        "@nocobase/auth": "1.2.7-alpha",
-        "@nocobase/cache": "1.2.7-alpha",
-        "@nocobase/data-source-manager": "1.2.7-alpha",
-        "@nocobase/database": "1.2.7-alpha",
-        "@nocobase/evaluators": "1.2.7-alpha",
-        "@nocobase/logger": "1.2.7-alpha",
-        "@nocobase/resourcer": "1.2.7-alpha",
-        "@nocobase/sdk": "1.2.7-alpha",
-        "@nocobase/telemetry": "1.2.7-alpha",
-        "@nocobase/utils": "1.2.7-alpha",
+        "@nocobase/acl": "1.2.9-alpha",
+        "@nocobase/actions": "1.2.9-alpha",
+        "@nocobase/auth": "1.2.9-alpha",
+        "@nocobase/cache": "1.2.9-alpha",
+        "@nocobase/data-source-manager": "1.2.9-alpha",
+        "@nocobase/database": "1.2.9-alpha",
+        "@nocobase/evaluators": "1.2.9-alpha",
+        "@nocobase/logger": "1.2.9-alpha",
+        "@nocobase/resourcer": "1.2.9-alpha",
+        "@nocobase/sdk": "1.2.9-alpha",
+        "@nocobase/telemetry": "1.2.9-alpha",
+        "@nocobase/utils": "1.2.9-alpha",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "393313a2a7d183ac72311484e452a2143a90fd02"
+    "gitHead": "b80e4678e8098d60755195ec63f865122aba021a"
 }