@nocobase/server 0.21.0-alpha.14 → 0.21.0-alpha.16

package/lib/acl/index.js

@@ -23,23 +23,11 @@ __export(acl_exports, {
 module.exports = __toCommonJS(acl_exports);
 var import_acl = require("@nocobase/acl");
 var import_available_action = require("./available-action");
-const configureResources = [
-  "roles",
-  "users",
-  "collections",
-  "fields",
-  "collections.fields",
-  "roles.collections",
-  "roles.resources",
-  "rolesResourcesScopes",
-  "availableActions"
-];
 function createACL() {
   const acl = new import_acl.ACL();
   for (const [actionName, actionParams] of Object.entries(import_available_action.availableActions)) {
     acl.setAvailableAction(actionName, actionParams);
   }
-  acl.registerConfigResources(configureResources);
   return acl;
 }
 __name(createACL, "createACL");

package/lib/application.d.ts

@@ -142,13 +142,14 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     protected plugins: Map<string, Plugin<any>>;
     protected _appSupervisor: AppSupervisor;
     protected _started: boolean;
-    protected _logger: SystemLogger;
     private _authenticated;
     private _maintaining;
     private _maintainingCommandStatus;
     private _maintainingStatusBeforeCommand;
     private _actionCommand;
     constructor(options: ApplicationOptions);
+    protected _logger: SystemLogger;
+    get logger(): SystemLogger;
     protected _loaded: boolean;
     /**
      * @internal
@@ -163,7 +164,6 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get cronJobManager(): CronJobManager;
     get mainDataSource(): SequelizeDataSource;
     get db(): Database;
-    get logger(): SystemLogger;
     get resourceManager(): import("@nocobase/resourcer").ResourceManager;
     /**
      * This method is deprecated and should not be used.
@@ -265,16 +265,9 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
      * @deprecated
      */
     getPlugin<P extends Plugin>(name: string | typeof Plugin): P;
-    /**
-     * This method is deprecated and should not be used.
-     * Use {@link this.runAsCLI()} instead.
-     * @deprecated
-     */
-    parse(argv?: string[]): Promise<AppCommand>;
     authenticate(): Promise<void>;
     runCommand(command: string, ...args: any[]): Promise<AppCommand>;
     runCommandThrowError(command: string, ...args: any[]): Promise<AppCommand>;
-    protected createCLI(): AppCommand;
     /**
      * @internal
      */
@@ -297,10 +290,6 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
             up: () => Promise<void>;
         };
     }>;
-    /**
-     * @internal
-     */
-    loadPluginCommands(): Promise<void>;
     /**
      * @internal
      */
@@ -333,6 +322,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
      */
     reInitEvents(): void;
     createLogger(options: LoggerOptions): import("winston").Logger;
+    protected createCLI(): AppCommand;
     protected init(): void;
     protected createMainDataSource(options: ApplicationOptions): void;
     protected createDatabase(options: ApplicationOptions): Database;

package/lib/application.js

