@dxos/app-framework 0.6.14-main.2b6a0f3 → 0.6.14-main.f49f251

package/dist/lib/browser/index.mjs

@@ -1,10 +1,3 @@
-import {
-  SurfaceProvider,
-  meta_default as meta_default2,
-  parseRootSurfacePlugin,
-  parseSurfacePlugin,
-  useSurfaceRoot
-} from "./chunk-SB4XRTGZ.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";
@@ -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,7 +229,7 @@ var parseTranslationsPlugin = (plugin) => {
   return success ? plugin : void 0;
 };
 
-// packages/sdk/app-framework/src/plugins/PluginHost/plugin.ts
+// packages/sdk/app-framework/src/plugins/plugin-host/plugin.ts
 var Plugin;
 (function(Plugin2) {
   Plugin2.lazy = (p, props) => {
@@ -238,37 +239,14 @@ var Plugin;
   };
 })(Plugin || (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(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/PluginHost/PluginHost.tsx
-import React4 from "react";
+// packages/sdk/app-framework/src/plugins/plugin-host/HostPlugin.tsx
+import React2 from "react";
 import { LocalStorageStore } from "@dxos/local-storage";
 
-// packages/sdk/app-framework/src/plugins/PluginHost/PluginContainer.tsx
+// 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/PluginHost/PluginContainer.tsx";
+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(() => {
@@ -359,9 +337,9 @@ var initializePlugin = async (pluginDefinition) => {
 };
 var rootComponents = (plugins) => {
   return plugins.map((plugin) => {
-    const Component2 = plugin.provides.root;
-    if (Component2) {
-      return /* @__PURE__ */ React.createElement(Component2, {
+    const Component = plugin.provides.root;
+    if (Component) {
+      return /* @__PURE__ */ React.createElement(Component, {
         key: plugin.meta.id
       });
     } else {
@@ -378,149 +356,34 @@ var compose = (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";
-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__ */ React2.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/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);
 };
-
-// packages/sdk/app-framework/src/plugins/SurfacePlugin/Surface.tsx
-import React3, { Fragment, Suspense, createContext as createContext2, forwardRef, isValidElement, memo, useContext as useContext2, useEffect as useEffect2, useState as useState2 } from "react";
-import { raise as raise2 } from "@dxos/debug";
-var Surface = /* @__PURE__ */ memo(/* @__PURE__ */ forwardRef(({ role, name = role, fallback, placeholder, ...rest }, forwardedRef) => {
-  const props = {
-    role,
-    name,
-    fallback,
-    ...rest
-  };
-  const { debugInfo } = useSurfaceRoot();
-  const [id] = useState2(Math.random().toString(36).slice(2));
-  useEffect2(() => {
-    debugInfo?.set(id, {
-      id,
-      created: Date.now(),
-      name,
-      role,
-      renderCount: 0
-    });
-    return () => {
-      debugInfo?.delete(id);
-    };
-  }, [
-    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
   ]);
-  if (debugInfo?.get(id)) {
-    debugInfo.get(id).renderCount++;
-  }
-  const context = useContext2(SurfaceContext);
-  const data = props.data ?? (name && context?.surfaces?.[name]?.data || {});
-  const resolver = /* @__PURE__ */ React3.createElement(SurfaceResolver, {
-    ...props,
-    ref: forwardedRef
-  });
-  const suspense = placeholder ? /* @__PURE__ */ React3.createElement(Suspense, {
-    fallback: placeholder
-  }, resolver) : resolver;
-  return fallback ? /* @__PURE__ */ React3.createElement(ErrorBoundary, {
-    data,
-    fallback
-  }, suspense) : suspense;
-}));
-var SurfaceContext = /* @__PURE__ */ createContext2(void 0);
-var useSurface = () => useContext2(SurfaceContext) ?? raise2(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__ */ React3.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__ */ React3.createElement(Fragment, {
-    key
-  }, result.node));
-  return props.limit ? nodes.slice(0, props.limit) : nodes;
 };
+var PluginProvider = PluginContext.Provider;
 
-// packages/sdk/app-framework/src/plugins/PluginHost/PluginHost.tsx
+// packages/sdk/app-framework/src/plugins/plugin-host/HostPlugin.tsx
 var parsePluginHost = (plugin) => plugin.provides.plugins ? plugin : void 0;
-var PLUGIN_HOST = "dxos.org/plugin/host";
-var PluginHost = ({ plugins, meta, core, defaults = [], fallback = DefaultFallback, placeholder = null }) => {
-  const state = new LocalStorageStore(PLUGIN_HOST, {
+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: [
@@ -528,6 +391,7 @@ var PluginHost = ({ plugins, meta, core, defaults = [], fallback = DefaultFallba
     ],
     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);
@@ -543,20 +407,20 @@ var PluginHost = ({ plugins, meta, core, defaults = [], fallback = DefaultFallba
   });
   return {
     meta: {
-      id: PLUGIN_HOST,
+      id: HOST_PLUGIN,
       name: "Plugin host"
     },
     provides: {
       plugins: state.values,
       context: ({ children }) => {
-        return /* @__PURE__ */ React4.createElement(PluginProvider, {
+        return /* @__PURE__ */ React2.createElement(PluginProvider, {
           value: state.values
         }, children);
       },
       root: () => {
-        return /* @__PURE__ */ React4.createElement(ErrorBoundary, {
+        return /* @__PURE__ */ React2.createElement(ErrorBoundary, {
           fallback
-        }, /* @__PURE__ */ React4.createElement(PluginContainer, {
+        }, /* @__PURE__ */ React2.createElement(PluginContainer, {
           plugins,
           core,
           state: state.values,
@@ -567,56 +431,58 @@ var PluginHost = ({ plugins, meta, core, defaults = [], fallback = DefaultFallba
   };
 };
 var DefaultFallback = ({ error }) => {
-  return /* @__PURE__ */ React4.createElement("div", {
+  return /* @__PURE__ */ React2.createElement("div", {
     style: {
       padding: "1rem"
     }
-  }, /* @__PURE__ */ React4.createElement("h1", {
+  }, /* @__PURE__ */ React2.createElement("h1", {
     style: {
       fontSize: "1.2rem",
       fontWeight: 700,
       margin: "0.5rem 0"
     }
-  }, error.message), /* @__PURE__ */ React4.createElement("pre", null, error.stack));
+  }, error.message), /* @__PURE__ */ React2.createElement("pre", null, error.stack));
 };
 
 // packages/sdk/app-framework/src/App.tsx
-import React5 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 = ({ meta, plugins, core, ...params }) => {
-  const host = PluginHost({
+  const hostPlugin = HostPlugin({
     plugins: {
       ...plugins,
-      [meta_default2.id]: Plugin.lazy(() => import("./plugin-Y4KRQJE4.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"))
     },
-    // TODO(burdon): Why not include in core?
     meta: [
-      meta_default2,
       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, void 0, {
+  invariant(hostPlugin.provides, void 0, {
     F: __dxlog_file2,
-    L: 52,
+    L: 53,
     S: void 0,
     A: [
-      "host.provides",
+      "hostPlugin.provides",
       ""
     ]
   });
-  const { context: Context, root: Root } = host.provides;
+  const { context: Context, root: Root } = hostPlugin.provides;
   invariant(Context, void 0, {
     F: __dxlog_file2,
-    L: 54,
+    L: 55,
     S: void 0,
     A: [
       "Context",
@@ -625,25 +491,25 @@ var createApp = ({ meta, plugins, core, ...params }) => {
   });
   invariant(Root, void 0, {
     F: __dxlog_file2,
-    L: 55,
+    L: 56,
     S: void 0,
     A: [
       "Root",
       ""
     ]
   });
-  return () => /* @__PURE__ */ React5.createElement(Context, null, /* @__PURE__ */ React5.createElement(Root, null));
+  return () => /* @__PURE__ */ React3.createElement(Context, null, /* @__PURE__ */ React3.createElement(Root, null));
 };
 export {
   ActiveParts,
   ErrorBoundary,
+  HostPlugin,
   IntentAction,
   IntentProvider,
   Layout,
   LayoutAction,
   NavigationAction,
   Plugin,
-  PluginHost,
   PluginProvider,
   Resource,
   ResourceKey,