Support export default

Author: OverHash

README.md

@@ -17,6 +17,7 @@ It is easiest to clone this repository and copy relevant files across from there
 	- The `Promise` library under Shared *must* exist - or the AeroClient will not be able to load.
 	- The `Internal` folder under Shared *must* exist - or the AeroClient will not be able to load.
 - Create a file under your desired location, and add it to `src/GlobalRegistry.d.ts` in the defined format
+- You will need to export a class which extends from an `Aero.x` class. This class has to be exported either as the only object exported, or through `export default`
 - For examples on how to do this, see [examples](https://github.com/OverHash/aeroTS/tree/master/examples)
 
 ## Recommendations

examples/exampleController.ts

@@ -1,6 +1,6 @@
 import Aero from 'internal/Aero/Aero';
 
-export = class exampleController extends Aero.Controller {
+export default class exampleController extends Aero.Controller {
 	protected static Start(): void {
 		print('exampleController.ts started!');
 	}
@@ -12,4 +12,4 @@ export = class exampleController extends Aero.Controller {
 	static foo(str: string): void {
 		print('Someone sent a message!\n' + str);
 	}
-};
+}

examples/exampleModule.ts

@@ -1,6 +1,6 @@
 import Aero from 'internal/Aero/Aero';
 
-export = class exampleModule extends Aero.SharedModule {
+export default class exampleModule extends Aero.SharedModule {
 	protected static Start(): void {
 		print('exampleModule.ts started!');
 	}
@@ -12,4 +12,4 @@ export = class exampleModule extends Aero.SharedModule {
 	foo(str: string): void {
 		print(str);
 	}
-};
+}

examples/exampleService.ts

@@ -1,6 +1,6 @@
 import Aero from 'internal/Aero/Aero';
 
-export = class exampleService extends Aero.Service {
+export default class exampleService extends Aero.Service {
 	protected static Start(): void {
 		print('exampleService.ts started!');
 
@@ -11,4 +11,4 @@ export = class exampleService extends Aero.Service {
 	protected static Init(): void {
 		print('Initiated from exampleService.ts!');
 	}
-};
+}

src/Client/Controllers/test.ts

@@ -1,11 +1,11 @@
 import Aero from 'internal/Aero/Aero';
 
-export = class clientTest extends Aero.Controller {
+export default class clientTest extends Aero.Controller {
 	protected static Start(): void {
 		print("Started from test.ts!");
 	}
 
 	protected static Init(): void {
 		print("Initiated from test.ts!");
 	}
-};
+}

src/Server/Services/test.ts

@@ -1,11 +1,11 @@
 import Aero = require("internal/Aero/Aero");
 
-export = class test extends Aero.Service {
+export default class test extends Aero.Service {
 	protected static Start(): void {
 		print('Started from test.ts!');
 	}
 
 	protected static Init(): void {
 		print('Initiated from test.ts!');
 	}
-};
+}

src/internal/client/AeroClient.client.lua

@@ -152,6 +152,9 @@ local function LazyLoadSetup(tbl, folder)
 			if (child:IsA("ModuleScript")) then
 				local objSettings = Settings:Get(child)
 				local obj = require(child)
+				if (type(obj) == 'table' and not objSettings.Standalone and obj['default']) then
+					obj = obj.default
+				end
 				settingsPerTbl[obj] = objSettings
 				rawset(t, i, obj)
 				if (type(obj) == "table" and not objSettings.Standalone) then
@@ -176,6 +179,9 @@ end
 local function LoadController(module, controllersTbl)
 	local controllerSettings = Settings:Get(module)
 	local controller = require(module)
+	if (type(controller) == 'table' and controller['default']) then
+		controller = controller.default
+	end
 	controllersTbl[module.Name] = controller
 	controller._events = {}
 	setmetatable(controller, mt)

src/internal/server/AeroServer.server.lua

@@ -181,6 +181,9 @@ local function LazyLoadSetup(tbl, folder)
 			if (child:IsA("ModuleScript")) then
 				local objSettings = Settings:Get(child)
 				local obj = require(child)
+				if (type(obj) == 'table' and not objSettings.Standalone and obj['default']) then
+					obj = obj.default
+				end
 				settingsPerTbl[obj] = objSettings
 				rawset(t, i, obj)
 				if (type(obj) == "table" and not objSettings.Standalone) then
@@ -212,6 +215,9 @@ local function LoadService(module, servicesTbl, parentFolder)
 	remoteFolder.Parent = parentFolder
 
 	local service = require(module)
+	if (type(service) == 'table' and service['default']) then
+		service = service.default
+	end
 	servicesTbl[module.Name] = service
 
 	if (type(service.Client) ~= "table") then