Support consuming Value.HwbColor and emitting Value.HslColor (#54)

Author: nex3

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.0.0-beta.11
+
+* Support version 1.0.0-beta.13 of the Sass embedded protocol:
+  * Support `Value.HwbColor`.
+  * Emit colors as `Value.HslColor` if that internal representation is
+    available.
+
 ## 1.0.0-beta.10
 
 * Support version 1.0.0-beta.12 of the Sass embedded protocol:

lib/src/function_registry.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import 'package:sass/sass.dart' as sass;
+import 'package:sass_api/sass_api.dart' as sass;
 
 import 'embedded_sass.pb.dart';
 

lib/src/host_callable.dart

@@ -5,7 +5,7 @@
 import 'dart:cli';
 import 'dart:io';
 
-import 'package:sass/sass.dart' as sass;
+import 'package:sass_api/sass_api.dart' as sass;
 
 import 'dispatcher.dart';
 import 'embedded_sass.pb.dart';

lib/src/importer.dart

@@ -4,7 +4,7 @@
 
 import 'dart:cli';
 
-import 'package:sass/sass.dart' as sass;
+import 'package:sass_api/sass_api.dart' as sass;
 
 import 'dispatcher.dart';
 import 'embedded_sass.pb.dart' hide SourceSpan;

lib/src/logger.dart

@@ -3,7 +3,7 @@
 // https://opensource.org/licenses/MIT.
 
 import 'package:path/path.dart' as p;
-import 'package:sass/sass.dart' as sass;
+import 'package:sass_api/sass_api.dart' as sass;
 import 'package:source_span/source_span.dart';
 import 'package:stack_trace/stack_trace.dart';
 

lib/src/protofier.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import 'package:sass/sass.dart' as sass;
+import 'package:sass_api/sass_api.dart' as sass;
 
 import 'dispatcher.dart';
 import 'embedded_sass.pb.dart';
@@ -51,14 +51,19 @@ class Protofier {
       number.denominators.addAll(value.denominatorUnits);
       result.number = number;
     } else if (value is sass.SassColor) {
-      // TODO(nweiz): If the color is represented as HSL internally, this coerces
-      // it to RGB. Is it worth providing some visibility into its internal
-      // representation so we can serialize without converting?
-      result.rgbColor = Value_RgbColor()
-        ..red = value.red
-        ..green = value.green
-        ..blue = value.blue
-        ..alpha = value.alpha * 1.0;
+      if (value.hasCalculatedHsl) {
+        result.hslColor = Value_HslColor()
+          ..hue = value.hue * 1.0
+          ..saturation = value.saturation * 1.0
+          ..lightness = value.lightness * 1.0
+          ..alpha = value.alpha * 1.0;
+      } else {
+        result.rgbColor = Value_RgbColor()
+          ..red = value.red
+          ..green = value.green
+          ..blue = value.blue
+          ..alpha = value.alpha * 1.0;
+      }
     } else if (value is sass.SassArgumentList) {
       _argumentLists.add(value);
       var argList = Value_ArgumentList()
@@ -148,6 +153,13 @@ class Protofier {
               value.hslColor.lightness,
               value.hslColor.alpha);
 
+        case Value_Value.hwbColor:
+          return sass.SassColor.hwb(
+              value.hwbColor.hue,
+              value.hwbColor.whiteness,
+              value.hwbColor.blackness,
+              value.hwbColor.alpha);
+
         case Value_Value.argumentList:
           if (value.argumentList.id != 0) {
             return _argumentListForId(value.argumentList.id);

lib/src/utils.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import 'package:sass/sass.dart' as sass;
+import 'package:sass_api/sass_api.dart' as sass;
 import 'package:source_span/source_span.dart';
 import 'package:term_glyph/term_glyph.dart' as term_glyph;
 

lib/src/value.dart

@@ -2,7 +2,7 @@
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import 'package:sass/sass.dart' as sass;
+import 'package:sass_api/sass_api.dart' as sass;
 
 import 'dispatcher.dart';
 import 'embedded_sass.pb.dart';

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass_embedded
-version: 1.0.0-beta.10
+version: 1.0.0-dev
 description: An implementation of the Sass embedded protocol using Dart Sass.
 author: Sass Team
 homepage: https://github.com/sass/dart-sass-embedded
@@ -14,7 +14,7 @@ dependencies:
   async: ">=1.13.0 <3.0.0"
   meta: ^1.1.0
   protobuf: ^2.0.0
-  sass: ^1.38.0
+  sass_api: ^1.0.0-beta.5
   source_span: ^1.1.0
   stack_trace: ^1.6.0
   stream_channel: ">=1.6.0 <3.0.0"

test/function_test.dart

@@ -447,78 +447,75 @@ void main() {
         group("without alpha:", () {
           group("hue", () {
             test("0", () async {
-              expect(
-                  await _protofy('hsl(0, 50%, 50%)'), _rgb(191, 64, 64, 1.0));
+              expect(await _protofy('hsl(0, 50%, 50%)'), _hsl(0, 50, 50, 1.0));
             });
 
             test("360", () async {
               expect(
-                  await _protofy('hsl(360, 50%, 50%)'), _rgb(191, 64, 64, 1.0));
+                  await _protofy('hsl(360, 50%, 50%)'), _hsl(0, 50, 50, 1.0));
             });
 
             test("below 0", () async {
               expect(await _protofy('hsl(-100, 50%, 50%)'),
-                  _rgb(106, 64, 191, 1.0));
+                  _hsl(260, 50, 50, 1.0));
             });
 
             test("between 0 and 360", () async {
-              expect(await _protofy('hsl(100, 50%, 50%)'),
-                  _rgb(106, 191, 64, 1.0));
+              expect(
+                  await _protofy('hsl(100, 50%, 50%)'), _hsl(100, 50, 50, 1.0));
             });
 
             test("above 360", () async {
-              expect(await _protofy('hsl(560, 50%, 50%)'),
-                  _rgb(64, 149, 191, 1.0));
+              expect(
+                  await _protofy('hsl(560, 50%, 50%)'), _hsl(200, 50, 50, 1.0));
             });
           });
 
           group("saturation", () {
             test("0", () async {
-              expect(
-                  await _protofy('hsl(0, 0%, 50%)'), _rgb(128, 128, 128, 1.0));
+              expect(await _protofy('hsl(0, 0%, 50%)'), _hsl(0, 0, 50, 1.0));
             });
 
             test("100", () async {
-              expect(await _protofy('hsl(0, 100%, 50%)'), _rgb(255, 0, 0, 1.0));
+              expect(
+                  await _protofy('hsl(0, 100%, 50%)'), _hsl(0, 100, 50, 1.0));
             });
 
             test("in the middle", () async {
-              expect(
-                  await _protofy('hsl(0, 42%, 50%)'), _rgb(181, 74, 74, 1.0));
+              expect(await _protofy('hsl(0, 42%, 50%)'), _hsl(0, 42, 50, 1.0));
             });
           });
 
           group("lightness", () {
             test("0", () async {
-              expect(await _protofy('hsl(0, 50%, 0%)'), _rgb(0, 0, 0, 1.0));
+              expect(await _protofy('hsl(0, 50%, 0%)'), _hsl(0, 50, 0, 1.0));
             });
 
             test("100", () async {
-              expect(await _protofy('hsl(0, 50%, 100%)'),
-                  _rgb(255, 255, 255, 1.0));
+              expect(
+                  await _protofy('hsl(0, 50%, 100%)'), _hsl(0, 50, 100, 1.0));
             });
 
             test("in the middle", () async {
-              expect(
-                  await _protofy('hsl(0, 50%, 42%)'), _rgb(161, 54, 54, 1.0));
+              expect(await _protofy('hsl(0, 50%, 42%)'), _hsl(0, 50, 42, 1.0));
             });
           });
         });
 
         group("with alpha", () {
           test("0", () async {
             expect(await _protofy('hsl(10, 20%, 30%, 0)'),
-                equals(_rgb(92, 66, 61, 0.0)));
+                equals(_hsl(10, 20, 30, 0.0)));
           });
 
           test("1", () async {
             expect(await _protofy('hsl(10, 20%, 30%, 1)'),
-                equals(_rgb(92, 66, 61, 1.0)));
+                equals(_hsl(10, 20, 30, 1.0)));
           });
 
           test("between 0 and 1", () async {
             expect(await _protofy('hsl(10, 20%, 30%, 0.123)'),
-                equals(_rgb(92, 66, 61, 0.123)));
+                equals(_hsl(10, 20, 30, 0.123)));
           });
         });
       });