@nocobase/server 0.7.4-alpha.7 → 0.7.6-alpha.1

package/lib/application.d.ts

@@ -11,6 +11,7 @@ import Koa from 'koa';
 import { AppManager } from './app-manager';
 import { Plugin } from './plugin';
 import { InstallOptions, PluginManager } from './plugin-manager';
+import { ICacheConfig, Cache } from '@nocobase/cache';
 export declare type PluginConfiguration = string | [string, any];
 export declare type PluginsConfigurations = Array<PluginConfiguration>;
 export interface ResourcerOptions {
@@ -18,6 +19,7 @@ export interface ResourcerOptions {
 }
 export interface ApplicationOptions {
     database?: IDatabaseOptions | Database;
+    cache?: ICacheConfig | ICacheConfig[];
     resourcer?: ResourcerOptions;
     bodyParser?: any;
     cors?: any;
@@ -32,6 +34,7 @@ export interface DefaultState {
 }
 export interface DefaultContext {
     db: Database;
+    cache: Cache;
     resourcer: Resourcer;
     [key: string]: any;
 }
@@ -75,6 +78,7 @@ export declare class ApplicationVersion {
 export declare class Application<StateT = DefaultState, ContextT = DefaultContext> extends Koa implements AsyncEmitter {
     options: ApplicationOptions;
     readonly db: Database;
+    readonly cache: Cache;
     readonly resourcer: Resourcer;
     readonly cli: Command;
     readonly i18n: i18n;

package/lib/application.js

@@ -85,6 +85,16 @@ var _helper = require("./helper");
 
 var _pluginManager = require("./plugin-manager");
 
+function _cache() {
+  const data = require("@nocobase/cache");
+
+  _cache = function _cache() {
+    return data;
+  };
+
+  return data;
+}
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; } } }; }
@@ -164,7 +174,9 @@ class ApplicationVersion {
           return true;
         }
 
-        return _semver().default.satisfies(version, range);
+        return _semver().default.satisfies(version, range, {
+          includePrerelease: true
+        });
       }
 
       return true;
