@dxos/app-graph 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-graph",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.7ace549",
   "description": "Constructs knowledge graphs for the purpose of building applications on top of",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -27,14 +27,14 @@
   "dependencies": {
     "@preact/signals-core": "^1.12.1",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/echo-signals": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3"
+    "@dxos/async": "0.8.4-main.7ace549",
+    "@dxos/echo": "0.8.4-main.7ace549",
+    "@dxos/debug": "0.8.4-main.7ace549",
+    "@dxos/echo-signals": "0.8.4-main.7ace549",
+    "@dxos/invariant": "0.8.4-main.7ace549",
+    "@dxos/live-object": "0.8.4-main.7ace549",
+    "@dxos/log": "0.8.4-main.7ace549",
+    "@dxos/util": "0.8.4-main.7ace549"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.3.4",
@@ -45,14 +45,14 @@
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/echo-db": "0.8.4-main.72ec0f3",
-    "@dxos/random": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-tabs": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-list": "0.8.4-main.72ec0f3"
+    "@dxos/echo-db": "0.8.4-main.7ace549",
+    "@dxos/random": "0.8.4-main.7ace549",
+    "@dxos/react-client": "0.8.4-main.7ace549",
+    "@dxos/react-ui": "0.8.4-main.7ace549",
+    "@dxos/react-ui-list": "0.8.4-main.7ace549",
+    "@dxos/react-ui-tabs": "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",
@@ -60,8 +60,8 @@
     "effect": "3.14.21",
     "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/node.ts

@@ -77,7 +77,7 @@ export type InvokeParams = {
   caller?: string;
 };
 
-export type ActionData = (params?: InvokeParams) => MaybePromise<void>;
+export type ActionData = (params?: InvokeParams) => MaybePromise<any>;
 
 export type Action<TProperties extends Record<string, any> = Record<string, any>> = Readonly<
   Omit<Node<ActionData, TProperties>, 'properties'> & {

package/src/signals-integration.test.ts

@@ -79,8 +79,8 @@ describe('signals integration', () => {
       let outerId: string;
       {
         await using db = await peer.createDatabase();
-        const inner = db.add({ name: 'inner' });
-        const outer = db.add({ inner: Ref.make(inner) });
+        const inner = db.add(Obj.make(Type.Expando, { name: 'inner' }));
+        const outer = db.add(Obj.make(Type.Expando, { inner: Ref.make(inner) }));
         outerId = outer.id;
         await db.flush();
       }
@@ -118,8 +118,8 @@ describe('signals integration', () => {
       let outerId, innerId: string;
       {
         await using db = await peer.createDatabase();
-        const inner = db.add({ name: 'inner' });
-        const outer = db.add({ inner: Ref.make(inner) });
+        const inner = db.add(Obj.make(Type.Expando, { name: 'inner' }));
+        const outer = db.add(Obj.make(Type.Expando, { inner: Ref.make(inner) }));
         innerId = inner.id;
         outerId = outer.id;
         await db.flush();
@@ -187,7 +187,11 @@ describe('signals integration', () => {
 
             return Atom.make((get) => {
               const objects = get(atomFromQuery(query));
-              return objects.map((object) => ({ id: object.id, type: EXAMPLE_TYPE, data: object.name }));
+              return objects.map((object) => ({
+                id: object.id,
+                type: EXAMPLE_TYPE,
+                data: object.name,
+              }));
             });
           },
         }),

package/src/stories/EchoGraph.stories.tsx

@@ -6,20 +6,11 @@ import { Atom, type Registry, RegistryContext, useAtomValue } from '@effect-atom
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
+import type * as Schema from 'effect/Schema';
 import React, { type PropsWithChildren, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
-import {
-  Expando,
-  Filter,
-  type Live,
-  Query,
-  type QueryResult,
-  type Space,
-  SpaceState,
-  isSpace,
-  live,
-} from '@dxos/client/echo';
-import { Obj, Type } from '@dxos/echo';
+import { Filter, type Live, Query, type Space, SpaceState, isSpace, live } from '@dxos/client/echo';
+import { type Database, Obj, Type } from '@dxos/echo';
 import { faker } from '@dxos/random';
 import { type Client, useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
@@ -30,7 +21,7 @@ import { getSize, mx } from '@dxos/react-ui-theme';
 import { byPosition, isNonNullable, safeParseInt } from '@dxos/util';
 
 import { type ExpandableGraph, ROOT_ID } from '../graph';
-import { GraphBuilder, atomFromObservable, createExtension } from '../graph-builder';
+import { GraphBuilder, atomFromObservable, atomFromSignal, createExtension } from '../graph-builder';
 import { type Node } from '../node';
 import { atomFromQuery } from '../testing';
 
@@ -72,7 +63,7 @@ const createGraph = (client: Client, registry: Registry.Registry): ExpandableGra
                 id: space.id,
                 type: 'dxos.org/type/Space',
                 properties: {
-                  label: get(atomFromObservable(space.properties.name)),
+                  label: get(atomFromSignal(() => space.properties.name)),
                 },
                 data: space,
               }));
@@ -85,16 +76,18 @@ const createGraph = (client: Client, registry: Registry.Registry): ExpandableGra
   const objectBuilderExtension = createExtension({
     id: 'object',
     connector: (node) => {
-      let query: QueryResult<Live<Expando>> | undefined;
+      // TODO(wittjosiah): Find a simpler way to define this type.
+      let result: Database.QueryResult<Schema.Schema.Type<typeof Type.Expando>> | undefined;
       return Atom.make((get) =>
         Function.pipe(
           get(node),
           Option.flatMap((node) => (isSpace(node.data) ? Option.some(node.data) : Option.none())),
           Option.map((space) => {
-            if (!query) {
-              query = space.db.query(Query.type(Expando, { type: 'test' }));
+            if (!result) {
+              result = space.db.query(Query.type(Type.Expando, { type: 'test' }));
             }
-            const objects = get(atomFromQuery(query));
+
+            const objects = get(atomFromQuery(result));
             return objects.map((object) => ({
               id: object.id,
               type: 'dxos.org/type/test',
@@ -116,7 +109,6 @@ const createGraph = (client: Client, registry: Registry.Registry): ExpandableGra
   });
   graph.expand(ROOT_ID);
   (window as any).graph = graph;
-
   return graph;
 };
 
@@ -136,7 +128,7 @@ const getRandomSpace = (client: Client): Space | undefined => {
 const getSpaceWithObjects = async (client: Client): Promise<Space | undefined> => {
   const readySpaces = client.spaces.get().filter((space) => space.state.get() === SpaceState.SPACE_READY);
   const spaceQueries = await Promise.all(
-    readySpaces.map((space) => space.db.query(Filter.type(Expando, { type: 'test' })).run()),
+    readySpaces.map((space) => space.db.query(Filter.type(Type.Expando, { type: 'test' })).run()),
   );
   const spaces = readySpaces.filter((space, index) => spaceQueries[index].objects.length > 0);
   return spaces[Math.floor(Math.random() * spaces.length)];
@@ -172,7 +164,7 @@ const runAction = async (client: Client, action: Action) => {
     case Action.REMOVE_OBJECT: {
       const space = await getSpaceWithObjects(client);
       if (space) {
-        const { objects } = await space.db.query(Filter.type(Expando, { type: 'test' })).run();
+        const { objects } = await space.db.query(Filter.type(Type.Expando, { type: 'test' })).run();
         space.db.remove(objects[Math.floor(Math.random() * objects.length)]);
       }
       break;
@@ -181,7 +173,7 @@ const runAction = async (client: Client, action: Action) => {
     case Action.RENAME_OBJECT: {
       const space = await getSpaceWithObjects(client);
       if (space) {
-        const { objects } = await space.db.query(Filter.type(Expando, { type: 'test' })).run();
+        const { objects } = await space.db.query(Filter.type(Type.Expando, { type: 'test' })).run();
         objects[Math.floor(Math.random() * objects.length)].name = faker.commerce.productName();
       }
       break;

package/src/testing.ts

@@ -4,10 +4,11 @@
 
 import { Atom } from '@effect-atom/atom-react';
 
-import { type AnyEchoObject } from '@dxos/echo/internal';
-import { type QueryResult } from '@dxos/echo-db';
+import { type Database, type Entity } from '@dxos/echo';
 
-export const atomFromQuery = <T extends AnyEchoObject>(query: QueryResult<T>): Atom.Atom<T[]> => {
+export const atomFromQuery = <T extends Entity.Unknown = Entity.Unknown>(
+  query: Database.QueryResult<T>,
+): Atom.Atom<T[]> => {
   return Atom.make((get) => {
     const unsubscribe = query.subscribe((result) => {
       get.setSelf(result.objects);

package/dist/types/src/experimental/graph-projections.test.d.ts

@@ -1,25 +0,0 @@
-type Cb = () => void;
-interface Query {
-    id?: string[];
-    typename?: string[];
-}
-/**
- * Lazy query result that can be executed.
- * Does not run without the run function being called.
- */
-interface QueryResult<T> {
-    /**
-     * Execute the query and subscribe to the result.
-     * @param next Called at least once with the first value (maybe synchronously) and then for every subsequent update.
-     * @param error Called on error. `next` is never called after that.
-     * @returns Function to dispose the query and unsubscribe.
-     */
-    run(onData: (value?: T[]) => void, onError: (err: Error) => void): Cb;
-}
-declare const QueryResult: Readonly<{
-    fromPromise: <T>(run: (onDispose: (cb: Cb) => void) => Promise<T[]>) => QueryResult<T>;
-}>;
-interface _Resolver<T> {
-    query(query: Query): QueryResult<T>;
-}
-//# sourceMappingURL=graph-projections.test.d.ts.map

package/dist/types/src/experimental/graph-projections.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"graph-projections.test.d.ts","sourceRoot":"","sources":["../../../../src/experimental/graph-projections.test.ts"],"names":[],"mappings":"AAIA,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC;AAErB,UAAU,KAAK;IACb,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;;GAGG;AACH,UAAU,WAAW,CAAC,CAAC;IACrB;;;;;OAKG;IACH,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,EAAE,CAAC;CACvE;AAED,QAAA,MAAM,WAAW;kBACD,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,IAAI,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,KAAG,WAAW,CAAC,CAAC,CAAC;EAyBpF,CAAC;AAEH,UAAU,SAAS,CAAC,CAAC;IACnB,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;CACrC"}

package/src/experimental/graph-projections.test.ts

@@ -1,56 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-type Cb = () => void;
-
-interface Query {
-  id?: string[];
-  typename?: string[];
-}
-
-/**
- * Lazy query result that can be executed.
- * Does not run without the run function being called.
- */
-interface QueryResult<T> {
-  /**
-   * Execute the query and subscribe to the result.
-   * @param next Called at least once with the first value (maybe synchronously) and then for every subsequent update.
-   * @param error Called on error. `next` is never called after that.
-   * @returns Function to dispose the query and unsubscribe.
-   */
-  run(onData: (value?: T[]) => void, onError: (err: Error) => void): Cb;
-}
-
-const QueryResult = Object.freeze({
-  fromPromise: <T>(run: (onDispose: (cb: Cb) => void) => Promise<T[]>): QueryResult<T> => {
-    return {
-      run: (onData, onError) => {
-        const cbs: Cb[] = [];
-        let disposed = false;
-        const dispose = () => {
-          cbs.forEach((cb) => cb());
-          disposed = true;
-        };
-        run((cb) => (disposed ? cb() : cbs.push(cb))).then(
-          (data) => {
-            if (disposed) {
-              return;
-            }
-            onData(data);
-          },
-          (err) => {
-            dispose();
-            onError(err);
-          },
-        );
-        return dispose;
-      },
-    };
-  },
-});
-
-interface _Resolver<T> {
-  query(query: Query): QueryResult<T>;
-}