Fix bug with implicit configuration for nested imports

Actually fixes #2641

Author: jathak

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.93.3
+
+* Additional fixes for implicit configuration when nested imports are involved.
+
 ## 1.93.2
 
 * No user-visible changes.

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 ?? <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/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: a2860c59c051b8353caa4dc0767f7b803b8b5582
 //
 // 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 ?? <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.32
+
+* No user-visible changes.
+
 ## 0.4.31
 
 * No user-visible changes.

pkg/sass-parser/package.json

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

pkg/sass_api/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 15.12.3
+
+* No user-visible changes.
+
 ## 15.12.2
 
 * No user-visible changes.

pkg/sass_api/pubspec.yaml

@@ -2,7 +2,7 @@ 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: 15.12.2
+version: 15.12.3
 description: Additional APIs for Dart Sass.
 homepage: https://github.com/sass/dart-sass
 

pubspec.yaml

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