Merge pull request #626 from Quenty/users/quenty/vscode-extension

ci: Fix CI for Nevermore VSCode extension

Author: Quenty

.github/workflows/extension-release.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - run: npm ci
-        working-directory: tools/nevrmoree-vscode
+        working-directory: tools/nevermore-vscode
 
       - name: Publish VSCode Extension
         working-directory: tools/nevermore-vscode

src/buttonhighlightmodel/src/Client/ButtonHighlightModel.lua

@@ -194,7 +194,7 @@ end
 	Sets the button for the highlight model.
 	@param button
 ]=]
-function ButtonHighlightModel.SetButton(self: ButtonHighlightModel, button: GuiObject?)
+function ButtonHighlightModel.SetButton(self: ButtonHighlightModel, button: GuiObject?): () -> ()
 	assert(typeof(button) == "Instance" or button == nil, "Bad button")
 
 	local maid = Maid.new()
@@ -276,7 +276,7 @@ function ButtonHighlightModel._trackIfButtonMovedOutFromMouse(
 	self: ButtonHighlightModel,
 	maid: Maid.Maid,
 	button: GuiObject
-)
+): ()
 	maid:GiveTask(button.InputChanged:Connect(function(inputObject: InputObject)
 		if inputObject.UserInputType == Enum.UserInputType.MouseMovement then
 			self._lastMousePositionForScrollingCheck.Value = inputObject.Position
@@ -449,7 +449,7 @@ end
 	@param isChoosen boolean
 	@param doNotAnimate boolean
 ]=]
-function ButtonHighlightModel.SetIsChoosen(self: ButtonHighlightModel, isChoosen: boolean, doNotAnimate: boolean?)
+function ButtonHighlightModel.SetIsChoosen(self: ButtonHighlightModel, isChoosen: boolean, doNotAnimate: boolean?): ()
 	assert(type(isChoosen) == "boolean", "Bad isChoosen")
 
 	self._isChoosen:SetValue(isChoosen, doNotAnimate)
@@ -510,8 +510,8 @@ end
 	Sets whether interaction is enabled
 	@param interactionEnabled boolean
 ]=]
-function ButtonHighlightModel.SetInteractionEnabled(self: ButtonHighlightModel, interactionEnabled: boolean)
-	self._interactionEnabled:Mount(interactionEnabled)
+function ButtonHighlightModel.SetInteractionEnabled(self: ButtonHighlightModel, interactionEnabled: boolean): () -> ()
+	return self._interactionEnabled:Mount(interactionEnabled)
 end
 
 --[=[
@@ -535,13 +535,13 @@ end
 	@param isKeyDown boolean
 	@param doNotAnimate boolean -- Optional
 ]=]
-function ButtonHighlightModel.SetKeyDown(self: ButtonHighlightModel, isKeyDown: boolean, doNotAnimate: boolean?)
+function ButtonHighlightModel.SetKeyDown(self: ButtonHighlightModel, isKeyDown: boolean, doNotAnimate: boolean?): ()
 	assert(type(isKeyDown) == "boolean", "Bad isKeyDown")
 
 	self._isKeyDown:SetValue(isKeyDown, doNotAnimate)
 end
 
-function ButtonHighlightModel._trackTouch(self: ButtonHighlightModel, inputObject: InputObject)
+function ButtonHighlightModel._trackTouch(self: ButtonHighlightModel, inputObject: InputObject): ()
 	if inputObject.UserInputState == Enum.UserInputState.End then
 		return
 	end
@@ -564,12 +564,12 @@ function ButtonHighlightModel._trackTouch(self: ButtonHighlightModel, inputObjec
 	self._maid[inputObject] = maid
 end
 
-function ButtonHighlightModel._stopTouchTrack(self: ButtonHighlightModel, inputObject: InputObject)
+function ButtonHighlightModel._stopTouchTrack(self: ButtonHighlightModel, inputObject: InputObject): ()
 	-- Clears the input tracking as we slide off the button
 	self._maid[inputObject] = nil
 end
 
-function ButtonHighlightModel._updateTargets(self: ButtonHighlightModel)
+function ButtonHighlightModel._updateTargets(self: ButtonHighlightModel): ()
 	self._isMouseOrTouchOver.Value = self._isMouseOver.Value or self._numFingerDown.Value > 0
 
 	-- Assume event emission can lead to cleanup in middle of call
@@ -594,7 +594,7 @@ function ButtonHighlightModel._update(self: ButtonHighlightModel): boolean
 	)
 end
 
