@simpleform/render 4.1.17 → 4.1.19

package/lib/store.d.ts

@@ -1,16 +1,12 @@
-/// <reference types="react" />
 import { CustomUnionType, FormRenderProps, WidgetList } from "./typings";
 export type FormRenderListener<V> = (newValue?: V, oldValue?: V) => void;
 export declare class SimpleFormRender {
-    config?: {
-        variables?: FormRenderProps['variables'];
-        components?: FormRenderProps['components'];
-    };
+    config?: FormRenderProps;
     private widgetList;
     private lastWidgetList;
     private widgetListListeners;
     constructor(config?: SimpleFormRender['config']);
-    defineConfig(data?: SimpleFormRender['config']): void;
+    defineConfig(payload?: SimpleFormRender['config'] | ((config?: FormRenderProps) => Partial<FormRenderProps>)): void;
     getFormComponent(target?: CustomUnionType): any;
     createFormElement(target?: CustomUnionType, commonProps?: unknown): import("react").ReactNode;
     getWidgetList(): WidgetList;
@@ -19,9 +15,9 @@ export declare class SimpleFormRender {
     }): void;
     setItemByPath: (data?: unknown, path?: string) => void;
     setItemByIndex: <V>(data?: unknown, index?: number, parent?: string) => void;
-    insertItemByIndex: <V>(data?: V | V[] | undefined, index?: number, parent?: string) => void;
+    insertItemByIndex: <V>(data?: V | Array<V>, index?: number, parent?: string) => void;
     delItemByPath: (path?: string) => void;
