@measured/puck 0.20.0-canary.755737e8 → 0.20.0-canary.f768aab9

package/dist/rsc.d.mts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-6PP75PCU.mjs';
-export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-6PP75PCU.mjs';
+import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-BOSl1o0G.mjs';
+export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-BOSl1o0G.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 { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-6PP75PCU.js';
-export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-6PP75PCU.js';
+import { a as Config, U as UserGenerics, M as Metadata } from './walk-tree-BOSl1o0G.js';
+export { af as migrate, ah as resolveAllData, ag as transformProps, w as walkTree } from './walk-tree-BOSl1o0G.js';
 import 'react';
 
 declare function Render<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>({ config, data, metadata, }: {

package/dist/rsc.js

@@ -816,8 +816,8 @@ var migrations = [
     return data;
   },
   // Migrate zones to slots
-  (data, config) => {
-    var _a;
+  (data, config, migrationOptions) => {
+    var _a, _b;
     if (!config) return data;
     console.log("Migrating DropZones to slots...");
     const updatedItems = {};
@@ -825,13 +825,13 @@ var migrations = [
     const { indexes } = walkAppState(appState, config);
     const deletedCompounds = [];
     walkAppState(appState, config, (content, zoneCompound, zoneType) => {
-      var _a2, _b, _c;
+      var _a2, _b2, _c;
       if (zoneType === "dropzone") {
         const [id, slotName] = zoneCompound.split(":");
         const nodeData = indexes.nodes[id].data;
         const componentType = nodeData.type;
         const configForComponent = id === "root" ? config.root : config.components[componentType];
-        if (((_b = (_a2 = configForComponent == null ? void 0 : configForComponent.fields) == null ? void 0 : _a2[slotName]) == null ? void 0 : _b.type) === "slot") {
+        if (((_b2 = (_a2 = configForComponent == null ? void 0 : configForComponent.fields) == null ? void 0 : _a2[slotName]) == null ? void 0 : _b2.type) === "slot") {
           updatedItems[id] = __spreadProps(__spreadValues({}, nodeData), {
             props: __spreadProps(__spreadValues(__spreadValues({}, nodeData.props), (_c = updatedItems[id]) == null ? void 0 : _c.props), {
               [slotName]: content
@@ -860,7 +860,49 @@ var migrations = [
       );
       (_a2 = updated.data.zones) == null ? true : delete _a2[zoneCompound];
     });
-    Object.keys((_a = updated.data.zones) != null ? _a : {}).forEach((zoneCompound) => {
+    if (migrationOptions == null ? void 0 : migrationOptions.migrateDynamicZonesForComponent) {
+      const unmigratedZonesGrouped = {};
+      Object.keys((_a = updated.data.zones) != null ? _a : {}).forEach((zoneCompound) => {
+        var _a2;
+        const [componentId, propName] = zoneCompound.split(":");
+        const content = (_a2 = updated.data.zones) == null ? void 0 : _a2[zoneCompound];
+        if (!content) {
+          return;
+        }
+        if (!unmigratedZonesGrouped[componentId]) {
+          unmigratedZonesGrouped[componentId] = {};
+        }
+        if (!unmigratedZonesGrouped[componentId][propName]) {
+          unmigratedZonesGrouped[componentId][propName] = content;
+        }
+      });
+      Object.keys(unmigratedZonesGrouped).forEach((componentId) => {
+        updated.data = walkTree(updated.data, config, (content) => {
+          return content.map((child) => {
+            var _a2;
+            if (child.props.id !== componentId) {
+              return child;
+            }
+            const migrateFn = (_a2 = migrationOptions == null ? void 0 : migrationOptions.migrateDynamicZonesForComponent) == null ? void 0 : _a2[child.type];
+            if (!migrateFn) {
+              return child;
+            }
+            const zones = unmigratedZonesGrouped[componentId];
+            const migratedProps = migrateFn(child.props, zones);
+            Object.keys(zones).forEach((propName) => {
+              var _a3;
+              const zoneCompound = `${componentId}:${propName}`;
+              console.log(`\u2713 Success: Migrated "${zoneCompound}" DropZone`);
+              (_a3 = updated.data.zones) == null ? true : delete _a3[zoneCompound];
+            });
+            return __spreadProps(__spreadValues({}, child), {
+              props: migratedProps
+            });
+          });
+        });
+      });
+    }
+    Object.keys((_b = updated.data.zones) != null ? _b : {}).forEach((zoneCompound) => {
       const [_, propName] = zoneCompound.split(":");
       throw new Error(
         `Could not migrate DropZone "${zoneCompound}" to slot field. No slot exists with the name "${propName}".`
@@ -870,9 +912,9 @@ var migrations = [
     return updated.data;
   }
 ];
-function migrate(data, config) {
+function migrate(data, config, migrationOptions) {
   return migrations == null ? void 0 : migrations.reduce(
-    (acc, migration) => migration(acc, config),
+    (acc, migration) => migration(acc, config, migrationOptions),
     data
   );
 }

package/dist/rsc.mjs

@@ -4,7 +4,7 @@ import {
   resolveAllData,
   transformProps,
   walkTree
-} from "./chunk-IM42S4YL.mjs";
+} from "./chunk-H6KSTNLT.mjs";
 export {
   Render,
   migrate,

package/dist/{walk-tree-6PP75PCU.d.mts → walk-tree-BOSl1o0G.d.mts}

@@ -49,11 +49,11 @@ type RadioField = BaseField & {
     type: "radio";
     options: FieldOptions;
 };
-type ArrayField<Props extends {
+type ArrayField<Props extends any = {
     [key: string]: any;
-} = {
+}> = Props extends {
     [key: string]: any;
-}> = BaseField & {
+} ? BaseField & {
     type: "array";
     arrayFields: {
         [SubPropName in keyof Props[0]]: Field<Props[0][SubPropName]>;
@@ -62,14 +62,12 @@ type ArrayField<Props extends {
     getItemSummary?: (item: Props[0], index?: number) => string;
     max?: number;
     min?: number;
-};
-type ObjectField<Props extends {
-    [key: string]: any;
-} = {
+} : never;
+type ObjectField<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "object";
-    objectFields: Props extends any[] ? never : {
+    objectFields: {
         [SubPropName in keyof Props]: Field<Props[SubPropName]>;
     };
 };
@@ -78,20 +76,17 @@ type Adaptor<AdaptorParams = {}, TableShape extends Record<string, any> = {}, Pr
     fetchList: (adaptorParams?: AdaptorParams) => Promise<TableShape[] | null>;
     mapProp?: (value: TableShape) => PropShape;
 };
-type ExternalFieldWithAdaptor<Props extends {
-    [key: string]: any;
-} = {
+type NotUndefined<T> = T extends undefined ? Record<string, any> : T;
+type ExternalFieldWithAdaptor<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "external";
     placeholder?: string;
     adaptor: Adaptor<any, any, Props>;
     adaptorParams?: object;
-    getItemSummary: (item: Props, index?: number) => string;
+    getItemSummary: (item: NotUndefined<Props>, index?: number) => string;
 };
-type ExternalField<Props extends {
-    [key: string]: any;
-} = {
+type ExternalField<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "external";
@@ -102,7 +97,7 @@ type ExternalField<Props extends {
     }) => Promise<any[] | null>;
     mapProp?: (value: any) => Props;
     mapRow?: (value: any) => Record<string, string | number | ReactElement>;
-    getItemSummary?: (item: Props, index?: number) => string;
+    getItemSummary?: (item: NotUndefined<Props>, index?: number) => string;
     showSearch?: boolean;
     renderFooter?: (props: {
         items: any[];
@@ -128,15 +123,7 @@ type SlotField = BaseField & {
     allow?: string[];
     disallow?: string[];
 };
-type Field<Props extends any = any> = TextField | NumberField | TextareaField | SelectField | RadioField | ArrayField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ObjectField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ExternalField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ExternalFieldWithAdaptor<Props extends {
-    [key: string]: any;
-} ? Props : any> | CustomField<Props> | SlotField;
+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]>;
 };
@@ -353,12 +340,12 @@ 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;
-
 declare const overrideKeys: readonly ["header", "headerActions", "fields", "fieldLabel", "components", "componentItem", "outline", "puck", "preview"];
 type OverrideKey = (typeof overrideKeys)[number];
 type OverridesGeneric<Shape extends {
@@ -443,11 +430,7 @@ type IframeConfig = {
 };
 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>;
+    overrides: Partial<Overrides>;
 };
 type History<D = any> = {
     state: D;
@@ -539,7 +522,12 @@ type PuckAction = {
     recordHistory?: boolean;
 } & (ReorderAction | InsertAction | MoveAction | ReplaceAction | ReplaceRootAction | RemoveAction | DuplicateAction | SetAction | SetDataAction | SetUiAction | RegisterZoneAction | UnregisterZoneAction);
 
-declare function migrate(data: Data, config?: Config): Data;
+type MigrationOptions<UserConfig extends Config> = {
+    migrateDynamicZonesForComponent?: {
+        [ComponentName in keyof UserConfig["components"]]: (props: WithId<UserGenerics<UserConfig>["UserProps"][ComponentName]>, zones: Record<string, Content>) => ComponentData["props"];
+    };
+};
+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] & {

package/dist/{walk-tree-6PP75PCU.d.ts → walk-tree-BOSl1o0G.d.ts}

@@ -49,11 +49,11 @@ type RadioField = BaseField & {
     type: "radio";
     options: FieldOptions;
 };
-type ArrayField<Props extends {
+type ArrayField<Props extends any = {
     [key: string]: any;
-} = {
+}> = Props extends {
     [key: string]: any;
-}> = BaseField & {
+} ? BaseField & {
     type: "array";
     arrayFields: {
         [SubPropName in keyof Props[0]]: Field<Props[0][SubPropName]>;
@@ -62,14 +62,12 @@ type ArrayField<Props extends {
     getItemSummary?: (item: Props[0], index?: number) => string;
     max?: number;
     min?: number;
-};
-type ObjectField<Props extends {
-    [key: string]: any;
-} = {
+} : never;
+type ObjectField<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "object";
-    objectFields: Props extends any[] ? never : {
+    objectFields: {
         [SubPropName in keyof Props]: Field<Props[SubPropName]>;
     };
 };
@@ -78,20 +76,17 @@ type Adaptor<AdaptorParams = {}, TableShape extends Record<string, any> = {}, Pr
     fetchList: (adaptorParams?: AdaptorParams) => Promise<TableShape[] | null>;
     mapProp?: (value: TableShape) => PropShape;
 };
-type ExternalFieldWithAdaptor<Props extends {
-    [key: string]: any;
-} = {
+type NotUndefined<T> = T extends undefined ? Record<string, any> : T;
+type ExternalFieldWithAdaptor<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "external";
     placeholder?: string;
     adaptor: Adaptor<any, any, Props>;
     adaptorParams?: object;
-    getItemSummary: (item: Props, index?: number) => string;
+    getItemSummary: (item: NotUndefined<Props>, index?: number) => string;
 };
-type ExternalField<Props extends {
-    [key: string]: any;
-} = {
+type ExternalField<Props extends any = {
     [key: string]: any;
 }> = BaseField & {
     type: "external";
@@ -102,7 +97,7 @@ type ExternalField<Props extends {
     }) => Promise<any[] | null>;
     mapProp?: (value: any) => Props;
     mapRow?: (value: any) => Record<string, string | number | ReactElement>;
-    getItemSummary?: (item: Props, index?: number) => string;
+    getItemSummary?: (item: NotUndefined<Props>, index?: number) => string;
     showSearch?: boolean;
     renderFooter?: (props: {
         items: any[];
@@ -128,15 +123,7 @@ type SlotField = BaseField & {
     allow?: string[];
     disallow?: string[];
 };
-type Field<Props extends any = any> = TextField | NumberField | TextareaField | SelectField | RadioField | ArrayField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ObjectField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ExternalField<Props extends {
-    [key: string]: any;
-} ? Props : any> | ExternalFieldWithAdaptor<Props extends {
-    [key: string]: any;
-} ? Props : any> | CustomField<Props> | SlotField;
+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]>;
 };
@@ -353,12 +340,12 @@ 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;
-
 declare const overrideKeys: readonly ["header", "headerActions", "fields", "fieldLabel", "components", "componentItem", "outline", "puck", "preview"];
 type OverrideKey = (typeof overrideKeys)[number];
 type OverridesGeneric<Shape extends {
@@ -443,11 +430,7 @@ type IframeConfig = {
 };
 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>;
+    overrides: Partial<Overrides>;
 };
 type History<D = any> = {
     state: D;
@@ -539,7 +522,12 @@ type PuckAction = {
     recordHistory?: boolean;
 } & (ReorderAction | InsertAction | MoveAction | ReplaceAction | ReplaceRootAction | RemoveAction | DuplicateAction | SetAction | SetDataAction | SetUiAction | RegisterZoneAction | UnregisterZoneAction);
 
-declare function migrate(data: Data, config?: Config): Data;
+type MigrationOptions<UserConfig extends Config> = {
+    migrateDynamicZonesForComponent?: {
+        [ComponentName in keyof UserConfig["components"]]: (props: WithId<UserGenerics<UserConfig>["UserProps"][ComponentName]>, zones: Record<string, Content>) => ComponentData["props"];
+    };
+};
+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] & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck",
-  "version": "0.20.0-canary.755737e8",
+  "version": "0.20.0-canary.f768aab9",
   "author": "Chris Villa <chris@puckeditor.com>",
   "repository": "measuredco/puck",
   "bugs": "https://github.com/measuredco/puck/issues",