Support Import Assertions for re-export statement (#12249)

babel · Oct 26, 2020 · faaebfe · faaebfe
1 parent f5bd9f2
commit faaebfe
Show file tree

Hide file tree

Showing 33 changed files with 763 additions and 18 deletions.
diff --git a/packages/babel-generator/src/generators/modules.js b/packages/babel-generator/src/generators/modules.js
@@ -53,6 +53,7 @@ export function ExportAllDeclaration(node: Object) {
   this.word("from");
   this.space();
   this.print(node.source, node);
+  this.printAssertions(node);
   this.semicolon();
 }
 
@@ -131,6 +132,7 @@ function ExportDeclaration(node: Object) {
       this.word("from");
       this.space();
       this.print(node.source, node);
+      this.printAssertions(node);
     }
 
     this.semicolon();
@@ -180,19 +182,10 @@ export function ImportDeclaration(node: Object) {
 
   this.print(node.source, node);
 
-  if (node.assertions?.length) {
-    this.space();
-    this.word("assert");
-    this.space();
-    this.token("{");
-    this.space();
-    this.printList(node.assertions, node);
-    this.space();
-    this.token("}");
-  }
+  this.printAssertions(node);
   // todo(Babel 8): remove this if branch
   // `module-attributes` support is discontinued, use `import-assertions` instead.
-  else if (node.attributes?.length) {
+  if (node.attributes?.length) {
     this.space();
     this.word("with");
     this.space();

diff --git a/packages/babel-generator/src/printer.js b/packages/babel-generator/src/printer.js
@@ -646,6 +646,19 @@ export default class Printer {
       }
     }
   }
+
+  printAssertions(node: Node) {
+    if (node.assertions?.length) {
+      this.space();
+      this.word("assert");
+      this.space();
+      this.token("{");
+      this.space();
+      this.printList(node.assertions, node);
+      this.space();
+      this.token("}");
+    }
+  }
 }
 
 // Expose the node type functions and helpers on the prototype for easy usage.

diff --git a/packages/babel-generator/test/fixtures/types/ImportAssertion/input.js b/packages/babel-generator/test/fixtures/types/ImportAssertion/input.js
@@ -1 +1,4 @@
-import foo from "foo.json" assert { type: "json" };
+import foo1 from "foo.json" assert { type: "json" };
+export { foo2 } from "foo.json" assert { type: "json" };
+export * from "foo.json" assert { type: "json" };
+export * as foo3 from "foo.json" assert { type: "json" };
diff --git a/packages/babel-generator/test/fixtures/types/ImportAssertion/output.js b/packages/babel-generator/test/fixtures/types/ImportAssertion/output.js
@@ -1 +1,4 @@
-import foo from "foo.json" assert { type: "json" };
+import foo1 from "foo.json" assert { type: "json" };
+export { foo2 } from "foo.json" assert { type: "json" };
+export * from "foo.json" assert { type: "json" };
+export * as foo3 from "foo.json" assert { type: "json" };
diff --git a/packages/babel-parser/ast/spec.md b/packages/babel-parser/ast/spec.md
@@ -1364,6 +1364,7 @@ interface ExportNamedDeclaration <: ModuleDeclaration {
   declaration: Declaration | null;
   specifiers: [ ExportSpecifier ];
   source: StringLiteral | null;
+  assertions?: [ ImportAttribute ];
 }
 ```
 

diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
@@ -1924,6 +1924,11 @@ export default class StatementParser extends ExpressionParser {
       }
     }
 
+    const assertions = this.maybeParseImportAssertions();
+    if (assertions) {
+      node.assertions = assertions;
+    }
+
     this.semicolon();
   }
 

diff --git a/packages/babel-parser/src/types.js b/packages/babel-parser/src/types.js
@@ -360,6 +360,12 @@ export type Directive = NodeBase & {
 
 export type DirectiveLiteral = StringLiteral & { type: "DirectiveLiteral" };
 
+export type ImportAttribute = NodeBase & {
+  type: "ImportAttribute",
+  key: Identifier | StringLiteral,
+  value: StringLiteral,
+};
+
 // Expressions
 
 export type Super = NodeBase & { type: "Super" };
@@ -867,6 +873,8 @@ export type ExportNamedDeclaration = NodeBase & {
   source: ?Literal,
 
   exportKind?: "type" | "value", // TODO: Not in spec
+
+  assertions?: $ReadOnlyArray<ImportAttribute>,
 };
 
 export type ExportSpecifier = NodeBase & {

diff --git a/...ental/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/input.js b/...ental/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/input.js
@@ -0,0 +1,2 @@
+export { x } from "foo" assert
+{ type: "json" }
diff --git a/...al/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/output.json b/...al/import-assertions/invalid-syntax-export-with-and-attributes-multiple-lines/output.json
@@ -0,0 +1,63 @@
+{
+  "type": "File",
+  "start":0,"end":47,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":16}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":47,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":16}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start":0,"end":47,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":16}},
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start":9,"end":10,"loc":{"start":{"line":1,"column":9},"end":{"line":1,"column":10}},
+            "local": {
+              "type": "Identifier",
+              "start":9,"end":10,"loc":{"start":{"line":1,"column":9},"end":{"line":1,"column":10},"identifierName":"x"},
+              "name": "x"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start":9,"end":10,"loc":{"start":{"line":1,"column":9},"end":{"line":1,"column":10},"identifierName":"x"},
+              "name": "x"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start":18,"end":23,"loc":{"start":{"line":1,"column":18},"end":{"line":1,"column":23}},
+          "extra": {
+            "rawValue": "foo",
+            "raw": "\"foo\""
+          },
+          "value": "foo"
+        },
+        "declaration": null,
+        "assertions": [
+          {
+            "type": "ImportAttribute",
+            "start":33,"end":45,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":14}},
+            "key": {
+              "type": "Identifier",
+              "start":33,"end":37,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":6},"identifierName":"type"},
+              "name": "type"
+            },
+            "value": {
+              "type": "StringLiteral",
+              "start":39,"end":45,"loc":{"start":{"line":2,"column":8},"end":{"line":2,"column":14}},
+              "extra": {
+                "rawValue": "json",
+                "raw": "\"json\""
+              },
+              "value": "json"
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/...perimental/import-assertions/invalid-syntax-export-without-attributes-identifier/input.js b/...perimental/import-assertions/invalid-syntax-export-without-attributes-identifier/input.js
@@ -0,0 +1 @@
+export { x } from "foo" assert;
diff --git a/...mental/import-assertions/invalid-syntax-export-without-attributes-identifier/options.json b/...mental/import-assertions/invalid-syntax-export-without-attributes-identifier/options.json
@@ -0,0 +1,5 @@
+{
+  "plugins": [["importAssertions"]],
+  "sourceType": "module",
+  "throws": "Unexpected token (1:30)"
+}
diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/input.js b/packages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/input.js
@@ -1 +1,2 @@
 import foo from "foo.json" assert { for: "for" }
+export { foo } from "foo.json" assert { for: "for" }
diff --git a/...ages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/output.json b/...ages/babel-parser/test/fixtures/experimental/import-assertions/string-literal/output.json
@@ -1,12 +1,13 @@
 {
   "type": "File",
-  "start":0,"end":48,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":48}},
+  "start":0,"end":101,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":52}},
   "errors": [
-    "SyntaxError: The only accepted module attribute is `type` (1:36)"
+    "SyntaxError: The only accepted module attribute is `type` (1:36)",
+    "SyntaxError: The only accepted module attribute is `type` (2:40)"
   ],
   "program": {
     "type": "Program",
-    "start":0,"end":48,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":48}},
+    "start":0,"end":101,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":52}},
     "sourceType": "module",
     "interpreter": null,
     "body": [
@@ -53,6 +54,56 @@
             }
           }
         ]
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start":49,"end":101,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":52}},
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start":58,"end":61,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":12}},
+            "local": {
+              "type": "Identifier",
+              "start":58,"end":61,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":12},"identifierName":"foo"},
+              "name": "foo"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start":58,"end":61,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":12},"identifierName":"foo"},
+              "name": "foo"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start":69,"end":79,"loc":{"start":{"line":2,"column":20},"end":{"line":2,"column":30}},
+          "extra": {
+            "rawValue": "foo.json",
+            "raw": "\"foo.json\""
+          },
+          "value": "foo.json"
+        },
+        "declaration": null,
+        "assertions": [
+          {
+            "type": "ImportAttribute",
+            "start":89,"end":99,"loc":{"start":{"line":2,"column":40},"end":{"line":2,"column":50}},
+            "key": {
+              "type": "Identifier",
+              "start":89,"end":92,"loc":{"start":{"line":2,"column":40},"end":{"line":2,"column":43},"identifierName":"for"},
+              "name": "for"
+            },
+            "value": {
+              "type": "StringLiteral",
+              "start":94,"end":99,"loc":{"start":{"line":2,"column":45},"end":{"line":2,"column":50}},
+              "extra": {
+                "rawValue": "for",
+                "raw": "\"for\""
+              },
+              "value": "for"
+            }
+          }
+        ]
       }
     ],
     "directives": []

diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/trailing-comma/input.js b/packages/babel-parser/test/fixtures/experimental/import-assertions/trailing-comma/input.js
@@ -1 +1,2 @@
 import foo from "foo" assert { type: "json", }
+export { foo } from "foo" assert { type: "json", }
diff --git a/...ages/babel-parser/test/fixtures/experimental/import-assertions/trailing-comma/output.json b/...ages/babel-parser/test/fixtures/experimental/import-assertions/trailing-comma/output.json
@@ -1,9 +1,9 @@
 {
   "type": "File",
-  "start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":46}},
+  "start":0,"end":97,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":50}},
   "program": {
     "type": "Program",
-    "start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":46}},
+    "start":0,"end":97,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":50}},
     "sourceType": "module",
     "interpreter": null,
     "body": [
@@ -50,6 +50,56 @@
             }
           }
         ]
+      },
+      {
+        "type": "ExportNamedDeclaration",
+        "start":47,"end":97,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":50}},
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start":56,"end":59,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":12}},
+            "local": {
+              "type": "Identifier",
+              "start":56,"end":59,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":12},"identifierName":"foo"},
+              "name": "foo"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start":56,"end":59,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":12},"identifierName":"foo"},
+              "name": "foo"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start":67,"end":72,"loc":{"start":{"line":2,"column":20},"end":{"line":2,"column":25}},
+          "extra": {
+            "rawValue": "foo",
+            "raw": "\"foo\""
+          },
+          "value": "foo"
+        },
+        "declaration": null,
+        "assertions": [
+          {
+            "type": "ImportAttribute",
+            "start":82,"end":94,"loc":{"start":{"line":2,"column":35},"end":{"line":2,"column":47}},
+            "key": {
+              "type": "Identifier",
+              "start":82,"end":86,"loc":{"start":{"line":2,"column":35},"end":{"line":2,"column":39},"identifierName":"type"},
+              "name": "type"
+            },
+            "value": {
+              "type": "StringLiteral",
+              "start":88,"end":94,"loc":{"start":{"line":2,"column":41},"end":{"line":2,"column":47}},
+              "extra": {
+                "rawValue": "json",
+                "raw": "\"json\""
+              },
+              "value": "json"
+            }
+          }
+        ]
       }
     ],
     "directives": []

diff --git a/...tures/experimental/import-assertions/valid-syntax-export-star-as-with-attributes/input.js b/...tures/experimental/import-assertions/valid-syntax-export-star-as-with-attributes/input.js
@@ -0,0 +1 @@
+export * as foo from "foo.json" assert { type: "json" };
diff --git a/...es/experimental/import-assertions/valid-syntax-export-star-as-with-attributes/output.json b/...es/experimental/import-assertions/valid-syntax-export-star-as-with-attributes/output.json
@@ -0,0 +1,57 @@
+{
+  "type": "File",
+  "start":0,"end":56,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":56}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":56,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":56}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start":0,"end":56,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":56}},
+        "specifiers": [
+          {
+            "type": "ExportNamespaceSpecifier",
+            "start":7,"end":15,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":15}},
+            "exported": {
+              "type": "Identifier",
+              "start":12,"end":15,"loc":{"start":{"line":1,"column":12},"end":{"line":1,"column":15},"identifierName":"foo"},
+              "name": "foo"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start":21,"end":31,"loc":{"start":{"line":1,"column":21},"end":{"line":1,"column":31}},
+          "extra": {
+            "rawValue": "foo.json",
+            "raw": "\"foo.json\""
+          },
+          "value": "foo.json"
+        },
+        "assertions": [
+          {
+            "type": "ImportAttribute",
+            "start":41,"end":53,"loc":{"start":{"line":1,"column":41},"end":{"line":1,"column":53}},
+            "key": {
+              "type": "Identifier",
+              "start":41,"end":45,"loc":{"start":{"line":1,"column":41},"end":{"line":1,"column":45},"identifierName":"type"},
+              "name": "type"
+            },
+            "value": {
+              "type": "StringLiteral",
+              "start":47,"end":53,"loc":{"start":{"line":1,"column":47},"end":{"line":1,"column":53}},
+              "extra": {
+                "rawValue": "json",
+                "raw": "\"json\""
+              },
+              "value": "json"
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  }
+}