Fix inherits aliases

babel · Aug 16, 2021 · 517edbc · 517edbc
1 parent b2bd3cd
commit 517edbc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/packages/babel-types/src/ast-types/generated/index.ts b/packages/babel-types/src/ast-types/generated/index.ts
@@ -2234,9 +2234,6 @@ export type StandardizedOrProposal =
   | PrivateName
   | ArgumentPlaceholder
   | BindExpression
-  | PipelineTopicExpression
-  | PipelineBareFunction
-  | PipelinePrimaryTopicReference
   | ImportAttribute
   | Decorator
   | DoExpression
@@ -2245,7 +2242,11 @@ export type StandardizedOrProposal =
   | TupleExpression
   | DecimalLiteral
   | StaticBlock
-  | ModuleExpression;
+  | ModuleExpression
+  | TopicReference
+  | PipelineTopicExpression
+  | PipelineBareFunction
+  | PipelinePrimaryTopicReference;
 export type Expression =
   | ArrayExpression
   | AssignmentExpression
@@ -2261,6 +2262,7 @@ export type Expression =
   | RegExpLiteral
   | LogicalExpression
   | MemberExpression
+  | NewExpression
   | ObjectExpression
   | SequenceExpression
   | ParenthesizedExpression
@@ -2682,9 +2684,6 @@ export type Miscellaneous = Noop | Placeholder | V8IntrinsicIdentifier;
 export type Proposal =
   | ArgumentPlaceholder
   | BindExpression
-  | PipelineTopicExpression
-  | PipelineBareFunction
-  | PipelinePrimaryTopicReference
   | ImportAttribute
   | Decorator
   | DoExpression
@@ -2693,7 +2692,11 @@ export type Proposal =
   | TupleExpression
   | DecimalLiteral
   | StaticBlock
-  | ModuleExpression;
+  | ModuleExpression
+  | TopicReference
+  | PipelineTopicExpression
+  | PipelineBareFunction
+  | PipelinePrimaryTopicReference;
 export type TypeScript =
   | TSParameterProperty
   | TSDeclareFunction

diff --git a/packages/babel-types/src/definitions/utils.ts b/packages/babel-types/src/definitions/utils.ts
@@ -271,7 +271,12 @@ const validFieldKeys = ["default", "optional", "validate"];
 // Wraps defineType to ensure these aliases are included.
 export function defineAliasedType(...aliases: string[]) {
   return (type: string, opts: DefineTypeOpts = {}) => {
-    const defined = (opts.aliases ??= []);
+    let defined = opts.aliases;
+    if (!defined) {
+      if (opts.inherits) defined = store[opts.inherits].aliases?.slice();
+      defined ??= [];
+      opts.aliases = defined;
+    }
     const additional = aliases.filter(a => !defined.includes(a));
     defined.unshift(...additional);
     return defineType(type, opts);

diff --git a/packages/babel-types/src/validators/generated/index.ts b/packages/babel-types/src/validators/generated/index.ts
@@ -4390,9 +4390,6 @@ export function isStandardizedOrProposal(
     "PrivateName" === nodeType ||
     "ArgumentPlaceholder" === nodeType ||
     "BindExpression" === nodeType ||
-    "PipelineTopicExpression" === nodeType ||
-    "PipelineBareFunction" === nodeType ||
-    "PipelinePrimaryTopicReference" === nodeType ||
     "ImportAttribute" === nodeType ||
     "Decorator" === nodeType ||
     "DoExpression" === nodeType ||
@@ -4402,6 +4399,10 @@ export function isStandardizedOrProposal(
     "DecimalLiteral" === nodeType ||
     "StaticBlock" === nodeType ||
     "ModuleExpression" === nodeType ||
+    "TopicReference" === nodeType ||
+    "PipelineTopicExpression" === nodeType ||
+    "PipelineBareFunction" === nodeType ||
+    "PipelinePrimaryTopicReference" === nodeType ||
     (nodeType === "Placeholder" &&
       ("Identifier" === (node as t.Placeholder).expectedNode ||
         "StringLiteral" === (node as t.Placeholder).expectedNode ||
@@ -4439,6 +4440,7 @@ export function isExpression(
     "RegExpLiteral" === nodeType ||
     "LogicalExpression" === nodeType ||
     "MemberExpression" === nodeType ||
+    "NewExpression" === nodeType ||
     "ObjectExpression" === nodeType ||
     "SequenceExpression" === nodeType ||
     "ParenthesizedExpression" === nodeType ||
@@ -5638,9 +5640,6 @@ export function isProposal(
   if (
     "ArgumentPlaceholder" === nodeType ||
     "BindExpression" === nodeType ||
-    "PipelineTopicExpression" === nodeType ||
-    "PipelineBareFunction" === nodeType ||
-    "PipelinePrimaryTopicReference" === nodeType ||
     "ImportAttribute" === nodeType ||
     "Decorator" === nodeType ||
     "DoExpression" === nodeType ||
@@ -5649,7 +5648,11 @@ export function isProposal(
     "TupleExpression" === nodeType ||
     "DecimalLiteral" === nodeType ||
     "StaticBlock" === nodeType ||
-    "ModuleExpression" === nodeType
+    "ModuleExpression" === nodeType ||
+    "TopicReference" === nodeType ||
+    "PipelineTopicExpression" === nodeType ||
+    "PipelineBareFunction" === nodeType ||
+    "PipelinePrimaryTopicReference" === nodeType
   ) {
     if (typeof opts === "undefined") {
       return true;