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.

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

feat!: allow JSDoc tags without explicit value (e.g. @deprecated) to default to true #1172

Merged
merged 2 commits into from Mar 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/AnnotationsReader/BasicAnnotationsReader.ts
Expand Up @@ -85,7 +85,9 @@ export class BasicAnnotationsReader implements AnnotationsReader {
}

private parseJsDocTag(jsDocTag: ts.JSDocTagInfo): any {
const text = (jsDocTag.text ?? []).map((part) => part.text).join("");
// Tags without explicit value (e.g. `@deprecated`) default to `true`.
const text = jsDocTag.text?.map((part) => part.text).join("") || "true";

if (BasicAnnotationsReader.textTags.has(jsDocTag.name)) {
return text;
} else if (BasicAnnotationsReader.jsonTags.has(jsDocTag.name)) {
Expand All @@ -97,6 +99,7 @@ export class BasicAnnotationsReader implements AnnotationsReader {
return undefined;
}
}

private parseJson(value: string): any {
try {
return json5.parse(value);
Expand Down
13 changes: 9 additions & 4 deletions test/valid-data-annotations.test.ts
Expand Up @@ -4,6 +4,7 @@ describe("valid-data-annotations", () => {
it(
"annotation-custom",
assertValidSchema("annotation-custom", "MyObject", "basic", [
"customBooleanProperty",
"customNumberProperty",
"customStringProperty",
"customComplexProperty",
Expand All @@ -18,15 +19,19 @@ describe("valid-data-annotations", () => {
assertValidSchema("annotation-empty", "MyObject", "extended", ["customEmptyAnnotation"])
);
it(
"annotation-deprecated-empty-basic",
assertValidSchema("annotation-deprecated-empty", "MyObject", "basic", ["customEmptyAnnotation"])
"annotation-deprecated-basic",
assertValidSchema("annotation-deprecated", "MyObject", "basic", ["deprecationMessage"])
);
it(
"annotation-deprecated-empty-extended",
assertValidSchema("annotation-deprecated-empty", "MyObject", "extended", ["customEmptyAnnotation"])
"annotation-deprecated-extended",
assertValidSchema("annotation-deprecated", "MyObject", "extended", ["deprecationMessage"])
);

it("annotation-comment", assertValidSchema("annotation-comment", "MyObject", "extended"));

it("annotation-id", assertValidSchema("annotation-id", "MyObject", "extended", [], "Test"));

it("annotation-readOnly", assertValidSchema("annotation-readOnly", "MyObject", "basic"));

it("annotation-writeOnly", assertValidSchema("annotation-writeOnly", "MyObject", "basic"));
});
1 change: 1 addition & 0 deletions test/valid-data/annotation-custom/main.ts
@@ -1,4 +1,5 @@
/**
* @customBooleanProperty false
* @customNumberProperty 14
* @customStringProperty "string-value"
* @customComplexProperty { "a": 1, "b": 2 }
Expand Down
1 change: 1 addition & 0 deletions test/valid-data/annotation-custom/schema.json
Expand Up @@ -4,6 +4,7 @@
"definitions": {
"MyObject": {
"additionalProperties": false,
"customBooleanProperty": false,
"customComplexProperty": {
"a": 1,
"b": 2
Expand Down
4 changes: 0 additions & 4 deletions test/valid-data/annotation-deprecated-empty/main.ts

This file was deleted.

9 changes: 9 additions & 0 deletions test/valid-data/annotation-deprecated/main.ts
@@ -0,0 +1,9 @@
/**
* @deprecated
* @deprecationMessage Use `NewMyObject` instead.
*/
export interface MyObject {
one?: string;
/** @deprecated */
two?: number;
}
21 changes: 21 additions & 0 deletions test/valid-data/annotation-deprecated/schema.json
@@ -0,0 +1,21 @@
{
"$ref": "#/definitions/MyObject",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"MyObject": {
"additionalProperties": false,
"deprecated": true,
"deprecationMessage": "Use `NewMyObject` instead.",
"properties": {
"one": {
"type": "string"
},
"two": {
"deprecated": true,
"type": "number"
}
},
"type": "object"
}
}
}
2 changes: 1 addition & 1 deletion test/valid-data/annotation-empty/schema.json
Expand Up @@ -4,7 +4,7 @@
"definitions": {
"MyObject": {
"additionalProperties": false,
"customEmptyAnnotation": "",
"customEmptyAnnotation": true,
"type": "object"
}
}
Expand Down
5 changes: 5 additions & 0 deletions test/valid-data/annotation-readOnly/main.ts
@@ -0,0 +1,5 @@
export interface MyObject {
one?: string;
/** @readOnly */
two?: number;
}
Expand Up @@ -4,7 +4,15 @@
"definitions": {
"MyObject": {
"additionalProperties": false,
"deprecated": "",
"properties": {
"one": {
"type": "string"
},
"two": {
"readOnly": true,
"type": "number"
}
},
"type": "object"
}
}
Expand Down
5 changes: 5 additions & 0 deletions test/valid-data/annotation-writeOnly/main.ts
@@ -0,0 +1,5 @@
export interface MyObject {
one?: string;
/** @writeOnly */
two?: number;
}
19 changes: 19 additions & 0 deletions test/valid-data/annotation-writeOnly/schema.json
@@ -0,0 +1,19 @@
{
"$ref": "#/definitions/MyObject",
"$schema": "http://json-schema.org/draft-07/schema#",
"definitions": {
"MyObject": {
"additionalProperties": false,
"properties": {
"one": {
"type": "string"
},
"two": {
"type": "number",
"writeOnly": true
}
},
"type": "object"
}
}
}