@dxos/plugin-space 0.8.4-main.4a85c3132b → 0.8.4-main.51f1e5ca51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.4a85c3132b",
+  "version": "0.8.4-main.51f1e5ca51",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,21 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./src/capabilities/index.ts",
+      "browser": "./src/capabilities/index.ts",
+      "node": "./src/capabilities/node.ts"
+    },
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#translations": "./src/translations.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -24,6 +39,24 @@
       "types": "./dist/types/src/cli/index.d.ts",
       "node": "./dist/lib/node-esm/cli/index.mjs"
     },
+    "./meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "browser": "./dist/lib/browser/meta.mjs",
+      "node": "./dist/lib/node-esm/meta.mjs"
+    },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
@@ -32,13 +65,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
@@ -53,54 +79,54 @@
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~19.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.4a85c3132b",
-    "@dxos/app-framework": "0.8.4-main.4a85c3132b",
-    "@dxos/app-toolkit": "0.8.4-main.4a85c3132b",
-    "@dxos/cli-util": "0.8.4-main.4a85c3132b",
-    "@dxos/async": "0.8.4-main.4a85c3132b",
-    "@dxos/client": "0.8.4-main.4a85c3132b",
-    "@dxos/client-protocol": "0.8.4-main.4a85c3132b",
-    "@dxos/context": "0.8.4-main.4a85c3132b",
-    "@dxos/display-name": "0.8.4-main.4a85c3132b",
-    "@dxos/echo": "0.8.4-main.4a85c3132b",
-    "@dxos/echo-atom": "0.8.4-main.4a85c3132b",
-    "@dxos/blueprints": "0.8.4-main.4a85c3132b",
-    "@dxos/echo-db": "0.8.4-main.4a85c3132b",
-    "@dxos/echo-protocol": "0.8.4-main.4a85c3132b",
-    "@dxos/effect": "0.8.4-main.4a85c3132b",
-    "@dxos/invariant": "0.8.4-main.4a85c3132b",
-    "@dxos/functions": "0.8.4-main.4a85c3132b",
-    "@dxos/keys": "0.8.4-main.4a85c3132b",
-    "@dxos/operation": "0.8.4-main.4a85c3132b",
-    "@dxos/log": "0.8.4-main.4a85c3132b",
-    "@dxos/migrations": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-attention": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-graph": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-client": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-deck": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-observability": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-status-bar": "0.8.4-main.4a85c3132b",
-    "@dxos/protocols": "0.8.4-main.4a85c3132b",
-    "@dxos/react-client": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-attention": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-components": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-editor": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-form": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-list": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-masonry": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-searchlist": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-mosaic": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-pickers": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-stack": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-tabs": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.4a85c3132b",
-    "@dxos/schema": "0.8.4-main.4a85c3132b",
-    "@dxos/shell": "0.8.4-main.4a85c3132b",
-    "@dxos/types": "0.8.4-main.4a85c3132b",
-    "@dxos/ui-theme": "0.8.4-main.4a85c3132b",
-    "@dxos/ui-types": "0.8.4-main.4a85c3132b",
-    "@dxos/util": "0.8.4-main.4a85c3132b"
+    "@dxos/ai": "0.8.4-main.51f1e5ca51",
+    "@dxos/app-framework": "0.8.4-main.51f1e5ca51",
+    "@dxos/async": "0.8.4-main.51f1e5ca51",
+    "@dxos/app-toolkit": "0.8.4-main.51f1e5ca51",
+    "@dxos/client": "0.8.4-main.51f1e5ca51",
+    "@dxos/cli-util": "0.8.4-main.51f1e5ca51",
+    "@dxos/client-protocol": "0.8.4-main.51f1e5ca51",
+    "@dxos/compute": "0.8.4-main.51f1e5ca51",
+    "@dxos/display-name": "0.8.4-main.51f1e5ca51",
+    "@dxos/context": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-atom": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-protocol": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-db": "0.8.4-main.51f1e5ca51",
+    "@dxos/invariant": "0.8.4-main.51f1e5ca51",
+    "@dxos/effect": "0.8.4-main.51f1e5ca51",
+    "@dxos/migrations": "0.8.4-main.51f1e5ca51",
+    "@dxos/log": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo": "0.8.4-main.51f1e5ca51",
+    "@dxos/keys": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-attention": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-graph": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-deck": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-observability": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-settings": "0.8.4-main.51f1e5ca51",
+    "@dxos/protocols": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-status-bar": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-attention": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-components": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-editor": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-form": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-list": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-masonry": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-mosaic": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-menu": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-pickers": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-search": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-stack": "0.8.4-main.51f1e5ca51",
+    "@dxos/shell": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-tabs": "0.8.4-main.51f1e5ca51",
+    "@dxos/schema": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51",
+    "@dxos/types": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-types": "0.8.4-main.51f1e5ca51",
+    "@dxos/util": "0.8.4-main.51f1e5ca51"
   },
   "devDependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
