@nocobase/server 1.4.0-alpha.9 → 1.4.0-beta.10

package/lib/commands/pm.js

@@ -69,6 +69,9 @@ var pm_default = /* @__PURE__ */ __name((app) => {
     try {
       await app.pm.enable(plugins);
     } catch (error) {
+      await app.tryReloadOrRestart({
+        recover: true
+      });
       throw new import_plugin_command_error.PluginCommandError(`Failed to enable plugin`, { cause: error });
     }
   });

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

@@ -119,7 +119,8 @@ var resource_default = {
       if (!filterByTk) {
         ctx.throw(400, "plugin name invalid");
       }
-      app.runAsCLI(["pm", "enable", filterByTk], { from: "user" });
+      const keys = Array.isArray(filterByTk) ? filterByTk : [filterByTk];
+      app.runAsCLI(["pm", "enable", ...keys], { from: "user" });
       ctx.body = filterByTk;
       await next();
     },

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

@@ -32,6 +32,7 @@ export declare class PluginManagerRepository extends Repository {
      * @deprecated
      */
     disable(name: string | string[]): Promise<string[]>;
-    getItems(): Promise<any>;
+    sort(names: string[]): Promise<string[]>;
+    getItems(): Promise<any[]>;
     init(): Promise<void>;
 }

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

@@ -40,6 +40,7 @@ __export(plugin_manager_repository_exports, {
   PluginManagerRepository: () => PluginManagerRepository
 });
 module.exports = __toCommonJS(plugin_manager_repository_exports);
+var import_topo = __toESM(require("@hapi/topo"));
 var import_database = require("@nocobase/database");
 var import_lodash = __toESM(require("lodash"));
 var import_plugin_manager = require("./plugin-manager");
@@ -140,17 +141,49 @@ const _PluginManagerRepository = class _PluginManagerRepository extends import_d
     });
     return pluginNames;
   }
+  async sort(names) {
+    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) {
+      let packageJson = {};
+      try {
+        packageJson = await import_plugin_manager.PluginManager.getPackageJson(pluginName);
+      } catch (error) {
+        packageJson = {};
+      }
+      const peerDependencies = Object.keys((packageJson == null ? void 0 : packageJson.peerDependencies) || {});
+      sorter.add(pluginName, { after: peerDependencies, group: (packageJson == null ? void 0 : packageJson.packageName) || pluginName });
+    }
+    return sorter.nodes;
+  }
   async getItems() {
     const exists = await this.collection.existsInDb();
     if (!exists) {
       return [];
     }
-    return await this.find({
+    const items = await this.find({
       sort: "id",
       filter: {
         enabled: true
       }
     });
+    const sortedItems = [];
+    const map = {};
+    for (const item of items) {
+      if (item.packageName) {
+        map[item.packageName] = item;
+      } else {
+        sortedItems.push(item);
+      }
+    }
+    const names = await this.sort(Object.keys(map));
+    for (const name of names) {
+      sortedItems.push(map[name]);
+    }
+    return sortedItems;
   }
   async init() {
     const items = await this.getItems();

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

@@ -129,9 +129,11 @@ const _PluginManager = class _PluginManager {
    */
   static async getPackageJson(nameOrPkg) {
     const { packageName } = await this.parseName(nameOrPkg);
-    const file = await import_fs_extra.default.realpath((0, import_path.resolve)(process.env.NODE_MODULES_PATH, packageName, "package.json"));
-    const data = await import_fs_extra.default.readFile(file, { encoding: "utf-8" });
-    return JSON.parse(data);
+    const packageFile = (0, import_path.resolve)(process.env.NODE_MODULES_PATH, packageName, "package.json");
+    if (!await import_fs_extra.default.exists(packageFile)) {
+      throw new Error(`Cannot find plugin '${nameOrPkg}'`);
+    }
+    return import_fs_extra.default.readJSON(packageFile);
   }
   /**
    * @internal

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.4.0-alpha.9",
+    "version": "1.4.0-beta.10",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.4.0-alpha.9",
-        "@nocobase/actions": "1.4.0-alpha.9",
-        "@nocobase/auth": "1.4.0-alpha.9",
-        "@nocobase/cache": "1.4.0-alpha.9",
-        "@nocobase/data-source-manager": "1.4.0-alpha.9",
-        "@nocobase/database": "1.4.0-alpha.9",
-        "@nocobase/evaluators": "1.4.0-alpha.9",
-        "@nocobase/logger": "1.4.0-alpha.9",
-        "@nocobase/resourcer": "1.4.0-alpha.9",
-        "@nocobase/sdk": "1.4.0-alpha.9",
-        "@nocobase/telemetry": "1.4.0-alpha.9",
-        "@nocobase/utils": "1.4.0-alpha.9",
+        "@nocobase/acl": "1.4.0-beta.10",
+        "@nocobase/actions": "1.4.0-beta.10",
+        "@nocobase/auth": "1.4.0-beta.10",
+        "@nocobase/cache": "1.4.0-beta.10",
+        "@nocobase/data-source-manager": "1.4.0-beta.10",
+        "@nocobase/database": "1.4.0-beta.10",
+        "@nocobase/evaluators": "1.4.0-beta.10",
+        "@nocobase/logger": "1.4.0-beta.10",
+        "@nocobase/resourcer": "1.4.0-beta.10",
+        "@nocobase/sdk": "1.4.0-beta.10",
+        "@nocobase/telemetry": "1.4.0-beta.10",
+        "@nocobase/utils": "1.4.0-beta.10",
         "@types/decompress": "4.2.7",
         "@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": "af26b630a5b590f986e21231f0db289c65dd7f70"
+    "gitHead": "4e3bbdab89b6eea6011a7b86fdefd66e0d0080d4"
 }