From 491f39206c469ad6b27964a3a7a9b2566655e221 Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Tue, 25 Jun 2019 15:28:17 +0200 Subject: [PATCH 1/2] fix exportKind types declaration for ExportNamedDeclaration and DeclareExportAllDeclaration in babel-types --- packages/babel-parser/src/types.js | 2 +- packages/babel-types/src/definitions/es2015.js | 2 ++ packages/babel-types/src/definitions/flow.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/babel-parser/src/types.js b/packages/babel-parser/src/types.js index 2c5992d2ba6c..ea0b9538136d 100644 --- a/packages/babel-parser/src/types.js +++ b/packages/babel-parser/src/types.js @@ -837,7 +837,7 @@ export type ExportNamedDeclaration = NodeBase & { specifiers: $ReadOnlyArray, source: ?Literal, - exportKind?: "type" | "value", // TODO: Not in spec + exportKind?: "type" | "value" | "let", // TODO: Not in spec }; export type ExportSpecifier = NodeBase & { diff --git a/packages/babel-types/src/definitions/es2015.js b/packages/babel-types/src/definitions/es2015.js index e18d0e49763c..4150f5d58031 100644 --- a/packages/babel-types/src/definitions/es2015.js +++ b/packages/babel-types/src/definitions/es2015.js @@ -5,6 +5,7 @@ import defineType, { chain, assertEach, assertOneOf, + validateOptional, } from "./utils"; import { functionCommon, @@ -260,6 +261,7 @@ defineType("ExportNamedDeclaration", { validate: assertNodeType("StringLiteral"), optional: true, }, + exportKind: validateOptional(assertOneOf("type", "value", "let")), }, }); diff --git a/packages/babel-types/src/definitions/flow.js b/packages/babel-types/src/definitions/flow.js index b0e47a1c8251..75f6c8801966 100644 --- a/packages/babel-types/src/definitions/flow.js +++ b/packages/babel-types/src/definitions/flow.js @@ -150,7 +150,7 @@ defineType("DeclareExportAllDeclaration", { aliases: ["Flow", "FlowDeclaration", "Statement", "Declaration"], fields: { source: validateType("StringLiteral"), - exportKind: validateOptional(assertOneOf(["type", "value"])), + exportKind: validateOptional(assertOneOf("type", "value")), }, }); From 698c2129771c380d35f974bc6afbf7c5b8e16bd3 Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Tue, 25 Jun 2019 15:48:39 +0200 Subject: [PATCH 2/2] revert `let` in exportKind in babel-parser types --- packages/babel-parser/src/types.js | 2 +- packages/babel-types/src/definitions/es2015.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/babel-parser/src/types.js b/packages/babel-parser/src/types.js index ea0b9538136d..2c5992d2ba6c 100644 --- a/packages/babel-parser/src/types.js +++ b/packages/babel-parser/src/types.js @@ -837,7 +837,7 @@ export type ExportNamedDeclaration = NodeBase & { specifiers: $ReadOnlyArray, source: ?Literal, - exportKind?: "type" | "value" | "let", // TODO: Not in spec + exportKind?: "type" | "value", // TODO: Not in spec }; export type ExportSpecifier = NodeBase & { diff --git a/packages/babel-types/src/definitions/es2015.js b/packages/babel-types/src/definitions/es2015.js index 4150f5d58031..fb42b1390583 100644 --- a/packages/babel-types/src/definitions/es2015.js +++ b/packages/babel-types/src/definitions/es2015.js @@ -261,7 +261,7 @@ defineType("ExportNamedDeclaration", { validate: assertNodeType("StringLiteral"), optional: true, }, - exportKind: validateOptional(assertOneOf("type", "value", "let")), + exportKind: validateOptional(assertOneOf("type", "value")), }, });