@@ -96,12 +96,15 @@ const _Application = class _Application extends import_koa.default {
   plugins = /* @__PURE__ */ new Map();
   _appSupervisor = import_app_supervisor.AppSupervisor.getInstance();
   _started;
-  _logger;
   _authenticated = false;
   _maintaining = false;
   _maintainingCommandStatus;
   _maintainingStatusBeforeCommand;
   _actionCommand;
+  _logger;
+  get logger() {
+    return this._logger;
+  }
   _loaded;
   /**
    * @internal
@@ -130,9 +133,6 @@ const _Application = class _Application extends import_koa.default {
     }
     return this.mainDataSource.collectionManager.db;
   }
-  get logger() {
-    return this._logger;
-  }
   get resourceManager() {
     return this.mainDataSource.resourceManager;
   }
@@ -383,14 +383,6 @@ const _Application = class _Application extends import_koa.default {
   getPlugin(name) {
     return this.pm.get(name);
   }
-  /**
-   * This method is deprecated and should not be used.
-   * Use {@link this.runAsCLI()} instead.
-   * @deprecated
-   */
-  async parse(argv = process.argv) {
-    return this.runAsCLI(argv);
-  }
   async authenticate() {
     if (this._authenticated) {
       return;
@@ -406,37 +398,6 @@ const _Application = class _Application extends import_koa.default {
   async runCommandThrowError(command, ...args) {
     return await this.runAsCLI([command, ...args], { from: "user", throwError: true });
   }
-  createCLI() {
-    const command = new import_app_command.AppCommand("nocobase").usage("[command] [options]").hook("preAction", async (_, actionCommand) => {
-      this._actionCommand = actionCommand;
-      this.activatedCommand = {
-        name: (0, import_helper.getCommandFullName)(actionCommand)
-      };
-      this.setMaintaining({
-        status: "command_begin",
-        command: this.activatedCommand
-      });
-      this.setMaintaining({
-        status: "command_running",
-        command: this.activatedCommand
-      });
-      if (actionCommand["_authenticate"]) {
-        await this.authenticate();
-      }
-      if (actionCommand["_preload"]) {
-        await this.load();
-      }
-    }).hook("postAction", async (_, actionCommand) => {
-      var _a;
-      if (((_a = this._maintainingStatusBeforeCommand) == null ? void 0 : _a.error) && this._started) {
-        await this.restart();
-      }
-    });
-    command.exitOverride((err) => {
-      throw err;
-    });
-    return command;
-  }
   /**
    * @internal
    */
@@ -497,13 +458,6 @@ const _Application = class _Application extends import_koa.default {
       }
     };
   }
-  /**
-   * @internal
-   */
-  async loadPluginCommands() {
-    this.log.debug("load plugin commands");
-    await this.pm.loadCommands();
-  }
   /**
    * @internal
    */
@@ -742,6 +696,37 @@ const _Application = class _Application extends import_koa.default {
       dirname: (0, import_logger.getLoggerFilePath)(this.name || "main", dirname || "")
     });
   }
