@dxos/app-framework 0.3.11-main.f14932f → 0.3.11-main.f4c1077

package/dist/types/src/plugins/PluginHost/PluginHost.d.ts

@@ -1,12 +1,14 @@
 import { type ReactNode } from 'react';
 import { type PluginContext } from './PluginContext';
 import { type Plugin, type PluginDefinition } from './plugin';
+import { ErrorBoundary } from '../SurfacePlugin';
 export type BootstrapPluginsParams = {
     order: PluginDefinition['meta'][];
     plugins: Record<string, () => Promise<PluginDefinition>>;
     core?: string[];
     defaults?: string[];
-    fallback?: ReactNode;
+    fallback?: ErrorBoundary['props']['fallback'];
+    placeholder?: ReactNode;
 };
 export type PluginHostProvides = {
     plugins: PluginContext;
@@ -15,7 +17,7 @@ export declare const parsePluginHost: (plugin: Plugin) => Plugin<PluginHostProvi
 /**
  * Bootstraps an application by initializing plugins and rendering root components.
  */
-export declare const PluginHost: ({ order, plugins: definitions, core, defaults, fallback, }: BootstrapPluginsParams) => PluginDefinition<PluginHostProvides>;
+export declare const PluginHost: ({ order, plugins: definitions, core, defaults, fallback, placeholder, }: BootstrapPluginsParams) => PluginDefinition<PluginHostProvides>;
 /**
  * Resolve a `PluginDefinition` into a fully initialized `Plugin`.
  */

package/dist/types/src/plugins/PluginHost/PluginHost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginHost.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/PluginHost/PluginHost.tsx"],"names":[],"mappings":"AAKA,OAAc,EAA8C,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAK1F,OAAO,EAAE,KAAK,aAAa,EAAkB,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,gBAAgB,EAAuB,MAAM,UAAU,CAAC;AAEnF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,aAAa,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,MAAM,2CACwD,CAAC;AAIvG;;GAEG;AACH,eAAO,MAAM,UAAU,+DAMpB,sBAAsB,KAAG,iBAAiB,kBAAkB,CAmF9D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,4EAS5B,CAAC"}
+{"version":3,"file":"PluginHost.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/PluginHost/PluginHost.tsx"],"names":[],"mappings":"AAKA,OAAc,EAA8C,KAAK,SAAS,EAAY,MAAM,OAAO,CAAC;AAKpG,OAAO,EAAE,KAAK,aAAa,EAAkB,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,gBAAgB,EAAuB,MAAM,UAAU,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC;IAC9C,WAAW,CAAC,EAAE,SAAS,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,aAAa,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,eAAe,WAAY,MAAM,2CACwD,CAAC;AAIvG;;GAEG;AACH,eAAO,MAAM,UAAU,4EAOpB,sBAAsB,KAAG,iBAAiB,kBAAkB,CAkC9D,CAAC;AAmFF;;GAEG;AACH,eAAO,MAAM,gBAAgB,4EAS5B,CAAC"}

package/dist/types/src/plugins/PluginHost/plugin.d.ts

@@ -70,7 +70,7 @@ export type PluginDefinition<TProvides = {}, TInitializeProvides = {}> = Omit<Pl
      *
      * @return Capabilities provided by the plugin which are merged with base capabilities.
      */
