@dxos/echo 0.8.4-main.8360d9e660 → 0.8.4-main.8baae0fced

package/dist/lib/neutral/{chunk-C4JZK4J7.mjs → chunk-Z5GKP74O.mjs}

@@ -3,12 +3,12 @@ import {
   JsonSchemaType,
   toEffectSchema,
   toJsonSchema
-} from "./chunk-BOZZPUXE.mjs";
+} from "./chunk-MLS7U7AT.mjs";
 import {
   Ref,
   refFromEncodedReference,
   setRefResolver
-} from "./chunk-43Y5DOS6.mjs";
+} from "./chunk-BMB7IHGB.mjs";
 import {
   ATTR_PARENT,
   ATTR_TYPE,
@@ -33,14 +33,14 @@ import {
   getTypename,
   setSchema,
   setTypename
-} from "./chunk-SEMVAGBM.mjs";
+} from "./chunk-TNBK56IN.mjs";
 import {
   EntityKind,
   KindId,
   SchemaKindId,
   SnapshotKindId,
   makeTypeJsonSchemaAnnotation
-} from "./chunk-WYOKA6AE.mjs";
+} from "./chunk-N4B7FHQT.mjs";
 
 // src/internal/index.ts
 import { JsonPath, JsonProp, getValue, splitJsonPath } from "@dxos/effect";
@@ -72,19 +72,21 @@ var ObjectMetaSchema = Schema2.Struct({
   // TODO(dmaretskyi): Has to be optional for compatibility with old data.
   // Defaulting to an empty array is possible but requires a bit more work.
   // TODO(dmaretskyi): In automerge this should be a map of { [tag]: boolean } for uniqueness and conflict resolution.
-  tags: Schema2.optional(Schema2.Array(Schema2.String))
+  tags: Schema2.optional(Schema2.Array(Schema2.String)),
+  /**
+  * Fully-qualified registry key for the object (FQN format, e.g. `org.example.type.foo`).
+  * Identifies the canonical registry entry the object instance was created from.
+  */
+  key: Schema2.optional(Schema2.String),
+  /**
+  * Semantic version of the registry entry the object was created from.
+  * Must be a valid semver string (e.g. `1.2.3`).
+  */
+  version: Schema2.optional(Schema2.String)
 });
 var getMeta = (obj) => {
   const metadata = obj[MetaId];
-  invariant(metadata, "ObjectMeta not found.", {
-    F: __dxlog_file,
-    L: 55,
-    S: void 0,
-    A: [
-      "metadata",
-      "'ObjectMeta not found.'"
-    ]
-  });
+  invariant(metadata, "ObjectMeta not found.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 45, S: void 0, A: ["metadata", "'ObjectMeta not found.'"] });
   return metadata;
 };
 var foreignKey = (source, id) => ({
@@ -141,29 +143,13 @@ var __dxlog_file2 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/common/
 function getMetaChecked(entity) {
   assertArgument(entity, "entity", "Should be an entity.");
   const meta = getMeta(entity);
-  invariant2(meta != null, "Invalid entity.", {
-    F: __dxlog_file2,
-    L: 34,
-    S: this,
-    A: [
-      "meta != null",
-      "'Invalid entity.'"
-    ]
-  });
+  invariant2(meta != null, "Invalid entity.", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 9, S: this, A: ["meta != null", "'Invalid entity.'"] });
   return meta;
 }
 var getKeys = (entity, source) => {
   assertArgument(entity, "entity", "Should be an entity.");
   const meta = getMetaChecked(entity);
-  invariant2(meta != null, "Invalid entity.", {
-    F: __dxlog_file2,
-    L: 45,
-    S: void 0,
-    A: [
-      "meta != null",
-      "'Invalid entity.'"
-    ]
-  });
+  invariant2(meta != null, "Invalid entity.", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 18, S: void 0, A: ["meta != null", "'Invalid entity.'"] });
   return meta.keys.filter((key) => key.source === source);
 };
 var deleteKeys = (entity, source) => {
@@ -282,7 +268,7 @@ var defineHiddenProperty = (object, key, value2) => {
 // src/internal/common/proxy/errors.ts
 var MutationOutsideChangeContextError = class extends Error {
   constructor(operation, suggestion) {
-    super(`Cannot ${operation} outside of Obj.change(). Use Obj.change(obj, (mutableObj) => { ${suggestion} }) instead.`);
+    super(`Cannot ${operation} outside of Obj.update(). Use Obj.update(obj, (mutableObj) => { ${suggestion} }) instead.`);
     this.name = "MutationOutsideChangeContextError";
   }
 };
@@ -299,7 +285,7 @@ var createArrayMethodError = (method) => {
 // src/internal/common/proxy/json-serializer.ts
 import { invariant as invariant3 } from "@dxos/invariant";
 import { DXN } from "@dxos/keys";
-import { deepMapValues } from "@dxos/util";
+import { deepMapValues, encodeUint8ArrayToJson } from "@dxos/util";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/common/proxy/json-serializer.ts";
 var attachTypedJsonSerializer = (obj) => {
   const descriptor = Object.getOwnPropertyDescriptor(obj, "toJSON");
@@ -330,28 +316,12 @@ var typedJsonSerializer = function() {
   }
   if (this[RelationSourceDXNId]) {
     const sourceDXN = this[RelationSourceDXNId];
-    invariant3(sourceDXN instanceof DXN, void 0, {
-      F: __dxlog_file3,
-      L: 64,
-      S: this,
-      A: [
-        "sourceDXN instanceof DXN",
-        ""
-      ]
-    });
+    invariant3(sourceDXN instanceof DXN, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 42, S: this, A: ["sourceDXN instanceof DXN", ""] });
     result[ATTR_RELATION_SOURCE] = sourceDXN.toString();
   }
   if (this[RelationTargetDXNId]) {
     const targetDXN = this[RelationTargetDXNId];
-    invariant3(targetDXN instanceof DXN, void 0, {
-      F: __dxlog_file3,
-      L: 69,
-      S: this,
-      A: [
-        "targetDXN instanceof DXN",
-        ""
-      ]
-    });
+    invariant3(targetDXN instanceof DXN, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 47, S: this, A: ["targetDXN instanceof DXN", ""] });
     result[ATTR_RELATION_TARGET] = targetDXN.toString();
   }
   Object.assign(result, serializeData(rest));
@@ -362,6 +332,9 @@ var serializeData = (data) => {
     if (Ref.isRef(value2)) {
       return value2.noInline().encode();
     }
+    if (value2 instanceof Uint8Array) {
+      return encodeUint8ArrayToJson(value2);
+    }
     return recurse(value2);
   });
 };
@@ -388,15 +361,7 @@ var isValidProxyTarget = (value2) => {
 };
 var getProxySlot = (proxy) => {
   const value2 = proxy[symbolIsProxy];
-  invariant4(value2 instanceof ProxyHandlerSlot, void 0, {
-    F: __dxlog_file4,
-    L: 32,
-    S: void 0,
-    A: [
-      "value instanceof ProxyHandlerSlot",
-      ""
-    ]
-  });
+  invariant4(value2 instanceof ProxyHandlerSlot, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 22, S: void 0, A: ["value instanceof ProxyHandlerSlot", ""] });
   return value2;
 };
 var getProxyTarget = (proxy) => {
@@ -430,15 +395,7 @@ var ProxyHandlerSlot = class {
     this._handler = _handler;
   }
   get handler() {
-    invariant4(this._handler, void 0, {
-      F: __dxlog_file4,
-      L: 91,
-      S: this,
-      A: [
-        "this._handler",
-        ""
-      ]
-    });
+    invariant4(this._handler, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 71, S: this, A: ["this._handler", ""] });
     return this._handler;
   }
   // TODO(burdon): Requires comment.
