From 75db2f5e90ab83e3c51c778f7d72e7be852922d4 Mon Sep 17 00:00:00 2001
From: Thomas <semoir.dense-0h@icloud.com>
Date: Fri, 24 Apr 2026 10:11:04 +0900
Subject: [PATCH 1/7] Make editor script library manager optional

---
 editor/Editor.cpp                            |  51 +-------
 editor/Editor.hpp                            |  23 +---
 editor/UI/EntityInspectorPanel.cpp           |  19 +--
 editor/UI/EntityInspectorPanel.hpp           |  11 +-
 include/Game-Engine/Game.hpp                 |  11 +-
 include/Game-Engine/ScriptLibraryManager.hpp |  53 ++++++++
 src/Game.cpp                                 |  22 ++--
 src/ScriptLibraryManager.cpp                 | 131 +++++++++++++++++++
 tests/Script_testCases.cpp                   |  23 ++++
 9 files changed, 243 insertions(+), 101 deletions(-)
 create mode 100644 include/Game-Engine/ScriptLibraryManager.hpp
 create mode 100644 src/ScriptLibraryManager.cpp

diff --git a/editor/Editor.cpp b/editor/Editor.cpp
index 2a58a78..67514c0 100644
--- a/editor/Editor.cpp
+++ b/editor/Editor.cpp
@@ -160,60 +160,21 @@ void Editor::reloadScriptLib()
         [](const auto& e) -> bool { return e.template get<0>().instance == nullptr; }
     ));
 
-    m_listScriptNames = {};
-    m_listScriptParameters = {};
-    m_makeScriptInstance = {};
-
     if (m_project.scriptLib().empty())
-        m_scriptLibHandle.reset();
-    else
-        m_scriptLibHandle.reset(dlLoad(m_project.scriptLib().string().c_str()));
-
-    if (m_scriptLibHandle == nullptr)
-        throw std::runtime_error(std::format("unable to load shared lib : {}", m_project.scriptLib().string()));
-
-    void* listScriptNamesSym = getSym(m_scriptLibHandle.get(), "listScriptNames");
-    void* listScriptParametersSym = getSym(m_scriptLibHandle.get(), "listScriptParameters");
-    void* makeScriptInstanceSym = getSym(m_scriptLibHandle.get(), "makeScriptInstance");
-
-    if (listScriptNamesSym == nullptr || listScriptParametersSym == nullptr || makeScriptInstanceSym == nullptr)
     {
-        m_scriptLibHandle.reset();
-        throw std::runtime_error(std::format("unable to get symbols in lib : {}", m_project.scriptLib().string()));
+        m_scriptLibrary.reset();
+        return;
     }
 
-    m_listScriptNames = [listScriptNamesSym]() -> std::vector<std::string> {
-        const char** names = nullptr;
-        unsigned long count = 0;
-        reinterpret_cast<GE::ListScriptNamesFn>(listScriptNamesSym)(&names, &count);
-        std::vector<std::string> output;
-        for (unsigned long i = 0; i < count; i++)
-            if (names[i] != nullptr)
-                output.emplace_back(names[i]);
-        return output;
-    };
-
-    m_listScriptParameters = [listScriptParametersSym](const std::string& name) -> std::vector<GE::ScriptParameterDescriptor> {
-        const GE::ScriptParameterDescriptor* parameters = nullptr;
-        unsigned long count = 0;
-        reinterpret_cast<GE::ListScriptParametersFn>(listScriptParametersSym)(name.c_str(), &parameters, &count);
-        std::vector<GE::ScriptParameterDescriptor> output;
-        output.reserve(count);
-        for (unsigned long i = 0; i < count; i++)
-            output.emplace_back(parameters[i]);
-        return output;
-    };
-
-    m_makeScriptInstance = [makeScriptInstanceSym](const std::string& name) -> std::shared_ptr<GE::Script> {
-        return std::shared_ptr<GE::Script>(reinterpret_cast<GE::MakeScriptInstanceFn>(makeScriptInstanceSym)(name.c_str()));
-    };
+    m_scriptLibrary.emplace();
+    m_scriptLibrary->load(m_project.scriptLib());
 }
 
 void Editor::startGame()
 {
     assert(m_game.has_value() == false);
     saveEditedScene();
-    m_game.emplace(&assetManager(), m_makeScriptInstance, m_listScriptParameters, m_project.makeGameDescriptor());
+    m_game.emplace(&assetManager(), m_scriptLibrary.has_value() ? &*m_scriptLibrary : nullptr, m_project.makeGameDescriptor());
     setPrimaryInputContext(m_game->inputContext());
 }
 
@@ -300,7 +261,7 @@ void Editor::renderImgui()
     SceneGraphPanel(&m_editedScene.second, &m_selectedEntity)
         .render();
 
-    EntityInspectorPanel(m_selectedEntity, m_listScriptNames, m_listScriptParameters)
+    EntityInspectorPanel(m_selectedEntity, m_scriptLibrary.has_value() ? &*m_scriptLibrary : nullptr)
         .render();
 
     ContentBrowserPanel("Scenes", "scene_dnd", sizeof(GE::Scene::Descriptor))
diff --git a/editor/Editor.hpp b/editor/Editor.hpp
index 1f2893f..0ef9e89 100644
--- a/editor/Editor.hpp
+++ b/editor/Editor.hpp
@@ -18,22 +18,16 @@
 #include <Game-Engine/FrameGraph.hpp>
 #include <Game-Engine/InputContext.hpp>
 #include <Game-Engine/Input.hpp>
-#include <Game-Engine/Script.hpp>
+#include <Game-Engine/ScriptLibraryManager.hpp>
 #include <Game-Engine/Scene.hpp>
 
-#include <dlLoad/dlLoad.h>
-
 #include <imgui.h>
 
 #include <cstdint>
 #include <filesystem>
-#include <memory>
 #include <optional>
 #include <string>
-#include <type_traits>
 #include <utility>
