@dxos/echo 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/dist/lib/{browser/chunk-BJPE6CIC.mjs → neutral/chunk-ZUG3PNXU.mjs}

@@ -1,17 +1,19 @@
-import "@dxos/node-std/globals";
 import {
   CurrencyAnnotationId,
   FormatAnnotation,
   FormatAnnotationId,
   TypeFormat
-} from "./chunk-FRDT7RA4.mjs";
+} from "./chunk-7WE7SBA2.mjs";
 import {
   Service
-} from "./chunk-7STIBCP7.mjs";
+} from "./chunk-B4FLOYG7.mjs";
 import {
+  ATTR_PARENT,
   ATTR_TYPE,
   GeneratorAnnotationId,
+  LabelAnnotation,
   LabelAnnotationId,
+  ParentId,
   PropertyMetaAnnotationId,
   ReferenceAnnotationId,
   SchemaId,
@@ -35,7 +37,7 @@ import {
   setLabelWithSchema,
   setSchema,
   setTypename
-} from "./chunk-RK4Z4JUZ.mjs";
+} from "./chunk-RIMHNJ3E.mjs";
 import {
   ANY_OBJECT_TYPENAME,
   ANY_OBJECT_VERSION,
@@ -45,7 +47,7 @@ import {
   SchemaKindId,
   SnapshotKindId,
   makeTypeJsonSchemaAnnotation
-} from "./chunk-YKTSSMDS.mjs";
+} from "./chunk-KB7RIVLK.mjs";
 
 // src/internal/index.ts
 import { JsonPath as JsonPath2, JsonProp, getValue, splitJsonPath } from "@dxos/effect";
@@ -67,22 +69,22 @@ import { intersection } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/types/meta.ts";
 var ATTR_META = "@meta";
 var MetaId = Symbol.for("@dxos/echo/Meta");
