@rbxts/uiblox 0.2.0-alpha.36 → 0.2.0-alpha.38

package/out/ui/packages/markdown/parseMarkdown.luau

@@ -46,6 +46,71 @@ local function trim(value)
 	local _stop = stop
 	return string.sub(_value, _start, _stop)
 end
+local function stripCr(raw)
+	local _condition = #raw > 0
+	if _condition then
+		local _raw = raw
+		local _arg0 = #raw
+		local _arg1 = #raw
+		_condition = string.sub(_raw, _arg0, _arg1) == "\r"
+	end
+	if _condition then
+		local _raw = raw
+		local _arg1 = #raw - 1
+		return string.sub(_raw, 1, _arg1)
+	end
+	return raw
+end
+--* Two trailing spaces end a paragraph line. A trailing backslash is not a break. 
+local function endsWithHardBreak(raw)
+	local line = stripCr(raw)
+	local _condition = #line >= 2
+	if _condition then
+		local _arg0 = #line - 1
+		local _arg1 = #line
+		_condition = string.sub(line, _arg0, _arg1) == "  "
+	end
+	return _condition
+end
+local function withoutHardBreak(raw)
+	local line = stripCr(raw)
+	if not endsWithHardBreak(line) then
+		return trimEnd(line)
+	end
+	local _arg1 = #line - 2
+	return trimEnd(string.sub(line, 1, _arg1))
+end
+--* Adjacent lines join with a space. A hard break on the previous line inserts a newline. 
+local function foldLines(rawLines)
+	local acc = ""
+	local breakNext = false
+	for index = 0, #rawLines - 1 do
+		local text = withoutHardBreak(rawLines[index + 1])
+		if index == 0 then
+			acc = text
+		elseif breakNext then
+			acc = `{acc}\n{text}`
+		else
+			acc = if #acc == 0 then text else `{acc} {text}`
+		end
+		breakNext = endsWithHardBreak(rawLines[index + 1])
+	end
+	return acc
+end
+--* `>` or `> ` starts a quote line. `>>` does not, so it stays ordinary text. 
+local function quoteBody(raw)
+	local line = stripCr(raw)
+	if #line == 0 or string.sub(line, 1, 1) ~= ">" then
+		return nil
+	end
+	if #line == 1 then
+		return ""
+	end
+	if string.sub(line, 2, 2) ~= " " then
+		return nil
+	end
+	return string.sub(line, 3)
+end
 local function headingLevel(line)
 	local n = 0
 	while true do
@@ -240,6 +305,138 @@ local function isHr(line)
 	end
 	return true
 end
+--* Split a pipe row. Leading and trailing pipes are optional. `\|` is a literal pipe. 
+local function splitCells(line)
+	local t = trim(line)
+	if (string.find(t, "|", 1, true)) == nil then
+		return nil
+	end
+	local body = t
+	if string.sub(body, 1, 1) == "|" then
+		body = string.sub(body, 2)
+	end
+	local _condition = #body > 0
+	if _condition then
+		local _body = body
+		local _arg0 = #body
+		local _arg1 = #body
+		_condition = string.sub(_body, _arg0, _arg1) == "|"
+	end
+	if _condition then
+		local _body = body
+		local _arg1 = #body - 1
+		body = string.sub(_body, 1, _arg1)
+	end
+	local cells = {}
+	local buf = ""
+	local i = 1
+	while i <= #body do
+		local _body = body
+		local _i = i
+		local _i_1 = i
+		local ch = string.sub(_body, _i, _i_1)
+		local _condition_1 = ch == "\\" and i < #body
+		if _condition_1 then
+			local _body_1 = body
+			local _arg0 = i + 1
+			local _arg1 = i + 1
+			_condition_1 = string.sub(_body_1, _arg0, _arg1) == "|"
+		end
+		if _condition_1 then
+			buf = `{buf}|`
+			i += 2
+			continue
+		end
+		if ch == "|" then
+			local _arg0 = trim(buf)
+			table.insert(cells, _arg0)
+			buf = ""
+			i += 1
+			continue
+		end
+		buf = `{buf}{ch}`
+		i += 1
+	end
+	local _arg0 = trim(buf)
+	table.insert(cells, _arg0)
+	return cells
+end
+local function cellAlign(cell)
+	local t = trim(cell)
+	local i = 1
+	local left = false
+	local right = false
+	if string.sub(t, 1, 1) == ":" then
+		left = true
+		i = 2
+	end
+	local dashes = 0
+	while true do
+		local _condition = i <= #t
+		if _condition then
+			local _i = i
+			local _i_1 = i
+			_condition = string.sub(t, _i, _i_1) == "-"
+		end
+		if not _condition then
+			break
+		end
+		dashes += 1
+		i += 1
+	end
+	local _condition = i <= #t
+	if _condition then
+		local _i = i
+		local _i_1 = i
+		_condition = string.sub(t, _i, _i_1) == ":"
+	end
+	if _condition then
+		right = true
+		i += 1
+	end
+	if i <= #t or dashes < 3 then
+		return nil
+	end
+	if left and right then
+		return "center"
+	end
+	if right then
+		return "right"
+	end
+	return "left"
+end
+local function delimiterAlign(cells)
+	if #cells == 0 then
+		return nil
+	end
+	local align = {}
+	for _, cell in cells do
+		local aligned = cellAlign(cell)
+		if aligned == nil then
+			return nil
+		end
+		table.insert(align, aligned)
+	end
+	return align
+end
+local function tableAt(lines, index)
+	if index + 1 >= #lines then
+		return nil
+	end
+	local header = splitCells(trimEnd(lines[index + 1]))
+	local delim = splitCells(trimEnd(lines[index + 2]))
+	if header == nil or delim == nil then
+		return nil
+	end
+	local align = delimiterAlign(delim)
+	if align == nil or #align ~= #header then
+		return nil
+	end
+	return {
+		align = align,
+		header = header,
+	}
+end
 local function listMarker(line)
 	local t = trim(line)
 	if #t >= 2 and (string.sub(t, 1, 2) == "- " or string.sub(t, 1, 2) == "* ") then
