@measured/puck-plugin-heading-analyzer 0.19.0-canary.896a6279 → 0.19.0-canary.8e1d7223

package/dist/index.mjs

@@ -146,6 +146,120 @@ var require_classnames = __commonJS({
   }
 });
 
+// ../../node_modules/flat/index.js
+var require_flat = __commonJS({
+  "../../node_modules/flat/index.js"(exports, module) {
+    "use strict";
+    init_react_import();
+    module.exports = flatten3;
+    flatten3.flatten = flatten3;
+    flatten3.unflatten = unflatten2;
+    function isBuffer(obj) {
+      return obj && obj.constructor && typeof obj.constructor.isBuffer === "function" && obj.constructor.isBuffer(obj);
+    }
+    function keyIdentity(key) {
+      return key;
+    }
+    function flatten3(target, opts) {
+      opts = opts || {};
+      const delimiter = opts.delimiter || ".";
+      const maxDepth = opts.maxDepth;
+      const transformKey = opts.transformKey || keyIdentity;
+      const output = {};
+      function step(object, prev, currentDepth) {
+        currentDepth = currentDepth || 1;
+        Object.keys(object).forEach(function(key) {
+          const value = object[key];
+          const isarray = opts.safe && Array.isArray(value);
+          const type = Object.prototype.toString.call(value);
+          const isbuffer = isBuffer(value);
+          const isobject = type === "[object Object]" || type === "[object Array]";
+          const newKey = prev ? prev + delimiter + transformKey(key) : transformKey(key);
+          if (!isarray && !isbuffer && isobject && Object.keys(value).length && (!opts.maxDepth || currentDepth < maxDepth)) {
+            return step(value, newKey, currentDepth + 1);
+          }
+          output[newKey] = value;
+        });
+      }
+      step(target);
+      return output;
+    }
+    function unflatten2(target, opts) {
+      opts = opts || {};
+      const delimiter = opts.delimiter || ".";
+      const overwrite = opts.overwrite || false;
+      const transformKey = opts.transformKey || keyIdentity;
+      const result = {};
+      const isbuffer = isBuffer(target);
+      if (isbuffer || Object.prototype.toString.call(target) !== "[object Object]") {
+        return target;
+      }
+      function getkey(key) {
+        const parsedKey = Number(key);
+        return isNaN(parsedKey) || key.indexOf(".") !== -1 || opts.object ? key : parsedKey;
+      }
+      function addKeys(keyPrefix, recipient, target2) {
+        return Object.keys(target2).reduce(function(result2, key) {
+          result2[keyPrefix + delimiter + key] = target2[key];
+          return result2;
+        }, recipient);
+      }
+      function isEmpty(val) {
+        const type = Object.prototype.toString.call(val);
+        const isArray = type === "[object Array]";
+        const isObject = type === "[object Object]";
+        if (!val) {
+          return true;
+        } else if (isArray) {
+          return !val.length;
+        } else if (isObject) {
+          return !Object.keys(val).length;
+        }
+      }
+      target = Object.keys(target).reduce(function(result2, key) {
+        const type = Object.prototype.toString.call(target[key]);
+        const isObject = type === "[object Object]" || type === "[object Array]";
+        if (!isObject || isEmpty(target[key])) {
+          result2[key] = target[key];
+          return result2;
+        } else {
+          return addKeys(
+            key,
+            result2,
+            flatten3(target[key], opts)
+          );
+        }
+      }, {});
+      Object.keys(target).forEach(function(key) {
+        const split = key.split(delimiter).map(transformKey);
+        let key1 = getkey(split.shift());
+        let key2 = getkey(split[0]);
+        let recipient = result;
+        while (key2 !== void 0) {
+          if (key1 === "__proto__") {
+            return;
+          }
+          const type = Object.prototype.toString.call(recipient[key1]);
+          const isobject = type === "[object Object]" || type === "[object Array]";
+          if (!overwrite && !isobject && typeof recipient[key1] !== "undefined") {
+            return;
+          }
+          if (overwrite && !isobject || !overwrite && recipient[key1] == null) {
+            recipient[key1] = typeof key2 === "number" && !opts.object ? [] : {};
+          }
+          recipient = recipient[key1];
+          if (split.length > 0) {
+            key1 = getkey(split.shift());
+            key2 = getkey(split[0]);
+          }
+        }
+        recipient[key1] = unflatten2(target[key], opts);
+      });
+      return result;
+    }
+  }
+});
+
 // ../../node_modules/fast-deep-equal/index.js
 var require_fast_deep_equal = __commonJS({
   "../../node_modules/fast-deep-equal/index.js"(exports, module) {
@@ -359,45 +473,8 @@ init_react_import();
 // ../core/reducer/actions/set.ts
 init_react_import();
 
-// ../core/lib/data/walk-tree.ts
-init_react_import();
-
-// ../core/lib/data/for-each-slot.ts
-init_react_import();
-
-// ../core/lib/data/is-slot.ts
+// ../core/lib/data/walk-app-state.ts
 init_react_import();
-var isSlot = (prop) => {
-  var _a, _b;
-  return Array.isArray(prop) && typeof ((_a = prop[0]) == null ? void 0 : _a.type) === "string" && typeof ((_b = prop[0]) == null ? void 0 : _b.props) === "object";
-};
-var createIsSlotConfig = (config) => (itemType, propName, propValue) => {
-  var _a, _b;
-  const configForComponent = itemType === "root" ? config == null ? void 0 : config.root : config == null ? void 0 : config.components[itemType];
-  if (!configForComponent) return isSlot(propValue);
-  return ((_b = (_a = configForComponent.fields) == null ? void 0 : _a[propName]) == null ? void 0 : _b.type) === "slot";
-};
-
-// ../core/lib/data/for-each-slot.ts
-var forEachSlot = (item, cb, recursive = false, isSlot2 = isSlot) => {
-  const props = item.props || {};
-  const propKeys = Object.keys(props);
-  for (let i = 0; i < propKeys.length; i++) {
-    const propKey = propKeys[i];
-    const itemType = "type" in item ? item.type : "root";
-    if (isSlot2(itemType, propKey, props[propKey])) {
-      const content = props[propKey];
-      cb(props.id, propKey, content);
-      if (recursive) {
-        content.forEach(
-          (childItem) => __async(void 0, null, function* () {
-            return forEachSlot(childItem, cb, true, isSlot2);
-          })
-        );
-      }
-    }
-  }
-};
 
 // ../core/lib/data/for-related-zones.ts
 init_react_import();
@@ -432,24 +509,159 @@ function forRelatedZones(item, data, cb, path = []) {
   });
 }
 
+// ../core/lib/data/map-slots.ts
+init_react_import();
+var isPromise = (v) => !!v && typeof v.then === "function";
+var flatten = (values) => values.reduce((acc, item) => __spreadValues(__spreadValues({}, acc), item), {});
+var containsPromise = (arr) => arr.some(isPromise);
+var walkField = ({
+  value,
+  fields,
+  map,
+  propKey = "",
+  propPath = "",
+  id = "",
+  config,
+  recurseSlots = false
+}) => {
+  var _a, _b, _c;
+  if (((_a = fields[propKey]) == null ? void 0 : _a.type) === "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}`);
+      }
+      const fields2 = (_a2 = componentConfig.fields) != null ? _a2 : {};
+      return walkField({
+        value: el,
+        fields: fields2,
+        map,
+        id: el.props.id,
+        config,
+        recurseSlots
+      });
+    }) : content;
+    if (containsPromise(mappedContent)) {
+      return Promise.all(mappedContent);
+    }
+    return map(mappedContent, id, propPath, fields[propKey], propPath);
+  }
+  if (value && typeof value === "object") {
+    if (Array.isArray(value)) {
+      const arrayFields = ((_b = fields[propKey]) == null ? void 0 : _b.type) === "array" ? fields[propKey].arrayFields : null;
+      if (!arrayFields) return value;
+      const newValue = value.map(
+        (el, idx) => walkField({
+          value: el,
+          fields: arrayFields,
+          map,
+          propKey,
+          propPath: `${propPath}[${idx}]`,
+          id,
+          config,
+          recurseSlots
+        })
+      );
+      if (containsPromise(newValue)) {
+        return Promise.all(newValue);
+      }
+      return newValue;
+    } else if ("$$typeof" in value) {
+      return value;
+    } else {
+      const objectFields = ((_c = fields[propKey]) == null ? void 0 : _c.type) === "object" ? fields[propKey].objectFields : fields;
+      return walkObject({
+        value,
+        fields: objectFields,
+        map,
+        id,
+        getPropPath: (k) => `${propPath}.${k}`,
+        config,
+        recurseSlots
+      });
+    }
+  }
+  return value;
+};
+var walkObject = ({
+  value,
+  fields,
+  map,
+  id,
+  getPropPath,
+  config,
+  recurseSlots
+}) => {
+  const newProps = Object.entries(value).map(([k, v]) => {
+    const opts = {
+      value: v,
+      fields,
+      map,
+      propKey: k,
+      propPath: getPropPath(k),
+      id,
+      config,
+      recurseSlots
+    };
+    const newValue = walkField(opts);
+    if (isPromise(newValue)) {
+      return newValue.then((resolvedValue) => ({
+        [k]: resolvedValue
+      }));
+    }
+    return {
+      [k]: newValue
+    };
+  }, {});
+  if (containsPromise(newProps)) {
+    return Promise.all(newProps).then(flatten);
+  }
+  return flatten(newProps);
+};
+function mapSlots(item, map, config, recurseSlots = false) {
+  var _a, _b, _c, _d;
+  const itemType = "type" in item ? item.type : "root";
+  const componentConfig = itemType === "root" ? config.root : (_a = config.components) == null ? void 0 : _a[itemType];
+  const newProps = walkObject({
+    value: (_b = item.props) != null ? _b : {},
+    fields: (_c = componentConfig == null ? void 0 : componentConfig.fields) != null ? _c : {},
+    map,
+    id: item.props ? (_d = item.props.id) != null ? _d : "root" : "root",
+    getPropPath: (k) => k,
+    config,
+    recurseSlots
+  });
+  if (isPromise(newProps)) {
+    return newProps.then((resolvedProps) => __spreadProps(__spreadValues({}, item), {
+      props: resolvedProps
+    }));
+  }
+  return __spreadProps(__spreadValues({}, item), {
+    props: newProps
+  });
+}
+
+// ../core/lib/data/flatten-node.ts
+init_react_import();
+var import_flat = __toESM(require_flat());
+
 // ../core/lib/data/strip-slots.ts
 init_react_import();
