v0.16.0+luau700

Author: khvzak

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "luau0-src"
-version = "0.15.11+luau697"
+version = "0.16.0+luau700"
 authors = ["Aleksandr Orlenko <[email protected]>"]
 edition = "2021"
 repository = "https://github.com/mlua-rs/luau-src-rs"

luau/Ast/include/Luau/TimeTrace.h renamed to luau/Common/include/Luau/TimeTrace.h

@@ -54,20 +54,6 @@ struct Config
     DenseHashMap<std::string, std::unique_ptr<std::string>> configLocationCache{""};
 };
 
-struct ConfigResolver
-{
-    virtual ~ConfigResolver() {}
-
-    virtual const Config& getConfig(const ModuleName& name) const = 0;
-};
-
-struct NullConfigResolver : ConfigResolver
-{
-    Config defaultConfig;
-
-    virtual const Config& getConfig(const ModuleName& name) const override;
-};
-
 std::optional<std::string> parseModeString(Mode& mode, const std::string& modeString, bool compat = false);
 std::optional<std::string> parseLintRuleString(
     LintOptions& enabledLints,

luau/Ast/src/TimeTrace.cpp renamed to luau/Common/src/TimeTrace.cpp

@@ -173,8 +173,12 @@ bool isValidAlias(const std::string& alias)
     if (!aliasIsNotAPath)
         return false;
 
-    for (char ch : alias)
+    for (size_t i = 0; i < alias.size(); i++)
     {
+        char ch = alias[i];
+        if (i == 0 && ch == '@')
+            continue;
+
         bool isupper = 'A' <= ch && ch <= 'Z';
         bool islower = 'a' <= ch && ch <= 'z';
         bool isdigit = '0' <= ch && ch <= '9';
@@ -366,9 +370,4 @@ Error parseConfig(const std::string& contents, Config& config, const ConfigOptio
     );
 }
 
-const Config& NullConfigResolver::getConfig(const ModuleName& name) const
-{
-    return defaultConfig;
-}
-
 } // namespace Luau

luau/Config/include/Luau/Config.h

@@ -27,6 +27,8 @@ struct lua_State;
 namespace Luau::Require
 {
 
+class AliasCycleTracker;
+
 // The ErrorHandler interface is used to report errors during navigation.
 // The default implementation does nothing but can be overridden to enable
 // custom error handling behavior.
@@ -110,8 +112,8 @@ class Navigator
     using Error = std::optional<std::string>;
     [[nodiscard]] Error navigateImpl(std::string_view path);
     [[nodiscard]] Error navigateThroughPath(std::string_view path);
-    [[nodiscard]] Error navigateToAlias(const std::string& alias, const std::string& value);
-    [[nodiscard]] Error navigateToAndPopulateConfig(const std::string& desiredAlias);
+    [[nodiscard]] Error navigateToAlias(const std::string& alias, const Config& config, AliasCycleTracker cycleTracker);
+    [[nodiscard]] Error navigateToAndPopulateConfig(const std::string& desiredAlias, Config& config);
 
     [[nodiscard]] Error resetToRequirer();
     [[nodiscard]] Error jumpToAlias(const std::string& aliasPath);

luau/Config/src/Config.cpp

@@ -0,0 +1,45 @@
+// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
+#include "AliasCycleTracker.h"
+
+#include "Luau/DenseHash.h"
+#include "Luau/StringUtils.h"
+
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace Luau::Require
+{
+
+std::optional<std::string> AliasCycleTracker::add(std::string alias)
+{
+    if (seen.contains(alias))
+        return Luau::format("detected alias cycle (%s)", getStringifiedCycle(alias).c_str());
+
+    seen.insert(alias);
+    ordered.push_back(std::move(alias));
+    return std::nullopt;
+}
+
+std::string AliasCycleTracker::getStringifiedCycle(const std::string& repeated) const
+{
+    std::string result;
+    bool inCycle = false;
+    for (const std::string& item : ordered)
+    {
+        if (inCycle)
+        {
+            result += " -> ";
+            result += "@" + item;
+        }
+        if (item == repeated)
+        {
+            inCycle = true;
+            result += "@" + item;
+        }
+    }
+    result += " -> " + ("@" + repeated);
+    return result;
+}
+
+} // namespace Luau::Require

luau/Require/include/Luau/RequireNavigator.h

@@ -0,0 +1,25 @@
+// This file is part of the Luau programming language and is licensed under MIT License; see LICENSE.txt for details
+#pragma once
+
+#include "Luau/DenseHash.h"
+
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace Luau::Require
+{
+
+class AliasCycleTracker
+{
+public:
+    std::optional<std::string> add(std::string alias);
+
+private:
+    std::string getStringifiedCycle(const std::string& repeated) const;
+
+    DenseHashSet<std::string> seen{""};
+    std::vector<std::string> ordered;
+};
+
+} // namespace Luau::Require

luau/Require/src/AliasCycleTracker.cpp

@@ -2,6 +2,7 @@
 
 #include "Luau/RequireNavigator.h"
 
+#include "AliasCycleTracker.h"
 #include "PathUtilities.h"
 
 #include "Luau/Config.h"
@@ -76,10 +77,11 @@ Error Navigator::navigateImpl(std::string_view path)
             }
         );
 
