@nocobase/server 0.7.7-alpha.1 → 0.8.0-alpha.5

package/lib/helper.js

@@ -60,7 +60,9 @@ function _koaBodyparser() {
 
 var _dataWrapping = require("./middlewares/data-wrapping");
 
-var _table2resource = require("./middlewares/table2resource");
+var _db2resource = require("./middlewares/db2resource");
+
+var _i18n = require("./middlewares/i18n");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -97,33 +99,25 @@ function createResourcer(options) {
 }
 
 function registerMiddlewares(app, options) {
+  app.use((0, _cors().default)(_objectSpread({
+    exposeHeaders: ['content-disposition']
+  }, options.cors)), {
+    tag: 'cors',
+    after: 'bodyParser'
+  });
+
   if (options.bodyParser !== false) {
-    app.use((0, _koaBodyparser().default)(_objectSpread({}, options.bodyParser)));
+    app.use((0, _koaBodyparser().default)(_objectSpread({}, options.bodyParser)), {
+      tag: 'bodyParser'
+    });
   }
 
-  app.use((0, _cors().default)(_objectSpread({
-    exposeHeaders: ['content-disposition']
-  }, options.cors)));
   app.use( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (ctx, next) {
       ctx.getBearerToken = () => {
         return ctx.get('Authorization').replace(/^Bearer\s+/gi, '');
       };
 
-      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 || app.i18n.language || ctx.acceptsLanguages().shift() || 'en-US';
-
-      if (lng !== '*' && lng) {
-        i18n.changeLanguage(lng);
-      }
-
       yield next();
     });
 
@@ -131,11 +125,24 @@ function registerMiddlewares(app, options) {
       return _ref.apply(this, arguments);
     };
   }());
+  app.use(_i18n.i18n, {
+    tag: 'i18n',
+    after: 'cors'
+  });
 
   if (options.dataWrapping !== false) {
-    app.use((0, _dataWrapping.dataWrapping)());
+    app.use((0, _dataWrapping.dataWrapping)(), {
+      tag: 'dataWrapping',
+      after: 'i18n'
+    });
   }
 
-  app.use(_table2resource.table2resource);
-  app.use(app.resourcer.restApiMiddleware());
+  app.use(_db2resource.db2resource, {
+    tag: 'db2resource',
+    after: 'dataWrapping'
+  });
+  app.use(app.resourcer.restApiMiddleware(), {
+    tag: 'restApi',
+    after: 'db2resource'
+  });
 }

package/lib/middlewares/data-wrapping.js

@@ -5,8 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.dataWrapping = dataWrapping;
 exports.default = void 0;
