@nocobase/server 0.21.0-alpha.7 → 0.21.0-alpha.9

package/lib/commands/pm.js

@@ -55,6 +55,13 @@ var pm_default = /* @__PURE__ */ __name((app) => {
       throw new import_plugin_command_error.PluginCommandError(`Failed to update plugin`, { cause: error });
     }
   });
+  pm.command("enable-all").ipc().preload().action(async () => {
+    try {
+      await app.pm.enable("*");
+    } catch (error) {
+      throw new import_plugin_command_error.PluginCommandError(`Failed to enable plugin`, { cause: error });
+    }
+  });
   pm.command("enable").ipc().preload().arguments("<plugins...>").action(async (plugins) => {
     try {
       await app.pm.enable(plugins);

package/lib/locale/locale.js

@@ -86,7 +86,7 @@ const _Locale = class _Locale {
   getResources(lang) {
     var _a;
     const resources = {};
-    const names = this.app.pm.getAliases();
+    const names = this.app.pm.getPlugins().keys();
     for (const name of names) {
       try {
         const p = this.app.pm.get(name);

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

@@ -93,6 +93,7 @@ export declare class PluginManager {
     loadCommands(): Promise<void>;
     load(options?: any): Promise<void>;
     install(options?: InstallOptions): Promise<void>;
+    private sort;
     enable(name: string | string[]): Promise<void>;
     disable(name: string | string[]): Promise<void>;
     remove(name: string | string[], options?: {

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

@@ -34,6 +34,7 @@ __export(plugin_manager_exports, {
   sleep: () => sleep
 });
 module.exports = __toCommonJS(plugin_manager_exports);
+var import_topo = __toESM(require("@hapi/topo"));
 var import_utils = require("@nocobase/utils");
 var import_plugin_symlink = require("@nocobase/utils/plugin-symlink");
 var import_execa = __toESM(require("execa"));
@@ -312,6 +313,9 @@ const _PluginManager = class _PluginManager {
     if (options.name) {
       this.pluginAliases.set(options.name, instance);
     }
+    if (options.packageName) {
+      this.pluginAliases.set(options.packageName, instance);
+    }
     if (insert && options.name) {
       await this.repository.updateOrCreate({
         values: {
@@ -443,8 +447,27 @@ const _PluginManager = class _PluginManager {
       }
     });
   }
+  sort(names) {
+    var _a, _b, _c;
+    const pluginNames = import_lodash.default.castArray(names);
+    if (pluginNames.length === 1) {
+      return pluginNames;
+    }
+    const sorter = new import_topo.default.Sorter();
+    for (const pluginName of pluginNames) {
+      const plugin = this.get(pluginName);
+      const peerDependencies = Object.keys(((_b = (_a = plugin.options) == null ? void 0 : _a.packageJson) == null ? void 0 : _b.peerDependencies) || {});
+      sorter.add(pluginName, { after: peerDependencies, group: ((_c = plugin.options) == null ? void 0 : _c.packageName) || pluginName });
+    }
+    return sorter.nodes;
+  }
   async enable(name) {
-    const pluginNames = import_lodash.default.castArray(name);
+    let pluginNames = name;
+    if (name === "*") {
+      const items = await this.repository.find();
+      pluginNames = items.map((item) => item.name);
+    }
+    pluginNames = this.sort(pluginNames);
     this.app.log.debug(`enabling plugin ${pluginNames.join(",")}`);
     this.app.setMaintainingMessage(`enabling plugin ${pluginNames.join(",")}`);
     const toBeUpdated = [];
@@ -457,9 +480,17 @@ const _PluginManager = class _PluginManager {
         continue;
       }
       await this.app.emitAsync("beforeEnablePlugin", pluginName);
-      await plugin.beforeEnable();
-      plugin.enabled = true;
-      toBeUpdated.push(pluginName);
+      try {
+        await plugin.beforeEnable();
+        plugin.enabled = true;
+        toBeUpdated.push(pluginName);
+      } catch (error) {
+        if (name === "*") {
+          this.app.log.error(error.message);
+        } else {
+          throw error;
+        }
+      }
     }
     if (toBeUpdated.length === 0) {
       return;
@@ -474,10 +505,10 @@ const _PluginManager = class _PluginManager {
     });
     try {
       await this.app.reload();
-      this.app.log.debug(`syncing database in enable plugin ${pluginNames.join(",")}...`);
-      this.app.setMaintainingMessage(`syncing database in enable plugin ${pluginNames.join(",")}...`);
+      this.app.log.debug(`syncing database in enable plugin ${toBeUpdated.join(",")}...`);
+      this.app.setMaintainingMessage(`syncing database in enable plugin ${toBeUpdated.join(",")}...`);
       await this.app.db.sync();
-      for (const pluginName of pluginNames) {
+      for (const pluginName of toBeUpdated) {
         const plugin = this.get(pluginName);
         if (!plugin.installed) {
           this.app.log.debug(`installing plugin ${pluginName}...`);
@@ -494,7 +525,7 @@ const _PluginManager = class _PluginManager {
           installed: true
         }
       });
-      for (const pluginName of pluginNames) {
+      for (const pluginName of toBeUpdated) {
         const plugin = this.get(pluginName);
         this.app.log.debug(`emit afterEnablePlugin event...`);
         await plugin.afterEnable();
@@ -823,7 +854,7 @@ const _PluginManager = class _PluginManager {
   async list(options = {}) {
     const { locale = "en-US", isPreset = false } = options;
     return Promise.all(
-      [...this.getAliases()].map((name) => {
+      [...this.getPlugins().keys()].map((name) => {
         const plugin = this.get(name);
         if (!isPreset && plugin.options.isPreset) {
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "0.21.0-alpha.7",
+    "version": "0.21.0-alpha.9",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "Apache-2.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "0.21.0-alpha.7",
-        "@nocobase/actions": "0.21.0-alpha.7",
-        "@nocobase/auth": "0.21.0-alpha.7",
-        "@nocobase/cache": "0.21.0-alpha.7",
-        "@nocobase/data-source-manager": "0.21.0-alpha.7",
-        "@nocobase/database": "0.21.0-alpha.7",
-        "@nocobase/evaluators": "0.21.0-alpha.7",
-        "@nocobase/logger": "0.21.0-alpha.7",
-        "@nocobase/resourcer": "0.21.0-alpha.7",
-        "@nocobase/sdk": "0.21.0-alpha.7",
-        "@nocobase/telemetry": "0.21.0-alpha.7",
-        "@nocobase/utils": "0.21.0-alpha.7",
+        "@nocobase/acl": "0.21.0-alpha.9",
+        "@nocobase/actions": "0.21.0-alpha.9",
+        "@nocobase/auth": "0.21.0-alpha.9",
+        "@nocobase/cache": "0.21.0-alpha.9",
+        "@nocobase/data-source-manager": "0.21.0-alpha.9",
+        "@nocobase/database": "0.21.0-alpha.9",
+        "@nocobase/evaluators": "0.21.0-alpha.9",
+        "@nocobase/logger": "0.21.0-alpha.9",
+        "@nocobase/resourcer": "0.21.0-alpha.9",
+        "@nocobase/sdk": "0.21.0-alpha.9",
+        "@nocobase/telemetry": "0.21.0-alpha.9",
+        "@nocobase/utils": "0.21.0-alpha.9",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "b1be3993f8aa81173d01bc390aa8e4c5adcc0e2d"
+    "gitHead": "a6fe6c4ee532c04e5a50ec777bf76436ca624cbd"
 }