Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions src/from1ToApiTreeSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,26 @@ function flattenModelInheritance(models) {
/**
* @private
*/
function flattenTree(tree, models) {
if (Array.isArray(tree)) {
return tree.map((t) => flattenTree(t, models));
} else if (Object(tree) === tree) {
return Object.entries(tree).reduce((accumulator, [k, v]) => {
if (k === '$ref' || k === 'type') {
if (models.hasOwnProperty(v)) {
return Object.assign(accumulator, flattenTree(models[v], models));
}
}

return Object.assign(accumulator, {[k]: flattenTree(v, models)});
}, {});
}

return tree;
function flattenTree(tree, models, _refs = null) {
if(!_refs) // detect circular reference
_refs = new WeakSet();

if (Array.isArray(tree)) {
return tree.map((t) => flattenTree(t, models));
} else if (Object(tree) === tree) {
return Object.entries(tree).reduce((accumulator, [k, v]) => {
if (k === '$ref' || k === 'type' || k === 'responseModel') {
const model = models[v];
if (models.hasOwnProperty(v) && !_refs.has(model)) {
_refs.add(model);
return Object.assign(accumulator, flattenTree(model, models, _refs));
}
}
return Object.assign(accumulator, { [k]: flattenTree(v, models, _refs) });
}, {});
}

return tree;
}

const interpolationPattern = /^\{.+\}$/;
Expand Down
41 changes: 23 additions & 18 deletions src/from2ToApiTreeSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,29 @@
/**
* @private
*/
function flatten(tree, definitions) {
if (Array.isArray(tree)) {
return tree.map((t) => flatten(t, definitions));
} else if (Object(tree) === tree) {
return Object.entries(tree).reduce((accumulator, [k, v]) => {
if (k === '$ref') {
const key = v.split('/').slice(-1);

if (definitions.hasOwnProperty(key)) {
return Object.assign(accumulator, flatten(definitions[key], definitions));
}
}

return Object.assign(accumulator, {[k]: flatten(v, definitions)});
}, {});
}

return tree;
function flatten(tree, definitions, _refs = null) {
if(!_refs) // detect circular reference
_refs = new WeakSet();

if (Array.isArray(tree)) {
return tree.map(t => flatten(t, definitions));
} else if (Object(tree) === tree) {
return Object.entries(tree).reduce((accumulator, [k, v]) => {
if (k === '$ref') {
const key = v.split('/').slice(-1);
const model = definitions[key];

if (definitions.hasOwnProperty(key) && !_refs.has(model)) {
_refs.add(model);
return Object.assign(accumulator, flatten(model, definitions, _refs));
}
}

return Object.assign(accumulator, { [k]: flatten(v, definitions, _refs) });
}, {});
}

return tree;
}

const interpolationPattern = /^\{.+\}$/;
Expand Down