@dxos/app-framework 0.6.12-staging.e11e696 → 0.6.13-main.548ca8d

package/dist/lib/browser/index.mjs

@@ -131,7 +131,10 @@ var LayoutEntrySchema = S.mutable(S.Struct({
   path: S.optional(S.String)
 }));
 var LayoutPartSchema = S.Union(S.Literal("sidebar"), S.Literal("main"), S.Literal("solo"), S.Literal("complementary"), S.Literal("fullScreen"));
-var LayoutPartsSchema = S.partial(S.mutable(S.Record(LayoutPartSchema, S.mutable(S.Array(LayoutEntrySchema)))));
+var LayoutPartsSchema = S.partial(S.mutable(S.Record({
+  key: LayoutPartSchema,
+  value: S.mutable(S.Array(LayoutEntrySchema))
+})));
 var LayoutCoordinateSchema = S.mutable(S.Struct({
   part: LayoutPartSchema,
   entryId: S.String
@@ -226,7 +229,6 @@ var parseTranslationsPlugin = (plugin) => {
 };
 
 // packages/sdk/app-framework/src/plugins/PluginHost/plugin.ts
-var pluginMeta = (meta) => meta;
 var Plugin;
 (function(Plugin2) {
   Plugin2.lazy = (p, props) => {
@@ -238,17 +240,10 @@ var Plugin;
 
 // packages/sdk/app-framework/src/plugins/PluginHost/PluginContext.tsx
 import { createContext, useContext, useMemo } from "react";
+import { raise } from "@dxos/debug";
 import { nonNullable } from "@dxos/util";
-var PluginContext = /* @__PURE__ */ createContext({
-  ready: false,
-  core: [],
-  enabled: [],
-  plugins: [],
-  available: [],
-  setPlugin: () => {
-  }
-});
-var usePlugins = () => useContext(PluginContext);
+var PluginContext = /* @__PURE__ */ createContext(void 0);
+var usePlugins = () => useContext(PluginContext) ?? raise(new Error("Missing PluginContext"));
 var usePlugin = (id) => {
   const { plugins } = usePlugins();
   return findPlugin(plugins, id);
@@ -267,15 +262,127 @@ var useResolvePlugins = (predicate) => {
 var PluginProvider = PluginContext.Provider;
 
 // packages/sdk/app-framework/src/plugins/PluginHost/PluginHost.tsx
-import React3, { useEffect, useState } from "react";
+import React4 from "react";
 import { LocalStorageStore } from "@dxos/local-storage";
+
+// packages/sdk/app-framework/src/plugins/PluginHost/PluginContainer.tsx
+import React, { useEffect, useState } from "react";
 import { log } from "@dxos/log";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/app-framework/src/plugins/PluginHost/PluginContainer.tsx";
+var PluginContainer = ({ plugins: definitions, core, state, placeholder }) => {
+  const [error, setError] = useState();
+  useEffect(() => {
+    log("initializing plugins", {
+      enabled: state.enabled
+    }, {
+      F: __dxlog_file,
+      L: 26,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    const t = setTimeout(async () => {
+      try {
+        const enabledIds = [
+          ...core,
+          ...state.enabled
+        ];
+        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) => {
+            log.error("Failed to initialize plugin:", {
+              id: definition.meta.id,
+              err
+            }, {
+              F: __dxlog_file,
+              L: 41,
+              S: void 0,
+              C: (f, a) => f(...a)
+            });
+          });
+          log("initialized", {
+            plugin: definition.meta.id
+          }, {
+            F: __dxlog_file,
+            L: 44,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+          return plugin;
+        }));
+        const initialized = plugins.filter((plugin) => Boolean(plugin));
+        log("plugins initialized", {
+          plugins: initialized
+        }, {
+          F: __dxlog_file,
+          L: 50,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+        await Promise.all(enabled.map((plugin) => plugin.ready?.(initialized)));
+        log("plugins ready", {
+          plugins: initialized
+        }, {
+          F: __dxlog_file,
+          L: 53,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+        state.plugins = initialized;
+        state.ready = true;
+      } catch (err) {
+        setError(err);
+      }
+    });
+    return () => {
+      clearTimeout(t);
+      state.ready = false;
+    };
+  }, []);
+  if (error) {
+    throw error;
+  }
+  if (!state.ready) {
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, placeholder);
+  }
+  const ComposedContext = composeContext(state.plugins);
+  return /* @__PURE__ */ React.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__ */ 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 React, { Component } from "react";
+import React2, { Component } from "react";
 var ErrorBoundary = class extends Component {
   constructor(props) {
     super(props);
@@ -295,7 +402,7 @@ var ErrorBoundary = class extends Component {
   }
   render() {
     if (this.state.error) {
-      return /* @__PURE__ */ React.createElement(this.props.fallback, {
+      return /* @__PURE__ */ React2.createElement(this.props.fallback, {
         data: this.props.data,
         error: this.state.error,
         reset: this.resetError
@@ -311,9 +418,9 @@ var ErrorBoundary = class extends Component {
 };
 
 // packages/sdk/app-framework/src/plugins/SurfacePlugin/Surface.tsx
-import React2, { forwardRef, Fragment, isValidElement, Suspense } from "react";
+import React3, { forwardRef, Fragment, isValidElement, Suspense } from "react";
 import { createContext as createContext2, useContext as useContext2 } from "react";
-import { raise } from "@dxos/debug";
+import { raise as raise2 } from "@dxos/debug";
 var Surface = /* @__PURE__ */ forwardRef(({ role, name = role, fallback, placeholder, ...rest }, forwardedRef) => {
   const props = {
     role,
@@ -323,20 +430,20 @@ var Surface = /* @__PURE__ */ forwardRef(({ role, name = role, fallback, placeho
   };
   const context = useContext2(SurfaceContext);
   const data = props.data ?? (name && context?.surfaces?.[name]?.data || {});
-  const resolver = /* @__PURE__ */ React2.createElement(SurfaceResolver, {
+  const resolver = /* @__PURE__ */ React3.createElement(SurfaceResolver, {
     ...props,
     ref: forwardedRef
   });
-  const suspense = placeholder ? /* @__PURE__ */ React2.createElement(Suspense, {
+  const suspense = placeholder ? /* @__PURE__ */ React3.createElement(Suspense, {
     fallback: placeholder
   }, resolver) : resolver;
-  return fallback ? /* @__PURE__ */ React2.createElement(ErrorBoundary, {
+  return fallback ? /* @__PURE__ */ React3.createElement(ErrorBoundary, {
     data,
     fallback
   }, suspense) : suspense;
 });
 var SurfaceContext = /* @__PURE__ */ createContext2(null);
-var useSurface = () => useContext2(SurfaceContext) ?? raise(new Error("Surface context not found"));
+var useSurface = () => useContext2(SurfaceContext) ?? raise2(new Error("Surface context not found"));
 var SurfaceResolver = /* @__PURE__ */ forwardRef((props, forwardedRef) => {
   const { components } = useSurfaceRoot();
   const parent = useContext2(SurfaceContext);
@@ -348,7 +455,7 @@ var SurfaceResolver = /* @__PURE__ */ forwardRef((props, forwardedRef) => {
       ...props.surfaces
     }
   };
-  return /* @__PURE__ */ React2.createElement(SurfaceContext.Provider, {
+  return /* @__PURE__ */ React3.createElement(SurfaceContext.Provider, {
     value: currentContext
   }, nodes);
 });
@@ -385,17 +492,16 @@ var resolveNodes = (components, props, context, forwardedRef) => {
       return 1;
     }
     return 0;
-  }).map(([key, result]) => /* @__PURE__ */ React2.createElement(Fragment, {
+  }).map(([key, result]) => /* @__PURE__ */ React3.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 }) => {
+var PluginHost = ({ plugins, meta, core, defaults = [], fallback = DefaultFallback, placeholder = null }) => {
   const state = new LocalStorageStore(PLUGIN_HOST, {
     ready: false,
     core,
@@ -403,7 +509,7 @@ var PluginHost = ({ order, plugins: definitions, core = [], defaults = [], fallb
       ...defaults
     ],
     plugins: [],
-    available: order.filter(({ id }) => !core.includes(id)),
+    available: meta.filter(({ id }) => !core.includes(id)),
     setPlugin: (id, enabled) => {
       if (enabled) {
         state.values.enabled.push(id);
@@ -424,16 +530,17 @@ var PluginHost = ({ order, plugins: definitions, core = [], defaults = [], fallb
     },
     provides: {
       plugins: state.values,
-      context: ({ children }) => /* @__PURE__ */ React3.createElement(PluginProvider, {
-        value: state.values
-      }, children),
+      context: ({ children }) => {
+        return /* @__PURE__ */ React4.createElement(PluginProvider, {
+          value: state.values
+        }, children);
+      },
       root: () => {
-        return /* @__PURE__ */ React3.createElement(ErrorBoundary, {
+        return /* @__PURE__ */ React4.createElement(ErrorBoundary, {
           fallback
-        }, /* @__PURE__ */ React3.createElement(Root, {
-          order,
+        }, /* @__PURE__ */ React4.createElement(PluginContainer, {
+          plugins,
           core,
-          definitions,
           state: state.values,
           placeholder
         }));
@@ -442,139 +549,36 @@ var PluginHost = ({ order, plugins: definitions, core = [], defaults = [], fallb
   };
 };
 var DefaultFallback = ({ error }) => {
-  return /* @__PURE__ */ React3.createElement("div", {
+  return /* @__PURE__ */ React4.createElement("div", {
     style: {
       padding: "1rem"
     }
-  }, /* @__PURE__ */ React3.createElement("h1", {
+  }, /* @__PURE__ */ React4.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: 102,
-      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) => {
-            log.error("Failed to initialize plugin:", {
-              id: definition.meta.id,
-              err
-            }, {
-              F: __dxlog_file,
-              L: 122,
-              S: void 0,
-              C: (f, a) => f(...a)
-            });
-            return void 0;
-          });
-          return plugin;
-        })).then((plugins2) => plugins2.filter((plugin) => Boolean(plugin)));
-        log("plugins initialized", {
-          plugins
-        }, {
-          F: __dxlog_file,
-          L: 128,
-          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: 131,
-          S: void 0,
-          C: (f, a) => f(...a)
-        });
-        state.plugins = 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)));
+  }, error.message), /* @__PURE__ */ React4.createElement("pre", null, error.stack));
 };
 
 // packages/sdk/app-framework/src/App.tsx
-import React4 from "react";
+import React5 from "react";
 import { invariant } from "@dxos/invariant";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/app-framework/src/App.tsx";
-var createApp = ({ order, plugins, core = order.map(({ id }) => id), ...params }) => {
+var createApp = ({ meta, plugins, core, ...params }) => {
   const host = PluginHost({
-    order: [
-      meta_default2,
-      meta_default,
-      ...order
-    ],
     plugins: {
       ...plugins,
       [meta_default2.id]: Plugin.lazy(() => import("./plugin-K3KCPCTJ.mjs")),
       [meta_default.id]: Plugin.lazy(() => import("./plugin-MM66VRCO.mjs"))
     },
+    // TODO(burdon): Why not include in core?
+    meta: [
+      meta_default2,
+      meta_default,
+      ...meta
+    ],
     core: [
       meta_default2.id,
       meta_default.id,
@@ -582,27 +586,35 @@ var createApp = ({ order, plugins, core = order.map(({ id }) => id), ...params }
     ],
     ...params
   });
-  invariant(host.provides?.context, void 0, {
+  invariant(host.provides, void 0, {
     F: __dxlog_file2,
-    L: 51,
+    L: 52,
     S: void 0,
     A: [
-      "host.provides?.context",
+      "host.provides",
       ""
     ]
   });
-  invariant(host.provides?.root, void 0, {
+  const { context: Context, root: Root } = host.provides;
+  invariant(Context, void 0, {
     F: __dxlog_file2,
-    L: 52,
+    L: 54,
+    S: void 0,
+    A: [
+      "Context",
+      ""
+    ]
+  });
+  invariant(Root, void 0, {
+    F: __dxlog_file2,
+    L: 55,
     S: void 0,
     A: [
-      "host.provides?.root",
+      "Root",
       ""
     ]
   });
-  const Context = host.provides.context;
-  const Root2 = host.provides.root;
-  return () => /* @__PURE__ */ React4.createElement(Context, null, /* @__PURE__ */ React4.createElement(Root2, null));
+  return () => /* @__PURE__ */ React5.createElement(Context, null, /* @__PURE__ */ React5.createElement(Root, null));
 };
 export {
   ActiveParts,
@@ -635,7 +647,6 @@ export {
   firstIdInPart,
   getPlugin,
   indexInPart,
-  initializePlugin,
   isLayoutAdjustment,
   isLayoutMode,
   isLayoutParts,
@@ -657,7 +668,6 @@ export {
   parseSurfacePlugin,
   parseTranslationsPlugin,
   partLength,
-  pluginMeta,
   resolvePlugin,
   useIntent,
   useIntentDispatcher,