@dxos/graph 0.8.2-main.fbd8ed0 → 0.8.2-staging.4d6ad0f

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

@@ -8,20 +8,22 @@ export declare const BaseGraphNode: Schema.Struct<{
 /** Raw base type. */
 export type BaseGraphNode = Schema.Schema.Type<typeof BaseGraphNode>;
 /** Typed node data. */
-export type GraphNode<Data = any, Optional extends boolean = false> = Specialize<BaseGraphNode, Optional extends true ? {
+type GraphNode<Data = any, Optional extends boolean = false> = Specialize<BaseGraphNode, Optional extends true ? {
     data?: Data;
 } : {
     data: Data;
 }>;
 export declare namespace GraphNode {
-    type Optional<T = any> = GraphNode<T, true>;
+    type Any = GraphNode<any, true>;
+    type Optional<Data = any> = GraphNode<Data, true>;
+    type Required<Data = any> = GraphNode<Data, false>;
 }
 export declare const BaseGraphEdge: Schema.Struct<{
     id: typeof Schema.String;
     type: Schema.optional<typeof Schema.String>;
-    data: Schema.optional<typeof Schema.Any>;
     source: typeof Schema.String;
     target: typeof Schema.String;
+    data: Schema.optional<typeof Schema.Any>;
 }>;
 /** Raw base type. */
 export type BaseGraphEdge = Schema.Schema.Type<typeof BaseGraphEdge>;
@@ -32,28 +34,25 @@ export type GraphEdge<Data = any, Optional extends boolean = false> = Specialize
     data: Data;
 }>;
 export declare namespace GraphEdge {
-    type Optional<T = any> = GraphEdge<T, true>;
+    type Any = GraphEdge<any, true>;
+    type Optional<Data = any> = GraphEdge<Data, true>;
+    type Required<Data = any> = GraphEdge<Data, false>;
 }
-/**
- * Generic graph.
- */
 export declare const Graph: Schema.Struct<{
     id: Schema.optional<typeof Schema.String>;
-    nodes: Schema.mutable<Schema.Array$<Schema.extend<Schema.Struct<{
+    nodes: Schema.mutable<Schema.Array$<Schema.Struct<{
         id: typeof Schema.String;
         type: Schema.optional<typeof Schema.String>;
         data: Schema.optional<typeof Schema.Any>;
-    }>, Schema.TypeLiteral<{}, readonly [{
-        readonly key: typeof Schema.String;
-        readonly value: typeof Schema.Any;
-    }]>>>>;
+    }>>>;
     edges: Schema.mutable<Schema.Array$<Schema.Struct<{
         id: typeof Schema.String;
         type: Schema.optional<typeof Schema.String>;
-        data: Schema.optional<typeof Schema.Any>;
         source: typeof Schema.String;
         target: typeof Schema.String;
+        data: Schema.optional<typeof Schema.Any>;
     }>>>;
 }>;
 export type Graph = Schema.Schema.Type<typeof Graph>;
+export {};
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,aAAa;;;;EAIxB,CAAC;AAEH,qBAAqB;AACrB,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAErE,uBAAuB;AACvB,MAAM,MAAM,SAAS,CAAC,IAAI,GAAG,GAAG,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,IAAI,UAAU,CAC9E,aAAa,EACb,QAAQ,SAAS,IAAI,GAAG;IAAE,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CACzD,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAY,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;CACpD;AAED,eAAO,MAAM,aAAa;;;;;;EAMxB,CAAC;AAEH,qBAAqB;AACrB,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAErE,uBAAuB;AACvB,MAAM,MAAM,SAAS,CAAC,IAAI,GAAG,GAAG,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,IAAI,UAAU,CAC9E,aAAa,EACb,QAAQ,SAAS,IAAI,GAAG;IAAE,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CACzD,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAY,QAAQ,CAAC,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;CACpD;AAUD;;GAEG;AACH,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;EAIhB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAO7C,eAAO,MAAM,aAAa;;;;EAIxB,CAAC;AAEH,qBAAqB;AACrB,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAErE,uBAAuB;AACvB,KAAK,SAAS,CAAC,IAAI,GAAG,GAAG,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,IAAI,UAAU,CACvE,aAAa,EACb,QAAQ,SAAS,IAAI,GAAG;IAAE,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CACzD,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAY,GAAG,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACvC,KAAY,QAAQ,CAAC,IAAI,GAAG,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzD,KAAY,QAAQ,CAAC,IAAI,GAAG,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;CAC3D;AAMD,eAAO,MAAM,aAAa;;;;;;EAMxB,CAAC;AAEH,qBAAqB;AACrB,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAErE,uBAAuB;AACvB,MAAM,MAAM,SAAS,CAAC,IAAI,GAAG,GAAG,EAAE,QAAQ,SAAS,OAAO,GAAG,KAAK,IAAI,UAAU,CAC9E,aAAa,EACb,QAAQ,SAAS,IAAI,GAAG;IAAE,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CACzD,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,SAAS,CAAC;IACjC,KAAY,GAAG,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACvC,KAAY,QAAQ,CAAC,IAAI,GAAG,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzD,KAAY,QAAQ,CAAC,IAAI,GAAG,GAAG,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;CAC3D;AAMD,eAAO,MAAM,KAAK;;;;;;;;;;;;;;EAIhB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/graph",
-  "version": "0.8.2-main.fbd8ed0",
+  "version": "0.8.2-staging.4d6ad0f",
   "description": "Low-level graph API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -18,11 +18,8 @@
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
-      "meta": [
-        "dist/types/src/meta.d.ts"
-      ],
       "types": [
-        "dist/types/src/types/index.d.ts"
+        "dist/types/src/types.d.ts"
       ]
     }
   },
