rename assertsModifier to asserts (#10613)

see #10543 (comment)
babel · Oct 29, 2019 · 63f9a3c · 63f9a3c
1 parent 3a5e8a8
commit 63f9a3c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/packages/babel-generator/src/generators/typescript.js b/packages/babel-generator/src/generators/typescript.js
@@ -197,7 +197,7 @@ export function TSTypeReference(node) {
 }
 
 export function TSTypePredicate(node) {
-  if (node.assertsModifier) {
+  if (node.asserts) {
     this.word("asserts");
     this.space();
   }

diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js
@@ -904,24 +904,24 @@ 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 =
           this.tsIsIdentifier() &&
           this.tsTryParse(this.tsParseTypePredicatePrefix.bind(this));
 
         if (!typePredicateVariable) {
-          if (!assertsModifier) {
+          if (!asserts) {
             // : type
             return this.tsParseTypeAnnotation(/* eatColon */ false, t);
           }
 
           // : 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;
       }

diff --git a/packages/babel-parser/test/fixtures/typescript/assert-predicate/arrow-function/output.json b/packages/babel-parser/test/fixtures/typescript/assert-predicate/arrow-function/output.json
@@ -164,7 +164,7 @@
                       }
                     }
                   },
-                  "assertsModifier": true
+                  "asserts": true
                 }
               },
               "id": null,
@@ -346,7 +346,7 @@
                     },
                     "name": "value"
                   },
-                  "assertsModifier": true
+                  "asserts": true
                 }
               },
               "id": null,
@@ -607,4 +607,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/packages/babel-parser/test/fixtures/typescript/assert-predicate/asserts-var/output.json b/packages/babel-parser/test/fixtures/typescript/assert-predicate/asserts-var/output.json
@@ -156,12 +156,12 @@
               },
               "name": "value"
             },
-            "assertsModifier": true
+            "asserts": true
           }
         },
         "declare": true
       }
     ],
     "directives": []
   }
-}
+}
diff --git a/...babel-parser/test/fixtures/typescript/assert-predicate/asserts-with-predicate/output.json b/...babel-parser/test/fixtures/typescript/assert-predicate/asserts-with-predicate/output.json
@@ -186,12 +186,12 @@
                 }
               }
             },
-            "assertsModifier": true
+            "asserts": true
           }
         },
         "declare": true
       }
     ],
     "directives": []
   }
-}
+}
diff --git a/...s/babel-parser/test/fixtures/typescript/assert-predicate/function-declaration/output.json b/...s/babel-parser/test/fixtures/typescript/assert-predicate/function-declaration/output.json
@@ -186,7 +186,7 @@
                 }
               }
             },
-            "assertsModifier": true
+            "asserts": true
           }
         },
         "body": {
@@ -334,7 +334,7 @@
               },
               "name": "value"
             },
-            "assertsModifier": true
+            "asserts": true
           }
         },
         "body": {
@@ -505,4 +505,4 @@
     ],
     "directives": []
   }
-}
+}
diff --git a/packages/babel-types/src/definitions/typescript.js b/packages/babel-types/src/definitions/typescript.js
@@ -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),
   },
 });