@measured/puck 0.16.0-canary.53c8bfc → 0.16.0-canary.555902

package/dist/{Config-CkVFT1_w.d.mts → Config-RpUGTBxI.d.mts}

@@ -128,7 +128,7 @@ type Field<Props extends any = any> = TextField | NumberField | TextareaField |
     [key: string]: any;
 } ? Props : any> | CustomField<Props>;
 type Fields<ComponentProps extends DefaultComponentProps = DefaultComponentProps> = {
-    [PropName in keyof Omit<Required<ComponentProps>, "children" | "editMode">]: Field<ComponentProps[PropName]>;
+    [PropName in keyof Omit<ComponentProps, "editMode">]: Field<ComponentProps[PropName]>;
 };
 type FieldProps<ValueType = any, F = Field<any>> = {
     field: F;
@@ -138,54 +138,60 @@ type FieldProps<ValueType = any, F = Field<any>> = {
     readOnly?: boolean;
 };
 
-type WithPuckProps<Props> = Props & {
+type WithId<Props> = Props & {
     id: string;
 };
-type DefaultRootProps = {
+type WithPuckProps<Props> = Props & {
+    puck: PuckContext;
+    editMode?: boolean;
+};
+type AsFieldProps<Props> = Omit<Props, "children" | "puck" | "editMode">;
+type WithChildren<Props> = Props & {
+    children: ReactNode;
+};
+type DefaultRootFieldProps = {
     title?: string;
-    [key: string]: any;
 };
+type DefaultRootRenderProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = WithPuckProps<WithChildren<Props>>;
+type DefaultRootProps = DefaultRootRenderProps;
 type DefaultComponentProps = {
     [key: string]: any;
-    editMode?: boolean;
 };
-type Content<Props extends {
+type Content<PropsMap extends {
     [key: string]: any;
 } = {
     [key: string]: any;
-}> = ComponentData<Props>[];
-type PuckComponent<Props> = (props: WithPuckProps<Props & {
-    puck: PuckContext;
-}>) => JSX.Element;
+}> = ComponentDataMap<PropsMap>[];
+type PuckComponent<Props> = (props: WithId<WithPuckProps<Props>>) => JSX.Element;
 type PuckContext = {
     renderDropZone: React.FC<DropZoneProps>;
     isEditing: boolean;
 };
-type ComponentConfig<ComponentProps extends DefaultComponentProps = DefaultComponentProps, DefaultProps = ComponentProps, DataShape = Omit<ComponentData<ComponentProps>, "type">> = {
-    render: PuckComponent<ComponentProps>;
+type ComponentConfig<RenderProps extends DefaultComponentProps = DefaultComponentProps, FieldProps extends DefaultComponentProps = RenderProps, DataShape = Omit<ComponentData<FieldProps>, "type">> = {
+    render: PuckComponent<RenderProps>;
     label?: string;
-    defaultProps?: DefaultProps;
-    fields?: Fields<ComponentProps>;
+    defaultProps?: FieldProps;
+    fields?: Fields<FieldProps>;
     permissions?: Partial<Permissions>;
     resolveFields?: (data: DataShape, params: {
-        changed: Partial<Record<keyof ComponentProps, boolean>>;
-        fields: Fields<ComponentProps>;
-        lastFields: Fields<ComponentProps>;
+        changed: Partial<Record<keyof FieldProps, boolean>>;
+        fields: Fields<FieldProps>;
+        lastFields: Fields<FieldProps>;
         lastData: DataShape;
         appState: AppState;
-    }) => Promise<Fields<ComponentProps>> | Fields<ComponentProps>;
+    }) => Promise<Fields<FieldProps>> | Fields<FieldProps>;
     resolveData?: (data: DataShape, params: {
-        changed: Partial<Record<keyof ComponentProps, boolean>>;
+        changed: Partial<Record<keyof FieldProps, boolean>>;
         lastData: DataShape;
     }) => Promise<{
-        props?: Partial<ComponentProps>;
-        readOnly?: Partial<Record<keyof ComponentProps, boolean>>;
+        props?: Partial<FieldProps>;
+        readOnly?: Partial<Record<keyof FieldProps, boolean>>;
     }> | {
-        props?: Partial<ComponentProps>;
-        readOnly?: Partial<Record<keyof ComponentProps, boolean>>;
+        props?: Partial<FieldProps>;
+        readOnly?: Partial<Record<keyof FieldProps, boolean>>;
     };
     resolvePermissions?: (data: DataShape, params: {
-        changed: Partial<Record<keyof ComponentProps, boolean>>;
+        changed: Partial<Record<keyof FieldProps, boolean>>;
         lastPermissions: Partial<Permissions> | undefined;
         initialPermissions: Partial<Permissions>;
         appState: AppState;
@@ -197,19 +203,17 @@ type Category<ComponentName> = {
     visible?: boolean;
     defaultExpanded?: boolean;
 };
-type Config<Props extends Record<string, any> = Record<string, any>, RootProps extends DefaultRootProps = DefaultRootProps, CategoryName extends string = string> = {
+type Config<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = any, CategoryName extends string = string> = {
     categories?: Record<CategoryName, Category<keyof Props>> & {
         other?: Category<keyof Props>;
     };
     components: {
         [ComponentName in keyof Props]: Omit<ComponentConfig<Props[ComponentName], Props[ComponentName]>, "type">;
     };
-    root?: Partial<ComponentConfig<RootProps & {
-        children?: ReactNode;
-    }, Partial<RootProps & {
-        children?: ReactNode;
-    }>, RootData>>;
+    root?: Partial<ComponentConfig<DefaultRootRenderProps<RootProps>, AsFieldProps<RootProps>, RootData>>;
 };
+type ExtractPropsFromConfig<UserConfig> = UserConfig extends Config<infer P, any, any> ? P : never;
+type ExtractRootPropsFromConfig<UserConfig> = UserConfig extends Config<any, infer P, any> ? P : never;
 type BaseData<Props extends {
     [key: string]: any;
 } = {
@@ -217,20 +221,23 @@ type BaseData<Props extends {
 }> = {
     readOnly?: Partial<Record<keyof Props, boolean>>;
 };
-type ComponentData<Props extends DefaultComponentProps = DefaultComponentProps> = {
-    type: keyof Props;
-    props: WithPuckProps<Props>;
+type ComponentData<Props extends DefaultComponentProps = DefaultComponentProps, Name = string> = {
+    type: Name;
+    props: WithId<Props>;
 } & BaseData<Props>;
-type RootDataWithProps<Props extends DefaultRootProps = DefaultRootProps> = BaseData<Props> & {
+type ComponentDataMap<Props extends Record<string, DefaultComponentProps> = DefaultComponentProps> = {
+    [K in keyof Props]: ComponentData<Props[K], K extends string ? K : never>;
+}[keyof Props];
+type RootDataWithProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = BaseData<Props> & {
     props: Props;
 };
-type RootDataWithoutProps<Props extends DefaultRootProps = DefaultRootProps> = Props;
-type RootData<Props extends DefaultRootProps = DefaultRootProps> = Partial<RootDataWithProps<Props>> & Partial<RootDataWithoutProps<Props>>;
+type RootDataWithoutProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = Props;
+type RootData<Props extends DefaultComponentProps = DefaultRootFieldProps> = Partial<RootDataWithProps<AsFieldProps<Props>>> & Partial<RootDataWithoutProps<Props>>;
 type MappedItem = ComponentData;
-type Data<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultRootProps = DefaultRootProps> = {
+type Data<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = {
     root: RootData<RootProps>;
-    content: Content<WithPuckProps<Props>>;
-    zones?: Record<string, Content<WithPuckProps<Props>>>;
+    content: Content<Props>;
+    zones?: Record<string, Content<Props>>;
 };
 type ItemWithId = {
     _arrayId: string;
@@ -261,8 +268,8 @@ type UiState = {
         options: Viewport[];
     };
 };
-type AppState = {
-    data: Data;
+type AppState<UserData extends Data = Data> = {
+    data: UserData;
     ui: UiState;
 };
 type Permissions = {
@@ -273,4 +280,4 @@ type Permissions = {
     insert: boolean;
 } & Record<string, boolean>;
 
-export type { AppState as A, BaseData as B, Config as C, Data as D, ExternalFieldWithAdaptor as E, Field as F, ItemSelector as I, MappedItem as M, NumberField as N, ObjectField as O, Permissions as P, RootData as R, SelectField as S, TextField as T, UiState as U, Viewports as V, FieldProps as a, DropZoneProps as b, DefaultComponentProps as c, DefaultRootProps as d, RootDataWithProps as e, ComponentData as f, Content as g, PuckComponent as h, PuckContext as i, ComponentConfig as j, RootDataWithoutProps as k, ItemWithId as l, ArrayState as m, BaseField as n, TextareaField as o, RadioField as p, ArrayField as q, Adaptor as r, ExternalField as s, CustomField as t, Fields as u };
+export type { AppState as A, BaseData as B, Config as C, Data as D, ExtractPropsFromConfig as E, Field as F, ItemSelector as I, MappedItem as M, NumberField as N, ObjectField as O, Permissions as P, RootDataWithProps as R, SelectField as S, TextField as T, UiState as U, Viewports as V, FieldProps as a, DropZoneProps as b, ExtractRootPropsFromConfig as c, DefaultComponentProps as d, DefaultRootFieldProps as e, ComponentData as f, DefaultRootRenderProps as g, DefaultRootProps as h, Content as i, PuckComponent as j, PuckContext as k, ComponentConfig as l, ComponentDataMap as m, RootDataWithoutProps as n, RootData as o, ItemWithId as p, ArrayState as q, BaseField as r, TextareaField as s, RadioField as t, ArrayField as u, Adaptor as v, ExternalFieldWithAdaptor as w, ExternalField as x, CustomField as y, Fields as z };

package/dist/{Config-CkVFT1_w.d.ts → Config-RpUGTBxI.d.ts}

@@ -128,7 +128,7 @@ type Field<Props extends any = any> = TextField | NumberField | TextareaField |
     [key: string]: any;
 } ? Props : any> | CustomField<Props>;
 type Fields<ComponentProps extends DefaultComponentProps = DefaultComponentProps> = {
-    [PropName in keyof Omit<Required<ComponentProps>, "children" | "editMode">]: Field<ComponentProps[PropName]>;
+    [PropName in keyof Omit<ComponentProps, "editMode">]: Field<ComponentProps[PropName]>;
 };
 type FieldProps<ValueType = any, F = Field<any>> = {
     field: F;
@@ -138,54 +138,60 @@ type FieldProps<ValueType = any, F = Field<any>> = {
     readOnly?: boolean;
 };
 
-type WithPuckProps<Props> = Props & {
+type WithId<Props> = Props & {
     id: string;
 };
-type DefaultRootProps = {
+type WithPuckProps<Props> = Props & {
+    puck: PuckContext;
+    editMode?: boolean;
+};
+type AsFieldProps<Props> = Omit<Props, "children" | "puck" | "editMode">;
+type WithChildren<Props> = Props & {
+    children: ReactNode;
+};
+type DefaultRootFieldProps = {
     title?: string;
-    [key: string]: any;
 };
+type DefaultRootRenderProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = WithPuckProps<WithChildren<Props>>;
+type DefaultRootProps = DefaultRootRenderProps;
 type DefaultComponentProps = {
     [key: string]: any;
-    editMode?: boolean;
 };
-type Content<Props extends {
+type Content<PropsMap extends {
     [key: string]: any;
 } = {
     [key: string]: any;
-}> = ComponentData<Props>[];
-type PuckComponent<Props> = (props: WithPuckProps<Props & {
-    puck: PuckContext;
-}>) => JSX.Element;
+}> = ComponentDataMap<PropsMap>[];
+type PuckComponent<Props> = (props: WithId<WithPuckProps<Props>>) => JSX.Element;
 type PuckContext = {
     renderDropZone: React.FC<DropZoneProps>;
     isEditing: boolean;
 };
-type ComponentConfig<ComponentProps extends DefaultComponentProps = DefaultComponentProps, DefaultProps = ComponentProps, DataShape = Omit<ComponentData<ComponentProps>, "type">> = {
-    render: PuckComponent<ComponentProps>;
+type ComponentConfig<RenderProps extends DefaultComponentProps = DefaultComponentProps, FieldProps extends DefaultComponentProps = RenderProps, DataShape = Omit<ComponentData<FieldProps>, "type">> = {
+    render: PuckComponent<RenderProps>;
     label?: string;
-    defaultProps?: DefaultProps;
-    fields?: Fields<ComponentProps>;
+    defaultProps?: FieldProps;
+    fields?: Fields<FieldProps>;
     permissions?: Partial<Permissions>;
     resolveFields?: (data: DataShape, params: {
-        changed: Partial<Record<keyof ComponentProps, boolean>>;
-        fields: Fields<ComponentProps>;
-        lastFields: Fields<ComponentProps>;
+        changed: Partial<Record<keyof FieldProps, boolean>>;
+        fields: Fields<FieldProps>;
+        lastFields: Fields<FieldProps>;
         lastData: DataShape;
         appState: AppState;
-    }) => Promise<Fields<ComponentProps>> | Fields<ComponentProps>;
+    }) => Promise<Fields<FieldProps>> | Fields<FieldProps>;
     resolveData?: (data: DataShape, params: {
-        changed: Partial<Record<keyof ComponentProps, boolean>>;
+        changed: Partial<Record<keyof FieldProps, boolean>>;
         lastData: DataShape;
     }) => Promise<{
-        props?: Partial<ComponentProps>;
-        readOnly?: Partial<Record<keyof ComponentProps, boolean>>;
+        props?: Partial<FieldProps>;
+        readOnly?: Partial<Record<keyof FieldProps, boolean>>;
     }> | {
-        props?: Partial<ComponentProps>;
-        readOnly?: Partial<Record<keyof ComponentProps, boolean>>;
+        props?: Partial<FieldProps>;
+        readOnly?: Partial<Record<keyof FieldProps, boolean>>;
     };
     resolvePermissions?: (data: DataShape, params: {
-        changed: Partial<Record<keyof ComponentProps, boolean>>;
+        changed: Partial<Record<keyof FieldProps, boolean>>;
         lastPermissions: Partial<Permissions> | undefined;
         initialPermissions: Partial<Permissions>;
         appState: AppState;
@@ -197,19 +203,17 @@ type Category<ComponentName> = {
     visible?: boolean;
     defaultExpanded?: boolean;
 };
-type Config<Props extends Record<string, any> = Record<string, any>, RootProps extends DefaultRootProps = DefaultRootProps, CategoryName extends string = string> = {
+type Config<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = any, CategoryName extends string = string> = {
     categories?: Record<CategoryName, Category<keyof Props>> & {
         other?: Category<keyof Props>;
     };
     components: {
         [ComponentName in keyof Props]: Omit<ComponentConfig<Props[ComponentName], Props[ComponentName]>, "type">;
     };
-    root?: Partial<ComponentConfig<RootProps & {
-        children?: ReactNode;
-    }, Partial<RootProps & {
-        children?: ReactNode;
-    }>, RootData>>;
+    root?: Partial<ComponentConfig<DefaultRootRenderProps<RootProps>, AsFieldProps<RootProps>, RootData>>;
 };
+type ExtractPropsFromConfig<UserConfig> = UserConfig extends Config<infer P, any, any> ? P : never;
+type ExtractRootPropsFromConfig<UserConfig> = UserConfig extends Config<any, infer P, any> ? P : never;
 type BaseData<Props extends {
     [key: string]: any;
 } = {
@@ -217,20 +221,23 @@ type BaseData<Props extends {
 }> = {
     readOnly?: Partial<Record<keyof Props, boolean>>;
 };
-type ComponentData<Props extends DefaultComponentProps = DefaultComponentProps> = {
-    type: keyof Props;
-    props: WithPuckProps<Props>;
+type ComponentData<Props extends DefaultComponentProps = DefaultComponentProps, Name = string> = {
+    type: Name;
+    props: WithId<Props>;
 } & BaseData<Props>;
-type RootDataWithProps<Props extends DefaultRootProps = DefaultRootProps> = BaseData<Props> & {
+type ComponentDataMap<Props extends Record<string, DefaultComponentProps> = DefaultComponentProps> = {
+    [K in keyof Props]: ComponentData<Props[K], K extends string ? K : never>;
+}[keyof Props];
+type RootDataWithProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = BaseData<Props> & {
     props: Props;
 };
-type RootDataWithoutProps<Props extends DefaultRootProps = DefaultRootProps> = Props;
-type RootData<Props extends DefaultRootProps = DefaultRootProps> = Partial<RootDataWithProps<Props>> & Partial<RootDataWithoutProps<Props>>;
+type RootDataWithoutProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = Props;
+type RootData<Props extends DefaultComponentProps = DefaultRootFieldProps> = Partial<RootDataWithProps<AsFieldProps<Props>>> & Partial<RootDataWithoutProps<Props>>;
 type MappedItem = ComponentData;
-type Data<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultRootProps = DefaultRootProps> = {
+type Data<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = {
     root: RootData<RootProps>;
-    content: Content<WithPuckProps<Props>>;
-    zones?: Record<string, Content<WithPuckProps<Props>>>;
+    content: Content<Props>;
+    zones?: Record<string, Content<Props>>;
 };
 type ItemWithId = {
     _arrayId: string;
@@ -261,8 +268,8 @@ type UiState = {
         options: Viewport[];
     };
 };
-type AppState = {
-    data: Data;
+type AppState<UserData extends Data = Data> = {
+    data: UserData;
     ui: UiState;
 };
 type Permissions = {
@@ -273,4 +280,4 @@ type Permissions = {
     insert: boolean;
 } & Record<string, boolean>;
 
-export type { AppState as A, BaseData as B, Config as C, Data as D, ExternalFieldWithAdaptor as E, Field as F, ItemSelector as I, MappedItem as M, NumberField as N, ObjectField as O, Permissions as P, RootData as R, SelectField as S, TextField as T, UiState as U, Viewports as V, FieldProps as a, DropZoneProps as b, DefaultComponentProps as c, DefaultRootProps as d, RootDataWithProps as e, ComponentData as f, Content as g, PuckComponent as h, PuckContext as i, ComponentConfig as j, RootDataWithoutProps as k, ItemWithId as l, ArrayState as m, BaseField as n, TextareaField as o, RadioField as p, ArrayField as q, Adaptor as r, ExternalField as s, CustomField as t, Fields as u };
+export type { AppState as A, BaseData as B, Config as C, Data as D, ExtractPropsFromConfig as E, Field as F, ItemSelector as I, MappedItem as M, NumberField as N, ObjectField as O, Permissions as P, RootDataWithProps as R, SelectField as S, TextField as T, UiState as U, Viewports as V, FieldProps as a, DropZoneProps as b, ExtractRootPropsFromConfig as c, DefaultComponentProps as d, DefaultRootFieldProps as e, ComponentData as f, DefaultRootRenderProps as g, DefaultRootProps as h, Content as i, PuckComponent as j, PuckContext as k, ComponentConfig as l, ComponentDataMap as m, RootDataWithoutProps as n, RootData as o, ItemWithId as p, ArrayState as q, BaseField as r, TextareaField as s, RadioField as t, ArrayField as u, Adaptor as v, ExternalFieldWithAdaptor as w, ExternalField as x, CustomField as y, Fields as z };

package/dist/{chunk-TM7CT64S.mjs → chunk-7CYJT5DS.mjs}

@@ -90,12 +90,16 @@ var rootDroppableId = "default-zone";
 
 // lib/setup-zone.ts
 init_react_import();
+function ensureZones(data) {
+  return __spreadProps(__spreadValues({}, data), {
+    zones: data.zones || {}
+  });
+}
 var setupZone = (data, zoneKey) => {
   if (zoneKey === rootDroppableId) {
     return data;
   }
-  const newData = __spreadValues({}, data);
-  newData.zones = data.zones || {};
+  const newData = ensureZones(data);
   newData.zones[zoneKey] = newData.zones[zoneKey] || [];
   return newData;
 };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { U as UiState, D as Data, A as AppState, I as ItemSelector, F as Field, a as FieldProps, C as Config, b as DropZoneProps, P as Permissions, V as Viewports, c as DefaultComponentProps, d as DefaultRootProps, M as MappedItem, R as RootData, e as RootDataWithProps, f as ComponentData } from './Config-CkVFT1_w.mjs';
-export { r as Adaptor, q as ArrayField, m as ArrayState, B as BaseData, n as BaseField, j as ComponentConfig, g as Content, t as CustomField, s as ExternalField, E as ExternalFieldWithAdaptor, u as Fields, l as ItemWithId, N as NumberField, O as ObjectField, h as PuckComponent, i as PuckContext, p as RadioField, k as RootDataWithoutProps, S as SelectField, T as TextField, o as TextareaField } from './Config-CkVFT1_w.mjs';
+import { U as UiState, D as Data, A as AppState, I as ItemSelector, F as Field, a as FieldProps, C as Config, b as DropZoneProps, E as ExtractPropsFromConfig, c as ExtractRootPropsFromConfig, P as Permissions, V as Viewports, d as DefaultComponentProps, e as DefaultRootFieldProps, f as ComponentData } from './Config-RpUGTBxI.mjs';
+export { v as Adaptor, u as ArrayField, q as ArrayState, B as BaseData, r as BaseField, l as ComponentConfig, m as ComponentDataMap, i as Content, y as CustomField, h as DefaultRootProps, g as DefaultRootRenderProps, x as ExternalField, w as ExternalFieldWithAdaptor, z as Fields, p as ItemWithId, M as MappedItem, N as NumberField, O as ObjectField, j as PuckComponent, k as PuckContext, t as RadioField, o as RootData, R as RootDataWithProps, n as RootDataWithoutProps, S as SelectField, T as TextField, s as TextareaField } from './Config-RpUGTBxI.mjs';
 import * as react from 'react';
 import { ReactNode, ReactElement, SyntheticEvent, CSSProperties } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
@@ -49,9 +49,9 @@ type SetDataAction = {
     type: "setData";
     data: Partial<Data> | ((previous: Data) => Partial<Data>);
 };
-type SetAction = {
+type SetAction<UserData extends Data = Data> = {
     type: "set";
-    state: Partial<AppState> | ((previous: AppState) => Partial<AppState>);
+    state: Partial<AppState<UserData>> | ((previous: AppState<UserData>) => Partial<AppState<UserData>>);
 };
 type RegisterZoneAction = {
     type: "registerZone";
@@ -234,7 +234,7 @@ type HistoryStore<D = any> = {
     setHistoryIndex: (index: number) => void;
 };
 
-type OnAction = (action: PuckAction, appState: AppState, prevAppState: AppState) => void;
+type OnAction<UserData extends Data = Data> = (action: PuckAction, appState: AppState<UserData>, prevAppState: AppState<UserData>) => void;
 
 type PathData = Record<string, {
     path: string[];
@@ -292,24 +292,24 @@ type IframeConfig = {
     enabled?: boolean;
 };
 
-declare function Puck<UserConfig extends Config = Config>({ children, config, data: initialData, ui: initialUi, onChange, onPublish, onAction, permissions, plugins, overrides, renderHeader, renderHeaderActions, headerTitle, headerPath, viewports, iframe, dnd, initialHistory, }: {
+declare function Puck<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> = Data<UserProps, UserRootProps>>({ children, config, data: initialData, ui: initialUi, onChange, onPublish, onAction, permissions, plugins, overrides, renderHeader, renderHeaderActions, headerTitle, headerPath, viewports, iframe, dnd, initialHistory, }: {
     children?: ReactNode;
     config: UserConfig;
-    data: Partial<Data>;
+    data: Partial<UserData>;
     ui?: Partial<UiState>;
-    onChange?: (data: Data) => void;
-    onPublish?: (data: Data) => void;
-    onAction?: OnAction;
+    onChange?: (data: UserData) => void;
+    onPublish?: (data: UserData) => void;
+    onAction?: OnAction<UserData>;
     permissions?: Partial<Permissions>;
     plugins?: Plugin[];
     overrides?: Partial<Overrides>;
     renderHeader?: (props: {
         children: ReactNode;
         dispatch: (action: PuckAction) => void;
-        state: AppState;
+        state: AppState<UserData>;
     }) => ReactElement;
     renderHeaderActions?: (props: {
-        state: AppState;
+        state: AppState<UserData>;
         dispatch: (action: PuckAction) => void;
     }) => ReactElement;
     headerTitle?: string;
@@ -333,14 +333,14 @@ declare namespace Puck {
     }) => react_jsx_runtime.JSX.Element;
 }
 
-declare function Render<UserConfig extends Config = Config>({ config, data, }: {
+declare function Render<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> = Data<UserProps, UserRootProps>>({ config, data }: {
     config: UserConfig;
-    data: Partial<Data>;
+    data: Partial<UserData>;
 }): react_jsx_runtime.JSX.Element;
 
 declare function migrate(data: Data): Data;
 
-type PropTransform<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultRootProps = DefaultRootProps> = Partial<{
+type PropTransform<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = Partial<{
     [ComponentName in keyof Props]: (props: Props[ComponentName] & {
         [key: string]: any;
     }) => Props[ComponentName];
@@ -349,13 +349,9 @@ type PropTransform<Props extends DefaultComponentProps = DefaultComponentProps,
         [key: string]: any;
     }) => RootProps;
 }>;
-declare function transformProps<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultComponentProps>(data: Partial<Data>, propTransforms: PropTransform<Props, RootProps>): Data;
+declare function transformProps<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps>(data: Partial<Data>, propTransforms: PropTransform<Props, RootProps>): Data;
 
-declare function resolveAllData(data: Partial<Data>, config: Config, onResolveStart?: (item: MappedItem) => void, onResolveEnd?: (item: MappedItem) => void): Promise<{
-    root: RootData<DefaultRootProps> | RootDataWithProps;
-    content: any;
-    zones: Record<string, MappedItem[]>;
-}>;
+declare function resolveAllData<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends Record<string, any> = DefaultRootFieldProps>(data: Partial<Data>, config: Config, onResolveStart?: (item: ComponentData) => void, onResolveEnd?: (item: ComponentData) => void): Promise<Data<Props, RootProps>>;
 
 declare const usePuck: () => {
     appState: AppState;
@@ -383,9 +379,7 @@ declare const usePuck: () => {
         index: number;
         historyStore: HistoryStore | undefined;
     };
-    selectedItem: ComponentData<DefaultComponentProps & {
-        id: string;
-    }> | null;
+    selectedItem: ComponentData<any, string> | null;
 };
 
-export { Action, ActionBar, AppState, AutoField, AutoFieldPrivate, Button, ComponentData, Config, Data, DefaultComponentProps, DefaultRootProps, Drawer, DropZone, DropZoneProvider, Field, FieldLabel, FieldLabelInternal, FieldProps, type FieldPropsInternal, type History, IconButton, MappedItem, Permissions, type Plugin, Puck, type PuckAction, Render, RootData, RootDataWithProps, UiState, dropZoneContext, migrate, resolveAllData, transformProps, usePuck };
+export { Action, ActionBar, AppState, AutoField, AutoFieldPrivate, Button, ComponentData, Config, Data, DefaultComponentProps, DefaultRootFieldProps, Drawer, DropZone, DropZoneProvider, ExtractPropsFromConfig, ExtractRootPropsFromConfig, Field, FieldLabel, FieldLabelInternal, FieldProps, type FieldPropsInternal, type History, IconButton, Permissions, type Plugin, Puck, type PuckAction, Render, UiState, dropZoneContext, migrate, resolveAllData, transformProps, usePuck };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { U as UiState, D as Data, A as AppState, I as ItemSelector, F as Field, a as FieldProps, C as Config, b as DropZoneProps, P as Permissions, V as Viewports, c as DefaultComponentProps, d as DefaultRootProps, M as MappedItem, R as RootData, e as RootDataWithProps, f as ComponentData } from './Config-CkVFT1_w.js';
-export { r as Adaptor, q as ArrayField, m as ArrayState, B as BaseData, n as BaseField, j as ComponentConfig, g as Content, t as CustomField, s as ExternalField, E as ExternalFieldWithAdaptor, u as Fields, l as ItemWithId, N as NumberField, O as ObjectField, h as PuckComponent, i as PuckContext, p as RadioField, k as RootDataWithoutProps, S as SelectField, T as TextField, o as TextareaField } from './Config-CkVFT1_w.js';
+import { U as UiState, D as Data, A as AppState, I as ItemSelector, F as Field, a as FieldProps, C as Config, b as DropZoneProps, E as ExtractPropsFromConfig, c as ExtractRootPropsFromConfig, P as Permissions, V as Viewports, d as DefaultComponentProps, e as DefaultRootFieldProps, f as ComponentData } from './Config-RpUGTBxI.js';
+export { v as Adaptor, u as ArrayField, q as ArrayState, B as BaseData, r as BaseField, l as ComponentConfig, m as ComponentDataMap, i as Content, y as CustomField, h as DefaultRootProps, g as DefaultRootRenderProps, x as ExternalField, w as ExternalFieldWithAdaptor, z as Fields, p as ItemWithId, M as MappedItem, N as NumberField, O as ObjectField, j as PuckComponent, k as PuckContext, t as RadioField, o as RootData, R as RootDataWithProps, n as RootDataWithoutProps, S as SelectField, T as TextField, s as TextareaField } from './Config-RpUGTBxI.js';
 import * as react from 'react';
 import { ReactNode, ReactElement, SyntheticEvent, CSSProperties } from 'react';
 import * as react_jsx_runtime from 'react/jsx-runtime';
@@ -49,9 +49,9 @@ type SetDataAction = {
     type: "setData";
     data: Partial<Data> | ((previous: Data) => Partial<Data>);
 };
-type SetAction = {
+type SetAction<UserData extends Data = Data> = {
     type: "set";
-    state: Partial<AppState> | ((previous: AppState) => Partial<AppState>);
+    state: Partial<AppState<UserData>> | ((previous: AppState<UserData>) => Partial<AppState<UserData>>);
 };
 type RegisterZoneAction = {
     type: "registerZone";
@@ -234,7 +234,7 @@ type HistoryStore<D = any> = {
     setHistoryIndex: (index: number) => void;
 };
 
-type OnAction = (action: PuckAction, appState: AppState, prevAppState: AppState) => void;
+type OnAction<UserData extends Data = Data> = (action: PuckAction, appState: AppState<UserData>, prevAppState: AppState<UserData>) => void;
 
 type PathData = Record<string, {
     path: string[];
@@ -292,24 +292,24 @@ type IframeConfig = {
     enabled?: boolean;
 };
 
-declare function Puck<UserConfig extends Config = Config>({ children, config, data: initialData, ui: initialUi, onChange, onPublish, onAction, permissions, plugins, overrides, renderHeader, renderHeaderActions, headerTitle, headerPath, viewports, iframe, dnd, initialHistory, }: {
+declare function Puck<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> = Data<UserProps, UserRootProps>>({ children, config, data: initialData, ui: initialUi, onChange, onPublish, onAction, permissions, plugins, overrides, renderHeader, renderHeaderActions, headerTitle, headerPath, viewports, iframe, dnd, initialHistory, }: {
     children?: ReactNode;
     config: UserConfig;
-    data: Partial<Data>;
+    data: Partial<UserData>;
     ui?: Partial<UiState>;
-    onChange?: (data: Data) => void;
-    onPublish?: (data: Data) => void;
-    onAction?: OnAction;
+    onChange?: (data: UserData) => void;
+    onPublish?: (data: UserData) => void;
+    onAction?: OnAction<UserData>;
     permissions?: Partial<Permissions>;
     plugins?: Plugin[];
     overrides?: Partial<Overrides>;
     renderHeader?: (props: {
         children: ReactNode;
         dispatch: (action: PuckAction) => void;
-        state: AppState;
+        state: AppState<UserData>;
     }) => ReactElement;
     renderHeaderActions?: (props: {
-        state: AppState;
+        state: AppState<UserData>;
         dispatch: (action: PuckAction) => void;
     }) => ReactElement;
     headerTitle?: string;
@@ -333,14 +333,14 @@ declare namespace Puck {
     }) => react_jsx_runtime.JSX.Element;
 }
 
-declare function Render<UserConfig extends Config = Config>({ config, data, }: {
+declare function Render<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> = Data<UserProps, UserRootProps>>({ config, data }: {
     config: UserConfig;
-    data: Partial<Data>;
+    data: Partial<UserData>;
 }): react_jsx_runtime.JSX.Element;
 
 declare function migrate(data: Data): Data;
 
-type PropTransform<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultRootProps = DefaultRootProps> = Partial<{
+type PropTransform<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = Partial<{
     [ComponentName in keyof Props]: (props: Props[ComponentName] & {
         [key: string]: any;
     }) => Props[ComponentName];
@@ -349,13 +349,9 @@ type PropTransform<Props extends DefaultComponentProps = DefaultComponentProps,
         [key: string]: any;
     }) => RootProps;
 }>;
-declare function transformProps<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultComponentProps>(data: Partial<Data>, propTransforms: PropTransform<Props, RootProps>): Data;
+declare function transformProps<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps>(data: Partial<Data>, propTransforms: PropTransform<Props, RootProps>): Data;
 
-declare function resolveAllData(data: Partial<Data>, config: Config, onResolveStart?: (item: MappedItem) => void, onResolveEnd?: (item: MappedItem) => void): Promise<{
-    root: RootData<DefaultRootProps> | RootDataWithProps;
-    content: any;
-    zones: Record<string, MappedItem[]>;
-}>;
+declare function resolveAllData<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends Record<string, any> = DefaultRootFieldProps>(data: Partial<Data>, config: Config, onResolveStart?: (item: ComponentData) => void, onResolveEnd?: (item: ComponentData) => void): Promise<Data<Props, RootProps>>;
 
 declare const usePuck: () => {
     appState: AppState;
@@ -383,9 +379,7 @@ declare const usePuck: () => {
         index: number;
         historyStore: HistoryStore | undefined;
     };
-    selectedItem: ComponentData<DefaultComponentProps & {
-        id: string;
-    }> | null;
+    selectedItem: ComponentData<any, string> | null;
 };
 
-export { Action, ActionBar, AppState, AutoField, AutoFieldPrivate, Button, ComponentData, Config, Data, DefaultComponentProps, DefaultRootProps, Drawer, DropZone, DropZoneProvider, Field, FieldLabel, FieldLabelInternal, FieldProps, type FieldPropsInternal, type History, IconButton, MappedItem, Permissions, type Plugin, Puck, type PuckAction, Render, RootData, RootDataWithProps, UiState, dropZoneContext, migrate, resolveAllData, transformProps, usePuck };
+export { Action, ActionBar, AppState, AutoField, AutoFieldPrivate, Button, ComponentData, Config, Data, DefaultComponentProps, DefaultRootFieldProps, Drawer, DropZone, DropZoneProvider, ExtractPropsFromConfig, ExtractRootPropsFromConfig, Field, FieldLabel, FieldLabelInternal, FieldProps, type FieldPropsInternal, type History, IconButton, Permissions, type Plugin, Puck, type PuckAction, Render, UiState, dropZoneContext, migrate, resolveAllData, transformProps, usePuck };