@dxos/app-framework 0.8.2-main.12df754 → 0.8.2-main.30e4dbb

package/src/plugin-intent/intent.ts

@@ -2,20 +2,24 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 
 export type IntentParams = {
-  readonly input: S.Schema.All;
-  readonly output: S.Schema.All;
+  readonly input: Schema.Schema.All;
+  readonly output: Schema.Schema.All;
 };
 
 export type IntentData<Fields extends IntentParams> =
-  S.Schema.Type<S.Struct<Fields>> extends { readonly input: any } ? S.Schema.Type<S.Struct<Fields>>['input'] : any;
+  Schema.Schema.Type<Schema.Struct<Fields>> extends { readonly input: any }
+    ? Schema.Schema.Type<Schema.Struct<Fields>>['input']
+    : any;
 
 export type IntentResultData<Fields extends IntentParams> =
-  S.Schema.Type<S.Struct<Fields>> extends { readonly output: any } ? S.Schema.Type<S.Struct<Fields>>['output'] : any;
+  Schema.Schema.Type<Schema.Struct<Fields>> extends { readonly output: any }
+    ? Schema.Schema.Type<Schema.Struct<Fields>>['output']
+    : any;
 
-export type IntentSchema<Tag extends string, Fields extends IntentParams> = S.TaggedClass<any, Tag, Fields>;
+export type IntentSchema<Tag extends string, Fields extends IntentParams> = Schema.TaggedClass<any, Tag, Fields>;
 
 /**
  * An intent is an abstract description of an operation to be performed.
@@ -80,7 +84,7 @@ export const createIntent = <Tag extends string, Fields extends IntentParams>(
 ): IntentChain<Tag, Tag, Fields, Fields> => {
   // The output of validateSync breaks proxy objects so this is just used for validation.
   // TODO(wittjosiah): Is there a better way to make theses types align?
-  const _ = S.validateSync(schema.fields.input as S.Schema<any, any, unknown>)(data);
+  const _ = Schema.validateSync(schema.fields.input as Schema.Schema<any, any, unknown>)(data);
   const intent = {
     ...params,
     _schema: schema,
@@ -139,8 +143,13 @@ export const chain =
 
 // NOTE: Should maintain compatibility with `i18next` (and @dxos/react-ui).
 // TODO(wittjosiah): Making this immutable breaks type compatibility.
-export const Label = S.Union(
-  S.String,
-  S.mutable(S.Tuple(S.String, S.mutable(S.Struct({ ns: S.String, count: S.optional(S.Number) })))),
+export const Label = Schema.Union(
+  Schema.String,
+  Schema.mutable(
+    Schema.Tuple(
+      Schema.String,
+      Schema.mutable(Schema.Struct({ ns: Schema.String, count: Schema.optional(Schema.Number) })),
+    ),
+  ),
 );
-export type Label = S.Schema.Type<typeof Label>;
+export type Label = Schema.Schema.Type<typeof Label>;

package/src/plugin-settings/actions.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 
 export const SETTINGS_PLUGIN = 'dxos.org/plugin/settings';
 export const SETTINGS_ACTION = `${SETTINGS_PLUGIN}/action`;
@@ -12,18 +12,18 @@ export const SETTINGS_ID = '!dxos:settings';
 export const SETTINGS_KEY = 'settings';
 
 export namespace SettingsAction {
-  export class Open extends S.TaggedClass<Open>()(`${SETTINGS_ACTION}/open`, {
-    input: S.Struct({
-      plugin: S.optional(S.String),
+  export class Open extends Schema.TaggedClass<Open>()(`${SETTINGS_ACTION}/open`, {
+    input: Schema.Struct({
+      plugin: Schema.optional(Schema.String),
     }),
-    output: S.Void,
+    output: Schema.Void,
   }) {}
 
-  export class OpenPluginRegistry extends S.TaggedClass<OpenPluginRegistry>()(
+  export class OpenPluginRegistry extends Schema.TaggedClass<OpenPluginRegistry>()(
     `${SETTINGS_ACTION}/open-plugin-registry`,
     {
-      input: S.Void,
-      output: S.Void,
+      input: Schema.Void,
+      output: Schema.Void,
     },
   ) {}
 }

package/src/plugin-settings/app-graph-builder.ts

@@ -26,6 +26,7 @@ export default (context: PluginsContext) =>
           properties: {
             label: ['open settings label', { ns: SETTINGS_PLUGIN }],
             icon: 'ph--gear--regular',
+            disposition: 'menu',
             keyBinding: {
               macos: 'meta+,',
               windows: 'alt+,',
@@ -81,11 +82,12 @@ export default (context: PluginsContext) =>
 
           {
             id: `${SETTINGS_KEY}:custom-plugins`,
-            type: 'collection',
+            type: 'category',
             properties: {
               label: ['custom plugins label', { ns: SETTINGS_PLUGIN }],
               icon: 'ph--squares-four--regular',
               role: 'branch',
+              disposition: 'collection',
             },
           },
         ];

package/src/react/Surface.stories.tsx

@@ -87,7 +87,7 @@ export default {
     );
   },
   // NOTE: Intentionally not using withPluginManager to try to reduce surface area of the story.
-  decorators: [withTheme, withLayout({ tooltips: true })],
+  decorators: [withTheme, withLayout()],
   args: {
     manager: setupPluginManager(),
   },

package/src/testing/withPluginManager.stories.tsx

@@ -1,6 +1,5 @@
 //
 // Copyright 2025 DXOS.org
-
 //
 
 import React from 'react';

package/src/testing/withPluginManager.tsx

@@ -16,8 +16,16 @@ import {
   defineModule,
   definePlugin,
   PluginManager,
+  type PluginsContext,
 } from '../core';
 
+// TODO(burdon): Factor out (use consistently in plugin framework?)
+export type Provider<C, R> = (context: C) => R;
+export type ProviderOrValue<C, R> = Provider<C, R> | R;
+export const getValue = <C, R>(providerOrValue: ProviderOrValue<C, R>, context: C): R => {
+  return typeof providerOrValue === 'function' ? (providerOrValue as Provider<C, R>)(context) : providerOrValue;
+};
+
 /**
  * @internal
  */
@@ -26,7 +34,7 @@ export const setupPluginManager = ({
   plugins = [],
   core = plugins.map(({ meta }) => meta.id),
   ...options
-}: CreateAppOptions & { capabilities?: AnyCapability[] } = {}) => {
+}: CreateAppOptions & Pick<WithPluginManagerOptions, 'capabilities'> = {}) => {
   const pluginManager = new PluginManager({
     pluginLoader: () => raise(new Error('Not implemented')),
     plugins: [StoryPlugin(), ...plugins],
@@ -35,7 +43,7 @@ export const setupPluginManager = ({
   });
 
   if (capabilities) {
-    capabilities.forEach((capability) => {
+    getValue(capabilities, pluginManager.context).forEach((capability) => {
       pluginManager.context.contributeCapability({
         interface: capability.interface,
         implementation: capability.implementation,
@@ -48,7 +56,7 @@ export const setupPluginManager = ({
 };
 
 export type WithPluginManagerOptions = CreateAppOptions & {
-  capabilities?: AnyCapability[];
+  capabilities?: ProviderOrValue<PluginsContext, AnyCapability[]>;
   fireEvents?: (ActivationEvent | string)[];
 };