@dxos/app-framework 0.8.4-main.f9ba587 → 0.8.4-main.fcc0d83b33

package/moon.yml

@@ -1,14 +1,37 @@
-type: library
+layer: library
 language: typescript
 tags:
   - pack
   - ts-build
   - ts-test
+  - ts-test-storybook
   - typedoc
+  - storybook
 tasks:
   compile:
     args:
       - '--entryPoint=src/index.ts'
+      - '--entryPoint=src/cli/index.ts'
+      - '--entryPoint=src/core/activation-event.ts'
+      - '--entryPoint=src/core/capability.ts'
+      - '--entryPoint=src/core/plugin.ts'
+      - '--entryPoint=src/core/plugin-manager.ts'
+      - '--entryPoint=src/common/capabilities.ts'
+      - '--entryPoint=src/common/activation-events.ts'
+      - '--entryPoint=src/ui/index.ts'
       - '--entryPoint=src/testing/index.ts'
-      - '--entryPoint=src/worker.ts'
-      - '--preactSignalTracking'
+      - '--entryPoint=src/testing/react.tsx'
+      - '--entryPoint=src/core/url-loader.ts'
+    deps:
+      - compile-plugin
+  compile-plugin:
+    command: dx-compile
+    args:
+      - '--entryPoint=src/vite-plugin/index.ts'
+      - '--outputPath=dist/plugin'
+      - '--platform=node'
+    deps:
+      - ^:compile
+      - dx-compile:compile
+    outputs:
+      - dist/plugin

package/package.json

@@ -1,79 +1,140 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fcc0d83b33",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/types/src/index.d.ts",
+      "source": "./src/index.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "types": "./dist/types/src/index.d.ts"
+    },
+    "./ActivationEvent": {
+      "source": "./src/core/activation-event.ts",
+      "browser": "./dist/lib/browser/activation-event/index.mjs",
+      "node": "./dist/lib/node-esm/activation-event/index.mjs",
+      "types": "./dist/types/src/activation-event/index.d.ts"
+    },
+    "./ActivationEvents": {
+      "source": "./src/common/activation-events.ts",
+      "browser": "./dist/lib/browser/common/activation-events.mjs",
+      "node": "./dist/lib/node-esm/common/activation-events.mjs",
+      "types": "./dist/types/src/common/activation-events.d.ts"
+    },
+    "./Capabilities": {
+      "source": "./src/common/capabilities.ts",
+      "browser": "./dist/lib/browser/common/capabilities.mjs",
+      "node": "./dist/lib/node-esm/common/capabilities.mjs",
+      "types": "./dist/types/src/common/capabilities.d.ts"
+    },
+    "./Capability": {
+      "source": "./src/core/capability.ts",
+      "browser": "./dist/lib/browser/capability/index.mjs",
+      "node": "./dist/lib/node-esm/capability/index.mjs",
+      "types": "./dist/types/src/capability/index.d.ts"
+    },
+    "./Plugin": {
+      "source": "./src/core/plugin.ts",
+      "browser": "./dist/lib/browser/plugin/index.mjs",
+      "node": "./dist/lib/node-esm/plugin/index.mjs",
+      "types": "./dist/types/src/plugin/index.d.ts"
+    },
+    "./PluginManager": {
+      "source": "./src/core/plugin-manager.ts",
+      "browser": "./dist/lib/browser/plugin-manager/index.mjs",
+      "node": "./dist/lib/node-esm/plugin-manager/index.mjs",
+      "types": "./dist/types/src/plugin-manager/index.d.ts"
+    },
+    "./UrlLoader": {
+      "source": "./src/core/url-loader.ts",
+      "browser": "./dist/lib/browser/url-loader/index.mjs",
+      "node": "./dist/lib/node-esm/url-loader/index.mjs",
+      "types": "./dist/types/src/url-loader/index.d.ts"
+    },
+    "./vite-plugin": {
+      "import": "./dist/plugin/node-esm/index.mjs",
+      "types": "./dist/types/src/vite-plugin/index.d.ts"
+    },
+    "./cli": {
+      "source": "./src/cli/index.ts",
+      "browser": "./dist/lib/browser/cli/index.mjs",
+      "node": "./dist/lib/node-esm/cli/index.mjs",
+      "types": "./dist/types/src/cli/index.d.ts"
     },
     "./testing": {
-      "types": "./dist/types/src/testing/index.d.ts",
+      "source": "./src/testing/index.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs"
+      "node": "./dist/lib/node-esm/testing/index.mjs",
+      "types": "./dist/types/src/testing/index.d.ts"
     },
