@dxos/graph 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

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

@@ -1,12 +1,12 @@
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
 import { type Specialize } from '@dxos/util';
-export declare const BaseGraphNode: S.Struct<{
-    id: typeof S.String;
-    type: S.optional<typeof S.String>;
-    data: S.optional<typeof S.Any>;
+export declare const BaseGraphNode: Schema.Struct<{
+    id: typeof Schema.String;
+    type: Schema.optional<typeof Schema.String>;
+    data: Schema.optional<typeof Schema.Any>;
 }>;
 /** Raw base type. */
-export type BaseGraphNode = S.Schema.Type<typeof BaseGraphNode>;
+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 ? {
     data?: Data;
@@ -16,15 +16,15 @@ export type GraphNode<Data = any, Optional extends boolean = false> = Specialize
 export declare namespace GraphNode {
     type Optional<T = any> = GraphNode<T, true>;
 }
-export declare const BaseGraphEdge: S.Struct<{
-    id: typeof S.String;
-    type: S.optional<typeof S.String>;
-    data: S.optional<typeof S.Any>;
-    source: typeof S.String;
-    target: typeof S.String;
+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;
 }>;
 /** Raw base type. */
-export type BaseGraphEdge = S.Schema.Type<typeof BaseGraphEdge>;
+export type BaseGraphEdge = Schema.Schema.Type<typeof BaseGraphEdge>;
 /** Typed edge data. */
 export type GraphEdge<Data = any, Optional extends boolean = false> = Specialize<BaseGraphEdge, Optional extends true ? {
     data?: Data;
@@ -37,23 +37,23 @@ export declare namespace GraphEdge {
 /**
  * Generic graph.
  */
-export declare const Graph: S.Struct<{
-    id: S.optional<typeof S.String>;
-    nodes: S.mutable<S.Array$<S.extend<S.Struct<{
-        id: typeof S.String;
-        type: S.optional<typeof S.String>;
-        data: S.optional<typeof S.Any>;
-    }>, S.TypeLiteral<{}, readonly [{
-        readonly key: typeof S.String;
-        readonly value: typeof S.Any;
+export declare const Graph: Schema.Struct<{
+    id: Schema.optional<typeof Schema.String>;
+    nodes: Schema.mutable<Schema.Array$<Schema.extend<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: S.mutable<S.Array$<S.Struct<{
-        id: typeof S.String;
-        type: S.optional<typeof S.String>;
-        data: S.optional<typeof S.Any>;
-        source: typeof S.String;
-        target: typeof S.String;
+    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;
     }>>>;
 }>;
-export type Graph = S.Schema.Type<typeof Graph>;
+export type Graph = Schema.Schema.Type<typeof Graph>;
 //# 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,CAAC,EAAE,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,aAAa;;;;EAIxB,CAAC;AAEH,qBAAqB;AACrB,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhE,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,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC,CAAC;AAEhE,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;AAOD;;GAEG;AACH,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;EAIhB,CAAC;AAEH,MAAM,MAAM,KAAK,GAAG,CAAC,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;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"}

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

@@ -1,6 +1,3 @@
-import { type ReactiveEchoObject } from '@dxos/echo-db';
-import { GraphModel } from './model';
-import { type GraphNode } from './types';
 type EdgeMeta = {
     source: string;
     target: string;
@@ -8,10 +5,5 @@ type EdgeMeta = {
 };
 export declare const createEdgeId: ({ source, target, relation }: EdgeMeta) => string;
 export declare const parseEdgeId: (id: string) => EdgeMeta;
-/**
- * Creates a new reactive graph from a set of ECHO objects.
- * References are mapped onto graph edges.
- */
-export declare const createGraph: (objects: ReactiveEchoObject<any>[]) => GraphModel<GraphNode<ReactiveEchoObject<any>>>;
 export {};
 //# 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.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAOxD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAS,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AAKhD,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,eAAO,MAAM,YAAY,iCAAkC,QAAQ,WAIlE,CAAC;AAEF,eAAO,MAAM,WAAW,OAAQ,MAAM,KAAG,QAIxC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,YAAa,kBAAkB,CAAC,GAAG,CAAC,EAAE,KAAG,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAiC7G,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.ts"],"names":[],"mappings":"AASA,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,eAAO,MAAM,YAAY,GAAI,8BAA8B,QAAQ,WAIlE,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,MAAM,KAAG,QAIxC,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/graph",
-  "version": "0.8.2-main.f11618f",
+  "version": "0.8.2-main.fbd8ed0",
   "description": "Low-level graph API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -32,24 +32,28 @@
   ],
   "dependencies": {
     "@preact/signals-core": "^1.6.0",
+    "effect": "3.14.21",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/async": "0.8.2-main.f11618f",
-    "@dxos/echo-db": "0.8.2-main.f11618f",
-    "@dxos/debug": "0.8.2-main.f11618f",
-    "@dxos/echo-schema": "0.8.2-main.f11618f",
-    "@dxos/live-object": "0.8.2-main.f11618f",
-    "@dxos/schema": "0.8.2-main.f11618f",
-    "@dxos/log": "0.8.2-main.f11618f",
-    "@dxos/util": "0.8.2-main.f11618f",
-    "@dxos/invariant": "0.8.2-main.f11618f"
+    "@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"
   },
   "devDependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@dxos/echo-db": "0.8.2-main.f11618f",
-    "@dxos/random": "0.8.2-main.f11618f",
-    "@dxos/echo-schema": "0.8.2-main.f11618f"
+    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
+    "@dxos/random": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-db": "0.8.2-main.fbd8ed0"
+  },
+  "peerDependencies": {
+    "effect": "^3.13.3"
   },
   "publishConfig": {
     "access": "public"

package/src/create.ts

@@ -0,0 +1,52 @@
+//
+// 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;
+};

package/src/index.ts

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

package/src/model.test.ts

@@ -2,21 +2,20 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Schema } from 'effect';
 import { describe, test } from 'vitest';
 
-import { S } from '@dxos/echo-schema';
-
 import { GraphModel } from './model';
 import { BaseGraphNode, type GraphNode } from './types';
 
-const TestNode = S.extend(
+const TestNode = Schema.extend(
   BaseGraphNode,
-  S.Struct({
-    value: S.String,
+  Schema.Struct({
+    value: Schema.String,
   }),
 );
 
-type TestNode = S.Schema.Type<typeof TestNode>;
+type TestNode = Schema.Schema.Type<typeof TestNode>;
 
 type TestData = { value: string };
 

package/src/model.ts

@@ -7,7 +7,7 @@ import { failedInvariant, invariant } from '@dxos/invariant';
 import { getSnapshot } from '@dxos/live-object';
 import { type MakeOptional, isNotFalsy, removeBy, stripUndefined } from '@dxos/util';
 
-import { type Graph, type GraphNode, type GraphEdge, type BaseGraphNode, type BaseGraphEdge } from './types';
+import { type BaseGraphEdge, type BaseGraphNode, type Graph, type GraphEdge, type GraphNode } from './types';
 import { createEdgeId } from './util';
 
 /**

package/src/types.ts

@@ -2,17 +2,18 @@
 // Copyright 2024 DXOS.org
 //
 
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
+
 import { type Specialize } from '@dxos/util';
 
-export const BaseGraphNode = S.Struct({
-  id: S.String,
-  type: S.optional(S.String),
-  data: S.optional(S.Any),
+export const BaseGraphNode = Schema.Struct({
+  id: Schema.String,
+  type: Schema.optional(Schema.String),
+  data: Schema.optional(Schema.Any),
 });
 
 /** Raw base type. */
-export type BaseGraphNode = S.Schema.Type<typeof BaseGraphNode>;
+export type BaseGraphNode = Schema.Schema.Type<typeof BaseGraphNode>;
 
 /** Typed node data. */
 export type GraphNode<Data = any, Optional extends boolean = false> = Specialize<
@@ -24,16 +25,16 @@ export declare namespace GraphNode {
   export type Optional<T = any> = GraphNode<T, true>;
 }
 
-export const BaseGraphEdge = S.Struct({
-  id: S.String,
-  type: S.optional(S.String),
-  data: S.optional(S.Any),
-  source: S.String,
-  target: S.String,
+export const BaseGraphEdge = Schema.Struct({
+  id: Schema.String,
+  type: Schema.optional(Schema.String),
+  data: Schema.optional(Schema.Any),
+  source: Schema.String,
+  target: Schema.String,
 });
 
 /** Raw base type. */
-export type BaseGraphEdge = S.Schema.Type<typeof BaseGraphEdge>;
+export type BaseGraphEdge = Schema.Schema.Type<typeof BaseGraphEdge>;
 
 /** Typed edge data. */
 export type GraphEdge<Data = any, Optional extends boolean = false> = Specialize<
@@ -48,15 +49,18 @@ export declare namespace GraphEdge {
 /**
  * Allows any additional properties on graph nodes.
  */
-const ExtendableBaseGraphNode = S.extend(BaseGraphNode, S.Struct({}, { key: S.String, value: S.Any }));
+const ExtendableBaseGraphNode = Schema.extend(
+  BaseGraphNode,
+  Schema.Struct({}, { key: Schema.String, value: Schema.Any }),
+);
 
 /**
  * Generic graph.
  */
-export const Graph = S.Struct({
-  id: S.optional(S.String),
-  nodes: S.mutable(S.Array(ExtendableBaseGraphNode)),
-  edges: S.mutable(S.Array(BaseGraphEdge)),
+export const Graph = Schema.Struct({
+  id: Schema.optional(Schema.String),
+  nodes: Schema.mutable(Schema.Array(ExtendableBaseGraphNode)),
+  edges: Schema.mutable(Schema.Array(BaseGraphEdge)),
 });
 
-export type Graph = S.Schema.Type<typeof Graph>;
+export type Graph = Schema.Schema.Type<typeof Graph>;

package/src/util.ts

@@ -2,15 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type ReactiveEchoObject } from '@dxos/echo-db';
-import { FormatEnum, getSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
-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';
 
 const KEY_REGEX = /\w+/;
 
@@ -28,42 +20,3 @@ export const parseEdgeId = (id: string): EdgeMeta => {
   invariant(source.length && target.length);
   return { source, relation: relation.length ? relation : undefined, target };
 };
-
-/**
- * Creates a new reactive graph from a set of ECHO objects.
- * References are mapped onto graph edges.
- */
-export const createGraph = (objects: ReactiveEchoObject<any>[]): GraphModel<GraphNode<ReactiveEchoObject<any>>> => {
-  const graph = new GraphModel<GraphNode<ReactiveEchoObject<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;
-};