@nocobase/server 0.11.1-alpha.1 → 0.11.1-alpha.3

package/lib/application.d.ts

@@ -12,6 +12,7 @@ import { Server } from 'http';
 import { i18n, InitOptions } from 'i18next';
 import Koa, { DefaultContext as KoaDefaultContext, DefaultState as KoaDefaultState } from 'koa';
 import { AppManager } from './app-manager';
+import { Locale } from './locale';
 import { Plugin } from './plugin';
 import { InstallOptions, PluginManager } from './plugin-manager';
 export type PluginConfiguration = string | [string, any];
@@ -87,6 +88,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     protected _acl: ACL;
     protected _appManager: AppManager;
     protected _authManager: AuthManager;
+    protected _locales: Locale;
     protected _version: ApplicationVersion;
     protected plugins: Map<string, Plugin<any>>;
     listenServer: Server;
@@ -105,6 +107,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get authManager(): AuthManager;
     get logger(): Logger;
     get log(): Logger;
+    get locales(): Locale;
     get name(): string;
     protected init(): void;
     private createDatabase;

package/lib/application.js

@@ -92,6 +92,7 @@ var _acl = require("./acl");
 var _appManager = require("./app-manager");
 var _commands = require("./commands");
 var _helper = require("./helper");
+var _locale = require("./locale");
 var _pluginManager = require("./plugin-manager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -178,6 +179,7 @@ class Application extends _koa().default {
     this._acl = void 0;
     this._appManager = void 0;
     this._authManager = void 0;
+    this._locales = void 0;
     this._version = void 0;
     this.plugins = new Map();
     this.listenServer = void 0;
@@ -221,6 +223,9 @@ class Application extends _koa().default {
   get log() {
     return this._logger;
   }
+  get locales() {
+    return this._locales;
+  }
   get name() {
     return this.options.name || 'main';
   }
@@ -282,6 +287,7 @@ class Application extends _koa().default {
         after: ['auth']
       });
     }