-var ObjectMetaSchema = Schema2.mutable(Schema2.Struct({
-  keys: Schema2.mutable(Schema2.Array(ForeignKey)),
+var ObjectMetaSchema = Schema2.Struct({
+  keys: Schema2.Array(ForeignKey),
   /**
-   * A set of tags.
-   * Tags are arbitrary application-defined strings.
-   * ECHO makes no assumptions about the tag structure.
-   */
+  * A set of tags.
+  * Tags are arbitrary application-defined strings.
+  * ECHO makes no assumptions about the tag structure.
+  */
   // TODO(dmaretskyi): Has to be optional for compatibility with old data.
   // Defaulting to an empty array is possible but requires a bit more work.
-  tags: Schema2.optional(Schema2.mutable(Schema2.Array(Schema2.String)))
-}));
+  tags: Schema2.optional(Schema2.Array(Schema2.String))
+});
 var getMeta = (obj) => {
   const metadata = obj[MetaId];
   invariant(metadata, "ObjectMeta not found.", {
     F: __dxlog_file,
-    L: 53,
+    L: 52,
     S: void 0,
     A: [
       "metadata",
@@ -200,7 +202,7 @@ var EchoRelationSchema = ({ source, target, typename, version: version2 }) => {
       ]
     });
     const fields = self.fields ?? {};
-    const schemaWithId = Schema4.extend(Schema4.mutable(self), Schema4.Struct({
+    const schemaWithId = Schema4.extend(self, Schema4.Struct({
       id: Schema4.String
     }));
     const ast = SchemaAST2.annotations(schemaWithId.ast, {
@@ -249,7 +251,7 @@ var ObjectDatabaseId = Symbol.for("@dxos/echo/Database");
 function assertObjectModel(obj) {
   invariant3(typeof obj === "object" && obj !== null, "Invalid object model: not an object", {
     F: __dxlog_file3,
-    L: 119,
+    L: 123,
     S: this,
     A: [
       "typeof obj === 'object' && obj !== null",
@@ -259,7 +261,7 @@ function assertObjectModel(obj) {
   assumeType(obj);
   invariant3(ObjectId.isValid(obj.id), "Invalid object model: invalid id", {
     F: __dxlog_file3,
-    L: 121,
+    L: 125,
     S: this,
     A: [
       "ObjectId.isValid(obj.id)",
@@ -268,7 +270,7 @@ function assertObjectModel(obj) {
   });
   invariant3(obj[TypeId] === void 0 || obj[TypeId] instanceof DXN2, "Invalid object model: invalid type", {
     F: __dxlog_file3,
-    L: 122,
+    L: 126,
     S: this,
     A: [
       "obj[TypeId] === undefined || obj[TypeId] instanceof DXN",
@@ -277,7 +279,7 @@ function assertObjectModel(obj) {
   });
   invariant3(obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation, "Invalid object model: invalid entity kind", {
     F: __dxlog_file3,
-    L: 123,
+    L: 127,
     S: this,
     A: [
       "obj[KindId] === EntityKind.Object || obj[KindId] === EntityKind.Relation",
@@ -287,7 +289,7 @@ function assertObjectModel(obj) {
   if (obj[KindId] === EntityKind.Relation) {
     invariant3(obj[RelationSourceDXNId] instanceof DXN2, "Invalid object model: invalid relation source", {
       F: __dxlog_file3,
-      L: 129,
+      L: 133,
       S: this,
       A: [
         "obj[RelationSourceDXNId] instanceof DXN",
@@ -296,7 +298,7 @@ function assertObjectModel(obj) {
     });
     invariant3(obj[RelationTargetDXNId] instanceof DXN2, "Invalid object model: invalid relation target", {
       F: __dxlog_file3,
-      L: 130,
+      L: 134,
       S: this,
       A: [
         "obj[RelationTargetDXNId] instanceof DXN",
@@ -305,7 +307,7 @@ function assertObjectModel(obj) {
     });
     invariant3(!(obj[RelationSourceId] instanceof DXN2), "Invalid object model: source pointer is a DXN", {
       F: __dxlog_file3,
-      L: 131,
+      L: 135,
       S: this,
       A: [
         "!(obj[RelationSourceId] instanceof DXN)",
@@ -314,7 +316,7 @@ function assertObjectModel(obj) {
     });
     invariant3(!(obj[RelationTargetId] instanceof DXN2), "Invalid object model: target pointer is a DXN", {
       F: __dxlog_file3,
-      L: 132,
+      L: 136,
       S: this,
       A: [
         "!(obj[RelationTargetId] instanceof DXN)",
@@ -350,7 +352,7 @@ var EchoObjectSchema = ({ typename, version: version2 }) => {
       ]
     });
     const fields = self.fields ?? {};
-    const schemaWithId = Schema5.extend(Schema5.mutable(self), Schema5.Struct({
+    const schemaWithId = Schema5.extend(self, Schema5.Struct({
       id: Schema5.String
     }));
     const ast = SchemaAST3.annotations(schemaWithId.ast, {
@@ -575,7 +577,7 @@ import * as Schema7 from "effect/Schema";
 import { JsonPath } from "@dxos/effect";
 var SimpleTypes = Schema7.Literal("array", "boolean", "integer", "null", "number", "object", "string");
 var NonNegativeInteger = Schema7.Number.pipe(Schema7.greaterThanOrEqualTo(0));
-var StringArray = Schema7.Array(Schema7.String).pipe(Schema7.mutable);
+var StringArray = Schema7.Array(Schema7.String);
 var JsonSchemaOrBoolean = Schema7.Union(Schema7.suspend(() => JsonSchemaType), Schema7.Boolean);
 var JsonSchemaEchoAnnotations = Schema7.Struct({
   /**
@@ -594,7 +596,7 @@ var JsonSchemaEchoAnnotations = Schema7.Struct({
   meta: Schema7.optional(Schema7.Record({
     key: Schema7.String,
     value: Schema7.Any
-  }).pipe(Schema7.mutable)),
+  })),
   /**
   * @deprecated
   */
@@ -604,15 +606,15 @@ var JsonSchemaEchoAnnotations = Schema7.Struct({
     version: Schema7.String,
     // Not used.
     schemaId: Schema7.optional(Schema7.String)
-  }).pipe(Schema7.mutable)),
+  })),
   /**
   * @deprecated Superseded by `meta`.
   */
   annotations: Schema7.optional(Schema7.Record({
     key: Schema7.String,
     value: Schema7.Any
-  }).pipe(Schema7.mutable))
-}).pipe(Schema7.mutable);
+  }))
+});
 var _JsonSchemaType = Schema7.Struct({
   /**
   * Identifier for this schema.
@@ -746,16 +748,16 @@ var _JsonSchemaType = Schema7.Struct({
   properties: Schema7.optional(Schema7.Record({
     key: Schema7.String,
     value: Schema7.suspend(() => JsonSchemaType)
-  }).pipe(Schema7.mutable)),
+  })),
   patternProperties: Schema7.optional(Schema7.Record({
     key: Schema7.String,
     value: Schema7.suspend(() => JsonSchemaType)
-  }).pipe(Schema7.mutable)),
+  })),
   propertyNames: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
-  definitions: Schema7.optional(Schema7.mutable(Schema7.Record({
+  definitions: Schema7.optional(Schema7.Record({
     key: Schema7.String,
     value: Schema7.suspend(() => JsonSchemaType)
-  }))),
+  })),
   dependencies: Schema7.optional(Schema7.Record({
     key: Schema7.String,
     value: Schema7.suspend(() => Schema7.Union(Schema7.String, StringArray, JsonSchemaType)).annotations({
@@ -772,34 +774,34 @@ var _JsonSchemaType = Schema7.Struct({
   anyOf: Schema7.optional(Schema7.Array(Schema7.suspend(() => JsonSchemaType))),
   oneOf: Schema7.optional(Schema7.Array(Schema7.suspend(() => JsonSchemaType))),
   not: Schema7.optional(Schema7.suspend(() => JsonSchemaType)),
-  $defs: Schema7.optional(Schema7.mutable(Schema7.Record({
+  $defs: Schema7.optional(Schema7.Record({
     key: Schema7.String,
     value: Schema7.suspend(() => JsonSchemaType)
-  }))),
+  })),
   //
   // ECHO extensions.
   //
   currency: Schema7.optional(Schema7.String),
-  reference: Schema7.optional(Schema7.mutable(Schema7.Struct({
+  reference: Schema7.optional(Schema7.Struct({
     schema: Schema7.suspend(() => JsonSchemaType),
     schemaVersion: Schema7.optional(Schema7.String),
     schemaObject: Schema7.optional(Schema7.String)
-  }))),
+  })),
   /**
   * ECHO-specific annotations.
   */
   // TODO(dmaretskyi): Since we are adding a lot of new extensions to the JSON Schema, it is safer to namespace them here.
-  annotations: Schema7.optional(Schema7.mutable(JsonSchemaEchoAnnotations)),
+  annotations: Schema7.optional(JsonSchemaEchoAnnotations),
   /**
   * @deprecated Use `annotations` instead.
   */
-  echo: Schema7.optional(Schema7.mutable(JsonSchemaEchoAnnotations))
+  echo: Schema7.optional(JsonSchemaEchoAnnotations)
 }).annotations({
   identifier: "jsonSchema",
   description: "JSON Schema"
 });
 var JsonSchemaFields = Object.keys(_JsonSchemaType.fields);
-var JsonSchemaType = _JsonSchemaType.pipe(Schema7.mutable);
+var JsonSchemaType = _JsonSchemaType;
 var getSchemaProperty = (schema, property) => {
   return schema.properties?.[property];
 };
@@ -947,8 +949,11 @@ import { clearUndefined, orderKeys, removeProperties } from "@dxos/util";
 
 // src/internal/ref/ref.ts
 import * as Effect from "effect/Effect";
+import * as Equal from "effect/Equal";
+import * as Hash from "effect/Hash";
 import * as Option from "effect/Option";
 import * as ParseResult from "effect/ParseResult";
+import * as Pipeable from "effect/Pipeable";
 import * as Schema8 from "effect/Schema";
 import * as SchemaAST5 from "effect/SchemaAST";
 import { Event } from "@dxos/async";
@@ -1011,7 +1016,7 @@ Ref.make = (obj) => {
   const id = obj.id;
   invariant8(ObjectId3.isValid(id), "Invalid object ID", {
     F: __dxlog_file8,
-    L: 221,
+    L: 225,
     S: void 0,
     A: [
       "ObjectId.isValid(id)",
@@ -1121,7 +1126,7 @@ var RefImpl = class _RefImpl {
     }
     invariant8(this.#resolver, "Resolver is not set", {
       F: __dxlog_file8,
-      L: 389,
+      L: 393,
       S: this,
       A: [
         "this.#resolver",
@@ -1139,7 +1144,7 @@ var RefImpl = class _RefImpl {
     }
     invariant8(this.#resolver, "Resolver is not set", {
       F: __dxlog_file8,
-      L: 400,
+      L: 404,
       S: this,
       A: [
         "this.#resolver",
@@ -1161,7 +1166,7 @@ var RefImpl = class _RefImpl {
     }
     invariant8(this.#resolver, "Resolver is not set", {
       F: __dxlog_file8,
-      L: 415,
+      L: 419,
       S: this,
       A: [
         "this.#resolver",
@@ -1208,6 +1213,19 @@ var RefImpl = class _RefImpl {
   };
   [RefTypeId] = refVariance;
   /**
+  * Effect Hash trait. Required for MutableHashMap-based caches (e.g., Atom.family)
+  * to deduplicate Ref instances that point to the same object.
+  * ECHO proxies return new RefImpl instances on every property access,
+  * so without this, each access would create a separate cache entry.
+  */
+  [Hash.symbol]() {
+    return Hash.hash(this.#dxn.toString());
+  }
+  /** Effect Equal trait. See {@link Hash.symbol} for rationale. */
+  [Equal.symbol](that) {
+    return that instanceof _RefImpl && this.#dxn.toString() === that.dxn.toString();
+  }
+  /**
   * Internal method to set the resolver.
   *
   * @internal
@@ -1221,11 +1239,14 @@ var RefImpl = class _RefImpl {
   _getSavedTarget() {
     return this.#target;
   }
+  pipe() {
+    return Pipeable.pipeArguments(this, arguments);
+  }
 };
 var setRefResolver = (ref, resolver) => {
   invariant8(ref instanceof RefImpl, "Ref is not an instance of RefImpl", {
     F: __dxlog_file8,
-    L: 482,
+    L: 506,
     S: void 0,
     A: [
       "ref instanceof RefImpl",
@@ -1237,7 +1258,7 @@ var setRefResolver = (ref, resolver) => {
 var getRefSavedTarget = (ref) => {
   invariant8(ref instanceof RefImpl, "Ref is not an instance of RefImpl", {
     F: __dxlog_file8,
-    L: 490,
+    L: 514,
     S: void 0,
     A: [
       "ref instanceof RefImpl",
@@ -1268,7 +1289,7 @@ var StaticRefResolver = class {
     const dxn = getSchemaDXN(schema);
     invariant8(dxn, "Schema has no DXN", {
       F: __dxlog_file8,
-      L: 522,
+      L: 546,
       S: this,
       A: [
         "dxn",
@@ -1469,7 +1490,7 @@ var toEffectSchema = (root, _defs) => {
     } else {
       log.warn("allOf with multiple schemas is not supported", void 0, {
         F: __dxlog_file9,
-        L: 220,
+        L: 224,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1503,7 +1524,7 @@ var toEffectSchema = (root, _defs) => {
         } else {
           invariant9(root.items, void 0, {
             F: __dxlog_file9,
-            L: 253,
+            L: 257,
             S: void 0,
             A: [
               "root.items",
@@ -1525,7 +1546,7 @@ var toEffectSchema = (root, _defs) => {
     const jsonSchema = defs[refSegments[refSegments.length - 1]];
     invariant9(jsonSchema, `missing definition for ${root.$ref}`, {
       F: __dxlog_file9,
-      L: 269,
+      L: 273,
       S: void 0,
       A: [
         "jsonSchema",
@@ -1543,7 +1564,7 @@ var toEffectSchema = (root, _defs) => {
 var objectToEffectSchema = (root, defs) => {
   invariant9("type" in root && root.type === "object", `not an object: ${root}`, {
     F: __dxlog_file9,
-    L: 284,
+    L: 288,
     S: void 0,
     A: [
       "'type' in root && root.type === 'object'",
@@ -1569,7 +1590,7 @@ var objectToEffectSchema = (root, defs) => {
   if (root.patternProperties) {
     invariant9(propertyList.length === 0, "pattern properties mixed with regular properties are not supported", {
       F: __dxlog_file9,
-      L: 310,
+      L: 314,
       S: void 0,
       A: [
         "propertyList.length === 0",
@@ -1578,7 +1599,7 @@ var objectToEffectSchema = (root, defs) => {
     });
     invariant9(Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === "", "only one pattern property is supported", {
       F: __dxlog_file9,
-      L: 311,
+      L: 315,
       S: void 0,
       A: [
         "Object.keys(root.patternProperties).length === 1 && Object.keys(root.patternProperties)[0] === ''",
@@ -1606,7 +1627,7 @@ var objectToEffectSchema = (root, defs) => {
     }
   }
   if (immutableIdField) {
-    schema = Schema9.extend(Schema9.mutable(schema), Schema9.Struct({
+    schema = Schema9.extend(schema, Schema9.Struct({
       id: immutableIdField
     }));
   }
@@ -1632,7 +1653,7 @@ var refToEffectSchema = (root) => {
   const targetSchemaDXN = DXN5.parse(reference.schema.$ref);
   invariant9(targetSchemaDXN.kind === DXN5.kind.TYPE, void 0, {
     F: __dxlog_file9,
-    L: 364,
+    L: 368,
     S: void 0,
     A: [
       "targetSchemaDXN.kind === DXN.kind.TYPE",
@@ -2564,7 +2585,7 @@ var TypedReactiveHandler = class _TypedReactiveHandler {
   init(target) {
     invariant14(typeof target === "object" && target !== null, void 0, {
       F: __dxlog_file14,
-      L: 147,
+      L: 148,
       S: this,
       A: [
         "typeof target === 'object' && target !== null",
@@ -2573,7 +2594,7 @@ var TypedReactiveHandler = class _TypedReactiveHandler {
     });
     invariant14(SchemaId in target, "Schema is not defined for the target", {
       F: __dxlog_file14,
-      L: 148,
+      L: 149,
       S: this,
       A: [
         "SchemaId in target",
@@ -2693,6 +2714,12 @@ var TypedReactiveHandler = class _TypedReactiveHandler {
   */
   _prepareValueForAssignment(target, prop, value2) {
     const echoRoot = getEchoRoot(target);
+    if (prop === ParentId) {
+      return {
+        echoRoot,
+        preparedValue: value2
+      };
+    }
     if (isValidProxyTarget(value2) || isProxy(value2)) {
       if (wouldCreateCycle(echoRoot, value2)) {
         throw new Error("Cannot create cycles in typed object graph. Consider using Ref for circular references.");
@@ -2725,6 +2752,9 @@ var TypedReactiveHandler = class _TypedReactiveHandler {
     };
   }
   _validateValue(target, prop, value2) {
+    if (prop === ParentId) {
+      return value2;
+    }
     const schema = SchemaValidator.getTargetPropertySchema(target, prop);
     const _ = Schema12.asserts(schema)(value2);
     if (isValidProxyTarget(value2)) {
@@ -2787,9 +2817,7 @@ var makeArraysReactive = (target) => {
 
 // src/internal/proxy/make-object.ts
 var makeObject = (schema, obj, meta) => {
-  return createReactiveObject({
-    ...obj
-  }, meta, schema);
+  return createReactiveObject(Object.assign({}, obj), meta, schema);
 };
 var createReactiveObject = (obj, meta, schema) => {
   if (!isValidProxyTarget(obj)) {
@@ -2798,12 +2826,19 @@ var createReactiveObject = (obj, meta, schema) => {
   if (!schema) {
     throw new Error("Schema is required for reactive objects. Use Atom for untyped reactive state.");
   }
+  const parent = obj[ParentId];
+  if (parent !== void 0) {
+    delete obj[ParentId];
+  }
   const annotation = getTypeAnnotation(schema);
   if (annotation) {
     setIdOnTarget(obj);
     defineHiddenProperty(obj, KindId, annotation.kind);
   }
   initMeta(obj, meta);
+  if (parent !== void 0) {
+    defineHiddenProperty(obj, ParentId, parent);
+  }
   prepareTypedTarget(obj, schema);
   attachTypedJsonSerializer(obj);
   const proxy = createProxy(obj, TypedReactiveHandler.instance);
@@ -2886,7 +2921,7 @@ var objectToJSON = (obj) => {
   const typename = getTypeDXN(obj)?.toString();
   invariant15(typename && typeof typename === "string", void 0, {
     F: __dxlog_file15,
-    L: 62,
+    L: 64,
     S: void 0,
     A: [
       "typename && typeof typename === 'string'",
@@ -2904,27 +2939,28 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
   const schema = await refResolver?.resolveSchema(type);
   invariant15(schema === void 0 || Schema13.isSchema(schema), void 0, {
     F: __dxlog_file15,
-    L: 83,
+    L: 85,
     S: void 0,
     A: [
       "schema === undefined || Schema.isSchema(schema)",
       ""
     ]
   });
+  const decodedInput = stripInternalJsonKeys(jsonData);
   let obj;
   if (schema != null) {
-    obj = await schema.pipe(Schema13.decodeUnknownPromise)(jsonData);
+    obj = await schema.pipe(Schema13.decodeUnknownPromise)(decodedInput);
     if (refResolver) {
       setRefResolverOnData(obj, refResolver);
     }
   } else {
-    obj = decodeGeneric(jsonData, {
+    obj = decodeGeneric(decodedInput, {
       refResolver
     });
   }
   invariant15(ObjectId6.isValid(obj.id), "Invalid object id", {
     F: __dxlog_file15,
-    L: 95,
+    L: 98,
     S: void 0,
     A: [
       "ObjectId.isValid(obj.id)",
@@ -2953,7 +2989,7 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
     const meta = await ObjectMetaSchema.pipe(Schema13.decodeUnknownPromise)(jsonData[ATTR_META]);
     invariant15(Array.isArray(meta.keys), void 0, {
       F: __dxlog_file15,
-      L: 121,
+      L: 124,
       S: void 0,
       A: [
         "Array.isArray(meta.keys)",
@@ -2966,13 +3002,18 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
       keys: []
     });
   }
+  if (jsonData[ATTR_PARENT]) {
+    const parentDxn = DXN7.parse(jsonData[ATTR_PARENT]);
+    const parent = await refResolver?.resolve(parentDxn);
+    defineHiddenProperty(obj, ParentId, parent);
+  }
   if (dxn) {
     defineHiddenProperty(obj, SelfDXNId, dxn);
   }
   assertObjectModel(obj);
   invariant15(obj[ATTR_TYPE] === void 0, "Invalid object model", {
     F: __dxlog_file15,
-    L: 134,
+    L: 143,
     S: void 0,
     A: [
       "(obj as any)[ATTR_TYPE] === undefined",
@@ -2981,7 +3022,7 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
   });
   invariant15(obj[ATTR_META] === void 0, "Invalid object model", {
     F: __dxlog_file15,
-    L: 135,
+    L: 144,
     S: void 0,
     A: [
       "(obj as any)[ATTR_META] === undefined",
@@ -2990,7 +3031,7 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
   });
   invariant15(obj[ATTR_DELETED] === void 0, "Invalid object model", {
     F: __dxlog_file15,
-    L: 136,
+    L: 145,
     S: void 0,
     A: [
       "(obj as any)[ATTR_DELETED] === undefined",
@@ -2999,7 +3040,7 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
   });
   invariant15(obj[ATTR_SELF_DXN] === void 0, "Invalid object model", {
     F: __dxlog_file15,
-    L: 137,
+    L: 146,
     S: void 0,
     A: [
       "(obj as any)[ATTR_SELF_DXN] === undefined",
@@ -3008,7 +3049,7 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
   });
   invariant15(obj[ATTR_RELATION_SOURCE] === void 0, "Invalid object model", {
     F: __dxlog_file15,
-    L: 138,
+    L: 147,
     S: void 0,
     A: [
       "(obj as any)[ATTR_RELATION_SOURCE] === undefined",
@@ -3017,7 +3058,7 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
   });
   invariant15(obj[ATTR_RELATION_TARGET] === void 0, "Invalid object model", {
     F: __dxlog_file15,
-    L: 139,
+    L: 148,
     S: void 0,
     A: [
       "(obj as any)[ATTR_RELATION_TARGET] === undefined",
@@ -3027,7 +3068,7 @@ var objectFromJSON = async (jsonData, { refResolver, dxn } = {}) => {
   return obj;
 };
 var decodeGeneric = (jsonData, options) => {
-  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 props = stripInternalJsonKeys(jsonData);
   return deepMapValues2(props, (value2, visitor) => {
     if (isEncodedReference(value2)) {
       return refFromEncodedReference(value2, options.refResolver);
@@ -3035,6 +3076,10 @@ var decodeGeneric = (jsonData, options) => {
     return visitor(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;
+  return props;
+};
 var setRefResolverOnData = (obj, refResolver) => {
   const visitor = (value2) => {
     if (Ref.isRef(value2)) {
@@ -3051,6 +3096,7 @@ var objectStructureToJson = (objectId, structure) => {
     id: objectId,
     [ATTR_TYPE]: ObjectStructure.getTypeReference(structure)?.["/"] ?? "",
     [ATTR_DELETED]: ObjectStructure.isDeleted(structure),
+    [ATTR_PARENT]: ObjectStructure.getParent(structure)?.["/"],
     [ATTR_RELATION_SOURCE]: ObjectStructure.getRelationSource(structure)?.["/"],
     [ATTR_RELATION_TARGET]: ObjectStructure.getRelationTarget(structure)?.["/"]
   };
@@ -3216,10 +3262,17 @@ var createObjectWithDefaults = (ast) => {
 
 // src/internal/object/snapshot.ts
 import { deepMapValues as deepMapValues3 } from "@dxos/util";
-var copySymbolProperty = (source, target, symbol) => {
-  if (symbol in source) {
-    Object.defineProperty(target, symbol, {
-      value: source[symbol],
+var copySymbolProperty = (source, target, symbol3, transform) => {
+  let value2;
+  try {
+    value2 = source[symbol3];
+  } catch {
+    return;
+  }
+  if (value2 !== void 0) {
+    const finalValue = transform ? transform(value2) : value2;
+    Object.defineProperty(target, symbol3, {
+      value: finalValue,
       writable: false,
       enumerable: false,
       configurable: false
@@ -3240,7 +3293,15 @@ var getSnapshot = (obj) => {
     const source = obj;
     copySymbolProperty(source, snapshot, TypeId);
     copySymbolProperty(source, snapshot, SchemaId);
-    copySymbolProperty(source, snapshot, MetaId);
+    copySymbolProperty(source, snapshot, ObjectDatabaseId);
+    copySymbolProperty(source, snapshot, MetaId, (meta) => ({
+      keys: [
+        ...meta?.keys ?? []
+      ],
+      tags: [
+        ...meta?.tags ?? []
+      ]
+    }));
     copySymbolProperty(source, snapshot, RelationSourceDXNId);
     copySymbolProperty(source, snapshot, RelationTargetDXNId);
     copySymbolProperty(source, snapshot, RelationSourceId);
@@ -3381,7 +3442,9 @@ var PersistentSchema = Schema15.Struct({
 }).pipe(EchoObjectSchema({
   typename: "dxos.org/type/Schema",
   version: "0.1.0"
-}));
+}), LabelAnnotation.set([
+  "name"
+]));
 
 // src/internal/schema/echo-schema.ts
 var __dxlog_file19 = "/__w/dxos/dxos/packages/core/echo/echo/src/internal/schema/echo-schema.ts";
@@ -3393,7 +3456,7 @@ var ImmutableSchema = class {
     this._objectAnnotation = getTypeAnnotation(this._schema);
     invariant19(this._objectAnnotation, void 0, {
       F: __dxlog_file19,
-      L: 48,
+      L: 49,
       S: this,
       A: [
         "this._objectAnnotation",
@@ -3555,7 +3618,7 @@ var EchoSchema = class extends EchoSchemaConstructor() {
   get mutable() {
     invariant19(!this.readonly, "Schema is not mutable", {
       F: __dxlog_file19,
-      L: 278,
+      L: 279,
       S: this,
       A: [
         "!this.readonly",
@@ -3596,7 +3659,7 @@ var EchoSchema = class extends EchoSchemaConstructor() {
     const ast = this._getSchema().ast;
     invariant19(SchemaAST11.isTypeLiteral(ast), void 0, {
       F: __dxlog_file19,
-      L: 313,
+      L: 314,
       S: this,
       A: [
         "SchemaAST.isTypeLiteral(ast)",
@@ -3844,4 +3907,4 @@ export {
   getValue,
   splitJsonPath
 };
-//# sourceMappingURL=chunk-BJPE6CIC.mjs.map
+//# sourceMappingURL=chunk-ZUG3PNXU.mjs.map