@nocobase/utils 0.9.1-alpha.1 → 0.9.2-alpha.1

package/lib/parse-filter.d.ts

@@ -0,0 +1,142 @@
+export declare type ParseFilterOptions = {
+    vars?: Record<string, any>;
+    now?: any;
+    timezone?: string;
+    getField?: any;
+};
+export declare const parseFilter: (filter: any, opts?: ParseFilterOptions) => Promise<{}>;
+export declare type GetDayRangeOptions = {
+    now?: any;
+    timezone?: string;
+    offset: number;
+};
+export declare function getDayRange(options: GetDayRangeOptions): string[];
+export declare type Utc2unitOptions = {
+    now?: any;
+    unit: any;
+    timezone?: string;
+    offset?: number;
+};
+export declare function utc2unit(options: Utc2unitOptions): any;
+export declare function getDateVars(): {
+    today: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    yesterday: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    tomorrow: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    thisWeek: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    lastWeek: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    nextWeek: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    thisIsoWeek: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    lastIsoWeek: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    nextIsoWeek: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    thisMonth: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    lastMonth: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    nextMonth: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    thisQuarter: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    lastQuarter: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    nextQuarter: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    thisYear: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    lastYear: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    nextYear: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => any;
+    last7Days: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => string[];
+    next7Days: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => string[];
+    last30Days: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => string[];
+    next30Days: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => string[];
+    last90Days: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => string[];
+    next90Days: ({ now, timezone, field }: {
+        now: any;
+        timezone: any;
+        field: any;
+    }) => string[];
+};

package/lib/parse-filter.js

