@dxos/app-framework 0.6.12-staging.e11e696 → 0.6.13-main.09887cd

package/dist/lib/node/index.cjs

@@ -58,7 +58,6 @@ __export(node_exports, {
   firstIdInPart: () => firstIdInPart,
   getPlugin: () => import_chunk_62W6CMGM.getPlugin,
   indexInPart: () => indexInPart,
-  initializePlugin: () => initializePlugin,
   isLayoutAdjustment: () => isLayoutAdjustment,
   isLayoutMode: () => isLayoutMode,
   isLayoutParts: () => isLayoutParts,
@@ -80,7 +79,6 @@ __export(node_exports, {
   parseSurfacePlugin: () => import_chunk_P5GRB4XF.parseSurfacePlugin,
   parseTranslationsPlugin: () => parseTranslationsPlugin,
   partLength: () => partLength,
-  pluginMeta: () => pluginMeta,
   resolvePlugin: () => import_chunk_62W6CMGM.resolvePlugin,
   useIntent: () => import_chunk_DFST5IG5.useIntent,
   useIntentDispatcher: () => import_chunk_DFST5IG5.useIntentDispatcher,
@@ -101,15 +99,17 @@ var import_schema = require("@effect/schema");
 var import_zod2 = require("zod");
 var import_zod3 = require("zod");
 var import_react = require("react");
+var import_debug = require("@dxos/debug");
 var import_util = require("@dxos/util");
 var import_react2 = __toESM(require("react"));
 var import_local_storage = require("@dxos/local-storage");
-var import_log = require("@dxos/log");
 var import_react3 = __toESM(require("react"));
+var import_log = require("@dxos/log");
 var import_react4 = __toESM(require("react"));
-var import_react5 = require("react");
-var import_debug = require("@dxos/debug");
-var import_react6 = __toESM(require("react"));
+var import_react5 = __toESM(require("react"));
+var import_react6 = require("react");
+var import_debug2 = require("@dxos/debug");
+var import_react7 = __toESM(require("react"));
 var import_invariant = require("@dxos/invariant");
 var defaultFileTypes = {
   images: [
@@ -207,7 +207,10 @@ var LayoutEntrySchema = import_schema.Schema.mutable(import_schema.Schema.Struct
   path: import_schema.Schema.optional(import_schema.Schema.String)
 }));
 var LayoutPartSchema = import_schema.Schema.Union(import_schema.Schema.Literal("sidebar"), import_schema.Schema.Literal("main"), import_schema.Schema.Literal("solo"), import_schema.Schema.Literal("complementary"), import_schema.Schema.Literal("fullScreen"));
-var LayoutPartsSchema = import_schema.Schema.partial(import_schema.Schema.mutable(import_schema.Schema.Record(LayoutPartSchema, import_schema.Schema.mutable(import_schema.Schema.Array(LayoutEntrySchema)))));
+var LayoutPartsSchema = import_schema.Schema.partial(import_schema.Schema.mutable(import_schema.Schema.Record({
+  key: LayoutPartSchema,
+  value: import_schema.Schema.mutable(import_schema.Schema.Array(LayoutEntrySchema))
+})));
 var LayoutCoordinateSchema = import_schema.Schema.mutable(import_schema.Schema.Struct({
   part: LayoutPartSchema,
   entryId: import_schema.Schema.String
@@ -295,7 +298,6 @@ var parseTranslationsPlugin = (plugin) => {
   const { success } = import_zod3.z.array(Resource).safeParse(plugin.provides.translations);
   return success ? plugin : void 0;
 };
-var pluginMeta = (meta) => meta;
 var Plugin;
 (function(Plugin2) {
   Plugin2.lazy = (p, props) => {
@@ -304,16 +306,8 @@ var Plugin;
     });
   };
 })(Plugin || (Plugin = {}));
-var PluginContext = /* @__PURE__ */ (0, import_react.createContext)({
-  ready: false,
-  core: [],
-  enabled: [],
-  plugins: [],
-  available: [],
-  setPlugin: () => {
-  }
-});
-var usePlugins = () => (0, import_react.useContext)(PluginContext);
+var PluginContext = /* @__PURE__ */ (0, import_react.createContext)(void 0);
+var usePlugins = () => (0, import_react.useContext)(PluginContext) ?? (0, import_debug.raise)(new Error("Missing PluginContext"));
 var usePlugin = (id) => {
   const { plugins } = usePlugins();
   return (0, import_chunk_62W6CMGM.findPlugin)(plugins, id);
@@ -330,8 +324,117 @@ var useResolvePlugins = (predicate) => {
   ]);
 };
 var PluginProvider = PluginContext.Provider;
+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] = (0, import_react3.useState)();
+  (0, import_react3.useEffect)(() => {
+    (0, import_log.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) => {
+            import_log.log.error("Failed to initialize plugin:", {
+              id: definition.meta.id,
+              err
+            }, {
+              F: __dxlog_file,
+              L: 41,
+              S: void 0,
+              C: (f, a) => f(...a)
+            });
+          });
+          (0, import_log.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));
+        (0, import_log.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)));
+        (0, import_log.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__ */ import_react3.default.createElement(import_react3.default.Fragment, null, placeholder);
+  }
+  const ComposedContext = composeContext(state.plugins);
+  return /* @__PURE__ */ import_react3.default.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__ */ import_react3.default.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__ */ import_react3.default.createElement(Acc, null, /* @__PURE__ */ import_react3.default.createElement(Next, null, children)));
+};
 var isObject = (data) => !!data && typeof data === "object";