-var stripSlots = (data) => {
-  return __spreadProps(__spreadValues({}, data), {
-    props: Object.entries(data.props).reduce(
-      (acc, [propKey, propVal]) => {
-        if (isSlot(propVal)) {
-          return acc;
-        }
-        return __spreadProps(__spreadValues({}, acc), { [propKey]: propVal });
-      },
-      { id: data.props.id }
-    )
+var stripSlots = (data, config) => {
+  return mapSlots(data, () => null, config);
+};
+
+// ../core/lib/data/flatten-node.ts
+var flattenNode = (node, config) => {
+  return __spreadProps(__spreadValues({}, node), {
+    props: (0, import_flat.flatten)(stripSlots(node, config).props)
   });
 };
 
-// ../core/lib/data/walk-tree.ts
-function walkTree(state, config, mapContent = (content) => content, mapNodeOrSkip = (item) => item) {
+// ../core/lib/data/walk-app-state.ts
+function walkAppState(state, config, mapContent = (content) => content, mapNodeOrSkip = (item) => item) {
   var _a;
   let newZones = {};
   const newZoneIndex = {};
@@ -490,10 +702,9 @@ function walkTree(state, config, mapContent = (content) => content, mapNodeOrSki
     const mappedItem = mapNodeOrSkip(item, path, index);
     if (!mappedItem) return item;
     const id = mappedItem.props.id;
-    const newProps = __spreadValues({}, mappedItem.props);
-    forEachSlot(
+    const newProps = __spreadProps(__spreadValues({}, mapSlots(
       mappedItem,
-      (parentId2, slotId, content) => {
+      (content, parentId2, slotId) => {
         const zoneCompound = `${parentId2}:${slotId}`;
         const [_2, newContent2] = processContent(
           path,
@@ -502,18 +713,19 @@ function walkTree(state, config, mapContent = (content) => content, mapNodeOrSki
           "slot",
           parentId2
         );
-        newProps[slotId] = newContent2;
+        return newContent2;
       },
-      false,
-      createIsSlotConfig(config)
-    );
+      config
+    ).props), {
+      id
+    });
     processRelatedZones(item, id, path);
     const newItem = __spreadProps(__spreadValues({}, item), { props: newProps });
     const thisZoneCompound = path[path.length - 1];
     const [parentId, zone] = thisZoneCompound ? thisZoneCompound.split(":") : [null, ""];
     newNodeIndex[id] = {
       data: newItem,
-      flatData: stripSlots(newItem),
+      flatData: flattenNode(newItem, config),
       path,
       parentId,
       zone
@@ -582,7 +794,7 @@ var setAction = (state, action, appStore) => {
     console.warn(
       "`set` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
     );
-    return walkTree(newState, appStore.config);
+    return walkAppState(newState, appStore.config);
   }
   return __spreadValues(__spreadValues({}, state), action.state(state));
 };
@@ -668,18 +880,77 @@ var getIdsForParent = (zoneCompound, state) => {
   return ((node == null ? void 0 : node.path) || []).map((p) => p.split(":")[0]);
 };
 
+// ../core/lib/data/populate-ids.ts
+init_react_import();
+
+// ../core/lib/data/walk-tree.ts
+init_react_import();
+function walkTree(data, config, callbackFn) {
+  var _a, _b;
+  const walkItem = (item) => {
+    return mapSlots(
+      item,
+      (content, parentId, propName) => {
+        var _a2;
+        return (_a2 = callbackFn(content, { parentId, propName })) != null ? _a2 : content;
+      },
+      config,
+      true
+    );
+  };
+  if ("props" in data) {
+    return walkItem(data);
+  }
+  const _data = data;
+  const zones = (_a = _data.zones) != null ? _a : {};
+  const mappedContent = _data.content.map(walkItem);
+  return {
+    root: walkItem(_data.root),
+    content: (_b = callbackFn(mappedContent, {
+      parentId: "root",
+      propName: "default-zone"
+    })) != null ? _b : mappedContent,
+    zones: Object.keys(zones).reduce(
+      (acc, zoneCompound) => __spreadProps(__spreadValues({}, acc), {
+        [zoneCompound]: zones[zoneCompound].map(walkItem)
+      }),
+      {}
+    )
+  };
+}
+
+// ../core/lib/data/populate-ids.ts
+var populateIds = (data, config, override = false) => {
+  const id = generateId(data.type);
+  return walkTree(
+    __spreadProps(__spreadValues({}, data), {
+      props: override ? __spreadProps(__spreadValues({}, data.props), { id }) : __spreadValues({}, data.props)
+    }),
+    config,
+    (contents) => contents.map((item) => {
+      const id2 = generateId(item.type);
+      return __spreadProps(__spreadValues({}, item), {
+        props: override ? __spreadProps(__spreadValues({}, item.props), { id: id2 }) : __spreadValues({ id: id2 }, item.props)
+      });
+    })
+  );
+};
+
 // ../core/reducer/actions/insert.ts
 function insertAction(state, action, appStore) {
   const id = action.id || generateId(action.componentType);
-  const emptyComponentData = {
-    type: action.componentType,
-    props: __spreadProps(__spreadValues({}, appStore.config.components[action.componentType].defaultProps || {}), {
-      id
-    })
-  };
+  const emptyComponentData = populateIds(
+    {
+      type: action.componentType,
+      props: __spreadProps(__spreadValues({}, appStore.config.components[action.componentType].defaultProps || {}), {
+        id
+      })
+    },
+    appStore.config
+  );
   const [parentId] = action.destinationZone.split(":");
   const idsInPath = getIdsForParent(action.destinationZone, state);
-  return walkTree(
+  return walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -717,25 +988,26 @@ var replaceAction = (state, action, appStore) => {
       `Can't change the id during a replace action. Please us "remove" and "insert" to define a new node.`
     );
   }
-  return walkTree(
+  const data = populateIds(action.data, appStore.config);
+  return walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
       const newContent = [...content];
       if (zoneCompound === action.destinationZone) {
-        newContent[action.destinationIndex] = action.data;
+        newContent[action.destinationIndex] = data;
       }
       return newContent;
     },
     (childItem, path) => {
       const pathIds = path.map((p) => p.split(":")[0]);
-      if (childItem.props.id === action.data.props.id) {
-        return action.data;
+      if (childItem.props.id === data.props.id) {
+        return data;
       } else if (childItem.props.id === parentId) {
         return childItem;
       } else if (idsInPath.indexOf(childItem.props.id) > -1) {
         return childItem;
-      } else if (pathIds.indexOf(action.data.props.id) > -1) {
+      } else if (pathIds.indexOf(data.props.id) > -1) {
         return childItem;
       }
       return null;
@@ -746,7 +1018,7 @@ var replaceAction = (state, action, appStore) => {
 // ../core/reducer/actions/replace-root.ts
 init_react_import();
 var replaceRootAction = (state, action, appStore) => {
-  return walkTree(
+  return walkAppState(
     state,
     appStore.config,
     (content) => content,
@@ -785,7 +1057,7 @@ function duplicateAction(state, action, appStore) {
       id: generateId(item.type)
     })
   });
-  const modified = walkTree(
+  const modified = walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -850,7 +1122,7 @@ var moveAction = (state, action, appStore) => {
   if (!item) return state;
   const idsInSourcePath = getIdsForParent(action.sourceZone, state);
   const idsInDestinationPath = getIdsForParent(action.destinationZone, state);
-  return walkTree(
+  return walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -898,7 +1170,6 @@ var reorderAction = (state, action, appStore) => {
 init_react_import();
 var removeAction = (state, action, appStore) => {
   const item = getItem({ index: action.index, zone: action.zone }, state);
-  const [parentId] = action.zone.split(":");
   const nodesToDelete = Object.entries(state.indexes.nodes).reduce(
     (acc, [nodeId, nodeData]) => {
       const pathIds = nodeData.path.map((p) => p.split(":")[0]);
@@ -909,7 +1180,7 @@ var removeAction = (state, action, appStore) => {
     },
     [item.props.id]
   );
-  const newState = walkTree(
+  const newState = walkAppState(
     state,
     appStore.config,
     (content, zoneCompound) => {
@@ -917,24 +1188,17 @@ var removeAction = (state, action, appStore) => {
         return remove(content, action.index);
       }
       return content;
-    },
-    (childItem, path) => {
-      const parentIds = path.map((p) => p.split(":")[0]);
-      if (childItem.props.id === parentId || childItem.props.id === item.props.id || parentIds.indexOf(item.props.id) > -1) {
-        return childItem;
-      }
-      return null;
     }
   );
   Object.keys(newState.data.zones || {}).forEach((zoneCompound) => {
-    const parentId2 = zoneCompound.split(":")[0];
-    if (nodesToDelete.includes(parentId2) && newState.data.zones) {
+    const parentId = zoneCompound.split(":")[0];
+    if (nodesToDelete.includes(parentId) && newState.data.zones) {
       delete newState.data.zones[zoneCompound];
     }
   });
   Object.keys(newState.indexes.zones).forEach((zoneCompound) => {
-    const parentId2 = zoneCompound.split(":")[0];
-    if (nodesToDelete.includes(parentId2)) {
+    const parentId = zoneCompound.split(":")[0];
+    if (nodesToDelete.includes(parentId)) {
       delete newState.indexes.zones[zoneCompound];
     }
   });
@@ -1007,14 +1271,14 @@ var setDataAction = (state, action, appStore) => {
     console.warn(
       "`setData` is expensive and may cause unnecessary re-renders. Consider using a more atomic action instead."
     );
-    return walkTree(
+    return walkAppState(
       __spreadProps(__spreadValues({}, state), {
         data: __spreadValues(__spreadValues({}, state.data), action.data)
       }),
       appStore.config
     );
   }
-  return walkTree(
+  return walkAppState(
     __spreadProps(__spreadValues({}, state), {
       data: __spreadValues(__spreadValues({}, state.data), action.data(state.data))
     }),
@@ -1301,7 +1565,7 @@ var createHistorySlice = (set, get) => {
       const { dispatch, history } = get();
       dispatch({
         type: "set",
-        state: ((_a = history.histories[history.index]) == null ? void 0 : _a.state) || history.initialAppState
+        state: ((_a = history.histories[index]) == null ? void 0 : _a.state) || history.initialAppState
       });
       set({ history: __spreadProps(__spreadValues({}, history), { index }) });
     },
@@ -1317,7 +1581,11 @@ var createNodesSlice = (set, get) => ({
     const s = get().nodes;
     const emptyNode = {
       id,
-      methods: { sync: () => null },
+      methods: {
+        sync: () => null,
+        hideOverlay: () => null,
+        showOverlay: () => null
+      },
       element: null
     };
     const existingNode = s.nodes[id];
@@ -1354,7 +1622,7 @@ import { useEffect as useEffect3 } from "react";
 init_react_import();
 var flattenData = (state, config) => {
   const data = [];
-  walkTree(
+  walkAppState(
     state,
     config,
     (content) => content,
@@ -1368,12 +1636,13 @@ var flattenData = (state, config) => {
 
 // ../core/lib/get-changed.ts
 init_react_import();
+var import_fast_deep_equal = __toESM(require_fast_deep_equal());
 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]: oldItemProps[item] !== newItemProps[item]
+      [item]: !(0, import_fast_deep_equal.default)(oldItemProps[item], newItemProps[item])
     });
   }, {}) : {};
 };
@@ -1491,45 +1760,23 @@ var createFieldsSlice = (_set, _get) => {
   return {
     fields: {},
     loading: false,
-    lastResolvedData: {}
+    lastResolvedData: {},
+    id: void 0
   };
 };
 
 // ../core/lib/resolve-component-data.ts
 init_react_import();
-
-// ../core/lib/data/map-slots.ts
-init_react_import();
-function mapSlots(_0, _1) {
-  return __async(this, arguments, function* (item, map, recursive = true, isSlot2 = isSlot) {
-    const props = __spreadValues({}, item.props);
-    const propKeys = Object.keys(props);
-    for (let i = 0; i < propKeys.length; i++) {
-      const propKey = propKeys[i];
-      const itemType = "type" in item ? item.type : "root";
-      if (isSlot2(itemType, propKey, props[propKey])) {
-        const content = props[propKey];
-        const mappedContent = recursive ? yield Promise.all(
-          content.map((item2) => __async(this, null, function* () {
-            return yield mapSlots(item2, map, recursive, isSlot2);
-          }))
-        ) : content;
-        props[propKey] = yield map(mappedContent, propKey);
-      }
-    }
-    return __spreadProps(__spreadValues({}, item), { props });
-  });
-}
-
-// ../core/lib/resolve-component-data.ts
-var import_fast_deep_equal = __toESM(require_fast_deep_equal());
+var import_fast_deep_equal2 = __toESM(require_fast_deep_equal());
 var cache = { lastChange: {} };
-var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], function* (item, config, metadata = {}, onResolveStart, onResolveEnd, trigger = "replace", recursive = true) {
+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;
-  if ((configForItem == null ? void 0 : configForItem.resolveData) && item.props) {
-    const id = "id" in item.props ? item.props.id : "root";
+  const resolvedItem = __spreadValues({}, item);
+  const shouldRunResolver = (configForItem == null ? void 0 : configForItem.resolveData) && item.props;
+  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_equal.default)(item, oldItem)) {
+    if (item && (0, import_fast_deep_equal2.default)(item, oldItem)) {
       return { node: resolved, didChange: false };
     }
     const changed = getChanged(item, oldItem);
@@ -1539,49 +1786,45 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
     const { props: resolvedProps, readOnly = {} } = yield configForItem.resolveData(item, {
       changed,
       lastData: oldItem,
-      metadata,
+      metadata: __spreadValues(__spreadValues({}, metadata), configForItem.metadata),
       trigger
     });
-    let resolvedItem = __spreadProps(__spreadValues({}, item), {
-      props: __spreadValues(__spreadValues({}, item.props), resolvedProps)
-    });
-    if (recursive) {
-      resolvedItem = yield mapSlots(
-        resolvedItem,
-        (content) => __async(void 0, null, function* () {
-          return Promise.all(
-            content.map(
-              (childItem) => __async(void 0, null, function* () {
-                return (yield resolveComponentData(
-                  childItem,
-                  config,
-                  metadata,
-                  onResolveStart,
-                  onResolveEnd,
-                  trigger,
-                  false
-                )).node;
-              })
-            )
-          );
-        }),
-        false,
-        createIsSlotConfig(config)
-      );
-    }
+    resolvedItem.props = __spreadValues(__spreadValues({}, item.props), resolvedProps);
     if (Object.keys(readOnly).length) {
       resolvedItem.readOnly = readOnly;
     }
-    cache.lastChange[id] = {
-      item,
-      resolved: resolvedItem
-    };
-    if (onResolveEnd) {
-      onResolveEnd(resolvedItem);
-    }
-    return { node: resolvedItem, didChange: !(0, import_fast_deep_equal.default)(item, resolvedItem) };
   }
-  return { node: item, didChange: false };
+  let itemWithResolvedChildren = yield mapSlots(
+    resolvedItem,
+    (content) => __async(void 0, null, function* () {
+      return yield Promise.all(
+        content.map(
+          (childItem) => __async(void 0, null, function* () {
+            return (yield resolveComponentData(
+              childItem,
+              config,
+              metadata,
+              onResolveStart,
+              onResolveEnd,
+              trigger
+            )).node;
+          })
+        )
+      );
+    }),
+    config
+  );
+  if (shouldRunResolver && onResolveEnd) {
+    onResolveEnd(resolvedItem);
+  }
+  cache.lastChange[id] = {
+    item,
+    resolved: itemWithResolvedChildren
+  };
+  return {
+    node: itemWithResolvedChildren,
+    didChange: !(0, import_fast_deep_equal2.default)(item, itemWithResolvedChildren)
+  };
 });
 
 // ../core/lib/data/to-root.ts
@@ -1601,7 +1844,8 @@ var toRoot = (item) => {
   return { props: {}, readOnly };
 };
 
-// ../core/store/index.ts
+// ../core/store/default-app-state.ts
+init_react_import();
 var defaultAppState = {
   data: { content: [], root: {}, zones: {} },
   ui: {
@@ -1627,6 +1871,8 @@ var defaultAppState = {
     zones: {}
   }
 };
+
+// ../core/store/index.ts
 var defaultPageFields = {
   title: { type: "text" }
 };
@@ -1766,7 +2012,7 @@ var createAppStore = (initialAppStore) => create()(
       }),
       resolveAndCommitData: () => __async(void 0, null, function* () {
         const { config, state, dispatch, resolveComponentData: resolveComponentData2 } = get();
-        walkTree(
+        walkAppState(
           state,
           config,
           (content) => content,