@nocobase/server 0.19.0-alpha.4 → 0.19.0-alpha.6

package/lib/middlewares/data-wrapping.js

@@ -55,27 +55,27 @@ function dataWrapping() {
       ctx.body = {
         data: ctx.body
       };
-      return;
-    }
-    if (ctx.body) {
-      const { rows, ...meta } = ctx.body;
-      if (rows) {
-        ctx.body = {
-          data: rows,
-          meta
-        };
-      } else {
+    } else {
+      if (ctx.body) {
+        const { rows, ...meta } = ctx.body;
+        if (rows) {
+          ctx.body = {
+            data: rows,
+            meta
+          };
+        } else {
+          ctx.body = {
+            data: ctx.body
+          };
+          if (ctx.bodyMeta) {
+            ctx.body.meta = ctx.bodyMeta;
+          }
+        }
+      } else if (ctx.action) {
         ctx.body = {
           data: ctx.body
         };
-        if (ctx.bodyMeta) {
-          ctx.body.meta = ctx.bodyMeta;
-        }
       }
-    } else if (ctx.action) {
-      ctx.body = {
-        data: ctx.body
-      };
     }
     if (ctx.body && ((_b = ctx.state.messages) == null ? void 0 : _b.length)) {
       ctx.body.messages = ctx.state.messages;

package/lib/plugin.d.ts

@@ -37,7 +37,8 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
     setOptions(options: any): void;
     getName(): any;
     createLogger(options: LoggerOptions): import("winston").Logger;
-    get _sourceDir(): "src" | "dist" | "lib";
+    protected _sourceDir: string;
+    protected getSourceDir(): Promise<string>;
     loadCommands(): Promise<void>;
     loadMigrations(): Promise<{
         beforeLoad: any[];
@@ -59,6 +60,7 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
     loadCollections(): Promise<void>;
     requiredPlugins(): any[];
     t(text: TFuncKey | TFuncKey[], options?: TOptions): import("i18next").TFunctionDetailedResult<object>;
+    protected isDev(): Promise<boolean>;
     toJSON(options?: any): Promise<any>;
 }
 export default Plugin;

package/lib/plugin.js

@@ -86,18 +86,25 @@ const _Plugin = class _Plugin {
   createLogger(options) {
     return this.app.createLogger(options);
   }
-  get _sourceDir() {
+  _sourceDir;
+  async getSourceDir() {
+    if (this._sourceDir) {
+      return this._sourceDir;
+    }
+    if (await this.isDev()) {
+      return this._sourceDir = "src";
+    }
     if ((0, import_path.basename)(__dirname) === "src") {
-      return "src";
+      return this._sourceDir = "src";
     }
-    return this.isPreset ? "lib" : "dist";
+    return this._sourceDir = this.isPreset ? "lib" : "dist";
   }
   async loadCommands() {
     const extensions = ["js", "ts"];
     const directory = (0, import_path.resolve)(
       process.env.NODE_MODULES_PATH,
       this.options.packageName,
-      this._sourceDir,
+      await this.getSourceDir(),
       "server/commands"
     );
     const patten = `${directory}/*.{${extensions.join(",")}}`;
@@ -122,7 +129,7 @@ const _Plugin = class _Plugin {
     const directory = (0, import_path.resolve)(
       process.env.NODE_MODULES_PATH,
       this.options.packageName,
-      this._sourceDir,
+      await this.getSourceDir(),
       "server/migrations"
     );
     return await this.app.loadMigrations({
@@ -164,7 +171,7 @@ const _Plugin = class _Plugin {
     const directory = (0, import_path.resolve)(
       process.env.NODE_MODULES_PATH,
       this.options.packageName,
-      this._sourceDir,
+      await this.getSourceDir(),
       "server/collections"
     );
     if (await (0, import_utils.fsExists)(directory)) {
@@ -180,6 +187,18 @@ const _Plugin = class _Plugin {
   t(text, options = {}) {
     return this.app.i18n.t(text, { ns: this.options["packageName"], ...options });
   }
+  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;
+  }
   async toJSON(options = {}) {
     const { locale = "en-US" } = options;
     const { name, packageName, packageJson } = this.options;
@@ -190,10 +209,12 @@ const _Plugin = class _Plugin {
     }
     const results = {
       ...this.options,
+      keywords: packageJson.keywords,
       readmeUrl: (0, import_plugin_manager.getExposeReadmeUrl)(packageName, locale),
       changelogUrl: (0, import_plugin_manager.getExposeChangelogUrl)(packageName),
       displayName: packageJson[`displayName.${locale}`] || packageJson.displayName || name,
-      description: packageJson[`description.${locale}`] || packageJson.description
+      description: packageJson[`description.${locale}`] || packageJson.description,
+      homepage: packageJson[`homepage.${locale}`] || packageJson.homepage
     };
     if (!options.withOutOpenFile) {
       const file = await import_fs.default.promises.realpath(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "0.19.0-alpha.4",
+    "version": "0.19.0-alpha.6",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "Apache-2.0",
@@ -10,17 +10,17 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "0.19.0-alpha.4",
-        "@nocobase/actions": "0.19.0-alpha.4",
-        "@nocobase/auth": "0.19.0-alpha.4",
-        "@nocobase/cache": "0.19.0-alpha.4",
-        "@nocobase/database": "0.19.0-alpha.4",
-        "@nocobase/evaluators": "0.19.0-alpha.4",
-        "@nocobase/logger": "0.19.0-alpha.4",
-        "@nocobase/resourcer": "0.19.0-alpha.4",
-        "@nocobase/sdk": "0.19.0-alpha.4",
-        "@nocobase/telemetry": "0.19.0-alpha.4",
-        "@nocobase/utils": "0.19.0-alpha.4",
+        "@nocobase/acl": "0.19.0-alpha.6",
+        "@nocobase/actions": "0.19.0-alpha.6",
+        "@nocobase/auth": "0.19.0-alpha.6",
+        "@nocobase/cache": "0.19.0-alpha.6",
+        "@nocobase/database": "0.19.0-alpha.6",
+        "@nocobase/evaluators": "0.19.0-alpha.6",
+        "@nocobase/logger": "0.19.0-alpha.6",
+        "@nocobase/resourcer": "0.19.0-alpha.6",
+        "@nocobase/sdk": "0.19.0-alpha.6",
+        "@nocobase/telemetry": "0.19.0-alpha.6",
+        "@nocobase/utils": "0.19.0-alpha.6",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -53,5 +53,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "9583023f7bea828da5192384a5c002782c341b65"
+    "gitHead": "2eb524db98c7f4136fe1a9a1b1259cd72cf6635f"
 }