@dxos/app-framework 0.3.11-main.f5e7551 → 0.3.11-next.0fb359e

package/package.json

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

package/src/plugins/IntentPlugin/IntentContext.tsx

@@ -3,15 +3,39 @@
 //
 
 import { type Context, createContext, useContext, type Provider } from 'react';
+import { useEffect } from 'react';
 
-import { type DispatchIntent } from './intent';
+import { type UnsubscribeCallback } from '@dxos/async';
+
+import { type IntentDispatcher, type IntentResolver } from './intent';
 
 export type IntentContext = {
-  dispatch: DispatchIntent;
+  dispatch: IntentDispatcher;
+  registerResolver: (pluginId: string, resolver: IntentResolver) => UnsubscribeCallback;
 };
 
-const IntentContext: Context<IntentContext> = createContext<IntentContext>({ dispatch: async () => {} });
+const IntentContext: Context<IntentContext> = createContext<IntentContext>({
+  dispatch: async () => {},
+  registerResolver: () => () => {},
+});
 
+/**
+ * @deprecated
+ * TODO(burdon): Use useIntentDispatcher.
+ */
 export const useIntent = () => useContext(IntentContext);
 
+// TODO(burdon): Dispatch or Dispatcher?
+export const useIntentDispatcher = (): IntentDispatcher => {
+  const { dispatch } = useIntent();
+  return dispatch;
+};
+
+export const useIntentResolver = (plugin: string, resolver: IntentResolver) => {
+  const { registerResolver } = useIntent();
+  useEffect(() => {
+    return registerResolver(plugin, resolver);
+  }, [plugin, resolver]);
+};
+
 export const IntentProvider: Provider<IntentContext> = IntentContext.Provider;

package/src/plugins/IntentPlugin/intent.ts

@@ -2,6 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
+import type { Plugin } from '../PluginHost';
+
 /**
  * An intent is an abstract description of an operation to be performed.
  * Intents allow actions to be performed across plugins.
@@ -31,4 +33,6 @@ export type Intent = {
  *
  * @returns The result of the last intent.
  */
-export type DispatchIntent = (intent: Intent | Intent[]) => Promise<any>;
+export type IntentDispatcher = (intent: Intent | Intent[]) => Promise<any>;
+
+export type IntentResolver = (intent: Intent, plugins: Plugin[]) => any;

package/src/plugins/IntentPlugin/plugin.tsx

@@ -6,7 +6,7 @@ import { deepSignal } from 'deepsignal/react';
 import React from 'react';
 
 import { type IntentContext, IntentProvider } from './IntentContext';
-import type { Intent } from './intent';
+import type { Intent, IntentResolver } from './intent';
 import IntentMeta from './meta';
 import { type IntentPluginProvides, type IntentResolverProvides, parseIntentResolverPlugin } from './provides';
 import type { PluginDefinition } from '../PluginHost';
