@dxos/plugin-space 0.8.2 → 0.8.3-main.7f5a14c

package/dist/types/src/types/collection.d.ts

@@ -1,13 +1,13 @@
 import { Schema } from 'effect';
-import { Expando } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
 declare const CollectionType_base: import("@dxos/echo-schema").TypedObjectPrototype<import("@dxos/echo-schema").TypedObjectFields<{
     name: Schema.optional<typeof Schema.String>;
-    objects: Schema.mutable<Schema.Array$<import("@dxos/echo-schema").Ref$<Expando>>>;
-    views: Schema.mutable<Schema.Record$<typeof Schema.String, import("@dxos/echo-schema").Ref$<Expando>>>;
+    objects: Schema.mutable<Schema.Array$<import("@dxos/echo-schema").Ref$<Type.Expando>>>;
+    views: Schema.mutable<Schema.Record$<typeof Schema.String, import("@dxos/echo-schema").Ref$<Type.Expando>>>;
 }, import("@dxos/echo-schema").TypedObjectOptions>, Schema.Struct.Encoded<{
     name: Schema.optional<typeof Schema.String>;
-    objects: Schema.mutable<Schema.Array$<import("@dxos/echo-schema").Ref$<Expando>>>;
-    views: Schema.mutable<Schema.Record$<typeof Schema.String, import("@dxos/echo-schema").Ref$<Expando>>>;
+    objects: Schema.mutable<Schema.Array$<import("@dxos/echo-schema").Ref$<Type.Expando>>>;
+    views: Schema.mutable<Schema.Record$<typeof Schema.String, import("@dxos/echo-schema").Ref$<Type.Expando>>>;
 }>>;
 export declare class CollectionType extends CollectionType_base {
 }

