rsuite 5.78.0 → 5.79.0-canary-2025032417

package/esm/Form/hooks/useSchemaModel.js

@@ -1,58 +1,7 @@
 'use client';
-import { SchemaModel, ObjectType } from 'schema-typed';
+import { SchemaModel } from 'schema-typed';
 import { useRef, useCallback } from 'react';
-/**
- * Convert a flat schema object to a nested schema object
- *
- * @example
- *
- * ```js
- * const schema = {
- *  'address.city': StringType().isRequired('City is required'),
- *  'address.street': StringType().isRequired('Street is required')
- * };
- *
- * const result = unflattenSchemaObject(schema);
- *
- * // result
- * {
- *    address: ObjectType().shape({
- *      city: StringType().isRequired('City is required'),
- *      street: StringType().isRequired('Street is required')
- *    })
- * }
- * ```
- */
-function unflattenSchemaObject(schema) {
-  var result = {};
-  var $type = Symbol('schema-type');
-  Object.keys(schema).forEach(function (key) {
-    if (key.includes('.')) {
-      var keys = key.split('.');
-      var lastKey = keys.pop() || '';
-      var current = result;
-      keys.forEach(function (subKey) {
-        var _ref;
-        current[subKey] = current[subKey] || (_ref = {}, _ref[$type] = 'object-type', _ref);
-        current = current[subKey];
-      });
-      current[lastKey] = schema[key];
-    } else {
-      result[key] = schema[key];
-    }
-  });
-  function convertToShape(obj) {
-    Object.keys(obj).forEach(function (key) {
-      var _obj$key;
-      if (((_obj$key = obj[key]) === null || _obj$key === void 0 ? void 0 : _obj$key[$type]) === 'object-type') {
-        delete obj[key][$type];
-        obj[key] = ObjectType().shape(convertToShape(obj[key]));
-      }
-    });
-    return obj;
-  }
-  return convertToShape(result);
-}
+import { constructFlatSchema } from "../utils/constructFlatSchema.js";
 function useSchemaModel(formModel, nestedField) {
   var subRulesRef = useRef([]);
   var pushFieldRule = useCallback(function (name, fieldRule) {
@@ -76,15 +25,15 @@ function useSchemaModel(formModel, nestedField) {
     if (realSubRules.length === 0) {
       return formModel;
     }
-    var subRuleObject = realSubRules.map(function (_ref2) {
-      var _ref3;
-      var name = _ref2.name,
-        fieldRule = _ref2.fieldRule;
-      return _ref3 = {}, _ref3[name] = fieldRule.current, _ref3;
+    var subRuleObject = realSubRules.map(function (_ref) {
+      var _ref2;
+      var name = _ref.name,
+        fieldRule = _ref.fieldRule;
+      return _ref2 = {}, _ref2[name] = fieldRule.current, _ref2;
     }).reduce(function (a, b) {
       return Object.assign(a, b);
     }, {});
-    return SchemaModel.combine(formModel, SchemaModel(nestedField ? unflattenSchemaObject(subRuleObject) : subRuleObject));
+    return SchemaModel.combine(formModel, SchemaModel(nestedField ? constructFlatSchema(subRuleObject) : subRuleObject));
   }, [formModel, nestedField]);
   return {
     getCombinedModel: getCombinedModel,

package/esm/Form/utils/constructFlatSchema.d.ts

@@ -0,0 +1,4 @@
+/**
+ * combine flat schema to nested schema
+ */
+export declare function constructFlatSchema(schema: any): any;

package/esm/Form/utils/constructFlatSchema.js

@@ -0,0 +1,38 @@
+'use client';
+import { ObjectType, ArrayType } from 'schema-typed';
+import set from 'lodash/set';
+
+/**
+ * combine flat schema to nested schema
+ */
+export function constructFlatSchema(schema) {
+  var shape = {};
+  Object.keys(schema).forEach(function (key) {
+    set(shape, key, {
+      schema: schema[key],
+      primitiveType: true
+    });
+  });
+  function convertShapeToSchema(shape, result, internal) {
+    Object.keys(shape).forEach(function (key) {
+      var currentShape = shape[key];
+      if (Array.isArray(currentShape)) {
+        var _ArrayType;
+        result[key] = (_ArrayType = ArrayType()).of.apply(_ArrayType, currentShape.map(function (v) {
+          if (v.primitiveType) {
+            return v.schema;
+          }
+          return convertShapeToSchema(v, {}, true);
+        }));
+      } else {
+        if (currentShape.primitiveType) {
+          result[key] = currentShape.schema;
+        } else {
+          result[key] = convertShapeToSchema(currentShape, {}, true);
+        }
+      }
+    });
+    return internal ? ObjectType().shape(result) : result;
+  }
+  return convertShapeToSchema(shape, {});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "5.78.0",
+  "version": "5.79.0-canary-2025032417",
   "description": "A suite of react components",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -39,7 +39,7 @@
     "react-use-set": "^1.0.0",
     "react-window": "^1.8.8",
     "rsuite-table": "^5.19.1",
-    "schema-typed": "^2.3.0"
+    "schema-typed": "^2.4.1"
   },
   "peerDependencies": {
     "react": ">=16.8.0",