Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: schema fields builder stuck #2425

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: schema fields builder stuck #2425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 21 additions & 6 deletions src/services/models/Schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class SchemaModel {

constraints: string[];

fields?: FieldModel[];
private _fields?: FieldModel[];
items?: SchemaModel;

oneOf?: SchemaModel[];
Expand All @@ -76,7 +76,7 @@ export class SchemaModel {
* When true forces dereferencing in allOfs even if circular
*/
constructor(
parser: OpenAPIParser,
private parser: OpenAPIParser,
schemaOrRef: Referenced<OpenAPISchema>,
pointer: string,
private options: RedocNormalizedOptions,
Expand Down Expand Up @@ -112,6 +112,23 @@ export class SchemaModel {
return this.type === type || (isArray(this.type) && this.type.includes(type));
}

get fields(): FieldModel[] | undefined {
if (this.isCircular) {
return undefined;
}

if (!this._fields && this.hasType('object')) {
this._fields = buildFields(
this.parser,
this.schema,
this.pointer,
this.options,
this.refsStack,
);
}
return this._fields;
}

init(parser: OpenAPIParser, isChild: boolean) {
const schema = this.schema;
this.isCircular = !!schema['x-circular-ref'];
Expand Down Expand Up @@ -190,11 +207,9 @@ export class SchemaModel {
return;
}

if (this.hasType('object')) {
this.fields = buildFields(parser, schema, this.pointer, this.options, this.refsStack);
} else if (this.hasType('array')) {
if (this.hasType('array')) {
if (isArray(schema.items) || isArray(schema.prefixItems)) {
this.fields = buildFields(parser, schema, this.pointer, this.options, this.refsStack);
this._fields = buildFields(parser, schema, this.pointer, this.options, this.refsStack);
} else if (schema.items) {
this.items = new SchemaModel(
parser,
Expand Down