Avoid rc deep imports

package.json

@@ -50,11 +50,11 @@
   },
   "dependencies": {
     "@rc-component/async-validator": "^5.1.0",
-    "@rc-component/util": "^1.6.2",
+    "@rc-component/util": "^1.11.1",
     "clsx": "^2.1.1"
   },
   "devDependencies": {
-    "@rc-component/father-plugin": "^2.0.1",
+    "@rc-component/father-plugin": "^2.2.0",
     "@rc-component/np": "^1.0.2",
     "@testing-library/jest-dom": "^6.1.4",
     "@testing-library/react": "^16.0.0",

src/Field.tsx

@@ -1,6 +1,4 @@
-import toChildrenArray from '@rc-component/util/lib/Children/toArray';
-import isEqual from '@rc-component/util/lib/isEqual';
-import warning from '@rc-component/util/lib/warning';
+import { isEqual, toArray as toChildrenArray, warning } from '@rc-component/util';
 import * as React from 'react';
 import FieldContext, { HOOK_MARK } from './FieldContext';
 import type {

src/FieldContext.ts

@@ -1,4 +1,4 @@
-import warning from '@rc-component/util/lib/warning';
+import { warning } from '@rc-component/util';
 import * as React from 'react';
 import type { InternalFormInstance } from './interface';
 

src/List.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import warning from '@rc-component/util/lib/warning';
+import { warning } from '@rc-component/util';
 import type {
   InternalNamePath,
   NamePath,

src/hooks/useForm.ts

@@ -1,5 +1,4 @@
-import { merge } from '@rc-component/util/lib/utils/set';
-import warning from '@rc-component/util/lib/warning';
+import { merge, warning } from '@rc-component/util';
 import * as React from 'react';
 import { HOOK_MARK } from '../FieldContext';
 import type {

src/hooks/useWatch.ts

@@ -1,4 +1,4 @@
-import warning from '@rc-component/util/lib/warning';
+import { useEvent, warning } from '@rc-component/util';
 import { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import FieldContext, { HOOK_MARK } from '../FieldContext';
 import type {
@@ -10,7 +10,6 @@ import type {
 } from '../interface';
 import { isFormInstance } from '../utils/typeUtil';
 import { getNamePath, getValue } from '../utils/valueUtil';
-import { useEvent } from '@rc-component/util';
 
 type ReturnPromise<T> = T extends Promise<infer ValueType> ? ValueType : never;
 type GetGeneric<TForm extends FormInstance> = ReturnPromise<ReturnType<TForm['validateFields']>>;

src/index.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { FormRef, FormInstance } from './interface';
+import type { FormRef } from './interface';
 import Field from './Field';
 import List from './List';
 import useForm from './hooks/useForm';
@@ -33,6 +33,23 @@ RefForm.useWatch = useWatch;
 
 export { Field, List, useForm, FormProvider, FieldContext, ListContext, useWatch };
 
-export type { FormProps, FormInstance, FormRef };
+export type { FieldProps } from './Field';
+export type { FormProviderProps } from './FormContext';
+export type {
+  FormInstance,
+  FormRef,
+  InternalNamePath,
+  Meta,
+  NamePath,
+  Rule,
+  RuleObject,
+  RuleRender,
+  Store,
+  StoreValue,
+  ValidateErrorEntity,
+  ValidateMessages,
+  ValidatorRule,
+} from './interface';
+export type { FormProps };
 
 export default RefForm;

src/utils/delayUtil.ts

@@ -1,5 +1,5 @@
 import { macroTask } from '../hooks/useNotifyWatch';
-import raf from '@rc-component/util/lib/raf';
+import { raf } from '@rc-component/util';
 
 export default async function delayFrame() {
   return new Promise<void>(resolve => {

src/utils/validateUtil.ts

@@ -1,6 +1,6 @@
 import RawAsyncValidator from '@rc-component/async-validator';
 import * as React from 'react';
-import warning from '@rc-component/util/lib/warning';
+import { merge, warning } from '@rc-component/util';
 import type {
   InternalNamePath,
   InternalValidateOptions,
@@ -9,7 +9,6 @@ import type {
   RuleError,
 } from '../interface';
 import { defaultValidateMessages } from './messages';
-import { merge } from '@rc-component/util/lib/utils/set';
 
 // Remove incorrect original ts define
 const AsyncValidator: any = RawAsyncValidator;

src/utils/valueUtil.ts

@@ -1,5 +1,4 @@
-import getValue from '@rc-component/util/lib/utils/get';
-import setValue from '@rc-component/util/lib/utils/set';
+import { get as getValue, set as setValue } from '@rc-component/util';
 import type { InternalNamePath, NamePath, Store, EventArgs } from '../interface';
 import { toArray } from './typeUtil';
 

tests/index.test.tsx

@@ -1,5 +1,5 @@
 import { act, fireEvent, render } from '@testing-library/react';
-import { resetWarned } from '@rc-component/util/lib/warning';
+import { resetWarned } from '@rc-component/util';
 import React from 'react';
 import type { FormInstance } from '../src';
 import Form, { Field, useForm } from '../src';

tests/initialValue.test.tsx

@@ -1,5 +1,5 @@
 import { act, fireEvent, render } from '@testing-library/react';
-import { resetWarned } from '@rc-component/util/lib/warning';
+import { resetWarned } from '@rc-component/util';
 import React, { useState } from 'react';
 import Form, { Field, List, useForm, type FormInstance } from '../src';
 import { changeValue, getInput } from './common';
@@ -166,11 +166,9 @@ describe('Form.InitialValues', () => {
     fireEvent.click(container.querySelector('button'));
     expect(formValue.users[0].last).toEqual('bbb');
 
-
     fireEvent.click(container.querySelector('button'));
     expect(formValue.users[0].last).toEqual('bbb');
 
-
     fireEvent.click(container.querySelector('button'));
 
     expect(container.querySelector<HTMLInputElement>('.first-name-input').value).toEqual('aaa');

tests/list.test.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { fireEvent, render, act } from '@testing-library/react';
-import { resetWarned } from '@rc-component/util/lib/warning';
+import { resetWarned } from '@rc-component/util';
 import Form, { Field, List } from '../src';
 import type { FormProps } from '../src';
 import type { ListField, ListOperations, ListProps } from '../src/List';