@dxos/app-graph 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-graph",
-  "version": "0.8.4-main.a4bbb77",
+  "version": "0.8.4-main.ae835ea",
   "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,33 +27,32 @@
   "dependencies": {
     "@preact/signals-core": "^1.12.1",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/async": "0.8.4-main.a4bbb77",
-    "@dxos/debug": "0.8.4-main.a4bbb77",
-    "@dxos/echo": "0.8.4-main.a4bbb77",
-    "@dxos/echo-signals": "0.8.4-main.a4bbb77",
-    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
-    "@dxos/live-object": "0.8.4-main.a4bbb77",
-    "@dxos/invariant": "0.8.4-main.a4bbb77",
-    "@dxos/log": "0.8.4-main.a4bbb77",
-    "@dxos/util": "0.8.4-main.a4bbb77"
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/debug": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/echo-signals": "0.8.4-main.ae835ea",
+    "@dxos/live-object": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "0.42.4",
     "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.0",
-    "@types/react-dom": "~19.2.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/echo-db": "0.8.4-main.a4bbb77",
-    "@dxos/random": "0.8.4-main.a4bbb77",
-    "@dxos/react-client": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-list": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-tabs": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
-    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
+    "@dxos/echo-db": "0.8.4-main.ae835ea",
+    "@dxos/random": "0.8.4-main.ae835ea",
+    "@dxos/react-client": "0.8.4-main.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-list": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-tabs": "0.8.4-main.ae835ea",
+    "@dxos/storybook-utils": "0.8.4-main.ae835ea"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -61,8 +60,8 @@
     "effect": "3.14.21",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
   },
   "publishConfig": {
     "access": "public"

package/src/graph-builder.test.ts

@@ -3,7 +3,8 @@
 //
 
 import { Registry, Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Trigger, sleep } from '@dxos/async';
@@ -238,7 +239,7 @@ describe('GraphBuilder', () => {
           id: 'root',
           connector: (node) =>
             Rx.make((get) =>
-              pipe(
+              Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === 'root' ? Option.some(get(name)) : Option.none())),
                 Option.filter((name) => name !== 'removed'),
@@ -330,7 +331,7 @@ describe('GraphBuilder', () => {
           id: 'root',
           connector: (node) =>
             Rx.make((get) =>
-              pipe(
+              Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === 'root' ? Option.some(get(name)) : Option.none())),
                 Option.filter((name) => name !== 'removed'),
@@ -343,7 +344,7 @@ describe('GraphBuilder', () => {
           id: 'connector1',
           connector: (node) =>
             Rx.make((get) =>
-              pipe(
+              Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === EXAMPLE_ID ? Option.some(get(sub)) : Option.none())),
                 Option.map((sub) => [{ id: exampleId(2), type: EXAMPLE_TYPE, data: sub }]),
@@ -355,7 +356,7 @@ describe('GraphBuilder', () => {
           id: 'connector2',
           connector: (node) =>
             Rx.make((get) =>
-              pipe(
+              Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === EXAMPLE_ID ? Option.some(node.data) : Option.none())),
                 Option.map((data) => [{ id: exampleId(3), type: EXAMPLE_TYPE, data }]),
@@ -439,7 +440,7 @@ describe('GraphBuilder', () => {
           id: 'connector',
           connector: (node) => {
             return Rx.make((get) =>
-              pipe(
+              Function.pipe(
                 get(node),
                 Option.map((node) => (node.data ? node.data + 1 : 1)),
                 Option.filter((data) => data <= 5),
@@ -475,7 +476,7 @@ describe('GraphBuilder', () => {
           id: 'connector',
           connector: (node) =>
             Rx.make((get) =>
-              pipe(
+              Function.pipe(
                 get(node),
                 Option.map((node) => (node.data ? node.data + 1 : 1)),
                 Option.filter((data) => data <= 5),

package/src/graph-builder.ts

@@ -4,7 +4,10 @@
 
 import { Registry, Rx } from '@effect-rx/rx-react';
 import { effect } from '@preact/signals-core';
-import { Array, Option, Record, pipe } from 'effect';
+import * as Array from 'effect/Array';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import * as Record from 'effect/Record';
 
 import { type CleanupFn, type MulticastObservable, type Trigger } from '@dxos/async';
 import { log } from '@dxos/log';
@@ -289,7 +292,7 @@ export class GraphBuilder {
 
   private readonly _resolvers = Rx.family<string, Rx.Rx<Option.Option<NodeArg<any>>>>((id) => {
     return Rx.make((get) => {
-      return pipe(
+      return Function.pipe(
         get(this._extensions),
         Record.values,
         Array.sortBy(byPosition),
@@ -307,7 +310,7 @@ export class GraphBuilder {
       const [id, relation] = key.split('+');
       const node = this._graph.node(id);
 
-      return pipe(
+      return Function.pipe(
         get(this._extensions),
         Record.values,
         // TODO(wittjosiah): Sort on write rather than read.

package/src/graph.test.ts

@@ -3,7 +3,7 @@
 //
 
 import { Registry, Rx } from '@effect-rx/rx-react';
-import { Option } from 'effect';
+import * as Option from 'effect/Option';
 import { assert, describe, expect, onTestFinished, test } from 'vitest';
 
 import { Graph, ROOT_ID, ROOT_TYPE, getGraph } from './graph';

package/src/graph.ts

@@ -3,7 +3,9 @@
 //
 
 import { Registry, Rx } from '@effect-rx/rx-react';
-import { Option, Record, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import * as Record from 'effect/Record';
 
 import { Event, Trigger } from '@dxos/async';
 import { todo } from '@dxos/debug';
@@ -285,7 +287,7 @@ export class Graph implements WritableGraph {
       const toJSON = (node: Node, seen: string[] = []): any => {
         const nodes = get(this.connections(node.id));
         const obj: Record<string, any> = {
-          id: node.id.length > 32 ? `${node.id.slice(0, 32)}...` : node.id,
+          id: node.id,
           type: node.type,
         };
         if (node.properties.label) {
@@ -553,7 +555,7 @@ export class Graph implements WritableGraph {
   }
 
   getPath({ source = 'root', target }: { source?: string; target: string }): Option.Option<string[]> {
-    return pipe(
+    return Function.pipe(
       this.getNode(source),
       Option.flatMap((node) => {
         let found: Option.Option<string[]> = Option.none();

package/src/signals-integration.test.ts

@@ -7,11 +7,11 @@ import { signal } from '@preact/signals-core';
 import { afterEach, beforeEach, describe, expect, onTestFinished, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
+import { Obj, Type } from '@dxos/echo';
+import { Ref } from '@dxos/echo/internal';
 import { Filter } from '@dxos/echo-db';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
-import { Expando, Ref } from '@dxos/echo-schema';
 import { registerSignalsRuntime } from '@dxos/echo-signals';
-import { live } from '@dxos/live-object';
 
 import { ROOT_ID } from './graph';
 import { GraphBuilder, createExtension, rxFromSignal } from './graph-builder';
@@ -174,15 +174,15 @@ describe('signals integration', () => {
       const registry = Registry.make();
       await using peer = await dbBuilder.createPeer();
       await using db = await peer.createDatabase();
-      db.add(live(Expando, { name: 'a' }));
-      db.add(live(Expando, { name: 'b' }));
+      db.add(Obj.make(Type.Expando, { name: 'a' }));
+      db.add(Obj.make(Type.Expando, { name: 'b' }));
 
       const builder = new GraphBuilder({ registry });
       builder.addExtension(
         createExtension({
           id: 'expando',
           connector: () => {
-            const query = db.query(Filter.type(Expando));
+            const query = db.query(Filter.type(Type.Expando));
 
             return Rx.make((get) => {
               const objects = get(rxFromQuery(query));
@@ -205,7 +205,7 @@ describe('signals integration', () => {
       graph.expand(ROOT_ID);
       expect(count).to.eq(2);
 
-      const object = db.add(live(Expando, { name: 'c' }));
+      const object = db.add(Obj.make(Type.Expando, { name: 'c' }));
       await db.flush();
       expect(count).to.eq(3);
 

package/src/stories/EchoGraph.stories.tsx

@@ -4,7 +4,8 @@
 
 import { type Registry, RegistryContext, Rx, useRxValue } from '@effect-rx/rx-react';
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Option, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 import React, { type PropsWithChildren, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
 import {
@@ -60,7 +61,7 @@ const createGraph = (client: Client, registry: Registry.Registry): ExpandableGra
     id: 'space',
     connector: (node) =>
       Rx.make((get) =>
-        pipe(
+        Function.pipe(
           get(node),
           Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
           Option.map(() => {
@@ -84,7 +85,7 @@ const createGraph = (client: Client, registry: Registry.Registry): ExpandableGra
     connector: (node) => {
       let query: QueryResult<Live<Expando>> | undefined;
       return Rx.make((get) =>
-        pipe(
+        Function.pipe(
           get(node),
           Option.flatMap((node) => (isSpace(node.data) ? Option.some(node.data) : Option.none())),
           Option.map((space) => {

package/src/testing.ts

@@ -4,8 +4,8 @@
 
 import { Rx } from '@effect-rx/rx-react';
 
+import { type AnyEchoObject } from '@dxos/echo/internal';
 import { type QueryResult } from '@dxos/echo-db';
-import { type AnyEchoObject } from '@dxos/echo-schema';
 
 export const rxFromQuery = <T extends AnyEchoObject>(query: QueryResult<T>): Rx.Rx<T[]> => {
   return Rx.make((get) => {