@measured/puck 0.20.0-canary.274fe3d9 → 0.20.0-canary.29cd4d52

package/dist/no-external.mjs

@@ -13,17 +13,19 @@ import {
   Render,
   createUsePuck,
   overrideKeys,
+  registerOverlayPortal,
   renderContext,
+  setDeep,
   useGetPuck,
   usePuck
-} from "./chunk-4KAREQPB.mjs";
+} from "./chunk-DCZ7BU3G.mjs";
 import {
   init_react_import,
   migrate,
   resolveAllData,
   transformProps,
   walkTree
-} from "./chunk-32MJ3X3H.mjs";
+} from "./chunk-NFK5JVZW.mjs";
 
 // bundle/no-external.ts
 init_react_import();
@@ -43,8 +45,10 @@ export {
   createUsePuck,
   migrate,
   overrideKeys,
+  registerOverlayPortal,
   renderContext,
   resolveAllData,
+  setDeep,
   transformProps,
   useGetPuck,
   usePuck,

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-DrNRq2FV.mjs';
-export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-DrNRq2FV.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-DrNRq2FV.js';
-export { m as migrate, r as resolveAllData, t as transformProps, w as walkTree } from './walk-tree-DrNRq2FV.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

@@ -22,6 +22,18 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -95,7 +107,7 @@ var setupZone = (data, zoneKey) => {
   return newData;
 };
 
-// lib/use-slots.tsx
+// lib/field-transforms/use-field-transforms.tsx
 var import_react2 = require("react");
 
 // lib/data/default-slots.ts
@@ -104,14 +116,14 @@ var defaultSlots = (value, fields) => Object.keys(fields).reduce(
   value
 );
 
-// lib/data/map-slots.ts
+// lib/data/map-fields.ts
 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,
+  mappers,
   propKey = "",
   propPath = "",
   id = "",
@@ -119,7 +131,9 @@ var walkField = ({
   recurseSlots = false
 }) => {
   var _a, _b, _c;
-  if (((_a = fields[propKey]) == null ? void 0 : _a.type) === "slot") {
+  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;
@@ -131,7 +145,7 @@ var walkField = ({
       return walkField({
         value: __spreadProps(__spreadValues({}, el), { props: defaultSlots(el.props, fields2) }),
         fields: fields2,
-        map,
+        mappers,
         id: el.props.id,
         config,
         recurseSlots
@@ -140,7 +154,21 @@ var walkField = ({
     if (containsPromise(mappedContent)) {
       return Promise.all(mappedContent);
     }
-    return map(mappedContent, id, propPath, fields[propKey], propPath);
+    return map({
+      value: mappedContent,
+      parentId: id,
+      propName: propKey,
+      field: fields[propKey],
+      propPath
+    });
+  } else if (map && fields[propKey]) {
+    return map({
+      value,
+      parentId: id,
+      propName: propKey,
+      field: fields[propKey],
+      propPath
+    });
   }
   if (value && typeof value === "object") {
     if (Array.isArray(value)) {
@@ -150,7 +178,7 @@ var walkField = ({
         (el, idx) => walkField({
           value: el,
           fields: arrayFields,
-          map,
+          mappers,
           propKey,
           propPath: `${propPath}[${idx}]`,
           id,
@@ -169,7 +197,7 @@ var walkField = ({
       return walkObject({
         value,
         fields: objectFields,
-        map,
+        mappers,
         id,
         getPropPath: (k) => `${propPath}.${k}`,
         config,
@@ -182,7 +210,7 @@ var walkField = ({
 var walkObject = ({
   value,
   fields,
-  map,
+  mappers,
   id,
   getPropPath,
   config,
@@ -192,7 +220,7 @@ var walkObject = ({
     const opts = {
       value: v,
       fields,
-      map,
+      mappers,
       propKey: k,
       propPath: getPropPath(k),
       id,
@@ -214,14 +242,14 @@ var walkObject = ({
   }
   return flatten(newProps);
 };
-function mapSlots(item, map, config, recurseSlots = false) {
+function mapFields(item, mappers, config, recurseSlots = false) {
   var _a, _b, _c, _d, _e;
   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: defaultSlots((_b = item.props) != null ? _b : {}, (_c = componentConfig == null ? void 0 : componentConfig.fields) != null ? _c : {}),
     fields: (_d = componentConfig == null ? void 0 : componentConfig.fields) != null ? _d : {},
-    map,
+    mappers,
     id: item.props ? (_e = item.props.id) != null ? _e : "root" : "root",
     getPropPath: (k) => k,
     config,
@@ -237,35 +265,66 @@ function mapSlots(item, map, config, recurseSlots = false) {
   });
 }
 
-// lib/use-slots.tsx
-function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
-  const slotProps = (0, import_react2.useMemo)(() => {
-    const mapped = mapSlots(
-      item,
-      (content, _parentId, propName, field, propPath) => {
-        const wildcardPath = propPath.replace(/\[\d+\]/g, "[*]");
-        const isReadOnly = (readOnly == null ? void 0 : readOnly[propPath]) || (readOnly == null ? void 0 : readOnly[wildcardPath]) || forceReadOnly;
-        const render = isReadOnly ? renderSlotRender : renderSlotEdit;
-        const Slot = (dzProps) => render(__spreadProps(__spreadValues({
-          allow: (field == null ? void 0 : field.type) === "slot" ? field.allow : [],
-          disallow: (field == null ? void 0 : field.type) === "slot" ? field.disallow : []
-        }, dzProps), {
-          zone: propName,
-          content
-        }));
-        return Slot;
-      },
-      config
-    ).props;
+// lib/field-transforms/use-field-transforms.tsx
+function useFieldTransforms(config, item, transforms, readOnly, forceReadOnly) {
+  const mappers = (0, import_react2.useMemo)(() => {
+    return Object.keys(transforms).reduce((acc, _fieldType) => {
+      const fieldType = _fieldType;
+      return __spreadProps(__spreadValues({}, acc), {
+        [fieldType]: (_a) => {
+          var _b = _a, {
+            parentId
+          } = _b, params = __objRest(_b, [
+            "parentId"
+          ]);
+          const wildcardPath = params.propPath.replace(/\[\d+\]/g, "[*]");
+          const isReadOnly = (readOnly == null ? void 0 : readOnly[params.propPath]) || (readOnly == null ? void 0 : readOnly[wildcardPath]) || forceReadOnly || false;
+          const fn = transforms[fieldType];
+          return fn == null ? void 0 : fn(__spreadProps(__spreadValues({}, params), {
+            isReadOnly,
+            componentId: parentId
+          }));
+        }
+      });
+    }, {});
+  }, [transforms, readOnly, forceReadOnly]);
+  const transformedProps = (0, import_react2.useMemo)(() => {
+    const mapped = mapFields(item, mappers, config).props;
     return mapped;
-  }, [config, item, readOnly, forceReadOnly]);
+  }, [config, item, mappers]);
   const mergedProps = (0, import_react2.useMemo)(
-    () => __spreadValues(__spreadValues({}, item.props), slotProps),
-    [item.props, slotProps]
+    () => __spreadValues(__spreadValues({}, item.props), transformedProps),
+    [item.props, transformedProps]
   );
   return mergedProps;
 }
 
+// lib/field-transforms/default-transforms/slot-transform.tsx
+var getSlotTransform = (renderSlotEdit, renderSlotRender = renderSlotEdit) => ({
+  slot: ({ value: content, propName, field, isReadOnly }) => {
+    const render = isReadOnly ? renderSlotRender : renderSlotEdit;
+    const Slot = (dzProps) => render(__spreadProps(__spreadValues({
+      allow: (field == null ? void 0 : field.type) === "slot" ? field.allow : [],
+      disallow: (field == null ? void 0 : field.type) === "slot" ? field.disallow : []
+    }, dzProps), {
+      zone: propName,
+      content
+    }));
+    return Slot;
+  }
+});
+
+// lib/use-slots.tsx
+function useSlots(config, item, renderSlotEdit, renderSlotRender = renderSlotEdit, readOnly, forceReadOnly) {
+  return useFieldTransforms(
+    config,
+    item,
+    getSlotTransform(renderSlotEdit, renderSlotRender),
+    readOnly,
+    forceReadOnly
+  );
+}
+
 // components/SlotRender/server.tsx
 var import_react3 = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -281,7 +340,6 @@ var Item = ({
     Component.render,
     __spreadProps(__spreadValues({}, props), {
       puck: __spreadProps(__spreadValues({}, props.puck), {
-        renderDropZone: DropZoneRender,
         metadata: metadata || {}
       })
     })
@@ -441,24 +499,27 @@ var resolveComponentData = (_0, _1, ..._2) => __async(void 0, [_0, _1, ..._2], f
       resolvedItem.readOnly = readOnly;
     }
   }
-  let itemWithResolvedChildren = yield mapSlots(
+  let itemWithResolvedChildren = yield mapFields(
     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;
-          })
-        )
-      );
-    }),
+    {
+      slot: (_02) => __async(void 0, [_02], function* ({ value }) {
+        const content = value;
+        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) {
@@ -506,9 +567,9 @@ function resolveAllData(_0, _1) {
         },
         "force"
       )).node;
-      const resolvedDeep = yield mapSlots(
+      const resolvedDeep = yield mapFields(
         resolved,
-        processContent,
+        { slot: ({ value }) => processContent(value) },
         config
       );
       onResolveEnd == null ? void 0 : onResolveEnd(toComponent(resolvedDeep));
@@ -542,11 +603,14 @@ function resolveAllData(_0, _1) {
 function walkTree(data, config, callbackFn) {
   var _a, _b;
   const walkItem = (item) => {
-    return mapSlots(
+    return mapFields(
       item,
-      (content, parentId, propName) => {
-        var _a2;
-        return (_a2 = callbackFn(content, { parentId, propName })) != null ? _a2 : content;
+      {
+        slot: ({ value, parentId, propName }) => {
+          var _a2;
+          const content = value;
+          return (_a2 = callbackFn(content, { parentId, propName })) != null ? _a2 : content;
+        }
       },
       config,
       true
@@ -663,7 +727,7 @@ var import_flat = __toESM(require("flat"));
 
 // lib/data/strip-slots.ts
 var stripSlots = (data, config) => {
-  return mapSlots(data, () => null, config);
+  return mapFields(data, { slot: () => null }, config);
 };
 
 // lib/data/flatten-node.ts
@@ -716,18 +780,21 @@ function walkAppState(state, config, mapContent = (content) => content, mapNodeO
     const mappedItem = mapNodeOrSkip(item, path, index);
     if (!mappedItem) return item;
     const id = mappedItem.props.id;
-    const newProps = __spreadProps(__spreadValues({}, mapSlots(
+    const newProps = __spreadProps(__spreadValues({}, mapFields(
       mappedItem,
-      (content, parentId2, slotId) => {
-        const zoneCompound = `${parentId2}:${slotId}`;
-        const [_2, newContent2] = processContent(
-          path,
-          zoneCompound,
-          content,
-          "slot",
-          parentId2
-        );
-        return newContent2;
+      {
+        slot: ({ value, parentId: parentId2, propPath }) => {
+          const content = value;
+          const zoneCompound = `${parentId2}:${propPath}`;
+          const [_2, newContent2] = processContent(
+            path,
+            zoneCompound,
+            content,
+            "slot",
+            parentId2
+          );
+          return newContent2;
+        }
       },
       config
     ).props), {

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-32MJ3X3H.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,