-    initialize?: () => Promise<PluginProvides<TInitializeProvides>>;
+    initialize?: () => Promise<PluginProvides<TInitializeProvides> | void>;
     /**
      * Called once all plugins have been initialized.
      * This is the place to do any initialization which requires other plugins to be ready.

package/dist/types/src/plugins/PluginHost/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/PluginHost/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,cAAc,CAAC,SAAS,IAAI,SAAS,GAAG;IAClD;;OAEG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAKhC,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,MAAM,CAAC,SAAS,GAAG,EAAE,IAAI;IACnC,IAAI,EAAE;QACJ;;;;;;WAMG;QACH,EAAE,EAAE,MAAM,CAAC;QAEX;;;;WAIG;QAEH,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QAEd;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;WAEG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAElB;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAEhB;;WAEG;QAEH,aAAa,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;KAC/B,CAAC;IAEF;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,SAAS,GAAG,EAAE,EAAE,mBAAmB,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG;IAClG;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC;IAEzC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAEhE;;;;;OAKG;IACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,MAAM,CAAC,MAAM,CAAC;IAjF3C;;;;;;OAMG;QACC,MAAM;IAEV;;;;OAIG;;IAIH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;CA0CiD,CAAC;AAEzD,KAAK,UAAU,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC;IAAE,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,gBAAgB,CAAA;CAAE,CAAC,CAAC;AAEhF,yBAAiB,MAAM,CAAC;IACf,MAAM,IAAI,yFAKhB,CAAC;CACH"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/PluginHost/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,EAAE,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAEnD;;;GAGG;AACH,MAAM,MAAM,cAAc,CAAC,SAAS,IAAI,SAAS,GAAG;IAClD;;OAEG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAKhC,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,MAAM,CAAC,SAAS,GAAG,EAAE,IAAI;IACnC,IAAI,EAAE;QACJ;;;;;;WAMG;QACH,EAAE,EAAE,MAAM,CAAC;QAEX;;;;WAIG;QAEH,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QAEd;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;WAEG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAElB;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAEhB;;WAEG;QAEH,aAAa,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;KAC/B,CAAC;IAEF;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;CACrC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,SAAS,GAAG,EAAE,EAAE,mBAAmB,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG;IAClG;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC;IAEzC;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,CAAC;IAEvE;;;;;OAKG;IAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,UAAU,SAAU,MAAM,CAAC,MAAM,CAAC;IAlF3C;;;;;;OAMG;QACC,MAAM;IAEV;;;;OAIG;;IAIH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;CA2CiD,CAAC;AAEzD,KAAK,UAAU,CAAC,CAAC,IAAI,MAAM,OAAO,CAAC;IAAE,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,gBAAgB,CAAA;CAAE,CAAC,CAAC;AAEhF,yBAAiB,MAAM,CAAC;IACf,MAAM,IAAI,yFAKhB,CAAC;CACH"}

package/dist/types/src/plugins/SurfacePlugin/Surface.d.ts

@@ -1,4 +1,4 @@
-import React, { type FC, type PropsWithChildren } from 'react';
+import React, { type ReactNode, type PropsWithChildren } from 'react';
 import { ErrorBoundary } from './ErrorBoundary';
 /**
  * Direction determines how multiple components are laid out.
@@ -28,11 +28,10 @@ export type SurfaceProps = PropsWithChildren<{
      */
     fallback?: ErrorBoundary['props']['fallback'];
     /**
-     * If specified, this will render if no plugin can offer renderable content for the surface.
-     *
-     * @deprecated Provide a component with `disposition: 'fallback'` instead.
+     * If specified, the Surface will be wrapped in a suspense boundary.
+     * The placeholder component will be rendered while the surface component is loading.
      */
-    contentFallback?: FC<{}>;
+    placeholder?: ReactNode;
     /**
      * If more than one component is resolved, the limit determines how many are rendered.
      */

package/dist/types/src/plugins/SurfacePlugin/Surface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Surface.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/SurfacePlugin/Surface.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,EAEZ,KAAK,EAAE,EAIP,KAAK,iBAAiB,EAEvB,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,gBAAgB,GAAG,OAAO,GAAG,eAAe,CAAC;AAEhF,MAAM,MAAM,YAAY,GAAG,iBAAiB,CAAC;IAC3C;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC;IAEnE;;;OAGG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC;IAE9C;;;;OAIG;IACH,eAAe,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;IAEzB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;OAGG;IACH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,OAAO,yGAkBnB,CAAC"}
+{"version":3,"file":"Surface.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/SurfacePlugin/Surface.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,EAEZ,KAAK,SAAS,EAGd,KAAK,iBAAiB,EAGvB,MAAM,OAAO,CAAC;AAGf,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD;;GAEG;AACH,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,gBAAgB,GAAG,OAAO,GAAG,eAAe,CAAC;AAEhF,MAAM,MAAM,YAAY,GAAG,iBAAiB,CAAC;IAC3C;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC;IAEnE;;;OAGG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC;IAE9C;;;OAGG;IACH,WAAW,CAAC,EAAE,SAAS,CAAC;IAExB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3B;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;OAGG;IACH,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,OAAO,yGAiBnB,CAAC"}

