Skip to content
This repository was archived by the owner on Jan 19, 2019. It is now read-only.

Commit 407341b

Browse files
JamesHenryJamesHenry
committed
Chore: Consistency with babylon for custom modifiers
1 parent e33021d commit 407341b

File tree

4 files changed

+56
-187
lines changed

4 files changed

+56
-187
lines changed

‎lib/convert.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ module.exports = function convert(config) {
808808
value: convertChild(node.initializer),
809809
computed: nodeUtils.isComputedProperty(node.name),
810810
static: nodeUtils.hasStaticModifierFlag(node),
811-
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined
811+
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) || undefined
812812
});
813813

814814
if (node.type) {
@@ -1291,9 +1291,9 @@ module.exports = function convert(config) {
12911291
range: [node.getStart(), node.end],
12921292
loc: nodeUtils.getLoc(node, ast),
12931293
accessibility: nodeUtils.getTSNodeAccessibility(node),
1294-
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined,
1294+
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) || undefined,
12951295
static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
1296-
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node),
1296+
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node) || undefined,
12971297
parameter: result
12981298
};
12991299
}
@@ -1946,9 +1946,9 @@ module.exports = function convert(config) {
19461946
key: convertChild(node.name),
19471947
params: convertParameters(node.parameters),
19481948
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
1949-
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined,
1949+
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) || undefined,
19501950
static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
1951-
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
1951+
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node) || undefined
19521952
});
19531953

19541954
const accessibility = nodeUtils.getTSNodeAccessibility(node);
@@ -1966,14 +1966,14 @@ module.exports = function convert(config) {
19661966
case SyntaxKind.PropertySignature: {
19671967
Object.assign(result, {
19681968
type: AST_NODE_TYPES.TSPropertySignature,
1969-
optional: nodeUtils.isOptional(node),
1969+
optional: nodeUtils.isOptional(node) || undefined,
19701970
computed: nodeUtils.isComputedProperty(node.name),
19711971
key: convertChild(node.name),
1972-
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
1973-
initializer: convertChild(node.initializer),
1974-
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined,
1975-
static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
1976-
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
1972+
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : undefined,
1973+
initializer: convertChild(node.initializer) || undefined,
1974+
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) || undefined,
1975+
static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node) || undefined,
1976+
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node) || undefined
19771977
});
19781978

19791979
const accessibility = nodeUtils.getTSNodeAccessibility(node);
@@ -1989,9 +1989,9 @@ module.exports = function convert(config) {
19891989
type: AST_NODE_TYPES.TSIndexSignature,
19901990
index: convertChild(node.parameters[0]),
19911991
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
1992-
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) ? true : undefined,
1992+
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node) || undefined,
19931993
static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
1994-
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
1994+
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node) || undefined
19951995
});
19961996

