Fix: Only set optional property on certain node property (fixes #289) (#292)

Author: soda0289

lib/convert.js

@@ -326,15 +326,6 @@ module.exports = function convert(config) {
                 type: AST_NODE_TYPES.Identifier,
                 name: nodeUtils.unescapeIdentifier(node.text)
             });
-            if (node.parent.questionToken && (
-                SyntaxKind.Parameter === node.parent.kind ||
-                SyntaxKind.PropertyDeclaration === node.parent.kind ||
-                SyntaxKind.PropertySignature === node.parent.kind ||
-                SyntaxKind.MethodDeclaration === node.parent.kind ||
-                SyntaxKind.MethodSignature === node.parent.kind
-            )) {
-                result.optional = true;
-            }
             break;
 
         case SyntaxKind.WithStatement:
@@ -675,6 +666,14 @@ module.exports = function convert(config) {
                 decorators: convertDecorators(node.decorators),
                 typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null
             });
+
+            if (node.name.kind === SyntaxKind.Identifier && node.questionToken) {
+                result.key.optional = true;
+            }
+
+            if (result.key.type === AST_NODE_TYPES.Literal && node.questionToken) {
+                result.optional = true;
+            }
             break;
         }
 
@@ -753,6 +752,10 @@ module.exports = function convert(config) {
 
             }
 
+            if (result.key.type === AST_NODE_TYPES.Identifier && node.questionToken) {
+                result.key.optional = true;
+            }
+
             if (node.kind === SyntaxKind.GetAccessor) {
                 result.kind = "get";
             } else if (node.kind === SyntaxKind.SetAccessor) {
@@ -1097,6 +1100,10 @@ module.exports = function convert(config) {
                 });
             }
 
+            if (node.questionToken) {
+                parameter.optional = true;
+            }
+
             if (node.modifiers) {
                 return {
                     type: AST_NODE_TYPES.TSParameterProperty,
@@ -1764,6 +1771,15 @@ module.exports = function convert(config) {
             });
             break;
 
+        case SyntaxKind.PropertySignature:
+        case SyntaxKind.MethodSignature:
+            deeplyCopy();
+
+            if (node.questionToken) {
+                result.name.optional = true;
+            }
+            break;
+
         default:
             deeplyCopy();
     }