coracle/welshman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

review changes

Browse Source
This commit is contained in:
Ticruz
2025-01-29 11:15:17 +01:00
parent 3f9f4b5639
commit 14b7384da3
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/content/src/index.ts
+22 -25
View File
@@ -95,6 +95,7 @@ export type ParsedLink = {
export type ParsedLinkGrid = { export type ParsedLinkGrid = {
type: ParsedType.LinkGrid type: ParsedType.LinkGrid
value: ParsedLinkGridValue value: ParsedLinkGridValue
raw: string
} }
export type ParsedNewline = { export type ParsedNewline = {
@@ -159,6 +160,8 @@ export const isEvent = (parsed: Parsed): parsed is ParsedEvent => parsed.type ==
export const isInvoice = (parsed: Parsed): parsed is ParsedInvoice => export const isInvoice = (parsed: Parsed): parsed is ParsedInvoice =>
parsed.type === ParsedType.Invoice parsed.type === ParsedType.Invoice
export const isLink = (parsed: Parsed): parsed is ParsedLink => parsed.type === ParsedType.Link export const isLink = (parsed: Parsed): parsed is ParsedLink => parsed.type === ParsedType.Link
export const isImage = (parsed: Parsed): parsed is ParsedLink =>
isLink(parsed) && Boolean(parsed.value.url.toString().match(/\.(jpe?g|png|gif|webp)$/))
export const isLinkGrid = (parsed: Parsed): parsed is ParsedLinkGrid => export const isLinkGrid = (parsed: Parsed): parsed is ParsedLinkGrid =>
parsed.type === ParsedType.LinkGrid parsed.type === ParsedType.LinkGrid
export const isNewline = (parsed: Parsed): parsed is ParsedNewline => export const isNewline = (parsed: Parsed): parsed is ParsedNewline =>
@@ -433,41 +436,35 @@ export const truncate = (
return content return content
} }
function isImage(parsed: Parsed) {
return isLink(parsed) && parsed.value.url.toString().match(/\.(jpe?g|png|gif|webp)$/)
}
export const reduceLinks = (content: Parsed[]) => { export const reduceLinks = (content: Parsed[]) => {
let images: ParsedLinkGridValue = {links: []} let images: URL[] = []
let newLine: ParsedNewline | null = null let newLine: ParsedNewline | null = null
let emptyText: ParsedText | null = null let emptyText: ParsedText | null = null
const parsedContent = [] const parsedContent = []
for (const parsed of content) { for (const parsed of content) {
if (isImage(parsed)) { if (isImage(parsed)) {
images.links.push(parsed.value as ParsedLinkValue) images.push((parsed.value as ParsedLinkValue).url)
} else { } else if (images.length && isNewline(parsed)) {
if (images.links.length && isNewline(parsed)) { newLine = parsed
newLine = parsed } else if (images.length && isText(parsed) && !parsed.value.trim()) {
} else if (images.links.length && isText(parsed) && !parsed.value.trim()) { emptyText = parsed
emptyText = parsed } else if (images.length) {
} else if (images.links.length) { parsedContent.push({type: ParsedType.LinkGrid, value: {links: [...images]}})
parsedContent.push({type: ParsedType.LinkGrid, value: {...images}}) if (newLine) {
if (newLine) { parsedContent.push(newLine)
parsedContent.push(newLine) newLine = null
newLine = null } else if (emptyText) {
} else if (emptyText) { parsedContent.push(emptyText)
parsedContent.push(emptyText) emptyText = null
emptyText = null
}
images.links = []
} else {
parsedContent.push(parsed)
} }
images = []
} else {
parsedContent.push(parsed)
} }
} }
if (images.links.length) { if (images.length) {
parsedContent.push({type: ParsedType.LinkGrid, value: images}) parsedContent.push({type: ParsedType.LinkGrid, value: {links: [...images]}})
} }
return parsedContent return parsedContent
} }