@dxos/echo 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/dist/lib/node-esm/{chunk-AWWFAF75.mjs → chunk-ZSSII3JW.mjs}

@@ -1,353 +1,48 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
-var __defProp = Object.defineProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-
-// 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
-    });
-  }
-};
+import {
+  EchoObject,
+  EchoRelation,
+  EntityKind,
+  EntityKindId,
+  Expando,
+  Format,
+  JsonSchemaType,
+  LabelAnnotation,
+  MetaId,
+  ObjectVersionId,
+  Ref,
+  RefArray,
+  VersionTypeId,
+  __export,
+  getDescription,
+  getLabel,
+  getMeta,
+  getObjectDXN,
+  getSchema,
+  getSchemaDXN,
+  getSchemaTypename,
+  getSchemaVersion,
+  getType,
+  getTypeAnnotation,
+  getTypeReference,
+  isDeleted,
+  isInstanceOf,
+  isMutable,
+  live,
+  objectFromJSON,
+  objectToJSON,
+  setDescription,
+  setLabel,
+  toEffectSchema,
+  toJsonSchema
+} from "./chunk-DWZYQ2UR.mjs";
 
-// src/Key.ts
-var Key_exports = {};
-__export(Key_exports, {
-  ObjectId: () => ObjectId,
-  SpaceId: () => SpaceId
-});
-import { SpaceId, ObjectId } from "@dxos/keys";
-
-// 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: () => getDXN2,
-  getKeys: () => getKeys,
-  getLabel: () => getLabel2,
-  getMeta: () => getMeta3,
-  getSchema: () => getSchema2,
-  getSnapshot: () => getSnapshot2,
-  getTypeDXN: () => getTypeDXN,
-  getTypename: () => getTypename2,
-  instanceOf: () => instanceOf,
-  isDeleted: () => isDeleted2,
-  isObject: () => isObject,
-  isVersion: () => isVersion,
-  make: () => make,
-  setLabel: () => setLabel2,
-  sort: () => sort,
-  sortByLabel: () => sortByLabel,
-  sortByTypename: () => sortByTypename,
-  toJSON: () => toJSON,
-  version: () => version,
-  versionValid: () => versionValid
-});
-import { Schema } from "effect";
-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, 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(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[EchoSchema2.EntityKindId] === EchoSchema2.EntityKind.Object;
-};
-var instanceOf = (...args) => {
-  if (args.length === 1) {
-    return (obj) => EchoSchema2.isInstanceOf(args[0], obj);
-  }
-  return EchoSchema2.isInstanceOf(args[0], args[1]);
-};
-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",
-      "'Invalid object.'"
-    ]
-  });
-  return dxn;
-};
-var getTypeDXN = EchoSchema2.getType;
-var getTypename2 = (obj) => {
-  const schema = getSchema2(obj);
-  if (schema == null) {
-    return EchoSchema2.getType(obj)?.asTypeDXN()?.type;
-  }
-  return EchoSchema2.getSchemaTypename(schema);
-};
-var getMeta3 = (obj) => {
-  const meta = EchoSchema2.getMeta(obj);
-  invariant2(meta != null, "Invalid object.", {
-    F: __dxlog_file2,
-    L: 148,
-    S: void 0,
-    A: [
-      "meta != null",
-      "'Invalid object.'"
-    ]
-  });
-  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 = EchoSchema2.isDeleted(obj);
-  invariant2(typeof deleted === "boolean", "Invalid object.", {
-    F: __dxlog_file2,
-    L: 182,
-    S: void 0,
-    A: [
-      "typeof deleted === 'boolean'",
-      "'Invalid object.'"
-    ]
-  });
-  return deleted;
-};
-var getLabel2 = (obj) => {
-  const schema = getSchema2(obj);
-  if (schema != null) {
-    return EchoSchema2.getLabel(schema, obj);
-  }
-};
-var setLabel2 = (obj, label) => {
-  const schema = getSchema2(obj);
-  if (schema != null) {
-    EchoSchema2.setLabel(schema, obj, label);
-  }
-};
-var compare = (a, b) => {
-  if (a == null) {
-    return b == null ? 0 : 1;
-  }
-  if (b == null) {
-    return -1;
-  }
-  return a.localeCompare(b);
-};
-var sortByLabel = (a, b) => compare(getLabel2(a), getLabel2(b));
-var sortByTypename = (a, b) => compare(getTypename2(a), getTypename2(b));
-var sort = (...comparators) => {
-  return (a, b) => {
-    for (const comparator of comparators) {
-      const result = comparator(a, b);
-      if (result !== 0) {
-        return result;
-      }
-    }
-    return 0;
-  };
-};
-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: 275,
-    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;
-};
+// src/query/query.ts
+import * as Match from "effect/Match";
+import * as Schema from "effect/Schema";
+import { raise } from "@dxos/debug";
+import { assertArgument } from "@dxos/invariant";
+import { DXN, ObjectId } from "@dxos/keys";
 
 // src/Ref.ts
 var Ref_exports = {};
