@simpleform/render 4.1.30 → 4.1.32

package/lib/node.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { FormRenderNodeProps } from './typings';
+declare const FormRenderNode: React.FC<FormRenderNodeProps>;
+export default FormRenderNode;

package/lib/store/actions.d.ts

@@ -0,0 +1,23 @@
+export declare const actionCreators: {
+    setWidgetList: (widgetList: any) => {
+        widgetList: any;
+    };
+    setItemByPath: (data: any, path: any) => {
+        data: any;
+        path: any;
+    };
+    insertItemByIndex: (data: any, index: any, parent: any) => {
+        data: any;
+        index: any;
+        parent: any;
+    };
+    delItemByPath: (path: any) => {
+        path: any;
+    };
+    moveItemByPath: (from: any, to: any) => {
+        from: any;
+        to: any;
+    };
+};
+declare const _default: (state: any, actionName: any, payload: any) => any;
+export default _default;

package/lib/store/index.d.ts

@@ -0,0 +1,21 @@
+import { FormRenderNodeProps, FormRenderProps } from '../typings';
+export type FormRenderListener<V> = (newValue?: V, oldValue?: V) => void;
+export declare class SimpleFormRender {
+    config?: FormRenderProps;
+    private widgetList;
+    private lastWidgetList;
+    private widgetListListeners;
+    constructor(config?: SimpleFormRender['config']);
+    defineConfig(payload?: SimpleFormRender['config'] | ((config?: FormRenderProps) => Partial<FormRenderProps>)): void;
+    getWidgetList(): import("../typings").WithExpression<import("../typings").WithGenerateNode<import("../typings").FRGenerateNode, "inside" | "outside">>[];
+    setWidgetList(data?: SimpleFormRender['widgetList'], option?: {
+        ignore?: boolean;
+    }): void;
+    getItemByPath: (path?: FormRenderNodeProps["path"]) => import("../typings").WithExpression<import("../typings").WithGenerateNode<import("../typings").FRGenerateNode, "inside" | "outside">>[] | undefined;
+    getActions(): {
+        [k: string]: (...args: any[]) => void;
+    };
+    subscribeWidgetList(listener: SimpleFormRender['widgetListListeners'][number]): () => void;
+    unsubscribeWidgetList(): void;
+    private notifyWidgetList;
+}

package/lib/typings.d.ts

@@ -1,48 +1,55 @@
-import React, { ReactNode } from "react";
-import { FormItemProps, FormProps } from "@simpleform/form";
-import { SimpleFormRender } from "./store";
+import React, { ReactNode } from 'react';
+import { FormItemProps, FormProps } from '@simpleform/form';
+import { SimpleFormRender } from './store';
 export type ReactComponent<P> = React.ComponentType<P> | React.ForwardRefExoticComponent<P>;
