@dxos/echo 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

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

@@ -1,2 +1,3 @@
+export { ForeignKey } from '@dxos/echo-protocol';
 export { SpaceId, ObjectId } from '@dxos/keys';
 //# sourceMappingURL=Key.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Key.d.ts","sourceRoot":"","sources":["../../../src/Key.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"Key.d.ts","sourceRoot":"","sources":["../../../src/Key.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC"}

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

@@ -1,33 +1,44 @@
-import { Schema } from 'effect';
-import * as EchoSchema from '@dxos/echo-schema';
-import { type DXN } from '@dxos/keys';
-import type * as LiveObject from '@dxos/live-object';
-import type * as Ref from './Ref';
-import type * as Relation from './Relation';
-import type * as Type from './Type';
+import * as Schema from 'effect/Schema';
+import { type ForeignKey } from '@dxos/echo-protocol';
+import { type DXN, ObjectId } from '@dxos/keys';
+import * as Entity from './Entity';
+import { type AnyEchoObject, type AnyProperties, type ObjectJSON, type ObjectMeta, VersionTypeId } from './internal';
+import * as Ref from './Ref';
+import * as Type from './Type';
 /**
- * NOTE: Don't export: Obj.Any and Obj.Obj form the public API.
+ * Base type for all ECHO objects.
+ * @private
  */
