Add node util function isOptional and isComputedProperty

Author: soda0289

lib/convert.js

@@ -618,7 +618,7 @@ module.exports = function convert(config) {
                 type: AST_NODE_TYPES.Property,
                 key: convertChild(node.name),
                 value: convertChild(node.initializer),
-                computed: (node.name.kind === SyntaxKind.ComputedPropertyName),
+                computed: nodeUtils.isComputedProperty(node.name),
                 method: false,
                 shorthand: false,
                 kind: "init"
@@ -660,7 +660,7 @@ module.exports = function convert(config) {
                 type: (isAbstract) ? AST_NODE_TYPES.TSAbstractClassProperty : AST_NODE_TYPES.ClassProperty,
                 key: convertChild(node.name),
                 value: convertChild(node.initializer),
-                computed: (node.name.kind === SyntaxKind.ComputedPropertyName),
+                computed: nodeUtils.isComputedProperty(node.name),
                 static: nodeUtils.hasStaticModifierFlag(node),
                 accessibility: nodeUtils.getTSNodeAccessibility(node),
                 decorators: convertDecorators(node.decorators),
@@ -713,7 +713,7 @@ module.exports = function convert(config) {
                     type: AST_NODE_TYPES.Property,
                     key: convertChild(node.name),
                     value: method,
-                    computed: (node.name.kind === SyntaxKind.ComputedPropertyName),
+                    computed: nodeUtils.isComputedProperty(node.name),
                     method: nodeIsMethod,
                     shorthand: false,
                     kind: "init"
@@ -730,8 +730,6 @@ module.exports = function convert(config) {
                     return convertedParam;
                 });
 
-                const isMethodNameComputed = (node.name.kind === SyntaxKind.ComputedPropertyName);
-
                 /**
                  * TypeScript class methods can be defined as "abstract"
                  */
@@ -743,7 +741,7 @@ module.exports = function convert(config) {
                     type: methodDefinitionType,
                     key: convertChild(node.name),
                     value: method,
-                    computed: isMethodNameComputed,
+                    computed: nodeUtils.isComputedProperty(node.name),
                     static: nodeUtils.hasStaticModifierFlag(node),
                     kind: "method",
                     accessibility: nodeUtils.getTSNodeAccessibility(node),
@@ -805,7 +803,7 @@ module.exports = function convert(config) {
                 };
 
             const constructorIdentifierLoc = ast.getLineAndCharacterOfPosition(firstConstructorToken.getStart()),
-                constructorIsComputed = !!node.name && (node.name.kind === SyntaxKind.ComputedPropertyName);
+                constructorIsComputed = !!node.name && nodeUtils.isComputedProperty(node.name);
 
             let constructorKey;
 
@@ -1726,8 +1724,8 @@ module.exports = function convert(config) {
         case SyntaxKind.MethodSignature: {
             Object.assign(result, {
                 type: AST_NODE_TYPES.TSMethodSignature,
-                optional: (node.questionToken) ? (node.questionToken.kind === SyntaxKind.QuestionToken) : false,
-                computed: node.name.kind === SyntaxKind.ComputedPropertyName,
+                optional: nodeUtils.isOptional(node),
+                computed: nodeUtils.isComputedProperty(node.name),
                 key: convertChild(node.name),
                 params: node.parameters.map(parameter => convertChild(parameter)),
                 typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null
@@ -1743,8 +1741,8 @@ module.exports = function convert(config) {
         case SyntaxKind.PropertySignature: {
             Object.assign(result, {
                 type: AST_NODE_TYPES.TSPropertySignature,
-                optional: (node.questionToken) ? (node.questionToken.kind === SyntaxKind.QuestionToken) : false,
-                computed: node.name.kind === SyntaxKind.ComputedPropertyName,
+                optional: nodeUtils.isOptional(node),
+                computed: nodeUtils.isComputedProperty(node.name),
                 key: convertChild(node.name),
                 typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null
             });

lib/node-utils.js

@@ -186,6 +186,8 @@ module.exports = {
     hasJSXAncestor,
     unescapeIdentifier,
     unescapeStringLiteralText,
+    isComputedProperty,
+    isOptional,
     fixExports,
     getTokenType,
     convertToken,
@@ -446,6 +448,25 @@ function unescapeStringLiteralText(text) {
     return unescape(text);
 }
 
+/**
+ * Returns true if a given TSNode is a computed property
+ * @param  {TSNode} node TSNode to be checked
+ * @returns {boolean}       is Computed Property
+ */
+function isComputedProperty(node) {
+    return node.kind === SyntaxKind.ComputedPropertyName;
+}
+
+/**
+ * Returns true if a given TSNode is optional (has QuestionToken)
+ * @param  {TSNode} node TSNode to be checked
+ * @returns {boolean}       is Optional
+ */
+function isOptional(node) {
+    return (node.questionToken)
+        ? (node.questionToken.kind === SyntaxKind.QuestionToken) : false;
+}
+
 /**
  * Fixes the exports of the given TSNode
  * @param  {TSNode} node   the TSNode