Merge remote-tracking branch 'origin/master' into fromImport

CHANGELOG.md

@@ -1,3 +1,4 @@
 ## 1.0.0-beta.8
 
-* Set CanonicalizeRequest.fromImport.
+* Support version 1.0.0-beta.11 of the Sass embedded protocol:
+  * Set CanonicalizeRequest.fromImport.

bin/dart_sass_embedded.dart

@@ -36,7 +36,7 @@ void main(List<String> args) {
     var functions = FunctionRegistry();
 
     var style =
-        request.style == InboundMessage_CompileRequest_OutputStyle.COMPRESSED
+        request.style == OutputStyle.COMPRESSED
             ? sass.OutputStyle.compressed
             : sass.OutputStyle.expanded;
     var logger = Logger(dispatcher, request.id,

lib/src/dispatcher.dart

@@ -98,7 +98,7 @@ class Dispatcher {
         var errorMessage = "$error\n${Chain.forTrace(stackTrace)}";
         stderr.write("Internal compiler error: $errorMessage");
         sendError(ProtocolError()
-          ..type = ProtocolError_ErrorType.INTERNAL
+          ..type = ProtocolErrorType.INTERNAL
           ..id = _inboundId(message) ?? errorId
           ..message = errorMessage);
         _channel.sink.close();
@@ -177,7 +177,7 @@ class Dispatcher {
 
   /// Returns a [ProtocolError] with type `PARSE` and the given [message].
   ProtocolError _parseError(String message) => ProtocolError()
-    ..type = ProtocolError_ErrorType.PARSE
+    ..type = ProtocolErrorType.PARSE
     ..message = message;
 
   /// Returns the id for [message] if it it's a request, or `null`

lib/src/logger.dart

@@ -40,7 +40,7 @@ class Logger implements sass.Logger {
 
     _dispatcher.sendLog(OutboundMessage_LogEvent()
       ..compilationId = _compilationId
-      ..type = OutboundMessage_LogEvent_Type.DEBUG
+      ..type = LogEventType.DEBUG
       ..message = message
       ..span = protofySpan(span)
       ..formatted = buffer.toString());
@@ -74,8 +74,8 @@ class Logger implements sass.Logger {
     var event = OutboundMessage_LogEvent()
       ..compilationId = _compilationId
       ..type = deprecation
-          ? OutboundMessage_LogEvent_Type.DEPRECATION_WARNING
-          : OutboundMessage_LogEvent_Type.WARNING
+          ? LogEventType.DEPRECATION_WARNING
+          : LogEventType.WARNING
       ..message = message
       ..formatted = formatted;
     if (span != null) event.span = protofySpan(span);

lib/src/utils.dart

@@ -24,7 +24,7 @@ ProtocolError paramsError(String message) => ProtocolError()
   // Set the ID to [errorId] by default. This will be overwritten by the
   // dispatcher if a request ID is available.
   ..id = errorId
-  ..type = ProtocolError_ErrorType.PARAMS
+  ..type = ProtocolErrorType.PARAMS
   ..message = message;
 
 /// Converts a Dart source span to a protocol buffer source span.
@@ -46,13 +46,13 @@ SourceSpan_SourceLocation _protofyLocation(SourceLocation location) =>
       ..column = location.column;
 
 /// Converts a protocol buffer syntax enum into a Sass API syntax enum.
-sass.Syntax syntaxToSyntax(InboundMessage_Syntax syntax) {
+sass.Syntax syntaxToSyntax(Syntax syntax) {
   switch (syntax) {
-    case InboundMessage_Syntax.SCSS:
+    case Syntax.SCSS:
       return sass.Syntax.scss;
-    case InboundMessage_Syntax.INDENTED:
+    case Syntax.INDENTED:
       return sass.Syntax.sass;
-    case InboundMessage_Syntax.CSS:
+    case Syntax.CSS:
       return sass.Syntax.css;
     default:
       throw "Unknown syntax $syntax.";

lib/src/value.dart

@@ -52,26 +52,26 @@ Value protofyValue(FunctionRegistry functions, sass.Value value) {
   } else if (value is sass.SassFunction) {
     result.compilerFunction = functions.protofy(value);
   } else if (value == sass.sassTrue) {
-    result.singleton = Value_Singleton.TRUE;
+    result.singleton = SingletonValue.TRUE;
   } else if (value == sass.sassFalse) {
-    result.singleton = Value_Singleton.FALSE;
+    result.singleton = SingletonValue.FALSE;
   } else if (value == sass.sassNull) {
-    result.singleton = Value_Singleton.NULL;
+    result.singleton = SingletonValue.NULL;
   } else {
     throw "Unknown Value $value";
   }
   return result;
 }
 
 /// Converts [separator] to its protocol buffer representation.
-Value_List_Separator _protofySeparator(sass.ListSeparator separator) {
+ListSeparator _protofySeparator(sass.ListSeparator separator) {
   switch (separator) {
     case sass.ListSeparator.comma:
-      return Value_List_Separator.COMMA;
+      return ListSeparator.COMMA;
     case sass.ListSeparator.space:
-      return Value_List_Separator.SPACE;
+      return ListSeparator.SPACE;
     case sass.ListSeparator.undecided:
-      return Value_List_Separator.UNDECIDED;
+      return ListSeparator.UNDECIDED;
     default:
       throw "Unknown ListSeparator $separator";
   }
@@ -157,11 +157,11 @@ sass.Value deprotofyValue(Dispatcher dispatcher, FunctionRegistry functions,
 
     case Value_Value.singleton:
       switch (value.singleton) {
-        case Value_Singleton.TRUE:
+        case SingletonValue.TRUE:
           return sass.sassTrue;
-        case Value_Singleton.FALSE:
+        case SingletonValue.FALSE:
           return sass.sassFalse;
-        case Value_Singleton.NULL:
+        case SingletonValue.NULL:
           return sass.sassNull;
         default:
           throw "Unknown Value.singleton ${value.singleton}";
@@ -173,13 +173,13 @@ sass.Value deprotofyValue(Dispatcher dispatcher, FunctionRegistry functions,
 }
 
 /// Converts [separator] to its Sass representation.
-sass.ListSeparator _deprotofySeparator(Value_List_Separator separator) {
+sass.ListSeparator _deprotofySeparator(ListSeparator separator) {
   switch (separator) {
-    case Value_List_Separator.COMMA:
+    case ListSeparator.COMMA:
       return sass.ListSeparator.comma;
-    case Value_List_Separator.SPACE:
+    case ListSeparator.SPACE:
       return sass.ListSeparator.space;
-    case Value_List_Separator.UNDECIDED:
+    case ListSeparator.UNDECIDED:
       return sass.ListSeparator.undecided;
     default:
       throw "Unknown separator $separator";