@dxos/echo 0.8.3-main.672df60 → 0.8.3-main.7f5a14c

package/dist/types/src/Type.d.ts

@@ -10,6 +10,13 @@ export type Schema = EchoSchema.EchoSchema;
  * EchoObject schema.
  */
 export declare const Obj: (meta: EchoSchema.TypeMeta) => <Self extends Schema.Schema.Any>(self: Self) => EchoSchema.EchoTypeSchema<Self>;
+export declare namespace Obj {
+    /**
+     * Type that represents an arbitrary schema type of an object.
+     * NOTE: This is not an instance type.
+     */
+    type Any = Schema.Schema.AnyNoContext;
+}
 /**
  * EchoRelation schema.
  */
@@ -19,17 +26,6 @@ export declare const Relation: <Source extends Schema.Schema.AnyNoContext, Targe
     source: Source;
     target: Target;
 }) => <Self extends Schema.Schema.Any>(self: Self) => EchoSchema.EchoTypeSchema<Self, EchoSchema.RelationSourceTargetRefs<Schema.Schema.Type<Source>, Schema.Schema.Type<Target>>>;
-/**
- * Ref schema.
- */
-export declare const Ref: <S extends Obj.Any>(schema: S) => EchoSchema.Ref$<Schema.Schema.Type<S>>;
-export declare namespace Obj {
-    /**
-     * Type that represents an arbitrary schema type of an object.
-     * NOTE: This is not an instance type.
-     */
-    type Any = Schema.Schema.AnyNoContext;
-}
 export declare namespace Relation {
     /**
      * Type that represents an arbitrary schema type of a relation.
@@ -45,6 +41,12 @@ export declare namespace Relation {
      */
     type Source<A> = A extends EchoSchema.RelationSourceTargetRefs<infer _T, infer S> ? S : never;
 }
