@dxos/plugin-space 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.7ace549",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -43,50 +43,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.72ec0f3",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/context": "0.8.4-main.72ec0f3",
-    "@dxos/client": "0.8.4-main.72ec0f3",
-    "@dxos/blueprints": "0.8.4-main.72ec0f3",
-    "@dxos/echo-signals": "0.8.4-main.72ec0f3",
-    "@dxos/display-name": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/effect": "0.8.4-main.72ec0f3",
-    "@dxos/functions": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/keys": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/local-storage": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-attention": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-client": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-deck": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-graph": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-observability": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-status-bar": "0.8.4-main.72ec0f3",
-    "@dxos/protocols": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/migrations": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-components": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-attention": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-form": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-list": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-editor": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-masonry": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-pickers": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-searchlist": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-tabs": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/shell": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/types": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3"
+    "@dxos/ai": "0.8.4-main.7ace549",
+    "@dxos/app-framework": "0.8.4-main.7ace549",
+    "@dxos/async": "0.8.4-main.7ace549",
+    "@dxos/client-protocol": "0.8.4-main.7ace549",
+    "@dxos/context": "0.8.4-main.7ace549",
+    "@dxos/blueprints": "0.8.4-main.7ace549",
+    "@dxos/client": "0.8.4-main.7ace549",
+    "@dxos/echo": "0.8.4-main.7ace549",
+    "@dxos/echo-db": "0.8.4-main.7ace549",
+    "@dxos/echo-protocol": "0.8.4-main.7ace549",
+    "@dxos/echo-signals": "0.8.4-main.7ace549",
+    "@dxos/effect": "0.8.4-main.7ace549",
+    "@dxos/functions": "0.8.4-main.7ace549",
+    "@dxos/invariant": "0.8.4-main.7ace549",
+    "@dxos/keys": "0.8.4-main.7ace549",
+    "@dxos/local-storage": "0.8.4-main.7ace549",
+    "@dxos/live-object": "0.8.4-main.7ace549",
+    "@dxos/log": "0.8.4-main.7ace549",
+    "@dxos/display-name": "0.8.4-main.7ace549",
+    "@dxos/migrations": "0.8.4-main.7ace549",
+    "@dxos/plugin-attention": "0.8.4-main.7ace549",
+    "@dxos/plugin-client": "0.8.4-main.7ace549",
+    "@dxos/plugin-graph": "0.8.4-main.7ace549",
+    "@dxos/plugin-deck": "0.8.4-main.7ace549",
+    "@dxos/plugin-status-bar": "0.8.4-main.7ace549",
+    "@dxos/plugin-observability": "0.8.4-main.7ace549",
+    "@dxos/protocols": "0.8.4-main.7ace549",
+    "@dxos/react-client": "0.8.4-main.7ace549",
+    "@dxos/react-ui-attention": "0.8.4-main.7ace549",
+    "@dxos/react-ui-components": "0.8.4-main.7ace549",
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-editor": "0.8.4-main.7ace549",
+    "@dxos/react-ui-form": "0.8.4-main.7ace549",
+    "@dxos/react-ui-list": "0.8.4-main.7ace549",
+    "@dxos/react-ui-masonry": "0.8.4-main.7ace549",
+    "@dxos/react-ui-pickers": "0.8.4-main.7ace549",
+    "@dxos/react-ui-searchlist": "0.8.4-main.7ace549",
+    "@dxos/react-ui-stack": "0.8.4-main.7ace549",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.7ace549",
+    "@dxos/react-ui-tabs": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549",
+    "@dxos/shell": "0.8.4-main.7ace549",
+    "@dxos/types": "0.8.4-main.7ace549",
+    "@dxos/schema": "0.8.4-main.7ace549",
+    "@dxos/util": "0.8.4-main.7ace549"
   },
   "devDependencies": {
+    "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.3",
     "@babel/core": "^7.18.13",
     "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "0.92.1",
@@ -96,11 +100,11 @@
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/lit-ui": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3"
+    "@dxos/lit-ui": "0.8.4-main.7ace549",
+    "@dxos/random": "0.8.4-main.7ace549",
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549",
+    "@dxos/storybook-utils": "0.8.4-main.7ace549"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -108,8 +112,8 @@
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-theme": "0.8.4-main.7ace549"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -17,7 +17,9 @@ import {
 import { Ref, Tag, Type } from '@dxos/echo';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { Collection, DataTypes, StoredSchema, getTypenameFromQuery } 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,
@@ -39,8 +41,7 @@ import {
   IntentResolver,
   ReactRoot,
   ReactSurface,
-  SchemaDefs,
-  SpaceCapabilities,
+  Repair,
   SpaceSettings,
   SpaceState,
   SpacesReady,
@@ -48,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 = {
   /**
@@ -94,7 +95,13 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
       defineModule({
         id: `${meta.id}/module/translations`,
         activatesOn: Events.SetupTranslations,
-        activate: () => contributes(Capabilities.Translations, [...translations, ...shellTranslations]),
+        activate: () =>
+          contributes(Capabilities.Translations, [
+            ...translations,
+            ...componentsTranslations,
+            ...formTranslations,
+            ...shellTranslations,
+          ]),
       }),
       defineModule({
         id: `${meta.id}/module/metadata`,
@@ -107,27 +114,26 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
               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(Capabilities.Metadata, {
-            id: Type.getTypename(Collection.QueryCollection),
-            metadata: {
-              label: (object: Collection.QueryCollection) => [
-                'typename label',
-                {
-                  ns: getTypenameFromQuery(object.query),
-                  count: 2,
-                  defaultValue: 'New smart collection',
-                },
-              ],
-              icon: 'ph--funnel-simple--regular',
-            },
-          }),
-          contributes(Capabilities.Metadata, {
-            id: Type.getTypename(StoredSchema),
+            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(Capabilities.Metadata, {
@@ -156,83 +162,22 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
           }),
         ],
       }),
-      defineModule({
-        id: `${meta.id}/module/object-form`,
-        activatesOn: ClientEvents.SetupSchema,
-        activate: () => [
-          contributes(
-            SpaceCapabilities.ObjectForm,
-            defineObjectForm({
-              objectSchema: Collection.Collection,
-              formSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
-              getIntent: (props) => createIntent(CollectionAction.Create, props),
-            }),
-          ),
-          contributes(
-            SpaceCapabilities.ObjectForm,
-            defineObjectForm({
-              // TODO(wittjosiah): Remove cast.
-              objectSchema: Collection.QueryCollection as any,
-              formSchema: CollectionAction.QueryCollectionForm,
-              getIntent: (props) => createIntent(CollectionAction.CreateQueryCollection, props),
-            }),
-          ),
-          contributes(
-            SpaceCapabilities.ObjectForm,
-            defineObjectForm({
-              objectSchema: 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,
-                      // 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),
-                      }),
-                    }),
-            }),
-          ),
-        ],
-      }),
-      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, [
-            Tag.Tag,
-            Event.Event,
-            Organization.Organization,
-            Person.Person,
-            Project.Project,
-            Task.Task,
+            ...DataTypes,
             AnchoredTo.AnchoredTo,
             Employer.Employer,
+            Event.Event,
             HasConnection.HasConnection,
             HasRelationship.HasRelationship,
             HasSubject.HasSubject,
-            ...DataTypes,
-          ]),
-      }),
-      defineModule({
-        id: `${meta.id}/module/whitelist-schema`,
-        activatesOn: ClientEvents.SetupSchema,
-        activate: () =>
-          contributes(ClientCapabilities.SchemaWhiteList, [
-            Event.Event,
             Organization.Organization,
             Person.Person,
             Project.Project,
+            Tag.Tag,
             Task.Task,
           ]),
       }),
@@ -282,6 +227,11 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
         ),
         activate: SpacesReady,
       }),
+      defineModule({
+        id: `${meta.id}/module/repair`,
+        activatesOn: ClientEvents.SpacesReady,
+        activate: Repair,
+      }),
     ];
   },
 );