@sheinx/hooks 3.0.0-rc.2 → 3.0.0-rc.4

package/esm/utils/validate/get-rule.js

@@ -1,18 +1,8 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = getRule;
-require("core-js/modules/es.regexp.constructor.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.regexp.to-string.js");
-var _nullable = _interopRequireDefault(require("./nullable"));
-var _is = require("../is");
-var _type = _interopRequireDefault(require("./type"));
-var _error = require("./error");
-function getRule(rule, props) {
+import nullable from "./nullable";
+import { isEmpty } from "../is";
+import typeOf from "./type";
+import { FormError } from "./error";
+export default function getRule(rule, props) {
   var po = props;
   var rulePo = rule;
   if (typeof rulePo === 'function') {
@@ -46,7 +36,7 @@ function getRule(rule, props) {
       }
       // eslint-disable-next-line eqeqeq
       if (value == null || value.length === 0) {
-        callback(new _error.FormError(po.message, po));
+        callback(new FormError(po.message, po));
         return;
       } else {
         callback(true);
@@ -57,34 +47,34 @@ function getRule(rule, props) {
     cb = function cb(value, _formData, callback) {
       var reg = typeof regExp === 'string' ? new RegExp(regExp) : regExp;
       if (!reg) {
-        callback(new _error.FormError(po.message, po));
+        callback(new FormError(po.message, po));
         return;
       }
       if (reg.global) reg.lastIndex = 0;
       if (typeof value === 'string' && reg.test(value)) {
         callback(true);
       } else {
-        callback(new _error.FormError(po.message, po));
+        callback(new FormError(po.message, po));
         return;
       }
       callback(true);
     };
-    cb = (0, _nullable.default)(cb);
+    cb = nullable(cb);
   } else if (min !== undefined || max !== undefined) {
     // 数字 min max
     if (type === 'number' || type === 'integer') {
-      cb = (0, _nullable.default)(function (value, _formData, callback) {
+      cb = nullable(function (value, _formData, callback) {
         if (value === undefined || value === '') {
           callback(true);
           return;
         }
         var val = parseFloat(String(value));
         if (Number.isNaN(val)) {
-          callback(new _error.FormError(po.message, po));
+          callback(new FormError(po.message, po));
           return;
         }
         if (typeof min === 'number' && val < min || typeof max === 'number' && val > max) {
-          callback(new _error.FormError(po.message, po));
+          callback(new FormError(po.message, po));
         } else {
           callback(true);
         }
@@ -92,8 +82,8 @@ function getRule(rule, props) {
     } else {
       // 长度 min max
       cb = function cb(value, _formData, callback) {
-        var error = new _error.FormError(po.message, po);
-        if ((0, _is.isEmpty)(value)) {
+        var error = new FormError(po.message, po);
+        if (isEmpty(value)) {
           if (min) callback(error);else callback(true);
           return;
         }
@@ -106,9 +96,9 @@ function getRule(rule, props) {
       };
     }
   } else if (type) {
-    cb = (0, _type.default)(type, po.message);
+    cb = typeOf(type, po.message);
   } else {
-    var err = new _error.FormError("Rule ".concat(JSON.stringify(rule), " is not valid."), po);
+    var err = new FormError("Rule ".concat(JSON.stringify(rule), " is not valid."), po);
     console.error(err);
     throw err;
   }

package/esm/utils/validate/index.d.ts

@@ -1,6 +1,6 @@
 import { ObjectType } from '../../common/type';
 import { FormItemRule } from '../rule/rule.type';
 export * from './error';
-export declare const validate: <T>(value: T | undefined, formData: ObjectType, rules: FormItemRule<T, any, any>, p: ObjectType) => Promise<true | Error>;
+export declare const validate: <T>(value: T | undefined, formData: ObjectType, rules: FormItemRule<T>, p: ObjectType) => Promise<true | Error>;
 export default validate;
 //# sourceMappingURL=index.d.ts.map

package/esm/utils/validate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,cAAc,SAAS,CAAC;AAaxB,eAAO,MAAM,QAAQ,sCAET,UAAU,uCAEjB,UAAU,0BA4BX,CAAC;AAEL,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,cAAc,SAAS,CAAC;AAaxB,eAAO,MAAM,QAAQ,sCAET,UAAU,6BAEjB,UAAU,0BA4BX,CAAC;AAEL,eAAe,QAAQ,CAAC"}

package/esm/utils/validate/index.js

@@ -1,51 +1,33 @@
-"use strict";
-
-require("core-js/modules/web.dom-collections.for-each.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {
-  validate: true
-};
-exports.validate = exports.default = void 0;
-var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-require("core-js/modules/es.promise.js");
-require("core-js/modules/es.array.slice.js");
-var _getRule = _interopRequireDefault(require("./get-rule"));
-var _array = require("../array");
-var _error = require("./error");
-Object.keys(_error).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _error[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _error[key];
-    }
-  });
-});
+function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+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; }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import getRule from "./get-rule";
+import { flattenArray } from "../array";
+import { wrapFormError } from "./error";
+export * from "./error";
 var handleProps = function handleProps(props) {
   return Object.keys(props).reduce(function (acc, key) {
     var value = props[key];
-    var type = (0, _typeof2.default)(value);
+    var type = _typeof(value);
     if (type === 'string' || type === 'number') {
       acc[key] = value;
     }
     return acc;
   }, {});
 };
-var validate = function validate(value, formData, rules, p) {
+export var validate = function validate(value, formData, rules, p) {
   return new Promise(function (resolve, reject) {
     if (!rules.length) {
       resolve(true);
       return;
     }
     var props = handleProps(p);
-    var _ref = (0, _array.flattenArray)(rules),
-      _ref2 = (0, _toArray2.default)(_ref),
+    var _ref = flattenArray(rules),
+      _ref2 = _toArray(_ref),
       rule = _ref2[0],
       restRule = _ref2.slice(1);
     if (!rule) {
@@ -54,20 +36,18 @@ var validate = function validate(value, formData, rules, p) {
     }
     var callback = function callback(result) {
       if (result !== true) {
-        reject((0, _error.wrapFormError)(result, props));
+        reject(wrapFormError(result, props));
         return;
       }
       validate(value, formData, restRule, props).then(resolve, reject);
     };
-    var fn = (0, _getRule.default)(rule, props);
+    var fn = getRule(rule, props);
     var cb = fn(value, formData, callback, props);
     if (cb) {
-      cb === null || cb === void 0 ? void 0 : cb.then(callback.bind(null, true)).catch(function (e) {
-        reject((0, _error.wrapFormError)(e, props));
+      cb === null || cb === void 0 || cb.then(callback.bind(null, true)).catch(function (e) {
+        reject(wrapFormError(e, props));
       });
     }
   });
 };
-exports.validate = validate;
-var _default = validate;
-exports.default = _default;
+export default validate;

package/esm/utils/validate/isJson.js

@@ -1,15 +1,6 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = _default;
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.string.replace.js");
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-function _default(value) {
-  if ((0, _typeof2.default)(value) === 'object') return true;
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+export default function (value) {
+  if (_typeof(value) === 'object') return true;
 
   // In the second stage, we run the text against
   // regular expressions that look for non-JSON patterns. We are especially

package/esm/utils/validate/nullable.js

@@ -1,10 +1,4 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = function _default(fn) {
+export default (function (fn) {
   var cb = function cb(value, formData, callback) {
     // eslint-disable-next-line eqeqeq
     if (value == null || value.length === 0) {
@@ -14,5 +8,4 @@ var _default = function _default(fn) {
     fn(value, formData, callback, {});
   };
   return cb;
-};
-exports.default = _default;
+});

package/esm/utils/validate/type.d.ts

@@ -1,5 +1,5 @@
 import { MessageType } from '../rule/rule.type';
-export declare type RuleType = keyof typeof regs | 'json';
+export type RuleType = keyof typeof regs | 'json';
 export declare const regs: {
     readonly email: RegExp;
     readonly integer: RegExp;

package/esm/utils/validate/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,oBAAY,QAAQ,GAAG,MAAM,OAAO,IAAI,GAAG,MAAM,CAAC;AAElD,eAAO,MAAM,IAAI;;;;;;;;;;CAiEhB,CAAC;+BAIoB,QAAQ,YAAW,WAAW;AAApD,wBA8BK"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["type.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,QAAQ,GAAG,MAAM,OAAO,IAAI,GAAG,MAAM,CAAC;AAElD,eAAO,MAAM,IAAI;;;;;;;;;;CAiEhB,CAAC;+BAIoB,QAAQ,YAAW,WAAW;AAApD,wBA8BK"}

package/esm/utils/validate/type.js

@@ -1,17 +1,7 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.regs = exports.default = void 0;
-require("core-js/modules/es.regexp.constructor.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.regexp.to-string.js");
-var _nullable = _interopRequireDefault(require("./nullable"));
-var _isJson = _interopRequireDefault(require("./isJson"));
+import nullable from "./nullable";
+import isJson from "./isJson";
 /* eslint-disable */
-var regs = {
+export var regs = {
   get email() {
     return /^((([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/;
   },
@@ -68,10 +58,10 @@ var regs = {
 };
 
 /* eslint-enable */
-exports.regs = regs;
-var _default = function _default(type) {
+
+export default (function (type) {
   var message = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  return (0, _nullable.default)(function (value, _formData, callback) {
+  return nullable(function (value, _formData, callback) {
     var error;
     if (typeof message === 'string') {
       error = new Error(message);
@@ -80,7 +70,7 @@ var _default = function _default(type) {
       error = new Error(message());
     }
     if (type === 'json') {
-      if ((0, _isJson.default)(value)) callback(true);else callback(error);
+      if (isJson(value)) callback(true);else callback(error);
       return;
     }
     var reg = regs[type];
@@ -94,5 +84,4 @@ var _default = function _default(type) {
       callback(error);
     }
   });
-};
-exports.default = _default;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.4",
   "description": "",
   "keywords": [],
   "license": "ISC",
@@ -14,7 +14,8 @@
     "date-fns": "2.30.0",
     "dayjs": "^1.11.9",
     "react-fast-compare": "^3.2.2",
-    "immer": "^10.0.0"
+    "@shined/reactive": "^0.1.2",
+    "immer": "10.0.2"
   },
   "peerDependencies": {
     "react": ">=16.8",