-function ButtonHighlightModel._setupLegacySteppedMode(self: ButtonHighlightModel)
+function ButtonHighlightModel._setupLegacySteppedMode(self: ButtonHighlightModel): ()
 	self._percentHighlightedAccelTween = AccelTween.new(200)
 	self._percentHighlightedAccelTween.t = 0
 	self._percentHighlightedAccelTween.p = 0

src/rogue-properties/src/Shared/Implementation/RogueProperty.lua

@@ -481,7 +481,7 @@ function RogueProperty:ObserveBrio(predicate)
 	})
 end
 
-function RogueProperty:CreateMultiplier(amount: number, source)
+function RogueProperty:CreateMultiplier(amount: number, source): Instance?
 	assert(type(amount) == "number", "Bad amount")
 
 	local className = ValueBaseUtils.getClassNameFromType(typeof(amount))

src/settings/src/Server/Player/PlayerSettings.lua

@@ -52,7 +52,7 @@ function PlayerSettings.new(folder: Folder, serviceBag: ServiceBag.ServiceBag):
 	return self
 end
 
-function PlayerSettings.EnsureInitialized(self: PlayerSettings, settingName: string, defaultValue)
+function PlayerSettings.EnsureInitialized<T>(self: PlayerSettings, settingName: string, defaultValue: T): ()
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 
@@ -68,7 +68,7 @@ function PlayerSettings.EnsureInitialized(self: PlayerSettings, settingName: str
 
 		-- Paranoid UTF8 check
 		if type(encoded) == "string" then
-			assert(DataStoreStringUtils.isValidUTF8(defaultValue), "Bad UTF8 defaultValue")
+			assert(DataStoreStringUtils.isValidUTF8(encoded), "Bad UTF8 defaultValue")
 		end
 
 		self._obj:SetAttribute(attributeName, encoded)

src/settings/src/Shared/Player/PlayerSettingsBase.lua

@@ -9,11 +9,13 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local DataStoreStringUtils = require("DataStoreStringUtils")
+local Observable = require("Observable")
 local PlayerSettingsUtils = require("PlayerSettingsUtils")
 local Rx = require("Rx")
 local RxAttributeUtils = require("RxAttributeUtils")
 local ServiceBag = require("ServiceBag")
 local SettingDefinition = require("SettingDefinition")
+local SettingProperty = require("SettingProperty")
 
 local PlayerSettingsBase = setmetatable({}, BaseObject)
 PlayerSettingsBase.ClassName = "PlayerSettingsBase"
@@ -65,16 +67,23 @@ end
 	consider using the setting definitions in a centralized location.
 
 	@param settingName string
-	@param defaultValue any
-	@return SettingProperty
+	@param defaultValue T
+	@return SettingProperty.SettingProperty<T>
 ]=]
-function PlayerSettingsBase.GetSettingProperty(self: PlayerSettingsBase, settingName: string, defaultValue)
+function PlayerSettingsBase.GetSettingProperty<T>(
+	self: PlayerSettingsBase,
+	settingName: string,
+	defaultValue: T
+): SettingProperty.SettingProperty<T>
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 
 	self:EnsureInitialized(settingName, defaultValue)
 
-	return SettingDefinition.new(settingName, defaultValue):GetSettingProperty(self._serviceBag, self:GetPlayer())
+	local player = self:GetPlayer()
+	assert(player ~= nil, "No player found for settings")
+
+	return SettingDefinition.new(settingName, defaultValue):GetSettingProperty(self._serviceBag, player)
 end
 
 --[=[
@@ -84,7 +93,7 @@ end
 	@param defaultValue any
 	@return any
 ]=]
-function PlayerSettingsBase.GetValue(self: PlayerSettingsBase, settingName: string, defaultValue)
+function PlayerSettingsBase.GetValue<T>(self: PlayerSettingsBase, settingName: string, defaultValue: T): T
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
@@ -108,7 +117,7 @@ end
 	@param value any
 	@return any
 ]=]
-function PlayerSettingsBase.SetValue(self: PlayerSettingsBase, settingName: string, value)
+function PlayerSettingsBase.SetValue<T>(self: PlayerSettingsBase, settingName: string, value: T): ()
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
 
@@ -124,7 +133,11 @@ end
 	@param defaultValue any
 	@return Observable<any>
 ]=]
