Skip to content

Commit 3fb8ae0

Browse files
dotslashderekDerek Thompson
and
Derek Thompson
authored
fix(mergeallof): make sure fragment is fully merged (#16)
Right now we merge on a fragment with multiple nested refs at most twice; we have some that require more merge operations to be fully merged. Co-authored-by: Derek Thompson <[email protected]>
1 parent c4395db commit 3fb8ae0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/mergers/mergeAllOf.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ export function mergeAllOf(fragment: SchemaFragment, path: string[], walkingOpti
5959
store.set(walkingOptions.resolveRef, new WeakMap());
6060
}
6161

62-
const merged = _mergeAllOf(fragment, path, walkingOptions.resolveRef);
63-
if ('allOf' in merged) {
64-
return _mergeAllOf(merged, path, walkingOptions.resolveRef);
62+
let merged = _mergeAllOf(fragment, path, walkingOptions.resolveRef);
63+
while ('allOf' in merged) {
64+
merged = _mergeAllOf(merged, path, walkingOptions.resolveRef);
6565
}
6666

6767
return merged;

0 commit comments

Comments
 (0)