package/dist/types/src/plugins/common/layout.d.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { type IntentData } from '../IntentPlugin';
 import type { Plugin } from '../PluginHost';
 /**
  * Basic state provided by a layout plugin.
@@ -63,28 +64,28 @@ export declare enum LayoutAction {
  * Expected payload for layout actions.
  */
 export declare namespace LayoutAction {
-    type ToggleFullscreen = {
+    type ToggleFullscreen = IntentData<{
         state?: boolean;
-    };
-    type ToggleSidebar = {
+    }>;
+    type ToggleSidebar = IntentData<{
         state?: boolean;
-    };
-    type ToggleComplementarySidebar = {
+    }>;
+    type ToggleComplementarySidebar = IntentData<{
         state?: boolean;
-    };
-    type OpenDialog = {
+    }>;
+    type OpenDialog = IntentData<{
         component: string;
         subject: any;
-    };
-    type CloseDialog = {};
-    type OpenPopover = {
+    }>;
+    type CloseDialog = IntentData<{}>;
+    type OpenPopover = IntentData<{
         anchorId: string;
         component: string;
         subject: any;
-    };
-    type ClosePopover = {};
-    type Activate = {
+    }>;
+    type ClosePopover = IntentData<{}>;
+    type Activate = IntentData<{
         id: string;
-    };
+    }>;
 }
 //# sourceMappingURL=layout.d.ts.map

package/dist/types/src/plugins/common/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/common/layout.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAM5C;;GAEG;AAEH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBjB,CAAC;AAEH,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,MAAM,CAAC,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,WAAY,MAAM,uCAG/C,CAAC;AAQF,oBAAY,YAAY;IACtB,iBAAiB,6CAAuC;IACxD,cAAc,0CAAoC;IAClD,4BAA4B,wDAAkD;IAC9E,WAAW,uCAAiC;IAC5C,YAAY,wCAAkC;IAC9C,YAAY,wCAAkC;IAC9C,aAAa,yCAAmC;IAChD,QAAQ,oCAA8B;IACtC,KAAK,iCAA2B;CACjC;AAED;;GAEG;AACH,yBAAiB,YAAY,CAAC;IAC5B,KAAY,gBAAgB,GAAG;QAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;IAEF,KAAY,aAAa,GAAG;QAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;IAEF,KAAY,0BAA0B,GAAG;QACvC,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;IAEF,KAAY,UAAU,GAAG;QACvB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,GAAG,CAAC;KACd,CAAC;IAEF,KAAY,WAAW,GAAG,EAAE,CAAC;IAE7B,KAAY,WAAW,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,GAAG,CAAC;KACd,CAAC;IAEF,KAAY,YAAY,GAAG,EAAE,CAAC;IAE9B,KAAY,QAAQ,GAAG;QACrB,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;CACH"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/common/layout.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAM5C;;GAEG;AAEH,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBjB,CAAC;AAEH,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,MAAM,CAAC,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,WAAY,MAAM,uCAG/C,CAAC;AAQF,oBAAY,YAAY;IACtB,iBAAiB,6CAAuC;IACxD,cAAc,0CAAoC;IAClD,4BAA4B,wDAAkD;IAC9E,WAAW,uCAAiC;IAC5C,YAAY,wCAAkC;IAC9C,YAAY,wCAAkC;IAC9C,aAAa,yCAAmC;IAChD,QAAQ,oCAA8B;IACtC,KAAK,iCAA2B;CACjC;AAED;;GAEG;AACH,yBAAiB,YAAY,CAAC;IAC5B,KAAY,gBAAgB,GAAG,UAAU,CAAC;QACxC,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC,CAAC;IAEH,KAAY,aAAa,GAAG,UAAU,CAAC;QACrC,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC,CAAC;IAEH,KAAY,0BAA0B,GAAG,UAAU,CAAC;QAClD,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC,CAAC;IAEH,KAAY,UAAU,GAAG,UAAU,CAAC;QAClC,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,GAAG,CAAC;KACd,CAAC,CAAC;IAEH,KAAY,WAAW,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAEzC,KAAY,WAAW,GAAG,UAAU,CAAC;QACnC,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,GAAG,CAAC;KACd,CAAC,CAAC;IAEH,KAAY,YAAY,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAE1C,KAAY,QAAQ,GAAG,UAAU,CAAC;QAChC,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.3.11-main.f14932f",
+  "version": "0.3.11-main.f4c1077",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,12 +16,13 @@
     "@preact/signals-react": "^1.3.6",
     "deepsignal": "1.4.0-shallow.0",
     "zod": "^3.22.4",