-function PlayerSettingsBase.ObserveValue(self: PlayerSettingsBase, settingName: string, defaultValue)
+function PlayerSettingsBase.ObserveValue<T>(
+	self: PlayerSettingsBase,
+	settingName: string,
+	defaultValue: T
+): Observable.Observable<T>
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
@@ -144,7 +157,7 @@ end
 	@param settingName string
 	@param defaultValue T
 ]=]
-function PlayerSettingsBase.RestoreDefault(self: PlayerSettingsBase, settingName: string, defaultValue)
+function PlayerSettingsBase.RestoreDefault<T>(self: PlayerSettingsBase, settingName: string, defaultValue: T): ()
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")
 
@@ -158,7 +171,7 @@ end
 	@param settingName string
 	@param defaultValue any
 ]=]
-function PlayerSettingsBase.EnsureInitialized(_self: PlayerSettingsBase, settingName: string, defaultValue)
+function PlayerSettingsBase.EnsureInitialized<T>(_self: PlayerSettingsBase, settingName: string, defaultValue: T): ()
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "defaultValue cannot be nil")
 	assert(DataStoreStringUtils.isValidUTF8(settingName), "Bad settingName")

src/settings/src/Shared/Setting/SettingDefinition.lua

@@ -1,4 +1,4 @@
---!nonstrict
+--!strict
 --[=[
 	These settings definitions are used to define a setting and register them on both the client and server. See
 	[SettingDefinitionProvider] for more details on grouping these.
@@ -25,6 +25,8 @@ local Players = game:GetService("Players")
 
 local DuckTypeUtils = require("DuckTypeUtils")
 local Maid = require("Maid")
+local Observable = require("Observable")
+local Promise = require("Promise")
 local ServiceBag = require("ServiceBag")
 local SettingProperty = require("SettingProperty")
 local SettingsDataService = require("SettingsDataService")
@@ -34,18 +36,29 @@ SettingDefinition.ClassName = "SettingDefinition"
 SettingDefinition.ServiceName = "SettingDefinition"
 SettingDefinition.__index = SettingDefinition
 
+export type SettingDefinition<T> = typeof(setmetatable(
+	{} :: {
+		_settingName: string,
+		_defaultValue: T,
+		_maid: Maid.Maid,
+		_serviceBag: ServiceBag.ServiceBag,
+		ServiceName: string,
+	},
+	{} :: typeof({ __index = SettingDefinition })
+))
+
 --[=[
 	Constructs a new setting definition which defines the name and the defaultValue
 
 	@param settingName string
 	@param defaultValue T
 	@return SettingDefinition<T>
 ]=]
-function SettingDefinition.new(settingName, defaultValue)
+function SettingDefinition.new<T>(settingName: string, defaultValue: T): SettingDefinition<T>
 	assert(type(settingName) == "string", "Bad settingName")
 	assert(defaultValue ~= nil, "DefaultValue cannot be nil")
 
-	local self = setmetatable({}, SettingDefinition)
+	local self: SettingDefinition<T> = setmetatable({} :: any, SettingDefinition)
 
 	self._settingName = settingName
 	self._defaultValue = defaultValue
@@ -60,9 +73,9 @@ end
 
 	@param serviceBag ServiceBag
 ]=]
-function SettingDefinition:Init(serviceBag: ServiceBag.ServiceBag)
+function SettingDefinition.Init<T>(self: SettingDefinition<T>, serviceBag: ServiceBag.ServiceBag)
 	assert(serviceBag, "No serviceBag")
-	assert(not self._maid, "Already initialized")
+	assert(not (self :: any)._maid, "Already initialized")
 
 	self._maid = Maid.new()
 	self._serviceBag = assert(serviceBag, "No serviceBag")
@@ -77,11 +90,11 @@ end
 	@param player Player
 	@return T
 ]=]
-function SettingDefinition:Get(player: Player)
+function SettingDefinition.Get<T>(self: SettingDefinition<T>, player: Player): T
 	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
 	assert(self._serviceBag, "Retrieve from serviceBag")
 
-	return self:GetSettingProperty(self._serviceBag, player):GetValue()
+	return self:GetSettingProperty(self._serviceBag, player).Value
 end
 
 --[=[
@@ -90,7 +103,7 @@ end
 	@param player Player
 	@param value T
 ]=]
-function SettingDefinition:Set(player: Player, value)
+function SettingDefinition.Set<T>(self: SettingDefinition<T>, player: Player, value: T): ()
 	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
 	assert(self._serviceBag, "Retrieve from serviceBag")
 
