fix(core): resolve value avoid infinite loop on multi files refs by a…

…dding a parents relation
orval-labs · Apr 12, 2023 · 9707881 · 9707881 · vercel · Apr 12, 2023
1 parent b2fc79d
commit 9707881
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/core/src/resolvers/value.ts b/packages/core/src/resolvers/value.ts
@@ -27,20 +27,15 @@ export const resolveValue = ({
 
     let hasReadonlyProps = false;
 
-    const spec = context.specs[context.specKey];
-
     // Avoid infinite loop
-    if (
-      name &&
-      !name.startsWith(resolvedImport.name) &&
-      !spec?.components?.schemas?.[name]
-    ) {
+    if (!name || !context.parents?.includes(name)) {
       const scalar = getScalar({
         item: schemaObject,
         name: resolvedImport.name,
         context: {
           ...context,
           specKey: importSpecKey || context.specKey,
+          ...(name ? { parents: [...(context.parents || []), name] } : {}),
         },
       });
 

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -383,6 +383,7 @@ export interface ContextSpecs {
   override: NormalizedOverrideOutput;
   tsconfig?: Tsconfig;
   packageJson?: PackageJson;
+  parents?: string[];
 }
 
 export interface GlobalOptions {