Skip to content

Commit 9619e75

Browse files
SleitnickSleitnick
committed
Stylua
1 parent ae7de41 commit 9619e75

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+952
-1150
lines changed

‎.vscode/settings.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"[lua]": {
3+
"editor.defaultFormatter": "JohnnyMorganz.stylua",
4+
"editor.formatOnSave": true
5+
}
6+
}

‎modules/comm/Client/ClientComm.lua

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@ end
9292
end)
9393
```
9494
]=]
95-
function ClientComm:GetFunction(name: string, inboundMiddleware: Types.ClientMiddleware?, outboundMiddleware: Types.ClientMiddleware?)
95+
function ClientComm:GetFunction(
96+
name: string,
97+
inboundMiddleware: Types.ClientMiddleware?,
98+
outboundMiddleware: Types.ClientMiddleware?
99+
)
96100
return Comm.GetFunction(self._instancesFolder, name, self._usePromise, inboundMiddleware, outboundMiddleware)
97101
end
98102

@@ -116,7 +120,11 @@ end
116120
mySignal:Fire("Hello!")
117121
```
118122
]=]
119-
function ClientComm:GetSignal(name: string, inboundMiddleware: Types.ClientMiddleware?, outboundMiddleware: Types.ClientMiddleware?)
123+
function ClientComm:GetSignal(
124+
name: string,
125+
inboundMiddleware: Types.ClientMiddleware?,
126+
outboundMiddleware: Types.ClientMiddleware?
127+
)
120128
return Comm.GetSignal(self._instancesFolder, name, inboundMiddleware, outboundMiddleware)
121129
end
122130

