@nocobase/resourcer 2.0.0-alpha.7 → 2.0.0-alpha.70

package/lib/action.js

@@ -180,6 +180,7 @@ const _Action = class _Action {
     const handlers = [
       ...this.resource.resourcer.getMiddlewares(),
       ...this.getMiddlewareHandlers(),
+      ...this.resource.resourcer.getRegisteredPreActionHandlers(this.resource.getName(), this.name),
       this.getHandler()
     ].filter(Boolean);
     return handlers.map((fn) => (0, import_utils.wrapMiddlewareWithLogging)(fn));

package/lib/resourcer.d.ts

@@ -142,6 +142,7 @@ export declare class ResourceManager {
      */
     protected handlers: Map<ActionName, any>;
     protected actionHandlers: Map<ActionName, any>;
+    protected preActionHandlers: Map<ActionName, Toposort<HandlerType>>;
     protected middlewareHandlers: Map<string, any>;
     protected middlewares: Toposort<any>;
     constructor(options?: ResourceManagerOptions);
@@ -195,6 +196,8 @@ export declare class ResourceManager {
      * @internal
      */
     getRegisteredHandlers(): Map<ActionName, any>;
+    registerPreActionHandler(name: ActionName, handler: HandlerType, options?: ToposortOptions): void;
+    getRegisteredPreActionHandlers(name: string, action: ActionName): HandlerType[];
     /**
      * @internal
      */

package/lib/resourcer.js

@@ -59,6 +59,7 @@ const _ResourceManager = class _ResourceManager {
    */
   handlers = /* @__PURE__ */ new Map();
   actionHandlers = /* @__PURE__ */ new Map();
+  preActionHandlers = /* @__PURE__ */ new Map();
   middlewareHandlers = /* @__PURE__ */ new Map();
   middlewares;
   constructor(options = {}) {
@@ -151,6 +152,22 @@ const _ResourceManager = class _ResourceManager {
   getRegisteredHandlers() {
     return this.actionHandlers;
   }
+  registerPreActionHandler(name, handler, options = {}) {
+    const middlewares = this.preActionHandlers.get(name) || new import_utils.Toposort();
+    middlewares.add(handler, options);
+    this.preActionHandlers.set(name, middlewares);
+  }
+  getRegisteredPreActionHandlers(name, action) {
+    let specificAction = action;
+    if (!action.includes(":")) {
+      specificAction = `${name}:${action}`;
+    }
+    let middlewares = this.preActionHandlers.get(specificAction);
+    if (!middlewares) {
+      middlewares = this.preActionHandlers.get(action);
+    }
+    return (middlewares == null ? void 0 : middlewares.nodes) || [];
+  }
   /**
    * @internal
    */
@@ -176,6 +193,9 @@ const _ResourceManager = class _ResourceManager {
     return this.middlewares.nodes;
   }
   use(middlewares, options = {}) {
+    if (!options.tag && !options.group && !options.before && !options.after) {
+      options.tag = "default";
+    }
     this.middlewares.add(middlewares, options);
   }
   middleware({ prefix, accessors, skipIfDataSourceExists = false } = {}) {

package/lib/utils.js

@@ -205,16 +205,39 @@ function parseRequest(request, options = {}) {
   return params;
 }
 __name(parseRequest, "parseRequest");
+function smartParse(str) {
+  if (typeof str !== "string") return str;
+  const s = str.trim();
+  if (!s) return str;
+  const first = s[0];
+  if (first !== "{" && first !== "[") {
+    return str;
+  }
+  try {
+    const parsed = JSON.parse(s);
+    if (Array.isArray(parsed)) return parsed;
+    if (parsed !== null && typeof parsed === "object") return parsed;
+    return str;
+  } catch {
+    return str;
+  }
+}
+__name(smartParse, "smartParse");
 function parseQuery(input) {
   const query = import_qs.default.parse(input, {
     // 原始 query string 中如果一个键连等号“=”都没有可以被认为是 null 类型
-    strictNullHandling: true
+    strictNullHandling: true,
+    // 允许更大的数组长度，避免像 appends[] 这种参数在超过默认 20 个时被转换成对象
+    arrayLimit: 100
     // 逗号分隔转换为数组
     // comma: true,
   });
   if (typeof query.filter === "string") {
     query.filter = JSON.parse(query.filter);
   }
+  if (typeof query.filterByTk === "string") {
+    query.filterByTk = smartParse(query.filterByTk);
+  }
   return query;
 }
 __name(parseQuery, "parseQuery");

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.70",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@nocobase/utils": "2.0.0-alpha.7",
+    "@nocobase/utils": "2.0.0-alpha.70",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
@@ -18,5 +18,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/resourcer"
   },
-  "gitHead": "cb012f93256f534472d3ae56e075839ca1675779"
+  "gitHead": "42556ed4b29d8410e104ffd8af4fa72c9b1bae7f"
 }