@measured/puck 0.20.0-canary.f73c8fa0 → 0.20.0

package/dist/no-external.mjs

@@ -11,23 +11,21 @@ import {
   Label,
   Puck,
   Render,
-  blocksPlugin,
   createUsePuck,
-  outlinePlugin,
   overrideKeys,
   registerOverlayPortal,
   renderContext,
   setDeep,
   useGetPuck,
   usePuck
-} from "./chunk-UBWXLOVR.mjs";
+} from "./chunk-DCZ7BU3G.mjs";
 import {
   init_react_import,
   migrate,
   resolveAllData,
   transformProps,
   walkTree
-} from "./chunk-BNXRZWNI.mjs";
+} from "./chunk-NFK5JVZW.mjs";
 
 // bundle/no-external.ts
 init_react_import();
@@ -44,10 +42,8 @@ export {
   Label,
   Puck,
   Render,
-  blocksPlugin,
   createUsePuck,
   migrate,
-  outlinePlugin,
   overrideKeys,
   registerOverlayPortal,
   renderContext,

package/dist/rsc.d.mts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { C as Config, U as UserGenerics, M as Metadata } from './walk-tree-Dn5XpDNA.mjs';
-export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-Dn5XpDNA.mjs';
+import { C as Config, U as UserGenerics, M as Metadata } from './walk-tree-CiAkCQEp.mjs';
+export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-CiAkCQEp.mjs';
 import 'react';
 
 declare function Render<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>({ config, data, metadata, }: {

package/dist/rsc.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { C as Config, U as UserGenerics, M as Metadata } from './walk-tree-Dn5XpDNA.js';
-export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-Dn5XpDNA.js';
+import { C as Config, U as UserGenerics, M as Metadata } from './walk-tree-CiAkCQEp.js';
+export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-CiAkCQEp.js';
 import 'react';
 
 declare function Render<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>({ config, data, metadata, }: {

package/dist/rsc.js

@@ -340,7 +340,6 @@ var Item = ({
     Component.render,
     __spreadProps(__spreadValues({}, props), {
       puck: __spreadProps(__spreadValues({}, props.puck), {
-        renderDropZone: DropZoneRender,
         metadata: metadata || {}
       })
     })
@@ -694,8 +693,7 @@ var defaultAppState = {
       options: [],
       controlsVisible: true
     },
-    field: { focus: null },
-    plugin: { current: null }
+    field: { focus: null }
   },
   indexes: {
     nodes: {},

package/dist/rsc.mjs

@@ -1,14 +1,117 @@
 import {
-  Render,
+  SlotRenderPure,
+  __spreadProps,
+  __spreadValues,
   init_react_import,
   migrate,
   resolveAllData,
+  rootAreaId,
+  rootDroppableId,
+  rootZone,
+  setupZone,
   transformProps,
+  useSlots,
   walkTree
-} from "./chunk-BNXRZWNI.mjs";
+} from "./chunk-NFK5JVZW.mjs";
 
 // bundle/rsc.tsx
 init_react_import();
+
+// components/ServerRender/index.tsx
+init_react_import();
+import { Fragment, jsx } from "react/jsx-runtime";
+function DropZoneRender({
+  zone,
+  data,
+  areaId = "root",
+  config,
+  metadata = {}
+}) {
+  let zoneCompound = rootDroppableId;
+  let content = (data == null ? void 0 : data.content) || [];
+  if (!data || !config) {
+    return null;
+  }
+  if (areaId !== rootAreaId && zone !== rootZone) {
+    zoneCompound = `${areaId}:${zone}`;
+    content = setupZone(data, zoneCompound).zones[zoneCompound];
+  }
+  return /* @__PURE__ */ jsx(Fragment, { children: content.map((item) => {
+    const Component = config.components[item.type];
+    const props = __spreadProps(__spreadValues({}, item.props), {
+      puck: {
+        renderDropZone: ({ zone: zone2 }) => /* @__PURE__ */ jsx(
+          DropZoneRender,
+          {
+            zone: zone2,
+            data,
+            areaId: item.props.id,
+            config,
+            metadata
+          }
+        ),
+        metadata,
+        dragRef: null,
+        isEditing: false
+      }
+    });
+    const renderItem = __spreadProps(__spreadValues({}, item), { props });
+    const propsWithSlots = useSlots(config, renderItem, (props2) => /* @__PURE__ */ jsx(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+    if (Component) {
+      return /* @__PURE__ */ jsx(Component.render, __spreadValues({}, propsWithSlots), renderItem.props.id);
+    }
+    return null;
+  }) });
+}
+function Render({
+  config,
+  data,
+  metadata = {}
+}) {
+  var _a;
+  const rootProps = "props" in data.root ? data.root.props : data.root;
+  const title = rootProps.title || "";
+  const props = __spreadProps(__spreadValues({}, rootProps), {
+    puck: {
+      renderDropZone: ({ zone }) => /* @__PURE__ */ jsx(
+        DropZoneRender,
+        {
+          zone,
+          data,
+          config,
+          metadata
+        }
+      ),
+      isEditing: false,
+      dragRef: null,
+      metadata
+    },
+    title,
+    editMode: false,
+    id: "puck-root"
+  });
+  const propsWithSlots = useSlots(config, { type: "root", props }, (props2) => /* @__PURE__ */ jsx(SlotRenderPure, __spreadProps(__spreadValues({}, props2), { config, metadata })));
+  if ((_a = config.root) == null ? void 0 : _a.render) {
+    return /* @__PURE__ */ jsx(config.root.render, __spreadProps(__spreadValues({}, propsWithSlots), { children: /* @__PURE__ */ jsx(
+      DropZoneRender,
+      {
+        config,
+        data,
+        zone: rootZone,
+        metadata
+      }
+    ) }));
+  }
+  return /* @__PURE__ */ jsx(
+    DropZoneRender,
+    {
+      config,
+      data,
+      zone: rootZone,
+      metadata
+    }
+  );
+}
 export {
   Render,
   migrate,

package/dist/{walk-tree-Dn5XpDNA.d.mts → walk-tree-CiAkCQEp.d.mts}

@@ -1,20 +1,10 @@
-import { CSSProperties, ReactElement, ReactNode, JSX } from 'react';
+import { ReactElement, CSSProperties, ReactNode, JSX } from 'react';
 
 type ItemSelector = {
     index: number;
     zone?: string;
 };
 
-type DropZoneProps = {
-    zone: string;
-    allow?: string[];
-    disallow?: string[];
-    style?: CSSProperties;
-    minEmptyHeight?: number;
-    className?: string;
-    collisionAxis?: DragAxis;
-};
-
 type FieldOption = {
     label: string;
     value: string | number | boolean | undefined | null | object;
@@ -51,26 +41,30 @@ type RadioField = BaseField & {
     type: "radio";
     options: FieldOptions;
 };
-type ArrayField<Props extends any = {
+type ArrayField<Props extends {
     [key: string]: any;
-}> = Props extends {
+}[] = {
     [key: string]: any;
-} ? BaseField & {
+}[], UserField extends {} = {}> = BaseField & {
     type: "array";
     arrayFields: {
-        [SubPropName in keyof Props[0]]: Field<Props[0][SubPropName]>;
+        [SubPropName in keyof Props[0]]: UserField extends {
+            type: PropertyKey;
+        } ? Field<Props[0][SubPropName], UserField> | UserField : Field<Props[0][SubPropName], UserField>;
     };
     defaultItemProps?: Props[0];
     getItemSummary?: (item: Props[0], index?: number) => string;
     max?: number;
     min?: number;
-} : never;
+};
 type ObjectField<Props extends any = {
     [key: string]: any;
-}> = BaseField & {
+}, UserField extends {} = {}> = BaseField & {
     type: "object";
     objectFields: {
-        [SubPropName in keyof Props]: Field<Props[SubPropName]>;
+        [SubPropName in keyof Props]: UserField extends {
+            type: PropertyKey;
+        } ? Field<Props[SubPropName]> | UserField : Field<Props[SubPropName]>;
     };
 };
 type Adaptor<AdaptorParams = {}, TableShape extends Record<string, any> = {}, PropShape = TableShape> = {
@@ -126,9 +120,13 @@ type SlotField = BaseField & {
     allow?: string[];
     disallow?: string[];
 };
-type Field<ValueType = any> = TextField | NumberField | TextareaField | SelectField | RadioField | ArrayField<ValueType> | ObjectField<ValueType> | ExternalField<ValueType> | ExternalFieldWithAdaptor<ValueType> | CustomField<ValueType> | SlotField;
-type Fields<ComponentProps extends DefaultComponentProps = DefaultComponentProps> = {
-    [PropName in keyof Omit<ComponentProps, "editMode">]: Field<ComponentProps[PropName]>;
+type Field<ValueType = any, UserField extends {} = {}> = TextField | NumberField | TextareaField | SelectField | RadioField | ArrayField<ValueType extends {
+    [key: string]: any;
+}[] ? ValueType : {}[], UserField> | ObjectField<ValueType, UserField> | ExternalField<ValueType> | ExternalFieldWithAdaptor<ValueType> | CustomField<ValueType> | SlotField;
+type Fields<ComponentProps extends DefaultComponentProps = DefaultComponentProps, UserField extends {} = {}> = {
+    [PropName in keyof Omit<ComponentProps, "editMode">]: UserField extends {
+        type: PropertyKey;
+    } ? Field<ComponentProps[PropName], UserField> | UserField : Field<ComponentProps[PropName]>;
 };
 type FieldProps<F = Field<any>, ValueType = any> = {
     field: F;
@@ -138,6 +136,59 @@ type FieldProps<F = Field<any>, ValueType = any> = {
     readOnly?: boolean;
 };
 
+type DropZoneProps = {
+    zone: string;
+    allow?: string[];
+    disallow?: string[];
+    style?: CSSProperties;
+    minEmptyHeight?: number;
+    className?: string;
+    collisionAxis?: DragAxis;
+};
+
+type PuckContext = {
+    renderDropZone: React.FC<DropZoneProps>;
+    metadata: Metadata;
+    isEditing: boolean;
+    dragRef: ((element: Element | null) => void) | null;
+};
+type DefaultRootFieldProps = {
+    title?: string;
+};
+type DefaultRootRenderProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = WithPuckProps<WithChildren<Props>>;
+type DefaultRootProps = DefaultRootRenderProps;
+type DefaultComponentProps = {
+    [key: string]: any;
+};
+
+type WithId<Props> = Props & {
+    id: string;
+};
+type WithPuckProps<Props> = Props & {
+    puck: PuckContext;
+    editMode?: boolean;
+};
+type AsFieldProps<Props> = Omit<Props, "children" | "puck" | "editMode">;
+type WithChildren<Props> = Props & {
+    children: ReactNode;
+};
+type UserGenerics<UserConfig extends Config = Config, UserParams extends ExtractConfigParams<UserConfig> = ExtractConfigParams<UserConfig>, UserData extends Data<UserParams["props"], UserParams["rootProps"]> | Data = Data<UserParams["props"], UserParams["rootProps"]>, UserAppState extends PrivateAppState<UserData> = PrivateAppState<UserData>, UserPublicAppState extends AppState<UserData> = AppState<UserData>, UserComponentData extends ComponentData = UserData["content"][0]> = {
+    UserConfig: UserConfig;
+    UserParams: UserParams;
+    UserProps: UserParams["props"];
+    UserRootProps: UserParams["rootProps"] & DefaultRootFieldProps;
+    UserData: UserData;
+    UserAppState: UserAppState;
+    UserPublicAppState: UserPublicAppState;
+    UserComponentData: UserComponentData;
+    UserField: UserParams["field"];
+};
+type ExtractField<UserField extends {
+    type: PropertyKey;
+}, T extends UserField["type"]> = Extract<UserField, {
+    type: T;
+}>;
+
 type SlotComponent = (props?: Omit<DropZoneProps, "zone">) => ReactNode;
 type PuckComponent<Props> = (props: WithId<WithPuckProps<{
     [K in keyof Props]: WithDeepSlots<Props[K], SlotComponent>;
@@ -146,11 +197,12 @@ type ResolveDataTrigger = "insert" | "replace" | "load" | "force";
 type WithPartialProps<T, Props extends DefaultComponentProps> = Omit<T, "props"> & {
     props?: Partial<Props>;
 };
-type ComponentConfig<RenderProps extends DefaultComponentProps = DefaultComponentProps, FieldProps extends DefaultComponentProps = RenderProps, DataShape = Omit<ComponentData<FieldProps>, "type">> = {
+type ComponentConfigInternal<RenderProps extends DefaultComponentProps, FieldProps extends DefaultComponentProps, DataShape = Omit<ComponentData<FieldProps>, "type">, // NB this doesn't include AllProps, so types will not contain deep slot types. To fix, we require a breaking change.
+UserField extends BaseField = {}> = {
     render: PuckComponent<RenderProps>;
     label?: string;
     defaultProps?: FieldProps;
-    fields?: Fields<FieldProps>;
+    fields?: Fields<FieldProps, UserField>;
     permissions?: Partial<Permissions>;
     inline?: boolean;
     resolveFields?: (data: DataShape, params: {
@@ -182,64 +234,36 @@ type ComponentConfig<RenderProps extends DefaultComponentProps = DefaultComponen
     }) => Promise<Partial<Permissions>> | Partial<Permissions>;
     metadata?: Metadata;
 };
-type RootConfig<RootProps extends DefaultComponentProps = any> = Partial<ComponentConfig<WithChildren<RootProps>, AsFieldProps<RootProps>, RootData<AsFieldProps<RootProps>>>>;
+type ComponentConfig<RenderPropsOrParams extends LeftOrExactRight<RenderPropsOrParams, DefaultComponentProps, ComponentConfigParams> = DefaultComponentProps, FieldProps extends DefaultComponentProps = RenderPropsOrParams extends {
+    props: any;
+} ? RenderPropsOrParams["props"] : RenderPropsOrParams, DataShape = Omit<ComponentData<FieldProps>, "type">> = RenderPropsOrParams extends ComponentConfigParams<infer ParamsRenderProps, never> ? ComponentConfigInternal<ParamsRenderProps, FieldProps, DataShape, {}> : RenderPropsOrParams extends ComponentConfigParams<infer ParamsRenderProps, infer ParamsFields> ? ComponentConfigInternal<ParamsRenderProps, FieldProps, DataShape, ParamsFields[keyof ParamsFields] & BaseField> : ComponentConfigInternal<RenderPropsOrParams, FieldProps, DataShape>;
+type RootConfigInternal<RootProps extends DefaultComponentProps = DefaultComponentProps, UserField extends BaseField = {}> = Partial<ComponentConfigInternal<WithChildren<RootProps>, AsFieldProps<RootProps>, RootData<AsFieldProps<RootProps>>, UserField>>;
+type RootConfig<RootPropsOrParams extends LeftOrExactRight<RootPropsOrParams, DefaultComponentProps, ComponentConfigParams> = DefaultComponentProps> = RootPropsOrParams extends ComponentConfigParams<infer Props, never> ? Partial<RootConfigInternal<WithChildren<Props>, {}>> : RootPropsOrParams extends ComponentConfigParams<infer Props, infer UserFields> ? Partial<RootConfigInternal<WithChildren<Props>, UserFields[keyof UserFields] & BaseField>> : Partial<RootConfigInternal<WithChildren<RootPropsOrParams>>>;
 type Category<ComponentName> = {
     components?: ComponentName[];
     title?: string;
     visible?: boolean;
     defaultExpanded?: boolean;
 };
-type Config<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = any, CategoryName extends string = string> = {
+type ConfigInternal<Props extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = DefaultComponentProps, CategoryName extends string = string, UserField extends {} = {}> = {
     categories?: Record<CategoryName, Category<keyof Props>> & {
         other?: Category<keyof Props>;
     };
     components: {
-        [ComponentName in keyof Props]: Omit<ComponentConfig<Props[ComponentName], Props[ComponentName]>, "type">;
+        [ComponentName in keyof Props]: Omit<ComponentConfigInternal<Props[ComponentName], Props[ComponentName], Omit<ComponentData<Props[ComponentName]>, "type">, UserField>, "type">;
     };
-    root?: RootConfig<RootProps>;
-};
-
-type WithId<Props> = Props & {
-    id: string;
-};
-type WithPuckProps<Props> = Props & {
-    puck: PuckContext;
-    editMode?: boolean;
-};
-type AsFieldProps<Props> = Omit<Props, "children" | "puck" | "editMode">;
-type WithChildren<Props> = Props & {
-    children: ReactNode;
-};
-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 UserGenerics<UserConfig extends Config = Config, UserProps extends ExtractPropsFromConfig<UserConfig> = ExtractPropsFromConfig<UserConfig>, UserRootProps extends ExtractRootPropsFromConfig<UserConfig> = ExtractRootPropsFromConfig<UserConfig>, UserData extends Data<UserProps, UserRootProps> | Data = Data<UserProps, UserRootProps>, UserAppState extends PrivateAppState<UserData> = PrivateAppState<UserData>, UserPublicAppState extends AppState<UserData> = AppState<UserData>, UserComponentData extends ComponentData = UserData["content"][0]> = {
-    UserConfig: UserConfig;
-    UserProps: UserProps;
-    UserRootProps: UserRootProps;
-    UserData: UserData;
-    UserAppState: UserAppState;
-    UserPublicAppState: UserPublicAppState;
-    UserComponentData: UserComponentData;
-};
-type ExtractField<T extends Field["type"]> = Extract<Field, {
-    type: T;
-}>;
-
-type PuckContext = {
-    renderDropZone: React.FC<DropZoneProps>;
-    metadata: Metadata;
-    isEditing: boolean;
-    dragRef: ((element: Element | null) => void) | null;
-};
-type DefaultRootFieldProps = {
-    [key: string]: any;
-    title?: string;
-};
-type DefaultRootRenderProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = WithPuckProps<WithChildren<Props>>;
-type DefaultRootProps = DefaultRootRenderProps;
-type DefaultComponentProps = {
-    [key: string]: any;
-};
+    root?: RootConfigInternal<RootProps, UserField>;
+};
+type DefaultComponents = Record<string, any>;
+type Config<PropsOrParams extends LeftOrExactRight<PropsOrParams, DefaultComponents, ConfigParams> = DefaultComponents | ConfigParams, RootProps extends DefaultComponentProps = DefaultComponentProps, CategoryName extends string = string> = PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, never> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number]> : PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, infer ParamFields> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number], ParamFields[keyof ParamFields] & BaseField> : PropsOrParams extends ConfigParams<infer ParamComponents, infer ParamRoot, infer ParamCategoryName, any> ? ConfigInternal<ParamComponents, ParamRoot, ParamCategoryName[number], {}> : ConfigInternal<PropsOrParams, RootProps, CategoryName>;
+type ExtractConfigParams<UserConfig extends ConfigInternal> = UserConfig extends ConfigInternal<infer PropsOrParams, infer RootProps, infer CategoryName, infer UserField> ? {
+    props: PropsOrParams;
+    rootProps: RootProps & DefaultRootFieldProps;
+    categoryNames: CategoryName;
+    field: UserField extends {
+        type: string;
+    } ? UserField : Field;
+} : never;
 
 type BaseData<Props extends {
     [key: string]: any;
@@ -253,9 +277,9 @@ type RootDataWithProps<Props extends DefaultComponentProps = DefaultRootFieldPro
 };
 type RootDataWithoutProps<Props extends DefaultComponentProps = DefaultRootFieldProps> = Props;
 type RootData<Props extends DefaultComponentProps = DefaultRootFieldProps> = Partial<RootDataWithProps<AsFieldProps<Props>>> & Partial<RootDataWithoutProps<Props>>;
-type ComponentData<Props extends DefaultComponentProps = DefaultComponentProps, Name = string, AllProps extends Record<string, DefaultComponentProps> = Record<string, DefaultComponentProps>> = {
+type ComponentData<Props extends DefaultComponentProps = DefaultComponentProps, Name = string, Components extends Record<string, DefaultComponentProps> = Record<string, DefaultComponentProps>> = {
     type: Name;
-    props: WithDeepSlots<WithId<Props>, Content<AllProps>>;
+    props: WithDeepSlots<WithId<Props>, Content<Components>>;
 } & BaseData<Props>;
 type ComponentDataOptionalId<Props extends DefaultComponentProps = DefaultComponentProps, Name = string> = {
     type: Name;
@@ -264,18 +288,18 @@ type ComponentDataOptionalId<Props extends DefaultComponentProps = DefaultCompon
     };
 } & BaseData<Props>;
 type MappedItem = ComponentData;
-type ComponentDataMap<AllProps extends DefaultAllProps = DefaultAllProps> = {
-    [K in keyof AllProps]: ComponentData<AllProps[K], K extends string ? K : never, AllProps>;
-}[keyof AllProps];
+type ComponentDataMap<Components extends DefaultComponents = DefaultComponents> = {
+    [K in keyof Components]: ComponentData<Components[K], K extends string ? K : never, Components>;
+}[keyof Components];
 type Content<PropsMap extends {
     [key: string]: DefaultComponentProps;
 } = {
     [key: string]: DefaultComponentProps;
 }> = ComponentDataMap<PropsMap>[];
-type Data<AllProps extends DefaultAllProps = DefaultAllProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = {
-    root: WithDeepSlots<RootData<RootProps>, Content<AllProps>>;
-    content: Content<AllProps>;
-    zones?: Record<string, Content<AllProps>>;
+type Data<Components extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = {
+    root: WithDeepSlots<RootData<RootProps>, Content<Components>>;
+    content: Content<Components>;
+    zones?: Record<string, Content<Components>>;
 };
 type Metadata = {
     [key: string]: any;
@@ -284,7 +308,6 @@ type Metadata = {
 type ItemWithId = {
     _arrayId: string;
     _originalIndex: number;
-    _currentIndex: number;
 };
 type ArrayState = {
     items: ItemWithId[];
@@ -316,9 +339,6 @@ type UiState = {
     field: {
         focus?: string | null;
     };
-    plugin: {
-        current: string | null;
-    };
 };
 type AppState<UserData extends Data = Data> = {
     data: UserData;
@@ -345,7 +365,6 @@ type PrivateAppState<UserData extends Data = Data> = AppState<UserData> & {
         zones: ZoneIndex;
     };
 };
-type DefaultAllProps = Record<string, DefaultComponentProps>;
 type BuiltinTypes = Date | RegExp | Error | Function | symbol | null | undefined;
 /**
  * Recursively walk T and replace Slots with SlotComponents
@@ -353,11 +372,26 @@ type BuiltinTypes = Date | RegExp | Error | Function | symbol | null | undefined
 type WithDeepSlots<T, SlotType = T> = T extends Slot ? SlotType : T extends (infer U)[] ? Array<WithDeepSlots<U, SlotType>> : T extends (infer U)[] ? WithDeepSlots<U, SlotType>[] : T extends BuiltinTypes ? T : T extends object ? {
     [K in keyof T]: WithDeepSlots<T[K], SlotType>;
 } : T;
-type RenderFunc<Props extends {
-    [key: string]: any;
-} = {
-    children: ReactNode;
-}> = (props: Props) => ReactElement;
+type ConfigParams<Components extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = DefaultComponentProps, CategoryNames extends string[] = string[], UserFields extends FieldsExtension = FieldsExtension> = {
+    components?: Components;
+    root?: RootProps;
+    categories?: CategoryNames;
+    fields?: AssertHasValue<UserFields>;
+};
+type FieldsExtension = {
+    [Type in string]: {
+        type: Type;
+    };
+};
+type ComponentConfigParams<Props extends DefaultComponentProps = DefaultComponentProps, UserFields extends FieldsExtension = never> = {
+    props: Props;
+    fields?: AssertHasValue<UserFields>;
+};
+type Exact<T, Target> = Record<Exclude<keyof T, keyof Target>, never>;
+type LeftOrExactRight<Union, Left, Right> = (Left & Union extends Right ? Exact<Union, Right> : Left) | (Right & Exact<Union, Right>);
+type AssertHasValue<T, True = T, False = never> = [keyof T] extends [
+    never
+] ? False : True;
 
 type MapFnParams<ThisField = Field> = {
     value: any;
@@ -371,18 +405,28 @@ type FieldTransformFnParams<T> = Omit<MapFnParams<T>, "parentId"> & {
     isReadOnly: boolean;
     componentId: string;
 };
-type FieldTransformFn<T = any> = (params: FieldTransformFnParams<T>) => any;
-type FieldTransforms = Partial<{
-    [FieldType in Field["type"]]: FieldTransformFn<ExtractField<FieldType>>;
+type FieldTransformFn<T> = (params: FieldTransformFnParams<T>) => any;
+type FieldTransforms<UserConfig extends Config = Config<{
+    fields: {};
+}>, // Setting fields: {} helps TS choose default field types
+G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>, UserField extends {
+    type: string;
+} = Field | G["UserField"]> = Partial<{
+    [Type in UserField["type"]]: FieldTransformFn<ExtractField<UserField, Type>>;
 }>;
 
+type RenderFunc<Props extends {
+    [key: string]: any;
+} = {
+    children: ReactNode;
+}> = (props: Props) => ReactElement;
 declare const overrideKeys: readonly ["header", "headerActions", "fields", "fieldLabel", "drawer", "drawerItem", "componentOverlay", "outline", "puck", "preview"];
 type OverrideKey = (typeof overrideKeys)[number];
 type OverridesGeneric<Shape extends {
     [key in OverrideKey]: any;
 }> = Shape;
-type Overrides = OverridesGeneric<{
-    fieldTypes: Partial<FieldRenderFunctions>;
+type Overrides<UserConfig extends Config = Config> = OverridesGeneric<{
+    fieldTypes: Partial<FieldRenderFunctions<UserConfig>>;
     header: RenderFunc<{
         actions: ReactNode;
         children: ReactNode;
@@ -433,19 +477,14 @@ type Overrides = OverridesGeneric<{
     }>;
     puck: RenderFunc;
 }>;
-type FieldRenderFunctions = Omit<{
-    [Type in Field["type"]]: React.FunctionComponent<FieldProps<Extract<Field, {
-        type: Type;
-    }>, any> & {
+type FieldRenderFunctions<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>, UserField extends {
+    type: string;
+} = Field | G["UserField"]> = Omit<{
+    [Type in UserField["type"]]: React.FunctionComponent<FieldProps<ExtractField<UserField, Type>, any> & {
         children: ReactNode;
         name: string;
     }>;
-}, "custom"> & {
-    [key: string]: React.FunctionComponent<FieldProps<any> & {
-        children: ReactNode;
-        name: string;
-    }>;
-};
+}, "custom">;
 
 type Direction = "left" | "right" | "up" | "down" | null;
 type DragAxis = "dynamic" | "y" | "x";
@@ -471,13 +510,9 @@ type IframeConfig = {
     waitForStyles?: boolean;
 };
 type OnAction<UserData extends Data = Data> = (action: PuckAction, appState: AppState<UserData>, prevAppState: AppState<UserData>) => void;
-type Plugin = {
-    name?: string;
-    label?: string;
-    icon?: ReactNode;
-    render?: () => ReactElement;
-    overrides?: Partial<Overrides>;
-    fieldTransforms?: FieldTransforms;
+type Plugin<UserConfig extends Config = Config> = {
+    overrides?: Partial<Overrides<UserConfig>>;
+    fieldTransforms?: FieldTransforms<UserConfig>;
 };
 type History<D = any> = {
     state: D;
@@ -501,7 +536,7 @@ type Slot<Props extends {
 }> = {
     [K in keyof Props]: ComponentDataOptionalId<Props[K], K extends string ? K : never>;
 }[keyof Props][];
-type WithSlotProps<Target extends Record<string, any>, AllProps extends DefaultAllProps = DefaultAllProps, SlotType extends Content<AllProps> = Content<AllProps>> = WithDeepSlots<Target, SlotType>;
+type WithSlotProps<Target extends Record<string, any>, Components extends DefaultComponents = DefaultComponents, SlotType extends Content<Components> = Content<Components>> = WithDeepSlots<Target, SlotType>;
 
 type InsertAction = {
     type: "insert";
@@ -576,18 +611,18 @@ type MigrationOptions<UserConfig extends Config> = {
 };
 declare function migrate<UserConfig extends Config = Config>(data: Data, config?: UserConfig, migrationOptions?: MigrationOptions<UserConfig>): Data;
 
-type PropTransform<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = Partial<{
-    [ComponentName in keyof Props]: (props: Props[ComponentName] & {
+type PropTransform<Components extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = DefaultRootFieldProps> = Partial<{
+    [ComponentName in keyof Components]: (props: Components[ComponentName] & {
         [key: string]: any;
-    }) => Props[ComponentName];
+    }) => Components[ComponentName];
 } & {
     root: (props: RootProps & {
         [key: string]: any;
     }) => RootProps;
 }>;
-declare function transformProps<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends DefaultComponentProps = DefaultRootFieldProps>(data: Partial<Data>, propTransforms: PropTransform<Props, RootProps>, config?: Config): Data;
+declare function transformProps<Components extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = DefaultRootFieldProps>(data: Partial<Data>, propTransforms: PropTransform<Components, RootProps>, config?: Config): Data;
 
-declare function resolveAllData<Props extends DefaultComponentProps = DefaultComponentProps, RootProps extends Record<string, any> = DefaultRootFieldProps>(data: Partial<Data>, config: Config, metadata?: Metadata, onResolveStart?: (item: ComponentData) => void, onResolveEnd?: (item: ComponentData) => void): Promise<Data<Props, RootProps>>;
+declare function resolveAllData<Components extends DefaultComponents = DefaultComponents, RootProps extends Record<string, any> = DefaultRootFieldProps>(data: Partial<Data>, config: Config, metadata?: Metadata, onResolveStart?: (item: ComponentData) => void, onResolveEnd?: (item: ComponentData) => void): Promise<Data<Components, RootProps>>;
 
 type WalkTreeOptions = {
     parentId: string;
@@ -595,4 +630,4 @@ type WalkTreeOptions = {
 };
 declare function walkTree<T extends ComponentData | RootData | G["UserData"], UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>(data: T, config: UserConfig, callbackFn: (data: Content, options: WalkTreeOptions) => Content | null | void): T;
 
-export { type NumberField as $, type AppState as A, type ArrayState as B, type Config as C, type DropZoneProps as D, type SlotComponent as E, type Fields as F, type PuckComponent as G, type History as H, type IframeConfig as I, type RootConfig as J, type BaseData as K, type RootDataWithoutProps as L, type Metadata as M, type RootData as N, type Overrides as O, type Permissions as P, type ComponentDataOptionalId as Q, type RootDataWithProps as R, type Slot as S, type MappedItem as T, type UserGenerics as U, type Viewports as V, type WithSlotProps as W, type ComponentDataMap as X, type Content as Y, type BaseField as Z, type TextField as _, type ComponentData as a, type TextareaField as a0, type SelectField as a1, type RadioField as a2, type ArrayField as a3, type ObjectField as a4, type Adaptor as a5, type ExternalFieldWithAdaptor as a6, type ExternalField as a7, type CustomFieldRender as a8, type CustomField as a9, type SlotField as aa, type PuckContext as ab, type DefaultRootFieldProps as ac, type DefaultRootRenderProps as ad, type DefaultRootProps as ae, type DefaultComponentProps as af, type WithId as ag, type WithPuckProps as ah, type AsFieldProps as ai, type WithChildren as aj, type ExtractPropsFromConfig as ak, type ExtractRootPropsFromConfig as al, type ExtractField as am, type PuckAction as b, type ResolveDataTrigger as c, type Plugin as d, type UiState as e, type ComponentConfig as f, type FieldTransforms as g, type Field as h, type FieldProps as i, type Data as j, type OnAction as k, type InitialHistory as l, migrate as m, type ItemSelector as n, type Direction as o, type DragAxis as p, type Viewport as q, resolveAllData as r, type FieldTransformFnParams as s, transformProps as t, type FieldTransformFn as u, overrideKeys as v, walkTree as w, type OverrideKey as x, type FieldRenderFunctions as y, type ItemWithId as z };
+export { type BaseField as $, type AppState as A, type ArrayState as B, type Config as C, type DropZoneProps as D, type SlotComponent as E, type Fields as F, type PuckComponent as G, type History as H, type IframeConfig as I, type RootConfig as J, type DefaultComponents as K, type ExtractConfigParams as L, type Metadata as M, type BaseData as N, type Overrides as O, type Permissions as P, type RootDataWithoutProps as Q, type RootDataWithProps as R, type Slot as S, type RootData as T, type UserGenerics as U, type Viewports as V, type WithSlotProps as W, type ComponentDataOptionalId as X, type MappedItem as Y, type ComponentDataMap as Z, type Content as _, type ComponentData as a, type TextField as a0, type NumberField as a1, type TextareaField as a2, type SelectField as a3, type RadioField as a4, type ArrayField as a5, type ObjectField as a6, type Adaptor as a7, type ExternalFieldWithAdaptor as a8, type ExternalField as a9, type CustomFieldRender as aa, type CustomField as ab, type SlotField as ac, type PuckContext as ad, type DefaultRootFieldProps as ae, type DefaultRootRenderProps as af, type DefaultRootProps as ag, type DefaultComponentProps as ah, type WithId as ai, type WithPuckProps as aj, type AsFieldProps as ak, type WithChildren as al, type ExtractField as am, type PuckAction as b, type ResolveDataTrigger as c, type Plugin as d, type UiState as e, type ComponentConfig as f, type FieldTransforms as g, type Field as h, type FieldProps as i, type Data as j, type OnAction as k, type InitialHistory as l, migrate as m, type ItemSelector as n, type Direction as o, type DragAxis as p, type Viewport as q, resolveAllData as r, type FieldTransformFnParams as s, transformProps as t, type FieldTransformFn as u, overrideKeys as v, walkTree as w, type OverrideKey as x, type FieldRenderFunctions as y, type ItemWithId as z };