@nocobase/resourcer 0.8.0-alpha.8 → 0.8.1-alpha.3

package/lib/action.d.ts

@@ -1,4 +1,4 @@
-import { MergeStrategies } from './assign';
+import { MergeStrategies } from '@nocobase/utils';
 import Middleware, { MiddlewareType } from './middleware';
 import Resource from './resource';
 import { HandlerType } from './resourcer';
@@ -174,6 +174,12 @@ export declare class Action {
     resourceOf: any;
     readonly middlewares: Array<Middleware>;
     constructor(options: ActionOptions);
+    toJSON(): {
+        actionName: string;
+        resourceName: string;
+        resourceOf: any;
+        params: ActionParams;
+    };
     clone(): Action;
     setContext(context: any): void;
     mergeParams(params: ActionParams, strategies?: MergeStrategies): void;

package/lib/action.js

@@ -35,8 +35,6 @@ function _lodash() {
   return data;
 }
 
-var _assign = require("./assign");
-
 var _middleware = _interopRequireDefault(require("./middleware"));
 
 const _excluded = ["middleware", "middlewares", "handler"];
@@ -90,6 +88,15 @@ class Action {
     this.mergeParams(params);
   }
 
+  toJSON() {
+    return {
+      actionName: this.actionName,
+      resourceName: this.resourceName,
+      resourceOf: this.resourceOf,
+      params: this.params
+    };
+  }
+
   clone() {
     const options = _lodash().default.cloneDeep(this.options);
 
@@ -107,7 +114,15 @@ class Action {
   }
 
   mergeParams(params, strategies = {}) {
-    (0, _assign.assign)(this.params, params, _objectSpread({
+    if (!this.params) {
+      this.params = {};
+    }
+
+    if (!params) {
+      return;
+    }
+
+    (0, _utils().assign)(this.params, params, _objectSpread({
       filter: 'andMerge',
       fields: 'intersect',
       appends: 'union',
@@ -155,8 +170,8 @@ class Action {
   }
 
   getHandlers() {
-    const handers = [...this.resource.resourcer.getMiddlewares(), ...this.getMiddlewareHandlers(), this.getHandler()].filter(Boolean);
-    return handers;
+    const handlers = [...this.resource.resourcer.getMiddlewares(), ...this.getMiddlewareHandlers(), this.getHandler()].filter(Boolean);
+    return handlers;
   }
 
   execute(context, next) {

package/lib/utils.js

@@ -165,6 +165,13 @@ function parseRequest(request, options = {}) {
         patch: accessors.update,
         delete: accessors.remove
       }
+    },
+    set: {
+      '/:associatedName/:associatedIndex/:resourceName': {
+        get: accessors.list,
+        post: accessors.add,
+        delete: accessors.remove
+      }
     }
   };
   const params = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "0.8.0-alpha.8",
+  "version": "0.8.1-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,7 +12,7 @@
     }
   ],
   "dependencies": {
-    "@nocobase/utils": "0.8.0-alpha.8",
+    "@nocobase/utils": "0.8.1-alpha.3",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
@@ -24,5 +24,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/resourcer"
   },
-  "gitHead": "d53b20e08591651692c37b8bfdf1bfe59332bbdb"
+  "gitHead": "e03df3df5962b99d9fbf5b6e33fbe2b23f14f3d3"
 }

package/lib/assign.d.ts

@@ -1,10 +0,0 @@
-declare type MergeStrategyType = 'merge' | 'deepMerge' | 'overwrite' | 'andMerge' | 'orMerge' | 'intersect' | 'union';
-declare type MergeStrategyFunc = (x: any, y: any) => any;
-export declare type MergeStrategy = MergeStrategyType | MergeStrategyFunc;
-export interface MergeStrategies {
-    [key: string]: MergeStrategy;
-}
-export default function isPlainObject(value: any): boolean;
-export declare const mergeStrategies: Map<MergeStrategyType, MergeStrategyFunc>;
-export declare function assign(target: any, source: any, strategies?: MergeStrategies): any;
-export {};

package/lib/assign.js

@@ -1,145 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.assign = assign;
-exports.default = isPlainObject;
-exports.mergeStrategies = void 0;
-
-function _deepmerge() {
-  const data = _interopRequireDefault(require("deepmerge"));
-
-  _deepmerge = function _deepmerge() {
-    return data;
-  };
-
-  return data;
-}
-
-function _lodash() {
-  const data = _interopRequireDefault(require("lodash"));
-
-  _lodash = function _lodash() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function isPlainObject(value) {
-  if (Object.prototype.toString.call(value) !== '[object Object]') {
-    return false;
-  }
-
-  const prototype = Object.getPrototypeOf(value);
-  return prototype === null || prototype === Object.prototype;
-}
-
-function getEnumerableOwnPropertySymbols(target) {
-  return Object.getOwnPropertySymbols ? Object.getOwnPropertySymbols(target).filter(symbol => target.propertyIsEnumerable(symbol)) : [];
-}
-
-function getKeys(target) {
-  return Object.keys(target).concat(getEnumerableOwnPropertySymbols(target));
-}
-
-const mergeStrategies = new Map();
-exports.mergeStrategies = mergeStrategies;
-mergeStrategies.set('overwrite', (_, y) => {
-  if (typeof y === 'string') {
-    y = y.split(',');
-  }
-
-  return y;
-});
-mergeStrategies.set('andMerge', (x, y) => {
-  if (!x && !y) {
-    return;
-  }
-
-  if (!x) {
-    return y;
-  }
-
-  if (!y) {
-    return x;
-  }
-
-  return {
-    $and: [x, y]
-  };
-});
-mergeStrategies.set('orMerge', (x, y) => {
-  if (!x && !y) {
-    return;
-  }
-
-  if (!x) {
-    return y;
-  }
-
-  if (!y) {
-    return x;
-  }
-
-  return {
-    $or: [x, y]
-  };
-});
-mergeStrategies.set('deepMerge', (x, y) => {
-  return isPlainObject(x) && isPlainObject(y) ? (0, _deepmerge().default)(x, y, {
-    arrayMerge: (x, y) => y
-  }) : y;
-});
-mergeStrategies.set('merge', (x, y) => {
-  return isPlainObject(x) && isPlainObject(y) ? Object.assign(x, y) : y;
-});
-mergeStrategies.set('union', (x, y) => {
-  if (typeof x === 'string') {
-    x = x.split(',');
-  }
-
-  if (typeof y === 'string') {
-    y = y.split(',');
-  }
-
-  return _lodash().default.uniq((x || []).concat(y || [])).filter(Boolean);
-});
-mergeStrategies.set('intersect', (x, y) => {
-  if (typeof x === 'string') {
-    x = x.split(',');
-  }
-
-  if (typeof y === 'string') {
-    y = y.split(',');
-  }
-
-  if (!Array.isArray(x) || x.length === 0) {
-    return y || [];
-  }
-
-  if (!Array.isArray(y) || y.length === 0) {
-    return x || [];
-  }
-
-  return x.filter(v => y.includes(v));
-});
-
-function assign(target, source, strategies = {}) {
-  getKeys(source).forEach(sourceKey => {
-    const strategy = strategies[sourceKey];
-    let func = mergeStrategies.get('deepMerge');
-
-    if (typeof strategy === 'function') {
-      func = strategy;
-    } else if (typeof strategy === 'string' && mergeStrategies.has(strategy)) {
-      func = mergeStrategies.get(strategy);
-    }
-
-    target[sourceKey] = func(target[sourceKey], source[sourceKey]);
-  });
-  return target;
-}