First pass at lexer approach

Author: rtsao

lib/build-exports.js

@@ -5,7 +5,7 @@ var makeComposition = require('./composition').makeComposition;
 module.exports = function createExports(classes, keyframes, compositions) {
   var keyframesObj = Object.keys(keyframes).reduce(function(acc, key) {
     var val = keyframes[key];
-    acc[val] = makeComposition([key], [val], true);
+    acc[key] = makeComposition([val], [key], true);
     return acc;
   }, {});
 

lib/csjs.js

@@ -3,8 +3,9 @@
 var extractExtends = require('./css-extract-extends');
 var isComposition = require('./composition').isComposition;
 var buildExports = require('./build-exports');
-var scopify = require('./scopeify');
+var scopify = require('./scopify');
 var cssKey = require('./css-key');
+var lex = require('./lexer');
 
 module.exports = function csjsHandler(strings) {
   // Fast path to prevent arguments deopt
@@ -23,21 +24,20 @@ module.exports = function csjsHandler(strings) {
     return acc;
   }, {});
 
-  var scoped = scopify(css, ignores);
-  var hashes = Object.assign({}, scoped.classes, scoped.keyframes);
-  var extracted = extractExtends(scoped.css, hashes);
+  var tokens = lex(css);
+  var scoped = scopify(css, tokens, ignores);
 
   var localClasses = without(scoped.classes, ignores);
   var localKeyframes = without(scoped.keyframes, ignores);
-  var compositions = extracted.compositions;
+  // var compositions = extracted.compositions;
 
-  var exports = buildExports(localClasses, localKeyframes, compositions);
+  var exports = buildExports(localClasses, localKeyframes, {});
 
   return Object.defineProperty(exports, cssKey, {
     enumerable: false,
     configurable: false,
     writeable: false,
-    value: extracted.css
+    value: lol.css
   });
 };