@@ -31,26 +28,26 @@
     "src"
   ],
   "dependencies": {
-    "@preact/signals-core": "^1.6.0",
+    "@preact/signals-core": "^1.9.0",
     "effect": "3.14.21",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/async": "0.8.2-main.fbd8ed0",
-    "@dxos/debug": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-db": "0.8.2-main.fbd8ed0",
-    "@dxos/invariant": "0.8.2-main.fbd8ed0",
-    "@dxos/log": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
-    "@dxos/live-object": "0.8.2-main.fbd8ed0",
-    "@dxos/schema": "0.8.2-main.fbd8ed0",
-    "@dxos/util": "0.8.2-main.fbd8ed0"
+    "@dxos/async": "0.8.2-staging.4d6ad0f",
+    "@dxos/debug": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo-db": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo-schema": "0.8.2-staging.4d6ad0f",
+    "@dxos/invariant": "0.8.2-staging.4d6ad0f",
+    "@dxos/live-object": "0.8.2-staging.4d6ad0f",
+    "@dxos/log": "0.8.2-staging.4d6ad0f",
+    "@dxos/util": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo-signals": "0.8.2-staging.4d6ad0f"
   },
   "devDependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
-    "@dxos/random": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-db": "0.8.2-main.fbd8ed0"
+    "@dxos/echo-db": "0.8.2-staging.4d6ad0f",
+    "@dxos/echo-schema": "0.8.2-staging.4d6ad0f",
+    "@dxos/random": "0.8.2-staging.4d6ad0f"
   },
   "peerDependencies": {
     "effect": "^3.13.3"

package/src/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './create';
 export * from './model';
+export * from './selection';
 export * from './types';
 export * from './util';

package/src/model.test.ts

@@ -2,11 +2,18 @@
 // Copyright 2024 DXOS.org
 //
 
+import { effect } from '@preact/signals-core';
 import { Schema } from 'effect';
 import { describe, test } from 'vitest';
 
-import { GraphModel } from './model';
-import { BaseGraphNode, type GraphNode } from './types';
+import { Trigger } from '@dxos/async';
+import { registerSignalsRuntime } from '@dxos/echo-signals';
+import { live } from '@dxos/live-object';
+
+import { GraphModel, ReactiveGraphModel } from './model';
+import { BaseGraphNode, type Graph, type GraphNode } from './types';
+
+registerSignalsRuntime();
 
 const TestNode = Schema.extend(
   BaseGraphNode,
@@ -24,7 +31,7 @@ describe('Graph', () => {
     const graph = new GraphModel();
     expect(graph.nodes).to.have.length(0);
     expect(graph.edges).to.have.length(0);
-    expect(graph.toJSON()).to.deep.eq({ nodes: [], edges: [] });
+    expect(graph.toJSON()).to.deep.eq({ nodes: 0, edges: 0 });
   });
 
   test('extended', ({ expect }) => {
@@ -33,9 +40,71 @@ describe('Graph', () => {
     expect(node.value.length).to.eq(4);
   });
 
+  test('reactive', async ({ expect }) => {
+    const graph = new GraphModel(live({ nodes: [], edges: [] }));
+
+    const done = new Trigger<Graph>();
+
+    // NOTE: Requires `registerSignalsRuntime` to be called.
+    const unsubscribe = effect(() => {
+      if (graph.edges.length === 2) {
+        done.wake(graph.graph);
+      }
+    });
+
+    setTimeout(() => {
+      graph.builder.addNode({ id: 'node-1' });
+      graph.builder.addNode({ id: 'node-2' });
+      graph.builder.addNode({ id: 'node-3' });
+    });
+
+    setTimeout(() => {
+      graph.builder.addEdge({ source: 'node-1', target: 'node-2' });
+      graph.builder.addEdge({ source: 'node-2', target: 'node-3' });
+    });
+
+    {
+      const graph = await done.wait();
+      expect(graph.nodes).to.have.length(3);
+      expect(graph.edges).to.have.length(2);
+    }
+
+    unsubscribe();
+  });
+
+  test('reactive model', async ({ expect }) => {
+    const graph = new ReactiveGraphModel();
+
+    const done = new Trigger<Graph>();
+    const unsubscribe = graph.subscribe((graph) => {
+      if (graph.edges.length === 2) {
+        done.wake(graph.graph);
+      }
+    });
+
+    setTimeout(() => {
+      graph.builder.addNode({ id: 'node-1' });
+      graph.builder.addNode({ id: 'node-2' });
+      graph.builder.addNode({ id: 'node-3' });
+    });
+
+    setTimeout(() => {
+      graph.builder.addEdge({ source: 'node-1', target: 'node-2' });
+      graph.builder.addEdge({ source: 'node-2', target: 'node-3' });
+    });
+
+    {
+      const graph = await done.wait();
+      expect(graph.nodes).to.have.length(3);
+      expect(graph.edges).to.have.length(2);
+    }
+
+    unsubscribe();
+  });
+
   test('optional', ({ expect }) => {
     {
-      const graph = new GraphModel<GraphNode<string>>();
+      const graph = new GraphModel<GraphNode.Required<string>>();
       const node = graph.addNode({ id: 'test', data: 'test' });
       expect(node.data.length).to.eq(4);
     }
@@ -48,7 +117,7 @@ describe('Graph', () => {
   });
 
   test('add and remove subgraphs', ({ expect }) => {
-    const graph = new GraphModel<GraphNode<TestData>>();
+    const graph = new GraphModel<GraphNode.Required<TestData>>();
     graph.builder
       .addNode({ id: 'node1', data: { value: 'test' } })
       .addNode({ id: 'node2', data: { value: 'test' } })

package/src/model.ts

@@ -2,16 +2,18 @@
 // Copyright 2024 DXOS.org
 //
 
+import { effect } from '@preact/signals-core';
+
 import { inspectCustom } from '@dxos/debug';
 import { failedInvariant, invariant } from '@dxos/invariant';
-import { getSnapshot } from '@dxos/live-object';
-import { type MakeOptional, isNotFalsy, removeBy, stripUndefined } from '@dxos/util';
+import { type Live, live } from '@dxos/live-object';
+import { type MakeOptional, isNotFalsy, removeBy } from '@dxos/util';
 
 import { type BaseGraphEdge, type BaseGraphNode, type Graph, type GraphEdge, type GraphNode } from './types';
 import { createEdgeId } from './util';
 
 /**
- * Wrapper class contains reactive nodes and edges.
+ * Readonly Graph wrapper.
  */
 export class ReadonlyGraphModel<
   Node extends BaseGraphNode = BaseGraphNode,
@@ -23,7 +25,10 @@ export class ReadonlyGraphModel<
    * NOTE: Pass in simple Graph or Live.
    */
   constructor(graph?: Graph) {
-    this._graph = graph ?? { nodes: [], edges: [] };
+    this._graph = graph ?? {
+      nodes: [],
+      edges: [],
+    };
   }
 
   [inspectCustom]() {
@@ -33,12 +38,11 @@ export class ReadonlyGraphModel<
   /**
    * Return stable sorted JSON representation of graph.
    */
-  // TODO(burdon): Create separate toJson method with computed signal.
   toJSON() {
-    const { id, nodes, edges } = getSnapshot(this._graph);
-    nodes.sort(({ id: a }, { id: b }) => a.localeCompare(b));
-    edges.sort(({ id: a }, { id: b }) => a.localeCompare(b));
-    return stripUndefined({ id, nodes, edges });
+    return {
+      nodes: this.nodes.length,
+      edges: this.edges.length,
+    };
   }
 
   get graph(): Graph {
@@ -65,7 +69,7 @@ export class ReadonlyGraphModel<
     return this.findNode(id) ?? failedInvariant();
   }
 
-  filterNodes({ type }: Partial<GraphNode> = {}): Node[] {
+  filterNodes({ type }: Partial<GraphNode.Any> = {}): Node[] {
     return this.nodes.filter((node) => !type || type === node.type);
   }
 
@@ -111,13 +115,13 @@ export class ReadonlyGraphModel<
 }
 
 /**
- * Typed wrapper.
+ * Mutable Graph wrapper.
  */
 export abstract class AbstractGraphModel<
-  Node extends BaseGraphNode,
-  Edge extends BaseGraphEdge,
-  Model extends AbstractGraphModel<Node, Edge, Model, Builder>,
-  Builder extends AbstractGraphBuilder<Node, Edge, Model>,
+  Node extends BaseGraphNode = BaseGraphNode,
+  Edge extends BaseGraphEdge = BaseGraphEdge,
+  Model extends AbstractGraphModel<Node, Edge, Model, Builder> = any,
+  Builder extends AbstractGraphBuilder<Node, Edge, Model> = AbstractGraphBuilder<Node, Edge, Model>,
 > extends ReadonlyGraphModel<Node, Edge> {
   /**
    * Allows chaining.
@@ -177,8 +181,8 @@ export abstract class AbstractGraphModel<
   }
 
   removeNode(id: string): Model {
-    const nodes = removeBy<Node>(this._graph.nodes as Node[], (node) => node.id === id);
     const edges = removeBy<Edge>(this._graph.edges as Edge[], (edge) => edge.source === id || edge.target === id);
+    const nodes = removeBy<Node>(this._graph.nodes as Node[], (node) => node.id === id);
     return this.copy({ nodes, edges });
   }
 
@@ -199,7 +203,7 @@ export abstract class AbstractGraphModel<
 }
 
 /**
- * Chainable wrapper
+ * Chainable builder wrapper
  */
 export abstract class AbstractGraphBuilder<
   Node extends BaseGraphNode,
@@ -242,6 +246,9 @@ export abstract class AbstractGraphBuilder<
   }
 }
 
+/**
+ * Basic model.
+ */
 export class GraphModel<
   Node extends BaseGraphNode = BaseGraphNode,
   Edge extends BaseGraphEdge = BaseGraphEdge,
@@ -250,16 +257,60 @@ export class GraphModel<
     return new GraphBuilder<Node, Edge>(this);
   }
 
-  override copy(graph?: Partial<Graph>) {
+  override copy(graph?: Partial<Graph>): GraphModel<Node, Edge> {
     return new GraphModel<Node, Edge>({ nodes: graph?.nodes ?? [], edges: graph?.edges ?? [] });
   }
 }
 
+export type GraphModelSubscription = (model: GraphModel, graph: Live<Graph>) => void;
+
+/**
+ * Subscription.
+ * NOTE: Requires `registerSignalsRuntime` to be called.
+ */
+export const subscribe = (model: GraphModel, cb: GraphModelSubscription, fire = false) => {
+  if (fire) {
+    cb(model, model.graph);
+  }
+
+  return effect(() => {
+    cb(model, model.graph); // TODO(burdon): This won't work unless model.graph is reactive.
+  });
+};
+
+/**
+ * Basic reactive model.
+ */
+export class ReactiveGraphModel<
+  Node extends BaseGraphNode = BaseGraphNode,
+  Edge extends BaseGraphEdge = BaseGraphEdge,
+> extends GraphModel<Node, Edge> {
+  constructor(graph?: Partial<Graph>) {
+    super(
+      live({
+        nodes: graph?.nodes ?? [],
+        edges: graph?.edges ?? [],
+      }),
+    );
+  }
+
+  override copy(graph?: Partial<Graph>): ReactiveGraphModel<Node, Edge> {
+    return new ReactiveGraphModel<Node, Edge>(graph);
+  }
+
+  subscribe(cb: GraphModelSubscription, fire = false): () => void {
+    return subscribe(this, cb, fire);
+  }
+}
+
+/**
+ * Basic builder.
+ */
 export class GraphBuilder<
   Node extends BaseGraphNode = BaseGraphNode,
   Edge extends BaseGraphEdge = BaseGraphEdge,
 > extends AbstractGraphBuilder<Node, Edge, GraphModel<Node, Edge>> {
-  override call(cb: (builder: this) => void) {
+  override call(cb: (builder: this) => void): this {
     cb(this);
     return this;
   }

package/src/selection.ts

@@ -0,0 +1,70 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { computed, signal, type ReadonlySignal, type Signal } from '@preact/signals-core';
+
+import { invariant } from '@dxos/invariant';
+
+/**
+ * Reactive selection model.
+ */
+export class SelectionModel {
+  private readonly _selected: Signal<Set<string>> = signal(new Set<string>());
+  private readonly _selectedIds = computed(() => Array.from(this._selected.value.values()));
+
+  constructor(private readonly _singleSelect: boolean = false) {}
+
+  toJSON(): { selected: string[] } {
+    return {
+      selected: Array.from(this._selected.value.values()),
+    };
+  }
+
+  get size(): number {
+    return this._selected.value.size;
+  }
+
+  get selected(): ReadonlySignal<string[]> {
+    return this._selectedIds;
+  }
+
+  contains(id: string): boolean {
+    return this._selected.value.has(id);
+  }
+
+  clear(): void {
+    this._selected.value = new Set();
+  }
+
+  add(id: string): void {
+    invariant(id);
+    this._selected.value = new Set<string>(
+      this._singleSelect ? [id] : [...Array.from(this._selected.value.values()), id],
+    );
+  }
+
+  remove(id: string): void {
+    invariant(id);
+    this._selected.value = new Set<string>(Array.from(this._selected.value.values()).filter((_id) => _id !== id));
+  }
+
+  // TODO(burdon): Handle single select.
+
+  setSelected(ids: string[], shift = false): void {
+    this._selected.value = new Set([...(shift ? Array.from(this._selected.value.values()) : []), ...ids]);
+  }
+
+  toggleSelected(ids: string[], shift = false): void {
+    const set = new Set<string>(shift ? Array.from(this._selected.value.values()) : undefined);
+    ids.forEach((id) => {
+      if (this._selected.value.has(id)) {
+        set.delete(id);
+      } else {
+        set.add(id);
+      }
+    });
+
+    this._selected.value = set;
+  }
+}

package/src/types.ts

@@ -6,6 +6,11 @@ import { Schema } from 'effect';
 
 import { type Specialize } from '@dxos/util';
 
+//
+// Node
+//
+
+// TODO(burdon): Make type extensible (i.e., not dependent on `data` property)?
 export const BaseGraphNode = Schema.Struct({
   id: Schema.String,
   type: Schema.optional(Schema.String),
@@ -16,21 +21,27 @@ export const BaseGraphNode = Schema.Struct({
 export type BaseGraphNode = Schema.Schema.Type<typeof BaseGraphNode>;
 
 /** Typed node data. */
-export type GraphNode<Data = any, Optional extends boolean = false> = Specialize<
+type GraphNode<Data = any, Optional extends boolean = false> = Specialize<
   BaseGraphNode,
   Optional extends true ? { data?: Data } : { data: Data }
 >;
 
 export declare namespace GraphNode {
-  export type Optional<T = any> = GraphNode<T, true>;
+  export type Any = GraphNode<any, true>;
+  export type Optional<Data = any> = GraphNode<Data, true>;
+  export type Required<Data = any> = GraphNode<Data, false>;
 }
 
+//
+// Edge
+//
+
 export const BaseGraphEdge = Schema.Struct({
   id: Schema.String,
   type: Schema.optional(Schema.String),
-  data: Schema.optional(Schema.Any),
   source: Schema.String,
   target: Schema.String,
+  data: Schema.optional(Schema.Any),
 });
 
 /** Raw base type. */
@@ -43,23 +54,18 @@ export type GraphEdge<Data = any, Optional extends boolean = false> = Specialize
 >;
 
 export declare namespace GraphEdge {
-  export type Optional<T = any> = GraphEdge<T, true>;
+  export type Any = GraphEdge<any, true>;
+  export type Optional<Data = any> = GraphEdge<Data, true>;
+  export type Required<Data = any> = GraphEdge<Data, false>;
 }
 
-/**
- * Allows any additional properties on graph nodes.
- */
-const ExtendableBaseGraphNode = Schema.extend(
-  BaseGraphNode,
-  Schema.Struct({}, { key: Schema.String, value: Schema.Any }),
-);
+//
+// Graph
+//
 
-/**
- * Generic graph.
- */
 export const Graph = Schema.Struct({
   id: Schema.optional(Schema.String),
-  nodes: Schema.mutable(Schema.Array(ExtendableBaseGraphNode)),
+  nodes: Schema.mutable(Schema.Array(BaseGraphNode)),
   edges: Schema.mutable(Schema.Array(BaseGraphEdge)),
 });
 

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

@@ -1,9 +0,0 @@
-import { type AnyLiveObject } from '@dxos/echo-db';
-import { GraphModel } from './model';
-import { type GraphNode } from './types';
-/**
- * Creates a new reactive graph from a set of ECHO objects.
- * References are mapped onto graph edges.
- */
-export declare const createGraph: (objects: AnyLiveObject<any>[]) => GraphModel<GraphNode<AnyLiveObject<any>>>;
-//# sourceMappingURL=create.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/create.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AAMnD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAS,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAGhD;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,aAAa,CAAC,GAAG,CAAC,EAAE,KAAG,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAiCnG,CAAC"}

package/src/create.ts

@@ -1,52 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { type AnyLiveObject } from '@dxos/echo-db';
-import { FormatEnum, getSchema } from '@dxos/echo-schema';
-import { live } from '@dxos/live-object';
-import { log } from '@dxos/log';
-import { getSchemaProperties } from '@dxos/schema';
-
-import { GraphModel } from './model';
-import { Graph, type GraphNode } from './types';
-import { createEdgeId } from './util';
-
-/**
- * Creates a new reactive graph from a set of ECHO objects.
- * References are mapped onto graph edges.
- */
-export const createGraph = (objects: AnyLiveObject<any>[]): GraphModel<GraphNode<AnyLiveObject<any>>> => {
-  const graph = new GraphModel<GraphNode<AnyLiveObject<any>>>(live(Graph, { nodes: [], edges: [] }));
-
-  // Map objects.
-  objects.forEach((object) => {
-    graph.addNode({ id: object.id, type: object.typename, data: object });
-  });
-
-  // Find references.
-  objects.forEach((object) => {
-    const schema = getSchema(object);
-    if (!schema) {
-      log.info('no schema for object', { id: object.id.slice(0, 8) });
-      return;
-    }
-
-    // Parse schema to follow referenced objects.
-    for (const prop of getSchemaProperties(schema.ast, object)) {
-      if (prop.format === FormatEnum.Ref) {
-        const source = object;
-        const target = object[prop.name]?.target;
-        if (target) {
-          graph.addEdge({
-            id: createEdgeId({ source: source.id, target: target.id, relation: String(prop.name) }),
-            source: source.id,
-            target: target.id,
-          });
-        }
-      }
-    }
-  });
-
-  return graph;
-};