@rbxts/centurion-ui 1.0.1 → 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.luau

@@ -37,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()

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)
@@ -19,19 +22,10 @@ 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)
+	local quoted = false
+	if textPart ~= nil then
+		quoted = isQuoteStarted(textPart) and not isQuoteEnded(textPart)
 	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)

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.1",
+  "version": "1.0.2",
   "author": "paradoxuum",
   "license": "MIT",
   "main": "out/init.lua",