-    "@dxos/app-graph": "0.3.11-main.f14932f",
-    "@dxos/async": "0.3.11-main.f14932f",
-    "@dxos/debug": "0.3.11-main.f14932f",
-    "@dxos/invariant": "0.3.11-main.f14932f",
-    "@dxos/log": "0.3.11-main.f14932f",
-    "@dxos/local-storage": "0.3.11-main.f14932f"
+    "@dxos/app-graph": "0.3.11-main.f4c1077",
+    "@dxos/async": "0.3.11-main.f4c1077",
+    "@dxos/debug": "0.3.11-main.f4c1077",
+    "@dxos/local-storage": "0.3.11-main.f4c1077",
+    "@dxos/log": "0.3.11-main.f4c1077",
+    "@dxos/invariant": "0.3.11-main.f4c1077",
+    "@dxos/util": "0.3.11-main.f4c1077"
   },
   "devDependencies": {
     "@types/react": "^18.0.21",

package/project.json

@@ -19,7 +19,9 @@
       }
     }
   },
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "implicitDependencies": [
     "test"
-  ]
+  ],
+  "name": "app-framework"
 }

package/src/plugins/IntentPlugin/IntentContext.tsx

@@ -15,7 +15,7 @@ export type IntentContext = {
 };
 
 const IntentContext: Context<IntentContext> = createContext<IntentContext>({
-  dispatch: async () => {},
+  dispatch: async () => ({}),
   registerResolver: () => () => {},
 });
 

package/src/plugins/IntentPlugin/intent.ts

@@ -2,8 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
+import type { MaybePromise } from '@dxos/util';
+
 import type { Plugin } from '../PluginHost';
 
+export type IntentData<T extends Record<string, any> = Record<string, any>> = T & {
+  /**
+   * The data from the result of the previous intent.
+   */
+  result?: any;
+};
+
 /**
  * An intent is an abstract description of an operation to be performed.
  * Intents allow actions to be performed across plugins.
@@ -24,7 +33,28 @@ export type Intent = {
   /**
    * Any data needed to perform the desired action.
    */
+  data?: IntentData;
+};
+
+export type IntentResult = {
+  /**
+   * The output of the action that was performed.
+   *
+   * If the intent is apart of a chain of intents, the data will be passed to the next intent.
+   */
   data?: any;
+
+  /**
+   * An error that occurred while performing the action.
+   *
+   * If the intent is apart of a chain of intents and an error occurs, the chain will be aborted.
+   */
+  error?: Error;
+
+  /**
+   * Other intent chains to be triggered.
+   */
+  intents?: Intent[][];
 };
 
 /**
@@ -33,6 +63,12 @@ export type Intent = {
  *
  * @returns The result of the last intent.
  */
-export type IntentDispatcher = (intent: Intent | Intent[]) => Promise<any>;
+export type IntentDispatcher = (intent: Intent | Intent[]) => Promise<IntentResult | void>;
 
-export type IntentResolver = (intent: Intent, plugins: Plugin[]) => any;
+/**
+ * Resolves an intent that was dispatched.
+ * If the intent is not handled, nothing should be returned.
+ *
+ * @returns The result of the intent.
+ */
+export type IntentResolver = (intent: Intent, plugins: Plugin[]) => MaybePromise<IntentResult | void>;

package/src/plugins/IntentPlugin/plugin.tsx

@@ -5,19 +5,23 @@
 import { deepSignal } from 'deepsignal/react';
 import React from 'react';
 
+import { log } from '@dxos/log';
+
 import { type IntentContext, IntentProvider } from './IntentContext';
