@dxos/plugin-space 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.406dc2a",
+  "version": "0.8.4-main.548089c",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -43,71 +43,73 @@
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~19.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.406dc2a",
-    "@dxos/app-framework": "0.8.4-main.406dc2a",
-    "@dxos/async": "0.8.4-main.406dc2a",
-    "@dxos/blueprints": "0.8.4-main.406dc2a",
-    "@dxos/client": "0.8.4-main.406dc2a",
-    "@dxos/context": "0.8.4-main.406dc2a",
-    "@dxos/display-name": "0.8.4-main.406dc2a",
-    "@dxos/echo": "0.8.4-main.406dc2a",
-    "@dxos/echo-signals": "0.8.4-main.406dc2a",
-    "@dxos/invariant": "0.8.4-main.406dc2a",
-    "@dxos/effect": "0.8.4-main.406dc2a",
-    "@dxos/live-object": "0.8.4-main.406dc2a",
-    "@dxos/keys": "0.8.4-main.406dc2a",
-    "@dxos/log": "0.8.4-main.406dc2a",
-    "@dxos/migrations": "0.8.4-main.406dc2a",
-    "@dxos/local-storage": "0.8.4-main.406dc2a",
-    "@dxos/plugin-attention": "0.8.4-main.406dc2a",
-    "@dxos/plugin-client": "0.8.4-main.406dc2a",
-    "@dxos/plugin-graph": "0.8.4-main.406dc2a",
-    "@dxos/plugin-observability": "0.8.4-main.406dc2a",
-    "@dxos/plugin-status-bar": "0.8.4-main.406dc2a",
-    "@dxos/protocols": "0.8.4-main.406dc2a",
-    "@dxos/plugin-deck": "0.8.4-main.406dc2a",
-    "@dxos/react-client": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-attention": "0.8.4-main.406dc2a",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-components": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-editor": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-form": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-masonry": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-list": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-pickers": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-searchlist": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-stack": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-tabs": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
-    "@dxos/schema": "0.8.4-main.406dc2a",
-    "@dxos/util": "0.8.4-main.406dc2a",
-    "@dxos/shell": "0.8.4-main.406dc2a"
+    "@dxos/app-framework": "0.8.4-main.548089c",
+    "@dxos/ai": "0.8.4-main.548089c",
+    "@dxos/async": "0.8.4-main.548089c",
+    "@dxos/blueprints": "0.8.4-main.548089c",
+    "@dxos/client": "0.8.4-main.548089c",
+    "@dxos/display-name": "0.8.4-main.548089c",
+    "@dxos/context": "0.8.4-main.548089c",
+    "@dxos/echo": "0.8.4-main.548089c",
+    "@dxos/echo-signals": "0.8.4-main.548089c",
+    "@dxos/effect": "0.8.4-main.548089c",
+    "@dxos/invariant": "0.8.4-main.548089c",
+    "@dxos/keys": "0.8.4-main.548089c",
+    "@dxos/live-object": "0.8.4-main.548089c",
+    "@dxos/functions": "0.8.4-main.548089c",
+    "@dxos/local-storage": "0.8.4-main.548089c",
+    "@dxos/log": "0.8.4-main.548089c",
+    "@dxos/plugin-attention": "0.8.4-main.548089c",
+    "@dxos/migrations": "0.8.4-main.548089c",
+    "@dxos/plugin-client": "0.8.4-main.548089c",
+    "@dxos/plugin-deck": "0.8.4-main.548089c",
+    "@dxos/plugin-graph": "0.8.4-main.548089c",
+    "@dxos/plugin-observability": "0.8.4-main.548089c",
+    "@dxos/plugin-status-bar": "0.8.4-main.548089c",
+    "@dxos/protocols": "0.8.4-main.548089c",
+    "@dxos/react-client": "0.8.4-main.548089c",
+    "@dxos/react-ui": "0.8.4-main.548089c",
+    "@dxos/react-ui-attention": "0.8.4-main.548089c",
+    "@dxos/react-ui-components": "0.8.4-main.548089c",
+    "@dxos/react-ui-form": "0.8.4-main.548089c",
+    "@dxos/react-ui-list": "0.8.4-main.548089c",
+    "@dxos/react-ui-editor": "0.8.4-main.548089c",
+    "@dxos/react-ui-masonry": "0.8.4-main.548089c",
+    "@dxos/react-ui-pickers": "0.8.4-main.548089c",
+    "@dxos/react-ui-searchlist": "0.8.4-main.548089c",
+    "@dxos/react-ui-stack": "0.8.4-main.548089c",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.548089c",
+    "@dxos/react-ui-tabs": "0.8.4-main.548089c",
+    "@dxos/react-ui-theme": "0.8.4-main.548089c",
+    "@dxos/schema": "0.8.4-main.548089c",
+    "@dxos/shell": "0.8.4-main.548089c",
+    "@dxos/util": "0.8.4-main.548089c",
+    "@dxos/types": "0.8.4-main.548089c"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
-    "@effect-rx/rx-react": "0.42.4",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "0.92.1",
     "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/lit-ui": "0.8.4-main.406dc2a",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/random": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
-    "@dxos/storybook-utils": "0.8.4-main.406dc2a"
+    "@dxos/lit-ui": "0.8.4-main.548089c",
+    "@dxos/random": "0.8.4-main.548089c",
+    "@dxos/react-ui": "0.8.4-main.548089c",
+    "@dxos/react-ui-theme": "0.8.4-main.548089c",
+    "@dxos/storybook-utils": "0.8.4-main.548089c"
   },
   "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": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
