Fix import stack and relative meta.load-css resolving

Author: mgreter

src/ast_css.hpp

@@ -553,6 +553,8 @@ namespace Sass {
 
     CssParentNodeObj loaded = nullptr;
 
+    ImportObj import;
+
     bool isActive = false;
     bool isLoading = false;
 

src/ast_statements.cpp

@@ -505,18 +505,22 @@ namespace Sass {
 
   UseRule::UseRule(
     const SourceSpan& pstate,
-    const sass::string& url) :
+    const sass::string& url,
+    Import* import) :
     Statement(pstate),
+    import_(import),
     url_(url)
   {}
 
   ForwardRule::ForwardRule(
     const SourceSpan& pstate,
     const sass::string& url,
+    Import* import,
     std::set<sass::string>&& toggledVariables,
     std::set<sass::string>&& toggledCallables,
     bool isShown) :
     Statement(pstate),
+    import_(import),
     url_(url),
     isShown_(isShown),
     toggledVariables_(std::move(toggledVariables)),

src/ast_statements.hpp

@@ -15,6 +15,7 @@
 #include "ast_statements.hpp"
 #include "ast_css.hpp"
 #include "environment_stack.hpp"
+#include "file.hpp"
 
 namespace Sass {
 
@@ -568,6 +569,7 @@ namespace Sass {
   class UseRule final : public Statement
   {
   private:
+    ADD_CONSTREF(ImportObj, import);
     ADD_CONSTREF(sass::string, url);
     // ADD_REF(sass::vector<WithConfigVar>, config);
     ADD_CONSTREF(RootObj, root);
@@ -577,7 +579,8 @@ namespace Sass {
     // Value constructor
     UseRule(
       const SourceSpan& pstate,
-      const sass::string& url);
+      const sass::string& url,
+      Import* import);
     // Statement visitor to sass values entry function
     Value* accept(StatementVisitor<Value*>* visitor) override final {
       return visitor->visitUseRule(this);
@@ -590,6 +593,7 @@ namespace Sass {
   class ForwardRule final : public Statement
   {
   private:
+    ADD_CONSTREF(ImportObj, import);
     ADD_CONSTREF(sass::string, url);
     ADD_PROPERTY(bool, isShown);
     ADD_PROPERTY(bool, hasWithConfig);
@@ -601,6 +605,7 @@ namespace Sass {
     ForwardRule(
       const SourceSpan& pstate,
       const sass::string& url,
+      Import* import,
       std::set<sass::string>&& toggledVariables,
       std::set<sass::string>&& toggledCallables,
       bool isShown);

src/eval.cpp

@@ -1436,9 +1436,11 @@ namespace Sass {
       root->pstate(), nullptr, selectorStack.back());
       auto oldCurrent = current;
       current = root->loaded;
+      compiler.import_stack.push_back(root->import);
       for (auto child : root->elements()) {
         child->accept(this);
       }
+      compiler.import_stack.pop_back();
       current = oldCurrent;
 
       for (auto child : root->loaded->elements()) {
@@ -1475,9 +1477,11 @@ namespace Sass {
 
       node->root()->isActive = true;
       node->root()->isLoading = true;
+      compiler.import_stack.push_back(root->import);
       for (auto child : node->root()->elements()) {
         child->accept(this);
       }
+      compiler.import_stack.pop_back();
       node->root()->isLoading = false;
       node->root()->loaded = current;
     }

src/fn_meta.cpp

@@ -463,8 +463,10 @@ namespace Sass {
           return SASS_MEMORY_NEW(Null, pstate);
         }
 
-        sass::string previous(".");
-        const ImportRequest import(url->value(), previous);
+        Import* loaded = compiler.import_stack.back();
+
+        // Loading relative to where the function was included
+        const ImportRequest import(url->value(), pstate.getAbsPath());
         // Search for valid imports (e.g. partials) on the file-system
         // Returns multiple valid results for ambiguous import path
         const sass::vector<ResolvedImport> resolved(compiler.findIncludes(import));
@@ -504,6 +506,7 @@ namespace Sass {
             sheet = compiler.registerImport(loaded); // @use
             // eval.selectorStack.pop_back();
             sheet->root2->idxs = local.idxs;
+            sheet->root2->import = loaded;
           }
           else if (sheet->root2->isActive) {
             if (withMap) {
@@ -557,9 +560,11 @@ namespace Sass {
             eval.current = root->loaded;
             EnvScope scoped(compiler.varRoot, root->idxs);
             eval.selectorStack.push_back(nullptr);
+            compiler.import_stack.push_back(root->import);
             for (auto child : root->elements()) {
               child->accept(&eval);
             }
+            compiler.import_stack.pop_back();
             eval.selectorStack.pop_back();
             eval.current = oldCurrent;
             root->isLoading = false;

src/parser_stylesheet.cpp

@@ -1379,7 +1379,7 @@ namespace Sass {
 
     UseRuleObj rule = SASS_MEMORY_NEW(UseRule,
       scanner.relevantSpanFrom(start),
-      url);
+      url, {});
 
     rule->hasWithConfig(hasWith);
 
@@ -1531,6 +1531,7 @@ namespace Sass {
         local.idxs->fnFrame = 0xFFFFFFFF;
         sheet = context.registerImport(loaded);
         sheet->root2->idxs = local.idxs;
+        sheet->root2->import = loaded;
         // sheet->root2->con context->node
       }
 
@@ -1748,7 +1749,7 @@ namespace Sass {
 
     ForwardRuleObj rule = SASS_MEMORY_NEW(ForwardRule,
       scanner.relevantSpanFrom(start),
-      url,
+      url, {},
       std::move(toggledVariables2),
       std::move(toggledCallables2),
       isShown);
@@ -1995,6 +1996,7 @@ namespace Sass {
         local.idxs->fnFrame = 0xFFFFFFFF;
         sheet = context.registerImport(loaded);
         sheet->root2->idxs = local.idxs;
+        sheet->root2->import = loaded;
       }
 
       Root* root = sheet->root2;