Add support for missing color channels to the protofier

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.79.4
+
+### Embedded Sass
+
+* Properly pass missing color channel values to and from custom functions.
+
 ## 1.79.3
 
 * Update the `$channel` parameter in the suggested replacement for

lib/src/embedded/protofier.dart

@@ -54,12 +54,12 @@ final class Protofier {
       case SassNumber():
         result.number = _protofyNumber(value);
       case SassColor():
-        result.color = Value_Color()
-          ..space = value.space.name
-          ..channel1 = value.channel0
-          ..channel2 = value.channel1
-          ..channel3 = value.channel2
-          ..alpha = value.alpha * 1.0;
+        result.color = Value_Color(
+            space: value.space.name,
+            channel1: value.channel0OrNull,
+            channel2: value.channel1OrNull,
+            channel3: value.channel2OrNull,
+            alpha: value.alphaOrNull);
       case SassArgumentList():
         _argumentLists.add(value);
         result.argumentList = Value_ArgumentList()
@@ -178,79 +178,50 @@ final class Protofier {
 
         case Value_Value.color:
           var space = ColorSpace.fromName(value.color.space);
+          var channel1 =
+              value.color.hasChannel1() ? value.color.channel1 : null;
+          var channel2 =
+              value.color.hasChannel2() ? value.color.channel2 : null;
+          var channel3 =
+              value.color.hasChannel3() ? value.color.channel3 : null;
+          var alpha = value.color.hasAlpha() ? value.color.alpha : null;
           switch (space) {
             case ColorSpace.rgb:
-              return SassColor.rgb(value.color.channel1, value.color.channel2,
-                  value.color.channel3, value.color.alpha);
+              return SassColor.rgb(channel1, channel2, channel3, alpha);
 
             case ColorSpace.hsl:
-              return SassColor.hsl(value.color.channel1, value.color.channel2,
-                  value.color.channel3, value.color.alpha);
+              return SassColor.hsl(channel1, channel2, channel3, alpha);
 
             case ColorSpace.hwb:
-              return SassColor.hwb(value.color.channel1, value.color.channel2,
-                  value.color.channel3, value.color.alpha);
+              return SassColor.hwb(channel1, channel2, channel3, alpha);
 
             case ColorSpace.lab:
-              return SassColor.lab(value.color.channel1, value.color.channel2,
-                  value.color.channel3, value.color.alpha);
+              return SassColor.lab(channel1, channel2, channel3, alpha);
             case ColorSpace.oklab:
-              return SassColor.oklab(value.color.channel1, value.color.channel2,
-                  value.color.channel3, value.color.alpha);
+              return SassColor.oklab(channel1, channel2, channel3, alpha);
 
             case ColorSpace.lch:
-              return SassColor.lch(value.color.channel1, value.color.channel2,
-                  value.color.channel3, value.color.alpha);
+              return SassColor.lch(channel1, channel2, channel3, alpha);
             case ColorSpace.oklch:
-              return SassColor.oklch(value.color.channel1, value.color.channel2,
-                  value.color.channel3, value.color.alpha);
+              return SassColor.oklch(channel1, channel2, channel3, alpha);
 
             case ColorSpace.srgb:
-              return SassColor.srgb(value.color.channel1, value.color.channel2,
-                  value.color.channel3, value.color.alpha);
+              return SassColor.srgb(channel1, channel2, channel3, alpha);
             case ColorSpace.srgbLinear:
-              return SassColor.srgbLinear(
-                  value.color.channel1,
-                  value.color.channel2,
-                  value.color.channel3,
-                  value.color.alpha);
+              return SassColor.srgbLinear(channel1, channel2, channel3, alpha);
             case ColorSpace.displayP3:
-              return SassColor.displayP3(
-                  value.color.channel1,
-                  value.color.channel2,
-                  value.color.channel3,
-                  value.color.alpha);
+              return SassColor.displayP3(channel1, channel2, channel3, alpha);
             case ColorSpace.a98Rgb:
-              return SassColor.a98Rgb(
-                  value.color.channel1,
-                  value.color.channel2,
-                  value.color.channel3,
-                  value.color.alpha);
+              return SassColor.a98Rgb(channel1, channel2, channel3, alpha);
             case ColorSpace.prophotoRgb:
-              return SassColor.prophotoRgb(
-                  value.color.channel1,
-                  value.color.channel2,
-                  value.color.channel3,
-                  value.color.alpha);
+              return SassColor.prophotoRgb(channel1, channel2, channel3, alpha);
             case ColorSpace.rec2020:
-              return SassColor.rec2020(
-                  value.color.channel1,
-                  value.color.channel2,
-                  value.color.channel3,
-                  value.color.alpha);
+              return SassColor.rec2020(channel1, channel2, channel3, alpha);
 
             case ColorSpace.xyzD50:
-              return SassColor.xyzD50(
-                  value.color.channel1,
-                  value.color.channel2,
-                  value.color.channel3,
-                  value.color.alpha);
+              return SassColor.xyzD50(channel1, channel2, channel3, alpha);
             case ColorSpace.xyzD65:
-              return SassColor.xyzD65(
-                  value.color.channel1,
-                  value.color.channel2,
-                  value.color.channel3,
-                  value.color.alpha);
+              return SassColor.xyzD65(channel1, channel2, channel3, alpha);
 
             default:
               throw "Unreachable";

pkg/sass-parser/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3
+
+* No user-visible changes.
+
 ## 0.2.2
 
 * No user-visible changes.

pkg/sass-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-parser",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "A PostCSS-compatible wrapper of the official Sass parser",
   "repository": "sass/sass",
   "author": "Google Inc.",

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 12.0.4
+
+* No user-visible changes.
+
 ## 12.0.3
 
 * No user-visible changes.

pkg/sass_api/pubspec.yaml

@@ -2,15 +2,15 @@ name: sass_api
 # Note: Every time we add a new Sass AST node, we need to bump the *major*
 # version because it's a breaking change for anyone who's implementing the
 # visitor interface(s).
-version: 12.0.3
+version: 12.0.4
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  sass: 1.79.3
+  sass: 1.79.4
 
 dev_dependencies:
   dartdoc: ^8.0.14

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.79.3
+version: 1.79.4
 description: A Sass implementation in Dart.
 homepage: https://github.com/sass/dart-sass