@@ -154,7 +162,11 @@ end
154162
local success, info = mapInfo:OnReady():await()
155163
```
156164
]=]
157-
function ClientComm:GetProperty(name: string, inboundMiddleware: Types.ClientMiddleware?, outboundMiddleware: Types.ClientMiddleware?)
165+
function ClientComm:GetProperty(
166+
name: string,
167+
inboundMiddleware: Types.ClientMiddleware?,
168+
outboundMiddleware: Types.ClientMiddleware?
169+
)
158170
return Comm.GetProperty(self._instancesFolder, name, inboundMiddleware, outboundMiddleware)
159171
end
160172

@@ -183,23 +195,29 @@ function ClientComm:BuildObject(inboundMiddleware: Types.ClientMiddleware?, outb
183195
local reFolder = self._instancesFolder:FindFirstChild("RE")
184196
local rpFolder = self._instancesFolder:FindFirstChild("RP")
185197
if rfFolder then
186-
for _,rf in ipairs(rfFolder:GetChildren()) do
187-
if not rf:IsA("RemoteFunction") then continue end
198+
for _, rf in ipairs(rfFolder:GetChildren()) do
199+
if not rf:IsA("RemoteFunction") then
200+
continue
201+
end
188202
local f = self:GetFunction(rf.Name, inboundMiddleware, outboundMiddleware)
189203
obj[rf.Name] = function(_self, ...)
190204
return f(...)
191205
end
192206
end
193207
end
194208
if reFolder then
195-
for _,re in ipairs(reFolder:GetChildren()) do
196-
if not re:IsA("RemoteEvent") then continue end
209+
for _, re in ipairs(reFolder:GetChildren()) do
210+
if not re:IsA("RemoteEvent") then
211+
continue
212+
end
197213
obj[re.Name] = self:GetSignal(re.Name, inboundMiddleware, outboundMiddleware)
198214
end
199215
end
200216
if rpFolder then
201-
for _,re in ipairs(rpFolder:GetChildren()) do
202-
if not re:IsA("RemoteEvent") then continue end
217+
for _, re in ipairs(rpFolder:GetChildren()) do
218+
if not re:IsA("RemoteEvent") then
219+
continue
220+
end
203221
obj[re.Name] = self:GetProperty(re.Name, inboundMiddleware, outboundMiddleware)
204222
end
205223
end
@@ -209,7 +227,6 @@ end
209227
--[=[
210228
Destroys the ClientComm object.
211229
]=]
212-
function ClientComm:Destroy()
213-
end
230+
function ClientComm:Destroy() end
214231

215232
return ClientComm

‎modules/comm/Client/ClientRemoteProperty.lua

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
-- Stephen Leitnick
33
-- December 20, 2021
44

5-
65
local Promise = require(script.Parent.Parent.Parent.Promise)
76
local Signal = require(script.Parent.Parent.Parent.Signal)
87
local ClientRemoteSignal = require(script.Parent.ClientRemoteSignal)
@@ -30,7 +29,11 @@ local Types = require(script.Parent.Parent.Types)
3029
local ClientRemoteProperty = {}
3130
ClientRemoteProperty.__index = ClientRemoteProperty
3231

33-
function ClientRemoteProperty.new(re: RemoteEvent, inboundMiddleware: Types.ClientMiddleware?, outboudMiddleware: Types.ClientMiddleware?)
32+
function ClientRemoteProperty.new(
33+
re: RemoteEvent,
34+
inboundMiddleware: Types.ClientMiddleware?,
35+
outboudMiddleware: Types.ClientMiddleware?
36+
)
3437
local self = setmetatable({}, ClientRemoteProperty)
3538
self._rs = ClientRemoteSignal.new(re, inboundMiddleware, outboudMiddleware)
3639
self._ready = false
@@ -40,7 +43,9 @@ function ClientRemoteProperty.new(re: RemoteEvent, inboundMiddleware: Types.Clie
4043
self._readyPromise = nil
4144
self.Changed:Fire(self._value)
4245
self._changed = self._rs:Connect(function(value)
43-
if value == self._value then return end
46+
if value == self._value then
47+
return
48+
end
4449
self._value = value
4550
self.Changed:Fire(value)
4651
end)

‎modules/comm/Client/ClientRemoteSignal.lua

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
-- Stephen Leitnick
33
-- December 20, 2021
44

5-
65
local Signal = require(script.Parent.Parent.Parent.Signal)
76
local Types = require(script.Parent.Parent.Types)
87

@@ -20,7 +19,11 @@ ClientRemoteSignal.__index = ClientRemoteSignal
2019
.Disconnect () -> ()
2120
]=]
2221

23-
function ClientRemoteSignal.new(re: RemoteEvent, inboundMiddleware: Types.ClientMiddleware?, outboudMiddleware: Types.ClientMiddleware?)
22+
function ClientRemoteSignal.new(
23+
re: RemoteEvent,
24+
inboundMiddleware: Types.ClientMiddleware?,
25+
outboudMiddleware: Types.ClientMiddleware?
26+
)
2427
local self = setmetatable({}, ClientRemoteSignal)
2528
self._re = re
2629
if outboudMiddleware and #outboudMiddleware > 0 then
@@ -34,7 +37,7 @@ function ClientRemoteSignal.new(re: RemoteEvent, inboundMiddleware: Types.Client
3437
self._signal = Signal.new()
3538
self._reConn = self._re.OnClientEvent:Connect(function(...)
3639
local args = table.pack(...)
37-
for _,middlewareFunc in ipairs(inboundMiddleware) do
40+
for _, middlewareFunc in ipairs(inboundMiddleware) do
3841
local middlewareResult = table.pack(middlewareFunc(args))
3942
if not middlewareResult[1] then
4043
return
@@ -51,7 +54,7 @@ end
5154

5255
function ClientRemoteSignal:_processOutboundMiddleware(...: any)
5356
local args = table.pack(...)
54-
for _,middlewareFunc in ipairs(self._outbound) do
57+
for _, middlewareFunc in ipairs(self._outbound) do
5558
local middlewareResult = table.pack(middlewareFunc(args))
5659
if not middlewareResult[1] then
5760
return table.unpack(middlewareResult, 2, middlewareResult.n)

‎modules/comm/Client/init.lua

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,21 @@ local ClientRemoteProperty = require(script.ClientRemoteProperty)
66

77
local Client = {}
88

9-
function Client.GetFunction(parent: Instance, name: string, usePromise: boolean, inboundMiddleware: Types.ClientMiddleware?, outboundMiddleware: Types.ClientMiddleware?)
9+
function Client.GetFunction(
10+
parent: Instance,
11+
name: string,
12+
usePromise: boolean,
13+
inboundMiddleware: Types.ClientMiddleware?,
14+
outboundMiddleware: Types.ClientMiddleware?
15+
)
1016
assert(not Util.IsServer, "GetFunction must be called from the client")
1117
local folder = Util.GetCommSubFolder(parent, "RF"):Expect("Failed to get Comm RF folder")
1218
local rf = folder:WaitForChild(name, Util.WaitForChildTimeout)
1319
assert(rf ~= nil, "Failed to find RemoteFunction: " .. name)
1420
local hasInbound = type(inboundMiddleware) == "table" and #inboundMiddleware > 0
1521
local hasOutbound = type(outboundMiddleware) == "table" and #outboundMiddleware > 0
1622
local function ProcessOutbound(args)
17-
for _,middlewareFunc in ipairs(outboundMiddleware) do
23+
for _, middlewareFunc in ipairs(outboundMiddleware) do
1824
local middlewareResult = table.pack(middlewareFunc(args))
1925
if not middlewareResult[1] then
2026
return table.unpack(middlewareResult, 2, middlewareResult.n)
@@ -36,7 +42,7 @@ function Client.GetFunction(parent: Instance, name: string, usePromise: boolean,
3642
end
3743
end)
3844
if success then
39-
for _,middlewareFunc in ipairs(inboundMiddleware) do
45+
for _, middlewareFunc in ipairs(inboundMiddleware) do
4046
local middlewareResult = table.pack(middlewareFunc(res))
4147
if not middlewareResult[1] then
4248
return table.unpack(middlewareResult, 2, middlewareResult.n)
@@ -57,7 +63,7 @@ function Client.GetFunction(parent: Instance, name: string, usePromise: boolean,
5763
else
5864
res = table.pack(rf:InvokeServer(...))
5965
end
60-
for _,middlewareFunc in ipairs(inboundMiddleware) do
66+
for _, middlewareFunc in ipairs(inboundMiddleware) do
6167
local middlewareResult = table.pack(middlewareFunc(res))
6268
if not middlewareResult[1] then
6369
return table.unpack(middlewareResult, 2, middlewareResult.n)
@@ -100,17 +106,25 @@ function Client.GetFunction(parent: Instance, name: string, usePromise: boolean,
100106
end
101107
end
102108

103-
104-
function Client.GetSignal(parent: Instance, name: string, inboundMiddleware: Types.ClientMiddleware?, outboundMiddleware: Types.ClientMiddleware?)
109+
function Client.GetSignal(
110+
parent: Instance,
111+
name: string,
112+
inboundMiddleware: Types.ClientMiddleware?,
113+
outboundMiddleware: Types.ClientMiddleware?
114+
)
105115
assert(not Util.IsServer, "GetSignal must be called from the client")
106116
local folder = Util.GetCommSubFolder(parent, "RE"):Expect("Failed to get Comm RE folder")
107117
local re = folder:WaitForChild(name, Util.WaitForChildTimeout)
108118
assert(re ~= nil, "Failed to find RemoteEvent: " .. name)
109119
return ClientRemoteSignal.new(re, inboundMiddleware, outboundMiddleware)
110120
end
111121

112-
113-
function Client.GetProperty(parent: Instance, name: string, inboundMiddleware: Types.ClientMiddleware?, outboundMiddleware: Types.ClientMiddleware?)
122+
function Client.GetProperty(
123+
parent: Instance,
124+
name: string,
125+
inboundMiddleware: Types.ClientMiddleware?,
126+
outboundMiddleware: Types.ClientMiddleware?
127+
)
114128
assert(not Util.IsServer, "GetProperty must be called from the client")
115129
local folder = Util.GetCommSubFolder(parent, "RP"):Expect("Failed to get Comm RP folder")
116130
local re = folder:WaitForChild(name, Util.WaitForChildTimeout)

‎modules/comm/Server/RemoteProperty.lua

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
-- Stephen Leitnick
33
-- December 20, 2021
44

5-
65
local Players = game:GetService("Players")
76

87
local Util = require(script.Parent.Parent.Util)
@@ -51,7 +50,13 @@ local None = Util.None
5150
local RemoteProperty = {}
5251
RemoteProperty.__index = RemoteProperty
5352

54-
function RemoteProperty.new(parent: Instance, name: string, initialValue: any, inboundMiddleware: Types.ServerMiddleware?, outboundMiddleware: Types.ServerMiddleware?)
53+
function RemoteProperty.new(
54+
parent: Instance,
55+
name: string,
56+
initialValue: any,
57+
inboundMiddleware: Types.ServerMiddleware?,
58+
outboundMiddleware: Types.ServerMiddleware?
59+
)
5560
local self = setmetatable({}, RemoteProperty)
5661
self._rs = RemoteSignal.new(parent, name, inboundMiddleware, outboundMiddleware)
5762
self._value = initialValue
@@ -112,7 +117,7 @@ end
112117
]=]
113118
function RemoteProperty:SetTop(value: any)
114119
self._value = value
115-
for _,player in ipairs(Players:GetPlayers()) do
120+
for _, player in ipairs(Players:GetPlayers()) do
116121
if self._perPlayer[player] == nil then
117122
self._rs:Fire(player, value)
118123
end
@@ -134,7 +139,7 @@ end
134139
```
135140
]=]
136141
function RemoteProperty:SetFilter(predicate: (Player, any) -> boolean, value: any)
137-
for _,player in ipairs(Players:GetPlayers()) do
142+
for _, player in ipairs(Players:GetPlayers()) do
138143
if predicate(player, value) then
139144
self:SetFor(player, value)
140145
end
@@ -171,8 +176,8 @@ end
171176
remoteProperty:SetForList(players, "CustomData")
172177
```
173178
]=]
174-
function RemoteProperty:SetForList(players: {Player}, value: any)
175-
for _,player in ipairs(players) do
179+
function RemoteProperty:SetForList(players: { Player }, value: any)
180+
for _, player in ipairs(players) do
176181
self:SetFor(player, value)
177182
end
178183
end
@@ -199,7 +204,9 @@ end
199204
```
200205
]=]
201206
function RemoteProperty:ClearFor(player: Player)
202-
if self._perPlayer[player] == nil then return end
207+
if self._perPlayer[player] == nil then
208+
return
209+
end
203210
self._perPlayer[player] = nil
204211
self._rs:Fire(player, self._value)
205212
end
@@ -209,8 +216,8 @@ end
209216
just loops through the list of players and calls
210217
the `ClearFor` method for each player.
211218
]=]
212-
function RemoteProperty:ClearForList(players: {Player})
213-
for _,player in ipairs(players) do
219+
function RemoteProperty:ClearForList(players: { Player })
220+
for _, player in ipairs(players) do
214221
self:ClearFor(player)
215222
end
216223
end
@@ -220,7 +227,7 @@ end
220227
for any player that passes the predicate.
221228
]=]
222229
function RemoteProperty:ClearFilter(predicate: (Player) -> boolean)
223-
for _,player in ipairs(Players:GetPlayers()) do
230+
for _, player in ipairs(Players:GetPlayers()) do
224231
if predicate(player) then
225232
self:ClearFor(player)
226233
end

