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

package/lib/assign.d.ts

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,145 @@
+"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));
+})().filter(Boolean));
+
+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;
+}

package/lib/date.d.ts

@@ -5,6 +5,6 @@ export interface Str2momentOptions {
     utcOffset?: any;
 }
 export declare const getDefaultFormat: (props: any) => any;
-export declare const toGmt: (value: moment.Moment | moment.Moment[]) => string | moment.Moment | moment.Moment[] | string[];
-export declare const toLocal: (value: moment.Moment | moment.Moment[]) => string | moment.Moment | moment.Moment[] | string[];
+export declare const toGmt: (value: moment.Moment | moment.Moment[]) => string | string[] | moment.Moment | moment.Moment[];
+export declare const toLocal: (value: moment.Moment | moment.Moment[]) => string | string[] | moment.Moment | moment.Moment[];
 export declare const str2moment: (value?: string | string[], options?: Str2momentOptions) => any;

package/lib/index.d.ts

@@ -7,3 +7,4 @@ export * from './registry';
 export * from './requireModule';
 export * from './toposort';
 export * from './uid';
+export * from './assign';

package/lib/index.js

@@ -119,4 +119,17 @@ Object.keys(_uid).forEach(function (key) {
       return _uid[key];
     }
   });
+});
+
+var _assign = require("./assign");
+
+Object.keys(_assign).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _assign[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _assign[key];
+    }
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "0.8.0-alpha.8",
+  "version": "0.8.1-alpha.3",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -19,5 +19,5 @@
     "moment": "2.x",
     "rc-input-number": "7.x"
   },
-  "gitHead": "d53b20e08591651692c37b8bfdf1bfe59332bbdb"
+  "gitHead": "e03df3df5962b99d9fbf5b6e33fbe2b23f14f3d3"
 }