@dxos/plugin-space 0.8.3-main.7f5a14c → 0.8.3-staging.0fa589b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.3-main.7f5a14c",
+  "version": "0.8.3-staging.0fa589b",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,44 +42,44 @@
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~18.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.3-main.7f5a14c",
-    "@dxos/app-framework": "0.8.3-main.7f5a14c",
-    "@dxos/async": "0.8.3-main.7f5a14c",
-    "@dxos/artifact": "0.8.3-main.7f5a14c",
-    "@dxos/client": "0.8.3-main.7f5a14c",
-    "@dxos/context": "0.8.3-main.7f5a14c",
-    "@dxos/display-name": "0.8.3-main.7f5a14c",
-    "@dxos/echo": "0.8.3-main.7f5a14c",
-    "@dxos/echo-schema": "0.8.3-main.7f5a14c",
-    "@dxos/echo-signals": "0.8.3-main.7f5a14c",
-    "@dxos/effect": "0.8.3-main.7f5a14c",
-    "@dxos/invariant": "0.8.3-main.7f5a14c",
-    "@dxos/keys": "0.8.3-main.7f5a14c",
-    "@dxos/live-object": "0.8.3-main.7f5a14c",
-    "@dxos/local-storage": "0.8.3-main.7f5a14c",
-    "@dxos/migrations": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-client": "0.8.3-main.7f5a14c",
-    "@dxos/log": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-deck": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-attention": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-graph": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-observability": "0.8.3-main.7f5a14c",
-    "@dxos/react-client": "0.8.3-main.7f5a14c",
-    "@dxos/protocols": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-status-bar": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-attention": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-editor": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-form": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-list": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-pickers": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-searchlist": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-tabs": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-stack": "0.8.3-main.7f5a14c",
-    "@dxos/schema": "0.8.3-main.7f5a14c",
-    "@dxos/shell": "0.8.3-main.7f5a14c",
-    "@dxos/util": "0.8.3-main.7f5a14c"
+    "@dxos/ai": "0.8.3-staging.0fa589b",
+    "@dxos/artifact": "0.8.3-staging.0fa589b",
+    "@dxos/app-framework": "0.8.3-staging.0fa589b",
+    "@dxos/async": "0.8.3-staging.0fa589b",
+    "@dxos/context": "0.8.3-staging.0fa589b",
+    "@dxos/client": "0.8.3-staging.0fa589b",
+    "@dxos/display-name": "0.8.3-staging.0fa589b",
+    "@dxos/echo-schema": "0.8.3-staging.0fa589b",
+    "@dxos/echo": "0.8.3-staging.0fa589b",
+    "@dxos/echo-signals": "0.8.3-staging.0fa589b",
+    "@dxos/keys": "0.8.3-staging.0fa589b",
+    "@dxos/effect": "0.8.3-staging.0fa589b",
+    "@dxos/invariant": "0.8.3-staging.0fa589b",
+    "@dxos/live-object": "0.8.3-staging.0fa589b",
+    "@dxos/local-storage": "0.8.3-staging.0fa589b",
+    "@dxos/log": "0.8.3-staging.0fa589b",
+    "@dxos/migrations": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-client": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-attention": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-deck": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-graph": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-observability": "0.8.3-staging.0fa589b",
+    "@dxos/protocols": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-status-bar": "0.8.3-staging.0fa589b",
+    "@dxos/react-client": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-attention": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-editor": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-list": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-form": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-pickers": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-searchlist": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-stack": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-tabs": "0.8.3-staging.0fa589b",
+    "@dxos/shell": "0.8.3-staging.0fa589b",
+    "@dxos/schema": "0.8.3-staging.0fa589b",
+    "@dxos/util": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
@@ -91,10 +91,10 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui": "0.8.3-main.7f5a14c",
-    "@dxos/storybook-utils": "0.8.3-main.7f5a14c"
+    "@dxos/random": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b",
+    "@dxos/storybook-utils": "0.8.3-staging.0fa589b"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -103,8 +103,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
+    "@dxos/react-ui": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b"
   },
   "publishConfig": {
     "access": "public"

package/src/{SpacePlugin.tsx → SpacePlugin.ts}

@@ -14,9 +14,10 @@ import {
   definePlugin,
   oneOf,
 } from '@dxos/app-framework';
-import { Ref } from '@dxos/echo';
+import { Ref, Type } from '@dxos/echo';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientEvents } from '@dxos/plugin-client';
+import { DataType } from '@dxos/schema';
 import { osTranslations } from '@dxos/shell/react';
 
 import {
@@ -36,7 +37,7 @@ import {
 import { SpaceEvents } from './events';
 import { meta } from './meta';
 import translations from './translations';
-import { CollectionAction, CollectionType, defineObjectForm } from './types';
+import { CollectionAction, defineObjectForm } from './types';
 
 export type SpacePluginOptions = {
   /**
@@ -89,29 +90,48 @@ export const SpacePlugin = ({
     defineModule({
       id: `${meta.id}/module/metadata`,
       activatesOn: Events.SetupMetadata,
-      activate: () =>
+      activate: () => [
         contributes(Capabilities.Metadata, {
-          id: CollectionType.typename,
+          id: Type.getTypename(DataType.Collection),
           metadata: {
             icon: 'ph--cards-three--regular',
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (collection: CollectionType) =>
-              await Ref.Array.loadAll([...collection.objects, ...Object.values(collection.views)]),
+            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',
+          },
+        }),
+      ],
     }),
     defineModule({
       id: `${meta.id}/module/object-form`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
+      activate: () => [
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
-            objectSchema: CollectionType,
+            objectSchema: DataType.Collection,
             formSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
             getIntent: (props) => createIntent(CollectionAction.Create, props),
           }),
         ),
+        contributes(
+          SpaceCapabilities.ObjectForm,
+          defineObjectForm({
+            objectSchema: DataType.QueryCollection,
+            formSchema: CollectionAction.QueryCollectionForm,
+            getIntent: (props) => createIntent(CollectionAction.CreateQueryCollection, props),
+          }),
+        ),
+      ],
     }),
     defineModule({
       id: `${meta.id}/module/schema`,

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

@@ -7,17 +7,18 @@ import { Array, Option, pipe } from 'effect';
 
 import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
 import { getSpace, SpaceState, type Space, isSpace, type QueryResult } from '@dxos/client/echo';
-import { Filter, Obj, Type } from '@dxos/echo';
+import { Filter, Obj, Query, Type } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { createExtension, rxFromObservable, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';
+import { DataType } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
 import { SpaceCapabilities } from './capabilities';
 import { getActiveSpace } from '../hooks';
 import { SPACE_PLUGIN } from '../meta';
-import { CollectionType, SPACE_TYPE, SpaceAction, type SpaceSettingsProps } from '../types';
+import { SPACE_TYPE, SpaceAction, type SpaceSettingsProps } from '../types';
 import {
   constructObjectActions,
   constructSpaceActions,
@@ -29,6 +30,7 @@ import {
 } from '../util';
 
 export default (context: PluginContext) => {
+  // TODO(wittjosiah): Make reactive.
   const resolve = (typename: string) =>
     context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
 
@@ -319,7 +321,10 @@ export default (context: PluginContext) => {
               }
 
               const collection = get(
-                rxFromSignal(() => space.properties[CollectionType.typename]?.target as CollectionType | undefined),
+                rxFromSignal(
+                  () =>
+                    space.properties[Type.getTypename(DataType.Collection)]?.target as DataType.Collection | undefined,
+                ),
               );
               if (!collection) {
                 return [];
@@ -356,7 +361,9 @@ export default (context: PluginContext) => {
         Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) => (node.data instanceof CollectionType ? Option.some(node.data) : Option.none())),
+            Option.flatMap((node) =>
+              Obj.instanceOf(DataType.Collection, node.data) ? Option.some(node.data) : Option.none(),
+            ),
             Option.map((collection) => {
               const state = context.getCapability(SpaceCapabilities.State);
               const space = getSpace(collection);
@@ -418,6 +425,60 @@ export default (context: PluginContext) => {
       // },
     }),
 
+    // Create nodes for objects in a query collection.
+    createExtension({
+      id: `${SPACE_PLUGIN}/query-collection-objects`,
+      connector: (node) => {
+        let query: QueryResult<Type.Expando> | undefined;
+        return Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) =>
+              Obj.instanceOf(DataType.QueryCollection, node.data) ? Option.some(node.data) : Option.none(),
+            ),
+            Option.flatMap((collection) => {
+              const space = getSpace(collection);
+              return collection.query.typename && space
+                ? Option.some({ typename: collection.query.typename, space })
+                : Option.none();
+            }),
+            Option.map(({ typename, space }) => {
+              const state = context.getCapability(SpaceCapabilities.State);
+              if (!query) {
+                query = space.db.query(
+                  Query.without(
+                    Query.select(Filter.typename(typename)),
+                    // TODO(wittjosiah): This query is broader than it should be.
+                    //   It will return all objects in the collection, not just the ones of the given type.
+                    //   However this works fine for now because this query is only used for exclusions.
+                    Query.select(Filter.typename(typename))
+                      .referencedBy(DataType.Collection, 'objects')
+                      .reference('objects'),
+                  ),
+                );
+              }
+              return get(rxFromQuery(query))
+                .map((object) =>
+                  get(
+                    rxFromSignal(() =>
+                      createObjectNode({
+                        object,
+                        space,
+                        resolve,
+                        droppable: false, // Cannot rearrange query collections.
+                        navigable: state.navigableCollections,
+                      }),
+                    ),
+                  ),
+                )
+                .filter(isNonNullable);
+            }),
+            Option.getOrElse(() => []),
+          ),
+        );
+      },
+    }),
+
     // Create collection actions and action groups.
     createExtension({
       id: `${SPACE_PLUGIN}/object-actions`,
@@ -430,6 +491,7 @@ export default (context: PluginContext) => {
               const [dispatcher] = get(context.capabilities(Capabilities.IntentDispatcher));
               const [appGraph] = get(context.capabilities(Capabilities.AppGraph));
               const [state] = get(context.capabilities(SpaceCapabilities.State));
+              const objectForms = get(context.capabilities(SpaceCapabilities.ObjectForm));
 
               if (!dispatcher || !appGraph || !state) {
                 return Option.none();
@@ -438,6 +500,7 @@ export default (context: PluginContext) => {
                   object,
                   graph: appGraph.graph,
                   dispatch: dispatcher.dispatchPromise,
+                  objectForms,
                   navigable: get(rxFromSignal(() => state.navigableCollections)),
                 });
               }

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

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

package/src/capabilities/capabilities.ts

@@ -3,7 +3,9 @@
 //
 
 import { defineCapability, type Label } from '@dxos/app-framework';
-import { type Position, type DeepReadonly } from '@dxos/util';
+import { type Space } from '@dxos/react-client/echo';
+import { type DataType } from '@dxos/schema';
+import { type Position, type DeepReadonly, type MaybePromise } from '@dxos/util';
 
 import { SPACE_PLUGIN } from '../meta';
 import { type ObjectForm, type PluginState } from '../types';
@@ -15,5 +17,8 @@ export namespace SpaceCapabilities {
   export type SettingsSection = { id: string; label: Label; position?: Position };
   export const SettingsSection = defineCapability<SettingsSection>(`${SPACE_PLUGIN}/capability/settings-section`);
 
+  export type OnSpaceCreated = (params: { space: Space; rootCollection: DataType.Collection }) => MaybePromise<void>;
+  export const OnSpaceCreated = defineCapability<OnSpaceCreated>(`${SPACE_PLUGIN}/capability/on-space-created`);
+
   export const ObjectForm = defineCapability<ObjectForm<any>>(`${SPACE_PLUGIN}/capability/object-form`);
 }

package/src/capabilities/identity-created.ts

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

package/src/capabilities/intent-resolver.ts

@@ -12,7 +12,7 @@ import {
   createIntent,
   createResolver,
 } from '@dxos/app-framework';
-import { Obj, Ref, Relation, type Type } from '@dxos/echo';
+import { Obj, Ref, Relation, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
@@ -21,6 +21,7 @@ import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata
 import { isSpace, getSpace, SpaceState, fullyQualifiedId } from '@dxos/react-client/echo';
 import { Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
+import { DataType } from '@dxos/schema';
 
 import { SpaceCapabilities } from './capabilities';
 import {
@@ -32,8 +33,9 @@ import {
   type CreateObjectDialogProps,
   type JoinDialogProps,
 } from '../components';
+import { SpaceEvents } from '../events';
 import { SPACE_PLUGIN } from '../meta';
-import { CollectionAction, CollectionType, SpaceAction } from '../types';
+import { CollectionAction, SpaceAction } from '../types';
 import { cloneObject, COMPOSER_SPACE_LOCK, getNestedObjects } from '../util';
 
 // TODO(wittjosiah): Remove.
@@ -73,13 +75,19 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
         }
         await space.waitUntilReady();
-        const collection = Obj.make(CollectionType, { objects: [], views: {} });
-        space.properties[CollectionType.typename] = Ref.make(collection);
+        const collection = Obj.make(DataType.Collection, { objects: [] });
+        space.properties[Type.getTypename(DataType.Collection)] = Ref.make(collection);
 
         if (Migrations.versionProperty) {
           space.properties[Migrations.versionProperty] = Migrations.targetVersion;
         }
 
+        await context.activatePromise(SpaceEvents.SpaceCreated);
+        const onSpaceCreatedCallbacks = context.getCapabilities(SpaceCapabilities.OnSpaceCreated);
+        await Promise.all(
+          onSpaceCreatedCallbacks.map((onSpaceCreated) => onSpaceCreated({ space, rootCollection: collection })),
+        );
+
         return {
           data: {
             id: space.id,
@@ -303,7 +311,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.OpenCreateObject,
-      resolve: ({ target, navigable = true }) => {
+      resolve: ({ target, typename, navigable = true }) => {
         const state = context.getCapability(SpaceCapabilities.State);
 
         return {
@@ -315,8 +323,13 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
                 blockAlign: 'start',
                 props: {
                   target,
+                  typename,
                   shouldNavigate: navigable
-                    ? (object: Obj.Any) => !(object instanceof CollectionType) || state.navigableCollections
+                    ? (object: Obj.Any) => {
+                        const isCollection = Obj.instanceOf(DataType.Collection, object);
+                        const isQueryCollection = Obj.instanceOf(DataType.QueryCollection, object);
+                        return (!isCollection && !isQueryCollection) || state.navigableCollections;
+                      }
                     : () => false,
                 } satisfies Partial<CreateObjectDialogProps>,
               },
@@ -363,18 +376,18 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           };
         }
 
-        if (target instanceof CollectionType) {
+        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[CollectionType.typename]?.target;
-          if (collection instanceof CollectionType) {
+          const collection = space.properties[Type.getTypename(DataType.Collection)]?.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(CollectionType, { objects: [Ref.make(object)], views: {} });
-            space.properties[CollectionType.typename] = Ref.make(collection);
+            const collection = Obj.make(DataType.Collection, { objects: [Ref.make(object)] });
+            space.properties[Type.getTypename(DataType.Collection)] = Ref.make(collection);
           }
         }
 
@@ -405,7 +418,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
       intent: SpaceAction.AddRelation,
       resolve: ({ space, schema, source, target, fields }) => {
         const relation = space.db.add(
-          Obj.make(schema, {
+          Relation.make(schema, {
             [Relation.Source]: source,
             [Relation.Target]: target,
             ...fields,
@@ -430,14 +443,15 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         const openObjectIds = new Set<string>(layout.active);
 
         if (!undo) {
-          const parentCollection: CollectionType = target ?? space.properties[CollectionType.typename]?.target;
+          const parentCollection: DataType.Collection =
+            target ?? space.properties[Type.getTypename(DataType.Collection)]?.target;
           const nestedObjectsList = await Promise.all(objects.map((obj) => getNestedObjects(obj, resolve)));
 
           const deletionData = {
             objects,
             parentCollection,
             indices: objects.map((obj) =>
-              parentCollection instanceof CollectionType
+              Obj.instanceOf(DataType.Collection, parentCollection)
                 ? parentCollection.objects.findIndex((object) => object.target === obj)
                 : -1,
             ),
@@ -448,7 +462,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
               .filter((id) => openObjectIds.has(id)),
           } satisfies SpaceAction.DeletionData;
 
-          if (deletionData.parentCollection instanceof CollectionType) {
+          if (Obj.instanceOf(DataType.Collection, deletionData.parentCollection)) {
             [...deletionData.indices]
               .sort((a, b) => b - a)
               .forEach((index: number) => {
@@ -463,7 +477,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           });
           objects.forEach((obj) => space.db.remove(obj));
 
-          const undoMessageKey = objects.some((obj) => obj instanceof CollectionType)
+          const undoMessageKey = objects.some((obj) => Obj.instanceOf(DataType.Collection, obj))
             ? 'collection deleted label'
             : objects.length > 1
               ? 'objects deleted label'
@@ -490,7 +504,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           if (
             deletionData?.objects?.length &&
             deletionData.objects.every(Obj.isObject) &&
-            deletionData.parentCollection instanceof CollectionType
+            Obj.instanceOf(DataType.Collection, deletionData.parentCollection)
           ) {
             // Restore the object to the space.
             const restoredObjects = deletionData.objects.map((obj: Type.Expando) => space.db.add(obj));
@@ -558,7 +572,13 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: CollectionAction.Create,
       resolve: async ({ name }) => ({
-        data: { object: Obj.make(CollectionType, { name, objects: [], views: {} }) },
+        data: { object: Obj.make(DataType.Collection, { name, objects: [] }) },
+      }),
+    }),
+    createResolver({
+      intent: CollectionAction.CreateQueryCollection,
+      resolve: async ({ name, typename }) => ({
+        data: { object: Obj.make(DataType.QueryCollection, { name, query: { typename } }) },
       }),
     }),
   ]);