fix: toString should stringify node (#74)

* fix: toString should stringify node

* refactor: rename, rework inherited nodes for toString

* chore: remove commented code

lib/ValuesParser.js

@@ -52,6 +52,7 @@ module.exports = class ValuesParser extends Parser {
     const inline = Comment.testInline(token);
     const node = this.lastNode;
     node.inline = inline;
+    Object.setPrototypeOf(node, Comment.prototype);
   }
 
   fromFirst(tokens, Constructor) {

lib/ValuesStringifier.js

@@ -1,6 +1,11 @@
 const Stringifier = require('postcss/lib/stringifier');
 
-module.exports = class LessStringifier extends Stringifier {
+module.exports = class ValuesStringifier extends Stringifier {
+  static stringify(node, builder) {
+    const stringifier = new ValuesStringifier(builder);
+    stringifier.stringify(node);
+  }
+
   basic(node, value) {
     const print = value || node.value;
     const after = node.raws.after ? this.raw(node, 'after') || '' : '';

lib/index.js

@@ -11,7 +11,7 @@
 const Input = require('postcss/lib/input');
 
 const Parser = require('./ValuesParser');
-const Stringifier = require('./ValuesStringifier');
+const { stringify } = require('./ValuesStringifier');
 
 module.exports = {
   parse(css, options) {
@@ -20,13 +20,19 @@ module.exports = {
 
     parser.parse();
 
+    const { root } = parser;
+    const ogToString = root.toString;
+
+    function toString(stringifier) {
+      return ogToString.bind(root)(stringifier || module.exports.stringify);
+    }
+
+    root.toString = toString.bind(root);
+
     return parser.root;
   },
 
-  stringify(node, builder) {
-    const stringifier = new Stringifier(builder);
-    stringifier.stringify(node);
-  },
+  stringify,
 
   nodeToString(node) {
     let result = '';

lib/nodes/AtWord.js

@@ -12,10 +12,11 @@ const AtRule = require('postcss/lib/node');
 
 const { registerWalker } = require('../walker');
 
+const { stringify } = require('../ValuesStringifier');
+
 class AtWord extends AtRule {
-  constructor(options) {
-    super(options);
-    this.type = 'atword';
+  toString(stringifier = stringify) {
+    return super.toString(stringifier);
   }
 }
 

lib/nodes/Comment.js

@@ -8,61 +8,71 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const Comment = require('postcss/lib/comment');
+const PostCssComment = require('postcss/lib/comment');
+
+const { stringify } = require('../ValuesStringifier');
 
 const inlineRegex = /(\/\/)/;
 
-Comment.testInline = (token) => inlineRegex.test(token[1]);
+class Comment extends PostCssComment {
+  static testInline(token) {
+    return inlineRegex.test(token[1]);
+  }
 
-Comment.tokenizeNext = (tokens, parser) => {
-  const [first] = tokens;
-  const newlineIndex = tokens.findIndex((t) => /\n/.test(t[1]));
-  let bits = tokens;
-  let rest = [];
+  static tokenizeNext(tokens, parser) {
+    const [first] = tokens;
+    const newlineIndex = tokens.findIndex((t) => /\n/.test(t[1]));
+    let bits = tokens;
+    let rest = [];
 
-  if (newlineIndex >= 0) {
-    bits = tokens.slice(0, newlineIndex);
-    rest = tokens.slice(newlineIndex);
-  }
+    if (newlineIndex >= 0) {
+      bits = tokens.slice(0, newlineIndex);
+      rest = tokens.slice(newlineIndex);
+    }
+
+    bits = bits.map((t) => t[1]);
 
-  bits = bits.map((t) => t[1]);
+    // see tilde comment in tokenizeInline
+    const text = bits.concat('~~').join('');
+    const last = bits[bits.length - 1];
+    const newToken = ['comment', text, first[2], first[3], last[2], last[3]];
 
-  // see tilde comment in tokenizeInline
-  const text = bits.concat('~~').join('');
-  const last = bits[bits.length - 1];
-  const newToken = ['comment', text, first[2], first[3], last[2], last[3]];
+    parser.back([newToken, ...rest]);
+  }
 
-  parser.back([newToken, ...rest]);
-};
+  static tokenizeInline(tokens, parser) {
+    const [first, ...rest] = tokens;
+    const bits = first[1].split(/(\/\/.+)/).filter((t) => !!t);
+    const newTokens = [];
+    const [, , startLine, , endLine] = first;
+    let [, , , startChar, , endChar] = first;
 
-Comment.tokenizeInline = (tokens, parser) => {
-  const [first, ...rest] = tokens;
-  const bits = first[1].split(/(\/\/.+)/).filter((t) => !!t);
-  const newTokens = [];
-  const [, , startLine, , endLine] = first;
-  let [, , , startChar, , endChar] = first;
+    for (let bit of bits) {
+      const comment = bit.slice(0, 2) === '//';
+      const type = comment ? 'comment' : 'word';
 
-  for (let bit of bits) {
-    const comment = bit.slice(0, 2) === '//';
-    const type = comment ? 'comment' : 'word';
+      if (comment) {
+        // the Parser base comment() method trims the last two characters when creating the node
+        // these tildes are added to counter that. it's hacky, but it works, and we don't have to
+        // re-implement the method
+        bit += '~~';
+      }
 
-    if (comment) {
-      // the Parser base comment() method trims the last two characters when creating the node
-      // these tildes are added to counter that. it's hacky, but it works, and we don't have to
-      // re-implement the method
-      bit += '~~';
-    }
+      if (bit !== bits[0]) {
+        startChar = endChar + 1;
+      }
 
-    if (bit !== bits[0]) {
-      startChar = endChar + 1;
-    }
+      endChar = startChar + bit.length - 1;
 
-    endChar = startChar + bit.length - 1;
+      newTokens.push([type, bit, startLine, startChar, endLine, endChar]);
+    }
 
-    newTokens.push([type, bit, startLine, startChar, endLine, endChar]);
+    parser.back(newTokens.concat(rest));
   }
 
-  parser.back(newTokens.concat(rest));
-};
+  toString(stringifier = stringify) {
+    return super.toString(stringifier);
+  }
+}
 
 module.exports = Comment;

lib/nodes/Container.js

@@ -0,0 +1,21 @@
+/*
+  Copyright © 2018 Andrew Powell
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of this Source Code Form.
+*/
+const PostCssContainer = require('postcss/lib/container');
+
+const { stringify } = require('../ValuesStringifier');
+
+class Container extends PostCssContainer {
+  toString(stringifier = stringify) {
+    return super.toString(stringifier);
+  }
+}
+
+module.exports = Container;

lib/nodes/Func.js

@@ -8,10 +8,10 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const Container = require('postcss/lib/container');
-
 const { registerWalker } = require('../walker');
 
+const Container = require('./Container');
+
 const colorFunctions = ['hsl', 'hsla', 'rgb', 'rgba'];
 
 class Func extends Container {

lib/nodes/Interpolation.js

@@ -8,10 +8,10 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const Container = require('postcss/lib/container');
-
 const { registerWalker } = require('../walker');
 
+const Container = require('./Container');
+
 class Interpolation extends Container {
   constructor(options = {}) {
     super(options);

lib/nodes/Node.js

@@ -0,0 +1,21 @@
+/*
+  Copyright © 2018 Andrew Powell
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of this Source Code Form.
+*/
+const PostCssNode = require('postcss/lib/node');
+
+const { stringify } = require('../ValuesStringifier');
+
+class Node extends PostCssNode {
+  toString(stringifier = stringify) {
+    return super.toString(stringifier || {});
+  }
+}
+
+module.exports = Node;

lib/nodes/Numeric.js

@@ -9,10 +9,11 @@
   included in all copies or substantial portions of this Source Code Form.
 */
 const isNumber = require('is-number');
-const Node = require('postcss/lib/node');
 
 const { registerWalker } = require('../walker');
 
+const Node = require('./Node');
+
 const unitRegex = /%|ch|cm|em|ex|in|mm|pc|pt|px|rem|vh|vmax|vmin|vw$/i;
 
 class Numeric extends Node {

lib/nodes/Operator.js

@@ -8,10 +8,10 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const Node = require('postcss/lib/node');
-
 const { registerWalker } = require('../walker');
 
+const Node = require('./Node');
+
 const operators = ['+', '-', '/', '*', '%'];
 const operRegex = new RegExp(`([/|*}])`);
 

lib/nodes/Punctuation.js

@@ -8,11 +8,11 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const Node = require('postcss/lib/node');
-
 const { getTokens } = require('../tokenize');
 const { registerWalker } = require('../walker');
 
+const Node = require('./Node');
+
 /**
  * @desc Punctuation nodes can contain:
  *       , : ( ) { } [ ]

lib/nodes/Quoted.js

@@ -8,10 +8,10 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const Node = require('postcss/lib/node');
-
 const { registerWalker } = require('../walker');
 
+const Node = require('./Node');
+
 class Quoted extends Node {
   constructor(options) {
     super(options);

lib/nodes/UnicodeRange.js

@@ -8,10 +8,10 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const Node = require('postcss/lib/node');
-
 const { registerWalker } = require('../walker');
 
+const Node = require('./Node');
+
 class UnicodeRange extends Node {
   constructor(options) {
     super(options);

lib/nodes/Word.js

@@ -10,10 +10,11 @@
 */
 const colors = require('color-name');
 const isUrl = require('is-url-superb');
-const Node = require('postcss/lib/node');
 
 const { registerWalker } = require('../walker');
 
+const Node = require('./Node');
+
 const escapeRegex = /^\\(.+)/;
 const hexRegex = /^#(.+)/;
 const colorRegex = /^#([0-9a-f]{3}|[0-9a-f]{4}|[0-9a-f]{6}|[0-9a-f]{8})$/i;

test/atword.test.js

@@ -24,6 +24,8 @@ for (const fixture of snapshot) {
     const string = nodeToString(root);
 
     t.is(string, fixture);
+    t.is(fixture, root.toString());
+    t.snapshot(root.first.toString());
     t.snapshot(string);
     t.snapshot(nodes);
   });

test/comment.test.js

@@ -24,6 +24,8 @@ for (const fixture of snapshot) {
     const string = nodeToString(root);
 
     t.is(string, fixture);
+    t.is(fixture, root.toString());
+    t.snapshot(root.first.toString());
     t.snapshot(string);
     t.snapshot(nodes);
   });

test/fixtures/interpolation.js

@@ -12,5 +12,6 @@ module.exports = {
   options: {
     interpolation: { prefix: '#' }
   },
-  snapshot: ['#{batman}', '#{2px}', '#{2 * 2px}']
+  snapshot: ['#{batman}', '#{2px}', '#{2 * 2px}'],
+  throws: ['#{batman']
 };

test/func.test.js

@@ -24,6 +24,8 @@ for (const fixture of snapshot) {
     const string = nodeToString(root);
 
     t.is(string, fixture);
+    t.is(fixture, root.toString());
+    t.snapshot(root.first.toString());
     t.snapshot(string);
     t.snapshot(nodes);
   });

test/interpolation.test.js

@@ -12,7 +12,7 @@ const test = require('ava');
 
 const { nodeToString, parse } = require('../lib');
 
-const { options, snapshot } = require('./fixtures/interpolation');
+const { options, snapshot, throws } = require('./fixtures/interpolation');
 
 for (const fixture of snapshot) {
   test(fixture, (t) => {
@@ -24,7 +24,15 @@ for (const fixture of snapshot) {
     const string = nodeToString(root);
 
     t.is(string, fixture);
+    t.is(fixture, root.toString());
+    t.snapshot(root.first.toString());
     t.snapshot(string);
     t.snapshot(nodes);
   });
 }
+
+for (const fixture of throws) {
+  test(fixture, (t) => {
+    t.throws(() => parse(fixture));
+  });
+}

test/numeric.test.js

@@ -24,6 +24,8 @@ for (const fixture of snapshot) {
     const string = nodeToString(root);
 
     t.is(string, fixture);
+    t.is(fixture, root.toString());
+    t.snapshot(root.first.toString());
     t.snapshot(string);
     t.snapshot(nodes);
   });