@dxos/app-framework 0.6.13 → 0.6.14-main.69511f5

package/dist/lib/browser/index.mjs

@@ -1,10 +1,3 @@
-import {
-  SurfaceProvider,
-  meta_default as meta_default2,
-  parseRootSurfacePlugin,
-  parseSurfacePlugin,
-  useSurfaceRoot
-} from "./chunk-YYV26N3W.mjs";
 import {
   IntentAction,
   IntentProvider,
@@ -14,14 +7,30 @@ import {
   useIntent,
   useIntentDispatcher,
   useIntentResolver
-} from "./chunk-J45KR4DI.mjs";
+} from "./chunk-CDLQO5K2.mjs";
+import {
+  ErrorBoundary,
+  Surface,
+  SurfaceProvider,
+  isObject,
+  meta_default as meta_default2,
+  parseRootSurfacePlugin,
+  parseSurfacePlugin,
+  useSurface,
+  useSurfaceRoot
+} from "./chunk-EQTQGGE6.mjs";
 import {
   definePlugin,
   filterPlugins,
   findPlugin,
   getPlugin,
   resolvePlugin
-} from "./chunk-S5CI6EUQ.mjs";
+} from "./chunk-3E7RY3CE.mjs";
+import {
+  SettingsAction,
+  meta_default as meta_default3,
+  parseSettingsPlugin
+} from "./chunk-653Y45CL.mjs";
 
 // packages/sdk/app-framework/src/plugins/common/file.ts
 var defaultFileTypes = {
@@ -101,7 +110,8 @@ var parseLayoutPlugin = (plugin) => {
   const { success } = Layout.safeParse(plugin.provides.layout);
   return success ? plugin : void 0;
 };
-var LAYOUT_ACTION = "dxos.org/plugin/layout";
+var LAYOUT_PLUGIN = "dxos.org/plugin/layout";
+var LAYOUT_ACTION = `${LAYOUT_PLUGIN}/action`;
 var LayoutAction;
 (function(LayoutAction2) {
   LayoutAction2[LayoutAction2["SET_LAYOUT"] = `${LAYOUT_ACTION}/set-layout`] = "SET_LAYOUT";
@@ -119,8 +129,8 @@ var parseMetadataResolverPlugin = (plugin) => {
 };
 
 // packages/sdk/app-framework/src/plugins/common/navigation.ts
+import { Schema as S } from "@effect/schema";
 import { z as z2 } from "zod";
-import { S } from "@dxos/echo-schema";
 var SLUG_LIST_SEPARATOR = "+";
 var SLUG_ENTRY_SEPARATOR = "_";
 var SLUG_KEY_VALUE_SEPARATOR = "-";
@@ -131,7 +141,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
@@ -145,9 +158,6 @@ var ActiveParts = z2.record(z2.string(), z2.union([
   z2.string(),
   z2.array(z2.string())
 ]));
-var Attention = z2.object({
-  attended: z2.set(z2.string()).optional().describe("Ids of items which have focus.")
-});
 var LocationProvidesSchema = S.mutable(S.Struct({
   location: S.Struct({
     active: LayoutPartsSchema,
@@ -194,7 +204,8 @@ var partLength = (layout, part) => {
   }
   return layout[part]?.length ?? 0;
 };
-var NAVIGATION_ACTION = "dxos.org/plugin/navigation";
+var NAVIGATION_PLUGIN = "dxos.org/plugin/navigation";
+var NAVIGATION_ACTION = `${NAVIGATION_PLUGIN}/action`;
 var NavigationAction;
 (function(NavigationAction2) {
   NavigationAction2[NavigationAction2["OPEN"] = `${NAVIGATION_ACTION}/open`] = "OPEN";
@@ -205,16 +216,6 @@ var NavigationAction;
   NavigationAction2[NavigationAction2["EXPOSE"] = `${NAVIGATION_ACTION}/expose`] = "EXPOSE";
 })(NavigationAction || (NavigationAction = {}));
 
-// packages/sdk/app-framework/src/plugins/common/settings.ts
-var parseSettingsPlugin = (plugin) => {
-  return typeof plugin.provides.settings === "object" ? plugin : void 0;
-};
-var SETTINGS_ACTION = "dxos.org/plugin/settings";
-var SettingsAction;
-(function(SettingsAction2) {
-  SettingsAction2[SettingsAction2["OPEN"] = `${SETTINGS_ACTION}/open`] = "OPEN";
-})(SettingsAction || (SettingsAction = {}));
-
 // packages/sdk/app-framework/src/plugins/common/translations.ts
 import { z as z3 } from "zod";
 var ResourceKey = z3.union([
@@ -228,8 +229,7 @@ var parseTranslationsPlugin = (plugin) => {
   return success ? plugin : void 0;
 };
 
-// packages/sdk/app-framework/src/plugins/PluginHost/plugin.ts
-var pluginMeta = (meta) => meta;
+// packages/sdk/app-framework/src/plugins/plugin-host/plugin.ts
 var Plugin;
 (function(Plugin2) {
   Plugin2.lazy = (p, props) => {
@@ -239,245 +239,31 @@ var Plugin;
   };
 })(Plugin || (Plugin = {}));
 
-// packages/sdk/app-framework/src/plugins/PluginHost/PluginContext.tsx
-import { createContext, useContext, useMemo } from "react";
-import { nonNullable } from "@dxos/util";
-var PluginContext = /* @__PURE__ */ createContext({
-  ready: false,
-  core: [],
-  enabled: [],
-  plugins: [],
-  available: [],
-  setPlugin: () => {
-  }
-});
-var usePlugins = () => useContext(PluginContext);
-var usePlugin = (id) => {
-  const { plugins } = usePlugins();
-  return findPlugin(plugins, id);
-};
-var useResolvePlugin = (predicate) => {
-  const { plugins } = usePlugins();
-  return resolvePlugin(plugins, predicate);
-};
-var useResolvePlugins = (predicate) => {
-  const { plugins } = usePlugins();
-  return useMemo(() => plugins.map(predicate).filter(nonNullable), [
-    plugins,
-    predicate
-  ]);
-};
-var PluginProvider = PluginContext.Provider;
-
-// packages/sdk/app-framework/src/plugins/PluginHost/PluginHost.tsx
-import React3, { useEffect, useState } from "react";
+// packages/sdk/app-framework/src/plugins/plugin-host/HostPlugin.tsx
+import React2 from "react";
 import { LocalStorageStore } from "@dxos/local-storage";
-import { log } from "@dxos/log";
-
-// 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";
-var ErrorBoundary = class extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      error: void 0
-    };
-  }
-  static getDerivedStateFromError(error) {
-    return {
-      error
-    };
-  }
-  componentDidUpdate(prevProps) {
-    if (prevProps.data !== this.props.data) {
-      this.resetError();
-    }
-  }
-  render() {
-    if (this.state.error) {
-      return /* @__PURE__ */ React.createElement(this.props.fallback, {
-        data: this.props.data,
-        error: this.state.error,
-        reset: this.resetError
-      });
-    }
-    return this.props.children;
-  }
-  resetError() {
-    this.setState({
-      error: void 0
-    });
-  }
-};
-
-// packages/sdk/app-framework/src/plugins/SurfacePlugin/Surface.tsx
-import React2, { forwardRef, Fragment, isValidElement, Suspense } from "react";
-import { createContext as createContext2, useContext as useContext2 } from "react";
-import { raise } from "@dxos/debug";
-var Surface = /* @__PURE__ */ forwardRef(({ role, name = role, fallback, placeholder, ...rest }, forwardedRef) => {
-  const props = {
-    role,
-    name,
-    fallback,
-    ...rest
-  };
-  const context = useContext2(SurfaceContext);
-  const data = props.data ?? (name && context?.surfaces?.[name]?.data || {});
-  const resolver = /* @__PURE__ */ React2.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 useSurface = () => useContext2(SurfaceContext) ?? raise(new Error("Surface context not found"));
-var SurfaceResolver = /* @__PURE__ */ forwardRef((props, forwardedRef) => {
-  const { components } = useSurfaceRoot();
-  const parent = useContext2(SurfaceContext);
-  const nodes = resolveNodes(components, props, parent, forwardedRef);
-  const currentContext = {
-    ...props,
-    surfaces: {
-      ...props.name && parent?.surfaces?.[props.name]?.surfaces || {},
-      ...props.surfaces
-    }
-  };
-  return /* @__PURE__ */ React2.createElement(SurfaceContext.Provider, {
-    value: currentContext
-  }, nodes);
-});
-var resolveNodes = (components, props, context, forwardedRef) => {
-  const data = {
-    ...props.name && context?.surfaces?.[props.name]?.data || {},
-    ...props.data
-  };
-  const nodes = Object.entries(components).map(([key, component]) => {
-    const result = component({
-      ...props,
-      data
-    }, forwardedRef);
-    if (!result || typeof result !== "object") {
-      return void 0;
-    }
-    return "node" in result ? [
-      key,
-      result
-    ] : /* @__PURE__ */ isValidElement(result) ? [
-      key,
-      {
-        node: result
-      }
-    ] : void 0;
-  }).filter((result) => Boolean(result)).sort(([, a], [, b]) => {
-    const aDisposition = a.disposition ?? "default";
-    const bDisposition = b.disposition ?? "default";
-    if (aDisposition === bDisposition) {
-      return 0;
-    } else if (aDisposition === "hoist" || bDisposition === "fallback") {
-      return -1;
-    } else if (bDisposition === "hoist" || aDisposition === "fallback") {
-      return 1;
-    }
-    return 0;
-  }).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,
-    core,
-    enabled: [
-      ...defaults
-    ],
-    plugins: [],
-    available: order.filter(({ id }) => !core.includes(id)),
-    setPlugin: (id, enabled) => {
-      if (enabled) {
-        state.values.enabled.push(id);
-      } else {
-        const index = state.values.enabled.findIndex((enabled2) => enabled2 === id);
-        index !== -1 && state.values.enabled.splice(index, 1);
-      }
-    }
-  });
-  state.prop({
-    key: "enabled",
-    type: 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 }) => {
+// packages/sdk/app-framework/src/plugins/plugin-host/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/plugin-host/PluginContainer.tsx";
+var PluginContainer = ({ plugins: definitions, core, state, placeholder }) => {
   const [error, setError] = useState();
   useEffect(() => {
     log("initializing plugins", {
       enabled: state.enabled
     }, {
       F: __dxlog_file,
-      L: 102,
+      L: 26,
       S: void 0,
       C: (f, a) => f(...a)
     });
-    const timeout = setTimeout(async () => {
+    const t = setTimeout(async () => {
       try {
         const enabledIds = [
-          ...corePluginIds,
+          ...core,
           ...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) => {
@@ -486,39 +272,47 @@ var Root = ({ order, core: corePluginIds, definitions, state, placeholder }) =>
               err
             }, {
               F: __dxlog_file,
-              L: 122,
+              L: 41,
               S: void 0,
               C: (f, a) => f(...a)
             });
-            return void 0;
+          });
+          log("initialized", {
+            plugin: definition.meta.id
+          }, {
+            F: __dxlog_file,
+            L: 44,
+            S: void 0,
+            C: (f, a) => f(...a)
           });
           return plugin;
-        })).then((plugins2) => plugins2.filter((plugin) => Boolean(plugin)));
+        }));
+        const initialized = plugins.filter((plugin) => Boolean(plugin));
         log("plugins initialized", {
-          plugins
+          plugins: initialized
         }, {
           F: __dxlog_file,
-          L: 128,
+          L: 50,
           S: void 0,
           C: (f, a) => f(...a)
         });
-        await Promise.all(enabled.map((pluginDefinition) => pluginDefinition.ready?.(plugins)));
+        await Promise.all(enabled.map((plugin) => plugin.ready?.(initialized)));
         log("plugins ready", {
-          plugins
+          plugins: initialized
         }, {
           F: __dxlog_file,
-          L: 131,
+          L: 53,
           S: void 0,
           C: (f, a) => f(...a)
         });
-        state.plugins = plugins;
+        state.plugins = initialized;
         state.ready = true;
       } catch (err) {
         setError(err);
       }
     });
     return () => {
-      clearTimeout(timeout);
+      clearTimeout(t);
       state.ready = false;
     };
   }, []);
@@ -526,10 +320,10 @@ var Root = ({ order, core: corePluginIds, definitions, state, placeholder }) =>
     throw error;
   }
   if (!state.ready) {
-    return /* @__PURE__ */ React3.createElement(React3.Fragment, null, placeholder);
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, placeholder);
   }
   const ComposedContext = composeContext(state.plugins);