+    this._locales = new _locale.Locale(this);
     (0, _helper.registerMiddlewares)(this, options);
     if (options.registerActions !== false) {
       (0, _actions().registerActions)(this);

package/lib/locale/antd.d.ts

@@ -0,0 +1 @@
+export declare const getAntdLocale: (lang: any) => any;

package/lib/locale/antd.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getAntdLocale = void 0;
+const getAntdLocale = lang => {
+  const lng = lang.replace('-', '_');
+  try {
+    require.resolve(`antd/lib/locale/${lng}`);
+    return require(`antd/lib/locale/${lng}`).default;
+  } catch (error) {
+    return require(`antd/lib/locale/en_US`).default;
+  }
+};
+exports.getAntdLocale = getAntdLocale;

package/lib/locale/cron.d.ts

@@ -0,0 +1 @@
+export declare const getCronLocale: (lang: string) => any;

package/lib/locale/cron.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCronLocale = void 0;
+const getCronLocale = lang => {
+  const packageName = '@nocobase/client';
+  let locale = null;
+  try {
+    var _require$cron;
+    const file = `${packageName}/src/locale`;
+    require.resolve(file);
+    locale = (_require$cron = require(file).cron) === null || _require$cron === void 0 ? void 0 : _require$cron[lang];
+  } catch (error) {
+    try {
+      var _require$cron2;
+      const file = `${packageName}/lib/locale`;
+      require.resolve(file);
+      locale = (_require$cron2 = require(file).cron) === null || _require$cron2 === void 0 ? void 0 : _require$cron2[lang];
+    } catch (error) {}
+  }
+  return locale;
+};
+exports.getCronLocale = getCronLocale;

package/lib/locale/cronstrue.d.ts

@@ -0,0 +1 @@
+export declare const getCronstrueLocale: (lang: any) => {};

package/lib/locale/cronstrue.js

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCronstrueLocale = void 0;
+const methods = ['atX0SecondsPastTheMinuteGt20', 'atX0MinutesPastTheHourGt20', 'commaMonthX0ThroughMonthX1', 'commaYearX0ThroughYearX1', 'use24HourTimeFormatByDefault', 'anErrorOccuredWhenGeneratingTheExpressionD', 'everyMinute', 'everyHour', 'atSpace', 'everyMinuteBetweenX0AndX1', 'at', 'spaceAnd', 'everySecond', 'everyX0Seconds', 'secondsX0ThroughX1PastTheMinute', 'atX0SecondsPastTheMinute', 'everyX0Minutes', 'minutesX0ThroughX1PastTheHour', 'atX0MinutesPastTheHour', 'everyX0Hours', 'betweenX0AndX1', 'atX0', 'commaEveryDay', 'commaEveryX0DaysOfTheWeek', 'commaX0ThroughX1', 'commaAndX0ThroughX1', 'first', 'second', 'third', 'fourth', 'fifth', 'commaOnThe', 'spaceX0OfTheMonth', 'lastDay', 'commaOnTheLastX0OfTheMonth', 'commaOnlyOnX0', 'commaAndOnX0', 'commaEveryX0Months', 'commaOnlyInX0', 'commaOnTheLastDayOfTheMonth', 'commaOnTheLastWeekdayOfTheMonth', 'commaDaysBeforeTheLastDayOfTheMonth', 'firstWeekday', 'weekdayNearestDayX0', 'commaOnTheX0OfTheMonth', 'commaEveryX0Days', 'commaBetweenDayX0AndX1OfTheMonth', 'commaOnDayX0OfTheMonth', 'commaEveryHour', 'commaEveryX0Years', 'commaStartingX0', 'daysOfTheWeek', 'monthsOfTheYear'];
+const langs = {
+  af: 'af',
+  ar: 'ar',
+  be: 'be',
+  ca: 'ca',
+  cs: 'cs',
+  da: 'da',
+  de: 'de',
+  'en-US': 'en',
+  es: 'es',
+  fa: 'fa',
+  fi: 'fi',
+  fr: 'fr',
+  he: 'he',
+  hu: 'hu',
+  id: 'id',
+  it: 'it',
+  'ja-JP': 'ja',
+  ko: 'ko',
+  nb: 'nb',
+  nl: 'nl',
+  pl: 'pl',
+  pt_BR: 'pt_BR',
+  pt_PT: 'pt_PT',
+  ro: 'ro',
+  'ru-RU': 'ru',
+  sk: 'sk',
+  sl: 'sl',
+  sv: 'sv',
+  sw: 'sw',
+  'th-TH': 'th',
+  'tr-TR': 'tr',
+  uk: 'uk',
+  'zh-CN': 'zh_CN',
+  'zh-TW': 'zh_TW'
+};
+const getCronstrueLocale = lang => {
+  const lng = langs[lang] || 'en';
+  const Locale = require(`cronstrue/locales/${lng}`);
+  let locale;
+  if (Locale !== null && Locale !== void 0 && Locale.default) {
+    locale = Locale.default.locales[lng];
+  } else {
+    const L = Locale[lng];
+    locale = new L();
+  }
+  const items = {};
+  for (var _i = 0, _methods = methods; _i < _methods.length; _i++) {
+    const method = _methods[_i];
+    try {
+      items[method] = locale[method]();
+    } catch (error) {}
+  }
+  return items;
+};
+exports.getCronstrueLocale = getCronstrueLocale;

package/lib/locale/index.d.ts

@@ -0,0 +1 @@
+export * from './locale';

package/lib/locale/index.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _locale = require("./locale");
+Object.keys(_locale).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _locale[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _locale[key];
+    }
+  });
+});

package/lib/locale/locale.d.ts

@@ -0,0 +1,17 @@
+import { Cache } from '@nocobase/cache';
+import Application from '../application';
+export declare class Locale {
+    app: Application;
+    cache: Cache;
+    defaultLang: string;
+    constructor(app: Application);
+    load(): void;
+    get(lang: string): Promise<{
+        antd: any;
+        cronstrue: any;
+        resources: any;
+    }>;
+    wrapCache(key: string, fn: () => any): Promise<any>;
+    getCacheResources(lang: string): Promise<any>;
+    getResources(lang: string): {};
+}

package/lib/locale/locale.js