@@ -355,160 +50,25 @@ __export(Ref_exports, {
   Array: () => Array2,
   fromDXN: () => fromDXN,
   isRef: () => isRef,
-  make: () => make2
+  make: () => make
 });
-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;
+var Array2 = RefArray;
+var isRef = Ref.isRef;
+var make = Ref.make;
+var fromDXN = Ref.fromDXN;
 
-// src/Relation.ts
-var Relation_exports = {};
-__export(Relation_exports, {
-  Any: () => Any2,
-  Source: () => Source,
-  Target: () => Target,
-  getSource: () => getSource,
-  getSourceDXN: () => getSourceDXN,
-  getTarget: () => getTarget,
-  getTargetDXN: () => getTargetDXN,
-  isRelation: () => isRelation,
-  make: () => make3
-});
-import { Schema as Schema2 } from "effect";
-import { raise } from "@dxos/debug";
-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_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(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 (EchoSchema4.ATTR_RELATION_SOURCE in value || EchoSchema4.ATTR_RELATION_TARGET in value) {
-    return true;
-  }
-  const kind = value[EchoSchema4.EntityKindId];
-  return kind === EchoSchema4.EntityKind.Relation;
-};
-var getSourceDXN = (value) => {
-  assertArgument2(isRelation(value), "Expected a relation");
-  assumeType2(value);
-  const dxn = value[EchoSchema4.RelationSourceDXNId];
-  invariant3(dxn instanceof DXN2, void 0, {
-    F: __dxlog_file3,
-    L: 109,
-    S: void 0,
-    A: [
-      "dxn instanceof DXN",
-      ""
-    ]
-  });
-  return dxn;
-};
-var getTargetDXN = (value) => {
-  assertArgument2(isRelation(value), "Expected a relation");
-  assumeType2(value);
-  const dxn = value[EchoSchema4.RelationTargetDXNId];
-  invariant3(dxn instanceof DXN2, void 0, {
-    F: __dxlog_file3,
-    L: 121,
-    S: void 0,
-    A: [
-      "dxn instanceof DXN",
-      ""
-    ]
-  });
-  return dxn;
-};
-var getSource = (relation) => {
-  assertArgument2(isRelation(relation), "Expected a relation");
-  assumeType2(relation);
-  const obj = relation[EchoSchema4.RelationSourceId];
-  invariant3(obj !== void 0, `Invalid source: ${relation.id}`, {
-    F: __dxlog_file3,
-    L: 133,
-    S: void 0,
-    A: [
-      "obj !== undefined",
-      "`Invalid source: ${relation.id}`"
-    ]
-  });
-  return obj;
-};
-var getTarget = (relation) => {
-  assertArgument2(isRelation(relation), "Expected a relation");
-  assumeType2(relation);
-  const obj = relation[EchoSchema4.RelationTargetId];
-  invariant3(obj !== void 0, `Invalid target: ${relation.id}`, {
-    F: __dxlog_file3,
-    L: 145,
-    S: void 0,
-    A: [
-      "obj !== undefined",
-      "`Invalid target: ${relation.id}`"
-    ]
-  });
-  return obj;
-};
-
-// src/index.ts
-import { DXN as DXN4 } from "@dxos/keys";
-
-// 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";
-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;
-}
+// src/query/query.ts
 var OrderClass = class _OrderClass {
-  static is(value) {
-    return typeof value === "object" && value !== null && "~Order" in value;
+  ast;
+  static variance = {};
+  static is(value2) {
+    return typeof value2 === "object" && value2 !== null && "~Order" in value2;
   }
   constructor(ast) {
-    _define_property(this, "ast", void 0);
-    _define_property(this, "~Order", void 0);
     this.ast = ast;
-    this["~Order"] = _OrderClass.variance;
   }
+  "~Order" = _OrderClass.variance;
 };
-_define_property(OrderClass, "variance", {});
 (function(Order2) {
   Order2.natural = new OrderClass({
     kind: "natural"
@@ -520,8 +80,13 @@ _define_property(OrderClass, "variance", {});
   });
 })(Order || (Order = {}));
 var FilterClass = class _FilterClass {
-  static is(value) {
-    return typeof value === "object" && value !== null && "~Filter" in value;
+  ast;
+  static variance = {};
+  static is(value2) {
+    return typeof value2 === "object" && value2 !== null && "~Filter" in value2;
+  }
+  static fromAst(ast) {
+    return new _FilterClass(ast);
   }
   static everything() {
     return new _FilterClass({
@@ -548,7 +113,7 @@ var FilterClass = class _FilterClass {
     });
   }
   static ids(...ids) {
-    assertArgument3(ids.every((id) => ObjectId3.isValid(id)), "ids", "ids must be valid");
+    assertArgument(ids.every((id) => ObjectId.isValid(id)), "ids", "ids must be valid");
     if (ids.length === 0) {
       return Filter.nothing();
     }
@@ -560,7 +125,7 @@ var FilterClass = class _FilterClass {
     });
   }
   static type(schema, props) {
-    const dxn = getTypeReference(schema)?.toDXN() ?? raise2(new TypeError("Schema has no DXN"));
+    const dxn = getTypeDXNFromSpecifier(schema);
     return new _FilterClass({
       type: "object",
       typename: dxn.toString(),
@@ -568,10 +133,10 @@ var FilterClass = class _FilterClass {
     });
   }
   static typename(typename) {
-    assertArgument3(!typename.startsWith("dxn:"), "typename", "Typename must no be qualified");
+    assertArgument(!typename.startsWith("dxn:"), "typename", "Typename must no be qualified");
     return new _FilterClass({
       type: "object",
-      typename: DXN3.fromTypename(typename).toString(),
+      typename: DXN.fromTypename(typename).toString(),
       props: {}
     });
   }
@@ -603,7 +168,7 @@ var FilterClass = class _FilterClass {
     });
   }
   static foreignKeys(schema, keys) {
-    const dxn = getTypeReference(schema)?.toDXN() ?? raise2(new TypeError("Schema has no DXN"));
+    const dxn = getTypeDXNFromSpecifier(schema);
     return new _FilterClass({
       type: "object",
       typename: dxn.toString(),
@@ -611,49 +176,49 @@ var FilterClass = class _FilterClass {
       foreignKeys: keys
     });
   }
-  static eq(value) {
-    if (!isRef(value) && typeof value === "object" && value !== null) {
+  static eq(value2) {
+    if (!isRef(value2) && typeof value2 === "object" && value2 !== null) {
       throw new TypeError("Cannot use object as a value for eq filter");
     }
     return new _FilterClass({
       type: "compare",
       operator: "eq",
-      value: isRef(value) ? value.noInline().encode() : value
+      value: isRef(value2) ? value2.noInline().encode() : value2
     });
   }
-  static neq(value) {
+  static neq(value2) {
     return new _FilterClass({
       type: "compare",
       operator: "neq",
-      value
+      value: value2
     });
   }
-  static gt(value) {
+  static gt(value2) {
     return new _FilterClass({
       type: "compare",
       operator: "gt",
-      value
+      value: value2
     });
   }
-  static gte(value) {
+  static gte(value2) {
     return new _FilterClass({
       type: "compare",
       operator: "gte",
-      value
+      value: value2
     });
   }
-  static lt(value) {
+  static lt(value2) {
     return new _FilterClass({
       type: "compare",
       operator: "lt",
-      value
+      value: value2
     });
   }
-  static lte(value) {
+  static lte(value2) {
     return new _FilterClass({
       type: "compare",
       operator: "lte",
-      value
+      value: value2
     });
   }
   static in(...values) {
@@ -662,10 +227,10 @@ var FilterClass = class _FilterClass {
       values
     });
   }
-  static contains(value) {
+  static contains(value2) {
     return new _FilterClass({
       type: "contains",
-      value
+      value: value2
     });
   }
   static between(from, to) {
@@ -694,22 +259,19 @@ 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;
   }
+  "~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), "predicates.id", "invalid id filter");
+    assertArgument(typeof predicates.id === "string" || Array.isArray(predicates.id), "predicates.id", "invalid id filter");
     idFilter = typeof predicates.id === "string" ? [
       predicates.id
     ] : predicates.id;
-    Schema3.Array(ObjectId3).pipe(Schema3.validateSync)(idFilter);
+    Schema.Array(ObjectId).pipe(Schema.validateSync)(idFilter);
   }
   return {
     id: idFilter,
@@ -728,9 +290,9 @@ var processPredicate = (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]) => [
+      const nestedProps = Object.fromEntries(Object.entries(predicate2).map(([key, value2]) => [
         key,
-        processPredicate(value)
+        processPredicate(value2)
       ]));
       return {
         type: "object",
@@ -738,145 +300,515 @@ var processPredicate = (predicate) => {
         props: nestedProps
       };
     }),
-    Match.orElse((value) => Filter.eq(value).ast)
+    Match.orElse((value2) => Filter.eq(value2).ast)
   );
 };
-var QueryClass = class _QueryClass {
-  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",
-      filter: filter.ast
-    });
+var QueryClass = class _QueryClass {
+  ast;
+  static variance = {};
+  static is(value2) {
+    return typeof value2 === "object" && value2 !== null && "~Query" in value2;
+  }
+  static fromAst(ast) {
+    return new _QueryClass(ast);
+  }
+  static select(filter) {
+    return new _QueryClass({
+      type: "select",
+      filter: filter.ast
+    });
+  }
+  static type(schema, predicates) {
+    return new _QueryClass({
+      type: "select",
+      filter: FilterClass.type(schema, predicates).ast
+    });
+  }
+  static all(...queries) {
+    if (queries.length === 0) {
+      throw new TypeError("Query.all combines results of multiple queries, to query all objects use Query.select(Filter.everything())");
+    }
+    return new _QueryClass({
+      type: "union",
+      queries: queries.map((q) => q.ast)
+    });
+  }
+  static without(source, exclude) {
+    return new _QueryClass({
+      type: "set-difference",
+      source: source.ast,
+      exclude: exclude.ast
+    });
+  }
+  constructor(ast) {
+    this.ast = ast;
+  }
+  "~Query" = _QueryClass.variance;
+  select(filter) {
+    if (Filter.is(filter)) {
+      return new _QueryClass({
+        type: "filter",
+        selection: this.ast,
+        filter: filter.ast
+      });
+    } else {
+      return new _QueryClass({
+        type: "filter",
+        selection: this.ast,
+        filter: FilterClass.props(filter).ast
+      });
+    }
+  }
+  reference(key) {
+    return new _QueryClass({
+      type: "reference-traversal",
+      anchor: this.ast,
+      property: key
+    });
+  }
+  referencedBy(target, key) {
+    const dxn = getTypeDXNFromSpecifier(target);
+    return new _QueryClass({
+      type: "incoming-references",
+      anchor: this.ast,
+      property: key,
+      typename: dxn.toString()
+    });
+  }
+  sourceOf(relation, predicates) {
+    return new _QueryClass({
+      type: "relation",
+      anchor: this.ast,
+      direction: "outgoing",
+      filter: FilterClass.type(relation, predicates).ast
+    });
+  }
+  targetOf(relation, predicates) {
+    return new _QueryClass({
+      type: "relation",
+      anchor: this.ast,
+      direction: "incoming",
+      filter: FilterClass.type(relation, predicates).ast
+    });
+  }
+  source() {
+    return new _QueryClass({
+      type: "relation-traversal",
+      anchor: this.ast,
+      direction: "source"
+    });
+  }
+  target() {
+    return new _QueryClass({
+      type: "relation-traversal",
+      anchor: this.ast,
+      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",
+      query: this.ast,
+      options
+    });
+  }
+};
+var Query = QueryClass;
+var getTypeDXNFromSpecifier = (input) => {
+  if (Schema.isSchema(input)) {
+    return getTypeReference(input)?.toDXN() ?? raise(new TypeError("Schema has no DXN"));
+  } else {
+    assertArgument(typeof input === "string", "input");
+    assertArgument(!input.startsWith("dxn:"), "input");
+    return DXN.fromTypename(input);
+  }
+};
+var Order;
+
+// src/query/tag.ts
+var tag_exports = {};
+__export(tag_exports, {
+  Tag: () => Tag,
+  createTagList: () => createTagList,
+  findTagByLabel: () => findTagByLabel,
+  make: () => make3,
+  sortTags: () => sortTags
+});
+import * as Schema3 from "effect/Schema";
+
+// 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: () => getDXN2,
+  getDescription: () => getDescription2,
+  getKeys: () => getKeys,
+  getLabel: () => getLabel2,
+  getMeta: () => getMeta3,
+  getSchema: () => getSchema2,
+  getSnapshot: () => getSnapshot2,
+  getTypeDXN: () => getTypeDXN,
+  getTypename: () => getTypename2,
+  instanceOf: () => instanceOf,
+  isDeleted: () => isDeleted2,
+  isObject: () => isObject,
+  isVersion: () => isVersion,
+  make: () => make2,
+  setDescription: () => setDescription2,
+  setLabel: () => setLabel2,
+  sort: () => sort,
+  sortByLabel: () => sortByLabel,
+  sortByTypename: () => sortByTypename,
+  toJSON: () => toJSON,
+  version: () => version,
+  versionValid: () => versionValid
+});
+import * as Function from "effect/Function";
+import * as Schema2 from "effect/Schema";
+import { assertArgument as assertArgument2, invariant as invariant2 } from "@dxos/invariant";
+import * as LiveObject from "@dxos/live-object";
+import { assumeType, deepMapValues } from "@dxos/util";
+
+// src/Type.ts
+var Type_exports = {};
+__export(Type_exports, {
+  DXN: () => DXN2,
+  Expando: () => Expando2,
+  Format: () => Format,
+  JsonSchema: () => JsonSchemaType,
+  Kind: () => Kind,
+  KindId: () => KindId,
+  Obj: () => Obj,
+  ObjectId: () => ObjectId2,
+  Ref: () => Ref2,
+  Relation: () => Relation,
+  SpaceId: () => SpaceId,
+  getDXN: () => getDXN,
+  getMeta: () => getMeta2,
+  getTypename: () => getTypename,
+  getVersion: () => getVersion,
+  isMutable: () => isMutable2,
+  toEffectSchema: () => toEffectSchema,
+  toJsonSchema: () => toJsonSchema
+});
+import { invariant } from "@dxos/invariant";
+import { SpaceId, ObjectId as ObjectId2, DXN as DXN2 } from "@dxos/keys";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/Type.ts";
+var KindId = EntityKindId;
+var Kind = EntityKind;
+var Obj = EchoObject;
+var Expando2 = Expando;
+var Relation = EchoRelation;
+var Ref2 = Ref;
+var getDXN = (schema) => {
+  return getSchemaDXN(schema);
+};
+var getTypename = (schema) => {
+  const typename = getSchemaTypename(schema);
+  invariant(typeof typename === "string" && !typename.startsWith("dxn:"), "Invalid typename", {
+    F: __dxlog_file,
+    L: 211,
+    S: void 0,
+    A: [
+      "typeof typename === 'string' && !typename.startsWith('dxn:')",
+      "'Invalid typename'"
+    ]
+  });
+  return typename;
+};
+var getVersion = (schema) => {
+  const version2 = getSchemaVersion(schema);
+  invariant(typeof version2 === "string" && version2.match(/^\d+\.\d+\.\d+$/), "Invalid version", {
+    F: __dxlog_file,
+    L: 221,
+    S: void 0,
+    A: [
+      "typeof version === 'string' && version.match(/^\\d+\\.\\d+\\.\\d+$/)",
+      "'Invalid version'"
+    ]
+  });
+  return version2;
+};
+var isMutable2 = isMutable;
+var getMeta2 = (schema) => {
+  return getTypeAnnotation(schema);
+};
+
+// src/Obj.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo/src/Obj.ts";
+var Any = Schema2.Struct({}).pipe(Obj({
+  typename: "dxos.org/types/Any",
+  version: "0.1.0"
+}));
+var Meta = MetaId;
+var DEFAULT_META = {
+  keys: []
+};
+var make2 = (schema, props, meta) => {
+  assertArgument2(getTypeAnnotation(schema)?.kind === EntityKind.Object, "schema", "Expected an object schema");
+  if (props[MetaId] != null) {
+    meta = {
+      ...structuredClone(DEFAULT_META),
+      ...props[MetaId]
+    };
+    delete props[MetaId];
+  }
+  const filterUndefined = Object.fromEntries(Object.entries(props).filter(([_, v]) => v !== void 0));
+  return live(schema, filterUndefined, {
+    keys: [],
+    ...meta
+  });
+};
+var isObject = (obj) => {
+  assumeType(obj);
+  return typeof obj === "object" && obj !== null && obj[EntityKindId] === EntityKind.Object;
+};
+var instanceOf = (...args) => {
+  if (args.length === 1) {
+    return (obj) => isInstanceOf(args[0], obj);
   }
-  static type(schema, predicates) {
-    return new _QueryClass({
-      type: "select",
-      filter: FilterClass.type(schema, predicates).ast
-    });
+  return isInstanceOf(args[0], args[1]);
+};
+var getSchema2 = getSchema;
+var getDXN2 = (obj) => {
+  assertArgument2(!Schema2.isSchema(obj), "obj", "Object should not be a schema.");
+  const dxn = getObjectDXN(obj);
+  invariant2(dxn != null, "Invalid object.", {
+    F: __dxlog_file2,
+    L: 136,
+    S: void 0,
+    A: [
+      "dxn != null",
+      "'Invalid object.'"
+    ]
+  });
+  return dxn;
+};
+var getTypeDXN = getType;
+var getTypename2 = (obj) => {
+  const schema = getSchema2(obj);
+  if (schema == null) {
+    return getType(obj)?.asTypeDXN()?.type;
   }
-  static all(...queries) {
-    if (queries.length === 0) {
-      throw new TypeError("Query.all combines results of multiple queries, to query all objects use Query.select(Filter.everything())");
+  return getSchemaTypename(schema);
+};
+var getMeta3 = (obj) => {
+  const meta = getMeta(obj);
+  invariant2(meta != null, "Invalid object.", {
+    F: __dxlog_file2,
+    L: 164,
+    S: void 0,
+    A: [
+      "meta != null",
+      "'Invalid object.'"
+    ]
+  });
+  return meta;
+};
+var getKeys = Function.dual(2, (obj, source) => {
+  const meta = getMeta(obj);
+  invariant2(meta != null, "Invalid object.", {
+    F: __dxlog_file2,
+    L: 176,
+    S: void 0,
+    A: [
+      "meta != null",
+      "'Invalid object.'"
+    ]
+  });
+  return meta.keys.filter((key) => key.source === source);
+});
+var deleteKeys = (obj, source) => {
+  const meta = getMeta(obj);
+  for (let i = 0; i < meta.keys.length; i++) {
+    if (meta.keys[i].source === source) {
+      meta.keys.splice(i, 1);
+      i--;
     }
-    return new _QueryClass({
-      type: "union",
-      queries: queries.map((q) => q.ast)
-    });
   }
-  static without(source, exclude) {
-    return new _QueryClass({
-      type: "set-difference",
-      source: source.ast,
-      exclude: exclude.ast
-    });
+};
+var isDeleted2 = (obj) => {
+  const deleted = isDeleted(obj);
+  invariant2(typeof deleted === "boolean", "Invalid object.", {
+    F: __dxlog_file2,
+    L: 198,
+    S: void 0,
+    A: [
+      "typeof deleted === 'boolean'",
+      "'Invalid object.'"
+    ]
+  });
+  return deleted;
+};
+var getLabel2 = (obj) => {
+  const schema = getSchema2(obj);
+  if (schema != null) {
+    return getLabel(schema, obj);
   }
-  select(filter) {
-    if (Filter.is(filter)) {
-      return new _QueryClass({
-        type: "filter",
-        selection: this.ast,
-        filter: filter.ast
-      });
-    } else {
-      return new _QueryClass({
-        type: "filter",
-        selection: this.ast,
-        filter: FilterClass.props(filter).ast
-      });
-    }
+};
+var setLabel2 = (obj, label) => {
+  const schema = getSchema2(obj);
+  if (schema != null) {
+    setLabel(schema, obj, label);
   }
-  reference(key) {
-    return new _QueryClass({
-      type: "reference-traversal",
-      anchor: this.ast,
-      property: key
-    });
+};
+var getDescription2 = (obj) => {
+  const schema = getSchema2(obj);
+  if (schema != null) {
+    return getDescription(schema, obj);
   }
-  referencedBy(target, key) {
-    const dxn = getTypeReference(target)?.toDXN() ?? raise2(new TypeError("Target schema has no DXN"));
-    return new _QueryClass({
-      type: "incoming-references",
-      anchor: this.ast,
-      property: key,
-      typename: dxn.toString()
-    });
+};
+var setDescription2 = (obj, description) => {
+  const schema = getSchema2(obj);
+  if (schema != null) {
+    setDescription(schema, obj, description);
   }
-  sourceOf(relation, predicates) {
-    return new _QueryClass({
-      type: "relation",
-      anchor: this.ast,
-      direction: "outgoing",
-      filter: FilterClass.type(relation, predicates).ast
-    });
+};
+var compare = (a, b) => {
+  if (a == null) {
+    return b == null ? 0 : 1;
   }
-  targetOf(relation, predicates) {
-    return new _QueryClass({
-      type: "relation",
-      anchor: this.ast,
-      direction: "incoming",
-      filter: FilterClass.type(relation, predicates).ast
-    });
+  if (b == null) {
+    return -1;
   }
-  source() {
-    return new _QueryClass({
-      type: "relation-traversal",
-      anchor: this.ast,
-      direction: "source"
-    });
+  return a.localeCompare(b);
+};
+var sortByLabel = (a, b) => compare(getLabel2(a), getLabel2(b));
+var sortByTypename = (a, b) => compare(getTypename2(a), getTypename2(b));
+var sort = (...comparators) => {
+  return (a, b) => {
+    for (const comparator of comparators) {
+      const result = comparator(a, b);
+      if (result !== 0) {
+        return result;
+      }
+    }
+    return 0;
+  };
+};
+var toJSON = (obj) => objectToJSON(obj);
+var fromJSON = 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: 305,
+    S: void 0,
+    A: [
+      "schema != null",
+      "'Object should have a schema'"
+    ]
+  });
+  const props = deepMapValues(data, (value2, recurse) => {
+    if (Ref.isRef(value2)) {
+      return value2;
+    }
+    return recurse(value2);
+  });
+  if (opts?.retainId) {
+    props.id = id;
   }
-  target() {
-    return new _QueryClass({
-      type: "relation-traversal",
-      anchor: this.ast,
-      direction: "target"
-    });
+  const meta = getMeta3(obj);
+  props[MetaId] = deepMapValues(meta, (value2, recurse) => {
+    if (Ref.isRef(value2)) {
+      return value2;
+    }
+    return recurse(value2);
+  });
+  return make2(schema, props);
+};
+var VersionTypeId2 = VersionTypeId;
+var unversioned = {
+  [VersionTypeId2]: {},
+  versioned: false
+};
+var isVersion = (obj) => {
+  return obj != null && typeof obj === "object" && VersionTypeId2 in obj;
+};
+var version = (obj) => {
+  const version2 = obj[ObjectVersionId];
+  if (version2 === void 0) {
+    return unversioned;
   }
-  orderBy(...order) {
-    return new _QueryClass({
-      type: "order",
-      query: this.ast,
-      order: order.map((o) => o.ast)
-    });
+  return version2;
+};
+var versionValid = (version2) => {
+  assertArgument2(isVersion(version2), "version", "Invalid version object");
+  return !!version2.versioned;
+};
+var compareVersions = (version1, version2) => {
+  assertArgument2(isVersion(version1), "version1", "Invalid version object");
+  assertArgument2(isVersion(version2), "version2", "Invalid version object");
+  if (!versionValid(version1) || !versionValid(version2)) {
+    return "unversioned";
   }
-  options(options) {
-    return new _QueryClass({
-      type: "options",
-      query: this.ast,
-      options
-    });
+  if (version1.automergeHeads?.length !== version2.automergeHeads?.length) {
+    return "different";
   }
-  constructor(ast) {
-    _define_property(this, "ast", void 0);
-    _define_property(this, "~Query", void 0);
-    this.ast = ast;
-    this["~Query"] = _QueryClass.variance;
+  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;
 };
-_define_property(QueryClass, "variance", {});
-var Query = QueryClass;
-var Order;
 
-// src/index.ts
-import { QueryAST } from "@dxos/echo-protocol";
+// src/query/tag.ts
+var Tag = Schema3.Struct({
+  label: Schema3.String,
+  hue: Schema3.optional(Schema3.String)
+}).pipe(Obj({
+  typename: "dxos.org/type/Tag",
+  version: "0.1.0"
+}), LabelAnnotation.set([
+  "label"
+]));
+var make3 = (props) => make2(Tag, props);
+var sortTags = ({ label: a }, { label: b }) => a.localeCompare(b);
+var createTagList = (tags) => Object.entries(tags).map(([id, tag]) => ({
+  ...tag,
+  id
+})).sort(sortTags);
+var findTagByLabel = (tags, name) => {
+  const entry = Object.entries(tags ?? {}).find(([_, tag]) => tag.label.toLowerCase() === name.toLowerCase());
+  return entry ? {
+    ...entry[1],
+    id: entry[0]
+  } : void 0;
+};
 
 export {
-  SchemaNotFoundError,
-  ObjectNotFoundError,
-  Key_exports,
-  Type_exports,
-  Obj_exports,
   Ref_exports,
-  Relation_exports,
   Filter,
   Query,
   Order,
-  DXN4 as DXN,
-  QueryAST
+  Relation,
+  Type_exports,
+  Any,
+  Obj_exports,
+  tag_exports
 };
-//# sourceMappingURL=chunk-AWWFAF75.mjs.map
+//# sourceMappingURL=chunk-ZSSII3JW.mjs.map