-interface BaseObj extends EchoSchema.HasId, Type.OfKind<EchoSchema.EntityKind.Object> {
+interface BaseObj extends AnyEchoObject, Entity.OfKind<typeof Entity.Kind.Object> {
 }
+/**
+ * Base type for all Obj objects.
+ */
+export interface Any extends BaseObj {
+}
+export declare const Any: Type.obj<Schema.Struct<{}>>;
 /**
  * Object type with specific properties.
  */
 export type Obj<Props> = BaseObj & Props;
 /**
- * Base type for all ECHO objects.
+ * Object with arbitrary properties.
+ *
+ * NOTE: Due to how typescript works, this type is not assignable to a specific schema type.
+ * In that case, use `Obj.instanceOf` to check if an object is of a specific type.
  */
-export interface Any extends BaseObj {
+export interface AnyProps extends BaseObj, AnyProperties {
 }
 type Props<T = any> = {
-    id?: EchoSchema.ObjectId;
+    id?: ObjectId;
+    [Meta]?: Partial<ObjectMeta>;
 } & Type.Properties<T>;
-export type MakeProps<T extends Type.Obj.Any> = NoInfer<Props<Schema.Schema.Type<T>>> & {
-    [Meta]?: Partial<EchoSchema.ObjectMeta>;
-};
-export declare const Meta: unique symbol;
+export type MakeProps<T extends Schema.Schema.AnyNoContext> = {
+    id?: ObjectId;
+    [Meta]?: Partial<ObjectMeta>;
+} & NoInfer<Props<Schema.Schema.Type<T>>>;
 /**
- * Creates new object.
+ * Creates a new object of the given types.
  * @param schema - Object schema.
  * @param props - Object properties.
  * @param meta - Object metadata (deprecated) -- pass with Obj.Meta.
@@ -39,69 +50,97 @@ export declare const Meta: unique symbol;
  * 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 Schema.Schema.AnyNoContext>(schema: S, props: MakeProps<S>, meta?: Partial<ObjectMeta>) => Obj<Schema.Schema.Type<S>>;
+/**
+ * Determine if object is an ECHO object.
+ */
 export declare const isObject: (obj: unknown) => obj is 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>(obj: T, opts?: CloneOptions) => T;
+export declare const ID: import("@dxos/keys").ObjectIdClass;
+export type ID = ObjectId;
 /**
  * Test if object or relation is an instance of a schema.
  * @example
  * ```ts
  * const john = Obj.make(Person, { name: 'John' });
- * const johnIsPerson = Obj.instanceOf(Person)(john);
- *
  * const isPerson = Obj.instanceOf(Person);
- * if(isPerson(john)) {
+ * if (isPerson(john)) {
  *   // john is Person
  * }
  * ```
  */
 export declare const instanceOf: {
-    <S extends Type.Relation.Any | Type.Obj.Any>(schema: S): (value: unknown) => value is Schema.Schema.Type<S>;
-    <S extends Type.Relation.Any | Type.Obj.Any>(schema: S, value: unknown): value is Schema.Schema.Type<S>;
+    <S extends Type.Entity.Any>(schema: S): (value: unknown) => value is Schema.Schema.Type<S>;
+    <S extends Type.Entity.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 | Relation.Any) => DXN;
+export declare const getDXN: (entity: Entity.Unknown) => DXN;
 /**
  * @returns The DXN of the object's type.
- * @example dxn:example.com/type/Contact:1.0.0
+ * @example dxn:example.com/type/Person:1.0.0
+ */
+export declare const getTypeDXN: (obj: AnyProperties) => DXN | undefined;
+/**
+ * Get the schema of the object.
  */
-export declare const getTypeDXN: (obj: EchoSchema.BaseObject) => DXN | undefined;
+export declare const getSchema: (obj: unknown | undefined) => Schema.Schema.AnyNoContext | undefined;
 /**
  * @returns The typename of the object's type.
- * @example `example.com/type/Contact`
+ * @example `example.com/type/Person`
  */
-export declare const getTypename: (obj: Any | Relation.Any) => string | undefined;
-export declare const getMeta: (obj: Any | Relation.Any) => EchoSchema.ObjectMeta;
+export declare const getTypename: (entity: Entity.Unknown) => string | undefined;
+export declare const Meta: unique symbol;
+export declare const getMeta: (entity: AnyProperties) => 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[];
+    (entity: Entity.Unknown, source: string): ForeignKey[];
+    (source: string): (entity: Entity.Unknown) => ForeignKey[];
 };
 /**
  * Delete all keys from the object for the specified source.
- * @param obj
+ * @param entity
  * @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 declare const deleteKeys: (entity: Entity.Unknown, source: string) => void;
+export declare const addTag: (entity: Entity.Unknown, tag: string) => void;
+export declare const removeTag: (entity: Entity.Unknown, tag: string) => void;
+export declare const isDeleted: (entity: Entity.Unknown) => boolean;
+export declare const getLabel: (entity: Entity.Unknown) => string | undefined;
+export declare const setLabel: (entity: Entity.Unknown, label: string) => void;
+export declare const getDescription: (entity: Entity.Unknown) => string | undefined;
+export declare const setDescription: (entity: Entity.Unknown, description: string) => void;
 /**
  * JSON representation of an object.
  */
-export type JSON = EchoSchema.ObjectJSON;
+export type JSON = ObjectJSON;
 /**
  * Converts object to its JSON representation.
  *
  * The same algorithm is used when calling the standard `JSON.stringify(obj)` function.
  */
-export declare const toJSON: (obj: Any | Relation.Any) => JSON;
+export declare const toJSON: (entity: Entity.Unknown) => JSON;
 /**
  * Creates an object from its json representation, performing schema validation.
  * 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.
+ * The function must 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`.
@@ -110,18 +149,50 @@ export declare const fromJSON: (json: unknown, options?: {
     refResolver?: Ref.Resolver;
     dxn?: DXN;
 }) => Promise<Any>;
-export type CloneOptions = {
+export type Comparator = (a: Entity.Unknown, b: Entity.Unknown) => number;
+export declare const sortByLabel: Comparator;
+export declare const sortByTypename: Comparator;
+export declare const sort: (...comparators: Comparator[]) => Comparator;
+/**
+ * Unique symbol for version type identification.
+ */
+export { VersionTypeId };
+/**
+ * Represent object version.
+ * May be backed by Automerge.
+ * Objects with no history are not versioned.
+ */
+export interface Version {
+    [VersionTypeId]: {};
     /**
-     * Retain the original object's ID.
-     * @default false
+     * Whether the object is versioned.
      */
-    retainId?: boolean;
-};
+    versioned: boolean;
+    /**
+     * Automerge heads.
+     */
+    automergeHeads?: string[];
+}
 /**
- * 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.
+ * Checks that `obj` is a version object.
+ */
+export declare const isVersion: (entity: unknown) => entity is Version;
+/**
+ * Returns the version of the object.
+ */
+export declare const version: (entity: Entity.Unknown) => 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 clone: <T extends Any | Relation.Any>(obj: T, opts?: CloneOptions) => T;
-export {};
+export declare const compareVersions: (version1: Version, version2: Version) => VersionCompareResult;
+export declare const encodeVersion: (version: Version) => string;
+export declare const decodeVersion: (version: string) => Version;
 //# 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":"AAKA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,KAAK,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAIhD,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,aAAa,EAGlB,KAAK,UAAU,EACf,KAAK,UAAU,EAEf,aAAa,EAgBd,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAE/B;;;GAGG;AACH,UAAU,OAAQ,SAAQ,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;CAAG;AAEpF;;GAEG;AACH,MAAM,WAAW,GAAI,SAAQ,OAAO;CAAG;AAEvC,eAAO,MAAM,GAAG,6BAKf,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,OAAO,GAAG,KAAK,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,WAAW,QAAS,SAAQ,OAAO,EAAE,aAAa;CAAG;AAM3D,KAAK,KAAK,CAAC,CAAC,GAAG,GAAG,IAAI;IACpB,EAAE,CAAC,EAAE,QAAQ,CAAC;IACd,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CAC9B,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;AAGvB,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,IAAI;IAC5D,EAAE,CAAC,EAAE,QAAQ,CAAC;IACd,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE1C;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EACvD,QAAQ,CAAC,EACT,OAAO,SAAS,CAAC,CAAC,CAAC,EACnB,OAAO,OAAO,CAAC,UAAU,CAAC,KACzB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAgB3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,GAAI,KAAK,OAAO,KAAG,GAAG,IAAI,GAG9C,CAAC;AAMF;;GAEG;AACH,eAAO,MAAM,WAAW,EAAE,CAAC,CAAC,SAAS,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAgB,CAAC;AAE3E,MAAM,MAAM,YAAY,GAAG;IACzB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO,YAAY,KAAG,CAuBlE,CAAC;AAOF,eAAO,MAAM,EAAE,oCAAW,CAAC;AAC3B,MAAM,MAAM,EAAE,GAAG,QAAQ,CAAC;AAE1B;;;;;;;;;;GAUG;AACH,eAAO,MAAM,UAAU,EAAE;IACvB,CAAC,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3F,CAAC,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CAOhF,CAAC;AAGV,eAAO,MAAM,MAAM,GAAI,QAAQ,MAAM,CAAC,OAAO,KAAG,GAK/C,CAAC;AAEF;;;GAGG;AAEH,eAAO,MAAM,UAAU,yCAAc,CAAC;AAEtC;;GAEG;AACH,eAAO,MAAM,SAAS,sEAAa,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,CAAC,OAAO,KAAG,MAAM,GAAG,SAQ7D,CAAC;AAMF,eAAO,MAAM,IAAI,EAAE,OAAO,MAAsB,CAAC;AAIjD,eAAO,MAAM,OAAO,GAAI,QAAQ,aAAa,KAAG,UAI/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE;IACpB,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,EAAE,CAAC;IACvD,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;CAK3D,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,CAAC,OAAO,EAAE,QAAQ,MAAM,SAQhE,CAAC;AAEF,eAAO,MAAM,MAAM,GAAI,QAAQ,MAAM,CAAC,OAAO,EAAE,KAAK,MAAM,SAIzD,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,CAAC,OAAO,EAAE,KAAK,MAAM,SAW5D,CAAC;AAGF,eAAO,MAAM,SAAS,GAAI,QAAQ,MAAM,CAAC,OAAO,KAAG,OAIlD,CAAC;AAMF,eAAO,MAAM,QAAQ,GAAI,QAAQ,MAAM,CAAC,OAAO,KAAG,MAAM,GAAG,SAK1D,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,QAAQ,MAAM,CAAC,OAAO,EAAE,OAAO,MAAM,SAK7D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,CAAC,OAAO,KAAG,MAAM,GAAG,SAKhE,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,QAAQ,MAAM,CAAC,OAAO,EAAE,aAAa,MAAM,SAKzE,CAAC;AAMF;;GAEG;AACH,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC;AAE9B;;;;GAIG;AACH,eAAO,MAAM,MAAM,GAAI,QAAQ,MAAM,CAAC,OAAO,KAAG,IAA4B,CAAC;AAE7E;;;;;;;;GAQG;AACH,eAAO,MAAM,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,KAAK,OAAO,CAAC,GAAG,CACnF,CAAC;AAkBxB,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,CAAC,OAAO,KAAK,MAAM,CAAC;AAE1E,eAAO,MAAM,WAAW,EAAE,UAAwF,CAAC;AACnH,eAAO,MAAM,cAAc,EAAE,UACY,CAAC;AAC1C,eAAO,MAAM,IAAI,GAAI,GAAG,aAAa,UAAU,EAAE,KAAG,UAWnD,CAAC;AAMF;;GAEG;AACH,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC;IAEpB;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAOD;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,OAAO,KAAG,MAAM,IAAI,OAErD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,QAAQ,MAAM,CAAC,OAAO,KAAG,OAOhD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAI,SAAS,OAAO,KAAG,OAG/C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzE;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,UAAU,OAAO,EAAE,UAAU,OAAO,KAAG,oBAgBtE,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,SAAS,OAAO,KAAG,MAEhD,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,KAAG,OAI/C,CAAC"}

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