@@ -0,0 +1,106 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Locale = void 0;
+function _cache() {
+  const data = require("@nocobase/cache");
+  _cache = function _cache() {
+    return data;
+  };
+  return data;
+}
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
+    return data;
+  };
+  return data;
+}
+var _pluginManager = require("../plugin-manager");
+var _antd = require("./antd");
+var _cronstrue = require("./cronstrue");
+var _resource = require("./resource");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+class Locale {
+  constructor(app) {
+    this.app = void 0;
+    this.cache = void 0;
+    this.defaultLang = 'en-US';
+    this.app = app;
+    this.cache = (0, _cache().createCache)();
+    this.app.on('afterLoad', () => this.load());
+  }
+  load() {
+    this.getCacheResources(this.defaultLang);
+  }
+  get(lang) {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      return {
+        antd: yield _this.wrapCache(`locale:antd:${lang}`, () => (0, _antd.getAntdLocale)(lang)),
+        cronstrue: yield _this.wrapCache(`locale:cronstrue:${lang}`, () => (0, _cronstrue.getCronstrueLocale)(lang)),
+        resources: yield _this.getCacheResources(lang)
+      };
+    })();
+  }
+  wrapCache(key, fn) {
+    var _this2 = this;
+    return _asyncToGenerator(function* () {
+      const result = yield _this2.cache.get(key);
+      if (result) {
+        return result;
+      }
+      const value = yield fn();
+      if (_utils().lodash.isEmpty(value)) {
+        return value;
+      }
+      yield _this2.cache.set(key, value);
+      return value;
+    })();
+  }
+  getCacheResources(lang) {
+    var _this3 = this;
+    return _asyncToGenerator(function* () {
+      return yield _this3.wrapCache(`locale:resources:${lang}`, () => _this3.getResources(lang));
+    })();
+  }
+  getResources(lang) {
+    const resources = {};
+    const plugins = this.app.pm.getPlugins();
+    var _iterator = _createForOfIteratorHelper(plugins.keys()),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        const name = _step.value;
+        try {
+          const packageName = _pluginManager.PluginManager.getPackageName(name);
+          const res = (0, _resource.getResource)(packageName, lang);
+          if (res) {
+            resources[name] = _objectSpread({}, res);
+          }
+        } catch (err) {}
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    const res = (0, _resource.getResource)('@nocobase/client', lang);
+    if (res) {
+      resources['client'] = _objectSpread(_objectSpread({}, resources['client'] || {}), res);
+    }
+    return resources;
+  }
+}
+exports.Locale = Locale;

package/lib/locale/resource.d.ts

@@ -0,0 +1 @@
+export declare const getResource: (packageName: string, lang: string) => any;

package/lib/locale/resource.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getResource = void 0;
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+const arr2obj = items => {
+  const obj = {};
+  var _iterator = _createForOfIteratorHelper(items),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      const item = _step.value;
+      Object.assign(obj, item);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return obj;
+};
+const getResource = (packageName, lang) => {
+  const resources = [];
+  const prefixes = ['src', 'lib'];
+  for (var _i = 0, _prefixes = prefixes; _i < _prefixes.length; _i++) {
+    const prefix = _prefixes[_i];
+    try {
+      const file = `${packageName}/${prefix}/locale/${lang}`;
+      require.resolve(file);
+      const resource = require(file).default;
+      resources.push(resource);
+    } catch (error) {}
+    if (resources.length) {
+      break;
+    }
+  }
+  if (resources.length === 0 && lang.replace('-', '_') !== lang) {
+    return getResource(packageName, lang.replace('-', '_'));
+  }
+  return arr2obj(resources);
+};
+exports.getResource = getResource;

package/lib/plugin-manager/plugin-manager.js

@@ -448,7 +448,10 @@ class PluginManager {
             if (!plugin) {
               throw new Error(`${name} plugin does not exist`);
             }
-            yield plugin.install();
+            if (!plugin.options.installed) {
+              yield plugin.install();
+              plugin.options.installed = true;
+            }
             yield plugin.afterEnable();
           }
         } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.11.1-alpha.1",
+  "version": "0.11.1-alpha.3",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -8,13 +8,13 @@
     "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.11.1-alpha.1",
-    "@nocobase/actions": "0.11.1-alpha.1",
-    "@nocobase/auth": "0.11.1-alpha.1",
-    "@nocobase/database": "0.11.1-alpha.1",
-    "@nocobase/logger": "0.11.1-alpha.1",
-    "@nocobase/resourcer": "0.11.1-alpha.1",
-    "@nocobase/utils": "0.11.1-alpha.1",
+    "@nocobase/acl": "0.11.1-alpha.3",
+    "@nocobase/actions": "0.11.1-alpha.3",
+    "@nocobase/auth": "0.11.1-alpha.3",
+    "@nocobase/database": "0.11.1-alpha.3",
+    "@nocobase/logger": "0.11.1-alpha.3",
+    "@nocobase/resourcer": "0.11.1-alpha.3",
+    "@nocobase/utils": "0.11.1-alpha.3",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "dayjs": "^1.11.8",
@@ -30,5 +30,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "9ed1dba520bc5f3a7cb1255ea8d92ccbefc11bc8"
+  "gitHead": "5ed3bd7d5b16bd38d268961b34875d5cd45799ef"
 }