@dxos/app-framework 0.3.11-main.0e40963 → 0.3.11-main.101b0f0

package/dist/lib/browser/{chunk-C2K6M6WC.mjs → chunk-7MQ2DVDI.mjs}

@@ -4,11 +4,26 @@ var parseIntentResolverPlugin = (plugin) => plugin.provides.intent?.resolver ? p
 
 // packages/sdk/app-framework/src/plugins/IntentPlugin/IntentContext.tsx
 import { createContext, useContext } from "react";
+import { useEffect } from "react";
 var IntentContext = /* @__PURE__ */ createContext({
-  dispatch: async () => {
+  dispatch: async () => ({}),
+  registerResolver: () => () => {
   }
 });
 var useIntent = () => useContext(IntentContext);
+var useIntentDispatcher = () => {
+  const { dispatch } = useIntent();
+  return dispatch;
+};
+var useIntentResolver = (plugin, resolver) => {
+  const { registerResolver } = useIntent();
+  useEffect(() => {
+    return registerResolver(plugin, resolver);
+  }, [
+    plugin,
+    resolver
+  ]);
+};
 var IntentProvider = IntentContext.Provider;
 
 // packages/sdk/app-framework/src/plugins/IntentPlugin/meta.ts
@@ -21,7 +36,9 @@ export {
   parseIntentPlugin,
   parseIntentResolverPlugin,
   useIntent,
+  useIntentDispatcher,
+  useIntentResolver,
   IntentProvider,
   meta_default
 };
-//# sourceMappingURL=chunk-C2K6M6WC.mjs.map
+//# sourceMappingURL=chunk-7MQ2DVDI.mjs.map

package/dist/lib/browser/chunk-7MQ2DVDI.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/plugins/IntentPlugin/provides.ts", "../../../src/plugins/IntentPlugin/IntentContext.tsx", "../../../src/plugins/IntentPlugin/meta.ts"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type IntentContext } from './IntentContext';\nimport { type IntentResolver } from './intent';\nimport { type Plugin } from '../PluginHost';\n\nexport type IntentResolverProvides = {\n  intent: {\n    resolver: IntentResolver;\n  };\n};\n\nexport type IntentPluginProvides = {\n  intent: IntentContext;\n};\n\nexport const parseIntentPlugin = (plugin: Plugin) =>\n  (plugin.provides as any).intent?.dispatch ? (plugin as Plugin<IntentPluginProvides>) : undefined;\n\nexport const parseIntentResolverPlugin = (plugin: Plugin) =>\n  (plugin.provides as any).intent?.resolver ? (plugin as Plugin<IntentResolverProvides>) : undefined;\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { type Context, createContext, useContext, type Provider } from 'react';\nimport { useEffect } from 'react';\n\nimport { type UnsubscribeCallback } from '@dxos/async';\n\nimport { type IntentDispatcher, type IntentResolver } from './intent';\n\nexport type IntentContext = {\n  dispatch: IntentDispatcher;\n  registerResolver: (pluginId: string, resolver: IntentResolver) => UnsubscribeCallback;\n};\n\nconst IntentContext: Context<IntentContext> = createContext<IntentContext>({\n  dispatch: async () => ({}),\n  registerResolver: () => () => {},\n});\n\n/**\n * @deprecated\n * TODO(burdon): Use useIntentDispatcher.\n */\nexport const useIntent = () => useContext(IntentContext);\n\n// TODO(burdon): Dispatch or Dispatcher?\nexport const useIntentDispatcher = (): IntentDispatcher => {\n  const { dispatch } = useIntent();\n  return dispatch;\n};\n\nexport const useIntentResolver = (plugin: string, resolver: IntentResolver) => {\n  const { registerResolver } = useIntent();\n  useEffect(() => {\n    return registerResolver(plugin, resolver);\n  }, [plugin, resolver]);\n};\n\nexport const IntentProvider: Provider<IntentContext> = IntentContext.Provider;\n", "//\n// Copyright 2023 DXOS.org\n//\n\nconst IntentMeta = {\n  id: 'dxos.org/plugin/intent',\n};\n\nexport default IntentMeta;\n"],
+  "mappings": ";AAkBO,IAAMA,oBAAoB,CAACC,WAC/BA,OAAOC,SAAiBC,QAAQC,WAAYH,SAA0CI;AAElF,IAAMC,4BAA4B,CAACL,WACvCA,OAAOC,SAAiBC,QAAQI,WAAYN,SAA4CI;;;AClB3F,SAAuBG,eAAeC,kBAAiC;AACvE,SAASC,iBAAiB;AAW1B,IAAMC,gBAAwCC,8BAA6B;EACzEC,UAAU,aAAa,CAAC;EACxBC,kBAAkB,MAAM,MAAA;EAAO;AACjC,CAAA;AAMO,IAAMC,YAAY,MAAMC,WAAWL,aAAAA;AAGnC,IAAMM,sBAAsB,MAAA;AACjC,QAAM,EAAEJ,SAAQ,IAAKE,UAAAA;AACrB,SAAOF;AACT;AAEO,IAAMK,oBAAoB,CAACC,QAAgBC,aAAAA;AAChD,QAAM,EAAEN,iBAAgB,IAAKC,UAAAA;AAC7BM,YAAU,MAAA;AACR,WAAOP,iBAAiBK,QAAQC,QAAAA;EAClC,GAAG;IAACD;IAAQC;GAAS;AACvB;AAEO,IAAME,iBAA0CX,cAAcY;;;ACpCrE,IAAMC,aAAa;EACjBC,IAAI;AACN;AAEA,IAAA,eAAeD;",
+  "names": ["parseIntentPlugin", "plugin", "provides", "intent", "dispatch", "undefined", "parseIntentResolverPlugin", "resolver", "createContext", "useContext", "useEffect", "IntentContext", "createContext", "dispatch", "registerResolver", "useIntent", "useContext", "useIntentDispatcher", "useIntentResolver", "plugin", "resolver", "useEffect", "IntentProvider", "Provider", "IntentMeta", "id"]
+}

