Set CompileSuccess.loaded_urls

CHANGELOG.md

@@ -4,5 +4,6 @@
   * Support `VersionRequest` and `VersionResponse`.
   * Support `CompileRequest.quiet_deps` and `.verbose`.
   * Set `CanonicalizeRequest.from_import`.
+  * Set `CompileSuccess.loaded_urls`.
 
 * Properly throw errors for range checks for colors.

bin/dart_sass_embedded.dart

@@ -6,7 +6,6 @@ import 'dart:io';
 import 'dart:convert';
 
 import 'package:sass/sass.dart' as sass;
-import 'package:source_maps/source_maps.dart' as source_maps;
 import 'package:stream_channel/stream_channel.dart';
 
 import 'package:sass_embedded/src/dispatcher.dart';
@@ -42,23 +41,18 @@ void main(List<String> args) {
         color: request.alertColor, ascii: request.alertAscii);
 
     try {
-      String result;
-      source_maps.SingleMapping? sourceMap;
-      var sourceMapCallback = request.sourceMap
-          ? (source_maps.SingleMapping map) => sourceMap = map
-          : null;
-
       var importers = request.importers.map((importer) =>
           _decodeImporter(dispatcher, request, importer) ??
           (throw mandatoryError("Importer.importer")));
 
       var globalFunctions = request.globalFunctions.map((signature) =>
           hostCallable(dispatcher, functions, request.id, signature));
 
+      late sass.CompileResult result;
       switch (request.whichInput()) {
         case InboundMessage_CompileRequest_Input.string:
           var input = request.string;
-          result = sass.compileString(input.source,
+          result = sass.compileStringToResult(input.source,
               color: request.alertColor,
               logger: logger,
               importers: importers,
@@ -69,20 +63,20 @@ void main(List<String> args) {
               url: input.url.isEmpty ? null : input.url,
               quietDeps: request.quietDeps,
               verbose: request.verbose,
-              sourceMap: sourceMapCallback);
+              sourceMap: request.sourceMap);
           break;
 
         case InboundMessage_CompileRequest_Input.path:
           try {
-            result = sass.compile(request.path,
+            result = sass.compileToResult(request.path,
                 color: request.alertColor,
                 logger: logger,
                 importers: importers,
                 functions: globalFunctions,
                 style: style,
                 quietDeps: request.quietDeps,
                 verbose: request.verbose,
-                sourceMap: sourceMapCallback);
+                sourceMap: request.sourceMap);
           } on FileSystemException catch (error) {
             return OutboundMessage_CompileResponse()
               ..failure = (OutboundMessage_CompileResponse_CompileFailure()
@@ -97,10 +91,12 @@ void main(List<String> args) {
       }
 
       var success = OutboundMessage_CompileResponse_CompileSuccess()
-        ..css = result;
+        ..css = result.css
+        ..loadedUrls.addAll(result.loadedUrls.map((url) => url.toString()));
+
+      var sourceMap = result.sourceMap;
       if (sourceMap != null) {
-        // dart-lang/language#1536
-        success.sourceMap = json.encode(sourceMap!.toJson());
+        success.sourceMap = json.encode(sourceMap.toJson());
       }
       return OutboundMessage_CompileResponse()..success = success;
     } on sass.SassException catch (error) {

pubspec.yaml

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