@@ -0,0 +1,299 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDateVars = getDateVars;
+exports.getDayRange = getDayRange;
+exports.parseFilter = void 0;
+exports.utc2unit = utc2unit;
+function _get() {
+  const data = _interopRequireDefault(require("lodash/get"));
+  _get = function _get() {
+    return data;
+  };
+  return data;
+}
+function _set() {
+  const data = _interopRequireDefault(require("lodash/set"));
+  _set = function _set() {
+    return data;
+  };
+  return data;
+}
+function _moment() {
+  const data = _interopRequireDefault(require("moment"));
+  _moment = function _moment() {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+const re = /^\s*\{\{([\s\S]*)\}\}\s*$/;
+function isBuffer(obj) {
+  return obj && obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj);
+}
+function keyIdentity(key) {
+  return key;
+}
+function flatten(target, opts) {
+  opts = opts || {};
+  const delimiter = opts.delimiter || '.';
+  const maxDepth = opts.maxDepth;
+  const transformKey = opts.transformKey || keyIdentity;
+  const transformValue = opts.transformValue || keyIdentity;
+  const output = {};
+  function step(object, prev, currentDepth) {
+    currentDepth = currentDepth || 1;
+    Object.keys(object).forEach(function (key) {
+      const value = object[key];
+      const isarray = opts.safe && Array.isArray(value);
+      const type = Object.prototype.toString.call(value);
+      const isbuffer = isBuffer(value);
+      const isobject = type === '[object Object]' || type === '[object Array]';
+      const newKey = prev ? prev + delimiter + transformKey(key) : transformKey(key);
+      if (opts.breakOn({
+        key
+      })) {
+        output[newKey] = transformValue(value, newKey);
+        return;
+      }
+      if (!isarray && !isbuffer && isobject && Object.keys(value).length && (!opts.maxDepth || currentDepth < maxDepth)) {
+        return step(value, newKey, currentDepth + 1);
+      }
+      output[newKey] = transformValue(value, newKey);
+    });
+  }
+  step(target);
+  return output;
+}
+function unflatten(obj, opts = {}) {
+  const parsed = {};
+  const transformValue = opts.transformValue || keyIdentity;
+  Object.keys(obj).forEach(key => {
+    (0, _set().default)(parsed, key, transformValue(obj[key], key));
+  });
+  return parsed;
+}
+const parsePath = path => {
+  let operator = path.split('.').pop() || '';
+  if (!operator.startsWith('$')) {
+    operator = '';
+  }
+  return {
+    operator
+  };
+};
+const isDateOperator = op => {
+  return ['$dateOn', '$dateNotOn', '$dateBefore', '$dateAfter', '$dateNotBefore', '$dateNotAfter', '$dateBetween'].includes(op);
+};
+function isDate(input) {
+  return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
+}
+const dateValueWrapper = (value, timezone) => {
+  if (!value) {
+    return null;
+  }
+  if (Array.isArray(value)) {
+    if (value.length === 2) {
+      value.push('[]', timezone);
+    } else if (value.length === 3) {
+      value.push(timezone);
+    }
+    return value;
+  }
+  if (typeof value === 'string') {
+    if (!timezone || /(\+|\-)\d\d\:\d\d$/.test(value)) {
+      return value;
+    }
+    return value + timezone;
+  }
+  if (isDate(value)) {
+    return value.toISOString();
+  }
+};
+const parseFilter = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(function* (filter, opts = {}) {
+    const userFieldsSet = new Set();
+    const vars = opts.vars || {};
+    const timezone = opts.timezone;
+    const now = opts.now;
+    const getField = opts.getField;
+    const flat = flatten(filter, {
+      breakOn({
+        key
+      }) {
+        return key.startsWith('$') && key !== '$and' && key !== '$or';
+      },
+      transformValue(value) {
+        if (typeof value !== 'string') {
+          return value;
+        }
+        // parse user fields parameter
+        const match = re.exec(value);
+        if (match) {
+          const key = match[1].trim();
+          if (key.startsWith('$user')) {
+            userFieldsSet.add(key.substring(6));
+          }
+        }
+        return value;
+      }
+    });
+    if (userFieldsSet.size > 0) {
+      const $user = yield vars.$user({
+        fields: [...userFieldsSet.values()]
+      });
+      Object.assign(vars, {
+        $user
+      });
+    }
+    return unflatten(flat, {
+      transformValue(value, path) {
+        const _parsePath = parsePath(path),
+          operator = _parsePath.operator;
+        // parse string variables
+        if (typeof value === 'string') {
+          const match = re.exec(value);
+          if (match) {
+            const key = match[1].trim();
+            const val = (0, _get().default)(vars, key, null);
+            const field = getField === null || getField === void 0 ? void 0 : getField(path);
+            value = typeof val === 'function' ? val === null || val === void 0 ? void 0 : val({
+              field,
+              operator,
+              timezone,
+              now
+            }) : val;
+          }
+        }
+        if (isDateOperator(operator)) {
+          const field = getField === null || getField === void 0 ? void 0 : getField(path);
+          return dateValueWrapper(value, (field === null || field === void 0 ? void 0 : field.timezone) || timezone);
+        }
+        return value;
+      }
+    });
+  });
+  return function parseFilter(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+exports.parseFilter = parseFilter;
+function getDayRange(options) {
+  const now = options.now,
+    _options$timezone = options.timezone,
+    timezone = _options$timezone === void 0 ? '+00:00' : _options$timezone,
+    offset = options.offset;
+  let m = toMoment(now).utcOffset(timezone);
+  if (offset > 0) {
+    return [
+    // 第二天开始计算
+    m.add(1, 'day').startOf('day').format('YYYY-MM-DD'),
+    // 第九天开始前结束
+    m.clone().add(offset, 'day').startOf('day').format('YYYY-MM-DD'), '[)', timezone];
+  }
+  return [
+  // 今天开始前
+  m.clone().subtract(-1 * offset - 1, 'day').startOf('day').format('YYYY-MM-DD'),
+  // 明天开始前
+  m.clone().add(1, 'day').startOf('day').format('YYYY-MM-DD'), '[)', timezone];
+}
+function toMoment(value) {
+  if (!value) {
+    return (0, _moment().default)();
+  }
+  if (_moment().default.isMoment(value)) {
+    return value;
+  }
+  return (0, _moment().default)(value);
+}
+function utc2unit(options) {
+  var _fn$unit;
+  const now = options.now,
+    unit = options.unit,
+    _options$timezone2 = options.timezone,
+    timezone = _options$timezone2 === void 0 ? '+00:00' : _options$timezone2,
+    offset = options.offset;
+  let m = toMoment(now);
+  m.utcOffset(timezone);
+  m.startOf(unit);
+  if (offset > 0) {
+    m.add(offset, unit === 'isoWeek' ? 'week' : unit);
+  } else if (offset < 0) {
+    m.subtract(-1 * offset, unit === 'isoWeek' ? 'week' : unit);
+  }
+  const fn = {
+    year: () => m.format('YYYY'),
+    quarter: () => m.format('YYYY[Q]Q'),
+    month: () => m.format('YYYY-MM'),
+    week: () => m.format('gggg[w]ww'),
+    isoWeek: () => m.format('GGGG[W]WW'),
+    day: () => m.format('YYYY-MM-DD')
+  };
+  const r = (_fn$unit = fn[unit]) === null || _fn$unit === void 0 ? void 0 : _fn$unit.call(fn);
+  return timezone ? r + timezone : r;
+}
+const toUnit = (unit, offset) => {
+  return ({
+    now,
+    timezone,
+    field
+  }) => {
+    if (field === null || field === void 0 ? void 0 : field.timezone) {
+      timezone = field === null || field === void 0 ? void 0 : field.timezone;
+    }
+    return utc2unit({
+      now,
+      timezone,
+      unit,
+      offset
+    });
+  };
+};
+const toDays = offset => {
+  return ({
+    now,
+    timezone,
+    field
+  }) => {
+    if (field === null || field === void 0 ? void 0 : field.timezone) {
+      timezone = field === null || field === void 0 ? void 0 : field.timezone;
+    }
+    return getDayRange({
+      now,
+      timezone,
+      offset
+    });
+  };
+};
+function getDateVars() {
+  return {
+    today: toUnit('day'),
+    yesterday: toUnit('day', -1),
+    tomorrow: toUnit('day', 1),
+    thisWeek: toUnit('week'),
+    lastWeek: toUnit('week', -1),
+    nextWeek: toUnit('week', 1),
+    thisIsoWeek: toUnit('isoWeek'),
+    lastIsoWeek: toUnit('isoWeek', -1),
+    nextIsoWeek: toUnit('isoWeek', 1),
+    thisMonth: toUnit('month'),
+    lastMonth: toUnit('month', -1),
+    nextMonth: toUnit('month', 1),
+    thisQuarter: toUnit('quarter'),
+    lastQuarter: toUnit('quarter', -1),
+    nextQuarter: toUnit('quarter', 1),
+    thisYear: toUnit('year'),
+    lastYear: toUnit('year', -1),
+    nextYear: toUnit('year', 1),
+    last7Days: toDays(-7),
+    next7Days: toDays(7),
+    last30Days: toDays(-30),
+    next30Days: toDays(30),
+    last90Days: toDays(-90),
+    next90Days: toDays(90)
+  };
+}

package/lib/registry.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Registry = void 0;
-
 class Registry {
   constructor(options = {
     override: false
@@ -13,37 +12,29 @@ class Registry {
     this.options = void 0;
     this.options = options;
   }
-
   register(key, value) {
     if (!this.options.override && this.map.has(key)) {
       throw new Error(`this registry does not allow to override existing keys: "${key}"`);
     }
-
     this.map.set(key, value);
-  } // async import({ directory, extensions = ['.js', '.ts', '.json'] }) {
+  }
+  // async import({ directory, extensions = ['.js', '.ts', '.json'] }) {
   //   const files = await fs.readdir(directory);
   //   return files.filter(file => extensions.includes(path.extname(file)))
   // }
-
-
   get(key) {
     return this.map.get(key);
   }
-
   getKeys() {
     return this.map.keys();
   }
-
   getValues() {
     return this.map.values();
   }
-
   getEntities() {
     return this.map.entries();
   }
-
 }
-
 exports.Registry = Registry;
 var _default = Registry;
 exports.default = _default;

package/lib/requireModule.js

@@ -5,18 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.requireModule = requireModule;
-
 function requireModule(m) {
   if (typeof m === 'string') {
     m = require(m);
   }
-
   if (typeof m !== 'object') {
     return m;
   }
-
   return m.__esModule ? m.default : m;
 }
-
 var _default = requireModule;
 exports.default = _default;

package/lib/server.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _date = require("./date");
-
 Object.keys(_date).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _date[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_date).forEach(function (key) {
     }
   });
 });
