fixed hoisting with new flattened selector AST

Author: d4tocchini

Gruntfile.coffee

@@ -74,5 +74,5 @@ module.exports = ->
   @loadNpmTasks 'grunt-contrib-watch'
 
   @registerTask 'build', ['coffee:src', 'peg', 'componentbuild', 'uglify']
-  @registerTask 'test', ['build', 'coffee:spec', 'cafemocha'  ]#,  'mocha_phantomjs']
+  @registerTask 'test', ['build', 'coffee:spec', 'cafemocha', 'mocha_phantomjs']
   @registerTask 'default', ['build']

lib/scoper.js

@@ -29,7 +29,7 @@ analyze = function(ast, buffer) {
 };
 
 _analyze = function(node, buffer, bufferLengthMinus) {
-  var currScope, i, isScope, name, parent, scope, sub, _i, _len, _ref;
+  var currScope, i, isScope, name, parent, part, scope, sub, _i, _j, _len, _len1, _ref;
   if (bufferLengthMinus == null) {
     bufferLengthMinus = 1;
   }
@@ -44,17 +44,32 @@ _analyze = function(node, buffer, bufferLengthMinus) {
     scope._childScopes = [];
     scope._unscopedVars = [];
     buffer.push(scope);
-  } else if (name === 'get' || name === 'virtual') {
+  } else if (name === 'get') {
     currScope = buffer[buffer.length - bufferLengthMinus];
     if (currScope) {
       if (node.length === 2) {
         node._varKey = node.toString();
         currScope._unscopedVars.push(node);
       }
     }
+  } else if (name instanceof Array) {
+    for (_i = 0, _len = node.length; _i < _len; _i++) {
+      part = node[_i];
+      if (part[0] === 'virtual') {
+        part._dontHoist = true;
+      }
+    }
+  } else if (name === 'virtual') {
+    currScope = buffer[buffer.length - bufferLengthMinus];
+    if (currScope) {
+      if (!node._dontHoist) {
+        node._varKey = node.toString();
+        currScope._unscopedVars.push(node);
+      }
+    }
   }
   _ref = node.slice(0, +node.length + 1 || 9e9);
-  for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) {
+  for (i = _j = 0, _len1 = _ref.length; _j < _len1; i = ++_j) {
     sub = _ref[i];
     if (sub instanceof Array) {
       if (name === 'rule' && i === 1) {
@@ -81,7 +96,7 @@ mutate = function(buffer) {
 };
 
 _mutate = function(node) {
-  var child, hoistLevel, hoister, level, parent, unscoped, upper_unscoped, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3, _results;
+  var child, clone, hoistLevel, hoister, level, parent, unscoped, unscopedCommand, upper_unscoped, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3, _results;
   _ref = node._childScopes;
   for (_i = 0, _len = _ref.length; _i < _len; _i++) {
     child = _ref[_i];
@@ -112,7 +127,16 @@ _mutate = function(node) {
           if (hoistLevel > 1) {
             hoister.push(hoistLevel);
           }
-          _results.push(unscoped.splice(1, 0, hoister));
+          unscopedCommand = unscoped[0];
+          if (unscopedCommand === 'get') {
+            _results.push(unscoped.splice(1, 0, hoister));
+          } else if (unscopedCommand === 'virtual') {
+            clone = unscoped.splice(0, 2);
+            unscoped.push(hoister);
+            _results.push(unscoped.push(clone));
+          } else {
+            _results.push(void 0);
+          }
         } else {
           _results.push(void 0);
         }

src/scoper.coffee

@@ -41,12 +41,25 @@ _analyze = (node, buffer, bufferLengthMinus = 1) =>
     scope._unscopedVars = []
     buffer.push scope
 
-  else if name is 'get' or name is 'virtual'
+  else if name is 'get'
     currScope = buffer[buffer.length - bufferLengthMinus]
     if currScope
       if node.length is 2
         node._varKey = node.toString()
         currScope._unscopedVars.push node
+  
+  # is selector chain... dangerous assumption    
+  else if name instanceof Array 
+    for part in node
+      if part[0] is 'virtual'
+        part._dontHoist = true
+  
+  else if name is 'virtual'
+    currScope = buffer[buffer.length - bufferLengthMinus]
+    if currScope
+      if !node._dontHoist
+        node._varKey = node.toString()
+        currScope._unscopedVars.push node
 
   for sub, i in node[0..node.length]
     if sub instanceof Array # then recurse
@@ -85,4 +98,13 @@ _mutate = (node) =>
         if unscoped[1][0] isnt '^' # not already hoisted
           hoister = ['^']
           hoister.push(hoistLevel) if hoistLevel > 1
-          unscoped.splice 1, 0, hoister
+          unscopedCommand = unscoped[0]
+          if unscopedCommand is 'get'      
+            unscoped.splice 1, 0, hoister
+          else if unscopedCommand is 'virtual'            
+            # can't do the easy way:
+            # `unscoped = [hoister, unscoped]`
+            # because creates new pointer, so...
+            clone = unscoped.splice(0,2)
+            unscoped.push hoister
+            unscoped.push clone