@nocobase/server 0.8.0-alpha.6 → 0.8.0-alpha.7

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

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

package/lib/plugin-manager/PluginManager.js

@@ -348,12 +348,21 @@ class PluginManager {
     return instance;
   }
 
-  add(plugin, options = {}) {
+  add(plugin, options = {}, transaction) {
     var _this4 = this;
 
     return _asyncToGenerator(function* () {
       if (Array.isArray(plugin)) {
-        return Promise.all(plugin.map(p => _this4.add(p, options)));
+        const t = transaction || (yield _this4.app.db.sequelize.transaction());
+
+        try {
+          const items = yield Promise.all(plugin.map(p => _this4.add(p, options, t)));
+          yield t.commit();
+          return items;
+        } catch (error) {
+          yield t.rollback();
+          throw error;
+        }
       } // console.log(`adding ${plugin} plugin`);
 
 
@@ -366,6 +375,7 @@ class PluginManager {
       }));
 
       let model = yield _this4.repository.findOne({
+        transaction,
         filter: {
           name: plugin
         }
@@ -381,6 +391,7 @@ class PluginManager {
             others = _objectWithoutProperties(options, _excluded);
 
       yield _this4.repository.create({
+        transaction,
         values: {
           name: plugin,
           version: packageJson.version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.8.0-alpha.6",
+  "version": "0.8.0-alpha.7",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.8.0-alpha.6",
-    "@nocobase/actions": "0.8.0-alpha.6",
-    "@nocobase/database": "0.8.0-alpha.6",
-    "@nocobase/resourcer": "0.8.0-alpha.6",
+    "@nocobase/acl": "0.8.0-alpha.7",
+    "@nocobase/actions": "0.8.0-alpha.7",
+    "@nocobase/database": "0.8.0-alpha.7",
+    "@nocobase/resourcer": "0.8.0-alpha.7",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
@@ -32,5 +32,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "41aeed64d2d662a9e7fee56b6fd746cfbc962197"
+  "gitHead": "8d6ee41e3ff401922cd8d2d93bc15e289cdf2977"
 }