@nocobase/server 1.0.0-alpha.13 → 1.0.0-alpha.14

package/lib/commands/start.js

@@ -52,7 +52,10 @@ var start_default = /* @__PURE__ */ __name((app) => {
     const upgrading = await (0, import_utils.fsExists)(file);
     if (upgrading) {
       await app.upgrade();
-      await import_fs.default.promises.rm(file);
+      try {
+        await import_fs.default.promises.rm(file);
+      } catch (error) {
+      }
     } else if (options.quickstart) {
       if (await app.isInstalled()) {
         await app.upgrade();

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

@@ -379,7 +379,7 @@ const _PluginManager = class _PluginManager {
    * @internal
    */
   async loadCommands() {
-    this.app.log.debug("load commands");
+    this.app.log.info("load commands");
     const items = await this.repository.find({
       filter: {
         enabled: true
@@ -388,21 +388,15 @@ const _PluginManager = class _PluginManager {
     const packageNames = items.map((item) => item.packageName);
     const source = [];
     for (const packageName of packageNames) {
-      const file = require.resolve(packageName);
-      const sourceDir = (0, import_path.basename)((0, import_path.dirname)(file)) === "src" ? "src" : "dist";
-      const directory = (0, import_path.join)(
-        packageName,
-        sourceDir,
-        "server/commands/*." + ((0, import_path.basename)((0, import_path.dirname)(file)) === "src" ? "ts" : "js")
-      );
+      const dirname = await (0, import_utils2.getPluginBasePath)(packageName);
+      const directory = (0, import_path.join)(dirname, "server/commands/*." + ((0, import_path.basename)(dirname) === "src" ? "ts" : "js"));
       source.push(directory.replaceAll(import_path.sep, "/"));
     }
     for (const plugin of this.options.plugins || []) {
       if (typeof plugin === "string") {
-        const packageName = await _PluginManager.getPackageName(plugin);
-        const file = require.resolve(packageName);
-        const sourceDir = (0, import_path.basename)((0, import_path.dirname)(file)) === "src" ? "src" : "lib";
-        const directory = (0, import_path.join)(packageName, sourceDir, "server/commands/*." + (sourceDir === "src" ? "ts" : "js"));
+        const { packageName } = await _PluginManager.parseName(plugin);
+        const dirname = await (0, import_utils2.getPluginBasePath)(packageName);
+        const directory = (0, import_path.join)(dirname, "server/commands/*." + ((0, import_path.basename)(dirname) === "src" ? "ts" : "js"));
         source.push(directory.replaceAll(import_path.sep, "/"));
       }
     }

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

@@ -111,4 +111,5 @@ export declare function checkAndGetCompatible(packageName: string): Promise<{
     isCompatible: boolean;
     depsCompatible: DepCompatible[];
 }>;
+export declare function getPluginBasePath(packageName: string): Promise<string>;
 export {};

package/lib/plugin-manager/utils.js

@@ -57,6 +57,7 @@ __export(utils_exports, {
   getPackageJsonByLocalPath: () => getPackageJsonByLocalPath,
   getPackageNameFromString: () => getPackageNameFromString,
   getPackagesFromFiles: () => getPackagesFromFiles,
+  getPluginBasePath: () => getPluginBasePath,
   getPluginInfoByNpm: () => getPluginInfoByNpm,
   getPluginStoragePath: () => getPluginStoragePath,
   getServerPackages: () => getServerPackages,
@@ -512,6 +513,21 @@ async function checkAndGetCompatible(packageName) {
   };
 }
 __name(checkAndGetCompatible, "checkAndGetCompatible");
+async function getPluginBasePath(packageName) {
+  if (!packageName) {
+    return;
+  }
+  const file = await import_fs_extra.default.realpath(await (0, import_utils.requireResolve)(packageName));
+  try {
+    const basePath = await import_fs_extra.default.realpath(import_path.default.resolve(process.env.NODE_MODULES_PATH, packageName, "src"));
+    if (file.startsWith(basePath)) {
+      return basePath;
+    }
+  } catch (error) {
+  }
+  return import_path.default.dirname(import_path.default.dirname(file));
+}
+__name(getPluginBasePath, "getPluginBasePath");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkAndGetCompatible,
@@ -534,6 +550,7 @@ __name(checkAndGetCompatible, "checkAndGetCompatible");
   getPackageJsonByLocalPath,
   getPackageNameFromString,
   getPackagesFromFiles,
+  getPluginBasePath,
   getPluginInfoByNpm,
   getPluginStoragePath,
   getServerPackages,

package/lib/plugin.d.ts

@@ -73,10 +73,6 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
      * @internal
      */
     setOptions(options: any): void;
-    /**
-     * @internal
-     */
-    loadCommands(): Promise<void>;
     /**
      * @internal
      */
@@ -85,6 +81,7 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
         afterSync: any[];
         afterLoad: any[];
     }>;
+    private getPluginBasePath;
     /**
      * @internal
      */
@@ -98,13 +95,5 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
      * @experimental
      */
     toJSON(options?: any): Promise<any>;
-    /**
-     * @internal
-     */
-    protected getSourceDir(): Promise<string>;
-    /**
-     * @internal
-     */
-    protected isDev(): Promise<boolean>;
 }
 export default Plugin;

package/lib/plugin.js

@@ -43,7 +43,6 @@ __export(plugin_exports, {
 module.exports = __toCommonJS(plugin_exports);
 var import_utils = require("@nocobase/utils");
 var import_fs = __toESM(require("fs"));
-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");
@@ -136,45 +135,16 @@ const _Plugin = class _Plugin {
   setOptions(options) {
     this.options = options || {};
   }
-  /**
-   * @internal
-   */
-  async loadCommands() {
-    const extensions = ["js", "ts"];
-    const directory = (0, import_path.resolve)(
-      process.env.NODE_MODULES_PATH,
-      this.options.packageName,
-      await this.getSourceDir(),
-      "server/commands"
-    );
-    const patten = `${directory}/*.{${extensions.join(",")}}`;
-    const files = import_glob.default.sync(patten, {
-      ignore: ["**/*.d.ts"]
-    });
-    for (const file of files) {
-      let filename = (0, import_path.basename)(file);
-      filename = filename.substring(0, filename.lastIndexOf(".")) || filename;
-      const callback = await (0, import_utils.importModule)(file);
-      callback(this.app);
-    }
-    if (files.length) {
-      this.app.log.debug(`load commands [${this.name}]`);
-    }
-  }
   /**
    * @internal
    */
   async loadMigrations() {
     this.app.log.debug(`load plugin migrations [${this.name}]`);
-    if (!this.options.packageName) {
+    const basePath = await this.getPluginBasePath();
+    if (!basePath) {
       return { beforeLoad: [], afterSync: [], afterLoad: [] };
     }
-    const directory = (0, import_path.resolve)(
-      process.env.NODE_MODULES_PATH,
-      this.options.packageName,
-      await this.getSourceDir(),
-      "server/migrations"
-    );
+    const directory = (0, import_path.resolve)(basePath, "server/migrations");
     return await this.app.loadMigrations({
       directory,
       namespace: this.options.packageName,
@@ -183,19 +153,21 @@ const _Plugin = class _Plugin {
       }
     });
   }
+  async getPluginBasePath() {
+    if (!this.options.packageName) {
+      return;
+    }
+    return (0, import_utils2.getPluginBasePath)(this.options.packageName);
+  }
   /**
    * @internal
    */
   async loadCollections() {
-    if (!this.options.packageName) {
+    const basePath = await this.getPluginBasePath();
+    if (!basePath) {
       return;
     }
-    const directory = (0, import_path.resolve)(
-      process.env.NODE_MODULES_PATH,
-      this.options.packageName,
-      await this.getSourceDir(),
-      "server/collections"
-    );
+    const directory = (0, import_path.resolve)(basePath, "server/collections");
     if (await (0, import_utils.fsExists)(directory)) {
       await this.db.import({
         directory,
@@ -246,36 +218,6 @@ 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": "1.0.0-alpha.13",
+    "version": "1.0.0-alpha.14",
     "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.0.0-alpha.13",
-        "@nocobase/actions": "1.0.0-alpha.13",
-        "@nocobase/auth": "1.0.0-alpha.13",
-        "@nocobase/cache": "1.0.0-alpha.13",
-        "@nocobase/data-source-manager": "1.0.0-alpha.13",
-        "@nocobase/database": "1.0.0-alpha.13",
-        "@nocobase/evaluators": "1.0.0-alpha.13",
-        "@nocobase/logger": "1.0.0-alpha.13",
-        "@nocobase/resourcer": "1.0.0-alpha.13",
-        "@nocobase/sdk": "1.0.0-alpha.13",
-        "@nocobase/telemetry": "1.0.0-alpha.13",
-        "@nocobase/utils": "1.0.0-alpha.13",
+        "@nocobase/acl": "1.0.0-alpha.14",
+        "@nocobase/actions": "1.0.0-alpha.14",
+        "@nocobase/auth": "1.0.0-alpha.14",
+        "@nocobase/cache": "1.0.0-alpha.14",
+        "@nocobase/data-source-manager": "1.0.0-alpha.14",
+        "@nocobase/database": "1.0.0-alpha.14",
+        "@nocobase/evaluators": "1.0.0-alpha.14",
+        "@nocobase/logger": "1.0.0-alpha.14",
+        "@nocobase/resourcer": "1.0.0-alpha.14",
+        "@nocobase/sdk": "1.0.0-alpha.14",
+        "@nocobase/telemetry": "1.0.0-alpha.14",
+        "@nocobase/utils": "1.0.0-alpha.14",
         "@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": "bd97adef70762a6691b5b58ca6572672a8cdf838"
+    "gitHead": "829078819e5b9720a4c2501c340a301315c0d029"
 }