package/dist/lib/browser/index.mjs

@@ -10,8 +10,10 @@ import {
   meta_default,
   parseIntentPlugin,
   parseIntentResolverPlugin,
-  useIntent
-} from "./chunk-C2K6M6WC.mjs";
+  useIntent,
+  useIntentDispatcher,
+  useIntentResolver
+} from "./chunk-7MQ2DVDI.mjs";
 import {
   filterPlugins,
   findPlugin,
@@ -93,7 +95,7 @@ var parseTranslationsPlugin = (plugin) => {
 var pluginMeta = (meta) => meta;
 var Plugin;
 (function(Plugin2) {
-  var lazy = Plugin2.lazy = (p, props) => {
+  Plugin2.lazy = (p, props) => {
     return () => p().then(({ default: definition }) => {
       return definition(props);
     });
@@ -123,141 +125,15 @@ var PluginProvider = PluginContext.Provider;
 
 // packages/sdk/app-framework/src/plugins/PluginHost/PluginHost.tsx
 import { shallow } from "deepsignal/react";
-import React, { useEffect } from "react";
+import React3, { useEffect, useState } from "react";
 import { LocalStorageStore } from "@dxos/local-storage";
 import { log } from "@dxos/log";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/app-framework/src/plugins/PluginHost/PluginHost.tsx";
-var parsePluginHost = (plugin) => plugin.provides.plugins ? plugin : void 0;
-var PLUGIN_HOST = "dxos.org/plugin/host";
-var PluginHost = ({ order, plugins: definitions, core = [], defaults = [], fallback = null }) => {
-  const state = new LocalStorageStore(PLUGIN_HOST, {
-    ready: false,
-    enabled: [
-      ...defaults
-    ],
-    plugins: [],
-    available: order.filter(({ id }) => !core.includes(id)),
-    setPlugin: (id, enabled) => {
-      if (enabled) {
-        state.values.enabled = [
-          ...state.values.enabled,
-          id
-        ];
-      } else {
-        state.values.enabled = state.values.enabled.filter((enabled2) => enabled2 !== id);
-      }
-    }
-  });
-  state.prop(state.values.$enabled, "enabled", LocalStorageStore.json);
-  return {
-    meta: {
-      id: PLUGIN_HOST,
-      name: "Plugin host"
-    },
-    provides: {
-      plugins: state.values,
-      context: ({ children }) => /* @__PURE__ */ React.createElement(PluginProvider, {
-        value: state.values
-      }, children),
-      root: () => {
-        useEffect(() => {
-          log("initializing plugins", {
-            enabled: state.values.enabled
-          }, {
-            F: __dxlog_file,
-            L: 67,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
-          const timeout = setTimeout(async () => {
-            const enabledIds = [
-              ...core,
-              ...state.values.enabled
-            ].sort((a, b) => {
-              const indexA = order.findIndex(({ id }) => id === a);
-              const indexB = order.findIndex(({ id }) => id === b);
-              return indexA - indexB;
-            });
-            const enabled = await Promise.all(enabledIds.map((id) => definitions[id]).filter((definition) => Boolean(definition)).map((definition) => definition()));
-            const plugins = await Promise.all(enabled.map(async (definition) => {
-              const plugin = await initializePlugin(definition).catch((err) => {
-                console.error("Failed to initialize plugin:", definition.meta.id, err);
-                return void 0;
-              });
-              return plugin;
-            })).then((plugins2) => plugins2.filter((plugin) => Boolean(plugin)));
-            log("plugins initialized", {
-              plugins
-            }, {
-              F: __dxlog_file,
-              L: 92,
-              S: void 0,
-              C: (f, a) => f(...a)
-            });
-            await Promise.all(enabled.map(async (pluginDefinition) => {
-              await pluginDefinition.ready?.(plugins);
-            }));
-            log("plugins ready", {
-              plugins
-            }, {
-              F: __dxlog_file,
-              L: 99,
-              S: void 0,
-              C: (f, a) => f(...a)
-            });
-            state.values.plugins = shallow(plugins);
-            state.values.ready = true;
-          });
-          return () => {
-            clearTimeout(timeout);
-            state.values.ready = false;
-          };
-        }, []);
-        if (!state.values.ready) {
-          return /* @__PURE__ */ React.createElement(React.Fragment, null, fallback);
-        }
-        const ComposedContext = composeContext(state.values.plugins);
-        return /* @__PURE__ */ React.createElement(ComposedContext, null, rootComponents(state.values.plugins));
-      }
-    }
-  };
-};
-var initializePlugin = async (pluginDefinition) => {
-  const provides = await pluginDefinition.initialize?.();
-  return {
-    ...pluginDefinition,
-    provides: {
-      ...pluginDefinition.provides,
-      ...provides
-    }
-  };
-};
-var rootComponents = (plugins) => {
-  return plugins.map((plugin) => {
-    const Component2 = plugin.provides.root;
-    if (Component2) {
-      return /* @__PURE__ */ React.createElement(Component2, {
-        key: plugin.meta.id
-      });
-    } else {
-      return null;
-    }
-  }).filter((node) => Boolean(node));
-};
-var composeContext = (plugins) => {
-  return compose(plugins.map((p) => p.provides.context).filter(Boolean));
-};
-var compose = (contexts) => {
-  return [
-    ...contexts
-  ].reduce((Acc, Next) => ({ children }) => /* @__PURE__ */ React.createElement(Acc, null, /* @__PURE__ */ React.createElement(Next, null, children)));
-};
 
 // packages/sdk/app-framework/src/plugins/SurfacePlugin/helpers.ts
 var isObject = (data) => !!data && typeof data === "object";
 
 // packages/sdk/app-framework/src/plugins/SurfacePlugin/ErrorBoundary.tsx
-import React2, { Component } from "react";
+import React, { Component } from "react";
 var ErrorBoundary = class extends Component {
   constructor(props) {
     super(props);
@@ -277,7 +153,7 @@ var ErrorBoundary = class extends Component {
   }
   render() {
     if (this.state.error) {
-      return /* @__PURE__ */ React2.createElement(this.props.fallback, {
+      return /* @__PURE__ */ React.createElement(this.props.fallback, {
         error: this.state.error,
         reset: this.resetError
       });
@@ -292,9 +168,9 @@ var ErrorBoundary = class extends Component {
 };
 
 // packages/sdk/app-framework/src/plugins/SurfacePlugin/Surface.tsx
-import React3, { forwardRef, Fragment, isValidElement } from "react";
+import React2, { forwardRef, Fragment, isValidElement, Suspense } from "react";
 import { createContext as createContext2, useContext as useContext2 } from "react";
-var Surface = /* @__PURE__ */ forwardRef(({ role, name = role, fallback, ...rest }, forwardedRef) => {
+var Surface = /* @__PURE__ */ forwardRef(({ role, name = role, fallback, placeholder, ...rest }, forwardedRef) => {
   const props = {
     role,
     name,
@@ -303,16 +179,17 @@ var Surface = /* @__PURE__ */ forwardRef(({ role, name = role, fallback, ...rest
   };
   const context = useContext2(SurfaceContext);
   const data = props.data ?? (name && context?.surfaces?.[name]?.data || {});
-  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, fallback ? /* @__PURE__ */ React3.createElement(ErrorBoundary, {
-    data,
-    fallback
-  }, /* @__PURE__ */ React3.createElement(SurfaceResolver, {
+  const resolver = /* @__PURE__ */ React2.createElement(SurfaceResolver, {
     ...props,
     ref: forwardedRef
-  })) : /* @__PURE__ */ React3.createElement(SurfaceResolver, {
-    ...props,
-    ref: forwardedRef
-  }));
+  });
+  const suspense = placeholder ? /* @__PURE__ */ React2.createElement(Suspense, {
+    fallback: placeholder
+  }, resolver) : resolver;
+  return fallback ? /* @__PURE__ */ React2.createElement(ErrorBoundary, {
+    data,
+    fallback
+  }, suspense) : suspense;
 });
 var SurfaceContext = /* @__PURE__ */ createContext2(null);
 var SurfaceResolver = /* @__PURE__ */ forwardRef((props, forwardedRef) => {
@@ -326,9 +203,9 @@ var SurfaceResolver = /* @__PURE__ */ forwardRef((props, forwardedRef) => {
       ...props.surfaces
     }
   };
-  return /* @__PURE__ */ React3.createElement(SurfaceContext.Provider, {
+  return /* @__PURE__ */ React2.createElement(SurfaceContext.Provider, {
     value: currentContext
-  }, nodes.length > 0 ? nodes : props.contentFallback ? /* @__PURE__ */ React3.createElement(props.contentFallback, null) : null);
+  }, nodes);
 });
 var resolveNodes = (components, props, context, forwardedRef) => {
   const data = {
@@ -363,12 +240,170 @@ var resolveNodes = (components, props, context, forwardedRef) => {
       return 1;
     }
     return 0;
-  }).map(([key, result]) => /* @__PURE__ */ React3.createElement(Fragment, {
+  }).map(([key, result]) => /* @__PURE__ */ React2.createElement(Fragment, {
     key
   }, result.node));
   return props.limit ? nodes.slice(0, props.limit) : nodes;
 };
 
+// packages/sdk/app-framework/src/plugins/PluginHost/PluginHost.tsx
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/app-framework/src/plugins/PluginHost/PluginHost.tsx";
+var parsePluginHost = (plugin) => plugin.provides.plugins ? plugin : void 0;
+var PLUGIN_HOST = "dxos.org/plugin/host";
+var PluginHost = ({ order, plugins: definitions, core = [], defaults = [], fallback = DefaultFallback, placeholder = null }) => {
+  const state = new LocalStorageStore(PLUGIN_HOST, {
+    ready: false,
+    enabled: [
+      ...defaults
+    ],
+    plugins: [],
+    available: order.filter(({ id }) => !core.includes(id)),
+    setPlugin: (id, enabled) => {
+      if (enabled) {
+        state.values.enabled = [
+          ...state.values.enabled,
+          id
+        ];
+      } else {
+        state.values.enabled = state.values.enabled.filter((enabled2) => enabled2 !== id);
+      }
+    }
+  });
+  state.prop(state.values.$enabled, "enabled", LocalStorageStore.json);
+  return {
+    meta: {
+      id: PLUGIN_HOST,
+      name: "Plugin host"
+    },
+    provides: {
+      plugins: state.values,
+      context: ({ children }) => /* @__PURE__ */ React3.createElement(PluginProvider, {
+        value: state.values
+      }, children),
+      root: () => {
+        return /* @__PURE__ */ React3.createElement(ErrorBoundary, {
+          fallback
+        }, /* @__PURE__ */ React3.createElement(Root, {
+          order,
+          core,
+          definitions,
+          state: state.values,
+          placeholder
+        }));
+      }
+    }
+  };
+};
+var DefaultFallback = ({ error }) => {
+  return /* @__PURE__ */ React3.createElement("div", {
+    style: {
+      padding: "1rem"
+    }
+  }, /* @__PURE__ */ React3.createElement("h1", {
+    style: {
+      fontSize: "1.2rem",
+      fontWeight: 700,
+      margin: "0.5rem 0"
+    }
+  }, error.message), /* @__PURE__ */ React3.createElement("pre", null, error.stack));
+};
+var Root = ({ order, core: corePluginIds, definitions, state, placeholder }) => {
+  const [error, setError] = useState();
+  useEffect(() => {
+    log("initializing plugins", {
+      enabled: state.enabled
+    }, {
+      F: __dxlog_file,
+      L: 101,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    const timeout = setTimeout(async () => {
+      try {
+        const enabledIds = [
+          ...corePluginIds,
+          ...state.enabled
+        ].sort((a, b) => {
+          const indexA = order.findIndex(({ id }) => id === a);
+          const indexB = order.findIndex(({ id }) => id === b);
+          return indexA - indexB;
+        });
+        const enabled = await Promise.all(enabledIds.map((id) => definitions[id]).filter((definition) => Boolean(definition)).map((definition) => definition()));
+        const plugins = await Promise.all(enabled.map(async (definition) => {
+          const plugin = await initializePlugin(definition).catch((err) => {
+            console.error("Failed to initialize plugin:", definition.meta.id, err);
+            return void 0;
+          });
+          return plugin;
+        })).then((plugins2) => plugins2.filter((plugin) => Boolean(plugin)));
+        log("plugins initialized", {
+          plugins
+        }, {
+          F: __dxlog_file,
+          L: 127,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+        await Promise.all(enabled.map((pluginDefinition) => pluginDefinition.ready?.(plugins)));
+        log("plugins ready", {
+          plugins
+        }, {
+          F: __dxlog_file,
+          L: 130,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+        state.plugins = shallow(plugins);
+        state.ready = true;
+      } catch (err) {
+        setError(err);
+      }
+    });
+    return () => {
+      clearTimeout(timeout);
+      state.ready = false;
+    };
+  }, []);
+  if (error) {
+    throw error;
+  }
+  if (!state.ready) {
+    return /* @__PURE__ */ React3.createElement(React3.Fragment, null, placeholder);
+  }
+  const ComposedContext = composeContext(state.plugins);
+  return /* @__PURE__ */ React3.createElement(ComposedContext, null, rootComponents(state.plugins));
+};
+var initializePlugin = async (pluginDefinition) => {
+  const provides = await pluginDefinition.initialize?.();
+  return {
+    ...pluginDefinition,
+    provides: {
+      ...pluginDefinition.provides,
+      ...provides
+    }
+  };
+};
+var rootComponents = (plugins) => {
+  return plugins.map((plugin) => {
+    const Component2 = plugin.provides.root;
+    if (Component2) {
+      return /* @__PURE__ */ React3.createElement(Component2, {
+        key: plugin.meta.id
+      });
+    } else {
+      return null;
+    }
+  }).filter((node) => Boolean(node));
+};
+var composeContext = (plugins) => {
+  return compose(plugins.map((p) => p.provides.context).filter(Boolean));
+};
+var compose = (contexts) => {
+  return [
+    ...contexts
+  ].reduce((Acc, Next) => ({ children }) => /* @__PURE__ */ React3.createElement(Acc, null, /* @__PURE__ */ React3.createElement(Next, null, children)));
+};
+
 // packages/sdk/app-framework/src/App.tsx
 import React4 from "react";
 import { invariant } from "@dxos/invariant";
@@ -383,7 +418,7 @@ var createApp = ({ order, plugins, core = order.map(({ id }) => id), ...params }
     plugins: {
       ...plugins,
       [meta_default2.id]: Plugin.lazy(() => import("./plugin-JDIMDLDU.mjs")),
-      [meta_default.id]: Plugin.lazy(() => import("./plugin-CBPJO5NB.mjs"))
+      [meta_default.id]: Plugin.lazy(() => import("./plugin-KC4DT4AJ.mjs"))
     },
     core: [
       meta_default2.id,
@@ -411,8 +446,8 @@ var createApp = ({ order, plugins, core = order.map(({ id }) => id), ...params }
     ]
   });
   const Context = host.provides.context;
-  const Root = host.provides.root;
-  return () => /* @__PURE__ */ React4.createElement(Context, null, /* @__PURE__ */ React4.createElement(Root, null));
+  const Root2 = host.provides.root;
+  return () => /* @__PURE__ */ React4.createElement(Context, null, /* @__PURE__ */ React4.createElement(Root2, null));
 };
 export {
   ErrorBoundary,
@@ -449,6 +484,8 @@ export {
   pluginMeta,
   resolvePlugin,
   useIntent,
+  useIntentDispatcher,
+  useIntentResolver,
   usePlugin,
   usePlugins,
   useResolvePlugin,