@rbxts/centurion-ui 1.0.0-dev-47fa67f → 1.0.0-dev-84057f1

package/out/components/suggestions/suggestion-list.lua

@@ -1,7 +1,9 @@
 -- Compiled with roblox-ts v2.3.0-dev-26ec859
 local TS = _G[script]
+local ArrayUtil = TS.import(script, TS.getModule(script, "@rbxts", "centurion").out.shared.util.data).ArrayUtil
 local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
 local Vide = _vide
+local derive = _vide.derive
 local For = _vide.For
 local read = _vide.read
 local SUGGESTION_TEXT_SIZE = TS.import(script, script.Parent.Parent.Parent, "constants", "text").SUGGESTION_TEXT_SIZE
@@ -15,11 +17,23 @@ local Group = TS.import(script, script.Parent.Parent, "ui", "group").Group
 local Padding = TS.import(script, script.Parent.Parent, "ui", "padding").Padding
 local Text = TS.import(script, script.Parent.Parent, "ui", "text").Text
 local highlightMatching = TS.import(script, script.Parent, "util").highlightMatching
+local MAX_SUGGESTIONS = 3
 local function SuggestionList(_param)
 	local suggestion = _param.suggestion
 	local currentText = _param.currentText
 	local size = _param.size
 	local options = useAtom(interfaceOptions)
