Update Nexus Instance.

sourcemap.json

@@ -0,0 +1 @@
+{"name":"Nexus-Button","className":"DataModel","filePaths":["place.project.json"],"children":[{"name":"ReplicatedStorage","className":"ReplicatedStorage","children":[{"name":"NexusButton","className":"ModuleScript","filePaths":["src\\init.lua","default.project.json"],"children":[{"name":"ControllerIcon","className":"ModuleScript","filePaths":["src\\ControllerIcon\\init.lua"],"children":[{"name":"ControllerIconCreator","className":"ModuleScript","filePaths":["src\\ControllerIcon\\ControllerIconCreator\\init.lua"],"children":[{"name":"Spritesheet","className":"ModuleScript","filePaths":["src\\ControllerIcon\\ControllerIconCreator\\Spritesheet.lua"]},{"name":"Spritesheets","className":"Folder","children":[{"name":"XboxOne","className":"Folder","children":[{"name":"Dark","className":"ModuleScript","filePaths":["src\\ControllerIcon\\ControllerIconCreator\\Spritesheets\\XboxOne\\Dark.lua"]},{"name":"Light","className":"ModuleScript","filePaths":["src\\ControllerIcon\\ControllerIconCreator\\Spritesheets\\XboxOne\\Light.lua"]}]}]}]}]},{"name":"Factory","className":"Folder","children":[{"name":"ButtonFactory","className":"ModuleScript","filePaths":["src\\Factory\\ButtonFactory.lua"]},{"name":"TextButtonFactory","className":"ModuleScript","filePaths":["src\\Factory\\TextButtonFactory.lua"]}]},{"name":"ThemedFrame","className":"ModuleScript","filePaths":["src\\ThemedFrame.lua"]},{"name":"NexusWrappedInstance","className":"ModuleScript","filePaths":["module/Nexus-Wrapped-Instance\\./src\\init.lua","module/Nexus-Wrapped-Instance/default.project.json"],"children":[{"name":"NexusInstance","className":"Folder","filePaths":["module/Nexus-Wrapped-Instance\\./module/Nexus-Instance/default.project.json"],"children":[{"name":"Event","className":"Folder","children":[{"name":"NexusConnection","className":"ModuleScript","filePaths":["module/Nexus-Wrapped-Instance\\./module/Nexus-Instance\\./src\\Event\\NexusConnection.lua"]},{"name":"NexusEvent","className":"ModuleScript","filePaths":["module/Nexus-Wrapped-Instance\\./module/Nexus-Instance\\./src\\Event\\NexusEvent.lua"]}]},{"name":"NexusInstance","className":"ModuleScript","filePaths":["module/Nexus-Wrapped-Instance\\./module/Nexus-Instance\\./src\\NexusInstance.lua"]},{"name":"NexusObject","className":"ModuleScript","filePaths":["module/Nexus-Wrapped-Instance\\./module/Nexus-Instance\\./src\\NexusObject.lua"]},{"name":"PropertyValidator","className":"Folder","children":[{"name":"TypePropertyValidator","className":"ModuleScript","filePaths":["module/Nexus-Wrapped-Instance\\./module/Nexus-Instance\\./src\\PropertyValidator\\TypePropertyValidator.lua"]}]}]}]}]},{"name":"NexusButtonTests.nexusspec","className":"ModuleScript","filePaths":["test\\init.lua"],"children":[{"name":"ControllerIconTests.nexusspec","className":"ModuleScript","filePaths":["test\\ControllerIconTests.nexusspec.lua"]},{"name":"Factory","className":"Folder","children":[{"name":"ButtonFactoryTests.nexusspec","className":"ModuleScript","filePaths":["test\\Factory\\ButtonFactoryTests.nexusspec.lua"]},{"name":"TextButtonFactoryTests.nexusspec","className":"ModuleScript","filePaths":["test\\Factory\\TextButtonFactoryTests.nexusspec.lua"]}]}]}]}]}

src/ControllerIcon/init.lua

@@ -26,7 +26,7 @@ ControllerIcon:SetClassName("ControllerIcon")
 Constructor of the Controller Icon class.
 --]]
 function ControllerIcon:__new()
-    self:InitializeSuper()
+    NexusInstance.__new(self)
 
     --Create the adorn frame.
     local AdornFrame = Instance.new("ImageLabel")
@@ -118,7 +118,7 @@ end
 Destroys the frame.
 --]]
 function ControllerIcon:Destroy(): nil
-    self.super:Destroy()
+    NexusInstance.Destroy(self)
 
     --Disconnect the events.
     for _,Event in pairs(self.Events) do

src/Factory/ButtonFactory.lua

