Fix bug with implicit configuration for nested imports (#2658)

Actually fixes #2641

Author: jathak

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.97.2
+
+* Additional fixes for implicit configuration when nested imports are involved.
+
 ## 1.97.1
 
 * Fix a bug with the new CSS-style `if()` syntax where values would be evaluated

lib/src/async_environment.dart

@@ -223,7 +223,7 @@ final class AsyncEnvironment {
         {},
         _importedModules,
         null,
-        null,
+        _nestedForwardedModules,
         [],
         _variables.toList(),
         _variableNodes.toList(),
@@ -834,13 +834,15 @@ final class AsyncEnvironment {
   /// environment.
   Configuration toImplicitConfiguration() {
     var configuration = <String, ConfiguredValue>{};
-    for (var module in _importedModules.keys) {
-      for (var (name, value) in module.variables.pairs) {
-        configuration[name] =
-            ConfiguredValue.implicit(value, module.variableNodes[name]!);
-      }
-    }
     for (var i = 0; i < _variables.length; i++) {
+      var modules =
+          i == 0 ? _importedModules.keys : _nestedForwardedModules?[i - 1];
+      for (var module in modules ?? const <Module>[]) {
+        for (var (name, value) in module.variables.pairs) {
+          configuration[name] =
+              ConfiguredValue.implicit(value, module.variableNodes[name]!);
+        }
+      }
       var values = _variables[i];
       var nodes = _variableNodes[i];
       for (var (name, value) in values.pairs) {

lib/src/deprecation.dart

@@ -15,7 +15,7 @@ enum Deprecation {
   // DO NOT EDIT. This section was generated from the language repo.
   // See tool/grind/generate_deprecations.dart for details.
   //
-  // Checksum: 81dd840fe9e83020c1fd88a91e46f49b16190c76
+  // Checksum: 6fc524360d067b73c243c666e27a9a9ea7e08841
 
   /// Deprecation for passing a string directly to meta.call().
   callString('call-string',
@@ -88,6 +88,7 @@ enum Deprecation {
   /// Deprecation for function and mixin names beginning with --.
   cssFunctionMixin('css-function-mixin',
       deprecatedIn: '1.76.0',
+      obsoleteIn: '1.94.0',
       description: 'Function and mixin names beginning with --.'),
 
   /// Deprecation for declarations after or between nested rules.

lib/src/environment.dart

@@ -5,7 +5,7 @@
 // DO NOT EDIT. This file was generated from async_environment.dart.
 // See tool/grind/synchronize.dart for details.
 //
-// Checksum: 608af187f35a7483a87d8a54e97793e776ba215c
+// Checksum: 1a3e8a246997bac547c2c15e5c191aac2132cc5b
 //
 // ignore_for_file: unused_import
 
@@ -230,7 +230,7 @@ final class Environment {
         {},
         _importedModules,
         null,
-        null,
+        _nestedForwardedModules,
         [],
         _variables.toList(),
         _variableNodes.toList(),
@@ -842,13 +842,15 @@ final class Environment {
   /// environment.
   Configuration toImplicitConfiguration() {
     var configuration = <String, ConfiguredValue>{};
-    for (var module in _importedModules.keys) {
-      for (var (name, value) in module.variables.pairs) {
-        configuration[name] =
-            ConfiguredValue.implicit(value, module.variableNodes[name]!);
-      }
-    }
     for (var i = 0; i < _variables.length; i++) {
+      var modules =
+          i == 0 ? _importedModules.keys : _nestedForwardedModules?[i - 1];
+      for (var module in modules ?? const <Module<Callable>>[]) {
+        for (var (name, value) in module.variables.pairs) {
+          configuration[name] =
+              ConfiguredValue.implicit(value, module.variableNodes[name]!);
+        }
+      }
       var values = _variables[i];
       var nodes = _variableNodes[i];
       for (var (name, value) in values.pairs) {

pkg/sass-parser/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.41
+
+* No user-visible changes.
+
 ## 0.4.40
 
 * No user-visible changes.

pkg/sass-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-parser",
-  "version": "0.4.40",
+  "version": "0.4.41",
   "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,7 @@
+## 17.3.2
+
+* No user-visible changes.
+
 ## 17.3.1
 
 * 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: 17.3.1
+version: 17.3.2
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 
 environment:
   sdk: ">=3.6.0 <4.0.0"
 
 dependencies:
-  sass: 1.97.1
+  sass: 1.97.2
 
 dev_dependencies:
   dartdoc: ">=8.0.14 <10.0.0"

pubspec.yaml

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