WIP

Author: JamesHenry

Diff for: lib/ast-converter.js

@@ -656,7 +656,7 @@ module.exports = function(ast, extra) {
         function deeplyCopy() {
             result.type = "TS" + SyntaxKind[node.kind];
             Object.keys(node).filter(function(key) {
-                return !(/^(?:kind|parent|pos|end|flags)$/.test(key));
+                return !(/^(?:kind|parent|pos|end|flags|modifierFlagsCache)$/.test(key));
             }).forEach(function(key) {
                 if (key === "type") {
                     result.typeAnnotation = convertTypeAnnotation(node.type);
@@ -1059,7 +1059,7 @@ module.exports = function(ast, extra) {
                     key: convertChild(node.name),
                     value: convertChild(node.initializer),
                     computed: (node.name.kind === SyntaxKind.ComputedPropertyName),
-                    static: Boolean(node.flags & ts.NodeFlags.Static),
+                    static: Boolean(ts.getModifierFlags(node) & ts.ModifierFlags.Static),
                     accessibility: getTSNodeAccessibility(node),
                     decorators: (node.decorators) ? node.decorators.map(function(d) {
                         return convertChild(d.expression);
@@ -1142,7 +1142,7 @@ module.exports = function(ast, extra) {
                         key: convertChild(node.name),
                         value: method,
                         computed: isMethodNameComputed,
-                        static: Boolean(node.flags & ts.NodeFlags.Static),
+                        static: Boolean(ts.getModifierFlags(node) & ts.ModifierFlags.Static),
                         kind: "method",
                         accessibility: getTSNodeAccessibility(node),
                         decorators: (node.decorators) ? node.decorators.map(function(d) {
@@ -1164,7 +1164,7 @@ module.exports = function(ast, extra) {
             // TypeScript uses this even for static methods named "constructor"
             case SyntaxKind.Constructor:
 
-                var constructorIsStatic = Boolean(node.flags & ts.NodeFlags.Static),
+                var constructorIsStatic = Boolean(ts.getModifierFlags(node) & ts.ModifierFlags.Static),
                     firstConstructorToken = constructorIsStatic ? ts.findNextToken(node.getFirstToken(), ast) : node.getFirstToken(),
                     constructorLoc = ast.getLineAndCharacterOfPosition(node.parameters.pos - 1),
                     constructor = {
@@ -1417,8 +1417,8 @@ module.exports = function(ast, extra) {
 
             // Patterns
 
-            // Note: TypeScript uses this for both spread and rest expressions
-            case SyntaxKind.SpreadElementExpression:
+            case SyntaxKind.SpreadElement:
+            case SyntaxKind.SpreadAssignment:
                 assign(result, {
                     type: "SpreadElement",
                     argument: convertChild(node.expression)

Diff for: package.json

@@ -30,7 +30,7 @@
     "semver": "^4.1.1",
     "shelljs": "^0.3.0",
     "shelljs-nodecli": "^0.1.1",
-    "typescript": "~2.0.3"
+    "typescript": "~2.1.4"
   },
   "keywords": [
     "ast",
@@ -55,6 +55,6 @@
     "object-assign": "^4.0.1"
   },
   "peerDependencies": {
-    "typescript": "~2.0.3"
+    "typescript": "~2.1.4"
   }
 }