-        if (Error error = navigateToAndPopulateConfig(alias))
+        Config config;
+        if (Error error = navigateToAndPopulateConfig(alias, config))
             return error;
 
-        if (!foundAliasValue)
+        if (!config.aliases.contains(alias))
         {
             if (alias != "self")
                 return "@" + alias + " is not a valid alias";
@@ -94,7 +96,7 @@ Error Navigator::navigateImpl(std::string_view path)
             return std::nullopt;
         }
 
-        if (Error error = navigateToAlias(alias, *foundAliasValue))
+        if (Error error = navigateToAlias(alias, config, {}))
             return error;
         if (Error error = navigateThroughPath(path))
             return error;
@@ -146,8 +148,9 @@ Error Navigator::navigateThroughPath(std::string_view path)
     return std::nullopt;
 }
 
-Error Navigator::navigateToAlias(const std::string& alias, const std::string& value)
+Error Navigator::navigateToAlias(const std::string& alias, const Config& config, AliasCycleTracker cycleTracker)
 {
+    std::string value = config.aliases.find(alias)->value;
     PathType pathType = getPathType(value);
 
     if (pathType == PathType::RelativeToCurrent || pathType == PathType::RelativeToParent)
@@ -157,7 +160,33 @@ Error Navigator::navigateToAlias(const std::string& alias, const std::string& va
     }
     else if (pathType == PathType::Aliased)
     {
-        return "alias \"@" + alias + "\" cannot point to an aliased path (\"" + value + "\")";
+        if (Error error = cycleTracker.add(alias))
+            return error;
+
+        std::string nextAlias = extractAlias(value);
+        if (config.aliases.contains(nextAlias))
+        {
+            if (Error error = navigateToAlias(nextAlias, config, std::move(cycleTracker)))
+                return error;
+        }
+        else
+        {
+            Config parentConfig;
+            if (Error error = navigateToAndPopulateConfig(nextAlias, parentConfig))
+                return error;
+            if (parentConfig.aliases.contains(nextAlias))
+            {
+                if (Error error = navigateToAlias(nextAlias, parentConfig, {}))
+                    return error;
+            }
+            else
+            {
+                return "@" + nextAlias + " is not a valid alias";
+            }
+        }
+
+        if (Error error = navigateThroughPath(value))
+            return error;
     }
     else
     {
@@ -168,11 +197,9 @@ Error Navigator::navigateToAlias(const std::string& alias, const std::string& va
     return std::nullopt;
 }
 
-Error Navigator::navigateToAndPopulateConfig(const std::string& desiredAlias)
+Error Navigator::navigateToAndPopulateConfig(const std::string& desiredAlias, Config& config)
 {
-    Luau::Config config;
-
-    while (!foundAliasValue)
+    while (!config.aliases.contains(desiredAlias))
     {
         NavigationContext::NavigateResult result = navigationContext.toParent();
         if (result == NavigationContext::NavigateResult::Ambiguous)
@@ -193,7 +220,7 @@ Error Navigator::navigateToAndPopulateConfig(const std::string& desiredAlias)
         {
             if (navigationContext.getConfigBehavior() == NavigationContext::ConfigBehavior::GetAlias)
             {
-                foundAliasValue = navigationContext.getAlias(desiredAlias);
+                config.setAlias(desiredAlias, *navigationContext.getAlias(desiredAlias), /* configLocation = */ "unused");
                 break;
             }
 
@@ -221,9 +248,6 @@ Error Navigator::navigateToAndPopulateConfig(const std::string& desiredAlias)
                 if (Error error = Luau::extractLuauConfig(*configContents, config, std::move(opts.aliasOptions), std::move(callbacks)))
                     return error;
             }
-
-            if (config.aliases.contains(desiredAlias))
-                foundAliasValue = config.aliases[desiredAlias].value;
         }
     };