-import type { Intent, IntentResolver } from './intent';
+import type { Intent, IntentResolver, IntentResult } from './intent';
 import IntentMeta from './meta';
 import { type IntentPluginProvides, type IntentResolverProvides, parseIntentResolverPlugin } from './provides';
 import type { PluginDefinition } from '../PluginHost';
 import { filterPlugins, findPlugin } from '../helpers';
 
+const EXECUTION_LIMIT = 1000;
+
 /**
  * Allows plugins to register intent handlers and routes sent intents to the appropriate plugin.
  * Inspired by https://developer.android.com/reference/android/content/Intent.
  */
 const IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {
-  const state = deepSignal<IntentContext>({ dispatch: async () => {}, registerResolver: () => () => {} });
+  const state = deepSignal<IntentContext>({ dispatch: async () => ({}), registerResolver: () => () => {} });
 
   const dynamicResolvers = new Set<{ plugin: string; resolver: IntentResolver }>();
 
@@ -29,7 +33,7 @@ const IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {
         if (intent.plugin) {
           for (const entry of dynamicResolvers) {
             if (entry.plugin === intent.plugin) {
-              const result = entry.resolver(intent, plugins);
+              const result = await entry.resolver(intent, plugins);
               if (result) {
                 return result;
               }
@@ -37,11 +41,12 @@ const IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {
           }
 
           const plugin = findPlugin<IntentResolverProvides>(plugins, intent.plugin);
-          return plugin?.provides.intent.resolver(intent, plugins);
+          const result = plugin?.provides.intent.resolver(intent, plugins);
+          return result;
         }
 
         for (const entry of dynamicResolvers) {
-          const result = entry.resolver(intent, plugins);
+          const result = await entry.resolver(intent, plugins);
           if (result) {
             return result;
           }
@@ -54,18 +59,42 @@ const IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {
             return result;
           }
         }
+
+        // https://vitejs.dev/guide/env-and-mode#env-variables
+        // TODO(wittjosiah): How to handle this more generically?
+        if (import.meta?.env?.DEV) {
+          log.warn('No plugin found to handle intent', intent);
+        }
       };
 
       // Sequentially dispatch array of invents.
-      state.dispatch = async (intentOrArray) => {
-        let result: any = null;
+      const dispatchChain = async (intentOrArray: Intent | Intent[], depth = 0) => {
+        if (depth > EXECUTION_LIMIT) {
+          return {
+            error: new Error(
+              `Intent execution limit exceeded (${EXECUTION_LIMIT} iterations). This is likely due to an infinite loop within intent resolvers.`,
+            ),
+          };
+        }
+
+        let result: IntentResult | undefined;
         for (const intent of Array.isArray(intentOrArray) ? intentOrArray : [intentOrArray]) {
-          const data = intent.data ? { ...result, ...intent.data } : result;
-          result = await dispatch({ ...intent, data });
+          const data = intent.data ? { result: result?.data, ...intent.data } : result?.data;
+          result = (await dispatch({ ...intent, data })) ?? undefined;
+
+          if (result?.error) {
+            break;
+          }
+
+          result?.intents?.forEach((intents) => {
+            void dispatchChain(intents, depth + 1);
+          });
         }
+
         return result;
       };
 
+      state.dispatch = dispatchChain;
       state.registerResolver = (plugin, resolver) => {
         const entry = { plugin, resolver };
         dynamicResolvers.add(entry);

package/src/plugins/PluginHost/PluginHost.tsx

@@ -3,20 +3,22 @@
 //
 
 import { shallow } from 'deepsignal/react';
-import React, { useEffect, type FC, type PropsWithChildren, type ReactNode } from 'react';
+import React, { useEffect, type FC, type PropsWithChildren, type ReactNode, useState } from 'react';
 
 import { LocalStorageStore } from '@dxos/local-storage';
 import { log } from '@dxos/log';
 
 import { type PluginContext, PluginProvider } from './PluginContext';
 import { type Plugin, type PluginDefinition, type PluginProvides } from './plugin';
+import { ErrorBoundary } from '../SurfacePlugin';
 
 export type BootstrapPluginsParams = {
   order: PluginDefinition['meta'][];
   plugins: Record<string, () => Promise<PluginDefinition>>;
   core?: string[];
   defaults?: string[];
-  fallback?: ReactNode;
+  fallback?: ErrorBoundary['props']['fallback'];
+  placeholder?: ReactNode;
 };
 
 export type PluginHostProvides = {
@@ -36,7 +38,8 @@ export const PluginHost = ({
   plugins: definitions,
   core = [],
   defaults = [],
-  fallback = null,
+  fallback = DefaultFallback,
+  placeholder = null,
 }: BootstrapPluginsParams): PluginDefinition<PluginHostProvides> => {
   const state = new LocalStorageStore<PluginContext>(PLUGIN_HOST, {
     ready: false,
@@ -63,65 +66,97 @@ export const PluginHost = ({
       plugins: state.values,
       context: ({ children }) => <PluginProvider value={state.values}>{children}</PluginProvider>,
       root: () => {
-        useEffect(() => {
-          log('initializing plugins', { enabled: state.values.enabled });
-          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])
-                // If local storage indicates a plugin is enabled, but it is not available, ignore it.
-                .filter((definition): definition is () => Promise<PluginDefinition> => 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 undefined;
-                });
-                return plugin;
-              }),
-            ).then((plugins) => plugins.filter((plugin): plugin is Plugin => Boolean(plugin)));
-            log('plugins initialized', { plugins });
-
-            await Promise.all(
-              enabled.map(async (pluginDefinition) => {
-                await pluginDefinition.ready?.(plugins);
-              }),
-            );
-            log('plugins ready', { plugins });
-
-            state.values.plugins = shallow(plugins);
-            state.values.ready = true;
-          });
-
-          return () => {
-            clearTimeout(timeout);
-            state.values.ready = false;
-            // TODO(wittjosiah): Does this ever need to be called prior to having dynamic plugins?
-            // void Promise.all(enabled.map((definition) => definition.unload?.()));
-          };
-        }, []);
-
-        if (!state.values.ready) {
-          return <>{fallback}</>;
-        }
-
-        const ComposedContext = composeContext(state.values.plugins);
-
-        return <ComposedContext>{rootComponents(state.values.plugins)}</ComposedContext>;
+        return (
+          <ErrorBoundary fallback={fallback}>
+            <Root order={order} core={core} definitions={definitions} state={state.values} placeholder={placeholder} />
+          </ErrorBoundary>
+        );
       },
     },
   };
 };
 
