Fix Error @TJS-custom annotation without value (YousefED#313)

Author: ndunks

test/programs/annotation-tjs/main.ts

@@ -64,4 +64,19 @@ interface MyObject {
      * @TJS-examples ["foo", 1]
      */
     examples: string;
+
+    /**
+     * @TJS-hide
+     */
+    booleanAnnotationDefaultValue: string;
+
+    /**
+     * @TJS-hide true
+     */
+    booleanAnnotationWithTrue: string;
+
+    /**
+     * @TJS-hide false
+     */
+    booleanAnnotationWithFalse: string;
 }

test/programs/annotation-tjs/schema.json

@@ -55,9 +55,24 @@
         "uriTemplate": {
             "format": "uri-template",
             "type": "string"
+        },
+        "booleanAnnotationDefaultValue": {
+            "hide": true,
+            "type": "string"
+        },
+        "booleanAnnotationWithTrue": {
+            "hide": true,
+            "type": "string"
+        },
+        "booleanAnnotationWithFalse": {
+            "hide": false,
+            "type": "string"
         }
     },
     "required": [
+        "booleanAnnotationDefaultValue",
+        "booleanAnnotationWithFalse",
+        "booleanAnnotationWithTrue",
         "dateTime",
         "email",
         "examples",

test/schema.test.ts

@@ -190,7 +190,9 @@ describe("schema", () => {
     describe("annotations", () => {
         assertSchema("annotation-default", "MyObject");
         assertSchema("annotation-ref", "MyObject");
-        assertSchema("annotation-tjs", "MyObject");
+        assertSchema("annotation-tjs", "MyObject", {
+            validationKeywords: [ "hide" ]
+        });
         assertSchema("annotation-id", "MyObject");
 
         assertSchema("typeof-keyword", "MyObject", {typeOfKeyword: true});

typescript-json-schema.ts

@@ -373,7 +373,18 @@ export class JsonSchemaGenerator {
         const jsdocs = symbol.getJsDocTags();
         jsdocs.forEach(doc => {
             // if we have @TJS-... annotations, we have to parse them
-            const [name, text] = (doc.name === "TJS" ? new RegExp(REGEX_TJS_JSDOC).exec(doc.text!)!.slice(1,3) : [doc.name, doc.text]) as string[];
+            let [ name, text ] = [doc.name, doc.text as string];
+            if( doc.name === "TJS" ) {
+                let match: string[] | RegExpExecArray | null = new RegExp(REGEX_TJS_JSDOC).exec(doc.text!);
+                if( match ) {
+                    name = match[1];
+                    text = match[2];
+                } else {
+                    // Treat empty text as boolean true
+                    name = (text as string).replace(/^[\s\-]+/, "");
+                    text = "true";
+                }
+            }
             if (validationKeywords[name] || this.userValidationKeywords[name]) {
                 definition[name] = text === undefined ? "" : parseValue(text);
             } else {