-
 var _merge = require("./merge");
-
 Object.keys(_merge).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _merge[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_merge).forEach(function (key) {
     }
   });
 });
-
 var _mixin = require("./mixin");
-
 Object.keys(_mixin).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _mixin[key]) return;
@@ -42,9 +36,7 @@ Object.keys(_mixin).forEach(function (key) {
     }
   });
 });
-
 var _AsyncEmitter = require("./mixin/AsyncEmitter");
-
 Object.keys(_AsyncEmitter).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _AsyncEmitter[key]) return;
@@ -55,9 +47,7 @@ Object.keys(_AsyncEmitter).forEach(function (key) {
     }
   });
 });
-
 var _number = require("./number");
-
 Object.keys(_number).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _number[key]) return;
@@ -68,9 +58,7 @@ Object.keys(_number).forEach(function (key) {
     }
   });
 });
-
 var _registry = require("./registry");
-
 Object.keys(_registry).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _registry[key]) return;
@@ -81,9 +69,7 @@ Object.keys(_registry).forEach(function (key) {
     }
   });
 });
-
 var _requireModule = require("./requireModule");
-
 Object.keys(_requireModule).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _requireModule[key]) return;
@@ -94,9 +80,7 @@ Object.keys(_requireModule).forEach(function (key) {
     }
   });
 });
