Return thunk() within object; fix

ts/core/run.ts

@@ -53,8 +53,8 @@ function run(refs: any, schema: JsonSchema, container: Container) {
           var _sub = reduce(subSchema, maxReduceDepth + 1);
 
           // call given thunks if present
-          utils.merge(sub, typeof _sub === 'function'
-            ? _sub()
+          utils.merge(sub, typeof _sub.thunk === 'function'
+            ? _sub.thunk()
             : _sub);
         });
       }
@@ -65,12 +65,14 @@ function run(refs: any, schema: JsonSchema, container: Container) {
         delete sub.anyOf;
         delete sub.oneOf;
 
-        return () => {
+        return {
+          thunk() {
             var copy = utils.merge({}, sub);
 
             utils.merge(copy, random.pick(mix));
 
             return copy;
+          },
         };
       }
 

ts/core/traverse.ts

@@ -18,8 +18,8 @@ function traverse(schema: JsonSchema, path: SchemaPath, resolve: Function) {
   }
 
   // thunks can return sub-schemas
-  if (typeof schema === 'function') {
-    return traverse(schema(), path, resolve);
+  if (typeof schema.thunk === 'function') {
+    return traverse(schema.thunk(), path, resolve);
   }
 
   if (typeof schema.generate === 'function') {