diff --git a/packages/babel-traverse/scripts/generators/asserts.js b/packages/babel-traverse/scripts/generators/asserts.js index efc35c7e44ec..c93efbb4173b 100644 --- a/packages/babel-traverse/scripts/generators/asserts.js +++ b/packages/babel-traverse/scripts/generators/asserts.js @@ -8,12 +8,12 @@ export default function generateAsserts() { import type * as t from "@babel/types"; import type NodePath from "../index"; -type Opts = Partial<{ - [Prop in keyof Object]: Object[Prop] extends t.Node - ? t.Node | Object[Prop] - : Object[Prop] extends t.Node[] - ? t.Node[] | Object[Prop] - : Object[Prop]; +type Opts = Partial<{ + [Prop in keyof Obj]: Obj[Prop] extends t.Node + ? t.Node + : Obj[Prop] extends t.Node[] + ? t.Node[] + : Obj[Prop]; }>; export interface NodePathAssertions {`; diff --git a/packages/babel-traverse/scripts/generators/validators.js b/packages/babel-traverse/scripts/generators/validators.js index 06c261bc5ab1..8f197c6c6577 100644 --- a/packages/babel-traverse/scripts/generators/validators.js +++ b/packages/babel-traverse/scripts/generators/validators.js @@ -9,12 +9,12 @@ import type * as t from "@babel/types"; import type NodePath from "../index"; import type { VirtualTypeNodePathValidators } from "../lib/virtual-types-validator"; -type Opts = Partial<{ - [Prop in keyof Object]: Object[Prop] extends t.Node - ? t.Node | Object[Prop] - : Object[Prop] extends t.Node[] - ? t.Node[] | Object[Prop] - : Object[Prop]; +type Opts = Partial<{ + [Prop in keyof Obj]: Obj[Prop] extends t.Node + ? t.Node + : Obj[Prop] extends t.Node[] + ? t.Node[] + : Obj[Prop]; }>; interface BaseNodePathValidators { diff --git a/packages/babel-traverse/src/path/generated/asserts.d.ts b/packages/babel-traverse/src/path/generated/asserts.d.ts index 1373af874a0d..24c21fbfdfeb 100644 --- a/packages/babel-traverse/src/path/generated/asserts.d.ts +++ b/packages/babel-traverse/src/path/generated/asserts.d.ts @@ -5,12 +5,12 @@ import type * as t from "@babel/types"; import type NodePath from "../index"; -type Opts = Partial<{ - [Prop in keyof Object]: Object[Prop] extends t.Node - ? t.Node | Object[Prop] - : Object[Prop] extends t.Node[] - ? t.Node[] | Object[Prop] - : Object[Prop]; +type Opts = Partial<{ + [Prop in keyof Obj]: Obj[Prop] extends t.Node + ? t.Node + : Obj[Prop] extends t.Node[] + ? t.Node[] + : Obj[Prop]; }>; export interface NodePathAssertions { diff --git a/packages/babel-traverse/src/path/generated/validators.d.ts b/packages/babel-traverse/src/path/generated/validators.d.ts index 3f5fc2e8b6f9..8854fa3d6c0e 100644 --- a/packages/babel-traverse/src/path/generated/validators.d.ts +++ b/packages/babel-traverse/src/path/generated/validators.d.ts @@ -6,12 +6,12 @@ import type * as t from "@babel/types"; import type NodePath from "../index"; import type { VirtualTypeNodePathValidators } from "../lib/virtual-types-validator"; -type Opts = Partial<{ - [Prop in keyof Object]: Object[Prop] extends t.Node - ? t.Node | Object[Prop] - : Object[Prop] extends t.Node[] - ? t.Node[] | Object[Prop] - : Object[Prop]; +type Opts = Partial<{ + [Prop in keyof Obj]: Obj[Prop] extends t.Node + ? t.Node + : Obj[Prop] extends t.Node[] + ? t.Node[] + : Obj[Prop]; }>; interface BaseNodePathValidators { diff --git a/packages/babel-traverse/src/path/lib/virtual-types-validator.ts b/packages/babel-traverse/src/path/lib/virtual-types-validator.ts index 64bce7e062aa..6da221af4f21 100644 --- a/packages/babel-traverse/src/path/lib/virtual-types-validator.ts +++ b/packages/babel-traverse/src/path/lib/virtual-types-validator.ts @@ -26,13 +26,14 @@ import type * as t from "@babel/types"; const { isCompatTag } = react; import type { VirtualTypeAliases } from "./virtual-types"; -type Opts = Partial<{ - [Prop in keyof Object]: Object[Prop] extends t.Node - ? t.Node | Object[Prop] - : Object[Prop] extends t.Node[] - ? t.Node[] | Object[Prop] - : Object[Prop]; +type Opts = Partial<{ + [Prop in keyof Obj]: Obj[Prop] extends t.Node + ? t.Node + : Obj[Prop] extends t.Node[] + ? t.Node[] + : Obj[Prop]; }>; + export interface VirtualTypeNodePathValidators { isBindingIdentifier( this: NodePath, @@ -210,15 +211,23 @@ export function isForAwaitStatement(this: NodePath): boolean { return isForOfStatement(this.node, { await: true }); } -// TODO: Remove in Babel 8 -export function isExistentialTypeParam(this: NodePath): void { - throw new Error( - "`path.isExistentialTypeParam` has been renamed to `path.isExistsTypeAnnotation()` in Babel 7.", - ); -} - -export function isNumericLiteralTypeAnnotation(this: NodePath): void { - throw new Error( - "`path.isNumericLiteralTypeAnnotation()` has been renamed to `path.isNumberLiteralTypeAnnotation()` in Babel 7.", - ); +if (!process.env.BABEL_8_BREAKING) { + if (!USE_ESM) { + // eslint-disable-next-line no-restricted-globals + exports.isExistentialTypeParam = function isExistentialTypeParam( + this: NodePath, + ): void { + throw new Error( + "`path.isExistentialTypeParam` has been renamed to `path.isExistsTypeAnnotation()` in Babel 7.", + ); + }; + + // eslint-disable-next-line no-restricted-globals + exports.isNumericLiteralTypeAnnotation = + function isNumericLiteralTypeAnnotation(this: NodePath): void { + throw new Error( + "`path.isNumericLiteralTypeAnnotation()` has been renamed to `path.isNumberLiteralTypeAnnotation()` in Babel 7.", + ); + }; + } } diff --git a/packages/babel-types/scripts/generators/validators.js b/packages/babel-types/scripts/generators/validators.js index 870423f5bc9b..95577fc18cb1 100644 --- a/packages/babel-types/scripts/generators/validators.js +++ b/packages/babel-types/scripts/generators/validators.js @@ -81,12 +81,12 @@ import shallowEqual from "../../utils/shallowEqual"; import type * as t from "../.."; import deprecationWarning from "../../utils/deprecationWarning"; -type Opts = Partial<{ - [Prop in keyof Object]: Object[Prop] extends t.Node - ? t.Node | Object[Prop] - : Object[Prop] extends t.Node[] - ? t.Node[] | Object[Prop] - : Object[Prop]; +type Opts = Partial<{ + [Prop in keyof Obj]: Obj[Prop] extends t.Node + ? t.Node + : Obj[Prop] extends t.Node[] + ? t.Node[] + : Obj[Prop]; }>; `; diff --git a/packages/babel-types/src/validators/generated/index.ts b/packages/babel-types/src/validators/generated/index.ts index 0933f7fa883d..4ea3fb808ff9 100644 --- a/packages/babel-types/src/validators/generated/index.ts +++ b/packages/babel-types/src/validators/generated/index.ts @@ -9,12 +9,12 @@ import shallowEqual from "../../utils/shallowEqual"; import type * as t from "../.."; import deprecationWarning from "../../utils/deprecationWarning"; -type Opts = Partial<{ - [Prop in keyof Object]: Object[Prop] extends t.Node - ? t.Node | Object[Prop] - : Object[Prop] extends t.Node[] - ? t.Node[] | Object[Prop] - : Object[Prop]; +type Opts = Partial<{ + [Prop in keyof Obj]: Obj[Prop] extends t.Node + ? t.Node + : Obj[Prop] extends t.Node[] + ? t.Node[] + : Obj[Prop]; }>; export function isArrayExpression(