-  return /* @__PURE__ */ React3.createElement(ComposedContext, null, rootComponents(state.plugins));
+  return /* @__PURE__ */ React.createElement(ComposedContext, null, rootComponents(state.plugins));
 };
 var initializePlugin = async (pluginDefinition) => {
   const provides = await pluginDefinition.initialize?.();
@@ -543,9 +337,9 @@ var initializePlugin = async (pluginDefinition) => {
 };
 var rootComponents = (plugins) => {
   return plugins.map((plugin) => {
-    const Component2 = plugin.provides.root;
-    if (Component2) {
-      return /* @__PURE__ */ React3.createElement(Component2, {
+    const Component = plugin.provides.root;
+    if (Component) {
+      return /* @__PURE__ */ React.createElement(Component, {
         key: plugin.meta.id
       });
     } else {
@@ -559,65 +353,163 @@ var composeContext = (plugins) => {
 var compose = (contexts) => {
   return [
     ...contexts
-  ].reduce((Acc, Next) => ({ children }) => /* @__PURE__ */ React3.createElement(Acc, null, /* @__PURE__ */ React3.createElement(Next, null, children)));
+  ].reduce((Acc, Next) => ({ children }) => /* @__PURE__ */ React.createElement(Acc, null, /* @__PURE__ */ React.createElement(Next, null, children)));
+};
+
+// packages/sdk/app-framework/src/plugins/plugin-host/PluginContext.tsx
+import { createContext, useContext, useMemo } from "react";
+import { raise } from "@dxos/debug";
+import { nonNullable } from "@dxos/util";
+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);
+};
+var useResolvePlugin = (predicate) => {
+  const { plugins } = usePlugins();
+  return resolvePlugin(plugins, predicate);
+};
+var useResolvePlugins = (predicate) => {
+  const { plugins } = usePlugins();
+  return useMemo(() => plugins.map(predicate).filter(nonNullable), [
+    plugins,
+    predicate
+  ]);
+};
+var PluginProvider = PluginContext.Provider;
+
+// packages/sdk/app-framework/src/plugins/plugin-host/HostPlugin.tsx
+var parsePluginHost = (plugin) => plugin.provides.plugins ? plugin : void 0;
+var HOST_PLUGIN = "dxos.org/plugin/host";
+var HostPlugin = ({ plugins, meta, core, defaults = [], fallback = DefaultFallback, placeholder = null }) => {
+  const state = new LocalStorageStore(HOST_PLUGIN, {
+    ready: false,
+    core,
+    enabled: [
+      ...defaults
+    ],
+    plugins: [],
+    available: meta.filter(({ id }) => !core.includes(id)),
+    // TODO(burdon): Functions should not be part of the settings type.
+    setPlugin: (id, enabled) => {
+      if (enabled) {
+        state.values.enabled.push(id);
+      } else {
+        const index = state.values.enabled.findIndex((enabled2) => enabled2 === id);
+        index !== -1 && state.values.enabled.splice(index, 1);
+      }
+    }
+  });
+  state.prop({
+    key: "enabled",
+    type: LocalStorageStore.json()
+  });
+  return {
+    meta: {
+      id: HOST_PLUGIN,
+      name: "Plugin host"
+    },
+    provides: {
+      plugins: state.values,
+      context: ({ children }) => {
+        return /* @__PURE__ */ React2.createElement(PluginProvider, {
+          value: state.values
+        }, children);
+      },
+      root: () => {
+        return /* @__PURE__ */ React2.createElement(ErrorBoundary, {
+          fallback
+        }, /* @__PURE__ */ React2.createElement(PluginContainer, {
+          plugins,
+          core,
+          state: state.values,
+          placeholder
+        }));
+      }
+    }
+  };
+};
+var DefaultFallback = ({ error }) => {
+  return /* @__PURE__ */ React2.createElement("div", {
+    style: {
+      padding: "1rem"
+    }
+  }, /* @__PURE__ */ React2.createElement("h1", {
+    style: {
+      fontSize: "1.2rem",
+      fontWeight: 700,
+      margin: "0.5rem 0"
+    }
+  }, error.message), /* @__PURE__ */ React2.createElement("pre", null, error.stack));
 };
 
 // packages/sdk/app-framework/src/App.tsx
-import React4 from "react";
+import React3 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 }) => {
-  const host = PluginHost({
-    order: [
-      meta_default2,
-      meta_default,
-      ...order
-    ],
+var createApp = ({ meta, plugins, core, ...params }) => {
+  const hostPlugin = HostPlugin({
     plugins: {
       ...plugins,
-      [meta_default2.id]: Plugin.lazy(() => import("./plugin-K3KCPCTJ.mjs")),
-      [meta_default.id]: Plugin.lazy(() => import("./plugin-MM66VRCO.mjs"))
+      [meta_default.id]: Plugin.lazy(() => import("./plugin-intent-Q5KFPKFA.mjs")),
+      [meta_default3.id]: Plugin.lazy(() => import("./plugin-settings-OM3G2QFY.mjs")),
+      [meta_default2.id]: Plugin.lazy(() => import("./plugin-surface-ZQXFAL46.mjs"))
     },
+    meta: [
+      meta_default,
+      meta_default3,
+      meta_default2,
+      ...meta
+    ],
     core: [
-      meta_default2.id,
       meta_default.id,
+      meta_default3.id,
+      meta_default2.id,
       ...core
     ],
     ...params
   });
-  invariant(host.provides?.context, void 0, {
+  invariant(hostPlugin.provides, void 0, {
+    F: __dxlog_file2,
+    L: 53,
+    S: void 0,
+    A: [
+      "hostPlugin.provides",
+      ""
+    ]
+  });
+  const { context: Context, root: Root } = hostPlugin.provides;
+  invariant(Context, void 0, {
     F: __dxlog_file2,
-    L: 51,
+    L: 55,
     S: void 0,
     A: [
-      "host.provides?.context",
+      "Context",
       ""
     ]
   });
-  invariant(host.provides?.root, void 0, {
+  invariant(Root, void 0, {
     F: __dxlog_file2,
-    L: 52,
+    L: 56,
     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__ */ React3.createElement(Context, null, /* @__PURE__ */ React3.createElement(Root, null));
 };
 export {
   ActiveParts,
-  Attention,
   ErrorBoundary,
+  HostPlugin,
   IntentAction,
   IntentProvider,
   Layout,
   LayoutAction,
   NavigationAction,
   Plugin,
-  PluginHost,
   PluginProvider,
   Resource,
   ResourceKey,
@@ -639,7 +531,6 @@ export {
   firstIdInPart,
   getPlugin,
   indexInPart,
-  initializePlugin,
   isLayoutAdjustment,
   isLayoutMode,
   isLayoutParts,
@@ -661,7 +552,6 @@ export {
   parseSurfacePlugin,
   parseTranslationsPlugin,
   partLength,
-  pluginMeta,
   resolvePlugin,
   useIntent,
   useIntentDispatcher,