@dxos/app-framework 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

package/dist/lib/node/{chunk-I3CJYEBC.cjs → chunk-2EBZ2ICH.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_I3CJYEBC_exports = {};
-__export(chunk_I3CJYEBC_exports, {
+var chunk_2EBZ2ICH_exports = {};
+__export(chunk_2EBZ2ICH_exports, {
   Capabilities: () => Capabilities,
   CollaborationActions: () => CollaborationActions,
   Events: () => Events,
@@ -41,9 +41,9 @@ __export(chunk_I3CJYEBC_exports, {
   Label: () => Label,
   LayoutAction: () => LayoutAction,
   Plugin: () => Plugin,
+  PluginContext: () => PluginContext,
   PluginManager: () => PluginManager,
   PluginModule: () => PluginModule,
-  PluginsContext: () => PluginsContext,
   Resource: () => Resource,
   ResourceKey: () => ResourceKey,
   ResourceLanguage: () => ResourceLanguage,
@@ -67,26 +67,27 @@ __export(chunk_I3CJYEBC_exports, {
   lazy: () => lazy,
   oneOf: () => oneOf
 });
-module.exports = __toCommonJS(chunk_I3CJYEBC_exports);
+module.exports = __toCommonJS(chunk_2EBZ2ICH_exports);
 var import_effect = require("effect");
 var import_live_object = require("@dxos/live-object");
 var import_log = require("@dxos/log");
 var import_util = require("@dxos/util");
 var import_effect2 = require("effect");
 var import_effect3 = require("effect");
-var import_signals_core = require("@preact/signals-core");
+var import_rx_react = require("@effect-rx/rx-react");
 var import_effect4 = require("effect");
 var import_async = require("@dxos/async");
 var import_invariant = require("@dxos/invariant");
-var import_live_object2 = require("@dxos/live-object");
 var import_log2 = require("@dxos/log");
-var import_signals_core2 = require("@preact/signals-core");
+var import_rx_react2 = require("@effect-rx/rx-react");
+var import_signals_core = require("@preact/signals-core");
 var import_effect5 = require("effect");
 var import_async2 = require("@dxos/async");
-var import_live_object3 = require("@dxos/live-object");
+var import_live_object2 = require("@dxos/live-object");
 var import_log3 = require("@dxos/log");
 var import_effect6 = require("effect");
 var import_echo_schema = require("@dxos/echo-schema");
+var import_keys = require("@dxos/keys");
 var import_effect7 = require("effect");
 var import_effect8 = require("effect");
 var import_effect9 = require("effect");
@@ -199,9 +200,33 @@ var lazy = (c) => async (props) => {
   const { default: getCapability } = await c();
   return async () => getCapability(props);
 };
-var PluginsContext = class {
-  constructor({ activate, reset }) {
-    this._definedCapabilities = /* @__PURE__ */ new Map();
+var PluginContext = class {
+  constructor({ registry, activate, reset }) {
+    this._capabilityImpls = import_rx_react.Rx.family(() => {
+      return import_rx_react.Rx.make([]).pipe(import_rx_react.Rx.keepAlive);
+    });
+    this._capabilities = import_rx_react.Rx.family((id) => {
+      return import_rx_react.Rx.make((get) => {
+        const current = get(this._capabilityImpls(id));
+        return current.map((c) => c.implementation);
+      });
+    });
+    this._capability = import_rx_react.Rx.family((id) => {
+      return import_rx_react.Rx.make((get) => {
+        const current = get(this._capabilities(id));
+        (0, import_invariant.invariant)(current.length > 0, `No capability found for ${id}`, {
+          F: __dxlog_file,
+          L: 117,
+          S: this,
+          A: [
+            "current.length > 0",
+            "`No capability found for ${id}`"
+          ]
+        });
+        return current[0];
+      });
+    });
+    this._registry = registry;
     this.activate = activate;
     this.reset = reset;
   }
@@ -209,22 +234,22 @@ var PluginsContext = class {
   * @internal
   */
   contributeCapability({ module: moduleId, interface: interfaceDef, implementation }) {
-    let current = this._definedCapabilities.get(interfaceDef.identifier);
-    if (!current) {
-      const object = (0, import_live_object2.live)({
-        value: []
-      });
-      current = (0, import_signals_core.untracked)(() => object.value);
-      this._definedCapabilities.set(interfaceDef.identifier, current);
+    const current = this._registry.get(this._capabilityImpls(interfaceDef.identifier));
+    const capability = new CapabilityImpl(moduleId, implementation);
+    if (current.includes(capability)) {
+      return;
     }
-    current.push(new CapabilityImpl(moduleId, implementation));
+    this._registry.set(this._capabilityImpls(interfaceDef.identifier), [
+      ...current,
+      capability
+    ]);
     (0, import_log2.log)("capability contributed", {
       id: interfaceDef.identifier,
       moduleId,
-      count: (0, import_signals_core.untracked)(() => current.length)
+      count: current.length
     }, {
       F: __dxlog_file,
-      L: 146,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -233,19 +258,19 @@ var PluginsContext = class {
   * @internal
   */
   removeCapability(interfaceDef, implementation) {
-    const current = this._definedCapabilities.get(interfaceDef.identifier);
-    if (!current) {
+    const current = this._registry.get(this._capabilityImpls(interfaceDef.identifier));
+    if (current.length === 0) {
       return;
     }
-    const index = current.findIndex((i) => i.implementation === implementation);
-    if (index !== -1) {
-      current.splice(index, 1);
+    const next = current.filter((c) => c.implementation !== implementation);
+    if (next.length !== current.length) {
+      this._registry.set(this._capabilityImpls(interfaceDef.identifier), next);
       (0, import_log2.log)("capability removed", {
         id: interfaceDef.identifier,
-        count: (0, import_signals_core.untracked)(() => current.length)
+        count: current.length
       }, {
         F: __dxlog_file,
-        L: 165,
+        L: 180,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -254,63 +279,64 @@ var PluginsContext = class {
         id: interfaceDef.identifier
       }, {
         F: __dxlog_file,
-        L: 167,
+        L: 182,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
   /**
-  * Requests capabilities from the plugin context.
+  * Get the Rx reference to the available capabilities for a given interface.
+  * Primarily useful for deriving other Rx values based on the capabilities or
+  * for subscribing to changes in the capabilities.
+  * @returns An Rx reference to the available capabilities.
+  */
+  capabilities(interfaceDef) {
+    return this._capabilities(interfaceDef.identifier);
+  }
+  /**
+  * Get the Rx reference to the available capabilities for a given interface.
+  * Primarily useful for deriving other Rx values based on the capability or
+  * for subscribing to changes in the capability.
+  * @returns An Rx reference to the available capability.
+  * @throws If no capability is found.
+  */
+  capability(interfaceDef) {
+    return this._capability(interfaceDef.identifier);
+  }
+  /**
+  * Get capabilities from the plugin context.
   * @returns An array of capabilities.
-  * @reactive
   */
-  requestCapabilities(interfaceDef, filter) {
-    let current = this._definedCapabilities.get(interfaceDef.identifier);
-    if (!current) {
-      const object = (0, import_live_object2.live)({
-        value: []
-      });
-      current = (0, import_signals_core.untracked)(() => object.value);
-      this._definedCapabilities.set(interfaceDef.identifier, current);
-    }
-    const capabilities = filter ? current.filter((c) => filter(c.implementation, c.moduleId)) : current;
-    return capabilities.map((c) => c.implementation);
+  getCapabilities(interfaceDef) {
+    return this._registry.get(this.capabilities(interfaceDef));
   }
   /**
   * Requests a single capability from the plugin context.
   * @returns The capability.
   * @throws If no capability is found.
-  * @reactive
   */
-  requestCapability(interfaceDef, filter) {
-    const capability = this.requestCapabilities(interfaceDef, filter)[0];
-    (0, import_invariant.invariant)(capability, `No capability found for ${interfaceDef.identifier}`, {
-      F: __dxlog_file,
-      L: 203,
-      S: this,
-      A: [
-        "capability",
-        "`No capability found for ${interfaceDef.identifier}`"
-      ]
-    });
-    return capability;
+  getCapability(interfaceDef) {
+    return this._registry.get(this.capability(interfaceDef));
   }
   /**
-  * Waits for a capability to be contributed.
+  * Waits for a capability to be available.
   * @returns The capability.
   */
-  async waitForCapability(interfaceDef, filter) {
+  async waitForCapability(interfaceDef) {
+    const [capability] = this.getCapabilities(interfaceDef);
+    if (capability) {
+      return capability;
+    }
     const trigger = new import_async.Trigger();
-    const unsubscribe = (0, import_signals_core.effect)(() => {
-      const capabilities = this.requestCapabilities(interfaceDef, filter);
-      if (capabilities[0]) {
+    const cancel = this._registry.subscribe(this.capabilities(interfaceDef), (capabilities) => {
+      if (capabilities.length > 0) {
         trigger.wake(capabilities[0]);
       }
     });
-    const capability = await trigger.wait();
-    unsubscribe();
-    return capability;
+    const result = await trigger.wait();
+    cancel();
+    return result;
   }
   async activatePromise(event) {
     return this.activate(event).pipe(import_effect4.Effect.runPromise);
@@ -344,15 +370,17 @@ var isPromise = (value) => {
   return value !== null && typeof value === "object" && "then" in value;
 };
 var PluginManager = class {
-  constructor({ pluginLoader, plugins = [], core = plugins.map(({ meta }) => meta.id), enabled = [] }) {
+  constructor({ pluginLoader, plugins = [], core = plugins.map(({ meta }) => meta.id), enabled = [], registry }) {
     this.activation = new import_async2.Event();
-    this.context = new PluginsContext({
+    this._capabilities = /* @__PURE__ */ new Map();
+    this.registry = registry ?? import_rx_react2.Registry.make();
+    this.context = new PluginContext({
+      registry: this.registry,
       activate: (event) => this._activate(event),
       reset: (id) => this._reset(id)
     });
-    this._capabilities = /* @__PURE__ */ new Map();
     this._pluginLoader = pluginLoader;
-    this._state = (0, import_live_object3.live)({
+    this._state = (0, import_live_object2.live)({
       plugins,
       core,
       enabled,
@@ -426,12 +454,12 @@ var PluginManager = class {
   * @param id The id of the plugin.
   */
   async add(id) {
-    return (0, import_signals_core2.untracked)(async () => {
+    return (0, import_signals_core.untracked)(async () => {
       (0, import_log3.log)("add plugin", {
         id
       }, {
         F: __dxlog_file2,
-        L: 146,
+        L: 154,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -445,12 +473,12 @@ var PluginManager = class {
   * @param id The id of the plugin.
   */
   enable(id) {
-    return (0, import_signals_core2.untracked)(async () => {
+    return (0, import_signals_core.untracked)(async () => {
       (0, import_log3.log)("enable plugin", {
         id
       }, {
         F: __dxlog_file2,
-        L: 159,
+        L: 167,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -471,7 +499,7 @@ var PluginManager = class {
         ]
       }, {
         F: __dxlog_file2,
-        L: 174,
+        L: 182,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -486,12 +514,12 @@ var PluginManager = class {
   * @param id The id of the plugin.
   */
   remove(id) {
-    return (0, import_signals_core2.untracked)(() => {
+    return (0, import_signals_core.untracked)(() => {
       (0, import_log3.log)("remove plugin", {
         id
       }, {
         F: __dxlog_file2,
-        L: 192,
+        L: 200,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -508,12 +536,12 @@ var PluginManager = class {
   * @param id The id of the plugin.
   */
   disable(id) {
-    return (0, import_signals_core2.untracked)(async () => {
+    return (0, import_signals_core.untracked)(async () => {
       (0, import_log3.log)("disable plugin", {
         id
       }, {
         F: __dxlog_file2,
-        L: 209,
+        L: 217,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -541,7 +569,7 @@ var PluginManager = class {
   * @returns Whether the activation was successful.
   */
   activate(event) {
-    return (0, import_signals_core2.untracked)(() => import_effect5.Effect.runPromise(this._activate(event)));
+    return (0, import_signals_core.untracked)(() => import_effect5.Effect.runPromise(this._activate(event)));
   }
   /**
   * Deactivates all of the modules for a plugin.
@@ -549,7 +577,7 @@ var PluginManager = class {
   * @returns Whether the deactivation was successful.
   */
   deactivate(id) {
-    return (0, import_signals_core2.untracked)(() => import_effect5.Effect.runPromise(this._deactivate(id)));
+    return (0, import_signals_core.untracked)(() => import_effect5.Effect.runPromise(this._deactivate(id)));
   }
   /**
   * Re-activates the modules that were activated by the event.
@@ -557,15 +585,15 @@ var PluginManager = class {
   * @returns Whether the reset was successful.
   */
   reset(event) {
-    return (0, import_signals_core2.untracked)(() => import_effect5.Effect.runPromise(this._reset(event)));
+    return (0, import_signals_core.untracked)(() => import_effect5.Effect.runPromise(this._reset(event)));
   }
   _addPlugin(plugin) {
-    (0, import_signals_core2.untracked)(() => {
+    (0, import_signals_core.untracked)(() => {
       (0, import_log3.log)("add plugin", {
         id: plugin.meta.id
       }, {
         F: __dxlog_file2,
-        L: 262,
+        L: 270,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -575,12 +603,12 @@ var PluginManager = class {
     });
   }
   _removePlugin(id) {
-    (0, import_signals_core2.untracked)(() => {
+    (0, import_signals_core.untracked)(() => {
       (0, import_log3.log)("remove plugin", {
         id
       }, {
         F: __dxlog_file2,
-        L: 271,
+        L: 279,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -591,12 +619,12 @@ var PluginManager = class {
     });
   }
   _addModule(module2) {
-    (0, import_signals_core2.untracked)(() => {
+    (0, import_signals_core.untracked)(() => {
       (0, import_log3.log)("add module", {
         id: module2.id
       }, {
         F: __dxlog_file2,
-        L: 281,
+        L: 289,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -606,12 +634,12 @@ var PluginManager = class {
     });
   }
   _removeModule(id) {
-    (0, import_signals_core2.untracked)(() => {
+    (0, import_signals_core.untracked)(() => {
       (0, import_log3.log)("remove module", {
         id
       }, {
         F: __dxlog_file2,
-        L: 290,
+        L: 298,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -637,7 +665,7 @@ var PluginManager = class {
     return this._getInactiveModules().filter((module2) => getEvents(module2.activatesOn).map(eventKey).includes(key));
   }
   _setPendingResetByModule(module2) {
-    return (0, import_signals_core2.untracked)(() => {
+    return (0, import_signals_core.untracked)(() => {
       const activationEvents = getEvents(module2.activatesOn).map(eventKey).filter((key) => this._state.eventsFired.includes(key));
       const pendingReset = Array.from(new Set(activationEvents)).filter((event) => !this._state.pendingReset.includes(event));
       if (pendingReset.length > 0) {
@@ -645,7 +673,7 @@ var PluginManager = class {
           events: pendingReset
         }, {
           F: __dxlog_file2,
-          L: 328,
+          L: 336,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -664,7 +692,7 @@ var PluginManager = class {
         key
       }, {
         F: __dxlog_file2,
-        L: 341,
+        L: 349,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -685,7 +713,7 @@ var PluginManager = class {
           key
         }, {
           F: __dxlog_file2,
-          L: 357,
+          L: 365,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -699,7 +727,7 @@ var PluginManager = class {
         modules: modules.map((module2) => module2.id)
       }, {
         F: __dxlog_file2,
-        L: 364,
+        L: 372,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -741,7 +769,7 @@ var PluginManager = class {
         key
       }, {
         F: __dxlog_file2,
-        L: 398,
+        L: 406,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -757,7 +785,7 @@ var PluginManager = class {
         module: module2.id
       }, {
         F: __dxlog_file2,
-        L: 413,
+        L: 421,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -786,7 +814,7 @@ var PluginManager = class {
         module: module2.id
       }, {
         F: __dxlog_file2,
-        L: 436,
+        L: 444,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -815,7 +843,7 @@ var PluginManager = class {
         id
       }, {
         F: __dxlog_file2,
-        L: 463,
+        L: 471,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -824,7 +852,7 @@ var PluginManager = class {
         for (const capability of capabilities) {
           this.context.removeCapability(capability.interface, capability.implementation);
           const program = capability.deactivate?.();
-          yield* import_effect5.Match.value(program).pipe(import_effect5.Match.when(import_effect5.Effect.isEffect, (effect2) => effect2), import_effect5.Match.when(isPromise, (promise) => import_effect5.Effect.tryPromise({
+          yield* import_effect5.Match.value(program).pipe(import_effect5.Match.when(import_effect5.Effect.isEffect, (effect) => effect), import_effect5.Match.when(isPromise, (promise) => import_effect5.Effect.tryPromise({
             try: () => promise,
             catch: (error) => error
           })), import_effect5.Match.orElse((program2) => import_effect5.Effect.succeed(program2)));
@@ -839,7 +867,7 @@ var PluginManager = class {
         id
       }, {
         F: __dxlog_file2,
-        L: 489,
+        L: 497,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -853,7 +881,7 @@ var PluginManager = class {
         key
       }, {
         F: __dxlog_file2,
-        L: 497,
+        L: 505,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -892,6 +920,7 @@ var Capabilities;
 (function(Capabilities2) {
   Capabilities2.PluginManager = defineCapability("dxos.org/app-framework/capability/plugin-manager");
   Capabilities2.Null = defineCapability("dxos.org/app-framework/capability/null");
+  Capabilities2.RxRegistry = defineCapability("dxos.org/app-framework/capability/rx-registry");
   Capabilities2.ReactContext = defineCapability("dxos.org/app-framework/capability/react-context");
   Capabilities2.ReactRoot = defineCapability("dxos.org/app-framework/capability/react-root");
   Capabilities2.ReactSurface = defineCapability("dxos.org/app-framework/common/react-surface");
@@ -913,7 +942,7 @@ var CollaborationActions;
 (function(CollaborationActions2) {
   class InsertContent extends import_effect6.Schema.TaggedClass()("assistant/intent-content", {
     input: import_effect6.Schema.Struct({
-      spaceId: import_echo_schema.SpaceIdSchema,
+      spaceId: import_keys.SpaceId,
       target: (0, import_echo_schema.Ref)(import_echo_schema.Expando),
       object: (0, import_echo_schema.Ref)(import_echo_schema.Expando),
       label: import_effect6.Schema.String.pipe(import_effect6.Schema.optional)
@@ -979,7 +1008,7 @@ var IntentPlugin = () => definePlugin({
     activatesAfter: [
       Events.DispatcherReady
     ],
-    activate: lazy(() => import("./intent-dispatcher-FQPJNKIZ.cjs"))
+    activate: lazy(() => import("./intent-dispatcher-TASJBG5M.cjs"))
   })
 ]);
 var LAYOUT_PLUGIN = "dxos.org/plugin/layout";
@@ -1329,12 +1358,12 @@ var isUndoable = (historyEntry) => historyEntry.length > 0 && historyEntry.every
 var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, historyLimit = HISTORY_LIMIT } = {}) => {
   const historyRef = import_effect.Effect.runSync(import_effect.Ref.make([]));
   const handleIntent = (intent) => import_effect.Effect.gen(function* () {
-    const candidates = getResolvers(intent.module).filter((resolver) => resolver.intent._tag === intent.id).filter((resolver) => !resolver.filter || resolver.filter(intent.data)).toSorted(import_util.byPosition);
+    const candidates = getResolvers().filter((resolver) => resolver.intent._tag === intent.id).filter((resolver) => !resolver.filter || resolver.filter(intent.data)).toSorted(import_util.byPosition);
     if (candidates.length === 0) {
       yield* import_effect.Effect.fail(new NoResolversError(intent.id));
     }
-    const effect2 = candidates[0].resolve(intent.data, intent.undo ?? false);
-    const result = import_effect.Effect.isEffect(effect2) ? yield* effect2 : yield* import_effect.Effect.promise(async () => effect2);
+    const effect = candidates[0].resolve(intent.data, intent.undo ?? false);
+    const result = import_effect.Effect.isEffect(effect) ? yield* effect : yield* import_effect.Effect.promise(async () => effect);
     return {
       _intent: intent,
       ...result
@@ -1454,10 +1483,8 @@ var intent_dispatcher_default = (context) => {
     undo: defaultEffect,
     undoPromise: defaultPromise
   });
-  const { dispatch, dispatchPromise, undo, undoPromise } = createDispatcher((module2) => context.requestCapabilities(Capabilities.IntentResolver, (c, moduleId) => {
-    return module2 ? moduleId === module2 : true;
-  }).flat());
-  const manager = context.requestCapability(Capabilities.PluginManager);
+  const { dispatch, dispatchPromise, undo, undoPromise } = createDispatcher(() => context.getCapabilities(Capabilities.IntentResolver).flat());
+  const manager = context.getCapability(Capabilities.PluginManager);
   state.dispatch = (intentChain, depth) => {
     return import_effect.Effect.gen(function* () {
       yield* manager._activate(Events.SetupIntentResolver);
@@ -1487,9 +1514,9 @@ var intent_dispatcher_default = (context) => {
   Label,
   LayoutAction,
   Plugin,
+  PluginContext,
   PluginManager,
   PluginModule,
-  PluginsContext,
   Resource,
   ResourceKey,
   ResourceLanguage,
@@ -1513,4 +1540,4 @@ var intent_dispatcher_default = (context) => {
   lazy,
   oneOf
 });
-//# sourceMappingURL=chunk-I3CJYEBC.cjs.map
+//# sourceMappingURL=chunk-2EBZ2ICH.cjs.map