Add TSSatisfiesExpression to types and generator

babel · Aug 31, 2022 · 3d69eaa · 3d69eaa
1 parent 816b009
commit 3d69eaa
Show file tree

Hide file tree

Showing 13 changed files with 249 additions and 9 deletions.
diff --git a/packages/babel-generator/src/generators/typescript.ts b/packages/babel-generator/src/generators/typescript.ts
@@ -521,15 +521,23 @@ export function TSTypeAliasDeclaration(
   this.token(";");
 }
 
-export function TSAsExpression(this: Printer, node: t.TSAsExpression) {
-  const { expression, typeAnnotation } = node;
+function TSTypeExpression(
+  this: Printer,
+  node: t.TSAsExpression | t.TSSatisfiesExpression,
+) {
+  const { type, expression, typeAnnotation } = node;
   this.print(expression, node);
   this.space();
-  this.word("as");
+  this.word(type === "TSAsExpression" ? "as" : "satisfies");
   this.space();
   this.print(typeAnnotation, node);
 }
 
+export {
+  TSTypeExpression as TSAsExpression,
+  TSTypeExpression as TSSatisfiesExpression,
+};
+
 export function TSTypeAssertion(this: Printer, node: t.TSTypeAssertion) {
   const { typeAnnotation, expression } = node;
   this.token("<");

diff --git a/packages/babel-generator/src/node/parentheses.ts b/packages/babel-generator/src/node/parentheses.ts
@@ -49,6 +49,7 @@ import {
   isVariableDeclarator,
   isWhileStatement,
   isYieldExpression,
+  isTSSatisfiesExpression,
 } from "@babel/types";
 import type * as t from "@babel/types";
 const PRECEDENCE = {
@@ -225,9 +226,10 @@ export function TSAsExpression() {
   return true;
 }
 
-export function TSTypeAssertion() {
-  return true;
-}
+export {
+  TSAsExpression as TSSatisfiesExpression,
+  TSAsExpression as TSTypeAssertion,
+};
 
 export function TSUnionType(node: t.TSUnionType, parent: t.Node): boolean {
   return (
@@ -368,7 +370,8 @@ export function ConditionalExpression(
     isConditionalExpression(parent, { test: node }) ||
     isAwaitExpression(parent) ||
     isTSTypeAssertion(parent) ||
-    isTSAsExpression(parent)
+    isTSAsExpression(parent) ||
+    isTSSatisfiesExpression(parent)
   ) {
     return true;
   }

diff --git a/packages/babel-generator/test/fixtures/typescript/satisfies/input.js b/packages/babel-generator/test/fixtures/typescript/satisfies/input.js
@@ -0,0 +1,4 @@
+x satisfies T;
+x < y satisfies boolean; // (x < y) satisfies boolean;
+x === 1 satisfies number; // x === (1 satisfies number);
+x satisfies any satisfies T;
diff --git a/packages/babel-generator/test/fixtures/typescript/satisfies/output.js b/packages/babel-generator/test/fixtures/typescript/satisfies/output.js
@@ -0,0 +1,6 @@
+(x satisfies T);
+(x < y satisfies boolean); // (x < y) satisfies boolean;
+
+x === (1 satisfies number); // x === (1 satisfies number);
+
+((x satisfies any) satisfies T);
diff --git a/packages/babel-traverse/src/path/generated/asserts.ts b/packages/babel-traverse/src/path/generated/asserts.ts
@@ -577,6 +577,9 @@ export interface NodePathAssetions {
     opts?: object,
   ): asserts this is NodePath<t.TSQualifiedName>;
   assertTSRestType(opts?: object): asserts this is NodePath<t.TSRestType>;
+  assertTSSatisfiesExpression(
+    opts?: object,
+  ): asserts this is NodePath<t.TSSatisfiesExpression>;
   assertTSStringKeyword(
     opts?: object,
   ): asserts this is NodePath<t.TSStringKeyword>;

diff --git a/packages/babel-traverse/src/path/generated/validators.ts b/packages/babel-traverse/src/path/generated/validators.ts
@@ -995,6 +995,10 @@ interface BaseNodePathValidators {
     this: NodePath<T>,
     opts?: object,
   ): this is NodePath<T & t.TSRestType>;
+  isTSSatisfiesExpression<T extends t.Node>(
+    this: NodePath<T>,
+    opts?: object,
+  ): this is NodePath<T & t.TSSatisfiesExpression>;
   isTSStringKeyword<T extends t.Node>(
     this: NodePath<T>,
     opts?: object,

diff --git a/packages/babel-types/src/asserts/generated/index.ts b/packages/babel-types/src/asserts/generated/index.ts
@@ -1412,6 +1412,12 @@ export function assertTSAsExpression(
 ): asserts node is t.TSAsExpression {
   assert("TSAsExpression", node, opts);
 }
+export function assertTSSatisfiesExpression(
+  node: object | null | undefined,
+  opts?: object | null,
+): asserts node is t.TSSatisfiesExpression {
+  assert("TSSatisfiesExpression", node, opts);
+}
 export function assertTSTypeAssertion(
   node: object | null | undefined,
   opts?: object | null,