Rename includedUrls to loadedUrls

This is more explicit, and matches the name in the embedded protocol.
sass · Jul 14, 2021 · 1565b9c · 1565b9c
1 parent 558ca0a
commit 1565b9c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/lib/src/compile_result.dart b/lib/src/compile_result.dart
@@ -27,7 +27,7 @@ class CompileResult {
   SingleMapping? get sourceMap => _serialize.sourceMap;
 
   /// The canonical URLs of all stylesheets loaded during compilation.
-  Set<Uri> get includedUrls => _evaluate.includedUrls;
+  Set<Uri> get loadedUrls => _evaluate.loadedUrls;
 
   /// @nodoc
   @internal

diff --git a/lib/src/node.dart b/lib/src/node.dart
@@ -410,7 +410,7 @@ RenderResult _newRenderResult(
           end: end.millisecondsSinceEpoch,
           duration: end.difference(start).inMilliseconds,
           includedFiles: [
-            for (var url in result.includedUrls)
+            for (var url in result.loadedUrls)
               if (url.scheme == 'file') p.fromUri(url) else url.toString()
           ]));
 }

diff --git a/lib/src/visitor/async_evaluate.dart b/lib/src/visitor/async_evaluate.dart
@@ -217,7 +217,7 @@ class _EvaluateVisitor
   var _inKeyframes = false;
 
   /// The canonical URLs of all stylesheets loaded during compilation.
-  final _includedUrls = <Uri>{};
+  final _loadedUrls = <Uri>{};
 
   /// A map from canonical URLs for modules (or imported files) that are
   /// currently being evaluated to AST nodes whose spans indicate the original
@@ -504,12 +504,12 @@ class _EvaluateVisitor
       var url = node.span.sourceUrl;
       if (url != null) {
         _activeModules[url] = null;
-        if (!(_asNodeSass && url.toString() == 'stdin')) _includedUrls.add(url);
+        if (!(_asNodeSass && url.toString() == 'stdin')) _loadedUrls.add(url);
       }
 
       var module = await _execute(importer, node);
 
-      return EvaluateResult(_combineCss(module), _includedUrls);
+      return EvaluateResult(_combineCss(module), _loadedUrls);
     });
   }
 
@@ -1567,15 +1567,15 @@ class _EvaluateVisitor
               tuple.item1, tuple.item2,
               originalUrl: tuple.item3, quiet: _quietDeps && isDependency);
           if (stylesheet != null) {
-            _includedUrls.add(tuple.item2);
+            _loadedUrls.add(tuple.item2);
             return _LoadedStylesheet(stylesheet,
                 importer: tuple.item1, isDependency: isDependency);
           }
         }
       } else {
         var result = await _importLikeNode(url, forImport);
         if (result != null) {
-          result.stylesheet.span.sourceUrl.andThen(_includedUrls.add);
+          result.stylesheet.span.sourceUrl.andThen(_loadedUrls.add);
           return result;
         }
       }
@@ -3309,9 +3309,9 @@ class EvaluateResult {
   final CssStylesheet stylesheet;
 
   /// The canonical URLs of all stylesheets loaded during compilation.
-  final Set<Uri> includedUrls;
+  final Set<Uri> loadedUrls;
 
-  EvaluateResult(this.stylesheet, this.includedUrls);
+  EvaluateResult(this.stylesheet, this.loadedUrls);
 }
 
 /// The result of evaluating arguments to a function or mixin.

diff --git a/lib/src/visitor/evaluate.dart b/lib/src/visitor/evaluate.dart
@@ -225,7 +225,7 @@ class _EvaluateVisitor
   var _inKeyframes = false;
 
   /// The canonical URLs of all stylesheets loaded during compilation.
-  final _includedUrls = <Uri>{};
+  final _loadedUrls = <Uri>{};
 
   /// A map from canonical URLs for modules (or imported files) that are
   /// currently being evaluated to AST nodes whose spans indicate the original
@@ -509,12 +509,12 @@ class _EvaluateVisitor
       var url = node.span.sourceUrl;
       if (url != null) {
         _activeModules[url] = null;
-        if (!(_asNodeSass && url.toString() == 'stdin')) _includedUrls.add(url);
+        if (!(_asNodeSass && url.toString() == 'stdin')) _loadedUrls.add(url);
       }
 
       var module = _execute(importer, node);
 
