More modifiers set to undefined by default

Author: JamesHenry

lib/convert.js

@@ -1293,7 +1293,7 @@ module.exports = function convert(config) {
                     accessibility: nodeUtils.getTSNodeAccessibility(node),
                     readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined,
                     static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
-                    export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node),
+                    export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node) ? true : undefined,
                     parameter: result
                 };
             }
@@ -1948,7 +1948,7 @@ module.exports = function convert(config) {
                 typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
                 readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined,
                 static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
-                export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
+                export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node) ? true : undefined
             });
 
             const accessibility = nodeUtils.getTSNodeAccessibility(node);
@@ -1966,14 +1966,14 @@ module.exports = function convert(config) {
         case SyntaxKind.PropertySignature: {
             Object.assign(result, {
                 type: AST_NODE_TYPES.TSPropertySignature,
-                optional: nodeUtils.isOptional(node),
+                optional: nodeUtils.isOptional(node) || undefined,
                 computed: nodeUtils.isComputedProperty(node.name),
                 key: convertChild(node.name),
-                typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
-                initializer: convertChild(node.initializer),
+                typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : undefined,
+                initializer: convertChild(node.initializer) || undefined,
                 readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined,
-                static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
-                export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
+                static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node) ? true : undefined,
+                export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node) ? true : undefined
             });
 
             const accessibility = nodeUtils.getTSNodeAccessibility(node);
@@ -1991,7 +1991,7 @@ module.exports = function convert(config) {
                 typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
                 readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined,
                 static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
-                export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
+                export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node) ? true : undefined
             });
 
             const accessibility = nodeUtils.getTSNodeAccessibility(node);

tests/ast-alignment/spec.js

@@ -437,6 +437,8 @@ const fixturePatternsToTest = [
     "typescript/decorators/parameter-decorators/parameter-decorator-decorator-static-member.src.ts",
     "typescript/decorators/parameter-decorators/parameter-decorator-instance-member.src.ts",
     "typescript/decorators/parameter-decorators/parameter-decorator-static-member.src.ts",
+    "typescript/basics/function-with-object-type-with-optional-properties.src.ts",
+    "typescript/basics/function-with-object-type-without-annotation.src.ts",
     {
         pattern: "typescript/basics/export-named-enum.src.ts",
         config: { babylonParserOptions: { sourceType: "module" } }
@@ -559,8 +561,6 @@ const fixturePatternsToTest = [
     // "typescript/basics/class-with-public-parameter-properties.src.ts",
     // "typescript/basics/class-with-readonly-parameter-properties.src.ts",
     // "typescript/basics/destructuring-assignment.src.ts",
-    // "typescript/basics/function-with-object-type-with-optional-properties.src.ts",
-    // "typescript/basics/function-with-object-type-without-annotation.src.ts",
     // "typescript/basics/nested-type-arguments.src.ts",
     // "typescript/basics/null-and-undefined-type-annotations.src.ts",
     // "typescript/basics/type-guard.src.ts",