fix: rework recursive references, closes #584

json-schema-faker · Nov 11, 2020 · ce42af1 · ce42af1
1 parent 581aeb2
commit ce42af1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/lib/core/buildResolveSchema.js b/src/lib/core/buildResolveSchema.js
@@ -79,14 +79,14 @@ const buildResolveSchema = ({
       // this is the only case where all sub-schemas
       // must be resolved before any merge
       schemas.forEach(subSchema => {
-        const _sub = recursiveUtil.resolveSchema(subSchema, null, rootPath);
+        const _sub = resolveSchema(subSchema, null, rootPath);
 
         // call given thunks if present
         utils.merge(sub, typeof _sub.thunk === 'function'
           ? _sub.thunk(sub)
           : _sub);
         if (Array.isArray(sub.allOf)) {
-          recursiveUtil.resolveSchema(sub, index, rootPath);
+          resolveSchema(sub, index, rootPath);
         }
       });
     }
@@ -130,7 +130,7 @@ const buildResolveSchema = ({
 
     Object.keys(sub).forEach(prop => {
       if ((Array.isArray(sub[prop]) || typeof sub[prop] === 'object') && !utils.isKey(prop)) {
-        sub[prop] = recursiveUtil.resolveSchema(sub[prop], prop, rootPath.concat(prop));
+        sub[prop] = resolveSchema(sub[prop], prop, rootPath.concat(prop));
       }
     });
 
@@ -146,7 +146,7 @@ const buildResolveSchema = ({
     return container.wrap(sub);
   };
 
-  return recursiveUtil;
+  return resolveSchema;
 };
 
 export default buildResolveSchema;
diff --git a/src/lib/core/run.js b/src/lib/core/run.js
@@ -91,7 +91,7 @@ function run(refs, schema, container) {
   const refDepthMax = optionAPI('refDepthMax') || 3;
 
   try {
-    const { resolveSchema } = buildResolveSchema({
+    const resolveSchema = buildResolveSchema({
       refs,
       schema,
       container,

diff --git a/tests/schema/core/option/refDepth.json b/tests/schema/core/option/refDepth.json
@@ -53,11 +53,7 @@
                         {
                           "subA": [
                             {
-                              "subA": [
-                                {
-                                  "subA": []
-                                }
-                              ]
+                              "subA": []
                             }
                           ]
                         }