Ensure that an array validator is followed by assertEach

babel · Feb 12, 2021 · 4a20844 · 4a20844
1 parent b8d0958
commit 4a20844
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/packages/babel-types/src/ast-types/generated/index.ts b/packages/babel-types/src/ast-types/generated/index.ts
@@ -820,7 +820,7 @@ export interface ClassDeclaration extends BaseNode {
 export interface ExportAllDeclaration extends BaseNode {
   type: "ExportAllDeclaration";
   source: StringLiteral;
-  assertions?: ImportAttribute | null;
+  assertions?: Array<ImportAttribute> | null;
   exportKind?: "type" | "value" | null;
 }
 
@@ -840,7 +840,7 @@ export interface ExportNamedDeclaration extends BaseNode {
     ExportSpecifier | ExportDefaultSpecifier | ExportNamespaceSpecifier
   >;
   source?: StringLiteral | null;
-  assertions?: ImportAttribute | null;
+  assertions?: Array<ImportAttribute> | null;
   exportKind?: "type" | "value" | null;
 }
 
@@ -864,7 +864,7 @@ export interface ImportDeclaration extends BaseNode {
     ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier
   >;
   source: StringLiteral;
-  assertions?: ImportAttribute | null;
+  assertions?: Array<ImportAttribute> | null;
   importKind?: "type" | "typeof" | "value" | null;
 }
 

diff --git a/packages/babel-types/src/definitions/utils.ts b/packages/babel-types/src/definitions/utils.ts
@@ -19,12 +19,18 @@ function getType(val) {
   }
 }
 
-// TODO: Import and use Node instead of any
-type Validator = { chainOf?: Validator[] } & ((
-  parent: any,
-  key: string,
-  node: any,
-) => void);
+type Validator = (
+  | { type: string }
+  | { each: Validator }
+  | { chainOf: Validator[] }
+  | { oneOf: any[] }
+  | { oneOfNodeTypes: string[] }
+  | { oneOfNodeOrValueTypes: string[] }
+  | { shapeOf: { [x: string]: FieldOptions } }
+  | {}
+) &
+  // TODO: Import and use Node instead of any
+  ((parent: any, key: string, node: any) => void);
 
 type FieldOptions = {
   default?: any;
@@ -218,12 +224,24 @@ export function assertOptionalChainStart(): Validator {
 }
 
 export function chain(...fns: Array<Validator>): Validator {
-  const validate: Validator = function (...args) {
+  function validate(...args: Parameters<Validator>) {
     for (const fn of fns) {
       fn(...args);
     }
-  };
+  }
   validate.chainOf = fns;
+
+  if (
+    fns.length >= 2 &&
+    "type" in fns[0] &&
+    fns[0].type === "array" &&
+    !("each" in fns[1])
+  ) {
+    throw new Error(
+      `An assertValueType("array") validator can only be followed by an assertEach(...) validator.`,
+    );
+  }
+
   return validate;
 }