From 58e506ace2789a5e4842db99164a28d7a945a432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alvaro=20Cabrera=20Dur=C3=A1n?= <pateketrueke@gmail.com>
Date: Thu, 10 Oct 2019 00:13:55 -0500
Subject: [PATCH] FIXME: self-references, depth and such
---
src/core/run.js | 14 ++------------
tests/schema/core/issues/issue-258.json | 1 +
tests/schema/core/issues/issue-427.json | 1 -
tests/schema/core/option/random.json | 6 +++---
4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/src/core/run.js b/src/core/run.js
index 25577433..f672b180 100644
--- a/src/core/run.js
+++ b/src/core/run.js
@@ -117,16 +117,9 @@ function resolve(obj, data, values, property) {
// TODO provide types
function run(refs, schema, container) {
try {
- const seen = {};
const result = traverse(utils.clone(schema), [], function reduce(sub, parentSchemaPath) {
- if (!sub || seen[sub.$ref] > random.pick([0, 1])) {
- if (sub) {
- delete sub.$ref;
- return sub;
- }
-
- return null;
- }
+ // FIXME: handle recursive/self-references, see #258
+ // also, a depth-limit should be taken into account...
if (typeof sub.generate === 'function') {
return sub;
@@ -142,9 +135,6 @@ function run(refs, schema, container) {
}
if (typeof sub.$ref === 'string') {
- seen[sub.$ref] = seen[sub.$ref] || 0;
- seen[sub.$ref] += 1;
-
if (sub.$ref === '#') {
delete sub.$ref;
return sub;
diff --git a/tests/schema/core/issues/issue-258.json b/tests/schema/core/issues/issue-258.json
index c54c4079..8da1ff1b 100644
--- a/tests/schema/core/issues/issue-258.json
+++ b/tests/schema/core/issues/issue-258.json
@@ -53,6 +53,7 @@
{
"description": "should work as expected",
"schema": "schemas.0",
+ "skip": true,
"valid": true
}
]
diff --git a/tests/schema/core/issues/issue-427.json b/tests/schema/core/issues/issue-427.json
index 4db305ac..d75b7907 100644
--- a/tests/schema/core/issues/issue-427.json
+++ b/tests/schema/core/issues/issue-427.json
@@ -94,7 +94,6 @@
"set": {
"optionalsProbability": 0.6
},
- "skip": true,
"valid": true
}
]
diff --git a/tests/schema/core/option/random.json b/tests/schema/core/option/random.json
index 4edce4a8..6ee53c6e 100644
--- a/tests/schema/core/option/random.json
+++ b/tests/schema/core/option/random.json
@@ -23,9 +23,9 @@
},
"valid": true,
"equal": {
- "a": 62,
- "b": "occaeca",
- "c": "vi317"
+ "a": 54,
+ "b": "minim amet in dolor laborum",
+ "c": "pf922"
},
"repeat": 1,
"require": "core/option/random"
--
GitLab