@@ -11,10 +11,10 @@ local BORDER_COLOR_OFFSET = Color3.new(-30 / 255, -30 / 255, -30 / 255)
 
 local RootModule = script.Parent.Parent
 
-local NexusInstance = require(RootModule:WaitForChild("NexusWrappedInstance"):WaitForChild("NexusInstance"):WaitForChild("NexusInstance"))
+local NexusObject = require(RootModule:WaitForChild("NexusWrappedInstance"):WaitForChild("NexusInstance"):WaitForChild("NexusObject"))
 local NexusButton = require(RootModule)
 
-local ButtonFactory = NexusInstance:Extend()
+local ButtonFactory = NexusObject:Extend()
 ButtonFactory:SetClassName("ButtonFactory")
 
 
@@ -49,7 +49,7 @@ end
 Creates a button factory.
 --]]
 function ButtonFactory:__new()
-    self:InitializeSuper()
+    NexusObject.__new(self)
     self.Defaults = {}
 end
 

src/Factory/TextButtonFactory.lua

@@ -53,7 +53,7 @@ end
 Creates a text button factory.
 --]]
 function TextButtonFactory:__new()
-    self:InitializeSuper()
+    ButtonFactory.__new(self)
     self.TextDefaults = {}
 end
 
@@ -62,7 +62,7 @@ Creates a text button instance.
 --]]
 function TextButtonFactory:Create()
     --Create the button.
-    local Button = self.super:Create()
+    local Button = ButtonFactory.Create(self)
 
     --Add a text label.
     local TextLabel = Instance.new("TextLabel")

src/ThemedFrame.lua

@@ -15,7 +15,7 @@ ThemedFrame:SetClassName("ThemedFrame")
 Creates the themed frame.
 --]]
 function ThemedFrame:__new()
-    self:InitializeSuper("ImageLabel")
+    NexusWrappedInstance.__new(self, "ImageLabel")
     self.BackgroundTransparency = 1
 
     --Connect replicating values.

src/init.lua

@@ -62,7 +62,6 @@ local DEFAULT_THEMES = {
 
 
 
-local ReplicatedStorage = game:GetService("ReplicatedStorage")
 local GuiService = game:GetService("GuiService")
 local TweenService = game:GetService("TweenService")
 local UserInputService = game:GetService("UserInputService")
@@ -87,7 +86,7 @@ end
 Creates a Nexus Button object.
 --]]
 function NexusButton:__new()
-    self:InitializeSuper("TextButton")
+    NexusWrappedInstance.__new(self, "TextButton")
 
     --Create the frames.
     local BaseButton = self:GetWrappedInstance()
@@ -365,7 +364,7 @@ end
 Destroys the button and disconnects the events.
 --]]
 function NexusButton:Destroy(): nil
-    self.super:Destroy()
+    NexusWrappedInstance.Destroy(self)
     self.GamepadIcon:Destroy()
 
     --Disconnect the events.

test/ControllerIconTests.nexusspec.lua

@@ -5,6 +5,7 @@ Unit tests for the ControllerIcon class.
 --]]
 
 local NexusUnitTesting = require("NexusUnitTesting")
+_G.EnsureNexusWrappedInstanceSingleton = false
 
 local NexusButton = game:GetService("ReplicatedStorage"):WaitForChild("NexusButton")
 local ControllerIcon = require(NexusButton:WaitForChild("ControllerIcon"))

test/Factory/ButtonFactoryTests.nexusspec.lua

@@ -5,6 +5,7 @@ Unit tests for the ButtonFactory class.
 --]]
 
 local NexusUnitTesting = require("NexusUnitTesting")
+_G.EnsureNexusWrappedInstanceSingleton = false
 
 local NexusButton = game:GetService("ReplicatedStorage"):WaitForChild("NexusButton")
 local Factory = NexusButton:WaitForChild("Factory")

test/Factory/TextButtonFactoryTests.nexusspec.lua

@@ -5,6 +5,7 @@ Unit tests for the TextButtonFactory class.
 --]]
 
 local NexusUnitTesting = require("NexusUnitTesting")
+_G.EnsureNexusWrappedInstanceSingleton = false
 
 local NexusButton = game:GetService("ReplicatedStorage"):WaitForChild("NexusButton")
 local Factory = NexusButton:WaitForChild("Factory")

test/init.lua

@@ -5,6 +5,7 @@ Unit tests for the NeuxsButton class.
 --]]
 
 local NexusUnitTesting = require("NexusUnitTesting")
+_G.EnsureNexusWrappedInstanceSingleton = false
 
 local NexusButton = require(game:GetService("ReplicatedStorage"):WaitForChild("NexusButton"))
 local NexusButtonTest = NexusUnitTesting.UnitTest:Extend()