@dxos/echo 0.8.4-main.66e292d → 0.8.4-main.69d29f4

package/dist/types/src/internal/types/base.d.ts

@@ -1,18 +1,6 @@
 import * as Schema from 'effect/Schema';
 import { type ObjectId } from '@dxos/keys';
 import { type ATTR_META, type ObjectMeta } from './meta';
-/**
- * Marker interface for object with an `id`.
- */
-export interface HasId {
-    readonly id: ObjectId;
-}
-/**
- * Object that has an associated typename.
- * The typename is retrievable using {@link getTypename}.
- * The object can be used with {@link isInstanceOf} to check if it is an instance of a schema.
- */
-export type HasTypename = {};
 /**
  * Base type for all data objects (reactive, ECHO, and other raw objects).
  * NOTE: This describes the base type for all database objects.
@@ -20,18 +8,19 @@ export type HasTypename = {};
  */
 export type AnyProperties = Record<string, any>;
 /**
- * Canonical type for all ECHO objects.
+ * Canonical type for all ECHO entities (objects and relations).
  */
-export interface AnyEchoObject extends HasId, HasTypename {
+export interface AnyEntity {
+    readonly id: ObjectId;
 }
-export type WithId<T extends AnyProperties = AnyProperties> = T & HasId;
 export type ExcludeId<T extends AnyProperties> = Omit<T, 'id'>;
 export type PropertyKey<T extends AnyProperties> = Extract<keyof ExcludeId<T>, string>;
-export type WithMeta = {
+type WithMeta = {
     [ATTR_META]?: ObjectMeta;
 };
 /**
  * The raw object should not include the ECHO id, but may include metadata.
  */
 export declare const RawObject: <S extends Schema.Schema.AnyNoContext>(schema: S) => Schema.Schema<ExcludeId<Schema.Schema.Type<S>> & WithMeta, Schema.Schema.Encoded<S>>;
+export {};
 //# sourceMappingURL=base.d.ts.map

package/dist/types/src/internal/types/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;CACvB;AAED;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,EAAE,CAAC;AAE7B;;;;GAIG;AAIH,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,KAAK,EAAE,WAAW;CAAG;AAG5D,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI,CAAC,GAAG,KAAK,CAAC;AAExE,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,aAAa,IAAI,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AAE/D,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,aAAa,IAAI,OAAO,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAGvF,MAAM,MAAM,QAAQ,GAAG;IAAE,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAA;CAAE,CAAC;AAEpD;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EAC5D,QAAQ,CAAC,KACR,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAErF,CAAC"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/base.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEzD;;;;GAIG;AAGH,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEhD;;GAEG;AAEH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;CACvB;AAED,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,aAAa,IAAI,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AAE/D,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,aAAa,IAAI,OAAO,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAGvF,KAAK,QAAQ,GAAG;IAAE,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAA;CAAE,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EAC5D,QAAQ,CAAC,KACR,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAErF,CAAC"}

package/dist/types/src/internal/types/entity.d.ts

@@ -1,4 +1,22 @@
 import * as Schema from 'effect/Schema';
+/**
+ * String key used to identify the kind of an entity instance (object or relation).
+ */
+export declare const KindId: "~@dxos/echo/Kind";
+export type KindId = typeof KindId;
+/**
+ * String key used to identify the kind of a schema (object schema or relation schema).
+ * Parallels KindId which identifies instance kinds.
+ */
+export declare const SchemaKindId: "~@dxos/echo/SchemaKind";
+export type SchemaKindId = typeof SchemaKindId;
+/**
+ * String key used to brand snapshot types.
+ * Snapshots have SnapshotKindId instead of KindId, making them
+ * distinguishable from reactive objects at the type level.
+ */
+export declare const SnapshotKindId: "~@dxos/echo/SnapshotKind";
+export type SnapshotKindId = typeof SnapshotKindId;
 /**
  * Kinds of entities stored in ECHO: objects and relations.
  */
@@ -7,6 +25,13 @@ export declare enum EntityKind {
     Relation = "relation"
 }
 export declare const EntityKindSchema: Schema.Enums<typeof EntityKind>;
-export declare const KindId: unique symbol;
-export type KindId = typeof KindId;
+/**
+ * Typename for generic object references (Type.Obj / Type.Ref(Type.Obj)).
+ * Used when referencing any object without a specific schema.
+ */
+export declare const ANY_OBJECT_TYPENAME = "dxos.org/schema/AnyObject";
+/**
+ * Version for generic object references.
+ */
+export declare const ANY_OBJECT_VERSION = "0.0.0";
 //# sourceMappingURL=entity.d.ts.map

package/dist/types/src/internal/types/entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/entity.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAOxC;;GAEG;AACH,oBAAY,UAAU;IACpB,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,gBAAgB,iCAA2B,CAAC;AAEzD,eAAO,MAAM,MAAM,EAAE,OAAO,MAA4B,CAAC;AACzD,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC"}
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/entity.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AASxC;;GAEG;AACH,eAAO,MAAM,MAAM,EAAG,kBAA2B,CAAC;AAClD,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC;AAEnC;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAG,wBAAiC,CAAC;AAC9D,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC;AAE/C;;;;GAIG;AACH,eAAO,MAAM,cAAc,EAAG,0BAAmC,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,OAAO,cAAc,CAAC;AAEnD;;GAEG;AACH,oBAAY,UAAU;IACpB,MAAM,WAAW;IACjB,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,gBAAgB,iCAA2B,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,8BAA8B,CAAC;AAE/D;;GAEG;AACH,eAAO,MAAM,kBAAkB,UAAU,CAAC"}

package/dist/types/src/internal/types/meta.d.ts

@@ -1,7 +1,7 @@
 import * as Schema from 'effect/Schema';
 import { ForeignKey } from '@dxos/echo-protocol';
 import { type Comparator } from '@dxos/util';
-import { type AnyProperties, type WithMeta } from './base';
+import { type AnyProperties } from './base';
 /**
  * Property name for meta when object is serialized to JSON.
  */
@@ -10,30 +10,22 @@ export declare const ATTR_META = "@meta";
  * Metadata section.
  */
 export declare const MetaId: unique symbol;
-export declare const ObjectMetaSchema: Schema.mutable<Schema.Struct<{
-    keys: Schema.mutable<Schema.Array$<Schema.Schema<{
+export declare const ObjectMetaSchema: Schema.Struct<{
+    keys: Schema.Array$<Schema.Schema<{
         readonly source: string;
         readonly id: string;
     }, {
         readonly source: string;
         readonly id: string;
-    }, never>>>;
+    }, never>>;
     /**
      * A set of tags.
      * Tags are arbitrary application-defined strings.
      * ECHO makes no assumptions about the tag structure.
      */
-    tags: Schema.optional<Schema.mutable<Schema.Array$<typeof Schema.String>>>;
-}>>;
+    tags: Schema.optional<Schema.Array$<typeof Schema.String>>;
+}>;
 export type ObjectMeta = Schema.Schema.Type<typeof ObjectMetaSchema>;
-/**
- * Utility to split meta property from raw object.
- * @deprecated Bad API.
- */
-export declare const splitMeta: <T>(object: T & WithMeta) => {
-    object: T;
-    meta?: ObjectMeta;
-};
 export declare const foreignKey: (source: string, id: string) => ForeignKey;
 export declare const foreignKeyEquals: (a: ForeignKey, b: ForeignKey) => boolean;
 export declare const compareForeignKeys: Comparator<AnyProperties>;

package/dist/types/src/internal/types/meta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/meta.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,YAAY,CAAC;AAE3D,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAE3D;;GAEG;AACH,eAAO,MAAM,SAAS,UAAU,CAAC;AAEjC;;GAEG;AACH,eAAO,MAAM,MAAM,eAAgC,CAAC;AAOpD,eAAO,MAAM,gBAAgB;;;;;;;;IAIzB;;;;OAIG;;GAKN,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAerE;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,QAAQ,CAAC,GAAG,QAAQ,KAAG;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,IAAI,CAAC,EAAE,UAAU,CAAA;CAIjF,CAAC;AAMF,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,EAAE,IAAI,MAAM,KAAG,UAA8B,CAAC;AACvF,eAAO,MAAM,gBAAgB,GAAI,GAAG,UAAU,EAAE,GAAG,UAAU,YAA2C,CAAC;AAGzG,eAAO,MAAM,kBAAkB,EAAE,UAAU,CAAC,aAAa,CACoB,CAAC"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../../../src/internal/types/meta.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,YAAY,CAAC;AAE3D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,SAAS,UAAU,CAAC;AAEjC;;GAEG;AACH,eAAO,MAAM,MAAM,eAAgC,CAAC;AAOpD,eAAO,MAAM,gBAAgB;;;;;;;;IAG3B;;;;OAIG;;EAIH,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAmBrE,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,EAAE,IAAI,MAAM,KAAG,UAA8B,CAAC;AACvF,eAAO,MAAM,gBAAgB,GAAI,GAAG,UAAU,EAAE,GAAG,UAAU,YAA2C,CAAC;AAGzG,eAAO,MAAM,kBAAkB,EAAE,UAAU,CAAC,aAAa,CACoB,CAAC"}

