@dxos/echo 0.8.4-main.937b3ca → 0.8.4-main.9735255

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo",
-  "version": "0.8.4-main.937b3ca",
+  "version": "0.8.4-main.9735255",
   "description": "ECHO API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,181 +16,102 @@
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     },
     "./internal": {
       "source": "./src/internal/index.ts",
       "types": "./dist/types/src/internal/index.d.ts",
-      "browser": "./dist/lib/browser/internal/index.mjs",
-      "node": "./dist/lib/node-esm/internal/index.mjs"
+      "default": "./dist/lib/neutral/internal/index.mjs"
     },
     "./testing": {
       "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
-      "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs"
+      "default": "./dist/lib/neutral/testing/index.mjs"
     },
     "./Annotation": {
       "source": "./src/Annotation.ts",
       "types": "./dist/types/src/Annotation.d.ts",
-      "browser": "./dist/lib/browser/Annotation.mjs",
-      "node": "./dist/lib/node-esm/Annotation.mjs"
+      "default": "./dist/lib/neutral/Annotation.mjs"
     },
     "./Database": {
       "source": "./src/Database.ts",
       "types": "./dist/types/src/Database.d.ts",
-      "browser": "./dist/lib/browser/Database.mjs",
-      "node": "./dist/lib/node-esm/Database.mjs"
+      "default": "./dist/lib/neutral/Database.mjs"
     },
     "./Entity": {
       "source": "./src/Entity.ts",
       "types": "./dist/types/src/Entity.d.ts",
-      "browser": "./dist/lib/browser/Entity.mjs",
-      "node": "./dist/lib/node-esm/Entity.mjs"
+      "default": "./dist/lib/neutral/Entity.mjs"
     },
     "./Err": {
       "source": "./src/Err.ts",
       "types": "./dist/types/src/Err.d.ts",
-      "browser": "./dist/lib/browser/Err.mjs",
-      "node": "./dist/lib/node-esm/Err.mjs"
+      "default": "./dist/lib/neutral/Err.mjs"
     },
     "./Filter": {
       "source": "./src/Filter.ts",
       "types": "./dist/types/src/Filter.d.ts",
-      "browser": "./dist/lib/browser/Filter.mjs",
-      "node": "./dist/lib/node-esm/Filter.mjs"
+      "default": "./dist/lib/neutral/Filter.mjs"
     },
     "./Format": {
       "source": "./src/Format.ts",
       "types": "./dist/types/src/Format.d.ts",
-      "browser": "./dist/lib/browser/Format.mjs",
-      "node": "./dist/lib/node-esm/Format.mjs"
+      "default": "./dist/lib/neutral/Format.mjs"
     },
     "./JsonSchema": {
       "source": "./src/JsonSchema.ts",
       "types": "./dist/types/src/JsonSchema.d.ts",
-      "browser": "./dist/lib/browser/JsonSchema.mjs",
-      "node": "./dist/lib/node-esm/JsonSchema.mjs"
+      "default": "./dist/lib/neutral/JsonSchema.mjs"
     },
     "./Key": {
       "source": "./src/Key.ts",
       "types": "./dist/types/src/Key.d.ts",
-      "browser": "./dist/lib/browser/Key.mjs",
-      "node": "./dist/lib/node-esm/Key.mjs"
+      "default": "./dist/lib/neutral/Key.mjs"
     },
     "./Obj": {
       "source": "./src/Obj.ts",
       "types": "./dist/types/src/Obj.d.ts",
-      "browser": "./dist/lib/browser/Obj.mjs",
-      "node": "./dist/lib/node-esm/Obj.mjs"
+      "default": "./dist/lib/neutral/Obj.mjs"
     },
     "./Order": {
       "source": "./src/Order.ts",
       "types": "./dist/types/src/Order.d.ts",
-      "browser": "./dist/lib/browser/Order.mjs",
-      "node": "./dist/lib/node-esm/Order.mjs"
+      "default": "./dist/lib/neutral/Order.mjs"
     },
     "./Query": {
       "source": "./src/Query.ts",
       "types": "./dist/types/src/Query.d.ts",
-      "browser": "./dist/lib/browser/Query.mjs",
-      "node": "./dist/lib/node-esm/Query.mjs"
+      "default": "./dist/lib/neutral/Query.mjs"
     },
     "./QueryResult": {
       "source": "./src/QueryResult.ts",
       "types": "./dist/types/src/QueryResult.d.ts",
-      "browser": "./dist/lib/browser/QueryResult.mjs",
-      "node": "./dist/lib/node-esm/QueryResult.mjs"
+      "default": "./dist/lib/neutral/QueryResult.mjs"
     },
     "./Ref": {
       "source": "./src/Ref.ts",
       "types": "./dist/types/src/Ref.d.ts",
-      "browser": "./dist/lib/browser/Ref.mjs",
-      "node": "./dist/lib/node-esm/Ref.mjs"
+      "default": "./dist/lib/neutral/Ref.mjs"
     },
     "./Relation": {
       "source": "./src/Relation.ts",
       "types": "./dist/types/src/Relation.d.ts",
-      "browser": "./dist/lib/browser/Relation.mjs",
-      "node": "./dist/lib/node-esm/Relation.mjs"
+      "default": "./dist/lib/neutral/Relation.mjs"
     },
     "./SchemaRegistry": {
       "source": "./src/SchemaRegistry.ts",
       "types": "./dist/types/src/SchemaRegistry.d.ts",
-      "browser": "./dist/lib/browser/SchemaRegistry.mjs",
-      "node": "./dist/lib/node-esm/SchemaRegistry.mjs"
+      "default": "./dist/lib/neutral/SchemaRegistry.mjs"
     },
     "./Tag": {
       "source": "./src/Tag.ts",
       "types": "./dist/types/src/Tag.d.ts",
-      "browser": "./dist/lib/browser/Tag.mjs",
-      "node": "./dist/lib/node-esm/Tag.mjs"
+      "default": "./dist/lib/neutral/Tag.mjs"
     },
     "./Type": {
       "source": "./src/Type.ts",
       "types": "./dist/types/src/Type.d.ts",
-      "browser": "./dist/lib/browser/Type.mjs",
-      "node": "./dist/lib/node-esm/Type.mjs"
-    }
-  },
-  "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "internal": [
-        "dist/types/src/internal/index.d.ts"
-      ],
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ],
-      "Annotation": [
-        "dist/types/src/Annotation.d.ts"
-      ],
-      "Database": [
-        "dist/types/src/Database.d.ts"
-      ],
-      "Entity": [
-        "dist/types/src/Entity.d.ts"
-      ],
-      "Err": [
-        "dist/types/src/Err.d.ts"
-      ],
-      "Filter": [
-        "dist/types/src/Filter.d.ts"
-      ],
-      "Format": [
-        "dist/types/src/Format.d.ts"
-      ],
-      "JsonSchema": [
-        "dist/types/src/JsonSchema.d.ts"
-      ],
-      "Key": [
-        "dist/types/src/Key.d.ts"
-      ],
-      "Obj": [
-        "dist/types/src/Obj.d.ts"
-      ],
-      "Order": [
-        "dist/types/src/Order.d.ts"
-      ],
-      "Query": [
-        "dist/types/src/Query.d.ts"
-      ],
-      "QueryResult": [
-        "dist/types/src/QueryResult.d.ts"
-      ],
-      "Ref": [
-        "dist/types/src/Ref.d.ts"
-      ],
-      "Relation": [
-        "dist/types/src/Relation.d.ts"
-      ],
-      "Tag": [
-        "dist/types/src/Tag.d.ts"
-      ],
-      "Type": [
-        "dist/types/src/Type.d.ts"
-      ]
+      "default": "./dist/lib/neutral/Type.mjs"
     }
   },
   "files": [
@@ -199,18 +120,18 @@
   ],
   "dependencies": {
     "effect": "3.19.11",
-    "@dxos/context": "0.8.4-main.937b3ca",
-    "@dxos/debug": "0.8.4-main.937b3ca",
-    "@dxos/async": "0.8.4-main.937b3ca",
-    "@dxos/echo-protocol": "0.8.4-main.937b3ca",
-    "@dxos/effect": "0.8.4-main.937b3ca",
-    "@dxos/errors": "0.8.4-main.937b3ca",
-    "@dxos/invariant": "0.8.4-main.937b3ca",
-    "@dxos/keys": "0.8.4-main.937b3ca",
-    "@dxos/log": "0.8.4-main.937b3ca",
-    "@dxos/node-std": "0.8.4-main.937b3ca",
-    "@dxos/protocols": "0.8.4-main.937b3ca",
-    "@dxos/util": "0.8.4-main.937b3ca"
+    "@dxos/async": "0.8.4-main.9735255",
+    "@dxos/echo-protocol": "0.8.4-main.9735255",
+    "@dxos/debug": "0.8.4-main.9735255",
+    "@dxos/effect": "0.8.4-main.9735255",
+    "@dxos/invariant": "0.8.4-main.9735255",
+    "@dxos/errors": "0.8.4-main.9735255",
+    "@dxos/context": "0.8.4-main.9735255",
+    "@dxos/log": "0.8.4-main.9735255",
+    "@dxos/node-std": "0.8.4-main.9735255",
+    "@dxos/keys": "0.8.4-main.9735255",
+    "@dxos/protocols": "0.8.4-main.9735255",
+    "@dxos/util": "0.8.4-main.9735255"
   },
   "publishConfig": {
     "access": "public"

package/src/Obj.ts

@@ -316,7 +316,7 @@ export const getValue = (obj: Unknown | Snapshot, path: readonly (string | numbe
  * @example
  * ```ts
  * const person = Obj.make(Person, { name: 'John' });
- * // Person schema has: addresses: Schema.mutable(Schema.Array(Address))
+ * // Person schema has: addresses: Schema.Array(Address)
  * Obj.change(person, (p) => {
  *   Obj.setValue(p, ['addresses', 0, 'street'], '123 Main St');
  * });
@@ -436,9 +436,9 @@ export type Meta = ApiMeta;
  * ```
  */
 // TODO(wittjosiah): When passed a Snapshot, should return a snapshot of meta, not the live meta proxy.
-export function getMeta(entity: Mutable<Unknown>): ObjectMeta;
+export function getMeta(entity: Mutable<Unknown>): Meta;
 export function getMeta(entity: Unknown | Snapshot): ReadonlyMeta;
-export function getMeta(entity: Unknown | Snapshot | Mutable<Unknown>): ObjectMeta | ReadonlyMeta {
+export function getMeta(entity: Unknown | Snapshot | Mutable<Unknown>): Meta | ReadonlyMeta {
   return getMeta$(entity);
 }
 

package/src/Relation.ts

@@ -372,9 +372,9 @@ export type Meta = ApiMeta;
  * Returns read-only meta when passed a regular relation or snapshot.
  */
 // TODO(wittjosiah): When passed a Snapshot, should return a snapshot of meta, not the live meta proxy.
-export function getMeta(entity: Mutable<Unknown>): ObjectMeta;
+export function getMeta(entity: Mutable<Unknown>): Meta;
 export function getMeta(entity: Unknown | Snapshot): ReadonlyMeta;
-export function getMeta(entity: Unknown | Snapshot | Mutable<Unknown>): ObjectMeta | ReadonlyMeta {
+export function getMeta(entity: Unknown | Snapshot | Mutable<Unknown>): Meta | ReadonlyMeta {
   return getMeta$(entity);
 }
 

package/src/internal/api/meta.ts

@@ -17,7 +17,7 @@ export type ReadonlyMeta = DeepReadonly<ObjectMeta>;
 /**
  * Mutable meta type received in meta mutation callbacks.
  */
-export type Meta = ObjectMeta;
+export type Meta = Mutable<ObjectMeta>;
 
 /**
  * Get the metadata for an entity with validation.
@@ -26,9 +26,9 @@ export type Meta = ObjectMeta;
  *
  * TODO(burdon): When passed a Snapshot, should return a snapshot of meta, not the live meta proxy.
  */
-export function getMetaChecked(entity: Mutable<AnyProperties>): ObjectMeta;
+export function getMetaChecked(entity: Mutable<AnyProperties>): Meta;
 export function getMetaChecked(entity: AnyProperties): ReadonlyMeta;
-export function getMetaChecked(entity: AnyProperties): ObjectMeta | ReadonlyMeta {
+export function getMetaChecked(entity: AnyProperties): Meta | ReadonlyMeta {
   assertArgument(entity, 'entity', 'Should be an entity.');
   const meta = getMeta$(entity);
   invariant(meta != null, 'Invalid entity.');

package/src/internal/entities/object.ts

@@ -40,9 +40,7 @@ export const EchoObjectSchema: {
     // Extract fields from the schema if available (Struct schemas have .fields).
     const fields = ((self as any).fields ?? {}) as Fields;
 
-    // TODO(dmaretskyi): Does `Schema.mutable` work for deep mutability here?
-    // TODO(dmaretskyi): Do not do mutable here.
-    const schemaWithId = Schema.extend(Schema.mutable(self), Schema.Struct({ id: Schema.String }));
+    const schemaWithId = Schema.extend(self, Schema.Struct({ id: Schema.String }));
     const ast = SchemaAST.annotations(schemaWithId.ast, {
       // TODO(dmaretskyi): `extend` kills the annotations.
       ...self.ast.annotations,

package/src/internal/entities/relation.ts

@@ -129,9 +129,7 @@ export const EchoRelationSchema = <
     // Extract fields from the schema if available (Struct schemas have .fields).
     const fields = ((self as any).fields ?? {}) as Fields;
 
-    // TODO(dmaretskyi): Does `Schema.mutable` work for deep mutability here?
-    // TODO(dmaretskyi): Do not do mutable here.
-    const schemaWithId = Schema.extend(Schema.mutable(self), Schema.Struct({ id: Schema.String }));
+    const schemaWithId = Schema.extend(self, Schema.Struct({ id: Schema.String }));
     const ast = SchemaAST.annotations(schemaWithId.ast, {
       // TODO(dmaretskyi): `extend` kills the annotations.
       ...self.ast.annotations,

package/src/internal/formats/format.test.ts

@@ -20,7 +20,7 @@ describe('formats', () => {
       birthday: Schema.optional(Format.Date),
       started: Schema.optional(Format.DateTime),
       active: Schema.optional(Schema.Boolean),
-    }).pipe(Schema.mutable);
+    });
 
     type TestType = Schema.Schema.Type<typeof TestSchema>;
 

package/src/internal/formats/select.ts

@@ -13,6 +13,6 @@ export const SelectOption = Schema.Struct({
   title: Schema.String,
   /** Color palette used for visual styling. */
   color: Schema.String,
-}).pipe(Schema.mutable);
+});
 
 export type SelectOption = Schema.Schema.Type<typeof SelectOption>;

package/src/internal/json-schema/json-schema-normalize.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
+import type * as Types from 'effect/Types';
+
 import { JsonSchemaFields, type JsonSchemaType } from './json-schema-type';
 
 /**
@@ -9,12 +11,12 @@ import { JsonSchemaFields, type JsonSchemaType } from './json-schema-type';
  * Note: the input type does not necessarily match the {@link JsonSchemaType} type.
  */
 export const normalizeSchema = (schema: JsonSchemaType): JsonSchemaType => {
-  const copy = structuredClone(schema);
+  const copy = structuredClone(schema) as Types.DeepMutable<JsonSchemaType>;
   go(copy);
   return copy;
 };
 
-const go = (schema: JsonSchemaType) => {
+const go = (schema: Types.DeepMutable<JsonSchemaType>) => {
   if (typeof schema !== 'object' || schema === null) {
     return;
   }

package/src/internal/json-schema/json-schema-type.ts

@@ -7,6 +7,7 @@ import * as Schema from 'effect/Schema';
 import { JsonPath, type JsonProp } from '@dxos/effect';
 
 import { FormatAnnotation, TypeFormat } from '../formats';
+import { type Mutable } from '../proxy';
 import { EntityKindSchema } from '../types';
 
 //
@@ -18,7 +19,7 @@ const SimpleTypes = Schema.Literal('array', 'boolean', 'integer', 'null', 'numbe
 
 const NonNegativeInteger = Schema.Number.pipe(Schema.greaterThanOrEqualTo(0));
 
-const StringArray = Schema.Array(Schema.String).pipe(Schema.mutable);
+const StringArray = Schema.Array(Schema.String);
 
 const JsonSchemaOrBoolean = Schema.Union(
   Schema.suspend(() => JsonSchemaType),
@@ -48,7 +49,7 @@ export const JsonSchemaEchoAnnotations = Schema.Struct({
     Schema.Record({
       key: Schema.String,
       value: Schema.Any,
-    }).pipe(Schema.mutable),
+    }),
   ),
 
   /**
@@ -62,7 +63,7 @@ export const JsonSchemaEchoAnnotations = Schema.Struct({
 
       // Not used.
       schemaId: Schema.optional(Schema.String),
-    }).pipe(Schema.mutable),
+    }),
   ),
 
   /**
@@ -72,9 +73,9 @@ export const JsonSchemaEchoAnnotations = Schema.Struct({
     Schema.Record({
       key: Schema.String,
       value: Schema.Any,
-    }).pipe(Schema.mutable),
+    }),
   ),
-}).pipe(Schema.mutable);
+});
 export type JsonSchemaEchoAnnotations = Schema.Schema.Type<typeof JsonSchemaEchoAnnotations>;
 
 /**
@@ -257,23 +258,21 @@ const _JsonSchemaType = Schema.Struct({
     Schema.Record({
       key: Schema.String,
       value: Schema.suspend(() => JsonSchemaType),
-    }).pipe(Schema.mutable),
+    }),
   ),
   patternProperties: Schema.optional(
     Schema.Record({
       key: Schema.String,
       value: Schema.suspend(() => JsonSchemaType),
-    }).pipe(Schema.mutable),
+    }),
   ),
   propertyNames: Schema.optional(Schema.suspend(() => JsonSchemaType)),
 
   definitions: Schema.optional(
-    Schema.mutable(
-      Schema.Record({
-        key: Schema.String,
-        value: Schema.suspend(() => JsonSchemaType),
-      }),
-    ),
+    Schema.Record({
+      key: Schema.String,
+      value: Schema.suspend(() => JsonSchemaType),
+    }),
   ),
   dependencies: Schema.optional(
     Schema.Record({
@@ -296,12 +295,10 @@ const _JsonSchemaType = Schema.Struct({
   oneOf: Schema.optional(Schema.Array(Schema.suspend(() => JsonSchemaType))),
   not: Schema.optional(Schema.suspend(() => JsonSchemaType)),
   $defs: Schema.optional(
-    Schema.mutable(
-      Schema.Record({
-        key: Schema.String,
-        value: Schema.suspend(() => JsonSchemaType),
-      }),
-    ),
+    Schema.Record({
+      key: Schema.String,
+      value: Schema.suspend(() => JsonSchemaType),
+    }),
   ),
 
   //
@@ -311,25 +308,23 @@ const _JsonSchemaType = Schema.Struct({
   currency: Schema.optional(Schema.String),
 
   reference: Schema.optional(
-    Schema.mutable(
-      Schema.Struct({
-        schema: Schema.suspend(() => JsonSchemaType),
-        schemaVersion: Schema.optional(Schema.String),
-        schemaObject: Schema.optional(Schema.String),
-      }),
-    ),
+    Schema.Struct({
+      schema: Schema.suspend(() => JsonSchemaType),
+      schemaVersion: Schema.optional(Schema.String),
+      schemaObject: Schema.optional(Schema.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: Schema.optional(Schema.mutable(JsonSchemaEchoAnnotations)),
+  annotations: Schema.optional(JsonSchemaEchoAnnotations),
 
   /**
    * @deprecated Use `annotations` instead.
    */
-  echo: Schema.optional(Schema.mutable(JsonSchemaEchoAnnotations)),
+  echo: Schema.optional(JsonSchemaEchoAnnotations),
 }).annotations({ identifier: 'jsonSchema', description: 'JSON Schema' });
 
 export const JsonSchemaFields = Object.keys(_JsonSchemaType.fields);
@@ -338,9 +333,9 @@ export const JsonSchemaFields = Object.keys(_JsonSchemaType.fields);
  * https://json-schema.org/draft-07/schema
  */
 // TODO(burdon): Reconcile with @effect/Schema/JSONSchema
-export interface JsonSchemaType extends Schema.Schema.Type<Schema.mutable<typeof _JsonSchemaType>> {}
+export interface JsonSchemaType extends Schema.Schema.Type<typeof _JsonSchemaType> {}
 
-export const JsonSchemaType: Schema.Schema<JsonSchemaType> = _JsonSchemaType.pipe(Schema.mutable);
+export const JsonSchemaType: Schema.Schema<JsonSchemaType> = _JsonSchemaType;
 
 // TODO(burdon): Factor out JSON schema utils.
 
@@ -349,7 +344,11 @@ export const getSchemaProperty = (schema: JsonSchemaType, property: JsonProp): J
 };
 
 // TODO(burdon): Properties should be ordered.
-export const setSchemaProperty = (schema: JsonSchemaType, property: JsonProp, value: JsonSchemaType) => {
+export const setSchemaProperty = (
+  schema: Mutable<JsonSchemaType>,
+  property: JsonProp,
+  value: Mutable<JsonSchemaType>,
+) => {
   schema.properties ??= {};
   schema.properties[property] = value;
   return schema;

package/src/internal/json-schema/json-schema.ts

@@ -80,7 +80,11 @@ export type JsonSchemaOptions = {
  */
 // TODO(burdon): Reconcile with possibly extending @effect/Schema/JSONSchema
 //  We add additional propertyOrder (but the object properties ARE ordered); and type "string" for literals.
-export const toJsonSchema = (schema: Schema.Schema.All, options: JsonSchemaOptions = {}): JsonSchemaType => {
+// TODO(wittjosiah): This is mutable because its a pojo, perhaps should be left as readonly at type level though?
+export const toJsonSchema = (
+  schema: Schema.Schema.All,
+  options: JsonSchemaOptions = {},
+): Types.DeepMutable<JsonSchemaType> => {
   assertArgument(Schema.isSchema(schema), 'schema');
   let jsonSchema = _toJsonSchemaAST(schema.ast);
   if (options.strict) {
@@ -103,11 +107,11 @@ export const toJsonSchema = (schema: Schema.Schema.All, options: JsonSchemaOptio
   return jsonSchema;
 };
 
-const _toJsonSchemaAST = (ast: SchemaAST.AST): JsonSchemaType => {
+const _toJsonSchemaAST = (ast: SchemaAST.AST): Types.DeepMutable<JsonSchemaType> => {
   const withRefinements = withEchoRefinements(ast, '#');
   const jsonSchema = JSONSchema.fromAST(withRefinements, {
     definitions: {},
-  }) as JsonSchemaType;
+  }) as Types.DeepMutable<JsonSchemaType>;
 
   return normalizeJsonSchema(jsonSchema);
 };
@@ -326,7 +330,7 @@ const objectToEffectSchema = (root: JsonSchemaType, defs: JsonSchemaType['$defs'
   }
 
   if (immutableIdField) {
-    schema = Schema.extend(Schema.mutable(schema), Schema.Struct({ id: immutableIdField }));
+    schema = Schema.extend(schema, Schema.Struct({ id: immutableIdField }));
   }
 
   const annotations = jsonSchemaFieldsToAnnotations(root);
@@ -377,7 +381,7 @@ const refToEffectSchema = (root: any): Schema.Schema.AnyNoContext => {
 const annotations_toJsonSchemaFields = (annotations: SchemaAST.Annotations): Record<symbol, any> => {
   const schemaFields: Record<string, any> = {};
 
-  const echoAnnotations: JsonSchemaEchoAnnotations = {};
+  const echoAnnotations: Types.Mutable<JsonSchemaEchoAnnotations> = {};
   for (const [key, annotationId] of Object.entries(EchoAnnotations)) {
     if (annotations[annotationId] != null) {
       echoAnnotations[key as keyof JsonSchemaEchoAnnotations] = annotations[annotationId] as any;
@@ -495,7 +499,7 @@ const addJsonSchemaFields = (ast: SchemaAST.AST, schema: JsonSchemaType): Schema
  * Fixes field order.
  * Sets `$schema` prop.
  */
-const normalizeJsonSchema = (jsonSchema: JsonSchemaType): JsonSchemaType => {
+const normalizeJsonSchema = (jsonSchema: Types.DeepMutable<JsonSchemaType>): Types.DeepMutable<JsonSchemaType> => {
   if (jsonSchema.properties && 'id' in jsonSchema.properties) {
     jsonSchema.properties = orderKeys(jsonSchema.properties, ['id']); // Put id first.
   }

package/src/internal/object/json-serializer.test.ts

@@ -9,10 +9,11 @@ import { DXN } from '@dxos/keys';
 import * as Obj from '../../Obj';
 import { TestSchema } from '../../testing';
 import { getSchemaDXN, getSchemaTypename, getTypeDXN, getTypename } from '../annotations';
+import { getMetaChecked } from '../api';
 import { RelationSourceId, RelationTargetId, getObjectDXN } from '../entities';
 import { makeObject } from '../proxy';
 import { Ref, StaticRefResolver } from '../ref';
-import { ATTR_TYPE, EntityKind, KindId, MetaId, TypeId, getMeta, getSchema } from '../types';
+import { ATTR_TYPE, EntityKind, KindId, MetaId, TypeId, getSchema } from '../types';
 
 import { createObject } from './create-object';
 import { objectFromJSON, objectToJSON } from './json-serializer';
@@ -21,7 +22,7 @@ describe('Object JSON serializer', () => {
   test('should serialize and deserialize object', async () => {
     const contact = makeObject(TestSchema.Person, { name: 'Alice' });
     Obj.change(contact, (c) => {
-      getMeta(c).keys.push({ id: '12345', source: 'example.com' });
+      getMetaChecked(c).keys.push({ id: '12345', source: 'example.com' });
     });
 
     const task = createObject(TestSchema.Task, {

package/src/internal/object/schema-validator.test.ts

@@ -27,9 +27,7 @@ describe('schema-validator', () => {
       const TestSchema: Schema.Schema.AnyNoContext = Schema.Struct({
         name: Schema.String.annotations({ [annotationId]: annotationValue }),
         parent: Schema.optional(Schema.suspend(() => TestSchema.annotations({ [annotationId]: annotationValue }))),
-        friends: Schema.suspend(() =>
-          Schema.mutable(Schema.Array(TestSchema.annotations({ [annotationId]: annotationValue }))),
-        ),
+        friends: Schema.suspend(() => Schema.Array(TestSchema.annotations({ [annotationId]: annotationValue }))),
       });
       expect(SchemaValidator.hasTypeAnnotation(TestSchema, 'name', annotationId)).to.be.true;
       expect(SchemaValidator.hasTypeAnnotation(TestSchema, 'parent', annotationId)).to.be.true;
@@ -41,7 +39,7 @@ describe('schema-validator', () => {
       const Person: Schema.Schema.AnyNoContext = Schema.Struct({
         name: Schema.String,
         parent: Schema.optional(Schema.suspend(() => Person)),
-        friends: Schema.suspend(() => Schema.mutable(Schema.Array(Person))),
+        friends: Schema.suspend(() => Schema.Array(Person)),
       });
       expect(SchemaValidator.hasTypeAnnotation(Person, 'name', annotationId)).to.be.false;
       expect(SchemaValidator.hasTypeAnnotation(Person, 'parent', annotationId)).to.be.false;
@@ -87,9 +85,7 @@ describe('schema-validator', () => {
       const annotationValue = 'bar';
       const Person: Schema.Schema.AnyNoContext = Schema.Struct({
         parent: Schema.optional(Schema.suspend(() => Person.annotations({ [annotationId]: annotationValue }))),
-        friends: Schema.suspend(() =>
-          Schema.mutable(Schema.Array(Person.annotations({ [annotationId]: annotationValue }))),
-        ),
+        friends: Schema.suspend(() => Schema.Array(Person.annotations({ [annotationId]: annotationValue }))),
       });
       expect(SchemaValidator.getPropertySchema(Person, ['parent']).ast.annotations[annotationId]).to.eq(
         annotationValue,