@nocobase/server 1.6.0-alpha.5 → 1.6.0-alpha.7

package/lib/audit-manager/index.js

@@ -260,6 +260,8 @@ const _AuditManager = class _AuditManager {
       const auditLog = this.formatAuditData(ctx);
       auditLog.uuid = reqId;
       auditLog.status = ctx.status;
+      const defaultMetaData = await this.getDefaultMetaData(ctx);
+      auditLog.metadata = { ...metadata, ...defaultMetaData };
       if (typeof action !== "string") {
         if (action.getUserInfo) {
           const userInfo = await action.getUserInfo(ctx);
@@ -274,10 +276,15 @@ const _AuditManager = class _AuditManager {
         }
         if (action.getMetaData) {
           const extra = await action.getMetaData(ctx);
-          auditLog.metadata = { ...metadata, ...extra };
-        } else {
-          const defaultMetaData = await this.getDefaultMetaData(ctx);
-          auditLog.metadata = { ...metadata, ...defaultMetaData };
+          if (extra) {
+            if (extra.request) {
+              auditLog.metadata.request = { ...auditLog.metadata.request, ...extra.request };
+            }
+            if (extra.response) {
+              auditLog.metadata.response = { ...auditLog.metadata.response, ...extra.response };
+            }
+            auditLog.metadata = { ...extra, ...auditLog.metadata };
+          }
         }
         if (action.getSourceAndTarget) {
           const sourceAndTarget = await action.getSourceAndTarget(ctx);
@@ -288,9 +295,6 @@ const _AuditManager = class _AuditManager {
             auditLog.targetRecordUK = sourceAndTarget.targetRecordUK;
           }
         }
-      } else {
-        const defaultMetaData = await this.getDefaultMetaData(ctx);
-        auditLog.metadata = { ...metadata, ...defaultMetaData };
       }
       this.logger.log(auditLog);
     } catch (err) {

package/lib/middlewares/data-template.js

@@ -32,12 +32,12 @@ __export(data_template_exports, {
 module.exports = __toCommonJS(data_template_exports);
 async function dataTemplate(ctx, next) {
   const { resourceName, actionName } = ctx.action;
-  const { isTemplate, fields } = ctx.action.params;
+  const { isTemplate, fields, appends } = ctx.action.params;
   await next();
-  if (isTemplate && actionName === "get" && fields.length > 0) {
+  if (isTemplate && actionName === "get") {
     ctx.body = traverseJSON(JSON.parse(JSON.stringify(ctx.body)), {
-      collection: ctx.db.getCollection(resourceName),
-      include: fields
+      collection: ctx.getCurrentRepository().collection,
+      include: [...fields || [], ...appends || []]
     });
   }
 }
@@ -101,7 +101,7 @@ const traverseJSON = /* @__PURE__ */ __name((data, options) => {
       result[key] = data[key];
       continue;
     }
-    if (field.options.primaryKey && excludePk) {
+    if (field.options.primaryKey && excludePk && !collection.isMultiFilterTargetKey()) {
       continue;
     }
     if (field.options.isForeignKey) {

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

@@ -67,7 +67,7 @@ export declare class PluginManager {
     /**
      * @internal
      */
-    static getPackageName(name: string): Promise<string>;
+    static getPackageName(name: string): Promise<any>;
     /**
      * @internal
      */
@@ -75,7 +75,7 @@ export declare class PluginManager {
     /**
      * @internal
      */
-    static findPackage(name: string): Promise<string>;
+    static findPackage(name: string): Promise<any>;
     /**
      * @internal
      */

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

@@ -139,15 +139,12 @@ const _PluginManager = class _PluginManager {
    * @internal
    */
   static async getPackageName(name) {
-    const prefixes = this.getPluginPkgPrefix();
-    for (const prefix of prefixes) {
-      const pkg = (0, import_path.resolve)(process.env.NODE_MODULES_PATH, `${prefix}${name}`, "package.json");
-      const exists = await import_fs_extra.default.exists(pkg);
-      if (exists) {
-        return `${prefix}${name}`;
-      }
+    const { packageName } = await this.parseName(name);
+    const packageFile = (0, import_path.resolve)(process.env.NODE_MODULES_PATH, packageName, "package.json");
+    if (!await import_fs_extra.default.exists(packageFile)) {
+      return null;
     }
-    throw new Error(`${name} plugin does not exist`);
+    return packageName;
   }
   /**
    * @internal
@@ -312,7 +309,9 @@ const _PluginManager = class _PluginManager {
     try {
       if (typeof plugin === "string" && options.name && !options.packageName) {
         const packageName = await _PluginManager.getPackageName(options.name);
-        options["packageName"] = packageName;
+        if (packageName) {
+          options["packageName"] = packageName;
+        }
       }
       if (options.packageName) {
         const packageJson = await _PluginManager.getPackageJson(options.packageName);
@@ -320,12 +319,14 @@ const _PluginManager = class _PluginManager {
         options["version"] = packageJson.version;
       }
     } catch (error) {
+      this.app.log.error(error);
       console.error(error);
     }
-    this.app.log.trace(`add plugin [${options.name}]`, {
+    this.app.log.trace(`adding plugin [${options.name}]`, {
       method: "add",
       submodule: "plugin-manager",
-      name: options.name
+      name: options.name,
+      options
     });
     let P;
     try {
@@ -343,6 +344,12 @@ const _PluginManager = class _PluginManager {
       this.pluginAliases.set(options.packageName, instance);
     }
     await instance.afterAdd();
+    this.app.log.trace(`added plugin [${options.name}]`, {
+      method: "add",
+      submodule: "plugin-manager",
+      name: instance.name,
+      options: instance.options
+    });
   }
   /**
    * @internal

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.6.0-alpha.5",
+    "version": "1.6.0-alpha.7",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.6.0-alpha.5",
-        "@nocobase/actions": "1.6.0-alpha.5",
-        "@nocobase/auth": "1.6.0-alpha.5",
-        "@nocobase/cache": "1.6.0-alpha.5",
-        "@nocobase/data-source-manager": "1.6.0-alpha.5",
-        "@nocobase/database": "1.6.0-alpha.5",
-        "@nocobase/evaluators": "1.6.0-alpha.5",
-        "@nocobase/lock-manager": "1.6.0-alpha.5",
-        "@nocobase/logger": "1.6.0-alpha.5",
-        "@nocobase/resourcer": "1.6.0-alpha.5",
-        "@nocobase/sdk": "1.6.0-alpha.5",
-        "@nocobase/telemetry": "1.6.0-alpha.5",
-        "@nocobase/utils": "1.6.0-alpha.5",
+        "@nocobase/acl": "1.6.0-alpha.7",
+        "@nocobase/actions": "1.6.0-alpha.7",
+        "@nocobase/auth": "1.6.0-alpha.7",
+        "@nocobase/cache": "1.6.0-alpha.7",
+        "@nocobase/data-source-manager": "1.6.0-alpha.7",
+        "@nocobase/database": "1.6.0-alpha.7",
+        "@nocobase/evaluators": "1.6.0-alpha.7",
+        "@nocobase/lock-manager": "1.6.0-alpha.7",
+        "@nocobase/logger": "1.6.0-alpha.7",
+        "@nocobase/resourcer": "1.6.0-alpha.7",
+        "@nocobase/sdk": "1.6.0-alpha.7",
+        "@nocobase/telemetry": "1.6.0-alpha.7",
+        "@nocobase/utils": "1.6.0-alpha.7",
         "@types/decompress": "4.2.7",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -56,5 +56,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "b600efcab7fef54f1456ef079787f0ab4992e249"
+    "gitHead": "d9552440f5e3ce2795c9f2f23a1b04f5376a1550"
 }