@dxos/echo 0.8.3 → 0.8.4-main.1da679c

package/dist/lib/node-esm/{chunk-BYBICDIO.mjs → chunk-N55B5WWQ.mjs}

@@ -5,7 +5,30 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// packages/core/echo/echo/src/Key.ts
+// src/errors.ts
+import { BaseError } from "@dxos/errors";
+var SchemaNotFoundError = class extends BaseError.extend("SCHEMA_NOT_FOUND", "Schema not found") {
+  constructor(schema, options) {
+    super({
+      context: {
+        schema
+      },
+      ...options
+    });
+  }
+};
+var ObjectNotFoundError = class extends BaseError.extend("OBJECT_NOT_FOUND", "Object not found") {
+  constructor(dxn, options) {
+    super({
+      context: {
+        dxn
+      },
+      ...options
+    });
+  }
+};
+
+// src/Key.ts
 var Key_exports = {};
 __export(Key_exports, {
   ObjectId: () => ObjectId,
@@ -13,53 +36,143 @@ __export(Key_exports, {
 });
 import { SpaceId, ObjectId } from "@dxos/keys";
 
-// packages/core/echo/echo/src/Obj.ts
+// src/Obj.ts
 var Obj_exports = {};
 __export(Obj_exports, {
+  Any: () => Any,
+  Meta: () => Meta,
+  VersionTypeId: () => VersionTypeId2,
+  clone: () => clone,
+  compareVersions: () => compareVersions,
+  decodeVersion: () => decodeVersion,
+  deleteKeys: () => deleteKeys,
+  encodeVersion: () => encodeVersion,
   fromJSON: () => fromJSON,
-  getDXN: () => getDXN,
+  getDXN: () => getDXN2,
+  getKeys: () => getKeys,
   getLabel: () => getLabel2,
-  getMeta: () => getMeta2,
+  getMeta: () => getMeta3,
   getSchema: () => getSchema2,
+  getSnapshot: () => getSnapshot2,
   getTypeDXN: () => getTypeDXN,
-  getTypename: () => getTypename,
+  getTypename: () => getTypename2,
   instanceOf: () => instanceOf,
   isDeleted: () => isDeleted2,
   isObject: () => isObject,
+  isVersion: () => isVersion,
   make: () => make,
-  toJSON: () => toJSON
+  setLabel: () => setLabel2,
+  toJSON: () => toJSON,
+  version: () => version,
+  versionValid: () => versionValid
 });
 import { Schema } from "effect";
-import * as EchoSchema from "@dxos/echo-schema";
-import { assertArgument, invariant } from "@dxos/invariant";
+import { dual } from "effect/Function";
+import * as EchoSchema2 from "@dxos/echo-schema";
+import { assertArgument, invariant as invariant2 } from "@dxos/invariant";
+import * as LiveObject from "@dxos/live-object";
 import { live } from "@dxos/live-object";
-import { assumeType } from "@dxos/util";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/echo/echo/src/Obj.ts";
+import { assumeType, deepMapValues } from "@dxos/util";
+
+// src/Type.ts
+var Type_exports = {};
+__export(Type_exports, {
+  DXN: () => DXN,
+  Expando: () => Expando2,
+  Format: () => Format,
+  JsonSchema: () => JsonSchemaType,
+  Kind: () => Kind,
+  KindId: () => KindId,
+  Obj: () => Obj,
+  ObjectId: () => ObjectId2,
+  Ref: () => Ref2,
+  Relation: () => Relation,
+  SpaceId: () => SpaceId2,
+  getDXN: () => getDXN,
+  getMeta: () => getMeta,
+  getTypename: () => getTypename,
+  getVersion: () => getVersion,
+  isMutable: () => isMutable2,
+  toEffectSchema: () => toEffectSchema,
+  toJsonSchema: () => toJsonSchema
+});
+import * as EchoSchema from "@dxos/echo-schema";
+import { invariant } from "@dxos/invariant";
+import { SpaceId as SpaceId2, ObjectId as ObjectId2, DXN } from "@dxos/keys";
+import { Format, JsonSchemaType, toEffectSchema, toJsonSchema } from "@dxos/echo-schema";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/Type.ts";
+var KindId = EchoSchema.EntityKindId;
+var Kind = EchoSchema.EntityKind;
+var Obj = EchoSchema.EchoObject;
+var Expando2 = EchoSchema.Expando;
+var Relation = EchoSchema.EchoRelation;
+var Ref2 = EchoSchema.Ref;
+var getDXN = (schema) => {
+  return EchoSchema.getSchemaDXN(schema);
+};
+var getTypename = (schema) => {
+  const typename = EchoSchema.getSchemaTypename(schema);
+  invariant(typeof typename === "string" && !typename.startsWith("dxn:"), "Invalid typename", {
+    F: __dxlog_file,
+    L: 212,
+    S: void 0,
+    A: [
+      "typeof typename === 'string' && !typename.startsWith('dxn:')",
+      "'Invalid typename'"
+    ]
+  });
+  return typename;
+};
+var getVersion = (schema) => {
+  const version2 = EchoSchema.getSchemaVersion(schema);
+  invariant(typeof version2 === "string" && version2.match(/^\d+\.\d+\.\d+$/), "Invalid version", {
+    F: __dxlog_file,
+    L: 222,
+    S: void 0,
+    A: [
+      "typeof version === 'string' && version.match(/^\\d+\\.\\d+\\.\\d+$/)",
+      "'Invalid version'"
+    ]
+  });
+  return version2;
+};
+var isMutable2 = EchoSchema.isMutable;
+var getMeta = (schema) => {
+  return EchoSchema.getTypeAnnotation(schema);
+};
+
+// src/Obj.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo/src/Obj.ts";
+var Any = Schema.Struct({}).pipe(Obj({
+  typename: "dxos.org/types/Any",
+  version: "0.1.0"
+}));
+var Meta = EchoSchema2.MetaId;
 var make = (schema, props, meta) => {
-  assertArgument(EchoSchema.getTypeAnnotation(schema)?.kind === EchoSchema.EntityKind.Object, "Expected an object schema");
-  if (props[EchoSchema.MetaId] != null) {
-    meta = props[EchoSchema.MetaId];
-    delete props[EchoSchema.MetaId];
+  assertArgument(EchoSchema2.getTypeAnnotation(schema)?.kind === EchoSchema2.EntityKind.Object, "schema", "Expected an object schema");
+  if (props[EchoSchema2.MetaId] != null) {
+    meta = props[EchoSchema2.MetaId];
+    delete props[EchoSchema2.MetaId];
   }
   return live(schema, props, meta);
 };
 var isObject = (obj) => {
   assumeType(obj);
-  return typeof obj === "object" && obj !== null && obj[EchoSchema.EntityKindId] === EchoSchema.EntityKind.Object;
+  return typeof obj === "object" && obj !== null && obj[EchoSchema2.EntityKindId] === EchoSchema2.EntityKind.Object;
 };
 var instanceOf = (...args) => {
   if (args.length === 1) {
-    return (obj) => EchoSchema.isInstanceOf(args[0], obj);
+    return (obj) => EchoSchema2.isInstanceOf(args[0], obj);
   }
-  return EchoSchema.isInstanceOf(args[0], args[1]);
+  return EchoSchema2.isInstanceOf(args[0], args[1]);
 };
-var getSchema2 = EchoSchema.getSchema;
-var getDXN = (obj) => {
-  assertArgument(!Schema.isSchema(obj), "Object should not be a schema.");
-  const dxn = EchoSchema.getObjectDXN(obj);
-  invariant(dxn != null, "Invalid object.", {
-    F: __dxlog_file,
-    L: 96,
+var getSchema2 = EchoSchema2.getSchema;
+var getDXN2 = (obj) => {
+  assertArgument(!Schema.isSchema(obj), "obj", "Object should not be a schema.");
+  const dxn = EchoSchema2.getObjectDXN(obj);
+  invariant2(dxn != null, "Invalid object.", {
+    F: __dxlog_file2,
+    L: 120,
     S: void 0,
     A: [
       "dxn != null",
@@ -68,19 +181,19 @@ var getDXN = (obj) => {
   });
   return dxn;
 };
-var getTypeDXN = EchoSchema.getType;
-var getTypename = (obj) => {
+var getTypeDXN = EchoSchema2.getType;
+var getTypename2 = (obj) => {
   const schema = getSchema2(obj);
   if (schema == null) {
-    return EchoSchema.getType(obj)?.asTypeDXN()?.type;
+    return EchoSchema2.getType(obj)?.asTypeDXN()?.type;
   }
-  return EchoSchema.getSchemaTypename(schema);
+  return EchoSchema2.getSchemaTypename(schema);
 };
-var getMeta2 = (obj) => {
-  const meta = EchoSchema.getMeta(obj);
-  invariant(meta != null, "Invalid object.", {
-    F: __dxlog_file,
-    L: 124,
+var getMeta3 = (obj) => {
+  const meta = EchoSchema2.getMeta(obj);
+  invariant2(meta != null, "Invalid object.", {
+    F: __dxlog_file2,
+    L: 148,
     S: void 0,
     A: [
       "meta != null",
@@ -89,11 +202,33 @@ var getMeta2 = (obj) => {
   });
   return meta;
 };
+var getKeys = dual(2, (obj, source) => {
+  const meta = EchoSchema2.getMeta(obj);
+  invariant2(meta != null, "Invalid object.", {
+    F: __dxlog_file2,
+    L: 160,
+    S: void 0,
+    A: [
+      "meta != null",
+      "'Invalid object.'"
+    ]
+  });
+  return meta.keys.filter((key) => key.source === source);
+});
+var deleteKeys = (obj, source) => {
+  const meta = EchoSchema2.getMeta(obj);
+  for (let i = 0; i < meta.keys.length; i++) {
+    if (meta.keys[i].source === source) {
+      meta.keys.splice(i, 1);
+      i--;
+    }
+  }
+};
 var isDeleted2 = (obj) => {
-  const deleted = EchoSchema.isDeleted(obj);
-  invariant(typeof deleted === "boolean", "Invalid object.", {
-    F: __dxlog_file,
-    L: 131,
+  const deleted = EchoSchema2.isDeleted(obj);
+  invariant2(typeof deleted === "boolean", "Invalid object.", {
+    F: __dxlog_file2,
+    L: 182,
     S: void 0,
     A: [
       "typeof deleted === 'boolean'",
@@ -105,13 +240,91 @@ var isDeleted2 = (obj) => {
 var getLabel2 = (obj) => {
   const schema = getSchema2(obj);
   if (schema != null) {
-    return EchoSchema.getLabel(schema, obj);
+    return EchoSchema2.getLabel(schema, obj);
   }
 };
-var toJSON = (obj) => EchoSchema.objectToJSON(obj);
-var fromJSON = EchoSchema.objectFromJSON;
+var setLabel2 = (obj, label) => {
+  const schema = getSchema2(obj);
+  if (schema != null) {
+    EchoSchema2.setLabel(schema, obj, label);
+  }
+};
+var toJSON = (obj) => EchoSchema2.objectToJSON(obj);
+var fromJSON = EchoSchema2.objectFromJSON;
+var getSnapshot2 = LiveObject.getSnapshot;
+var clone = (obj, opts) => {
+  const { id, ...data } = obj;
+  const schema = getSchema2(obj);
+  invariant2(schema != null, "Object should have a schema", {
+    F: __dxlog_file2,
+    L: 247,
+    S: void 0,
+    A: [
+      "schema != null",
+      "'Object should have a schema'"
+    ]
+  });
+  const props = deepMapValues(data, (value, recurse) => {
+    if (EchoSchema2.Ref.isRef(value)) {
+      return value;
+    }
+    return recurse(value);
+  });
+  if (opts?.retainId) {
+    props.id = id;
+  }
+  const meta = getMeta3(obj);
+  props[EchoSchema2.MetaId] = deepMapValues(meta, (value, recurse) => {
+    if (EchoSchema2.Ref.isRef(value)) {
+      return value;
+    }
+    return recurse(value);
+  });
+  return make(schema, props);
+};
+var VersionTypeId2 = EchoSchema2.VersionTypeId;
+var unversioned = {
+  [VersionTypeId2]: {},
+  versioned: false
+};
+var isVersion = (obj) => {
+  return obj != null && typeof obj === "object" && VersionTypeId2 in obj;
+};
+var version = (obj) => {
+  const version2 = obj[EchoSchema2.ObjectVersionId];
+  if (version2 === void 0) {
+    return unversioned;
+  }
+  return version2;
+};
+var versionValid = (version2) => {
+  assertArgument(isVersion(version2), "version", "Invalid version object");
+  return !!version2.versioned;
+};
+var compareVersions = (version1, version2) => {
+  assertArgument(isVersion(version1), "version1", "Invalid version object");
+  assertArgument(isVersion(version2), "version2", "Invalid version object");
+  if (!versionValid(version1) || !versionValid(version2)) {
+    return "unversioned";
+  }
+  if (version1.automergeHeads?.length !== version2.automergeHeads?.length) {
+    return "different";
+  }
+  if (version1.automergeHeads?.some((head) => !version2.automergeHeads?.includes(head))) {
+    return "different";
+  }
+  return "equal";
+};
+var encodeVersion = (version2) => {
+  return JSON.stringify(version2);
+};
+var decodeVersion = (version2) => {
+  const parsed = JSON.parse(version2);
+  parsed[VersionTypeId2] = {};
+  return parsed;
+};
 
-// packages/core/echo/echo/src/Ref.ts
+// src/Ref.ts
 var Ref_exports = {};
 __export(Ref_exports, {
   Array: () => Array2,
@@ -119,15 +332,16 @@ __export(Ref_exports, {
   isRef: () => isRef,
   make: () => make2
 });
-import * as EchoSchema2 from "@dxos/echo-schema";
-var Array2 = EchoSchema2.RefArray;
-var isRef = EchoSchema2.Ref.isRef;
-var make2 = EchoSchema2.Ref.make;
-var fromDXN = EchoSchema2.Ref.fromDXN;
+import * as EchoSchema3 from "@dxos/echo-schema";
+var Array2 = EchoSchema3.RefArray;
+var isRef = EchoSchema3.Ref.isRef;
+var make2 = EchoSchema3.Ref.make;
+var fromDXN = EchoSchema3.Ref.fromDXN;
 
-// packages/core/echo/echo/src/Relation.ts
+// src/Relation.ts
 var Relation_exports = {};
 __export(Relation_exports, {
+  Any: () => Any2,
   Source: () => Source,
   Target: () => Target,
   getSource: () => getSource,
@@ -137,44 +351,51 @@ __export(Relation_exports, {
   isRelation: () => isRelation,
   make: () => make3
 });
+import { Schema as Schema2 } from "effect";
 import { raise } from "@dxos/debug";
-import * as EchoSchema3 from "@dxos/echo-schema";
-import { assertArgument as assertArgument2, invariant as invariant2 } from "@dxos/invariant";
-import { DXN } from "@dxos/keys";
+import * as EchoSchema4 from "@dxos/echo-schema";
+import { assertArgument as assertArgument2, invariant as invariant3 } from "@dxos/invariant";
+import { DXN as DXN2 } from "@dxos/keys";
 import { live as live2 } from "@dxos/live-object";
 import { assumeType as assumeType2 } from "@dxos/util";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/echo/echo/src/Relation.ts";
-var Source = EchoSchema3.RelationSourceId;
-var Target = EchoSchema3.RelationTargetId;
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo/src/Relation.ts";
+var Any2 = Schema2.Struct({}).pipe(Relation({
+  typename: "dxos.org/types/Any",
+  version: "0.1.0",
+  source: Any,
+  target: Any
+}));
+var Source = EchoSchema4.RelationSourceId;
+var Target = EchoSchema4.RelationTargetId;
 var make3 = (schema, props, meta) => {
-  assertArgument2(EchoSchema3.getTypeAnnotation(schema)?.kind === EchoSchema3.EntityKind.Relation, "Expected a relation schema");
-  if (props[EchoSchema3.MetaId] != null) {
-    meta = props[EchoSchema3.MetaId];
-    delete props[EchoSchema3.MetaId];
-  }
-  const sourceDXN = EchoSchema3.getObjectDXN(props[Source]) ?? raise(new Error("Unresolved relation source"));
-  const targetDXN = EchoSchema3.getObjectDXN(props[Target]) ?? raise(new Error("Unresolved relation target"));
-  props[EchoSchema3.RelationSourceDXNId] = sourceDXN;
-  props[EchoSchema3.RelationTargetDXNId] = targetDXN;
+  assertArgument2(EchoSchema4.getTypeAnnotation(schema)?.kind === EchoSchema4.EntityKind.Relation, "schema", "Expected a relation schema");
+  if (props[EchoSchema4.MetaId] != null) {
+    meta = props[EchoSchema4.MetaId];
+    delete props[EchoSchema4.MetaId];
+  }
+  const sourceDXN = EchoSchema4.getObjectDXN(props[Source]) ?? raise(new Error("Unresolved relation source"));
+  const targetDXN = EchoSchema4.getObjectDXN(props[Target]) ?? raise(new Error("Unresolved relation target"));
+  props[EchoSchema4.RelationSourceDXNId] = sourceDXN;
+  props[EchoSchema4.RelationTargetDXNId] = targetDXN;
   return live2(schema, props, meta);
 };
 var isRelation = (value) => {
   if (typeof value !== "object" || value === null) {
     return false;
   }
-  if (EchoSchema3.ATTR_RELATION_SOURCE in value || EchoSchema3.ATTR_RELATION_TARGET in value) {
+  if (EchoSchema4.ATTR_RELATION_SOURCE in value || EchoSchema4.ATTR_RELATION_TARGET in value) {
     return true;
   }
-  const kind = value[EchoSchema3.EntityKindId];
-  return kind === EchoSchema3.EntityKind.Relation;
+  const kind = value[EchoSchema4.EntityKindId];
+  return kind === EchoSchema4.EntityKind.Relation;
 };
 var getSourceDXN = (value) => {
   assertArgument2(isRelation(value), "Expected a relation");
   assumeType2(value);
-  const dxn = value[EchoSchema3.RelationSourceDXNId];
-  invariant2(dxn instanceof DXN, void 0, {
-    F: __dxlog_file2,
-    L: 98,
+  const dxn = value[EchoSchema4.RelationSourceDXNId];
+  invariant3(dxn instanceof DXN2, void 0, {
+    F: __dxlog_file3,
+    L: 109,
     S: void 0,
     A: [
       "dxn instanceof DXN",
@@ -186,10 +407,10 @@ var getSourceDXN = (value) => {
 var getTargetDXN = (value) => {
   assertArgument2(isRelation(value), "Expected a relation");
   assumeType2(value);
-  const dxn = value[EchoSchema3.RelationTargetDXNId];
-  invariant2(dxn instanceof DXN, void 0, {
-    F: __dxlog_file2,
-    L: 110,
+  const dxn = value[EchoSchema4.RelationTargetDXNId];
+  invariant3(dxn instanceof DXN2, void 0, {
+    F: __dxlog_file3,
+    L: 121,
     S: void 0,
     A: [
       "dxn instanceof DXN",
@@ -201,10 +422,10 @@ var getTargetDXN = (value) => {
 var getSource = (relation) => {
   assertArgument2(isRelation(relation), "Expected a relation");
   assumeType2(relation);
-  const obj = relation[EchoSchema3.RelationSourceId];
-  invariant2(obj !== void 0, `Invalid source: ${relation.id}`, {
-    F: __dxlog_file2,
-    L: 122,
+  const obj = relation[EchoSchema4.RelationSourceId];
+  invariant3(obj !== void 0, `Invalid source: ${relation.id}`, {
+    F: __dxlog_file3,
+    L: 133,
     S: void 0,
     A: [
       "obj !== undefined",
@@ -216,10 +437,10 @@ var getSource = (relation) => {
 var getTarget = (relation) => {
   assertArgument2(isRelation(relation), "Expected a relation");
   assumeType2(relation);
-  const obj = relation[EchoSchema3.RelationTargetId];
-  invariant2(obj !== void 0, `Invalid target: ${relation.id}`, {
-    F: __dxlog_file2,
-    L: 134,
+  const obj = relation[EchoSchema4.RelationTargetId];
+  invariant3(obj !== void 0, `Invalid target: ${relation.id}`, {
+    F: __dxlog_file3,
+    L: 145,
     S: void 0,
     A: [
       "obj !== undefined",
@@ -229,91 +450,51 @@ var getTarget = (relation) => {
   return obj;
 };
 
-// packages/core/echo/echo/src/Type.ts
-var Type_exports = {};
-__export(Type_exports, {
-  DXN: () => DXN2,
-  Expando: () => Expando2,
-  Format: () => Format,
-  JsonSchema: () => JsonSchemaType,
-  Kind: () => EntityKind3,
-  KindId: () => KindId,
-  Obj: () => Obj,
-  ObjectId: () => ObjectId2,
-  Ref: () => Ref3,
-  Relation: () => Relation,
-  SpaceId: () => SpaceId2,
-  getDXN: () => getDXN2,
-  getMeta: () => getMeta3,
-  getTypename: () => getTypename2,
-  getVersion: () => getVersion,
-  isMutable: () => isMutable2,
-  toEffectSchema: () => toEffectSchema,
-  toJsonSchema: () => toJsonSchema
-});
-import * as EchoSchema4 from "@dxos/echo-schema";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { EntityKind as EntityKind3 } from "@dxos/echo-schema";
-import { SpaceId as SpaceId2, ObjectId as ObjectId2, DXN as DXN2 } from "@dxos/keys";
-import {
-  Format,
-  JsonSchemaType,
-  toEffectSchema,
-  toJsonSchema
-} from "@dxos/echo-schema";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/echo/echo/src/Type.ts";
-var KindId = EchoSchema4.EntityKindId;
-var Obj = EchoSchema4.EchoObject;
-var Relation = EchoSchema4.EchoRelation;
-var Ref3 = EchoSchema4.Ref;
-var getDXN2 = (schema) => {
-  return EchoSchema4.getSchemaDXN(schema);
-};
-var getTypename2 = (schema) => {
-  const typename = EchoSchema4.getSchemaTypename(schema);
-  invariant3(typeof typename === "string" && !typename.startsWith("dxn:"), "Invalid typename", {
-    F: __dxlog_file3,
-    L: 182,
-    S: void 0,
-    A: [
-      "typeof typename === 'string' && !typename.startsWith('dxn:')",
-      "'Invalid typename'"
-    ]
-  });
-  return typename;
-};
-var getVersion = (schema) => {
-  const version = EchoSchema4.getSchemaVersion(schema);
-  invariant3(typeof version === "string" && version.match(/^\d+\.\d+\.\d+$/), "Invalid version", {
-    F: __dxlog_file3,
-    L: 192,
-    S: void 0,
-    A: [
-      "typeof version === 'string' && version.match(/^\\d+\\.\\d+\\.\\d+$/)",
-      "'Invalid version'"
-    ]
-  });
-  return version;
-};
-var getMeta3 = (schema) => {
-  return EchoSchema4.getTypeAnnotation(schema);
-};
-var isMutable2 = EchoSchema4.isMutable;
-var Expando2 = EchoSchema4.Expando;
-
-// packages/core/echo/echo/src/index.ts
+// src/index.ts
 import { DXN as DXN4 } from "@dxos/keys";
 
-// packages/core/echo/echo/src/query/dsl.ts
-import { Schema as Schema2 } from "effect";
+// src/query/dsl.ts
+import { Match, Schema as Schema3 } from "effect";
 import { raise as raise2 } from "@dxos/debug";
 import { getTypeReference } from "@dxos/echo-schema";
 import { assertArgument as assertArgument3 } from "@dxos/invariant";
 import { DXN as DXN3, ObjectId as ObjectId3 } from "@dxos/keys";
-var FilterClass = class _FilterClass {
-  static {
-    this.variance = {};
+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;
+}
+var OrderClass = class _OrderClass {
+  static is(value) {
+    return typeof value === "object" && value !== null && "~Order" in value;
+  }
+  constructor(ast) {
+    _define_property(this, "ast", void 0);
+    _define_property(this, "~Order", void 0);
+    this.ast = ast;
+    this["~Order"] = _OrderClass.variance;
   }
+};
+_define_property(OrderClass, "variance", {});
+(function(Order2) {
+  Order2.natural = new OrderClass({
+    kind: "natural"
+  });
+  Order2.property = (property, direction) => new OrderClass({
+    kind: "property",
+    property,
+    direction
+  });
+})(Order || (Order = {}));
+var FilterClass = class _FilterClass {
   static is(value) {
     return typeof value === "object" && value !== null && "~Filter" in value;
   }
@@ -342,7 +523,7 @@ var FilterClass = class _FilterClass {
     });
   }
   static ids(...ids) {
-    assertArgument3(ids.every((id) => ObjectId3.isValid(id)), "ids must be valid");
+    assertArgument3(ids.every((id) => ObjectId3.isValid(id)), "ids", "ids must be valid");
     if (ids.length === 0) {
       return Filter.nothing();
     }
@@ -362,7 +543,7 @@ var FilterClass = class _FilterClass {
     });
   }
   static typename(typename) {
-    assertArgument3(!typename.startsWith("dxn:"), "Typename must no be qualified");
+    assertArgument3(!typename.startsWith("dxn:"), "typename", "Typename must no be qualified");
     return new _FilterClass({
       type: "object",
       typename: DXN3.fromTypename(typename).toString(),
@@ -453,6 +634,12 @@ var FilterClass = class _FilterClass {
       values
     });
   }
+  static contains(value) {
+    return new _FilterClass({
+      type: "contains",
+      value
+    });
+  }
   static between(from, to) {
     return new _FilterClass({
       type: "range",
@@ -479,35 +666,60 @@ var FilterClass = class _FilterClass {
     });
   }
   constructor(ast) {
+    _define_property(this, "ast", void 0);
+    _define_property(this, "~Filter", void 0);
     this.ast = ast;
     this["~Filter"] = _FilterClass.variance;
   }
 };
+_define_property(FilterClass, "variance", {});
 var Filter = FilterClass;
 var propsFilterToAst = (predicates) => {
   let idFilter;
   if ("id" in predicates) {
-    assertArgument3(typeof predicates.id === "string" || Array.isArray(predicates.id), "invalid id filter");
+    assertArgument3(typeof predicates.id === "string" || Array.isArray(predicates.id), "predicates.id", "invalid id filter");
     idFilter = typeof predicates.id === "string" ? [
       predicates.id
     ] : predicates.id;
-    Schema2.Array(ObjectId3).pipe(Schema2.validateSync)(idFilter);
+    Schema3.Array(ObjectId3).pipe(Schema3.validateSync)(idFilter);
   }
   return {
     id: idFilter,
     props: Object.fromEntries(Object.entries(predicates).filter(([prop, _value]) => prop !== "id").map(([prop, predicate]) => [
       prop,
-      Filter.is(predicate) ? predicate.ast : Filter.eq(predicate).ast
+      processPredicate(predicate)
     ]))
   };
 };
+var processPredicate = (predicate) => {
+  return Match.value(predicate).pipe(
+    Match.withReturnType(),
+    Match.when(Filter.is, (predicate2) => predicate2.ast),
+    // TODO(wittjosiah): Add support for array predicates.
+    Match.when(Array.isArray, (_predicate) => {
+      throw new Error("Array predicates are not yet supported.");
+    }),
+    Match.when((predicate2) => !isRef(predicate2) && typeof predicate2 === "object" && predicate2 !== null, (predicate2) => {
+      const nestedProps = Object.fromEntries(Object.entries(predicate2).map(([key, value]) => [
+        key,
+        processPredicate(value)
+      ]));
+      return {
+        type: "object",
+        typename: null,
+        props: nestedProps
+      };
+    }),
+    Match.orElse((value) => Filter.eq(value).ast)
+  );
+};
 var QueryClass = class _QueryClass {
-  static {
-    this.variance = {};
-  }
   static is(value) {
     return typeof value === "object" && value !== null && "~Query" in value;
   }
+  static fromAst(ast) {
+    return new _QueryClass(ast);
+  }
   static select(filter) {
     return new _QueryClass({
       type: "select",
@@ -536,10 +748,6 @@ var QueryClass = class _QueryClass {
       exclude: exclude.ast
     });
   }
-  constructor(ast) {
-    this.ast = ast;
-    this["~Query"] = _QueryClass.variance;
-  }
   select(filter) {
     if (Filter.is(filter)) {
       return new _QueryClass({
@@ -601,6 +809,13 @@ var QueryClass = class _QueryClass {
       direction: "target"
     });
   }
+  orderBy(...order) {
+    return new _QueryClass({
+      type: "order",
+      query: this.ast,
+      order: order.map((o) => o.ast)
+    });
+  }
   options(options) {
     return new _QueryClass({
       type: "options",
@@ -608,17 +823,32 @@ var QueryClass = class _QueryClass {
       options
     });
   }
+  constructor(ast) {
+    _define_property(this, "ast", void 0);
+    _define_property(this, "~Query", void 0);
+    this.ast = ast;
+    this["~Query"] = _QueryClass.variance;
+  }
 };
+_define_property(QueryClass, "variance", {});
 var Query = QueryClass;
+var Order;
+
+// src/index.ts
+import { QueryAST } from "@dxos/echo-protocol";
 
 export {
+  SchemaNotFoundError,
+  ObjectNotFoundError,
   Key_exports,
+  Type_exports,
   Obj_exports,
   Ref_exports,
   Relation_exports,
-  Type_exports,
   Filter,
   Query,
-  DXN4 as DXN
+  Order,
+  DXN4 as DXN,
+  QueryAST
 };
-//# sourceMappingURL=chunk-BYBICDIO.mjs.map
+//# sourceMappingURL=chunk-N55B5WWQ.mjs.map