-      return EvaluateResult(_combineCss(module), _includedUrls);
+      return EvaluateResult(_combineCss(module), _loadedUrls);
     });
   }
 
@@ -1565,15 +1565,15 @@ class _EvaluateVisitor
           var stylesheet = importCache.importCanonical(tuple.item1, tuple.item2,
               originalUrl: tuple.item3, quiet: _quietDeps && isDependency);
           if (stylesheet != null) {
-            _includedUrls.add(tuple.item2);
+            _loadedUrls.add(tuple.item2);
             return _LoadedStylesheet(stylesheet,
                 importer: tuple.item1, isDependency: isDependency);
           }
         }
       } else {
         var result = _importLikeNode(url, forImport);
         if (result != null) {
-          result.stylesheet.span.sourceUrl.andThen(_includedUrls.add);
+          result.stylesheet.span.sourceUrl.andThen(_loadedUrls.add);
           return result;
         }
       }

diff --git a/test/dart_api_test.dart b/test/dart_api_test.dart
@@ -226,46 +226,46 @@ a {
     });
   });
 
-  group("includedUrls", () {
+  group("loadedUrls", () {
     group("contains the entrypoint's URL", () {
       group("in compileStringToResult()", () {
         test("if it's given", () {
           var result = compileStringToResult("a {b: c}", url: "source.scss");
-          expect(result.includedUrls, equals([Uri.parse("source.scss")]));
+          expect(result.loadedUrls, equals([Uri.parse("source.scss")]));
         });
 
         test("unless it's not given", () {
           var result = compileStringToResult("a {b: c}");
-          expect(result.includedUrls, isEmpty);
+          expect(result.loadedUrls, isEmpty);
         });
       });
 
       test("in compileToResult()", () async {
         await d.file("input.scss", "a {b: c};").create();
         var result = compileToResult(d.path('input.scss'));
-        expect(result.includedUrls, equals([p.toUri(d.path('input.scss'))]));
+        expect(result.loadedUrls, equals([p.toUri(d.path('input.scss'))]));
       });
     });
 
     test("contains a URL loaded via @import", () async {
       await d.file("_other.scss", "a {b: c}").create();
       await d.file("input.scss", "@import 'other';").create();
       var result = compileToResult(d.path('input.scss'));
-      expect(result.includedUrls, contains(p.toUri(d.path('_other.scss'))));
+      expect(result.loadedUrls, contains(p.toUri(d.path('_other.scss'))));
     });
 
     test("contains a URL loaded via @use", () async {
       await d.file("_other.scss", "a {b: c}").create();
       await d.file("input.scss", "@use 'other';").create();
       var result = compileToResult(d.path('input.scss'));
-      expect(result.includedUrls, contains(p.toUri(d.path('_other.scss'))));
+      expect(result.loadedUrls, contains(p.toUri(d.path('_other.scss'))));
     });
 
     test("contains a URL loaded via @forward", () async {
       await d.file("_other.scss", "a {b: c}").create();
       await d.file("input.scss", "@forward 'other';").create();
       var result = compileToResult(d.path('input.scss'));
-      expect(result.includedUrls, contains(p.toUri(d.path('_other.scss'))));
+      expect(result.loadedUrls, contains(p.toUri(d.path('_other.scss'))));
     });
 
     test("contains a URL loaded via @meta.load-css()", () async {
@@ -275,7 +275,7 @@ a {
         @include meta.load-css('other');
       """).create();
       var result = compileToResult(d.path('input.scss'));
-      expect(result.includedUrls, contains(p.toUri(d.path('_other.scss'))));
+      expect(result.loadedUrls, contains(p.toUri(d.path('_other.scss'))));
     });
 
     test("contains a URL loaded via a chain of loads", () async {
@@ -289,7 +289,7 @@ a {
       """).create();
       var result = compileToResult(d.path('mercury.scss'));
       expect(
-          result.includedUrls,
+          result.loadedUrls,
           unorderedEquals([
             p.toUri(d.path('mercury.scss')),
             p.toUri(d.path('_venus.scss')),