-    getItemByPath: <V>(path?: string) => V | undefined;
+    getItemByPath: (path?: string) => undefined;
     getItemByIndex: <V>(index: number, parent?: string) => V | undefined;
     moveItemByPath: (from: {
         parent?: string;

package/lib/typings.d.ts

@@ -21,7 +21,7 @@ export type GenerateWidgetItem<P = {}> = P & FormItemProps & {
 export type WidgetItem<P = {}> = {
     [key in keyof GenerateWidgetItem<P>]: (string | GenerateWidgetItem<P>[key]);
 };
-export type WidgetOptions<P = {}> = GenerateWidgetItem<P> & Pick<FormChildrenProps, 'form' | 'formrender' | 'renderList' | 'renderItem'> & {
+export type WidgetOptions<P = {}> = GenerateWidgetItem<P> & Pick<FormChildrenProps, 'formrender'> & Pick<FormProps, 'form'> & {
     index?: number;
     path?: string;
 };
@@ -29,12 +29,16 @@ export type WidgetContextProps<P = {}> = {
     _options?: WidgetOptions<P>;
 };
 export type CustomRenderType = <C, P = {}>(children?: C, context?: WidgetContextProps<P>) => C;
-export type FormChildrenProps<P = {}> = Pick<FormProps, 'form'> & Pick<GenerateWidgetItem<P>, 'inside'> & {
+export type FormChildrenProps<P = {}> = {
+    /**@deprecated no longer recommended, please use 'options.inside' instead */
+    inside?: GenerateWidgetItem<P>['inside'];
+    /**@deprecated no longer recommended */
+    form?: FormProps['form'];
     formrender?: SimpleFormRender;
     options?: GenerateWidgetItem<P> | ((item?: GenerateWidgetItem<P>) => GenerateWidgetItem<P>);
-    uneval?: boolean;
+    parser?: <V>(value?: unknown, variables?: object) => V;
     components?: RegisteredComponents;
-    /**@deprecated plugins由variables代替 */
+    /**@deprecated no longer recommended, please use 'variables' instead */
     plugins?: Record<string, unknown>;
     variables?: Record<string, unknown>;
     widgetList?: WidgetList<P>;
@@ -42,4 +46,4 @@ export type FormChildrenProps<P = {}> = Pick<FormProps, 'form'> & Pick<GenerateW
     renderItem?: CustomRenderType;
     onRenderChange?: (newData?: WidgetList<P>, oldData?: WidgetList<P>) => void;
 };
-export type FormRenderProps<P = {}> = FormProps & FormChildrenProps<P>;
+export type FormRenderProps<P = {}> = FormProps & Omit<FormChildrenProps<P>, 'form'>;

package/lib/utils/transform.d.ts

@@ -1,17 +1,17 @@
 import React from 'react';
 import { CustomRenderType, CustomUnionType, FormRenderProps, RegisteredComponents, WidgetContextProps, WidgetItem, WidgetList } from "../typings";
-export declare const mergeFormOptions: <V>(oldConfig: V, newConfig?: Partial<V> | undefined, mergeFunNames?: string[]) => V;
+export declare const mergeFormOptions: <V>(oldConfig: V, newConfig?: Partial<V>, mergeFunNames?: string[]) => V;
+export declare const matchExpression: (value?: unknown) => string | undefined;
+export declare const toExpression: (val?: unknown) => string | undefined;
+export declare const parseExpression: <V>(value: V, variables?: object) => any;
 export declare const traverseMapObject: (val: any, callback: any) => any;
-export declare const traverseWidgetList: <R>(list?: WidgetList, callback?: ((item: WidgetItem, _options: {
+export declare const traverseWidgetList: <R>(list?: WidgetList, callback?: (item: WidgetItem, _options: {
     path: string;
     index?: number;
-}, children?: R[] | undefined) => R) | undefined, parent?: string) => any;
-export declare const matchExpression: (value?: unknown) => string | undefined;
-export declare const evalAttr: <V>(val: V, variables?: object, uneval?: boolean) => any;
+}, children?: R[]) => R, parent?: string) => any;
+export declare const evalAttr: <V>(val: V, variables?: object, parser?: FormRenderProps["parser"]) => any;
 export declare const getInitialValues: <V>(widgetList?: WidgetList) => V | undefined;
 export declare const getFormComponent: (target?: any, widgets?: RegisteredComponents) => any;
 export declare const createFormElement: (target?: CustomUnionType, props?: unknown, widgets?: RegisteredComponents) => React.ReactNode;
-export declare const transformStr: (str?: string) => string | undefined;
-export declare const compileExpression: <V>(value: V, variables?: object, uneval?: boolean) => any;
 export declare const withSide: (target?: React.ReactNode, customRender?: CustomRenderType, side?: React.ReactNode, context?: WidgetContextProps) => string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined;
-export declare const renderWidgetItem: (formrender?: FormRenderProps['formrender'], target?: CustomUnionType, options?: WidgetContextProps['_options']) => any;
+export declare const renderWidgetItem: (formrender?: FormRenderProps["formrender"], target?: CustomUnionType, options?: WidgetContextProps["_options"]) => any;

package/lib/utils/type.d.ts

@@ -7,12 +7,12 @@ export declare function isNumber<T>(data: T): boolean;
 export declare function isString<T>(data: T): boolean;
 export declare function isFunction<T>(data: T): boolean;
 export declare function isArray<T>(data: T): boolean;
-export declare function isDate<T>(data: T): boolean;
+export declare function isDate<T>(data: T): data is T & Date;
 export declare function isRegExp<T>(data: T): boolean;
 export declare function isUndefined<T>(data: T): boolean;
 export declare function isNull<T>(data: T): boolean;
 export declare function isObject<T>(data: T): boolean;
-export declare function isElement<T>(data: T): boolean;
+export declare function isElement<T>(data: T): data is T & Element;
 export declare function isDom<T>(data: T & {
     nodeType?: number;
     nodeName?: string;
@@ -30,5 +30,5 @@ export declare function isStream<T>(data: T & {
     pipe?: Function;
 }): boolean;
 export declare function isBase<T>(data: T): boolean;
-export declare const isNumberStr: <T>(str?: T | undefined) => true | undefined;
-export declare const isBase64: <T>(str?: T | undefined) => boolean | undefined;
+export declare const isNumberStr: <T>(str?: T) => true | undefined;
+export declare const isBase64: <T>(str?: T) => boolean | undefined;

package/lib/utils/utils.d.ts

@@ -1,24 +1,19 @@
+import { FormPathType } from "@simpleform/form";
 import { WidgetList } from "../typings";
 export declare const getPathEnd: (path?: string) => string | number | undefined;
 export declare const getParent: (path?: string) => string;
 export declare const getPathLen: (path?: string) => number;
-export declare const setItemByPath: (widgetList?: WidgetList, data?: unknown, path?: string) => WidgetList | undefined;
-export type GetItemByPath = {
-    (widgetList?: WidgetList): WidgetList | undefined;
-    <V>(widgetList?: WidgetList, path?: string): V | undefined;
-};
-export declare const getItemByPath: GetItemByPath;
+export declare const setItemByPath: <V>(widgetList?: V, data?: unknown, path?: string) => V | undefined;
+export declare const getItemByPath: <V, Path extends FormPathType = string>(widgetList?: V, path?: Path) => import("@simpleform/form/lib/typings").PathValue<V, Path> | undefined;
 export declare const getKeyValueByIndex: <V>(widgetList?: WidgetList, index?: number, parent?: string) => [string, V] | undefined;
-export declare const toEntries: <T>(data: T) => {
+export declare const toEntries: <V>(data: any) => {
     isList: boolean;
-    entries: (T extends (infer I)[] | Record<string, infer I> ? [string, I] : unknown)[];
+    entries: Array<[string, V]>;
 };
-export type ParseEntries = {
-    <T>(entries: Array<[string, T]>): Record<string, T>;
-    <T>(entries: Array<[string, T]>, isList: boolean): Array<T> | Record<string, T>;
+export declare const parseEntries: <T>(entries: Array<[string, T]>, isList?: boolean) => T[] | {
+    [k: string]: T;
 };
-export declare const parseEntries: ParseEntries;
-export declare const insertItemByIndex: <V>(widgetList?: WidgetList, data?: V | V[] | undefined, index?: number, parent?: string) => WidgetList | undefined;
+export declare const insertItemByIndex: <V>(widgetList?: WidgetList, data?: V | Array<V>, index?: number, parent?: string) => WidgetList | undefined;
 export declare const moveSameLevel: (widgetList: WidgetList | undefined, from: {
     parent?: string;
     index: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simpleform/render",
-  "version": "4.1.17",
+  "version": "4.1.19",
   "description": "dynamic rendering core of simple form",
   "author": "mezhanglei <496623925@qq.com>",
   "homepage": "https://github.com/mezhanglei/simpleform#readme",
@@ -45,9 +45,10 @@
     "react-router-dom": "^6.19.0"
   },
   "dependencies": {
-    "@simpleform/form": "^2.1.9",
+    "@simpleform/form": "^2.1.11",
     "classnames": "^2.3.2",
-    "copy-anything": "^3.0.5"
+    "copy-anything": "^3.0.5",
+    "serialize-javascript": "^6.0.2"
   },
   "peerDependencies": {
     "antd": ">=4.0.0",