@rbxts/centurion-ui 1.0.0 → 1.0.2

package/out/components/terminal/suggestion.luau

@@ -1,17 +1,17 @@
 -- Compiled with roblox-ts v3.0.0
 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 _string = TS.import(script, script.Parent.Parent.Parent, "utils", "string")
+local containsSpace = _string.containsSpace
+local getQuoteChar = _string.getQuoteChar
 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 }
+			local formatted = if containsSpace(str) then `"{str}"` else str
+			return { i, formatted, #formatted }
 		end
 		for _k, _v in strings do
 			_newValue[_k] = _callback(_v, _k - 1, strings)
@@ -21,39 +21,35 @@ local function getMatches(strings, text)
 	end
 	local textLower = string.lower(text)
 	local textEndIndex = #text
-	-- ▼ ReadonlyArray.mapFiltered ▼
-	local _newValue = {}
-	local _callback = function(str, i)
+	local quoteChar = getQuoteChar(text)
+	local quoted = quoteChar ~= nil
+	local results = {}
+	for i = 0, #strings - 1 do
+		local str = strings[i + 1]
+		if quoted then
+			str = `{quoteChar}{str}{quoteChar}`
+		elseif containsSpace(str) then
+			str = `"{str}"`
+		end
 		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
+			local _arg0 = { i, str, #str }
+			table.insert(results, _arg0)
 		end
 	end
-	-- ▲ ReadonlyArray.mapFiltered ▲
-	table.sort(_newValue, function(a, b)
+	table.sort(results, function(a, b)
 		return a[2] < b[2]
 	end)
-	return _newValue
+	return results
 end
 local function getArgumentSuggestion(arg, textPart)
 	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
+		local _array = {}
+		local _length = #_array
+		local _array_1 = arg.options.suggestions
+		table.move(_array_1, 1, #_array_1, _length + 1, _array)
+		_result = _array
 	else
 		_result = {}
 	end
@@ -80,8 +76,7 @@ local function getArgumentSuggestion(arg, textPart)
 	local typeSuggestions = _result_1
 	if typeSuggestions ~= nil then
 		for _, text in typeSuggestions do
-			local _arg0 = formatText(text)
-			table.insert(suggestions, _arg0)
+			table.insert(suggestions, text)
 		end
 	end
 	local errorText
@@ -183,7 +178,7 @@ local function getCommandSuggestion(registry, parentPath, text)
 	local _newValue_1 = table.create(#sortedPaths)
 	local _callback_1 = function(_param)
 		local str = _param[2]
-		return formatText(str)
+		return str
 	end
 	for _k, _v in sortedPaths do
 		_newValue_1[_k] = _callback_1(_v, _k - 1, sortedPaths)

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

@@ -1,6 +1,7 @@
 -- 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
@@ -77,7 +78,7 @@ local function completeArgument(text, suggestion, commandArgCount)
 end
 local function getSuggestedText(registry, text, suggestion)
 	if suggestion == nil then
-		return text
+		return ""
 	end
 	local suggestionText
 	local parts = terminalTextParts()
@@ -87,10 +88,9 @@ local function getSuggestedText(registry, text, suggestion)
 		local command = currentCommandPath()
 		local argIndex = terminalArgIndex()
 		if command == nil or argIndex == nil then
-			return text
+			return ""
 		end
-		local atNextPart = string.sub(text, -1) == " "
-		if atNextPart and argIndex == commandArgIndex() then
+		if atNextPart() and argIndex == commandArgIndex() then
 			suggestionText = suggestion.title
 		elseif not (#suggestion.others == 0) then
 			suggestionText = suggestion.others[1]

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

@@ -62,7 +62,6 @@ local function TerminalTextField(_param)
 		end
 		textBox.Text = text
 		textBox.CursorPosition = #text + 1
-		suggestionText(text)
 	end
 	local traverseHistory = function(up)
 		local history = commandHistory()

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,7 +37,6 @@ 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()
@@ -116,7 +116,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
@@ -133,18 +133,14 @@ 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 textPart = parts[#parts]
-			local _result = textPart
-			if _result ~= nil then
-				_result = string.match(_result, START_QUOTE_PATTERN)
-			end
-			local quoted = _result ~= nil
-			if atNextPart and not quoted then
+			local atNext = atNextPart()
+			if atNext then
 				textPart = nil
 			elseif textPart ~= nil then
 				local _condition = (string.match(text, TRAILING_SPACE_PATTERN))
@@ -154,18 +150,18 @@ local function Terminal()
 				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_1 = parentPath
-				if _result_1 ~= nil then
-					_result_1 = _result_1:isEmpty()
+				local _result = parentPath
+				if _result ~= nil then
+					_result = _result:isEmpty()
 				end
-				currentSuggestion(getCommandSuggestion(_exp, if not _result_1 then parentPath else nil, textPart))
+				currentSuggestion(getCommandSuggestion(_exp, if not _result then parentPath else nil, textPart))
 				return nil
 			end
 			-- Handle arguments
@@ -197,11 +193,11 @@ local function Terminal()
 				endIndex = if numArgs ~= "rest" then i + (numArgs - 1) else nil
 			end
 			local _registry = client.registry
-			local _result_1 = currentArg
-			if _result_1 ~= nil then
-				_result_1 = _result_1.type
+			local _result = currentArg
+			if _result ~= nil then
+				_result = _result.type
 			end
-			local _condition = _result_1
+			local _condition = _result
 			if _condition == nil then
 				_condition = ""
 			end
@@ -231,11 +227,11 @@ local function Terminal()
 				end
 				local textParts = splitString(_condition_1, ",", true)
 				local lastText = if not (#textParts == 0) then textParts[#textParts] else nil
-				local _result_2 = textPart
-				if _result_2 ~= nil then
-					_result_2 = string.sub(_result_2, -1)
+				local _result_1 = textPart
+				if _result_1 ~= nil then
+					_result_1 = string.sub(_result_1, -1)
 				end
-				argTextPart = if _result_2 ~= "," then lastText else nil
+				argTextPart = if _result_1 ~= "," then lastText else nil
 				suggestion = getArgumentSuggestion({
 					kind = "list",
 					options = currentArg,
@@ -245,11 +241,11 @@ local function Terminal()
 			end
 			currentTextPart(argTextPart)
 			currentSuggestion(suggestion)
-			local _result_2 = suggestion
-			if _result_2 ~= nil then
-				_result_2 = _result_2.error
+			local _result_1 = suggestion
+			if _result_1 ~= nil then
+				_result_1 = _result_1.error
 			end
-			if _result_2 ~= nil then
+			if _result_1 ~= nil then
 				terminalTextValid(false)
 			end
 		end,
@@ -273,7 +269,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

@@ -5,6 +5,9 @@ local _charm = TS.import(script, TS.getModule(script, "@rbxts", "charm").src)
 local atom = _charm.atom
 local computed = _charm.computed
 local DEFAULT_INTERFACE_OPTIONS = TS.import(script, script.Parent, "constants", "options").DEFAULT_INTERFACE_OPTIONS
+local _string = TS.import(script, script.Parent, "utils", "string")
+local isQuoteEnded = _string.isQuoteEnded
+local isQuoteStarted = _string.isQuoteStarted
 local interfaceVisible = atom(false)
 local interfaceOptions = atom(DEFAULT_INTERFACE_OPTIONS)
 local mouseOverInterface = atom(false)
@@ -16,6 +19,15 @@ local terminalText = atom("")
 local terminalTextParts = computed(function()
 	return splitString(terminalText(), " ", true)
 end)
+local atNextPart = computed(function()
+	local parts = terminalTextParts()
+	local textPart = parts[#parts]
+	local quoted = false
+	if textPart ~= nil then
+		quoted = isQuoteStarted(textPart) and not isQuoteEnded(textPart)
+	end
+	return string.sub(terminalText(), -1) == " " and not quoted
+end)
 local terminalTextValid = atom(false)
 local currentTextPart = atom(nil)
 return {
@@ -28,6 +40,7 @@ return {
 	currentSuggestion = currentSuggestion,
 	terminalText = terminalText,
 	terminalTextParts = terminalTextParts,
+	atNextPart = atNextPart,
 	terminalTextValid = terminalTextValid,
 	currentTextPart = currentTextPart,
 }

package/out/utils/string.d.ts

@@ -0,0 +1,5 @@
+export declare function containsSpace(text: string): boolean;
+export declare function stripQuotes(text: string): string;
+export declare function getQuoteChar(text: string): string;
+export declare function isQuoteStarted(text: string): boolean;
+export declare function isQuoteEnded(text: string): boolean;

package/out/utils/string.luau

@@ -0,0 +1,25 @@
+-- Compiled with roblox-ts v3.0.0
+local START_QUOTE_PATTERN = `^(['"])`
+local END_QUOTE_PATTERN = `(['"])%s*$`
+local function containsSpace(text)
+	return not (#{ string.match(text, "%s") } == 0)
+end
+local function stripQuotes(text)
+	return (string.gsub((string.gsub(text, START_QUOTE_PATTERN, "")), END_QUOTE_PATTERN, ""))
+end
+local function getQuoteChar(text)
+	return (string.match(text, START_QUOTE_PATTERN))
+end
+local function isQuoteStarted(text)
+	return (string.match(text, START_QUOTE_PATTERN)) ~= nil
+end
+local function isQuoteEnded(text)
+	return (string.match(text, END_QUOTE_PATTERN)) ~= nil
+end
+return {
+	containsSpace = containsSpace,
+	stripQuotes = stripQuotes,
+	getQuoteChar = getQuoteChar,
+	isQuoteStarted = isQuoteStarted,
+	isQuoteEnded = isQuoteEnded,
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rbxts/centurion-ui",
   "description": "Terminal UI for the Centurion command framework",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "author": "paradoxuum",
   "license": "MIT",
   "main": "out/init.lua",