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

package/src/capabilities/app-graph-serializer.ts

@@ -4,15 +4,15 @@
 
 import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { isSpace } from '@dxos/client/echo';
-import { Obj, Type } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Obj } from '@dxos/echo';
+import { Collection } from '@dxos/schema';
 
 import { meta } from '../meta';
 import { translations } from '../translations';
 import { SPACE_TYPE, SpaceAction } from '../types';
 import { SPACES } from '../util';
 
-const COLLECTION_TYPE = Type.getTypename(DataType.Collection);
+const COLLECTION_TYPE = Collection.Collection.typename;
 
 // https://stackoverflow.com/a/19016910
 const DIRECTORY_TYPE = 'text/directory';
@@ -56,7 +56,7 @@ export default (context: PluginContext) =>
       deserialize: async (data, ancestors) => {
         const space = ancestors.find(isSpace);
         const collection =
-          ancestors.findLast((ancestor) => Obj.instanceOf(DataType.Collection, ancestor)) ??
+          ancestors.findLast((ancestor) => Obj.instanceOf(Collection.Collection, ancestor)) ??
           space?.properties[COLLECTION_TYPE]?.target;
         if (!space || !collection) {
           return;
@@ -66,7 +66,7 @@ export default (context: PluginContext) =>
         const result = await dispatch(
           createIntent(SpaceAction.AddObject, {
             target: collection,
-            object: Obj.make(DataType.Collection, { name: data.name, objects: [] }),
+            object: Obj.make(Collection.Collection, { name: data.name, objects: [] }),
           }),
         );
 

package/src/capabilities/capabilities.ts

@@ -6,11 +6,11 @@ import type * as Schema from 'effect/Schema';
 
 import { type AnyIntentChain, type Label, defineCapability } from '@dxos/app-framework';
 import { type Space } from '@dxos/react-client/echo';
-import { type DataType } from '@dxos/schema';
+import { type Collection } from '@dxos/schema';
 import { type DeepReadonly, type Position } from '@dxos/util';
 
 import { meta } from '../meta';
-import { type ObjectForm, type PluginState } from '../types';
+import { type PluginState } from '../types';
 
 export namespace SpaceCapabilities {
   export const State = defineCapability<DeepReadonly<PluginState>>(`${meta.id}/capability/state`);
@@ -19,12 +19,22 @@ export namespace SpaceCapabilities {
   export type SettingsSection = { id: string; label: Label; position?: Position };
   export const SettingsSection = defineCapability<SettingsSection>(`${meta.id}/capability/settings-section`);
 
-  export type onCreateSpace = (params: { space: Space; rootCollection: DataType.Collection }) => AnyIntentChain;
-  export const onCreateSpace = defineCapability<onCreateSpace>(`${meta.id}/capability/on-space-created`);
-
-  export type OnSchemaAdded = (params: { space: Space; schema: Schema.Schema.AnyNoContext }) => AnyIntentChain;
+  export type OnCreateSpace = (params: {
+    space: Space;
+    isDefault: boolean;
+    rootCollection: Collection.Collection;
+  }) => AnyIntentChain;
+  export const OnCreateSpace = defineCapability<OnCreateSpace>(`${meta.id}/capability/on-space-created`);
+
+  export type OnSchemaAdded = (params: {
+    space: Space;
+    schema: Schema.Schema.AnyNoContext;
+    // TODO(wittjosiah): This is leaky.
+    show?: boolean;
+  }) => AnyIntentChain;
   export const OnSchemaAdded = defineCapability<OnSchemaAdded>(`${meta.id}/capability/on-schema-added`);
 
-  // TODO(burdon): Should this be view? Forms are UI concepts? (associated with a View/schema).
-  export const ObjectForm = defineCapability<ObjectForm<any>>(`${meta.id}/capability/object-form`);
+  // TODO(wittjosiah): Replace with migrations, this is not a sustainable solution.
+  export type HandleRepair = (params: { space: Space; isDefault: boolean }) => Promise<void>;
+  export const Repair = defineCapability<HandleRepair>(`${meta.id}/capability/repair`);
 }

package/src/capabilities/identity-created.ts

@@ -6,7 +6,7 @@ import { Capabilities, type PluginContext, contributes } from '@dxos/app-framewo
 import { Obj, Ref } from '@dxos/echo';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { DataType } from '@dxos/schema';
+import { Collection } from '@dxos/schema';
 
 export default async (context: PluginContext) => {
   const client = context.getCapability(ClientCapabilities.Client);
@@ -16,7 +16,7 @@ export default async (context: PluginContext) => {
   await defaultSpace.waitUntilReady();
 
   // Create root collection structure.
-  defaultSpace.properties[DataType.Collection.typename] = Ref.make(Obj.make(DataType.Collection, { objects: [] }));
+  defaultSpace.properties[Collection.Collection.typename] = Ref.make(Obj.make(Collection.Collection, { objects: [] }));
   if (Migrations.versionProperty) {
     defaultSpace.properties[Migrations.versionProperty] = Migrations.targetVersion;
   }

package/src/capabilities/index.ts

@@ -10,7 +10,7 @@ export const IdentityCreated = lazy(() => import('./identity-created'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactRoot = lazy(() => import('./react-root'));
 export const ReactSurface = lazy(() => import('./react-surface'));
-export const SchemaDefs = lazy(() => import('./schema-defs'));
+export const Repair = lazy(() => import('./repair'));
 export const SpaceSettings = lazy(() => import('./settings'));
 export const SpaceState = lazy(() => import('./state'));
 export const SpacesReady = lazy(() => import('./spaces-ready'));

package/src/capabilities/intent-resolver.ts

@@ -6,22 +6,27 @@ import * as Effect from 'effect/Effect';
 
 import {
   Capabilities,
+  type Label,
   LayoutAction,
   type PluginContext,
   contributes,
   createIntent,
   createResolver,
 } from '@dxos/app-framework';
-import { Filter, Obj, Query, Ref, Relation, Type } from '@dxos/echo';
+import { Obj, Query, Ref, Relation, Type } from '@dxos/echo';
+import { Serializer } from '@dxos/echo-db';
+import { DatabaseService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { SpaceState, fullyQualifiedId, getSpace, isSpace } from '@dxos/react-client/echo';
+import { SpaceState, getSpace, isSpace } from '@dxos/react-client/echo';
 import { Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
-import { DataType, ProjectionModel, getTypenameFromQuery } from '@dxos/schema';
+import { iconValues } from '@dxos/react-ui-pickers';
+import { hues } from '@dxos/react-ui-theme';
+import { Collection, ProjectionModel, getTypenameFromQuery } from '@dxos/schema';
 
 import {
   CREATE_OBJECT_DIALOG,
@@ -29,8 +34,8 @@ import {
   type CreateObjectDialogProps,
   JOIN_DIALOG,
   type JoinDialogProps,
-  POPOVER_RENAME_OBJECT,
-  POPOVER_RENAME_SPACE,
+  OBJECT_RENAME_POPOVER,
+  SPACE_RENAME_POPOVER,
 } from '../components';
 import { SpaceEvents } from '../events';
 import { meta } from '../meta';
@@ -40,7 +45,7 @@ import { COMPOSER_SPACE_LOCK, cloneObject, getNestedObjects } from '../util';
 import { SpaceCapabilities } from './capabilities';
 
 // TODO(wittjosiah): Remove.
-const SPACE_MAX_OBJECTS = 500;
+const SPACE_MAX_OBJECTS = 750;
 
 type IntentResolverOptions = {
   context: PluginContext;
@@ -69,8 +74,10 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.Create,
-      resolve: async ({ name, hue, icon, edgeReplication }) => {
+      resolve: async ({ name, hue: hue_, icon: icon_, edgeReplication }) => {
         const client = context.getCapability(ClientCapabilities.Client);
+        const hue = hue_ ?? hues[Math.floor(Math.random() * hues.length)];
+        const icon = icon_ ?? iconValues[Math.floor(Math.random() * iconValues.length)];
         const space = await client.spaces.create({ name, hue, icon });
         if (edgeReplication) {
           await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
@@ -78,8 +85,8 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         await space.waitUntilReady();
 
         // Create root collection.
-        const collection = Obj.make(DataType.Collection, { objects: [] });
-        space.properties[DataType.Collection.typename] = Ref.make(collection);
+        const collection = Obj.make(Collection.Collection, { objects: [] });
+        space.properties[Collection.Collection.typename] = Ref.make(collection);
 
         // Set current migration version.
         if (Migrations.versionProperty) {
@@ -87,16 +94,13 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         }
 
         // Create records smart collection.
-        const records = Obj.make(DataType.QueryCollection, {
-          query: Query.select(Filter.typename(DataType.StoredSchema.typename)).ast,
-        });
-        collection.objects.push(Ref.make(records));
+        collection.objects.push(Ref.make(Collection.makeManaged({ key: Type.getTypename(Type.PersistentType) })));
 
         // Allow other plugins to add default content.
         await context.activatePromise(SpaceEvents.SpaceCreated);
-        const onCreateSpaceCallbacks = context.getCapabilities(SpaceCapabilities.onCreateSpace);
+        const onCreateSpaceCallbacks = context.getCapabilities(SpaceCapabilities.OnCreateSpace);
         const spaceCreatedIntents = onCreateSpaceCallbacks.map((onCreateSpace) =>
-          onCreateSpace({ space, rootCollection: collection }),
+          onCreateSpace({ space, isDefault: false, rootCollection: collection }),
         );
 
         return {
@@ -254,7 +258,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           intents: [
             createIntent(LayoutAction.UpdatePopover, {
               part: 'popover',
-              subject: POPOVER_RENAME_SPACE,
+              subject: SPACE_RENAME_POPOVER,
               options: {
                 anchorId: `dxos.org/ui/${caller}/${space.id}`,
                 props: space,
@@ -321,9 +325,20 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         };
       },
     }),
+    createResolver({
+      intent: SpaceAction.Snapshot,
+      resolve: async ({ space, query }) => {
+        const backup = await new Serializer().export(space.db, query && Query.fromAst(query));
+        return {
+          data: {
+            snapshot: new Blob([JSON.stringify(backup, null, 2)], { type: 'application/json' }),
+          },
+        };
+      },
+    }),
     createResolver({
       intent: SpaceAction.UseStaticSchema,
-      resolve: async ({ space, typename }) => {
+      resolve: async ({ space, typename, show }) => {
         const client = context.getCapability(ClientCapabilities.Client);
         const schema = client.graph.schemaRegistry.schemas.find((schema) => Type.getTypename(schema) === typename);
         invariant(schema, `Schema not found: ${typename}`);
@@ -338,7 +353,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
 
         await context.activatePromise(SpaceEvents.SchemaAdded);
         const onSchemaAdded = context.getCapabilities(SpaceCapabilities.OnSchemaAdded);
-        const schemaAddedIntents = onSchemaAdded.map((onSchemaAdded) => onSchemaAdded({ space, schema }));
+        const schemaAddedIntents = onSchemaAdded.map((onSchemaAdded) => onSchemaAdded({ space, schema, show }));
 
         return {
           data: {},
@@ -361,7 +376,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.AddSchema,
-      resolve: async ({ space, name, typename, version, schema: schemaInput }) => {
+      resolve: async ({ space, name, typename, version, schema: schemaInput, show }) => {
         const [schema] = await space.db.schemaRegistry.register([schemaInput]);
         if (name) {
           schema.storedSchema.name = name;
@@ -375,7 +390,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
 
         await context.activatePromise(SpaceEvents.SchemaAdded);
         const onSchemaAdded = context.getCapabilities(SpaceCapabilities.OnSchemaAdded);
-        const schemaAddedIntents = onSchemaAdded.map((onSchemaAdded) => onSchemaAdded({ space, schema }));
+        const schemaAddedIntents = onSchemaAdded.map((onSchemaAdded) => onSchemaAdded({ space, schema, show }));
 
         return {
           data: {
@@ -445,9 +460,9 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
                   onCreateObject,
                   shouldNavigate: navigable
                     ? (object: Obj.Any) => {
-                        const isCollection = Obj.instanceOf(DataType.Collection, object);
-                        const isQueryCollection = Obj.instanceOf(DataType.QueryCollection, object);
-                        return (!isCollection && !isQueryCollection) || state.navigableCollections;
+                        const isCollection = Obj.instanceOf(Collection.Collection, object);
+                        const isSystemCollection = Obj.instanceOf(Collection.Managed, object);
+                        return (!isCollection && !isSystemCollection) || state.navigableCollections;
                       }
                     : () => false,
                 } satisfies Partial<CreateObjectDialogProps>,
@@ -495,25 +510,18 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           };
         }
 
-        if (Obj.instanceOf(DataType.Collection, target)) {
-          target.objects.push(Ref.make(object));
-        } else if (isSpace(target) && hidden) {
-          space.db.add(object);
-        } else if (isSpace(target)) {
-          const collection = space.properties[DataType.Collection.typename]?.target;
-          if (Obj.instanceOf(DataType.Collection, collection)) {
-            collection.objects.push(Ref.make(object));
-          } else {
-            // TODO(wittjosiah): Can't add non-echo objects by including in a collection because of types.
-            const collection = Obj.make(DataType.Collection, { objects: [Ref.make(object)] });
-            space.properties[DataType.Collection.typename] = Ref.make(collection);
-          }
-        }
+        await Effect.gen(function* () {
+          yield* Collection.add({
+            object,
+            target: isSpace(target) ? undefined : target,
+            hidden,
+          });
+        }).pipe(Effect.provide(DatabaseService.layer(space.db)), Effect.runPromise);
 
         return {
           data: {
-            id: fullyQualifiedId(object),
-            subject: [fullyQualifiedId(object)],
+            id: Obj.getDXN(object).toString(),
+            subject: [Obj.getDXN(object).toString()],
             object,
           },
           intents: [
@@ -562,26 +570,26 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         const openObjectIds = new Set<string>(layout.active);
 
         if (!undo) {
-          const parentCollection: DataType.Collection =
-            target ?? space.properties[DataType.Collection.typename]?.target;
+          const parentCollection: Collection.Collection =
+            target ?? space.properties[Collection.Collection.typename]?.target;
           const nestedObjectsList = await Promise.all(objects.map((obj) => getNestedObjects(obj, resolve)));
 
           const deletionData = {
             objects,
             parentCollection,
             indices: objects.map((obj) =>
-              Obj.instanceOf(DataType.Collection, parentCollection)
+              Obj.instanceOf(Collection.Collection, parentCollection)
                 ? parentCollection.objects.findIndex((object) => object.target === obj)
                 : -1,
             ),
             nestedObjectsList,
             wasActive: objects
               .flatMap((obj, i) => [obj, ...nestedObjectsList[i]])
-              .map((obj) => fullyQualifiedId(obj))
+              .map((obj) => Obj.getDXN(obj).toString())
               .filter((id) => openObjectIds.has(id)),
           } satisfies SpaceAction.DeletionData;
 
-          if (Obj.instanceOf(DataType.Collection, deletionData.parentCollection)) {
+          if (Obj.instanceOf(Collection.Collection, deletionData.parentCollection)) {
             [...deletionData.indices]
               .sort((a, b) => b - a)
               .forEach((index: number) => {
@@ -596,16 +604,17 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           });
           objects.forEach((obj) => space.db.remove(obj));
 
-          const undoMessageKey = objects.some((obj) => Obj.instanceOf(DataType.Collection, obj))
-            ? 'collection deleted label'
-            : objects.length > 1
-              ? 'objects deleted label'
-              : 'object deleted label';
+          // TODO(wittjosiah): Once we can compose translations outside of react, use count instead.
+          //   ['deleted label', { ns: meta.id, typename: ['typename label', { ns: typename, count: objects.length }] }]
+          const undoMessageLabel: Label =
+            objects.length === 1
+              ? ['object deleted label', { ns: Obj.getTypename(objects[0]) ?? meta.id, defaultValue: 'Object deleted' }]
+              : ['objects deleted label', { ns: meta.id }];
 
           return {
             undoable: {
               // TODO(ZaymonFC): Pluralize if more than one object.
-              message: [undoMessageKey, { ns: meta.id }],
+              message: undoMessageLabel,
               data: { deletionData },
             },
             intents:
@@ -623,19 +632,19 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           if (
             deletionData?.objects?.length &&
             deletionData.objects.every(Obj.isObject) &&
-            Obj.instanceOf(DataType.Collection, deletionData.parentCollection)
+            Obj.instanceOf(Collection.Collection, deletionData.parentCollection)
           ) {
             // Restore the object to the space.
-            const restoredObjects = deletionData.objects.map((obj: Type.Expando) => space.db.add(obj));
+            const restoredObjects = deletionData.objects.map((obj: Obj.Any) => space.db.add(obj));
 
             // Restore nested objects to the space.
-            deletionData.nestedObjectsList.flat().forEach((obj: Type.Expando) => {
+            deletionData.nestedObjectsList.flat().forEach((obj: Obj.Any) => {
               space.db.add(obj);
             });
 
             deletionData.indices.forEach((index: number, i: number) => {
               if (index !== -1) {
-                deletionData.parentCollection.objects.splice(index, 0, Ref.make(restoredObjects[i] as Type.Expando));
+                deletionData.parentCollection.objects.splice(index, 0, Ref.make(restoredObjects[i] as Obj.Any));
               }
             });
 
@@ -660,9 +669,9 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         intents: [
           createIntent(LayoutAction.UpdatePopover, {
             part: 'popover',
-            subject: POPOVER_RENAME_OBJECT,
+            subject: OBJECT_RENAME_POPOVER,
             options: {
-              anchorId: `dxos.org/ui/${caller}/${fullyQualifiedId(object)}`,
+              anchorId: `dxos.org/ui/${caller}/${Obj.getDXN(object).toString()}`,
               props: object,
             },
           }),
@@ -674,7 +683,6 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
       resolve: async ({ object, target }) => {
         const space = isSpace(target) ? target : getSpace(target);
         invariant(space, 'Space not found.');
-
         const newObject = await cloneObject(object, resolve, space);
         return {
           intents: [createIntent(SpaceAction.AddObject, { object: newObject, target })],
@@ -691,15 +699,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: CollectionAction.Create,
       resolve: async ({ name }) => ({
-        data: { object: Obj.make(DataType.Collection, { name, objects: [] }) },
-      }),
-    }),
-    createResolver({
-      intent: CollectionAction.CreateQueryCollection,
-      resolve: async ({ name, typename }) => ({
-        data: {
-          object: Obj.make(DataType.QueryCollection, { name, query: Query.select(Filter.typename(typename)).ast }),
-        },
+        data: { object: Obj.make(Collection.Collection, { name, objects: [] }) },
       }),
     }),
   ]);

package/src/capabilities/react-root.tsx

@@ -4,7 +4,8 @@
 
 import React from 'react';
 
-import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
+import { Capabilities, contributes } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 
 import { AwaitingObject } from '../components';
 import { meta } from '../meta';