@dxos/plugin-space 0.8.2-main.fbd8ed0 → 0.8.2-staging.42af850

package/src/capabilities/intent-resolver.ts

@@ -12,7 +12,7 @@ import {
   LayoutAction,
   type PluginContext,
 } from '@dxos/app-framework';
-import { type Expando, getTypename, type HasId } from '@dxos/echo-schema';
+import { type Expando, getTypename, type HasId, RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { live, makeRef, type Live } from '@dxos/live-object';
 import { Migrations } from '@dxos/migrations';
@@ -402,6 +402,18 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         };
       },
     }),
+    createResolver({
+      intent: SpaceAction.AddRelation,
+      resolve: ({ space, schema, source, target, fields }) => {
+        const relation = live(schema, { [RelationSourceId]: source, [RelationTargetId]: target, ...fields });
+        space.db.add(relation);
+        return {
+          data: {
+            relation,
+          },
+        };
+      },
+    }),
     createResolver({
       intent: SpaceAction.RemoveObjects,
       resolve: async ({ objects, target, deletionData }, undo) => {

package/src/capabilities/schema-tools.ts

@@ -4,8 +4,8 @@
 
 import { Schema, SchemaAST } from 'effect';
 
+import { createTool, ToolResult } from '@dxos/ai';
 import { Capabilities, contributes, type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { defineTool, ToolResult } from '@dxos/artifact';
 import { type Space } from '@dxos/client/echo';
 import { FormatEnum, FormatEnums, SelectOptionSchema, GeoPoint, toJsonSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
@@ -24,8 +24,8 @@ declare global {
 export const TypeNameSchema = Schema.String.pipe(
   Schema.pattern(/^\w+\.\w{2,}\/[\w/]+$/i),
   Schema.annotations({
-    [SchemaAST.TitleAnnotationId]: 'TypeName',
-    [SchemaAST.DescriptionAnnotationId]:
+    title: 'TypeName',
+    description:
       'Domain-style type name path. Dashes are not allowed. Use camel case for the final component of the type name.',
     [SchemaAST.ExamplesAnnotationId]: ['example.com/type/Document', 'example.com/type/FlightList'],
   }),
@@ -37,9 +37,9 @@ const formatDescription = `The format of the property. Additional information:
 
 // TODO(ZaymonFC): All properties are default optional, but maybe we should allow for required properties.
 const PropertyDefinitionSchema = Schema.Struct({
-  name: Schema.String.annotations({ [SchemaAST.DescriptionAnnotationId]: 'The name of the property.' }),
+  name: Schema.String.annotations({ description: 'The name of the property.' }),
   format: Schema.Union(...FormatEnums.map((format) => Schema.Literal(format))).annotations({
-    [SchemaAST.DescriptionAnnotationId]: formatDescription,
+    description: formatDescription,
   }),
   config: Schema.optional(
     Schema.Struct({
@@ -58,7 +58,7 @@ const SYSTEM_NAMESPACE = 'dxos.org/echo/schema';
 
 export default () =>
   contributes(Capabilities.Tools, [
-    defineTool(SYSTEM_NAMESPACE, {
+    createTool(SYSTEM_NAMESPACE, {
       name: 'list',
       description: 'List registered schemas in the space.',
       caption: 'Listing registered schemas...',
@@ -76,7 +76,7 @@ export default () =>
         );
       },
     }),
-    defineTool(SYSTEM_NAMESPACE, {
+    createTool(SYSTEM_NAMESPACE, {
       name: 'get',
       description: 'Get a specific schema by its typename.',
       caption: 'Getting schema...',
@@ -97,7 +97,7 @@ export default () =>
         return ToolResult.Success(schema);
       },
     }),
-    defineTool(SYSTEM_NAMESPACE, {
+    createTool(SYSTEM_NAMESPACE, {
       name: 'create',
       description: 'Create a new schema with the provided definition.',
       caption: 'Creating schema...',

package/src/capabilities/spaces-ready.ts

@@ -23,7 +23,7 @@ import { SpaceAction } from '../types';
 import { COMPOSER_SPACE_LOCK, SHARED } from '../util';
 
 const ACTIVE_NODE_BROADCAST_INTERVAL = 30_000;
-const WAIT_FOR_OBJECT_TIMEOUT = 1000;
+const WAIT_FOR_OBJECT_TIMEOUT = 5_000;
 
 export default async (context: PluginContext) => {
   const subscriptions = new SubscriptionList();

package/src/components/ObjectSettings/AdvancedObjectSettings.tsx

@@ -4,7 +4,7 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { type ForeignKey, ForeignKeySchema } from '@dxos/echo-schema';
+import { ForeignKey } from '@dxos/echo-schema';
 import { getMeta, type AnyLiveObject } from '@dxos/react-client/echo';
 import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
@@ -66,7 +66,7 @@ export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps)
         {!adding && <ForeignKeys keys={keys} onDelete={handleDelete} />}
       </div>
 
-      {adding && <Form schema={ForeignKeySchema} values={initialValues} onSave={handleSave} onCancel={handleCancel} />}
+      {adding && <Form schema={ForeignKey} values={initialValues} onSave={handleSave} onCancel={handleCancel} />}
     </>
   );
 };

package/src/components/PopoverRenameObject.tsx

@@ -41,7 +41,7 @@ export const PopoverRenameObject = ({ object: obj }: { object: Live<any> }) => {
   }, [object, name]);
 
   return (
-    <div role='none' className='p-1 flex gap-2'>
+    <div role='none' className='p-2 flex gap-2'>
       <div role='none' className='flex-1'>
         <Input.Root>
           <Input.Label srOnly>{t('object name label')}</Input.Label>

package/src/components/PopoverRenameSpace.tsx

@@ -30,7 +30,7 @@ export const PopoverRenameSpace = ({ space }: { space: Space }) => {
 
   // TODO(thure): Why does the input value need to be uncontrolled to work?
   return (
-    <div role='none' className='p-1 flex gap-2'>
+    <div role='none' className='p-2 flex gap-2'>
       <div role='none' className='flex-1'>
         <Input.Root>
           <Input.Label srOnly>{t('space name label')}</Input.Label>

package/src/index.ts

@@ -2,8 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-export { SpaceCapabilities, ThreadCapabilities } from './capabilities';
-export { SpaceEvents, ThreadEvents } from './events';
+export { SpaceCapabilities } from './capabilities';
+export { SpaceEvents } from './events';
 
 export * from './components';
 export * from './hooks';

package/src/types/index.ts

@@ -3,5 +3,4 @@
 //
 
 export * from './collection';
-export * from './thread';
 export * from './types';

package/src/types/types.ts

@@ -5,7 +5,7 @@
 import { Schema } from 'effect';
 
 import { type AnyIntentChain } from '@dxos/app-framework';
-import { type Expando, type BaseObject, type TypedObject } from '@dxos/echo-schema';
+import { Expando, type BaseObject, type TypedObject } from '@dxos/echo-schema';
 import { type PublicKey } from '@dxos/react-client';
 // TODO(wittjosiah): This pulls in full client.
 import { EchoObjectSchema, ReactiveObjectSchema, type Space, SpaceSchema } from '@dxos/react-client/echo';
@@ -237,6 +237,21 @@ export namespace SpaceAction {
     }),
   }) {}
 
+  export class AddRelation extends Schema.TaggedClass<AddRelation>()(`${SPACE_ACTION}/add-relation`, {
+    input: Schema.Struct({
+      space: SpaceSchema,
+      // TODO(wittjosiah): Relation schema.
+      schema: Schema.Any,
+      source: Expando,
+      target: Expando,
+      // TODO(wittjosiah): Type based on relation schema.
+      fields: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
+    }),
+    output: Schema.Struct({
+      relation: Schema.Any,
+    }),
+  }) {}
+
   export const DeletionData = Schema.Struct({
     objects: Schema.Array(EchoObjectSchema),
     parentCollection: CollectionType,