-
 var _toposort = require("./toposort");
-
 Object.keys(_toposort).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _toposort[key]) return;
@@ -107,9 +91,7 @@ Object.keys(_toposort).forEach(function (key) {
     }
   });
 });
-
 var _uid = require("./uid");
-
 Object.keys(_uid).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _uid[key]) return;

package/lib/toposort.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Toposort = void 0;
-
 function _topo() {
   const data = _interopRequireDefault(require("@hapi/topo"));
-
   _topo = function _topo() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 class Toposort extends _topo().default.Sorter {
   unshift(...items) {
     this._items.unshift(...items.map(node => ({
@@ -28,7 +23,6 @@ class Toposort extends _topo().default.Sorter {
       group: '?'
     })));
   }
-
   push(...items) {
     this._items.push(...items.map(node => ({
       node,
@@ -39,18 +33,14 @@ class Toposort extends _topo().default.Sorter {
       group: '?'
     })));
   }
-
   add(nodes, options) {
     if (options === null || options === void 0 ? void 0 : options.tag) {
       // @ts-ignore
       options.group = options.tag;
     }
-
     return super.add(nodes, options);
   }
-
 }
-
 exports.Toposort = Toposort;
 var _default = Toposort;
 exports.default = _default;

package/lib/uid.js

@@ -5,15 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.uid = uid;
 let IDX = 36,
-    HEX = '';
-
+  HEX = '';
 while (IDX--) HEX += IDX.toString(36);
-
 function uid(len) {
   let str = '',
-      num = len || 11;
-
+    num = len || 11;
   while (num--) str += HEX[Math.random() * 36 | 0];
-
   return str;
 }

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@nocobase/utils",
-  "version": "0.9.1-alpha.1",
+  "version": "0.9.2-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
     "@hapi/topo": "^6.0.0",
     "deepmerge": "^4.2.2",
-    "flat-to-nested": "^1.1.1"
+    "flat-to-nested": "^1.1.1",
+    "graphlib": "^2.1.8"
   },
   "peerDependencies": {
     "moment": "2.x",
     "rc-input-number": "7.x"
   },
-  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
+  "gitHead": "a4f103eb0144f07205aff7b2a6be8ea6aa1330df"
 }