@@ -17,7 +17,9 @@ import { filterPlugins, findPlugin } from '../helpers';
  * Inspired by https://developer.android.com/reference/android/content/Intent.
  */
 const IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {
-  const state = deepSignal<IntentContext>({ dispatch: async () => {} });
+  const state = deepSignal<IntentContext>({ dispatch: async () => {}, registerResolver: () => () => {} });
+
+  const dynamicResolvers = new Set<{ plugin: string; resolver: IntentResolver }>();
 
   return {
     meta: IntentMeta,
@@ -25,10 +27,26 @@ const IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {
       // Dispatch intent to associated plugin.
       const dispatch = async (intent: Intent) => {
         if (intent.plugin) {
+          for (const entry of dynamicResolvers) {
+            if (entry.plugin === intent.plugin) {
+              const result = entry.resolver(intent, plugins);
+              if (result) {
+                return result;
+              }
+            }
+          }
+
           const plugin = findPlugin<IntentResolverProvides>(plugins, intent.plugin);
           return plugin?.provides.intent.resolver(intent, plugins);
         }
 
+        for (const entry of dynamicResolvers) {
+          const result = entry.resolver(intent, plugins);
+          if (result) {
+            return result;
+          }
+        }
+
         // Return resolved value from first plugin that handles the intent.
         for (const plugin of filterPlugins(plugins, parseIntentResolverPlugin)) {
           const result = await plugin.provides.intent.resolver(intent, plugins);
@@ -47,6 +65,12 @@ const IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {
         }
         return result;
       };
+
+      state.registerResolver = (plugin, resolver) => {
+        const entry = { plugin, resolver };
+        dynamicResolvers.add(entry);
+        return () => dynamicResolvers.delete(entry);
+      };
     },
     provides: {
       intent: state,

package/src/plugins/IntentPlugin/provides.ts

@@ -3,12 +3,12 @@
 //
 
 import { type IntentContext } from './IntentContext';
-import { type Intent } from './intent';
+import { type IntentResolver } from './intent';
 import { type Plugin } from '../PluginHost';
 
 export type IntentResolverProvides = {
   intent: {
-    resolver: (intent: Intent, plugins: Plugin[]) => any;
+    resolver: IntentResolver;
   };
 };
 

package/src/plugins/common/layout.ts

@@ -65,6 +65,7 @@ export enum LayoutAction {
   OPEN_POPOVER = `${LAYOUT_ACTION}/open-popover`,
   CLOSE_POPOVER = `${LAYOUT_ACTION}/close-popover`,
   ACTIVATE = `${LAYOUT_ACTION}/activate`,
+  FOCUS = `${LAYOUT_ACTION}/focus`,
 }
 
 /**

package/dist/lib/browser/chunk-C2K6M6WC.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/plugins/IntentPlugin/provides.ts", "../../../src/plugins/IntentPlugin/IntentContext.tsx", "../../../src/plugins/IntentPlugin/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type IntentContext } from './IntentContext';\nimport { type Intent } from './intent';\nimport { type Plugin } from '../PluginHost';\n\nexport type IntentResolverProvides = {\n  intent: {\n    resolver: (intent: Intent, plugins: Plugin[]) => any;\n  };\n};\n\nexport type IntentPluginProvides = {\n  intent: IntentContext;\n};\n\nexport const parseIntentPlugin = (plugin: Plugin) =>\n  (plugin.provides as any).intent?.dispatch ? (plugin as Plugin<IntentPluginProvides>) : undefined;\n\nexport const parseIntentResolverPlugin = (plugin: Plugin) =>\n  (plugin.provides as any).intent?.resolver ? (plugin as Plugin<IntentResolverProvides>) : undefined;\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { type Context, createContext, useContext, type Provider } from 'react';\n\nimport { type DispatchIntent } from './intent';\n\nexport type IntentContext = {\n  dispatch: DispatchIntent;\n};\n\nconst IntentContext: Context<IntentContext> = createContext<IntentContext>({ dispatch: async () => {} });\n\nexport const useIntent = () => useContext(IntentContext);\n\nexport const IntentProvider: Provider<IntentContext> = IntentContext.Provider;\n", "//\n// Copyright 2023 DXOS.org\n//\n\nconst IntentMeta = {\n  id: 'dxos.org/plugin/intent',\n};\n\nexport default IntentMeta;\n"],
-  "mappings": ";AAkBO,IAAMA,oBAAoB,CAACC,WAC/BA,OAAOC,SAAiBC,QAAQC,WAAYH,SAA0CI;AAElF,IAAMC,4BAA4B,CAACL,WACvCA,OAAOC,SAAiBC,QAAQI,WAAYN,SAA4CI;;;AClB3F,SAAuBG,eAAeC,kBAAiC;AAQvE,IAAMC,gBAAwCC,8BAA6B;EAAEC,UAAU,YAAA;EAAa;AAAE,CAAA;AAE/F,IAAMC,YAAY,MAAMC,WAAWJ,aAAAA;AAEnC,IAAMK,iBAA0CL,cAAcM;;;ACZrE,IAAMC,aAAa;EACjBC,IAAI;AACN;AAEA,IAAA,eAAeD;",
-  "names": ["parseIntentPlugin", "plugin", "provides", "intent", "dispatch", "undefined", "parseIntentResolverPlugin", "resolver", "createContext", "useContext", "IntentContext", "createContext", "dispatch", "useIntent", "useContext", "IntentProvider", "Provider", "IntentMeta", "id"]
-}

package/dist/lib/browser/plugin-CBPJO5NB.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/plugins/IntentPlugin/plugin.tsx"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { deepSignal } from 'deepsignal/react';\nimport React from 'react';\n\nimport { type IntentContext, IntentProvider } from './IntentContext';\nimport type { Intent } from './intent';\nimport IntentMeta from './meta';\nimport { type IntentPluginProvides, type IntentResolverProvides, parseIntentResolverPlugin } from './provides';\nimport type { PluginDefinition } from '../PluginHost';\nimport { filterPlugins, findPlugin } from '../helpers';\n\n/**\n * Allows plugins to register intent handlers and routes sent intents to the appropriate plugin.\n * Inspired by https://developer.android.com/reference/android/content/Intent.\n */\nconst IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {\n  const state = deepSignal<IntentContext>({ dispatch: async () => {} });\n\n  return {\n    meta: IntentMeta,\n    ready: async (plugins) => {\n      // Dispatch intent to associated plugin.\n      const dispatch = async (intent: Intent) => {\n        if (intent.plugin) {\n          const plugin = findPlugin<IntentResolverProvides>(plugins, intent.plugin);\n          return plugin?.provides.intent.resolver(intent, plugins);\n        }\n\n        // Return resolved value from first plugin that handles the intent.\n        for (const plugin of filterPlugins(plugins, parseIntentResolverPlugin)) {\n          const result = await plugin.provides.intent.resolver(intent, plugins);\n          if (result) {\n            return result;\n          }\n        }\n      };\n\n      // Sequentially dispatch array of invents.\n      state.dispatch = async (intentOrArray) => {\n        let result: any = null;\n        for (const intent of Array.isArray(intentOrArray) ? intentOrArray : [intentOrArray]) {\n          const data = intent.data ? { ...result, ...intent.data } : result;\n          result = await dispatch({ ...intent, data });\n        }\n        return result;\n      };\n    },\n    provides: {\n      intent: state,\n      context: ({ children }) => <IntentProvider value={state}>{children}</IntentProvider>,\n    },\n  };\n};\n\nexport default IntentPlugin;\n"],
-  "mappings": ";;;;;;;;;;;AAIA,SAASA,kBAAkB;AAC3B,OAAOC,WAAW;AAalB,IAAMC,eAAe,MAAA;AACnB,QAAMC,QAAQC,WAA0B;IAAEC,UAAU,YAAA;IAAa;EAAE,CAAA;AAEnE,SAAO;IACLC,MAAMC;IACNC,OAAO,OAAOC,YAAAA;AAEZ,YAAMJ,WAAW,OAAOK,WAAAA;AACtB,YAAIA,OAAOC,QAAQ;AACjB,gBAAMA,SAASC,WAAmCH,SAASC,OAAOC,MAAM;AACxE,iBAAOA,QAAQE,SAASH,OAAOI,SAASJ,QAAQD,OAAAA;QAClD;AAGA,mBAAWE,UAAUI,cAAcN,SAASO,yBAAAA,GAA4B;AACtE,gBAAMC,SAAS,MAAMN,OAAOE,SAASH,OAAOI,SAASJ,QAAQD,OAAAA;AAC7D,cAAIQ,QAAQ;AACV,mBAAOA;UACT;QACF;MACF;AAGAd,YAAME,WAAW,OAAOa,kBAAAA;AACtB,YAAID,SAAc;AAClB,mBAAWP,UAAUS,MAAMC,QAAQF,aAAAA,IAAiBA,gBAAgB;UAACA;WAAgB;AACnF,gBAAMG,OAAOX,OAAOW,OAAO;YAAE,GAAGJ;YAAQ,GAAGP,OAAOW;UAAK,IAAIJ;AAC3DA,mBAAS,MAAMZ,SAAS;YAAE,GAAGK;YAAQW;UAAK,CAAA;QAC5C;AACA,eAAOJ;MACT;IACF;IACAJ,UAAU;MACRH,QAAQP;MACRmB,SAAS,CAAC,EAAEC,SAAQ,MAAO,sBAAA,cAACC,gBAAAA;QAAeC,OAAOtB;SAAQoB,QAAAA;IAC5D;EACF;AACF;AAEA,IAAA,iBAAerB;",
-  "names": ["deepSignal", "React", "IntentPlugin", "state", "deepSignal", "dispatch", "meta", "IntentMeta", "ready", "plugins", "intent", "plugin", "findPlugin", "provides", "resolver", "filterPlugins", "parseIntentResolverPlugin", "result", "intentOrArray", "Array", "isArray", "data", "context", "children", "IntentProvider", "value"]
-}

package/dist/lib/node/chunk-BOQBLWMX.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/plugins/IntentPlugin/provides.ts", "../../../src/plugins/IntentPlugin/IntentContext.tsx", "../../../src/plugins/IntentPlugin/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { type IntentContext } from './IntentContext';\nimport { type Intent } from './intent';\nimport { type Plugin } from '../PluginHost';\n\nexport type IntentResolverProvides = {\n  intent: {\n    resolver: (intent: Intent, plugins: Plugin[]) => any;\n  };\n};\n\nexport type IntentPluginProvides = {\n  intent: IntentContext;\n};\n\nexport const parseIntentPlugin = (plugin: Plugin) =>\n  (plugin.provides as any).intent?.dispatch ? (plugin as Plugin<IntentPluginProvides>) : undefined;\n\nexport const parseIntentResolverPlugin = (plugin: Plugin) =>\n  (plugin.provides as any).intent?.resolver ? (plugin as Plugin<IntentResolverProvides>) : undefined;\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { type Context, createContext, useContext, type Provider } from 'react';\n\nimport { type DispatchIntent } from './intent';\n\nexport type IntentContext = {\n  dispatch: DispatchIntent;\n};\n\nconst IntentContext: Context<IntentContext> = createContext<IntentContext>({ dispatch: async () => {} });\n\nexport const useIntent = () => useContext(IntentContext);\n\nexport const IntentProvider: Provider<IntentContext> = IntentContext.Provider;\n", "//\n// Copyright 2023 DXOS.org\n//\n\nconst IntentMeta = {\n  id: 'dxos.org/plugin/intent',\n};\n\nexport default IntentMeta;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;ACIA,mBAAuE;ADchE,IAAMA,oBAAoB,CAACC,WAC/BA,OAAOC,SAAiBC,QAAQC,WAAYH,SAA0CI;AAElF,IAAMC,4BAA4B,CAACL,WACvCA,OAAOC,SAAiBC,QAAQI,WAAYN,SAA4CI;ACV3F,IAAMG,gBAAwCC,gDAA6B;EAAEL,UAAU,YAAA;EAAa;AAAE,CAAA;AAE/F,IAAMM,YAAY,UAAMC,yBAAWH,aAAAA;AAEnC,IAAMI,iBAA0CJ,cAAcK;ACZrE,IAAMC,aAAa;EACjBC,IAAI;AACN;AAEA,IAAA,eAAeD;",
-  "names": ["parseIntentPlugin", "plugin", "provides", "intent", "dispatch", "undefined", "parseIntentResolverPlugin", "resolver", "IntentContext", "createContext", "useIntent", "useContext", "IntentProvider", "Provider", "IntentMeta", "id"]
-}

package/dist/lib/node/plugin-WDNRX2SR.cjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/plugins/IntentPlugin/plugin.tsx"],
-  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { deepSignal } from 'deepsignal/react';\nimport React from 'react';\n\nimport { type IntentContext, IntentProvider } from './IntentContext';\nimport type { Intent } from './intent';\nimport IntentMeta from './meta';\nimport { type IntentPluginProvides, type IntentResolverProvides, parseIntentResolverPlugin } from './provides';\nimport type { PluginDefinition } from '../PluginHost';\nimport { filterPlugins, findPlugin } from '../helpers';\n\n/**\n * Allows plugins to register intent handlers and routes sent intents to the appropriate plugin.\n * Inspired by https://developer.android.com/reference/android/content/Intent.\n */\nconst IntentPlugin = (): PluginDefinition<IntentPluginProvides> => {\n  const state = deepSignal<IntentContext>({ dispatch: async () => {} });\n\n  return {\n    meta: IntentMeta,\n    ready: async (plugins) => {\n      // Dispatch intent to associated plugin.\n      const dispatch = async (intent: Intent) => {\n        if (intent.plugin) {\n          const plugin = findPlugin<IntentResolverProvides>(plugins, intent.plugin);\n          return plugin?.provides.intent.resolver(intent, plugins);\n        }\n\n        // Return resolved value from first plugin that handles the intent.\n        for (const plugin of filterPlugins(plugins, parseIntentResolverPlugin)) {\n          const result = await plugin.provides.intent.resolver(intent, plugins);\n          if (result) {\n            return result;\n          }\n        }\n      };\n\n      // Sequentially dispatch array of invents.\n      state.dispatch = async (intentOrArray) => {\n        let result: any = null;\n        for (const intent of Array.isArray(intentOrArray) ? intentOrArray : [intentOrArray]) {\n          const data = intent.data ? { ...result, ...intent.data } : result;\n          result = await dispatch({ ...intent, data });\n        }\n        return result;\n      };\n    },\n    provides: {\n      intent: state,\n      context: ({ children }) => <IntentProvider value={state}>{children}</IntentProvider>,\n    },\n  };\n};\n\nexport default IntentPlugin;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,mBAA2B;AAC3B,IAAAA,gBAAkB;AAalB,IAAMC,eAAe,MAAA;AACnB,QAAMC,YAAQC,yBAA0B;IAAEC,UAAU,YAAA;IAAa;EAAE,CAAA;AAEnE,SAAO;IACLC,MAAMC;IACNC,OAAO,OAAOC,YAAAA;AAEZ,YAAMJ,WAAW,OAAOK,WAAAA;AACtB,YAAIA,OAAOC,QAAQ;AACjB,gBAAMA,aAASC,kCAAmCH,SAASC,OAAOC,MAAM;AACxE,iBAAOA,QAAQE,SAASH,OAAOI,SAASJ,QAAQD,OAAAA;QAClD;AAGA,mBAAWE,cAAUI,qCAAcN,SAASO,+CAAAA,GAA4B;AACtE,gBAAMC,SAAS,MAAMN,OAAOE,SAASH,OAAOI,SAASJ,QAAQD,OAAAA;AAC7D,cAAIQ,QAAQ;AACV,mBAAOA;UACT;QACF;MACF;AAGAd,YAAME,WAAW,OAAOa,kBAAAA;AACtB,YAAID,SAAc;AAClB,mBAAWP,UAAUS,MAAMC,QAAQF,aAAAA,IAAiBA,gBAAgB;UAACA;WAAgB;AACnF,gBAAMG,OAAOX,OAAOW,OAAO;YAAE,GAAGJ;YAAQ,GAAGP,OAAOW;UAAK,IAAIJ;AAC3DA,mBAAS,MAAMZ,SAAS;YAAE,GAAGK;YAAQW;UAAK,CAAA;QAC5C;AACA,eAAOJ;MACT;IACF;IACAJ,UAAU;MACRH,QAAQP;MACRmB,SAAS,CAAC,EAAEC,SAAQ,MAAO,8BAAAC,QAAA,cAACC,sCAAAA;QAAeC,OAAOvB;SAAQoB,QAAAA;IAC5D;EACF;AACF;AAEA,IAAA,iBAAerB;",
-  "names": ["import_react", "IntentPlugin", "state", "deepSignal", "dispatch", "meta", "IntentMeta", "ready", "plugins", "intent", "plugin", "findPlugin", "provides", "resolver", "filterPlugins", "parseIntentResolverPlugin", "result", "intentOrArray", "Array", "isArray", "data", "context", "children", "React", "IntentProvider", "value"]
-}