+  createCLI() {
+    const command = new import_app_command.AppCommand("nocobase").usage("[command] [options]").hook("preAction", async (_, actionCommand) => {
+      this._actionCommand = actionCommand;
+      this.activatedCommand = {
+        name: (0, import_helper.getCommandFullName)(actionCommand)
+      };
+      this.setMaintaining({
+        status: "command_begin",
+        command: this.activatedCommand
+      });
+      this.setMaintaining({
+        status: "command_running",
+        command: this.activatedCommand
+      });
+      if (actionCommand["_authenticate"]) {
+        await this.authenticate();
+      }
+      if (actionCommand["_preload"]) {
+        await this.load();
+      }
+    }).hook("postAction", async (_, actionCommand) => {
+      var _a;
+      if (((_a = this._maintainingStatusBeforeCommand) == null ? void 0 : _a.error) && this._started) {
+        await this.restart();
+      }
+    });
+    command.exitOverride((err) => {
+      throw err;
+    });
+    return command;
+  }
   init() {
     var _a;
     const options = this.options;

package/lib/commands/console.js

@@ -21,6 +21,7 @@ __export(console_exports, {
   default: () => console_default
 });
 module.exports = __toCommonJS(console_exports);
+/* istanbul ignore file -- @preserve */
 const REPL = require("repl");
 var console_default = /* @__PURE__ */ __name((app) => {
   app.command("console").preload().action(async () => {

package/lib/commands/create-migration.js

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(create_migration_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_fs = __toESM(require("fs"));
 var import_path = require("path");
+/* istanbul ignore file -- @preserve */
 var create_migration_default = /* @__PURE__ */ __name((app) => {
   app.command("create-migration").argument("<name>").option("--pkg <pkg>").option("--on [on]").action(async (name, options) => {
     const pkg = options.pkg;

package/lib/commands/db-auth.js

@@ -21,6 +21,7 @@ __export(db_auth_exports, {
   default: () => db_auth_default
 });
 module.exports = __toCommonJS(db_auth_exports);
+/* istanbul ignore file -- @preserve */
 var db_auth_default = /* @__PURE__ */ __name((app) => {
   app.command("db:auth").option("-r, --retry [retry]").action(async (opts) => {
     await app.db.auth({ retry: opts.retry || 10 });

package/lib/commands/db-clean.js

@@ -21,6 +21,7 @@ __export(db_clean_exports, {
   default: () => db_clean_default
 });
 module.exports = __toCommonJS(db_clean_exports);
+/* istanbul ignore file -- @preserve */
 var db_clean_default = /* @__PURE__ */ __name((app) => {
   app.command("db:clean").auth().option("-y, --yes").action(async (opts) => {
     console.log("Clearing database");

package/lib/commands/db-sync.js

@@ -21,6 +21,7 @@ __export(db_sync_exports, {
   default: () => db_sync_default
 });
 module.exports = __toCommonJS(db_sync_exports);
+/* istanbul ignore file -- @preserve */
 var db_sync_default = /* @__PURE__ */ __name((app) => {
   app.command("db:sync").auth().preload().action(async (...cliArgs) => {
     const [opts] = cliArgs;

package/lib/commands/destroy.js

@@ -21,6 +21,7 @@ __export(destroy_exports, {
   default: () => destroy_default
 });
 module.exports = __toCommonJS(destroy_exports);
+/* istanbul ignore file -- @preserve */
 var destroy_default = /* @__PURE__ */ __name((app) => {
   app.command("destroy").preload().action(async (...cliArgs) => {
     await app.destroy({

package/lib/commands/index.js

@@ -44,6 +44,7 @@ var import_start = __toESM(require("./start"));
 var import_stop = __toESM(require("./stop"));
 var import_upgrade = __toESM(require("./upgrade"));
 var import_console = __toESM(require("./console"));
+/* istanbul ignore file -- @preserve */
 function registerCli(app) {
   (0, import_console.default)(app);
   (0, import_db_auth.default)(app);

package/lib/commands/install.js

@@ -21,6 +21,7 @@ __export(install_exports, {
   default: () => install_default
 });
 module.exports = __toCommonJS(install_exports);
+/* istanbul ignore file -- @preserve */
 var install_default = /* @__PURE__ */ __name((app) => {
   app.command("install").ipc().auth().option("-f, --force").option("-c, --clean").option("--lang <lang>").action(async (options) => {
     if (options.lang) {

package/lib/commands/migrator.js

@@ -21,6 +21,7 @@ __export(migrator_exports, {
   default: () => migrator_default
 });
 module.exports = __toCommonJS(migrator_exports);
+/* istanbul ignore file -- @preserve */
 var migrator_default = /* @__PURE__ */ __name((app) => {
   app.command("migrator").preload().action(async (opts) => {
     console.log("migrating...");

package/lib/commands/pm.js

@@ -33,6 +33,7 @@ __export(pm_exports, {
 module.exports = __toCommonJS(pm_exports);
 var import_lodash = __toESM(require("lodash"));
 var import_plugin_command_error = require("../errors/plugin-command-error");
+/* istanbul ignore file -- @preserve */
 var pm_default = /* @__PURE__ */ __name((app) => {
   const pm = app.command("pm");
   pm.command("create").arguments("plugin").option("--force-recreate").action(async (plugin, options) => {

package/lib/commands/refresh.js

@@ -21,6 +21,7 @@ __export(refresh_exports, {
   default: () => refresh_default
 });
 module.exports = __toCommonJS(refresh_exports);
+/* istanbul ignore file -- @preserve */
 var refresh_default = /* @__PURE__ */ __name((app) => {
   app.command("refresh").ipc().action(async (cliArgs) => {
     await app.restart({

package/lib/commands/restart.js

@@ -21,6 +21,7 @@ __export(restart_exports, {
   default: () => restart_default
 });
 module.exports = __toCommonJS(restart_exports);
+/* istanbul ignore file -- @preserve */
 var restart_default = /* @__PURE__ */ __name((app) => {
   app.command("restart").ipc().action(async (...cliArgs) => {
     if (!await app.isStarted()) {

package/lib/commands/start.js

@@ -35,6 +35,7 @@ var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
 var import_path = require("path");
 var import_application_not_install = require("../errors/application-not-install");
+/* istanbul ignore file -- @preserve */
 var start_default = /* @__PURE__ */ __name((app) => {
   app.command("start").auth().option("--db-sync").option("--quickstart").action(async (...cliArgs) => {
     const [options] = cliArgs;

package/lib/commands/stop.js

@@ -21,6 +21,7 @@ __export(stop_exports, {
   default: () => stop_default
 });
 module.exports = __toCommonJS(stop_exports);
+/* istanbul ignore file -- @preserve */
 var stop_default = /* @__PURE__ */ __name((app) => {
   app.command("stop").ipc().action(async (...cliArgs) => {
     if (!await app.isStarted()) {

package/lib/commands/upgrade.js

@@ -21,6 +21,7 @@ __export(upgrade_exports, {
   default: () => upgrade_default
 });
 module.exports = __toCommonJS(upgrade_exports);
+/* istanbul ignore file -- @preserve */
 var upgrade_default = /* @__PURE__ */ __name((app) => {
   app.command("upgrade").ipc().auth().action(async (options) => {
     await app.upgrade(options);

package/lib/gateway/index.d.ts

@@ -33,13 +33,14 @@ export declare class Gateway extends EventEmitter {
     selectorMiddlewares: Toposort<AppSelectorMiddleware>;
     server: http.Server | null;
     ipcSocketServer: IPCSocketServer | null;
+    loggers: Registry<SystemLogger>;
     private port;
     private host;
     private wsServer;
     private socketPath;
-    loggers: Registry<SystemLogger>;
     private constructor();
     static getInstance(options?: any): Gateway;
+    static getIPCSocketClient(): Promise<false | IPCSocketClient>;
     destroy(): void;
     reset(): void;
     addAppSelectorMiddleware(middleware: AppSelectorMiddleware, options?: ToposortOptions): void;
@@ -66,6 +67,5 @@ export declare class Gateway extends EventEmitter {
     tryConnectToIPCServer(): Promise<false | IPCSocketClient>;
     getIPCSocketClient(): Promise<IPCSocketClient>;
     close(): void;
-    static getIPCSocketClient(): Promise<false | IPCSocketClient>;
 }
 export {};

package/lib/gateway/index.js

@@ -65,11 +65,11 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   selectorMiddlewares = new import_utils.Toposort();
   server = null;
   ipcSocketServer = null;
+  loggers = new import_utils.Registry();
   port = process.env.APP_PORT ? parseInt(process.env.APP_PORT) : null;
   host = "0.0.0.0";
   wsServer;
   socketPath = (0, import_path.resolve)(process.cwd(), "storage", "gateway.sock");
-  loggers = new import_utils.Registry();
   constructor() {
     super();
     this.reset();
@@ -83,6 +83,14 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
     return _Gateway.instance;
   }
+  static async getIPCSocketClient() {
+    const socketPath = (0, import_path.resolve)(process.cwd(), process.env.SOCKET_PATH || "storage/gateway.sock");
+    try {
+      return await import_ipc_socket_client.IPCSocketClient.getConnection(socketPath);
+    } catch (error) {
+      return false;
+    }
+  }
   destroy() {
     this.reset();
     _Gateway.instance = null;
@@ -242,6 +250,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   getCallback() {
     return this.requestHandler.bind(this);
   }
+  /* istanbul ignore next -- @preserve */
   async watch() {
     if (!process.env.IS_DEV_CMD) {
       return;
@@ -252,6 +261,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
     require(file);
   }
+  /* istanbul ignore next -- @preserve */
   async run(options) {
     const isStart = this.isStart();
     let ipcClient;
@@ -303,11 +313,9 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     return argv[2] === "help";
   }
   getStartOptions() {
-    const argv = process.argv;
     const program = new import_commander.Command();
     program.allowUnknownOption().option("-s, --silent").option("-p, --port [post]").option("-h, --host [host]").option("--db-sync").parse(process.argv);
-    const options = program.opts();
-    return options;
+    return program.opts();
   }
   start(options) {
     this.startHttpServer(options);
@@ -362,14 +370,6 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     (_a = this.server) == null ? void 0 : _a.close();
     (_b = this.wsServer) == null ? void 0 : _b.close();
   }
-  static async getIPCSocketClient() {
-    const socketPath = (0, import_path.resolve)(process.cwd(), process.env.SOCKET_PATH || "storage/gateway.sock");
-    try {
-      return await import_ipc_socket_client.IPCSocketClient.getConnection(socketPath);
-    } catch (error) {
-      return false;
-    }
-  }
 };
 __name(_Gateway, "Gateway");
 __publicField(_Gateway, "instance");

package/lib/helper.js

@@ -137,10 +137,12 @@ const getCommandFullName = /* @__PURE__ */ __name((command) => {
   }
   return names.join(".");
 }, "getCommandFullName");
+/* istanbul ignore next -- @preserve */
 const tsxRerunning = /* @__PURE__ */ __name(async () => {
   const file = (0, import_path.resolve)(process.cwd(), "storage/app.watch.ts");
   await import_fs.default.promises.writeFile(file, `export const watchId = '${(0, import_utils.uid)()}';`, "utf-8");
 }, "tsxRerunning");
+/* istanbul ignore next -- @preserve */
 const enablePerfHooks = /* @__PURE__ */ __name((app) => {
   app.context.getPerfHistogram = (name) => {
     if (!app.perfHistograms.has(name)) {

package/lib/middlewares/index.d.ts

@@ -1,3 +1,2 @@
 export * from './data-wrapping';
-export * from './db2resource';
 export { parseVariables } from './parse-variables';

package/lib/middlewares/index.js

@@ -22,11 +22,9 @@ __export(middlewares_exports, {
 });
 module.exports = __toCommonJS(middlewares_exports);
 __reExport(middlewares_exports, require("./data-wrapping"), module.exports);
-__reExport(middlewares_exports, require("./db2resource"), module.exports);
 var import_parse_variables = require("./parse-variables");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   parseVariables,
-  ...require("./data-wrapping"),
-  ...require("./db2resource")
+  ...require("./data-wrapping")
 });

package/lib/migration.js

@@ -22,6 +22,7 @@ __export(migration_exports, {
 });
 module.exports = __toCommonJS(migration_exports);
 var import_database = require("@nocobase/database");
+/* istanbul ignore file -- @preserve */
 const _Migration = class _Migration extends import_database.Migration {
   appVersion = "";
   pluginVersion = "";

package/lib/migrations/20230912193824-package-name-unique.js

@@ -23,6 +23,7 @@ __export(package_name_unique_exports, {
 module.exports = __toCommonJS(package_name_unique_exports);
 var import_database = require("@nocobase/database");
 var import_migration = require("../migration");
+/* istanbul ignore file -- @preserve */
 const _package_name_unique_default = class _package_name_unique_default extends import_migration.Migration {
   on = "beforeLoad";
   appVersion = "<0.14.0-alpha.2";

package/lib/migrations/20230912294620-update-pkg.js

@@ -23,6 +23,7 @@ __export(update_pkg_exports, {
 module.exports = __toCommonJS(update_pkg_exports);
 var import_migration = require("../migration");
 var import_plugin_manager = require("../plugin-manager");
+/* istanbul ignore file -- @preserve */
 const _update_pkg_default = class _update_pkg_default extends import_migration.Migration {
   on = "afterSync";
   // 'beforeLoad' or 'afterLoad'

package/lib/migrations/20240106082756-update-plugins.js

@@ -22,6 +22,7 @@ __export(update_plugins_exports, {
 });
 module.exports = __toCommonJS(update_plugins_exports);
 var import_migration = require("../migration");
+/* istanbul ignore file -- @preserve */
 const _update_plugins_default = class _update_plugins_default extends import_migration.Migration {
   on = "afterSync";
   // 'beforeLoad' or 'afterLoad'

package/lib/plugin-manager/clientStaticUtils.js

@@ -42,6 +42,7 @@ __export(clientStaticUtils_exports, {
 module.exports = __toCommonJS(clientStaticUtils_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
+/* istanbul ignore file -- @preserve */
 const PLUGIN_STATICS_PATH = "/static/plugins/";
 function getDepPkgPath(packageName, cwd) {
   try {

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

@@ -43,11 +43,11 @@ export declare class PluginManager {
     /**
      * @internal
      */
-    _repository: PluginManagerRepository;
+    constructor(options: PluginManagerOptions);
     /**
      * @internal
      */
-    constructor(options: PluginManagerOptions);
+    _repository: PluginManagerRepository;
     get repository(): PluginManagerRepository;
     /**
      * @internal
@@ -93,17 +93,12 @@ 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?: {
         removeDir?: boolean;
         force?: boolean;
     }): Promise<void>;
-    /**
-     * @deprecated
-     */
-    loadOne(plugin: Plugin): Promise<void>;
     /**
      * @internal
      */
@@ -196,5 +191,6 @@ export declare class PluginManager {
      * @internal
      */
     initPresetPlugins(): Promise<void>;
+    private sort;
 }
 export default PluginManager;

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

@@ -223,6 +223,7 @@ const _PluginManager = class _PluginManager {
       this.app.pm.pluginInstances.delete(instance.constructor);
     }
   }
+  /* istanbul ignore next -- @preserve */
   async create(pluginName, options) {
     const createPlugin = /* @__PURE__ */ __name(async (name) => {
       const pluginDir = (0, import_path.resolve)(process.cwd(), "packages/plugins", name);
@@ -447,20 +448,6 @@ 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) {
     let pluginNames = name;
     if (name === "*") {
@@ -667,24 +654,6 @@ const _PluginManager = class _PluginManager {
     }
     await (0, import_execa.default)("yarn", ["nocobase", "refresh"]);
   }
-  /**
-   * @deprecated
-   */
-  async loadOne(plugin) {
-    this.app.setMaintainingMessage(`loading plugin ${plugin.name}...`);
-    if (plugin.state.loaded || !plugin.enabled) {
-      return;
-    }
-    const name = plugin.getName();
-    await plugin.beforeLoad();
-    await this.app.emitAsync("beforeLoadPlugin", plugin, {});
-    this.app.logger.debug(`loading plugin...`, { submodule: "plugin-manager", method: "loadOne", name });
-    await plugin.load();
-    plugin.state.loaded = true;
-    await this.app.emitAsync("afterLoadPlugin", plugin, {});
-    this.app.logger.debug(`after load plugin...`, { submodule: "plugin-manager", method: "loadOne", name });
-    this.app.setMaintainingMessage(`loaded plugin ${plugin.name}`);
-  }
   /**
    * @internal
    */
@@ -1016,6 +985,20 @@ const _PluginManager = class _PluginManager {
     }
     this["_initPresetPlugins"] = true;
   }
+  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;
+  }
 };
 __name(_PluginManager, "PluginManager");
 let PluginManager = _PluginManager;

package/lib/plugin-manager/utils.js

@@ -78,6 +78,7 @@ var import_semver = __toESM(require("semver"));
 var import_clientStaticUtils = require("./clientStaticUtils");
 var import_constants = require("./constants");
 var import_deps = __toESM(require("./deps"));
+/* istanbul ignore next -- @preserve */
 async function getTempDir() {
   const temporaryDirectory = await import_fs_extra.default.realpath(import_os.default.tmpdir());
   return import_path.default.join(temporaryDirectory, import_constants.APP_NAME);
@@ -116,11 +117,11 @@ __name(getNodeModulesPluginDir, "getNodeModulesPluginDir");
 function getAuthorizationHeaders(registry, authToken) {
   const headers = {};
   if (registry && !authToken) {
-    const npmrcPath = import_path.default.join(process.cwd(), ".npmrc");
+    const npmrcPath = import_path.default.join(import_os.default.homedir(), ".npmrc");
     const url = new URL(registry);
     let envConfig = process.env;
     if (import_fs_extra.default.existsSync(npmrcPath)) {
-      const content = import_fs_extra.default.readFileSync(import_path.default.join(process.cwd(), ".npmrc"), "utf-8");
+      const content = import_fs_extra.default.readFileSync(npmrcPath, "utf-8");
       envConfig = {
         ...envConfig,
         ...import_ini.default.parse(content)

package/lib/plugin.d.ts

@@ -65,10 +65,6 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
      * @internal
      */
     setOptions(options: any): void;
-    /**
-     * @internal
-     */
-    protected getSourceDir(): Promise<string>;
     /**
      * @internal
      */
@@ -90,13 +86,17 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
      */
     requiredPlugins(): any[];
     t(text: TFuncKey | TFuncKey[], options?: TOptions): import("i18next").TFunctionDetailedResult<object>;
+    /**
+     * @experimental
+     */
+    toJSON(options?: any): Promise<any>;
     /**
      * @internal
      */
-    protected isDev(): Promise<boolean>;
+    protected getSourceDir(): Promise<string>;
     /**
-     * @experimental
+     * @internal
      */
-    toJSON(options?: any): Promise<any>;
+    protected isDev(): Promise<boolean>;
 }
 export default Plugin;

package/lib/plugin.js

@@ -38,6 +38,7 @@ var import_glob = __toESM(require("glob"));
 var import_path = require("path");
 var import_plugin_manager = require("./plugin-manager");
 var import_utils2 = require("./plugin-manager/utils");
+/* istanbul ignore file -- @preserve */
 const _Plugin = class _Plugin {
   options;
   app;
@@ -126,21 +127,6 @@ const _Plugin = class _Plugin {
   setOptions(options) {
     this.options = options || {};
   }
-  /**
-   * @internal
-   */
-  async getSourceDir() {
-    if (this._sourceDir) {
-      return this._sourceDir;
-    }
-    if (await this.isDev()) {
-      return this._sourceDir = "src";
-    }
-    if ((0, import_path.basename)(__dirname) === "src") {
-      return this._sourceDir = "src";
-    }
-    return this._sourceDir = this.isPreset ? "lib" : "dist";
-  }
   /**
    * @internal
    */
@@ -217,21 +203,6 @@ const _Plugin = class _Plugin {
   t(text, options = {}) {
     return this.app.i18n.t(text, { ns: this.options["packageName"], ...options });
   }
-  /**
-   * @internal
-   */
-  async isDev() {
-    if (!this.options.packageName) {
-      return false;
-    }
-    const file = await import_fs.default.promises.realpath(
-      (0, import_path.resolve)(process.env.NODE_MODULES_PATH || (0, import_path.resolve)(process.cwd(), "node_modules"), this.options.packageName)
-    );
-    if (file.startsWith((0, import_path.resolve)(process.cwd(), "packages"))) {
-      return !!process.env.IS_DEV_CMD;
-    }
-    return false;
-  }
   /**
    * @experimental
    */
@@ -266,6 +237,36 @@ const _Plugin = class _Plugin {
     }
     return results;
   }
+  /**
+   * @internal
+   */
+  async getSourceDir() {
+    if (this._sourceDir) {
+      return this._sourceDir;
+    }
+    if (await this.isDev()) {
+      return this._sourceDir = "src";
+    }
+    if ((0, import_path.basename)(__dirname) === "src") {
+      return this._sourceDir = "src";
+    }
+    return this._sourceDir = this.isPreset ? "lib" : "dist";
+  }
+  /**
+   * @internal
+   */
+  async isDev() {
+    if (!this.options.packageName) {
+      return false;
+    }
+    const file = await import_fs.default.promises.realpath(
+      (0, import_path.resolve)(process.env.NODE_MODULES_PATH || (0, import_path.resolve)(process.cwd(), "node_modules"), this.options.packageName)
+    );
+    if (file.startsWith((0, import_path.resolve)(process.cwd(), "packages"))) {
+      return !!process.env.IS_DEV_CMD;
+    }
+    return false;
+  }
 };
 __name(_Plugin, "Plugin");
 let Plugin = _Plugin;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "0.21.0-alpha.14",
+    "version": "0.21.0-alpha.16",
     "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.14",
-        "@nocobase/actions": "0.21.0-alpha.14",
-        "@nocobase/auth": "0.21.0-alpha.14",
-        "@nocobase/cache": "0.21.0-alpha.14",
-        "@nocobase/data-source-manager": "0.21.0-alpha.14",
-        "@nocobase/database": "0.21.0-alpha.14",
-        "@nocobase/evaluators": "0.21.0-alpha.14",
-        "@nocobase/logger": "0.21.0-alpha.14",
-        "@nocobase/resourcer": "0.21.0-alpha.14",
-        "@nocobase/sdk": "0.21.0-alpha.14",
-        "@nocobase/telemetry": "0.21.0-alpha.14",
-        "@nocobase/utils": "0.21.0-alpha.14",
+        "@nocobase/acl": "0.21.0-alpha.16",
+        "@nocobase/actions": "0.21.0-alpha.16",
+        "@nocobase/auth": "0.21.0-alpha.16",
+        "@nocobase/cache": "0.21.0-alpha.16",
+        "@nocobase/data-source-manager": "0.21.0-alpha.16",
+        "@nocobase/database": "0.21.0-alpha.16",
+        "@nocobase/evaluators": "0.21.0-alpha.16",
+        "@nocobase/logger": "0.21.0-alpha.16",
+        "@nocobase/resourcer": "0.21.0-alpha.16",
+        "@nocobase/sdk": "0.21.0-alpha.16",
+        "@nocobase/telemetry": "0.21.0-alpha.16",
+        "@nocobase/utils": "0.21.0-alpha.16",
         "@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": "dbcca03c0535e14f0b09fd13306731b4438829c4"
+    "gitHead": "2914500f14e4454cc5702a49371230865660ca33"
 }

package/lib/helpers/multiple-instance-manager.d.ts

@@ -1,6 +0,0 @@
-export declare class MultipleInstanceManager<Item> {
-    map: Map<string, Item>;
-    constructor();
-    get(key: string): Item;
-    set(key: string, value: Item): void;
-}

package/lib/helpers/multiple-instance-manager.js

@@ -1,40 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var multiple_instance_manager_exports = {};
-__export(multiple_instance_manager_exports, {
-  MultipleInstanceManager: () => MultipleInstanceManager
-});
-module.exports = __toCommonJS(multiple_instance_manager_exports);
-const _MultipleInstanceManager = class _MultipleInstanceManager {
-  map = /* @__PURE__ */ new Map();
-  constructor() {
-  }
-  get(key) {
-    return this.map.get(key);
-  }
-  set(key, value) {
-    this.map.set(key, value);
-  }
-};
-__name(_MultipleInstanceManager, "MultipleInstanceManager");
-let MultipleInstanceManager = _MultipleInstanceManager;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  MultipleInstanceManager
-});

package/lib/middlewares/db2resource.d.ts

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

package/lib/middlewares/db2resource.js

@@ -1,69 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var db2resource_exports = {};
-__export(db2resource_exports, {
-  db2resource: () => db2resource,
-  default: () => db2resource_default
-});
-module.exports = __toCommonJS(db2resource_exports);
-var import_resourcer = require("@nocobase/resourcer");
-async function db2resource(ctx, next) {
-  const resourcer = ctx.resourcer;
-  const database = ctx.db;
-  const params = (0, import_resourcer.parseRequest)(
-    {
-      path: ctx.request.path,
-      method: ctx.request.method
-    },
-    {
-      prefix: resourcer.options.prefix,
-      accessors: resourcer.options.accessors
-    }
-  );
-  if (!params) {
-    return next();
-  }
-  const resourceName = (0, import_resourcer.getNameByParams)(params);
-  if (resourcer.isDefined(resourceName)) {
-    return next();
-  }
-  const splitResult = resourceName.split(".");
-  const collectionName = splitResult[0];
-  const fieldName = splitResult[1];
-  if (!database.hasCollection(collectionName)) {
-    return next();
-  }
-  const collection = database.getCollection(collectionName);
-  let resourceType = "single";
-  if (fieldName && collection.hasField(fieldName)) {
-    const field = collection.getField(fieldName);
-    resourceType = field.type;
-  }
-  resourcer.define({
-    type: resourceType,
-    name: resourceName
-  });
-  return next();
-}
-__name(db2resource, "db2resource");
-var db2resource_default = db2resource;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  db2resource
-});