Skip to content

Commit 7e008c5

Browse files
committed
fix: Additional type checking updates
1 parent afa1b3b commit 7e008c5

File tree

343 files changed

+3558
-2311
lines changed

Some content is hidden

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

343 files changed

+3558
-2311
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"out": true,
66
"roblox.toml": true
77
},
8-
"luau-lsp.server.path": "/Users/jonnen/.aftman/bin/luau-lsp",
8+
// "luau-lsp.server.path": "/Users/jonnen/.aftman/bin/luau-lsp",
9+
"luau-lsp.server.path": "/Users/jonnen/git/games/luau-lsp/cmake-build-debug/luau-lsp",
910
"luau-lsp.ignoreGlobs": ["**/node_modules/**"],
1011
"luau-lsp.fflags.enableNewSolver": false,
1112
"[lua]": {

aftman.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# To add a new tool, add an entry to this table.
55
[tools]
6-
luau-lsp = "Quenty/luau-lsp@1.42.0-quenty.1"
6+
luau-lsp = "Quenty/luau-lsp@1.45.0-quenty"
77
lune = "lune-org/lune@0.8.9"
88
mantle = "blake-mealey/mantle@0.10.7"
99
moonwave-extractor = "UpliftGames/moonwave@1.3.0"

foreman.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[tools]
2+
rojo = { github = "quenty/rojo", version = "=7.4.3-quenty-npm-canary.2" }
3+
luau-lsp = { github = "quenty/luau-lsp", version = "=1.45.0-quenty" }

games/integration/modules/Client/Button/LookAtButtonsClient.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ local AdorneeUtils = require("AdorneeUtils")
1616
local Maid = require("Maid")
1717
local IKServiceClient = require("IKServiceClient")
1818
local IKAimPositionPriorites = require("IKAimPositionPriorites")
19+
local ServiceBag = require("ServiceBag")
1920

2021
local LOOK_NEAR_DISTANCE = 15
2122

2223
local LookAtButtonsClient = setmetatable({}, BaseObject)
2324
LookAtButtonsClient.ClassName = "LookAtButtonsClient"
2425
LookAtButtonsClient.__index = LookAtButtonsClient
2526

26-
function LookAtButtonsClient.new(humanoid, serviceBag)
27+
function LookAtButtonsClient.new(humanoid, serviceBag: ServiceBag.ServiceBag)
2728
local self = setmetatable(BaseObject.new(humanoid), LookAtButtonsClient)
2829

2930
self._serviceBag = assert(serviceBag, "No serviceBag")

games/integration/modules/Client/GameBindersClient.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ local require = require(script.Parent.loader).load(script)
66

77
local Binder = require("Binder")
88
local BinderProvider = require("BinderProvider")
9-
local _ServiceBag = require("ServiceBag")
9+
local ServiceBag = require("ServiceBag")
1010

11-
return BinderProvider.new(script.Name, function(self, serviceBag: _ServiceBag.ServiceBag)
11+
return BinderProvider.new(script.Name, function(self, serviceBag: ServiceBag.ServiceBag)
1212
self:Add(Binder.new("PhysicalButton", require("PhysicalButtonClient"), serviceBag))
1313
self:Add(Binder.new("LookAtButtons", require("LookAtButtonsClient"), serviceBag))
1414
end)

games/integration/modules/Client/GameServiceClient.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
local require = require(script.Parent.loader).load(script)
66

7-
local _ServiceBag = require("ServiceBag")
7+
local ServiceBag = require("ServiceBag")
88

99
local GameServiceClient = {}
1010
GameServiceClient.ServiceName = "GameServiceClient"
1111

12-
function GameServiceClient:Init(serviceBag: _ServiceBag.ServiceBag)
12+
function GameServiceClient:Init(serviceBag: ServiceBag.ServiceBag)
1313
self._serviceBag = assert(serviceBag, "No serviceBag")
1414

1515
-- External

games/integration/modules/Server/GameBindersServer.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ local require = require(script.Parent.loader).load(script)
77
local Binder = require("Binder")
88
local BinderProvider = require("BinderProvider")
99
local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
10+
local ServiceBag = require("ServiceBag")
1011

11-
return BinderProvider.new(script.Name, function(self, serviceBag)
12+
return BinderProvider.new(script.Name, function(self, serviceBag: ServiceBag.ServiceBag)
1213
self:Add(Binder.new("PhysicalButton", require("PhysicalButton"), serviceBag))
1314
self:Add(PlayerHumanoidBinder.new("LookAtButtons", require("LookAtButtons"), serviceBag))
1415
end)

games/integration/modules/Server/GameServiceServer.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
local require = require(script.Parent.loader).load(script)
66

7-
local _ServiceBag = require("ServiceBag")
7+
local ServiceBag = require("ServiceBag")
88

99
local GameServiceServer = {}
1010

11-
function GameServiceServer:Init(serviceBag: _ServiceBag.ServiceBag)
11+
function GameServiceServer:Init(serviceBag: ServiceBag.ServiceBag)
1212
self._serviceBag = assert(serviceBag, "No serviceBag")
1313

1414
-- External

src/actionmanager/src/Client/ActionManager.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ local ValueObject = require("ValueObject")
1616
local Signal = require("Signal")
1717
local Maid = require("Maid")
1818

19-
local ActionManager = setmetatable({}, {})
19+
local ActionManager = {}
2020
ActionManager.__index = ActionManager
2121
ActionManager.ClassName = "ActionManager"
2222

src/adorneeboundingbox/src/Shared/AdorneeBoundingBox.lua

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ local AdorneeModelBoundingBox = require("AdorneeModelBoundingBox")
99
local AdorneePartBoundingBox = require("AdorneePartBoundingBox")
1010
local BaseObject = require("BaseObject")
1111
local Maid = require("Maid")
12+
local Observable = require("Observable")
1213
local Rx = require("Rx")
1314
local RxBrioUtils = require("RxBrioUtils")
1415
local RxInstanceUtils = require("RxInstanceUtils")
1516
local RxPartBoundingBoxUtils = require("RxPartBoundingBoxUtils")
1617
local ValueObject = require("ValueObject")
17-
local _Observable = require("Observable")
1818

1919
local AdorneeBoundingBox = setmetatable({}, BaseObject)
2020
AdorneeBoundingBox.ClassName = "AdorneeBoundingBox"
@@ -73,7 +73,7 @@ export type BoundingBoxData = {
7373
Observes the bounding box of the adornee
7474
@return Observable<BoundingBoxData>
7575
]=]
76-
function AdorneeBoundingBox.ObserveBoundingBox(self: AdorneeBoundingBox): _Observable.Observable<BoundingBoxData>
76+
function AdorneeBoundingBox.ObserveBoundingBox(self: AdorneeBoundingBox): Observable.Observable<BoundingBoxData>
7777
return Rx.combineLatest({
7878
CFrame = self:ObserveCFrame(),
7979
Size = self:ObserveSize(),
@@ -106,7 +106,7 @@ end
106106
Observes the cframe of the adornee
107107
@return Observable<Vector3>
108108
]=]
109-
function AdorneeBoundingBox.ObserveCFrame(self: AdorneeBoundingBox): _Observable.Observable<CFrame?>
109+
function AdorneeBoundingBox.ObserveCFrame(self: AdorneeBoundingBox): Observable.Observable<CFrame?>
110110
return self._bbCFrame:Observe()
111111
end
112112

@@ -122,7 +122,7 @@ end
122122
Observes the size of the adornee
123123
@return Observable<Vector3>
124124
]=]
125-
function AdorneeBoundingBox.ObserveSize(self: AdorneeBoundingBox): _Observable.Observable<Vector3?>
125+
function AdorneeBoundingBox.ObserveSize(self: AdorneeBoundingBox): Observable.Observable<Vector3?>
126126
return self._bbSize:Observe()
127127
end
128128

@@ -198,13 +198,14 @@ function AdorneeBoundingBox._setupHumanoid(self: AdorneeBoundingBox, humanoid: H
198198
local topMaid = Maid.new()
199199

200200
topMaid:GiveTask(RxInstanceUtils.observePropertyBrio(humanoid, "Parent", function(parent: Instance)
201-
return parent:IsA("Model")
201+
return parent and parent:IsA("Model")
202202
end):Subscribe(function(brio)
203203
if brio:IsDead() then
204204
return
205205
end
206206

207207
local maid, model = brio:ToMaidAndValue()
208+
assert(typeof(model) == "Instance" and model:IsA("Model"), "Bad model")
208209

209210
maid:GiveTask(self:_setupModel(model))
210211
end))
@@ -236,8 +237,8 @@ function AdorneeBoundingBox._setupAttachment(self: AdorneeBoundingBox, attachmen
236237
else
237238
return Rx.of(nil)
238239
end
239-
end),
240-
RxBrioUtils.flattenToValueAndNil,
240+
end) :: any,
241+
RxBrioUtils.flattenToValueAndNil :: any,
241242
})
242243
:Subscribe(function(cframe)
243244
self._bbCFrame.Value = cframe

0 commit comments

Comments
 (0)