@@ -103,7 +116,7 @@ end
 	@param player Player
 	@return Promise<T>
 ]=]
-function SettingDefinition:Promise(player: Player)
+function SettingDefinition.Promise<T>(self: SettingDefinition<T>, player: Player): Promise.Promise<T>
 	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
 	assert(self._serviceBag, "Retrieve from serviceBag")
 
@@ -117,7 +130,7 @@ end
 	@param value T
 	@return Promise<T>
 ]=]
-function SettingDefinition:PromiseSet(player: Player, value)
+function SettingDefinition.PromiseSet<T>(self: SettingDefinition<T>, player: Player, value: T): Promise.Promise<()>
 	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
 	assert(self._serviceBag, "Retrieve from serviceBag")
 
@@ -130,7 +143,7 @@ end
 	@param player Player
 	@return Promise<T>
 ]=]
-function SettingDefinition:Observe(player: Player)
+function SettingDefinition.Observe<T>(self: SettingDefinition<T>, player: Player): Observable.Observable<T>
 	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
 	assert(self._serviceBag, "Retrieve from serviceBag")
 
@@ -154,7 +167,11 @@ end
 	@param player Player
 	@return SettingProperty<T>
 ]=]
-function SettingDefinition:GetSettingProperty(serviceBag, player: Player)
+function SettingDefinition.GetSettingProperty<T>(
+	self: SettingDefinition<T>,
+	serviceBag: ServiceBag.ServiceBag,
+	player: Player
+): SettingProperty.SettingProperty<T>
 	assert(ServiceBag.isServiceBag(serviceBag), "Bad serviceBag")
 	assert(typeof(player) == "Instance" and player:IsA("Player") or player == nil, "Bad player")
 
@@ -169,7 +186,10 @@ end
 	@param serviceBag ServiceBag
 	@return SettingProperty<T>
 ]=]
-function SettingDefinition:GetLocalPlayerSettingProperty(serviceBag)
+function SettingDefinition.GetLocalPlayerSettingProperty<T>(
+	self: SettingDefinition<T>,
+	serviceBag: ServiceBag.ServiceBag
+): SettingProperty.SettingProperty<T>
 	assert(ServiceBag.isServiceBag(serviceBag), "Bad serviceBag")
 
 	return self:GetSettingProperty(serviceBag, Players.LocalPlayer)
@@ -179,19 +199,19 @@ end
 	Retrieves the default name of the setting
 	@return string
 ]=]
-function SettingDefinition:GetSettingName(): string
+function SettingDefinition.GetSettingName<T>(self: SettingDefinition<T>): string
 	return self._settingName
 end
 
 --[=[
 	Retrieves the default value for the setting
 	@return T
 ]=]
-function SettingDefinition:GetDefaultValue()
+function SettingDefinition.GetDefaultValue<T>(self: SettingDefinition<T>): T
 	return self._defaultValue
 end
 
-function SettingDefinition:Destroy()
+function SettingDefinition.Destroy<T>(self: SettingDefinition<T>): ()
 	self._maid:DoCleaning()
 end
 

src/settings/src/Shared/Setting/SettingProperty.lua

@@ -130,7 +130,7 @@ end
 
 	@param value T
 ]=]
-function SettingProperty.SetValue<T>(self: SettingProperty<T>, value: T)
+function SettingProperty.SetValue<T>(self: SettingProperty<T>, value: T): ()
 	local settings = self:_getPlayerSettings()
 	if settings then
 		settings:SetValue(self._definition:GetSettingName(), value)

src/soundgroups/package.json

@@ -26,16 +26,20 @@
   ],
   "dependencies": {
     "@quenty/baseobject": "file:../baseobject",
+    "@quenty/binder": "file:../binder",
     "@quenty/brio": "file:../brio",
     "@quenty/counter": "file:../counter",
     "@quenty/instanceutils": "file:../instanceutils",
     "@quenty/loader": "file:../loader",
     "@quenty/maid": "file:../maid",
     "@quenty/observablecollection": "file:../observablecollection",
+    "@quenty/promise": "file:../promise",
+    "@quenty/rogue-properties": "file:../rogue-properties",
     "@quenty/rx": "file:../rx",
     "@quenty/servicebag": "file:../servicebag",
     "@quenty/signal": "file:../signal",
     "@quenty/table": "file:../table",
+    "@quenty/tie": "file:../tie",
     "@quenty/valueobject": "file:../valueobject"
   },
   "publishConfig": {