19971997
const accessibility = nodeUtils.getTSNodeAccessibility(node);

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"license": "BSD-2-Clause",
2020
"devDependencies": {
2121
"babel-code-frame": "^6.22.0",
22-
"babylon": "^7.0.0-beta.20",
22+
"babylon": "^7.0.0-beta.21",
2323
"eslint": "3.19.0",
2424
"eslint-config-eslint": "4.0.0",
2525
"eslint-plugin-node": "4.2.2",

‎tests/ast-alignment/spec.js

Lines changed: 42 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -437,13 +437,55 @@ const fixturePatternsToTest = [
437437
"typescript/decorators/parameter-decorators/parameter-decorator-decorator-static-member.src.ts",
438438
"typescript/decorators/parameter-decorators/parameter-decorator-instance-member.src.ts",
439439
"typescript/decorators/parameter-decorators/parameter-decorator-static-member.src.ts",
440+
"typescript/basics/function-with-object-type-with-optional-properties.src.ts",
441+
"typescript/basics/function-with-object-type-without-annotation.src.ts",
442+
"typescript/decorators/accessor-decorators/accessor-decorator-factory-instance-member.src.ts",
443+
"typescript/decorators/accessor-decorators/accessor-decorator-factory-static-member.src.ts",
444+
"typescript/decorators/accessor-decorators/accessor-decorator-instance-member.src.ts",
445+
"typescript/decorators/accessor-decorators/accessor-decorator-static-member.src.ts",
446+
"typescript/decorators/method-decorators/method-decorator-factory-instance-member.src.ts",
447+
"typescript/decorators/method-decorators/method-decorator-factory-static-member.src.ts",
448+
"typescript/decorators/method-decorators/method-decorator-instance-member.src.ts",
449+
"typescript/decorators/method-decorators/method-decorator-static-member.src.ts",
450+
"typescript/decorators/property-decorators/property-decorator-factory-instance-member.src.ts",
451+
"typescript/decorators/property-decorators/property-decorator-factory-static-member.src.ts",
452+
"typescript/decorators/property-decorators/property-decorator-instance-member.src.ts",
453+
"typescript/decorators/property-decorators/property-decorator-static-member.src.ts",
454+
"typescript/decorators/class-decorators/class-decorator-factory.src.ts",
455+
"typescript/decorators/class-decorators/class-decorator.src.ts",
456+
"typescript/babylon-convergence/type-parameters.src.ts",
457+
"typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts",
458+
"typescript/basics/class-with-type-parameter-default.src.ts",
459+
"typescript/basics/class-with-type-parameter-underscore.src.ts",
460+
"typescript/basics/class-with-type-parameter.src.ts",
461+
"typescript/basics/function-with-type-parameters-that-have-comments.src.ts",
462+
"typescript/basics/function-with-type-parameters-with-constraint.src.ts",
463+
"typescript/basics/function-with-type-parameters.src.ts",
464+
"typescript/basics/type-parameters-comments.src.ts",
465+
"typescript/namespaces-and-modules/shorthand-ambient-module-declaration.src.ts",
440466
{
441467
pattern: "typescript/basics/export-named-enum.src.ts",
442468
config: { babylonParserOptions: { sourceType: "module" } }
443469
},
444470
{
445471
pattern: "typescript/basics/export-assignment.src.ts",
446472
config: { babylonParserOptions: { sourceType: "module" } }
473+
},
474+
{
475+
pattern: "typescript/basics/export-default-class-with-generic.src.ts",
476+
config: { babylonParserOptions: { sourceType: "module" } }
477+
},
478+
{
479+
pattern: "typescript/basics/export-default-class-with-multiple-generics.src.ts",
480+
config: { babylonParserOptions: { sourceType: "module" } }
481+
},
482+
{
483+
pattern: "typescript/basics/export-named-class-with-generic.src.ts",
484+
config: { babylonParserOptions: { sourceType: "module" } }
485+
},
486+
{
487+
pattern: "typescript/basics/export-named-class-with-multiple-generics.src.ts",
488+
config: { babylonParserOptions: { sourceType: "module" } }
447489
}
448490

449491
/**
@@ -559,63 +601,12 @@ const fixturePatternsToTest = [
559601
// "typescript/basics/class-with-public-parameter-properties.src.ts",
560602
// "typescript/basics/class-with-readonly-parameter-properties.src.ts",
561603
// "typescript/basics/destructuring-assignment.src.ts",
562-
// "typescript/basics/function-with-object-type-with-optional-properties.src.ts",
563-
// "typescript/basics/function-with-object-type-without-annotation.src.ts",
564604
// "typescript/basics/nested-type-arguments.src.ts",
565605
// "typescript/basics/null-and-undefined-type-annotations.src.ts",
566606
// "typescript/basics/type-guard.src.ts",
567607
// "typescript/basics/var-with-dotted-type.src.ts",
568608
// "typescript/basics/var-with-type.src.ts",
569609
// "typescript/basics/variable-declaration-type-annotation-spacing.src.ts",
570-
// "typescript/decorators/accessor-decorators/accessor-decorator-factory-instance-member.src.ts",
571-
// "typescript/decorators/accessor-decorators/accessor-decorator-factory-static-member.src.ts",
572-
// "typescript/decorators/accessor-decorators/accessor-decorator-instance-member.src.ts",
573-
// "typescript/decorators/accessor-decorators/accessor-decorator-static-member.src.ts",
574-
// "typescript/decorators/class-decorators/class-decorator-factory.src.ts",
575-
// "typescript/decorators/class-decorators/class-decorator.src.ts",
576-
// "typescript/decorators/method-decorators/method-decorator-factory-instance-member.src.ts",
577-
// "typescript/decorators/method-decorators/method-decorator-factory-static-member.src.ts",
578-
// "typescript/decorators/method-decorators/method-decorator-instance-member.src.ts",
579-
// "typescript/decorators/method-decorators/method-decorator-static-member.src.ts",
580-
// "typescript/decorators/property-decorators/property-decorator-factory-instance-member.src.ts",
581-
// "typescript/decorators/property-decorators/property-decorator-factory-static-member.src.ts",
582-
// "typescript/decorators/property-decorators/property-decorator-instance-member.src.ts",
583-
// "typescript/decorators/property-decorators/property-decorator-static-member.src.ts",
584-
585-
/**
586-
* Requires a solution to https://github.com/babel/babylon/issues/691
587-
*/
588-
// "typescript/babylon-convergence/type-parameters.src.ts",
589-
// "typescript/babylon-convergence/type-parameter-whitespace-loc.src.ts",
590-
// "typescript/basics/class-with-type-parameter-default.src.ts",
591-
// "typescript/basics/class-with-type-parameter-underscore.src.ts",
592-
// "typescript/basics/class-with-type-parameter.src.ts",
593-
// {
594-
// pattern: "typescript/basics/export-default-class-with-generic.src.ts",
595-
// config: { babylonParserOptions: { sourceType: "module" } }
596-
// },
597-
// {
598-
// pattern: "typescript/basics/export-default-class-with-multiple-generics.src.ts",
599-
// config: { babylonParserOptions: { sourceType: "module" } }
600-
// },
601-
// {
602-
// pattern: "typescript/basics/export-named-class-with-generic.src.ts",
603-
// config: { babylonParserOptions: { sourceType: "module" } }
604-
// },
605-
// {
606-
// pattern: "typescript/basics/export-named-class-with-multiple-generics.src.ts",
607-
// config: { babylonParserOptions: { sourceType: "module" } }
608-
// },
609-
// "typescript/basics/function-with-type-parameters-that-have-comments.src.ts",
610-
// "typescript/basics/function-with-type-parameters-with-constraint.src.ts",
611-
// "typescript/basics/function-with-type-parameters.src.ts",
612-
// "typescript/basics/type-parameters-comments.src.ts",
613-
614-
/**
615-
* Requires the fix in https://github.com/babel/babylon/pull/684 (MERGED not yet released)
616-
*/
617-
// "typescript/namespaces-and-modules/shorthand-ambient-module-declaration.src.ts"
618-
619610
];
620611

621612
// Either a string of the pattern, or an object containing the pattern and some additional config

0 commit comments

Comments
 (0)