Handle circular-refs and such; fixes #258 #427

src/core/run.js

@@ -117,9 +117,10 @@ function resolve(obj, data, values, property) {
 // TODO provide types
 function run(refs, schema, container) {
   let depth = 0;
+  let lastRef;
 
   try {
-    const result = traverse(utils.clone(schema), [], function reduce(sub, index, rootPath, parentSchema) {
+    const result = traverse(utils.clone(schema), [], function reduce(sub, index, rootPath) {
       if (typeof sub.generate === 'function') {
         return sub;
       }
@@ -134,15 +135,14 @@ function run(refs, schema, container) {
       }
 
       if (typeof sub.$ref === 'string') {
-        if (index !== null && parentSchema && parentSchema.required) {
-          if (parentSchema.required.includes(index)) return sub;
-        }
-
-        if (sub.$ref === '#' || (++depth > random.number(1, 2))) {
+        // increasing depth only for repeated refs seems to be fixing #258
+        if (sub.$ref === '#' || (lastRef === sub.$ref && ++depth > random.number(0, 3))) {
           delete sub.$ref;
           return sub;
         }
 
+        lastRef = sub.$ref;
+
         let ref;
 
         if (sub.$ref.indexOf('#/') === -1) {
@@ -221,7 +221,7 @@ function run(refs, schema, container) {
 
       Object.keys(sub).forEach(prop => {
         if ((Array.isArray(sub[prop]) || typeof sub[prop] === 'object') && !utils.isKey(prop)) {
-          sub[prop] = reduce(sub[prop], prop, rootPath.concat(prop), parentSchema);
+          sub[prop] = reduce(sub[prop], prop, rootPath.concat(prop));
         }
       });
 

src/types/object.js

@@ -43,7 +43,7 @@ function objectType(value, path, resolve, traverseCallback) {
       }
     });
 
-    return traverseCallback(props, path.concat(['properties']), resolve);
+    return traverseCallback(props, path.concat(['properties']), resolve, value);
   }
 
   const optionalsProbability = optionAPI('alwaysFakeOptionals') === true ? 1.0 : optionAPI('optionalsProbability');
@@ -100,7 +100,7 @@ function objectType(value, path, resolve, traverseCallback) {
 
       return traverseCallback({
         allOf: _defns.concat(value),
-      }, path.concat(['properties']), resolve);
+      }, path.concat(['properties']), resolve, value);
     }
   }
 

tests/schema/core/issues/issue-427.json

@@ -94,7 +94,6 @@
       "set": {
         "optionalsProbability": 0.6
       },
-      "skip": true,
       "valid": true
     }
   ]