@@ -275,6 +472,24 @@ local function listMarker(line)
 	end
 	return nil
 end
+local function codeLanguage(info)
+	local _condition = string.split(trim(info), " ")[1]
+	if _condition == nil then
+		_condition = ""
+	end
+	local token = _condition
+	local name = string.lower(token)
+	if name == "luau" then
+		return "luau"
+	end
+	if name == "ts" then
+		return "ts"
+	end
+	if name == "json" then
+		return "json"
+	end
+	return "text"
+end
 --* Small markdown subset → blocks. Unsupported syntax stays plain text. 
 local function parseMarkdown(source)
 	local lines = string.split(source, "\n")
@@ -288,6 +503,7 @@ local function parseMarkdown(source)
 			continue
 		end
 		if #line >= 3 and string.sub(line, 1, 3) == "```" then
+			local language = codeLanguage(string.sub(line, 4))
 			local body = {}
 			i += 1
 			while i < #lines and not (#lines[i + 1] >= 3 and string.sub(trim(lines[i + 1]), 1, 3) == "```") do
@@ -301,6 +517,7 @@ local function parseMarkdown(source)
 			local _arg0 = {
 				kind = "code",
 				text = table.concat(body, "\n"),
+				language = language,
 			}
 			table.insert(blocks, _arg0)
 			continue
@@ -325,20 +542,113 @@ local function parseMarkdown(source)
 			i += 1
 			continue
 		end