+
+function _stream() {
+  const data = _interopRequireDefault(require("stream"));
+
+  _stream = function _stream() {
+    return data;
+  };
+
+  return data;
+}
+
 const _excluded = ["rows"];
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -18,15 +31,16 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 function dataWrapping() {
   return /*#__PURE__*/function () {
     var _dataWrapping = _asyncToGenerator(function* (ctx, next) {
-      var _ctx$action;
-
       yield next();
 
       if (ctx.withoutDataWrapping) {
         return;
-      }
+      } // if (!ctx?.action?.params) {
+      //   return;
+      // }
+
 
-      if (!(ctx === null || ctx === void 0 ? void 0 : (_ctx$action = ctx.action) === null || _ctx$action === void 0 ? void 0 : _ctx$action.params)) {
+      if (ctx.body instanceof _stream().default.Readable) {
         return;
       }
 
@@ -35,24 +49,35 @@ function dataWrapping() {
       }
 
       if (!ctx.body) {
-        if (ctx.action.actionName == 'get') {
+        var _ctx$action;
+
+        if (((_ctx$action = ctx.action) === null || _ctx$action === void 0 ? void 0 : _ctx$action.actionName) == 'get') {
           ctx.status = 200;
         }
       }
 
-      const _ref = ctx.body || {},
-            rows = _ref.rows,
-            meta = _objectWithoutProperties(_ref, _excluded);
-
-      if (rows) {
-        ctx.body = {
-          data: rows,
-          meta
-        };
-      } else {
+      if (Array.isArray(ctx.body)) {
         ctx.body = {
           data: ctx.body
         };
+        return;
+      }
+
+      if (ctx.body) {
+        const _ctx$body = ctx.body,
+              rows = _ctx$body.rows,
+              meta = _objectWithoutProperties(_ctx$body, _excluded);
+
+        if (rows) {
+          ctx.body = {
+            data: rows,
+            meta
+          };
+        } else {
+          ctx.body = {
+            data: ctx.body
+          };
+        }
       }
     });
 

package/lib/middlewares/{table2resource.d.ts → db2resource.d.ts}

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

package/lib/middlewares/{table2resource.js → db2resource.js}

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.db2resource = db2resource;
 exports.default = void 0;
-exports.table2resource = table2resource;
 
 function _resourcer() {
   const data = require("@nocobase/resourcer");
@@ -28,7 +28,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function table2resource(ctx, next) {
+function db2resource(ctx, next) {
   const resourcer = ctx.resourcer;
   const database = ctx.db;
   let params = (0, _resourcer().parseRequest)({
@@ -74,5 +74,5 @@ function table2resource(ctx, next) {
   return next();
 }
 
-var _default = table2resource;
+var _default = db2resource;
 exports.default = _default;

package/lib/middlewares/i18n.d.ts

@@ -0,0 +1 @@
+export declare function i18n(ctx: any, next: any): Promise<void>;

package/lib/middlewares/i18n.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.i18n = i18n;
+
+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 i18n(_x, _x2) {
+  return _i18n.apply(this, arguments);
+}
+
+function _i18n() {
+  _i18n = _asyncToGenerator(function* (ctx, next) {
+    const i18n = ctx.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.app.i18n.language || ctx.acceptsLanguages().shift() || 'en-US';
+
+    if (lng !== '*' && lng) {
+      i18n.changeLanguage(lng);
+    }
+
+    yield next();
+  });
+  return _i18n.apply(this, arguments);
+}

package/lib/middlewares/index.d.ts

@@ -1,2 +1,2 @@
-export * from './table2resource';
 export * from './data-wrapping';
+export * from './db2resource';

package/lib/middlewares/index.js

@@ -4,28 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _table2resource = require("./table2resource");
+var _dataWrapping = require("./data-wrapping");
 
-Object.keys(_table2resource).forEach(function (key) {
+Object.keys(_dataWrapping).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _table2resource[key]) return;
+  if (key in exports && exports[key] === _dataWrapping[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _table2resource[key];
+      return _dataWrapping[key];
     }
   });
 });
 
-var _dataWrapping = require("./data-wrapping");
+var _db2resource = require("./db2resource");
 
-Object.keys(_dataWrapping).forEach(function (key) {
+Object.keys(_db2resource).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _dataWrapping[key]) return;
+  if (key in exports && exports[key] === _db2resource[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _dataWrapping[key];
+      return _db2resource[key];
     }
   });
 });

package/lib/plugin-manager/PluginManager.d.ts

@@ -0,0 +1,43 @@
+/// <reference types="node" />
+import { CleanOptions, Collection, SyncOptions } from '@nocobase/database';
+import net from 'net';
+import Application from '../application';
+import { Plugin } from '../plugin';
+import { PluginManagerRepository } from './PluginManagerRepository';
+export interface PluginManagerOptions {
+    app: Application;
+    plugins?: any[];
+}
+export interface InstallOptions {
+    cliArgs?: any[];
+    clean?: CleanOptions | boolean;
+    sync?: SyncOptions;
+}
+export declare class PluginManager {
+    app: Application;
+    collection: Collection;
+    repository: PluginManagerRepository;
+    plugins: Map<string, Plugin<any>>;
+    server: net.Server;
+    pmSock: string;
+    _tmpPluginArgs: any[];
+    constructor(options: PluginManagerOptions);
+    addStaticMultiple(plugins: any): void;
+    getPlugins(): Map<string, Plugin<any>>;
+    get(name: string): Plugin<any>;
+    clientWrite(data: any): void;
+    listen(): Promise<net.Server>;
+    create(name: string | string[]): Promise<void>;
+    clone(): PluginManager;
+    addStatic(plugin?: any, options?: any): any;
+    add(plugin: any, options?: any): any;
+    load(options?: any): Promise<void>;
+    install(options?: InstallOptions): Promise<void>;
+    enable(name: string | string[]): Promise<void>;
+    disable(name: string | string[]): Promise<void>;
+    remove(name: string | string[]): Promise<void>;
+    static getPackageName(name: string): string;
+    static findPackage(name: string): Promise<string>;
+    static resolvePlugin(pluginName: string): any;
+}
+export default PluginManager;