Merge branch 'add/pos'

Author: tj

index.js

@@ -1,5 +1,45 @@
 
-module.exports = function(css){
+module.exports = function(css, options){
+  options = options || {};
+
+  /**
+   * Positional.
+   */
+
+  var lineno = 1;
+  var column = 1;
+
+  /**
+   * Update lineno and column based on `str`.
+   */
+
+  function updatePosition(str) {
+    var lines = str.match(/\n/g);
+    if (lines) lineno += lines.length;
+    var i = str.lastIndexOf('\n');
+    column = ~i ? str.length-i : column + str.length;
+  }
+
+  function position() {
+    var start = { line: lineno, column: column };
+    if (!options.position) return positionNoop;
+    return function(node){
+      node.position = {
+        start: start,
+        end: { line: lineno, column: column }
+      };
+      whitespace();
+      return node;
+    }
+  }
+
+  /**
+   * Return `node`.
+   */
+  function positionNoop(node) {
+    whitespace();
+    return node;
+  }
 
   /**
    * Parse stylesheet.
@@ -27,7 +67,7 @@ module.exports = function(css){
    */
 
   function close() {
-    return match(/^}\s*/);
+    return match(/^}/);
   }
 
   /**
@@ -53,7 +93,9 @@ module.exports = function(css){
   function match(re) {
     var m = re.exec(css);
     if (!m) return;
-    css = css.slice(m[0].length);
+    var str = m[0];
+    updatePosition(str);
+    css = css.slice(str.length);
     return m;
   }
 
@@ -81,20 +123,22 @@ module.exports = function(css){
    */
 
   function comment() {
+    var pos = position();
     if ('/' != css[0] || '*' != css[1]) return;
 
     var i = 2;
     while (null != css[i] && ('*' != css[i] || '/' != css[i + 1])) ++i;
     i += 2;
 
     var str = css.slice(2, i - 2);
+    column += 2;
+    updatePosition(str);
     css = css.slice(i);
-    whitespace();
-
-    return {
+    column += 2;
+    return pos({
       type: 'comment',
       comment: str
-    };
+    });
   }
 
   /**
@@ -112,6 +156,8 @@ module.exports = function(css){
    */
 
   function declaration() {
+    var pos = position();
+
     // prop
     var prop = match(/^(\*?[-\w]+)\s*/);
     if (!prop) return;
@@ -121,18 +167,18 @@ module.exports = function(css){
     if (!match(/^:\s*/)) return;
 
     // val
-    var val = match(/^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^\)]*?\)|[^};])+)\s*/);
+    var val = match(/^((?:'(?:\\'|.)*?'|"(?:\\"|.)*?"|\([^\)]*?\)|[^};])+)/);
     if (!val) return;
-    val = val[0].trim();
-
-    // ;
-    match(/^[;\s]*/);
 
-    return {
+    var ret = pos({
       type: 'declaration',
       property: prop,
-      value: val
-    };
+      value: val[0].trim()
+    });
+
+    // ;
+    match(/^[;\s]*/);
+    return ret;
   }
 
   /**
@@ -163,6 +209,7 @@ module.exports = function(css){
   function keyframe() {
     var m;
     var vals = [];
+    var pos = position();
 
     while (m = match(/^(from|to|\d+%|\.\d+%|\d+\.\d+%)\s*/)) {
       vals.push(m[1]);
@@ -171,19 +218,21 @@ module.exports = function(css){
 
     if (!vals.length) return;
 
-    return {
+    return pos({
       type: 'keyframe',
       values: vals,
       declarations: declarations()
-    };
+    });
   }
 
   /**
    * Parse keyframes.
    */
 
   function atkeyframes() {
+    var pos = position();
     var m = match(/^@([-\w]+)?keyframes */);
+
     if (!m) return;
     var vendor = m[1];
 
@@ -204,20 +253,22 @@ module.exports = function(css){
 
     if (!close()) return;
 
-    return {
+    return pos({
       type: 'keyframes',
       name: name,
       vendor: vendor,
       keyframes: frames
-    };
+    });
   }
 
   /**
    * Parse supports.
    */
 
   function atsupports() {
+    var pos = position();
     var m = match(/^@supports *([^{]+)/);
+
     if (!m) return;
     var supports = m[1].trim();
 
@@ -228,19 +279,21 @@ module.exports = function(css){
 
     if (!close()) return;
 
-    return {
+    return pos({
       type: 'supports',
       supports: supports,
       rules: style
-    };
+    });
   }
 
   /**
    * Parse media.
    */
 
   function atmedia() {
+    var pos = position();
     var m = match(/^@media *([^{]+)/);
+
     if (!m) return;
     var media = m[1].trim();
 
@@ -251,18 +304,19 @@ module.exports = function(css){
 
     if (!close()) return;
 
-    return {
+    return pos({
       type: 'media',
       media: media,
       rules: style
-    };
+    });
   }
 
   /**
    * Parse paged media.
    */
 
   function atpage() {
+    var pos = position();
     var m = match(/^@page */);
     if (!m) return;
 
@@ -281,20 +335,22 @@ module.exports = function(css){
 
     if (!close()) return;
 
-    return {
+    return pos({
       type: 'page',
       selectors: sel,
       declarations: decls
-    };
+    });
   }
 
   /**
    * Parse document.
    */
 
   function atdocument() {
+    var pos = position();
     var m = match(/^@([-\w]+)?document *([^{]+)/);
     if (!m) return;
+
     var vendor = m[1].trim();
     var doc = m[2].trim();
 
@@ -305,12 +361,12 @@ module.exports = function(css){
 
     if (!close()) return;
 
-    return {
+    return pos({
       type: 'document',
       document: doc,
       vendor: vendor,
       rules: style
-    };
+    });
   }
 
   /**
@@ -342,11 +398,12 @@ module.exports = function(css){
    */
 
   function _atrule(name) {
-    var m = match(new RegExp('^@' + name + ' *([^;\\n]+);\\s*'));
+    var pos = position();
+    var m = match(new RegExp('^@' + name + ' *([^;\\n]+);'));
     if (!m) return;
     var ret = { type: name };
     ret[name] = m[1].trim();
-    return ret;
+    return pos(ret);
   }
 
   /**
@@ -369,15 +426,19 @@ module.exports = function(css){
    */
 
   function rule() {
+    var pos = position();
     var sel = selector();
+
     if (!sel) return;
     comments();
-    return {
+
+    return pos({
       type: 'rule',
       selectors: sel,
       declarations: declarations()
-    };
+    });
   }
 
   return stylesheet();
 };
+

test/cases/charset.json

@@ -4,19 +4,59 @@
     "rules": [
       {
         "type": "charset",
-        "charset": "\"UTF-8\""
+        "charset": "\"UTF-8\"",
+        "position": {
+          "start": {
+            "line": 1,
+            "column": 1
+          },
+          "end": {
+            "line": 1,
+            "column": 18
+          }
+        }
       },
       {
         "type": "comment",
-        "comment": " Set the encoding of the style sheet to Unicode UTF-8"
+        "comment": " Set the encoding of the style sheet to Unicode UTF-8",
+        "position": {
+          "start": {
+            "line": 1,
+            "column": 25
+          },
+          "end": {
+            "line": 1,
+            "column": 82
+          }
+        }
       },
       {
         "type": "charset",
-        "charset": "'iso-8859-15'"
+        "charset": "'iso-8859-15'",
+        "position": {
+          "start": {
+            "line": 2,
+            "column": 1
+          },
+          "end": {
+            "line": 2,
+            "column": 24
+          }
+        }
       },
       {
         "type": "comment",
-        "comment": " Set the encoding of the style sheet to Latin-9 (Western European languages, with euro sign) "
+        "comment": " Set the encoding of the style sheet to Latin-9 (Western European languages, with euro sign) ",
+        "position": {
+          "start": {
+            "line": 2,
+            "column": 25
+          },
+          "end": {
+            "line": 2,
+            "column": 122
+          }
+        }
       }
     ]
   }