package/dist/types/src/testing/test-schema.d.ts

@@ -1,6 +1,15 @@
 import * as Schema from 'effect/Schema';
 import * as Type from '../Type';
 export declare namespace TestSchema {
+    /**
+     * Expando object is an object with an arbitrary set of properties.
+     * This is the test variant with example.com namespace.
+     */
+    const Expando: Type.Obj<{
+        readonly [x: string]: any;
+    }, Schema.Struct.Fields>;
+    interface Expando extends Schema.Schema.Type<typeof Expando> {
+    }
     class TestClass {
         field: string;
         toJSON(): {
@@ -8,27 +17,27 @@ export declare namespace TestSchema {
         };
     }
     /** @deprecated Use another test schema or create a specific local test schema. */
-    const ExampleSchema: Schema.mutable<Schema.SchemaClass<{
+    const ExampleSchema: Schema.SchemaClass<{
         readonly string?: string | undefined;
         readonly number?: number | undefined;
         readonly boolean?: boolean | undefined;
         readonly undefined?: undefined;
         readonly null?: null | undefined;
         readonly reference?: import("../internal").Ref<Example> | undefined;
-        readonly other?: any;
+        readonly stringArray?: readonly string[] | undefined;
+        readonly twoDimNumberArray?: readonly (readonly number[])[] | undefined;
         readonly nested?: {
-            field: string;
+            readonly field: string;
         } | undefined;
-        readonly stringArray?: string[] | undefined;
-        readonly twoDimNumberArray?: number[][] | undefined;
-        readonly nestedArray?: {
-            field: string;
+        readonly nestedArray?: readonly {
+            readonly field: string;
         }[] | undefined;
-        readonly nestedNullableArray?: ({
-            field: string;
+        readonly nestedNullableArray?: readonly ({
+            readonly field: string;
         } | null)[] | undefined;
-        readonly referenceArray?: import("../internal").Ref<Example>[] | undefined;
+        readonly referenceArray?: readonly import("../internal").Ref<Example>[] | undefined;
         readonly classInstance?: TestClass | undefined;
+        readonly other?: any;
     }, {
         readonly string?: string | undefined;
         readonly number?: number | undefined;
@@ -36,91 +45,81 @@ export declare namespace TestSchema {
         readonly undefined?: undefined;
         readonly null?: null | undefined;
         readonly reference?: import("@dxos/echo-protocol").EncodedReference | undefined;
-        readonly other?: any;
+        readonly stringArray?: readonly string[] | undefined;
+        readonly twoDimNumberArray?: readonly (readonly number[])[] | undefined;
         readonly nested?: {
-            field: string;
+            readonly field: string;
         } | undefined;
-        readonly stringArray?: string[] | undefined;
-        readonly twoDimNumberArray?: number[][] | undefined;
-        readonly nestedArray?: {
-            field: string;
+        readonly nestedArray?: readonly {
+            readonly field: string;
         }[] | undefined;
-        readonly nestedNullableArray?: ({
-            field: string;
+        readonly nestedNullableArray?: readonly ({
+            readonly field: string;
         } | null)[] | undefined;
-        readonly referenceArray?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
+        readonly referenceArray?: readonly import("@dxos/echo-protocol").EncodedReference[] | undefined;
         readonly classInstance?: TestClass | undefined;
-    }, never>>;
+        readonly other?: any;
+    }, never>;
     /** @deprecated Use another test schema or create a specific local test schema. */
     interface ExampleSchema extends Schema.Schema.Type<typeof ExampleSchema> {
     }
     /** @deprecated Use another test schema or create a specific local test schema. */
-    const Example: Type.obj<Schema.mutable<Schema.SchemaClass<{
+    const Example: Type.Obj<{
         readonly string?: string | undefined;
         readonly number?: number | undefined;
         readonly boolean?: boolean | undefined;
         readonly undefined?: undefined;
         readonly null?: null | undefined;
         readonly reference?: import("../internal").Ref<Example> | undefined;
-        readonly other?: any;
+        readonly stringArray?: readonly string[] | undefined;
+        readonly twoDimNumberArray?: readonly (readonly number[])[] | undefined;
         readonly nested?: {
-            field: string;
+            readonly field: string;
         } | undefined;
-        readonly stringArray?: string[] | undefined;
-        readonly twoDimNumberArray?: number[][] | undefined;
-        readonly nestedArray?: {
-            field: string;
+        readonly nestedArray?: readonly {
+            readonly field: string;
         }[] | undefined;
-        readonly nestedNullableArray?: ({
-            field: string;
+        readonly nestedNullableArray?: readonly ({
+            readonly field: string;
         } | null)[] | undefined;
-        readonly referenceArray?: import("../internal").Ref<Example>[] | undefined;
+        readonly referenceArray?: readonly import("../internal").Ref<Example>[] | undefined;
         readonly classInstance?: TestClass | undefined;
-    }, {
-        readonly string?: string | undefined;
-        readonly number?: number | undefined;
-        readonly boolean?: boolean | undefined;
-        readonly undefined?: undefined;
-        readonly null?: null | undefined;
-        readonly reference?: import("@dxos/echo-protocol").EncodedReference | undefined;
         readonly other?: any;
-        readonly nested?: {
-            field: string;
-        } | undefined;
-        readonly stringArray?: string[] | undefined;
-        readonly twoDimNumberArray?: number[][] | undefined;
-        readonly nestedArray?: {
-            field: string;
-        }[] | undefined;
-        readonly nestedNullableArray?: ({
-            field: string;
-        } | null)[] | undefined;
-        readonly referenceArray?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        readonly classInstance?: TestClass | undefined;
-    }, never>>>;
+    }, Schema.Struct.Fields>;
     /** @deprecated Use another test schema or create a specific local test schema. */
     interface Example extends Schema.Schema.Type<typeof Example> {
     }
     const MessageStruct: Schema.Struct<{
         timestamp: Schema.PropertySignature<":", string, never, ":", string, true, never>;
     }>;
-    const Message: Type.obj<Schema.Struct<{
-        timestamp: Schema.PropertySignature<":", string, never, ":", string, true, never>;
-    }>>;
+    const Message: Type.Obj<{
+        readonly timestamp: string;
+    }, Schema.Struct.Fields>;
     interface Message extends Schema.Schema.Type<typeof Message> {
     }
-    const Organization: Type.obj<Schema.Struct<{
-        name: typeof Schema.String;
-    }>>;
+    const Organization: Type.Obj<{
+        readonly name: string;
+        readonly properties?: {
+            readonly [x: string]: string;
+        } | undefined;
+    }, Schema.Struct.Fields>;
     interface Organization extends Schema.Schema.Type<typeof Organization> {
     }
-    const Person: Type.obj<Schema.SchemaClass<{
+    const Person: Type.Obj<{
         readonly name?: string | undefined;
         readonly email?: string | undefined;
+        readonly fields?: readonly {
+            readonly value: string;
+            readonly label: string;
+        }[] | undefined;
         readonly username?: string | undefined;
-        readonly tasks?: import("../internal").Ref<Task>[] | undefined;
+        readonly age?: number | undefined;
+        readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
         readonly employer?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
-            name: string;
+            readonly name: string;
+            readonly properties?: {
+                readonly [x: string]: string;
+            } | undefined;
         }> | undefined;
         readonly address?: {
             readonly city?: string | undefined;
@@ -131,38 +130,31 @@ export declare namespace TestSchema {
                 readonly lng?: number | undefined;
             };
         } | undefined;
-    }, {
-        readonly name?: string | undefined;
-        readonly email?: string | undefined;
-        readonly username?: string | undefined;
-        readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        readonly address?: {
-            readonly coordinates: {
-                readonly lat?: number | undefined;
-                readonly lng?: number | undefined;
-            };
-            readonly city?: string | undefined;
-            readonly state?: string | undefined;
-            readonly zip?: string | undefined;
-        } | undefined;
-        readonly employer?: import("@dxos/echo-protocol").EncodedReference | undefined;
-    }, never>>;
+    }, Schema.Struct.Fields>;
     interface Person extends Schema.Schema.Type<typeof Person> {
     }
-    const Task: Type.obj<Schema.SchemaClass<{
+    const Task: Type.Obj<{
         readonly description?: string | undefined;
         readonly title?: string | undefined;
         readonly deadline?: string | undefined;
         readonly completed?: boolean | undefined;
         readonly assignee?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
-            name?: string | undefined;
-            email?: string | undefined;
-            username?: string | undefined;
-            tasks?: import("../internal").Ref<Task>[] | undefined;
-            employer?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
-                name: string;
+            readonly name?: string | undefined;
+            readonly email?: string | undefined;
+            readonly fields?: readonly {
+                readonly value: string;
+                readonly label: string;
+            }[] | undefined;
+            readonly username?: string | undefined;
+            readonly age?: number | undefined;
+            readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
+            readonly employer?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
+                readonly name: string;
+                readonly properties?: {
+                    readonly [x: string]: string;
+                } | undefined;
             }> | undefined;
-            address?: {
+            readonly address?: {
                 readonly city?: string | undefined;
                 readonly state?: string | undefined;
                 readonly zip?: string | undefined;
@@ -173,25 +165,25 @@ export declare namespace TestSchema {
             } | undefined;
         }> | undefined;
         readonly previous?: import("../internal").Ref<Task> | undefined;
-        readonly subTasks?: import("../internal").Ref<Task>[] | undefined;
-    }, {
-        readonly description?: string | undefined;
-        readonly title?: string | undefined;
-        readonly deadline?: string | undefined;
-        readonly completed?: boolean | undefined;
-        readonly assignee?: import("@dxos/echo-protocol").EncodedReference | undefined;
-        readonly previous?: import("@dxos/echo-protocol").EncodedReference | undefined;
-        readonly subTasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-    }, never>>;
+        readonly subTasks?: readonly import("../internal").Ref<Task>[] | undefined;
+    }, Schema.Struct.Fields>;
     interface Task extends Schema.Schema.Type<typeof Task> {
     }
-    const HasManager: Type.relation<Schema.Struct<{}>, Type.obj<Schema.SchemaClass<{
+    const HasManager: Type.Relation<{}, import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
         readonly name?: string | undefined;
         readonly email?: string | undefined;
+        readonly fields?: readonly {
+            readonly value: string;
+            readonly label: string;
+        }[] | undefined;
         readonly username?: string | undefined;
-        readonly tasks?: import("../internal").Ref<Task>[] | undefined;
+        readonly age?: number | undefined;
+        readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
         readonly employer?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
-            name: string;
+            readonly name: string;
+            readonly properties?: {
+                readonly [x: string]: string;
+            } | undefined;
         }> | undefined;
         readonly address?: {
             readonly city?: string | undefined;
@@ -202,28 +194,21 @@ export declare namespace TestSchema {
                 readonly lng?: number | undefined;
             };
         } | undefined;
-    }, {
-        readonly name?: string | undefined;
-        readonly email?: string | undefined;
-        readonly username?: string | undefined;
-        readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        readonly address?: {
-            readonly coordinates: {
-                readonly lat?: number | undefined;
-                readonly lng?: number | undefined;
-            };
-            readonly city?: string | undefined;
-            readonly state?: string | undefined;
-            readonly zip?: string | undefined;
-        } | undefined;
-        readonly employer?: import("@dxos/echo-protocol").EncodedReference | undefined;
-    }, never>>, Type.obj<Schema.SchemaClass<{
+    }, import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
         readonly name?: string | undefined;
         readonly email?: string | undefined;
+        readonly fields?: readonly {
+            readonly value: string;
+            readonly label: string;
+        }[] | undefined;
         readonly username?: string | undefined;
-        readonly tasks?: import("../internal").Ref<Task>[] | undefined;
+        readonly age?: number | undefined;
+        readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
         readonly employer?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
-            name: string;
+            readonly name: string;
+            readonly properties?: {
+                readonly [x: string]: string;
+            } | undefined;
         }> | undefined;
         readonly address?: {
             readonly city?: string | undefined;
@@ -234,34 +219,27 @@ export declare namespace TestSchema {
                 readonly lng?: number | undefined;
             };
         } | undefined;
-    }, {
-        readonly name?: string | undefined;
-        readonly email?: string | undefined;
-        readonly username?: string | undefined;
-        readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        readonly address?: {
-            readonly coordinates: {
-                readonly lat?: number | undefined;
-                readonly lng?: number | undefined;
-            };
-            readonly city?: string | undefined;
-            readonly state?: string | undefined;
-            readonly zip?: string | undefined;
-        } | undefined;
-        readonly employer?: import("@dxos/echo-protocol").EncodedReference | undefined;
-    }, never>>>;
+    }, Schema.Struct.Fields>;
     interface HasManager extends Schema.Schema.Type<typeof HasManager> {
     }
-    const EmployedBy: Type.relation<Schema.Struct<{
-        role: typeof Schema.String;
-        since: Schema.optional<typeof Schema.String>;
-    }>, Type.obj<Schema.SchemaClass<{
+    const EmployedBy: Type.Relation<{
+        readonly role: string;
+        readonly since?: string | undefined;
+    }, import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
         readonly name?: string | undefined;
         readonly email?: string | undefined;
+        readonly fields?: readonly {
+            readonly value: string;
+            readonly label: string;
+        }[] | undefined;
         readonly username?: string | undefined;
-        readonly tasks?: import("../internal").Ref<Task>[] | undefined;
+        readonly age?: number | undefined;
+        readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
         readonly employer?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
-            name: string;
+            readonly name: string;
+            readonly properties?: {
+                readonly [x: string]: string;
+            } | undefined;
         }> | undefined;
         readonly address?: {
             readonly city?: string | undefined;
@@ -272,24 +250,12 @@ export declare namespace TestSchema {
                 readonly lng?: number | undefined;
             };
         } | undefined;
-    }, {
-        readonly name?: string | undefined;
-        readonly email?: string | undefined;
-        readonly username?: string | undefined;
-        readonly tasks?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        readonly address?: {
-            readonly coordinates: {
-                readonly lat?: number | undefined;
-                readonly lng?: number | undefined;
-            };
-            readonly city?: string | undefined;
-            readonly state?: string | undefined;
-            readonly zip?: string | undefined;
+    }, import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
+        readonly name: string;
+        readonly properties?: {
+            readonly [x: string]: string;
         } | undefined;
-        readonly employer?: import("@dxos/echo-protocol").EncodedReference | undefined;
-    }, never>>, Type.obj<Schema.Struct<{
-        name: typeof Schema.String;
-    }>>>;
+    }, Schema.Struct.Fields>;
     interface EmployedBy extends Schema.Schema.Type<typeof EmployedBy> {
     }
     enum RecordType {
@@ -297,20 +263,28 @@ export declare namespace TestSchema {
         PERSONAL = 1,
         WORK = 2
     }
-    const Container: Type.obj<Schema.SchemaClass<{
-        readonly records?: {
+    const Container: Type.Obj<{
+        readonly records?: readonly {
             readonly description?: string | undefined;
-            readonly type?: RecordType | undefined;
             readonly title?: string | undefined;
-            readonly contacts?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
-                name?: string | undefined;
-                email?: string | undefined;
-                username?: string | undefined;
-                tasks?: import("../internal").Ref<Task>[] | undefined;
-                employer?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
-                    name: string;
+            readonly type?: RecordType | undefined;
+            readonly contacts?: readonly import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
+                readonly name?: string | undefined;
+                readonly email?: string | undefined;
+                readonly fields?: readonly {
+                    readonly value: string;
+                    readonly label: string;
+                }[] | undefined;
+                readonly username?: string | undefined;
+                readonly age?: number | undefined;
+                readonly tasks?: readonly import("../internal").Ref<Task>[] | undefined;
+                readonly employer?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {
+                    readonly name: string;
+                    readonly properties?: {
+                        readonly [x: string]: string;
+                    } | undefined;
                 }> | undefined;
-                address?: {
+                readonly address?: {
                     readonly city?: string | undefined;
                     readonly state?: string | undefined;
                     readonly zip?: string | undefined;
@@ -321,16 +295,8 @@ export declare namespace TestSchema {
                 } | undefined;
             }>[] | undefined;
         }[] | undefined;
-        readonly objects?: import("../internal").Ref<import("../Entity").OfKind<import("../internal").EntityKind.Object> & {}>[] | undefined;
-    }, {
-        readonly records?: {
-            readonly description?: string | undefined;
-            readonly type?: RecordType | undefined;
-            readonly title?: string | undefined;
-            readonly contacts?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-        }[] | undefined;
-        readonly objects?: import("@dxos/echo-protocol").EncodedReference[] | undefined;
-    }, never>>;
+        readonly objects?: readonly import("../internal").Ref<any>[] | undefined;
+    }, Schema.Struct.Fields>;
     interface Container extends Schema.Schema.Type<typeof Container> {
     }
 }

package/dist/types/src/testing/test-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAGxC,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAEhC,yBAAiB,UAAU,CAAC;IAS1B,MAAa,SAAS;QACpB,KAAK,SAAW;QAChB,MAAM;;;KAGP;IAED,kFAAkF;IAC3E,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAea,CAAC;IAExC,kFAAkF;IAClF,UAAiB,aAAc,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC;KAAG;IAElF,kFAAkF;IAC3E,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAKnB,CAAC;IAEF,kFAAkF;IAClF,UAAiB,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;KAAG;IAO/D,MAAM,aAAa;;MAOxB,CAAC;IAEI,MAAM,OAAO;;OAKnB,CAAC;IAEF,UAAiB,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;KAAG;IAM/D,MAAM,YAAY;;OAOxB,CAAC;IAEF,UAAiB,YAAa,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC;KAAG;IAMzE,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAqBlB,CAAC;IAEF,UAAiB,MAAO,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC;KAAG;IAM7D,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAchB,CAAC;IAEF,UAAiB,IAAK,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;KAAG;IAMzD,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAOtB,CAAC;IAEF,UAAiB,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC;KAAG;IAMrE,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAUtB,CAAC;IAEF,UAAiB,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC;KAAG;IAM5E,KAAY,UAAU;QACpB,SAAS,IAAI;QACb,QAAQ,IAAI;QACZ,IAAI,IAAI;KACT;IAEM,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAoBrB,CAAC;IAEF,UAAiB,SAAU,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,SAAS,CAAC;KAAG;CAC3E"}
+{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAEhC,yBAAiB,UAAU,CAAC;IAK1B;;;OAGG;IACI,MAAM,OAAO;;4BAKnB,CAAC;IAEF,UAAiB,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;KAAG;IAUtE,MAAa,SAAS;QACpB,KAAK,SAAW;QAChB,MAAM;;;KAGP;IAED,kFAAkF;IAC3E,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAeH,CAAC;IAExB,kFAAkF;IAClF,UAAiB,aAAc,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,aAAa,CAAC;KAAG;IAElF,kFAAkF;IAC3E,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;4BAKnB,CAAC;IAEF,kFAAkF;IAClF,UAAiB,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;KAAG;IAO/D,MAAM,aAAa;;MAOxB,CAAC;IAEI,MAAM,OAAO;;4BAKnB,CAAC;IAEF,UAAiB,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;KAAG;IAM/D,MAAM,YAAY;;;;;4BAaxB,CAAC;IAEF,UAAiB,YAAa,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC;KAAG;IAMzE,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;4BA0BlB,CAAC;IAEF,UAAiB,MAAO,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC;KAAG;IAM7D,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAchB,CAAC;IAEF,UAAiB,IAAK,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;KAAG;IAMzD,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAOtB,CAAC;IAEF,UAAiB,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC;KAAG;IAMrE,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAUtB,CAAC;IAEF,UAAiB,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC;KAAG;IAM5E,KAAY,UAAU;QACpB,SAAS,IAAI;QACb,QAAQ,IAAI;QACZ,IAAI,IAAI;KACT;IAEM,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAkBrB,CAAC;IAEF,UAAiB,SAAU,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,SAAS,CAAC;KAAG;CAC3E"}

package/dist/types/src/testing/util.d.ts

@@ -9,7 +9,12 @@ export declare const createEchoSchema: (schema: Schema.Schema.AnyNoContext, vers
  * Converts AST to a format that can be compared with test matchers.
  */
 export declare const prepareAstForCompare: (obj: SchemaAST.AST) => any;
-export declare const updateCounter: (touch: () => void) => {
+/**
+ * Creates an update counter that tracks changes to reactive objects.
+ * @param objects - Reactive objects to subscribe to.
+ * @returns An object with a count property and Symbol.dispose for cleanup.
+ */
+export declare const updateCounter: (...objects: object[]) => {
     [Symbol.dispose]: () => void;
     readonly count: number;
 };

package/dist/types/src/testing/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/testing/util.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAMnD,OAAO,EAAE,UAAU,EAAiE,MAAM,aAAa,CAAC;AAIxG;;GAEG;AAEH,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,gBAAiB,KAAG,UAaxF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,CAAC,GAAG,KAAG,GAsBtD,CAAC;AAGL,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,IAAI;;;CAc9C,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/testing/util.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAKnD,OAAO,EAAE,UAAU,EAA4E,MAAM,aAAa,CAAC;AAEnH;;GAEG;AAEH,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,gBAAiB,KAAG,UAYxF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,GAAI,KAAK,SAAS,CAAC,GAAG,KAAG,GAsBtD,CAAC;AAEL;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,GAAG,SAAS,MAAM,EAAE;;;CAsBjD,CAAC"}