@@ -1,21 +1,21 @@
-import * as EchoSchema from '@dxos/echo-schema';
+import { Ref as Ref$, type RefResolver } from './internal';
 import type * as Obj from './Obj';
-export type Ref<T> = EchoSchema.Ref<T>;
-export type Any = EchoSchema.Ref<Obj.Any>;
+export type Ref<T> = Ref$<T>;
+export type Any = Ref$<Obj.Any>;
 export declare const Array: Readonly<{
-    targets: <T extends EchoSchema.AnyEchoObject>(refs: readonly EchoSchema.Ref<T>[]) => T[];
-    loadAll: <T extends EchoSchema.AnyEchoObject>(refs: readonly EchoSchema.Ref<T>[]) => Promise<T[]>;
-    removeById: (refs: EchoSchema.Ref<EchoSchema.AnyEchoObject>[], id: EchoSchema.ObjectId) => void;
+    targets: <T extends import("./internal").AnyEchoObject>(refs: readonly Ref$<T>[]) => T[];
+    loadAll: <T extends import("./internal").AnyEchoObject>(refs: readonly Ref$<T>[]) => Promise<T[]>;
+    removeById: (refs: Ref$<import("./internal").AnyEchoObject>[], id: import("@dxos/keys").ObjectId) => void;
 }>;
 /**
  * Extract reference target.
  */
