Support parseSelectors in ImportCache (#2701)

Author: jathak

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.95.1
+
+* No user-visible changes.
+
 ## 1.95.0
 
 * Add support for the [CSS-style `if()` function]. In addition to supporting the

lib/src/ast/sass/statement/style_rule.dart

@@ -19,7 +19,7 @@ final class StyleRule extends ParentStatement<List<Statement>> {
   /// The selector to which the declaration will be applied.
   ///
   /// This is only parsed after the interpolation has been resolved. This is
-  /// null if and only if [interpolatedSelector] is not null.
+  /// null if and only if [parsedSelector] is not null.
   final Interpolation? selector;
 
   /// Like [selector], but with as much of the selector parsed as possible.
@@ -31,14 +31,12 @@ final class StyleRule extends ParentStatement<List<Statement>> {
 
   final FileSpan span;
 
-  /// Constructs a style rule with [selector] set and [interpolatedSelector]
-  /// null.
+  /// Constructs a style rule with [selector] set and [parsedSelector] null.
   StyleRule(this.selector, Iterable<Statement> children, this.span)
       : parsedSelector = null,
         super(List.unmodifiable(children));
 
-  /// Constructs a style rule with [interpolatedSelector] set and [selector]
-  /// null.
+  /// Constructs a style rule with [parsedSelector] set and [selector].
   StyleRule.withParsedSelector(
       this.parsedSelector, Iterable<Statement> children, this.span)
       : selector = null,

lib/src/async_import_cache.dart

@@ -35,6 +35,10 @@ final class AsyncImportCache {
   /// The importers to use when loading new Sass files.
   final List<AsyncImporter> _importers;
 
+  /// Whether to parse [StyleRule.parsedSelector]s rather than
+  /// [StyleRule.selector]s when loading new Sass files.
+  final bool _parseSelectors;
+
   /// The canonicalized URLs for each non-canonical URL.
   ///
   /// The `forImport` in each key is true when this canonicalization is for an
@@ -94,15 +98,21 @@ final class AsyncImportCache {
     Iterable<AsyncImporter>? importers,
     Iterable<String>? loadPaths,
     PackageConfig? packageConfig,
-  }) : _importers = _toImporters(importers, loadPaths, packageConfig);
+    bool parseSelectors = false,
+  })  : _importers = _toImporters(importers, loadPaths, packageConfig),
+        _parseSelectors = parseSelectors;
 
   /// Creates an import cache without any globally-available importers.
-  AsyncImportCache.none() : _importers = const [];
+  AsyncImportCache.none({bool parseSelectors = false})
+      : _importers = const [],
+        _parseSelectors = parseSelectors;
 
   /// Creates an import cache without any globally-available importers, and only
   /// the passed in importers.
-  AsyncImportCache.only(Iterable<AsyncImporter> importers)
-      : _importers = List.unmodifiable(importers);
+  AsyncImportCache.only(Iterable<AsyncImporter> importers,
+      {bool parseSelectors = false})
+      : _importers = List.unmodifiable(importers),
+        _parseSelectors = parseSelectors;
 
   /// Converts the user's [importers], [loadPaths], and [packageConfig]
   /// options into a single list of importers.
@@ -333,6 +343,7 @@ final class AsyncImportCache {
         url: originalUrl == null
             ? canonicalUrl
             : originalUrl.resolveUri(canonicalUrl),
+        parseSelectors: _parseSelectors,
       );
     });
   }

lib/src/import_cache.dart

@@ -5,7 +5,7 @@
 // DO NOT EDIT. This file was generated from async_import_cache.dart.
 // See tool/grind/synchronize.dart for details.
 //
-// Checksum: a0b4e091d7a729fbadceabdb1f51ab2631e2df4a
+// Checksum: bcdb7643d7bd5740fdb4586869f1b4cd362cf902
 //
 // ignore_for_file: unused_import
 
@@ -38,6 +38,10 @@ final class ImportCache {
   /// The importers to use when loading new Sass files.
   final List<Importer> _importers;
 
+  /// Whether to parse [StyleRule.parsedSelector]s rather than
+  /// [StyleRule.selector]s when loading new Sass files.
+  final bool _parseSelectors;
+
   /// The canonicalized URLs for each non-canonical URL.
   ///
   /// The `forImport` in each key is true when this canonicalization is for an
@@ -95,15 +99,20 @@ final class ImportCache {
     Iterable<Importer>? importers,
     Iterable<String>? loadPaths,
     PackageConfig? packageConfig,
-  }) : _importers = _toImporters(importers, loadPaths, packageConfig);
+    bool parseSelectors = false,
+  })  : _importers = _toImporters(importers, loadPaths, packageConfig),
+        _parseSelectors = parseSelectors;
 
   /// Creates an import cache without any globally-available importers.
-  ImportCache.none() : _importers = const [];
+  ImportCache.none({bool parseSelectors = false})
+      : _importers = const [],
+        _parseSelectors = parseSelectors;
 
   /// Creates an import cache without any globally-available importers, and only
   /// the passed in importers.
-  ImportCache.only(Iterable<Importer> importers)
-      : _importers = List.unmodifiable(importers);
+  ImportCache.only(Iterable<Importer> importers, {bool parseSelectors = false})
+      : _importers = List.unmodifiable(importers),
+        _parseSelectors = parseSelectors;
 
   /// Converts the user's [importers], [loadPaths], and [packageConfig]
   /// options into a single list of importers.
@@ -331,6 +340,7 @@ final class ImportCache {
         url: originalUrl == null
             ? canonicalUrl
             : originalUrl.resolveUri(canonicalUrl),
+        parseSelectors: _parseSelectors,
       );
     });
   }

pkg/sass-parser/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.38
+
+* No user-visible changes.
+
 ## 0.4.37
 
 * Add support for the CSS `if()` expression and its Sass extensions.

pkg/sass-parser/package.json

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

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 17.1.0
+
+* Add support for passing `parseSelectors: true` to `ImportCache` and
+  `AsyncImportCache`.
+
 ## 17.0.0
 
 * Rename the old `IfExpression` class to `LegacyIfExpression`.
@@ -17,8 +22,8 @@
 
 ## 16.0.3
 
-* Add several members of `RecursiveAstVisitor` which were mising in the previous
-  release.
+* Add several members of `RecursiveAstVisitor` which were missing in the
+  previous release.
 
 ## 16.0.2
 

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: 17.0.0
+version: 17.1.0
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.6.0 <4.0.0"
 
 dependencies:
-  sass: 1.95.0
+  sass: 1.95.1
 
 dev_dependencies:
   dartdoc: ">=8.0.14 <10.0.0"

pubspec.yaml

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