Define 'FROM' token only when in an import or export statement and from is followed by a string. More tests around assignment after import, not all passing yet.

Author: GeoffreyBooth

src/lexer.coffee

@@ -115,9 +115,6 @@ exports.Lexer = class Lexer
     if id is 'from' and @tag() is 'YIELD'
       @token 'FROM', id
       return id.length
-    if id is 'from' and (@seenImport or @seenExport)
-      @token 'FROM', id
-      return id.length
     if id is 'as' and (@seenImport or @seenExport) and @tokens[@tokens.length - 1][0] in ['IDENTIFIER', 'IMPORT_ALL']
       @token 'AS', id
       return id.length
@@ -218,6 +215,12 @@ exports.Lexer = class Lexer
   stringToken: ->
     [quote] = STRING_START.exec(@chunk) || []
     return 0 unless quote
+
+    # If the preceding token is `from` and this is an import or export statement,
+    # properly tag the `from`.
+    if @tokens.length and @tokens[@tokens.length - 1][1] is 'from' and (@seenImport or @seenExport)
+      @tokens[@tokens.length - 1][0] = 'FROM'
+
     regex = switch quote
       when "'"   then STRING_SINGLE
       when '"'   then STRING_DOUBLE

test/modules.coffee

@@ -185,6 +185,33 @@ test "multiline complex import", ->
     } from 'lib';"""
   eq toJS(input), output
 
+test "a variable can be assigned after an import", ->
+  input = """
+    import { foo } from 'lib'
+    bar = 5"""
+  output = """
+    var bar;
+
+    import {
+      foo
+    } from 'lib';
+    bar = 5;"""
+  eq toJS(input), output
+
+test "variables can be assigned before and after an import", ->
+  input = """
+    foo = 5
+    import { bar } from 'lib'
+    baz = 7"""
+  output = """
+    var foo, baz;
+
+    foo = 5;
+    import {
+      bar
+    } from 'lib';
+    baz = 7;"""
+  eq toJS(input), output
 
 # Export statements
 
@@ -365,14 +392,31 @@ test "`from` not part of an import or export statement can still be assigned", -
   from = 5
   eq 5, from
 
-test "`from` can be assigned after an import", ->
+test "a variable named `from` can be assigned after an import", ->
   input = """
     import { foo } from 'lib'
     from = 5"""
   output = """
     var from;
 
-    import { foo } from 'lib';
+    import {
+      foo
+    } from 'lib';
+    from = 5;"""
+  eq toJS(input), output
+
+test "`from` can be assigned after a multiline import", ->
+  input = """
+    import {
+      foo
+    } from 'lib'
+    from = 5"""
+  output = """
+    var from;
+
+    import {
+      foo
+    } from 'lib';
     from = 5;"""
   eq toJS(input), output