Allow hyphenated JSDoc tags

JSDoc tags may contain hyphens.  For example, `@TJS-type`, which is used
by [`typescript-json-schema`](https://www.npmjs.com/package/typescript-json-schema).

Author: jonathanhefner

src/lib/converter/comments/blockLexer.ts

@@ -263,7 +263,7 @@ function* lexBlockComment2(
                 if (lookahead !== pos + 1) {
                     while (
                         lookahead < end &&
-                        /[a-z0-9]/i.test(file[lookahead])
+                        /[a-z0-9-]/i.test(file[lookahead])
                     ) {
                         lookahead++;
                     }

src/lib/converter/comments/lineLexer.ts

@@ -179,7 +179,7 @@ function* lexLineComments2(
                 if (lookahead !== pos + 1) {
                     while (
                         lookahead < end &&
-                        /[a-z0-9]/i.test(file[lookahead])
+                        /[a-z0-9-]/i.test(file[lookahead])
                     ) {
                         lookahead++;
                     }

src/lib/converter/comments/rawLexer.ts

@@ -176,7 +176,7 @@ function* lexCommentString2(
                 if (lookahead !== pos + 1) {
                     while (
                         lookahead < end &&
-                        /[a-z0-9]/i.test(file[lookahead])
+                        /[a-z0-9-]/i.test(file[lookahead])
                     ) {
                         lookahead++;
                     }

src/lib/utils-common/validation.ts

@@ -120,5 +120,5 @@ export function optional<T extends Schema>(x: T): Optional<T> {
 }
 
 export function isTagString(x: unknown): x is `@${string}` {
-    return typeof x === "string" && /^@[a-zA-Z][a-zA-Z0-9]*$/.test(x);
+    return typeof x === "string" && /^@[a-z][a-z0-9-]*$/i.test(x);
 }

src/test/comments.test.ts

@@ -186,14 +186,16 @@ describe("Block Comment Lexer", () => {
     });
 
     it("Should recognize tags", () => {
-        const tokens = lex("/* @tag @a @abc234 */");
+        const tokens = lex("/* @tag @a @abc234 @abc-234 */");
 
         equal(tokens, [
             { kind: TokenSyntaxKind.Tag, text: "@tag", pos: 3 },
             { kind: TokenSyntaxKind.Text, text: " ", pos: 7 },
             { kind: TokenSyntaxKind.Tag, text: "@a", pos: 8 },
             { kind: TokenSyntaxKind.Text, text: " ", pos: 10 },
             { kind: TokenSyntaxKind.Tag, text: "@abc234", pos: 11 },
+            { kind: TokenSyntaxKind.Text, text: " ", pos: 18 },
+            { kind: TokenSyntaxKind.Tag, text: "@abc-234", pos: 19 },
         ]);
     });
 
@@ -641,14 +643,16 @@ describe("Line Comment Lexer", () => {
     });
 
     it("Should recognize tags", () => {
-        const tokens = lex("// @tag @a @abc234");
+        const tokens = lex("// @tag @a @abc234 @abc-234");
 
         equal(tokens, [
             { kind: TokenSyntaxKind.Tag, text: "@tag", pos: 3 },
             { kind: TokenSyntaxKind.Text, text: " ", pos: 7 },
             { kind: TokenSyntaxKind.Tag, text: "@a", pos: 8 },
             { kind: TokenSyntaxKind.Text, text: " ", pos: 10 },
             { kind: TokenSyntaxKind.Tag, text: "@abc234", pos: 11 },
+            { kind: TokenSyntaxKind.Text, text: " ", pos: 18 },
+            { kind: TokenSyntaxKind.Tag, text: "@abc-234", pos: 19 },
         ]);
     });
 
@@ -993,12 +997,12 @@ describe("Raw Lexer", () => {
     });
 
     it("Should not recognize tags", () => {
-        const tokens = lex("@123 @@ @ @tag @a @abc234");
+        const tokens = lex("@123 @@ @ @tag @a @abc234 @abc-234");
 
         equal(tokens, [
             {
                 kind: TokenSyntaxKind.Text,
-                text: "@123 @@ @ @tag @a @abc234",
+                text: "@123 @@ @ @tag @a @abc234 @abc-234",
                 pos: 0,
             },
         ]);

src/test/utils/options/default-options.test.ts

@@ -161,11 +161,15 @@ describe("Default Options", () => {
 
     describe("blockTags", () => {
         it("Should disallow non-tags", () => {
-            throws(() => opts.setValue("blockTags", ["@bad-non-tag"]));
+            throws(() => opts.setValue("blockTags", ["@bad_tag"]));
+            throws(() => opts.setValue("blockTags", ["@2bad"]));
         });
 
         it("Should allow tags", () => {
             doesNotThrow(() => opts.setValue("blockTags", ["@good"]));
+            doesNotThrow(() => opts.setValue("blockTags", ["@good2"]));
+            doesNotThrow(() => opts.setValue("blockTags", ["@Good"]));
+            doesNotThrow(() => opts.setValue("blockTags", ["@good-tag"]));
         });
     });