Merge pull request #23 from metrik-tech/feature/ENG-104

feature/eng 104: Implement 'Array' argument type.

Author: 4x8Matrix

Src/API/ActionBuilder.luau

@@ -74,7 +74,8 @@ function ActionBuilder.Prototype.AddArgument(self: ActionBuilder, argumentName:
 		Type = argumentMetadata and string.upper(argumentMetadata.Type or "STRING"),
 		Description = argumentMetadata and argumentMetadata.Description or "",
 		Required = argumentMetadata and argumentMetadata.Required or false,
-		Default = argumentMetadata and argumentMetadata.Default or ""
+		Default = argumentMetadata and argumentMetadata.Default or "",
+		IsArray = argumentMetadata and argumentMetadata.IsArray or false
 	}
 
 	table.insert(self.Prototype.ArgumentOrderedList, filteredArgumentName)
@@ -115,6 +116,7 @@ export type ArgumentMetadata = typeof(Action.Prototype) & {
 	Type: ("string" | "number" | "boolean")?,
 	Description: string?,
 	Required: boolean?,
+	IsArray: boolean?,
 	Default: any,
 }
 

Src/Services/ActionService.luau

@@ -26,6 +26,35 @@ ActionService.Reporter = Console.new(`{script.Name}`)
 
 ActionService.Actions = {}
 
+function ActionService.ParseArgument(self: ActionService, argumentData: any, serverArgumentData: any)
+	if serverArgumentData.array then
+		local arrayObject = {}
+		local jsonDecoded = HttpService:JSONDecode(serverArgumentData.value)
+
+		for _, value in jsonDecoded do
+			-- fixme: this is not nice, look into cleaning this code
+
+			table.insert(arrayObject, self:ParseArgument({
+				Type = argumentData.Type
+			}, {
+				value = value
+			}))
+		end
+	end
+	
+	if
+		argumentData.Type == ArgumentType.String
+		or argumentData.Type == ArgumentType.Number
+		or argumentData.Type == ArgumentType.Boolean
+	then
+		return serverArgumentData.value
+	elseif argumentData.Type == ArgumentType.Player then
+		return Players:GetPlayerByUserId(serverArgumentData.value)
+	end
+
+	return
+end
+
 function ActionService.RegisterActionAsync(self: ActionService, action: any)
 	local requestBody = {}
 
@@ -44,6 +73,7 @@ function ActionService.RegisterActionAsync(self: ActionService, action: any)
 		argumentBody.description = argumentObject.Description
 		argumentBody.required = argumentObject.Required
 		argumentBody.default = argumentObject.Default
+		argumentBody.array = argumentObject.IsArray
 		argumentBody.type = string.upper(argumentObject.Type)
 
 		table.insert(requestBody.arguments, argumentBody)
@@ -135,16 +165,14 @@ function ActionService.OnStart(self: ActionService)
 						return
 					end
 
-					if
-						argumentData.Type == ArgumentType.String
-						or argumentData.Type == ArgumentType.Number
-						or argumentData.Type == ArgumentType.Boolean
-					then
-						argumentValue = serverArgumentData.value
-					elseif argumentData.Type == ArgumentType.Player then
-						argumentValue = Players:GetPlayerByUserId(serverArgumentData.value)
+					if serverArgumentData.array ~= argumentData.IsArray then
+						self.Reporter:Warn(`Argument '{argumentName}' has invalid types! Dropping Action request!`)
+					
+						return
 					end
 
+					argumentValue = self:ParseArgument(argumentData, serverArgumentData)
+
 					table.insert(sanitizedArguments, argumentValue)
 				else
 					if argumentData.Required then