-var ErrorBoundary = class extends import_react3.Component {
+var ErrorBoundary = class extends import_react4.Component {
   constructor(props) {
     super(props);
     this.state = {
@@ -350,7 +453,7 @@ var ErrorBoundary = class extends import_react3.Component {
   }
   render() {
     if (this.state.error) {
-      return /* @__PURE__ */ import_react3.default.createElement(this.props.fallback, {
+      return /* @__PURE__ */ import_react4.default.createElement(this.props.fallback, {
         data: this.props.data,
         error: this.state.error,
         reset: this.resetError
@@ -364,32 +467,32 @@ var ErrorBoundary = class extends import_react3.Component {
     });
   }
 };
-var Surface = /* @__PURE__ */ (0, import_react4.forwardRef)(({ role, name = role, fallback, placeholder, ...rest }, forwardedRef) => {
+var Surface = /* @__PURE__ */ (0, import_react5.forwardRef)(({ role, name = role, fallback, placeholder, ...rest }, forwardedRef) => {
   const props = {
     role,
     name,
     fallback,
     ...rest
   };
-  const context = (0, import_react5.useContext)(SurfaceContext);
+  const context = (0, import_react6.useContext)(SurfaceContext);
   const data = props.data ?? (name && context?.surfaces?.[name]?.data || {});
-  const resolver = /* @__PURE__ */ import_react4.default.createElement(SurfaceResolver, {
+  const resolver = /* @__PURE__ */ import_react5.default.createElement(SurfaceResolver, {
     ...props,
     ref: forwardedRef
   });
-  const suspense = placeholder ? /* @__PURE__ */ import_react4.default.createElement(import_react4.Suspense, {
+  const suspense = placeholder ? /* @__PURE__ */ import_react5.default.createElement(import_react5.Suspense, {
     fallback: placeholder
   }, resolver) : resolver;
-  return fallback ? /* @__PURE__ */ import_react4.default.createElement(ErrorBoundary, {
+  return fallback ? /* @__PURE__ */ import_react5.default.createElement(ErrorBoundary, {
     data,
     fallback
   }, suspense) : suspense;
 });
-var SurfaceContext = /* @__PURE__ */ (0, import_react5.createContext)(null);
-var useSurface = () => (0, import_react5.useContext)(SurfaceContext) ?? (0, import_debug.raise)(new Error("Surface context not found"));
-var SurfaceResolver = /* @__PURE__ */ (0, import_react4.forwardRef)((props, forwardedRef) => {
+var SurfaceContext = /* @__PURE__ */ (0, import_react6.createContext)(null);
+var useSurface = () => (0, import_react6.useContext)(SurfaceContext) ?? (0, import_debug2.raise)(new Error("Surface context not found"));
+var SurfaceResolver = /* @__PURE__ */ (0, import_react5.forwardRef)((props, forwardedRef) => {
   const { components } = (0, import_chunk_P5GRB4XF.useSurfaceRoot)();
-  const parent = (0, import_react5.useContext)(SurfaceContext);
+  const parent = (0, import_react6.useContext)(SurfaceContext);
   const nodes = resolveNodes(components, props, parent, forwardedRef);
   const currentContext = {
     ...props,
@@ -398,7 +501,7 @@ var SurfaceResolver = /* @__PURE__ */ (0, import_react4.forwardRef)((props, forw
       ...props.surfaces
     }
   };
-  return /* @__PURE__ */ import_react4.default.createElement(SurfaceContext.Provider, {
+  return /* @__PURE__ */ import_react5.default.createElement(SurfaceContext.Provider, {
     value: currentContext
   }, nodes);
 });
@@ -418,7 +521,7 @@ var resolveNodes = (components, props, context, forwardedRef) => {
     return "node" in result ? [
       key,
       result
-    ] : /* @__PURE__ */ (0, import_react4.isValidElement)(result) ? [
+    ] : /* @__PURE__ */ (0, import_react5.isValidElement)(result) ? [
       key,
       {
         node: result
@@ -435,15 +538,14 @@ var resolveNodes = (components, props, context, forwardedRef) => {
       return 1;
     }
     return 0;
-  }).map(([key, result]) => /* @__PURE__ */ import_react4.default.createElement(import_react4.Fragment, {
+  }).map(([key, result]) => /* @__PURE__ */ import_react5.default.createElement(import_react5.Fragment, {
     key
   }, result.node));
   return props.limit ? nodes.slice(0, props.limit) : nodes;
 };
-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 import_local_storage.LocalStorageStore(PLUGIN_HOST, {
     ready: false,
     core,
@@ -451,7 +553,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);
@@ -472,16 +574,17 @@ var PluginHost = ({ order, plugins: definitions, core = [], defaults = [], fallb
     },
     provides: {
       plugins: state.values,
-      context: ({ children }) => /* @__PURE__ */ import_react2.default.createElement(PluginProvider, {
-        value: state.values
-      }, children),
+      context: ({ children }) => {
+        return /* @__PURE__ */ import_react2.default.createElement(PluginProvider, {
+          value: state.values
+        }, children);
+      },
       root: () => {
         return /* @__PURE__ */ import_react2.default.createElement(ErrorBoundary, {
           fallback
-        }, /* @__PURE__ */ import_react2.default.createElement(Root, {
-          order,
+        }, /* @__PURE__ */ import_react2.default.createElement(PluginContainer, {
+          plugins,
           core,
-          definitions,
           state: state.values,
           placeholder
         }));
@@ -502,123 +605,20 @@ var DefaultFallback = ({ error }) => {
     }
   }, error.message), /* @__PURE__ */ import_react2.default.createElement("pre", null, error.stack));
 };
-var Root = ({ order, core: corePluginIds, definitions, state, placeholder }) => {
-  const [error, setError] = (0, import_react2.useState)();
-  (0, import_react2.useEffect)(() => {
-    (0, import_log.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) => {
-            import_log.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)));
-        (0, import_log.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)));
-        (0, import_log.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__ */ import_react2.default.createElement(import_react2.default.Fragment, null, placeholder);
-  }
-  const ComposedContext = composeContext(state.plugins);
-  return /* @__PURE__ */ import_react2.default.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__ */ import_react2.default.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__ */ import_react2.default.createElement(Acc, null, /* @__PURE__ */ import_react2.default.createElement(Next, null, children)));
-};
 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: [
-      import_chunk_P5GRB4XF.meta_default,
-      import_chunk_DFST5IG5.meta_default,
-      ...order
-    ],
     plugins: {
       ...plugins,
       [import_chunk_P5GRB4XF.meta_default.id]: Plugin.lazy(() => import("./plugin-RUJ5PEXB.cjs")),
       [import_chunk_DFST5IG5.meta_default.id]: Plugin.lazy(() => import("./plugin-QV7ESETI.cjs"))
     },
+    // TODO(burdon): Why not include in core?
+    meta: [
+      import_chunk_P5GRB4XF.meta_default,
+      import_chunk_DFST5IG5.meta_default,
+      ...meta
+    ],
     core: [
       import_chunk_P5GRB4XF.meta_default.id,
       import_chunk_DFST5IG5.meta_default.id,
@@ -626,27 +626,35 @@ var createApp = ({ order, plugins, core = order.map(({ id }) => id), ...params }
     ],
     ...params
   });
-  (0, import_invariant.invariant)(host.provides?.context, void 0, {
+  (0, import_invariant.invariant)(host.provides, void 0, {
     F: __dxlog_file2,
-    L: 51,
+    L: 52,
     S: void 0,
     A: [
-      "host.provides?.context",
+      "host.provides",
       ""
     ]
   });
-  (0, import_invariant.invariant)(host.provides?.root, void 0, {
+  const { context: Context, root: Root } = host.provides;
+  (0, import_invariant.invariant)(Context, void 0, {
     F: __dxlog_file2,
-    L: 52,
+    L: 54,
+    S: void 0,
+    A: [
+      "Context",
+      ""
+    ]
+  });
+  (0, import_invariant.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__ */ import_react6.default.createElement(Context, null, /* @__PURE__ */ import_react6.default.createElement(Root2, null));
+  return () => /* @__PURE__ */ import_react7.default.createElement(Context, null, /* @__PURE__ */ import_react7.default.createElement(Root, null));
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -680,7 +688,6 @@ var createApp = ({ order, plugins, core = order.map(({ id }) => id), ...params }
   firstIdInPart,
   getPlugin,
   indexInPart,
-  initializePlugin,
   isLayoutAdjustment,
   isLayoutMode,
   isLayoutParts,
@@ -702,7 +709,6 @@ var createApp = ({ order, plugins, core = order.map(({ id }) => id), ...params }
   parseSurfacePlugin,
   parseTranslationsPlugin,
   partLength,
-  pluginMeta,
   resolvePlugin,
   useIntent,
   useIntentDispatcher,