+	local suggestions = derive(function()
+		local _result = read(suggestion)
+		if _result ~= nil then
+			_result = _result.others
+		end
+		local _condition = _result
+		if _condition == nil then
+			_condition = {}
+		end
+		return ArrayUtil.slice(_condition, 0, MAX_SUGGESTIONS)
+	end)
 	return Vide.jsx(Group, {
 		size = size,
 		mouseEnter = function()
@@ -34,17 +48,7 @@ local function SuggestionList(_param)
 			return UDim.new(0, px(8))
 		end,
 	}), Vide.jsx(For, {
-		each = function()
-			local _result = read(suggestion)
-			if _result ~= nil then
-				_result = _result.others
-			end
-			local _condition = _result
-			if _condition == nil then
-				_condition = {}
-			end
-			return _condition
-		end,
+		each = suggestions,
 	}, function(name, i)
 		return Vide.jsx(Frame, {
 			size = function()
@@ -64,6 +68,7 @@ local function SuggestionList(_param)
 				return UDim.new(0, px(8))
 			end,
 			clipsDescendants = true,
+			layoutOrder = i,
 		}, Vide.jsx(Padding, {
 			all = function()
 				return UDim.new(0, px(4))

package/out/components/terminal/command.d.ts

@@ -0,0 +1,5 @@
+import { BaseRegistry, ImmutableRegistryPath, RegistryPath } from "@rbxts/centurion";
+import { BaseCommand } from "@rbxts/centurion/out/shared/core/command";
+export declare function getValidPath(registry: BaseRegistry, text: string[]): ImmutableRegistryPath | undefined;
+export declare function getArgumentNames(registry: BaseRegistry, path: RegistryPath): string[];
+export declare function getMissingArgs(command: BaseCommand, text: string[]): string[];

package/out/components/terminal/command.lua

@@ -0,0 +1,71 @@
+-- Compiled with roblox-ts v2.3.0-dev-26ec859
+local TS = _G[script]
+local _centurion = TS.import(script, TS.getModule(script, "@rbxts", "centurion").out)
+local ImmutableRegistryPath = _centurion.ImmutableRegistryPath
+local RegistryPath = _centurion.RegistryPath
+local formatPartsAsPath = TS.import(script, TS.getModule(script, "@rbxts", "centurion").out.shared.util.string).formatPartsAsPath
+local IS_EDIT = TS.import(script, script.Parent.Parent.Parent, "constants", "util").IS_EDIT
+local function getValidPath(registry, text)
+	if #text == 0 then
+		return nil
+	end
+	local textPath = formatPartsAsPath(text)
+	if registry:getCommandByString(textPath) ~= nil or registry:getGroupByString(textPath) ~= nil then
+		return ImmutableRegistryPath:fromString(textPath)
+	end
+	local path = RegistryPath:empty()
+	for _, part in text do
+		path:append(part)
+		if registry:getCommand(path) == nil and registry:getGroup(path) == nil and #registry:getChildPaths(path) == 0 then
+			path:remove(path:size() - 1)
+			break
+		end
+	end
+	if registry:getCommand(path) ~= nil or registry:getGroup(path) ~= nil then
+		return ImmutableRegistryPath:fromPath(path)
+	end
+end
+local function getArgumentNames(registry, path)
+	if IS_EDIT then
+		return {}
+	end
+	local command = registry:getCommand(path)
+	if command == nil or command.options.arguments == nil then
+		return {}
+	end
+	local _exp = command.options.arguments
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#_exp)
+	local _callback = function(arg)
+		return arg.name
+	end
+	for _k, _v in _exp do
+		_newValue[_k] = _callback(_v, _k - 1, _exp)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	return _newValue
+end
+local function getMissingArgs(command, text)
+	if command.options.arguments == nil or #command.options.arguments == 0 then
+		return {}
+	end
+	local lastPartIndex = #text - command:getPath():size() - 1
+	local missingArgs = {}
+	local index = 0
+	for _, arg in command.options.arguments do
+		if arg.optional then
+			break
+		end
+		if index > lastPartIndex then
+			local _name = arg.name
+			table.insert(missingArgs, _name)
+		end
+		index += 1
+	end
+	return missingArgs
+end
+return {
+	getValidPath = getValidPath,
+	getArgumentNames = getArgumentNames,
+	getMissingArgs = getMissingArgs,
+}

package/out/components/terminal/suggestion.d.ts

@@ -0,0 +1,26 @@
+import { ArgumentOptions, BaseRegistry, ListArgumentType, RegistryPath, SingleArgumentType } from "@rbxts/centurion";
+import { ReadonlyDeep } from "@rbxts/centurion/out/shared/util/data";
+import { CommandSuggestion } from "../../types";
+export interface SingleArgument {
+    kind: "single";
+    options: ReadonlyDeep<ArgumentOptions>;
+    type: SingleArgumentType<unknown>;
+    input?: string;
+}
+export interface ListArgument {
+    kind: "list";
+    options: ReadonlyDeep<ArgumentOptions>;
+    type: ListArgumentType<unknown>;
+    input: string[];
+}
+export type Argument = SingleArgument | ListArgument;
+export declare function getArgumentSuggestion(arg: Argument, textPart?: string): {
+    type: "argument";
+    title: string;
+    others: string[];
+    description: string;
+    dataType: string;
+    optional: boolean;
+    error: string | undefined;
+};
+export declare function getCommandSuggestion(registry: BaseRegistry, parentPath?: RegistryPath, text?: string): CommandSuggestion | undefined;

package/out/components/terminal/suggestion.lua

@@ -0,0 +1,187 @@
+-- Compiled with roblox-ts v2.3.0-dev-26ec859
+local TS = _G[script]
+local Players = TS.import(script, TS.getModule(script, "@rbxts", "services")).Players
+local MAX_OTHER_SUGGESTIONS = 3
+local function getMatches(strings, text)
+	if text == nil then
+		table.sort(strings)
+		-- ▼ ReadonlyArray.map ▼
+		local _newValue = table.create(#strings)
+		local _callback = function(str, i)
+			return { i, str, #str }
+		end
+		for _k, _v in strings do
+			_newValue[_k] = _callback(_v, _k - 1, strings)
+		end
+		-- ▲ ReadonlyArray.map ▲
+		return _newValue
+	end
+	local textLower = string.lower(text)
+	local textEndIndex = #text
+	-- ▼ ReadonlyArray.mapFiltered ▼
+	local _newValue = {}
+	local _callback = function(str, i)
+		local part = string.sub(string.lower(str), 0, textEndIndex)
+		if part == textLower then
+			return { i, str, #str }
+		end
+	end
+	local _length = 0
+	for _k, _v in strings do
+		local _result = _callback(_v, _k - 1, strings)
+		if _result ~= nil then
+			_length += 1
+			_newValue[_length] = _result
+		end
+	end
+	-- ▲ ReadonlyArray.mapFiltered ▲
+	table.sort(_newValue, function(a, b)
+		return a[2] < b[2]
+	end)
+	return _newValue
+end
+local function getArgumentSuggestion(arg, textPart)
+	local _array = {}
+	local _length = #_array
+	local _array_1 = (arg.options.suggestions or {})
+	table.move(_array_1, 1, #_array_1, _length + 1, _array)
+	local suggestions = _array
+	local singleArg = arg.kind == "single"
+	local _result
+	if singleArg then
+		local _result_1 = arg.type.suggestions
+		if _result_1 ~= nil then
+			local _condition = arg.input
+			if _condition == nil then
+				_condition = ""
+			end
+			_result_1 = _result_1(_condition, Players.LocalPlayer)
+		end
+		_result = _result_1
+	else
+		local _result_1 = arg.type.suggestions
+		if _result_1 ~= nil then
+			_result_1 = _result_1(arg.input, Players.LocalPlayer)
+		end
+		_result = _result_1
+	end
+	local typeSuggestions = _result
+	if typeSuggestions ~= nil then
+		for _, text in typeSuggestions do
+			table.insert(suggestions, text)
+		end
+	end
+	local errorText
+	if not arg.type.expensive then
+		local success, err = pcall(function()
+			local _result_1
+			if singleArg then
+				local _type = arg.type
+				local _condition = arg.input
+				if _condition == nil then
+					_condition = ""
+				end
+				_result_1 = _type.transform(_condition, Players.LocalPlayer)
+			else
+				_result_1 = arg.type.transform(arg.input, Players.LocalPlayer)
+			end
+			local transformResult = _result_1
+			if transformResult.ok then
+				return nil
+			end
+			errorText = transformResult.value
+		end)
+		if not success then
+			errorText = "Failed to transform argument"
+			warn(err)
+		end
+	end
+	local _object = {
+		type = "argument",
+		title = arg.options.name,
+	}
+	local _left = "others"
+	local _exp = getMatches(suggestions, textPart)
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#_exp)
+	local _callback = function(_param)
+		local str = _param[2]
+		return str
+	end
+	for _k, _v in _exp do
+		_newValue[_k] = _callback(_v, _k - 1, _exp)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	_object[_left] = _newValue
+	_object.description = arg.options.description
+	_object.dataType = arg.type.name
+	local _left_1 = "optional"
+	local _condition = arg.options.optional
+	if _condition == nil then
+		_condition = false
+	end
+	_object[_left_1] = _condition
+	_object.error = errorText
+	return _object
+end
+local function getCommandSuggestion(registry, parentPath, text)
+	local paths = if parentPath ~= nil then registry:getChildPaths(parentPath) else registry:getRootPaths()
+	if #paths == 0 then
+		return nil
+	end
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue = table.create(#paths)
+	local _callback = function(path)
+		return path:tail()
+	end
+	for _k, _v in paths do
+		_newValue[_k] = _callback(_v, _k - 1, paths)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	local pathNames = _newValue
+	local sortedPaths = getMatches(pathNames, text)
+	local firstMatch = table.remove(sortedPaths, 1)
+	if firstMatch == nil then
+		return nil
+	end
+	local firstPath = paths[firstMatch[1] + 1]
+	local _result = registry:getCommand(firstPath)
+	if _result ~= nil then
+		_result = _result.options
+	end
+	local _condition = _result
+	if _condition == nil then
+		local _result_1 = registry:getGroup(firstPath)
+		if _result_1 ~= nil then
+			_result_1 = _result_1.options
+		end
+		_condition = _result_1
+	end
+	local mainData = _condition
+	if mainData == nil then
+		return nil
+	end
+	local _object = {
+		type = "command",
+		title = firstPath:tail(),
+	}
+	local _left = "others"
+	-- ▼ ReadonlyArray.map ▼
+	local _newValue_1 = table.create(#sortedPaths)
+	local _callback_1 = function(_param)
+		local str = _param[2]
+		return str
+	end
+	for _k, _v in sortedPaths do
+		_newValue_1[_k] = _callback_1(_v, _k - 1, sortedPaths)
+	end
+	-- ▲ ReadonlyArray.map ▲
+	_object[_left] = _newValue_1
+	_object.description = mainData.description
+	_object.shortcuts = mainData.shortcuts
+	return _object
+end
+return {
+	getArgumentSuggestion = getArgumentSuggestion,
+	getCommandSuggestion = getCommandSuggestion,
+}

package/out/components/terminal/terminal-text-field.lua

@@ -15,19 +15,21 @@ local useAtom = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-ato
 local useEvent = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-event").useEvent
 local px = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-px").px
 local _store = TS.import(script, script.Parent.Parent.Parent, "store")
-local currentArgIndex = _store.currentArgIndex
+local commandArgIndex = _store.commandArgIndex
 local currentCommandPath = _store.currentCommandPath
 local currentSuggestion = _store.currentSuggestion
+local currentTextPart = _store.currentTextPart
 local interfaceOptions = _store.interfaceOptions
 local interfaceVisible = _store.interfaceVisible
+local terminalArgIndex = _store.terminalArgIndex
 local terminalText = _store.terminalText
 local terminalTextParts = _store.terminalTextParts
 local terminalTextValid = _store.terminalTextValid
-local getArgumentNames = TS.import(script, script.Parent.Parent.Parent, "util", "argument").getArgumentNames
 local Frame = TS.import(script, script.Parent.Parent, "ui", "frame").Frame
 local Padding = TS.import(script, script.Parent.Parent, "ui", "padding").Padding
 local Text = TS.import(script, script.Parent.Parent, "ui", "text").Text
 local TextField = TS.import(script, script.Parent.Parent, "ui", "text-field").TextField
+local getArgumentNames = TS.import(script, script.Parent, "command").getArgumentNames
 local TEXT_SIZE = 22
 local function TerminalTextField(_param)
 	local anchorPoint = _param.anchorPoint
@@ -96,27 +98,40 @@ local function TerminalTextField(_param)
 		end
 		local atNextPart = endsWithSpace(terminalText())
 		local textParts = terminalTextParts()
-		local suggestionStartIndex = if #textParts > 0 then (if not atNextPart then #textParts[#textParts] else 0) + 1 else -1
-		if suggestion.type == "command" and suggestionStartIndex > -1 then
+		if #textParts == 0 then
+			suggestionText(suggestion.title)
+			return nil
+		end
+		-- Command suggestions
+		if suggestion.type == "command" then
+			local suggestionStartIndex = (if not atNextPart then #textParts[#textParts] else 0) + 1
 			suggestionText(text() .. string.sub(suggestion.title, suggestionStartIndex))
 			return nil
 		end
+		-- Argument suggestions
 		local command = currentCommandPath()
-		local argIndex = currentArgIndex()
+		local argIndex = terminalArgIndex()
 		if suggestion.type ~= "argument" or command == nil or argIndex == nil then
 			return nil
 		end
 		local newText = text()
-		local argNames = getArgumentNames(api.registry, command)
-		for i = argIndex, #argNames - 1 do
-			if i == argIndex and not atNextPart then
-				if not (#suggestion.others == 0) then
-					newText ..= string.sub(suggestion.others[1], suggestionStartIndex)
-				end
-				newText ..= " "
-				continue
+		if atNextPart and argIndex == commandArgIndex() then
+			newText ..= suggestion.title
+		elseif not (#suggestion.others == 0) then
+			local _exp = suggestion.others[1]
+			local _result = currentTextPart()
+			if _result ~= nil then
+				_result = #_result
+			end
+			local _condition = _result
+			if _condition == nil then
+				_condition = 0
 			end
-			newText = `{newText}{argNames[i + 1]} `
+			newText ..= string.sub(_exp, _condition + 1)
+		end
+		local argNames = getArgumentNames(api.registry, command)
+		for i = argIndex + 1, #argNames - 1 do
+			newText = `{newText} {argNames[i + 1]}`
 		end
 		suggestionText(newText)
 	end)
@@ -142,30 +157,37 @@ local function TerminalTextField(_param)
 		if input.KeyCode ~= Enum.KeyCode.Tab then
 			return nil
 		end
-		-- Handle command suggestions
+		-- Command suggestions
 		local commandPath = currentCommandPath()
 		local suggestion = currentSuggestion()
+		if suggestion == nil then
+			return nil
+		end
 		if commandPath == nil then
-			local _suggestionTitle = suggestion
-			if _suggestionTitle ~= nil then
-				_suggestionTitle = _suggestionTitle.title
-			end
-			local suggestionTitle = _suggestionTitle
-			if suggestionTitle == nil then
-				return nil
-			end
+			local suggestionTitle = suggestion.title
 			local currentText = text()
 			local textParts = terminalTextParts()
-			local newText = ""
+			if #textParts == 0 then
+				return nil
+			end
+			local _array = {}
+			local _length = #_array
+			table.move(textParts, 1, #textParts, _length + 1, _array)
+			local pathParts = _array
+			local newText = currentText
 			if endsWithSpace(currentText) then
-				newText = currentText .. suggestionTitle
+				newText ..= suggestionTitle
+				table.insert(pathParts, suggestionTitle)
 			elseif not (#textParts == 0) then
-				local textPartSize = #textParts[#textParts]
-				local _arg1 = #currentText - textPartSize
-				newText = string.sub(currentText, 0, _arg1) .. suggestionTitle
+				local lastPartSize = textParts[#textParts]
+				local _newText = newText
+				local _arg1 = #newText - #lastPartSize
+				newText = string.sub(_newText, 0, _arg1) .. suggestionTitle
+				local _arg0 = #textParts - 1
+				table.remove(pathParts, _arg0 + 1)
+				table.insert(pathParts, suggestionTitle)
 			end
-			local suggestionTextParts = string.split((string.gsub(suggestionText(), "%s+", " ")), " ")
-			local _nextCommand = api.registry:getCommandByString(formatPartsAsPath(suggestionTextParts))
+			local _nextCommand = api.registry:getCommandByString(formatPartsAsPath(pathParts))
 			if _nextCommand ~= nil then
 				_nextCommand = _nextCommand.options
 			end
@@ -174,13 +196,13 @@ local function TerminalTextField(_param)
 			if not _condition_1 then
 				local _result = nextCommand.arguments
 				if _result ~= nil then
-					_result = #_result
+					_result = #_result == 0
 				end
 				local _condition_2 = _result
 				if _condition_2 == nil then
-					_condition_2 = 0
+					_condition_2 = true
 				end
-				_condition_1 = _condition_2 > 0
+				_condition_1 = not _condition_2
 			end
 			if _condition_1 then
 				newText ..= " "
@@ -190,11 +212,11 @@ local function TerminalTextField(_param)
 			textBox.CursorPosition = #newText + 1
 			return nil
 		end
-		-- Handle argument suggestions
+		-- Argument suggestions
 		if commandPath == nil or suggestion == nil or #suggestion.others == 0 then
 			return nil
 		end
-		local argIndex = currentArgIndex()
+		local argIndex = terminalArgIndex()
 		local _commandArgs = api.registry:getCommand(commandPath)
 		if _commandArgs ~= nil then
 			_commandArgs = _commandArgs.options.arguments
@@ -204,17 +226,20 @@ local function TerminalTextField(_param)
 			return nil
 		end
 		local newText = text()
-		local parts = terminalTextParts()
-		if not endsWithSpace(newText) and not (#parts == 0) then
-			local _newText = newText
-			local _arg1 = #newText - #parts[#parts]
-			newText = string.sub(_newText, 0, _arg1)
-		end
 		local otherSuggestion = suggestion.others[1]
 		if (string.match(otherSuggestion, "%s")) ~= nil then
 			otherSuggestion = `"{otherSuggestion}"`
 		end
-		newText ..= otherSuggestion
+		local _otherSuggestion = otherSuggestion
+		local _result = currentTextPart()
+		if _result ~= nil then
+			_result = #_result
+		end
+		local _condition_1 = _result
+		if _condition_1 == nil then
+			_condition_1 = 0
+		end
+		newText ..= string.sub(_otherSuggestion, _condition_1 + 1)
 		if argIndex < #commandArgs - 1 then
 			newText ..= " "
 		end

package/out/components/terminal/terminal.lua

@@ -1,12 +1,9 @@
 -- Compiled with roblox-ts v2.3.0-dev-26ec859
 local TS = _G[script]
-local _centurion = TS.import(script, TS.getModule(script, "@rbxts", "centurion").out)
-local ImmutableRegistryPath = _centurion.ImmutableRegistryPath
-local RegistryPath = _centurion.RegistryPath
 local ArrayUtil = TS.import(script, TS.getModule(script, "@rbxts", "centurion").out.shared.util.data).ArrayUtil
 local _string = TS.import(script, TS.getModule(script, "@rbxts", "centurion").out.shared.util.string)
 local endsWithSpace = _string.endsWithSpace
-local formatPartsAsPath = _string.formatPartsAsPath
+local splitString = _string.splitString
 local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
 local Vide = _vide
 local effect = _vide.effect
@@ -18,21 +15,25 @@ local useHistory = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-
 local useMotion = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-motion").useMotion
 local px = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-px").px
 local _store = TS.import(script, script.Parent.Parent.Parent, "store")
-local currentArgIndex = _store.currentArgIndex
+local commandArgIndex = _store.commandArgIndex
 local currentCommandPath = _store.currentCommandPath
 local currentSuggestion = _store.currentSuggestion
+local currentTextPart = _store.currentTextPart
 local interfaceOptions = _store.interfaceOptions
 local mouseOverInterface = _store.mouseOverInterface
+local terminalArgIndex = _store.terminalArgIndex
 local terminalText = _store.terminalText
 local terminalTextParts = _store.terminalTextParts
 local terminalTextValid = _store.terminalTextValid
-local getMissingArgs = TS.import(script, script.Parent.Parent.Parent, "util", "argument").getMissingArgs
-local _suggestion = TS.import(script, script.Parent.Parent.Parent, "util", "suggestion")
-local getArgumentSuggestion = _suggestion.getArgumentSuggestion
-local getCommandSuggestion = _suggestion.getCommandSuggestion
 local HistoryList = TS.import(script, script.Parent.Parent, "history").HistoryList
 local Frame = TS.import(script, script.Parent.Parent, "ui", "frame").Frame
 local Padding = TS.import(script, script.Parent.Parent, "ui", "padding").Padding
+local _command = TS.import(script, script.Parent, "command")
+local getMissingArgs = _command.getMissingArgs
+local getValidPath = _command.getValidPath
+local _suggestion = TS.import(script, script.Parent, "suggestion")
+local getArgumentSuggestion = _suggestion.getArgumentSuggestion
+local getCommandSuggestion = _suggestion.getCommandSuggestion
 local TerminalTextField = TS.import(script, script.Parent, "terminal-text-field").TerminalTextField
 local MAX_HEIGHT = HISTORY_TEXT_SIZE * 10
 local TEXT_FIELD_HEIGHT = 40
@@ -103,112 +104,141 @@ local function Terminal()
 		onTextChange = function(text)
 			terminalText(text)
 			terminalTextValid(false)
+			missingArgs({})
 			local parts = terminalTextParts()
 			if #parts == 0 then
 				currentCommandPath(nil)
 				currentSuggestion(nil)
-				currentArgIndex(nil)
+				terminalArgIndex(nil)
 				return nil
 			end
 			-- If the text ends in a space, we want to count that as having traversed
-			-- to the next "part" of the text. This means we should include the previous
-			-- text part as part of the parent path.
+			-- to the next "part" of the text.
 			local atNextPart = endsWithSpace(text)
-			local commandPath = currentCommandPath()
-			local atCommand = false
-			if commandPath ~= nil and formatPartsAsPath(ArrayUtil.slice(parts, 0, commandPath:size())) == commandPath:toString() then
-				-- The current path still leads to the command, so it's valid
-				atCommand = true
-			elseif api.registry:getCommandByString(formatPartsAsPath(parts)) ~= nil then
-				atCommand = true
-				commandPath = ImmutableRegistryPath.new(parts)
-			else
-				local currentPath = RegistryPath:empty()
-				for _, part in parts do
-					currentPath:append(part)
-					if api.registry:getCommand(currentPath) ~= nil then
-						atCommand = true
-						break
-					end
-					if #api.registry:getChildPaths(currentPath) == 0 then
-						atCommand = false
-						break
-					end
+			local path = getValidPath(api.registry, parts)
+			local command = if path ~= nil then api.registry:getCommand(path) else nil
+			if command ~= nil then
+				-- Check for missing arguments
+				local missing = getMissingArgs(command, parts)
+				local _result = command.options.arguments
+				if _result ~= nil then
+					_result = #_result == 0
 				end
-				commandPath = ImmutableRegistryPath:fromPath(currentPath)
-			end
-			local currentPath = currentCommandPath()
-			if not atCommand and currentPath ~= nil then
-				currentCommandPath(nil)
-			elseif atCommand and commandPath ~= currentPath then
-				currentCommandPath(commandPath)
-			end
-			local _result
-			if commandPath ~= nil then
-				local _result_1 = api.registry:getCommand(commandPath)
-				if _result_1 ~= nil then
-					_result_1 = _result_1.options
-				end
-				_result = _result_1
-			else
-				_result = nil
-			end
-			local command = _result
-			if commandPath ~= nil and command ~= nil then
-				local missing = getMissingArgs(api.registry, commandPath, parts)
-				missingArgs(missing)
-				local _result_1 = command.arguments
-				if _result_1 ~= nil then
-					_result_1 = #_result_1 == 0
-				end
-				local _condition = _result_1
+				local _condition = _result
 				if _condition == nil then
 					_condition = true
 				end
 				local noArgs = _condition
+				currentCommandPath(path)
+				missingArgs(missing)
 				terminalTextValid(noArgs or #missing == 0 or (atNextPart and #missing == 1))
 			else
 				terminalTextValid(false)
 			end
-			-- Update suggestions
-			local showArgs = atCommand and (atNextPart or (commandPath ~= nil and #parts > commandPath:size()))
-			local _result_1
-			if showArgs and command ~= nil then
-				local _result_2 = command.arguments
-				if _result_2 ~= nil then
-					_result_2 = #_result_2
+			local textPart = if not atNextPart then parts[#parts] else nil
+			local argIndex = if path ~= nil then #parts - path:size() - (if atNextPart then 0 else 1) else -1
+			terminalArgIndex(argIndex)
+			if command == nil or argIndex == -1 then
+				-- Get command suggestions
+				local index = #parts - (if atNextPart then 1 else 2)
+				local _parentPath = path
+				if _parentPath ~= nil then
+					_parentPath = _parentPath:slice(0, index)
+				end
+				local parentPath = _parentPath
+				local _exp = api.registry
+				local _result = parentPath
+				if _result ~= nil then
+					_result = _result:isEmpty()
+				end
+				currentSuggestion(getCommandSuggestion(_exp, if not _result then parentPath else nil, textPart))
+				currentTextPart(textPart)
+				return nil
+			end
+			-- Handle arguments
+			local args = command.options.arguments
+			if args == nil then
+				currentSuggestion(nil)
+				currentTextPart(nil)
+				commandArgIndex(nil)
+				return nil
+			end
+			local index = -1
+			local currentArg
+			local endIndex = -1
+			for i = 0, argIndex do
+				if endIndex == nil or i <= endIndex then
+					continue
 				end
-				local _condition = _result_2
+				index += 1
+				if index >= #args then
+					currentArg = nil
+					break
+				end
+				currentArg = args[index + 1]
+				local _condition = currentArg.numArgs
 				if _condition == nil then
-					_condition = 0
+					_condition = 1
 				end
-				_result_1 = _condition
-			else
-				_result_1 = 0
+				local numArgs = _condition
+				endIndex = if numArgs ~= "rest" then i + (numArgs - 1) else nil
+			end
+			local _registry = api.registry
+			local _result = currentArg
+			if _result ~= nil then
+				_result = _result.type
+			end
+			local _condition = _result
+			if _condition == nil then
+				_condition = ""
 			end
-			local argCount = _result_1
-			local currentTextPart = if not atNextPart then parts[#parts] else nil
+			local argType = _registry:getType(_condition)
+			if currentArg == nil or argType == nil then
+				currentSuggestion(nil)
+				currentTextPart(nil)
+				terminalArgIndex(nil)
+				commandArgIndex(nil)
+				return nil
+			end
+			commandArgIndex(index)
+			local argTextPart
 			local suggestion
-			if argCount == 0 then
-				local parentPath = if atNextPart then commandPath elseif commandPath:size() ~= 1 then commandPath:parent() else nil
-				suggestion = getCommandSuggestion(api.registry, parentPath, currentTextPart)
-			elseif commandPath ~= nil then
-				-- Handle argument suggestions
-				local argIndex = #parts - commandPath:size() - (if atNextPart then 0 else 1)
-				if argIndex >= argCount then
-					return nil
-				end
-				currentArgIndex(argIndex)
-				suggestion = getArgumentSuggestion(api.registry, commandPath, argIndex, currentTextPart)
-				local _result_2 = suggestion
-				if _result_2 ~= nil then
-					_result_2 = _result_2.error
+			if argType.kind == "single" then
+				argTextPart = textPart
+				suggestion = getArgumentSuggestion({
+					kind = "single",
+					options = currentArg,
+					type = argType,
+					input = textPart,
+				}, textPart)
+			else
+				local _condition_1 = textPart
+				if _condition_1 == nil then
+					_condition_1 = ""
 				end
-				if _result_2 ~= nil then
-					terminalTextValid(false)
+				local textParts = splitString(_condition_1, ",")
+				local lastPart = if not (#textParts == 0) then textParts[#textParts] else nil
+				local _result_1 = textPart
+				if _result_1 ~= nil then
+					_result_1 = string.sub(_result_1, -1)
 				end
+				argTextPart = if _result_1 ~= "," then lastPart else nil
+				suggestion = getArgumentSuggestion({
+					kind = "list",
+					options = currentArg,
+					type = argType,
+					input = textParts,
+				}, argTextPart)
 			end
+			currentTextPart(argTextPart)
 			currentSuggestion(suggestion)
+			local _result_1 = suggestion
+			if _result_1 ~= nil then
+				_result_1 = _result_1.error
+			end
+			if _result_1 ~= nil then
+				terminalTextValid(false)
+			end
 		end,
 		onSubmit = function()
 			local commandPath = currentCommandPath()

package/out/store.d.ts

@@ -4,9 +4,10 @@ export declare const interfaceVisible: import("@rbxts/charm").Atom<boolean>;
 export declare const interfaceOptions: import("@rbxts/charm").Atom<import("./types").InterfaceOptions>;
 export declare const mouseOverInterface: import("@rbxts/charm").Atom<boolean>;
 export declare const currentCommandPath: import("@rbxts/charm").Atom<ImmutableRegistryPath | undefined>;
-export declare const currentArgIndex: import("@rbxts/charm").Atom<number | undefined>;
+export declare const commandArgIndex: import("@rbxts/charm").Atom<number | undefined>;
+export declare const terminalArgIndex: import("@rbxts/charm").Atom<number | undefined>;
 export declare const currentSuggestion: import("@rbxts/charm").Atom<Suggestion | undefined>;
 export declare const terminalText: import("@rbxts/charm").Atom<string>;
 export declare const terminalTextParts: import("@rbxts/charm").Molecule<string[]>;
-export declare const currentTextPart: import("@rbxts/charm").Molecule<string | undefined>;
 export declare const terminalTextValid: import("@rbxts/charm").Atom<boolean>;
+export declare const currentTextPart: import("@rbxts/charm").Atom<string | undefined>;

package/out/store.lua

@@ -9,32 +9,25 @@ local interfaceVisible = atom(false)
 local interfaceOptions = atom(DEFAULT_INTERFACE_OPTIONS)
 local mouseOverInterface = atom(false)
 local currentCommandPath = atom(nil)
-local currentArgIndex = atom(nil)
+local commandArgIndex = atom(nil)
+local terminalArgIndex = atom(nil)
 local currentSuggestion = atom(nil)
 local terminalText = atom("")
 local terminalTextParts = computed(function()
 	return splitString(terminalText(), " ")
 end)
-local currentTextPart = computed(function()
-	local text = terminalText()
-	local textParts = terminalTextParts()
-	local endsWithSpace = #textParts > 0 and #{ string.match(text, "%s$") } > 0
-	local index = if endsWithSpace then #textParts else #textParts - 1
-	if index == -1 or index >= #textParts then
-		return nil
-	end
-	return textParts[index + 1]
-end)
 local terminalTextValid = atom(false)
+local currentTextPart = atom(nil)
 return {
 	interfaceVisible = interfaceVisible,
 	interfaceOptions = interfaceOptions,
 	mouseOverInterface = mouseOverInterface,
 	currentCommandPath = currentCommandPath,
-	currentArgIndex = currentArgIndex,
+	commandArgIndex = commandArgIndex,
+	terminalArgIndex = terminalArgIndex,
 	currentSuggestion = currentSuggestion,
 	terminalText = terminalText,
 	terminalTextParts = terminalTextParts,
-	currentTextPart = currentTextPart,
 	terminalTextValid = terminalTextValid,
+	currentTextPart = currentTextPart,
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rbxts/centurion-ui",
   "description": "Terminal UI for the Centurion command framework",
-  "version": "1.0.0-dev-47fa67f",
+  "version": "1.0.0-dev-84057f1",
   "author": "paradoxuum",
   "license": "MIT",
   "main": "out/init.lua",
@@ -32,9 +32,9 @@
     "dev": "shx rm -rf out && rbxtsc -w"
   },
   "devDependencies": {
-    "@rbxts/centurion": "^1.0.0-dev-47fa67f",
+    "@rbxts/centurion": "^1.0.0-dev-84057f1",
     "@rbxts/compiler-types": "2.3.0-types.1",
-    "@rbxts/types": "^1.0.792",
+    "@rbxts/types": "^1.0.794",
     "roblox-ts": "2.3.0-dev-26ec859",
     "shx": "^0.3.4",
     "typescript": "~5.5.4"
@@ -47,7 +47,7 @@
     "@rbxts/vide": "^0.4.2"
   },
   "peerDependencies": {
-    "@rbxts/centurion": "^1.0.0-dev"
+    "@rbxts/centurion": "*"
   },
   "stableVersion": "1.0.0"
 }

package/out/util/argument.d.ts

@@ -1,3 +0,0 @@
-import { BaseRegistry, ImmutableRegistryPath, RegistryPath } from "@rbxts/centurion";
-export declare function getArgumentNames(registry: BaseRegistry, path: RegistryPath): string[];
-export declare function getMissingArgs(registry: BaseRegistry, path: ImmutableRegistryPath, text: string[]): string[];

package/out/util/argument.lua

@@ -1,51 +0,0 @@
--- Compiled with roblox-ts v2.3.0-dev-26ec859
-local TS = _G[script]
-local IS_EDIT = TS.import(script, script.Parent.Parent, "constants", "util").IS_EDIT
-local function getArgumentNames(registry, path)
-	if IS_EDIT then
-		return {}
-	end
-	local command = registry:getCommand(path)
-	if command == nil or command.options.arguments == nil then
-		return {}
-	end
-	local _exp = command.options.arguments
-	-- ▼ ReadonlyArray.map ▼
-	local _newValue = table.create(#_exp)
-	local _callback = function(arg)
-		return arg.name
-	end
-	for _k, _v in _exp do
-		_newValue[_k] = _callback(_v, _k - 1, _exp)
-	end
-	-- ▲ ReadonlyArray.map ▲
-	return _newValue
-end
-local function getMissingArgs(registry, path, text)
-	local _commandOptions = registry:getCommand(path)
-	if _commandOptions ~= nil then
-		_commandOptions = _commandOptions.options
-	end
-	local commandOptions = _commandOptions
-	if commandOptions == nil or commandOptions.arguments == nil or #commandOptions.arguments == 0 then
-		return {}
-	end
-	local lastPartIndex = #text - path:size() - 1
-	local missingArgs = {}
-	local index = 0
-	for _, arg in commandOptions.arguments do
-		if arg.optional then
-			break
-		end
-		if index > lastPartIndex then
-			local _name = arg.name
-			table.insert(missingArgs, _name)
-		end
-		index += 1
-	end
-	return missingArgs
-end
-return {
-	getArgumentNames = getArgumentNames,
-	getMissingArgs = getMissingArgs,
-}

package/out/util/suggestion.d.ts

@@ -1,4 +0,0 @@
-import { BaseRegistry, RegistryPath } from "@rbxts/centurion";
-import { ArgumentSuggestion, Suggestion } from "../types";
-export declare function getArgumentSuggestion(registry: BaseRegistry, path: RegistryPath, index: number, text?: string): ArgumentSuggestion | undefined;
-export declare function getCommandSuggestion(registry: BaseRegistry, parentPath?: RegistryPath, text?: string): Suggestion | undefined;

package/out/util/suggestion.lua

@@ -1,203 +0,0 @@
--- Compiled with roblox-ts v2.3.0-dev-26ec859
-local TS = _G[script]
-local ArrayUtil = TS.import(script, TS.getModule(script, "@rbxts", "centurion").out.shared.util.data).ArrayUtil
-local Players = TS.import(script, TS.getModule(script, "@rbxts", "services")).Players
-local MAX_OTHER_SUGGESTIONS = 3
-local function getSortedIndices(max, strings, text)
-	-- If no text is provided, sort alphabetically
-	if text == nil then
-		local _array = {}
-		local _length = #_array
-		table.move(strings, 1, #strings, _length + 1, _array)
-		table.sort(_array)
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue = table.create(#_array)
-		local _callback = function(_, index)
-			return index
-		end
-		for _k, _v in _array do
-			_newValue[_k] = _callback(_v, _k - 1, _array)
-		end
-		-- ▲ ReadonlyArray.map ▲
-		local sorted = _newValue
-		return ArrayUtil.slice(sorted, 0, math.min(#sorted, max))
-	end
-	-- Otherwise, sort by the closest match
-	local textLower = string.lower(text)
-	local textEndIndex = #text
-	local results = {}
-	for i = 0, #strings - 1 do
-		local part = string.sub(string.lower(strings[i + 1]), 0, textEndIndex)
-		if part == textLower then
-			local _arg0 = { #part, i }
-			table.insert(results, _arg0)
-		end
-	end
-	table.sort(results, function(a, b)
-		if a[1] == b[1] then
-			return strings[a[2] + 1] < strings[b[2] + 1]
-		end
-		return a[1] < b[1]
-	end)
-	local _exp = ArrayUtil.slice(results, 0, math.min(#results, max))
-	-- ▼ ReadonlyArray.map ▼
-	local _newValue = table.create(#_exp)
-	local _callback = function(val)
-		return val[2]
-	end
-	for _k, _v in _exp do
-		_newValue[_k] = _callback(_v, _k - 1, _exp)
-	end
-	-- ▲ ReadonlyArray.map ▲
-	return _newValue
-end
-local function getArgumentSuggestion(registry, path, index, text)
-	local command = registry:getCommand(path)
-	if command == nil then
-		return nil
-	end
-	local args = command.options.arguments
-	if args == nil or #args == 0 then
-		return nil
-	end
-	if index < 0 or index >= #args then
-		return nil
-	end
-	local arg = args[index + 1]
-	local typeObject = registry:getType(arg.type)
-	if typeObject == nil then
-		return nil
-	end
-	local _result
-	if arg.suggestions ~= nil then
-		local _array = {}
-		local _length = #_array
-		local _array_1 = arg.suggestions
-		table.move(_array_1, 1, #_array_1, _length + 1, _array)
-		_result = _array
-	else
-		_result = {}
-	end
-	local argSuggestions = _result
-	if typeObject.suggestions ~= nil then
-		local _condition = text
-		if _condition == nil then
-			_condition = ""
-		end
-		for _, suggestion in typeObject.suggestions(_condition, Players.LocalPlayer) do
-			table.insert(argSuggestions, suggestion)
-		end
-	end
-	-- If the type is not marked as "expensive", transform the text into the type
-	-- If the transformation fails, include the error message in the suggestion
-	local errorText
-	local success, err = pcall(function()
-		if typeObject.expensive then
-			return nil
-		end
-		local _condition = text
-		if _condition == nil then
-			_condition = ""
-		end
-		local transformResult = typeObject.transform(_condition, Players.LocalPlayer)
-		if transformResult.ok then
-			return nil
-		end
-		errorText = transformResult.value
-	end)
-	if not success then
-		errorText = "Failed to transform argument"
-		warn(err)
-	end
-	local _exp = getSortedIndices(MAX_OTHER_SUGGESTIONS, argSuggestions, text)
-	-- ▼ ReadonlyArray.map ▼
-	local _newValue = table.create(#_exp)
-	local _callback = function(index)
-		return argSuggestions[index + 1]
-	end
-	for _k, _v in _exp do
-		_newValue[_k] = _callback(_v, _k - 1, _exp)
-	end
-	-- ▲ ReadonlyArray.map ▲
-	local otherSuggestions = _newValue
-	local _object = {
-		type = "argument",
-		title = arg.name,
-		others = otherSuggestions,
-		description = arg.description,
-		dataType = typeObject.name,
-	}
-	local _left = "optional"
-	local _condition = arg.optional
-	if _condition == nil then
-		_condition = false
-	end
-	_object[_left] = _condition
-	_object.error = errorText
-	return _object
-end
-local function getCommandSuggestion(registry, parentPath, text)
-	local paths = if parentPath ~= nil then registry:getChildPaths(parentPath) else registry:getRootPaths()
-	if #paths == 0 then
-		return nil
-	end
-	-- ▼ ReadonlyArray.map ▼
-	local _newValue = table.create(#paths)
-	local _callback = function(path)
-		return path:tail()
-	end
-	for _k, _v in paths do
-		_newValue[_k] = _callback(_v, _k - 1, paths)
-	end
-	-- ▲ ReadonlyArray.map ▲
-	local pathNames = _newValue
-	local sortedPaths = getSortedIndices(MAX_OTHER_SUGGESTIONS + 1, pathNames, text)
-	if #sortedPaths == 0 then
-		return nil
-	end
-	local firstPath = paths[sortedPaths[1] + 1]
-	local _result = registry:getCommand(firstPath)
-	if _result ~= nil then
-		_result = _result.options
-	end
-	local _condition = _result
-	if _condition == nil then
-		local _result_1 = registry:getGroup(firstPath)
-		if _result_1 ~= nil then
-			_result_1 = _result_1.options
-		end
-		_condition = _result_1
-	end
-	local mainData = _condition
-	if mainData == nil then
-		return nil
-	end
-	local _result_1
-	if #sortedPaths > 1 then
-		local _exp = ArrayUtil.slice(sortedPaths, 1)
-		-- ▼ ReadonlyArray.map ▼
-		local _newValue_1 = table.create(#_exp)
-		local _callback_1 = function(index)
-			return pathNames[index + 1]
-		end
-		for _k, _v in _exp do
-			_newValue_1[_k] = _callback_1(_v, _k - 1, _exp)
-		end
-		-- ▲ ReadonlyArray.map ▲
-		_result_1 = _newValue_1
-	else
-		_result_1 = {}
-	end
-	local otherNames = _result_1
-	return {
-		type = "command",
-		title = firstPath:tail(),
-		others = otherNames,
-		description = mainData.description,
-		shortcuts = mainData.shortcuts,
-	}
-end
-return {
-	getArgumentSuggestion = getArgumentSuggestion,
-	getCommandSuggestion = getCommandSuggestion,
-}