Support both the hooRequire way and the parser way

Author: zoubin

.travis.yml

@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+  - "5"
+  - "4"
+  - "0.12"
+  - "0.11"
+  - "iojs"

README.md

@@ -1,19 +1,46 @@
 # postcss-comment
 Allow postcss to support inline comments.
 
+[![npm](https://nodei.co/npm/postcss-comment.png?downloads=true)](https://www.npmjs.org/package/postcss-comment)
+
+[![version](https://img.shields.io/npm/v/postcss-comment.svg)](https://www.npmjs.org/package/postcss-comment)
+[![status](https://travis-ci.org/zoubin/postcss-comment.svg?branch=master)](https://travis-ci.org/zoubin/postcss-comment)
+[![dependencies](https://david-dm.org/zoubin/postcss-comment.svg)](https://david-dm.org/zoubin/postcss-comment)
+[![devDependencies](https://david-dm.org/zoubin/postcss-comment/dev-status.svg)](https://david-dm.org/zoubin/postcss-comment#info=devDependencies)
+
 ## Usage
 
 ```bash
-npm i --save postcss postcss-comment
+npm i --save-dev postcss postcss-comment
 
 ```
 
+### As parser
+
 ```javascript
-require('postcss-comment')
 var postcss = require('postcss')
+var parser = require('postcss-comment')
 
-// or
-// var postcss = require('postcss-comment')
+var fs = require('fs')
+
+var file = __dirname + '/inline.css'
+
+postcss()
+  .process(
+    fs.readFileSync(file, 'utf8'),
+    { from: file, parser: parser }
+  )
+  .then(function (result) {
+    console.log(result.css)
+  })
+
+```
+
+### Hook require
+
+```javascript
+require('postcss-comment/hookRequire')
+var postcss = require('postcss')
 
 var fs = require('fs')
 
@@ -30,6 +57,8 @@ postcss()
 
 ```
 
+## Example
+
 inline.css:
 ```css
 /*

hookRequire.js

@@ -0,0 +1,9 @@
+var Parser = require('postcss/lib/parser')
+var tokenizer = require('./lib/tokenize')
+
+Parser.prototype.tokenize = function () {
+  this.tokens = tokenizer(this.input)
+}
+
+module.exports = require('postcss')
+

index.js

@@ -1,9 +1,2 @@
-var Parser = require('postcss/lib/parser')
-var tokenizer = require('./lib/tokenize')
-
-Parser.prototype.tokenize = function () {
-  this.tokens = tokenizer(this.input)
-}
-
-module.exports = require('postcss')
+exports.parse = require('./lib/parse')
 

lib/parse.js

@@ -0,0 +1,12 @@
+var Input = require('postcss/lib/input')
+var Parser = require('./parser')
+
+module.exports = function (css, opts) {
+  var input = new Input(css, opts)
+  var parser = new Parser(input)
+  parser.tokenize()
+  parser.loop()
+
+  return parser.root
+}
+

lib/parser.js

@@ -0,0 +1,15 @@
+var inherits = require('util').inherits
+var Parser = require('postcss/lib/parser')
+var tokenizer = require('./tokenize')
+
+inherits(InlineParser, Parser)
+
+module.exports = InlineParser
+
+function InlineParser(input) {
+  Parser.call(this, input)
+}
+
+InlineParser.prototype.tokenize = function() {
+  this.tokens = tokenizer(this.input)
+}

lib/tokenize.js

@@ -225,16 +225,11 @@ module.exports = function tokenize(input) {
                 content = '/*' + css.slice(pos + 2, next + 1);
                 content = content.replace(/\*\//g, '*\\/') + ' */'
 
-                nextLine   = line;
-                nextOffset = offset;
-
                 tokens.push(['comment', content,
                     line,     pos  - offset,
-                    nextLine, next - nextOffset
+                    line, next - offset
                 ]);
 
-                offset = nextOffset;
-                line   = nextLine;
                 pos    = next;
 
             } else {

test/index.js renamed to test/hookRequire.js

@@ -1,5 +1,5 @@
 var test = require('tap').test
-var postcss = require('..')
+var postcss = require('../hookRequire')
 var path = require('path')
 var fs = require('fs')
 var fixtures = path.resolve.bind(path, __dirname, 'fixtures')
@@ -8,7 +8,7 @@ function readFile(file) {
   return fs.readFileSync(file, 'utf8')
 }
 
-test('inline comment', function (t) {
+test('hookRequire', function (t) {
   t.plan(1)
   var file = fixtures('inline.css')
   postcss()
@@ -20,3 +20,4 @@ test('inline comment', function (t) {
       )
     })
 })
+

test/parser.js

@@ -0,0 +1,24 @@
+var test = require('tap').test
+var parser = require('..')
+var postcss = require('postcss')
+var path = require('path')
+var fs = require('fs')
+var fixtures = path.resolve.bind(path, __dirname, 'fixtures')
+
+function readFile(file) {
+  return fs.readFileSync(file, 'utf8')
+}
+
+test('parser', function (t) {
+  t.plan(1)
+  var file = fixtures('inline.css')
+  postcss()
+    .process(readFile(file), { from: file, parser: parser })
+    .then(function (result) {
+      t.equal(
+        result.css,
+        readFile(fixtures('inline.expected.css'))
+      )
+    })
+})
+