‎modules/comm/Server/RemoteSignal.lua

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
-- Stephen Leitnick
33
-- December 20, 2021
44

5-
65
local Players = game:GetService("Players")
76

87
local Signal = require(script.Parent.Parent.Parent.Signal)
98
local Types = require(script.Parent.Parent.Types)
109

11-
1210
--[=[
1311
@class RemoteSignal
1412
@server
@@ -24,7 +22,12 @@ RemoteSignal.__index = RemoteSignal
2422
.Connected boolean
2523
]=]
2624

27-
function RemoteSignal.new(parent: Instance, name: string, inboundMiddleware: Types.ServerMiddleware?, outboundMiddleware: Types.ServerMiddleware?)
25+
function RemoteSignal.new(
26+
parent: Instance,
27+
name: string,
28+
inboundMiddleware: Types.ServerMiddleware?,
29+
outboundMiddleware: Types.ServerMiddleware?
30+
)
2831
local self = setmetatable({}, RemoteSignal)
2932
self._re = Instance.new("RemoteEvent")
3033
self._re.Name = name
@@ -40,7 +43,7 @@ function RemoteSignal.new(parent: Instance, name: string, inboundMiddleware: Typ
4043
self._signal = Signal.new()
4144
self._re.OnServerEvent:Connect(function(player, ...)
4245
local args = table.pack(...)
43-
for _,middlewareFunc in ipairs(inboundMiddleware) do
46+
for _, middlewareFunc in ipairs(inboundMiddleware) do
4447
local middlewareResult = table.pack(middlewareFunc(player, args))
4548
if not middlewareResult[1] then
4649
return
@@ -75,7 +78,7 @@ function RemoteSignal:_processOutboundMiddleware(player: Player?, ...: any)
7578
return ...
7679
end
7780
local args = table.pack(...)
78-
for _,middlewareFunc in ipairs(self._outbound) do
81+
for _, middlewareFunc in ipairs(self._outbound) do
7982
local middlewareResult = table.pack(middlewareFunc(player, args))
8083
if not middlewareResult[1] then
8184
return table.unpack(middlewareResult, 2, middlewareResult.n)
@@ -154,7 +157,7 @@ end
154157
```
155158
]=]
156159
function RemoteSignal:FireFilter(predicate: (Player, ...any) -> boolean, ...: any)
157-
for _,player in ipairs(Players:GetPlayers()) do
160+
for _, player in ipairs(Players:GetPlayers()) do
158161
if predicate(player, ...) then
159162
self._re:FireClient(player, self:_processOutboundMiddleware(nil, ...))
160163
end
@@ -177,8 +180,8 @@ end
177180
remoteSignal:FireFor(players, "Hello, players!")
178181
```
179182
]=]
180-
function RemoteSignal:FireFor(players: {Player}, ...: any)
181-
for _,player in ipairs(players) do
183+
function RemoteSignal:FireFor(players: { Player }, ...: any)
184+
for _, player in ipairs(players) do
182185
self._re:FireClient(player, self:_processOutboundMiddleware(nil, ...))
183186
end
184187
end

0 commit comments

Comments
 (0)