+const DefaultFallback = ({ error }: { error: Error }) => {
+  return (
+    <div style={{ padding: '1rem' }}>
+      {/* TODO(wittjosiah): Link to docs for replacing default. */}
+      <h1 style={{ fontSize: '1.2rem', fontWeight: 700, margin: '0.5rem 0' }}>{error.message}</h1>
+      <pre>{error.stack}</pre>
+    </div>
+  );
+};
+
+type RootProps = {
+  order: PluginDefinition['meta'][];
+  state: PluginContext;
+  definitions: Record<string, () => Promise<PluginDefinition>>;
+  core: string[];
+  placeholder: ReactNode;
+};
+
+const Root = ({ order, core: corePluginIds, definitions, state, placeholder }: RootProps) => {
+  const [error, setError] = useState<unknown>();
+
+  useEffect(() => {
+    log('initializing plugins', { enabled: state.enabled });
+    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])
+            // If local storage indicates a plugin is enabled, but it is not available, ignore it.
+            .filter((definition): definition is () => Promise<PluginDefinition> => 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 undefined;
+            });
+            return plugin;
+          }),
+        ).then((plugins) => plugins.filter((plugin): plugin is Plugin => Boolean(plugin)));
+        log('plugins initialized', { plugins });
+
+        await Promise.all(enabled.map((pluginDefinition) => pluginDefinition.ready?.(plugins)));
+        log('plugins ready', { plugins });
+
+        state.plugins = shallow(plugins);
+        state.ready = true;
+      } catch (err) {
+        setError(err);
+      }
+    });
+
+    return () => {
+      clearTimeout(timeout);
+      state.ready = false;
+      // TODO(wittjosiah): Does this ever need to be called prior to having dynamic plugins?
+      // void Promise.all(enabled.map((definition) => definition.unload?.()));
+    };
+  }, []);
+
+  if (error) {
+    throw error;
+  }
+
+  if (!state.ready) {
+    return <>{placeholder}</>;
+  }
+
+  const ComposedContext = composeContext(state.plugins);
+
+  return <ComposedContext>{rootComponents(state.plugins)}</ComposedContext>;
+};
+
 /**
  * Resolve a `PluginDefinition` into a fully initialized `Plugin`.
  */

