@nocobase/utils 0.9.3-alpha.1 → 0.9.4-alpha.2

package/lib/client.d.ts

@@ -3,9 +3,11 @@ export * from './common';
 export * from './date';
 export * from './forEach';
 export * from './getValuesByPath';
+export * from './json-templates';
+export * from './log';
 export * from './merge';
+export * from './notification';
 export * from './number';
 export * from './parse-filter';
 export * from './registry';
 export * from './uid';
-export * from './json-templates';

package/lib/client.js

@@ -58,6 +58,28 @@ Object.keys(_getValuesByPath).forEach(function (key) {
     }
   });
 });
+var _jsonTemplates = require("./json-templates");
+Object.keys(_jsonTemplates).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _jsonTemplates[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _jsonTemplates[key];
+    }
+  });
+});
+var _log = require("./log");
+Object.keys(_log).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _log[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _log[key];
+    }
+  });
+});
 var _merge = require("./merge");
 Object.keys(_merge).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -69,6 +91,17 @@ Object.keys(_merge).forEach(function (key) {
     }
   });
 });
+var _notification = require("./notification");
+Object.keys(_notification).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _notification[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _notification[key];
+    }
+  });
+});
 var _number = require("./number");
 Object.keys(_number).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -112,15 +145,4 @@ Object.keys(_uid).forEach(function (key) {
       return _uid[key];
     }
   });
-});
-var _jsonTemplates = require("./json-templates");
-Object.keys(_jsonTemplates).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _jsonTemplates[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _jsonTemplates[key];
-    }
-  });
 });

package/lib/getValuesByPath.js

@@ -4,6 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getValuesByPath = void 0;
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 const getValuesByPath = (obj, path, defaultValue) => {
   if (!obj) {
     return defaultValue;
@@ -12,22 +15,36 @@ const getValuesByPath = (obj, path, defaultValue) => {
   let result = [];
   let currentValue = obj;
   for (let i = 0; i < keys.length; i++) {
+    var _currentValue;
     const key = keys[i];
     if (Array.isArray(currentValue)) {
-      for (let j = 0; j < currentValue.length; j++) {
-        const value = getValuesByPath(currentValue[j], keys.slice(i).join('.'), defaultValue);
-        result = result.concat(value);
+      var _iterator = _createForOfIteratorHelper(currentValue),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          const element = _step.value;
+          const value = getValuesByPath(element, keys.slice(i).join('.'), defaultValue);
+          result = result.concat(value);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
       }
       break;
     }
-    currentValue = currentValue[key] === undefined ? defaultValue : currentValue[key];
-    if (currentValue == null) {
+    if (((_currentValue = currentValue) === null || _currentValue === void 0 ? void 0 : _currentValue[key]) === undefined) {
       break;
     }
+    currentValue = currentValue[key];
     if (i === keys.length - 1) {
       result.push(currentValue);
     }
   }
+  result = result.filter(Boolean);
+  if (result.length === 0) {
+    return defaultValue;
+  }
   return result.length === 1 ? result[0] : result;
 };
 exports.getValuesByPath = getValuesByPath;

package/lib/log.d.ts

@@ -0,0 +1 @@
+export declare const error: (message: Error | string, ...args: any[]) => void;

package/lib/log.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.error = void 0;
+const error = (message, ...args) => {
+  console.error(message, ...args);
+};
+exports.error = error;

package/lib/notification.d.ts

@@ -0,0 +1 @@
+export declare const showToast: (message: any, type?: string, duration?: number) => void;

package/lib/notification.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.showToast = void 0;
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
+    return data;
+  };
+  return data;
+}
+const showToast = (message, type = 'info', duration = 5000) => {
+  _antd().notification[type]({
+    message,
+    duration
+  });
+};
+exports.showToast = showToast;

package/lib/parse-filter.d.ts

@@ -141,3 +141,4 @@ export declare function getDateVars(): {
         field: any;
     }) => string[];
 };
+export declare function splitPathToTwoParts(path: string): string[];

package/lib/parse-filter.js

@@ -7,14 +7,8 @@ exports.flatten = flatten;
 exports.getDateVars = getDateVars;
 exports.getDayRange = getDayRange;
 exports.parseFilter = void 0;
+exports.splitPathToTwoParts = splitPathToTwoParts;
 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() {
@@ -29,6 +23,7 @@ function _moment() {
   };
   return data;
 }
+var _getValuesByPath = require("./getValuesByPath");
 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); }); }; }
@@ -76,9 +71,10 @@ function flatten(target, opts) {
 function unflatten(obj, opts = {}) {
   const parsed = {};
   const transformValue = opts.transformValue || keyIdentity;
-  Object.keys(obj).forEach(key => {
+  for (var _i = 0, _Object$keys = Object.keys(obj); _i < _Object$keys.length; _i++) {
+    const key = _Object$keys[_i];
     (0, _set().default)(parsed, key, transformValue(obj[key], key));
-  });
+  }
   return parsed;
 }
 const parsePath = path => {
@@ -163,7 +159,7 @@ const parseFilter = /*#__PURE__*/function () {
           const match = re.exec(value);
           if (match) {
             const key = match[1].trim();
-            const val = (0, _get().default)(vars, key, null);
+            const val = (0, _getValuesByPath.getValuesByPath)(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,
@@ -300,4 +296,8 @@ function getDateVars() {
     last90Days: toDays(-90),
     next90Days: toDays(90)
   };
+}
+function splitPathToTwoParts(path) {
+  const parts = path.split('.');
+  return [parts.shift(), parts.join('.')];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "0.9.3-alpha.1",
+  "version": "0.9.4-alpha.2",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -16,5 +16,5 @@
     "moment": "2.x",
     "rc-input-number": "7.x"
   },
-  "gitHead": "24979bc561537c0b84469c161eeef1a6de4c4684"
+  "gitHead": "2bc19a85bf9425aa220b6c467315c8087f333a7e"
 }