@dxos/echo 0.8.4-main.2e9d522 → 0.8.4-main.3c1ae3b

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

@@ -0,0 +1,107 @@
+import type * as EffectArray from 'effect/Array';
+import type * as Schema from 'effect/Schema';
+import { type QueryAST } from '@dxos/echo-protocol';
+import * as Filter from './Filter';
+import type * as Order from './Order';
+import type * as Ref from './Ref';
+import type * as Type$ from './Type';
+/**
+ * All property paths inside T that are references.
+ */
+type RefPropKey<T> = keyof T & string;
+export interface Query<T> {
+    '~Query': {
+        value: T;
+    };
+    ast: QueryAST.Query;
+    /**
+     * Filter the current selection based on a filter.
+     * @param filter - Filter to select the objects.
+     * @returns Query for the selected objects.
+     */
+    select(filter: Filter.Filter<T>): Query<T>;
+    select(props: Filter.Props<T>): Query<T>;
+    /**
+     * Traverse an outgoing reference.
+     * @param key - Property path inside T that is a reference or optional reference.
+     * @returns Query for the target of the reference.
+     */
+    reference<K extends RefPropKey<T>>(key: K): Query<T[K] extends Ref.Any ? Ref.Target<T[K]> : T[K] extends Ref.Any | undefined ? Ref.Target<Exclude<T[K], undefined>> : never>;
+    /**
+     * Find objects referencing this object.
+     * @param target - Schema of the referencing object.
+     * @param key - Property path inside the referencing object that is a reference.
+     * @returns Query for the referencing objects.
+     */
+    referencedBy<S extends Schema.Schema.All>(target: S | string, key: RefPropKey<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
+    /**
+     * Find relations where this object is the source.
+     * @returns Query for the relation objects.
+     * @param relation - Schema of the relation.
+     * @param predicates - Predicates to filter the relation objects.
+     */
+    sourceOf<S extends Schema.Schema.All>(relation: S | string, predicates?: Filter.Props<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
+    /**
+     * Find relations where this object is the target.
+     * @returns Query for the relation objects.
+     * @param relation - Schema of the relation.
+     * @param predicates - Predicates to filter the relation objects.
+     */
+    targetOf<S extends Schema.Schema.All>(relation: S | string, predicates?: Filter.Props<Schema.Schema.Type<S>>): Query<Schema.Schema.Type<S>>;
+    /**
+     * For a query for relations, get the source objects.
+     * @returns Query for the source objects.
+     */
+    source(): Query<Type$.Relation.Source<T>>;
+    /**
+     * For a query for relations, get the target objects.
+     * @returns Query for the target objects.
+     */
+    target(): Query<Type$.Relation.Target<T>>;
+    /**
+     * Order the query results.
+     * Orders are specified in priority order. The first order will be applied first, etc.
+     * @param order - Order to sort the results.
+     * @returns Query for the ordered results.
+     */
+    orderBy(...order: EffectArray.NonEmptyArray<Order.Order<T>>): Query<T>;
+    /**
+     * Add options to a query.
+     */
+    options(options: QueryAST.QueryOptions): Query<T>;
+}
+export type Any = Query<any>;
+export type Type<Q extends Any> = Q extends Query<infer T> ? T : never;
+export declare const is: (value: unknown) => value is Any;
+/** Construct a query from an ast. */
+export declare const fromAst: (ast: QueryAST.Query) => Any;
+/**
+ * Select objects based on a filter.
+ * @param filter - Filter to select the objects.
+ * @returns Query for the selected objects.
+ */
+export declare const select: <F extends Filter.Any>(filter: F) => Query<Filter.Type<F>>;
+/**
+ * Query for objects of a given schema.
+ * @param schema - Schema of the objects.
+ * @param predicates - Predicates to filter the objects.
+ * @returns Query for the objects.
+ *
+ * Shorthand for: `Query.select(Filter.type(schema, predicates))`.
+ */
+export declare const type: (schema: Schema.Schema.All | string, predicates?: Filter.Props<unknown>) => Any;
+/**
+ * Combine results of multiple queries.
+ * @param queries - Queries to combine.
+ * @returns Query for the combined results.
+ */
+export declare const all: (...queries: Any[]) => Any;
+/**
+ * Subtract one query from another.
+ * @param source - Query to subtract from.
+ * @param exclude - Query to subtract.
+ * @returns Query for the results of the source query minus the results of the exclude query.
+ */
+export declare const without: <T>(source: Query<T>, exclude: Query<T>) => Query<T>;
+export {};
+//# sourceMappingURL=Query.d.ts.map

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

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

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Query.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Query.test.d.ts","sourceRoot":"","sources":["../../../src/Query.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,84 @@
+import { type CleanupFn } from '@dxos/async';
+import type * as Entity from './Entity';
+/**
+ * Individual query result entry.
+ */
+export type Entry<T> = {
+    id: string;
+    /**
+     * May not be present for remote results.
+     */
+    result?: T;
+    match?: {
+        /**
+         * Higher means better match.
+         */
+        rank: number;
+    };
+    /**
+     * Query resolution metadata.
+     */
+    resolution?: {
+        source: 'remote' | 'local' | 'index';
+        /**
+         * Query resolution time in milliseconds.
+         */
+        time: number;
+    };
+};
+/**
+ * Invidual query result entry for a database Entity.
+ */
+export type EntityEntry<T extends Entity.Unknown = Entity.Unknown> = Entry<T>;
+export type RunOptions = {
+    timeout?: number;
+};
+export type SubscriptionOptions = {
+    /**
+     * Fire the callback immediately.
+     */
+    fire?: boolean;
+};
+export interface QueryResult<T> {
+    /**
+     * Currently available results along with their match metadata.
+     *
+     * @reactive
+     */
+    readonly entries: Entry<T>[];
+    /**
+     * Currently available results.
+     *
+     * @reactive
+     */
+    readonly results: T[];
+    /**
+     * Returns all known results.
+     */
+    run(opts?: RunOptions): Promise<T[]>;
+    /**
+     * Returns all known results along with their match metadata.
+     */
+    runEntries(opts?: RunOptions): Promise<Entry<T>[]>;
+    /**
+     * Returns currently available results synchronously.
+     */
+    runSync(): T[];
+    /**
+     * Returns currently available results synchronously along with their match metadata.
+     */
+    runSyncEntries(): Entry<T>[];
+    /**
+     * Returns first result.
+     */
+    first(opts?: RunOptions): Promise<T>;
+    /**
+     * Returns first result if there is one.
+     */
+    firstOrUndefined(opts?: RunOptions): Promise<T | undefined>;
+    /**
+     * Subscribes to changes in query results.
+     */
+    subscribe(callback?: (query: QueryResult<T>) => void, opts?: SubscriptionOptions): CleanupFn;
+}
+//# sourceMappingURL=QueryResult.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"QueryResult.d.ts","sourceRoot":"","sources":["../../../src/QueryResult.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,KAAK,KAAK,MAAM,MAAM,UAAU,CAAC;AAExC;;GAEG;AACH,MAAM,MAAM,KAAK,CAAC,CAAC,IAAI;IACrB,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,CAAC;IAEX,KAAK,CAAC,EAAE;QAGN;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF;;OAEG;IAEH,UAAU,CAAC,EAAE;QAEX,MAAM,EAAE,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;QAErC;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;AAE9E,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7B;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;IAEtB;;OAEG;IACH,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAErC;;OAEG;IACH,UAAU,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAEnD;;OAEG;IACH,OAAO,IAAI,CAAC,EAAE,CAAC;IAEf;;OAEG;IACH,cAAc,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7B;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAErC;;OAEG;IACH,gBAAgB,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAE5D;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;CAC9F"}

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

@@ -1,21 +1,23 @@
-import * as EchoSchema from '@dxos/echo-schema';
+import * as SchemaAST from 'effect/SchemaAST';
+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>;
+export declare const isRefType: (ast: SchemaAST.AST) => boolean;
 //# 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":"AAKA,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,GAAG,IAAI,IAAI,EAAY,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAGrE,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;AAGpC,eAAO,MAAM,SAAS,GAAI,KAAK,SAAS,CAAC,GAAG,KAAG,OAS9C,CAAC"}

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

@@ -1,27 +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';
-interface RelationBase<Source, Target> extends Type.Relation.Endpoints<Source, Target>, Type.OfKind<EchoSchema.EntityKind.Relation> {
-    readonly id: EchoSchema.ObjectId;
-}
+import * as Entity from './Entity';
+import { type AnyEchoObject, EntityKind, MetaId, type ObjectMeta } from './internal';
+import * as Obj from './Obj';
+import * as Type from './Type';
 /**
- * Relation type with specific properties.
+ * Base type for all ECHO relations.
+ * @private
  */
-export type Relation<Source extends Obj.Any, Target extends Obj.Any, Props> = RelationBase<Source, Target> & Props;
+interface BaseRelation<Source, Target> extends AnyEchoObject, Type.Relation.Endpoints<Source, Target>, Entity.OfKind<EntityKind.Relation> {
+}
 /**
- * Base type for all ECHO relations.
+ * Base type for all Relations objects.
  */
-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<{}>>>;
+/**
+ * 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>;
@@ -32,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;AAGpC,UAAU,YAAY,CAAC,MAAM,EAAE,MAAM,CACnC,SAAQ,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7C,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC;IAC7C,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,QAAQ,CAAC;CAClC;AAED;;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/SchemaRegistry.d.ts

@@ -0,0 +1,73 @@
+import type * as Types from 'effect/Types';
+import type * as JsonSchema from './JsonSchema';
+import type * as Key from './Key';
+import type * as QueryResult from './QueryResult';
+import type * as Type from './Type';
+export type Query = {
+    /**
+     * Filter by schema ID.
+     * Schema id is a DXN with `echo` or `type` kind.
+     */
+    id?: string | string[];
+    /**
+     * Id of the backing ECHO object.
+     */
+    backingObjectId?: Key.ObjectId | Key.ObjectId[];
+    /**
+     * One or more typenames to filter by.
+     */
+    typename?: string | string[];
+    /**
+     * [Semver Range](https://docs.npmjs.com/cli/v6/using-npm/semver#ranges) for the schema version.
+     */
+    version?: string;
+    /**
+     * Where to look for the schema.
+     *
+     * Database schema are stored in the database of the current space.
+     * Runtime schema are registered in the runtime.
+     *
+     * @default ['database']
+     */
+    location?: ('database' | 'runtime')[];
+    /**
+     * Include system schemas.
+     * @default false
+     *
+     * The system schema include but are not limited to:
+     *  - dxos.org/type/Schema
+     */
+    includeSystem?: boolean;
+};
+/**
+ * Input for schema registration.
+ * The typename, version and schema mutability metadata is read from the schema annotations.
+ */
+export type RegisterSchemaInput = Type.Entity.Any | {
+    typename: string;
+    version: string;
+    jsonSchema: JsonSchema.JsonSchema;
+    /**
+     * Display name of the schema.
+     */
+    name?: string;
+};
+export type ExtractQueryResult<Query> = Query extends {
+    location: ('database' | 'runtime')[];
+} ? Type.Entity.Any : Type.RuntimeType;
+export interface SchemaRegistry {
+    /**
+     * Registers the provided schema.
+     *
+     * @returns Mutable runtime instances of schemas that were registered.
+     *
+     * The behavior of this method depends on the state of the database.
+     * The general principle is that the schema will be upserted into the space.
+     * If an equivalent schema with the same name and version already exists, the method does nothing.
+     * If a different schema with the same name and version exists, the method throws an error.
+     * If no schema with the same name and version exists, a new schema will be inserted based on semantic versioning rules.
+     */
+    register(input: RegisterSchemaInput[]): Promise<Type.RuntimeType[]>;
+    query<Q extends Types.NoExcessProperties<Query, Q>>(query?: Q & Query): QueryResult.QueryResult<ExtractQueryResult<Q>>;
+}
+//# sourceMappingURL=SchemaRegistry.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SchemaRegistry.d.ts","sourceRoot":"","sources":["../../../src/SchemaRegistry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAC;AAE3C,OAAO,KAAK,KAAK,UAAU,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,KAAK,GAAG,MAAM,OAAO,CAAC;AAClC,OAAO,KAAK,KAAK,WAAW,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,KAAK,IAAI,MAAM,QAAQ,CAAC;AAGpC,MAAM,MAAM,KAAK,GAAG;IAClB;;;OAGG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAEvB;;OAEG;IACH,eAAe,CAAC,EAAE,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAEhD;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAE7B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAC;IAEtC;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,GACf;IACE,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC;IAClC;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,MAAM,MAAM,kBAAkB,CAAC,KAAK,IAAI,KAAK,SAAS;IAAE,QAAQ,EAAE,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAA;CAAE,GAC1F,IAAI,CAAC,MAAM,CAAC,GAAG,GACf,IAAI,CAAC,WAAW,CAAC;AAErB,MAAM,WAAW,cAAc;IAC7B;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IAEpE,KAAK,CAAC,CAAC,SAAS,KAAK,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC,CAAC,EAChD,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,GAChB,WAAW,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;CACnD"}

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> = 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