@sheinx/hooks 3.0.0-alpha.23 → 3.0.0-alpha.24

package/cjs/components/use-form/use-form-control/use-form-control.d.ts

@@ -5,5 +5,6 @@ export default function useFormControl<T>(props: BaseFormControlProps<T>): {
     error: Error | undefined;
     inForm: boolean;
     disabled: boolean | undefined;
+    name: string | (string[] & string);
 };
 //# sourceMappingURL=use-form-control.d.ts.map

package/cjs/components/use-form/use-form-control/use-form-control.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAwB/D,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAsFpC,CAAC,YAAY,GAAG,EAAE;;;;EA8CrD"}
+{"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAwB/D,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAsFpC,CAAC,YAAY,GAAG,EAAE;;;;;EA8CrD"}

package/cjs/components/use-form/use-form-control/use-form-control.js

@@ -191,6 +191,7 @@ function useFormControl(props) {
     onChange: onChange,
     error: error,
     inForm: inForm,
-    disabled: disabled
+    disabled: disabled,
+    name: name
   };
 }

package/cjs/components/use-form/use-form-fieldset/fieldset-context.d.ts

@@ -7,7 +7,7 @@ interface BaseFieldProps {
     name: string | string[];
 }
 export declare const useFieldSetConsumer: <T extends BaseFieldProps>(props: T) => T & {
-    name: string | string[];
+    name: string;
     bind: string[] | undefined;
 };
 export default FieldsetContext;