@@ -109,25 +135,26 @@
     "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/lit-ui": "0.8.4-main.4a85c3132b",
-    "@dxos/plugin-testing": "0.8.4-main.4a85c3132b",
-    "@dxos/random": "0.8.4-main.4a85c3132b",
-    "@dxos/react-ui": "0.8.4-main.4a85c3132b",
-    "@dxos/storybook-utils": "0.8.4-main.4a85c3132b",
-    "@dxos/ui-theme": "0.8.4-main.4a85c3132b"
+    "vite": "^8.0.10",
+    "@dxos/plugin-preview": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-testing": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/storybook-utils": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51",
+    "@dxos/random": "0.8.4-main.51f1e5ca51",
+    "@dxos/lit-ui": "0.8.4-main.51f1e5ca51"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.4a85c3132b",
-    "@dxos/ui-theme": "0.8.4-main.4a85c3132b"
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -3,17 +3,18 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 
 import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Ref, Tag, Type } from '@dxos/echo';
+import { Operation } from '@dxos/compute';
+import { Annotation, Ref, Tag, Type } from '@dxos/echo';
 import { Collection } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { AttentionEvents } from '@dxos/plugin-attention';
+import { AttentionEvents } from '@dxos/plugin-attention/types';
 import { ClientEvents } from '@dxos/plugin-client/types';