package/src/plugins/PluginHost/plugin.ts

@@ -91,7 +91,7 @@ export type PluginDefinition<TProvides = {}, TInitializeProvides = {}> = Omit<Pl
    *
    * @return Capabilities provided by the plugin which are merged with base capabilities.
    */
-  initialize?: () => Promise<PluginProvides<TInitializeProvides>>;
+  initialize?: () => Promise<PluginProvides<TInitializeProvides> | void>;
 
   /**
    * Called once all plugins have been initialized.
@@ -99,6 +99,7 @@ export type PluginDefinition<TProvides = {}, TInitializeProvides = {}> = Omit<Pl
    *
    * @param plugins All plugins which successfully initialized.
    */
+  // TODO(wittjosiah): Rename `ready` to a verb?
   ready?: (plugins: Plugin[]) => Promise<void>;
 
   /**

package/src/plugins/SurfacePlugin/Surface.tsx

@@ -4,12 +4,12 @@
 
 import React, {
   forwardRef,
-  type FC,
   type ReactNode,
   Fragment,
   type ForwardedRef,
   type PropsWithChildren,
   isValidElement,
+  Suspense,
 } from 'react';
 import { createContext, useContext } from 'react';
 
@@ -50,11 +50,10 @@ export type SurfaceProps = PropsWithChildren<{
   fallback?: ErrorBoundary['props']['fallback'];
 
   /**
-   * If specified, this will render if no plugin can offer renderable content for the surface.
-   *
-   * @deprecated Provide a component with `disposition: 'fallback'` instead.
+   * If specified, the Surface will be wrapped in a suspense boundary.
+   * The placeholder component will be rendered while the surface component is loading.
    */
-  contentFallback?: FC<{}>;
+  placeholder?: ReactNode;
 
   /**
    * If more than one component is resolved, the limit determines how many are rendered.
@@ -78,21 +77,20 @@ export type SurfaceProps = PropsWithChildren<{
  * A surface is a named region of the screen that can be populated by plugins.
  */
 export const Surface = forwardRef<HTMLElement, SurfaceProps>(
-  ({ role, name = role, fallback, ...rest }, forwardedRef) => {
+  ({ role, name = role, fallback, placeholder, ...rest }, forwardedRef) => {
     const props = { role, name, fallback, ...rest };
     const context = useContext(SurfaceContext);
     const data = props.data ?? ((name && context?.surfaces?.[name]?.data) || {});
 
-    return (
-      <>
-        {fallback ? (
-          <ErrorBoundary data={data} fallback={fallback}>
-            <SurfaceResolver {...props} ref={forwardedRef} />
-          </ErrorBoundary>
-        ) : (
-          <SurfaceResolver {...props} ref={forwardedRef} />
-        )}
-      </>
+    const resolver = <SurfaceResolver {...props} ref={forwardedRef} />;
+    const suspense = placeholder ? <Suspense fallback={placeholder}>{resolver}</Suspense> : resolver;
+
+    return fallback ? (
+      <ErrorBoundary data={data} fallback={fallback}>
+        {suspense}
+      </ErrorBoundary>
+    ) : (
+      suspense
     );
   },
 );
@@ -111,11 +109,7 @@ const SurfaceResolver = forwardRef<HTMLElement, SurfaceProps>((props, forwardedR
     },
   };
 
-  return (
-    <SurfaceContext.Provider value={currentContext}>
-      {nodes.length > 0 ? nodes : props.contentFallback ? <props.contentFallback /> : null}
-    </SurfaceContext.Provider>
-  );
+  return <SurfaceContext.Provider value={currentContext}>{nodes}</SurfaceContext.Provider>;
 });
 
 const resolveNodes = (