-		if string.sub(line, 1, 1) == ">" and (#line == 1 or string.sub(line, 2, 2) == " ") then
-			local parts = {}
+		if quoteBody(lines[i + 1]) ~= nil then
+			local groups = {}
+			local current = {}
+			while i < #lines do
+				local body = quoteBody(lines[i + 1])
+				if body == nil then
+					if trim(lines[i + 1]) ~= "" then
+						break
+					end
+					local ahead = i + 1
+					while ahead < #lines and trim(lines[ahead + 1]) == "" do
+						ahead += 1
+					end
+					if ahead >= #lines or quoteBody(lines[ahead + 1]) == nil then
+						break
+					end
+					body = ""
+					i = ahead
+				else
+					i += 1
+				end
+				if trim(body) == "" then
+					if #current > 0 then
+						local _current = current
+						table.insert(groups, _current)
+					end
+					current = {}
+				else
+					local _current = current
+					local _body = body
+					table.insert(_current, _body)
+				end
+			end
+			if #current > 0 then
+				local _current = current
+				table.insert(groups, _current)
+			end
+			if #groups == 0 then
+				table.insert(groups, {})
+			end
+			local _object = {
+				kind = "blockquote",
+			}
+			local _left = "paragraphs"
+			-- ▼ ReadonlyArray.map ▼
+			local _newValue = table.create(#groups)
+			local _callback = function(group)
+				-- ▼ ReadonlyArray.map ▼
+				local _newValue_1 = table.create(#group)
+				local _callback_1 = function(line)
+					return withoutHardBreak(line)
+				end
+				for _k, _v in group do
+					_newValue_1[_k] = _callback_1(_v, _k - 1, group)
+				end
+				-- ▲ ReadonlyArray.map ▲
+				return parseInlines(table.concat(_newValue_1, "\n"))
+			end
+			for _k, _v in groups do
+				_newValue[_k] = _callback(_v, _k - 1, groups)
+			end
+			-- ▲ ReadonlyArray.map ▲
+			_object[_left] = _newValue
+			table.insert(blocks, _object)
+			continue
+		end
+		local parsed = tableAt(lines, i)
+		if parsed ~= nil then
+			local _exp = parsed.header
+			-- ▼ ReadonlyArray.map ▼
+			local _newValue = table.create(#_exp)
+			local _callback = function(cell)
+				return parseInlines(cell)
+			end
+			for _k, _v in _exp do
+				_newValue[_k] = _callback(_v, _k - 1, _exp)
+			end
+			-- ▲ ReadonlyArray.map ▲
+			local header = _newValue
+			local rows = {}
+			i += 2
 			while i < #lines do
 				local cur = trimEnd(lines[i + 1])
-				if not (string.sub(cur, 1, 1) == ">" and (#cur == 1 or string.sub(cur, 2, 2) == " ")) then
+				if trim(cur) == "" then
+					break
+				end
+				local row = splitCells(cur)
+				if row == nil then
 					break
 				end
-				local _arg0 = if #cur >= 2 then string.sub(cur, 3) else ""
-				table.insert(parts, _arg0)
+				local cells = {}
+				for col = 0, #parsed.align - 1 do
+					local _condition = row[col + 1]
+					if _condition == nil then
+						_condition = ""
+					end
+					local _arg0 = parseInlines(_condition)
+					table.insert(cells, _arg0)
+				end
+				table.insert(rows, cells)
 				i += 1
 			end
 			local _arg0 = {
-				kind = "blockquote",
-				inlines = parseInlines(table.concat(parts, " ")),
+				kind = "table",
+				align = parsed.align,
+				header = header,
+				rows = rows,
 			}
 			table.insert(blocks, _arg0)
 			continue
@@ -365,7 +675,7 @@ local function parseMarkdown(source)
 			table.insert(blocks, _arg0)
 			continue
 		end
-		local para = { line }
+		local rawPara = { lines[i + 1] }
 		i += 1
 		while i < #lines do
 			local cur = trimEnd(lines[i + 1])
@@ -381,31 +691,22 @@ local function parseMarkdown(source)
 			if headingLevel(cur) ~= nil then
 				break
 			end
-			if string.sub(cur, 1, 1) == ">" and (#cur == 1 or string.sub(cur, 2, 2) == " ") then
+			if quoteBody(lines[i + 1]) ~= nil then
 				break
 			end
 			if listMarker(cur) ~= nil then
 				break
 			end
-			-- two trailing spaces = hard break
-			local prev = para[#para]
-			local _condition = #prev >= 2
-			if _condition then
-				local _arg0 = #prev - 1
-				_condition = string.sub(prev, _arg0) == "  "
-			end
-			if _condition then
-				local _arg1 = #prev - 2
-				para[#para] = trimEnd(string.sub(prev, 1, _arg1))
-				table.insert(para, cur)
-			else
-				para[#para] = `{prev} {cur}`
+			if tableAt(lines, i) ~= nil then
+				break
 			end
+			local _arg0 = lines[i + 1]
+			table.insert(rawPara, _arg0)
 			i += 1
 		end
 		local _arg0 = {
 			kind = "paragraph",
-			inlines = parseInlines(table.concat(para, "\n")),
+			inlines = parseInlines(foldLines(rawPara)),
 		}
 		table.insert(blocks, _arg0)
 	end
@@ -432,7 +733,7 @@ local function escapeRich(text)
 	end
 	return out
 end
---* Turn inline nodes into Roblox RichText. Links become colored label + (url). 
+--* Turn inline nodes into Roblox RichText. Links stay the label only. 
 local function inlinesToRichText(inlines)
 	local out = ""
 	for _, part in inlines do
@@ -447,13 +748,140 @@ local function inlinesToRichText(inlines)
 		elseif part.kind == "code" then
 			out = `{out}<font face="RobotoMono">{escapeRich(part.text)}</font>`
 		elseif part.kind == "link" then
-			out = `{out}<font color="#4C9AFF">{escapeRich(part.text)}</font> ({escapeRich(part.href)})`
+			out = `{out}<u>{escapeRich(part.text)}</u>`
 		end
 	end
 	return out
 end
+--* Click payload for a link inline. Other inlines are not activatable. 
+local function markdownLinkPayload(inline)
+	if inline.kind ~= "link" or #inline.text == 0 then
+		return nil
+	end
+	return {
+		text = inline.text,
+		href = inline.href,
+	}
+end
+local function isPunctuation(word)
+	if #word == 0 then
+		return false
+	end
+	for i = 1, #word do
+		local _word = word
+		local _i = i
+		local _i_1 = i
+		local ch = string.sub(_word, _i, _i_1)
+		if ch ~= "," and ch ~= "." and ch ~= ";" and ch ~= ":" and ch ~= "!" and ch ~= "?" and ch ~= ")" and ch ~= "]" then
+			return false
+		end
+	end
+	return true
+end
+local function richWord(kind, word)
+	local safe = escapeRich(word)
+	if kind == "bold" then
+		return `<b>{safe}</b>`
+	end
+	if kind == "italic" then
+		return `<i>{safe}</i>`
+	end
+	if kind == "code" then
+		return `<font face="RobotoMono">{safe}</font>`
+	end
+	return safe
+end
+--* Split a line into words and link payloads so a link can take a click. 
+local function inlinePieces(inlines)
+	local out = {}
+	for _, part in inlines do
+		local link = markdownLinkPayload(part)
+		if link ~= nil then
+			local _arg0 = {
+				kind = "link",
+				text = link.text,
+				href = link.href,
+			}
+			table.insert(out, _arg0)
+			continue
+		end
+		if part.kind == "link" then
+			continue
+		end
+		local word = ""
+		local flush = function()
+			if #word == 0 then
+				return nil
+			end
+			local prev = out[#out]
+			if prev ~= nil and prev.kind ~= "break" and isPunctuation(word) then
+				prev.text = `{prev.text}{word}`
+			else
+				local _arg0 = {
+					kind = "word",
+					text = richWord(part.kind, word),
+				}
+				table.insert(out, _arg0)
+			end
+			word = ""
+		end
+		local source = part.text
+		for i = 1, #source do
+			local _i = i
+			local _i_1 = i
+			local ch = string.sub(source, _i, _i_1)
+			if ch == " " or ch == "\t" or ch == "\r" then
+				flush()
+				continue
+			end
+			if ch == "\n" then
+				flush()
+				table.insert(out, {
+					kind = "break",
+				})
+				continue
+			end
+			word = `{word}{ch}`
+		end
+		flush()
+	end
+	return out
+end
+--* Line index of each piece. A piece wraps only when it does not fit beside the previous one. 
+local function inlineLines(pieces, maxWidth, gap)
+	if gap == nil then
+		gap = 1
+	end
+	local lineOf = {}
+	local line = 0
+	local used = 0
+	for _, piece in pieces do
+		if piece.kind == "break" then
+			local _line = line
+			table.insert(lineOf, _line)
+			line += 1
+			used = 0
+			continue
+		end
+		local width = #piece.text
+		if used > 0 and used + gap + width > maxWidth then
+			line += 1
+			used = width
+		elseif used == 0 then
+			used = width
+		else
+			used += gap + width
+		end
+		local _line = line
+		table.insert(lineOf, _line)
+	end
+	return lineOf
+end
 return {
 	parseMarkdown = parseMarkdown,
 	inlinesToPlain = inlinesToPlain,
 	inlinesToRichText = inlinesToRichText,
+	markdownLinkPayload = markdownLinkPayload,
+	inlinePieces = inlinePieces,
+	inlineLines = inlineLines,
 }

package/out/ui/packages/menu/components/Menu.d.ts

@@ -1,9 +1,12 @@
 import React from "@rbxts/react";
 import { CustomizedProps } from "../../../../theme/index";
+import { Icons } from "../../../enums/index";
 export interface MenuItem {
     id: string;
     text: string;
+    icon?: Icons;
     disabled?: boolean;
+    tone?: "danger";
 }
 export interface MenuProps {
     anchor?: GuiObject;
@@ -16,5 +19,5 @@ export interface MenuProps {
     dense?: boolean;
     selected?: string;
 }
-declare function Menu(props: CustomizedProps<Frame, MenuProps>): JSX.Element | undefined;
+declare function Menu(props: CustomizedProps<Frame, MenuProps>): JSX.Element;
 export default Menu;