@makeswift/runtime 0.29.0-canary.20 → 0.29.0-canary.22

package/dist/cjs/runtimes/react/hooks/use-server-element-refresh.js

@@ -29,36 +29,31 @@ var import_use_api_resources_client = require("./use-api-resources-client");
 const useServerElementRefresh = ({
   elementKey
 }) => {
-  const requestIdRef = (0, import_react.useRef)(0);
-  const lastAppliedRequestId = (0, import_react.useRef)(0);
   const { renderRSCElement } = (0, import_use_framework_context.useFrameworkContext)();
-  const { updateElement } = (0, import_server_elements_cache.useServerElementsCache)();
+  const { beginRefresh } = (0, import_server_elements_cache.useServerElementsCache)();
   const documentKey = (0, import_use_document_context.useDocumentKey)();
   const documentLocale = (0, import_use_document_context.useDocumentLocale)();
   const apiResourcesClient = (0, import_use_api_resources_client.useApiResourcesClient)();
-  (0, import_react.useEffect)(() => {
-    return () => {
-      lastAppliedRequestId.current = ++requestIdRef.current;
-    };
-  }, []);
   return (0, import_react.useCallback)(
-    async (elementData) => {
+    async (elementData, onCommitted) => {
       if (!documentKey)
-        return false;
+        return;
       if (elementData.key !== elementKey) {
         console.error(
           `Cannot refresh server element: mismatching element key '${elementData.key}' != '${elementKey}'`
         );
-        return false;
+        return;
       }
       if (!renderRSCElement) {
         console.error(
           `Cannot refresh server element '${elementKey}' of type '${elementData.type}': \`renderRSCElement\` callback is null`
         );
-        return false;
+        return;
       }
       try {
-        const requestId = ++requestIdRef.current;
+        const commit = beginRefresh(elementKey, onCommitted);
+        if (commit == null)
+          return;
         const reactNode = await renderRSCElement({
           elementData,
           cacheData: apiResourcesClient.cacheData,
@@ -67,20 +62,15 @@ const useServerElementRefresh = ({
             locale: documentLocale ?? void 0
           }
         });
-        if (requestId > lastAppliedRequestId.current) {
-          updateElement(elementKey, reactNode);
-          lastAppliedRequestId.current = requestId;
-          return true;
-        }
+        commit(reactNode);
       } catch (error) {
         console.error(
           `Failed to refresh server element '${elementKey}' of type '${elementData.type}'`,
           error
         );
       }
-      return false;
     },
-    [renderRSCElement, documentKey, documentLocale, elementKey, apiResourcesClient, updateElement]
+    [renderRSCElement, documentKey, documentLocale, elementKey, apiResourcesClient, beginRefresh]
   );
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/runtimes/react/hooks/use-server-element-refresh.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-server-element-refresh.tsx"],"sourcesContent":["import { useCallback, useEffect, useRef } from 'react'\n\nimport { type ElementData } from '../../../state/read-only-state'\n\nimport { useFrameworkContext } from '../components/hooks/use-framework-context'\nimport { useServerElementsCache } from '../server/components/server-elements-cache'\n\nimport { useDocumentKey, useDocumentLocale } from './use-document-context'\nimport { useApiResourcesClient } from './use-api-resources-client'\n\n/**\n * Returns a element-scoped callback that renders the provided element data on\n * the server and stores the result in the server element cache under the\n * provided element key.\n *\n * The callback returns true only if the element render succeeds and is committed\n * to the cache. Returns false when rendering is unavailable, fails, or produces a\n * stale/out-of-order result.\n */\nexport const useServerElementRefresh = ({\n  elementKey,\n}: {\n  elementKey: string\n}): ((elementData: ElementData) => Promise<boolean>) => {\n  const requestIdRef = useRef(0)\n  const lastAppliedRequestId = useRef(0)\n\n  const { renderRSCElement } = useFrameworkContext()\n  const { updateElement } = useServerElementsCache()\n\n  const documentKey = useDocumentKey()\n  const documentLocale = useDocumentLocale()\n  const apiResourcesClient = useApiResourcesClient()\n\n  useEffect(() => {\n    // Invalidate all in-flight requests on unmount so they cannot update the cache\n    return () => {\n      // eslint-disable-next-line react-hooks/exhaustive-deps\n      lastAppliedRequestId.current = ++requestIdRef.current\n    }\n  }, [])\n\n  return useCallback(\n    async (elementData: ElementData): Promise<boolean> => {\n      if (!documentKey) return false\n      if (elementData.key !== elementKey) {\n        console.error(\n          `Cannot refresh server element: mismatching element key '${elementData.key}' != '${elementKey}'`,\n        )\n        return false\n      }\n\n      if (!renderRSCElement) {\n        console.error(\n          `Cannot refresh server element '${elementKey}' of type '${elementData.type}': \\`renderRSCElement\\` callback is null`,\n        )\n        return false\n      }\n\n      try {\n        // Assign each server refresh a sequential ID so we can track response\n        // arrival and ignore out-of-order results\n        const requestId = ++requestIdRef.current\n        const reactNode = await renderRSCElement({\n          elementData,\n          cacheData: apiResourcesClient.cacheData,\n          documentContext: {\n            key: documentKey,\n            locale: documentLocale ?? undefined,\n          },\n        })\n\n        if (requestId > lastAppliedRequestId.current) {\n          updateElement(elementKey, reactNode)\n          lastAppliedRequestId.current = requestId\n          return true\n        }\n      } catch (error) {\n        console.error(\n          `Failed to refresh server element '${elementKey}' of type '${elementData.type}'`,\n          error,\n        )\n      }\n\n      return false\n    },\n    [renderRSCElement, documentKey, documentLocale, elementKey, apiResourcesClient, updateElement],\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA+C;AAI/C,mCAAoC;AACpC,mCAAuC;AAEvC,kCAAkD;AAClD,sCAAsC;AAW/B,MAAM,0BAA0B,CAAC;AAAA,EACtC;AACF,MAEwD;AACtD,QAAM,mBAAe,qBAAO,CAAC;AAC7B,QAAM,2BAAuB,qBAAO,CAAC;AAErC,QAAM,EAAE,iBAAiB,QAAI,kDAAoB;AACjD,QAAM,EAAE,cAAc,QAAI,qDAAuB;AAEjD,QAAM,kBAAc,4CAAe;AACnC,QAAM,qBAAiB,+CAAkB;AACzC,QAAM,yBAAqB,uDAAsB;AAEjD,8BAAU,MAAM;AAEd,WAAO,MAAM;AAEX,2BAAqB,UAAU,EAAE,aAAa;AAAA,IAChD;AAAA,EACF,GAAG,CAAC,CAAC;AAEL,aAAO;AAAA,IACL,OAAO,gBAA+C;AACpD,UAAI,CAAC;AAAa,eAAO;AACzB,UAAI,YAAY,QAAQ,YAAY;AAClC,gBAAQ;AAAA,UACN,2DAA2D,YAAY,GAAG,SAAS,UAAU;AAAA,QAC/F;AACA,eAAO;AAAA,MACT;AAEA,UAAI,CAAC,kBAAkB;AACrB,gBAAQ;AAAA,UACN,kCAAkC,UAAU,cAAc,YAAY,IAAI;AAAA,QAC5E;AACA,eAAO;AAAA,MACT;AAEA,UAAI;AAGF,cAAM,YAAY,EAAE,aAAa;AACjC,cAAM,YAAY,MAAM,iBAAiB;AAAA,UACvC;AAAA,UACA,WAAW,mBAAmB;AAAA,UAC9B,iBAAiB;AAAA,YACf,KAAK;AAAA,YACL,QAAQ,kBAAkB;AAAA,UAC5B;AAAA,QACF,CAAC;AAED,YAAI,YAAY,qBAAqB,SAAS;AAC5C,wBAAc,YAAY,SAAS;AACnC,+BAAqB,UAAU;AAC/B,iBAAO;AAAA,QACT;AAAA,MACF,SAAS,OAAO;AACd,gBAAQ;AAAA,UACN,qCAAqC,UAAU,cAAc,YAAY,IAAI;AAAA,UAC7E;AAAA,QACF;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,IACA,CAAC,kBAAkB,aAAa,gBAAgB,YAAY,oBAAoB,aAAa;AAAA,EAC/F;AACF;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-server-element-refresh.tsx"],"sourcesContent":["import { useCallback } from 'react'\n\nimport { type ElementData } from '../../../state/read-only-state'\n\nimport { useFrameworkContext } from '../components/hooks/use-framework-context'\nimport { useServerElementsCache } from '../server/components/server-elements-cache'\n\nimport { useDocumentKey, useDocumentLocale } from './use-document-context'\nimport { useApiResourcesClient } from './use-api-resources-client'\n\n/**\n * Returns a element-scoped callback that renders the provided element data on\n * the server and stores the result in the server element cache under the\n * provided element key.\n *\n * Calls the `onCommitted` callback once after a successfully rendered node is\n * committed to the current React tree.\n */\nexport const useServerElementRefresh = ({\n  elementKey,\n}: {\n  elementKey: string\n}): ((elementData: ElementData, onCommitted?: () => void) => Promise<void>) => {\n  const { renderRSCElement } = useFrameworkContext()\n  const { beginRefresh } = useServerElementsCache()\n\n  const documentKey = useDocumentKey()\n  const documentLocale = useDocumentLocale()\n  const apiResourcesClient = useApiResourcesClient()\n\n  return useCallback(\n    async (elementData: ElementData, onCommitted?: () => void): Promise<void> => {\n      if (!documentKey) return\n      if (elementData.key !== elementKey) {\n        console.error(\n          `Cannot refresh server element: mismatching element key '${elementData.key}' != '${elementKey}'`,\n        )\n        return\n      }\n\n      if (!renderRSCElement) {\n        console.error(\n          `Cannot refresh server element '${elementKey}' of type '${elementData.type}': \\`renderRSCElement\\` callback is null`,\n        )\n        return\n      }\n\n      try {\n        const commit = beginRefresh(elementKey, onCommitted)\n        if (commit == null) return\n\n        const reactNode = await renderRSCElement({\n          elementData,\n          cacheData: apiResourcesClient.cacheData,\n          documentContext: {\n            key: documentKey,\n            locale: documentLocale ?? undefined,\n          },\n        })\n\n        commit(reactNode)\n      } catch (error) {\n        console.error(\n          `Failed to refresh server element '${elementKey}' of type '${elementData.type}'`,\n          error,\n        )\n      }\n    },\n    [renderRSCElement, documentKey, documentLocale, elementKey, apiResourcesClient, beginRefresh],\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA4B;AAI5B,mCAAoC;AACpC,mCAAuC;AAEvC,kCAAkD;AAClD,sCAAsC;AAU/B,MAAM,0BAA0B,CAAC;AAAA,EACtC;AACF,MAE+E;AAC7E,QAAM,EAAE,iBAAiB,QAAI,kDAAoB;AACjD,QAAM,EAAE,aAAa,QAAI,qDAAuB;AAEhD,QAAM,kBAAc,4CAAe;AACnC,QAAM,qBAAiB,+CAAkB;AACzC,QAAM,yBAAqB,uDAAsB;AAEjD,aAAO;AAAA,IACL,OAAO,aAA0B,gBAA4C;AAC3E,UAAI,CAAC;AAAa;AAClB,UAAI,YAAY,QAAQ,YAAY;AAClC,gBAAQ;AAAA,UACN,2DAA2D,YAAY,GAAG,SAAS,UAAU;AAAA,QAC/F;AACA;AAAA,MACF;AAEA,UAAI,CAAC,kBAAkB;AACrB,gBAAQ;AAAA,UACN,kCAAkC,UAAU,cAAc,YAAY,IAAI;AAAA,QAC5E;AACA;AAAA,MACF;AAEA,UAAI;AACF,cAAM,SAAS,aAAa,YAAY,WAAW;AACnD,YAAI,UAAU;AAAM;AAEpB,cAAM,YAAY,MAAM,iBAAiB;AAAA,UACvC;AAAA,UACA,WAAW,mBAAmB;AAAA,UAC9B,iBAAiB;AAAA,YACf,KAAK;AAAA,YACL,QAAQ,kBAAkB;AAAA,UAC5B;AAAA,QACF,CAAC;AAED,eAAO,SAAS;AAAA,MAClB,SAAS,OAAO;AACd,gBAAQ;AAAA,UACN,qCAAqC,UAAU,cAAc,YAAY,IAAI;AAAA,UAC7E;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,IACA,CAAC,kBAAkB,aAAa,gBAAgB,YAAY,oBAAoB,YAAY;AAAA,EAC9F;AACF;","names":[]}

package/dist/cjs/runtimes/react/server/components/editable-server-element.js

@@ -24,6 +24,8 @@ __export(editable_server_element_exports, {
 module.exports = __toCommonJS(editable_server_element_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
+var import_read_write_state = require("../../../../state/read-write-state");
+var import_unified_state = require("../../../../state/unified-state");
 var import_read_write_actions = require("../../../../state/actions/internal/read-write-actions");
 var import_use_server_element_refresh = require("../../hooks/use-server-element-refresh");
 var import_use_element_data = require("../../hooks/use-element-data");
@@ -31,6 +33,7 @@ var import_use_control_defs = require("../../hooks/use-control-defs");
 var import_use_resolved_props = require("../../hooks/use-resolved-props");
 var import_control_instances_context = require("../../components/control-instances-context");
 var import_use_dispatch = require("../../hooks/use-dispatch");
+var import_use_store = require("../../hooks/use-store");
 var import_use_document_context = require("../../hooks/use-document-context");
 var import_prop_by_path = require("../../../../utils/prop-by-path");
 var import_set = require("../../../../utils/set");
@@ -52,6 +55,7 @@ const EditableServerElementWrapper = ({
   children
 }) => {
   const elementKey = initialElementData.key;
+  const store = (0, import_use_store.useStore)();
   const dispatch = (0, import_use_dispatch.useDispatch)();
   const documentKey = (0, import_use_document_context.useDocumentKey)();
   const [_legacyDefs, definitions] = (0, import_use_control_defs.useControlDefs)({ elementType: initialElementData.type });
@@ -70,17 +74,18 @@ const EditableServerElementWrapper = ({
   );
   const serverRefresh = (0, import_use_server_element_refresh.useServerElementRefresh)({ elementKey });
   const applyServerRefresh = (0, import_react.useCallback)(
-    (elementData2, leafInstances, documentKey2) => (0, import_react.startTransition)(async () => {
-      const applied = await serverRefresh(elementData2);
-      if (!applied)
-        return;
-      (0, import_react.startTransition)(() => {
-        leafInstances.forEach(
-          (c) => dispatch((0, import_read_write_actions.clearResolvedValueOverride)({ documentKey: documentKey2, instanceKey: c.instanceKey }))
-        );
+    (elementData2, documentKey2) => (0, import_react.startTransition)(async () => {
+      const state = store.getState();
+      const generation = (0, import_unified_state.isReadWriteState)(state) ? (0, import_read_write_state.getResolvedValueOverridesGeneration)(state) : null;
+      await serverRefresh(elementData2, () => {
+        if (generation == null)
+          return;
+        (0, import_react.startTransition)(() => {
+          dispatch((0, import_read_write_actions.clearStaleResolvedValueOverrides)({ documentKey: documentKey2, elementKey, generation }));
+        });
       });
     }),
-    [serverRefresh, dispatch]
+    [serverRefresh, dispatch, store, elementKey]
   );
   const applyResolvedValueOverrides = (0, import_react.useCallback)(
     (instances, props, documentKey2) => instances.forEach(
@@ -98,21 +103,21 @@ const EditableServerElementWrapper = ({
     if (documentKey == null)
       return;
     if (children == null) {
-      const { leafInstances, leafProps } = getLeafPropsAndInstances(resolvedProps, controlInstances);
-      applyServerRefresh(elementData, leafInstances, documentKey);
+      const { leafProps } = getLeafPropsAndInstances(resolvedProps, controlInstances);
+      applyServerRefresh(elementData, documentKey);
       prevPropsRef.current = resolvedProps;
       prevLeafPropsRef.current = leafProps;
       return;
     }
     if (resolvedProps !== prevPropsRef.current) {
-      const { needsRefresh, leafInstances, leafProps, reactNodeInstances } = needsServerRefresh({
+      const { needsRefresh, leafProps, reactNodeInstances } = needsServerRefresh({
         resolvedProps,
         controlInstances,
         prevProps: prevPropsRef.current,
         prevLeafProps: prevLeafPropsRef.current
       });
       if (needsRefresh) {
-        applyServerRefresh(elementData, leafInstances, documentKey);
+        applyServerRefresh(elementData, documentKey);
       } else {
         applyResolvedValueOverrides(reactNodeInstances, resolvedProps, documentKey);
       }
@@ -155,7 +160,6 @@ const needsServerRefresh = ({
   const needsRefresh = (0, import_set.setDifference)(updatedLeafProps, reactNodePropKeys).size > 0 || newlyAddedLeafProps.size > 0;
   return {
     needsRefresh,
-    leafInstances,
     leafProps,
     reactNodeInstances
   };

package/dist/cjs/runtimes/react/server/components/editable-server-element.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/runtimes/react/server/components/editable-server-element.tsx"],"sourcesContent":["'use client'\n\nimport { type PropsWithChildren, useEffect, useRef, startTransition, useCallback } from 'react'\n\nimport { ControlInstance } from '@makeswift/controls'\n\nimport { type ElementData } from '../../../../state/read-only-state'\nimport {\n  setResolvedValueOverride,\n  clearResolvedValueOverride,\n} from '../../../../state/actions/internal/read-write-actions'\n\nimport { useServerElementRefresh } from '../../hooks/use-server-element-refresh'\nimport { useElementData } from '../../hooks/use-element-data'\nimport { useControlDefs } from '../../hooks/use-control-defs'\nimport { useResolvedProps } from '../../hooks/use-resolved-props'\nimport { useControlInstances } from '../../components/control-instances-context'\nimport { useDispatch } from '../../hooks/use-dispatch'\nimport { useDocumentKey } from '../../hooks/use-document-context'\n\nimport { getProp } from '../../../../utils/prop-by-path'\nimport { setUnion, setDifference } from '../../../../utils/set'\nimport { useControlledStyles } from '../../css-runtime/hooks/use-controlled-styles'\n\nexport const EditableServerElement = ({\n  initialElementData,\n  children,\n}: PropsWithChildren<{ initialElementData: ElementData }>) => {\n  const elementKey = initialElementData.key\n  const elementData = useElementData({ elementKey })\n  if (elementData == null) {\n    // Element has been deleted\n    return null\n  }\n\n  return (\n    <EditableServerElementWrapper {...{ initialElementData, elementData }}>\n      {children}\n    </EditableServerElementWrapper>\n  )\n}\n\n/**\n * Reflects edits to `elementData.props` in the server-rendered `children`.\n * Changes limited to existing `ReactNode` props are applied through client-side\n * overrides. Style prop changes are handled by the stylesheet engine during\n * prop resolution. All other prop changes trigger a server refresh.\n */\nconst EditableServerElementWrapper = ({\n  initialElementData,\n  elementData,\n  children,\n}: PropsWithChildren<{ initialElementData: ElementData; elementData: ElementData }>) => {\n  const elementKey = initialElementData.key\n  const dispatch = useDispatch()\n  const documentKey = useDocumentKey()\n\n  const [_legacyDefs, definitions] = useControlDefs({ elementType: initialElementData.type })\n  const { getStylesheet, styleElements } = useControlledStyles({ namespace: elementKey })\n\n  const controlInstances = useControlInstances(elementKey)\n  const resolvedProps = useResolvedProps({\n    elementKey,\n    propDefs: definitions,\n    propData: elementData.props,\n    controlInstances,\n    getStylesheet,\n  })\n\n  const prevPropsRef = useRef(resolvedProps)\n  const prevLeafPropsRef = useRef(\n    getLeafPropsAndInstances(resolvedProps, controlInstances).leafProps,\n  )\n\n  const serverRefresh = useServerElementRefresh({ elementKey })\n  const applyServerRefresh = useCallback(\n    (elementData: ElementData, leafInstances: ControlInstance[], documentKey: string) =>\n      startTransition(async () => {\n        const applied = await serverRefresh(elementData)\n        if (!applied) return\n\n        // need a nested `startTransition` here, see\n        // https://react.dev/reference/react/useTransition#react-doesnt-treat-my-state-update-after-await-as-a-transition\n        startTransition(() => {\n          // reset instance overrides, if any\n          leafInstances.forEach(c =>\n            dispatch(clearResolvedValueOverride({ documentKey, instanceKey: c.instanceKey })),\n          )\n        })\n      }),\n    [serverRefresh, dispatch],\n  )\n\n  const applyResolvedValueOverrides = useCallback(\n    (instances: ControlInstance[], props: Record<string, unknown>, documentKey: string) =>\n      instances.forEach(c =>\n        dispatch(\n          setResolvedValueOverride({\n            documentKey,\n            instanceKey: c.instanceKey,\n            value: getProp(props, c.propPath),\n          }),\n        ),\n      ),\n    [dispatch],\n  )\n\n  useEffect(() => {\n    if (documentKey == null) return\n\n    if (children == null) {\n      // If we don't have a server-rendered node (i.e. user just dropped the element to the page),\n      // trigger a server re-render\n      const { leafInstances, leafProps } = getLeafPropsAndInstances(resolvedProps, controlInstances)\n\n      applyServerRefresh(elementData, leafInstances, documentKey)\n\n      prevPropsRef.current = resolvedProps\n      prevLeafPropsRef.current = leafProps\n      return\n    }\n\n    if (resolvedProps !== prevPropsRef.current) {\n      // If there was a change in resolved value, check if any of the changed props necessitate\n      // a server refresh.\n      //\n      // Note that style props have stable class names and updating a style prop will not result\n      // in a change to the resolved value, which is what we want. Dynamic style updates are handled\n      // through a subscription mechanism that listens for changes to controlled style data in the\n      // styles registry.\n      const { needsRefresh, leafInstances, leafProps, reactNodeInstances } = needsServerRefresh({\n        resolvedProps,\n        controlInstances,\n        prevProps: prevPropsRef.current,\n        prevLeafProps: prevLeafPropsRef.current,\n      })\n\n      if (needsRefresh) {\n        applyServerRefresh(elementData, leafInstances, documentKey)\n      } else {\n        applyResolvedValueOverrides(reactNodeInstances, resolvedProps, documentKey)\n      }\n\n      prevPropsRef.current = resolvedProps\n      prevLeafPropsRef.current = leafProps\n    }\n  }, [\n    children,\n    resolvedProps,\n    documentKey,\n    elementData,\n    controlInstances,\n    applyServerRefresh,\n    applyResolvedValueOverrides,\n  ])\n\n  return (\n    <>\n      {children}\n      {styleElements}\n    </>\n  )\n}\n\n/**\n * Determines whether resolved prop changes require a server refresh and returns\n * the control-instance state needed to apply the update.\n */\nconst needsServerRefresh = ({\n  resolvedProps,\n  controlInstances,\n  prevProps,\n  prevLeafProps,\n}: {\n  resolvedProps: Record<string, unknown>\n  controlInstances: Record<string, ControlInstance> | null\n  prevProps: Record<string, unknown>\n  prevLeafProps: Set<string>\n}): {\n  needsRefresh: boolean\n  leafInstances: ControlInstance[]\n  leafProps: Set<string>\n  reactNodeInstances: ControlInstance[]\n} => {\n  const { leafInstances, leafProps } = getLeafPropsAndInstances(resolvedProps, controlInstances)\n\n  const combinedLeafProps = setUnion(leafProps, prevLeafProps).values()\n  const updatedLeafProps = new Set(\n    [...combinedLeafProps].filter(\n      propName => getProp(resolvedProps, propName) !== getProp(prevProps, propName),\n    ),\n  )\n\n  const updatedLeafInstances = leafInstances.filter(instance =>\n    updatedLeafProps.has(instance.propPath),\n  )\n\n  const reactNodeInstances = updatedLeafInstances.filter(c => c.resolvesToRenderableNode())\n\n  const reactNodePropKeys = new Set(reactNodeInstances.map(c => c.propPath))\n  const newlyAddedLeafProps = setDifference(leafProps, prevLeafProps)\n\n  // A server refresh is needed if some of the updated props are not `ReactNode` props, or we\n  // have newly observed props (typically `List` items). Even when newly observed props are\n  // `ReactNode` props, we have to first render them on the server to get them in the element\n  // tree before they can be updated client-side.\n  const needsRefresh =\n    setDifference(updatedLeafProps, reactNodePropKeys).size > 0 || newlyAddedLeafProps.size > 0\n\n  return {\n    needsRefresh,\n    leafInstances,\n    leafProps,\n    reactNodeInstances,\n  }\n}\n\n/**\n *  Returns terminal prop paths with the corresponding control instances.\n */\nconst getLeafPropsAndInstances = (\n  props: Record<string, unknown>,\n  controlInstances: Record<string, ControlInstance> | null,\n): {\n  leafProps: Set<string>\n  leafInstances: ControlInstance[]\n} => {\n  const topLevelInstances = Object.keys(props)\n    .map(prop => controlInstances?.[prop])\n    .filter(inst => inst != null)\n\n  const leafInstances = getLeafInstances(topLevelInstances)\n  const leafProps = new Set(leafInstances.map(c => c.propPath))\n  return { leafProps, leafInstances }\n}\n\n/**\n * Flattens a control instance tree to its leaf (terminal) instances.\n */\nconst getLeafInstances = (instances: ControlInstance[]): ControlInstance[] =>\n  instances.flatMap(instance =>\n    instance.isCompositeProp() ? getLeafInstances(instance.children()) : [instance],\n  )\n"],"mappings":"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","names":["elementData","documentKey"]}
+{"version":3,"sources":["../../../../../../src/runtimes/react/server/components/editable-server-element.tsx"],"sourcesContent":["'use client'\n\nimport { type PropsWithChildren, useEffect, useRef, startTransition, useCallback } from 'react'\n\nimport { ControlInstance } from '@makeswift/controls'\n\nimport { type ElementData } from '../../../../state/read-only-state'\nimport { getResolvedValueOverridesGeneration } from '../../../../state/read-write-state'\nimport { isReadWriteState } from '../../../../state/unified-state'\nimport {\n  setResolvedValueOverride,\n  clearStaleResolvedValueOverrides,\n} from '../../../../state/actions/internal/read-write-actions'\n\nimport { useServerElementRefresh } from '../../hooks/use-server-element-refresh'\nimport { useElementData } from '../../hooks/use-element-data'\nimport { useControlDefs } from '../../hooks/use-control-defs'\nimport { useResolvedProps } from '../../hooks/use-resolved-props'\nimport { useControlInstances } from '../../components/control-instances-context'\nimport { useDispatch } from '../../hooks/use-dispatch'\nimport { useStore } from '../../hooks/use-store'\nimport { useDocumentKey } from '../../hooks/use-document-context'\n\nimport { getProp } from '../../../../utils/prop-by-path'\nimport { setUnion, setDifference } from '../../../../utils/set'\nimport { useControlledStyles } from '../../css-runtime/hooks/use-controlled-styles'\n\nexport const EditableServerElement = ({\n  initialElementData,\n  children,\n}: PropsWithChildren<{ initialElementData: ElementData }>) => {\n  const elementKey = initialElementData.key\n  const elementData = useElementData({ elementKey })\n  if (elementData == null) {\n    // Element has been deleted\n    return null\n  }\n\n  return (\n    <EditableServerElementWrapper {...{ initialElementData, elementData }}>\n      {children}\n    </EditableServerElementWrapper>\n  )\n}\n\n/**\n * Reflects edits to `elementData.props` in the server-rendered `children`.\n * Changes limited to existing `ReactNode` props are applied through client-side\n * overrides. Style prop changes are handled by the stylesheet engine during\n * prop resolution. All other prop changes trigger a server refresh.\n */\nconst EditableServerElementWrapper = ({\n  initialElementData,\n  elementData,\n  children,\n}: PropsWithChildren<{ initialElementData: ElementData; elementData: ElementData }>) => {\n  const elementKey = initialElementData.key\n  const store = useStore()\n  const dispatch = useDispatch()\n  const documentKey = useDocumentKey()\n\n  const [_legacyDefs, definitions] = useControlDefs({ elementType: initialElementData.type })\n  const { getStylesheet, styleElements } = useControlledStyles({ namespace: elementKey })\n\n  const controlInstances = useControlInstances(elementKey)\n  const resolvedProps = useResolvedProps({\n    elementKey,\n    propDefs: definitions,\n    propData: elementData.props,\n    controlInstances,\n    getStylesheet,\n  })\n\n  const prevPropsRef = useRef(resolvedProps)\n  const prevLeafPropsRef = useRef(\n    getLeafPropsAndInstances(resolvedProps, controlInstances).leafProps,\n  )\n\n  const serverRefresh = useServerElementRefresh({ elementKey })\n  const applyServerRefresh = useCallback(\n    (elementData: ElementData, documentKey: string) =>\n      startTransition(async () => {\n        const state = store.getState()\n        // Capture the overrides generation prior to initiating server refresh so that we\n        // only clear the overrides that haven't been updated while the refresh is in flight\n        const generation = isReadWriteState(state)\n          ? getResolvedValueOverridesGeneration(state)\n          : null\n\n        await serverRefresh(elementData, () => {\n          if (generation == null) return\n          // need a nested `startTransition` here, see\n          // https://react.dev/reference/react/useTransition#react-doesnt-treat-my-state-update-after-await-as-a-transition\n          startTransition(() => {\n            dispatch(clearStaleResolvedValueOverrides({ documentKey, elementKey, generation }))\n          })\n        })\n      }),\n    [serverRefresh, dispatch, store, elementKey],\n  )\n\n  const applyResolvedValueOverrides = useCallback(\n    (instances: ControlInstance[], props: Record<string, unknown>, documentKey: string) =>\n      instances.forEach(c =>\n        dispatch(\n          setResolvedValueOverride({\n            documentKey,\n            instanceKey: c.instanceKey,\n            value: getProp(props, c.propPath),\n          }),\n        ),\n      ),\n    [dispatch],\n  )\n\n  useEffect(() => {\n    if (documentKey == null) return\n\n    if (children == null) {\n      // If we don't have a server-rendered node (i.e. user just dropped the element to the page),\n      // trigger a server re-render\n      const { leafProps } = getLeafPropsAndInstances(resolvedProps, controlInstances)\n\n      applyServerRefresh(elementData, documentKey)\n\n      prevPropsRef.current = resolvedProps\n      prevLeafPropsRef.current = leafProps\n      return\n    }\n\n    if (resolvedProps !== prevPropsRef.current) {\n      // If there was a change in resolved value, check if any of the changed props necessitate\n      // a server refresh.\n      //\n      // Note that style props have stable class names and updating a style prop will not result\n      // in a change to the resolved value, which is what we want. Dynamic style updates are handled\n      // through a subscription mechanism that listens for changes to controlled style data in the\n      // styles registry.\n      const { needsRefresh, leafProps, reactNodeInstances } = needsServerRefresh({\n        resolvedProps,\n        controlInstances,\n        prevProps: prevPropsRef.current,\n        prevLeafProps: prevLeafPropsRef.current,\n      })\n\n      if (needsRefresh) {\n        applyServerRefresh(elementData, documentKey)\n      } else {\n        applyResolvedValueOverrides(reactNodeInstances, resolvedProps, documentKey)\n      }\n\n      prevPropsRef.current = resolvedProps\n      prevLeafPropsRef.current = leafProps\n    }\n  }, [\n    children,\n    resolvedProps,\n    documentKey,\n    elementData,\n    controlInstances,\n    applyServerRefresh,\n    applyResolvedValueOverrides,\n  ])\n\n  return (\n    <>\n      {children}\n      {styleElements}\n    </>\n  )\n}\n\n/**\n * Determines whether resolved prop changes require a server refresh and returns\n * the control-instance state needed to apply the update.\n */\nconst needsServerRefresh = ({\n  resolvedProps,\n  controlInstances,\n  prevProps,\n  prevLeafProps,\n}: {\n  resolvedProps: Record<string, unknown>\n  controlInstances: Record<string, ControlInstance> | null\n  prevProps: Record<string, unknown>\n  prevLeafProps: Set<string>\n}): {\n  needsRefresh: boolean\n  leafProps: Set<string>\n  reactNodeInstances: ControlInstance[]\n} => {\n  const { leafInstances, leafProps } = getLeafPropsAndInstances(resolvedProps, controlInstances)\n\n  const combinedLeafProps = setUnion(leafProps, prevLeafProps).values()\n  const updatedLeafProps = new Set(\n    [...combinedLeafProps].filter(\n      propName => getProp(resolvedProps, propName) !== getProp(prevProps, propName),\n    ),\n  )\n\n  const updatedLeafInstances = leafInstances.filter(instance =>\n    updatedLeafProps.has(instance.propPath),\n  )\n\n  const reactNodeInstances = updatedLeafInstances.filter(c => c.resolvesToRenderableNode())\n\n  const reactNodePropKeys = new Set(reactNodeInstances.map(c => c.propPath))\n  const newlyAddedLeafProps = setDifference(leafProps, prevLeafProps)\n\n  // A server refresh is needed if some of the updated props are not `ReactNode` props, or we\n  // have newly observed props (typically `List` items). Even when newly observed props are\n  // `ReactNode` props, we have to first render them on the server to get them in the element\n  // tree before they can be updated client-side.\n  const needsRefresh =\n    setDifference(updatedLeafProps, reactNodePropKeys).size > 0 || newlyAddedLeafProps.size > 0\n\n  return {\n    needsRefresh,\n    leafProps,\n    reactNodeInstances,\n  }\n}\n\n/**\n *  Returns terminal prop paths with the corresponding control instances.\n */\nconst getLeafPropsAndInstances = (\n  props: Record<string, unknown>,\n  controlInstances: Record<string, ControlInstance> | null,\n): {\n  leafProps: Set<string>\n  leafInstances: ControlInstance[]\n} => {\n  const topLevelInstances = Object.keys(props)\n    .map(prop => controlInstances?.[prop])\n    .filter(inst => inst != null)\n\n  const leafInstances = getLeafInstances(topLevelInstances)\n  const leafProps = new Set(leafInstances.map(c => c.propPath))\n  return { leafProps, leafInstances }\n}\n\n/**\n * Flattens a control instance tree to its leaf (terminal) instances.\n */\nconst getLeafInstances = (instances: ControlInstance[]): ControlInstance[] =>\n  instances.flatMap(instance =>\n    instance.isCompositeProp() ? getLeafInstances(instance.children()) : [instance],\n  )\n"],"mappings":"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","names":["elementData","documentKey"]}

package/dist/cjs/runtimes/react/server/components/server-elements-cache.js

@@ -26,41 +26,91 @@ __export(server_elements_cache_exports, {
 module.exports = __toCommonJS(server_elements_cache_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
+var import_useIsomorphicLayoutEffect = require("../../../../components/hooks/useIsomorphicLayoutEffect");
+const createCacheState = (initialElements) => ({
+  initialElements,
+  elements: new Map(Array.from(initialElements, ([key, node]) => [key, { node }])),
+  refreshScope: {
+    active: false,
+    requestsByElement: /* @__PURE__ */ new Map()
+  }
+});
 const Context = (0, import_react.createContext)({
   getElement: () => null,
-  updateElement: () => {
-  },
-  removeElement: () => {
-  }
+  beginRefresh: () => null
 });
 const ServerElementsCache = ({
   children,
   value
 }) => {
-  const [nodes, setNodes] = (0, import_react.useState)(value);
-  const [previousValue, setPreviousValue] = (0, import_react.useState)(value);
-  if (value !== previousValue) {
-    setPreviousValue(value);
-    setNodes(value);
+  const [state, setState] = (0, import_react.useState)(() => createCacheState(value));
+  if (state.initialElements !== value) {
+    setState(createCacheState(value));
   }
-  const getElement = (0, import_react.useCallback)((elementKey) => nodes.get(elementKey), [nodes]);
-  const updateElement = (0, import_react.useCallback)(
-    (elementKey, node) => setNodes((prev) => new Map(prev).set(elementKey, node)),
-    []
-  );
-  const removeElement = (0, import_react.useCallback)(
-    (elementKey) => setNodes((prev) => {
-      const next = new Map(prev);
-      next.delete(elementKey);
-      return next;
-    }),
-    []
+  const { elements, refreshScope } = state;
+  (0, import_useIsomorphicLayoutEffect.useIsomorphicLayoutEffect)(() => {
+    refreshScope.active = true;
+    return () => {
+      refreshScope.active = false;
+    };
+  }, [refreshScope]);
+  const getElement = (0, import_react.useCallback)(
+    // Always wrap the node in `<RefreshCommitObserver>` so adding a commit callback
+    // during refresh doesn't change the tree shape and remount the refreshed node
+    (elementKey) => {
+      const entry = elements.get(elementKey);
+      if (entry == null)
+        return null;
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RefreshCommitObserver, { onCommitted: entry.onCommitted, children: entry.node });
+    },
+    [elements]
   );
-  const cache = (0, import_react.useMemo)(
-    () => ({ getElement, updateElement, removeElement }),
-    [getElement, updateElement, removeElement]
+  const beginRefresh = (0, import_react.useCallback)(
+    (elementKey, onCommitted) => {
+      const { requestsByElement } = refreshScope;
+      const elementRequests = requestsByElement.get(elementKey) ?? {
+        lastIssued: 0,
+        lastAccepted: 0,
+        lastCommitted: 0
+      };
+      requestsByElement.set(elementKey, elementRequests);
+      const requestId = ++elementRequests.lastIssued;
+      return (node) => {
+        if (!refreshScope.active || requestId <= elementRequests.lastAccepted)
+          return;
+        elementRequests.lastAccepted = requestId;
+        const notifyCommitted = () => {
+          if (requestId <= elementRequests.lastCommitted)
+            return;
+          elementRequests.lastCommitted = requestId;
+          const callback = onCommitted;
+          onCommitted = void 0;
+          callback?.();
+        };
+        setState((prev) => {
+          if (prev.refreshScope !== refreshScope)
+            return prev;
+          return {
+            ...prev,
+            elements: new Map(prev.elements).set(elementKey, {
+              node,
+              onCommitted: notifyCommitted
+            })
+          };
+        });
+      };
+    },
+    [refreshScope]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Context.Provider, { value: cache, children });
+  const result = (0, import_react.useMemo)(() => ({ getElement, beginRefresh }), [getElement, beginRefresh]);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Context.Provider, { value: result, children });
+};
+const RefreshCommitObserver = ({
+  children,
+  onCommitted
+}) => {
+  (0, import_react.useEffect)(() => onCommitted?.(), [onCommitted]);
+  return children;
 };
 const ServerElementsProvider = ({
   children,

package/dist/cjs/runtimes/react/server/components/server-elements-cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/runtimes/react/server/components/server-elements-cache.tsx"],"sourcesContent":["'use client'\n\nimport { createContext, ReactNode, useCallback, useContext, useState, useMemo } from 'react'\n\nimport { type ElementsMap } from '../collect-server-elements'\n\ntype ContextValue = {\n  getElement: (elementKey: string) => ReactNode\n  updateElement: (elementKey: string, node: ReactNode) => void\n  removeElement: (elementKey: string) => void\n}\n\nconst Context = createContext<ContextValue>({\n  getElement: () => null,\n  updateElement: () => {},\n  removeElement: () => {},\n})\n\n/**\n * Client-side \"cache\" of server-rendered elements; this is one of the key pieces in our RSC\n * implementation, with React doing the majority of the heavy lifting: when `ReactNode`s are\n * passed as props across a 'use client' boundary, React's flight serializer automatically\n * renders and encodes them in the RSC stream and then reconstructs them on the client. All\n * we need to do on the client is to make these React elements available for lookup/\n * manipulation when editing in the builder.\n */\nexport const ServerElementsCache = ({\n  children,\n  value,\n}: {\n  children: ReactNode\n  value: ElementsMap\n}) => {\n  // An RSC re-render does not inherently remount client components; React can reconcile\n  // the new server tree with the existing client tree, so we need to handle the `value`\n  // prop updates\n  const [nodes, setNodes] = useState(value)\n  const [previousValue, setPreviousValue] = useState(value)\n\n  // this is okay to do on render, see https://react.dev/learn/you-might-not-need-an-effect#adjusting-some-state-when-a-prop-changes\n  if (value !== previousValue) {\n    setPreviousValue(value)\n    setNodes(value)\n  }\n\n  const getElement = useCallback((elementKey: string): ReactNode => nodes.get(elementKey), [nodes])\n\n  const updateElement = useCallback(\n    (elementKey: string, node: ReactNode) => setNodes(prev => new Map(prev).set(elementKey, node)),\n    [],\n  )\n\n  const removeElement = useCallback(\n    (elementKey: string) =>\n      setNodes(prev => {\n        const next = new Map(prev)\n        next.delete(elementKey)\n        return next\n      }),\n    [],\n  )\n\n  const cache = useMemo(\n    () => ({ getElement, updateElement, removeElement }),\n    [getElement, updateElement, removeElement],\n  )\n\n  return <Context.Provider value={cache}>{children}</Context.Provider>\n}\n\nexport const ServerElementsProvider = ({\n  children,\n  elements,\n}: {\n  children: ReactNode\n  elements: ElementsMap\n}) => <ServerElementsCache value={elements}>{children}</ServerElementsCache>\n\nexport const useServerElementsCache = () => useContext(Context)\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAmES;AAjET,mBAAqF;AAUrF,MAAM,cAAU,4BAA4B;AAAA,EAC1C,YAAY,MAAM;AAAA,EAClB,eAAe,MAAM;AAAA,EAAC;AAAA,EACtB,eAAe,MAAM;AAAA,EAAC;AACxB,CAAC;AAUM,MAAM,sBAAsB,CAAC;AAAA,EAClC;AAAA,EACA;AACF,MAGM;AAIJ,QAAM,CAAC,OAAO,QAAQ,QAAI,uBAAS,KAAK;AACxC,QAAM,CAAC,eAAe,gBAAgB,QAAI,uBAAS,KAAK;AAGxD,MAAI,UAAU,eAAe;AAC3B,qBAAiB,KAAK;AACtB,aAAS,KAAK;AAAA,EAChB;AAEA,QAAM,iBAAa,0BAAY,CAAC,eAAkC,MAAM,IAAI,UAAU,GAAG,CAAC,KAAK,CAAC;AAEhG,QAAM,oBAAgB;AAAA,IACpB,CAAC,YAAoB,SAAoB,SAAS,UAAQ,IAAI,IAAI,IAAI,EAAE,IAAI,YAAY,IAAI,CAAC;AAAA,IAC7F,CAAC;AAAA,EACH;AAEA,QAAM,oBAAgB;AAAA,IACpB,CAAC,eACC,SAAS,UAAQ;AACf,YAAM,OAAO,IAAI,IAAI,IAAI;AACzB,WAAK,OAAO,UAAU;AACtB,aAAO;AAAA,IACT,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AAEA,QAAM,YAAQ;AAAA,IACZ,OAAO,EAAE,YAAY,eAAe,cAAc;AAAA,IAClD,CAAC,YAAY,eAAe,aAAa;AAAA,EAC3C;AAEA,SAAO,4CAAC,QAAQ,UAAR,EAAiB,OAAO,OAAQ,UAAS;AACnD;AAEO,MAAM,yBAAyB,CAAC;AAAA,EACrC;AAAA,EACA;AACF,MAGM,4CAAC,uBAAoB,OAAO,UAAW,UAAS;AAE/C,MAAM,yBAAyB,UAAM,yBAAW,OAAO;","names":[]}
+{"version":3,"sources":["../../../../../../src/runtimes/react/server/components/server-elements-cache.tsx"],"sourcesContent":["'use client'\n\nimport {\n  createContext,\n  ReactNode,\n  useCallback,\n  useContext,\n  useEffect,\n  useMemo,\n  useState,\n} from 'react'\n\nimport { useIsomorphicLayoutEffect } from '../../../../components/hooks/useIsomorphicLayoutEffect'\n\nimport { type ElementsMap } from '../collect-server-elements'\n\ntype CommitRefresh = (node: ReactNode) => void\n\ntype ElementRequests = {\n  lastIssued: number\n  lastAccepted: number\n  lastCommitted: number\n}\n\ntype ContextValue = {\n  getElement: (elementKey: string) => ReactNode\n  beginRefresh: (elementKey: string, onCommitted?: () => void) => CommitRefresh | null\n}\n\ntype CacheEntry = {\n  node: ReactNode\n  onCommitted?: () => void\n}\n\ntype CacheState = {\n  initialElements: ElementsMap\n  elements: Map<string, CacheEntry>\n  refreshScope: {\n    active: boolean\n    requestsByElement: Map<string, ElementRequests>\n  }\n}\n\nconst createCacheState = (initialElements: ElementsMap): CacheState => ({\n  initialElements,\n  elements: new Map(Array.from(initialElements, ([key, node]) => [key, { node }] as const)),\n  refreshScope: {\n    active: false,\n    requestsByElement: new Map(),\n  },\n})\n\nconst Context = createContext<ContextValue>({\n  getElement: () => null,\n  beginRefresh: () => null,\n})\n\n/**\n * Client-side \"cache\" of server-rendered elements; this is one of the key pieces in our RSC\n * implementation, with React doing the majority of the heavy lifting: when `ReactNode`s are\n * passed as props across a 'use client' boundary, React's flight serializer automatically\n * renders and encodes them in the RSC stream and then reconstructs them on the client. All\n * we need to do on the client is to make these React elements available for lookup/\n * manipulation when editing in the builder.\n */\nexport const ServerElementsCache = ({\n  children,\n  value,\n}: {\n  children: ReactNode\n  value: ElementsMap\n}) => {\n  const [state, setState] = useState<CacheState>(() => createCacheState(value))\n  // A new elements map resets the state\n  if (state.initialElements !== value) {\n    setState(createCacheState(value))\n  }\n\n  const { elements, refreshScope } = state\n\n  // Run during React commit, before paint\n  useIsomorphicLayoutEffect(() => {\n    // Activate current scope on mount / whenever we reset the state\n    refreshScope.active = true\n    return () => {\n      // Stop accepting refresh requests associated with the old scope\n      refreshScope.active = false\n    }\n  }, [refreshScope])\n\n  const getElement = useCallback(\n    // Always wrap the node in `<RefreshCommitObserver>` so adding a commit callback\n    // during refresh doesn't change the tree shape and remount the refreshed node\n    (elementKey: string): ReactNode => {\n      const entry = elements.get(elementKey)\n      if (entry == null) return null\n\n      return (\n        <RefreshCommitObserver onCommitted={entry.onCommitted}>{entry.node}</RefreshCommitObserver>\n      )\n    },\n    [elements],\n  )\n\n  const beginRefresh = useCallback(\n    (elementKey: string, onCommitted?: () => void) => {\n      const { requestsByElement } = refreshScope\n\n      const elementRequests = requestsByElement.get(elementKey) ?? {\n        lastIssued: 0,\n        lastAccepted: 0,\n        lastCommitted: 0,\n      }\n\n      requestsByElement.set(elementKey, elementRequests)\n\n      const requestId = ++elementRequests.lastIssued\n\n      return (node: ReactNode): void => {\n        // Ignore stale updates\n        if (!refreshScope.active || requestId <= elementRequests.lastAccepted) return\n\n        elementRequests.lastAccepted = requestId\n        const notifyCommitted = () => {\n          if (requestId <= elementRequests.lastCommitted) return\n\n          elementRequests.lastCommitted = requestId\n          // Don't retain the external callback and its captured values after notification\n          const callback = onCommitted\n          onCommitted = undefined\n          callback?.()\n        }\n\n        setState(prev => {\n          // Ignore updates that come in between element map replacement and scope deactivation\n          if (prev.refreshScope !== refreshScope) return prev\n\n          return {\n            ...prev,\n            elements: new Map(prev.elements).set(elementKey, {\n              node,\n              onCommitted: notifyCommitted,\n            }),\n          }\n        })\n      }\n    },\n    [refreshScope],\n  )\n\n  const result = useMemo(() => ({ getElement, beginRefresh }), [getElement, beginRefresh])\n\n  return <Context.Provider value={result}>{children}</Context.Provider>\n}\n\nconst RefreshCommitObserver = ({\n  children,\n  onCommitted,\n}: {\n  children: ReactNode\n  onCommitted?: () => void\n}) => {\n  // Notify the caller that the updated element node has been committed to\n  // the current React tree\n  useEffect(() => onCommitted?.(), [onCommitted])\n  return children\n}\n\nexport const ServerElementsProvider = ({\n  children,\n  elements,\n}: {\n  children: ReactNode\n  elements: ElementsMap\n}) => <ServerElementsCache value={elements}>{children}</ServerElementsCache>\n\nexport const useServerElementsCache = () => useContext(Context)\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAkGQ;AAhGR,mBAQO;AAEP,uCAA0C;AA+B1C,MAAM,mBAAmB,CAAC,qBAA8C;AAAA,EACtE;AAAA,EACA,UAAU,IAAI,IAAI,MAAM,KAAK,iBAAiB,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAU,CAAC;AAAA,EACxF,cAAc;AAAA,IACZ,QAAQ;AAAA,IACR,mBAAmB,oBAAI,IAAI;AAAA,EAC7B;AACF;AAEA,MAAM,cAAU,4BAA4B;AAAA,EAC1C,YAAY,MAAM;AAAA,EAClB,cAAc,MAAM;AACtB,CAAC;AAUM,MAAM,sBAAsB,CAAC;AAAA,EAClC;AAAA,EACA;AACF,MAGM;AACJ,QAAM,CAAC,OAAO,QAAQ,QAAI,uBAAqB,MAAM,iBAAiB,KAAK,CAAC;AAE5E,MAAI,MAAM,oBAAoB,OAAO;AACnC,aAAS,iBAAiB,KAAK,CAAC;AAAA,EAClC;AAEA,QAAM,EAAE,UAAU,aAAa,IAAI;AAGnC,kEAA0B,MAAM;AAE9B,iBAAa,SAAS;AACtB,WAAO,MAAM;AAEX,mBAAa,SAAS;AAAA,IACxB;AAAA,EACF,GAAG,CAAC,YAAY,CAAC;AAEjB,QAAM,iBAAa;AAAA;AAAA;AAAA,IAGjB,CAAC,eAAkC;AACjC,YAAM,QAAQ,SAAS,IAAI,UAAU;AACrC,UAAI,SAAS;AAAM,eAAO;AAE1B,aACE,4CAAC,yBAAsB,aAAa,MAAM,aAAc,gBAAM,MAAK;AAAA,IAEvE;AAAA,IACA,CAAC,QAAQ;AAAA,EACX;AAEA,QAAM,mBAAe;AAAA,IACnB,CAAC,YAAoB,gBAA6B;AAChD,YAAM,EAAE,kBAAkB,IAAI;AAE9B,YAAM,kBAAkB,kBAAkB,IAAI,UAAU,KAAK;AAAA,QAC3D,YAAY;AAAA,QACZ,cAAc;AAAA,QACd,eAAe;AAAA,MACjB;AAEA,wBAAkB,IAAI,YAAY,eAAe;AAEjD,YAAM,YAAY,EAAE,gBAAgB;AAEpC,aAAO,CAAC,SAA0B;AAEhC,YAAI,CAAC,aAAa,UAAU,aAAa,gBAAgB;AAAc;AAEvE,wBAAgB,eAAe;AAC/B,cAAM,kBAAkB,MAAM;AAC5B,cAAI,aAAa,gBAAgB;AAAe;AAEhD,0BAAgB,gBAAgB;AAEhC,gBAAM,WAAW;AACjB,wBAAc;AACd,qBAAW;AAAA,QACb;AAEA,iBAAS,UAAQ;AAEf,cAAI,KAAK,iBAAiB;AAAc,mBAAO;AAE/C,iBAAO;AAAA,YACL,GAAG;AAAA,YACH,UAAU,IAAI,IAAI,KAAK,QAAQ,EAAE,IAAI,YAAY;AAAA,cAC/C;AAAA,cACA,aAAa;AAAA,YACf,CAAC;AAAA,UACH;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA,IACA,CAAC,YAAY;AAAA,EACf;AAEA,QAAM,aAAS,sBAAQ,OAAO,EAAE,YAAY,aAAa,IAAI,CAAC,YAAY,YAAY,CAAC;AAEvF,SAAO,4CAAC,QAAQ,UAAR,EAAiB,OAAO,QAAS,UAAS;AACpD;AAEA,MAAM,wBAAwB,CAAC;AAAA,EAC7B;AAAA,EACA;AACF,MAGM;AAGJ,8BAAU,MAAM,cAAc,GAAG,CAAC,WAAW,CAAC;AAC9C,SAAO;AACT;AAEO,MAAM,yBAAyB,CAAC;AAAA,EACrC;AAAA,EACA;AACF,MAGM,4CAAC,uBAAoB,OAAO,UAAW,UAAS;AAE/C,MAAM,yBAAyB,UAAM,yBAAW,OAAO;","names":[]}

package/dist/cjs/state/actions/internal/read-write-action-types.js

@@ -33,7 +33,7 @@ const ReadWriteActionTypes = {
   REGISTER_MEASURABLE: "REGISTER_MEASURABLE",
   UNREGISTER_MEASURABLE: "UNREGISTER_MEASURABLE",
   SET_RESOLVED_VALUE_OVERRIDE: "SET_RESOLVED_VALUE_OVERRIDE",
-  CLEAR_RESOLVED_VALUE_OVERRIDE: "CLEAR_RESOLVED_VALUE_OVERRIDE",
+  CLEAR_STALE_RESOLVED_VALUE_OVERRIDES: "CLEAR_STALE_RESOLVED_VALUE_OVERRIDES",
   UPDATE_API_CLIENT_CACHE: "UPDATE_API_CLIENT_CACHE",
   CLEAR_API_CLIENT_CACHE: "CLEAR_API_CLIENT_CACHE"
 };

package/dist/cjs/state/actions/internal/read-write-action-types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/state/actions/internal/read-write-action-types.ts"],"sourcesContent":["export const ReadWriteActionTypes = {\n  FLUSH_ACTION_BUFFER: 'FLUSH_ACTION_BUFFER',\n\n  CHANGE_ELEMENT_TREE: 'CHANGE_ELEMENT_TREE',\n\n  REGISTER_COMPONENT_HANDLE: 'REGISTER_COMPONENT_HANDLE',\n  UNREGISTER_COMPONENT_HANDLE: 'UNREGISTER_COMPONENT_HANDLE',\n\n  REGISTER_PROP_CONTROLLERS: 'REGISTER_PROP_CONTROLLERS',\n  UNREGISTER_PROP_CONTROLLERS: 'UNREGISTER_PROP_CONTROLLERS',\n  REGISTER_PROP_CONTROLLERS_HANDLE: 'REGISTER_PROP_CONTROLLERS_HANDLE',\n  UNREGISTER_PROP_CONTROLLERS_HANDLE: 'UNREGISTER_PROP_CONTROLLERS_HANDLE',\n\n  REGISTER_MEASURABLE: 'REGISTER_MEASURABLE',\n  UNREGISTER_MEASURABLE: 'UNREGISTER_MEASURABLE',\n\n  SET_RESOLVED_VALUE_OVERRIDE: 'SET_RESOLVED_VALUE_OVERRIDE',\n  CLEAR_RESOLVED_VALUE_OVERRIDE: 'CLEAR_RESOLVED_VALUE_OVERRIDE',\n\n  UPDATE_API_CLIENT_CACHE: 'UPDATE_API_CLIENT_CACHE',\n  CLEAR_API_CLIENT_CACHE: 'CLEAR_API_CLIENT_CACHE',\n} as const\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,uBAAuB;AAAA,EAClC,qBAAqB;AAAA,EAErB,qBAAqB;AAAA,EAErB,2BAA2B;AAAA,EAC3B,6BAA6B;AAAA,EAE7B,2BAA2B;AAAA,EAC3B,6BAA6B;AAAA,EAC7B,kCAAkC;AAAA,EAClC,oCAAoC;AAAA,EAEpC,qBAAqB;AAAA,EACrB,uBAAuB;AAAA,EAEvB,6BAA6B;AAAA,EAC7B,+BAA+B;AAAA,EAE/B,yBAAyB;AAAA,EACzB,wBAAwB;AAC1B;","names":[]}
+{"version":3,"sources":["../../../../../src/state/actions/internal/read-write-action-types.ts"],"sourcesContent":["export const ReadWriteActionTypes = {\n  FLUSH_ACTION_BUFFER: 'FLUSH_ACTION_BUFFER',\n\n  CHANGE_ELEMENT_TREE: 'CHANGE_ELEMENT_TREE',\n\n  REGISTER_COMPONENT_HANDLE: 'REGISTER_COMPONENT_HANDLE',\n  UNREGISTER_COMPONENT_HANDLE: 'UNREGISTER_COMPONENT_HANDLE',\n\n  REGISTER_PROP_CONTROLLERS: 'REGISTER_PROP_CONTROLLERS',\n  UNREGISTER_PROP_CONTROLLERS: 'UNREGISTER_PROP_CONTROLLERS',\n  REGISTER_PROP_CONTROLLERS_HANDLE: 'REGISTER_PROP_CONTROLLERS_HANDLE',\n  UNREGISTER_PROP_CONTROLLERS_HANDLE: 'UNREGISTER_PROP_CONTROLLERS_HANDLE',\n\n  REGISTER_MEASURABLE: 'REGISTER_MEASURABLE',\n  UNREGISTER_MEASURABLE: 'UNREGISTER_MEASURABLE',\n\n  SET_RESOLVED_VALUE_OVERRIDE: 'SET_RESOLVED_VALUE_OVERRIDE',\n  CLEAR_STALE_RESOLVED_VALUE_OVERRIDES: 'CLEAR_STALE_RESOLVED_VALUE_OVERRIDES',\n\n  UPDATE_API_CLIENT_CACHE: 'UPDATE_API_CLIENT_CACHE',\n  CLEAR_API_CLIENT_CACHE: 'CLEAR_API_CLIENT_CACHE',\n} as const\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,uBAAuB;AAAA,EAClC,qBAAqB;AAAA,EAErB,qBAAqB;AAAA,EAErB,2BAA2B;AAAA,EAC3B,6BAA6B;AAAA,EAE7B,2BAA2B;AAAA,EAC3B,6BAA6B;AAAA,EAC7B,kCAAkC;AAAA,EAClC,oCAAoC;AAAA,EAEpC,qBAAqB;AAAA,EACrB,uBAAuB;AAAA,EAEvB,6BAA6B;AAAA,EAC7B,sCAAsC;AAAA,EAEtC,yBAAyB;AAAA,EACzB,wBAAwB;AAC1B;","names":[]}

package/dist/cjs/state/actions/internal/read-write-actions.js

@@ -30,7 +30,7 @@ var read_write_actions_exports = {};
 __export(read_write_actions_exports, {
   changeElementTree: () => changeElementTree,
   clearAPIClientCache: () => clearAPIClientCache,
-  clearResolvedValueOverride: () => clearResolvedValueOverride,
+  clearStaleResolvedValueOverrides: () => clearStaleResolvedValueOverrides,
   createPropControllers: () => createPropControllers,
   flushActionBuffer: () => flushActionBuffer,
   registerComponentHandle: () => registerComponentHandle,
@@ -128,9 +128,9 @@ function setResolvedValueOverride(payload) {
     payload
   };
 }
-function clearResolvedValueOverride(payload) {
+function clearStaleResolvedValueOverrides(payload) {
   return {
-    type: import_read_write_action_types.ReadWriteActionTypes.CLEAR_RESOLVED_VALUE_OVERRIDE,
+    type: import_read_write_action_types.ReadWriteActionTypes.CLEAR_STALE_RESOLVED_VALUE_OVERRIDES,
     payload
   };
 }
@@ -177,7 +177,7 @@ function createPropControllers({
 0 && (module.exports = {
   changeElementTree,
   clearAPIClientCache,
-  clearResolvedValueOverride,
+  clearStaleResolvedValueOverrides,
   createPropControllers,
   flushActionBuffer,
   registerComponentHandle,

package/dist/cjs/state/actions/internal/read-write-actions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/state/actions/internal/read-write-actions.ts"],"sourcesContent":["import { type Operation } from 'ot-json0'\nimport { type ThunkAction } from '@reduxjs/toolkit'\n\nimport { ControlInstance } from '@makeswift/controls'\n\nimport { ElementImperativeHandle } from '../../../runtimes/react/element-imperative-handle'\n\nimport { type DescriptorsByComponentType } from '../../modules/prop-controller-descriptors'\nimport { type Measurable } from '../../modules/read-write/box-models'\nimport { type PropControllersHandle } from '../../modules/read-write/prop-controllers'\nimport {\n  type ResolvedValueKey,\n  type ResolvedValue,\n} from '../../modules/read-write/resolved-value-overrides'\n\nimport { createPropController } from '../../../prop-controllers/instances'\n\nimport { type Action } from '../../actions'\nimport * as Builder from '../../builder-api/actions'\n\nimport { type DocumentPayload } from '../../shared-api'\nimport { type SerializedState as APIClientCache } from '../../api-client/state'\nimport { getComponentPropControllerDescriptors } from '../../read-only-state'\nimport { type State } from '../../unified-state'\n\nimport { ReadWriteActionTypes } from './read-write-action-types'\n\ntype FlushActionBufferAction = {\n  type: typeof ReadWriteActionTypes.FLUSH_ACTION_BUFFER\n}\n\ntype ChangeElementTreeAction = {\n  type: typeof ReadWriteActionTypes.CHANGE_ELEMENT_TREE\n  payload: {\n    oldDocument: DocumentPayload\n    newDocument: DocumentPayload\n    descriptors: DescriptorsByComponentType\n    operation: Operation\n  }\n}\n\ntype RegisterComponentHandleAction = {\n  type: typeof ReadWriteActionTypes.REGISTER_COMPONENT_HANDLE\n  payload: { documentKey: string; elementKey: string; componentHandle: ElementImperativeHandle }\n}\n\ntype UnregisterComponentHandleAction = {\n  type: typeof ReadWriteActionTypes.UNREGISTER_COMPONENT_HANDLE\n  payload: { documentKey: string; elementKey: string }\n}\n\ntype RegisterPropControllersHandleAction = {\n  type: typeof ReadWriteActionTypes.REGISTER_PROP_CONTROLLERS_HANDLE\n  payload: { documentKey: string; elementKey: string; handle: PropControllersHandle }\n}\n\ntype UnregisterPropControllersHandleAction = {\n  type: typeof ReadWriteActionTypes.UNREGISTER_PROP_CONTROLLERS_HANDLE\n  payload: { documentKey: string; elementKey: string }\n}\n\ntype RegisterPropControllersAction = {\n  type: typeof ReadWriteActionTypes.REGISTER_PROP_CONTROLLERS\n  payload: {\n    documentKey: string\n    elementKey: string\n    propControllers: Record<string, ControlInstance>\n  }\n}\n\ntype UnregisterPropControllersAction = {\n  type: typeof ReadWriteActionTypes.UNREGISTER_PROP_CONTROLLERS\n  payload: { documentKey: string; elementKey: string }\n}\n\ntype RegisterMeasurableAction = {\n  type: typeof ReadWriteActionTypes.REGISTER_MEASURABLE\n  payload: { documentKey: string; elementKey: string; measurable: Measurable }\n}\n\ntype UnregisterMeasurableAction = {\n  type: typeof ReadWriteActionTypes.UNREGISTER_MEASURABLE\n  payload: { documentKey: string; elementKey: string }\n}\n\ntype SetResolvedValueOverrideAction = {\n  type: typeof ReadWriteActionTypes.SET_RESOLVED_VALUE_OVERRIDE\n  payload: { documentKey: string; instanceKey: ResolvedValueKey; value: ResolvedValue }\n}\n\ntype ClearResolvedValueOverrideAction = {\n  type: typeof ReadWriteActionTypes.CLEAR_RESOLVED_VALUE_OVERRIDE\n  payload: { documentKey: string; instanceKey: ResolvedValueKey }\n}\n\ntype UpdateAPIClientCache = {\n  type: typeof ReadWriteActionTypes.UPDATE_API_CLIENT_CACHE\n  payload: APIClientCache\n}\n\ntype ClearAPIClientCache = {\n  type: typeof ReadWriteActionTypes.CLEAR_API_CLIENT_CACHE\n}\n\nexport type ReadWriteAction =\n  | FlushActionBufferAction\n  | ChangeElementTreeAction\n  | RegisterComponentHandleAction\n  | UnregisterComponentHandleAction\n  | RegisterPropControllersHandleAction\n  | UnregisterPropControllersHandleAction\n  | RegisterPropControllersAction\n  | UnregisterPropControllersAction\n  | RegisterMeasurableAction\n  | UnregisterMeasurableAction\n  | SetResolvedValueOverrideAction\n  | ClearResolvedValueOverrideAction\n  | UpdateAPIClientCache\n  | ClearAPIClientCache\n\nexport function flushActionBuffer() {\n  return { type: ReadWriteActionTypes.FLUSH_ACTION_BUFFER }\n}\n\nexport function changeElementTree(\n  payload: ChangeElementTreeAction['payload'],\n): ChangeElementTreeAction {\n  return {\n    type: ReadWriteActionTypes.CHANGE_ELEMENT_TREE,\n    payload,\n  }\n}\n\nexport function registerComponentHandle(\n  documentKey: string,\n  elementKey: string,\n  componentHandle: ElementImperativeHandle,\n): RegisterComponentHandleAction {\n  return {\n    type: ReadWriteActionTypes.REGISTER_COMPONENT_HANDLE,\n    payload: { documentKey, elementKey, componentHandle },\n  }\n}\n\nexport function unregisterComponentHandle(\n  documentKey: string,\n  elementKey: string,\n): UnregisterComponentHandleAction {\n  return {\n    type: ReadWriteActionTypes.UNREGISTER_COMPONENT_HANDLE,\n    payload: { documentKey, elementKey },\n  }\n}\n\nexport function registerComponentHandleEffect(\n  documentKey: string,\n  elementKey: string,\n  componentHandle: ElementImperativeHandle,\n): ThunkAction<() => void, unknown, unknown, ReadWriteAction> {\n  return dispatch => {\n    dispatch(registerComponentHandle(documentKey, elementKey, componentHandle))\n\n    return () => {\n      dispatch(unregisterComponentHandle(documentKey, elementKey))\n    }\n  }\n}\n\nexport function registerPropControllersHandle(\n  documentKey: string,\n  elementKey: string,\n  handle: PropControllersHandle,\n): RegisterPropControllersHandleAction {\n  return {\n    type: ReadWriteActionTypes.REGISTER_PROP_CONTROLLERS_HANDLE,\n    payload: { documentKey, elementKey, handle },\n  }\n}\n\nexport function unregisterPropControllersHandle(\n  documentKey: string,\n  elementKey: string,\n): UnregisterPropControllersHandleAction {\n  return {\n    type: ReadWriteActionTypes.UNREGISTER_PROP_CONTROLLERS_HANDLE,\n    payload: { documentKey, elementKey },\n  }\n}\n\nexport function registerPropControllers(\n  documentKey: string,\n  elementKey: string,\n  propControllers: Record<string, ControlInstance>,\n): RegisterPropControllersAction {\n  return {\n    type: ReadWriteActionTypes.REGISTER_PROP_CONTROLLERS,\n    payload: { documentKey, elementKey, propControllers },\n  }\n}\n\nexport function unregisterPropControllers(\n  documentKey: string,\n  elementKey: string,\n): UnregisterPropControllersAction {\n  return {\n    type: ReadWriteActionTypes.UNREGISTER_PROP_CONTROLLERS,\n    payload: { documentKey, elementKey },\n  }\n}\n\nexport function registerPropControllersEffect(\n  documentKey: string,\n  elementKey: string,\n  propControllers: Record<string, ControlInstance>,\n): ThunkAction<() => void, unknown, unknown, ReadWriteAction> {\n  return dispatch => {\n    dispatch(registerPropControllers(documentKey, elementKey, propControllers))\n\n    return () => {\n      dispatch(unregisterPropControllers(documentKey, elementKey))\n    }\n  }\n}\n\nexport function registerMeasurable(\n  documentKey: string,\n  elementKey: string,\n  measurable: Measurable,\n): RegisterMeasurableAction {\n  return {\n    type: ReadWriteActionTypes.REGISTER_MEASURABLE,\n    payload: { documentKey, elementKey, measurable },\n  }\n}\n\nexport function unregisterMeasurable(\n  documentKey: string,\n  elementKey: string,\n): UnregisterMeasurableAction {\n  return { type: ReadWriteActionTypes.UNREGISTER_MEASURABLE, payload: { documentKey, elementKey } }\n}\n\nexport function setResolvedValueOverride(\n  payload: SetResolvedValueOverrideAction['payload'],\n): SetResolvedValueOverrideAction {\n  return {\n    type: ReadWriteActionTypes.SET_RESOLVED_VALUE_OVERRIDE,\n    payload,\n  }\n}\n\nexport function clearResolvedValueOverride(\n  payload: ClearResolvedValueOverrideAction['payload'],\n): ClearResolvedValueOverrideAction {\n  return {\n    type: ReadWriteActionTypes.CLEAR_RESOLVED_VALUE_OVERRIDE,\n    payload,\n  }\n}\n\nexport function registerMeasurableEffect(\n  documentKey: string,\n  elementKey: string,\n  measurable: Measurable,\n): ThunkAction<() => void, unknown, unknown, ReadWriteAction> {\n  return dispatch => {\n    dispatch(registerMeasurable(documentKey, elementKey, measurable))\n\n    return () => {\n      dispatch(unregisterMeasurable(documentKey, elementKey))\n    }\n  }\n}\n\nexport function updateAPIClientCache(payload: APIClientCache): UpdateAPIClientCache {\n  return { type: ReadWriteActionTypes.UPDATE_API_CLIENT_CACHE, payload }\n}\n\nexport function clearAPIClientCache(): ClearAPIClientCache {\n  return { type: ReadWriteActionTypes.CLEAR_API_CLIENT_CACHE }\n}\n\nexport function createPropControllers({\n  documentKey,\n  elementKey,\n  componentType,\n}: {\n  documentKey: string\n  elementKey: string\n  componentType: string\n}): ThunkAction<Record<string, ControlInstance> | null, State, unknown, Action> {\n  return (dispatch, getState) => {\n    const descriptors = getComponentPropControllerDescriptors(getState(), componentType)\n    if (descriptors == null) return null\n\n    const propControllers = Object.entries(descriptors).reduce(\n      (acc, [propName, descriptor]) => {\n        const propController = createPropController({\n          descriptor,\n          instanceKey: { elementKey, propPath: propName },\n          sendMessage: message =>\n            dispatch(\n              Builder.messageBuilderPropController(documentKey, elementKey, propName, message),\n            ),\n        }) as ControlInstance\n\n        return { ...acc, [propName]: propController }\n      },\n      {} as Record<string, ControlInstance>,\n    )\n\n    return propControllers\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../../src/state/actions/internal/read-write-actions.ts"],"sourcesContent":["import { type Operation } from 'ot-json0'\nimport { type ThunkAction } from '@reduxjs/toolkit'\n\nimport { ControlInstance } from '@makeswift/controls'\n\nimport { ElementImperativeHandle } from '../../../runtimes/react/element-imperative-handle'\n\nimport { type DescriptorsByComponentType } from '../../modules/prop-controller-descriptors'\nimport { type Measurable } from '../../modules/read-write/box-models'\nimport { type PropControllersHandle } from '../../modules/read-write/prop-controllers'\nimport {\n  type ResolvedValueKey,\n  type ResolvedValue,\n} from '../../modules/read-write/resolved-value-overrides'\n\nimport { createPropController } from '../../../prop-controllers/instances'\n\nimport { type Action } from '../../actions'\nimport * as Builder from '../../builder-api/actions'\n\nimport { type DocumentPayload } from '../../shared-api'\nimport { type SerializedState as APIClientCache } from '../../api-client/state'\nimport { getComponentPropControllerDescriptors } from '../../read-only-state'\nimport { type State } from '../../unified-state'\n\nimport { ReadWriteActionTypes } from './read-write-action-types'\n\ntype FlushActionBufferAction = {\n  type: typeof ReadWriteActionTypes.FLUSH_ACTION_BUFFER\n}\n\ntype ChangeElementTreeAction = {\n  type: typeof ReadWriteActionTypes.CHANGE_ELEMENT_TREE\n  payload: {\n    oldDocument: DocumentPayload\n    newDocument: DocumentPayload\n    descriptors: DescriptorsByComponentType\n    operation: Operation\n  }\n}\n\ntype RegisterComponentHandleAction = {\n  type: typeof ReadWriteActionTypes.REGISTER_COMPONENT_HANDLE\n  payload: { documentKey: string; elementKey: string; componentHandle: ElementImperativeHandle }\n}\n\ntype UnregisterComponentHandleAction = {\n  type: typeof ReadWriteActionTypes.UNREGISTER_COMPONENT_HANDLE\n  payload: { documentKey: string; elementKey: string }\n}\n\ntype RegisterPropControllersHandleAction = {\n  type: typeof ReadWriteActionTypes.REGISTER_PROP_CONTROLLERS_HANDLE\n  payload: { documentKey: string; elementKey: string; handle: PropControllersHandle }\n}\n\ntype UnregisterPropControllersHandleAction = {\n  type: typeof ReadWriteActionTypes.UNREGISTER_PROP_CONTROLLERS_HANDLE\n  payload: { documentKey: string; elementKey: string }\n}\n\ntype RegisterPropControllersAction = {\n  type: typeof ReadWriteActionTypes.REGISTER_PROP_CONTROLLERS\n  payload: {\n    documentKey: string\n    elementKey: string\n    propControllers: Record<string, ControlInstance>\n  }\n}\n\ntype UnregisterPropControllersAction = {\n  type: typeof ReadWriteActionTypes.UNREGISTER_PROP_CONTROLLERS\n  payload: { documentKey: string; elementKey: string }\n}\n\ntype RegisterMeasurableAction = {\n  type: typeof ReadWriteActionTypes.REGISTER_MEASURABLE\n  payload: { documentKey: string; elementKey: string; measurable: Measurable }\n}\n\ntype UnregisterMeasurableAction = {\n  type: typeof ReadWriteActionTypes.UNREGISTER_MEASURABLE\n  payload: { documentKey: string; elementKey: string }\n}\n\ntype SetResolvedValueOverrideAction = {\n  type: typeof ReadWriteActionTypes.SET_RESOLVED_VALUE_OVERRIDE\n  payload: { documentKey: string; instanceKey: ResolvedValueKey; value: ResolvedValue }\n}\n\ntype ClearStaleResolvedValueOverridesAction = {\n  type: typeof ReadWriteActionTypes.CLEAR_STALE_RESOLVED_VALUE_OVERRIDES\n  payload: { documentKey: string; elementKey: string; generation: number }\n}\n\ntype UpdateAPIClientCache = {\n  type: typeof ReadWriteActionTypes.UPDATE_API_CLIENT_CACHE\n  payload: APIClientCache\n}\n\ntype ClearAPIClientCache = {\n  type: typeof ReadWriteActionTypes.CLEAR_API_CLIENT_CACHE\n}\n\nexport type ReadWriteAction =\n  | FlushActionBufferAction\n  | ChangeElementTreeAction\n  | RegisterComponentHandleAction\n  | UnregisterComponentHandleAction\n  | RegisterPropControllersHandleAction\n  | UnregisterPropControllersHandleAction\n  | RegisterPropControllersAction\n  | UnregisterPropControllersAction\n  | RegisterMeasurableAction\n  | UnregisterMeasurableAction\n  | SetResolvedValueOverrideAction\n  | ClearStaleResolvedValueOverridesAction\n  | UpdateAPIClientCache\n  | ClearAPIClientCache\n\nexport function flushActionBuffer() {\n  return { type: ReadWriteActionTypes.FLUSH_ACTION_BUFFER }\n}\n\nexport function changeElementTree(\n  payload: ChangeElementTreeAction['payload'],\n): ChangeElementTreeAction {\n  return {\n    type: ReadWriteActionTypes.CHANGE_ELEMENT_TREE,\n    payload,\n  }\n}\n\nexport function registerComponentHandle(\n  documentKey: string,\n  elementKey: string,\n  componentHandle: ElementImperativeHandle,\n): RegisterComponentHandleAction {\n  return {\n    type: ReadWriteActionTypes.REGISTER_COMPONENT_HANDLE,\n    payload: { documentKey, elementKey, componentHandle },\n  }\n}\n\nexport function unregisterComponentHandle(\n  documentKey: string,\n  elementKey: string,\n): UnregisterComponentHandleAction {\n  return {\n    type: ReadWriteActionTypes.UNREGISTER_COMPONENT_HANDLE,\n    payload: { documentKey, elementKey },\n  }\n}\n\nexport function registerComponentHandleEffect(\n  documentKey: string,\n  elementKey: string,\n  componentHandle: ElementImperativeHandle,\n): ThunkAction<() => void, unknown, unknown, ReadWriteAction> {\n  return dispatch => {\n    dispatch(registerComponentHandle(documentKey, elementKey, componentHandle))\n\n    return () => {\n      dispatch(unregisterComponentHandle(documentKey, elementKey))\n    }\n  }\n}\n\nexport function registerPropControllersHandle(\n  documentKey: string,\n  elementKey: string,\n  handle: PropControllersHandle,\n): RegisterPropControllersHandleAction {\n  return {\n    type: ReadWriteActionTypes.REGISTER_PROP_CONTROLLERS_HANDLE,\n    payload: { documentKey, elementKey, handle },\n  }\n}\n\nexport function unregisterPropControllersHandle(\n  documentKey: string,\n  elementKey: string,\n): UnregisterPropControllersHandleAction {\n  return {\n    type: ReadWriteActionTypes.UNREGISTER_PROP_CONTROLLERS_HANDLE,\n    payload: { documentKey, elementKey },\n  }\n}\n\nexport function registerPropControllers(\n  documentKey: string,\n  elementKey: string,\n  propControllers: Record<string, ControlInstance>,\n): RegisterPropControllersAction {\n  return {\n    type: ReadWriteActionTypes.REGISTER_PROP_CONTROLLERS,\n    payload: { documentKey, elementKey, propControllers },\n  }\n}\n\nexport function unregisterPropControllers(\n  documentKey: string,\n  elementKey: string,\n): UnregisterPropControllersAction {\n  return {\n    type: ReadWriteActionTypes.UNREGISTER_PROP_CONTROLLERS,\n    payload: { documentKey, elementKey },\n  }\n}\n\nexport function registerPropControllersEffect(\n  documentKey: string,\n  elementKey: string,\n  propControllers: Record<string, ControlInstance>,\n): ThunkAction<() => void, unknown, unknown, ReadWriteAction> {\n  return dispatch => {\n    dispatch(registerPropControllers(documentKey, elementKey, propControllers))\n\n    return () => {\n      dispatch(unregisterPropControllers(documentKey, elementKey))\n    }\n  }\n}\n\nexport function registerMeasurable(\n  documentKey: string,\n  elementKey: string,\n  measurable: Measurable,\n): RegisterMeasurableAction {\n  return {\n    type: ReadWriteActionTypes.REGISTER_MEASURABLE,\n    payload: { documentKey, elementKey, measurable },\n  }\n}\n\nexport function unregisterMeasurable(\n  documentKey: string,\n  elementKey: string,\n): UnregisterMeasurableAction {\n  return { type: ReadWriteActionTypes.UNREGISTER_MEASURABLE, payload: { documentKey, elementKey } }\n}\n\nexport function setResolvedValueOverride(\n  payload: SetResolvedValueOverrideAction['payload'],\n): SetResolvedValueOverrideAction {\n  return {\n    type: ReadWriteActionTypes.SET_RESOLVED_VALUE_OVERRIDE,\n    payload,\n  }\n}\n\nexport function clearStaleResolvedValueOverrides(\n  payload: ClearStaleResolvedValueOverridesAction['payload'],\n): ClearStaleResolvedValueOverridesAction {\n  return {\n    type: ReadWriteActionTypes.CLEAR_STALE_RESOLVED_VALUE_OVERRIDES,\n    payload,\n  }\n}\n\nexport function registerMeasurableEffect(\n  documentKey: string,\n  elementKey: string,\n  measurable: Measurable,\n): ThunkAction<() => void, unknown, unknown, ReadWriteAction> {\n  return dispatch => {\n    dispatch(registerMeasurable(documentKey, elementKey, measurable))\n\n    return () => {\n      dispatch(unregisterMeasurable(documentKey, elementKey))\n    }\n  }\n}\n\nexport function updateAPIClientCache(payload: APIClientCache): UpdateAPIClientCache {\n  return { type: ReadWriteActionTypes.UPDATE_API_CLIENT_CACHE, payload }\n}\n\nexport function clearAPIClientCache(): ClearAPIClientCache {\n  return { type: ReadWriteActionTypes.CLEAR_API_CLIENT_CACHE }\n}\n\nexport function createPropControllers({\n  documentKey,\n  elementKey,\n  componentType,\n}: {\n  documentKey: string\n  elementKey: string\n  componentType: string\n}): ThunkAction<Record<string, ControlInstance> | null, State, unknown, Action> {\n  return (dispatch, getState) => {\n    const descriptors = getComponentPropControllerDescriptors(getState(), componentType)\n    if (descriptors == null) return null\n\n    const propControllers = Object.entries(descriptors).reduce(\n      (acc, [propName, descriptor]) => {\n        const propController = createPropController({\n          descriptor,\n          instanceKey: { elementKey, propPath: propName },\n          sendMessage: message =>\n            dispatch(\n              Builder.messageBuilderPropController(documentKey, elementKey, propName, message),\n            ),\n        }) as ControlInstance\n\n        return { ...acc, [propName]: propController }\n      },\n      {} as Record<string, ControlInstance>,\n    )\n\n    return propControllers\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/cjs/state/modules/read-write/resolved-value-overrides.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var resolved_value_overrides_exports = {};
 __export(resolved_value_overrides_exports, {
+  getGeneration: () => getGeneration,
   getInitialState: () => getInitialState,
   getValueOverride: () => getValueOverride,
   hasValueOverride: () => hasValueOverride,
@@ -27,14 +28,17 @@ module.exports = __toCommonJS(resolved_value_overrides_exports);
 var import_actions = require("../../actions");
 var import_read_write_action_types = require("../../actions/internal/read-write-action-types");
 function getInitialState() {
-  return { overrides: /* @__PURE__ */ new Map() };
+  return { overrides: /* @__PURE__ */ new Map(), generation: 0 };
 }
-const compositeKey = ({ elementKey, propPath }) => `${elementKey}@${propPath}`;
+const getOverride = (state, documentKey, { elementKey, propPath }) => state.overrides.get(documentKey)?.get(elementKey)?.get(propPath);
 function hasValueOverride(state, documentKey, instanceKey) {
-  return state.overrides.get(documentKey)?.has(compositeKey(instanceKey)) ?? false;
+  return getOverride(state, documentKey, instanceKey) != null;
 }
 function getValueOverride(state, documentKey, instanceKey) {
-  return state.overrides.get(documentKey)?.get(compositeKey(instanceKey));
+  return getOverride(state, documentKey, instanceKey)?.value;
+}
+function getGeneration(state) {
+  return state.generation;
 }
 function reducer(state = getInitialState(), action) {
   if (!(0, import_actions.isKnownAction)(action))
@@ -42,26 +46,40 @@ function reducer(state = getInitialState(), action) {
   switch (action.type) {
     case import_read_write_action_types.ReadWriteActionTypes.SET_RESOLVED_VALUE_OVERRIDE: {
       const { documentKey, instanceKey, value } = action.payload;
+      const { elementKey, propPath } = instanceKey;
+      const generation = state.generation + 1;
+      const propOverrides = new Map(getPropOverrides(state, documentKey, elementKey)).set(
+        propPath,
+        { value, setAtGeneration: generation }
+      );
       return {
-        ...state,
-        overrides: new Map(state.overrides).set(
-          documentKey,
-          new Map(state.overrides.get(documentKey) ?? []).set(compositeKey(instanceKey), value)
-        )
+        generation,
+        overrides: setPropOverrides(state, documentKey, elementKey, propOverrides)
       };
     }
-    case import_read_write_action_types.ReadWriteActionTypes.CLEAR_RESOLVED_VALUE_OVERRIDE: {
-      const { documentKey, instanceKey } = action.payload;
-      const nextOverrides = new Map(state.overrides.get(documentKey) ?? []);
-      const deleted = nextOverrides.delete(compositeKey(instanceKey));
-      return deleted ? { ...state, overrides: new Map(state.overrides).set(documentKey, nextOverrides) } : state;
+    case import_read_write_action_types.ReadWriteActionTypes.CLEAR_STALE_RESOLVED_VALUE_OVERRIDES: {
+      const { documentKey, elementKey, generation } = action.payload;
+      const propOverrides = getPropOverrides(state, documentKey, elementKey);
+      const overridesSinceGeneration = new Map(
+        Array.from(propOverrides).filter(([, override]) => override.setAtGeneration > generation)
+      );
+      return overridesSinceGeneration.size === propOverrides.size ? state : {
+        ...state,
+        overrides: setPropOverrides(state, documentKey, elementKey, overridesSinceGeneration)
+      };
     }
     default:
       return state;
   }
 }
+const getPropOverrides = (state, documentKey, elementKey) => state.overrides.get(documentKey)?.get(elementKey) ?? /* @__PURE__ */ new Map();
+const setPropOverrides = (state, documentKey, elementKey, propOverrides) => new Map(state.overrides).set(
+  documentKey,
+  new Map(state.overrides.get(documentKey) ?? []).set(elementKey, propOverrides)
+);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getGeneration,
   getInitialState,
   getValueOverride,
   hasValueOverride,

package/dist/cjs/state/modules/read-write/resolved-value-overrides.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/state/modules/read-write/resolved-value-overrides.ts"],"sourcesContent":["import { type ControlInstanceKey } from '@makeswift/controls'\n\nimport { type Action, type UnknownAction, isKnownAction } from '../../actions'\nimport { ReadWriteActionTypes } from '../../actions/internal/read-write-action-types'\n\nimport { Branded } from '../../../utils/branded'\n\nexport type ResolvedValueKey = ControlInstanceKey\nexport type ResolvedValue = unknown\n\ntype CompositeKey = Branded<string, 'CompositeResolvedValueKey'>\n\nexport type State = {\n  overrides: Map<string, Map<CompositeKey, ResolvedValue>>\n}\n\nexport function getInitialState(): State {\n  return { overrides: new Map() }\n}\n\nconst compositeKey = ({ elementKey, propPath }: ResolvedValueKey): CompositeKey =>\n  `${elementKey}@${propPath}` as CompositeKey\n\nexport function hasValueOverride(\n  state: State,\n  documentKey: string,\n  instanceKey: ResolvedValueKey,\n): boolean {\n  return state.overrides.get(documentKey)?.has(compositeKey(instanceKey)) ?? false\n}\n\nexport function getValueOverride(\n  state: State,\n  documentKey: string,\n  instanceKey: ResolvedValueKey,\n): ResolvedValue {\n  return state.overrides.get(documentKey)?.get(compositeKey(instanceKey))\n}\n\nexport function reducer(state: State = getInitialState(), action: Action | UnknownAction) {\n  if (!isKnownAction(action)) return state\n\n  switch (action.type) {\n    case ReadWriteActionTypes.SET_RESOLVED_VALUE_OVERRIDE: {\n      const { documentKey, instanceKey, value } = action.payload\n      return {\n        ...state,\n        overrides: new Map(state.overrides).set(\n          documentKey,\n          new Map(state.overrides.get(documentKey) ?? []).set(compositeKey(instanceKey), value),\n        ),\n      }\n    }\n\n    case ReadWriteActionTypes.CLEAR_RESOLVED_VALUE_OVERRIDE: {\n      const { documentKey, instanceKey } = action.payload\n      const nextOverrides = new Map(state.overrides.get(documentKey) ?? [])\n\n      const deleted = nextOverrides.delete(compositeKey(instanceKey))\n      return deleted\n        ? { ...state, overrides: new Map(state.overrides).set(documentKey, nextOverrides) }\n        : state\n    }\n\n    default:\n      return state\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,qBAA+D;AAC/D,qCAAqC;AAa9B,SAAS,kBAAyB;AACvC,SAAO,EAAE,WAAW,oBAAI,IAAI,EAAE;AAChC;AAEA,MAAM,eAAe,CAAC,EAAE,YAAY,SAAS,MAC3C,GAAG,UAAU,IAAI,QAAQ;AAEpB,SAAS,iBACd,OACA,aACA,aACS;AACT,SAAO,MAAM,UAAU,IAAI,WAAW,GAAG,IAAI,aAAa,WAAW,CAAC,KAAK;AAC7E;AAEO,SAAS,iBACd,OACA,aACA,aACe;AACf,SAAO,MAAM,UAAU,IAAI,WAAW,GAAG,IAAI,aAAa,WAAW,CAAC;AACxE;AAEO,SAAS,QAAQ,QAAe,gBAAgB,GAAG,QAAgC;AACxF,MAAI,KAAC,8BAAc,MAAM;AAAG,WAAO;AAEnC,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK,oDAAqB,6BAA6B;AACrD,YAAM,EAAE,aAAa,aAAa,MAAM,IAAI,OAAO;AACnD,aAAO;AAAA,QACL,GAAG;AAAA,QACH,WAAW,IAAI,IAAI,MAAM,SAAS,EAAE;AAAA,UAClC;AAAA,UACA,IAAI,IAAI,MAAM,UAAU,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE,IAAI,aAAa,WAAW,GAAG,KAAK;AAAA,QACtF;AAAA,MACF;AAAA,IACF;AAAA,IAEA,KAAK,oDAAqB,+BAA+B;AACvD,YAAM,EAAE,aAAa,YAAY,IAAI,OAAO;AAC5C,YAAM,gBAAgB,IAAI,IAAI,MAAM,UAAU,IAAI,WAAW,KAAK,CAAC,CAAC;AAEpE,YAAM,UAAU,cAAc,OAAO,aAAa,WAAW,CAAC;AAC9D,aAAO,UACH,EAAE,GAAG,OAAO,WAAW,IAAI,IAAI,MAAM,SAAS,EAAE,IAAI,aAAa,aAAa,EAAE,IAChF;AAAA,IACN;AAAA,IAEA;AACE,aAAO;AAAA,EACX;AACF;","names":[]}
+{"version":3,"sources":["../../../../../src/state/modules/read-write/resolved-value-overrides.ts"],"sourcesContent":["import { type ControlInstanceKey } from '@makeswift/controls'\n\nimport { type Action, type UnknownAction, isKnownAction } from '../../actions'\nimport { ReadWriteActionTypes } from '../../actions/internal/read-write-action-types'\n\nexport type ResolvedValueKey = ControlInstanceKey\nexport type ResolvedValue = unknown\n\ntype Override = {\n  value: ResolvedValue\n  setAtGeneration: number\n}\n\ntype PropOverrides = Map<string, Override>\ntype ElementOverrides = Map<string, PropOverrides>\n\nexport type State = {\n  overrides: Map<string, ElementOverrides>\n  // incremented every time an override is set\n  generation: number\n}\n\nexport function getInitialState(): State {\n  return { overrides: new Map(), generation: 0 }\n}\n\nconst getOverride = (\n  state: State,\n  documentKey: string,\n  { elementKey, propPath }: ResolvedValueKey,\n): Override | undefined => state.overrides.get(documentKey)?.get(elementKey)?.get(propPath)\n\nexport function hasValueOverride(\n  state: State,\n  documentKey: string,\n  instanceKey: ResolvedValueKey,\n): boolean {\n  return getOverride(state, documentKey, instanceKey) != null\n}\n\nexport function getValueOverride(\n  state: State,\n  documentKey: string,\n  instanceKey: ResolvedValueKey,\n): ResolvedValue {\n  return getOverride(state, documentKey, instanceKey)?.value\n}\n\nexport function getGeneration(state: State): number {\n  return state.generation\n}\n\nexport function reducer(state: State = getInitialState(), action: Action | UnknownAction) {\n  if (!isKnownAction(action)) return state\n\n  switch (action.type) {\n    case ReadWriteActionTypes.SET_RESOLVED_VALUE_OVERRIDE: {\n      const { documentKey, instanceKey, value } = action.payload\n      const { elementKey, propPath } = instanceKey\n      const generation = state.generation + 1\n\n      const propOverrides = new Map(getPropOverrides(state, documentKey, elementKey)).set(\n        propPath,\n        { value, setAtGeneration: generation },\n      )\n\n      return {\n        generation,\n        overrides: setPropOverrides(state, documentKey, elementKey, propOverrides),\n      }\n    }\n\n    case ReadWriteActionTypes.CLEAR_STALE_RESOLVED_VALUE_OVERRIDES: {\n      const { documentKey, elementKey, generation } = action.payload\n      const propOverrides = getPropOverrides(state, documentKey, elementKey)\n\n      const overridesSinceGeneration = new Map(\n        Array.from(propOverrides).filter(([, override]) => override.setAtGeneration > generation),\n      )\n\n      return overridesSinceGeneration.size === propOverrides.size\n        ? state\n        : {\n            ...state,\n            overrides: setPropOverrides(state, documentKey, elementKey, overridesSinceGeneration),\n          }\n    }\n\n    default:\n      return state\n  }\n}\n\nconst getPropOverrides = (state: State, documentKey: string, elementKey: string): PropOverrides =>\n  state.overrides.get(documentKey)?.get(elementKey) ?? new Map()\n\nconst setPropOverrides = (\n  state: State,\n  documentKey: string,\n  elementKey: string,\n  propOverrides: PropOverrides,\n): State['overrides'] =>\n  new Map(state.overrides).set(\n    documentKey,\n    new Map(state.overrides.get(documentKey) ?? []).set(elementKey, propOverrides),\n  )\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,qBAA+D;AAC/D,qCAAqC;AAmB9B,SAAS,kBAAyB;AACvC,SAAO,EAAE,WAAW,oBAAI,IAAI,GAAG,YAAY,EAAE;AAC/C;AAEA,MAAM,cAAc,CAClB,OACA,aACA,EAAE,YAAY,SAAS,MACE,MAAM,UAAU,IAAI,WAAW,GAAG,IAAI,UAAU,GAAG,IAAI,QAAQ;AAEnF,SAAS,iBACd,OACA,aACA,aACS;AACT,SAAO,YAAY,OAAO,aAAa,WAAW,KAAK;AACzD;AAEO,SAAS,iBACd,OACA,aACA,aACe;AACf,SAAO,YAAY,OAAO,aAAa,WAAW,GAAG;AACvD;AAEO,SAAS,cAAc,OAAsB;AAClD,SAAO,MAAM;AACf;AAEO,SAAS,QAAQ,QAAe,gBAAgB,GAAG,QAAgC;AACxF,MAAI,KAAC,8BAAc,MAAM;AAAG,WAAO;AAEnC,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK,oDAAqB,6BAA6B;AACrD,YAAM,EAAE,aAAa,aAAa,MAAM,IAAI,OAAO;AACnD,YAAM,EAAE,YAAY,SAAS,IAAI;AACjC,YAAM,aAAa,MAAM,aAAa;AAEtC,YAAM,gBAAgB,IAAI,IAAI,iBAAiB,OAAO,aAAa,UAAU,CAAC,EAAE;AAAA,QAC9E;AAAA,QACA,EAAE,OAAO,iBAAiB,WAAW;AAAA,MACvC;AAEA,aAAO;AAAA,QACL;AAAA,QACA,WAAW,iBAAiB,OAAO,aAAa,YAAY,aAAa;AAAA,MAC3E;AAAA,IACF;AAAA,IAEA,KAAK,oDAAqB,sCAAsC;AAC9D,YAAM,EAAE,aAAa,YAAY,WAAW,IAAI,OAAO;AACvD,YAAM,gBAAgB,iBAAiB,OAAO,aAAa,UAAU;AAErE,YAAM,2BAA2B,IAAI;AAAA,QACnC,MAAM,KAAK,aAAa,EAAE,OAAO,CAAC,CAAC,EAAE,QAAQ,MAAM,SAAS,kBAAkB,UAAU;AAAA,MAC1F;AAEA,aAAO,yBAAyB,SAAS,cAAc,OACnD,QACA;AAAA,QACE,GAAG;AAAA,QACH,WAAW,iBAAiB,OAAO,aAAa,YAAY,wBAAwB;AAAA,MACtF;AAAA,IACN;AAAA,IAEA;AACE,aAAO;AAAA,EACX;AACF;AAEA,MAAM,mBAAmB,CAAC,OAAc,aAAqB,eAC3D,MAAM,UAAU,IAAI,WAAW,GAAG,IAAI,UAAU,KAAK,oBAAI,IAAI;AAE/D,MAAM,mBAAmB,CACvB,OACA,aACA,YACA,kBAEA,IAAI,IAAI,MAAM,SAAS,EAAE;AAAA,EACvB;AAAA,EACA,IAAI,IAAI,MAAM,UAAU,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE,IAAI,YAAY,aAAa;AAC/E;","names":[]}