Revert "rename source -> filename"

This reverts commit 190ba98. Conflicts: History.md Readme.md test/css-parse.js
reworkcss · Mar 6, 2014 · 018175e · 018175e
1 parent 35d5931
commit 018175e
Show file tree

Hide file tree

Showing 30 changed files with 262 additions and 271 deletions.
diff --git a/History.md b/History.md
@@ -1,10 +1,6 @@
-
 2.0.0 / 2014-01-24
 ==================
 
- * rename source to filename
-   - `source` is now the CSS string
-   - `filename` is now the optional filename
  * changed default `options.position` value to `true`
  * remove comments from properties and values
  * asserts when selectors are missing

diff --git a/Readme.md b/Readme.md
@@ -16,8 +16,8 @@ var css = "body { \n background-color: #fff;\n }";
 
 var output_obj = parse(css);
 
-// Filename parameter for source mapping
-var output_obj_pos = parse(css, { filename: 'file.css' });
+// Source parameter to specify source file name for source maps
+var output_obj_pos = parse(css, { source: 'file.css' });
 
 // Print parsed object as CSS string
 console.log(JSON.stringify(output_obj, null, 2));
@@ -145,17 +145,17 @@ parse tree with `.position` enabled:
 }
 ```
 
-If you also pass in `filename: 'path/to/original.css'`, that will be set
-on `node.position.filename`.
+If you also pass in `source: 'path/to/original.css'`, that will be set
+on `node.position.source`.
 
 ## Performance
 
   Parsed 15,000 lines of CSS (2mb) in 40ms on my macbook air.
 
 ## Related
-
-  [css-stringify](https://github.com/visionmedia/css-stringify "CSS-Stringify")
-  [css-value](https://github.com/visionmedia/css-value "CSS-Value")
+ 
+  [css-stringify](https://github.com/visionmedia/css-stringify "CSS-Stringify")  
+  [css-value](https://github.com/visionmedia/css-value "CSS-Value")  
 
 ## License
 

diff --git a/index.js b/index.js
@@ -29,29 +29,21 @@ module.exports = function(css, options){
    */
 
   function position() {
-    if (!options.position) return positionNoop;
-
     var start = { line: lineno, column: column };
+    if (!options.position) return positionNoop;
 
     return function(node){
-      node.position = new Position(start);
+      node.position = {
+        start: start,
+        end: { line: lineno, column: column },
+        source: options.source
+      };
+
       whitespace();
       return node;
     };
   }
 
-  function Position(start) {
-    this.start = start;
-    this.end = { line: lineno, column: column };
-    this.filename = options.filename;
-  }
-
-  /**
-   * Non-enumerable source string.
-   */
-
-  Position.prototype.source = css;
-
   /**
    * Return `node`.
    */
@@ -65,9 +57,12 @@ module.exports = function(css, options){
    * Error `msg`.
    */
 
-  function error(msg, start) {
+  function error(msg) {
     var err = new Error(msg + ' near line ' + lineno + ':' + column);
-    err.position = new Position(start);
+    err.filename = options.source;
+    err.line = lineno;
+    err.column = column;
+    err.source = css;
     throw err;
   }
 
@@ -183,7 +178,7 @@ module.exports = function(css, options){
   function selector() {
     var m = match(/^([^{]+)/);
     if (!m) return;
-    /* @fix Remove all comments from selectors
+    /* @fix Remove all comments from selectors 
      * http://ostermiller.org/findcomment.html */
     return trim(m[0]).replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*\/+/g, '').split(/\s*,\s*/);
   }

diff --git a/test/cases/charset.json b/test/cases/charset.json
@@ -14,7 +14,7 @@
             "line": 1,
             "column": 18
           },
-          "filename": "charset.css"
+          "source": "charset.css"
         }
       },
       {
@@ -29,7 +29,7 @@
             "line": 1,
             "column": 82
           },
-          "filename": "charset.css"
+          "source": "charset.css"
         }
       },
       {
@@ -44,7 +44,7 @@
             "line": 2,
             "column": 24
           },
-          "filename": "charset.css"
+          "source": "charset.css"
         }
       },
       {
@@ -59,7 +59,7 @@
             "line": 2,
             "column": 122
           },
-          "filename": "charset.css"
+          "source": "charset.css"
         }
       }
     ]

diff --git a/test/cases/colon-space.json b/test/cases/colon-space.json
@@ -21,7 +21,7 @@
                 "line": 2,
                 "column": 19
               },
-              "filename": "colon-space.css"
+              "source": "colon-space.css"
             }
           },
           {
@@ -37,7 +37,7 @@
                 "line": 3,
                 "column": 16
               },
-              "filename": "colon-space.css"
+              "source": "colon-space.css"
             }
           }
         ],
@@ -50,7 +50,7 @@
             "line": 4,
             "column": 2
           },
-          "filename": "colon-space.css"
+          "source": "colon-space.css"
         }
       }
     ]

diff --git a/test/cases/comment.json b/test/cases/comment.json
@@ -14,7 +14,7 @@
             "line": 1,
             "column": 8
           },
-          "filename": "comment.css"
+          "source": "comment.css"
         }
       },
       {
@@ -36,7 +36,7 @@
                 "line": 3,
                 "column": 44
               },
-              "filename": "comment.css"
+              "source": "comment.css"
             }
           },
           {
@@ -51,7 +51,7 @@
                 "line": 4,
                 "column": 10
               },
-              "filename": "comment.css"
+              "source": "comment.css"
             }
           },
           {
@@ -66,7 +66,7 @@
                 "line": 5,
                 "column": 7
               },
-              "filename": "comment.css"
+              "source": "comment.css"
             }
           },
           {
@@ -82,7 +82,7 @@
                 "line": 5,
                 "column": 17
               },
-              "filename": "comment.css"
+              "source": "comment.css"
             }
           },
           {
@@ -97,7 +97,7 @@
                 "line": 6,
                 "column": 10
               },
-              "filename": "comment.css"
+              "source": "comment.css"
             }
           }
         ],
@@ -110,7 +110,7 @@
             "line": 7,
             "column": 2
           },
-          "filename": "comment.css"
+          "source": "comment.css"
         }
       },
       {
@@ -125,7 +125,7 @@
             "line": 7,
             "column": 10
           },
-          "filename": "comment.css"
+          "source": "comment.css"
         }
       },
       {
@@ -140,7 +140,7 @@
             "line": 9,
             "column": 8
           },
-          "filename": "comment.css"
+          "source": "comment.css"
         }
       }
     ]

diff --git a/test/cases/comment.url.json b/test/cases/comment.url.json
@@ -14,7 +14,7 @@
             "line": 1,
             "column": 34
           },
-          "filename": "comment.url.css"
+          "source": "comment.url.css"
         }
       },
       {
@@ -29,7 +29,7 @@
             "line": 2,
             "column": 5
           },
-          "filename": "comment.url.css"
+          "source": "comment.url.css"
         }
       },
       {
@@ -50,7 +50,7 @@
                 "line": 4,
                 "column": 12
               },
-              "filename": "comment.url.css"
+              "source": "comment.url.css"
             }
           },
           {
@@ -65,7 +65,7 @@
                 "line": 5,
                 "column": 18
               },
-              "filename": "comment.url.css"
+              "source": "comment.url.css"
             }
           },
           {
@@ -81,7 +81,7 @@
                 "line": 6,
                 "column": 11
               },
-              "filename": "comment.url.css"
+              "source": "comment.url.css"
             }
           },
           {
@@ -96,7 +96,7 @@
                 "line": 6,
                 "column": 46
               },
-              "filename": "comment.url.css"
+              "source": "comment.url.css"
             }
           }
         ],
@@ -109,7 +109,7 @@
             "line": 7,
             "column": 2
           },
-          "filename": "comment.url.css"
+          "source": "comment.url.css"
         }
       }
     ]

diff --git a/test/cases/document.json b/test/cases/document.json
@@ -19,7 +19,7 @@
                 "line": 2,
                 "column": 17
               },
-              "filename": "document.css"
+              "source": "document.css"
             }
           },
           {
@@ -40,7 +40,7 @@
                     "line": 4,
                     "column": 20
                   },
-                  "filename": "document.css"
+                  "source": "document.css"
                 }
               },
               {
@@ -56,7 +56,7 @@
                     "line": 6,
                     "column": 3
                   },
-                  "filename": "document.css"
+                  "source": "document.css"
                 }
               }
             ],
@@ -69,7 +69,7 @@
                 "line": 6,
                 "column": 4
               },
-              "filename": "document.css"
+              "source": "document.css"
             }
           }
         ],
@@ -82,7 +82,7 @@
             "line": 7,
             "column": 2
           },
-          "filename": "document.css"
+          "source": "document.css"
         }
       }
     ]