+/**
+ * Ref schema.
+ */
+export declare const Ref: <S extends Obj.Any>(schema: S) => EchoSchema.Ref$<Schema.Schema.Type<S>>;
+export interface Ref<T> extends Schema.SchemaClass<EchoSchema.Ref<T>, EncodedReference> {
+}
 export declare namespace Ref {
     /**
      * Type that represents an arbitrary schema type of a reference.
@@ -81,7 +83,7 @@ export { EntityKind as Kind } from '@dxos/echo-schema';
 /**
  * @returns True if the schema is mutable.
  */
-export declare const isMutable: (schema: Obj.Any | Relation.Any) => boolean;
+export declare const isMutable: (schema: Schema.Schema.AnyNoContext) => schema is EchoSchema.EchoSchema;
 export { SpaceId, ObjectId, DXN } from '@dxos/keys';
-export { Expando, JsonSchemaType as JsonSchema, toJsonSchema, Format, } from '@dxos/echo-schema';
+export { Expando, Format, JsonSchemaType as JsonSchema, toEffectSchema, toJsonSchema, } from '@dxos/echo-schema';
 //# sourceMappingURL=Type.d.ts.map

package/dist/types/src/Type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Type.d.ts","sourceRoot":"","sources":["../../../src/Type.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAC;AAExC;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC;AAE3C;;GAEG;AACH,eAAO,MAAM,GAAG,gHAAwB,CAAC;AAEzC;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;kLAA0B,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,KAAK,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAkB,CAAC;AAE5G,yBAAiB,GAAG,CAAC;IACnB;;;OAGG;IAEH,KAAY,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;CAC9C;AAED,yBAAiB,QAAQ,CAAC;IACxB;;;OAGG;IAEH,KAAY,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IAE7C;;OAEG;IACH,KAAY,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAErG;;OAEG;IACH,KAAY,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,wBAAwB,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;CACtG;AAED,yBAAiB,GAAG,CAAC;IACnB;;;OAGG;IACH,KAAY,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC;CACxE;AAED;;;;;GAKG;AACH,eAAO,MAAM,MAAM,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,IAAI,CAAC,GAAG,GAAG,SAElE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,MAI5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,MAI3D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,cAAc,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,IAAI,GAAG,SAE/D,CAAC;AAEF,OAAO,EAAE,UAAU,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,OAE1D,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAEL,OAAO,EACP,cAAc,IAAI,UAAU,EAC5B,YAAY,EACZ,MAAM,GACP,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"Type.d.ts","sourceRoot":"","sources":["../../../src/Type.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,KAAK,IAAI,MAAM,YAAY,CAAC;AAExC;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC;AAE3C;;GAEG;AACH,eAAO,MAAM,GAAG,gHAAwB,CAAC;AAGzC,yBAAiB,GAAG,CAAC;IACnB;;;OAGG;IAEH,KAAY,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;CAC9C;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;kLAA0B,CAAC;AAGhD,yBAAiB,QAAQ,CAAC;IACxB;;;OAGG;IAEH,KAAY,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IAE7C;;OAEG;IACH,KAAY,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,wBAAwB,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAErG;;OAEG;IACH,KAAY,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,wBAAwB,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;CACtG;AAED;;GAEG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,KAAK,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAkB,CAAC;AAE5G,MAAM,WAAW,GAAG,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,gBAAgB,CAAC;CAAG;AAG1F,yBAAiB,GAAG,CAAC;IACnB;;;OAGG;IACH,KAAY,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,gBAAgB,CAAC,CAAC;CACxE;AAED;;;;;GAKG;AACH,eAAO,MAAM,MAAM,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,IAAI,CAAC,GAAG,GAAG,SAElE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,MAI5D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,MAI3D,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,cAAc,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,QAAQ,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,GAAG,KAAG,IAAI,GAAG,SAE/D,CAAC;AAEF,OAAO,EAAE,UAAU,IAAI,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,SAAS,yEAAuB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEpD,OAAO,EAEL,OAAO,EAEP,MAAM,EACN,cAAc,IAAI,UAAU,EAC5B,cAAc,EACd,YAAY,GACb,MAAM,mBAAmB,CAAC"}

package/dist/types/src/index.d.ts

@@ -1,7 +1,9 @@
-export * as Type from './Type';
+export * as Key from './Key';
 export * as Obj from './Obj';
-export * as Relation from './Relation';
 export * as Ref from './Ref';
-export { type Live } from '@dxos/live-object';
+export * as Relation from './Relation';
+export * as Type from './Type';
+export { DXN } from '@dxos/keys';
 export { Filter, Query } from '@dxos/echo-schema';
+export { type Live } from '@dxos/live-object';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAE7B,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo",
-  "version": "0.8.3-main.672df60",
+  "version": "0.8.3-main.7f5a14c",
   "description": "ECHO API",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -23,17 +23,17 @@
   "dependencies": {
     "@preact/signals-core": "^1.9.0",
     "effect": "3.14.21",
-    "@dxos/debug": "0.8.3-main.672df60",
-    "@dxos/echo-protocol": "0.8.3-main.672df60",
-    "@dxos/echo-schema": "0.8.3-main.672df60",
-    "@dxos/echo-signals": "0.8.3-main.672df60",
-    "@dxos/effect": "0.8.3-main.672df60",
-    "@dxos/invariant": "0.8.3-main.672df60",
-    "@dxos/keys": "0.8.3-main.672df60",
-    "@dxos/live-object": "0.8.3-main.672df60",
-    "@dxos/node-std": "0.8.3-main.672df60",
-    "@dxos/log": "0.8.3-main.672df60",
-    "@dxos/util": "0.8.3-main.672df60"
+    "@dxos/debug": "0.8.3-main.7f5a14c",
+    "@dxos/echo-protocol": "0.8.3-main.7f5a14c",
+    "@dxos/echo-schema": "0.8.3-main.7f5a14c",
+    "@dxos/echo-signals": "0.8.3-main.7f5a14c",
+    "@dxos/effect": "0.8.3-main.7f5a14c",
+    "@dxos/keys": "0.8.3-main.7f5a14c",
+    "@dxos/invariant": "0.8.3-main.7f5a14c",
+    "@dxos/live-object": "0.8.3-main.7f5a14c",
+    "@dxos/log": "0.8.3-main.7f5a14c",
+    "@dxos/node-std": "0.8.3-main.7f5a14c",
+    "@dxos/util": "0.8.3-main.7f5a14c"
   },
   "publishConfig": {
     "access": "public"

package/src/Key.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { SpaceId, ObjectId } from '@dxos/keys';

package/src/Obj.ts

@@ -6,34 +6,42 @@ import { Schema } from 'effect';
 
 import * as EchoSchema from '@dxos/echo-schema';
 import { assertArgument, invariant } from '@dxos/invariant';
-import type { DXN } from '@dxos/keys';
+import { type DXN } from '@dxos/keys';
 import * as LiveObject from '@dxos/live-object';
+import { assumeType } from '@dxos/util';
 
 import type * as Ref from './Ref';
 import type * as Type from './Type';
 
+export type Obj<T = any> = EchoSchema.AnyEchoObject & T;
 export type Any = EchoSchema.AnyEchoObject;
 
 export const make = LiveObject.live;
 
-// TODO(dmaretskyi): Currently broken
 export const isObject = (obj: unknown): obj is Any => {
-  return LiveObject.isLiveObject(obj);
+  assumeType<EchoSchema.InternalObjectProps>(obj);
+  return typeof obj === 'object' && obj !== null && obj[EchoSchema.EntityKindId] === EchoSchema.EntityKind.Object;
 };
 
 /**
- * Check that object or relation is an instance of a schema.
+ * Test if object or relation is an instance of a schema.
  * @example
  * ```ts
- * const person = Obj.make(Person, { name: 'John' });
+ * const john = Obj.make(Person, { name: 'John' });
+ * const johnIsPerson = Obj.instanceOf(Person)(john);
+ *
  * const isPerson = Obj.instanceOf(Person);
- * isPerson(person); // true
+ * if(isPerson(john)) {
+ *   // john is Person
+ * }
  * ```
  */
 export const instanceOf: {
-  <S extends Type.Relation.Any | Type.Obj.Any>(schema: S): (value: unknown) => value is S;
-  <S extends Type.Relation.Any | Type.Obj.Any>(schema: S, value: unknown): value is S;
-} = ((...args: any[]) => {
+  <S extends Type.Relation.Any | Type.Obj.Any>(schema: S): (value: unknown) => value is Schema.Schema.Type<S>;
+  <S extends Type.Relation.Any | Type.Obj.Any>(schema: S, value: unknown): value is Schema.Schema.Type<S>;
+} = ((
+  ...args: [schema: Type.Relation.Any | Type.Obj.Any, value: unknown] | [schema: Type.Relation.Any | Type.Obj.Any]
+) => {
   if (args.length === 1) {
     return (obj: unknown) => EchoSchema.isInstanceOf(args[0], obj);
   }
@@ -55,12 +63,8 @@ export const getDXN = (obj: Any): DXN => {
  * @returns The DXN of the object's type.
  * @example dxn:example.com/type/Contact:1.0.0
  */
-// TODO(dmaretskyi): Allow returning undefined.
-export const getSchemaDXN = (obj: Any): DXN => {
-  const type = EchoSchema.getType(obj);
-  invariant(type != null, 'Invalid object.');
-  return type;
-};
+// TODO(burdon): Expando does not have a type.
+export const getTypeDXN = EchoSchema.getType;
 
 /**
  * @returns The typename of the object's type.
@@ -70,7 +74,7 @@ export const getTypename = (obj: Any): string | undefined => {
   const schema = getSchema(obj);
   if (schema == null) {
     // Try to extract typename from DXN.
-    return getSchemaDXN(obj)?.asTypeDXN()?.type;
+    return EchoSchema.getType(obj)?.asTypeDXN()?.type;
   }
 
   return EchoSchema.getSchemaTypename(schema);
@@ -103,16 +107,15 @@ export const getLabel = (obj: Any): string | undefined => {
 export type JSON = EchoSchema.ObjectJSON;
 
 /**
- * Converts object to it's JSON representation.
+ * Converts object to its JSON representation.
  *
  * The same algorithm is used when calling the standard `JSON.stringify(obj)` function.
  */
 export const toJSON = (obj: Any): JSON => EchoSchema.objectToJSON(obj);
 
 /**
- * Creates an object from it's json representation.
- * Performs schema validation.
- * References and schema will be resolvable if the `refResolver` is provided.
+ * Creates an object from its json representation, performing schema validation.
+ * References and schemas will be resolvable if the `refResolver` is provided.
  *
  * The function need to be async to support resolving the schema as well as the relation endpoints.
  */

package/src/Ref.ts

@@ -6,14 +6,10 @@ import * as EchoSchema from '@dxos/echo-schema';
 
 import type * as Obj from './Obj';
 
+export type Ref<T extends Obj.Any> = EchoSchema.Ref<T>;
 export type Any = EchoSchema.Ref<Obj.Any>;
 
-export const make = EchoSchema.Ref.make;
-
-export const isRef: (value: unknown) => value is Any = EchoSchema.Ref.isRef;
-
-// TODO(dmaretskyi): Consider just allowing `make` to accept DXN.
-export const fromDXN = EchoSchema.Ref.fromDXN;
+export const Array = EchoSchema.RefArray;
 
 /**
  * Extract reference target.
@@ -24,3 +20,10 @@ export type Target<R extends Any> = R extends EchoSchema.Ref<infer T> ? T : neve
  * Reference resolver.
  */
 export type Resolver = EchoSchema.RefResolver;
+
+export const isRef: (value: unknown) => value is Any = EchoSchema.Ref.isRef;
+
+export const make = EchoSchema.Ref.make;
+
+// TODO(dmaretskyi): Consider just allowing `make` to accept DXN.
+export const fromDXN = EchoSchema.Ref.fromDXN;

package/src/Type.ts

@@ -19,16 +19,7 @@ export type Schema = EchoSchema.EchoSchema;
  */
 export const Obj = EchoSchema.EchoObject;
 
-/**
- * EchoRelation schema.
- */
-export const Relation = EchoSchema.EchoRelation;
-
-/**
- * Ref schema.
- */
-export const Ref: <S extends Obj.Any>(schema: S) => EchoSchema.Ref$<Schema.Schema.Type<S>> = EchoSchema.Ref;
-
+// TODO(buurdon): Move to Obj?
 export namespace Obj {
   /**
    * Type that represents an arbitrary schema type of an object.
@@ -38,6 +29,12 @@ export namespace Obj {
   export type Any = Schema.Schema.AnyNoContext;
 }
 
+/**
+ * EchoRelation schema.
+ */
+export const Relation = EchoSchema.EchoRelation;
+
+// TODO(buurdon): Move to Relation?
 export namespace Relation {
   /**
    * Type that represents an arbitrary schema type of a relation.
@@ -57,6 +54,14 @@ export namespace Relation {
   export type Source<A> = A extends EchoSchema.RelationSourceTargetRefs<infer _T, infer S> ? S : never;
 }
 
+/**
+ * Ref schema.
+ */
+export const Ref: <S extends Obj.Any>(schema: S) => EchoSchema.Ref$<Schema.Schema.Type<S>> = EchoSchema.Ref;
+
+export interface Ref<T> extends Schema.SchemaClass<EchoSchema.Ref<T>, EncodedReference> {}
+
+// TODO(buurdon): Move to Ref?
 export namespace Ref {
   /**
    * Type that represents an arbitrary schema type of a reference.
@@ -112,16 +117,16 @@ export { EntityKind as Kind } from '@dxos/echo-schema';
 /**
  * @returns True if the schema is mutable.
  */
-export const isMutable = (schema: Obj.Any | Relation.Any): boolean => {
-  return EchoSchema.isMutable(schema);
-};
+export const isMutable = EchoSchema.isMutable;
 
 export { SpaceId, ObjectId, DXN } from '@dxos/keys';
 
 export {
   //
   Expando,
+  // TODO(burdon): Standardize.
+  Format,
   JsonSchemaType as JsonSchema,
+  toEffectSchema,
   toJsonSchema,
-  Format,
 } from '@dxos/echo-schema';

package/src/index.ts

@@ -2,10 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as Type from './Type';
+export * as Key from './Key';
 export * as Obj from './Obj';
-export * as Relation from './Relation';
 export * as Ref from './Ref';
+export * as Relation from './Relation';
+export * as Type from './Type';
 
-export { type Live } from '@dxos/live-object';
+export { DXN } from '@dxos/keys';
 export { Filter, Query } from '@dxos/echo-schema';
+export { type Live } from '@dxos/live-object';

package/src/test/api.test.ts

@@ -117,12 +117,27 @@ describe('Experimental API review', () => {
 
     expect(Schema.is(Testing.Person)(contact)).to.be.true;
     expect(Testing.Person.instanceOf(contact)).to.be.true;
-    expect(Obj.instanceOf(Testing.Person)(contact)).to.be.true;
-    expect(Obj.instanceOf(Testing.Organization)(organization)).to.be.true;
+    expect(Obj.instanceOf(Testing.Person, contact)).to.be.true;
+    expect(Obj.instanceOf(Testing.Organization, organization)).to.be.true;
+
+    const isPerson = Obj.instanceOf(Testing.Person);
+    const x: any = {};
+    if (isPerson(x)) {
+      x.name;
+    }
   });
 
   test('default props', ({ expect }) => {
     const message = Obj.make(Testing.Message, Testing.MessageStruct.make({}));
     expect(message.timestamp).to.exist;
   });
+
+  test('Obj.isObject', ({ expect }) => {
+    const guy = Obj.make(Testing.Person, { name: 'Test' });
+    expect(Obj.isObject(guy)).to.be.true;
+    expect(Obj.isObject(null)).to.be.false;
+    expect(Obj.isObject(undefined)).to.be.false;
+    expect(Obj.isObject(1)).to.be.false;
+    expect(Obj.isObject('string')).to.be.false;
+  });
 });