-export type CustomUnionType<P = {}> = GenerateWidgetItem<P> | Array<GenerateWidgetItem<P>> | ReactComponent<any> | ReactNode;
-export interface RegisteredComponents<P = any> {
-    [key: string]: ReactComponent<P>;
-}
-export type WidgetList<P = {}> = Array<WidgetItem<P>>;
-export type GenerateWidgetItem<P = {}> = P & FormItemProps & {
+export type FRGenerateNode = FormItemProps & {
     type?: string | ReactComponent<any>;
     props?: Record<string, unknown>;
     children?: any;
-    inside?: CustomUnionType<P>;
-    outside?: CustomUnionType<P>;
+    inside?: ReactComponent<any> | ReactNode;
+    outside?: ReactComponent<any> | ReactNode;
     readOnly?: boolean;
-    readOnlyRender?: ReactNode | ((context?: WidgetContextProps) => ReactNode);
-    typeRender?: ReactNode | ((context?: WidgetContextProps) => ReactNode);
+    readOnlyRender?: ReactNode | ((context?: FRContext) => ReactNode);
+    typeRender?: ReactNode | ((context?: FRContext) => ReactNode);
     hidden?: boolean;
 };
-export type WidgetItem<P = {}> = {
-    [key in keyof GenerateWidgetItem<P>]: (string | GenerateWidgetItem<P>[key]);
+export type WithGenerateNode<T, K extends keyof FRGenerateNode> = {
+    [P in keyof T]: P extends K ? T[P] | FRGenerateNode : T[P];
 };
-export type WidgetOptions<P = {}> = GenerateWidgetItem<P> & Pick<FormChildrenProps, 'formrender'> & Pick<FormProps, 'form'> & {
-    index?: number;
-    path?: string;
+export type WithExpression<T> = {
+    [P in keyof T]: T[P] | string;
 };
-export type WidgetContextProps<P = {}> = {
-    _options?: WidgetOptions<P>;
+export type FRNode = WithExpression<WithGenerateNode<FRGenerateNode, 'inside' | 'outside'>>;
+export type FROptions = Partial<FRGenerateNode> & {
+    [key in string]: any;
 };
-export type CustomRenderType = <C, P = {}>(children?: C, context?: WidgetContextProps<P>) => C;
-export type FormChildrenProps<P = {}> = {
-    wrapper?: GenerateWidgetItem<P>['inside'];
+export type FRContext = {
+    _options: FROptions & Pick<FormChildrenProps, 'formrender'> & Pick<FormProps, 'form'> & {
+        index?: number;
+        path?: Array<string | number>;
+    };
+};
+export type CustomRenderType = <C>(children?: C, context?: FRContext) => C;
+export type FormRenderNodeProps = Pick<FormProps, 'onValuesChange'> & {
+    formrender: SimpleFormRender;
+    widget: FRNode;
+    index?: FRContext['_options']['index'];
+    path?: FRContext['_options']['path'];
+    renderList?: CustomRenderType;
+    renderItem?: CustomRenderType;
+};
+export type FormChildrenProps = Pick<FormRenderNodeProps, 'renderList' | 'renderItem'> & {
     /**@deprecated no longer recommended */
     form?: FormProps['form'];
     formrender?: SimpleFormRender;
-    options?: GenerateWidgetItem<P> | ((item?: GenerateWidgetItem<P>) => GenerateWidgetItem<P>);
-    parser?: <V>(value?: unknown, variables?: object) => V;
-    components?: RegisteredComponents;
+    wrapper?: FRNode['inside'];
+    options?: FROptions | ((frGenerateNode: any) => FROptions);
+    widgetList?: Array<FRNode>;
     /**@deprecated no longer recommended, please use 'variables' instead */
     plugins?: Record<string, unknown>;
     variables?: Record<string, unknown>;
-    widgetList?: WidgetList<P>;
-    renderList?: CustomRenderType;
-    renderItem?: CustomRenderType;
-    onRenderChange?: (newData?: WidgetList<P>, oldData?: WidgetList<P>) => void;
+    parser?: <V>(value?: V, variables?: object) => V;
+    components?: Record<string, ReactComponent<any>>;
+    onRenderChange?: (newData?: FormChildrenProps['widgetList'], oldData?: FormChildrenProps['widgetList']) => void;
 };
-export type FormRenderProps<P = {}> = FormProps & Omit<FormChildrenProps<P>, 'form'>;
+export type FormRenderProps = FormProps & Omit<FormChildrenProps, 'form'>;

package/lib/utils/index.d.ts

@@ -1,6 +1,6 @@
 export * from './framework';
-export * from './array';
 export * from './transform';
 export * from './object';
 export * from './type';
 export * from './utils';
+export * from './parser';

package/lib/utils/parser.d.ts

@@ -0,0 +1,3 @@
+export declare const toExpression: (val?: unknown) => string | undefined;
+export declare const matchExpression: (value?: unknown) => string | undefined;
+export declare const parseExpression: <V>(value: V, variables?: object) => any;

package/lib/utils/transform.d.ts

@@ -1,18 +1,12 @@
 import React from 'react';
-import { CustomRenderType, CustomUnionType, FormRenderProps, ReactComponent, RegisteredComponents, WidgetContextProps, WidgetItem, WidgetList } from "../typings";
-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;
+import { CustomRenderType, FormRenderNodeProps, FormRenderProps, FRContext } from '../typings';
+export declare const mergeFROptions: (oldConfig: any, newConfig: any, mergeFunNames?: string[]) => any;
 export declare const traverseMapObject: (val: any, callback: any) => any;
-export declare const traverseWidgetList: <R>(list?: WidgetList, callback?: (item: WidgetItem, _options: {
-    path: string;
-    index?: number;
-}, 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 withSide: (target?: React.ReactNode, customRender?: CustomRenderType, side?: React.ReactNode, context?: WidgetContextProps) => string | number | boolean | Iterable<React.ReactNode> | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | null | undefined;
-export declare const renderWidgetItem: (formrender?: FormRenderProps["formrender"], target?: WidgetItem | ReactComponent<any> | React.ReactNode, baseOptions?: WidgetContextProps["_options"]) => any;
-export declare const renderWidgetList: (formrender?: FormRenderProps["formrender"], widgetList?: WidgetList, baseOptions?: WidgetContextProps["_options"]) => any;
+export declare const traverseList: <V>(list?: Array<V>, callback?: (item: V, index: number, parent?: Array<string | number>) => any | void, parent?: Array<string | number>) => void[] | undefined;
+export declare const traverseParse: <V>(obj: V, variables?: object, parser?: FormRenderProps["parser"]) => any;
+export declare const getInitialValues: <V>(widgetList?: FormRenderProps["widgetList"]) => V | undefined;
+export declare const createFRElement: (target?: any, props?: any, widgets?: FormRenderProps["components"]) => React.ReactNode;
+export declare const parseFRData: (data: any, formrender: FormRenderProps["formrender"], form?: FormRenderProps["form"]) => any;
+export declare const withSide: (target?: React.ReactNode, customRender?: CustomRenderType, side?: React.ReactNode, context?: FRContext) => React.ReactElement<any, any>;
+export declare const renderFRNode: (node?: FormRenderNodeProps, formContext?: any) => React.ReactElement<any, any> | null | undefined;
+export declare const renderFRNodeList: (formrender: FormRenderNodeProps["formrender"], widgetList?: any, formContext?: any, parentNode?: Partial<FormRenderNodeProps>) => (React.ReactElement<any, any> | null | undefined)[] | undefined;

package/lib/utils/utils.d.ts

@@ -1,28 +1,10 @@
-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: <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 function getEntriesByIndex<T>(widgetList?: T[], index?: number, parent?: string): [number, T];
-export declare function getEntriesByIndex<T>(widgetList?: Record<string, T>, index?: number, parent?: string): [string, T];
+import { FormRenderNodeProps, FormRenderProps } from "src/typings";
+export declare const isEqualPath: (a: any, b: any) => boolean;
+export declare const setItemByPath: <V>(widgetList?: V, data?: unknown, path?: FormRenderNodeProps["path"]) => V | undefined;
+export declare const getItemByPath: <V, Path extends FormRenderNodeProps["path"]>(widgetList?: V, path?: Path) => V | import("@simpleform/form/lib/typings").PathValue<V, NonNullable<Path>> | undefined;
 export declare function toEntries<T>(data: T[]): [number, T][];
 export declare function toEntries<T>(data: Record<string, T>): [string, T][];
 export declare function parseEntries<T>(entries: Array<[number, T]>): T[];
 export declare function parseEntries<T>(entries: Array<[string, T]>): Record<string, T>;
-export declare const insertItemByIndex: (widgetList?: WidgetList, data?: unknown, index?: number, parent?: string) => WidgetList | undefined;
-export declare const moveSameLevel: (widgetList: WidgetList | undefined, from: {
-    parent?: string;
-    index: number;
-}, to: {
-    parent?: string;
-    index?: number;
-}) => WidgetList | undefined;
-export declare const moveDiffLevel: (widgetList: WidgetList | undefined, from: {
-    parent?: string;
-    index: number;
-}, to: {
-    parent?: string;
-    index?: number;
-}) => WidgetList | undefined;
+export declare const insertItemByIndex: (widgetList: FormRenderProps["widgetList"] | undefined, data: unknown, index?: number, parent?: FormRenderNodeProps["path"]) => import("src/typings").WithExpression<import("src/typings").WithGenerateNode<import("src/typings").FRGenerateNode, "inside" | "outside">>[] | undefined;
+export declare const moveItemByPath: (widgetList: FormRenderProps["widgetList"] | undefined, fromPath: FormRenderNodeProps["path"], toPath: FormRenderNodeProps["path"]) => import("src/typings").WithExpression<import("src/typings").WithGenerateNode<import("src/typings").FRGenerateNode, "inside" | "outside">>[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simpleform/render",
-  "version": "4.1.30",
+  "version": "4.1.32",
   "description": "dynamic rendering core of simple form",
   "author": "mezhanglei <496623925@qq.com>",
   "homepage": "https://github.com/mezhanglei/simpleform#readme",
@@ -45,7 +45,8 @@
     "react-router-dom": "^6.19.0"
   },
   "dependencies": {
-    "@simpleform/form": "^2.2.2",
+    "@simpleform/form": "^2.2.7",
+    "@simpleform/evaluator": "^0.0.2",
     "classnames": "^2.3.2",
     "copy-anything": "^3.0.5",
     "serialize-javascript": "^6.0.2"

package/lib/store.d.ts

@@ -1,32 +0,0 @@
-import { CustomUnionType, FormRenderProps, WidgetList } from "./typings";
-export type FormRenderListener<V> = (newValue?: V, oldValue?: V) => void;
-export declare class SimpleFormRender {
-    config?: FormRenderProps;
-    private widgetList;
-    private lastWidgetList;
-    private widgetListListeners;
-    constructor(config?: SimpleFormRender['config']);
-    defineConfig(payload?: SimpleFormRender['config'] | ((config?: FormRenderProps) => Partial<FormRenderProps>)): void;
-    getFormComponent(target?: CustomUnionType): any;
-    createFormElement(target?: CustomUnionType, commonProps?: unknown): import("react").ReactNode;
-    getWidgetList(): WidgetList;
-    setWidgetList(data?: SimpleFormRender['widgetList'], option?: {
-        ignore?: boolean;
-    }): void;
-    setItemByPath: (data?: unknown, path?: string) => void;
-    setItemByIndex: (data?: unknown, index?: number, parent?: string) => void;
-    insertItemByIndex: (data?: unknown, index?: number, parent?: string) => void;
-    delItemByPath: (path?: string) => void;
-    getItemByPath: (path?: string) => undefined;
-    getItemByIndex: (index: number, parent?: string) => import("./typings").WidgetItem<{}> | undefined;
-    moveItemByPath: (from: {
-        parent?: string;
-        index: number;
-    }, to: {
-        parent?: string;
-        index?: number;
-    }) => void;
-    subscribeWidgetList(listener: SimpleFormRender['widgetListListeners'][number]): () => void;
-    unsubscribeWidgetList(): void;
-    private notifyWidgetList;
-}

package/lib/utils/array.d.ts

@@ -1 +0,0 @@
-export declare const arrayMove: <T>(arr: T[], preIndex: number, nextIndex: number) => T[];