typescript-eslint · armano2 · Jan 29, 2020 · Jan 29, 2020
diff --git a/packages/parser/tests/lib/__snapshots__/typescript.ts.snap b/packages/parser/tests/lib/__snapshots__/typescript.ts.snap
diff --git a/...s/shared-fixtures/fixtures/typescript/errorRecovery/jsdoc-disallowed-in-typescript.src.ts b/...s/shared-fixtures/fixtures/typescript/errorRecovery/jsdoc-disallowed-in-typescript.src.ts
@@ -0,0 +1,23 @@
+//// [https://github.com/microsoft/TypeScript/blob/566202f55d85e2a61299eb34571354ec1550bdd2/tests/baselines/reference/jsdocDisallowedInTypescript.js]
+// grammar error from checker
+var ara: Array.<number> = [1,2,3];
+
+function f(x: ?number, y: Array.<number>) {
+  return x ? x + y[1] : y[0];
+}
+function hof(ctor: function(new: number, string)) {
+  return new ctor('hi');
+}
+function hof2(f: function(this: number, string): string) {
+  return f(12, 'hullo');
+}
+var whatevs: * = 1001;
+var ques: ? = 'what';
+var g: function(number, number): number = (n,m) => n + m;
+var most: !string = 'definite';
+var postfixdef: number! = 101;
+var postfixopt: number? = undefined;
+
+var nns: Array<?number>;
+var dns: Array<!number>;
+var anys: Array<*>;
diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -379,17 +379,6 @@ export class Converter {
    * property instead of a kind property. Recursively copies all children.
    */
   private deeplyCopy(node: TSNode): any {
-    if (
-      node.kind >= SyntaxKind.FirstJSDocNode &&
-      node.kind <= SyntaxKind.LastJSDocNode
-    ) {
-      throw createError(
-        this.ast,
-        node.pos,
-        'JSDoc types can only be used inside documentation comments.',
-      );
-    }
-
     const customType = `TS${SyntaxKind[node.kind]}` as AST_NODE_TYPES;
 
     /**
@@ -2651,6 +2640,21 @@ export class Converter {
           type: AST_NODE_TYPES.TSAbstractKeyword,
         });
       }
+      case SyntaxKind.JSDocAllType:
+      case SyntaxKind.JSDocUnknownType:
+      case SyntaxKind.JSDocFunctionType:
+      case SyntaxKind.JSDocNullableType:
+      case SyntaxKind.JSDocNonNullableType:
+        return this.createNode<TSESTree.TSUnknownJSDocType>(node, {
+          type: AST_NODE_TYPES.TSUnknownJSDocType,
+          kind: ts.SyntaxKind[node.kind] as
+            | 'JSDocAllType'
+            | 'JSDocUnknownType'
+            | 'JSDocFunctionType'
+            | 'JSDocNullableType'
+            | 'JSDocNonNullableType',
+          value: node.getText(this.ast),
+        });
       default:
         return this.deeplyCopy(node);
     }

diff --git a/packages/typescript-estree/src/ts-estree/ast-node-types.ts b/packages/typescript-estree/src/ts-estree/ast-node-types.ts
@@ -161,6 +161,9 @@ export enum AST_NODE_TYPES {
   TSUndefinedKeyword = 'TSUndefinedKeyword',
   TSUnknownKeyword = 'TSUnknownKeyword',
   TSVoidKeyword = 'TSVoidKeyword',
+
+  // Invalid jsdoc node types
+  TSUnknownJSDocType = 'TSUnknownJSDocType',
 }
 
 export enum AST_TOKEN_TYPES {

diff --git a/packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts b/packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts
@@ -258,6 +258,14 @@ export interface EstreeToTsNodeTypes {
   [AST_NODE_TYPES.TSVoidKeyword]: ts.KeywordTypeNode;
   [AST_NODE_TYPES.TSUndefinedKeyword]: ts.KeywordTypeNode;
 
+  // Invalid nodes
+  [AST_NODE_TYPES.TSUnknownJSDocType]:
+    | ts.JSDocAllType
+    | ts.JSDocUnknownType
+    | ts.JSDocFunctionType
+    | ts.JSDocNullableType
+    | ts.JSDocNonNullableType;
+
   // Unused
   [AST_NODE_TYPES.TSAsyncKeyword]: ts.Token<ts.SyntaxKind.AsyncKeyword>;
   [AST_NODE_TYPES.TSDeclareKeyword]: ts.Token<ts.SyntaxKind.DeclareKeyword>;

diff --git a/packages/typescript-estree/src/ts-estree/ts-estree.ts b/packages/typescript-estree/src/ts-estree/ts-estree.ts
@@ -295,7 +295,8 @@ export type Node =
   | VariableDeclarator
   | WhileStatement
   | WithStatement
-  | YieldExpression;
+  | YieldExpression
+  | TSUnknownJSDocType;
 
 //////////
 // Reusable Unions
@@ -1702,3 +1703,14 @@ export interface YieldExpression extends BaseNode {
   delegate: boolean;
   argument?: Expression;
 }
+
+export interface TSUnknownJSDocType extends BaseNode {
+  type: AST_NODE_TYPES.TSUnknownJSDocType;
+  kind:
+    | 'JSDocAllType'
+    | 'JSDocUnknownType'
+    | 'JSDocFunctionType'
+    | 'JSDocNullableType'
+    | 'JSDocNonNullableType';
+  value: string;
+}
diff --git a/packages/typescript-estree/src/visitor-keys.ts b/packages/typescript-estree/src/visitor-keys.ts
@@ -123,4 +123,7 @@ export const visitorKeys = eslintVisitorKeys.unionWith({
   TSUndefinedKeyword: [],
   TSUnknownKeyword: [],
   TSVoidKeyword: [],
+
+  // Invalid nodes
+  TSUnknownJSDocType: [],
 });
diff --git a/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts b/packages/typescript-estree/tests/ast-alignment/fixtures-to-test.ts
@@ -489,6 +489,10 @@ tester.addFixturePatternConfig('typescript/errorRecovery', {
      * TODO: enable error code TS1024: 'readonly' modifier can only appear on a property declaration or index signature.
      */
     'interface-method-readonly',
+    /**
+     * Babel correctly errors on this
+     */
+    'jsdoc-disallowed-in-typescript',
   ],
 });
 

diff --git a/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.ts.snap b/packages/typescript-estree/tests/lib/__snapshots__/semantic-diagnostics-enabled.ts.snap
@@ -2471,6 +2471,8 @@ Object {
 
 exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/interface-with-optional-index-signature.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
 
+exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/jsdoc-disallowed-in-typescript.src 1`] = `"TEST OUTPUT: No semantic or syntactic issues found"`;
+
 exports[`Parse all fixtures with "errorOnTypeScriptSyntacticAndSemanticIssues" enabled fixtures/typescript/errorRecovery/object-assertion-not-allowed.src 1`] = `
 Object {
   "column": 3,