Skip to content

Added function parameters definition in schema when using typeOf keyword #504

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

Open
Tiberiu02 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added function parameters definition in schema when using typeOf keyword #504

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5530873
Added parameters field to definition interface
Tiberiu02 Oct 10, 2022
e90789e
Added function type definition
Tiberiu02 Oct 10, 2022
deb118c
Removed old func type defs
Tiberiu02 Oct 10, 2022
056ae68
Added test for typeOfKeyword argument
Tiberiu02 Oct 10, 2022
8616b1c
fixed errors
Tiberiu02 Oct 10, 2022
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
Prev Previous commit
Next Next commit
Removed old func type defs
  • Loading branch information
@Tiberiu02
Tiberiu02 committed Oct 10, 2022
commit deb118ce3224620a475f717da9e1d8e5447466da
14 changes: 0 additions & 14 deletions typescript-json-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,11 +1025,6 @@ export class JsonSchemaGenerator {
return definition;
}

if (this.args.typeOfKeyword && node.kind === ts.SyntaxKind.FunctionType) {
definition.typeof = "function";
return definition;
}

const clazz = <ts.ClassDeclaration>node;
const props = this.tc.getPropertiesOfType(clazzType).filter((prop) => {
// filter never
Expand Down Expand Up @@ -1209,15 +1204,6 @@ export class JsonSchemaGenerator {
reffedType = undefined;
}

if (
this.args.typeOfKeyword &&
typ.flags & ts.TypeFlags.Object &&
(<ts.ObjectType>typ).objectFlags & ts.ObjectFlags.Anonymous
) {
definition.typeof = "function";
return definition;
}

let returnedDefinition = definition; // returned definition, may be a $ref

// Parse property comments now to skip recursive if ignore.
Expand Down