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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo",
-  "version": "0.8.4-main.21d9917",
+  "version": "0.8.4-main.2244d791bb",
   "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": [
@@ -198,19 +119,19 @@
     "src"
   ],
   "dependencies": {
-    "effect": "3.19.11",
-    "@dxos/async": "0.8.4-main.21d9917",
-    "@dxos/context": "0.8.4-main.21d9917",
-    "@dxos/debug": "0.8.4-main.21d9917",
-    "@dxos/echo-protocol": "0.8.4-main.21d9917",
-    "@dxos/effect": "0.8.4-main.21d9917",
-    "@dxos/errors": "0.8.4-main.21d9917",
-    "@dxos/invariant": "0.8.4-main.21d9917",
-    "@dxos/log": "0.8.4-main.21d9917",
-    "@dxos/keys": "0.8.4-main.21d9917",
-    "@dxos/util": "0.8.4-main.21d9917",
-    "@dxos/protocols": "0.8.4-main.21d9917",
-    "@dxos/node-std": "0.8.4-main.21d9917"
+    "effect": "3.19.16",
+    "@dxos/async": "0.8.4-main.2244d791bb",
+    "@dxos/debug": "0.8.4-main.2244d791bb",
+    "@dxos/context": "0.8.4-main.2244d791bb",
+    "@dxos/effect": "0.8.4-main.2244d791bb",
+    "@dxos/echo-protocol": "0.8.4-main.2244d791bb",
+    "@dxos/errors": "0.8.4-main.2244d791bb",
+    "@dxos/invariant": "0.8.4-main.2244d791bb",
+    "@dxos/keys": "0.8.4-main.2244d791bb",
+    "@dxos/log": "0.8.4-main.2244d791bb",
+    "@dxos/node-std": "0.8.4-main.2244d791bb",
+    "@dxos/util": "0.8.4-main.2244d791bb",
+    "@dxos/protocols": "0.8.4-main.2244d791bb"
   },
   "publishConfig": {
     "access": "public"

package/src/Annotation.ts

@@ -16,3 +16,30 @@ export {
   setDescriptionWithSchema,
   setLabelWithSchema,
 } from './internal/annotations';
+
+import type * as Schema from 'effect/Schema';
+
+import * as internalAnnotations from './internal/annotations';
+
+interface MakeProps<T> {
+  id: string;
+  schema: Schema.Schema<T, any, never>;
+}
+
+/**
+ * Create a new schema annotation.
+ * Annotation can be assigned both to fields and to the schema itself.
+ * Annotation is serialized with the schema.
+ *
+ * @example
+ * ```ts
+ * const ColorAnnotation = Annotation.make({
+ *   id: 'dxos.org/annotation/Color',
+ *   schema: Schema.String,
+ * });
+ *
+ * const schema = Schema.String.annotations(ColorAnnotation.set('red'));
+ * ```
+ */
+export const make: <T>(props: MakeProps<T>) => internalAnnotations.AnnotationHelper<T> =
+  internalAnnotations.makeUserAnnotation;

package/src/Database.ts

@@ -186,151 +186,168 @@ export const isDatabase = (obj: unknown): obj is Database => {
 
 export const Database: Schema.Schema<Database> = Schema.Any.pipe(Schema.filter((space) => isDatabase(space)));
 
+/**
+ * Effect service tag for Database dependency injection.
+ */
 export class Service extends Context.Tag('@dxos/echo/Database/Service')<
   Service,
   {
     readonly db: Database;
   }
->() {
-  static notAvailable = Layer.succeed(Service, {
-    get db(): Database {
-      throw new Error('Database not available');
-    },
-  });
-
-  static make = (db: Database): Context.Tag.Service<Service> => {
-    return {
-      get db() {
-        return db;
-      },
-    };
-  };
+>() {}
 
-  static layer = (db: Database): Layer.Layer<Service> => {
-    return Layer.succeed(Service, Service.make(db));
+/**
+ * Layer that provides a Database service that throws when accessed.
+ * Useful as a default layer when no database is available.
+ */
+export const notAvailable = Layer.succeed(Service, {
+  get db(): Database {
+    throw new Error('Database not available');
+  },
+});
+
+/**
+ * Creates a Database service instance from a Database.
+ */
+export const makeService = (db: Database): Context.Tag.Service<Service> => {
+  return {
+    get db() {
+      return db;
+    },
   };
+};
 
-  // TODO(dmaretskyi): Move all those to the top-level API of Database.ts module.
+/**
+ * Creates a Layer that provides the Database service.
+ */
+export const layer = (db: Database): Layer.Layer<Service> => {
+  return Layer.succeed(Service, makeService(db));
+};
 
-  /**
-   * Returns the space ID of the database.
-   */
-  static spaceId = Effect.gen(function* () {
-    const { db } = yield* Service;
-    return db.spaceId;
-  });
+/**
+ * Returns the space ID of the database.
+ */
+export const spaceId = Effect.gen(function* () {
+  const { db } = yield* Service;
+  return db.spaceId;
+});
 
-  /**
-   * Resolves an object by its DXN.
-   */
-  static resolve: {
-    // No type check.
-    (ref: DXN | Ref<any>): Effect.Effect<Entity.Unknown, never, Service>;
-    // Check matches schema.
-    <S extends Type.Entity.Any>(
-      ref: DXN | Ref<any>,
-      schema: S,
-    ): Effect.Effect<Schema.Schema.Type<S>, Err.ObjectNotFoundError, Service>;
-  } = (<S extends Type.Entity.Any>(
+/**
+ * Resolves an object by its DXN.
+ */
+export const resolve: {
+  // No type check.
+  (ref: DXN | Ref<any>): Effect.Effect<Entity.Unknown, never, Service>;
+  // Check matches schema.
+  <S extends Type.Entity.Any>(
     ref: DXN | Ref<any>,
-    schema?: S,
-  ): Effect.Effect<Schema.Schema.Type<S>, Err.ObjectNotFoundError, Service> =>
-    Effect.gen(function* () {
-      const { db } = yield* Service;
-      const dxn = ref instanceof DXN ? ref : ref.dxn;
-      const object = yield* promiseWithCauseCapture(() =>
-        db.graph
-          .createRefResolver({
-            context: {
-              space: db.spaceId,
-            },
-          })
-          .resolve(dxn),
-      );
-
-      if (!object) {
-        return yield* Effect.fail(new Err.ObjectNotFoundError(dxn));
-      }
-      invariant(!schema || isInstanceOf(schema, object), 'Object type mismatch.');
-      return object as any;
-    })) as any;
+    schema: S,
+  ): Effect.Effect<Schema.Schema.Type<S>, Err.ObjectNotFoundError, Service>;
+} = (<S extends Type.Entity.Any>(
+  ref: DXN | Ref<any>,
+  schema?: S,
+): Effect.Effect<Schema.Schema.Type<S>, Err.ObjectNotFoundError, Service> =>
+  Effect.gen(function* () {
+    const { db } = yield* Service;
+    const dxn = ref instanceof DXN ? ref : ref.dxn;
+    const object = yield* promiseWithCauseCapture(() =>
+      db.graph
+        .createRefResolver({
+          context: {
+            space: db.spaceId,
+          },
+        })
+        .resolve(dxn),
+    );
 
-  /**
-   * Loads an object reference.
-   */
-  static load: <T>(ref: Ref<T>) => Effect.Effect<T, Err.ObjectNotFoundError, never> = Effect.fn(function* (ref) {
-    const object = yield* promiseWithCauseCapture(() => ref.tryLoad());
     if (!object) {
-      return yield* Effect.fail(new Err.ObjectNotFoundError(ref.dxn));
+      return yield* Effect.fail(new Err.ObjectNotFoundError(dxn));
     }
-    return object;
-  });
+    invariant(!schema || isInstanceOf(schema, object), 'Object type mismatch.');
+    return object as any;
+  })) as any;
 
-  /**
-   * Loads an object reference option.
-   */
-  // TODO(dmaretskyi): Do we need this -- you can just use `Effect.catchTag` in calling code instead.
-  static loadOption: <T>(ref: Ref<T>) => Effect.Effect<Option.Option<T>, never, never> = Effect.fn(function* (ref) {
-    const object = yield* Service.load(ref).pipe(
-      Effect.catchTag('ObjectNotFoundError', () => Effect.succeed(undefined)),
-    );
+/**
+ * Loads an object reference.
+ */
+export const load: <T>(ref: Ref<T>) => Effect.Effect<T, Err.ObjectNotFoundError, never> = Effect.fn(function* (ref) {
+  const object = yield* promiseWithCauseCapture(() => ref.tryLoad());
+  if (!object) {
+    return yield* Effect.fail(new Err.ObjectNotFoundError(ref.dxn));
+  }
+  return object;
+});
 
-    return Option.fromNullable(object);
-  });
+/**
+ * Loads an object reference option.
+ */
+// TODO(dmaretskyi): Do we need this -- you can just use `Effect.catchTag` in calling code instead.
+export const loadOption: <T>(ref: Ref<T>) => Effect.Effect<Option.Option<T>, never, never> = Effect.fn(function* (ref) {
+  const object = yield* load(ref).pipe(Effect.catchTag('ObjectNotFoundError', () => Effect.succeed(undefined)));
 
-  /**
-   * @link EchoDatabase.add
-   */
-  static add = <T extends Entity.Unknown>(obj: T): Effect.Effect<T, never, Service> =>
-    Service.pipe(Effect.map(({ db }) => db.add(obj)));
+  return Option.fromNullable(object);
+});
 
-  /**
-   * @link EchoDatabase.remove
-   */
-  static remove = <T extends Entity.Unknown>(obj: T): Effect.Effect<void, never, Service> =>
-    Service.pipe(Effect.map(({ db }) => db.remove(obj)));
+/**
+ * Adds an object to the database.
+ * @see {@link Database.add}
+ */
+export const add = <T extends Entity.Unknown>(obj: T): Effect.Effect<T, never, Service> =>
+  Service.pipe(Effect.map(({ db }) => db.add(obj)));
 
-  /**
-   * @link EchoDatabase.flush
-   */
-  static flush = (opts?: FlushOptions) =>
-    Service.pipe(Effect.flatMap(({ db }) => promiseWithCauseCapture(() => db.flush(opts))));
+/**
+ * Removes an object from the database.
+ * @see {@link Database.remove}
+ */
+export const remove = <T extends Entity.Unknown>(obj: T): Effect.Effect<void, never, Service> =>
+  Service.pipe(Effect.map(({ db }) => db.remove(obj)));
 
-  /**
-   * Creates a `QueryResult` object that can be subscribed to.
-   */
-  static query: {
-    <Q extends Query.Any>(query: Q): Effect.Effect<QueryResult.QueryResult<Query.Type<Q>>, never, Service>;
-    <F extends Filter.Any>(filter: F): Effect.Effect<QueryResult.QueryResult<Filter.Type<F>>, never, Service>;
-  } = (queryOrFilter: Query.Any | Filter.Any) =>
-    Service.pipe(
-      Effect.map(({ db }) => db.query(queryOrFilter as any) as QueryResult.QueryResult<any>),
-      Effect.withSpan('Service.query'),
-    );
+/**
+ * Flushes pending changes to disk.
+ * @see {@link Database.flush}
+ */
+export const flush = (opts?: FlushOptions) =>
+  Service.pipe(Effect.flatMap(({ db }) => promiseWithCauseCapture(() => db.flush(opts))));
 
-  /**
-   * Executes the query once and returns the results.
-   */
-  static runQuery: {
-    <Q extends Query.Any>(query: Q): Effect.Effect<Query.Type<Q>[], never, Service>;
-    <F extends Filter.Any>(filter: F): Effect.Effect<Filter.Type<F>[], never, Service>;
-  } = (queryOrFilter: Query.Any | Filter.Any) =>
-    Service.query(queryOrFilter as any).pipe(
-      Effect.flatMap((queryResult) => promiseWithCauseCapture(() => queryResult.run())),
-    );
+/**
+ * Creates a `QueryResult` object that can be subscribed to.
+ */
+export const query: {
+  <Q extends Query.Any>(query: Q): Effect.Effect<QueryResult.QueryResult<Query.Type<Q>>, never, Service>;
+  <F extends Filter.Any>(filter: F): Effect.Effect<QueryResult.QueryResult<Filter.Type<F>>, never, Service>;
+} = (queryOrFilter: Query.Any | Filter.Any) =>
+  Service.pipe(
+    Effect.map(({ db }) => db.query(queryOrFilter as any) as QueryResult.QueryResult<any>),
+    Effect.withSpan('Database.query'),
+  );
 
-  // TODO(dmaretskyi): Change API to `yield* Service.querySchema(...).first` and `yield* Service.querySchema(...).schema`.
+/**
+ * Executes the query once and returns the results.
+ */
+export const runQuery: {
+  <Q extends Query.Any>(query: Q): Effect.Effect<Query.Type<Q>[], never, Service>;
+  <F extends Filter.Any>(filter: F): Effect.Effect<Filter.Type<F>[], never, Service>;
+} = (queryOrFilter: Query.Any | Filter.Any) =>
+  query(queryOrFilter as any).pipe(Effect.flatMap((queryResult) => promiseWithCauseCapture(() => queryResult.run())));
 
-  static schemaQuery = <Q extends Types.NoExcessProperties<SchemaRegistry.Query, Q>>(
-    query?: Q & SchemaRegistry.Query,
-  ): Effect.Effect<QueryResult.QueryResult<SchemaRegistry.ExtractQueryResult<Q>>, never, Service> =>
-    Service.pipe(
-      Effect.map(({ db }) => db.schemaRegistry.query(query)),
-      Effect.withSpan('Service.schemaQuery'),
-    );
+/**
+ * Creates a schema query result that can be subscribed to.
+ */
+// TODO(dmaretskyi): Change API to `yield* Database.querySchema(...).first` and `yield* Database.querySchema(...).schema`.
+export const schemaQuery = <Q extends Types.NoExcessProperties<SchemaRegistry.Query, Q>>(
+  schemaQueryOptions?: Q & SchemaRegistry.Query,
+): Effect.Effect<QueryResult.QueryResult<SchemaRegistry.ExtractQueryResult<Q>>, never, Service> =>
+  Service.pipe(
+    Effect.map(({ db }) => db.schemaRegistry.query(schemaQueryOptions)),
+    Effect.withSpan('Database.schemaQuery'),
+  );
 
-  static runSchemaQuery = <Q extends Types.NoExcessProperties<SchemaRegistry.Query, Q>>(
-    query?: Q & SchemaRegistry.Query,
-  ): Effect.Effect<SchemaRegistry.ExtractQueryResult<Q>[], never, Service> =>
-    Service.schemaQuery(query).pipe(Effect.flatMap((queryResult) => promiseWithCauseCapture(() => queryResult.run())));
-}
+/**
+ * Executes a schema query once and returns the results.
+ */
+export const runSchemaQuery = <Q extends Types.NoExcessProperties<SchemaRegistry.Query, Q>>(
+  schemaQueryOptions?: Q & SchemaRegistry.Query,
+): Effect.Effect<SchemaRegistry.ExtractQueryResult<Q>[], never, Service> =>
+  schemaQuery(schemaQueryOptions).pipe(
+    Effect.flatMap((queryResult) => promiseWithCauseCapture(() => queryResult.run())),
+  );

package/src/Err.ts

@@ -16,3 +16,23 @@ export class ObjectNotFoundError extends BaseError.extend('ObjectNotFoundError',
     super({ context: { dxn }, ...options });
   }
 }
+
+/**
+ * Reason why getting a reactive object from a snapshot failed.
+ * - `no-database`: The snapshot is not associated with a database.
+ * - `object-not-found`: The object was removed or does not exist in the database.
+ */
+export type GetReactiveErrorReason = 'no-database' | 'object-not-found';
+
+/**
+ * Error thrown when a reactive object cannot be resolved from a snapshot.
+ * Extends `BaseError` with a `reason` and optional `snapshotId` in its context.
+ */
+export class GetReactiveError extends BaseError.extend(
+  'GetReactiveError',
+  'Failed to get reactive object from snapshot',
+) {
+  constructor(options: { reason: GetReactiveErrorReason; snapshotId?: string } & BaseErrorOptions) {
+    super({ context: { reason: options.reason, snapshotId: options.snapshotId }, ...options });
+  }
+}

package/src/Obj.test.ts

@@ -77,6 +77,62 @@ describe('Obj', () => {
     });
   });
 