@@ -528,15 +485,7 @@ var setOwnerRecursive = (value2, owner, options = {}) => {
   }
   if (!isRootEchoObject) {
     const ownershipAllowed = existingOwner == null || existingOwner === owner || existingOwner === newAllowedPreviousOwner;
-    invariant5(ownershipAllowed, "Cannot reassign ownership of a nested record to a different ECHO object. Use deep copy first.", {
-      F: __dxlog_file5,
-      L: 102,
-      S: void 0,
-      A: [
-        "ownershipAllowed",
-        "'Cannot reassign ownership of a nested record to a different ECHO object. Use deep copy first.'"
-      ]
-    });
+    invariant5(ownershipAllowed, "Cannot reassign ownership of a nested record to a different ECHO object. Use deep copy first.", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 76, S: void 0, A: ["ownershipAllowed", "'Cannot reassign ownership of a nested record to a different ECHO object. Use deep copy first.'"] });
   }
   defineHiddenProperty(actualValue, EchoOwner, owner);
   const recursiveOptions = {
@@ -603,15 +552,7 @@ var hasForeignOwner = (value2, target) => traverseObjectGraph(value2, (v) => {
 });
 var MAX_OWNER_DEPTH = 100;
 var getEchoRoot = (target, depth = 0) => {
-  invariant5(depth < MAX_OWNER_DEPTH, "Owner chain too deep - possible circular ownership", {
-    F: __dxlog_file5,
-    L: 221,
-    S: void 0,
-    A: [
-      "depth < MAX_OWNER_DEPTH",
-      "'Owner chain too deep - possible circular ownership'"
-    ]
-  });
+  invariant5(depth < MAX_OWNER_DEPTH, "Owner chain too deep - possible circular ownership", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 169, S: void 0, A: ["depth < MAX_OWNER_DEPTH", "'Owner chain too deep - possible circular ownership'"] });
   if (KindId in target) {
     return target;
   }
@@ -733,12 +674,7 @@ var SchemaValidator = class {
           log.warn("unknown property", {
             path: propertyPath,
             property: propertyName
-          }, {
-            F: __dxlog_file6,
-            L: 71,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 60, S: this });
           continue;
         }
         schema = Schema3.make(propertyType).annotations(propertyType.annotations);
@@ -748,15 +684,7 @@ var SchemaValidator = class {
   }
   static getTargetPropertySchema(target, prop) {
     const schema = target[SchemaId];
-    invariant6(schema, "target has no schema", {
-      F: __dxlog_file6,
-      L: 84,
-      S: this,
-      A: [
-        "schema",
-        "'target has no schema'"
-      ]
-    });
+    invariant6(schema, "target has no schema", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 73, S: this, A: ["schema", "'target has no schema'"] });
     const arrayAst = unwrapArray(schema.ast);
     if (arrayAst != null) {
       return getArrayElementSchema(arrayAst, prop);
@@ -765,30 +693,14 @@ var SchemaValidator = class {
     if (propertyType == null) {
       return Schema3.Any;
     }
-    invariant6(propertyType, `invalid property: ${prop.toString()}`, {
-      F: __dxlog_file6,
-      L: 95,
-      S: this,
-      A: [
-        "propertyType",
-        "`invalid property: ${prop.toString()}`"
-      ]
-    });
+    invariant6(propertyType, `invalid property: ${prop.toString()}`, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 82, S: this, A: ["propertyType", "`invalid property: ${prop.toString()}`"] });
     return Schema3.make(propertyType);
   }
 };
 var getArrayElementSchema = (tupleAst, property) => {
   const elementIndex = typeof property === "string" ? parseInt(property, 10) : Number.NaN;
   if (Number.isNaN(elementIndex)) {
-    invariant6(property === "length", `invalid array property: ${String(property)}`, {
-      F: __dxlog_file6,
-      L: 111,
-      S: void 0,
-      A: [
-        "property === 'length'",
-        "`invalid array property: ${String(property)}`"
-      ]
-    });
+    invariant6(property === "length", `invalid array property: ${String(property)}`, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 93, S: void 0, A: ["property === 'length'", "`invalid array property: ${String(property)}`"] });
     return Schema3.Number;
   }
   if (elementIndex < tupleAst.elements.length) {
@@ -813,15 +725,7 @@ var getProperties = (typeAst, getTargetPropertyFn) => {
   const typeDiscriminators = getTypeDiscriminators(typeAstList);
   const targetPropertyValue = getTargetPropertyFn(String(typeDiscriminators[0].name));
   const typeIndex = typeDiscriminators.findIndex((p) => targetPropertyValue === p.type.literal);
-  invariant6(typeIndex !== -1, "discriminator field not set on target", {
-    F: __dxlog_file6,
-    L: 142,
-    S: void 0,
-    A: [
-      "typeIndex !== -1",
-      "'discriminator field not set on target'"
-    ]
-  });
+  invariant6(typeIndex !== -1, "discriminator field not set on target", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 118, S: void 0, A: ["typeIndex !== -1", "'discriminator field not set on target'"] });
   return SchemaAST2.getPropertySignatures(typeAstList[typeIndex]);
 };
 var getPropertyType = (ast, propertyName, getTargetPropertyFn) => {
@@ -851,15 +755,7 @@ var getTypeDiscriminators = (typeAstList) => {
   const isValidDiscriminator = discriminatorPropCandidates.every((p) => p.name === propertyName && !p.isOptional);
   const everyTypeHasDiscriminator = discriminatorPropCandidates.length === typeAstList.length;
   const isDiscriminatedUnion = isValidDiscriminator && everyTypeHasDiscriminator;
-  invariant6(isDiscriminatedUnion, "type ambiguity: every type in a union must have a single unique-literal field", {
-    F: __dxlog_file6,
-    L: 193,
-    S: void 0,
-    A: [
-      "isDiscriminatedUnion",
-      "'type ambiguity: every type in a union must have a single unique-literal field'"
-    ]
-  });
+  invariant6(isDiscriminatedUnion, "type ambiguity: every type in a union must have a single unique-literal field", { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 148, S: void 0, A: ["isDiscriminatedUnion", "'type ambiguity: every type in a union must have a single unique-literal field'"] });
   return discriminatorPropCandidates;
 };
 var unwrapAst = (rootAst, predicate) => {
@@ -885,15 +781,7 @@ var unwrapAst = (rootAst, predicate) => {
 };
 var unwrapArray = (ast) => unwrapAst(ast, SchemaAST2.isTupleType);
 var checkIdNotPresentOnSchema = (schema) => {
-  invariant6(SchemaAST2.isTypeLiteral(schema.ast), void 0, {
-    F: __dxlog_file6,
-    L: 236,
-    S: void 0,
-    A: [
-      "SchemaAST.isTypeLiteral(schema.ast)",
-      ""
-    ]
-  });
+  invariant6(SchemaAST2.isTypeLiteral(schema.ast), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 184, S: void 0, A: ["SchemaAST.isTypeLiteral(schema.ast)", ""] });
   const idProperty = SchemaAST2.getPropertySignatures(schema.ast).find((prop) => prop.name === "id");
   if (idProperty != null) {
     throw new Error('"id" property name is reserved');
@@ -954,24 +842,8 @@ var TypedReactiveHandler = class _TypedReactiveHandler {
   constructor() {
   }
   init(target) {
-    invariant7(typeof target === "object" && target !== null, void 0, {
-      F: __dxlog_file7,
-      L: 147,
-      S: this,
-      A: [
-        "typeof target === 'object' && target !== null",
-        ""
-      ]
-    });
-    invariant7(SchemaId in target, "Schema is not defined for the target", {
-      F: __dxlog_file7,
-      L: 148,
-      S: this,
-      A: [
-        "SchemaId in target",
-        "'Schema is not defined for the target'"
-      ]
-    });
+    invariant7(typeof target === "object" && target !== null, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 99, S: this, A: ["typeof target === 'object' && target !== null", ""] });
+    invariant7(SchemaId in target, "Schema is not defined for the target", { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 100, S: this, A: ["SchemaId in target", "'Schema is not defined for the target'"] });
     const hasOwner = !!getOwner(target);
     if (!(EventId in target) && !hasOwner) {
       defineHiddenProperty(target, EventId, new Event());
@@ -1028,7 +900,7 @@ var TypedReactiveHandler = class _TypedReactiveHandler {
     const isInitialized = ChangeId in echoRoot || EventId in echoRoot;
     const isSymbolProp = typeof prop === "symbol";
     if (isInitialized && !isSymbolProp && !isInChangeContext(echoRoot)) {
-      throw new Error(`Cannot modify object property "${String(prop)}" outside of Obj.change(). Use Obj.change(obj, (mutableObj) => { mutableObj.property = value; }) instead.`);
+      throw new Error(`Cannot modify object property "${String(prop)}" outside of Obj.update(). Use Obj.update(obj, (mutableObj) => { mutableObj.property = value; }) instead.`);
     }
     let result = false;
     this._inSet = true;
@@ -1067,7 +939,7 @@ var TypedReactiveHandler = class _TypedReactiveHandler {
     const isInitialized = ChangeId in echoRoot || EventId in echoRoot;
     const isSymbolProp = typeof property === "symbol";
     if (isInitialized && !isSymbolProp && !isInChangeContext(echoRoot)) {
-      throw new Error(`Cannot modify object property "${String(property)}" outside of Obj.change(). Use Obj.change(obj, (mutableObj) => { mutableObj.property = value; }) instead.`);
+      throw new Error(`Cannot modify object property "${String(property)}" outside of Obj.update(). Use Obj.update(obj, (mutableObj) => { mutableObj.property = value; }) instead.`);
     }
     const { echoRoot: _, preparedValue } = this._prepareValueForAssignment(target, property, attributes.value);
     const result = Reflect.defineProperty(target, property, {
@@ -1240,6 +1112,10 @@ var initMeta = (obj, meta = {
 
 // src/internal/common/proxy/reactive.ts
 var subscribe = (obj, callback) => {
+  if (!isProxy(obj)) {
+    return () => {
+    };
+  }
   const target = getProxyTarget(obj);
   if (target && EventId in target) {
     return target[EventId].on(callback);
@@ -1266,80 +1142,16 @@ import { DXN as DXN2, ObjectId as ObjectId2 } from "@dxos/keys";
 import { assumeType } from "@dxos/util";
 var __dxlog_file8 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/Entity/model.ts";
 function assertObjectModel(obj) {
-  invariant8(typeof obj === "object" && obj !== null, "Invalid object model: not an object", {
-    F: __dxlog_file8,
-    L: 94,
-    S: this,
-    A: [
-      "typeof obj === 'object' && obj !== null",
-      "'Invalid object model: not an object'"
-    ]
-  });
+  invariant8(typeof obj === "object" && obj !== null, "Invalid object model: not an object", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 12, S: this, A: ["typeof obj === 'object' && obj !== null", "'Invalid object model: not an object'"] });
   assumeType(obj);
-  invariant8(ObjectId2.isValid(obj.id), "Invalid object model: invalid id", {
-    F: __dxlog_file8,
-    L: 96,
-    S: this,
-    A: [
-      "ObjectId.isValid(obj.id)",
-      "'Invalid object model: invalid id'"
-    ]
-  });
-  invariant8(obj[TypeId] === void 0 || obj[TypeId] instanceof DXN2, "Invalid object model: invalid type", {
-    F: __dxlog_file8,
-    L: 97,
-    S: this,
-    A: [
-      "obj[TypeId] === undefined || obj[TypeId] instanceof DXN",
-      "'Invalid object model: invalid type'"
-    ]
-  });
-  invariant8(obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation, "Invalid object model: invalid entity kind", {
-    F: __dxlog_file8,
-    L: 98,
-    S: this,
-    A: [
-      "obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation",
-      "'Invalid object model: invalid entity kind'"
-    ]
-  });
+  invariant8(ObjectId2.isValid(obj.id), "Invalid object model: invalid id", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 14, S: this, A: ["ObjectId.isValid(obj.id)", "'Invalid object model: invalid id'"] });
+  invariant8(obj[TypeId] === void 0 || obj[TypeId] instanceof DXN2, "Invalid object model: invalid type", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 15, S: this, A: ["obj[TypeId] === undefined || obj[TypeId] instanceof DXN", "'Invalid object model: invalid type'"] });
+  invariant8(obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation, "Invalid object model: invalid entity kind", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 16, S: this, A: ["obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation", "'Invalid object model: invalid entity kind'"] });
   if (obj[KindId] === EntityKind.Relation) {
-    invariant8(obj[RelationSourceDXNId] instanceof DXN2, "Invalid object model: invalid relation source", {
-      F: __dxlog_file8,
-      L: 104,
-      S: this,
-      A: [
-        "obj[RelationSourceDXNId] instanceof DXN",
-        "'Invalid object model: invalid relation source'"
-      ]
-    });
-    invariant8(obj[RelationTargetDXNId] instanceof DXN2, "Invalid object model: invalid relation target", {
-      F: __dxlog_file8,
-      L: 105,
-      S: this,
-      A: [
-        "obj[RelationTargetDXNId] instanceof DXN",
-        "'Invalid object model: invalid relation target'"
-      ]
-    });
-    invariant8(!(obj[RelationSourceId] instanceof DXN2), "Invalid object model: source pointer is a DXN", {
-      F: __dxlog_file8,
-      L: 106,
-      S: this,
-      A: [
-        "!(obj[RelationSourceId] instanceof DXN)",
-        "'Invalid object model: source pointer is a DXN'"
-      ]
-    });
-    invariant8(!(obj[RelationTargetId] instanceof DXN2), "Invalid object model: target pointer is a DXN", {
-      F: __dxlog_file8,
-      L: 107,
-      S: this,
-      A: [
-        "!(obj[RelationTargetId] instanceof DXN)",
-        "'Invalid object model: target pointer is a DXN'"
-      ]
-    });
+    invariant8(obj[RelationSourceDXNId] instanceof DXN2, "Invalid object model: invalid relation source", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 18, S: this, A: ["obj[RelationSourceDXNId] instanceof DXN", "'Invalid object model: invalid relation source'"] });
+    invariant8(obj[RelationTargetDXNId] instanceof DXN2, "Invalid object model: invalid relation target", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 19, S: this, A: ["obj[RelationTargetDXNId] instanceof DXN", "'Invalid object model: invalid relation target'"] });
+    invariant8(!(obj[RelationSourceId] instanceof DXN2), "Invalid object model: source pointer is a DXN", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 20, S: this, A: ["!(obj[RelationSourceId] instanceof DXN)", "'Invalid object model: source pointer is a DXN'"] });
+    invariant8(!(obj[RelationTargetId] instanceof DXN2), "Invalid object model: target pointer is a DXN", { "~LogMeta": "~LogMeta", F: __dxlog_file8, L: 21, S: this, A: ["!(obj[RelationTargetId] instanceof DXN)", "'Invalid object model: target pointer is a DXN'"] });
   }
 }
 
@@ -1350,27 +1162,11 @@ import { DXN as DXN3, ObjectId as ObjectId3 } from "@dxos/keys";
 import { assumeType as assumeType2 } from "@dxos/util";
 var __dxlog_file9 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/Entity/util.ts";
 var getObjectDXN = (object) => {
-  invariant9(!Schema5.isSchema(object), "schema not allowed in this function", {
-    F: __dxlog_file9,
-    L: 19,
-    S: void 0,
-    A: [
-      "!Schema.isSchema(object)",
-      "'schema not allowed in this function'"
-    ]
-  });
+  invariant9(!Schema5.isSchema(object), "schema not allowed in this function", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 14, S: void 0, A: ["!Schema.isSchema(object)", "'schema not allowed in this function'"] });
   assertArgument2(typeof object === "object" && object != null, "object", "expected object");
   assumeType2(object);
   if (object[SelfDXNId]) {
-    invariant9(object[SelfDXNId] instanceof DXN3, "Invalid object model: invalid self dxn", {
-      F: __dxlog_file9,
-      L: 24,
-      S: void 0,
-      A: [
-        "object[SelfDXNId] instanceof DXN",
-        "'Invalid object model: invalid self dxn'"
-      ]
-    });
+    invariant9(object[SelfDXNId] instanceof DXN3, "Invalid object model: invalid self dxn", { "~LogMeta": "~LogMeta", F: __dxlog_file9, L: 18, S: void 0, A: ["object[SelfDXNId] instanceof DXN", "'Invalid object model: invalid self dxn'"] });
     return object[SelfDXNId];
   }
   if (!ObjectId3.isValid(object.id)) {
@@ -1383,15 +1179,7 @@ var getObjectDXN = (object) => {
 var __dxlog_file10 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/Entity/api.ts";
 var getDXN = (entity) => {
   const dxn = getObjectDXN(entity);
-  invariant10(dxn != null, "Invalid entity.", {
-    F: __dxlog_file10,
-    L: 20,
-    S: void 0,
-    A: [
-      "dxn != null",
-      "'Invalid entity.'"
-    ]
-  });
+  invariant10(dxn != null, "Invalid entity.", { "~LogMeta": "~LogMeta", F: __dxlog_file10, L: 13, S: void 0, A: ["dxn != null", "'Invalid entity.'"] });
   return dxn;
 };
 var getDatabase = (entity) => {
@@ -1435,24 +1223,8 @@ import { invariant as invariant11 } from "@dxos/invariant";
 var __dxlog_file11 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/Entity/object.ts";
 var EchoObjectSchema = ({ typename, version: version2 }) => {
   return (self) => {
-    invariant11(typeof TypeAnnotationId === "symbol", "Sanity.", {
-      F: __dxlog_file11,
-      L: 37,
-      S: void 0,
-      A: [
-        "typeof TypeAnnotationId === 'symbol'",
-        "'Sanity.'"
-      ]
-    });
-    invariant11(SchemaAST4.isTypeLiteral(self.ast), "Schema must be a TypeLiteral.", {
-      F: __dxlog_file11,
-      L: 38,
-      S: void 0,
-      A: [
-        "SchemaAST.isTypeLiteral(self.ast)",
-        "'Schema must be a TypeLiteral.'"
-      ]
-    });
+    invariant11(typeof TypeAnnotationId === "symbol", "Sanity.", { "~LogMeta": "~LogMeta", F: __dxlog_file11, L: 15, S: void 0, A: ["typeof TypeAnnotationId === 'symbol'", "'Sanity.'"] });
+    invariant11(SchemaAST4.isTypeLiteral(self.ast), "Schema must be a TypeLiteral.", { "~LogMeta": "~LogMeta", F: __dxlog_file11, L: 16, S: void 0, A: ["SchemaAST.isTypeLiteral(self.ast)", "'Schema must be a TypeLiteral.'"] });
     const fields = self.fields ?? {};
     const schemaWithId = Schema7.extend(self, Schema7.Struct({
       id: Schema7.String
@@ -1495,15 +1267,7 @@ var EchoRelationSchema = ({ source, target, typename, version: version2 }) => {
     raise(new Error("Target schema must be an echo object schema."));
   }
   return (self) => {
-    invariant12(SchemaAST5.isTypeLiteral(self.ast), "Schema must be a TypeLiteral.", {
-      F: __dxlog_file12,
-      L: 110,
-      S: void 0,
-      A: [
-        "SchemaAST.isTypeLiteral(self.ast)",
-        "'Schema must be a TypeLiteral.'"
-      ]
-    });
+    invariant12(SchemaAST5.isTypeLiteral(self.ast), "Schema must be a TypeLiteral.", { "~LogMeta": "~LogMeta", F: __dxlog_file12, L: 27, S: void 0, A: ["SchemaAST.isTypeLiteral(self.ast)", "'Schema must be a TypeLiteral.'"] });
     const fields = self.fields ?? {};
     const schemaWithId = Schema8.extend(self, Schema8.Struct({
       id: Schema8.String
@@ -1741,38 +1505,22 @@ import { raise as raise2 } from "@dxos/debug";
 import { ObjectStructure, isEncodedReference } from "@dxos/echo-protocol";
 import { assertArgument as assertArgument5, invariant as invariant13 } from "@dxos/invariant";
 import { DXN as DXN5, ObjectId as ObjectId4 } from "@dxos/keys";
-import { assumeType as assumeType4, deepMapValues as deepMapValues2, visitValues } from "@dxos/util";
+import { assumeType as assumeType4, decodeUint8ArrayFromJson, deepMapValues as deepMapValues2, isEncodedUint8Array, visitValues } from "@dxos/util";
 var __dxlog_file13 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/Obj/json-serializer.ts";
 var objectToJSON = (obj) => {
   const typename = getTypeDXN(obj)?.toString();
-  invariant13(typename && typeof typename === "string", void 0, {
-    F: __dxlog_file13,
-    L: 66,
-    S: void 0,
-    A: [
-      "typename && typeof typename === 'string'",
-      ""
-    ]
-  });
+  invariant13(typename && typeof typename === "string", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 21, S: void 0, A: ["typename && typeof typename === 'string'", ""] });
   return typedJsonSerializer.call(obj);
 };
-var objectFromJSON = async (jsonData, { refResolver, dxn, database } = {}) => {
+var objectFromJSON = async (jsonData, { refResolver, dxn, database, parent } = {}) => {
   assumeType4(jsonData);
   assertArgument5(typeof jsonData === "object" && jsonData !== null, "jsonData", "expect object");
   assertArgument5(typeof jsonData[ATTR_TYPE] === "string", "jsonData[ATTR_TYPE]", "expected object to have a type");
   assertArgument5(typeof jsonData.id === "string", "jsonData.id", "expected object to have an id");
   const type = DXN5.parse(jsonData[ATTR_TYPE]);
   const schema = await refResolver?.resolveSchema(type);
-  invariant13(schema === void 0 || Schema10.isSchema(schema), void 0, {
-    F: __dxlog_file13,
-    L: 92,
-    S: void 0,
-    A: [
-      "schema === undefined || Schema.isSchema(schema)",
-      ""
-    ]
-  });
-  const decodedInput = stripInternalJsonKeys(jsonData);
+  invariant13(schema === void 0 || Schema10.isSchema(schema), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 41, S: void 0, A: ["schema === undefined || Schema.isSchema(schema)", ""] });
+  const decodedInput = restoreUint8Arrays(stripInternalJsonKeys(jsonData));
   let obj;
   if (schema != null) {
     obj = await schema.pipe(Schema10.decodeUnknownPromise)(decodedInput);
@@ -1784,28 +1532,20 @@ var objectFromJSON = async (jsonData, { refResolver, dxn, database } = {}) => {
       refResolver
     });
   }
-  invariant13(ObjectId4.isValid(obj.id), "Invalid object id", {
-    F: __dxlog_file13,
-    L: 105,
-    S: void 0,
-    A: [
-      "ObjectId.isValid(obj.id)",
-      "'Invalid object id'"
-    ]
-  });
+  invariant13(ObjectId4.isValid(obj.id), "Invalid object id", { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 54, S: void 0, A: ["ObjectId.isValid(obj.id)", "'Invalid object id'"] });
   setTypename(obj, type);
   if (schema) {
     setSchema(obj, schema);
   }
   const isRelation = typeof jsonData[ATTR_RELATION_SOURCE] === "string" || typeof jsonData[ATTR_RELATION_TARGET] === "string";
   if (isRelation) {
-    const sourceDxn = DXN5.parse(jsonData[ATTR_RELATION_SOURCE] ?? raise2(new TypeError("Missing relation source")));
-    const targetDxn = DXN5.parse(jsonData[ATTR_RELATION_TARGET] ?? raise2(new TypeError("Missing relation target")));
-    const source = await refResolver?.resolve(sourceDxn);
-    const target = await refResolver?.resolve(targetDxn);
+    const sourceDXN = DXN5.parse(jsonData[ATTR_RELATION_SOURCE] ?? raise2(new TypeError("Missing relation source")));
+    const targetDXN = DXN5.parse(jsonData[ATTR_RELATION_TARGET] ?? raise2(new TypeError("Missing relation target")));
+    const source = await refResolver?.resolve(sourceDXN);
+    const target = await refResolver?.resolve(targetDXN);
     defineHiddenProperty(obj, KindId, EntityKind.Relation);
-    defineHiddenProperty(obj, RelationSourceDXNId, sourceDxn);
-    defineHiddenProperty(obj, RelationTargetDXNId, targetDxn);
+    defineHiddenProperty(obj, RelationSourceDXNId, sourceDXN);
+    defineHiddenProperty(obj, RelationTargetDXNId, targetDXN);
     defineHiddenProperty(obj, RelationSourceId, source);
     defineHiddenProperty(obj, RelationTargetId, target);
   } else {
@@ -1813,15 +1553,7 @@ var objectFromJSON = async (jsonData, { refResolver, dxn, database } = {}) => {
   }
   if (typeof jsonData[ATTR_META] === "object") {
     const meta = await ObjectMetaSchema.pipe(Schema10.decodeUnknownPromise)(jsonData[ATTR_META]);
-    invariant13(Array.isArray(meta.keys), void 0, {
-      F: __dxlog_file13,
-      L: 131,
-      S: void 0,
-      A: [
-        "Array.isArray(meta.keys)",
-        ""
-      ]
-    });
+    invariant13(Array.isArray(meta.keys), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 75, S: void 0, A: ["Array.isArray(meta.keys)", ""] });
     defineHiddenProperty(obj, MetaId, meta);
   } else {
     defineHiddenProperty(obj, MetaId, {
@@ -1829,8 +1561,10 @@ var objectFromJSON = async (jsonData, { refResolver, dxn, database } = {}) => {
     });
   }
   if (jsonData[ATTR_PARENT]) {
-    const parentDxn = DXN5.parse(jsonData[ATTR_PARENT]);
-    const parent = await refResolver?.resolve(parentDxn);
+    const parentDXN = DXN5.parse(jsonData[ATTR_PARENT]);
+    const resolvedParent = await refResolver?.resolve(parentDXN);
+    defineHiddenProperty(obj, ParentId, resolvedParent);
+  } else if (parent) {
     defineHiddenProperty(obj, ParentId, parent);
   }
   if (dxn) {
@@ -1840,60 +1574,12 @@ var objectFromJSON = async (jsonData, { refResolver, dxn, database } = {}) => {
     defineHiddenProperty(obj, ObjectDatabaseId, database);
   }
   assertObjectModel(obj);
-  invariant13(obj[ATTR_TYPE] === void 0, "Invalid object model", {
-    F: __dxlog_file13,
-    L: 154,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_TYPE] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant13(obj[ATTR_META] === void 0, "Invalid object model", {
-    F: __dxlog_file13,
-    L: 155,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_META] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant13(obj[ATTR_DELETED] === void 0, "Invalid object model", {
-    F: __dxlog_file13,
-    L: 156,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_DELETED] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant13(obj[ATTR_SELF_DXN] === void 0, "Invalid object model", {
-    F: __dxlog_file13,
-    L: 157,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_SELF_DXN] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant13(obj[ATTR_RELATION_SOURCE] === void 0, "Invalid object model", {
-    F: __dxlog_file13,
-    L: 158,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_RELATION_SOURCE] === undefined",
-      "'Invalid object model'"
-    ]
-  });
-  invariant13(obj[ATTR_RELATION_TARGET] === void 0, "Invalid object model", {
-    F: __dxlog_file13,
-    L: 159,
-    S: void 0,
-    A: [
-      "(obj as any)[ATTR_RELATION_TARGET] === undefined",
-      "'Invalid object model'"
-    ]
-  });
+  invariant13(obj[ATTR_TYPE] === void 0, "Invalid object model", { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 96, S: void 0, A: ["obj[ATTR_TYPE] === undefined", "'Invalid object model'"] });
+  invariant13(obj[ATTR_META] === void 0, "Invalid object model", { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 97, S: void 0, A: ["obj[ATTR_META] === undefined", "'Invalid object model'"] });
+  invariant13(obj[ATTR_DELETED] === void 0, "Invalid object model", { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 98, S: void 0, A: ["obj[ATTR_DELETED] === undefined", "'Invalid object model'"] });
+  invariant13(obj[ATTR_SELF_DXN] === void 0, "Invalid object model", { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 99, S: void 0, A: ["obj[ATTR_SELF_DXN] === undefined", "'Invalid object model'"] });
+  invariant13(obj[ATTR_RELATION_SOURCE] === void 0, "Invalid object model", { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 100, S: void 0, A: ["obj[ATTR_RELATION_SOURCE] === undefined", "'Invalid object model'"] });
+  invariant13(obj[ATTR_RELATION_TARGET] === void 0, "Invalid object model", { "~LogMeta": "~LogMeta", F: __dxlog_file13, L: 101, S: void 0, A: ["obj[ATTR_RELATION_TARGET] === undefined", "'Invalid object model'"] });
   return obj;
 };
 var decodeGeneric = (jsonData, options) => {
@@ -1902,11 +1588,20 @@ var decodeGeneric = (jsonData, options) => {
     if (isEncodedReference(value2)) {
       return refFromEncodedReference(value2, options.refResolver);
     }
+    if (isEncodedUint8Array(value2)) {
+      return decodeUint8ArrayFromJson(value2);
+    }
     return visitor(value2);
   });
 };
+var restoreUint8Arrays = (data) => deepMapValues2(data, (value2, recurse) => {
+  if (isEncodedUint8Array(value2)) {
+    return decodeUint8ArrayFromJson(value2);
+  }
+  return recurse(value2);
+});
 var stripInternalJsonKeys = (jsonData) => {
-  const { [ATTR_TYPE]: _type, [ATTR_META]: _meta, [ATTR_DELETED]: _deleted, [ATTR_SELF_DXN]: _selfDxn, [ATTR_RELATION_SOURCE]: _relationSource, [ATTR_RELATION_TARGET]: _relationTarget, ...props } = jsonData;
+  const { [ATTR_TYPE]: _type, [ATTR_META]: _meta, [ATTR_DELETED]: _deleted, [ATTR_SELF_DXN]: _selfDXN, [ATTR_RELATION_SOURCE]: _relationSource, [ATTR_RELATION_TARGET]: _relationTarget, ...props } = jsonData;
   return props;
 };
 var setRefResolverOnData = (obj, refResolver) => {
@@ -1988,25 +1683,9 @@ import { getArrayElementType, getBaseType, getProperties as getProperties2, isAr
 import { invariant as invariant14 } from "@dxos/invariant";
 var __dxlog_file14 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/Obj/set-value.ts";
 var setValue = (obj, path, value2) => {
-  invariant14(path.length > 0, "Path must not be empty", {
-    F: __dxlog_file14,
-    L: 27,
-    S: void 0,
-    A: [
-      "path.length > 0",
-      "'Path must not be empty'"
-    ]
-  });
+  invariant14(path.length > 0, "Path must not be empty", { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 14, S: void 0, A: ["path.length > 0", "'Path must not be empty'"] });
   const schema = getSchema(obj);
-  invariant14(schema != null, "Object must have a schema", {
-    F: __dxlog_file14,
-    L: 30,
-    S: void 0,
-    A: [
-      "schema != null",
-      "'Object must have a schema'"
-    ]
-  });
+  invariant14(schema != null, "Object must have a schema", { "~LogMeta": "~LogMeta", F: __dxlog_file14, L: 16, S: void 0, A: ["schema != null", "'Object must have a schema'"] });
   let parent = obj;
   let currentAST = schema.ast;
   for (let i = 0; i < path.length - 1; i++) {
@@ -2148,15 +1827,7 @@ var __dxlog_file15 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/Obj/cl
 var clone = (obj, opts) => {
   const { id, ...data } = obj;
   const schema = getSchema(obj);
-  invariant15(schema != null, "Object should have a schema", {
-    F: __dxlog_file15,
-    L: 21,
-    S: void 0,
-    A: [
-      "schema != null",
-      "'Object should have a schema'"
-    ]
-  });
+  invariant15(schema != null, "Object should have a schema", { "~LogMeta": "~LogMeta", F: __dxlog_file15, L: 16, S: void 0, A: ["schema != null", "'Object should have a schema'"] });
   const props = deepMapValues4(data, (value2, recurse) => {
     if (Ref.isRef(value2)) {
       if (opts?.deep) {
@@ -2181,6 +1852,133 @@ var clone = (obj, opts) => {
   return makeObject(schema, props, meta);
 };
 
+// src/internal/Query.ts
+var prettyFilter = (filter) => {
+  switch (filter.type) {
+    case "object": {
+      if (filter.typename === null && (filter.id === void 0 || filter.id.length === 0) && Object.keys(filter.props).length === 0 && (filter.foreignKeys === void 0 || filter.foreignKeys.length === 0) && filter.metaKey !== void 0) {
+        return filter.metaVersion !== void 0 ? `Filter.key(${JSON.stringify(filter.metaKey)}, { version: ${JSON.stringify(filter.metaVersion)} })` : `Filter.key(${JSON.stringify(filter.metaKey)})`;
+      }
+      const parts = [];
+      if (filter.typename !== null) {
+        parts.push(String(filter.typename));
+      }
+      if (filter.id !== void 0 && filter.id.length > 0) {
+        parts.push(`id: [${filter.id.join(", ")}]`);
+      }
+      const propEntries = Object.entries(filter.props);
+      if (propEntries.length > 0) {
+        const propsStr = propEntries.map(([k, v]) => `${k}: ${prettyFilter(v)}`).join(", ");
+        parts.push(`{ ${propsStr} }`);
+      }
+      if (filter.foreignKeys !== void 0 && filter.foreignKeys.length > 0) {
+        parts.push(`foreignKeys: [${filter.foreignKeys.map((fk) => JSON.stringify(fk)).join(", ")}]`);
+      }
+      if (filter.metaKey !== void 0) {
+        parts.push(filter.metaVersion !== void 0 ? `metaKey: ${JSON.stringify(filter.metaKey)} (${filter.metaVersion})` : `metaKey: ${JSON.stringify(filter.metaKey)}`);
+      }
+      return parts.length > 0 ? `Filter.type(${parts.join(", ")})` : "Filter.everything()";
+    }
+    case "compare":
+      return `Filter.${filter.operator}(${JSON.stringify(filter.value)})`;
+    case "in":
+      return `Filter.in([${filter.values.map((v) => JSON.stringify(v)).join(", ")}])`;
+    case "contains":
+      return `Filter.contains(${JSON.stringify(filter.value)})`;
+    case "tag":
+      return `Filter.tag(${JSON.stringify(filter.tag)})`;
+    case "range":
+      return `Filter.range(${JSON.stringify(filter.from)}, ${JSON.stringify(filter.to)})`;
+    case "text-search":
+      return filter.searchKind ? `Filter.textSearch(${JSON.stringify(filter.text)}, ${JSON.stringify(filter.searchKind)})` : `Filter.textSearch(${JSON.stringify(filter.text)})`;
+    case "timestamp":
+      return `Filter.${filter.field}.${filter.operator}(${filter.value})`;
+    case "child-of":
+      return `Filter.childOf([${filter.parents.map((p) => JSON.stringify(p)).join(", ")}], { transitive: ${filter.transitive} })`;
+    case "not":
+      return `Filter.not(${prettyFilter(filter.filter)})`;
+    case "and":
+      return `Filter.and(${filter.filters.map(prettyFilter).join(", ")})`;
+    case "or":
+      return `Filter.or(${filter.filters.map(prettyFilter).join(", ")})`;
+  }
+};
+var prettyQuery = (query) => {
+  switch (query.type) {
+    case "select":
+      return `Query.select(${prettyFilter(query.filter)})`;
+    case "filter":
+      return `${prettyQuery(query.selection)}.select(${prettyFilter(query.filter)})`;
+    case "reference-traversal":
+      return `${prettyQuery(query.anchor)}.reference(${JSON.stringify(query.property)})`;
+    case "incoming-references": {
+      const args = [];
+      if (query.typename !== null) {
+        args.push(String(query.typename));
+      }
+      if (query.property !== null) {
+        args.push(JSON.stringify(query.property));
+      }
+      return `${prettyQuery(query.anchor)}.referencedBy(${args.join(", ")})`;
+    }
+    case "relation": {
+      const method = query.direction === "outgoing" ? "sourceOf" : query.direction === "incoming" ? "targetOf" : "relationOf";
+      const filterStr = query.filter !== void 0 ? prettyFilter(query.filter) : "";
+      return `${prettyQuery(query.anchor)}.${method}(${filterStr})`;
+    }
+    case "relation-traversal":
+      return `${prettyQuery(query.anchor)}.${query.direction}()`;
+    case "hierarchy-traversal":
+      return query.direction === "to-parent" ? `${prettyQuery(query.anchor)}.parent()` : `${prettyQuery(query.anchor)}.children()`;
+    case "union":
+      return `Query.all(${query.queries.map(prettyQuery).join(", ")})`;
+    case "set-difference":
+      return `Query.without(${prettyQuery(query.source)}, ${prettyQuery(query.exclude)})`;
+    case "order": {
+      const orders = query.order.map((o) => {
+        if (o.kind === "natural") {
+          return "Order.natural()";
+        } else if (o.kind === "rank") {
+          return `Order.rank(${JSON.stringify(o.direction)})`;
+        } else {
+          return `Order.property(${JSON.stringify(o.property)}, ${JSON.stringify(o.direction)})`;
+        }
+      });
+      return `${prettyQuery(query.query)}.orderBy(${orders.join(", ")})`;
+    }
+    case "options": {
+      const opts = query.options;
+      const parts = [];
+      if (opts.deleted !== void 0) {
+        parts.push(`deleted: ${JSON.stringify(opts.deleted)}`);
+      }
+      if (opts.debugLabel !== void 0) {
+        parts.push(`debugLabel: ${JSON.stringify(opts.debugLabel)}`);
+      }
+      return `${prettyQuery(query.query)}.options({ ${parts.join(", ")} })`;
+    }
+    case "from": {
+      if (query.from._tag === "scope") {
+        const scope = query.from.scope;
+        const parts = [];
+        if (scope.spaceIds !== void 0) {
+          parts.push(`spaceIds: [${scope.spaceIds.map((s) => JSON.stringify(s)).join(", ")}]`);
+        }
+        if (scope.feeds !== void 0) {
+          parts.push(`feeds: [${scope.feeds.map(String).join(", ")}]`);
+        }
+        if (scope.allFeedsFromSpaces !== void 0) {
+          parts.push(`allFeedsFromSpaces: ${scope.allFeedsFromSpaces}`);
+        }
+        return `${prettyQuery(query.query)}.from({ ${parts.join(", ")} })`;
+      }
+      return `${prettyQuery(query.query)}.from(${prettyQuery(query.from.query)})`;
+    }
+    case "limit":
+      return `${prettyQuery(query.query)}.limit(${query.limit})`;
+  }
+};
+
 // src/internal/Type/echo-schema.ts
 import * as Schema13 from "effect/Schema";
 import * as SchemaAST8 from "effect/SchemaAST";
@@ -2198,15 +1996,7 @@ var addFieldsToSchema = (schema, fields) => {
 };
 var updateFieldsInSchema = (schema, fields) => {
   const ast = schema.ast;
-  invariant16(SchemaAST7.isTypeLiteral(ast), void 0, {
-    F: __dxlog_file16,
-    L: 29,
-    S: void 0,
-    A: [
-      "SchemaAST.isTypeLiteral(ast)",
-      ""
-    ]
-  });
+  invariant16(SchemaAST7.isTypeLiteral(ast), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 16, S: void 0, A: ["SchemaAST.isTypeLiteral(ast)", ""] });
   const updatedProperties = [
     ...ast.propertySignatures
   ];
@@ -2226,28 +2016,12 @@ var removeFieldsFromSchema = (schema, fieldNames) => {
 };
 var updateFieldNameInSchema = (schema, { before, after }) => {
   const ast = schema.ast;
-  invariant16(SchemaAST7.isTypeLiteral(ast), void 0, {
-    F: __dxlog_file16,
-    L: 57,
-    S: void 0,
-    A: [
-      "SchemaAST.isTypeLiteral(ast)",
-      ""
-    ]
-  });
+  invariant16(SchemaAST7.isTypeLiteral(ast), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 36, S: void 0, A: ["SchemaAST.isTypeLiteral(ast)", ""] });
   return Schema11.make(new SchemaAST7.TypeLiteral(ast.propertySignatures.map((p) => p.name === before ? new SchemaAST7.PropertySignature(after, p.type, p.isOptional, p.isReadonly, p.annotations) : p), ast.indexSignatures, ast.annotations));
 };
 var setTypenameInSchema = (schema, typename) => {
   const existingAnnotation = schema.ast.annotations[TypeAnnotationId];
-  invariant16(existingAnnotation, `Missing ${String(TypeAnnotationId)}`, {
-    F: __dxlog_file16,
-    L: 77,
-    S: void 0,
-    A: [
-      "existingAnnotation",
-      "`Missing ${String(TypeAnnotationId)}`"
-    ]
-  });
+  invariant16(existingAnnotation, `Missing ${String(TypeAnnotationId)}`, { "~LogMeta": "~LogMeta", F: __dxlog_file16, L: 41, S: void 0, A: ["existingAnnotation", "`Missing ${String(TypeAnnotationId)}`"] });
   return schema.annotations({
     ...schema.ast.annotations,
     [TypeAnnotationId]: {
@@ -2288,15 +2062,7 @@ var ImmutableSchema = class {
   constructor(_schema) {
     this._schema = _schema;
     this._objectAnnotation = getTypeAnnotation(this._schema);
-    invariant17(this._objectAnnotation, void 0, {
-      F: __dxlog_file17,
-      L: 49,
-      S: this,
-      A: [
-        "this._objectAnnotation",
-        ""
-      ]
-    });
+    invariant17(this._objectAnnotation, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 24, S: this, A: ["this._objectAnnotation", ""] });
   }
   //
   // Effect Schema (push to abstract base class).
@@ -2450,15 +2216,7 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   * Returns a mutable schema.
   */
   get mutable() {
-    invariant17(!this.readonly, "Schema is not mutable", {
-      F: __dxlog_file17,
-      L: 279,
-      S: this,
-      A: [
-        "!this.readonly",
-        "'Schema is not mutable'"
-      ]
-    });
+    invariant17(!this.readonly, "Schema is not mutable", { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 203, S: this, A: ["!this.readonly", "'Schema is not mutable'"] });
     return this;
   }
   //
@@ -2491,15 +2249,7 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   }
   getProperties() {
     const ast = this._getSchema().ast;
-    invariant17(SchemaAST8.isTypeLiteral(ast), void 0, {
-      F: __dxlog_file17,
-      L: 314,
-      S: this,
-      A: [
-        "SchemaAST.isTypeLiteral(ast)",
-        ""
-      ]
-    });
+    invariant17(SchemaAST8.isTypeLiteral(ast), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file17, L: 233, S: this, A: ["SchemaAST.isTypeLiteral(ast)", ""] });
     return [
       ...ast.propertySignatures
     ].filter((p) => p.name !== "id").map(unwrapOptionality);
@@ -2559,7 +2309,7 @@ var EchoSchema = class extends EchoSchemaConstructor() {
     });
   }
   /**
-  * Wrapper for Obj.change that handles the change context for the persistent schema.
+  * Wrapper for Obj.update that handles the change context for the persistent schema.
   */
   _change(callback) {
     const changeFn = this._persistentSchema[ChangeId];
@@ -2695,6 +2445,8 @@ export {
   setValue,
   getSnapshot,
   clone,
+  prettyFilter,
+  prettyQuery,
   addFieldsToSchema,
   updateFieldsInSchema,
   removeFieldsFromSchema,
@@ -2709,4 +2461,4 @@ export {
   getValue,
   splitJsonPath
 };
-//# sourceMappingURL=chunk-C4JZK4J7.mjs.map
+//# sourceMappingURL=chunk-Z5GKP74O.mjs.map