added basic support for module attributes and tests updated

packages/babel-parser/src/parser/expression.js

@@ -852,6 +852,35 @@ export default class ExpressionParser extends LValParser {
     return this.parseSubscripts(this.parseExprAtom(), startPos, startLoc, true);
   }
 
+  /**
+   * Parse a primitive value
+   * primitive values are null, undefined, number, bigint, string, boolean
+   */
+  parsePrimitiveValue(): N.Expression {
+    let node;
+    switch (this.state.type) {
+      case tt.num:
+        return this.parseLiteral(this.state.value, "NumericLiteral");
+
+      case tt.bigint:
+        return this.parseLiteral(this.state.value, "BigIntLiteral");
+
+      case tt.string:
+        return this.parseLiteral(this.state.value, "StringLiteral");
+
+      case tt._null:
+        node = this.startNode();
+        this.next();
+        return this.finishNode(node, "NullLiteral");
+
+      case tt._true:
+      case tt._false:
+        return this.parseBooleanLiteral();
+      default:
+        throw this.unexpected();
+    }
+  }
+
   // Parse an atomic expression — either a single token that is an
   // expression, an expression started by a keyword like `function` or
   // `new`, or an expression wrapped in punctuation like `()`, `[]`,
@@ -1459,7 +1488,6 @@ export default class ExpressionParser extends LValParser {
     this.next();
     return this.finishNode(node, "TemplateLiteral");
   }
-
   // Parse an object literal or binding pattern.
 
   parseObj<T: N.ObjectPattern | N.ObjectExpression>(

packages/babel-parser/src/parser/statement.js

@@ -2005,13 +2005,29 @@ export default class StatementParser extends ExpressionParser {
     // import '...'
     node.specifiers = [];
     if (!this.match(tt.string)) {
+      // check if we have a default import like
+      // import React from "react";
       const hasDefault = this.maybeParseDefaultImportSpecifier(node);
+      /* we are checking if we do not have a default import, then it is obvious that we need named imports
+       * import { get } from "axios";
+       * but if we do have a default import
+       * we need to check if we have a comma after that and
+       * that is where this || this.eat comes into play
+       */
       const parseNext = !hasDefault || this.eat(tt.comma);
+      // if we do have to parse the next set of specifiers, we first check for start imports
+      // import React, * from "react";
       const hasStar = parseNext && this.maybeParseStarImportSpecifier(node);
+      // now we check that if we need to parse the next imports
+      // but only if he/she is not importing * which means all
       if (parseNext && !hasStar) this.parseNamedImportSpecifiers(node);
       this.expectContextual("from");
     }
     node.source = this.parseImportSource();
+    const attributes = this.maybeParseModuleAttributes();
+    if (Array.isArray(attributes)) {
+      node.attributes = attributes;
+    }
     this.semicolon();
     return this.finishNode(node, "ImportDeclaration");
   }
@@ -2042,6 +2058,27 @@ export default class StatementParser extends ExpressionParser {
     node.specifiers.push(this.finishNode(specifier, type));
   }
 
+  maybeParseModuleAttributes() {
+    if (!this.eat(tt._with)) {
+      if (this.hasPlugin("moduleAttributes")) return [];
+      return null;
+    }
+    this.expectPlugin("moduleAttributes");
+    const attrs = [];
+    do {
+      const node = this.startNode();
+      node.key = this.parseIdentifier();
+      node.computed = false;
+      node.method = false;
+      node.shorthand = false;
+      this.expect(tt.colon);
+      node.value = this.parsePrimitiveValue();
+      this.finishNode(node, "ObjectProperty");
+      attrs.push(node);
+    } while (this.eat(tt.comma));
+    return attrs;
+  }
+
   maybeParseDefaultImportSpecifier(node: N.ImportDeclaration): boolean {
     if (this.shouldParseDefaultImport(node)) {
       // import defaultObj, { x, y as z } from '...'

packages/babel-parser/test/fixtures/experimental/_no-plugin/import-module-attributes/input.js

@@ -0,0 +1 @@
+import foo from "foo.json" with type: "json";

packages/babel-parser/test/fixtures/experimental/_no-plugin/import-module-attributes/options.json

@@ -0,0 +1,5 @@
+{
+  "throws": "This experimental syntax requires enabling the parser plugin: 'moduleAttributes' (1:32)",
+  "sourceType": "module",
+  "plugins": []
+}

packages/babel-parser/test/fixtures/experimental/import-module-attributes/valid-syntax-with-attributes/input.js

@@ -0,0 +1 @@
+import foo from "foo.json" with type: "json";

packages/babel-parser/test/fixtures/experimental/import-module-attributes/valid-syntax-with-attributes/options.json

@@ -0,0 +1,4 @@
+{
+  "plugins": ["moduleAttributes"],
+  "sourceType": "module"
+}

packages/babel-parser/test/fixtures/experimental/import-module-attributes/valid-syntax-with-attributes/output.json

@@ -0,0 +1,161 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 45,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 45
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 45,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 45
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 45,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 45
+          }
+        },
+        "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"
+        },
+        "attributes": [
+          {
+            "type": "ObjectProperty",
+            "start": 32,
+            "end": 44,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 32
+              },
+              "end": {
+                "line": 1,
+                "column": 44
+              }
+            },
+            "key": {
+              "type": "Identifier",
+              "start": 32,
+              "end": 36,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 32
+                },
+                "end": {
+                  "line": 1,
+                  "column": 36
+                },
+                "identifierName": "type"
+              },
+              "name": "type"
+            },
+            "computed": false,
+            "method": false,
+            "shorthand": false,
+            "value": {
+              "type": "StringLiteral",
+              "start": 38,
+              "end": 44,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 38
+                },
+                "end": {
+                  "line": 1,
+                  "column": 44
+                }
+              },
+              "extra": {
+                "rawValue": "json",
+                "raw": "\"json\""
+              },
+              "value": "json"
+            }
+          }
+        ]
+      }
+    ],
+    "directives": []
+  }
+}

packages/babel-parser/test/fixtures/experimental/import-module-attributes/valid-syntax-without-attributes/input.js

@@ -0,0 +1 @@
+import foo from "foo.json";

packages/babel-parser/test/fixtures/experimental/import-module-attributes/valid-syntax-without-attributes/options.json

@@ -0,0 +1,4 @@
+{
+  "plugins": ["moduleAttributes"],
+  "sourceType": "module"
+}

packages/babel-parser/test/fixtures/experimental/import-module-attributes/valid-syntax-without-attributes/output.json

@@ -0,0 +1,105 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 27,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 27
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 27,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 27
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ImportDeclaration",
+        "start": 0,
+        "end": 27,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 27
+          }
+        },
+        "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"
+        },
+        "attributes": []
+      }
+    ],
+    "directives": []
+  }
+}