-export type Target<R extends Any> = R extends EchoSchema.Ref<infer T> ? T : never;
+export type Target<R extends Any> = R extends Ref$<infer T> ? T : never;
 /**
  * Reference resolver.
  */
-export type Resolver = EchoSchema.RefResolver;
+export type Resolver = RefResolver;
 export declare const isRef: (value: unknown) => value is Any;
-export declare const make: <T extends EchoSchema.WithId>(object: T) => EchoSchema.Ref<T>;
-export declare const fromDXN: (dxn: import("@dxos/keys").DXN) => EchoSchema.Ref<any>;
+export declare const make: <T extends import("./internal").WithId>(object: T) => Ref$<T>;
+export declare const fromDXN: (dxn: import("@dxos/keys").DXN) => Ref$<any>;
 //# sourceMappingURL=Ref.d.ts.map

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,EAAE,GAAG,IAAI,IAAI,EAAY,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,KAAK,GAAG,MAAM,OAAO,CAAC;AAElC,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;AAC7B,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAEhC,eAAO,MAAM,KAAK;;;;EAAW,CAAC;AAE9B;;GAEG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAExE;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC;AAEnC,eAAO,MAAM,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,KAAK,IAAI,GAAgB,CAAC;AAElE,eAAO,MAAM,IAAI,+DAAY,CAAC;AAG9B,eAAO,MAAM,OAAO,8CAAe,CAAC"}

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

@@ -1,29 +1,33 @@
-import { type Schema } from 'effect';
-import * as EchoSchema from '@dxos/echo-schema';
-import { DXN } from '@dxos/keys';
+import * as Schema from 'effect/Schema';
+import { DXN, type ObjectId } from '@dxos/keys';
 import { type Live } from '@dxos/live-object';
-import type * as Obj from './Obj';
-import type * as Type from './Type';
+import * as Entity from './Entity';
+import { type AnyEchoObject, EntityKind, MetaId, type ObjectMeta } 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.
+ * Base type for all ECHO relations.
+ * @private
  */
