Breaking: Support unique symbol (fixes #426)

eslint · Jan 27, 2018 · 189b3ef · 189b3ef
1 parent e94ede3
commit 189b3ef
Show file tree

Hide file tree

Showing 7 changed files with 478 additions and 1 deletion.
diff --git a/lib/ast-node-types.js b/lib/ast-node-types.js
@@ -141,6 +141,7 @@ module.exports = {
     TSSymbolKeyword: "TSSymbolKeyword",
     TSTypeAnnotation: "TSTypeAnnotation",
     TSTypeLiteral: "TSTypeLiteral",
+    TSTypeOperator: "TSTypeOperator",
     TSTypeParameter: "TSTypeParameter",
     TSTypeParameterDeclaration: "TSTypeParameterDeclaration",
     TSTypeParameterInstantiation: "TSTypeParameterInstantiation",

diff --git a/lib/convert.js b/lib/convert.js
@@ -1571,6 +1571,14 @@ module.exports = function convert(config) {
             });
             break;
 
+        case SyntaxKind.TypeOperator:
+            Object.assign(result, {
+                type: AST_NODE_TYPES.TSTypeOperator,
+                operator: nodeUtils.getTextForTokenKind(node.operator),
+                typeAnnotation: convertChild(node.type)
+            });
+            break;
+
         // Binary Operations
 
         case SyntaxKind.BinaryExpression:

diff --git a/lib/node-utils.js b/lib/node-utils.js
@@ -97,6 +97,8 @@ TOKEN_TO_TEXT[SyntaxKind.BarEqualsToken] = "|=";
 TOKEN_TO_TEXT[SyntaxKind.CaretEqualsToken] = "^=";
 TOKEN_TO_TEXT[SyntaxKind.AtToken] = "@";
 TOKEN_TO_TEXT[SyntaxKind.InKeyword] = "in";
+TOKEN_TO_TEXT[SyntaxKind.UniqueKeyword] = "unique";
+TOKEN_TO_TEXT[SyntaxKind.KeyOfKeyword] = "keyof";
 
 /**
  * Find the first matching child based on the given sourceFile and predicate function.

diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "npm-license": "0.3.3",
     "shelljs": "0.7.8",
     "shelljs-nodecli": "0.1.1",
-    "typescript": "~2.6.1"
+    "typescript": "2.7.0-insiders.20180108"
   },
   "keywords": [
     "ast",

diff --git a/tests/fixtures/typescript/basics/keyof-operator.src.ts b/tests/fixtures/typescript/basics/keyof-operator.src.ts
@@ -0,0 +1 @@
+type x = keyof foo;
diff --git a/tests/fixtures/typescript/basics/unique-symbol.src.ts b/tests/fixtures/typescript/basics/unique-symbol.src.ts
@@ -0,0 +1 @@
+type A = unique symbol;