-import { translations as componentsTranslations } from '@dxos/react-ui-components';
-import { translations as formTranslations } from '@dxos/react-ui-form';
+import { translations as componentsTranslations } from '@dxos/react-ui-components/translations';
+import { translations as formTranslations } from '@dxos/react-ui-form/translations';
 import { DataTypes, createDefaultSchema } from '@dxos/schema';
 import { translations as shellTranslations } from '@dxos/shell/react';
 import {
@@ -30,21 +31,26 @@ import {
 } from '@dxos/types';
 
 import {
-  AppGraphBuilder,
   AppGraphSerializer,
   IdentityCreated,
-  OperationResolver,
+  Migrations,
+  NavigationHandler,
+  NavigationResolver,
+  OperationHandler,
+  UndoMappings,
   ReactRoot,
   ReactSurface,
   Repair,
   SpaceSettings,
   SpaceState,
   SpacesReady,
-} from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { SpaceEvents } from './types';
-import { type CreateObject, SpaceOperation, type SpacePluginOptions } from './types';
+  AppGraphBuilder,
+} from '#capabilities';
+import { meta } from '#meta';
+import { SpaceOperation } from '#operations';
+import { translations } from '#translations';
+import { SpaceEvents } from '#types';
+import { type CreateObject, type SpacePluginOptions } from '#types';
 
 export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   AppPlugin.addMetadataModule({
@@ -52,66 +58,103 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       {
         id: Collection.Collection.typename,
         metadata: {
-          icon: 'ph--cards-three--regular',
-          iconHue: 'neutral',
+          icon: Annotation.IconAnnotation.get(Collection.Collection).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Collection.Collection).pipe(Option.getOrThrow).hue ?? 'white',
           // TODO(wittjosiah): Move out of metadata.
           loadReferences: async (collection: Collection.Collection) => await Ref.Array.loadAll(collection.objects),
           inputSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
-          createObject: ((props) => Effect.sync(() => Collection.make(props))) satisfies CreateObject,
-          addToCollectionOnCreate: true,
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Collection.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: false,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
       {
         id: Type.getTypename(Type.PersistentType),
         metadata: {
-          icon: 'ph--database--regular',
-          iconHue: 'green',
+          icon: Annotation.IconAnnotation.get(Type.PersistentType).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Type.PersistentType).pipe(Option.getOrThrow).hue ?? 'white',
           inputSchema: SpaceOperation.StoredSchemaForm,
-          createObject: ((props, { db }) =>
+          createObject: ((props, options) =>
             Effect.gen(function* () {
-              if (props.typename) {
-                const result = yield* Operation.invoke(SpaceOperation.UseStaticSchema, {
-                  db,
-                  typename: props.typename,
-                });
-                return result as any;
-              } else {
-                const result = yield* Operation.invoke(SpaceOperation.AddSchema, {
-                  db,
-                  name: props.name,
-                  schema: createDefaultSchema(),
-                });
-                return result.object;
-              }
+              const result = yield* Operation.invoke(SpaceOperation.AddSchema, {
+                db: options.db,
+                name: props.name,
+                schema: createDefaultSchema(),
+              });
+              return {
+                id: result.id,
+                subject: [],
+                object: result.object,
+              };
             })) satisfies CreateObject,
         },
       },
-      {
-        id: Event.Event.typename,
-        metadata: {
-          icon: 'ph--calendar-dot--regular',
-        },
-      },
       {
         id: Organization.Organization.typename,
         metadata: {
-          icon: 'ph--building-office--regular',
+          icon: Annotation.IconAnnotation.get(Organization.Organization).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Organization.Organization).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Organization.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
       {
         id: Person.Person.typename,
         metadata: {
-          icon: 'ph--user--regular',
+          icon: Annotation.IconAnnotation.get(Person.Person).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Person.Person).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Person.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
       {
         id: Task.Task.typename,
         metadata: {
-          icon: 'ph--check-circle--regular',
+          icon: Annotation.IconAnnotation.get(Task.Task).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Task.Task).pipe(Option.getOrThrow).hue ?? 'white',
+          inputSchema: Task.Task,
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Task.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
     ],
   }),
+  AppPlugin.addNavigationHandlerModule(({ invitationProp }) => ({
+    activate: () => NavigationHandler({ invitationProp }),
+  })),
+  AppPlugin.addNavigationResolverModule({ activatesOn: ClientEvents.ClientReady, activate: NavigationResolver }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addReactRootModule({ activate: ReactRoot }),
   AppPlugin.addSchemaModule({
     schema: [
@@ -138,7 +181,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
     //   Should this be a different event?
     //   Should settings store be renamed to be more generic?
     activatesOn: ActivationEvent.oneOf(AppActivationEvents.SetupSettings, AppActivationEvents.SetupAppGraph),
-    activatesAfter: [SpaceEvents.StateReady],
+    firesAfterActivation: [SpaceEvents.StateReady],
     activate: SpaceState,
   }),
   Plugin.addModule(
@@ -157,7 +200,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
         id: Capability.getModuleTag(ReactSurface),
         activatesOn: ActivationEvents.SetupReactSurface,
         // TODO(wittjosiah): Should occur before the settings dialog is loaded when surfaces activation is more granular.
-        activatesBefore: [SpaceEvents.SetupSettingsPanel],
+        firesBeforeActivation: [SpaceEvents.SetupSettingsPanel],
         activate: () => ReactSurface({ createInvitationUrl }),
       };
     },
@@ -183,9 +226,9 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       };
 
       return {
-        id: Capability.getModuleTag(OperationResolver),
-        activatesOn: ActivationEvents.SetupOperationResolver,
-        activate: () => OperationResolver({ createInvitationUrl, observability }),
+        id: Capability.getModuleTag(UndoMappings),
+        activatesOn: ActivationEvents.SetupOperationHandler,
+        activate: () => UndoMappings({ createInvitationUrl, observability }),
       };
     },
   ),
@@ -196,7 +239,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   }),
   Plugin.addModule({
     activatesOn: ClientEvents.IdentityCreated,
-    activatesAfter: [SpaceEvents.DefaultSpaceReady],
+    firesAfterActivation: [SpaceEvents.PersonalSpaceReady],
     activate: IdentityCreated,
   }),
   Plugin.addModule({
@@ -214,5 +257,9 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
     activatesOn: ClientEvents.SpacesReady,
     activate: Repair,
   }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.SetupMigration,
+    activate: Migrations,
+  }),
   Plugin.make,
 );