cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename assertsModifier to asserts (#10613)

Browse Source 
see https://github.com/babel/babel/pull/10543#issuecomment-547571501
This commit is contained in:
Georgii Dolzhykov 2019-10-29 22:25:42 +02:00 committed by Huáng Jùnliàng
parent 3a5e8a8dd4
commit 63f9a3c946
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/babel-generator/src/generators/typescript.js
View File

@ -197,7 +197,7 @@ export function TSTypeReference(node) {
}
export function TSTypePredicate(node) {
if (node.assertsModifier) {
if (node.asserts) {
this.word("asserts");
this.space();
}

12
packages/babel-parser/src/plugins/typescript/index.js
View File

@ -904,8 +904,8 @@ export default (superClass: Class<Parser>): Class<Parser> =>
const t: N.TsTypeAnnotation = this.startNode();
this.expect(returnToken);
const assertsModifier = this.tsTryParse(
this.tsParseTypePredicateAssertsModifier.bind(this),
const asserts = this.tsTryParse(
this.tsParseTypePredicateAsserts.bind(this),
);
const typePredicateVariable =
@ -913,7 +913,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
this.tsTryParse(this.tsParseTypePredicatePrefix.bind(this));
if (!typePredicateVariable) {
if (!assertsModifier) {
if (!asserts) {
// : type
return this.tsParseTypeAnnotation(/* eatColon */ false, t);
}
@ -921,7 +921,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
// : asserts foo
const node = this.startNodeAtNode(t);
node.parameterName = this.parseIdentifier();
node.assertsModifier = assertsModifier;
node.asserts = asserts;
t.typeAnnotation = this.finishNode(node, "TSTypePredicate");
return this.finishNode(t, "TSTypeAnnotation");
}
@ -931,7 +931,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
const node = this.startNodeAtNode(t);
node.parameterName = typePredicateVariable;
node.typeAnnotation = type;
node.assertsModifier = assertsModifier;
node.asserts = asserts;
t.typeAnnotation = this.finishNode(node, "TSTypePredicate");
return this.finishNode(t, "TSTypeAnnotation");
});
@ -959,7 +959,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}
}
tsParseTypePredicateAssertsModifier(): boolean {
tsParseTypePredicateAsserts(): boolean {
if (!this.tsIsIdentifier()) {
return false;
}

4
packages/babel-parser/test/fixtures/typescript/assert-predicate/arrow-function/output.json vendored
View File

@ -164,7 +164,7 @@
}
}
},
"assertsModifier": true
"asserts": true
}
},
"id": null,
@ -346,7 +346,7 @@
},
"name": "value"
},
"assertsModifier": true
"asserts": true
}
},
"id": null,

2
packages/babel-parser/test/fixtures/typescript/assert-predicate/asserts-var/output.json vendored
View File

@ -156,7 +156,7 @@
},
"name": "value"
},
"assertsModifier": true
"asserts": true
}
},
"declare": true

2
packages/babel-parser/test/fixtures/typescript/assert-predicate/asserts-with-predicate/output.json vendored
View File

@ -186,7 +186,7 @@
}
}
},
"assertsModifier": true
"asserts": true
}
},
"declare": true

4
packages/babel-parser/test/fixtures/typescript/assert-predicate/function-declaration/output.json vendored
View File

@ -186,7 +186,7 @@
}
}
},
"assertsModifier": true
"asserts": true
}
},
"body": {
@ -334,7 +334,7 @@
},
"name": "value"
},
"assertsModifier": true
"asserts": true
}
},
"body": {

4
packages/babel-types/src/definitions/typescript.js
View File

@ -175,11 +175,11 @@ defineType("TSTypeReference", {
defineType("TSTypePredicate", {
aliases: ["TSType"],
visitor: ["parameterName", "typeAnnotation", "assertsModifier"],
visitor: ["parameterName", "typeAnnotation", "asserts"],
fields: {
parameterName: validateType(["Identifier", "TSThisType"]),
typeAnnotation: validateOptionalType("TSTypeAnnotation"),
assertsModifier: validate(bool),
asserts: validate(bool),
},
});