@@ -180,6 +192,7 @@ class Application extends _koa().default {
     super();
     this.options = void 0;
     this.db = void 0;
+    this.cache = void 0;
     this.resourcer = void 0;
     this.cli = void 0;
     this.i18n = void 0;
@@ -192,6 +205,7 @@ class Application extends _koa().default {
     this.options = options;
     this.acl = (0, _acl.createACL)();
     this.db = this.createDatabase(options);
+    this.cache = (0, _cache().createCache)(options.cache);
     this.resourcer = (0, _helper.createResourcer)(options);
     this.cli = new (_commander().Command)('nocobase').usage('[command] [options]');
     this.i18n = (0, _helper.createI18n)(options);

package/lib/helper.js

@@ -111,13 +111,14 @@ function registerMiddlewares(app, options) {
       };
 
       ctx.db = app.db;
+      ctx.cache = app.cache;
       ctx.resourcer = app.resourcer;
       const i18n = app.i18n.cloneInstance({
         initImmediate: false
       });
       ctx.i18n = i18n;
       ctx.t = i18n.t.bind(i18n);
-      const lng = ctx.get('X-Locale') || ctx.request.query.locale || ctx.acceptsLanguages().shift() || 'en-US';
+      const lng = ctx.get('X-Locale') || ctx.request.query.locale || app.i18n.language || ctx.acceptsLanguages().shift() || 'en-US';
 
       if (lng !== '*' && lng) {
         i18n.changeLanguage(lng);
@@ -135,6 +136,6 @@ function registerMiddlewares(app, options) {
     app.use((0, _dataWrapping.dataWrapping)());
   }
 
-  app.use((0, _table2resource.table2resource)());
+  app.use(_table2resource.table2resource);
   app.use(app.resourcer.restApiMiddleware());
 }

package/lib/middlewares/table2resource.d.ts

@@ -1,6 +1,6 @@
 import { ResourcerContext } from '@nocobase/resourcer';
 import Database from '@nocobase/database';
-export declare function table2resource(): (ctx: ResourcerContext & {
+export declare function table2resource(ctx: ResourcerContext & {
     db: Database;
-}, next: () => Promise<any>) => Promise<any>;
+}, next: () => Promise<any>): Promise<any>;
 export default table2resource;

package/lib/middlewares/table2resource.js

@@ -28,64 +28,50 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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); }); }; }
-
-function table2resource() {
-  return /*#__PURE__*/function () {
-    var _table2resource = _asyncToGenerator(function* (ctx, next) {
-      const resourcer = ctx.resourcer;
-      const database = ctx.db;
-      let params = (0, _resourcer().parseRequest)({
-        path: ctx.request.path,
-        method: ctx.request.method
-      }, {
-        prefix: resourcer.options.prefix,
-        accessors: resourcer.options.accessors
-      });
-
-      if (!params) {
-        return next();
-      }
-
-      const resourceName = (0, _resourcer().getNameByParams)(params); // 如果资源名称未被定义
-
-      if (resourcer.isDefined(resourceName)) {
-        return next();
-      }
-
-      const _resourceName$split = resourceName.split('.'),
-            _resourceName$split2 = _slicedToArray(_resourceName$split, 2),
-            collectionName = _resourceName$split2[0],
-            fieldName = _resourceName$split2[1]; // 如果经过加载后是已经定义的表
-
-
-      if (!database.hasCollection(collectionName)) {
-        return next();
-      }
-
-      const collection = database.getCollection(collectionName);
-      let resourceType = 'single';
-
-      if (fieldName && collection.hasField(fieldName)) {
-        const field = collection.getField(fieldName);
-        resourceType = field.type;
-      }
-
-      resourcer.define({
-        type: resourceType,
-        name: resourceName
-      });
-      return next();
-    });
-
-    function table2resource(_x, _x2) {
-      return _table2resource.apply(this, arguments);
-    }
-
-    return table2resource;
-  }();
+function table2resource(ctx, next) {
+  const resourcer = ctx.resourcer;
+  const database = ctx.db;
+  let params = (0, _resourcer().parseRequest)({
+    path: ctx.request.path,
+    method: ctx.request.method
+  }, {
+    prefix: resourcer.options.prefix,
+    accessors: resourcer.options.accessors
+  });
+
+  if (!params) {
+    return next();
+  }
+
+  const resourceName = (0, _resourcer().getNameByParams)(params); // 如果资源名称未被定义
+
+  if (resourcer.isDefined(resourceName)) {
+    return next();
+  }
+
+  const _resourceName$split = resourceName.split('.'),
+        _resourceName$split2 = _slicedToArray(_resourceName$split, 2),
+        collectionName = _resourceName$split2[0],
+        fieldName = _resourceName$split2[1]; // 如果经过加载后是已经定义的表
+
+
+  if (!database.hasCollection(collectionName)) {
+    return next();
+  }
+
+  const collection = database.getCollection(collectionName);
+  let resourceType = 'single';
+
+  if (fieldName && collection.hasField(fieldName)) {
+    const field = collection.getField(fieldName);
+    resourceType = field.type;
+  }
+
+  resourcer.define({
+    type: resourceType,
+    name: resourceName
+  });
+  return next();
 }
 
 var _default = table2resource;

package/lib/plugin-manager.d.ts

@@ -9,13 +9,16 @@ export interface InstallOptions {
     clean?: CleanOptions | boolean;
     sync?: SyncOptions;
 }
+declare type PluginConstructor<P, O = any> = {
+    new (app: Application, options: O): P;
+};
 export declare class PluginManager {
     app: Application;
     protected plugins: Map<string, Plugin<any>>;
     constructor(options: PluginManagerOptions);
     getPlugins(): Map<string, Plugin<any>>;
     get(name: string): Plugin<any>;
-    add<P = Plugin, O = any>(pluginClass: any, options?: O): P;
+    add<P extends Plugin = Plugin, O = any>(pluginClass: PluginConstructor<P, O>, options?: O): P;
     load(): Promise<void>;
     install(options?: InstallOptions): Promise<void>;
     static resolvePlugin(pluginName: string): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.7.4-alpha.7",
+  "version": "0.7.6-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -13,14 +13,14 @@
   "dependencies": {
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.7.4-alpha.7",
-    "@nocobase/actions": "0.7.4-alpha.7",
-    "@nocobase/database": "0.7.4-alpha.7",
-    "@nocobase/resourcer": "0.7.4-alpha.7",
+    "@nocobase/acl": "0.7.6-alpha.1",
+    "@nocobase/actions": "0.7.6-alpha.1",
+    "@nocobase/database": "0.7.6-alpha.1",
+    "@nocobase/resourcer": "0.7.6-alpha.1",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
-    "i18next": "^21.3.2",
+    "i18next": "^21.6.0",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "koa-static": "^5.0.0",
@@ -30,5 +30,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "77f22e6da464d19be111835316faf4b94cd80413"
+  "gitHead": "f20ce011a9ac516dc6aec110979f063a0e63f923"
 }