@dxos/echo 0.8.4-main.b97322e → 0.8.4-main.c4373fc

package/dist/lib/node-esm/testing/index.mjs

@@ -1,16 +1,112 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
   Type_exports
-} from "../chunk-IV6BWGHK.mjs";
+} from "../chunk-L4PBAJDP.mjs";
+import "../chunk-AXWVDOP7.mjs";
+import {
+  EchoObject,
+  EchoRelation,
+  EchoSchema,
+  Expando,
+  Ref,
+  StoredSchema,
+  TypedObject,
+  getSchemaTypename,
+  live,
+  toJsonSchema
+} from "../chunk-YTNLFBIK.mjs";
 
-// src/testing/types.ts
-import { Schema } from "effect";
-(function(Testing2) {
-  const _Contact = Schema.Struct({
+// src/internal/testing/types.ts
+import * as Schema from "effect/Schema";
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+(function(Testing3) {
+  const Circle = Schema.Struct({
+    type: Schema.Literal("circle"),
+    radius: Schema.Number
+  });
+  const Square = Schema.Struct({
+    type: Schema.Literal("square"),
+    side: Schema.Number
+  });
+  const Shape = Schema.Union(Circle, Square);
+  const TestNestedSchema = Schema.mutable(Schema.Struct({
+    field: Schema.String
+  }));
+  Testing3.TestNestedType = TestNestedSchema.pipe(EchoObject({
+    typename: "example.com/type/TestNested",
+    version: "0.1.0"
+  }));
+  class EmptySchemaType extends TypedObject({
+    typename: "example.com/type/Empty",
+    version: "0.1.0"
+  })({}) {
+  }
+  Testing3.EmptySchemaType = EmptySchemaType;
+  const fields = {
+    string: Schema.String,
+    number: Schema.Number,
+    nullableShapeArray: Schema.mutable(Schema.Array(Schema.Union(Shape, Schema.Null))),
+    boolean: Schema.Boolean,
+    null: Schema.Null,
+    undefined: Schema.Undefined,
+    stringArray: Schema.mutable(Schema.Array(Schema.String)),
+    twoDimNumberArray: Schema.mutable(Schema.Array(Schema.mutable(Schema.Array(Schema.Number)))),
+    object: TestNestedSchema,
+    objectArray: Schema.mutable(Schema.Array(TestNestedSchema)),
+    nested: Schema.optional(Ref(Testing3.TestNestedType)),
+    other: Schema.Any
+  };
+  Testing3.TestSchema = Schema.mutable(Schema.partial(Schema.Struct(fields)));
+  class TestSchemaType extends TypedObject({
+    typename: "example.com/type/Test",
+    version: "0.1.0"
+  })(fields, {
+    partial: true
+  }) {
+  }
+  Testing3.TestSchemaType = TestSchemaType;
+  Testing3.TestType = Testing3.TestSchema.pipe(EchoObject({
+    typename: "example.com/type/Test",
+    version: "0.1.0"
+  }));
+  class TestClass {
+    toJSON() {
+      return {
+        field: this.field
+      };
+    }
+    constructor() {
+      _define_property(this, "field", "value");
+    }
+  }
+  Testing3.TestClass = TestClass;
+  Testing3.TestSchemaWithClass = Schema.mutable(Schema.extend(Testing3.TestSchema, Schema.mutable(Schema.Struct({
+    classInstance: Schema.optional(Schema.instanceOf(TestClass))
+  }))));
+  class Contact extends TypedObject({
+    typename: "example.com/type/Contact",
+    version: "0.1.0"
+  })({
     name: Schema.String,
     username: Schema.String,
     email: Schema.String,
-    tasks: Schema.mutable(Schema.Array(Schema.suspend(() => Type_exports.Ref(Testing2.Task)))),
+    phoneNumbers: Schema.optional(Schema.Array(Schema.Struct({
+      label: Schema.String,
+      number: Schema.String
+    }))),
+    tasks: Schema.suspend(() => Schema.mutable(Schema.Array(Ref(Task)))),
     address: Schema.Struct({
       city: Schema.optional(Schema.String),
       state: Schema.optional(Schema.String),
@@ -20,51 +116,183 @@ import { Schema } from "effect";
         lng: Schema.optional(Schema.Number)
       })
     })
-  }).pipe(Schema.partial, Type_exports.Obj({
-    typename: "example.com/type/Contact",
+  }, {
+    partial: true
+  }) {
+  }
+  Testing3.Contact = Contact;
+  class Task extends TypedObject({
+    typename: "example.com/type/Task",
     version: "0.1.0"
-  }));
-  Testing2.Contact = _Contact;
-  const _Task = Schema.Struct({
+  })({
     title: Schema.optional(Schema.String),
     completed: Schema.optional(Schema.Boolean),
-    assignee: Schema.optional(Type_exports.Ref(Testing2.Contact)),
-    previous: Schema.optional(Schema.suspend(() => Type_exports.Ref(Testing2.Task))),
-    subTasks: Schema.optional(Schema.mutable(Schema.Array(Schema.suspend(() => Type_exports.Ref(Testing2.Task))))),
+    assignee: Schema.optional(Ref(Contact)),
+    previous: Schema.optional(Schema.suspend(() => Ref(Task))),
+    subTasks: Schema.optional(Schema.mutable(Schema.Array(Schema.suspend(() => Ref(Task))))),
     description: Schema.optional(Schema.String)
-  }).pipe(Schema.partial, Type_exports.Obj({
-    typename: "example.com/type/Task",
-    version: "0.1.0"
-  }));
-  Testing2.Task = _Task;
+  }, {
+    partial: true
+  }) {
+  }
+  Testing3.Task = Task;
   (function(RecordType) {
     RecordType[RecordType["UNDEFINED"] = 0] = "UNDEFINED";
     RecordType[RecordType["PERSONAL"] = 1] = "PERSONAL";
     RecordType[RecordType["WORK"] = 2] = "WORK";
-  })(Testing2.RecordType || (Testing2.RecordType = {}));
-  Testing2.Container = Schema.Struct({
-    objects: Schema.mutable(Schema.Array(Type_exports.Ref(Type_exports.Expando))),
+  })(Testing3.RecordType || (Testing3.RecordType = {}));
+  class Container extends TypedObject({
+    typename: "example.com/type/Container",
+    version: "0.1.0"
+  })({
+    objects: Schema.mutable(Schema.Array(Ref(Expando))),
     records: Schema.mutable(Schema.Array(Schema.partial(Schema.Struct({
       title: Schema.String,
       description: Schema.String,
-      contacts: Schema.mutable(Schema.Array(Type_exports.Ref(Testing2.Contact))),
-      type: Schema.Enums(Testing2.RecordType)
+      contacts: Schema.mutable(Schema.Array(Ref(Contact))),
+      type: Schema.Enums(Testing3.RecordType)
+    }))))
+  }, {
+    partial: true
+  }) {
+  }
+  Testing3.Container = Container;
+  Testing3.HasManager = Schema.Struct({
+    since: Schema.optional(Schema.String)
+  }).pipe(EchoRelation({
+    typename: "example.com/type/HasManager",
+    version: "0.1.0",
+    source: Contact,
+    target: Contact
+  }));
+})(Testing || (Testing = {}));
+var Testing;
+
+// src/internal/testing/utils.ts
+import { effect } from "@preact/signals-core";
+import { registerSignalsRuntime } from "@dxos/echo-signals";
+import { deepMapValues } from "@dxos/util";
+registerSignalsRuntime();
+var updateCounter = (touch) => {
+  let updateCount = -1;
+  const unsubscribe = effect(() => {
+    touch();
+    updateCount++;
+  });
+  return {
+    // https://github.com/tc39/proposal-explicit-resource-management
+    [Symbol.dispose]: unsubscribe,
+    get count() {
+      return updateCount;
+    }
+  };
+};
+var prepareAstForCompare = (obj) => deepMapValues(obj, (value, recurse, key) => {
+  if (typeof value === "function") {
+    return null;
+  }
+  if (value instanceof RegExp) {
+    return value;
+  }
+  if (typeof value === "object") {
+    const clone = {
+      ...value
+    };
+    for (const sym of Object.getOwnPropertySymbols(clone)) {
+      clone[sym.toString()] = clone[sym];
+      delete clone[sym];
+    }
+    return recurse(clone);
+  }
+  return recurse(value);
+});
+
+// src/testing/types.ts
+import * as Schema2 from "effect/Schema";
+(function(Testing3) {
+  const _Contact = Schema2.Struct({
+    name: Schema2.String,
+    username: Schema2.String,
+    email: Schema2.String,
+    tasks: Schema2.mutable(Schema2.Array(Schema2.suspend(() => Type_exports.Ref(Testing3.Task)))),
+    address: Schema2.Struct({
+      city: Schema2.optional(Schema2.String),
+      state: Schema2.optional(Schema2.String),
+      zip: Schema2.optional(Schema2.String),
+      coordinates: Schema2.Struct({
+        lat: Schema2.optional(Schema2.Number),
+        lng: Schema2.optional(Schema2.Number)
+      })
+    })
+  }).pipe(Schema2.partial, Type_exports.Obj({
+    typename: "example.com/type/Contact",
+    version: "0.1.0"
+  }));
+  Testing3.Contact = _Contact;
+  const _Task = Schema2.Struct({
+    title: Schema2.optional(Schema2.String),
+    completed: Schema2.optional(Schema2.Boolean),
+    assignee: Schema2.optional(Type_exports.Ref(Testing3.Contact)),
+    previous: Schema2.optional(Schema2.suspend(() => Type_exports.Ref(Testing3.Task))),
+    subTasks: Schema2.optional(Schema2.mutable(Schema2.Array(Schema2.suspend(() => Type_exports.Ref(Testing3.Task))))),
+    description: Schema2.optional(Schema2.String)
+  }).pipe(Schema2.partial, Type_exports.Obj({
+    typename: "example.com/type/Task",
+    version: "0.1.0"
+  }));
+  Testing3.Task = _Task;
+  (function(RecordType) {
+    RecordType[RecordType["UNDEFINED"] = 0] = "UNDEFINED";
+    RecordType[RecordType["PERSONAL"] = 1] = "PERSONAL";
+    RecordType[RecordType["WORK"] = 2] = "WORK";
+  })(Testing3.RecordType || (Testing3.RecordType = {}));
+  Testing3.Container = Schema2.Struct({
+    objects: Schema2.mutable(Schema2.Array(Type_exports.Ref(Type_exports.Expando))),
+    records: Schema2.mutable(Schema2.Array(Schema2.partial(Schema2.Struct({
+      title: Schema2.String,
+      description: Schema2.String,
+      contacts: Schema2.mutable(Schema2.Array(Type_exports.Ref(Testing3.Contact))),
+      type: Schema2.Enums(Testing3.RecordType)
     }))))
-  }).pipe(Schema.partial, Type_exports.Obj({
+  }).pipe(Schema2.partial, Type_exports.Obj({
     typename: "example.com/type/Container",
     version: "0.1.0"
   }));
-  Testing2.WorksFor = Schema.Struct({
-    since: Schema.optional(Schema.String)
+  Testing3.WorksFor = Schema2.Struct({
+    since: Schema2.optional(Schema2.String)
   }).pipe(Type_exports.Relation({
     typename: "example.com/type/WorksFor",
     version: "0.1.0",
-    source: Testing2.Contact,
-    target: Testing2.Contact
+    source: Testing3.Contact,
+    target: Testing3.Contact
   }));
-})(Testing || (Testing = {}));
-var Testing;
+})(Testing2 || (Testing2 = {}));
+var Testing2;
+
+// src/testing/echo-schema.ts
+import { effect as effect2 } from "@preact/signals-core";
+import { registerSignalsRuntime as registerSignalsRuntime2 } from "@dxos/echo-signals";
+import { assertArgument } from "@dxos/invariant";
+registerSignalsRuntime2();
+var createEchoSchema = (schema) => {
+  const typename = getSchemaTypename(schema);
+  assertArgument(typename, "typename", "Schema does not have a typename.");
+  const echoSchema = new EchoSchema(live(StoredSchema, {
+    typename,
+    version: "0.1.0",
+    jsonSchema: toJsonSchema(schema)
+  }));
+  effect2(() => {
+    const _ = echoSchema.jsonSchema;
+    echoSchema._invalidate();
+  });
+  return echoSchema;
+};
 export {
-  Testing
+  Testing2 as Testing,
+  Testing as TestingDeprecated,
+  createEchoSchema,
+  prepareAstForCompare,
+  updateCounter
 };
 //# sourceMappingURL=index.mjs.map

package/dist/lib/node-esm/testing/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../../src/testing/types.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { Schema } from 'effect';\n\nimport { Type } from '..';\n\n// TODO(burdon): These are non-canonical test types, so we really shouldn't export and use in other classes (compare with @dxos/sdk/testing).\nexport namespace Testing {\n  const _Contact = Schema.Struct({\n    name: Schema.String,\n    username: Schema.String,\n    email: Schema.String,\n    tasks: Schema.mutable(Schema.Array(Schema.suspend((): Type.Ref<Task> => Type.Ref(Task)))),\n    address: Schema.Struct({\n      city: Schema.optional(Schema.String),\n      state: Schema.optional(Schema.String),\n      zip: Schema.optional(Schema.String),\n      coordinates: Schema.Struct({\n        lat: Schema.optional(Schema.Number),\n        lng: Schema.optional(Schema.Number),\n      }),\n    }),\n  }).pipe(\n    Schema.partial,\n    Type.Obj({\n      typename: 'example.com/type/Contact',\n      version: '0.1.0',\n    }),\n  );\n  export interface Contact extends Schema.Schema.Type<typeof _Contact> {}\n  export const Contact: Schema.Schema<Contact, Schema.Schema.Encoded<typeof _Contact>, never> = _Contact;\n\n  const _Task = Schema.Struct({\n    title: Schema.optional(Schema.String),\n    completed: Schema.optional(Schema.Boolean),\n    assignee: Schema.optional(Type.Ref(Contact)),\n    previous: Schema.optional(Schema.suspend((): Type.Ref<Task> => Type.Ref(Task))),\n    subTasks: Schema.optional(Schema.mutable(Schema.Array(Schema.suspend((): Type.Ref<Task> => Type.Ref(Task))))),\n    description: Schema.optional(Schema.String),\n  }).pipe(\n    Schema.partial,\n    Type.Obj({\n      typename: 'example.com/type/Task',\n      version: '0.1.0',\n    }),\n  );\n  export interface Task extends Schema.Schema.Type<typeof _Task> {}\n  export const Task: Schema.Schema<Task, Schema.Schema.Encoded<typeof _Task>, never> = _Task;\n\n  export enum RecordType {\n    UNDEFINED = 0,\n    PERSONAL = 1,\n    WORK = 2,\n  }\n\n  export const Container = Schema.Struct({\n    objects: Schema.mutable(Schema.Array(Type.Ref(Type.Expando))),\n    records: Schema.mutable(\n      Schema.Array(\n        Schema.partial(\n          Schema.Struct({\n            title: Schema.String,\n            description: Schema.String,\n            contacts: Schema.mutable(Schema.Array(Type.Ref(Contact))),\n            type: Schema.Enums(RecordType),\n          }),\n        ),\n      ),\n    ),\n  }).pipe(\n    Schema.partial,\n    Type.Obj({\n      typename: 'example.com/type/Container',\n      version: '0.1.0',\n    }),\n  );\n\n  export const WorksFor = Schema.Struct({\n    since: Schema.optional(Schema.String),\n  }).pipe(\n    Type.Relation({\n      typename: 'example.com/type/WorksFor',\n      version: '0.1.0',\n      source: Contact,\n      target: Contact,\n    }),\n  );\n  export interface WorksFor extends Schema.Schema.Type<typeof WorksFor> {}\n}\n"],
-  "mappings": ";;;;;;AAIA,SAASA,cAAc;UAKNC,UAAAA;AACf,QAAMC,WAAWC,OAAOC,OAAO;IAC7BC,MAAMF,OAAOG;IACbC,UAAUJ,OAAOG;IACjBE,OAAOL,OAAOG;IACdG,OAAON,OAAOO,QAAQP,OAAOQ,MAAMR,OAAOS,QAAQ,MAAsBC,aAAKC,IAAGb,SAACc,IAAAA,CAAAA,CAAAA,CAAAA;IACjFC,SAASb,OAAOC,OAAO;MACrBa,MAAMd,OAAOe,SAASf,OAAOG,MAAM;MACnCa,OAAOhB,OAAOe,SAASf,OAAOG,MAAM;MACpCc,KAAKjB,OAAOe,SAASf,OAAOG,MAAM;MAClCe,aAAalB,OAAOC,OAAO;QACzBkB,KAAKnB,OAAOe,SAASf,OAAOoB,MAAM;QAClCC,KAAKrB,OAAOe,SAASf,OAAOoB,MAAM;MACpC,CAAA;IACF,CAAA;EACF,CAAA,EAAGE,KACDtB,OAAOuB,SACPb,aAAKc,IAAI;IACPC,UAAU;IACVC,SAAS;EACX,CAAA,CAAA;WAGWC,UAAiF5B;AAE9F,QAAM6B,QAAQ5B,OAAOC,OAAO;IAC1B4B,OAAO7B,OAAOe,SAASf,OAAOG,MAAM;IACpC2B,WAAW9B,OAAOe,SAASf,OAAO+B,OAAO;IACzCC,UAAUhC,OAAOe,SAASL,aAAKC,IAAGb,SAAC6B,OAAAA,CAAAA;IACnCM,UAAUjC,OAAOe,SAASf,OAAOS,QAAQ,MAAsBC,aAAKC,IAAGb,SAACc,IAAAA,CAAAA,CAAAA;IACxEsB,UAAUlC,OAAOe,SAASf,OAAOO,QAAQP,OAAOQ,MAAMR,OAAOS,QAAQ,MAAsBC,aAAKC,IAAGb,SAACc,IAAAA,CAAAA,CAAAA,CAAAA,CAAAA;IACpGuB,aAAanC,OAAOe,SAASf,OAAOG,MAAM;EAC5C,CAAA,EAAGmB,KACDtB,OAAOuB,SACPb,aAAKc,IAAI;IACPC,UAAU;IACVC,SAAS;EACX,CAAA,CAAA;WAGWd,OAAwEgB;YAEzEQ,YAAAA;;;;cAAAA,eAAAA,SAAAA,aAAAA,CAAAA,EAAAA;WAMCC,YAAYrC,OAAOC,OAAO;IACrCqC,SAAStC,OAAOO,QAAQP,OAAOQ,MAAME,aAAKC,IAAID,aAAK6B,OAAO,CAAA,CAAA;IAC1DC,SAASxC,OAAOO,QACdP,OAAOQ,MACLR,OAAOuB,QACLvB,OAAOC,OAAO;MACZ4B,OAAO7B,OAAOG;MACdgC,aAAanC,OAAOG;MACpBsC,UAAUzC,OAAOO,QAAQP,OAAOQ,MAAME,aAAKC,IAAGb,SAAC6B,OAAAA,CAAAA,CAAAA;MAC/Ce,MAAM1C,OAAO2C,MAAK7C,SAACsC,UAAAA;IACrB,CAAA,CAAA,CAAA,CAAA;EAIR,CAAA,EAAGd,KACDtB,OAAOuB,SACPb,aAAKc,IAAI;IACPC,UAAU;IACVC,SAAS;EACX,CAAA,CAAA;WAGWkB,WAAW5C,OAAOC,OAAO;IACpC4C,OAAO7C,OAAOe,SAASf,OAAOG,MAAM;EACtC,CAAA,EAAGmB,KACDZ,aAAKoC,SAAS;IACZrB,UAAU;IACVC,SAAS;IACTqB,QAAMjD,SAAE6B;IACRqB,QAAMlD,SAAE6B;EACV,CAAA,CAAA;AAGJ,GAjFiB7B,YAAAA,UAAAA,CAAAA,EAAAA;;",
-  "names": ["Schema", "Testing", "_Contact", "Schema", "Struct", "name", "String", "username", "email", "tasks", "mutable", "Array", "suspend", "Type", "Ref", "Task", "address", "city", "optional", "state", "zip", "coordinates", "lat", "Number", "lng", "pipe", "partial", "Obj", "typename", "version", "Contact", "_Task", "title", "completed", "Boolean", "assignee", "previous", "subTasks", "description", "RecordType", "Container", "objects", "Expando", "records", "contacts", "type", "Enums", "WorksFor", "since", "Relation", "source", "target"]
+  "sources": ["../../../../src/internal/testing/types.ts", "../../../../src/internal/testing/utils.ts", "../../../../src/testing/types.ts", "../../../../src/testing/echo-schema.ts"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { EchoObject, EchoRelation, Expando, TypedObject } from '../object';\nimport { Ref, type Ref$ } from '../ref';\n\n// TODO(burdon): These are non-canonical test types, so we really shouldn't export and use in other classes (compare with @dxos/sdk/testing).\nexport namespace Testing {\n  //\n  // Primitives\n  //\n\n  const Circle = Schema.Struct({ type: Schema.Literal('circle'), radius: Schema.Number });\n  const Square = Schema.Struct({ type: Schema.Literal('square'), side: Schema.Number });\n  const Shape = Schema.Union(Circle, Square);\n\n  //\n  // Simple types\n  //\n\n  const TestNestedSchema = Schema.mutable(Schema.Struct({ field: Schema.String }));\n  export type TestNestedSchema = Schema.Schema.Type<typeof TestNestedSchema>;\n  export const TestNestedType = TestNestedSchema.pipe(\n    EchoObject({ typename: 'example.com/type/TestNested', version: '0.1.0' }),\n  );\n\n  //\n  // Complex types\n  // TODO(burdon): Change to Type.Obj.\n  //\n\n  export class EmptySchemaType extends TypedObject({\n    typename: 'example.com/type/Empty',\n    version: '0.1.0',\n  })({}) {}\n\n  const fields = {\n    string: Schema.String,\n    number: Schema.Number,\n    nullableShapeArray: Schema.mutable(Schema.Array(Schema.Union(Shape, Schema.Null))),\n    boolean: Schema.Boolean,\n    null: Schema.Null,\n    undefined: Schema.Undefined,\n    stringArray: Schema.mutable(Schema.Array(Schema.String)),\n    twoDimNumberArray: Schema.mutable(Schema.Array(Schema.mutable(Schema.Array(Schema.Number)))),\n    object: TestNestedSchema,\n    objectArray: Schema.mutable(Schema.Array(TestNestedSchema)),\n    nested: Schema.optional(Ref(TestNestedType)),\n    other: Schema.Any,\n  };\n\n  export const TestSchema = Schema.mutable(Schema.partial(Schema.Struct(fields)));\n  export type TestSchema = Schema.Schema.Type<typeof TestSchema>;\n\n  export class TestSchemaType extends TypedObject({\n    typename: 'example.com/type/Test',\n    version: '0.1.0',\n  })(fields, { partial: true }) {} // TODO(burdon): Partial?\n\n  // TODO(burdon): Why do we use need this rather then TestSchemaType?\n  export const TestType = TestSchema.pipe(\n    EchoObject({\n      typename: 'example.com/type/Test',\n      version: '0.1.0',\n    }),\n  );\n\n  export class TestClass {\n    field = 'value';\n    toJSON() {\n      return { field: this.field };\n    }\n  }\n\n  // TODO(dmaretskyi): Another top-level Schema.mutable call as a workaround for the regression in the last minor.\n  export const TestSchemaWithClass = Schema.mutable(\n    Schema.extend(\n      TestSchema,\n      Schema.mutable(\n        Schema.Struct({\n          classInstance: Schema.optional(Schema.instanceOf(TestClass)),\n        }),\n      ),\n    ),\n  );\n\n  export type TestSchemaWithClass = Schema.Schema.Type<typeof TestSchemaWithClass>;\n\n  export class Contact extends TypedObject({\n    typename: 'example.com/type/Contact',\n    version: '0.1.0',\n  })(\n    {\n      name: Schema.String,\n      username: Schema.String,\n      email: Schema.String,\n      phoneNumbers: Schema.optional(Schema.Array(Schema.Struct({ label: Schema.String, number: Schema.String }))),\n      tasks: Schema.suspend((): Schema.mutable<Schema.Array$<Ref$<Task>>> => Schema.mutable(Schema.Array(Ref(Task)))),\n      address: Schema.Struct({\n        city: Schema.optional(Schema.String),\n        state: Schema.optional(Schema.String),\n        zip: Schema.optional(Schema.String),\n        coordinates: Schema.Struct({\n          lat: Schema.optional(Schema.Number),\n          lng: Schema.optional(Schema.Number),\n        }),\n      }),\n    },\n    { partial: true },\n  ) {}\n\n  export class Task extends TypedObject({\n    typename: 'example.com/type/Task',\n    version: '0.1.0',\n  })(\n    {\n      title: Schema.optional(Schema.String),\n      completed: Schema.optional(Schema.Boolean),\n      assignee: Schema.optional(Ref(Contact)),\n      previous: Schema.optional(Schema.suspend((): Ref$<Task> => Ref(Task))),\n      subTasks: Schema.optional(Schema.mutable(Schema.Array(Schema.suspend((): Ref$<Task> => Ref(Task))))),\n      description: Schema.optional(Schema.String),\n    },\n    { partial: true },\n  ) {}\n\n  // TOOD(burdon): Ref$ breaks if using new syntax (since ID is not declared).\n\n  // export const Task = Schema.Struct({\n  //   title: Schema.String,\n  //   completed: Schema.Boolean,\n  //   assignee: Schema.optional(Ref(Schema.suspend((): Ref$<Contact> => Ref(Contact)))),\n  //   previous: Schema.optional(Ref(Schema.suspend((): Ref$<Task> => Ref(Task)))),\n  //   subTasks: Schema.optional(Schema.Array(Ref(Schema.suspend((): Ref$<Task> => Ref(Task))))),\n  //   description: Schema.optional(Schema.String),\n  // }).pipe(\n  //   EchoObject({\n  //     typename: 'example.com/type/Task',\n  //     version: '0.1.0',\n  //   }),\n  // );\n\n  // export type Task = Schema.Schema.Type<typeof Task>;\n\n  // export const Contact = Schema.Struct({\n  //   name: Schema.String,\n  //   username: Schema.String,\n  //   email: Schema.String,\n  //   // TOOD(burdon): Should model via relations?\n  //   // tasks: Schema.mutable(Schema.Array(Ref(Task))),\n  //   address: Schema.Struct({\n  //     city: Schema.optional(Schema.String),\n  //     state: Schema.optional(Schema.String),\n  //     zip: Schema.optional(Schema.String),\n  //     coordinates: Schema.Struct({\n  //       lat: Schema.optional(Schema.Number),\n  //       lng: Schema.optional(Schema.Number),\n  //     }),\n  //   }),\n  // }).pipe(\n  //   EchoObject({\n  //     typename: 'example.com/type/Contact',\n  //     version: '0.1.0',\n  //   }),\n  // );\n\n  // export type Contact = Schema.Schema.Type<typeof Contact>;\n\n  export enum RecordType {\n    UNDEFINED = 0,\n    PERSONAL = 1,\n    WORK = 2,\n  }\n\n  export class Container extends TypedObject({\n    typename: 'example.com/type/Container',\n    version: '0.1.0',\n  })(\n    {\n      objects: Schema.mutable(Schema.Array(Ref(Expando))),\n      records: Schema.mutable(\n        Schema.Array(\n          Schema.partial(\n            Schema.Struct({\n              title: Schema.String,\n              description: Schema.String,\n              contacts: Schema.mutable(Schema.Array(Ref(Contact))),\n              type: Schema.Enums(RecordType),\n            }),\n          ),\n        ),\n      ),\n    },\n    { partial: true },\n  ) {}\n\n  export const HasManager = Schema.Struct({\n    since: Schema.optional(Schema.String),\n  }).pipe(\n    EchoRelation({\n      typename: 'example.com/type/HasManager',\n      version: '0.1.0',\n      source: Contact,\n      target: Contact,\n    }),\n  );\n  export interface HasManager extends Schema.Schema.Type<typeof HasManager> {}\n}\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { effect } from '@preact/signals-core';\nimport type * as SchemaAST from 'effect/SchemaAST';\n\nimport { registerSignalsRuntime } from '@dxos/echo-signals';\nimport { deepMapValues } from '@dxos/util';\n\nregisterSignalsRuntime();\n\n// TODO(burdon): Move to util.\nexport const updateCounter = (touch: () => void) => {\n  let updateCount = -1;\n  const unsubscribe = effect(() => {\n    touch();\n    updateCount++;\n  });\n\n  return {\n    // https://github.com/tc39/proposal-explicit-resource-management\n    [Symbol.dispose]: unsubscribe,\n    get count() {\n      return updateCount;\n    },\n  };\n};\n\n/**\n * Converts AST to a format that can be compared with test matchers.\n */\nexport const prepareAstForCompare = (obj: SchemaAST.AST): any =>\n  deepMapValues(obj, (value: any, recurse, key) => {\n    if (typeof value === 'function') {\n      return null;\n    }\n\n    if (value instanceof RegExp) {\n      return value;\n    }\n\n    // Convert symbols to strings.\n    if (typeof value === 'object') {\n      const clone = { ...value };\n      for (const sym of Object.getOwnPropertySymbols(clone as any)) {\n        clone[sym.toString()] = clone[sym];\n        delete clone[sym];\n      }\n      return recurse(clone);\n    }\n\n    return recurse(value);\n  });\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport * as Schema from 'effect/Schema';\n\nimport { Type } from '..';\n\n// TODO(burdon): These are non-canonical test types, so we really shouldn't export and use in other classes (compare with @dxos/sdk/testing).\nexport namespace Testing {\n  const _Contact = Schema.Struct({\n    name: Schema.String,\n    username: Schema.String,\n    email: Schema.String,\n    tasks: Schema.mutable(Schema.Array(Schema.suspend((): Type.Ref<Task> => Type.Ref(Task)))),\n    address: Schema.Struct({\n      city: Schema.optional(Schema.String),\n      state: Schema.optional(Schema.String),\n      zip: Schema.optional(Schema.String),\n      coordinates: Schema.Struct({\n        lat: Schema.optional(Schema.Number),\n        lng: Schema.optional(Schema.Number),\n      }),\n    }),\n  }).pipe(\n    Schema.partial,\n    Type.Obj({\n      typename: 'example.com/type/Contact',\n      version: '0.1.0',\n    }),\n  );\n  export interface Contact extends Schema.Schema.Type<typeof _Contact> {}\n  export const Contact: Schema.Schema<Contact, Schema.Schema.Encoded<typeof _Contact>, never> = _Contact;\n\n  const _Task = Schema.Struct({\n    title: Schema.optional(Schema.String),\n    completed: Schema.optional(Schema.Boolean),\n    assignee: Schema.optional(Type.Ref(Contact)),\n    previous: Schema.optional(Schema.suspend((): Type.Ref<Task> => Type.Ref(Task))),\n    subTasks: Schema.optional(Schema.mutable(Schema.Array(Schema.suspend((): Type.Ref<Task> => Type.Ref(Task))))),\n    description: Schema.optional(Schema.String),\n  }).pipe(\n    Schema.partial,\n    Type.Obj({\n      typename: 'example.com/type/Task',\n      version: '0.1.0',\n    }),\n  );\n  export interface Task extends Schema.Schema.Type<typeof _Task> {}\n  export const Task: Schema.Schema<Task, Schema.Schema.Encoded<typeof _Task>, never> = _Task;\n\n  export enum RecordType {\n    UNDEFINED = 0,\n    PERSONAL = 1,\n    WORK = 2,\n  }\n\n  export const Container = Schema.Struct({\n    objects: Schema.mutable(Schema.Array(Type.Ref(Type.Expando))),\n    records: Schema.mutable(\n      Schema.Array(\n        Schema.partial(\n          Schema.Struct({\n            title: Schema.String,\n            description: Schema.String,\n            contacts: Schema.mutable(Schema.Array(Type.Ref(Contact))),\n            type: Schema.Enums(RecordType),\n          }),\n        ),\n      ),\n    ),\n  }).pipe(\n    Schema.partial,\n    Type.Obj({\n      typename: 'example.com/type/Container',\n      version: '0.1.0',\n    }),\n  );\n\n  export const WorksFor = Schema.Struct({\n    since: Schema.optional(Schema.String),\n  }).pipe(\n    Type.Relation({\n      typename: 'example.com/type/WorksFor',\n      version: '0.1.0',\n      source: Contact,\n      target: Contact,\n    }),\n  );\n  export interface WorksFor extends Schema.Schema.Type<typeof WorksFor> {}\n}\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { effect } from '@preact/signals-core';\nimport type * as Schema from 'effect/Schema';\n\nimport { registerSignalsRuntime } from '@dxos/echo-signals';\nimport { assertArgument } from '@dxos/invariant';\n\nimport { EchoSchema, StoredSchema, getSchemaTypename, live, toJsonSchema } from '../internal';\n\n// NOTE: Registration is done here is this is the module that calls out to `effect`.\nregisterSignalsRuntime();\n\n/**\n * Create a reactive mutable schema that updates when the JSON schema is updated.\n */\n// TODO(dmaretskyi): Should be replaced by registration of typed object.\nexport const createEchoSchema = (schema: Schema.Schema.AnyNoContext): EchoSchema => {\n  const typename = getSchemaTypename(schema);\n  assertArgument(typename, 'typename', 'Schema does not have a typename.');\n\n  const echoSchema = new EchoSchema(\n    live(StoredSchema, {\n      typename,\n      version: '0.1.0',\n      jsonSchema: toJsonSchema(schema),\n    }),\n  );\n\n  // TODO(burdon): Unsubscribe is never called.\n  effect(() => {\n    const _ = echoSchema.jsonSchema;\n    echoSchema._invalidate();\n  });\n\n  return echoSchema;\n};\n"],
+  "mappings": "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",
+  "names": ["Schema", "Testing", "Circle", "Struct", "type", "Literal", "radius", "Number", "Square", "side", "Shape", "Union", "TestNestedSchema", "mutable", "field", "String", "TestNestedType", "pipe", "EchoObject", "typename", "version", "EmptySchemaType", "TypedObject", "fields", "string", "number", "nullableShapeArray", "Array", "Null", "boolean", "Boolean", "null", "undefined", "Undefined", "stringArray", "twoDimNumberArray", "object", "objectArray", "nested", "optional", "Ref", "other", "Any", "TestSchema", "partial", "TestSchemaType", "TestType", "TestClass", "toJSON", "TestSchemaWithClass", "extend", "classInstance", "instanceOf", "Contact", "name", "username", "email", "phoneNumbers", "label", "tasks", "suspend", "Task", "address", "city", "state", "zip", "coordinates", "lat", "lng", "title", "completed", "assignee", "previous", "subTasks", "description", "RecordType", "Container", "objects", "Expando", "records", "contacts", "Enums", "HasManager", "since", "EchoRelation", "source", "target", "effect", "registerSignalsRuntime", "deepMapValues", "registerSignalsRuntime", "updateCounter", "touch", "updateCount", "unsubscribe", "effect", "Symbol", "dispose", "count", "prepareAstForCompare", "obj", "deepMapValues", "value", "recurse", "key", "RegExp", "clone", "sym", "Object", "getOwnPropertySymbols", "toString", "Schema", "Testing", "_Contact", "Struct", "name", "String", "username", "email", "tasks", "mutable", "Array", "suspend", "Type", "Ref", "Task", "address", "city", "optional", "state", "zip", "coordinates", "lat", "Number", "lng", "pipe", "partial", "Obj", "typename", "version", "Contact", "_Task", "title", "completed", "Boolean", "assignee", "previous", "subTasks", "description", "RecordType", "Container", "objects", "Expando", "records", "contacts", "type", "Enums", "WorksFor", "since", "Relation", "source", "target", "effect", "registerSignalsRuntime", "assertArgument", "registerSignalsRuntime", "createEchoSchema", "schema", "typename", "getSchemaTypename", "assertArgument", "echoSchema", "EchoSchema", "live", "StoredSchema", "version", "jsonSchema", "toJsonSchema", "effect", "_", "_invalidate"]
 }

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

@@ -1,30 +1,46 @@
-import { Schema } from 'effect';
-import * as EchoSchema from '@dxos/echo-schema';
+import * as Schema from 'effect/Schema';
 import { type DXN } from '@dxos/keys';
-import type * as LiveObject from '@dxos/live-object';
+import * as LiveObject from '@dxos/live-object';
+import * as EchoSchema from './internal';
 import type * as Ref from './Ref';
 import type * as Relation from './Relation';
-import type * as Type from './Type';
-interface ObjBase extends Type.OfKind<EchoSchema.EntityKind.Object> {
-    readonly id: EchoSchema.ObjectId;
+import * as Type from './Type';
+/**
+ * NOTE: Don't export: Obj.Any and Obj.Obj form the public API.
+ */
+interface BaseObj extends EchoSchema.HasId, Type.OfKind<EchoSchema.EntityKind.Object> {
 }
 /**
  * Object type with specific properties.
  */
-export type Obj<Props> = ObjBase & Props;
+export type Obj<Props> = BaseObj & Props;
 /**
  * Base type for all ECHO objects.
  */
-export interface Any extends ObjBase {
+export interface Any extends BaseObj {
 }
-type Props<T> = {
+export declare const Any: Type.obj<Schema.Struct<{}>>;
+type Props<T = any> = {
     id?: EchoSchema.ObjectId;
 } & Type.Properties<T>;
-export type MakeProps<S extends Type.Obj.Any> = NoInfer<Props<Schema.Schema.Type<S>>>;
+export type MakeProps<T extends Type.Obj.Any> = NoInfer<Props<Schema.Schema.Type<T>>> & {
+    [Meta]?: Partial<EchoSchema.ObjectMeta>;
+};
+export declare const Meta: unique symbol;
 /**
  * Creates new object.
+ * @param schema - Object schema.
+ * @param props - Object properties.
+ * @param meta - Object metadata (deprecated) -- pass with Obj.Meta.
+ *
+ * Meta can be passed as a symbol in `props`.
+ *
+ * Example:
+ * ```ts
+ * const obj = Obj.make(Person, { [Obj.Meta]: { keys: [...] }, name: 'John' });
+ * ```
  */
-export declare const make: <S extends Type.Obj.Any>(schema: S, props: MakeProps<S>, meta?: EchoSchema.ObjectMeta) => LiveObject.Live<Schema.Schema.Type<S>>;
+export declare const make: <S extends Type.Obj.Any>(schema: S, props: MakeProps<S>, meta?: Partial<EchoSchema.ObjectMeta>) => LiveObject.Live<Schema.Schema.Type<S>>;
 export declare const isObject: (obj: unknown) => obj is Any;
 /**
  * Test if object or relation is an instance of a schema.
@@ -34,7 +50,7 @@ export declare const isObject: (obj: unknown) => obj is Any;
  * const johnIsPerson = Obj.instanceOf(Person)(john);
  *
  * const isPerson = Obj.instanceOf(Person);
- * if(isPerson(john)) {
+ * if (isPerson(john)) {
  *   // john is Person
  * }
  * ```
@@ -44,7 +60,7 @@ export declare const instanceOf: {
     <S extends Type.Relation.Any | Type.Obj.Any>(schema: S, value: unknown): value is Schema.Schema.Type<S>;
 };
 export declare const getSchema: (obj: unknown | undefined) => Schema.Schema.AnyNoContext | undefined;
-export declare const getDXN: (obj: Any) => DXN;
+export declare const getDXN: (obj: Any | Relation.Any) => DXN;
 /**
  * @returns The DXN of the object's type.
  * @example dxn:example.com/type/Contact:1.0.0
@@ -54,10 +70,28 @@ export declare const getTypeDXN: (obj: EchoSchema.BaseObject) => DXN | undefined
  * @returns The typename of the object's type.
  * @example `example.com/type/Contact`
  */
-export declare const getTypename: (obj: Any) => string | undefined;
-export declare const getMeta: (obj: Any) => EchoSchema.ObjectMeta;
-export declare const isDeleted: (obj: Any) => boolean;
-export declare const getLabel: (obj: Any) => string | undefined;
+export declare const getTypename: (obj: Any | Relation.Any) => string | undefined;
+export declare const getMeta: (obj: Any | Relation.Any) => EchoSchema.ObjectMeta;
+/**
+ * @returns Foreign keys for the object from the specified source.
+ */
+export declare const getKeys: {
+    (obj: Any | Relation.Any, source: string): EchoSchema.ForeignKey[];
+    (source: string): (obj: Any | Relation.Any) => EchoSchema.ForeignKey[];
+};
+/**
+ * Delete all keys from the object for the specified source.
+ * @param obj
+ * @param source
+ */
+export declare const deleteKeys: (obj: Any | Relation.Any, source: string) => void;
+export declare const isDeleted: (obj: Any | Relation.Any) => boolean;
+export declare const getLabel: (obj: Any | Relation.Any) => string | undefined;
+export declare const setLabel: (obj: Any | Relation.Any, label: string) => void;
+export type Comparator = (a: Any, b: Any) => number;
+export declare const sortByLabel: Comparator;
+export declare const sortByTypename: Comparator;
+export declare const sort: (...comparators: Comparator[]) => Comparator;
 /**
  * JSON representation of an object.
  */
@@ -73,9 +107,69 @@ export declare const toJSON: (obj: Any | Relation.Any) => JSON;
  * References and schemas will be resolvable if the `refResolver` is provided.
  *
  * The function need to be async to support resolving the schema as well as the relation endpoints.
+ *
+ * @param options.refResolver - Resolver for references. Produces hydrated references that can be resolved.
+ * @param options.dxn - Override object DXN. Changes the result of `Obj.getDXN`.
  */
 export declare const fromJSON: (json: unknown, options?: {
     refResolver?: Ref.Resolver;
+    dxn?: DXN;
 }) => Promise<Any>;
+/**
+ * Returns an immutable snapshot of an object.
+ */
+export declare const getSnapshot: <T extends Any>(obj: Obj<T>) => T;
+export type CloneOptions = {
+    /**
+     * Retain the original object's ID.
+     * @default false
+     */
+    retainId?: boolean;
+};
+/**
+ * Clones an object or relation.
+ * This does not clone referenced objects, only the properties in the object.
+ * @returns A new object with the same schema and properties.
+ */
+export declare const clone: <T extends Any | Relation.Any>(obj: T, opts?: CloneOptions) => T;
+export declare const VersionTypeId: symbol;
+export type VersionType = typeof VersionTypeId;
+/**
+ * Represent object version.
+ * May be backed by Automerge.
+ * Objects with no history are not versioned.
+ */
+export interface Version {
+    /**
+     * Whether the object is versioned.
+     */
+    versioned: boolean;
+    /**
+     * Automerge heads.
+     */
+    automergeHeads?: string[];
+}
+/**
+ * Checks that `obj` is a version object.
+ */
+export declare const isVersion: (obj: unknown) => obj is Version;
+/**
+ * Returns the version of the object.
+ */
+export declare const version: (obj: Any | Relation.Any) => Version;
+/**
+ * Checks that `version` is a valid version object.
+ */
+export declare const versionValid: (version: Version) => boolean;
+export type VersionCompareResult = 'unversioned' | 'equal' | 'different';
+/**
+ * Compares two versions.
+ * @param version1
+ * @param version2
+ * @returns 'unversioned' if either object is unversioned, 'equal' if the versions are equal, 'different' if the versions are different.
+ */
+export declare const compareVersions: (version1: Version, version2: Version) => VersionCompareResult;
+export declare const encodeVersion: (version: Version) => string;
+export declare const decodeVersion: (version: string) => Version;
 export {};
 //# sourceMappingURL=Obj.d.ts.map

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

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

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

@@ -1,4 +1,4 @@
-import * as EchoSchema from '@dxos/echo-schema';
+import * as EchoSchema from './internal';
 import type * as Obj from './Obj';
 export type Ref<T> = EchoSchema.Ref<T>;
 export type Any = EchoSchema.Ref<Obj.Any>;

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

@@ -1 +1 @@
-{"version":3,"file":"Ref.d.ts","sourceRoot":"","sources":["../../../src/Ref.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,KAAK,GAAG,MAAM,OAAO,CAAC;AAElC,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACvC,MAAM,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE1C,eAAO,MAAM,KAAK;;;;EAAsB,CAAC;AAEzC;;GAEG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAElF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC;AAE9C,eAAO,MAAM,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,KAAK,IAAI,GAA0B,CAAC;AAE5E,eAAO,MAAM,IAAI,+DAAsB,CAAC;AAGxC,eAAO,MAAM,OAAO,wDAAyB,CAAC"}
+{"version":3,"file":"Ref.d.ts","sourceRoot":"","sources":["../../../src/Ref.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,KAAK,GAAG,MAAM,OAAO,CAAC;AAElC,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACvC,MAAM,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE1C,eAAO,MAAM,KAAK;;;;EAAsB,CAAC;AAEzC;;GAEG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAElF;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC;AAE9C,eAAO,MAAM,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,KAAK,IAAI,GAA0B,CAAC;AAE5E,eAAO,MAAM,IAAI,+DAAsB,CAAC;AAGxC,eAAO,MAAM,OAAO,wDAAyB,CAAC"}

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

@@ -1,21 +1,24 @@
-import { type Schema } from 'effect';
-import * as EchoSchema from '@dxos/echo-schema';
+import * as Schema from 'effect/Schema';
 import { DXN } from '@dxos/keys';
 import { type Live } from '@dxos/live-object';
-import type * as Obj from './Obj';
-import type * as Type from './Type';
-interface RelationBase<Source, Target> extends Type.Relation.Endpoints<Source, Target>, Type.OfKind<EchoSchema.EntityKind.Relation> {
-    readonly id: EchoSchema.ObjectId;
+import * as EchoSchema from './internal';
+import * as Obj from './Obj';
+import * as Type from './Type';
+/**
+ * NOTE: Don't export: Relation.Relation and Relation.Any form the public API.
+ */
+interface BaseRelation<Source, Target> extends EchoSchema.HasId, Type.Relation.Endpoints<Source, Target>, Type.OfKind<EchoSchema.EntityKind.Relation> {
 }
 /**
  * Relation type with specific properties.
  */
-export type Relation<Source extends Obj.Any, Target extends Obj.Any, Props> = RelationBase<Source, Target> & Props;
+export type Relation<Source extends Obj.Any, Target extends Obj.Any, Props> = BaseRelation<Source, Target> & Props;
 /**
  * Base type for all ECHO relations.
  */
-export interface Any extends RelationBase<Obj.Any, Obj.Any> {
+export interface Any extends BaseRelation<Obj.Any, Obj.Any> {
 }
+export declare const Any: Type.relation<Schema.Struct<{}>, Type.obj<Schema.Struct<{}>>, Type.obj<Schema.Struct<{}>>>;
 export declare const Source: unique symbol;
 export type Source = typeof Source;
 export declare const Target: unique symbol;