Support --linefeed in Dart and Node

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.0-beta.2
+
+### Node JS API
+
+* Add support for `lineFeed`, `indentWidth`, and `indentType` options to
+  `render()` and `renderSync()`.
+
 ## 1.0.0-beta.1
 
 * Drop support for the reference combinator. This has been removed from the

lib/src/node.dart

@@ -11,6 +11,7 @@ import 'node/exports.dart';
 import 'node/options.dart';
 import 'node/result.dart';
 import 'render.dart';
+import 'visitor/serialize.dart';
 
 /// The entrypoint for Node.js.
 ///
@@ -41,8 +42,11 @@ void _render(
     var indentWidth = indentWidthValue is int
         ? indentWidthValue
         : int.parse(indentWidthValue.toString());
+    var lineFeed = _parseLineFeed(options.linefeed);
     var result = newNodeResult(render(options.file,
-        useSpaces: options.indentType == 'space', indentWidth: indentWidth));
+        useSpaces: options.indentType == 'space',
+        indentWidth: indentWidth,
+        lineFeed: lineFeed));
     callback(null, result);
   } on SassException catch (error) {
     // TODO: populate the error more thoroughly if possible.
@@ -62,10 +66,27 @@ NodeResult _renderSync(NodeOptions options) {
     var indentWidth = indentWidthValue is int
         ? indentWidthValue
         : int.parse(indentWidthValue.toString());
+    var lineFeed = _parseLineFeed(options.linefeed);
     return newNodeResult(render(options.file,
-        useSpaces: options.indentType == 'space', indentWidth: indentWidth));
+        useSpaces: options.indentType == 'space',
+        indentWidth: indentWidth,
+        lineFeed: lineFeed));
   } on SassException catch (error) {
     // TODO: populate the error more thoroughly if possible.
     throw new NodeError(message: error.message);
   }
 }
+
+/// Parses the name of a line feed type into a [LineFeed].
+LineFeed _parseLineFeed(String str) {
+  switch (str) {
+    case 'cr':
+      return LineFeed.cr;
+    case 'crlf':
+      return LineFeed.crlf;
+    case 'lfcr':
+      return LineFeed.lfcr;
+    default:
+      return LineFeed.lf;
+  }
+}

lib/src/node/options.dart

@@ -9,4 +9,5 @@ class NodeOptions {
   external String get file;
   external String get indentType;
   external dynamic get indentWidth;
+  external String get linefeed;
 }

lib/src/render.dart

@@ -16,15 +16,15 @@ String render(String path,
     {bool color: false,
     SyncPackageResolver packageResolver,
     bool useSpaces: true,
-    int indentWidth: 2}) {
-  RangeError.checkValueInInterval(indentWidth, 0, 10, "indentWidth");
-
+    int indentWidth,
+    LineFeed lineFeed}) {
   var contents = readFile(path);
   var url = p.toUri(path);
   var sassTree = p.extension(path) == '.sass'
       ? new Stylesheet.parseSass(contents, url: url, color: color)
       : new Stylesheet.parseScss(contents, url: url, color: color);
   var cssTree =
       evaluate(sassTree, color: color, packageResolver: packageResolver);
-  return toCss(cssTree, useSpaces: useSpaces, indentWidth: indentWidth);
+  return toCss(cssTree,
+      useSpaces: useSpaces, indentWidth: indentWidth, lineFeed: lineFeed);
 }

lib/src/visitor/serialize.dart

@@ -32,12 +32,15 @@ String toCss(CssNode node,
     {OutputStyle style,
     bool inspect: false,
     bool useSpaces: true,
-    int indentWidth: 2}) {
+    int indentWidth,
+    LineFeed lineFeed}) {
+  indentWidth ??= 2;
   var visitor = new _SerializeCssVisitor(
       style: style,
       inspect: inspect,
       useSpaces: useSpaces,
-      indentWidth: indentWidth);
+      indentWidth: indentWidth,
+      lineFeed: lineFeed);
   node.accept(visitor);
   var result = visitor._buffer.toString();
   if (result.codeUnits.any((codeUnit) => codeUnit > 0x7F)) {
@@ -94,16 +97,23 @@ class _SerializeCssVisitor
   /// The number of spaces or tabs to be used for indentation.
   final int _indentWidth;
 
+  /// The characters to use for a line feed.
+  final LineFeed _lineFeed;
+
   _SerializeCssVisitor(
       {OutputStyle style,
       bool inspect: false,
       bool quote: true,
       bool useSpaces: true,
-      int indentWidth: 2})
+      int indentWidth,
+      LineFeed lineFeed})
       : _inspect = inspect,
         _quote = quote,
         _indentCharacter = useSpaces ? $space : $tab,
-        _indentWidth = indentWidth;
+        _indentWidth = indentWidth ?? 2,
+        _lineFeed = lineFeed ?? LineFeed.lf {
+    RangeError.checkValueInInterval(_indentWidth, 0, 10, "indentWidth");
+  }
 
   void visitStylesheet(CssStylesheet node) {
     CssNode previous;
@@ -112,8 +122,8 @@ class _SerializeCssVisitor
       if (_isInvisible(child)) continue;
 
       if (previous != null) {
-        _buffer.writeln();
-        if (previous.isGroupEnd) _buffer.writeln();
+        _buffer.write(_lineFeed.text);
+        if (previous.isGroupEnd) _buffer.write(_lineFeed.text);
       }
       previous = child;
 
@@ -738,7 +748,11 @@ class _SerializeCssVisitor
         first = false;
       } else {
         _buffer.writeCharCode($comma);
-        _buffer.writeCharCode(complex.lineBreak ? $lf : $space);
+        if (complex.lineBreak) {
+          _buffer.write(_lineFeed.text);
+        } else {
+          _buffer.writeCharCode($space);
+        }
       }
       visitComplexSelector(complex);
     }
@@ -798,23 +812,23 @@ class _SerializeCssVisitor
       return;
     }
 
-    _buffer.writeln();
+    _buffer.write(_lineFeed.text);
     _indent(() {
       CssNode previous;
       for (var i = 0; i < children.length; i++) {
         var child = children[i];
         if (_isInvisible(child)) continue;
 
         if (previous != null) {
-          _buffer.writeln();
-          if (previous.isGroupEnd) _buffer.writeln();
+          _buffer.write(_lineFeed.text);
+          if (previous.isGroupEnd) _buffer.write(_lineFeed.text);
         }
         previous = child;
 
         child.accept(this);
       }
     });
-    _buffer.writeln();
+    _buffer.write(_lineFeed.text);
     _writeIndentation();
     _buffer.writeCharCode($rbrace);
   }
@@ -919,3 +933,28 @@ class OutputStyle {
 
   String toString() => _name;
 }
+
+/// An enum of line feed sequences.
+class LineFeed {
+  /// A single carriage return.
+  static const cr = const LineFeed._('cr', '\r');
+
+  /// A carriage return followed by a line feed.
+  static const crlf = const LineFeed._('crlf', '\r\n');
+
+  /// A single line feed.
+  static const lf = const LineFeed._('lf', '\n');
+
+  /// A line feed followed by a carriage return.
+  static const lfcr = const LineFeed._('lfcr', '\n\r');
+
+  /// The name of this sequence..
+  final String name;
+
+  /// The text to emit for this line feed.
+  final String text;
+
+  const LineFeed._(this.name, this.text);
+
+  String toString() => name;
+}

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.0.0-beta.1
+version: 1.0.0-dev
 description: A Sass implementation in Dart.
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/sass/dart-sass