package/cjs/components/use-form/use-form-fieldset/fieldset-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fieldset-context.d.ts","sourceRoot":"","sources":["fieldset-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,QAAA,MAAM,eAAe;;EAA8B,CAAC;AAEpD,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB;AACD,eAAO,MAAM,mBAAmB;;;CAmB/B,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"fieldset-context.d.ts","sourceRoot":"","sources":["fieldset-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,QAAA,MAAM,eAAe;;EAA8B,CAAC;AAEpD,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB;AAiBD,eAAO,MAAM,mBAAmB;;;CAc/B,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/cjs/components/use-form/use-form-fieldset/fieldset-context.js

@@ -1,5 +1,5 @@
 "use strict";
-"use client";
+'use client';
 
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -14,8 +14,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useFieldSetConsumer = exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.array.concat.js");
 var _react = _interopRequireWildcard(require("react"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -24,6 +24,18 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var FieldsetContext = /*#__PURE__*/(0, _react.createContext)({
   path: ''
 });
+function extendName() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var name = arguments.length > 1 ? arguments[1] : undefined;
+  if (name === undefined) return undefined;
+  if (name === '') return path;
+  if (Array.isArray(name)) {
+    return name.map(function (n) {
+      return extendName(path, n);
+    });
+  }
+  return "".concat(path).concat(path.length > 0 ? '.' : '').concat(name);
+}
 var useFieldSetConsumer = function useFieldSetConsumer(props) {
   var _React$useContext = _react.default.useContext(FieldsetContext),
     path = _React$useContext.path;
@@ -31,12 +43,7 @@ var useFieldSetConsumer = function useFieldSetConsumer(props) {
     return path ? (props.bind || []).concat(path) : props.bind;
   }, [path, props.bind]);
   var name = _react.default.useMemo(function () {
-    if (Array.isArray(props.name)) {
-      return props.name.map(function (item) {
-        return path ? "".concat(path, ".").concat(item) : item;
-      });
-    }
-    return path ? "".concat(path, ".").concat(props.name) : props.name;
+    return extendName(path, props.name);
   }, [path, props.name]);
   return _objectSpread(_objectSpread({}, props), {}, {
     name: name,

package/cjs/components/use-form/use-form-fieldset/use-form-fieldset.d.ts

@@ -5,7 +5,7 @@ export declare const useFormFieldSet: <T>(props: BaseFormFieldSetProps<T>) => {
         path: string;
     }>;
     ProviderValue: {
-        path: string | (string & string[]);
+        path: string | (string[] & string);
     };
     error: Error | undefined;
     value: T | undefined;

package/cjs/components/use-form/use-form-fieldset/use-form-fieldset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-form-fieldset.d.ts","sourceRoot":"","sources":["use-form-fieldset.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAIjE,eAAO,MAAM,eAAe;;;;;;;;;;CA8B3B,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"use-form-fieldset.d.ts","sourceRoot":"","sources":["use-form-fieldset.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAKjE,eAAO,MAAM,eAAe;;;;;;;;;;CA0B3B,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/cjs/components/use-form/use-form-fieldset/use-form-fieldset.js

@@ -1,38 +1,30 @@
 "use strict";
 
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.weak-map.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useFormFieldSet = exports.default = void 0;
-var _fieldsetContext = _interopRequireWildcard(require("./fieldset-context"));
+var _fieldsetContext = _interopRequireDefault(require("./fieldset-context"));
 var _useFormControl2 = require("../use-form-control");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var emptyFunc = function emptyFunc() {};
+var emptyArr = [];
 var useFormFieldSet = function useFormFieldSet(props) {
-  var _useFieldSetConsumer = (0, _fieldsetContext.useFieldSetConsumer)({
-      name: props.name
-    }),
-    name = _useFieldSetConsumer.name,
-    bind = _useFieldSetConsumer.bind;
   var _useFormControl = (0, _useFormControl2.useFormControl)({
-      name: name,
+      name: props.name,
       defaultValue: props.defaultValue,
       reserveAble: props.reserveAble,
       rules: props.rules,
       onError: props.onError,
-      bind: bind,
+      bind: emptyArr,
       onChange: emptyFunc,
       getValidateProps: props.getValidateProps
     }),
     inForm = _useFormControl.inForm,
     error = _useFormControl.error,
     value = _useFormControl.value,
-    onChange = _useFormControl.onChange;
+    onChange = _useFormControl.onChange,
+    name = _useFormControl.name;
   if (!inForm) {
     console.error('[FieldSet] should render in Form');
   }

package/esm/components/use-form/use-form-control/use-form-control.d.ts

@@ -5,5 +5,6 @@ export default function useFormControl<T>(props: BaseFormControlProps<T>): {
     error: Error | undefined;
     inForm: boolean;
     disabled: boolean | undefined;
+    name: string | (string[] & string);
 };
 //# sourceMappingURL=use-form-control.d.ts.map

package/esm/components/use-form/use-form-control/use-form-control.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAwB/D,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAsFpC,CAAC,YAAY,GAAG,EAAE;;;;EA8CrD"}
+{"version":3,"file":"use-form-control.d.ts","sourceRoot":"","sources":["use-form-control.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAwB/D,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC,CAAC;;kBAsFpC,CAAC,YAAY,GAAG,EAAE;;;;;EA8CrD"}

package/esm/components/use-form/use-form-control/use-form-control.js

@@ -191,6 +191,7 @@ function useFormControl(props) {
     onChange: onChange,
     error: error,
     inForm: inForm,
-    disabled: disabled
+    disabled: disabled,
+    name: name
   };
 }

package/esm/components/use-form/use-form-fieldset/fieldset-context.d.ts

@@ -7,7 +7,7 @@ interface BaseFieldProps {
     name: string | string[];
 }
 export declare const useFieldSetConsumer: <T extends BaseFieldProps>(props: T) => T & {
-    name: string | string[];
+    name: string;
     bind: string[] | undefined;
 };
 export default FieldsetContext;

package/esm/components/use-form/use-form-fieldset/fieldset-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fieldset-context.d.ts","sourceRoot":"","sources":["fieldset-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,QAAA,MAAM,eAAe;;EAA8B,CAAC;AAEpD,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB;AACD,eAAO,MAAM,mBAAmB;;;CAmB/B,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"fieldset-context.d.ts","sourceRoot":"","sources":["fieldset-context.ts"],"names":[],"mappings":"AACA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,QAAA,MAAM,eAAe;;EAA8B,CAAC;AAEpD,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB;AAiBD,eAAO,MAAM,mBAAmB;;;CAc/B,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/esm/components/use-form/use-form-fieldset/fieldset-context.js

@@ -1,5 +1,5 @@
 "use strict";
-"use client";
+'use client';
 
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/web.dom-collections.for-each.js");
@@ -14,8 +14,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useFieldSetConsumer = exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.array.concat.js");
 var _react = _interopRequireWildcard(require("react"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -24,6 +24,18 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var FieldsetContext = /*#__PURE__*/(0, _react.createContext)({
   path: ''
 });
+function extendName() {
+  var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var name = arguments.length > 1 ? arguments[1] : undefined;
+  if (name === undefined) return undefined;
+  if (name === '') return path;
+  if (Array.isArray(name)) {
+    return name.map(function (n) {
+      return extendName(path, n);
+    });
+  }
+  return "".concat(path).concat(path.length > 0 ? '.' : '').concat(name);
+}
 var useFieldSetConsumer = function useFieldSetConsumer(props) {
   var _React$useContext = _react.default.useContext(FieldsetContext),
     path = _React$useContext.path;
@@ -31,12 +43,7 @@ var useFieldSetConsumer = function useFieldSetConsumer(props) {
     return path ? (props.bind || []).concat(path) : props.bind;
   }, [path, props.bind]);
   var name = _react.default.useMemo(function () {
-    if (Array.isArray(props.name)) {
-      return props.name.map(function (item) {
-        return path ? "".concat(path, ".").concat(item) : item;
-      });
-    }
-    return path ? "".concat(path, ".").concat(props.name) : props.name;
+    return extendName(path, props.name);
   }, [path, props.name]);
   return _objectSpread(_objectSpread({}, props), {}, {
     name: name,

package/esm/components/use-form/use-form-fieldset/use-form-fieldset.d.ts

@@ -5,7 +5,7 @@ export declare const useFormFieldSet: <T>(props: BaseFormFieldSetProps<T>) => {
         path: string;
     }>;
     ProviderValue: {
-        path: string | (string & string[]);
+        path: string | (string[] & string);
     };
     error: Error | undefined;
     value: T | undefined;

package/esm/components/use-form/use-form-fieldset/use-form-fieldset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-form-fieldset.d.ts","sourceRoot":"","sources":["use-form-fieldset.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAIjE,eAAO,MAAM,eAAe;;;;;;;;;;CA8B3B,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"use-form-fieldset.d.ts","sourceRoot":"","sources":["use-form-fieldset.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAKjE,eAAO,MAAM,eAAe;;;;;;;;;;CA0B3B,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/esm/components/use-form/use-form-fieldset/use-form-fieldset.js

@@ -1,38 +1,30 @@
 "use strict";
 
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.weak-map.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useFormFieldSet = exports.default = void 0;
-var _fieldsetContext = _interopRequireWildcard(require("./fieldset-context"));
+var _fieldsetContext = _interopRequireDefault(require("./fieldset-context"));
 var _useFormControl2 = require("../use-form-control");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var emptyFunc = function emptyFunc() {};
+var emptyArr = [];
 var useFormFieldSet = function useFormFieldSet(props) {
-  var _useFieldSetConsumer = (0, _fieldsetContext.useFieldSetConsumer)({
-      name: props.name
-    }),
-    name = _useFieldSetConsumer.name,
-    bind = _useFieldSetConsumer.bind;
   var _useFormControl = (0, _useFormControl2.useFormControl)({
-      name: name,
+      name: props.name,
       defaultValue: props.defaultValue,
       reserveAble: props.reserveAble,
       rules: props.rules,
       onError: props.onError,
-      bind: bind,
+      bind: emptyArr,
       onChange: emptyFunc,
       getValidateProps: props.getValidateProps
     }),
     inForm = _useFormControl.inForm,
     error = _useFormControl.error,
     value = _useFormControl.value,
-    onChange = _useFormControl.onChange;
+    onChange = _useFormControl.onChange,
+    name = _useFormControl.name;
   if (!inForm) {
     console.error('[FieldSet] should render in Form');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.0.0-alpha.23",
+  "version": "3.0.0-alpha.24",
   "description": "",
   "keywords": [],
   "license": "ISC",