-interface BaseRelation<Source, Target> extends EchoSchema.HasId, Type.Relation.Endpoints<Source, Target>, Type.OfKind<EchoSchema.EntityKind.Relation> {
+interface BaseRelation<Source, Target> extends AnyEchoObject, Type.Relation.Endpoints<Source, Target>, Entity.OfKind<EntityKind.Relation> {
 }
 /**
- * Relation type with specific properties.
- */
-export type Relation<Source extends Obj.Any, Target extends Obj.Any, Props> = BaseRelation<Source, Target> & Props;
-/**
- * Base type for all ECHO relations.
+ * Base type for all Relations objects.
  */
 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<{}>>>;
+/**
+ * Relation type with specific source and target types.
+ */
+export type Relation<Source extends Obj.Any, Target extends Obj.Any, Props> = BaseRelation<Source, Target> & Props;
 export declare const Source: unique symbol;
 export type Source = typeof Source;
 export declare const Target: unique symbol;
 export type Target = typeof Target;
 type MakeProps<T extends Any> = {
-    id?: EchoSchema.ObjectId;
+    id?: ObjectId;
+    [MetaId]?: ObjectMeta;
     [Source]: T[Source];
     [Target]: T[Target];
 } & Type.Properties<T>;
@@ -34,7 +38,7 @@ type MakeProps<T extends Any> = {
  * @param meta - Relation metadata.
  * @returns
  */
-export declare const make: <S extends Type.Relation.Any>(schema: S, props: NoInfer<MakeProps<Schema.Schema.Type<S>>>, meta?: EchoSchema.ObjectMeta) => Live<Schema.Schema.Type<S> & Type.OfKind<EchoSchema.EntityKind.Relation>>;
+export declare const make: <S extends Type.Relation.Any>(schema: S, props: NoInfer<MakeProps<Schema.Schema.Type<S>>>, meta?: ObjectMeta) => Live<Schema.Schema.Type<S> & Entity.OfKind<typeof Entity.Kind.Relation>>;
 export declare const isRelation: (value: unknown) => value is Any;
 /**
  * @returns Relation source DXN.

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

@@ -1 +1 @@
-{"version":3,"file":"Relation.d.ts","sourceRoot":"","sources":["../../../src/Relation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGrC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,KAAK,IAAI,EAAQ,MAAM,mBAAmB,CAAC;AAGpD,OAAO,KAAK,KAAK,GAAG,MAAM,OAAO,CAAC;AAClC,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AAEpC;;GAEG;AACH,UAAU,YAAY,CAAC,MAAM,EAAE,MAAM,CACnC,SAAQ,UAAU,CAAC,KAAK,EACtB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC;CAAG;AAElD;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,KAAK,IAAI,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;AAEnH;;GAEG;AACH,MAAM,WAAW,GAAI,SAAQ,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC;CAAG;AAG9D,eAAO,MAAM,MAAM,EAAE,OAAO,MAA2C,CAAC;AACxE,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC;AACnC,eAAO,MAAM,MAAM,EAAE,OAAO,MAA2C,CAAC;AACxE,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC;AAEnC,KAAK,SAAS,CAAC,CAAC,SAAS,GAAG,IAAI;IAC9B,EAAE,CAAC,EAAE,UAAU,CAAC,QAAQ,CAAC;IACzB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;CACrB,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;AAEvB;;;;;;GAMG;AAGH,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,GAAG,EAC9C,QAAQ,CAAC,EACT,OAAO,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAChD,OAAO,UAAU,CAAC,UAAU,KAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAiB1E,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,GAUpD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,OAAO,GAAG,KAAG,GAMzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,OAAO,GAAG,KAAG,GAMzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,GAAG,EAAE,UAAU,CAAC,KAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAM5E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,GAAG,EAAE,UAAU,CAAC,KAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAM5E,CAAC"}
+{"version":3,"file":"Relation.d.ts","sourceRoot":"","sources":["../../../src/Relation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAE,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAG9C,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,EAGL,KAAK,aAAa,EAClB,UAAU,EAEV,MAAM,EACN,KAAK,UAAU,EAQhB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAE/B;;;GAGG;AACH,UAAU,YAAY,CAAC,MAAM,EAAE,MAAM,CACnC,SAAQ,aAAa,EACnB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EACvC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;CAAG;AAEzC;;GAEG;AACH,MAAM,WAAW,GAAI,SAAQ,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC;CAAG;AAE9D,eAAO,MAAM,GAAG,4FAOf,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,KAAK,IAAI,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC;AAEnH,eAAO,MAAM,MAAM,EAAE,OAAO,MAAgC,CAAC;AAC7D,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC;AAEnC,eAAO,MAAM,MAAM,EAAE,OAAO,MAAgC,CAAC;AAC7D,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC;AAEnC,KAAK,SAAS,CAAC,CAAC,SAAS,GAAG,IAAI;IAC9B,EAAE,CAAC,EAAE,QAAQ,CAAC;IACd,CAAC,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC;IACtB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;CACrB,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;AAEvB;;;;;;GAMG;AAGH,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,GAAG,EAC9C,QAAQ,CAAC,EACT,OAAO,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAChD,OAAO,UAAU,KAChB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAezE,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,GAUpD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,OAAO,GAAG,KAAG,GAMzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,GAAI,OAAO,GAAG,KAAG,GAMzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,GAAG,EAAE,UAAU,CAAC,KAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAM5E,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,GAAG,EAAE,UAAU,CAAC,KAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAM5E,CAAC"}

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

@@ -0,0 +1,17 @@
+import * as Schema from 'effect/Schema';
+import * as Obj from './Obj';
+import * as Type from './Type';
+export declare const Tag: Type.obj<Schema.Struct<{
+    label: typeof Schema.String;
+    hue: Schema.optional<typeof Schema.String>;
+}>>;
+export type Tag = Schema.Schema.Type<typeof Tag>;
+export declare const make: (props: Obj.MakeProps<typeof Tag>) => Obj.Obj<import("./Entity").OfKind<import("./internal").EntityKind.Object> & {
+    label: string;
+    hue?: string | undefined;
+}>;
+export type Map = Record<string, Tag>;
+export declare const sortTags: ({ label: a }: Tag, { label: b }: Tag) => number;
+export declare const createTagList: (tags: Map) => Tag[];
+export declare const findTagByLabel: (tags: Map | undefined, name: string) => Tag | undefined;
+//# sourceMappingURL=Tag.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Tag.d.ts","sourceRoot":"","sources":["../../../src/Tag.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAE/B,eAAO,MAAM,GAAG;;;GAUf,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;AAEjD,eAAO,MAAM,IAAI,GAAI,OAAO,GAAG,CAAC,SAAS,CAAC,OAAO,GAAG,CAAC;;;EAAyB,CAAC;AAG/E,MAAM,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEtC,eAAO,MAAM,QAAQ,GAAI,cAAc,GAAG,EAAE,cAAc,GAAG,WAAuB,CAAC;AAErF,eAAO,MAAM,aAAa,GAAI,MAAM,GAAG,KAAG,GAAG,EAG1B,CAAC;AAEpB,eAAO,MAAM,cAAc,GAAI,MAAM,GAAG,GAAG,SAAS,EAAE,MAAM,MAAM,KAAG,GAAG,GAAG,SAG1E,CAAC"}

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

@@ -1,28 +1,21 @@
-import { type Schema } from 'effect';
-import { type Simplify } from 'effect/Schema';
+import type * as Schema$ from 'effect/Schema';
 import { type EncodedReference } from '@dxos/echo-protocol';
-import * as EchoSchema from '@dxos/echo-schema';
-import { type ToMutable } from '@dxos/echo-schema';
-import type * as Keys from '@dxos/keys';
-import type * as RelationModule from './Relation';
-export declare const KindId: unique symbol;
-export type KindId = typeof KindId;
-export declare const Kind: typeof EchoSchema.EntityKind;
-/**
- * Assigns a kind to an Object or Relation instance.
- */
-export interface OfKind<Kind extends EchoSchema.EntityKind> {
-    readonly id: Keys.ObjectId;
-    readonly [KindId]: Kind;
-}
-/**
- * Base ECHO schema type.
- */
-export type Schema = EchoSchema.EchoSchema;
+import { type DXN } from '@dxos/keys';
+import { type ToMutable } from '@dxos/util';
+import type * as Entity$ from './Entity';
+import { type ATTR_RELATION_SOURCE, type ATTR_RELATION_TARGET, type EchoRelationSchemaOptions, EchoSchema, Expando as Expando$, type ExpandoEncoded, PersistentSchema, type PersistentSchemaEncoded, Ref as Ref$, type RefFn, type RefSchema, type TypeAnnotation, type TypeMeta, toEffectSchema, toJsonSchema } from './internal';
+import type * as Relation$ from './Relation';
+export { toEffectSchema, toJsonSchema };
 /**
  * Returns all properties of an object or relation except for the id and kind.
  */
-export type Properties<T = any> = Omit<T, 'id' | KindId | RelationModule.Source | RelationModule.Target>;
+export type Properties<T = any> = Omit<T, 'id' | Entity$.KindId | Relation$.Source | Relation$.Target>;
+export declare namespace Entity {
+    /**
+     * Type.Obj.Any | Type.Relation.Any.
+     */
+    type Any = Obj.Any | Relation.Any;
+}
 interface ObjJsonProps {
     id: string;
 }
@@ -32,13 +25,13 @@ interface ObjJsonProps {
  * This typedef avoids `TS4023` error (name from external module cannot be used named).
  * See Effect's note on interface types.
  */
-export interface obj<Self extends Schema.Schema.Any> extends EchoSchema.TypeMeta, Schema.AnnotableClass<obj<Self>, OfKind<EchoSchema.EntityKind.Object> & ToMutable<Schema.Schema.Type<Self>>, Simplify<ObjJsonProps & ToMutable<Schema.Schema.Encoded<Self>>>, Schema.Schema.Context<Self>> {
+export interface obj<Self extends Schema$.Schema.Any> extends TypeMeta, Schema$.AnnotableClass<obj<Self>, Entity$.OfKind<typeof Entity$.Kind.Object> & ToMutable<Schema$.Schema.Type<Self>>, Schema$.Simplify<ObjJsonProps & ToMutable<Schema$.Schema.Encoded<Self>>>, Schema$.Schema.Context<Self>> {
 }
 /**
  * Object schema.
  */
 export declare const Obj: {
-    (opts: EchoSchema.TypeMeta): <Self extends Schema.Schema.Any>(self: Self) => obj<Self>;
+    (opts: TypeMeta): <Self extends Schema$.Schema.Any>(self: Self) => obj<Self>;
 };
 /**
  * Object schema type definitions.
@@ -48,19 +41,17 @@ export declare namespace Obj {
      * Type that represents an arbitrary schema type of an object.
      * NOTE: This is not an instance type.
      */
-    type Any = Schema.Schema.AnyNoContext;
-}
-export interface Expando extends OfKind<EchoSchema.EntityKind.Object> {
-    [key: string]: any;
+    type Any = obj<Schema$.Schema.AnyNoContext>;
 }
-type ExpandoEncoded = Simplify<ObjJsonProps & {
-    [key: string]: any;
-}>;
-export declare const Expando: Schema.Schema<Expando, ExpandoEncoded, never>;
+export declare const Expando: obj<Schema$.Schema<Expando$, ExpandoEncoded>>;
+export type Expando = obj<Schema$.Schema<Expando$, ExpandoEncoded>>;
+export declare const PersistentType: obj<Schema$.Schema<PersistentSchema, PersistentSchemaEncoded>>;
+export type PersistentType = obj<Schema$.Schema<PersistentSchema, PersistentSchemaEncoded>>;
+export { EchoSchema as RuntimeType };
 interface RelationJsonProps {
     id: string;
-    [EchoSchema.ATTR_RELATION_SOURCE]: string;
-    [EchoSchema.ATTR_RELATION_TARGET]: string;
+    [ATTR_RELATION_SOURCE]: string;
+    [ATTR_RELATION_TARGET]: string;
 }
 /**
  * Return type of the `Relation` schema constructor.
@@ -68,13 +59,13 @@ interface RelationJsonProps {
  * This typedef avoids `TS4023` error (name from external module cannot be used named).
  * See Effect's note on interface types.
  */
-export interface relation<Self extends Schema.Schema.Any, SourceSchema extends Schema.Schema.Any, TargetSchema extends Schema.Schema.Any> extends EchoSchema.TypeMeta, Schema.AnnotableClass<relation<Self, SourceSchema, TargetSchema>, OfKind<EchoSchema.EntityKind.Relation> & Relation.Endpoints<Schema.Schema.Type<SourceSchema>, Schema.Schema.Type<TargetSchema>> & ToMutable<Schema.Schema.Type<Self>>, Simplify<RelationJsonProps & ToMutable<Schema.Schema.Encoded<Self>>>, Schema.Schema.Context<Self>> {
+export interface relation<Self extends Schema$.Schema.Any, SourceSchema extends Schema$.Schema.Any, TargetSchema extends Schema$.Schema.Any> extends TypeMeta, Schema$.AnnotableClass<relation<Self, SourceSchema, TargetSchema>, Entity$.OfKind<typeof Entity$.Kind.Relation> & Relation.Endpoints<Schema$.Schema.Type<SourceSchema>, Schema$.Schema.Type<TargetSchema>> & ToMutable<Schema$.Schema.Type<Self>>, Schema$.Simplify<RelationJsonProps & ToMutable<Schema$.Schema.Encoded<Self>>>, Schema$.Schema.Context<Self>> {
 }
 /**
  * Relation schema.
  */
 export declare const Relation: {
-    <Source extends Schema.Schema.AnyNoContext, Target extends Schema.Schema.AnyNoContext>(opts: EchoSchema.EchoRelationOptions<Source, Target>): <Self extends Schema.Schema.Any>(self: Self) => relation<Self, Source, Target>;
+    <Source extends Schema$.Schema.AnyNoContext, Target extends Schema$.Schema.AnyNoContext>(opts: EchoRelationSchemaOptions<Source, Target>): <Self extends Schema$.Schema.Any>(self: Self) => relation<Self, Source, Target>;
 };
 /**
  * Relation schema type definitions.
@@ -84,7 +75,7 @@ export declare namespace Relation {
      * Type that represents an arbitrary schema type of a relation.
      * NOTE: This is not an instance type.
      */
-    type Any = Schema.Schema.AnyNoContext;
+    type Any = Schema$.Schema.AnyNoContext;
     /**
      * Get relation source type.
      */
@@ -94,8 +85,8 @@ export declare namespace Relation {
      */
     type Target<A> = A extends Relation.Endpoints<infer _S, infer T> ? T : never;
     type Endpoints<Source, Target> = {
-        [RelationModule.Source]: Source;
-        [RelationModule.Target]: Target;
+        [Relation$.Source]: Source;
+        [Relation$.Target]: Target;
     };
 }
 /**
@@ -104,20 +95,20 @@ export declare namespace Relation {
  * This typedef avoids `TS4023` error (name from external module cannot be used named).
  * See Effect's note on interface types.
  */
-export interface ref<TargetSchema extends Schema.Schema.Any> extends EchoSchema.Ref$<Schema.Schema.Type<TargetSchema>> {
+export interface ref<TargetSchema extends Schema$.Schema.Any> extends RefSchema<Schema$.Schema.Type<TargetSchema>> {
 }
 /**
  * Ref schema.
  */
-export declare const Ref: <S extends Obj.Any>(schema: S) => ref<S>;
-export interface Ref<T> extends Schema.SchemaClass<EchoSchema.Ref<T>, EncodedReference> {
+export declare const Ref: RefFn;
+export interface Ref<T> extends Schema$.SchemaClass<Ref$<T>, EncodedReference> {
 }
 export declare namespace Ref {
     /**
      * Type that represents an arbitrary schema type of a reference.
      * NOTE: This is not an instance type.
      */
-    type Any = Schema.Schema<EchoSchema.Ref<any>, EncodedReference>;
+    type Any = Schema$.Schema<Ref$<any>, EncodedReference>;
 }
 /**
  * Gets the full DXN of the schema.
@@ -125,29 +116,27 @@ export declare namespace Ref {
  * @example "dxn:example.com/type/Person:0.1.0"
  * @example "dxn:echo:SSSSSSSSSS:XXXXXXXXXXXXX"
  */
-export declare const getDXN: (schema: Obj.Any | Relation.Any) => Keys.DXN | undefined;
+export declare const getDXN: (schema: Entity.Any) => DXN | undefined;
 /**
  * @param schema - Schema to get the typename from.
  * @returns The typename of the schema. Example: `example.com/type/Person`.
  */
-export declare const getTypename: (schema: Obj.Any | Relation.Any) => string;
+export declare const getTypename: (schema: Entity.Any) => string;
 /**
  * Gets the version of the schema.
  * @example 0.1.0
  */
-export declare const getVersion: (schema: Obj.Any | Relation.Any) => string;
+export declare const getVersion: (schema: Entity.Any) => string;
 /**
  * @returns True if the schema is mutable.
  */
-export declare const isMutable: (schema: Schema.Schema.AnyNoContext) => schema is EchoSchema.EchoSchema;
+export declare const isMutable: (schema: Schema$.Schema.AnyNoContext) => schema is EchoSchema;
 /**
  * ECHO type metadata.
  */
-export type Meta = EchoSchema.TypeAnnotation;
+export type Meta = TypeAnnotation;
 /**
  * Gets the meta data of the schema.
  */
-export declare const getMeta: (schema: Obj.Any | Relation.Any) => Meta | undefined;
-export { SpaceId, ObjectId, DXN } from '@dxos/keys';
-export { Format, JsonSchemaType as JsonSchema, toEffectSchema, toJsonSchema } from '@dxos/echo-schema';
+export declare const getMeta: (schema: Entity.Any) => Meta | undefined;
 //# sourceMappingURL=Type.d.ts.map