Rename module-attributes to import-assertions

babel · Oct 8, 2020 · b4175f7 · b4175f7
1 parent a52e2b6
commit b4175f7
Show file tree

Hide file tree

Showing 17 changed files with 271 additions and 95 deletions.
diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
@@ -2118,8 +2118,13 @@ export default class StatementParser extends ExpressionParser {
     this.expectPlugin("importAssertions");
 
     const attrs = [];
+    const attrNames = new Set();
 
     do {
+      if (this.match(tt.braceR)) {
+        break;
+      }
+
       const node = this.startNode();
 
       // parse AssertionKey : IdentifierName, StringLiteral
@@ -2132,6 +2137,26 @@ export default class StatementParser extends ExpressionParser {
       this.next();
       node.key = assertionKeyNode;
 
+      // for now we are only allowing `type` as the only allowed module attribute
+      if (node.key.name !== "type") {
+        this.raise(
+          node.key.start,
+          Errors.ModuleAttributeDifferentFromType,
+          node.key.name,
+        );
+      }
+      // check if we already have an entry for an attribute
+      // if a duplicate entry is found, throw an error
+      // for now this logic will come into play only when someone declares `type` twice
+      if (attrNames.has(node.key.name)) {
+        this.raise(
+          node.key.start,
+          Errors.ModuleAttributesWithDuplicateKeys,
+          node.key.name,
+        );
+      }
+      attrNames.add(node.key.name);
+
       if (!this.match(tt.string)) {
         throw this.unexpected(
           this.state.start,

diff --git a/...plugin/module-attributes-dynamic/input.js → ...plugin/import-assertions-dynamic/input.js b/...plugin/module-attributes-dynamic/input.js → ...plugin/import-assertions-dynamic/input.js
diff --git a/...in/module-attributes-dynamic/options.json → ...in/import-assertions-dynamic/options.json b/...in/module-attributes-dynamic/options.json → ...in/import-assertions-dynamic/options.json
diff --git a/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-assertions/input.js b/packages/babel-parser/test/fixtures/experimental/_no-plugin/import-assertions/input.js
@@ -0,0 +1 @@
+import foo from "foo.json" assert { type: "json" };
diff --git a/..._no-plugin/module-attributes/options.json → ..._no-plugin/import-assertions/options.json b/..._no-plugin/module-attributes/options.json → ..._no-plugin/import-assertions/options.json
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
@@ -0,0 +1 @@
+import foo from "foo.json" assert { for: "for" }
diff --git a/...ges/babel-parser/test/fixtures/experimental/import-assertions/string-literal/options.json b/...ges/babel-parser/test/fixtures/experimental/import-assertions/string-literal/options.json
@@ -0,0 +1,11 @@
+{
+  "plugins": [
+    [
+      "importAssertions",
+      {
+        "version": "september-2020"
+      }
+    ]
+  ],
+  "sourceType": "module"
+}
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
@@ -0,0 +1,60 @@
+{
+  "type": "File",
+  "start":0,"end":48,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":48}},
+  "errors": [
+    "SyntaxError: The only accepted module attribute is `type` (1:36)"
+  ],
+  "program": {
+    "type": "Program",
+    "start":0,"end":48,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":48}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start":0,"end":48,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":48}},
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start":7,"end":10,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":10}},
+            "local": {
+              "type": "Identifier",
+              "start":7,"end":10,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":10},"identifierName":"foo"},
+              "name": "foo"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start":16,"end":26,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":26}},
+          "extra": {
+            "rawValue": "foo.json",
+            "raw": "\"foo.json\""
+          },
+          "value": "foo.json"
+        },
+        "assertions": [
+          {
+            "type": "ImportAttribute",
+            "start":36,"end":46,"loc":{"start":{"line":1,"column":36},"end":{"line":1,"column":46}},
+            "key": {
+              "type": "Identifier",
+              "start":36,"end":39,"loc":{"start":{"line":1,"column":36},"end":{"line":1,"column":39},"identifierName":"for"},
+              "name": "for"
+            },
+            "value": {
+              "type": "StringLiteral",
+              "start":41,"end":46,"loc":{"start":{"line":1,"column":41},"end":{"line":1,"column":46}},
+              "extra": {
+                "rawValue": "for",
+                "raw": "\"for\""
+              },
+              "value": "for"
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/...babel-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/input.js b/...babel-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/input.js
@@ -0,0 +1,2 @@
+import("foo.js",);
+import("foo.json", { assert: { type: "json" } },);
diff --git a/...l-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/options.json b/...l-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/options.json
@@ -0,0 +1,11 @@
+{
+  "plugins": [
+    [
+      "importAssertions",
+      {
+        "version": "september-2020"
+      }
+    ]
+  ],
+  "sourceType": "module"
+}
diff --git a/...el-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json b/...el-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json
@@ -0,0 +1,110 @@
+{
+  "type": "File",
+  "start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":50}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":50}},
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":18,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":18}},
+        "expression": {
+          "type": "CallExpression",
+          "start":0,"end":17,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":17}},
+          "callee": {
+            "type": "Import",
+            "start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}}
+          },
+          "extra": {
+            "trailingComma": 15
+          },
+          "arguments": [
+            {
+              "type": "StringLiteral",
+              "start":7,"end":15,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":15}},
+              "extra": {
+                "rawValue": "foo.js",
+                "raw": "\"foo.js\""
+              },
+              "value": "foo.js"
+            }
+          ]
+        }
+      },
+      {
+        "type": "ExpressionStatement",
+        "start":19,"end":69,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":50}},
+        "expression": {
+          "type": "CallExpression",
+          "start":19,"end":68,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":49}},
+          "callee": {
+            "type": "Import",
+            "start":19,"end":25,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":6}}
+          },
+          "extra": {
+            "trailingComma": 66
+          },
+          "arguments": [
+            {
+              "type": "StringLiteral",
+              "start":26,"end":36,"loc":{"start":{"line":2,"column":7},"end":{"line":2,"column":17}},
+              "extra": {
+                "rawValue": "foo.json",
+                "raw": "\"foo.json\""
+              },
+              "value": "foo.json"
+            },
+            {
+              "type": "ObjectExpression",
+              "start":38,"end":66,"loc":{"start":{"line":2,"column":19},"end":{"line":2,"column":47}},
+              "properties": [
+                {
+                  "type": "ObjectProperty",
+                  "start":40,"end":64,"loc":{"start":{"line":2,"column":21},"end":{"line":2,"column":45}},
+                  "method": false,
+                  "key": {
+                    "type": "Identifier",
+                    "start":40,"end":46,"loc":{"start":{"line":2,"column":21},"end":{"line":2,"column":27},"identifierName":"assert"},
+                    "name": "assert"
+                  },
+                  "computed": false,
+                  "shorthand": false,
+                  "value": {
+                    "type": "ObjectExpression",
+                    "start":48,"end":64,"loc":{"start":{"line":2,"column":29},"end":{"line":2,"column":45}},
+                    "properties": [
+                      {
+                        "type": "ObjectProperty",
+                        "start":50,"end":62,"loc":{"start":{"line":2,"column":31},"end":{"line":2,"column":43}},
+                        "method": false,
+                        "key": {
+                          "type": "Identifier",
+                          "start":50,"end":54,"loc":{"start":{"line":2,"column":31},"end":{"line":2,"column":35},"identifierName":"type"},
+                          "name": "type"
+                        },
+                        "computed": false,
+                        "shorthand": false,
+                        "value": {
+                          "type": "StringLiteral",
+                          "start":56,"end":62,"loc":{"start":{"line":2,"column":37},"end":{"line":2,"column":43}},
+                          "extra": {
+                            "rawValue": "json",
+                            "raw": "\"json\""
+                          },
+                          "value": "json"
+                        }
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      }
+    ],
+    "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,2 +1 @@
-import("foo.js",);
-import("foo.json", { assert: { type: "json" } },);
+import foo from "foo" assert { foo: "foo", }
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,108 +1,58 @@
 {
   "type": "File",
-  "start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":50}},
+  "start":0,"end":44,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":44}},
+  "errors": [
+    "SyntaxError: The only accepted module attribute is `type` (1:31)"
+  ],
   "program": {
     "type": "Program",
-    "start":0,"end":69,"loc":{"start":{"line":1,"column":0},"end":{"line":2,"column":50}},
+    "start":0,"end":44,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":44}},
     "sourceType": "module",
     "interpreter": null,
     "body": [
       {
-        "type": "ExpressionStatement",
-        "start":0,"end":18,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":18}},
-        "expression": {
-          "type": "CallExpression",
-          "start":0,"end":17,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":17}},
-          "callee": {
-            "type": "Import",
-            "start":0,"end":6,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":6}}
-          },
-          "extra": {
-            "trailingComma": 15
-          },
-          "arguments": [
-            {
-              "type": "StringLiteral",
-              "start":7,"end":15,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":15}},
-              "extra": {
-                "rawValue": "foo.js",
-                "raw": "\"foo.js\""
-              },
-              "value": "foo.js"
+        "type": "ImportDeclaration",
+        "start":0,"end":44,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":44}},
+        "specifiers": [
+          {
+            "type": "ImportDefaultSpecifier",
+            "start":7,"end":10,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":10}},
+            "local": {
+              "type": "Identifier",
+              "start":7,"end":10,"loc":{"start":{"line":1,"column":7},"end":{"line":1,"column":10},"identifierName":"foo"},
+              "name": "foo"
             }
-          ]
-        }
-      },
-      {
-        "type": "ExpressionStatement",
-        "start":19,"end":69,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":50}},
-        "expression": {
-          "type": "CallExpression",
-          "start":19,"end":68,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":49}},
-          "callee": {
-            "type": "Import",
-            "start":19,"end":25,"loc":{"start":{"line":2,"column":0},"end":{"line":2,"column":6}}
-          },
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start":16,"end":21,"loc":{"start":{"line":1,"column":16},"end":{"line":1,"column":21}},
           "extra": {
-            "trailingComma": 66
+            "rawValue": "foo",
+            "raw": "\"foo\""
           },
-          "arguments": [
-            {
+          "value": "foo"
+        },
+        "assertions": [
+          {
+            "type": "ImportAttribute",
+            "start":31,"end":41,"loc":{"start":{"line":1,"column":31},"end":{"line":1,"column":41}},
+            "key": {
+              "type": "Identifier",
+              "start":31,"end":34,"loc":{"start":{"line":1,"column":31},"end":{"line":1,"column":34},"identifierName":"foo"},
+              "name": "foo"
+            },
+            "value": {
               "type": "StringLiteral",
-              "start":26,"end":36,"loc":{"start":{"line":2,"column":7},"end":{"line":2,"column":17}},
+              "start":36,"end":41,"loc":{"start":{"line":1,"column":36},"end":{"line":1,"column":41}},
               "extra": {
-                "rawValue": "foo.json",
-                "raw": "\"foo.json\""
+                "rawValue": "foo",
+                "raw": "\"foo\""
               },
-              "value": "foo.json"
-            },
-            {
-              "type": "ObjectExpression",
-              "start":38,"end":66,"loc":{"start":{"line":2,"column":19},"end":{"line":2,"column":47}},
-              "properties": [
-                {
-                  "type": "ObjectProperty",
-                  "start":40,"end":64,"loc":{"start":{"line":2,"column":21},"end":{"line":2,"column":45}},
-                  "method": false,
-                  "key": {
-                    "type": "Identifier",
-                    "start":40,"end":46,"loc":{"start":{"line":2,"column":21},"end":{"line":2,"column":27},"identifierName":"assert"},
-                    "name": "assert"
-                  },
-                  "computed": false,
-                  "shorthand": false,
-                  "value": {
-                    "type": "ObjectExpression",
-                    "start":48,"end":64,"loc":{"start":{"line":2,"column":29},"end":{"line":2,"column":45}},
-                    "properties": [
-                      {
-                        "type": "ObjectProperty",
-                        "start":50,"end":62,"loc":{"start":{"line":2,"column":31},"end":{"line":2,"column":43}},
-                        "method": false,
-                        "key": {
-                          "type": "Identifier",
-                          "start":50,"end":54,"loc":{"start":{"line":2,"column":31},"end":{"line":2,"column":35},"identifierName":"type"},
-                          "name": "type"
-                        },
-                        "computed": false,
-                        "shorthand": false,
-                        "value": {
-                          "type": "StringLiteral",
-                          "start":56,"end":62,"loc":{"start":{"line":2,"column":37},"end":{"line":2,"column":43}},
-                          "extra": {
-                            "rawValue": "json",
-                            "raw": "\"json\""
-                          },
-                          "value": "json"
-                        }
-                      }
-                    ]
-                  }
-                }
-              ]
+              "value": "foo"
             }
-          ]
-        }
+          }
+        ]
       }
     ],
     "directives": []