@dxos/plugin-space 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.5ea62a8",
+  "version": "0.8.4-main.66e292d",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -35,76 +35,85 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.1",
+    "@automerge/automerge": "3.1.2",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "effect": "3.17.7",
+    "@preact/signals-core": "^1.12.1",
     "jszip": "^3.10.1",
     "localforage": "^1.10.0",
     "react-drag-drop-files": "^2.3.8",
-    "react-is": "~18.2.0",
+    "react-is": "~19.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.5ea62a8",
-    "@dxos/app-framework": "0.8.4-main.5ea62a8",
-    "@dxos/async": "0.8.4-main.5ea62a8",
-    "@dxos/blueprints": "0.8.4-main.5ea62a8",
-    "@dxos/context": "0.8.4-main.5ea62a8",
-    "@dxos/client": "0.8.4-main.5ea62a8",
-    "@dxos/echo": "0.8.4-main.5ea62a8",
-    "@dxos/echo-schema": "0.8.4-main.5ea62a8",
-    "@dxos/echo-signals": "0.8.4-main.5ea62a8",
-    "@dxos/effect": "0.8.4-main.5ea62a8",
-    "@dxos/invariant": "0.8.4-main.5ea62a8",
-    "@dxos/keys": "0.8.4-main.5ea62a8",
-    "@dxos/live-object": "0.8.4-main.5ea62a8",
-    "@dxos/display-name": "0.8.4-main.5ea62a8",
-    "@dxos/local-storage": "0.8.4-main.5ea62a8",
-    "@dxos/log": "0.8.4-main.5ea62a8",
-    "@dxos/migrations": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-attention": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-deck": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-graph": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-client": "0.8.4-main.5ea62a8",
-    "@dxos/protocols": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-observability": "0.8.4-main.5ea62a8",
-    "@dxos/plugin-status-bar": "0.8.4-main.5ea62a8",
-    "@dxos/react-client": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-attention": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-editor": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-form": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-list": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-pickers": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-stack": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-searchlist": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-tabs": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
-    "@dxos/schema": "0.8.4-main.5ea62a8",
-    "@dxos/shell": "0.8.4-main.5ea62a8",
-    "@dxos/util": "0.8.4-main.5ea62a8"
+    "@dxos/ai": "0.8.4-main.66e292d",
+    "@dxos/app-framework": "0.8.4-main.66e292d",
+    "@dxos/async": "0.8.4-main.66e292d",
+    "@dxos/blueprints": "0.8.4-main.66e292d",
+    "@dxos/client": "0.8.4-main.66e292d",
+    "@dxos/client-protocol": "0.8.4-main.66e292d",
+    "@dxos/context": "0.8.4-main.66e292d",
+    "@dxos/display-name": "0.8.4-main.66e292d",
+    "@dxos/echo": "0.8.4-main.66e292d",
+    "@dxos/echo-db": "0.8.4-main.66e292d",
+    "@dxos/echo-protocol": "0.8.4-main.66e292d",
+    "@dxos/echo-signals": "0.8.4-main.66e292d",
+    "@dxos/effect": "0.8.4-main.66e292d",
+    "@dxos/functions": "0.8.4-main.66e292d",
+    "@dxos/invariant": "0.8.4-main.66e292d",
+    "@dxos/keys": "0.8.4-main.66e292d",
+    "@dxos/local-storage": "0.8.4-main.66e292d",
+    "@dxos/live-object": "0.8.4-main.66e292d",
+    "@dxos/log": "0.8.4-main.66e292d",
+    "@dxos/migrations": "0.8.4-main.66e292d",
+    "@dxos/plugin-attention": "0.8.4-main.66e292d",
+    "@dxos/plugin-graph": "0.8.4-main.66e292d",
+    "@dxos/plugin-deck": "0.8.4-main.66e292d",
+    "@dxos/plugin-client": "0.8.4-main.66e292d",
+    "@dxos/plugin-observability": "0.8.4-main.66e292d",
+    "@dxos/protocols": "0.8.4-main.66e292d",
+    "@dxos/react-client": "0.8.4-main.66e292d",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-attention": "0.8.4-main.66e292d",
+    "@dxos/react-ui-components": "0.8.4-main.66e292d",
+    "@dxos/plugin-status-bar": "0.8.4-main.66e292d",
+    "@dxos/react-ui-form": "0.8.4-main.66e292d",
+    "@dxos/react-ui-masonry": "0.8.4-main.66e292d",
+    "@dxos/react-ui-list": "0.8.4-main.66e292d",
+    "@dxos/react-ui-editor": "0.8.4-main.66e292d",
+    "@dxos/react-ui-searchlist": "0.8.4-main.66e292d",
+    "@dxos/react-ui-pickers": "0.8.4-main.66e292d",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.66e292d",
+    "@dxos/react-ui-stack": "0.8.4-main.66e292d",
+    "@dxos/react-ui-tabs": "0.8.4-main.66e292d",
+    "@dxos/schema": "0.8.4-main.66e292d",
+    "@dxos/shell": "0.8.4-main.66e292d",
+    "@dxos/types": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d",
+    "@dxos/util": "0.8.4-main.66e292d"
   },
   "devDependencies": {
+    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
     "@babel/core": "^7.18.13",
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.90.2",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/random": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8",
-    "@dxos/storybook-utils": "0.8.4-main.5ea62a8"
+    "@effect-atom/atom-react": "^0.3.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/random": "0.8.4-main.66e292d",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/lit-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d",
+    "@dxos/storybook-utils": "0.8.4-main.66e292d"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.5ea62a8",
-    "@dxos/react-ui-theme": "0.8.4-main.5ea62a8"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import {
   Capabilities,
@@ -14,11 +14,25 @@ import {
   definePlugin,
   oneOf,
 } from '@dxos/app-framework';
-import { Ref, Type } from '@dxos/echo';
+import { Ref, Tag, Type } from '@dxos/echo';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { DataType, ViewTypeV1, ViewTypeV1ToV2, ViewTypeV2, createDefaultSchema } from '@dxos/schema';
+import { translations as componentsTranslations } from '@dxos/react-ui-components';
+import { translations as formTranslations } from '@dxos/react-ui-form';
+import { Collection, DataTypes, createDefaultSchema } from '@dxos/schema';
 import { translations as shellTranslations } from '@dxos/shell/react';
+import {
+  AnchoredTo,
+  Employer,
+  Event,
+  HasConnection,
+  HasRelationship,
+  HasSubject,
+  Organization,
+  Person,
+  Project,
+  Task,
+} from '@dxos/types';
 
 import {
   AppGraphBuilder,
@@ -27,8 +41,7 @@ import {
   IntentResolver,
   ReactRoot,
   ReactSurface,
-  SchemaDefs,
-  SpaceCapabilities,
+  Repair,
   SpaceSettings,
   SpaceState,
   SpacesReady,
@@ -36,7 +49,7 @@ import {
 import { SpaceEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { CollectionAction, SpaceAction, defineObjectForm } from './types';
+import { CollectionAction, type CreateObjectIntent, SpaceAction } from './types';
 
 export type SpacePluginOptions = {
   /**
@@ -55,217 +68,170 @@ export type SpacePluginOptions = {
   observability?: boolean;
 };
 
-export const SpacePlugin = ({
-  invitationUrl = window.location.origin,
-  invitationParam = 'spaceInvitationCode',
-  observability = false,
-}: SpacePluginOptions = {}) => {
-  const createInvitationUrl = (invitationCode: string) => {
-    const baseUrl = new URL(invitationUrl);
-    baseUrl.searchParams.set(invitationParam, invitationCode);
-    return baseUrl.toString();
-  };
+export const SpacePlugin = definePlugin<SpacePluginOptions>(
+  meta,
+  ({ invitationUrl = window.location.origin, invitationParam = 'spaceInvitationCode', observability = false }) => {
+    const createInvitationUrl = (invitationCode: string) => {
+      const baseUrl = new URL(invitationUrl);
+      baseUrl.searchParams.set(invitationParam, invitationCode);
+      return baseUrl.toString();
+    };
 
-  return definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/state`,
-      // TODO(wittjosiah): Does not integrate with settings store.
-      //   Should this be a different event?
-      //   Should settings store be renamed to be more generic?
-      activatesOn: oneOf(Events.SetupSettings, Events.SetupAppGraph),
-      activatesAfter: [SpaceEvents.StateReady],
-      activate: SpaceState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: SpaceSettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, [...translations, ...shellTranslations]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () => [
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Collection),
-          metadata: {
-            icon: 'ph--cards-three--regular',
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (collection: DataType.Collection) => await Ref.Array.loadAll(collection.objects),
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.QueryCollection),
-          metadata: {
-            label: (object: DataType.QueryCollection) => [
-              'typename label',
-              { ns: object.query.typename, count: 2, defaultValue: 'New smart collection' },
-            ],
-            icon: 'ph--funnel-simple--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.StoredSchema),
-          metadata: {
-            icon: 'ph--database--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Event),
-          metadata: {
-            icon: 'ph--calendar-dot--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Organization),
-          metadata: {
-            icon: 'ph--building-office--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Person),
-          metadata: {
-            icon: 'ph--user--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Project),
-          metadata: {
-            icon: 'ph--check-square-offset--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Task),
-          metadata: {
-            icon: 'ph--check-circle--regular',
-          },
-        }),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => [
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: DataType.Collection,
-            formSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
-            getIntent: (props) => createIntent(CollectionAction.Create, props),
+    return [
+      defineModule({
+        id: `${meta.id}/module/state`,
+        // TODO(wittjosiah): Does not integrate with settings store.
+        //   Should this be a different event?
+        //   Should settings store be renamed to be more generic?
+        activatesOn: oneOf(Events.SetupSettings, Events.SetupAppGraph),
+        activatesAfter: [SpaceEvents.StateReady],
+        activate: SpaceState,
+      }),
+      defineModule({
+        id: `${meta.id}/module/settings`,
+        activatesOn: Events.SetupSettings,
+        activate: SpaceSettings,
+      }),
+      defineModule({
+        id: `${meta.id}/module/translations`,
+        activatesOn: Events.SetupTranslations,
+        activate: () =>
+          contributes(Capabilities.Translations, [
+            ...translations,
+            ...componentsTranslations,
+            ...formTranslations,
+            ...shellTranslations,
+          ]),
+      }),
+      defineModule({
+        id: `${meta.id}/module/metadata`,
+        activatesOn: Events.SetupMetadata,
+        activate: () => [
+          contributes(Capabilities.Metadata, {
+            id: Collection.Collection.typename,
+            metadata: {
+              icon: 'ph--cards-three--regular',
+              iconHue: 'neutral',
+              // 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) }),
+              createObjectIntent: ((props) =>
+                createIntent(CollectionAction.Create, props)) satisfies CreateObjectIntent,
+              addToCollectionOnCreate: true,
+            },
           }),
-        ),
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: DataType.QueryCollection,
-            formSchema: CollectionAction.QueryCollectionForm,
-            getIntent: (props) => createIntent(CollectionAction.CreateQueryCollection, props),
+          contributes(Capabilities.Metadata, {
+            id: Type.getTypename(Type.PersistentType),
+            metadata: {
+              icon: 'ph--database--regular',
+              iconHue: 'green',
+              inputSchema: SpaceAction.StoredSchemaForm,
+              createObjectIntent: ((props, options) =>
+                props.typename
+                  ? createIntent(SpaceAction.UseStaticSchema, { space: options.space, typename: props.typename })
+                  : createIntent(SpaceAction.AddSchema, {
+                      space: options.space,
+                      name: props.name,
+                      schema: createDefaultSchema(),
+                    })) satisfies CreateObjectIntent,
+            },
           }),
-        ),
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: DataType.StoredSchema,
-            formSchema: SpaceAction.StoredSchemaForm,
-            getIntent: (props, options) =>
-              props.typename
-                ? createIntent(SpaceAction.UseStaticSchema, { space: options.space, typename: props.typename })
-                : createIntent(SpaceAction.AddSchema, {
-                    space: options.space,
-                    name: props.name,
-                    schema: createDefaultSchema(),
-                  }),
+          contributes(Capabilities.Metadata, {
+            id: Event.Event.typename,
+            metadata: {
+              icon: 'ph--calendar-dot--regular',
+            },
+          }),
+          contributes(Capabilities.Metadata, {
+            id: Organization.Organization.typename,
+            metadata: {
+              icon: 'ph--building-office--regular',
+            },
           }),
+          contributes(Capabilities.Metadata, {
+            id: Person.Person.typename,
+            metadata: {
+              icon: 'ph--user--regular',
+            },
+          }),
+          contributes(Capabilities.Metadata, {
+            id: Task.Task.typename,
+            metadata: {
+              icon: 'ph--check-circle--regular',
+            },
+          }),
+        ],
+      }),
+      defineModule({
+        id: `${meta.id}/module/schema`,
+        activatesOn: ClientEvents.SetupSchema,
+        activate: () =>
+          contributes(ClientCapabilities.Schema, [
+            ...DataTypes,
+            AnchoredTo.AnchoredTo,
+            Employer.Employer,
+            Event.Event,
+            HasConnection.HasConnection,
+            HasRelationship.HasRelationship,
+            HasSubject.HasSubject,
+            Organization.Organization,
+            Person.Person,
+            Project.Project,
+            Tag.Tag,
+            Task.Task,
+          ]),
+      }),
+      defineModule({
+        id: `${meta.id}/module/react-root`,
+        activatesOn: Events.Startup,
+        activate: ReactRoot,
+      }),
+      defineModule({
+        id: `${meta.id}/module/react-surface`,
+        activatesOn: Events.SetupReactSurface,
+        // TODO(wittjosiah): Should occur before the settings dialog is loaded when surfaces activation is more granular.
+        activatesBefore: [SpaceEvents.SetupSettingsPanel],
+        activate: () => ReactSurface({ createInvitationUrl }),
+      }),
+      defineModule({
+        id: `${meta.id}/module/intent-resolver`,
+        activatesOn: Events.SetupIntentResolver,
+        activate: (context) => IntentResolver({ context, createInvitationUrl, observability }),
+      }),
+      defineModule({
+        id: `${meta.id}/module/app-graph-builder`,
+        activatesOn: Events.SetupAppGraph,
+        activate: AppGraphBuilder,
+      }),
+      // TODO(wittjosiah): This could probably be deferred.
+      defineModule({
+        id: `${meta.id}/module/app-graph-serializer`,
+        activatesOn: Events.AppGraphReady,
+        activate: AppGraphSerializer,
+      }),
+      defineModule({
+        id: `${meta.id}/module/identity-created`,
+        activatesOn: ClientEvents.IdentityCreated,
+        activatesAfter: [SpaceEvents.DefaultSpaceReady],
+        activate: IdentityCreated,
+      }),
+      defineModule({
+        id: `${meta.id}/module/spaces-ready`,
+        activatesOn: allOf(
+          Events.DispatcherReady,
+          Events.LayoutReady,
+          Events.AppGraphReady,
+          AttentionEvents.AttentionReady,
+          SpaceEvents.StateReady,
+          ClientEvents.SpacesReady,
         ),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema-defs`,
-      activatesOn: ClientEvents.ClientReady,
-      activatesBefore: [ClientEvents.SetupSchema],
-      activate: SchemaDefs,
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(ClientCapabilities.Schema, [
-          DataType.View,
-          ViewTypeV1,
-          ViewTypeV2,
-          DataType.Event,
-          DataType.Organization,
-          DataType.Person,
-          DataType.Project,
-          DataType.Task,
-        ]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/migration`,
-      activatesOn: ClientEvents.SetupMigration,
-      activate: () => contributes(ClientCapabilities.Migration, [ViewTypeV1ToV2]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/whitelist-schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(ClientCapabilities.SchemaWhiteList, [
-          DataType.Event,
-          DataType.Organization,
-          DataType.Person,
-          DataType.Project,
-          DataType.Task,
-        ]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-root`,
-      activatesOn: Events.Startup,
-      activate: ReactRoot,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      // TODO(wittjosiah): Should occur before the settings dialog is loaded when surfaces activation is more granular.
-      activatesBefore: [SpaceEvents.SetupSettingsPanel],
-      activate: () => ReactSurface({ createInvitationUrl }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: (context) => IntentResolver({ context, createInvitationUrl, observability }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    // TODO(wittjosiah): This could probably be deferred.
-    defineModule({
-      id: `${meta.id}/module/app-graph-serializer`,
-      activatesOn: Events.AppGraphReady,
-      activate: AppGraphSerializer,
-    }),
-    defineModule({
-      id: `${meta.id}/module/identity-created`,
-      activatesOn: ClientEvents.IdentityCreated,
-      activatesAfter: [SpaceEvents.DefaultSpaceReady],
-      activate: IdentityCreated,
-    }),
-    defineModule({
-      id: `${meta.id}/module/spaces-ready`,
-      activatesOn: allOf(
-        Events.DispatcherReady,
-        Events.LayoutReady,
-        Events.AppGraphReady,
-        AttentionEvents.AttentionReady,
-        SpaceEvents.StateReady,
-        ClientEvents.SpacesReady,
-      ),
-      activate: SpacesReady,
-    }),
-  ]);
-};
+        activate: SpacesReady,
+      }),
+      defineModule({
+        id: `${meta.id}/module/repair`,
+        activatesOn: ClientEvents.SpacesReady,
+        activate: Repair,
+      }),
+    ];
+  },
+);