From c62a2b4b77f71baa36544d56296a56f10d34a6dd Mon Sep 17 00:00:00 2001 From: SaintRyoh <14931827+SaintRyoh@users.noreply.github.com> Date: Tue, 4 Apr 2023 01:44:51 -0500 Subject: [PATCH 1/2] provider instance not being returned unless it's a singleton --- lua-di/DependencyInjectionModule.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lua-di/DependencyInjectionModule.lua b/lua-di/DependencyInjectionModule.lua index c49cba1..97b6451 100644 --- a/lua-di/DependencyInjectionModule.lua +++ b/lua-di/DependencyInjectionModule.lua @@ -170,6 +170,11 @@ local DependencyInjectionModule = function(configure) return singletons[moduleName].instance end + if instance then + -- provider instance + return instance + end + local moduleHandle = dynamicRequire(moduleName) local moduleConstructor = getConstructor(moduleName, moduleHandle) From d2e05fd34ba0e482d115bac3ce5be0a950a4f762 Mon Sep 17 00:00:00 2001 From: SaintRyoh <14931827+SaintRyoh@users.noreply.github.com> Date: Wed, 5 Apr 2023 23:26:30 -0500 Subject: [PATCH 2/2] support for dashes in directory names --- lua-di/DependencyInjectionModule.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua-di/DependencyInjectionModule.lua b/lua-di/DependencyInjectionModule.lua index 97b6451..1a7525b 100644 --- a/lua-di/DependencyInjectionModule.lua +++ b/lua-di/DependencyInjectionModule.lua @@ -55,7 +55,7 @@ local DependencyInjectionModule = function(configure) end if autoInjectEnabled then - local moduleName = argumentName:gsub("__", ".") + local moduleName = argumentName:gsub("___", "-"):gsub("__", ".") return self.getInstance(moduleName) end