-#include <vector>
-#include <functional>
 
 namespace GE_Editor
 {
@@ -53,16 +47,6 @@ class Editor : public GE::Application
     ~Editor() override = default;
 
 private:
-    struct DlHandleDeleter
-    {
-        void operator()(DlHandle handle) const
-        {
-            if (handle != nullptr)
-                dlFree(handle);
-        }
-    };
-    using UniqueDlHandle = std::unique_ptr<std::remove_pointer_t<DlHandle>, DlHandleDeleter>;
-
     void loadProject(const std::filesystem::path&);
     void saveEditedScene();
     void saveProject();
@@ -76,10 +60,7 @@ class Editor : public GE::Application
     void rebuildFrameGraph();
     void renderImgui();
 
-    UniqueDlHandle m_scriptLibHandle; // need to be before m_edited scene so it is destroyed after
-    std::function<std::vector<std::string>()> m_listScriptNames;
-    std::function<std::vector<GE::ScriptParameterDescriptor>(const std::string&)> m_listScriptParameters;
-    std::function<std::shared_ptr<GE::Script>(const std::string&)> m_makeScriptInstance;
+    std::optional<GE::ScriptLibraryManager> m_scriptLibrary;
 
     std::filesystem::path m_projectFilePath;
     Project m_project;
diff --git a/editor/UI/EntityInspectorPanel.cpp b/editor/UI/EntityInspectorPanel.cpp
index 31bd5ad..0f33314 100644
--- a/editor/UI/EntityInspectorPanel.cpp
+++ b/editor/UI/EntityInspectorPanel.cpp
@@ -12,7 +12,7 @@
 #include <Game-Engine/Components.hpp>
 #include <Game-Engine/ECSWorld.hpp>
 #include <Game-Engine/Entity.hpp>
-#include <Game-Engine/Script.hpp>
+#include <Game-Engine/ScriptLibraryManager.hpp>
 
 #include <imgui.h>
 
@@ -92,20 +92,23 @@ template<>
 void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
 {
     GE::ScriptComponent& scriptComponent = m_entity.get<GE::ScriptComponent>();
+    if (m_scriptLibrary == nullptr)
+    {
+        ImGui::TextDisabled("No script library loaded");
+        return;
+    }
 
     const char* previewValue = scriptComponent.name.empty() ? "none" : scriptComponent.name.c_str();
     if (ImGui::BeginCombo("Script##ScriptComponent_name", previewValue))
     {
-        assert(m_listScriptNames);
-        for (const std::string& scriptName : m_listScriptNames())
+        for (const std::string& scriptName : m_scriptLibrary->listScriptNames())
         {
             const bool isSelected = scriptComponent.name == scriptName;
             if (ImGui::Selectable(scriptName.c_str(), isSelected))
             {
                 scriptComponent.name = scriptName;
                 scriptComponent.parameters.clear();
-                assert(m_listScriptParameters);
-                for (const GE::ScriptParameterDescriptor& parameter : m_listScriptParameters(scriptName))
+                for (const GE::ScriptParameterDescriptor& parameter : m_scriptLibrary->listScriptParameters(scriptName))
                 {
                     auto [parameterIt, inserted] = scriptComponent.parameters.try_emplace(parameter.name, parameter.defaultValue);
                     assert(inserted);
@@ -150,12 +153,10 @@ void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
 
 EntityInspectorPanel::EntityInspectorPanel(
     const GE::Entity& entity,
-    std::function<std::vector<std::string>()> listScriptNames,
-    std::function<std::vector<GE::ScriptParameterDescriptor>(const std::string&)> listScriptParameters
+    const GE::ScriptLibraryManager* scriptLibrary
 )
     : m_entity(entity)
-    , m_listScriptNames(std::move(listScriptNames))
-    , m_listScriptParameters(std::move(listScriptParameters))
+    , m_scriptLibrary(scriptLibrary)
 {
 }
 
diff --git a/editor/UI/EntityInspectorPanel.hpp b/editor/UI/EntityInspectorPanel.hpp
index 36cf109..41152fb 100644
--- a/editor/UI/EntityInspectorPanel.hpp
+++ b/editor/UI/EntityInspectorPanel.hpp
@@ -11,10 +11,9 @@
 #define ENTITYINSPECTORPANEL_HPP
 
 #include <Game-Engine/Entity.hpp>
-#include <Game-Engine/Script.hpp>
+#include <Game-Engine/ScriptLibraryManager.hpp>
+
 #include <functional>
-#include <string>
-#include <vector>
 
 namespace GE_Editor
 {
@@ -28,8 +27,7 @@ class EntityInspectorPanel
 
     EntityInspectorPanel(
         const GE::Entity& entity,
-        std::function<std::vector<std::string>()> listScriptNames,
-        std::function<std::vector<GE::ScriptParameterDescriptor>(const std::string&)> listScriptParameters
+        const GE::ScriptLibraryManager* scriptLibrary
     );
 
     EntityInspectorPanel& onEntityDelete(std::function<void()>&& f) { return m_onEntityDelete = std::move(f), *this; }
@@ -44,8 +42,7 @@ class EntityInspectorPanel
     void addComponentPopUp();
 
     GE::Entity m_entity;
-    std::function<std::vector<std::string>()> m_listScriptNames;
-    std::function<std::vector<GE::ScriptParameterDescriptor>(const std::string&)> m_listScriptParameters;
+    const GE::ScriptLibraryManager* m_scriptLibrary = nullptr;
 
     std::function<void()> m_onEntityDelete;
 
diff --git a/include/Game-Engine/Game.hpp b/include/Game-Engine/Game.hpp
index d58917e..e4a85b4 100644
--- a/include/Game-Engine/Game.hpp
+++ b/include/Game-Engine/Game.hpp
@@ -13,13 +13,10 @@
 #include "Game-Engine/InputContext.hpp"
 #include "Game-Engine/Scene.hpp"
 #include "Game-Engine/AssetManager.hpp"
-#include "Game-Engine/Script.hpp"
+#include "Game-Engine/ScriptLibraryManager.hpp"
 
 #include <map>
-#include <memory>
 #include <string>
-#include <functional>
-#include <vector>
 
 namespace GE
 {
@@ -41,8 +38,7 @@ class GE_API Game
 
     Game(
         AssetManager* assetManager,
-        std::function<std::shared_ptr<GE::Script>(const std::string&)> makeScriptInstance,
-        std::function<std::vector<GE::ScriptParameterDescriptor>(const std::string&)> listScriptParameters,
+        ScriptLibraryManager* scriptLibrary,
         const Descriptor& descriptor
     );
 
@@ -54,8 +50,7 @@ class GE_API Game
     ~Game();
 
 private:
-    std::function<std::shared_ptr<GE::Script>(const std::string&)> m_makeScriptInstance;
-    std::function<std::vector<GE::ScriptParameterDescriptor>(const std::string&)> m_listScriptParameters;
+    ScriptLibraryManager* m_scriptLibrary = nullptr;
     std::map<std::string, Scene> m_scenes;
     Scene* m_activeScene = nullptr;
     InputContext m_inputContext;
diff --git a/include/Game-Engine/ScriptLibraryManager.hpp b/include/Game-Engine/ScriptLibraryManager.hpp
new file mode 100644
index 0000000..d855aad
--- /dev/null
+++ b/include/Game-Engine/ScriptLibraryManager.hpp
@@ -0,0 +1,53 @@
+/*
+ * ---------------------------------------------------
+ * ScriptLibraryManager.hpp
+ *
+ * Author: Thomas Choquet <thomas.publique@icloud.com>
+ * ---------------------------------------------------
+ */
+
+#ifndef SCRIPT_LIBRARY_MANAGER_HPP
+#define SCRIPT_LIBRARY_MANAGER_HPP
+
+#include "Game-Engine/Export.hpp"
+#include "Game-Engine/Script.hpp"
+
+#include <filesystem>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace GE
+{
+
+class GE_API ScriptLibraryManager
+{
+public:
+    ScriptLibraryManager() = default;
+    ScriptLibraryManager(const ScriptLibraryManager&) = delete;
+    ScriptLibraryManager(ScriptLibraryManager&&) = default;
+
+    void load(const std::filesystem::path& path);
+    void unload();
+    [[nodiscard]] bool isLoaded() const;
+
+    [[nodiscard]] std::vector<std::string> listScriptNames() const;
+    [[nodiscard]] std::vector<ScriptParameterDescriptor> listScriptParameters(const std::string& scriptName) const;
+    [[nodiscard]] std::shared_ptr<Script> makeScriptInstance(const std::string& scriptName) const;
+
+    ~ScriptLibraryManager();
+
+    ScriptLibraryManager& operator=(const ScriptLibraryManager&) = delete;
+    ScriptLibraryManager& operator=(ScriptLibraryManager&&) = default;
+
+private:
+    struct LibraryHandle;
+    std::shared_ptr<LibraryHandle> m_libraryHandle;
+    ListScriptNamesFn m_listScriptNames = nullptr;
+    ListScriptParametersFn m_listScriptParameters = nullptr;
+    MakeScriptInstanceFn m_makeScriptInstance = nullptr;
+};
+
+} // namespace GE
+
+#endif // SCRIPT_LIBRARY_MANAGER_HPP
diff --git a/src/Game.cpp b/src/Game.cpp
index feea4ad..a311df7 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -7,12 +7,15 @@
  */
 
 #include "Game-Engine/Game.hpp"
+#include "Game-Engine/ScriptLibraryManager.hpp"
 #include "Game-Engine/ECSView.hpp"
 #include "Game-Engine/Scene.hpp"
 #include "Game-Engine/AssetManager.hpp"
 
+#include <format>
 #include <cassert>
 #include <ranges>
+#include <stdexcept>
 #include <utility>
 
 namespace GE
@@ -24,8 +27,7 @@ namespace
 void setupScene(
     Game& game,
     Scene& scene,
-    const std::function<std::shared_ptr<Script>(const std::string&)>& makeScriptInstance,
-    const std::function<std::vector<ScriptParameterDescriptor>(const std::string&)>& listScriptParameters
+    ScriptLibraryManager* scriptLibrary
 )
 {
     scene.load();
@@ -33,12 +35,12 @@ void setupScene(
                              | ECSView<ScriptComponent>()
                              | std::views::transform([&](auto id) { return Entity{ &scene.ecsWorld(), id }; }))
     {
-        assert(makeScriptInstance);
-        assert(listScriptParameters);
+        if (scriptLibrary == nullptr)
+            throw std::runtime_error(std::format("unable to create script '{}' without a loaded script library", entity.get<ScriptComponent>().name));
         ScriptComponent& scriptComponent = entity.get<ScriptComponent>();
-        scriptComponent.instance = makeScriptInstance(scriptComponent.name);
+        scriptComponent.instance = scriptLibrary->makeScriptInstance(scriptComponent.name);
         assert(scriptComponent.instance);
-        for (const ScriptParameterDescriptor& parameter : listScriptParameters(scriptComponent.name))
+        for (const ScriptParameterDescriptor& parameter : scriptLibrary->listScriptParameters(scriptComponent.name))
         {
             auto it = scriptComponent.parameters.find(parameter.name);
             parameter.set(*scriptComponent.instance, it == scriptComponent.parameters.end() ? parameter.defaultValue : it->second);
@@ -65,12 +67,10 @@ void tearDownScene(Game& game, Scene& scene)
 
 Game::Game(
     AssetManager* assetManager,
-    std::function<std::shared_ptr<Script>(const std::string&)> makeScriptInstance,
-    std::function<std::vector<ScriptParameterDescriptor>(const std::string&)> listScriptParameters,
+    ScriptLibraryManager* scriptLibrary,
     const Descriptor& descriptor
 )
-    : m_makeScriptInstance(std::move(makeScriptInstance))
-    , m_listScriptParameters(std::move(listScriptParameters))
+    : m_scriptLibrary(scriptLibrary)
     , m_scenes(std::from_range, descriptor.scenes | std::views::transform([&](const auto& sceneDesc){ return std::make_pair(sceneDesc.first, Scene(assetManager, sceneDesc.second)); }))
     , m_inputContext(descriptor.inputContext)
 {
@@ -82,7 +82,7 @@ void Game::setActiveScene(const std::string& name)
     if (m_activeScene)
         tearDownScene(*this, *m_activeScene);
     m_activeScene = &m_scenes.at(name);
-    setupScene(*this, *m_activeScene, m_makeScriptInstance, m_listScriptParameters);
+    setupScene(*this, *m_activeScene, m_scriptLibrary);
 }
 
 Game::~Game()
diff --git a/src/ScriptLibraryManager.cpp b/src/ScriptLibraryManager.cpp
new file mode 100644
index 0000000..0788c58
--- /dev/null
+++ b/src/ScriptLibraryManager.cpp
@@ -0,0 +1,131 @@
+/*
+ * ---------------------------------------------------
+ * ScriptLibraryManager.cpp
+ *
+ * Author: Thomas Choquet <thomas.publique@icloud.com>
+ * ---------------------------------------------------
+ */
+
+#include "Game-Engine/ScriptLibraryManager.hpp"
+
+#include <dlLoad/dlLoad.h>
+
+#include <format>
+#include <stdexcept>
+#include <utility>
+
+namespace GE
+{
+
+struct ScriptLibraryManager::LibraryHandle
+{
+    explicit LibraryHandle(DlHandle handle)
+        : value(handle)
+    {
+    }
+
+    ~LibraryHandle()
+    {
+        if (value != nullptr)
+            dlFree(value);
+    }
+
+    DlHandle value = nullptr;
+};
+
+void ScriptLibraryManager::load(const std::filesystem::path& path)
+{
+    unload();
+
+    DlHandle handle = dlLoad(path.string().c_str());
+    if (handle == nullptr)
+        throw std::runtime_error(std::format("unable to load shared lib : {}", path.string()));
+
+    m_libraryHandle = std::make_shared<LibraryHandle>(handle);
+    m_listScriptNames = reinterpret_cast<ListScriptNamesFn>(getSym(handle, "listScriptNames"));
+    m_listScriptParameters = reinterpret_cast<ListScriptParametersFn>(getSym(handle, "listScriptParameters"));
+    m_makeScriptInstance = reinterpret_cast<MakeScriptInstanceFn>(getSym(handle, "makeScriptInstance"));
+
+    if (m_listScriptNames == nullptr || m_listScriptParameters == nullptr || m_makeScriptInstance == nullptr)
+    {
+        unload();
+        throw std::runtime_error(std::format("unable to get symbols in lib : {}", path.string()));
+    }
+}
+
+void ScriptLibraryManager::unload()
+{
+    m_listScriptNames = nullptr;
+    m_listScriptParameters = nullptr;
+    m_makeScriptInstance = nullptr;
+    m_libraryHandle.reset();
+}
+
+bool ScriptLibraryManager::isLoaded() const
+{
+    return m_libraryHandle != nullptr;
+}
+
+std::vector<std::string> ScriptLibraryManager::listScriptNames() const
+{
+    if (m_listScriptNames == nullptr)
+        return {};
+
+    const char** names = nullptr;
+    unsigned long count = 0;
+    m_listScriptNames(&names, &count);
+
+    std::vector<std::string> output;
+    output.reserve(count);
+    for (unsigned long i = 0; i < count; i++)
+        if (names[i] != nullptr)
+            output.emplace_back(names[i]);
+    return output;
+}
+
+std::vector<ScriptParameterDescriptor> ScriptLibraryManager::listScriptParameters(const std::string& scriptName) const
+{
+    if (m_listScriptParameters == nullptr)
+        return {};
+
+    const ScriptParameterDescriptor* parameters = nullptr;
+    unsigned long count = 0;
+    m_listScriptParameters(scriptName.c_str(), &parameters, &count);
+
+    std::vector<ScriptParameterDescriptor> output;
+    output.reserve(count);
+    for (unsigned long i = 0; i < count; i++)
+        output.emplace_back(parameters[i]);
+    return output;
+}
+
+std::shared_ptr<Script> ScriptLibraryManager::makeScriptInstance(const std::string& scriptName) const
+{
+    struct ScriptInstanceDeleter
+    {
+        std::shared_ptr<LibraryHandle> libraryHandle;
+
+        void operator()(Script* ptr) const
+        {
+            delete ptr;
+        }
+    };
+
+    if (m_makeScriptInstance == nullptr)
+        return {};
+
+    Script* script = m_makeScriptInstance(scriptName.c_str());
+    if (script == nullptr)
+        return {};
+
+    return std::shared_ptr<Script>(script, ScriptInstanceDeleter{
+        .libraryHandle = m_libraryHandle
+    });
+}
+
+ScriptLibraryManager::~ScriptLibraryManager()
+{
+    unload();
+}
+
+} // namespace GE
diff --git a/tests/Script_testCases.cpp b/tests/Script_testCases.cpp
index 82a8ff7..53db87e 100644
--- a/tests/Script_testCases.cpp
+++ b/tests/Script_testCases.cpp
@@ -1,4 +1,5 @@
 #include <Game-Engine/Script.hpp>
+#include <Game-Engine/ScriptLibraryManager.hpp>
 
 #include <dlLoad/dlLoad.h>
 #include <gtest/gtest.h>
@@ -97,3 +98,25 @@ TEST(ScriptLibraryTest, loadsGeneratedScriptLibraryExports)
     EXPECT_EQ(std::get<bool>(enabled->get(*script)), false);
     EXPECT_EQ(std::get<std::string>(label->get(*script)), "changed");
 }
+
+TEST(ScriptLibraryManagerTest, keepsLibraryAliveForScriptInstanceLifetime)
+{
+    GE::ScriptLibraryManager manager;
+    manager.load(GE_TEST_SCRIPT_LIB);
+
+    std::vector<GE::ScriptParameterDescriptor> parameters = manager.listScriptParameters("TestScript");
+    ASSERT_EQ(parameters.size(), 3u);
+    const GE::ScriptParameterDescriptor* speed = findParameter(parameters.data(), parameters.size(), "speed");
+    ASSERT_NE(speed, nullptr);
+
+    std::shared_ptr<GE::Script> script = manager.makeScriptInstance("TestScript");
+    ASSERT_NE(script, nullptr);
+
+    manager.unload();
+    EXPECT_FALSE(manager.isLoaded());
+
+    speed->set(*script, 11.0f);
+    EXPECT_EQ(std::get<float>(speed->get(*script)), 11.0f);
+
+    script.reset();
+}

From 44d6317c47839821795a7250e5850c08aec6b4d8 Mon Sep 17 00:00:00 2001
From: Thomas <semoir.dense-0h@icloud.com>
Date: Fri, 24 Apr 2026 10:53:34 +0900
Subject: [PATCH 2/7] Return script library callables with shared handle
 lifetime

---
 editor/Editor.cpp                            |   9 +-
 editor/Editor.hpp                            |   2 +-
 editor/UI/EntityInspectorPanel.cpp           |  10 +-
 editor/UI/EntityInspectorPanel.hpp           |   4 +-
 include/Game-Engine/Game.hpp                 |   4 +-
 include/Game-Engine/ScriptLibraryManager.hpp |  44 +++++-
 src/Game.cpp                                 |  14 +-
 src/ScriptLibraryManager.cpp                 | 149 ++++++++++++-------
 8 files changed, 157 insertions(+), 79 deletions(-)

diff --git a/editor/Editor.cpp b/editor/Editor.cpp
index 67514c0..9129413 100644
--- a/editor/Editor.cpp
+++ b/editor/Editor.cpp
@@ -162,19 +162,18 @@ void Editor::reloadScriptLib()
 
     if (m_project.scriptLib().empty())
     {
-        m_scriptLibrary.reset();
+        m_scriptLibraryFunctions = {};
         return;
     }
 
-    m_scriptLibrary.emplace();
-    m_scriptLibrary->load(m_project.scriptLib());
+    m_scriptLibraryFunctions = GE::ScriptLibraryManager::loadFunctions(m_project.scriptLib());
 }
 
 void Editor::startGame()
 {
     assert(m_game.has_value() == false);
     saveEditedScene();
-    m_game.emplace(&assetManager(), m_scriptLibrary.has_value() ? &*m_scriptLibrary : nullptr, m_project.makeGameDescriptor());
+    m_game.emplace(&assetManager(), m_scriptLibraryFunctions, m_project.makeGameDescriptor());
     setPrimaryInputContext(m_game->inputContext());
 }
 
@@ -261,7 +260,7 @@ void Editor::renderImgui()
     SceneGraphPanel(&m_editedScene.second, &m_selectedEntity)
         .render();
 
-    EntityInspectorPanel(m_selectedEntity, m_scriptLibrary.has_value() ? &*m_scriptLibrary : nullptr)
+    EntityInspectorPanel(m_selectedEntity, &m_scriptLibraryFunctions)
         .render();
 
     ContentBrowserPanel("Scenes", "scene_dnd", sizeof(GE::Scene::Descriptor))
diff --git a/editor/Editor.hpp b/editor/Editor.hpp
index 0ef9e89..ef5c3a1 100644
--- a/editor/Editor.hpp
+++ b/editor/Editor.hpp
@@ -60,7 +60,7 @@ class Editor : public GE::Application
     void rebuildFrameGraph();
     void renderImgui();
 
-    std::optional<GE::ScriptLibraryManager> m_scriptLibrary;
+    GE::ScriptLibraryFunctions m_scriptLibraryFunctions;
 
     std::filesystem::path m_projectFilePath;
     Project m_project;
diff --git a/editor/UI/EntityInspectorPanel.cpp b/editor/UI/EntityInspectorPanel.cpp
index 0f33314..22e565a 100644
--- a/editor/UI/EntityInspectorPanel.cpp
+++ b/editor/UI/EntityInspectorPanel.cpp
@@ -92,7 +92,7 @@ template<>
 void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
 {
     GE::ScriptComponent& scriptComponent = m_entity.get<GE::ScriptComponent>();
-    if (m_scriptLibrary == nullptr)
+    if (m_scriptLibraryFunctions == nullptr || !*m_scriptLibraryFunctions)
     {
         ImGui::TextDisabled("No script library loaded");
         return;
@@ -101,14 +101,14 @@ void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
     const char* previewValue = scriptComponent.name.empty() ? "none" : scriptComponent.name.c_str();
     if (ImGui::BeginCombo("Script##ScriptComponent_name", previewValue))
     {
-        for (const std::string& scriptName : m_scriptLibrary->listScriptNames())
+        for (const std::string& scriptName : m_scriptLibraryFunctions->listScriptNames())
         {
             const bool isSelected = scriptComponent.name == scriptName;
             if (ImGui::Selectable(scriptName.c_str(), isSelected))
             {
                 scriptComponent.name = scriptName;
                 scriptComponent.parameters.clear();
-                for (const GE::ScriptParameterDescriptor& parameter : m_scriptLibrary->listScriptParameters(scriptName))
+                for (const GE::ScriptParameterDescriptor& parameter : m_scriptLibraryFunctions->listScriptParameters(scriptName))
                 {
                     auto [parameterIt, inserted] = scriptComponent.parameters.try_emplace(parameter.name, parameter.defaultValue);
                     assert(inserted);
@@ -153,10 +153,10 @@ void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
 
 EntityInspectorPanel::EntityInspectorPanel(
     const GE::Entity& entity,
-    const GE::ScriptLibraryManager* scriptLibrary
+    const GE::ScriptLibraryFunctions* scriptLibraryFunctions
 )
     : m_entity(entity)
-    , m_scriptLibrary(scriptLibrary)
+    , m_scriptLibraryFunctions(scriptLibraryFunctions)
 {
 }
 
diff --git a/editor/UI/EntityInspectorPanel.hpp b/editor/UI/EntityInspectorPanel.hpp
index 41152fb..34d133c 100644
--- a/editor/UI/EntityInspectorPanel.hpp
+++ b/editor/UI/EntityInspectorPanel.hpp
@@ -27,7 +27,7 @@ class EntityInspectorPanel
 
     EntityInspectorPanel(
         const GE::Entity& entity,
-        const GE::ScriptLibraryManager* scriptLibrary
+        const GE::ScriptLibraryFunctions* scriptLibraryFunctions
     );
 
     EntityInspectorPanel& onEntityDelete(std::function<void()>&& f) { return m_onEntityDelete = std::move(f), *this; }
@@ -42,7 +42,7 @@ class EntityInspectorPanel
     void addComponentPopUp();
 
     GE::Entity m_entity;
-    const GE::ScriptLibraryManager* m_scriptLibrary = nullptr;
+    const GE::ScriptLibraryFunctions* m_scriptLibraryFunctions = nullptr;
 
     std::function<void()> m_onEntityDelete;
 
diff --git a/include/Game-Engine/Game.hpp b/include/Game-Engine/Game.hpp
index e4a85b4..8c99a6d 100644
--- a/include/Game-Engine/Game.hpp
+++ b/include/Game-Engine/Game.hpp
@@ -38,7 +38,7 @@ class GE_API Game
 
     Game(
         AssetManager* assetManager,
-        ScriptLibraryManager* scriptLibrary,
+        ScriptLibraryFunctions scriptLibraryFunctions,
         const Descriptor& descriptor
     );
 
@@ -50,7 +50,7 @@ class GE_API Game
     ~Game();
 
 private:
-    ScriptLibraryManager* m_scriptLibrary = nullptr;
+    ScriptLibraryFunctions m_scriptLibraryFunctions;
     std::map<std::string, Scene> m_scenes;
     Scene* m_activeScene = nullptr;
     InputContext m_inputContext;
diff --git a/include/Game-Engine/ScriptLibraryManager.hpp b/include/Game-Engine/ScriptLibraryManager.hpp
index d855aad..691ad7f 100644
--- a/include/Game-Engine/ScriptLibraryManager.hpp
+++ b/include/Game-Engine/ScriptLibraryManager.hpp
@@ -20,6 +20,45 @@
 namespace GE
 {
 
+struct GE_API ScriptLibraryListScriptNames
+{
+    std::shared_ptr<void> libraryHandle;
+    ListScriptNamesFn fn = nullptr;
+
+    [[nodiscard]] std::vector<std::string> operator()() const;
+    [[nodiscard]] inline explicit operator bool() const { return fn != nullptr; }
+};
+
+struct GE_API ScriptLibraryListScriptParameters
+{
+    std::shared_ptr<void> libraryHandle;
+    ListScriptParametersFn fn = nullptr;
+
+    [[nodiscard]] std::vector<ScriptParameterDescriptor> operator()(const std::string& scriptName) const;
+    [[nodiscard]] inline explicit operator bool() const { return fn != nullptr; }
+};
+
+struct GE_API ScriptLibraryMakeScriptInstance
+{
+    std::shared_ptr<void> libraryHandle;
+    MakeScriptInstanceFn fn = nullptr;
+
+    [[nodiscard]] std::shared_ptr<Script> operator()(const std::string& scriptName) const;
+    [[nodiscard]] inline explicit operator bool() const { return fn != nullptr; }
+};
+
+struct GE_API ScriptLibraryFunctions
+{
+    ScriptLibraryListScriptNames listScriptNames;
+    ScriptLibraryListScriptParameters listScriptParameters;
+    ScriptLibraryMakeScriptInstance makeScriptInstance;
+
+    [[nodiscard]] inline explicit operator bool() const
+    {
+        return static_cast<bool>(listScriptNames) && static_cast<bool>(listScriptParameters) && static_cast<bool>(makeScriptInstance);
+    }
+};
+
 class GE_API ScriptLibraryManager
 {
 public:
@@ -34,6 +73,8 @@ class GE_API ScriptLibraryManager
     [[nodiscard]] std::vector<std::string> listScriptNames() const;
     [[nodiscard]] std::vector<ScriptParameterDescriptor> listScriptParameters(const std::string& scriptName) const;
     [[nodiscard]] std::shared_ptr<Script> makeScriptInstance(const std::string& scriptName) const;
+    [[nodiscard]] ScriptLibraryFunctions functions() const;
+    [[nodiscard]] static ScriptLibraryFunctions loadFunctions(const std::filesystem::path& path);
 
     ~ScriptLibraryManager();
 
@@ -41,8 +82,7 @@ class GE_API ScriptLibraryManager
     ScriptLibraryManager& operator=(ScriptLibraryManager&&) = default;
 
 private:
-    struct LibraryHandle;
-    std::shared_ptr<LibraryHandle> m_libraryHandle;
+    std::shared_ptr<void> m_libraryHandle;
     ListScriptNamesFn m_listScriptNames = nullptr;
     ListScriptParametersFn m_listScriptParameters = nullptr;
     MakeScriptInstanceFn m_makeScriptInstance = nullptr;
diff --git a/src/Game.cpp b/src/Game.cpp
index a311df7..908e219 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -27,7 +27,7 @@ namespace
 void setupScene(
     Game& game,
     Scene& scene,
-    ScriptLibraryManager* scriptLibrary
+    const ScriptLibraryFunctions& scriptLibraryFunctions
 )
 {
     scene.load();
@@ -35,12 +35,12 @@ void setupScene(
                              | ECSView<ScriptComponent>()
                              | std::views::transform([&](auto id) { return Entity{ &scene.ecsWorld(), id }; }))
     {
-        if (scriptLibrary == nullptr)
+        if (!scriptLibraryFunctions)
             throw std::runtime_error(std::format("unable to create script '{}' without a loaded script library", entity.get<ScriptComponent>().name));
         ScriptComponent& scriptComponent = entity.get<ScriptComponent>();
-        scriptComponent.instance = scriptLibrary->makeScriptInstance(scriptComponent.name);
+        scriptComponent.instance = scriptLibraryFunctions.makeScriptInstance(scriptComponent.name);
         assert(scriptComponent.instance);
-        for (const ScriptParameterDescriptor& parameter : scriptLibrary->listScriptParameters(scriptComponent.name))
+        for (const ScriptParameterDescriptor& parameter : scriptLibraryFunctions.listScriptParameters(scriptComponent.name))
         {
             auto it = scriptComponent.parameters.find(parameter.name);
             parameter.set(*scriptComponent.instance, it == scriptComponent.parameters.end() ? parameter.defaultValue : it->second);
@@ -67,10 +67,10 @@ void tearDownScene(Game& game, Scene& scene)
 
 Game::Game(
     AssetManager* assetManager,
-    ScriptLibraryManager* scriptLibrary,
+    ScriptLibraryFunctions scriptLibraryFunctions,
     const Descriptor& descriptor
 )
-    : m_scriptLibrary(scriptLibrary)
+    : m_scriptLibraryFunctions(std::move(scriptLibraryFunctions))
     , m_scenes(std::from_range, descriptor.scenes | std::views::transform([&](const auto& sceneDesc){ return std::make_pair(sceneDesc.first, Scene(assetManager, sceneDesc.second)); }))
     , m_inputContext(descriptor.inputContext)
 {
@@ -82,7 +82,7 @@ void Game::setActiveScene(const std::string& name)
     if (m_activeScene)
         tearDownScene(*this, *m_activeScene);
     m_activeScene = &m_scenes.at(name);
-    setupScene(*this, *m_activeScene, m_scriptLibrary);
+    setupScene(*this, *m_activeScene, m_scriptLibraryFunctions);
 }
 
 Game::~Game()
diff --git a/src/ScriptLibraryManager.cpp b/src/ScriptLibraryManager.cpp
index 0788c58..4cc86f3 100644
--- a/src/ScriptLibraryManager.cpp
+++ b/src/ScriptLibraryManager.cpp
@@ -17,21 +17,59 @@
 namespace GE
 {
 
-struct ScriptLibraryManager::LibraryHandle
+namespace
 {
-    explicit LibraryHandle(DlHandle handle)
-        : value(handle)
-    {
-    }
 
-    ~LibraryHandle()
-    {
-        if (value != nullptr)
-            dlFree(value);
-    }
+std::vector<std::string> listScriptNames(std::shared_ptr<void> libraryHandle, ListScriptNamesFn fn)
+{
+    (void)libraryHandle;
+    if (fn == nullptr)
+        return {};
 
-    DlHandle value = nullptr;
-};
+    const char** names = nullptr;
+    unsigned long count = 0;
+    fn(&names, &count);
+
+    std::vector<std::string> output;
+    output.reserve(count);
+    for (unsigned long i = 0; i < count; i++)
+        if (names[i] != nullptr)
+            output.emplace_back(names[i]);
+    return output;
+}
+
+std::vector<ScriptParameterDescriptor> listScriptParameters(std::shared_ptr<void> libraryHandle, ListScriptParametersFn fn, const std::string& scriptName)
+{
+    (void)libraryHandle;
+    if (fn == nullptr)
+        return {};
+
+    const ScriptParameterDescriptor* parameters = nullptr;
+    unsigned long count = 0;
+    fn(scriptName.c_str(), &parameters, &count);
+
+    std::vector<ScriptParameterDescriptor> output;
+    output.reserve(count);
+    for (unsigned long i = 0; i < count; i++)
+        output.emplace_back(parameters[i]);
+    return output;
+}
+
+std::shared_ptr<Script> makeScriptInstance(std::shared_ptr<void> libraryHandle, MakeScriptInstanceFn fn, const std::string& scriptName)
+{
+    if (fn == nullptr)
+        return {};
+
+    Script* script = fn(scriptName.c_str());
+    if (script == nullptr)
+        return {};
+
+    return std::shared_ptr<Script>(script, [libraryHandle = std::move(libraryHandle)](Script* ptr) {
+        delete ptr;
+    });
+}
+
+} // namespace
 
 void ScriptLibraryManager::load(const std::filesystem::path& path)
 {
@@ -41,7 +79,10 @@ void ScriptLibraryManager::load(const std::filesystem::path& path)
     if (handle == nullptr)
         throw std::runtime_error(std::format("unable to load shared lib : {}", path.string()));
 
-    m_libraryHandle = std::make_shared<LibraryHandle>(handle);
+    m_libraryHandle = std::shared_ptr<void>(handle, [](void* ptr){
+        if (ptr != nullptr)
+            dlFree(ptr);
+    });
     m_listScriptNames = reinterpret_cast<ListScriptNamesFn>(getSym(handle, "listScriptNames"));
     m_listScriptParameters = reinterpret_cast<ListScriptParametersFn>(getSym(handle, "listScriptParameters"));
     m_makeScriptInstance = reinterpret_cast<MakeScriptInstanceFn>(getSym(handle, "makeScriptInstance"));
@@ -68,59 +109,42 @@ bool ScriptLibraryManager::isLoaded() const
 
 std::vector<std::string> ScriptLibraryManager::listScriptNames() const
 {
-    if (m_listScriptNames == nullptr)
-        return {};
-
-    const char** names = nullptr;
-    unsigned long count = 0;
-    m_listScriptNames(&names, &count);
-
-    std::vector<std::string> output;
-    output.reserve(count);
-    for (unsigned long i = 0; i < count; i++)
-        if (names[i] != nullptr)
-            output.emplace_back(names[i]);
-    return output;
+    return GE::listScriptNames(m_libraryHandle, m_listScriptNames);
 }
 
 std::vector<ScriptParameterDescriptor> ScriptLibraryManager::listScriptParameters(const std::string& scriptName) const
 {
-    if (m_listScriptParameters == nullptr)
-        return {};
-
-    const ScriptParameterDescriptor* parameters = nullptr;
-    unsigned long count = 0;
-    m_listScriptParameters(scriptName.c_str(), &parameters, &count);
-
-    std::vector<ScriptParameterDescriptor> output;
-    output.reserve(count);
-    for (unsigned long i = 0; i < count; i++)
-        output.emplace_back(parameters[i]);
-    return output;
+    return GE::listScriptParameters(m_libraryHandle, m_listScriptParameters, scriptName);
 }
 
 std::shared_ptr<Script> ScriptLibraryManager::makeScriptInstance(const std::string& scriptName) const
 {
-    struct ScriptInstanceDeleter
-    {
-        std::shared_ptr<LibraryHandle> libraryHandle;
+    return GE::makeScriptInstance(m_libraryHandle, m_makeScriptInstance, scriptName);
+}
 
-        void operator()(Script* ptr) const
-        {
-            delete ptr;
-        }
+ScriptLibraryFunctions ScriptLibraryManager::functions() const
+{
+    return ScriptLibraryFunctions{
+        .listScriptNames = ScriptLibraryListScriptNames{
+            .libraryHandle = m_libraryHandle,
+            .fn = m_listScriptNames
+        },
+        .listScriptParameters = ScriptLibraryListScriptParameters{
+            .libraryHandle = m_libraryHandle,
+            .fn = m_listScriptParameters
+        },
+        .makeScriptInstance = ScriptLibraryMakeScriptInstance{
+            .libraryHandle = m_libraryHandle,
+            .fn = m_makeScriptInstance
+        },
     };
+}
 
-    if (m_makeScriptInstance == nullptr)
-        return {};
-
-    Script* script = m_makeScriptInstance(scriptName.c_str());
-    if (script == nullptr)
-        return {};
-
-    return std::shared_ptr<Script>(script, ScriptInstanceDeleter{
-        .libraryHandle = m_libraryHandle
-    });
+ScriptLibraryFunctions ScriptLibraryManager::loadFunctions(const std::filesystem::path& path)
+{
+    ScriptLibraryManager manager;
+    manager.load(path);
+    return manager.functions();
 }
 
 ScriptLibraryManager::~ScriptLibraryManager()
@@ -128,4 +152,19 @@ ScriptLibraryManager::~ScriptLibraryManager()
     unload();
 }
 
+std::vector<std::string> ScriptLibraryListScriptNames::operator()() const
+{
+    return GE::listScriptNames(libraryHandle, fn);
+}
+
+std::vector<ScriptParameterDescriptor> ScriptLibraryListScriptParameters::operator()(const std::string& scriptName) const
+{
+    return GE::listScriptParameters(libraryHandle, fn, scriptName);
+}
+
+std::shared_ptr<Script> ScriptLibraryMakeScriptInstance::operator()(const std::string& scriptName) const
+{
+    return GE::makeScriptInstance(libraryHandle, fn, scriptName);
+}
+
 } // namespace GE

From 8ef5d0aac366651a01571f424b51c48013adb27b Mon Sep 17 00:00:00 2001
From: Thomas <semoir.dense-0h@icloud.com>
Date: Fri, 24 Apr 2026 12:19:11 +0900
Subject: [PATCH 3/7] Expose script library callables individually from manager

---
 editor/Editor.cpp                            | 13 +++-
 editor/Editor.hpp                            |  4 +-
 editor/UI/EntityInspectorPanel.cpp           | 12 +--
 editor/UI/EntityInspectorPanel.hpp           |  6 +-
 include/Game-Engine/Game.hpp                 |  6 +-
 include/Game-Engine/ScriptLibraryManager.hpp | 26 +------
 src/Game.cpp                                 | 17 +++--
 src/ScriptLibraryManager.cpp                 | 79 ++++++--------------
 tests/Script_testCases.cpp                   | 16 ++--
 9 files changed, 73 insertions(+), 106 deletions(-)

diff --git a/editor/Editor.cpp b/editor/Editor.cpp
index 9129413..13fa27d 100644
--- a/editor/Editor.cpp
+++ b/editor/Editor.cpp
@@ -162,18 +162,23 @@ void Editor::reloadScriptLib()
 
     if (m_project.scriptLib().empty())
     {
-        m_scriptLibraryFunctions = {};
+        m_listScriptNames = {};
+        m_listScriptParameters = {};
+        m_makeScriptInstance = {};
         return;
     }
 
-    m_scriptLibraryFunctions = GE::ScriptLibraryManager::loadFunctions(m_project.scriptLib());
+    GE::ScriptLibraryManager manager(m_project.scriptLib());
+    m_listScriptNames = manager.listScriptNamesFunction();
+    m_listScriptParameters = manager.listScriptParametersFunction();
+    m_makeScriptInstance = manager.makeScriptInstanceFunction();
 }
 
 void Editor::startGame()
 {
     assert(m_game.has_value() == false);
     saveEditedScene();
-    m_game.emplace(&assetManager(), m_scriptLibraryFunctions, m_project.makeGameDescriptor());
+    m_game.emplace(&assetManager(), m_makeScriptInstance, m_listScriptParameters, m_project.makeGameDescriptor());
     setPrimaryInputContext(m_game->inputContext());
 }
 
@@ -260,7 +265,7 @@ void Editor::renderImgui()
     SceneGraphPanel(&m_editedScene.second, &m_selectedEntity)
         .render();
 
-    EntityInspectorPanel(m_selectedEntity, &m_scriptLibraryFunctions)
+    EntityInspectorPanel(m_selectedEntity, m_listScriptNames, m_listScriptParameters)
         .render();
 
     ContentBrowserPanel("Scenes", "scene_dnd", sizeof(GE::Scene::Descriptor))
diff --git a/editor/Editor.hpp b/editor/Editor.hpp
index ef5c3a1..2be6f95 100644
--- a/editor/Editor.hpp
+++ b/editor/Editor.hpp
@@ -60,7 +60,9 @@ class Editor : public GE::Application
     void rebuildFrameGraph();
     void renderImgui();
 
-    GE::ScriptLibraryFunctions m_scriptLibraryFunctions;
+    GE::ScriptLibraryListScriptNames m_listScriptNames;
+    GE::ScriptLibraryListScriptParameters m_listScriptParameters;
+    GE::ScriptLibraryMakeScriptInstance m_makeScriptInstance;
 
     std::filesystem::path m_projectFilePath;
     Project m_project;
diff --git a/editor/UI/EntityInspectorPanel.cpp b/editor/UI/EntityInspectorPanel.cpp
index 22e565a..7cc7e04 100644
--- a/editor/UI/EntityInspectorPanel.cpp
+++ b/editor/UI/EntityInspectorPanel.cpp
@@ -92,7 +92,7 @@ template<>
 void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
 {
     GE::ScriptComponent& scriptComponent = m_entity.get<GE::ScriptComponent>();
-    if (m_scriptLibraryFunctions == nullptr || !*m_scriptLibraryFunctions)
+    if (!m_listScriptNames || !m_listScriptParameters)
     {
         ImGui::TextDisabled("No script library loaded");
         return;
@@ -101,14 +101,14 @@ void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
     const char* previewValue = scriptComponent.name.empty() ? "none" : scriptComponent.name.c_str();
     if (ImGui::BeginCombo("Script##ScriptComponent_name", previewValue))
     {
-        for (const std::string& scriptName : m_scriptLibraryFunctions->listScriptNames())
+        for (const std::string& scriptName : m_listScriptNames())
         {
             const bool isSelected = scriptComponent.name == scriptName;
             if (ImGui::Selectable(scriptName.c_str(), isSelected))
             {
                 scriptComponent.name = scriptName;
                 scriptComponent.parameters.clear();
-                for (const GE::ScriptParameterDescriptor& parameter : m_scriptLibraryFunctions->listScriptParameters(scriptName))
+                for (const GE::ScriptParameterDescriptor& parameter : m_listScriptParameters(scriptName))
                 {
                     auto [parameterIt, inserted] = scriptComponent.parameters.try_emplace(parameter.name, parameter.defaultValue);
                     assert(inserted);
@@ -153,10 +153,12 @@ void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
 
 EntityInspectorPanel::EntityInspectorPanel(
     const GE::Entity& entity,
-    const GE::ScriptLibraryFunctions* scriptLibraryFunctions
+    GE::ScriptLibraryListScriptNames listScriptNames,
+    GE::ScriptLibraryListScriptParameters listScriptParameters
 )
     : m_entity(entity)
-    , m_scriptLibraryFunctions(scriptLibraryFunctions)
+    , m_listScriptNames(std::move(listScriptNames))
+    , m_listScriptParameters(std::move(listScriptParameters))
 {
 }
 
diff --git a/editor/UI/EntityInspectorPanel.hpp b/editor/UI/EntityInspectorPanel.hpp
index 34d133c..7b6009c 100644
--- a/editor/UI/EntityInspectorPanel.hpp
+++ b/editor/UI/EntityInspectorPanel.hpp
@@ -27,7 +27,8 @@ class EntityInspectorPanel
 
     EntityInspectorPanel(
         const GE::Entity& entity,
-        const GE::ScriptLibraryFunctions* scriptLibraryFunctions
+        GE::ScriptLibraryListScriptNames listScriptNames,
+        GE::ScriptLibraryListScriptParameters listScriptParameters
     );
 
     EntityInspectorPanel& onEntityDelete(std::function<void()>&& f) { return m_onEntityDelete = std::move(f), *this; }
@@ -42,7 +43,8 @@ class EntityInspectorPanel
     void addComponentPopUp();
 
     GE::Entity m_entity;
-    const GE::ScriptLibraryFunctions* m_scriptLibraryFunctions = nullptr;
+    GE::ScriptLibraryListScriptNames m_listScriptNames;
+    GE::ScriptLibraryListScriptParameters m_listScriptParameters;
 
     std::function<void()> m_onEntityDelete;
 
diff --git a/include/Game-Engine/Game.hpp b/include/Game-Engine/Game.hpp
index 8c99a6d..03e09e5 100644
--- a/include/Game-Engine/Game.hpp
+++ b/include/Game-Engine/Game.hpp
@@ -38,7 +38,8 @@ class GE_API Game
 
     Game(
         AssetManager* assetManager,
-        ScriptLibraryFunctions scriptLibraryFunctions,
+        ScriptLibraryMakeScriptInstance makeScriptInstance,
+        ScriptLibraryListScriptParameters listScriptParameters,
         const Descriptor& descriptor
     );
 
@@ -50,7 +51,8 @@ class GE_API Game
     ~Game();
 
 private:
-    ScriptLibraryFunctions m_scriptLibraryFunctions;
+    ScriptLibraryMakeScriptInstance m_makeScriptInstance;
+    ScriptLibraryListScriptParameters m_listScriptParameters;
     std::map<std::string, Scene> m_scenes;
     Scene* m_activeScene = nullptr;
     InputContext m_inputContext;
diff --git a/include/Game-Engine/ScriptLibraryManager.hpp b/include/Game-Engine/ScriptLibraryManager.hpp
index 691ad7f..cf41529 100644
--- a/include/Game-Engine/ScriptLibraryManager.hpp
+++ b/include/Game-Engine/ScriptLibraryManager.hpp
@@ -47,34 +47,16 @@ struct GE_API ScriptLibraryMakeScriptInstance
     [[nodiscard]] inline explicit operator bool() const { return fn != nullptr; }
 };
 
-struct GE_API ScriptLibraryFunctions
-{
-    ScriptLibraryListScriptNames listScriptNames;
-    ScriptLibraryListScriptParameters listScriptParameters;
-    ScriptLibraryMakeScriptInstance makeScriptInstance;
-
-    [[nodiscard]] inline explicit operator bool() const
-    {
-        return static_cast<bool>(listScriptNames) && static_cast<bool>(listScriptParameters) && static_cast<bool>(makeScriptInstance);
-    }
-};
-
 class GE_API ScriptLibraryManager
 {
 public:
-    ScriptLibraryManager() = default;
+    ScriptLibraryManager(const std::filesystem::path& path);
     ScriptLibraryManager(const ScriptLibraryManager&) = delete;
     ScriptLibraryManager(ScriptLibraryManager&&) = default;
 
-    void load(const std::filesystem::path& path);
-    void unload();
-    [[nodiscard]] bool isLoaded() const;
-
-    [[nodiscard]] std::vector<std::string> listScriptNames() const;
-    [[nodiscard]] std::vector<ScriptParameterDescriptor> listScriptParameters(const std::string& scriptName) const;
-    [[nodiscard]] std::shared_ptr<Script> makeScriptInstance(const std::string& scriptName) const;
-    [[nodiscard]] ScriptLibraryFunctions functions() const;
-    [[nodiscard]] static ScriptLibraryFunctions loadFunctions(const std::filesystem::path& path);
+    [[nodiscard]] ScriptLibraryListScriptNames listScriptNamesFunction() const;
+    [[nodiscard]] ScriptLibraryListScriptParameters listScriptParametersFunction() const;
+    [[nodiscard]] ScriptLibraryMakeScriptInstance makeScriptInstanceFunction() const;
 
     ~ScriptLibraryManager();
 
diff --git a/src/Game.cpp b/src/Game.cpp
index 908e219..40126f3 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -27,7 +27,8 @@ namespace
 void setupScene(
     Game& game,
     Scene& scene,
-    const ScriptLibraryFunctions& scriptLibraryFunctions
+    const ScriptLibraryMakeScriptInstance& makeScriptInstance,
+    const ScriptLibraryListScriptParameters& listScriptParameters
 )
 {
     scene.load();
@@ -35,12 +36,12 @@ void setupScene(
                              | ECSView<ScriptComponent>()
                              | std::views::transform([&](auto id) { return Entity{ &scene.ecsWorld(), id }; }))
     {
-        if (!scriptLibraryFunctions)
+        if (!makeScriptInstance || !listScriptParameters)
             throw std::runtime_error(std::format("unable to create script '{}' without a loaded script library", entity.get<ScriptComponent>().name));
         ScriptComponent& scriptComponent = entity.get<ScriptComponent>();
-        scriptComponent.instance = scriptLibraryFunctions.makeScriptInstance(scriptComponent.name);
+        scriptComponent.instance = makeScriptInstance(scriptComponent.name);
         assert(scriptComponent.instance);
-        for (const ScriptParameterDescriptor& parameter : scriptLibraryFunctions.listScriptParameters(scriptComponent.name))
+        for (const ScriptParameterDescriptor& parameter : listScriptParameters(scriptComponent.name))
         {
             auto it = scriptComponent.parameters.find(parameter.name);
             parameter.set(*scriptComponent.instance, it == scriptComponent.parameters.end() ? parameter.defaultValue : it->second);
@@ -67,10 +68,12 @@ void tearDownScene(Game& game, Scene& scene)
 
 Game::Game(
     AssetManager* assetManager,
-    ScriptLibraryFunctions scriptLibraryFunctions,
+    ScriptLibraryMakeScriptInstance makeScriptInstance,
+    ScriptLibraryListScriptParameters listScriptParameters,
     const Descriptor& descriptor
 )
-    : m_scriptLibraryFunctions(std::move(scriptLibraryFunctions))
+    : m_makeScriptInstance(std::move(makeScriptInstance))
+    , m_listScriptParameters(std::move(listScriptParameters))
     , m_scenes(std::from_range, descriptor.scenes | std::views::transform([&](const auto& sceneDesc){ return std::make_pair(sceneDesc.first, Scene(assetManager, sceneDesc.second)); }))
     , m_inputContext(descriptor.inputContext)
 {
@@ -82,7 +85,7 @@ void Game::setActiveScene(const std::string& name)
     if (m_activeScene)
         tearDownScene(*this, *m_activeScene);
     m_activeScene = &m_scenes.at(name);
-    setupScene(*this, *m_activeScene, m_scriptLibraryFunctions);
+    setupScene(*this, *m_activeScene, m_makeScriptInstance, m_listScriptParameters);
 }
 
 Game::~Game()
diff --git a/src/ScriptLibraryManager.cpp b/src/ScriptLibraryManager.cpp
index 4cc86f3..0576914 100644
--- a/src/ScriptLibraryManager.cpp
+++ b/src/ScriptLibraryManager.cpp
@@ -20,9 +20,8 @@ namespace GE
 namespace
 {
 
-std::vector<std::string> listScriptNames(std::shared_ptr<void> libraryHandle, ListScriptNamesFn fn)
+std::vector<std::string> listScriptNames(ListScriptNamesFn fn)
 {
-    (void)libraryHandle;
     if (fn == nullptr)
         return {};
 
@@ -38,9 +37,8 @@ std::vector<std::string> listScriptNames(std::shared_ptr<void> libraryHandle, Li
     return output;
 }
 
-std::vector<ScriptParameterDescriptor> listScriptParameters(std::shared_ptr<void> libraryHandle, ListScriptParametersFn fn, const std::string& scriptName)
+std::vector<ScriptParameterDescriptor> listScriptParameters(ListScriptParametersFn fn, const std::string& scriptName)
 {
-    (void)libraryHandle;
     if (fn == nullptr)
         return {};
 
@@ -71,10 +69,8 @@ std::shared_ptr<Script> makeScriptInstance(std::shared_ptr<void> libraryHandle,
 
 } // namespace
 
-void ScriptLibraryManager::load(const std::filesystem::path& path)
+ScriptLibraryManager::ScriptLibraryManager(const std::filesystem::path& path)
 {
-    unload();
-
     DlHandle handle = dlLoad(path.string().c_str());
     if (handle == nullptr)
         throw std::runtime_error(std::format("unable to load shared lib : {}", path.string()));
@@ -88,78 +84,49 @@ void ScriptLibraryManager::load(const std::filesystem::path& path)
     m_makeScriptInstance = reinterpret_cast<MakeScriptInstanceFn>(getSym(handle, "makeScriptInstance"));
 
     if (m_listScriptNames == nullptr || m_listScriptParameters == nullptr || m_makeScriptInstance == nullptr)
-    {
-        unload();
         throw std::runtime_error(std::format("unable to get symbols in lib : {}", path.string()));
-    }
-}
-
-void ScriptLibraryManager::unload()
-{
-    m_listScriptNames = nullptr;
-    m_listScriptParameters = nullptr;
-    m_makeScriptInstance = nullptr;
-    m_libraryHandle.reset();
-}
-
-bool ScriptLibraryManager::isLoaded() const
-{
-    return m_libraryHandle != nullptr;
 }
 
-std::vector<std::string> ScriptLibraryManager::listScriptNames() const
+ScriptLibraryListScriptNames ScriptLibraryManager::listScriptNamesFunction() const
 {
-    return GE::listScriptNames(m_libraryHandle, m_listScriptNames);
-}
-
-std::vector<ScriptParameterDescriptor> ScriptLibraryManager::listScriptParameters(const std::string& scriptName) const
-{
-    return GE::listScriptParameters(m_libraryHandle, m_listScriptParameters, scriptName);
-}
-
-std::shared_ptr<Script> ScriptLibraryManager::makeScriptInstance(const std::string& scriptName) const
-{
-    return GE::makeScriptInstance(m_libraryHandle, m_makeScriptInstance, scriptName);
+    return ScriptLibraryListScriptNames{
+        .libraryHandle = m_libraryHandle,
+        .fn = m_listScriptNames
+    };
 }
 
-ScriptLibraryFunctions ScriptLibraryManager::functions() const
+ScriptLibraryListScriptParameters ScriptLibraryManager::listScriptParametersFunction() const
 {
-    return ScriptLibraryFunctions{
-        .listScriptNames = ScriptLibraryListScriptNames{
-            .libraryHandle = m_libraryHandle,
-            .fn = m_listScriptNames
-        },
-        .listScriptParameters = ScriptLibraryListScriptParameters{
-            .libraryHandle = m_libraryHandle,
-            .fn = m_listScriptParameters
-        },
-        .makeScriptInstance = ScriptLibraryMakeScriptInstance{
-            .libraryHandle = m_libraryHandle,
-            .fn = m_makeScriptInstance
-        },
+    return ScriptLibraryListScriptParameters{
+        .libraryHandle = m_libraryHandle,
+        .fn = m_listScriptParameters
     };
 }
 
-ScriptLibraryFunctions ScriptLibraryManager::loadFunctions(const std::filesystem::path& path)
+ScriptLibraryMakeScriptInstance ScriptLibraryManager::makeScriptInstanceFunction() const
 {
-    ScriptLibraryManager manager;
-    manager.load(path);
-    return manager.functions();
+    return ScriptLibraryMakeScriptInstance{
+        .libraryHandle = m_libraryHandle,
+        .fn = m_makeScriptInstance
+    };
 }
 
 ScriptLibraryManager::~ScriptLibraryManager()
 {
-    unload();
+    m_listScriptNames = nullptr;
+    m_listScriptParameters = nullptr;
+    m_makeScriptInstance = nullptr;
+    m_libraryHandle.reset();
 }
 
 std::vector<std::string> ScriptLibraryListScriptNames::operator()() const
 {
-    return GE::listScriptNames(libraryHandle, fn);
+    return GE::listScriptNames(fn);
 }
 
 std::vector<ScriptParameterDescriptor> ScriptLibraryListScriptParameters::operator()(const std::string& scriptName) const
 {
-    return GE::listScriptParameters(libraryHandle, fn, scriptName);
+    return GE::listScriptParameters(fn, scriptName);
 }
 
 std::shared_ptr<Script> ScriptLibraryMakeScriptInstance::operator()(const std::string& scriptName) const
diff --git a/tests/Script_testCases.cpp b/tests/Script_testCases.cpp
index 53db87e..656090d 100644
--- a/tests/Script_testCases.cpp
+++ b/tests/Script_testCases.cpp
@@ -101,20 +101,22 @@ TEST(ScriptLibraryTest, loadsGeneratedScriptLibraryExports)
 
 TEST(ScriptLibraryManagerTest, keepsLibraryAliveForScriptInstanceLifetime)
 {
-    GE::ScriptLibraryManager manager;
-    manager.load(GE_TEST_SCRIPT_LIB);
+    GE::ScriptLibraryListScriptParameters listScriptParameters;
+    GE::ScriptLibraryMakeScriptInstance makeScriptInstance;
+    {
+        GE::ScriptLibraryManager manager(GE_TEST_SCRIPT_LIB);
+        listScriptParameters = manager.listScriptParametersFunction();
+        makeScriptInstance = manager.makeScriptInstanceFunction();
+    }
 
-    std::vector<GE::ScriptParameterDescriptor> parameters = manager.listScriptParameters("TestScript");
+    std::vector<GE::ScriptParameterDescriptor> parameters = listScriptParameters("TestScript");
     ASSERT_EQ(parameters.size(), 3u);
     const GE::ScriptParameterDescriptor* speed = findParameter(parameters.data(), parameters.size(), "speed");
     ASSERT_NE(speed, nullptr);
 
-    std::shared_ptr<GE::Script> script = manager.makeScriptInstance("TestScript");
+    std::shared_ptr<GE::Script> script = makeScriptInstance("TestScript");
     ASSERT_NE(script, nullptr);
 
-    manager.unload();
-    EXPECT_FALSE(manager.isLoaded());
-
     speed->set(*script, 11.0f);
     EXPECT_EQ(std::get<float>(speed->get(*script)), 11.0f);
 

From 8be867eeea156542a6171f81686d7b54ced85981 Mon Sep 17 00:00:00 2001
From: Thomas <semoir.dense-0h@icloud.com>
Date: Sat, 25 Apr 2026 13:52:17 +0900
Subject: [PATCH 4/7] Use std::function script library callables

---
 include/Game-Engine/ScriptLibraryManager.hpp | 30 +++---------------
 src/ScriptLibraryManager.cpp                 | 32 +++++---------------
 2 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/include/Game-Engine/ScriptLibraryManager.hpp b/include/Game-Engine/ScriptLibraryManager.hpp
index cf41529..984bdb5 100644
--- a/include/Game-Engine/ScriptLibraryManager.hpp
+++ b/include/Game-Engine/ScriptLibraryManager.hpp
@@ -13,6 +13,7 @@
 #include "Game-Engine/Script.hpp"
 
 #include <filesystem>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -20,32 +21,9 @@
 namespace GE
 {
 
-struct GE_API ScriptLibraryListScriptNames
-{
-    std::shared_ptr<void> libraryHandle;
-    ListScriptNamesFn fn = nullptr;
-
-    [[nodiscard]] std::vector<std::string> operator()() const;
-    [[nodiscard]] inline explicit operator bool() const { return fn != nullptr; }
-};
-
-struct GE_API ScriptLibraryListScriptParameters
-{
-    std::shared_ptr<void> libraryHandle;
-    ListScriptParametersFn fn = nullptr;
-
-    [[nodiscard]] std::vector<ScriptParameterDescriptor> operator()(const std::string& scriptName) const;
-    [[nodiscard]] inline explicit operator bool() const { return fn != nullptr; }
-};
-
-struct GE_API ScriptLibraryMakeScriptInstance
-{
-    std::shared_ptr<void> libraryHandle;
-    MakeScriptInstanceFn fn = nullptr;
-
-    [[nodiscard]] std::shared_ptr<Script> operator()(const std::string& scriptName) const;
-    [[nodiscard]] inline explicit operator bool() const { return fn != nullptr; }
-};
+using ScriptLibraryListScriptNames = std::function<std::vector<std::string>()>;
+using ScriptLibraryListScriptParameters = std::function<std::vector<ScriptParameterDescriptor>(const std::string&)>;
+using ScriptLibraryMakeScriptInstance = std::function<std::shared_ptr<Script>(const std::string&)>;
 
 class GE_API ScriptLibraryManager
 {
diff --git a/src/ScriptLibraryManager.cpp b/src/ScriptLibraryManager.cpp
index 0576914..7161c58 100644
--- a/src/ScriptLibraryManager.cpp
+++ b/src/ScriptLibraryManager.cpp
@@ -89,25 +89,24 @@ ScriptLibraryManager::ScriptLibraryManager(const std::filesystem::path& path)
 
 ScriptLibraryListScriptNames ScriptLibraryManager::listScriptNamesFunction() const
 {
-    return ScriptLibraryListScriptNames{
-        .libraryHandle = m_libraryHandle,
-        .fn = m_listScriptNames
+    return [libraryHandle = m_libraryHandle, listScriptNamesFn = m_listScriptNames]() -> std::vector<std::string> {
+        (void)libraryHandle;
+        return GE::listScriptNames(listScriptNamesFn);
     };
 }
 
 ScriptLibraryListScriptParameters ScriptLibraryManager::listScriptParametersFunction() const
 {
-    return ScriptLibraryListScriptParameters{
-        .libraryHandle = m_libraryHandle,
-        .fn = m_listScriptParameters
+    return [libraryHandle = m_libraryHandle, listScriptParametersFn = m_listScriptParameters](const std::string& scriptName) -> std::vector<ScriptParameterDescriptor> {
+        (void)libraryHandle;
+        return GE::listScriptParameters(listScriptParametersFn, scriptName);
     };
 }
 
 ScriptLibraryMakeScriptInstance ScriptLibraryManager::makeScriptInstanceFunction() const
 {
-    return ScriptLibraryMakeScriptInstance{
-        .libraryHandle = m_libraryHandle,
-        .fn = m_makeScriptInstance
+    return [libraryHandle = m_libraryHandle, makeScriptInstanceFn = m_makeScriptInstance](const std::string& scriptName) -> std::shared_ptr<Script> {
+        return GE::makeScriptInstance(libraryHandle, makeScriptInstanceFn, scriptName);
     };
 }
 
@@ -119,19 +118,4 @@ ScriptLibraryManager::~ScriptLibraryManager()
     m_libraryHandle.reset();
 }
 
-std::vector<std::string> ScriptLibraryListScriptNames::operator()() const
-{
-    return GE::listScriptNames(fn);
-}
-
-std::vector<ScriptParameterDescriptor> ScriptLibraryListScriptParameters::operator()(const std::string& scriptName) const
-{
-    return GE::listScriptParameters(fn, scriptName);
-}
-
-std::shared_ptr<Script> ScriptLibraryMakeScriptInstance::operator()(const std::string& scriptName) const
-{
-    return GE::makeScriptInstance(libraryHandle, fn, scriptName);
-}
-
 } // namespace GE

From c78e80d7202694847968c19fa4ab9e10c8f58005 Mon Sep 17 00:00:00 2001
From: Thomas <semoir.dense-0h@icloud.com>
Date: Sat, 25 Apr 2026 23:56:10 +0900
Subject: [PATCH 5/7] Nest script library function typedefs inside manager

---
 editor/Editor.hpp                            |  6 +++---
 editor/UI/EntityInspectorPanel.cpp           |  4 ++--
 editor/UI/EntityInspectorPanel.hpp           |  8 ++++----
 include/Game-Engine/Game.hpp                 |  8 ++++----
 include/Game-Engine/ScriptLibraryManager.hpp | 14 +++++++-------
 src/Game.cpp                                 |  8 ++++----
 src/ScriptLibraryManager.cpp                 |  6 +++---
 tests/Script_testCases.cpp                   |  4 ++--
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/editor/Editor.hpp b/editor/Editor.hpp
index 2be6f95..f4a865f 100644
--- a/editor/Editor.hpp
+++ b/editor/Editor.hpp
@@ -60,9 +60,9 @@ class Editor : public GE::Application
     void rebuildFrameGraph();
     void renderImgui();
 
-    GE::ScriptLibraryListScriptNames m_listScriptNames;
-    GE::ScriptLibraryListScriptParameters m_listScriptParameters;
-    GE::ScriptLibraryMakeScriptInstance m_makeScriptInstance;
+    GE::ScriptLibraryManager::ListScriptNames m_listScriptNames;
+    GE::ScriptLibraryManager::ListScriptParameters m_listScriptParameters;
+    GE::ScriptLibraryManager::MakeScriptInstance m_makeScriptInstance;
 
     std::filesystem::path m_projectFilePath;
     Project m_project;
diff --git a/editor/UI/EntityInspectorPanel.cpp b/editor/UI/EntityInspectorPanel.cpp
index 7cc7e04..6a4aeaf 100644
--- a/editor/UI/EntityInspectorPanel.cpp
+++ b/editor/UI/EntityInspectorPanel.cpp
@@ -153,8 +153,8 @@ void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
 
 EntityInspectorPanel::EntityInspectorPanel(
     const GE::Entity& entity,
-    GE::ScriptLibraryListScriptNames listScriptNames,
-    GE::ScriptLibraryListScriptParameters listScriptParameters
+    GE::ScriptLibraryManager::ListScriptNames listScriptNames,
+    GE::ScriptLibraryManager::ListScriptParameters listScriptParameters
 )
     : m_entity(entity)
     , m_listScriptNames(std::move(listScriptNames))
diff --git a/editor/UI/EntityInspectorPanel.hpp b/editor/UI/EntityInspectorPanel.hpp
index 7b6009c..ba33153 100644
--- a/editor/UI/EntityInspectorPanel.hpp
+++ b/editor/UI/EntityInspectorPanel.hpp
@@ -27,8 +27,8 @@ class EntityInspectorPanel
 
     EntityInspectorPanel(
         const GE::Entity& entity,
-        GE::ScriptLibraryListScriptNames listScriptNames,
-        GE::ScriptLibraryListScriptParameters listScriptParameters
+        GE::ScriptLibraryManager::ListScriptNames listScriptNames,
+        GE::ScriptLibraryManager::ListScriptParameters listScriptParameters
     );
 
     EntityInspectorPanel& onEntityDelete(std::function<void()>&& f) { return m_onEntityDelete = std::move(f), *this; }
@@ -43,8 +43,8 @@ class EntityInspectorPanel
     void addComponentPopUp();
 
     GE::Entity m_entity;
-    GE::ScriptLibraryListScriptNames m_listScriptNames;
-    GE::ScriptLibraryListScriptParameters m_listScriptParameters;
+    GE::ScriptLibraryManager::ListScriptNames m_listScriptNames;
+    GE::ScriptLibraryManager::ListScriptParameters m_listScriptParameters;
 
     std::function<void()> m_onEntityDelete;
 
diff --git a/include/Game-Engine/Game.hpp b/include/Game-Engine/Game.hpp
index 03e09e5..b2900cc 100644
--- a/include/Game-Engine/Game.hpp
+++ b/include/Game-Engine/Game.hpp
@@ -38,8 +38,8 @@ class GE_API Game
 
     Game(
         AssetManager* assetManager,
-        ScriptLibraryMakeScriptInstance makeScriptInstance,
-        ScriptLibraryListScriptParameters listScriptParameters,
+        ScriptLibraryManager::MakeScriptInstance makeScriptInstance,
+        ScriptLibraryManager::ListScriptParameters listScriptParameters,
         const Descriptor& descriptor
     );
 
@@ -51,8 +51,8 @@ class GE_API Game
     ~Game();
 
 private:
-    ScriptLibraryMakeScriptInstance m_makeScriptInstance;
-    ScriptLibraryListScriptParameters m_listScriptParameters;
+    ScriptLibraryManager::MakeScriptInstance m_makeScriptInstance;
+    ScriptLibraryManager::ListScriptParameters m_listScriptParameters;
     std::map<std::string, Scene> m_scenes;
     Scene* m_activeScene = nullptr;
     InputContext m_inputContext;
diff --git a/include/Game-Engine/ScriptLibraryManager.hpp b/include/Game-Engine/ScriptLibraryManager.hpp
index 984bdb5..0d9d6e9 100644
--- a/include/Game-Engine/ScriptLibraryManager.hpp
+++ b/include/Game-Engine/ScriptLibraryManager.hpp
@@ -21,20 +21,20 @@
 namespace GE
 {
 
-using ScriptLibraryListScriptNames = std::function<std::vector<std::string>()>;
-using ScriptLibraryListScriptParameters = std::function<std::vector<ScriptParameterDescriptor>(const std::string&)>;
-using ScriptLibraryMakeScriptInstance = std::function<std::shared_ptr<Script>(const std::string&)>;
-
 class GE_API ScriptLibraryManager
 {
 public:
+    using ListScriptNames = std::function<std::vector<std::string>()>;
+    using ListScriptParameters = std::function<std::vector<ScriptParameterDescriptor>(const std::string&)>;
+    using MakeScriptInstance = std::function<std::shared_ptr<Script>(const std::string&)>;
+
     ScriptLibraryManager(const std::filesystem::path& path);
     ScriptLibraryManager(const ScriptLibraryManager&) = delete;
     ScriptLibraryManager(ScriptLibraryManager&&) = default;
 
-    [[nodiscard]] ScriptLibraryListScriptNames listScriptNamesFunction() const;
-    [[nodiscard]] ScriptLibraryListScriptParameters listScriptParametersFunction() const;
-    [[nodiscard]] ScriptLibraryMakeScriptInstance makeScriptInstanceFunction() const;
+    [[nodiscard]] ListScriptNames listScriptNamesFunction() const;
+    [[nodiscard]] ListScriptParameters listScriptParametersFunction() const;
+    [[nodiscard]] MakeScriptInstance makeScriptInstanceFunction() const;
 
     ~ScriptLibraryManager();
 
diff --git a/src/Game.cpp b/src/Game.cpp
index 40126f3..27b90a8 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -27,8 +27,8 @@ namespace
 void setupScene(
     Game& game,
     Scene& scene,
-    const ScriptLibraryMakeScriptInstance& makeScriptInstance,
-    const ScriptLibraryListScriptParameters& listScriptParameters
+    const ScriptLibraryManager::MakeScriptInstance& makeScriptInstance,
+    const ScriptLibraryManager::ListScriptParameters& listScriptParameters
 )
 {
     scene.load();
@@ -68,8 +68,8 @@ void tearDownScene(Game& game, Scene& scene)
 
 Game::Game(
     AssetManager* assetManager,
-    ScriptLibraryMakeScriptInstance makeScriptInstance,
-    ScriptLibraryListScriptParameters listScriptParameters,
+    ScriptLibraryManager::MakeScriptInstance makeScriptInstance,
+    ScriptLibraryManager::ListScriptParameters listScriptParameters,
     const Descriptor& descriptor
 )
     : m_makeScriptInstance(std::move(makeScriptInstance))
diff --git a/src/ScriptLibraryManager.cpp b/src/ScriptLibraryManager.cpp
index 7161c58..a270af8 100644
--- a/src/ScriptLibraryManager.cpp
+++ b/src/ScriptLibraryManager.cpp
@@ -87,7 +87,7 @@ ScriptLibraryManager::ScriptLibraryManager(const std::filesystem::path& path)
         throw std::runtime_error(std::format("unable to get symbols in lib : {}", path.string()));
 }
 
-ScriptLibraryListScriptNames ScriptLibraryManager::listScriptNamesFunction() const
+ScriptLibraryManager::ListScriptNames ScriptLibraryManager::listScriptNamesFunction() const
 {
     return [libraryHandle = m_libraryHandle, listScriptNamesFn = m_listScriptNames]() -> std::vector<std::string> {
         (void)libraryHandle;
@@ -95,7 +95,7 @@ ScriptLibraryListScriptNames ScriptLibraryManager::listScriptNamesFunction() con
     };
 }
 
-ScriptLibraryListScriptParameters ScriptLibraryManager::listScriptParametersFunction() const
+ScriptLibraryManager::ListScriptParameters ScriptLibraryManager::listScriptParametersFunction() const
 {
     return [libraryHandle = m_libraryHandle, listScriptParametersFn = m_listScriptParameters](const std::string& scriptName) -> std::vector<ScriptParameterDescriptor> {
         (void)libraryHandle;
@@ -103,7 +103,7 @@ ScriptLibraryListScriptParameters ScriptLibraryManager::listScriptParametersFunc
     };
 }
 
-ScriptLibraryMakeScriptInstance ScriptLibraryManager::makeScriptInstanceFunction() const
+ScriptLibraryManager::MakeScriptInstance ScriptLibraryManager::makeScriptInstanceFunction() const
 {
     return [libraryHandle = m_libraryHandle, makeScriptInstanceFn = m_makeScriptInstance](const std::string& scriptName) -> std::shared_ptr<Script> {
         return GE::makeScriptInstance(libraryHandle, makeScriptInstanceFn, scriptName);
diff --git a/tests/Script_testCases.cpp b/tests/Script_testCases.cpp
index 656090d..fe0930c 100644
--- a/tests/Script_testCases.cpp
+++ b/tests/Script_testCases.cpp
@@ -101,8 +101,8 @@ TEST(ScriptLibraryTest, loadsGeneratedScriptLibraryExports)
 
 TEST(ScriptLibraryManagerTest, keepsLibraryAliveForScriptInstanceLifetime)
 {
-    GE::ScriptLibraryListScriptParameters listScriptParameters;
-    GE::ScriptLibraryMakeScriptInstance makeScriptInstance;
+    GE::ScriptLibraryManager::ListScriptParameters listScriptParameters;
+    GE::ScriptLibraryManager::MakeScriptInstance makeScriptInstance;
     {
         GE::ScriptLibraryManager manager(GE_TEST_SCRIPT_LIB);
         listScriptParameters = manager.listScriptParametersFunction();

From d834008f5b978365eb2b073d356460980900c4be Mon Sep 17 00:00:00 2001
From: Thomas <semoir.dense-0h@icloud.com>
Date: Sun, 26 Apr 2026 11:22:44 +0900
Subject: [PATCH 6/7] Inline script library callback logic in lambdas

---
 src/ScriptLibraryManager.cpp | 92 ++++++++++++++----------------------
 1 file changed, 35 insertions(+), 57 deletions(-)

diff --git a/src/ScriptLibraryManager.cpp b/src/ScriptLibraryManager.cpp
index a270af8..5fda3b0 100644
--- a/src/ScriptLibraryManager.cpp
+++ b/src/ScriptLibraryManager.cpp
@@ -12,63 +12,9 @@
 
 #include <format>
 #include <stdexcept>
-#include <utility>
-
 namespace GE
 {
 
-namespace
-{
-
-std::vector<std::string> listScriptNames(ListScriptNamesFn fn)
-{
-    if (fn == nullptr)
-        return {};
-
-    const char** names = nullptr;
-    unsigned long count = 0;
-    fn(&names, &count);
-
-    std::vector<std::string> output;
-    output.reserve(count);
-    for (unsigned long i = 0; i < count; i++)
-        if (names[i] != nullptr)
-            output.emplace_back(names[i]);
-    return output;
-}
-
-std::vector<ScriptParameterDescriptor> listScriptParameters(ListScriptParametersFn fn, const std::string& scriptName)
-{
-    if (fn == nullptr)
-        return {};
-
-    const ScriptParameterDescriptor* parameters = nullptr;
-    unsigned long count = 0;
-    fn(scriptName.c_str(), &parameters, &count);
-
-    std::vector<ScriptParameterDescriptor> output;
-    output.reserve(count);
-    for (unsigned long i = 0; i < count; i++)
-        output.emplace_back(parameters[i]);
-    return output;
-}
-
-std::shared_ptr<Script> makeScriptInstance(std::shared_ptr<void> libraryHandle, MakeScriptInstanceFn fn, const std::string& scriptName)
-{
-    if (fn == nullptr)
-        return {};
-
-    Script* script = fn(scriptName.c_str());
-    if (script == nullptr)
-        return {};
-
-    return std::shared_ptr<Script>(script, [libraryHandle = std::move(libraryHandle)](Script* ptr) {
-        delete ptr;
-    });
-}
-
-} // namespace
-
 ScriptLibraryManager::ScriptLibraryManager(const std::filesystem::path& path)
 {
     DlHandle handle = dlLoad(path.string().c_str());
@@ -91,7 +37,19 @@ ScriptLibraryManager::ListScriptNames ScriptLibraryManager::listScriptNamesFunct
 {
     return [libraryHandle = m_libraryHandle, listScriptNamesFn = m_listScriptNames]() -> std::vector<std::string> {
         (void)libraryHandle;
-        return GE::listScriptNames(listScriptNamesFn);
+        if (listScriptNamesFn == nullptr)
+            return {};
+
+        const char** names = nullptr;
+        unsigned long count = 0;
+        listScriptNamesFn(&names, &count);
+
+        std::vector<std::string> output;
+        output.reserve(count);
+        for (unsigned long i = 0; i < count; i++)
+            if (names[i] != nullptr)
+                output.emplace_back(names[i]);
+        return output;
     };
 }
 
@@ -99,14 +57,34 @@ ScriptLibraryManager::ListScriptParameters ScriptLibraryManager::listScriptParam
 {
     return [libraryHandle = m_libraryHandle, listScriptParametersFn = m_listScriptParameters](const std::string& scriptName) -> std::vector<ScriptParameterDescriptor> {
         (void)libraryHandle;
-        return GE::listScriptParameters(listScriptParametersFn, scriptName);
+        if (listScriptParametersFn == nullptr)
+            return {};
+
+        const ScriptParameterDescriptor* parameters = nullptr;
+        unsigned long count = 0;
+        listScriptParametersFn(scriptName.c_str(), &parameters, &count);
+
+        std::vector<ScriptParameterDescriptor> output;
+        output.reserve(count);
+        for (unsigned long i = 0; i < count; i++)
+            output.emplace_back(parameters[i]);
+        return output;
     };
 }
 
 ScriptLibraryManager::MakeScriptInstance ScriptLibraryManager::makeScriptInstanceFunction() const
 {
     return [libraryHandle = m_libraryHandle, makeScriptInstanceFn = m_makeScriptInstance](const std::string& scriptName) -> std::shared_ptr<Script> {
-        return GE::makeScriptInstance(libraryHandle, makeScriptInstanceFn, scriptName);
+        if (makeScriptInstanceFn == nullptr)
+            return {};
+
+        Script* script = makeScriptInstanceFn(scriptName.c_str());
+        if (script == nullptr)
+            return {};
+
+        return std::shared_ptr<Script>(script, [libraryHandle](Script* ptr) {
+            delete ptr;
+        });
     };
 }
 

From b133be235b49a4d793669ecd45651d72fe5e8b94 Mon Sep 17 00:00:00 2001
From: Thomas Choquet <semoir.dense-0h@icloud.com>
Date: Sun, 26 Apr 2026 12:38:00 +0900
Subject: [PATCH 7/7] Move script function typedefs to GE namespace

Introduce GE::ListScriptNamesFn, GE::ListScriptParametersFn and
GE::MakeScriptInstanceFn and replace uses of
ScriptLibraryManager::ListScript* / MakeScriptInstance across the
codebase.
ScriptLibraryManager now keeps raw C symbol pointer types (with Sym
suffix)
and exposes std::function wrappers. Update call sites and tests to the
new
API and remove now-unused includes and typedefs.
---
 editor/Editor.hpp                            |  9 ++-
 editor/UI/EntityInspectorPanel.cpp           |  4 +-
 editor/UI/EntityInspectorPanel.hpp           |  8 +--
 include/Game-Engine/Game.hpp                 |  8 +--
 include/Game-Engine/Script.hpp               |  4 --
 include/Game-Engine/ScriptLibraryManager.hpp | 25 +++++---
 src/Game.cpp                                 |  8 +--
 src/ScriptLibraryManager.cpp                 | 12 ++--
 tests/Script_testCases.cpp                   | 67 +++++++++-----------
 9 files changed, 71 insertions(+), 74 deletions(-)

diff --git a/editor/Editor.hpp b/editor/Editor.hpp
index f4a865f..20e3926 100644
--- a/editor/Editor.hpp
+++ b/editor/Editor.hpp
@@ -26,7 +26,6 @@
 #include <cstdint>
 #include <filesystem>
 #include <optional>
-#include <string>
 #include <utility>
 
 namespace GE_Editor
@@ -60,10 +59,6 @@ class Editor : public GE::Application
     void rebuildFrameGraph();
     void renderImgui();
 
-    GE::ScriptLibraryManager::ListScriptNames m_listScriptNames;
-    GE::ScriptLibraryManager::ListScriptParameters m_listScriptParameters;
-    GE::ScriptLibraryManager::MakeScriptInstance m_makeScriptInstance;
-
     std::filesystem::path m_projectFilePath;
     Project m_project;
 
@@ -80,6 +75,10 @@ class Editor : public GE::Application
     std::pair<uint32_t, uint32_t> m_viewportSize = {0, 0};
     GE::FrameGraph m_frameGraph; // TODO move into render (something like render->setGraph())
 
+    GE::ListScriptNamesFn m_listScriptNames;
+    GE::ListScriptParametersFn m_listScriptParameters;
+    GE::MakeScriptInstanceFn m_makeScriptInstance;
+
 public:
     Editor& operator=(const Editor&) = delete;
     Editor& operator=(Editor&&) = delete;
diff --git a/editor/UI/EntityInspectorPanel.cpp b/editor/UI/EntityInspectorPanel.cpp
index 6a4aeaf..36b0323 100644
--- a/editor/UI/EntityInspectorPanel.cpp
+++ b/editor/UI/EntityInspectorPanel.cpp
@@ -153,8 +153,8 @@ void EntityInspectorPanel::componentEditWidget<GE::ScriptComponent>()
 
 EntityInspectorPanel::EntityInspectorPanel(
     const GE::Entity& entity,
-    GE::ScriptLibraryManager::ListScriptNames listScriptNames,
-    GE::ScriptLibraryManager::ListScriptParameters listScriptParameters
+    GE::ListScriptNamesFn listScriptNames,
+    GE::ListScriptParametersFn listScriptParameters
 )
     : m_entity(entity)
     , m_listScriptNames(std::move(listScriptNames))
diff --git a/editor/UI/EntityInspectorPanel.hpp b/editor/UI/EntityInspectorPanel.hpp
index ba33153..f32a951 100644
--- a/editor/UI/EntityInspectorPanel.hpp
+++ b/editor/UI/EntityInspectorPanel.hpp
@@ -27,8 +27,8 @@ class EntityInspectorPanel
 
     EntityInspectorPanel(
         const GE::Entity& entity,
-        GE::ScriptLibraryManager::ListScriptNames listScriptNames,
-        GE::ScriptLibraryManager::ListScriptParameters listScriptParameters
+        GE::ListScriptNamesFn listScriptNames,
+        GE::ListScriptParametersFn listScriptParameters
     );
 
     EntityInspectorPanel& onEntityDelete(std::function<void()>&& f) { return m_onEntityDelete = std::move(f), *this; }
@@ -43,8 +43,8 @@ class EntityInspectorPanel
     void addComponentPopUp();
 
     GE::Entity m_entity;
-    GE::ScriptLibraryManager::ListScriptNames m_listScriptNames;
-    GE::ScriptLibraryManager::ListScriptParameters m_listScriptParameters;
+    GE::ListScriptNamesFn m_listScriptNames;
+    GE::ListScriptParametersFn m_listScriptParameters;
 
     std::function<void()> m_onEntityDelete;
 
diff --git a/include/Game-Engine/Game.hpp b/include/Game-Engine/Game.hpp
index b2900cc..118399b 100644
--- a/include/Game-Engine/Game.hpp
+++ b/include/Game-Engine/Game.hpp
@@ -38,8 +38,8 @@ class GE_API Game
 
     Game(
         AssetManager* assetManager,
-        ScriptLibraryManager::MakeScriptInstance makeScriptInstance,
-        ScriptLibraryManager::ListScriptParameters listScriptParameters,
+        MakeScriptInstanceFn makeScriptInstance,
+        ListScriptParametersFn listScriptParameters,
         const Descriptor& descriptor
     );
 
@@ -51,8 +51,8 @@ class GE_API Game
     ~Game();
 
 private:
-    ScriptLibraryManager::MakeScriptInstance m_makeScriptInstance;
-    ScriptLibraryManager::ListScriptParameters m_listScriptParameters;
+    MakeScriptInstanceFn m_makeScriptInstance;
+    ListScriptParametersFn m_listScriptParameters;
     std::map<std::string, Scene> m_scenes;
     Scene* m_activeScene = nullptr;
     InputContext m_inputContext;
diff --git a/include/Game-Engine/Script.hpp b/include/Game-Engine/Script.hpp
index 15903f4..f310adc 100644
--- a/include/Game-Engine/Script.hpp
+++ b/include/Game-Engine/Script.hpp
@@ -71,10 +71,6 @@ class GE_API Script
 template<typename T>
 concept ScriptClass = std::derived_from<T, Script>;
 
-using MakeScriptInstanceFn = Script* (*)(const char*);
-using ListScriptNamesFn = void (*)(const char***, unsigned long*);
-using ListScriptParametersFn = void (*)(const char*, const ScriptParameterDescriptor**, unsigned long*);
-
 class GE_API ScriptRegistry
 {
 public:
diff --git a/include/Game-Engine/ScriptLibraryManager.hpp b/include/Game-Engine/ScriptLibraryManager.hpp
index 0d9d6e9..3ed89d5 100644
--- a/include/Game-Engine/ScriptLibraryManager.hpp
+++ b/include/Game-Engine/ScriptLibraryManager.hpp
@@ -21,20 +21,22 @@
 namespace GE
 {
 
+
+using ListScriptNamesFn = std::function<std::vector<std::string>()>;
+using ListScriptParametersFn = std::function<std::vector<ScriptParameterDescriptor>(const std::string&)>;
+using MakeScriptInstanceFn = std::function<std::shared_ptr<Script>(const std::string&)>;
+
 class GE_API ScriptLibraryManager
 {
 public:
-    using ListScriptNames = std::function<std::vector<std::string>()>;
-    using ListScriptParameters = std::function<std::vector<ScriptParameterDescriptor>(const std::string&)>;
-    using MakeScriptInstance = std::function<std::shared_ptr<Script>(const std::string&)>;
 
     ScriptLibraryManager(const std::filesystem::path& path);
     ScriptLibraryManager(const ScriptLibraryManager&) = delete;
     ScriptLibraryManager(ScriptLibraryManager&&) = default;
 
-    [[nodiscard]] ListScriptNames listScriptNamesFunction() const;
-    [[nodiscard]] ListScriptParameters listScriptParametersFunction() const;
-    [[nodiscard]] MakeScriptInstance makeScriptInstanceFunction() const;
+    ListScriptNamesFn listScriptNamesFunction() const;
+    ListScriptParametersFn listScriptParametersFunction() const;
+    MakeScriptInstanceFn makeScriptInstanceFunction() const;
 
     ~ScriptLibraryManager();
 
@@ -42,10 +44,15 @@ class GE_API ScriptLibraryManager
     ScriptLibraryManager& operator=(ScriptLibraryManager&&) = default;
 
 private:
+    using MakeScriptInstanceSym = Script* (*)(const char*);
+    using ListScriptNamesSym = void (*)(const char***, unsigned long*);
+    using ListScriptParametersSym = void (*)(const char*, const ScriptParameterDescriptor**, unsigned long*);
+
     std::shared_ptr<void> m_libraryHandle;
-    ListScriptNamesFn m_listScriptNames = nullptr;
-    ListScriptParametersFn m_listScriptParameters = nullptr;
-    MakeScriptInstanceFn m_makeScriptInstance = nullptr;
+
+    ListScriptNamesSym m_listScriptNames = nullptr;
+    ListScriptParametersSym m_listScriptParameters = nullptr;
+    MakeScriptInstanceSym m_makeScriptInstance = nullptr;
 };
 
 } // namespace GE
diff --git a/src/Game.cpp b/src/Game.cpp
index 27b90a8..55a33e2 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -27,8 +27,8 @@ namespace
 void setupScene(
     Game& game,
     Scene& scene,
-    const ScriptLibraryManager::MakeScriptInstance& makeScriptInstance,
-    const ScriptLibraryManager::ListScriptParameters& listScriptParameters
+    const MakeScriptInstanceFn& makeScriptInstance,
+    const ListScriptParametersFn& listScriptParameters
 )
 {
     scene.load();
@@ -68,8 +68,8 @@ void tearDownScene(Game& game, Scene& scene)
 
 Game::Game(
     AssetManager* assetManager,
-    ScriptLibraryManager::MakeScriptInstance makeScriptInstance,
-    ScriptLibraryManager::ListScriptParameters listScriptParameters,
+    MakeScriptInstanceFn makeScriptInstance,
+    ListScriptParametersFn listScriptParameters,
     const Descriptor& descriptor
 )
     : m_makeScriptInstance(std::move(makeScriptInstance))
diff --git a/src/ScriptLibraryManager.cpp b/src/ScriptLibraryManager.cpp
index 5fda3b0..4e342b5 100644
--- a/src/ScriptLibraryManager.cpp
+++ b/src/ScriptLibraryManager.cpp
@@ -25,15 +25,15 @@ ScriptLibraryManager::ScriptLibraryManager(const std::filesystem::path& path)
         if (ptr != nullptr)
             dlFree(ptr);
     });
-    m_listScriptNames = reinterpret_cast<ListScriptNamesFn>(getSym(handle, "listScriptNames"));
-    m_listScriptParameters = reinterpret_cast<ListScriptParametersFn>(getSym(handle, "listScriptParameters"));
-    m_makeScriptInstance = reinterpret_cast<MakeScriptInstanceFn>(getSym(handle, "makeScriptInstance"));
+    m_listScriptNames = reinterpret_cast<ListScriptNamesSym>(getSym(handle, "listScriptNames"));
+    m_listScriptParameters = reinterpret_cast<ListScriptParametersSym>(getSym(handle, "listScriptParameters"));
+    m_makeScriptInstance = reinterpret_cast<MakeScriptInstanceSym>(getSym(handle, "makeScriptInstance"));
 
     if (m_listScriptNames == nullptr || m_listScriptParameters == nullptr || m_makeScriptInstance == nullptr)
         throw std::runtime_error(std::format("unable to get symbols in lib : {}", path.string()));
 }
 
-ScriptLibraryManager::ListScriptNames ScriptLibraryManager::listScriptNamesFunction() const
+ListScriptNamesFn ScriptLibraryManager::listScriptNamesFunction() const
 {
     return [libraryHandle = m_libraryHandle, listScriptNamesFn = m_listScriptNames]() -> std::vector<std::string> {
         (void)libraryHandle;
@@ -53,7 +53,7 @@ ScriptLibraryManager::ListScriptNames ScriptLibraryManager::listScriptNamesFunct
     };
 }
 
-ScriptLibraryManager::ListScriptParameters ScriptLibraryManager::listScriptParametersFunction() const
+ListScriptParametersFn ScriptLibraryManager::listScriptParametersFunction() const
 {
     return [libraryHandle = m_libraryHandle, listScriptParametersFn = m_listScriptParameters](const std::string& scriptName) -> std::vector<ScriptParameterDescriptor> {
         (void)libraryHandle;
@@ -72,7 +72,7 @@ ScriptLibraryManager::ListScriptParameters ScriptLibraryManager::listScriptParam
     };
 }
 
-ScriptLibraryManager::MakeScriptInstance ScriptLibraryManager::makeScriptInstanceFunction() const
+MakeScriptInstanceFn ScriptLibraryManager::makeScriptInstanceFunction() const
 {
     return [libraryHandle = m_libraryHandle, makeScriptInstanceFn = m_makeScriptInstance](const std::string& scriptName) -> std::shared_ptr<Script> {
         if (makeScriptInstanceFn == nullptr)
diff --git a/tests/Script_testCases.cpp b/tests/Script_testCases.cpp
index fe0930c..bcafe44 100644
--- a/tests/Script_testCases.cpp
+++ b/tests/Script_testCases.cpp
@@ -9,6 +9,7 @@
 #include <memory>
 #include <string>
 #include <type_traits>
+#include <vector>
 
 static_assert(GE::ScriptValueType<bool>);
 static_assert(GE::ScriptValueType<int64_t>);
@@ -53,56 +54,50 @@ const GE::ScriptParameterDescriptor* findParameter(const GE::ScriptParameterDesc
 
 TEST(ScriptLibraryTest, loadsGeneratedScriptLibraryExports)
 {
-    UniqueDlHandle handle(dlLoad(GE_TEST_SCRIPT_LIB));
-    ASSERT_NE(handle, nullptr);
+    EXPECT_NO_THROW({
+        GE::ScriptLibraryManager manager(GE_TEST_SCRIPT_LIB);
+        GE::ListScriptNamesFn listScriptNames = manager.listScriptNamesFunction();
+        GE::ListScriptParametersFn listScriptParameters = manager.listScriptParametersFunction();
+        GE::MakeScriptInstanceFn makeScriptInstance = manager.makeScriptInstanceFunction();
 
-    auto listScriptNames = loadFunction<GE::ListScriptNamesFn>(handle.get(), "listScriptNames");
-    auto listScriptParameters = loadFunction<GE::ListScriptParametersFn>(handle.get(), "listScriptParameters");
-    auto makeScriptInstance = loadFunction<GE::MakeScriptInstanceFn>(handle.get(), "makeScriptInstance");
+        std::vector<std::string> names = listScriptNames();
 
-    const char** names = nullptr;
-    unsigned long nameCount = 0;
-    listScriptNames(&names, &nameCount);
+        ASSERT_EQ(names.size(), 1u);
+        EXPECT_EQ(names[0], std::string("TestScript"));
 
-    ASSERT_NE(names, nullptr);
-    ASSERT_EQ(nameCount, 1u);
-    EXPECT_STREQ(names[0], "TestScript");
+        std::vector<GE::ScriptParameterDescriptor> parameters = listScriptParameters("TestScript");
 
-    const GE::ScriptParameterDescriptor* parameters = nullptr;
-    unsigned long parameterCount = 0;
-    listScriptParameters("TestScript", &parameters, &parameterCount);
+        ASSERT_EQ(parameters.size(), 3u);
 
-    ASSERT_NE(parameters, nullptr);
-    ASSERT_EQ(parameterCount, 3u);
+        const GE::ScriptParameterDescriptor* speed = findParameter(parameters.data(), parameters.size(), "speed");
+        const GE::ScriptParameterDescriptor* enabled = findParameter(parameters.data(), parameters.size(), "enabled");
+        const GE::ScriptParameterDescriptor* label = findParameter(parameters.data(), parameters.size(), "label");
 
-    const GE::ScriptParameterDescriptor* speed = findParameter(parameters, parameterCount, "speed");
-    const GE::ScriptParameterDescriptor* enabled = findParameter(parameters, parameterCount, "enabled");
-    const GE::ScriptParameterDescriptor* label = findParameter(parameters, parameterCount, "label");
+        ASSERT_NE(speed, nullptr);
+        ASSERT_NE(enabled, nullptr);
+        ASSERT_NE(label, nullptr);
 
-    ASSERT_NE(speed, nullptr);
-    ASSERT_NE(enabled, nullptr);
-    ASSERT_NE(label, nullptr);
+        EXPECT_EQ(std::get<float>(speed->defaultValue), 2.5f);
+        EXPECT_EQ(std::get<bool>(enabled->defaultValue), true);
+        EXPECT_EQ(std::get<std::string>(label->defaultValue), "default");
 
-    EXPECT_EQ(std::get<float>(speed->defaultValue), 2.5f);
-    EXPECT_EQ(std::get<bool>(enabled->defaultValue), true);
-    EXPECT_EQ(std::get<std::string>(label->defaultValue), "default");
+        std::shared_ptr<GE::Script> script = makeScriptInstance("TestScript");
+        ASSERT_NE(script, nullptr);
 
-    std::unique_ptr<GE::Script> script(makeScriptInstance("TestScript"));
-    ASSERT_NE(script, nullptr);
+        speed->set(*script, 7.0f);
+        enabled->set(*script, false);
+        label->set(*script, std::string("changed"));
 
-    speed->set(*script, 7.0f);
-    enabled->set(*script, false);
-    label->set(*script, std::string("changed"));
-
-    EXPECT_EQ(std::get<float>(speed->get(*script)), 7.0f);
-    EXPECT_EQ(std::get<bool>(enabled->get(*script)), false);
-    EXPECT_EQ(std::get<std::string>(label->get(*script)), "changed");
+        EXPECT_EQ(std::get<float>(speed->get(*script)), 7.0f);
+        EXPECT_EQ(std::get<bool>(enabled->get(*script)), false);
+        EXPECT_EQ(std::get<std::string>(label->get(*script)), "changed");
+    });
 }
 
 TEST(ScriptLibraryManagerTest, keepsLibraryAliveForScriptInstanceLifetime)
 {
-    GE::ScriptLibraryManager::ListScriptParameters listScriptParameters;
-    GE::ScriptLibraryManager::MakeScriptInstance makeScriptInstance;
+    GE::ListScriptParametersFn listScriptParameters;
+    GE::MakeScriptInstanceFn makeScriptInstance;
     {
         GE::ScriptLibraryManager manager(GE_TEST_SCRIPT_LIB);
         listScriptParameters = manager.listScriptParametersFunction();