-    "./worker": {
-      "types": "./dist/types/src/worker.d.ts",
-      "browser": "./dist/lib/browser/worker.mjs",
-      "node": "./dist/lib/node-esm/worker.mjs"
+    "./testing-react": {
+      "source": "./src/testing/react.tsx",
+      "browser": "./dist/lib/browser/testing/react.mjs",
+      "node": "./dist/lib/node-esm/testing/react.mjs",
+      "types": "./dist/types/src/testing/react.d.ts"
+    },
+    "./ui": {
+      "source": "./src/ui/index.ts",
+      "browser": "./dist/lib/browser/ui/index.mjs",
+      "node": "./dist/lib/node-esm/ui/index.mjs",
+      "types": "./dist/types/src/ui/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ],
-      "worker": [
-        "dist/types/src/worker.d.ts"
-      ]
-    }
-  },
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "@dxos/ai": "0.8.4-main.f9ba587",
-    "@dxos/app-graph": "0.8.4-main.f9ba587",
-    "@dxos/artifact": "0.8.4-main.f9ba587",
-    "@dxos/async": "0.8.4-main.f9ba587",
-    "@dxos/client-protocol": "0.8.4-main.f9ba587",
-    "@dxos/debug": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/keys": "0.8.4-main.f9ba587",
-    "@dxos/live-object": "0.8.4-main.f9ba587",
-    "@dxos/local-storage": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/react-hooks": "0.8.4-main.f9ba587",
-    "@dxos/schema": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@effect/cli": "0.73.2",
+    "cjs-module-lexer": "^2.2.0",
+    "@dxos/async": "0.8.4-main.fcc0d83b33",
+    "@dxos/compute": "0.8.4-main.fcc0d83b33",
+    "@dxos/debug": "0.8.4-main.fcc0d83b33",
+    "@dxos/echo": "0.8.4-main.fcc0d83b33",
+    "@dxos/effect": "0.8.4-main.fcc0d83b33",
+    "@dxos/errors": "0.8.4-main.fcc0d83b33",
+    "@dxos/log": "0.8.4-main.fcc0d83b33",
+    "@dxos/invariant": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-error-boundary": "0.8.4-main.fcc0d83b33",
+    "@dxos/protocols": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-ui": "0.8.4-main.fcc0d83b33",
+    "@dxos/ui-theme": "0.8.4-main.fcc0d83b33",
+    "@dxos/react-hooks": "0.8.4-main.fcc0d83b33",
+    "@dxos/web-context": "0.8.4-main.fcc0d83b33",
+    "@dxos/util": "0.8.4-main.fcc0d83b33",
+    "@dxos/web-context-react": "0.8.4-main.fcc0d83b33"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.88.0",
-    "@phosphor-icons/react": "^2.1.5",
-    "@types/react": "~18.2.0",
-    "effect": "3.16.13",
-    "react": "~18.2.0",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "@effect/vitest": "0.29.0",
+    "@testing-library/react": "^16.3.0",
+    "@types/react": "~19.2.7",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
     "typedoc": "0.28.1",