+    "@dxos/react-ui-theme": "0.8.4-main.548089c",
+    "@dxos/react-ui": "0.8.4-main.548089c"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -17,8 +17,20 @@ import {
 import { Ref, Tag, Type } from '@dxos/echo';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { DataType, createDefaultSchema, getTypenameFromQuery } from '@dxos/schema';
+import { Collection, DataTypes, StoredSchema, getTypenameFromQuery } 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,
@@ -89,17 +101,18 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
         activatesOn: Events.SetupMetadata,
         activate: () => [
           contributes(Capabilities.Metadata, {
-            id: Type.getTypename(DataType.Collection),
+            id: Collection.Collection.typename,
             metadata: {
               icon: 'ph--cards-three--regular',
+              iconHue: 'neutral',
               // TODO(wittjosiah): Move out of metadata.
-              loadReferences: async (collection: DataType.Collection) => await Ref.Array.loadAll(collection.objects),
+              loadReferences: async (collection: Collection.Collection) => await Ref.Array.loadAll(collection.objects),
             },
           }),
           contributes(Capabilities.Metadata, {
-            id: Type.getTypename(DataType.QueryCollection),
+            id: Type.getTypename(Collection.QueryCollection),
             metadata: {
-              label: (object: DataType.QueryCollection) => [
+              label: (object: Collection.QueryCollection) => [
                 'typename label',
                 {
                   ns: getTypenameFromQuery(object.query),
@@ -111,31 +124,32 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
             },
           }),
           contributes(Capabilities.Metadata, {
-            id: Type.getTypename(DataType.StoredSchema),
+            id: Type.getTypename(StoredSchema),
             metadata: {
               icon: 'ph--database--regular',
+              iconHue: 'green',
             },
           }),
           contributes(Capabilities.Metadata, {
-            id: Type.getTypename(DataType.Event),
+            id: Event.Event.typename,
             metadata: {
               icon: 'ph--calendar-dot--regular',
             },
           }),
           contributes(Capabilities.Metadata, {
-            id: Type.getTypename(DataType.Organization),
+            id: Organization.Organization.typename,
             metadata: {
               icon: 'ph--building-office--regular',
             },
           }),
           contributes(Capabilities.Metadata, {
-            id: Type.getTypename(DataType.Person),
+            id: Person.Person.typename,
             metadata: {
               icon: 'ph--user--regular',
             },
           }),
           contributes(Capabilities.Metadata, {
-            id: Type.getTypename(DataType.Task),
+            id: Task.Task.typename,
             metadata: {
               icon: 'ph--check-circle--regular',
             },
@@ -149,7 +163,7 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
           contributes(
             SpaceCapabilities.ObjectForm,
             defineObjectForm({
-              objectSchema: DataType.Collection,
+              objectSchema: Collection.Collection,
               formSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
               getIntent: (props) => createIntent(CollectionAction.Create, props),
             }),
@@ -158,7 +172,7 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
             SpaceCapabilities.ObjectForm,
             defineObjectForm({
               // TODO(wittjosiah): Remove cast.
-              objectSchema: DataType.QueryCollection as any,
+              objectSchema: Collection.QueryCollection as any,
               formSchema: CollectionAction.QueryCollectionForm,
               getIntent: (props) => createIntent(CollectionAction.CreateQueryCollection, props),
             }),
@@ -166,7 +180,7 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
           contributes(
             SpaceCapabilities.ObjectForm,
             defineObjectForm({
-              objectSchema: DataType.StoredSchema,
+              objectSchema: StoredSchema,
               formSchema: SpaceAction.StoredSchemaForm,
               getIntent: (props, options) =>
                 props.typename
@@ -174,7 +188,12 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
                   : createIntent(SpaceAction.AddSchema, {
                       space: options.space,
                       name: props.name,
-                      schema: createDefaultSchema(),
+                      // TODO(burdon): Import createDefaultSchema when it's exported from @dxos/schema
+                      schema: Schema.Struct({
+                        title: Schema.optional(Schema.String),
+                        status: Schema.optional(Schema.Literal('todo', 'in-progress', 'done')),
+                        description: Schema.optional(Schema.String),
+                      }),
                     }),
             }),
           ),
@@ -192,12 +211,17 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
         activate: () =>
           contributes(ClientCapabilities.Schema, [
             Tag.Tag,
-            DataType.View,
-            DataType.Event,
-            DataType.Organization,
-            DataType.Person,
-            DataType.Project,
-            DataType.Task,
+            Event.Event,
+            Organization.Organization,
+            Person.Person,
+            Project.Project,
+            Task.Task,
+            AnchoredTo.AnchoredTo,
+            Employer.Employer,
+            HasConnection.HasConnection,
+            HasRelationship.HasRelationship,
+            HasSubject.HasSubject,
+            ...DataTypes,
           ]),
       }),
       defineModule({
@@ -205,11 +229,11 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
         activatesOn: ClientEvents.SetupSchema,
         activate: () =>
           contributes(ClientCapabilities.SchemaWhiteList, [
-            DataType.Event,
-            DataType.Organization,
-            DataType.Person,
-            DataType.Project,
-            DataType.Task,
+            Event.Event,
+            Organization.Organization,
+            Person.Person,
+            Project.Project,
+            Task.Task,
           ]),
       }),
       defineModule({