fix: object type checking

Author: jedwards1211

src/errorReporting/typeOf.ts

@@ -1,8 +1,9 @@
 export default function typeOf(value: any): string {
   if (value == null) return String(value)
   if (typeof value !== 'object') return typeof value
-  if (value.constructor) return value.constructor.name
+  if (value.constructor && value.constructor !== Object)
+    return value.constructor.name
   return `{\n${Object.keys(value)
-    .map(key => `  ${key}: ${typeOf(value)}`)
+    .map(key => `  ${key}: ${typeOf(value[key])}`)
     .join(',\n')}\n}`
 }

src/index.ts

@@ -61,7 +61,7 @@ export const symbol = () => new SymbolType()
 export const symbolLiteral = (value: symbol) => new SymbolLiteralType(value)
 
 export function object<S extends {}>(
-  properties: { [K in keyof S]: Type<S[K]> }
+  properties: { [K in keyof S]-?: Type<S[K]> }
 ): Type<S> {
   return new ObjectType(
     Object.keys(properties).map(
@@ -87,12 +87,12 @@ type Tag = {
   PropagateAtLaunch?: boolean | null | undefined
 }
 
-const TagType = object({
+const TagType = object<Tag>({
   Key: string(),
   Value: string(),
   PropagateAtLaunch: nullable(boolean()),
 })
 
 const TagsType = new ArrayType(TagType)
 
-TagsType.assert([{ Key: 'foo', Value: 'bar', Qux: 2, PropagateAtLaunch: true }])
+TagsType.assert([{ Key: 'foo', Value: 'bar', Qux: 2 }])

src/types/IntersectionType.ts

@@ -102,19 +102,6 @@ export default class IntersectionType<T extends {}> extends Type<T> {
     }
   }
 
-  unwrap(): ObjectType<T> {
-    const properties: any = []
-    const indexers = []
-    const { types } = this
-    for (let i = 0; i < types.length; i++) {
-      const type = types[i].unwrap()
-      invariant(type instanceof ObjectType, 'Can only intersect object types')
-      indexers.push(...(type as ObjectType<any>).indexers)
-      mergeProperties(properties, (type as ObjectType<any>).properties)
-    }
-    return new ObjectType<T>(properties, indexers, true)
-  }
-
   toString(): string {
     return this.types.join(' & ')
   }

src/types/NullableType.ts

@@ -4,7 +4,7 @@ import NullLiteralType from './NullLiteralType'
 import VoidType from './VoidType'
 import Validation, { ErrorTuple, IdentifierPath } from '../Validation'
 
-export default class NullableType<T> extends Type<T> {
+export default class NullableType<T> extends Type<T | null | undefined> {
   typeName: string = 'NullableType'
   type: Type<T>
 
@@ -46,13 +46,6 @@ export default class NullableType<T> extends Type<T> {
     }
   }
 
-  /**
-   * Get the inner type or value.
-   */
-  unwrap(): Type<T> {
-    return this
-  }
-
   toString(): string {
     return `${this.type.toString()} | null | undefined`
   }

src/types/ObjectType.ts

@@ -51,7 +51,6 @@ export default class ObjectType<T extends {}> extends Type<T> {
         return property
       }
     }
-    return this.getIndexer(key)
   }
 
   setProperty(
@@ -85,7 +84,7 @@ export default class ObjectType<T extends {}> extends Type<T> {
         return true
       }
     }
-    return this.hasIndexer(key)
+    return false
   }
 
   /**

src/types/ObjectTypeIndexer.ts

@@ -87,10 +87,6 @@ export default class ObjectTypeIndexer<
     }
   }
 
-  unwrap(): Type<V> {
-    return this.value.unwrap()
-  }
-
   toString(): string {
     return `[${this.id}: ${this.key.toString()}]: ${this.value.toString()};`
   }

src/types/ObjectTypeProperty.ts

@@ -144,10 +144,6 @@ export default class ObjectTypeProperty<
     }
   }
 
-  unwrap(): Type<V> {
-    return this.value.unwrap()
-  }
-
   toString(): string {
     let key: any = this.key
     if (typeof key === 'symbol') {

src/types/Type.ts

@@ -9,6 +9,8 @@ import { ErrorTuple, IdentifierPath } from '../Validation'
  * This is the base class for all types.
  */
 export default class Type<T> {
+  readonly __type: T = null as any
+  readonly __constraint: (value: T) => any = null as any
   typeName: string = 'Type'
 
   constructor() {}
@@ -51,13 +53,6 @@ export default class Type<T> {
     return input
   }
 
-  /**
-   * Get the inner type.
-   */
-  unwrap(): Type<T> {
-    return this
-  }
-
   toString() {
     return '$Type'
   }