package/dist/types/src/types/collection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../../src/types/collection.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,OAAO,EAAoB,MAAM,mBAAmB,CAAC;;;;;;;;;;AAE9D,qBAAa,cAAe,SAAQ,mBASlC;CAAG"}
+{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../../../src/types/collection.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;;;;;;;;;;AAGlC,qBAAa,cAAe,SAAQ,mBAiBlC;CAAG"}

package/dist/types/src/types/types.d.ts

@@ -1,6 +1,7 @@
 import { Schema } from 'effect';
 import { type AnyIntentChain } from '@dxos/app-framework';
-import { Expando, type BaseObject, type TypedObject } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
+import { type BaseObject, type TypedObject } from '@dxos/echo-schema';
 import { type PublicKey } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { CancellableInvitationObservable, Invitation } from '@dxos/react-client/invitations';
@@ -52,7 +53,7 @@ export declare const SpaceSettingsSchema: Schema.mutable<Schema.Struct<{
 }>>;
 export type SpaceSettingsProps = Schema.Schema.Type<typeof SpaceSettingsSchema>;
 export type SerializerMap = Record<string, TypedObjectSerializer>;
-export interface TypedObjectSerializer<T extends Expando = Expando> {
+export interface TypedObjectSerializer<T extends Type.Expando = Type.Expando> {
     serialize(params: {
         object: T;
     }): Promise<string>;
@@ -263,8 +264,8 @@ export declare namespace SpaceAction {
         input: Schema.Struct<{
             space: Schema.Schema<Space, Space, never>;
             schema: typeof Schema.Any;
-            source: Schema.Schema<Expando, Expando, never>;
-            target: Schema.Schema<Expando, Expando, never>;
+            source: Schema.Schema<Type.Expando, Type.Expando, never>;
+            target: Schema.Schema<Type.Expando, Type.Expando, never>;
             fields: Schema.optional<Schema.Record$<typeof Schema.String, typeof Schema.Any>>;
         }>;
         output: Schema.Struct<{

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"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"}

package/dist/types/src/util.d.ts

@@ -1,15 +1,15 @@
 import { Rx } from '@effect-rx/rx-react';
 import { type PromiseIntentDispatcher } from '@dxos/app-framework';
-import { type BaseObject, type Expando } from '@dxos/echo-schema';
+import { Obj, Type } from '@dxos/echo';
 import { type ReadableGraph, type ActionData, type NodeArg } from '@dxos/plugin-graph';
-import { type QueryResult, type AnyLiveObject, type Space } from '@dxos/react-client/echo';
+import { type QueryResult, type Space } from '@dxos/react-client/echo';
 export declare const SPACES = "dxos.org/plugin/space-spaces";
 export declare const COMPOSER_SPACE_LOCK = "dxos.org/plugin/space/lock";
 export declare const SHARED = "shared-spaces";
 /**
  * Convert a query result to an Rx value of the objects.
  */
-export declare const rxFromQuery: <T extends BaseObject>(query: QueryResult<T>) => Rx.Rx<T[]>;
+export declare const rxFromQuery: <T extends Obj.Any>(query: QueryResult<T>) => Rx.Rx<T[]>;
 export declare const getSpaceDisplayName: (space: Space, { personal, namesCache }?: {
     personal?: boolean;
     namesCache?: Record<string, string>;
@@ -23,7 +23,7 @@ export declare const constructSpaceNode: ({ space, navigable, personal, namesCac
     namesCache?: Record<string, string>;
     resolve: (typename: string) => Record<string, any>;
 }) => {
-    id: import("@dxos/keys").SpaceId;
+    id: Type.SpaceId;
     type: string;
     cacheable: string[];
     data: Space;
@@ -79,20 +79,20 @@ export declare const constructSpaceActions: ({ space, dispatch, personal, migrat
     personal?: boolean;
     migrating?: boolean;
 }) => NodeArg<ActionData>[];
-export declare const createObjectNode: ({ object, space, navigable, resolve, }: {
-    object: AnyLiveObject<any>;
+export declare const createObjectNode: ({ space, object, navigable, resolve, }: {
     space: Space;
+    object: Obj.Any;
     navigable?: boolean;
     resolve: (typename: string) => Record<string, any>;
 }) => {
     id: string;
     type: string;
     cacheable: string[];
-    data: any;
+    data: import("@dxos/echo-schema").AnyEchoObject;
     properties: any;
 } | undefined;
 export declare const constructObjectActions: ({ object, graph, dispatch, navigable, }: {
-    object: AnyLiveObject<any>;
+    object: Obj.Any;
     graph: ReadableGraph;
     dispatch: PromiseIntentDispatcher;
     navigable?: boolean;
@@ -100,9 +100,9 @@ export declare const constructObjectActions: ({ object, graph, dispatch, navigab
 /**
  * @deprecated This is a temporary solution.
  */
-export declare const getNestedObjects: (object: AnyLiveObject<any>, resolve: (typename: string) => Record<string, any>) => Promise<AnyLiveObject<any>[]>;
+export declare const getNestedObjects: (object: Obj.Any, resolve: (typename: string) => Record<string, any>) => Promise<Obj.Any[]>;
 /**
  * @deprecated Workaround for ECHO not supporting clone.
  */
-export declare const cloneObject: (object: Expando, resolve: (typename: string) => Record<string, any>, newSpace: Space) => Promise<Expando>;
+export declare const cloneObject: (object: Type.Expando, resolve: (typename: string) => Record<string, any>, newSpace: Space) => Promise<Type.Expando>;
 //# sourceMappingURL=util.d.ts.map

package/dist/types/src/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AAEzC,OAAO,EAA8B,KAAK,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC/F,OAAO,EAAE,GAAG,EAAO,IAAI,EAAE,MAAM,YAAY,CAAC;AAI5C,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,UAAU,EAGf,KAAK,OAAO,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAA8B,KAAK,WAAW,EAAc,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAM/G,eAAO,MAAM,MAAM,iCAA2B,CAAC;AAC/C,eAAO,MAAM,mBAAmB,+BAA+B,CAAC;AAEhE,eAAO,MAAM,MAAM,kBAAkB,CAAC;AAEtC;;GAEG;AACH,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,OAAO,WAAW,CAAC,CAAC,CAAC,KAAG,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAS/E,CAAC;AAGF,eAAO,MAAM,mBAAmB,GAC9B,OAAO,KAAK,EACZ,2BAA+B;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAO,KAC9F,MAAM,GAAG,CAAC,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAQlC,CAAC;AAwFF,eAAO,MAAM,kBAAkB,GAAI,sDAMhC;IACD,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpD;;;;;;;gBA5G0B,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiLhC,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,2CAKnC;IACD,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,uBAAuB,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,0BAwDA,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,wCAK9B;IACD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpD;;;;;;aAgCA,CAAC;AAEF,eAAO,MAAM,sBAAsB,GAAI,yCAKpC;IACD,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,0BA6FA,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,GAAG,CAAC,GAAG,EACf,SAAS,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACjD,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAenB,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,WAAW,GACtB,QAAQ,IAAI,CAAC,OAAO,EACpB,SAAS,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAClD,UAAU,KAAK,KACd,OAAO,CAAC,IAAI,CAAC,OAAO,CAQtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.2",
+  "version": "0.8.3-main.7f5a14c",
   "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.2",
-    "@dxos/artifact": "0.8.2",
-    "@dxos/app-framework": "0.8.2",
-    "@dxos/async": "0.8.2",
-    "@dxos/client": "0.8.2",
-    "@dxos/context": "0.8.2",
-    "@dxos/display-name": "0.8.2",
-    "@dxos/echo": "0.8.2",
-    "@dxos/echo-schema": "0.8.2",
-    "@dxos/effect": "0.8.2",
-    "@dxos/keys": "0.8.2",
-    "@dxos/echo-signals": "0.8.2",
-    "@dxos/live-object": "0.8.2",
-    "@dxos/local-storage": "0.8.2",
-    "@dxos/log": "0.8.2",
-    "@dxos/invariant": "0.8.2",
-    "@dxos/plugin-client": "0.8.2",
-    "@dxos/plugin-deck": "0.8.2",
-    "@dxos/plugin-attention": "0.8.2",
-    "@dxos/plugin-graph": "0.8.2",
-    "@dxos/migrations": "0.8.2",
-    "@dxos/plugin-status-bar": "0.8.2",
-    "@dxos/plugin-observability": "0.8.2",
-    "@dxos/protocols": "0.8.2",
-    "@dxos/react-client": "0.8.2",
-    "@dxos/react-ui-attention": "0.8.2",
-    "@dxos/react-ui-editor": "0.8.2",
-    "@dxos/react-ui-form": "0.8.2",
-    "@dxos/react-ui-list": "0.8.2",
-    "@dxos/react-ui-pickers": "0.8.2",
-    "@dxos/react-ui-searchlist": "0.8.2",
-    "@dxos/react-ui-stack": "0.8.2",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2",
-    "@dxos/react-ui-tabs": "0.8.2",
-    "@dxos/schema": "0.8.2",
-    "@dxos/react-ui-theme": "0.8.2",
-    "@dxos/shell": "0.8.2",
-    "@dxos/util": "0.8.2"
+    "@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"
   },
   "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.2",
-    "@dxos/react-ui": "0.8.2",
-    "@dxos/react-ui-theme": "0.8.2",
-    "@dxos/storybook-utils": "0.8.2"
+    "@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"
   },
   "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.2",
-    "@dxos/react-ui-theme": "0.8.2"
+    "@dxos/react-ui": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.tsx

@@ -5,18 +5,18 @@
 import { Schema } from 'effect';
 
 import {
-  allOf,
   Capabilities,
+  Events,
+  allOf,
   contributes,
   createIntent,
   defineModule,
   definePlugin,
-  Events,
   oneOf,
 } from '@dxos/app-framework';
+import { Ref } from '@dxos/echo';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientEvents } from '@dxos/plugin-client';
-import { RefArray } from '@dxos/react-client/echo';
 import { osTranslations } from '@dxos/shell/react';
 
 import {
@@ -96,7 +96,7 @@ export const SpacePlugin = ({
             icon: 'ph--cards-three--regular',
             // TODO(wittjosiah): Move out of metadata.
             loadReferences: async (collection: CollectionType) =>
-              await RefArray.loadAll([...collection.objects, ...Object.values(collection.views)]),
+              await Ref.Array.loadAll([...collection.objects, ...Object.values(collection.views)]),
           },
         }),
     }),

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

@@ -6,16 +6,8 @@ import { Rx } from '@effect-rx/rx-react';
 import { Array, Option, pipe } from 'effect';
 
 import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
-import {
-  Expando,
-  Filter,
-  getSpace,
-  isEchoObject,
-  SpaceState,
-  type Space,
-  isSpace,
-  type QueryResult,
-} from '@dxos/client/echo';
+import { getSpace, SpaceState, type Space, isSpace, type QueryResult } from '@dxos/client/echo';
+import { Filter, Obj, 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';
@@ -67,7 +59,7 @@ export default (context: PluginContext) => {
 
         const {
           objects: [spacesOrder],
-        } = await client.spaces.default.db.query(Filter.type(Expando, { key: SHARED })).run();
+        } = await client.spaces.default.db.query(Filter.type(Type.Expando, { key: SHARED })).run();
         if (spacesOrder) {
           spacesOrder.order = nextOrder.map(({ id }) => id);
         } else {
@@ -175,7 +167,7 @@ export default (context: PluginContext) => {
     createExtension({
       id: SPACES,
       connector: (node) => {
-        let query: QueryResult<Expando> | undefined;
+        let query: QueryResult<Type.Expando> | undefined;
         return Rx.make((get) =>
           pipe(
             get(node),
@@ -200,7 +192,7 @@ export default (context: PluginContext) => {
               // TODO(wittjosiah): During client reset, accessing default space throws.
               try {
                 if (!query) {
-                  query = client.spaces.default.db.query(Filter.type(Expando, { key: SHARED }));
+                  query = client.spaces.default.db.query(Filter.type(Type.Expando, { key: SHARED }));
                 }
                 const [spacesOrder] = get(rxFromQuery(query));
                 return get(
@@ -321,7 +313,6 @@ export default (context: PluginContext) => {
             ),
             Option.map((space) => {
               const state = context.getCapability(SpaceCapabilities.State);
-
               const spaceState = get(rxFromObservable(space.state));
               if (spaceState !== SpaceState.SPACE_READY) {
                 return [];
@@ -342,8 +333,8 @@ export default (context: PluginContext) => {
                     Array.filter(isNonNullable),
                     Array.map((object) =>
                       createObjectNode({
-                        object,
                         space,
+                        object,
                         resolve,
                         navigable: state.navigableCollections,
                       }),
@@ -434,7 +425,7 @@ export default (context: PluginContext) => {
         Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) => (isEchoObject(node.data) ? Option.some(node.data) : Option.none())),
+            Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node.data) : Option.none())),
             Option.flatMap((object) => {
               const [dispatcher] = get(context.capabilities(Capabilities.IntentDispatcher));
               const [appGraph] = get(context.capabilities(Capabilities.AppGraph));
@@ -464,7 +455,7 @@ export default (context: PluginContext) => {
         Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) => (isEchoObject(node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'settings'].join(ATTENDABLE_PATH_SEPARATOR),

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

@@ -4,11 +4,11 @@
 
 import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
 import { isSpace } from '@dxos/client/echo';
-import { live } from '@dxos/live-object';
+import { Obj } from '@dxos/echo';
 
 import { SPACE_PLUGIN } from '../meta';
 import translations from '../translations';
-import { CollectionType, SpaceAction, SPACE_TYPE } from '../types';
+import { SPACE_TYPE, CollectionType, SpaceAction } from '../types';
 import { SPACES } from '../util';
 
 // https://stackoverflow.com/a/19016910
@@ -63,7 +63,7 @@ export default (context: PluginContext) =>
         const result = await dispatch(
           createIntent(SpaceAction.AddObject, {
             target: collection,
-            object: live(CollectionType, { name: data.name, objects: [], views: {} }),
+            object: Obj.make(CollectionType, { name: data.name, objects: [], views: {} }),
           }),
         );
 

package/src/capabilities/identity-created.ts

@@ -3,7 +3,7 @@
 //
 
 import { contributes, type PluginContext, Capabilities } from '@dxos/app-framework';
-import { live, makeRef } from '@dxos/live-object';
+import { Obj, Ref } from '@dxos/echo';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
@@ -17,7 +17,7 @@ export default async (context: PluginContext) => {
   await defaultSpace.waitUntilReady();
 
   // Create root collection structure.
-  defaultSpace.properties[CollectionType.typename] = makeRef(live(CollectionType, { objects: [], views: {} }));
+  defaultSpace.properties[CollectionType.typename] = Ref.make(Obj.make(CollectionType, { objects: [], views: {} }));
   if (Migrations.versionProperty) {
     defaultSpace.properties[Migrations.versionProperty] = Migrations.targetVersion;
   }

package/src/capabilities/intent-resolver.ts

@@ -6,32 +6,31 @@ import { Effect } from 'effect';
 
 import {
   Capabilities,
+  LayoutAction,
+  type PluginContext,
   contributes,
   createIntent,
   createResolver,
-  LayoutAction,
-  type PluginContext,
 } from '@dxos/app-framework';
-import { type Expando, getTypename, type HasId, RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
+import { Obj, Ref, Relation, type Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { live, makeRef, type Live } from '@dxos/live-object';
 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 { isSpace, getSpace, SpaceState, fullyQualifiedId, isEchoObject } from '@dxos/react-client/echo';
+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 { SpaceCapabilities } from './capabilities';
 import {
+  CREATE_OBJECT_DIALOG,
   CREATE_SPACE_DIALOG,
   JOIN_DIALOG,
-  type JoinDialogProps,
+  POPOVER_RENAME_OBJECT,
   POPOVER_RENAME_SPACE,
-  CREATE_OBJECT_DIALOG,
   type CreateObjectDialogProps,
-  POPOVER_RENAME_OBJECT,
+  type JoinDialogProps,
 } from '../components';
 import { SPACE_PLUGIN } from '../meta';
 import { CollectionAction, CollectionType, SpaceAction } from '../types';
@@ -74,8 +73,8 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
         }
         await space.waitUntilReady();
-        const collection = live(CollectionType, { objects: [], views: {} });
-        space.properties[CollectionType.typename] = makeRef(collection);
+        const collection = Obj.make(CollectionType, { objects: [], views: {} });
+        space.properties[CollectionType.typename] = Ref.make(collection);
 
         if (Migrations.versionProperty) {
           space.properties[Migrations.versionProperty] = Migrations.targetVersion;
@@ -317,7 +316,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
                 props: {
                   target,
                   shouldNavigate: navigable
-                    ? (object: Live<any>) => !(object instanceof CollectionType) || state.navigableCollections
+                    ? (object: Obj.Any) => !(object instanceof CollectionType) || state.navigableCollections
                     : () => false,
                 } satisfies Partial<CreateObjectDialogProps>,
               },
@@ -365,17 +364,17 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         }
 
         if (target instanceof CollectionType) {
-          target.objects.push(makeRef(object as HasId));
+          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) {
-            collection.objects.push(makeRef(object as HasId));
+            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 = live(CollectionType, { objects: [makeRef(object as HasId)], views: {} });
-            space.properties[CollectionType.typename] = makeRef(collection);
+            const collection = Obj.make(CollectionType, { objects: [Ref.make(object)], views: {} });
+            space.properties[CollectionType.typename] = Ref.make(collection);
           }
         }
 
@@ -383,7 +382,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           data: {
             id: fullyQualifiedId(object),
             subject: [fullyQualifiedId(object)],
-            object: object as HasId,
+            object,
           },
           intents: [
             ...(observability
@@ -393,7 +392,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
                     properties: {
                       spaceId: space.id,
                       objectId: object.id,
-                      typename: getTypename(object),
+                      typename: Obj.getTypename(object),
                     },
                   }),
                 ]
@@ -405,8 +404,14 @@ 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);
+        const relation = space.db.add(
+          Obj.make(schema, {
+            [Relation.Source]: source,
+            [Relation.Target]: target,
+            ...fields,
+          }),
+        );
+
         return {
           data: {
             relation,
@@ -421,7 +426,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
 
         // All objects must be a member of the same space.
         const space = getSpace(objects[0]);
-        invariant(space && objects.every((obj) => isEchoObject(obj) && getSpace(obj) === space));
+        invariant(space && objects.every((obj) => Obj.isObject(obj) && getSpace(obj) === space));
         const openObjectIds = new Set<string>(layout.active);
 
         if (!undo) {
@@ -484,20 +489,20 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         } else {
           if (
             deletionData?.objects?.length &&
-            deletionData.objects.every(isEchoObject) &&
+            deletionData.objects.every(Obj.isObject) &&
             deletionData.parentCollection instanceof CollectionType
           ) {
             // Restore the object to the space.
-            const restoredObjects = deletionData.objects.map((obj: Expando) => space.db.add(obj));
+            const restoredObjects = deletionData.objects.map((obj: Type.Expando) => space.db.add(obj));
 
             // Restore nested objects to the space.
-            deletionData.nestedObjectsList.flat().forEach((obj: Expando) => {
+            deletionData.nestedObjectsList.flat().forEach((obj: Type.Expando) => {
               space.db.add(obj);
             });
 
             deletionData.indices.forEach((index: number, i: number) => {
               if (index !== -1) {
-                deletionData.parentCollection.objects.splice(index, 0, makeRef(restoredObjects[i] as Expando));
+                deletionData.parentCollection.objects.splice(index, 0, Ref.make(restoredObjects[i] as Type.Expando));
               }
             });
 
@@ -553,7 +558,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: CollectionAction.Create,
       resolve: async ({ name }) => ({
-        data: { object: live(CollectionType, { name, objects: [], views: {} }) },
+        data: { object: Obj.make(CollectionType, { name, objects: [], views: {} }) },
       }),
     }),
   ]);