@rbxts/centurion-ui 1.0.0 → 1.0.1

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
@@ -116,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
@@ -133,18 +134,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 +151,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 +194,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 +228,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 +242,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 +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

@@ -16,6 +16,24 @@ local terminalText = atom("")
 local terminalTextParts = computed(function()
 	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)
 return {
@@ -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",
+  "version": "1.0.1",
   "author": "paradoxuum",
   "license": "MIT",
   "main": "out/init.lua",