+  describe('snapshotOf', () => {
+    test('returns true for snapshot of matching schema', ({ expect }) => {
+      const obj = Obj.make(TestSchema.Person, { name: 'Test' });
+      const snapshot = Obj.getSnapshot(obj);
+
+      expect(Obj.snapshotOf(TestSchema.Person, snapshot)).toBe(true);
+      expect(Obj.snapshotOf(TestSchema.Organization, snapshot)).toBe(false);
+    });
+
+    test('returns false for reactive object', ({ expect }) => {
+      const obj = Obj.make(TestSchema.Person, { name: 'Test' });
+
+      expect(Obj.snapshotOf(TestSchema.Person, obj)).toBe(false);
+    });
+
+    test('returns false for plain object with matching shape', ({ expect }) => {
+      const plain = { id: 'test', name: 'Test' };
+
+      expect(Obj.snapshotOf(TestSchema.Person, plain)).toBe(false);
+    });
+
+    test('curried form works', ({ expect }) => {
+      const snapshot = Obj.getSnapshot(Obj.make(TestSchema.Person, { name: 'Test' }));
+      const isPersonSnapshot = Obj.snapshotOf(TestSchema.Person);
+
+      expect(isPersonSnapshot(snapshot)).toBe(true);
+      expect(isPersonSnapshot({})).toBe(false);
+    });
+  });
+
+  describe('getKeys', () => {
+    const SOURCE = 'test-source';
+
+    test('returns keys from reactive object and snapshot', ({ expect }) => {
+      const obj = Obj.make(TestSchema.Person, { name: 'Test' });
+      Obj.change(obj, (o) => {
+        const meta = Obj.getMeta(o);
+        meta.keys.push({ source: SOURCE, id: 'key-1' });
+        meta.keys.push({ source: SOURCE, id: 'key-2' });
+        meta.keys.push({ source: 'other', id: 'key-3' });
+      });
+
+      expect(Obj.getKeys(obj, SOURCE)).toHaveLength(2);
+      expect(Obj.getKeys(obj, SOURCE).map((k) => k.id)).toEqual(['key-1', 'key-2']);
+
+      const snapshot = Obj.getSnapshot(obj);
+      expect(Obj.getKeys(snapshot, SOURCE)).toHaveLength(2);
+      expect(Obj.getKeys(snapshot, SOURCE).map((k) => k.id)).toEqual(['key-1', 'key-2']);
+    });
+
+    test('throws for plain object without metadata', ({ expect }) => {
+      const plain = { id: 'plain-1', name: 'Plain' };
+      expect(() => Obj.getKeys(plain as any, SOURCE)).toThrow(/ObjectMeta not found/);
+    });
+  });
+
   describe('clone', () => {
     test('clones object with same properties', ({ expect }) => {
       const original = Obj.make(TestSchema.Person, {