-    "@dxos/echo-signals": "0.8.4-main.f9ba587",
-    "@dxos/random": "0.8.4-main.f9ba587",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
+    "vite": "^8.0.10",
+    "@dxos/brand": "0.8.4-main.fcc0d83b33",
+    "@dxos/random": "0.8.4-main.fcc0d83b33",
+    "@dxos/storybook-utils": "0.8.4-main.fcc0d83b33",
+    "@dxos/echo-db": "0.8.4-main.fcc0d83b33",
+    "@dxos/test-utils": "0.8.4-main.fcc0d83b33"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "~18.2.0"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "@testing-library/react": "^16.3.0",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3"
   },
   "publishConfig": {
     "access": "public"

package/src/cli/cli.ts

@@ -0,0 +1,107 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import { invariant } from '@dxos/invariant';
+
+import { ActivationEvents, Capabilities } from '../common';
+import { Capability, Plugin, PluginManager } from '../core';
+
+const defaultPluginLoader =
+  (plugins: Plugin.Plugin[]): PluginManager.ManagerOptions['pluginLoader'] =>
+  (id: string) =>
+    Effect.sync(() => {
+      const plugin = plugins.find((plugin) => plugin.meta.id === id);
+      invariant(plugin, `Plugin not found: ${id}`);
+      return plugin;
+    });
+
+type SubCommands = [Command.Command<any, any, any, any>, ...Array<Command.Command<any, any, any, any>>];
+
+export type CreateCliAppOptions = {
+  rootCommand: Command.Command<any, any, any, any>;
+  subCommands?: SubCommands;
+  pluginManager?: PluginManager.PluginManager;
+  pluginLoader?: PluginManager.ManagerOptions['pluginLoader'];
+  plugins?: Plugin.Plugin[];
+  core?: string[];
+  enabled?: string[];
+  safeMode?: boolean;
+};
+
+/**
+ * Creates a CLI application with plugin support.
+ * Similar to useApp but for CLI environments.
+ *
+ * @example
+ * const plugins = [ClientPluginCLI()];
+ * const manager = await createCliApp({ plugins });
+ * const commands = manager.capabilities.getAll(Capabilities.Command);
+ *
+ * @param options.pluginManager Optional existing PluginManager instance.
+ * @param options.pluginLoader Function to load plugins by ID.
+ * @param options.plugins All plugins available to the application.
+ * @param options.core Core plugins which will always be enabled.
+ * @param options.enabled Enabled plugins.
+ * @param options.safeMode Whether to enable safe mode, which disables optional plugins.
+ */
+export const createCliApp = Effect.fn(function* ({
+  rootCommand,
+  subCommands: subCommandsProp,
+  pluginManager: pluginManagerProp,
+  pluginLoader: pluginLoaderProp,
+  plugins: pluginsProp = [],
+  core: coreProp,
+  enabled: enabledProp = [],
+  safeMode = false,
+}: CreateCliAppOptions) {
+  const plugins = pluginsProp;
+  const core = coreProp ?? plugins.map(({ meta }) => meta.id);
+  const pluginLoader = pluginLoaderProp ?? defaultPluginLoader(plugins);
+  const enabled = safeMode ? [] : enabledProp;
+  const manager =
+    pluginManagerProp ??
+    PluginManager.make({
+      pluginLoader,
+      plugins,
+      core,
+      enabled,
+    });
+
+  manager.capabilities.contribute({
+    interface: Capabilities.PluginManager,
+    implementation: manager,
+    module: 'org.dxos.app-framework.plugin-manager',
+  });
+
+  manager.capabilities.contribute({
+    interface: Capabilities.AtomRegistry,
+    implementation: manager.registry,
+    module: 'org.dxos.app-framework.atom-registry',
+  });
+
+  // Activate startup event to load CLI commands and Effect layers.
+  yield* manager.activate(ActivationEvents.Startup);
+
+  // Gather all layers and merge them into a single layer.
+  const layers = manager.capabilities.getAll(Capabilities.Layer);
+  const capabilityServiceLayer = Layer.succeed(Capability.Service, manager.capabilities);
+  const pluginServiceLayer = Layer.succeed(Plugin.Service, manager);
+  const layer = (Layer.mergeAll as (...args: Layer.Layer<any, any, any>[]) => Layer.Layer<any, any, never>)(
+    capabilityServiceLayer,
+    pluginServiceLayer,
+    ...layers,
+  );
+
+  // Gather all commands and provide them to the root command.
+  const pluginCommands = manager.capabilities.getAll(Capabilities.Command);
+  const subCommands = subCommandsProp ? [...subCommandsProp, ...pluginCommands] : pluginCommands;
+  invariant(subCommands.length > 0, 'No subcommands provided');
+  const command = rootCommand.pipe(Command.withSubcommands(subCommands as SubCommands));
+
+  return { command, layer };
+});

package/src/{playground/layout → cli}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './plugin';
+export * from './cli';

package/src/common/activation-events.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ActivationEvent as ActivationEvent$ } from '../core';
+
+/**
+ * Fired when the app is started.
+ */
+export const Startup = ActivationEvent$.make('org.dxos.app-framework.event.startup');
+
+//
+// Dependent Events
+//
+
+/**
+ * Fired to load any newly available surfaces.
+ */
+export const SetupReactSurface = ActivationEvent$.make('org.dxos.app-framework.event.setup-react-surface');
+
+/**
+ * Fired before the operation invoker is activated.
+ */
+export const SetupOperationHandler = ActivationEvent$.make('org.dxos.app-framework.event.setup-operation-handler');
+
+/**
+ * Fired before the managed runtime is created.
+ * Plugins should contribute their Layer capabilities before this event.
+ */
+export const SetupLayer = ActivationEvent$.make('org.dxos.app-framework.event.setup-layer');
+
+//
+// Triggered Events
+//
+
+/**
+ * Fired after the operation invoker is ready.
+ */
+export const OperationInvokerReady = ActivationEvent$.make('org.dxos.app-framework.event.operation-invoker-ready');
+
+/**
+ * Fired after the managed runtime is ready.
+ */
+export const ManagedRuntimeReady = ActivationEvent$.make('org.dxos.app-framework.event.managed-runtime-ready');