@rbxts/centurion-ui 1.0.0-dev-ecb0e98 → 1.0.1

package/out/components/history/history-list.luau

@@ -2,10 +2,9 @@
 local TS = _G[script]
 local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
 local Vide = _vide
-local effect = _vide.effect
+local derive = _vide.derive
 local For = _vide.For
 local read = _vide.read
-local source = _vide.source
 local useAtom = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-atom").useAtom
 local px = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-px").px
 local interfaceOptions = TS.import(script, script.Parent.Parent.Parent, "store").interfaceOptions
@@ -17,29 +16,30 @@ local function HistoryList(_param)
 	local position = _param.position
 	local maxHeight = _param.maxHeight
 	local options = useAtom(interfaceOptions)
-	local scrollingEnabled = source(false)
-	local canvasSize = source(UDim2.new())
-	local canvasPos = source(Vector2.new())
-	effect(function()
-		local height = read(data).height - px(8)
-		canvasSize(UDim2.new(0, 0, 0, height))
-		canvasPos(Vector2.new(0, height))
-		if maxHeight ~= nil then
-			scrollingEnabled(height > read(maxHeight))
-		end
+	local height = derive(function()
+		return read(data).height - px(8)
+	end)
+	local exceedsMaxHeight = derive(function()
+		return maxHeight ~= nil and height() > read(maxHeight)
 	end)
 	return Vide.jsx(ScrollingFrame, {
 		size = size,
 		position = position,
-		canvasSize = canvasSize,
-		canvasPosition = canvasPos,
+		canvasSize = function()
+			return UDim2.fromOffset(0, height())
+		end,
+		canvasPosition = function()
+			return Vector2.new(0, height())
+		end,
 		scrollBarColor = function()
 			return options().palette.subtext
 		end,
 		scrollBarThickness = function()
-			return if scrollingEnabled() then 10 else 0
+			return if exceedsMaxHeight() then 10 else 0
+		end,
+		scrollingEnabled = function()
+			return exceedsMaxHeight()
 		end,
-		scrollingEnabled = scrollingEnabled,
 	}, Vide.jsx(For, {
 		each = function()
 			return read(data).lines

package/out/components/terminal/command.luau

@@ -5,7 +5,7 @@ local ImmutableRegistryPath = _centurion.ImmutableRegistryPath
 local RegistryPath = _centurion.RegistryPath
 local IS_EDIT = TS.import(script, script.Parent.Parent.Parent, "constants", "util").IS_EDIT
 local function formatPartsAsPath(parts)
-	return table.concat(parts, "/")
+	return string.lower(table.concat(parts, "/"))
 end
 local function getValidPath(registry, text)
 	if #text == 0 then
@@ -17,7 +17,7 @@ local function getValidPath(registry, text)
 	end
 	local path = RegistryPath:empty()
 	for _, part in text do
-		path:append(part)
+		path:append(string.lower(part))
 		if registry:getCommand(path) == nil and registry:getGroup(path) == nil and #registry:getChildPaths(path) == 0 then
 			path:remove(path:size() - 1)
 			break

package/out/components/terminal/suggestion.luau

@@ -2,6 +2,9 @@
 local TS = _G[script]
 local Players = TS.import(script, TS.getModule(script, "@rbxts", "services")).Players
 local MAX_OTHER_SUGGESTIONS = 3
+local function formatText(text)
+	return if #{ string.match(text, "%s") } == 0 then text else `"{text}"`
+end
 local function getMatches(strings, text)
 	if text == nil then
 		table.sort(strings)
@@ -41,51 +44,61 @@ local function getMatches(strings, text)
 	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 arg.options.suggestions ~= nil then
+		local _exp = arg.options.suggestions
+		-- ▼ ReadonlyArray.map ▼
+		local _newValue = table.create(#_exp)
+		for _k, _v in _exp do
+			_newValue[_k] = formatText(_v, _k - 1, _exp)
+		end
+		-- ▲ ReadonlyArray.map ▲
+		_result = _newValue
+	else
+		_result = {}
+	end
+	local suggestions = _result
+	local singleArg = arg.kind == "single"
+	local _result_1
 	if singleArg then
-		local _result_1 = arg.type.suggestions
-		if _result_1 ~= nil then
+		local _result_2 = arg.type.suggestions
+		if _result_2 ~= nil then
 			local _condition = arg.input
 			if _condition == nil then
 				_condition = ""
 			end
-			_result_1 = _result_1(_condition, Players.LocalPlayer)
+			_result_2 = _result_2(_condition, Players.LocalPlayer)
 		end
-		_result = _result_1
+		_result_1 = _result_2
 	else
-		local _result_1 = arg.type.suggestions
-		if _result_1 ~= nil then
-			_result_1 = _result_1(arg.input, Players.LocalPlayer)
+		local _result_2 = arg.type.suggestions
+		if _result_2 ~= nil then
+			_result_2 = _result_2(arg.input, Players.LocalPlayer)
 		end
-		_result = _result_1
+		_result_1 = _result_2
 	end
-	local typeSuggestions = _result
+	local typeSuggestions = _result_1
 	if typeSuggestions ~= nil then
 		for _, text in typeSuggestions do
-			table.insert(suggestions, text)
+			local _arg0 = formatText(text)
+			table.insert(suggestions, _arg0)
 		end
 	end
 	local errorText
 	if not arg.type.expensive then
 		local success, err = pcall(function()
-			local _result_1
+			local _result_2
 			if singleArg then
 				local _type = arg.type
 				local _condition = arg.input
 				if _condition == nil then
 					_condition = ""
 				end
-				_result_1 = _type.transform(_condition, Players.LocalPlayer)
+				_result_2 = _type.transform(_condition, Players.LocalPlayer)
 			else
-				_result_1 = arg.type.transform(arg.input, Players.LocalPlayer)
+				_result_2 = arg.type.transform(arg.input, Players.LocalPlayer)
 			end
-			local transformResult = _result_1
+			local transformResult = _result_2
 			if transformResult.ok then
 				return nil
 			end
@@ -170,7 +183,7 @@ local function getCommandSuggestion(registry, parentPath, text)
 	local _newValue_1 = table.create(#sortedPaths)
 	local _callback_1 = function(_param)
 		local str = _param[2]
-		return str
+		return formatText(str)
 	end
 	for _k, _v in sortedPaths do
 		_newValue_1[_k] = _callback_1(_v, _k - 1, sortedPaths)

package/out/components/terminal/terminal-text-field/index.d.ts

@@ -0,0 +1 @@
+export * from "./terminal-text-field";

package/out/components/terminal/terminal-text-field/init.luau

@@ -0,0 +1,7 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local exports = {}
+for _k, _v in TS.import(script, script, "terminal-text-field") or {} do
+	exports[_k] = _v
+end
+return exports

package/out/components/terminal/terminal-text-field/suggestion.d.ts

@@ -0,0 +1,5 @@
+import { BaseRegistry } from "@rbxts/centurion";
+import { Suggestion } from "../../../types";
+export declare function completeCommand(registry: BaseRegistry, text: string, suggestion: string): string;
+export declare function completeArgument(text: string, suggestion: string, commandArgCount: number): string;
+export declare function getSuggestedText(registry: BaseRegistry, text: string, suggestion?: Suggestion): string;

package/out/components/terminal/terminal-text-field/suggestion.luau

@@ -0,0 +1,128 @@
+-- Compiled with roblox-ts v3.0.0
+local TS = _G[script]
+local _store = TS.import(script, script.Parent.Parent.Parent.Parent, "store")
+local atNextPart = _store.atNextPart
+local commandArgIndex = _store.commandArgIndex
+local currentCommandPath = _store.currentCommandPath
+local currentTextPart = _store.currentTextPart
+local terminalArgIndex = _store.terminalArgIndex
+local terminalTextParts = _store.terminalTextParts
+local _command = TS.import(script, script.Parent.Parent, "command")
+local formatPartsAsPath = _command.formatPartsAsPath
+local getArgumentNames = _command.getArgumentNames
+local function replaceTextPart(text, ...)
+	local suggestions = { ... }
+	local currentPart = currentTextPart()
+	local _result = currentPart
+	if _result ~= nil then
+		_result = #_result
+	end
+	local _condition = _result
+	if _condition == nil then
+		_condition = 0
+	end
+	local currentPartSize = _condition
+	local _text = text
+	local _arg1 = #text - currentPartSize
+	local result = string.sub(_text, 0, _arg1)
+	result ..= table.concat(suggestions, " ")
+	return result
+end
+local function completeCommand(registry, text, suggestion)
+	local textParts = terminalTextParts()
+	local atNextPart = string.sub(text, -1) == " "
+	local _array = {}
+	local _length = #_array
+	table.move(textParts, 1, #textParts, _length + 1, _array)
+	local pathParts = _array
+	if not atNextPart then
+		local _arg0 = #textParts - 1
+		table.remove(pathParts, _arg0 + 1)
+	end
+	local _suggestion = suggestion
+	table.insert(pathParts, _suggestion)
+	local _command_1 = registry:getCommandByString(formatPartsAsPath(pathParts))
+	if _command_1 ~= nil then
+		_command_1 = _command_1.options
+	end
+	local command = _command_1
+	local result = replaceTextPart(text, suggestion)
+	-- Add a space if this path isn't a command (meaning it's a group) or is a command with arguments
+	local _condition = command == nil
+	if not _condition then
+		local _result = command.arguments
+		if _result ~= nil then
+			_result = #_result == 0
+		end
+		local _condition_1 = _result
+		if _condition_1 == nil then
+			_condition_1 = true
+		end
+		_condition = not _condition_1
+	end
+	if _condition then
+		result ..= " "
+	end
+	return result
+end
+local function completeArgument(text, suggestion, commandArgCount)
+	local argIndex = terminalArgIndex()
+	if argIndex == nil or commandArgCount == 0 then
+		return text
+	end
+	local result = replaceTextPart(text, suggestion)
+	if argIndex < commandArgCount - 1 then
+		result ..= " "
+	end
+	return result
+end
+local function getSuggestedText(registry, text, suggestion)
+	if suggestion == nil then
+		return ""
+	end
+	local suggestionText
+	local parts = terminalTextParts()
+	if #parts == 0 or suggestion.type == "command" then
+		suggestionText = suggestion.title
+	else
+		local command = currentCommandPath()
+		local argIndex = terminalArgIndex()
+		if command == nil or argIndex == nil then
+			return ""
+		end
+		if atNextPart() and argIndex == commandArgIndex() then
+			suggestionText = suggestion.title
+		elseif not (#suggestion.others == 0) then
+			suggestionText = suggestion.others[1]
+		else
+			local _condition = currentTextPart()
+			if _condition == nil then
+				_condition = ""
+			end
+			suggestionText = _condition
+		end
+		local argNames = getArgumentNames(registry, command)
+		for i = argIndex + 1, #argNames - 1 do
+			suggestionText ..= ` {argNames[i + 1]}`
+		end
+	end
+	local _result = currentTextPart()
+	if _result ~= nil then
+		_result = #_result
+	end
+	local _condition = _result
+	if _condition == nil then
+		_condition = 0
+	end
+	local partSize = _condition
+	local result = text
+	local _suggestionText = suggestionText
+	local _arg0 = partSize + 1
+	result ..= string.sub(_suggestionText, _arg0)
+	return result
+end
+return {
+	completeCommand = completeCommand,
+	completeArgument = completeArgument,
+	getSuggestedText = getSuggestedText,
+}

package/out/components/terminal/{terminal-text-field.luau → terminal-text-field/terminal-text-field.luau}

@@ -1,35 +1,29 @@
 -- Compiled with roblox-ts v3.0.0
 local TS = _G[script]
-local splitString = TS.import(script, TS.getModule(script, "@rbxts", "centurion").out.shared.util.string).splitString
 local subscribe = TS.import(script, TS.getModule(script, "@rbxts", "charm").src).subscribe
 local UserInputService = TS.import(script, TS.getModule(script, "@rbxts", "services")).UserInputService
 local _vide = TS.import(script, TS.getModule(script, "@rbxts", "vide").src)
 local Vide = _vide
 local cleanup = _vide.cleanup
-local effect = _vide.effect
 local source = _vide.source
-local useAtom = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-atom").useAtom
-local useClient = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-client").useClient
-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 commandArgIndex = _store.commandArgIndex
+local useAtom = TS.import(script, script.Parent.Parent.Parent.Parent, "hooks", "use-atom").useAtom
+local useClient = TS.import(script, script.Parent.Parent.Parent.Parent, "hooks", "use-client").useClient
+local useEvent = TS.import(script, script.Parent.Parent.Parent.Parent, "hooks", "use-event").useEvent
+local px = TS.import(script, script.Parent.Parent.Parent.Parent, "hooks", "use-px").px
+local _store = TS.import(script, script.Parent.Parent.Parent.Parent, "store")
 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 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 _command = TS.import(script, script.Parent, "command")
-local formatPartsAsPath = _command.formatPartsAsPath
-local getArgumentNames = _command.getArgumentNames
+local Frame = TS.import(script, script.Parent.Parent.Parent, "ui", "frame").Frame
+local Padding = TS.import(script, script.Parent.Parent.Parent, "ui", "padding").Padding
+local Text = TS.import(script, script.Parent.Parent.Parent, "ui", "text").Text
+local TextField = TS.import(script, script.Parent.Parent.Parent, "ui", "text-field").TextField
+local _suggestion = TS.import(script, script.Parent, "suggestion")
+local completeArgument = _suggestion.completeArgument
+local completeCommand = _suggestion.completeCommand
+local getSuggestedText = _suggestion.getSuggestedText
 local TEXT_SIZE = 22
 local function TerminalTextField(_param)
 	local anchor = _param.anchor
@@ -40,7 +34,6 @@ local function TerminalTextField(_param)
 	local onSubmit = _param.onSubmit
 	local client = useClient()
 	local options = useAtom(interfaceOptions)
-	local visible = useAtom(interfaceVisible)
 	local valid = useAtom(terminalTextValid)
 	local ref = source()
 	local commandHistory = source({})
@@ -48,8 +41,8 @@ local function TerminalTextField(_param)
 	local suggestionText = source("")
 	local currentTextValue = ""
 	-- Focus text field when terminal becomes visible
-	effect(function()
-		if visible() then
+	local visibleConnection = subscribe(interfaceVisible, function(visible)
+		if visible then
 			local _result = ref()
 			if _result ~= nil then
 				_result:CaptureFocus()
@@ -61,6 +54,15 @@ local function TerminalTextField(_param)
 			end
 		end
 	end)
+	cleanup(visibleConnection)
+	local setText = function(text)
+		local textBox = ref()
+		if textBox == nil then
+			return nil
+		end
+		textBox.Text = text
+		textBox.CursorPosition = #text + 1
+	end
 	local traverseHistory = function(up)
 		local history = commandHistory()
 		if #history == 0 then
@@ -76,8 +78,7 @@ local function TerminalTextField(_param)
 		end
 		local lastIndex = #history - 1
 		if not up and historyIndex == lastIndex then
-			textBox.Text = ""
-			suggestionText("")
+			setText("")
 			commandHistoryIndex(nil)
 			return nil
 		end
@@ -86,63 +87,20 @@ local function TerminalTextField(_param)
 			_condition = #history
 		end
 		local newIndex = math.clamp(_condition + (if up then -1 else 1), 0, lastIndex)
-		local newText = history[newIndex + 1]
-		textBox.Text = newText
-		textBox.CursorPosition = #newText + 1
-		suggestionText("")
+		setText(history[newIndex + 1])
 		commandHistoryIndex(newIndex)
 	end
 	local suggestionConnection = subscribe(currentSuggestion, function(suggestion)
-		if suggestion == nil then
-			suggestionText("")
-			return nil
-		end
-		local atNextPart = string.sub(terminalText(), -1) == " "
-		local textParts = terminalTextParts()
-		if #textParts == 0 then
-			suggestionText(suggestion.title)
-			return nil
-		end
-		local _currentText = ref()
-		if _currentText ~= nil then
-			_currentText = _currentText.Text
+		local _exp = client.registry
+		local _result = ref()
+		if _result ~= nil then
+			_result = _result.Text
 		end
-		local currentText = _currentText
-		if currentText == nil then
-			return nil
-		end
-		-- Command suggestions
-		if suggestion.type == "command" then
-			local suggestionStartIndex = (if not atNextPart then #textParts[#textParts] else 0) + 1
-			suggestionText(currentText .. string.sub(suggestion.title, suggestionStartIndex))
-			return nil
-		end
-		-- Argument suggestions
-		local command = currentCommandPath()
-		local argIndex = terminalArgIndex()
-		if suggestion.type ~= "argument" or command == nil or argIndex == nil then
-			return nil
-		end
-		local newText = currentText
-		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 ..= string.sub(_exp, _condition + 1)
-		end
-		local argNames = getArgumentNames(client.registry, command)
-		for i = argIndex + 1, #argNames - 1 do
-			newText = `{newText} {argNames[i + 1]}`
+		local _condition = _result
+		if _condition == nil then
+			_condition = ""
 		end
-		suggestionText(newText)
+		suggestionText(getSuggestedText(_exp, _condition, suggestion))
 	end)
 	cleanup(suggestionConnection)
 	useEvent(UserInputService.InputBegan, function(input)
@@ -158,6 +116,7 @@ local function TerminalTextField(_param)
 		if _condition then
 			return nil
 		end
+		-- Handle history traversal
 		if input.KeyCode == Enum.KeyCode.Up then
 			traverseHistory(true)
 		elseif input.KeyCode == Enum.KeyCode.Down then
@@ -166,109 +125,38 @@ local function TerminalTextField(_param)
 		if input.KeyCode ~= Enum.KeyCode.Tab then
 			return nil
 		end
-		-- Command suggestions
+		-- Handle autocompletion
 		local commandPath = currentCommandPath()
 		local suggestion = currentSuggestion()
 		if suggestion == nil then
 			return nil
 		end
 		local currentText = textBox.Text
-		local textParts = terminalTextParts()
-		local atNextPart = string.sub(currentText, -1) == " "
-		local lastPart = if not atNextPart then textParts[#textParts] else nil
 		if commandPath == nil then
-			local suggestionTitle = suggestion.title
-			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 atNextPart then
-				newText ..= suggestionTitle
-				table.insert(pathParts, suggestionTitle)
-			elseif lastPart ~= nil then
-				local _newText = newText
-				local _arg1 = #newText - #lastPart
-				newText = string.sub(_newText, 0, _arg1) .. suggestionTitle
-				local _arg0 = #textParts - 1
-				table.remove(pathParts, _arg0 + 1)
-				table.insert(pathParts, suggestionTitle)
-			end
-			local _nextCommand = client.registry:getCommandByString(formatPartsAsPath(pathParts))
-			if _nextCommand ~= nil then
-				_nextCommand = _nextCommand.options
-			end
-			local nextCommand = _nextCommand
-			local _condition_1 = nextCommand == nil
-			if not _condition_1 then
-				local _result = nextCommand.arguments
-				if _result ~= nil then
-					_result = #_result == 0
-				end
-				local _condition_2 = _result
-				if _condition_2 == nil then
-					_condition_2 = true
-				end
-				_condition_1 = not _condition_2
-			end
-			if _condition_1 then
-				newText ..= " "
-			end
-			suggestionText("")
-			textBox.Text = newText
-			textBox.CursorPosition = #newText + 1
+			setText(completeCommand(client.registry, textBox.Text, suggestion.title))
 			return nil
 		end
-		local _commandArgs = client.registry:getCommand(commandPath)
-		if _commandArgs ~= nil then
-			_commandArgs = _commandArgs.options.arguments
-		end
-		local commandArgs = _commandArgs
-		local _condition_1 = suggestion.type == "command" and not atNextPart
-		if _condition_1 then
-			local _result = commandArgs
+		local _result = client.registry:getCommand(commandPath)
+		if _result ~= nil then
+			_result = _result.options.arguments
 			if _result ~= nil then
-				_result = #_result == 0
-			end
-			local _condition_2 = _result
-			if _condition_2 == nil then
-				_condition_2 = true
+				_result = #_result
 			end
-			_condition_1 = not _condition_2
 		end
-		if _condition_1 then
-			suggestionText("")
-			local newText = `{currentText} `
-			textBox.Text = newText
-			textBox.CursorPosition = #newText + 1
-			return nil
+		local _condition_1 = _result
+		if _condition_1 == nil then
+			_condition_1 = 0
 		end
-		-- Argument suggestions
-		if #suggestion.others == 0 then
+		local argCount = _condition_1
+		if suggestion.type == "command" and argCount ~= 0 then
+			setText(`{currentText} `)
 			return nil
 		end
-		local argIndex = terminalArgIndex()
-		if argIndex == nil or commandArgs == nil then
+		if #suggestion.others == 0 then
+			setText(currentText)
 			return nil
 		end
-		local newText = currentText
-		local parts = splitString(newText, " ", true)
-		local currentPart = parts[#parts]
-		local currentPartSize = if currentTextPart() ~= nil then #currentPart else 0
-		local _newText = newText
-		local _arg1 = #newText - currentPartSize
-		newText = string.sub(_newText, 0, _arg1)
-		local otherSuggestion = suggestion.others[1]
-		newText ..= if #{ string.match(otherSuggestion, "%s") } == 0 then otherSuggestion else `"{otherSuggestion}"`
-		if argIndex < #commandArgs - 1 then
-			newText ..= " "
-		end
-		suggestionText("")
-		textBox.Text = newText
-		textBox.CursorPosition = #newText + 1
+		setText(completeArgument(currentText, suggestion.others[1], argCount))
 	end)
 	return Vide.jsx(Frame, {
 		anchor = anchor,

package/out/components/terminal/terminal.luau

@@ -14,6 +14,7 @@ local useClient = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-c
 local useHistory = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-history").useHistory
 local px = TS.import(script, script.Parent.Parent.Parent, "hooks", "use-px").px
 local _store = TS.import(script, script.Parent.Parent.Parent, "store")
+local atNextPart = _store.atNextPart
 local commandArgIndex = _store.commandArgIndex
 local currentCommandPath = _store.currentCommandPath
 local currentSuggestion = _store.currentSuggestion
@@ -36,6 +37,8 @@ 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
+local START_QUOTE_PATTERN = `^(['"])`
+local TRAILING_SPACE_PATTERN = "(%s+)$"
 local function Terminal()
 	local client = useClient()
 	local options = useAtom(interfaceOptions)
@@ -114,7 +117,7 @@ local function Terminal()
 			end
 			-- If the text ends in a space, we want to count that as having traversed
 			-- to the next "part" of the text.
-			local atNextPart = string.sub(text, -1) == " "
+			local endsInSpace = string.sub(text, -1) == " "
 			local path = getValidPath(client.registry, parts)
 			local command = if path ~= nil then client.registry:getCommand(path) else nil
 			if command ~= nil then
@@ -131,43 +134,42 @@ local function Terminal()
 				local noArgs = _condition
 				currentCommandPath(path)
 				missingArgs(missing)
-				terminalTextValid(noArgs or #missing == 0 or (atNextPart and #missing == 1))
+				terminalTextValid(noArgs or #missing == 0 or (endsInSpace and #missing == 1))
 			else
 				currentCommandPath(nil)
 				terminalTextValid(false)
 			end
-			local lastPart = parts[#parts]
-			local textPart = nil
-			if string.sub(lastPart, 0, 1) == '"' then
-				textPart = string.sub(lastPart, 2)
-			elseif not atNextPart then
-				textPart = lastPart
-			end
-			if textPart ~= nil then
-				local trailingSpaces = (string.match(text, "(%s+)$"))
-				if trailingSpaces ~= nil then
-					textPart ..= tostring(trailingSpaces)
+			local textPart = parts[#parts]
+			local atNext = atNextPart()
+			if atNext then
+				textPart = nil
+			elseif textPart ~= nil then
+				local _condition = (string.match(text, TRAILING_SPACE_PATTERN))
+				if _condition == nil then
+					_condition = ""
 				end
+				local spaces = _condition
+				textPart ..= tostring(spaces)
 			end
-			local argIndex = if path ~= nil then #parts - path:size() - (if atNextPart then 0 else 1) else -1
+			local argIndex = if path ~= nil then #parts - path:size() - (if atNext then 0 else 1) else -1
 			terminalArgIndex(argIndex)
 			if command == nil or argIndex == -1 then
 				-- Get command suggestions
-				local parentPath = if not (#parts == 0) then RegistryPath.new(ArrayUtil.slice(parts, 0, #parts - (if atNextPart then 0 else 1))) else nil
+				local parentPath = if not (#parts == 0) then RegistryPath.new(ArrayUtil.slice(parts, 0, #parts - (if atNext then 0 else 1))) else nil
+				currentTextPart(textPart)
 				local _exp = client.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)
+				currentSuggestion(nil)
 				commandArgIndex(nil)
 				return nil
 			end
@@ -217,20 +219,20 @@ local function Terminal()
 					kind = "single",
 					options = currentArg,
 					type = argType,
-					input = textPart,
-				}, textPart)
+					input = argTextPart,
+				}, argTextPart)
 			else
 				local _condition_1 = textPart
 				if _condition_1 == nil then
 					_condition_1 = ""
 				end
-				local textParts = splitString(_condition_1, ",")
-				local lastPart = if not (#textParts == 0) then textParts[#textParts] else nil
+				local textParts = splitString(_condition_1, ",", true)
+				local lastText = 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
+				argTextPart = if _result_1 ~= "," then lastText else nil
 				suggestion = getArgumentSuggestion({
 					kind = "list",
 					options = currentArg,
@@ -268,7 +270,7 @@ local function Terminal()
 				})
 				return nil
 			end
-			local args = ArrayUtil.slice(terminalTextParts(), commandPath:size())
+			local args = ArrayUtil.slice(splitString(terminalText(), " "), commandPath:size())
 			client.dispatcher:run(commandPath, args)
 		end,
 	}))

package/out/store.d.ts

@@ -9,5 +9,6 @@ export declare const terminalArgIndex: import("@rbxts/charm").Atom<number | unde
 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 atNextPart: import("@rbxts/charm").Molecule<boolean>;
 export declare const terminalTextValid: import("@rbxts/charm").Atom<boolean>;
 export declare const currentTextPart: import("@rbxts/charm").Atom<string | undefined>;

package/out/store.luau

@@ -14,7 +14,25 @@ local terminalArgIndex = atom(nil)
 local currentSuggestion = atom(nil)
 local terminalText = atom("")
 local terminalTextParts = computed(function()
-	return splitString(terminalText(), " ")
+	return splitString(terminalText(), " ", true)
+end)
+local atNextPart = computed(function()
+	local parts = terminalTextParts()
+	local textPart = parts[#parts]
+	local _startQuote = textPart
+	if _startQuote ~= nil then
+		local _arg0 = `^(['"])`
+		_startQuote = string.match(_startQuote, _arg0)
+	end
+	local startQuote = _startQuote
+	local _endQuote = textPart
+	if _endQuote ~= nil then
+		local _arg0 = `(['"])%s*$`
+		_endQuote = string.match(_endQuote, _arg0)
+	end
+	local endQuote = _endQuote
+	local quoted = startQuote ~= nil and endQuote == nil
+	return string.sub(terminalText(), -1) == " " and not quoted
 end)
 local terminalTextValid = atom(false)
 local currentTextPart = atom(nil)
@@ -28,6 +46,7 @@ return {
 	currentSuggestion = currentSuggestion,
 	terminalText = terminalText,
 	terminalTextParts = terminalTextParts,
+	atNextPart = atNextPart,
 	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-ecb0e98",
+  "version": "1.0.1",
   "author": "paradoxuum",
   "license": "MIT",
   "main": "out/init.lua",
@@ -32,21 +32,20 @@
     "dev": "shx rm -rf out && rbxtsc -w"
   },
   "devDependencies": {
-    "@rbxts/centurion": "^1.0.0-dev-ecb0e98",
+    "@rbxts/centurion": "^1.0.0",
     "@rbxts/compiler-types": "3.0.0-types.0",
-    "@rbxts/types": "^1.0.799",
+    "@rbxts/types": "^1.0.809",
     "roblox-ts": "3.0.0",
     "shx": "^0.3.4",
-    "typescript": "~5.5.4"
+    "typescript": "=5.5.3"
   },
   "dependencies": {
-    "@rbxts/charm": "^0.6.0",
-    "@rbxts/services": "^1.5.4",
+    "@rbxts/charm": "^0.7.5",
+    "@rbxts/services": "^1.5.5",
     "@rbxts/set-timeout": "^1.1.2",
-    "@rbxts/vide": "^0.4.4"
+    "@rbxts/vide": "^0.4.6"
   },
   "peerDependencies": {
-    "@rbxts/centurion": "*"
-  },
-  "stableVersion": "1.0.0"
+    "@rbxts/centurion": "^1.0.0"
+  }
 }