@measured/puck 0.21.0-canary.b6ed9789 → 0.21.0-canary.bd7b613d

package/dist/no-external.mjs

@@ -21,14 +21,14 @@ import {
   setDeep,
   useGetPuck,
   usePuck
-} from "./chunk-VVS2EUKT.mjs";
+} from "./chunk-DBHXESEC.mjs";
 import {
   init_react_import,
   migrate,
   resolveAllData,
   transformProps,
   walkTree
-} from "./chunk-XYKLHT4R.mjs";
+} from "./chunk-FPQ7BWRD.mjs";
 
 // bundle/no-external.ts
 init_react_import();

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-C0rGZzWO.mjs';
-export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-C0rGZzWO.mjs';
+import { C as Config, U as UserGenerics, M as Metadata } from './walk-tree-Cvtjzg9C.mjs';
+export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-Cvtjzg9C.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-C0rGZzWO.js';
-export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-C0rGZzWO.js';
+import { C as Config, U as UserGenerics, M as Metadata } from './walk-tree-Cvtjzg9C.js';
+export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-Cvtjzg9C.js';
 import 'react';
 
 declare function Render<UserConfig extends Config = Config, G extends UserGenerics<UserConfig> = UserGenerics<UserConfig>>({ config, data, metadata, }: {

package/dist/rsc.js

@@ -130,34 +130,39 @@ var walkField = ({
   config,
   recurseSlots = false
 }) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const fieldType = (_a = fields[propKey]) == null ? void 0 : _a.type;
   const map = mappers[fieldType];
   if (map && fieldType === "slot") {
     const content = value || [];
-    const mappedContent = recurseSlots ? content.map((el) => {
-      var _a2;
-      const componentConfig = config.components[el.type];
-      if (!componentConfig) {
-        throw new Error(`Could not find component config for ${el.type}`);
+    let mappedContent = content;
+    if (recurseSlots) {
+      for (let i = 0; i < content.length; i++) {
+        const el = content[i];
+        const componentConfig = config.components[el.type];
+        if (!componentConfig) {
+          continue;
+        }
+        const fields2 = (_b = componentConfig.fields) != null ? _b : {};
+        mappedContent.push(
+          walkField({
+            value: __spreadProps(__spreadValues({}, el), { props: defaultSlots(el.props, fields2) }),
+            fields: fields2,
+            mappers,
+            id: el.props.id,
+            config,
+            recurseSlots
+          })
+        );
       }
-      const fields2 = (_a2 = componentConfig.fields) != null ? _a2 : {};
-      return walkField({
-        value: __spreadProps(__spreadValues({}, el), { props: defaultSlots(el.props, fields2) }),
-        fields: fields2,
-        mappers,
-        id: el.props.id,
-        config,
-        recurseSlots
-      });
-    }) : content;
+    }
     if (containsPromise(mappedContent)) {
       return Promise.all(mappedContent);
     }
     return map({
       value: mappedContent,
       parentId: id,
-      propName: propKey,
+      propName: propPath,
       field: fields[propKey],
       propPath
     });
@@ -172,7 +177,7 @@ var walkField = ({
   }
   if (value && typeof value === "object") {
     if (Array.isArray(value)) {
-      const arrayFields = ((_b = fields[propKey]) == null ? void 0 : _b.type) === "array" ? fields[propKey].arrayFields : null;
+      const arrayFields = ((_c = fields[propKey]) == null ? void 0 : _c.type) === "array" ? fields[propKey].arrayFields : null;
       if (!arrayFields) return value;
       const newValue = value.map(
         (el, idx) => walkField({
@@ -193,7 +198,7 @@ var walkField = ({
     } else if ("$$typeof" in value) {
       return value;
     } else {
-      const objectFields = ((_c = fields[propKey]) == null ? void 0 : _c.type) === "object" ? fields[propKey].objectFields : fields;
+      const objectFields = ((_d = fields[propKey]) == null ? void 0 : _d.type) === "object" ? fields[propKey].objectFields : fields;
       return walkObject({
         value,
         fields: objectFields,
@@ -460,19 +465,19 @@ function Render({
 }
 
 // lib/get-changed.ts
-var import_fast_deep_equal = __toESM(require("fast-deep-equal"));
+var import_fast_equals = require("fast-equals");
 var getChanged = (newItem, oldItem) => {
   return newItem ? Object.keys(newItem.props || {}).reduce((acc, item) => {
     const newItemProps = (newItem == null ? void 0 : newItem.props) || {};
     const oldItemProps = (oldItem == null ? void 0 : oldItem.props) || {};
     return __spreadProps(__spreadValues({}, acc), {
-      [item]: !(0, import_fast_deep_equal.default)(oldItemProps[item], newItemProps[item])
+      [item]: !(0, import_fast_equals.deepEqual)(oldItemProps[item], newItemProps[item])
     });
   }, {}) : {};
 };
 
 // lib/resolve-component-data.ts
-var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"));
+var import_fast_equals2 = require("fast-equals");
 var cache = { lastChange: {} };
 var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace") {
   const configForItem = "type" in item && item.type !== "root" ? config.components[item.type] : config.root;
@@ -481,7 +486,7 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
   const id = "id" in item.props ? item.props.id : "root";
   if (shouldRunResolver) {
     const { item: oldItem = null, resolved = {} } = cache.lastChange[id] || {};
-    if (item && (0, import_fast_deep_equal2.default)(item, oldItem)) {
+    if (trigger !== "force" && item && (0, import_fast_equals2.deepEqual)(item, oldItem)) {
       return { node: resolved, didChange: false };
     }
     const changed = getChanged(item, oldItem);
@@ -531,7 +536,7 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
   };
   return {
     node: itemWithResolvedChildren,
-    didChange: !(0, import_fast_deep_equal2.default)(item, itemWithResolvedChildren)
+    didChange: !(0, import_fast_equals2.deepEqual)(item, itemWithResolvedChildren)
   };
 });
 

package/dist/rsc.mjs

@@ -12,7 +12,7 @@ import {
   transformProps,
   useSlots,
   walkTree
-} from "./chunk-XYKLHT4R.mjs";
+} from "./chunk-FPQ7BWRD.mjs";
 
 // bundle/rsc.tsx
 init_react_import();

package/dist/{walk-tree-C0rGZzWO.d.mts → walk-tree-Cvtjzg9C.d.mts}

@@ -212,6 +212,7 @@ UserField extends BaseField = {}> = {
         fields: Fields<FieldProps>;
         lastFields: Fields<FieldProps>;
         lastData: DataShape | null;
+        metadata: Metadata;
         appState: AppState;
         parent: ComponentData | null;
     }) => Promise<Fields<FieldProps>> | Fields<FieldProps>;
@@ -255,7 +256,7 @@ type ConfigInternal<Props extends DefaultComponents = DefaultComponents, RootPro
     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 Config<PropsOrParams extends LeftOrExactRight<PropsOrParams, DefaultComponents, ConfigParams> = DefaultComponents | ConfigParams, RootProps extends DefaultComponentProps = any, 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;
@@ -377,7 +378,7 @@ 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 ConfigParams<Components extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = DefaultComponentProps, CategoryNames extends string[] = string[], UserFields extends FieldsExtension = FieldsExtension> = {
+type ConfigParams<Components extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = any, CategoryNames extends string[] = string[], UserFields extends FieldsExtension = FieldsExtension> = {
     components?: Components;
     root?: RootProps;
     categories?: CategoryNames;

package/dist/{walk-tree-C0rGZzWO.d.ts → walk-tree-Cvtjzg9C.d.ts}

@@ -212,6 +212,7 @@ UserField extends BaseField = {}> = {
         fields: Fields<FieldProps>;
         lastFields: Fields<FieldProps>;
         lastData: DataShape | null;
+        metadata: Metadata;
         appState: AppState;
         parent: ComponentData | null;
     }) => Promise<Fields<FieldProps>> | Fields<FieldProps>;
@@ -255,7 +256,7 @@ type ConfigInternal<Props extends DefaultComponents = DefaultComponents, RootPro
     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 Config<PropsOrParams extends LeftOrExactRight<PropsOrParams, DefaultComponents, ConfigParams> = DefaultComponents | ConfigParams, RootProps extends DefaultComponentProps = any, 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;
@@ -377,7 +378,7 @@ 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 ConfigParams<Components extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = DefaultComponentProps, CategoryNames extends string[] = string[], UserFields extends FieldsExtension = FieldsExtension> = {
+type ConfigParams<Components extends DefaultComponents = DefaultComponents, RootProps extends DefaultComponentProps = any, CategoryNames extends string[] = string[], UserFields extends FieldsExtension = FieldsExtension> = {
     components?: Components;
     root?: RootProps;
     categories?: CategoryNames;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measured/puck",
-  "version": "0.21.0-canary.b6ed9789",
+  "version": "0.21.0-canary.bd7b613d",
   "description": "The open-source visual editor for React",
   "author": "Chris Villa <chris@puckeditor.com>",
   "repository": "measuredco/puck",
@@ -96,7 +96,7 @@
     "@dnd-kit/helpers": "0.1.18",
     "@dnd-kit/react": "0.1.18",
     "deep-diff": "^1.0.2",
-    "fast-deep-equal": "^3.1.3",
+    "fast-equals": "5.2.2",
     "flat": "^5.0.2",
     "object-hash": "^3.0.0",
     "react-hotkeys-hook": "^4.6.1",