@makeswift/runtime 0.22.2-canary.1 → 0.22.3-canary.0

package/dist/cjs/next/api-handler/handlers/manifest.js

@@ -36,7 +36,7 @@ async function handler(...args) {
   const supportsPreviewMode = (0, import_ts_pattern.match)(args).with(routeHandlerPattern, () => false).with(apiRoutePattern, () => true).exhaustive();
   const supportsDraftMode = (0, import_ts_pattern.match)(args).with(routeHandlerPattern, () => true).with(apiRoutePattern, () => false).exhaustive();
   const body = {
-    version: "0.22.2-canary.1",
+    version: "0.22.3-canary.0",
     previewMode: supportsPreviewMode,
     draftMode: supportsDraftMode,
     interactionMode: true,

package/dist/cjs/runtimes/react/controls/control.js

@@ -35,7 +35,8 @@ function ControlValue({
   const id = `cv-${(0, import_use_css_id.useCssId)()}`;
   const value = (0, import_use_resolved_value.useResolvedValue)(
     data,
-    (data2, resourceResolver) => definition.resolveValue(data2, resourceResolver, stylesheetFactory.get(id), control)
+    (data2, resourceResolver) => definition.resolveValue(data2, resourceResolver, stylesheetFactory.get(id), control),
+    definition.config?.defaultValue
   );
   stylesheetFactory.useDefinedStyles();
   return children(value);

package/dist/cjs/runtimes/react/controls/control.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/controls/control.tsx"],"sourcesContent":["'use client'\n\nimport {\n  ControlDefinition,\n  type InstanceType,\n  type DataType,\n  type ResolvedValueType,\n} from '@makeswift/controls'\n\nimport { useResolvedValue } from '../hooks/use-resolved-value'\nimport { useStylesheetFactory } from '../hooks/use-stylesheet-factory'\nimport { useCssId } from '../hooks/use-css-id'\n\ntype ControlValueProps = {\n  definition: ControlDefinition\n  data: DataType<ControlDefinition> | undefined\n  children(value: ResolvedValueType<ControlDefinition>): JSX.Element\n  control?: InstanceType<ControlDefinition>\n}\n\nexport function ControlValue({\n  data,\n  definition,\n  children,\n  control,\n}: ControlValueProps): JSX.Element {\n  const stylesheetFactory = useStylesheetFactory()\n  const id = `cv-${useCssId()}`\n\n  const value = useResolvedValue(data, (data, resourceResolver) =>\n    definition.resolveValue(data, resourceResolver, stylesheetFactory.get(id), control),\n  )\n\n  stylesheetFactory.useDefinedStyles()\n\n  return children(value)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AASA,gCAAiC;AACjC,oCAAqC;AACrC,wBAAyB;AASlB,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAmC;AACjC,QAAM,wBAAoB,oDAAqB;AAC/C,QAAM,KAAK,UAAM,4BAAS,CAAC;AAE3B,QAAM,YAAQ;AAAA,IAAiB;AAAA,IAAM,CAACA,OAAM,qBAC1C,WAAW,aAAaA,OAAM,kBAAkB,kBAAkB,IAAI,EAAE,GAAG,OAAO;AAAA,EACpF;AAEA,oBAAkB,iBAAiB;AAEnC,SAAO,SAAS,KAAK;AACvB;","names":["data"]}
+{"version":3,"sources":["../../../../../src/runtimes/react/controls/control.tsx"],"sourcesContent":["'use client'\n\nimport {\n  ControlDefinition,\n  type InstanceType,\n  type DataType,\n  type ResolvedValueType,\n} from '@makeswift/controls'\n\nimport { useResolvedValue } from '../hooks/use-resolved-value'\nimport { useStylesheetFactory } from '../hooks/use-stylesheet-factory'\nimport { useCssId } from '../hooks/use-css-id'\n\ntype ControlValueProps = {\n  definition: ControlDefinition\n  data: DataType<ControlDefinition> | undefined\n  children(value: ResolvedValueType<ControlDefinition>): JSX.Element\n  control?: InstanceType<ControlDefinition>\n}\n\nexport function ControlValue({\n  data,\n  definition,\n  children,\n  control,\n}: ControlValueProps): JSX.Element {\n  const stylesheetFactory = useStylesheetFactory()\n  const id = `cv-${useCssId()}`\n\n  const value = useResolvedValue(\n    data,\n    (data, resourceResolver) =>\n      definition.resolveValue(data, resourceResolver, stylesheetFactory.get(id), control),\n    (definition.config as any)?.defaultValue,\n  )\n\n  stylesheetFactory.useDefinedStyles()\n\n  return children(value)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AASA,gCAAiC;AACjC,oCAAqC;AACrC,wBAAyB;AASlB,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAmC;AACjC,QAAM,wBAAoB,oDAAqB;AAC/C,QAAM,KAAK,UAAM,4BAAS,CAAC;AAE3B,QAAM,YAAQ;AAAA,IACZ;AAAA,IACA,CAACA,OAAM,qBACL,WAAW,aAAaA,OAAM,kBAAkB,kBAAkB,IAAI,EAAE,GAAG,OAAO;AAAA,IACnF,WAAW,QAAgB;AAAA,EAC9B;AAEA,oBAAkB,iBAAiB;AAEnC,SAAO,SAAS,KAAK;AACvB;","names":["data"]}

package/dist/cjs/runtimes/react/hooks/use-resolved-props.js

@@ -39,23 +39,7 @@ var import_use_document_key = require("./use-document-key");
 var import_use_selector = require("./use-selector");
 var import_use_stylesheet_factory = require("./use-stylesheet-factory");
 var import_resolvable_record = require("../resolvable-record");
-function propErrorHandlingProxy(resolvable, def, propName) {
-  return {
-    ...resolvable,
-    readStable: () => {
-      try {
-        return resolvable.readStable();
-      } catch (err) {
-        const defaultValue = def.config?.defaultValue;
-        console.error(
-          `Error reading value for prop "${propName}", falling back to \`${defaultValue}\`.`,
-          { control: def, error: err }
-        );
-        return defaultValue;
-      }
-    }
-  };
-}
+var import_prop_error_handling_proxy = require("../utils/prop-error-handling-proxy");
 function useControlInstances(elementKey) {
   const documentKey = (0, import_use_document_key.useDocumentKey)();
   return (0, import_use_selector.useSelector)((state) => {
@@ -88,10 +72,15 @@ function useResolvedProps(propDefs, elementData, elementKey) {
     [controls, elementData, resourceResolver, stylesheetFactory]
   );
   const resolvables = (0, import_react.useMemo)(
-    () => (0, import_controls.mapValues)(
-      propDefs,
-      (def, propName) => propErrorHandlingProxy(resolveProp(def, propName), def, propName)
-    ),
+    () => (0, import_controls.mapValues)(propDefs, (def, propName) => {
+      const defaultValue = def.config?.defaultValue;
+      return (0, import_prop_error_handling_proxy.propErrorHandlingProxy)(resolveProp(def, propName), defaultValue, (error) => {
+        console.warn(
+          `Error reading value for prop "${propName}", falling back to \`${defaultValue}\`.`,
+          { control: def, error }
+        );
+      });
+    }),
     [propDefs, resolveProp]
   );
   const props = (0, import_react.useMemo)(() => (0, import_resolvable_record.resolvableRecord)(resolvables), [resolvables]);

package/dist/cjs/runtimes/react/hooks/use-resolved-props.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-props.ts"],"sourcesContent":["import { useMemo, useEffect, useRef, useSyncExternalStore, useCallback } from 'react'\nimport {\n  ControlDefinition,\n  ControlInstance,\n  mapValues,\n  type Data,\n  type Resolvable,\n} from '@makeswift/controls'\n\nimport * as ReactPage from '../../../state/react-page'\nimport { useResourceResolver } from './use-resource-resolver'\nimport { useDocumentKey } from './use-document-key'\nimport { useSelector } from './use-selector'\n\nimport { useStylesheetFactory } from './use-stylesheet-factory'\n\nimport { resolvableRecord } from '../resolvable-record'\n\nfunction propErrorHandlingProxy(\n  resolvable: Resolvable<unknown>,\n  def: ControlDefinition,\n  propName: string,\n): Resolvable<unknown> {\n  return {\n    ...resolvable,\n    readStable: () => {\n      try {\n        return resolvable.readStable()\n      } catch (err) {\n        const defaultValue = (def.config as any)?.defaultValue\n        console.error(\n          `Error reading value for prop \"${propName}\", falling back to \\`${defaultValue}\\`.`,\n          { control: def, error: err },\n        )\n        return defaultValue\n      }\n    },\n  }\n}\n\nfunction useControlInstances(elementKey: string): Record<string, ControlInstance> | null {\n  const documentKey = useDocumentKey()\n\n  return useSelector(state => {\n    if (documentKey == null) return null\n\n    return ReactPage.getPropControllers(state, documentKey, elementKey)\n  })\n}\n\ntype CacheItem = {\n  data: Data\n  control: ControlInstance | undefined\n  resolvedValue: Resolvable<unknown>\n}\n\nexport function useResolvedProps(\n  propDefs: Record<string, ControlDefinition>,\n  elementData: Record<string, Data>,\n  elementKey: string,\n): Record<string, unknown> {\n  const stylesheetFactory = useStylesheetFactory()\n  const resourceResolver = useResourceResolver()\n  const controls = useControlInstances(elementKey)\n\n  const cache = useRef<Record<string, CacheItem>>({}).current\n  const resolveProp = useCallback(\n    (def: ControlDefinition, propName: string) => {\n      const data = elementData[propName]\n      const control = controls?.[propName]\n\n      if (\n        cache[propName] != null &&\n        data === cache[propName].data &&\n        control === cache[propName].control\n      ) {\n        return cache[propName].resolvedValue\n      }\n\n      const resolvedValue = def.resolveValue(\n        data,\n        resourceResolver,\n        stylesheetFactory.get(propName),\n        control,\n      )\n\n      cache[propName] = { data, control, resolvedValue }\n      return resolvedValue\n    },\n    [controls, elementData, resourceResolver, stylesheetFactory],\n  )\n\n  const resolvables = useMemo(\n    () =>\n      mapValues(propDefs, (def, propName) =>\n        propErrorHandlingProxy(resolveProp(def, propName), def, propName),\n      ),\n    [propDefs, resolveProp],\n  )\n\n  const props = useMemo(() => resolvableRecord(resolvables), [resolvables])\n\n  stylesheetFactory.useDefinedStyles()\n\n  useEffect(() => {\n    props.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(props.subscribe, props.readStable, props.readStable)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8E;AAC9E,sBAMO;AAEP,gBAA2B;AAC3B,mCAAoC;AACpC,8BAA+B;AAC/B,0BAA4B;AAE5B,oCAAqC;AAErC,+BAAiC;AAEjC,SAAS,uBACP,YACA,KACA,UACqB;AACrB,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY,MAAM;AAChB,UAAI;AACF,eAAO,WAAW,WAAW;AAAA,MAC/B,SAAS,KAAK;AACZ,cAAM,eAAgB,IAAI,QAAgB;AAC1C,gBAAQ;AAAA,UACN,iCAAiC,QAAQ,wBAAwB,YAAY;AAAA,UAC7E,EAAE,SAAS,KAAK,OAAO,IAAI;AAAA,QAC7B;AACA,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AACF;AAEA,SAAS,oBAAoB,YAA4D;AACvF,QAAM,kBAAc,wCAAe;AAEnC,aAAO,iCAAY,WAAS;AAC1B,QAAI,eAAe;AAAM,aAAO;AAEhC,WAAO,UAAU,mBAAmB,OAAO,aAAa,UAAU;AAAA,EACpE,CAAC;AACH;AAQO,SAAS,iBACd,UACA,aACA,YACyB;AACzB,QAAM,wBAAoB,oDAAqB;AAC/C,QAAM,uBAAmB,kDAAoB;AAC7C,QAAM,WAAW,oBAAoB,UAAU;AAE/C,QAAM,YAAQ,qBAAkC,CAAC,CAAC,EAAE;AACpD,QAAM,kBAAc;AAAA,IAClB,CAAC,KAAwB,aAAqB;AAC5C,YAAM,OAAO,YAAY,QAAQ;AACjC,YAAM,UAAU,WAAW,QAAQ;AAEnC,UACE,MAAM,QAAQ,KAAK,QACnB,SAAS,MAAM,QAAQ,EAAE,QACzB,YAAY,MAAM,QAAQ,EAAE,SAC5B;AACA,eAAO,MAAM,QAAQ,EAAE;AAAA,MACzB;AAEA,YAAM,gBAAgB,IAAI;AAAA,QACxB;AAAA,QACA;AAAA,QACA,kBAAkB,IAAI,QAAQ;AAAA,QAC9B;AAAA,MACF;AAEA,YAAM,QAAQ,IAAI,EAAE,MAAM,SAAS,cAAc;AACjD,aAAO;AAAA,IACT;AAAA,IACA,CAAC,UAAU,aAAa,kBAAkB,iBAAiB;AAAA,EAC7D;AAEA,QAAM,kBAAc;AAAA,IAClB,UACE;AAAA,MAAU;AAAA,MAAU,CAAC,KAAK,aACxB,uBAAuB,YAAY,KAAK,QAAQ,GAAG,KAAK,QAAQ;AAAA,IAClE;AAAA,IACF,CAAC,UAAU,WAAW;AAAA,EACxB;AAEA,QAAM,YAAQ,sBAAQ,UAAM,2CAAiB,WAAW,GAAG,CAAC,WAAW,CAAC;AAExE,oBAAkB,iBAAiB;AAEnC,8BAAU,MAAM;AACd,UAAM,eAAe;AAAA,EACvB,GAAG,CAAC,CAAC;AAEL,aAAO,mCAAqB,MAAM,WAAW,MAAM,YAAY,MAAM,UAAU;AACjF;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-props.ts"],"sourcesContent":["import { useMemo, useEffect, useRef, useSyncExternalStore, useCallback } from 'react'\nimport {\n  ControlDefinition,\n  ControlInstance,\n  mapValues,\n  type Data,\n  type Resolvable,\n} from '@makeswift/controls'\n\nimport * as ReactPage from '../../../state/react-page'\nimport { useResourceResolver } from './use-resource-resolver'\nimport { useDocumentKey } from './use-document-key'\nimport { useSelector } from './use-selector'\n\nimport { useStylesheetFactory } from './use-stylesheet-factory'\n\nimport { resolvableRecord } from '../resolvable-record'\nimport { propErrorHandlingProxy } from '../utils/prop-error-handling-proxy'\n\nfunction useControlInstances(elementKey: string): Record<string, ControlInstance> | null {\n  const documentKey = useDocumentKey()\n\n  return useSelector(state => {\n    if (documentKey == null) return null\n\n    return ReactPage.getPropControllers(state, documentKey, elementKey)\n  })\n}\n\ntype CacheItem = {\n  data: Data\n  control: ControlInstance | undefined\n  resolvedValue: Resolvable<unknown>\n}\n\nexport function useResolvedProps(\n  propDefs: Record<string, ControlDefinition>,\n  elementData: Record<string, Data>,\n  elementKey: string,\n): Record<string, unknown> {\n  const stylesheetFactory = useStylesheetFactory()\n  const resourceResolver = useResourceResolver()\n  const controls = useControlInstances(elementKey)\n\n  const cache = useRef<Record<string, CacheItem>>({}).current\n  const resolveProp = useCallback(\n    (def: ControlDefinition, propName: string) => {\n      const data = elementData[propName]\n      const control = controls?.[propName]\n\n      if (\n        cache[propName] != null &&\n        data === cache[propName].data &&\n        control === cache[propName].control\n      ) {\n        return cache[propName].resolvedValue\n      }\n\n      const resolvedValue = def.resolveValue(\n        data,\n        resourceResolver,\n        stylesheetFactory.get(propName),\n        control,\n      )\n\n      cache[propName] = { data, control, resolvedValue }\n      return resolvedValue\n    },\n    [controls, elementData, resourceResolver, stylesheetFactory],\n  )\n\n  const resolvables = useMemo(\n    () =>\n      mapValues(propDefs, (def, propName) => {\n        const defaultValue = (def.config as any)?.defaultValue\n        return propErrorHandlingProxy(resolveProp(def, propName), defaultValue, error => {\n          console.warn(\n            `Error reading value for prop \"${propName}\", falling back to \\`${defaultValue}\\`.`,\n            { control: def, error },\n          )\n        })\n      }),\n    [propDefs, resolveProp],\n  )\n\n  const props = useMemo(() => resolvableRecord(resolvables), [resolvables])\n\n  stylesheetFactory.useDefinedStyles()\n\n  useEffect(() => {\n    props.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(props.subscribe, props.readStable, props.readStable)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8E;AAC9E,sBAMO;AAEP,gBAA2B;AAC3B,mCAAoC;AACpC,8BAA+B;AAC/B,0BAA4B;AAE5B,oCAAqC;AAErC,+BAAiC;AACjC,uCAAuC;AAEvC,SAAS,oBAAoB,YAA4D;AACvF,QAAM,kBAAc,wCAAe;AAEnC,aAAO,iCAAY,WAAS;AAC1B,QAAI,eAAe;AAAM,aAAO;AAEhC,WAAO,UAAU,mBAAmB,OAAO,aAAa,UAAU;AAAA,EACpE,CAAC;AACH;AAQO,SAAS,iBACd,UACA,aACA,YACyB;AACzB,QAAM,wBAAoB,oDAAqB;AAC/C,QAAM,uBAAmB,kDAAoB;AAC7C,QAAM,WAAW,oBAAoB,UAAU;AAE/C,QAAM,YAAQ,qBAAkC,CAAC,CAAC,EAAE;AACpD,QAAM,kBAAc;AAAA,IAClB,CAAC,KAAwB,aAAqB;AAC5C,YAAM,OAAO,YAAY,QAAQ;AACjC,YAAM,UAAU,WAAW,QAAQ;AAEnC,UACE,MAAM,QAAQ,KAAK,QACnB,SAAS,MAAM,QAAQ,EAAE,QACzB,YAAY,MAAM,QAAQ,EAAE,SAC5B;AACA,eAAO,MAAM,QAAQ,EAAE;AAAA,MACzB;AAEA,YAAM,gBAAgB,IAAI;AAAA,QACxB;AAAA,QACA;AAAA,QACA,kBAAkB,IAAI,QAAQ;AAAA,QAC9B;AAAA,MACF;AAEA,YAAM,QAAQ,IAAI,EAAE,MAAM,SAAS,cAAc;AACjD,aAAO;AAAA,IACT;AAAA,IACA,CAAC,UAAU,aAAa,kBAAkB,iBAAiB;AAAA,EAC7D;AAEA,QAAM,kBAAc;AAAA,IAClB,UACE,2BAAU,UAAU,CAAC,KAAK,aAAa;AACrC,YAAM,eAAgB,IAAI,QAAgB;AAC1C,iBAAO,yDAAuB,YAAY,KAAK,QAAQ,GAAG,cAAc,WAAS;AAC/E,gBAAQ;AAAA,UACN,iCAAiC,QAAQ,wBAAwB,YAAY;AAAA,UAC7E,EAAE,SAAS,KAAK,MAAM;AAAA,QACxB;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,IACH,CAAC,UAAU,WAAW;AAAA,EACxB;AAEA,QAAM,YAAQ,sBAAQ,UAAM,2CAAiB,WAAW,GAAG,CAAC,WAAW,CAAC;AAExE,oBAAkB,iBAAiB;AAEnC,8BAAU,MAAM;AACd,UAAM,eAAe;AAAA,EACvB,GAAG,CAAC,CAAC;AAEL,aAAO,mCAAqB,MAAM,WAAW,MAAM,YAAY,MAAM,UAAU;AACjF;","names":[]}

package/dist/cjs/runtimes/react/hooks/use-resolved-value.js

@@ -23,9 +23,14 @@ __export(use_resolved_value_exports, {
 module.exports = __toCommonJS(use_resolved_value_exports);
 var import_react = require("react");
 var import_use_resource_resolver = require("./use-resource-resolver");
-function useResolvedValue(data, resolver) {
+var import_prop_error_handling_proxy = require("../utils/prop-error-handling-proxy");
+function useResolvedValue(data, resolver, defaultValue) {
   const resourceResolver = (0, import_use_resource_resolver.useResourceResolver)();
-  const resolvable = (0, import_react.useMemo)(() => resolver(data, resourceResolver), [data, resourceResolver]);
+  const resolvable = (0, import_react.useMemo)(() => {
+    return (0, import_prop_error_handling_proxy.propErrorHandlingProxy)(resolver(data, resourceResolver), defaultValue, (error) => {
+      console.warn(`Error resolving data, falling back to \`${defaultValue}\`.`, { error, data });
+    });
+  }, [data, resourceResolver, defaultValue]);
   (0, import_react.useEffect)(() => {
     resolvable.triggerResolve();
   }, []);

package/dist/cjs/runtimes/react/hooks/use-resolved-value.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-value.ts"],"sourcesContent":["import { useMemo, useEffect, useSyncExternalStore } from 'react'\nimport { Resolvable, ResourceResolver } from '@makeswift/controls'\n\nimport { useResourceResolver } from './use-resource-resolver'\n\nexport function useResolvedValue<D, T>(\n  data: D,\n  resolver: (data: D, resourceResolver: ResourceResolver) => Resolvable<T>,\n): T {\n  const resourceResolver = useResourceResolver()\n  const resolvable = useMemo(() => resolver(data, resourceResolver), [data, resourceResolver])\n\n  useEffect(() => {\n    resolvable.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(resolvable.subscribe, resolvable.readStable, resolvable.readStable)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAyD;AAGzD,mCAAoC;AAE7B,SAAS,iBACd,MACA,UACG;AACH,QAAM,uBAAmB,kDAAoB;AAC7C,QAAM,iBAAa,sBAAQ,MAAM,SAAS,MAAM,gBAAgB,GAAG,CAAC,MAAM,gBAAgB,CAAC;AAE3F,8BAAU,MAAM;AACd,eAAW,eAAe;AAAA,EAC5B,GAAG,CAAC,CAAC;AAEL,aAAO,mCAAqB,WAAW,WAAW,WAAW,YAAY,WAAW,UAAU;AAChG;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-value.ts"],"sourcesContent":["import { useMemo, useEffect, useSyncExternalStore } from 'react'\nimport { Resolvable, ResourceResolver } from '@makeswift/controls'\n\nimport { useResourceResolver } from './use-resource-resolver'\nimport { propErrorHandlingProxy } from '../utils/prop-error-handling-proxy'\n\nexport function useResolvedValue<D, T>(\n  data: D,\n  resolver: (data: D, resourceResolver: ResourceResolver) => Resolvable<T>,\n  defaultValue?: T,\n): T | undefined {\n  const resourceResolver = useResourceResolver()\n  const resolvable = useMemo(() => {\n    return propErrorHandlingProxy(resolver(data, resourceResolver), defaultValue, error => {\n      console.warn(`Error resolving data, falling back to \\`${defaultValue}\\`.`, { error, data })\n    })\n  }, [data, resourceResolver, defaultValue])\n\n  useEffect(() => {\n    resolvable.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(resolvable.subscribe, resolvable.readStable, resolvable.readStable)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAyD;AAGzD,mCAAoC;AACpC,uCAAuC;AAEhC,SAAS,iBACd,MACA,UACA,cACe;AACf,QAAM,uBAAmB,kDAAoB;AAC7C,QAAM,iBAAa,sBAAQ,MAAM;AAC/B,eAAO,yDAAuB,SAAS,MAAM,gBAAgB,GAAG,cAAc,WAAS;AACrF,cAAQ,KAAK,2CAA2C,YAAY,OAAO,EAAE,OAAO,KAAK,CAAC;AAAA,IAC5F,CAAC;AAAA,EACH,GAAG,CAAC,MAAM,kBAAkB,YAAY,CAAC;AAEzC,8BAAU,MAAM;AACd,eAAW,eAAe;AAAA,EAC5B,GAAG,CAAC,CAAC;AAEL,aAAO,mCAAqB,WAAW,WAAW,WAAW,YAAY,WAAW,UAAU;AAChG;","names":[]}

package/dist/cjs/runtimes/react/utils/prop-error-handling-proxy.js

@@ -0,0 +1,41 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var prop_error_handling_proxy_exports = {};
+__export(prop_error_handling_proxy_exports, {
+  propErrorHandlingProxy: () => propErrorHandlingProxy
+});
+module.exports = __toCommonJS(prop_error_handling_proxy_exports);
+function propErrorHandlingProxy(resolvable, fallback, onError) {
+  return {
+    ...resolvable,
+    readStable: () => {
+      try {
+        return resolvable.readStable();
+      } catch (err) {
+        onError?.(err);
+        return fallback;
+      }
+    }
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  propErrorHandlingProxy
+});
+//# sourceMappingURL=prop-error-handling-proxy.js.map

package/dist/cjs/runtimes/react/utils/prop-error-handling-proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/runtimes/react/utils/prop-error-handling-proxy.ts"],"sourcesContent":["import { type Resolvable } from '@makeswift/controls'\n\nexport function propErrorHandlingProxy<T>(\n  resolvable: Resolvable<T>,\n  fallback: T,\n  onError?: (error: unknown) => void,\n): Resolvable<T> {\n  return {\n    ...resolvable,\n    readStable: () => {\n      try {\n        return resolvable.readStable()\n      } catch (err: unknown) {\n        onError?.(err)\n        return fallback\n      }\n    },\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,SAAS,uBACd,YACA,UACA,SACe;AACf,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY,MAAM;AAChB,UAAI;AACF,eAAO,WAAW,WAAW;AAAA,MAC/B,SAAS,KAAc;AACrB,kBAAU,GAAG;AACb,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AACF;","names":[]}

package/dist/esm/next/api-handler/handlers/manifest.js

@@ -13,7 +13,7 @@ async function handler(...args) {
   const supportsPreviewMode = match(args).with(routeHandlerPattern, () => false).with(apiRoutePattern, () => true).exhaustive();
   const supportsDraftMode = match(args).with(routeHandlerPattern, () => true).with(apiRoutePattern, () => false).exhaustive();
   const body = {
-    version: "0.22.2-canary.1",
+    version: "0.22.3-canary.0",
     previewMode: supportsPreviewMode,
     draftMode: supportsDraftMode,
     interactionMode: true,

package/dist/esm/runtimes/react/controls/control.js

@@ -12,7 +12,8 @@ function ControlValue({
   const id = `cv-${useCssId()}`;
   const value = useResolvedValue(
     data,
-    (data2, resourceResolver) => definition.resolveValue(data2, resourceResolver, stylesheetFactory.get(id), control)
+    (data2, resourceResolver) => definition.resolveValue(data2, resourceResolver, stylesheetFactory.get(id), control),
+    definition.config?.defaultValue
   );
   stylesheetFactory.useDefinedStyles();
   return children(value);

package/dist/esm/runtimes/react/controls/control.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/controls/control.tsx"],"sourcesContent":["'use client'\n\nimport {\n  ControlDefinition,\n  type InstanceType,\n  type DataType,\n  type ResolvedValueType,\n} from '@makeswift/controls'\n\nimport { useResolvedValue } from '../hooks/use-resolved-value'\nimport { useStylesheetFactory } from '../hooks/use-stylesheet-factory'\nimport { useCssId } from '../hooks/use-css-id'\n\ntype ControlValueProps = {\n  definition: ControlDefinition\n  data: DataType<ControlDefinition> | undefined\n  children(value: ResolvedValueType<ControlDefinition>): JSX.Element\n  control?: InstanceType<ControlDefinition>\n}\n\nexport function ControlValue({\n  data,\n  definition,\n  children,\n  control,\n}: ControlValueProps): JSX.Element {\n  const stylesheetFactory = useStylesheetFactory()\n  const id = `cv-${useCssId()}`\n\n  const value = useResolvedValue(data, (data, resourceResolver) =>\n    definition.resolveValue(data, resourceResolver, stylesheetFactory.get(id), control),\n  )\n\n  stylesheetFactory.useDefinedStyles()\n\n  return children(value)\n}\n"],"mappings":";AASA,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AACrC,SAAS,gBAAgB;AASlB,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAmC;AACjC,QAAM,oBAAoB,qBAAqB;AAC/C,QAAM,KAAK,MAAM,SAAS,CAAC;AAE3B,QAAM,QAAQ;AAAA,IAAiB;AAAA,IAAM,CAACA,OAAM,qBAC1C,WAAW,aAAaA,OAAM,kBAAkB,kBAAkB,IAAI,EAAE,GAAG,OAAO;AAAA,EACpF;AAEA,oBAAkB,iBAAiB;AAEnC,SAAO,SAAS,KAAK;AACvB;","names":["data"]}
+{"version":3,"sources":["../../../../../src/runtimes/react/controls/control.tsx"],"sourcesContent":["'use client'\n\nimport {\n  ControlDefinition,\n  type InstanceType,\n  type DataType,\n  type ResolvedValueType,\n} from '@makeswift/controls'\n\nimport { useResolvedValue } from '../hooks/use-resolved-value'\nimport { useStylesheetFactory } from '../hooks/use-stylesheet-factory'\nimport { useCssId } from '../hooks/use-css-id'\n\ntype ControlValueProps = {\n  definition: ControlDefinition\n  data: DataType<ControlDefinition> | undefined\n  children(value: ResolvedValueType<ControlDefinition>): JSX.Element\n  control?: InstanceType<ControlDefinition>\n}\n\nexport function ControlValue({\n  data,\n  definition,\n  children,\n  control,\n}: ControlValueProps): JSX.Element {\n  const stylesheetFactory = useStylesheetFactory()\n  const id = `cv-${useCssId()}`\n\n  const value = useResolvedValue(\n    data,\n    (data, resourceResolver) =>\n      definition.resolveValue(data, resourceResolver, stylesheetFactory.get(id), control),\n    (definition.config as any)?.defaultValue,\n  )\n\n  stylesheetFactory.useDefinedStyles()\n\n  return children(value)\n}\n"],"mappings":";AASA,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AACrC,SAAS,gBAAgB;AASlB,SAAS,aAAa;AAAA,EAC3B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAmC;AACjC,QAAM,oBAAoB,qBAAqB;AAC/C,QAAM,KAAK,MAAM,SAAS,CAAC;AAE3B,QAAM,QAAQ;AAAA,IACZ;AAAA,IACA,CAACA,OAAM,qBACL,WAAW,aAAaA,OAAM,kBAAkB,kBAAkB,IAAI,EAAE,GAAG,OAAO;AAAA,IACnF,WAAW,QAAgB;AAAA,EAC9B;AAEA,oBAAkB,iBAAiB;AAEnC,SAAO,SAAS,KAAK;AACvB;","names":["data"]}

package/dist/esm/runtimes/react/hooks/use-resolved-props.js

@@ -8,23 +8,7 @@ import { useDocumentKey } from "./use-document-key";
 import { useSelector } from "./use-selector";
 import { useStylesheetFactory } from "./use-stylesheet-factory";
 import { resolvableRecord } from "../resolvable-record";
-function propErrorHandlingProxy(resolvable, def, propName) {
-  return {
-    ...resolvable,
-    readStable: () => {
-      try {
-        return resolvable.readStable();
-      } catch (err) {
-        const defaultValue = def.config?.defaultValue;
-        console.error(
-          `Error reading value for prop "${propName}", falling back to \`${defaultValue}\`.`,
-          { control: def, error: err }
-        );
-        return defaultValue;
-      }
-    }
-  };
-}
+import { propErrorHandlingProxy } from "../utils/prop-error-handling-proxy";
 function useControlInstances(elementKey) {
   const documentKey = useDocumentKey();
   return useSelector((state) => {
@@ -57,10 +41,15 @@ function useResolvedProps(propDefs, elementData, elementKey) {
     [controls, elementData, resourceResolver, stylesheetFactory]
   );
   const resolvables = useMemo(
-    () => mapValues(
-      propDefs,
-      (def, propName) => propErrorHandlingProxy(resolveProp(def, propName), def, propName)
-    ),
+    () => mapValues(propDefs, (def, propName) => {
+      const defaultValue = def.config?.defaultValue;
+      return propErrorHandlingProxy(resolveProp(def, propName), defaultValue, (error) => {
+        console.warn(
+          `Error reading value for prop "${propName}", falling back to \`${defaultValue}\`.`,
+          { control: def, error }
+        );
+      });
+    }),
     [propDefs, resolveProp]
   );
   const props = useMemo(() => resolvableRecord(resolvables), [resolvables]);

package/dist/esm/runtimes/react/hooks/use-resolved-props.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-props.ts"],"sourcesContent":["import { useMemo, useEffect, useRef, useSyncExternalStore, useCallback } from 'react'\nimport {\n  ControlDefinition,\n  ControlInstance,\n  mapValues,\n  type Data,\n  type Resolvable,\n} from '@makeswift/controls'\n\nimport * as ReactPage from '../../../state/react-page'\nimport { useResourceResolver } from './use-resource-resolver'\nimport { useDocumentKey } from './use-document-key'\nimport { useSelector } from './use-selector'\n\nimport { useStylesheetFactory } from './use-stylesheet-factory'\n\nimport { resolvableRecord } from '../resolvable-record'\n\nfunction propErrorHandlingProxy(\n  resolvable: Resolvable<unknown>,\n  def: ControlDefinition,\n  propName: string,\n): Resolvable<unknown> {\n  return {\n    ...resolvable,\n    readStable: () => {\n      try {\n        return resolvable.readStable()\n      } catch (err) {\n        const defaultValue = (def.config as any)?.defaultValue\n        console.error(\n          `Error reading value for prop \"${propName}\", falling back to \\`${defaultValue}\\`.`,\n          { control: def, error: err },\n        )\n        return defaultValue\n      }\n    },\n  }\n}\n\nfunction useControlInstances(elementKey: string): Record<string, ControlInstance> | null {\n  const documentKey = useDocumentKey()\n\n  return useSelector(state => {\n    if (documentKey == null) return null\n\n    return ReactPage.getPropControllers(state, documentKey, elementKey)\n  })\n}\n\ntype CacheItem = {\n  data: Data\n  control: ControlInstance | undefined\n  resolvedValue: Resolvable<unknown>\n}\n\nexport function useResolvedProps(\n  propDefs: Record<string, ControlDefinition>,\n  elementData: Record<string, Data>,\n  elementKey: string,\n): Record<string, unknown> {\n  const stylesheetFactory = useStylesheetFactory()\n  const resourceResolver = useResourceResolver()\n  const controls = useControlInstances(elementKey)\n\n  const cache = useRef<Record<string, CacheItem>>({}).current\n  const resolveProp = useCallback(\n    (def: ControlDefinition, propName: string) => {\n      const data = elementData[propName]\n      const control = controls?.[propName]\n\n      if (\n        cache[propName] != null &&\n        data === cache[propName].data &&\n        control === cache[propName].control\n      ) {\n        return cache[propName].resolvedValue\n      }\n\n      const resolvedValue = def.resolveValue(\n        data,\n        resourceResolver,\n        stylesheetFactory.get(propName),\n        control,\n      )\n\n      cache[propName] = { data, control, resolvedValue }\n      return resolvedValue\n    },\n    [controls, elementData, resourceResolver, stylesheetFactory],\n  )\n\n  const resolvables = useMemo(\n    () =>\n      mapValues(propDefs, (def, propName) =>\n        propErrorHandlingProxy(resolveProp(def, propName), def, propName),\n      ),\n    [propDefs, resolveProp],\n  )\n\n  const props = useMemo(() => resolvableRecord(resolvables), [resolvables])\n\n  stylesheetFactory.useDefinedStyles()\n\n  useEffect(() => {\n    props.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(props.subscribe, props.readStable, props.readStable)\n}\n"],"mappings":"AAAA,SAAS,SAAS,WAAW,QAAQ,sBAAsB,mBAAmB;AAC9E;AAAA,EAGE;AAAA,OAGK;AAEP,YAAY,eAAe;AAC3B,SAAS,2BAA2B;AACpC,SAAS,sBAAsB;AAC/B,SAAS,mBAAmB;AAE5B,SAAS,4BAA4B;AAErC,SAAS,wBAAwB;AAEjC,SAAS,uBACP,YACA,KACA,UACqB;AACrB,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY,MAAM;AAChB,UAAI;AACF,eAAO,WAAW,WAAW;AAAA,MAC/B,SAAS,KAAK;AACZ,cAAM,eAAgB,IAAI,QAAgB;AAC1C,gBAAQ;AAAA,UACN,iCAAiC,QAAQ,wBAAwB,YAAY;AAAA,UAC7E,EAAE,SAAS,KAAK,OAAO,IAAI;AAAA,QAC7B;AACA,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AACF;AAEA,SAAS,oBAAoB,YAA4D;AACvF,QAAM,cAAc,eAAe;AAEnC,SAAO,YAAY,WAAS;AAC1B,QAAI,eAAe;AAAM,aAAO;AAEhC,WAAO,UAAU,mBAAmB,OAAO,aAAa,UAAU;AAAA,EACpE,CAAC;AACH;AAQO,SAAS,iBACd,UACA,aACA,YACyB;AACzB,QAAM,oBAAoB,qBAAqB;AAC/C,QAAM,mBAAmB,oBAAoB;AAC7C,QAAM,WAAW,oBAAoB,UAAU;AAE/C,QAAM,QAAQ,OAAkC,CAAC,CAAC,EAAE;AACpD,QAAM,cAAc;AAAA,IAClB,CAAC,KAAwB,aAAqB;AAC5C,YAAM,OAAO,YAAY,QAAQ;AACjC,YAAM,UAAU,WAAW,QAAQ;AAEnC,UACE,MAAM,QAAQ,KAAK,QACnB,SAAS,MAAM,QAAQ,EAAE,QACzB,YAAY,MAAM,QAAQ,EAAE,SAC5B;AACA,eAAO,MAAM,QAAQ,EAAE;AAAA,MACzB;AAEA,YAAM,gBAAgB,IAAI;AAAA,QACxB;AAAA,QACA;AAAA,QACA,kBAAkB,IAAI,QAAQ;AAAA,QAC9B;AAAA,MACF;AAEA,YAAM,QAAQ,IAAI,EAAE,MAAM,SAAS,cAAc;AACjD,aAAO;AAAA,IACT;AAAA,IACA,CAAC,UAAU,aAAa,kBAAkB,iBAAiB;AAAA,EAC7D;AAEA,QAAM,cAAc;AAAA,IAClB,MACE;AAAA,MAAU;AAAA,MAAU,CAAC,KAAK,aACxB,uBAAuB,YAAY,KAAK,QAAQ,GAAG,KAAK,QAAQ;AAAA,IAClE;AAAA,IACF,CAAC,UAAU,WAAW;AAAA,EACxB;AAEA,QAAM,QAAQ,QAAQ,MAAM,iBAAiB,WAAW,GAAG,CAAC,WAAW,CAAC;AAExE,oBAAkB,iBAAiB;AAEnC,YAAU,MAAM;AACd,UAAM,eAAe;AAAA,EACvB,GAAG,CAAC,CAAC;AAEL,SAAO,qBAAqB,MAAM,WAAW,MAAM,YAAY,MAAM,UAAU;AACjF;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-props.ts"],"sourcesContent":["import { useMemo, useEffect, useRef, useSyncExternalStore, useCallback } from 'react'\nimport {\n  ControlDefinition,\n  ControlInstance,\n  mapValues,\n  type Data,\n  type Resolvable,\n} from '@makeswift/controls'\n\nimport * as ReactPage from '../../../state/react-page'\nimport { useResourceResolver } from './use-resource-resolver'\nimport { useDocumentKey } from './use-document-key'\nimport { useSelector } from './use-selector'\n\nimport { useStylesheetFactory } from './use-stylesheet-factory'\n\nimport { resolvableRecord } from '../resolvable-record'\nimport { propErrorHandlingProxy } from '../utils/prop-error-handling-proxy'\n\nfunction useControlInstances(elementKey: string): Record<string, ControlInstance> | null {\n  const documentKey = useDocumentKey()\n\n  return useSelector(state => {\n    if (documentKey == null) return null\n\n    return ReactPage.getPropControllers(state, documentKey, elementKey)\n  })\n}\n\ntype CacheItem = {\n  data: Data\n  control: ControlInstance | undefined\n  resolvedValue: Resolvable<unknown>\n}\n\nexport function useResolvedProps(\n  propDefs: Record<string, ControlDefinition>,\n  elementData: Record<string, Data>,\n  elementKey: string,\n): Record<string, unknown> {\n  const stylesheetFactory = useStylesheetFactory()\n  const resourceResolver = useResourceResolver()\n  const controls = useControlInstances(elementKey)\n\n  const cache = useRef<Record<string, CacheItem>>({}).current\n  const resolveProp = useCallback(\n    (def: ControlDefinition, propName: string) => {\n      const data = elementData[propName]\n      const control = controls?.[propName]\n\n      if (\n        cache[propName] != null &&\n        data === cache[propName].data &&\n        control === cache[propName].control\n      ) {\n        return cache[propName].resolvedValue\n      }\n\n      const resolvedValue = def.resolveValue(\n        data,\n        resourceResolver,\n        stylesheetFactory.get(propName),\n        control,\n      )\n\n      cache[propName] = { data, control, resolvedValue }\n      return resolvedValue\n    },\n    [controls, elementData, resourceResolver, stylesheetFactory],\n  )\n\n  const resolvables = useMemo(\n    () =>\n      mapValues(propDefs, (def, propName) => {\n        const defaultValue = (def.config as any)?.defaultValue\n        return propErrorHandlingProxy(resolveProp(def, propName), defaultValue, error => {\n          console.warn(\n            `Error reading value for prop \"${propName}\", falling back to \\`${defaultValue}\\`.`,\n            { control: def, error },\n          )\n        })\n      }),\n    [propDefs, resolveProp],\n  )\n\n  const props = useMemo(() => resolvableRecord(resolvables), [resolvables])\n\n  stylesheetFactory.useDefinedStyles()\n\n  useEffect(() => {\n    props.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(props.subscribe, props.readStable, props.readStable)\n}\n"],"mappings":"AAAA,SAAS,SAAS,WAAW,QAAQ,sBAAsB,mBAAmB;AAC9E;AAAA,EAGE;AAAA,OAGK;AAEP,YAAY,eAAe;AAC3B,SAAS,2BAA2B;AACpC,SAAS,sBAAsB;AAC/B,SAAS,mBAAmB;AAE5B,SAAS,4BAA4B;AAErC,SAAS,wBAAwB;AACjC,SAAS,8BAA8B;AAEvC,SAAS,oBAAoB,YAA4D;AACvF,QAAM,cAAc,eAAe;AAEnC,SAAO,YAAY,WAAS;AAC1B,QAAI,eAAe;AAAM,aAAO;AAEhC,WAAO,UAAU,mBAAmB,OAAO,aAAa,UAAU;AAAA,EACpE,CAAC;AACH;AAQO,SAAS,iBACd,UACA,aACA,YACyB;AACzB,QAAM,oBAAoB,qBAAqB;AAC/C,QAAM,mBAAmB,oBAAoB;AAC7C,QAAM,WAAW,oBAAoB,UAAU;AAE/C,QAAM,QAAQ,OAAkC,CAAC,CAAC,EAAE;AACpD,QAAM,cAAc;AAAA,IAClB,CAAC,KAAwB,aAAqB;AAC5C,YAAM,OAAO,YAAY,QAAQ;AACjC,YAAM,UAAU,WAAW,QAAQ;AAEnC,UACE,MAAM,QAAQ,KAAK,QACnB,SAAS,MAAM,QAAQ,EAAE,QACzB,YAAY,MAAM,QAAQ,EAAE,SAC5B;AACA,eAAO,MAAM,QAAQ,EAAE;AAAA,MACzB;AAEA,YAAM,gBAAgB,IAAI;AAAA,QACxB;AAAA,QACA;AAAA,QACA,kBAAkB,IAAI,QAAQ;AAAA,QAC9B;AAAA,MACF;AAEA,YAAM,QAAQ,IAAI,EAAE,MAAM,SAAS,cAAc;AACjD,aAAO;AAAA,IACT;AAAA,IACA,CAAC,UAAU,aAAa,kBAAkB,iBAAiB;AAAA,EAC7D;AAEA,QAAM,cAAc;AAAA,IAClB,MACE,UAAU,UAAU,CAAC,KAAK,aAAa;AACrC,YAAM,eAAgB,IAAI,QAAgB;AAC1C,aAAO,uBAAuB,YAAY,KAAK,QAAQ,GAAG,cAAc,WAAS;AAC/E,gBAAQ;AAAA,UACN,iCAAiC,QAAQ,wBAAwB,YAAY;AAAA,UAC7E,EAAE,SAAS,KAAK,MAAM;AAAA,QACxB;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,IACH,CAAC,UAAU,WAAW;AAAA,EACxB;AAEA,QAAM,QAAQ,QAAQ,MAAM,iBAAiB,WAAW,GAAG,CAAC,WAAW,CAAC;AAExE,oBAAkB,iBAAiB;AAEnC,YAAU,MAAM;AACd,UAAM,eAAe;AAAA,EACvB,GAAG,CAAC,CAAC;AAEL,SAAO,qBAAqB,MAAM,WAAW,MAAM,YAAY,MAAM,UAAU;AACjF;","names":[]}

package/dist/esm/runtimes/react/hooks/use-resolved-value.js

@@ -1,8 +1,13 @@
 import { useMemo, useEffect, useSyncExternalStore } from "react";
 import { useResourceResolver } from "./use-resource-resolver";
-function useResolvedValue(data, resolver) {
+import { propErrorHandlingProxy } from "../utils/prop-error-handling-proxy";
+function useResolvedValue(data, resolver, defaultValue) {
   const resourceResolver = useResourceResolver();
-  const resolvable = useMemo(() => resolver(data, resourceResolver), [data, resourceResolver]);
+  const resolvable = useMemo(() => {
+    return propErrorHandlingProxy(resolver(data, resourceResolver), defaultValue, (error) => {
+      console.warn(`Error resolving data, falling back to \`${defaultValue}\`.`, { error, data });
+    });
+  }, [data, resourceResolver, defaultValue]);
   useEffect(() => {
     resolvable.triggerResolve();
   }, []);

package/dist/esm/runtimes/react/hooks/use-resolved-value.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-value.ts"],"sourcesContent":["import { useMemo, useEffect, useSyncExternalStore } from 'react'\nimport { Resolvable, ResourceResolver } from '@makeswift/controls'\n\nimport { useResourceResolver } from './use-resource-resolver'\n\nexport function useResolvedValue<D, T>(\n  data: D,\n  resolver: (data: D, resourceResolver: ResourceResolver) => Resolvable<T>,\n): T {\n  const resourceResolver = useResourceResolver()\n  const resolvable = useMemo(() => resolver(data, resourceResolver), [data, resourceResolver])\n\n  useEffect(() => {\n    resolvable.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(resolvable.subscribe, resolvable.readStable, resolvable.readStable)\n}\n"],"mappings":"AAAA,SAAS,SAAS,WAAW,4BAA4B;AAGzD,SAAS,2BAA2B;AAE7B,SAAS,iBACd,MACA,UACG;AACH,QAAM,mBAAmB,oBAAoB;AAC7C,QAAM,aAAa,QAAQ,MAAM,SAAS,MAAM,gBAAgB,GAAG,CAAC,MAAM,gBAAgB,CAAC;AAE3F,YAAU,MAAM;AACd,eAAW,eAAe;AAAA,EAC5B,GAAG,CAAC,CAAC;AAEL,SAAO,qBAAqB,WAAW,WAAW,WAAW,YAAY,WAAW,UAAU;AAChG;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-value.ts"],"sourcesContent":["import { useMemo, useEffect, useSyncExternalStore } from 'react'\nimport { Resolvable, ResourceResolver } from '@makeswift/controls'\n\nimport { useResourceResolver } from './use-resource-resolver'\nimport { propErrorHandlingProxy } from '../utils/prop-error-handling-proxy'\n\nexport function useResolvedValue<D, T>(\n  data: D,\n  resolver: (data: D, resourceResolver: ResourceResolver) => Resolvable<T>,\n  defaultValue?: T,\n): T | undefined {\n  const resourceResolver = useResourceResolver()\n  const resolvable = useMemo(() => {\n    return propErrorHandlingProxy(resolver(data, resourceResolver), defaultValue, error => {\n      console.warn(`Error resolving data, falling back to \\`${defaultValue}\\`.`, { error, data })\n    })\n  }, [data, resourceResolver, defaultValue])\n\n  useEffect(() => {\n    resolvable.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(resolvable.subscribe, resolvable.readStable, resolvable.readStable)\n}\n"],"mappings":"AAAA,SAAS,SAAS,WAAW,4BAA4B;AAGzD,SAAS,2BAA2B;AACpC,SAAS,8BAA8B;AAEhC,SAAS,iBACd,MACA,UACA,cACe;AACf,QAAM,mBAAmB,oBAAoB;AAC7C,QAAM,aAAa,QAAQ,MAAM;AAC/B,WAAO,uBAAuB,SAAS,MAAM,gBAAgB,GAAG,cAAc,WAAS;AACrF,cAAQ,KAAK,2CAA2C,YAAY,OAAO,EAAE,OAAO,KAAK,CAAC;AAAA,IAC5F,CAAC;AAAA,EACH,GAAG,CAAC,MAAM,kBAAkB,YAAY,CAAC;AAEzC,YAAU,MAAM;AACd,eAAW,eAAe;AAAA,EAC5B,GAAG,CAAC,CAAC;AAEL,SAAO,qBAAqB,WAAW,WAAW,WAAW,YAAY,WAAW,UAAU;AAChG;","names":[]}

package/dist/esm/runtimes/react/utils/prop-error-handling-proxy.js

@@ -0,0 +1,17 @@
+function propErrorHandlingProxy(resolvable, fallback, onError) {
+  return {
+    ...resolvable,
+    readStable: () => {
+      try {
+        return resolvable.readStable();
+      } catch (err) {
+        onError?.(err);
+        return fallback;
+      }
+    }
+  };
+}
+export {
+  propErrorHandlingProxy
+};
+//# sourceMappingURL=prop-error-handling-proxy.js.map

package/dist/esm/runtimes/react/utils/prop-error-handling-proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/runtimes/react/utils/prop-error-handling-proxy.ts"],"sourcesContent":["import { type Resolvable } from '@makeswift/controls'\n\nexport function propErrorHandlingProxy<T>(\n  resolvable: Resolvable<T>,\n  fallback: T,\n  onError?: (error: unknown) => void,\n): Resolvable<T> {\n  return {\n    ...resolvable,\n    readStable: () => {\n      try {\n        return resolvable.readStable()\n      } catch (err: unknown) {\n        onError?.(err)\n        return fallback\n      }\n    },\n  }\n}\n"],"mappings":"AAEO,SAAS,uBACd,YACA,UACA,SACe;AACf,SAAO;AAAA,IACL,GAAG;AAAA,IACH,YAAY,MAAM;AAChB,UAAI;AACF,eAAO,WAAW,WAAW;AAAA,MAC/B,SAAS,KAAc;AACrB,kBAAU,GAAG;AACb,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AACF;","names":[]}

package/dist/types/runtimes/react/controls/control.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.d.ts","sourceRoot":"","sources":["../../../../../src/runtimes/react/controls/control.tsx"],"names":[],"mappings":";AAEA,OAAO,EACL,iBAAiB,EACjB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACvB,MAAM,qBAAqB,CAAA;AAM5B,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,iBAAiB,CAAA;IAC7B,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAA;IAC7C,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAC,OAAO,CAAA;IAClE,OAAO,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,YAAY,CAAC,EAC3B,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,OAAO,GACR,EAAE,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAWjC"}
+{"version":3,"file":"control.d.ts","sourceRoot":"","sources":["../../../../../src/runtimes/react/controls/control.tsx"],"names":[],"mappings":";AAEA,OAAO,EACL,iBAAiB,EACjB,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACvB,MAAM,qBAAqB,CAAA;AAM5B,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,iBAAiB,CAAA;IAC7B,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAA;IAC7C,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,GAAG,CAAC,OAAO,CAAA;IAClE,OAAO,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,CAAA;CAC1C,CAAA;AAED,wBAAgB,YAAY,CAAC,EAC3B,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,OAAO,GACR,EAAE,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAcjC"}

package/dist/types/runtimes/react/hooks/use-resolved-props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-resolved-props.d.ts","sourceRoot":"","sources":["../../../../../src/runtimes/react/hooks/use-resolved-props.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAGjB,KAAK,IAAI,EAEV,MAAM,qBAAqB,CAAA;AAiD5B,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAC3C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EACjC,UAAU,EAAE,MAAM,GACjB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiDzB"}
+{"version":3,"file":"use-resolved-props.d.ts","sourceRoot":"","sources":["../../../../../src/runtimes/react/hooks/use-resolved-props.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAGjB,KAAK,IAAI,EAEV,MAAM,qBAAqB,CAAA;AA4B5B,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAC3C,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EACjC,UAAU,EAAE,MAAM,GACjB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuDzB"}

package/dist/types/runtimes/react/hooks/use-resolved-value.d.ts

@@ -1,3 +1,3 @@
 import { Resolvable, ResourceResolver } from '@makeswift/controls';
-export declare function useResolvedValue<D, T>(data: D, resolver: (data: D, resourceResolver: ResourceResolver) => Resolvable<T>): T;
+export declare function useResolvedValue<D, T>(data: D, resolver: (data: D, resourceResolver: ResourceResolver) => Resolvable<T>, defaultValue?: T): T | undefined;
 //# sourceMappingURL=use-resolved-value.d.ts.map

package/dist/types/runtimes/react/hooks/use-resolved-value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-resolved-value.d.ts","sourceRoot":"","sources":["../../../../../src/runtimes/react/hooks/use-resolved-value.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAIlE,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EACnC,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,gBAAgB,EAAE,gBAAgB,KAAK,UAAU,CAAC,CAAC,CAAC,GACvE,CAAC,CASH"}
+{"version":3,"file":"use-resolved-value.d.ts","sourceRoot":"","sources":["../../../../../src/runtimes/react/hooks/use-resolved-value.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAKlE,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EACnC,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,gBAAgB,EAAE,gBAAgB,KAAK,UAAU,CAAC,CAAC,CAAC,EACxE,YAAY,CAAC,EAAE,CAAC,GACf,CAAC,GAAG,SAAS,CAaf"}

package/dist/types/runtimes/react/utils/prop-error-handling-proxy.d.ts

@@ -0,0 +1,3 @@
+import { type Resolvable } from '@makeswift/controls';
+export declare function propErrorHandlingProxy<T>(resolvable: Resolvable<T>, fallback: T, onError?: (error: unknown) => void): Resolvable<T>;
+//# sourceMappingURL=prop-error-handling-proxy.d.ts.map

package/dist/types/runtimes/react/utils/prop-error-handling-proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prop-error-handling-proxy.d.ts","sourceRoot":"","sources":["../../../../../src/runtimes/react/utils/prop-error-handling-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAErD,wBAAgB,sBAAsB,CAAC,CAAC,EACtC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EACzB,QAAQ,EAAE,CAAC,EACX,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GACjC,UAAU,CAAC,CAAC,CAAC,CAYf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makeswift/runtime",
-  "version": "0.22.2-canary.1",
+  "version": "0.22.3-canary.0",
   "license": "MIT",
   "files": [
     "dist",
@@ -156,8 +156,8 @@
     "uuid": "^9.0.0",
     "zod": "^3.21.4",
     "@makeswift/controls": "0.1.6",
-    "@makeswift/next-plugin": "0.3.0",
-    "@makeswift/prop-controllers": "0.3.7"
+    "@makeswift/prop-controllers": "0.3.7",
+    "@makeswift/next-plugin": "0.3.0"
   },
   "devDependencies": {
     "@emotion/jest": "^11.11.0",