Ensure a comma between imported default binding and named imports.

Fixes jquery#1046 Closes jquerygh-1221
jasonLaster · Jul 3, 2015 · 6bd50a2 · 6bd50a2
1 parent a87270b
commit 6bd50a2
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 33 deletions.
diff --git a/esprima.js b/esprima.js
@@ -5199,52 +5199,53 @@
     }
 
     function parseImportDeclaration() {
-        var specifiers, src, node = new Node();
+        var specifiers = [], src, node = new Node();
 
         if (state.inFunctionBody) {
             throwError(Messages.IllegalImportDeclaration);
         }
 
         expectKeyword('import');
-        specifiers = [];
 
         if (lookahead.type === Token.StringLiteral) {
-            // covers:
             // import 'foo';
             src = parseModuleSpecifier();
-            consumeSemicolon();
-            return node.finishImportDeclaration(specifiers, src);
-        }
+        } else {
 
-        if (!matchKeyword('default') && isIdentifierName(lookahead)) {
-            // covers:
-            // import foo
-            // import foo, ...
-            specifiers.push(parseImportDefaultSpecifier());
-            if (match(',')) {
-                lex();
+            if (match('{')) {
+                // import {bar}
+                specifiers = specifiers.concat(parseNamedImports());
+            } else if (match('*')) {
+                // import * as foo
+                specifiers.push(parseImportNamespaceSpecifier());
+            } else if (isIdentifierName(lookahead) && !matchKeyword('default')) {
+                // import foo
+                specifiers.push(parseImportDefaultSpecifier());
+                if (match(',')) {
+                    lex();
+                    if (match('*')) {
+                        // import foo, * as foo
+                        specifiers.push(parseImportNamespaceSpecifier());
+                    } else if (match('{')) {
+                        // import foo, {bar}
+                        specifiers = specifiers.concat(parseNamedImports());
+                    } else {
+                        throwUnexpectedToken(lookahead);
+                    }
+                }
+            } else {
+                throwUnexpectedToken(lex());
             }
-        }
-        if (match('*')) {
-            // covers:
-            // import foo, * as foo
-            // import * as foo
-            specifiers.push(parseImportNamespaceSpecifier());
-        } else if (match('{')) {
-            // covers:
-            // import foo, {bar}
-            // import {bar}
-            specifiers = specifiers.concat(parseNamedImports());
-        }
 
-        if (!matchContextualKeyword('from')) {
-            throwError(lookahead.value ?
-                    Messages.UnexpectedToken : Messages.MissingFromClause, lookahead.value);
+            if (!matchContextualKeyword('from')) {
+                throwError(lookahead.value ?
+                        Messages.UnexpectedToken : Messages.MissingFromClause, lookahead.value);
+            }
+            lex();
+            src = parseModuleSpecifier();
         }
-        lex();
-        src = parseModuleSpecifier();
-        consumeSemicolon();
 
+        consumeSemicolon();
         return node.finishImportDeclaration(specifiers, src);
     }
 

diff --git a/test/fixtures/ES6/import-declaration/invalid-import-default.module.json b/test/fixtures/ES6/import-declaration/invalid-import-default.module.json
@@ -1,7 +1,7 @@
 {
-    "index": 6,
+    "index": 7,
     "lineNumber": 1,
-    "column": 7,
+    "column": 8,
     "message": "Error: Line 1: Unexpected token default",
     "description": "Unexpected token default"
 }
diff --git a/test/fixtures/ES6/import-declaration/invalid-import-missing-comma.js b/test/fixtures/ES6/import-declaration/invalid-import-missing-comma.js
@@ -0,0 +1 @@
+import foo { bar } from "bar";
diff --git a/test/fixtures/ES6/import-declaration/invalid-import-missing-comma.module.json b/test/fixtures/ES6/import-declaration/invalid-import-missing-comma.module.json
@@ -0,0 +1,7 @@
+{
+    "index": 10,
+    "lineNumber": 1,
+    "column": 11,
+    "message": "Error: Line 1: Unexpected token {",
+    "description":"Unexpected token {"
+}
diff --git a/test/fixtures/ES6/import-declaration/invalid-import-specifiers.js b/test/fixtures/ES6/import-declaration/invalid-import-specifiers.js
@@ -0,0 +1 @@
+import foo, from "bar";
diff --git a/test/fixtures/ES6/import-declaration/invalid-import-specifiers.module.json b/test/fixtures/ES6/import-declaration/invalid-import-specifiers.module.json
@@ -0,0 +1,7 @@
+{
+    "index": 12,
+    "lineNumber": 1,
+    "column": 13,
+    "message": "Error: Line 1: Unexpected identifier",
+    "description": "Unexpected identifier"
+}