@nocobase/server 0.8.1-alpha.4 → 0.9.0-alpha.2

package/lib/acl/index.js

@@ -29,7 +29,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-const configureResources = ['roles', 'collections', 'roles.collections', 'roles.resources', 'rolesResourcesScopes', 'availableActions'];
+const configureResources = ['roles', 'users', 'collections', 'fields', 'collections.fields', 'roles.collections', 'roles.resources', 'rolesResourcesScopes', 'availableActions'];
 
 function createACL() {
   const acl = new (_acl().ACL)();

package/lib/middlewares/data-wrapping.js

@@ -77,6 +77,10 @@ function dataWrapping() {
           ctx.body = {
             data: ctx.body
           };
+
+          if (ctx.bodyMeta) {
+            ctx.body.meta = ctx.bodyMeta;
+          }
         }
       } else if (ctx.action) {
         ctx.body = {

package/lib/middlewares/i18n.js

@@ -20,7 +20,13 @@ function _i18n() {
     });
     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';
+
+    ctx.getCurrentLocale = () => {
+      const lng = ctx.get('X-Locale') || ctx.request.query.locale || ctx.app.i18n.language || ctx.acceptsLanguages().shift() || 'en-US';
+      return lng;
+    };
+
+    const lng = ctx.getCurrentLocale();
 
     if (lng !== '*' && lng) {
       i18n.changeLanguage(lng);

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

@@ -31,6 +31,7 @@ export declare class PluginManager {
     create(name: string | string[]): Promise<void>;
     clone(): PluginManager;
     addStatic(plugin?: any, options?: any): any;
+    generateClientFile(plugin: string, packageName: string): Promise<void>;
     add(plugin: any, options?: any, transaction?: any): any;
     load(options?: any): Promise<void>;
     install(options?: InstallOptions): Promise<void>;

package/lib/plugin-manager/PluginManager.js

@@ -124,8 +124,10 @@ class PluginManager {
     this.repository = this.collection.repository;
     this.repository.setPluginManager(this);
     this.app.resourcer.define(_resource.default);
-    this.app.acl.allow('pm', ['enable', 'disable', 'remove'], 'allowConfigure');
-    this.app.acl.allow('applicationPlugins', 'list', 'allowConfigure');
+    this.app.acl.registerSnippet({
+      name: 'pm',
+      actions: ['pm:*', 'applicationPlugins:list']
+    });
     this.server = _net().default.createServer(socket => {
       socket.on('data', /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (data) {
@@ -342,6 +344,25 @@ class PluginManager {
     return instance;
   }
 
+  generateClientFile(plugin, packageName) {
+    return _asyncToGenerator(function* () {
+      const file = (0, _path().resolve)(process.cwd(), 'packages', process.env.APP_PACKAGE_ROOT || 'app', 'client/src/plugins', `${plugin}.ts`);
+
+      if (!_fs().default.existsSync(file)) {
+        try {
+          require.resolve(`${packageName}/client`);
+
+          yield _fs().default.promises.writeFile(file, `export { default } from '${packageName}/client';`);
+
+          const _require3 = require('@nocobase/cli/src/util'),
+                run = _require3.run;
+
+          yield run('yarn', ['nocobase', 'postinstall']);
+        } catch (error) {}
+      }
+    })();
+  }
+
   add(plugin, options = {}, transaction) {
     var _this4 = this;
 
@@ -363,6 +384,8 @@ class PluginManager {
 
       const packageJson = require(`${packageName}/package.json`);
 
+      yield _this4.generateClientFile(plugin, packageName);
+
       const instance = _this4.addStatic(plugin, _objectSpread(_objectSpread({}, options), {}, {
         async: true
       }));
@@ -393,21 +416,6 @@ class PluginManager {
         });
       }
 
-      const file = (0, _path().resolve)(process.cwd(), 'packages', process.env.APP_PACKAGE_ROOT || 'app', 'client/src/plugins', `${plugin}.ts`);
-
-      if (!_fs().default.existsSync(file)) {
-        try {
-          require.resolve(`${packageName}/client`);
-
-          yield _fs().default.promises.writeFile(file, `export { default } from '${packageName}/client';`);
-
-          const _require3 = require('@nocobase/cli/src/util'),
-                run = _require3.run;
-
-          yield run('yarn', ['nocobase', 'postinstall']);
-        } catch (error) {}
-      }
-
       return instance;
     })();
   }

package/lib/plugin.d.ts

@@ -21,6 +21,7 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
     options: any;
     app: Application;
     constructor(app: Application, options?: any);
+    get name(): string;
     get db(): import("@nocobase/database").default;
     get enabled(): any;
     set enabled(value: any);
@@ -33,5 +34,6 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
     afterEnable(): Promise<void>;
     afterDisable(): Promise<void>;
     remove(): Promise<void>;
+    importCollections(collectionsPath: string): Promise<void>;
 }
 export default Plugin;

package/lib/plugin.js

@@ -13,11 +13,16 @@ class Plugin {
   constructor(app, options) {
     this.options = void 0;
     this.app = void 0;
+    this.setOptions(options);
     this.app = app;
     this.setOptions(options);
     this.afterAdd();
   }
 
+  get name() {
+    return this.options.name;
+  }
+
   get db() {
     return this.app.db;
   }
@@ -62,6 +67,17 @@ class Plugin {
     return _asyncToGenerator(function* () {})();
   }
 
+  importCollections(collectionsPath) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      yield _this.db.import({
+        directory: collectionsPath,
+        from: _this.getName()
+      });
+    })();
+  }
+
 }
 
 exports.Plugin = Plugin;

package/package.json

@@ -1,28 +1,22 @@
 {
   "name": "@nocobase/server",
-  "version": "0.8.1-alpha.4",
+  "version": "0.9.0-alpha.2",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
-  "licenses": [
-    {
-      "type": "Apache-2.0",
-      "url": "http://www.apache.org/licenses/LICENSE-2.0"
-    }
-  ],
   "dependencies": {
     "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.8.1-alpha.4",
-    "@nocobase/actions": "0.8.1-alpha.4",
-    "@nocobase/database": "0.8.1-alpha.4",
-    "@nocobase/logger": "0.8.1-alpha.4",
-    "@nocobase/resourcer": "0.8.1-alpha.4",
+    "@nocobase/acl": "0.9.0-alpha.2",
+    "@nocobase/actions": "0.9.0-alpha.2",
+    "@nocobase/database": "0.9.0-alpha.2",
+    "@nocobase/logger": "0.9.0-alpha.2",
+    "@nocobase/resourcer": "0.9.0-alpha.2",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
-    "i18next": "^21.6.0",
+    "i18next": "^22.4.9",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
     "koa-static": "^5.0.0",
@@ -33,5 +27,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "22ccdf7bd7fcbd16aeefd5250db237a4bd1ccff1"
+  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
 }