refac: think tag

This commit is contained in:
Timothy Jaeryang Baek
2025-01-22 09:24:40 -08:00
parent cf470e70e2
commit 9feed97f22
4 changed files with 42 additions and 30 deletions

View File

@@ -1,5 +1,5 @@
// Helper function to find matching closing tag
function findMatchingClosingTag(src, openTag, closeTag) {
function findMatchingClosingTag(src: string, openTag: string, closeTag: string): number {
let depth = 1;
let index = openTag.length;
while (depth > 0 && index < src.length) {
@@ -15,29 +15,37 @@ function findMatchingClosingTag(src, openTag, closeTag) {
return depth === 0 ? index + closeTag.length : -1;
}
function detailsTokenizer(src) {
const detailsRegex = /^<details>\n/;
const summaryRegex = /^<summary>(.*?)<\/summary>\n/;
const loadingRegex = /<loading\s*\/>/; // Detect <loading/>
// Function to parse attributes from tag
function parseAttributes(tag: string): { [key: string]: string } {
const attributes: { [key: string]: string } = {};
const attrRegex = /(\w+)="(.*?)"/g;
let match;
while ((match = attrRegex.exec(tag)) !== null) {
attributes[match[1]] = match[2];
}
return attributes;
}
if (detailsRegex.test(src)) {
const endIndex = findMatchingClosingTag(src, '<details>', '</details>');
function detailsTokenizer(src: string) {
// Updated regex to capture attributes inside <details>
const detailsRegex = /^<details(\s+[^>]*)?>\n/;
const summaryRegex = /^<summary>(.*?)<\/summary>\n/;
const detailsMatch = detailsRegex.exec(src);
if (detailsMatch) {
const endIndex = findMatchingClosingTag(src, '<details', '</details>');
if (endIndex === -1) return;
const fullMatch = src.slice(0, endIndex);
let content = fullMatch.slice(10, -10).trim(); // Remove <details> and </details>
const detailsTag = detailsMatch[0];
const attributes = parseAttributes(detailsTag); // Parse attributes from <details>
let content = fullMatch.slice(detailsTag.length, -10).trim(); // Remove <details> and </details>
let summary = '';
let isLoading = false;
const summaryMatch = summaryRegex.exec(content);
if (summaryMatch) {
summary = summaryMatch[1].trim();
// Detect and remove <loading/>
if (loadingRegex.test(summary)) {
isLoading = true;
summary = summary.replace(loadingRegex, '').trim(); // Remove <loading/> from summary
}
content = content.slice(summaryMatch[0].length).trim();
}
@@ -46,22 +54,29 @@ function detailsTokenizer(src) {
raw: fullMatch,
summary: summary,
text: content,
isLoading: isLoading // Include loading property to indicate if <loading/> was present
attributes: attributes // Include extracted attributes from <details>
};
}
}
function detailsStart(src) {
function detailsStart(src: string) {
return src.match(/^<details>/) ? 0 : -1;
}
function detailsRenderer(token) {
return `<details>
function detailsRenderer(token: any) {
const attributesString = token.attributes
? Object.entries(token.attributes)
.map(([key, value]) => `${key}="${value}"`)
.join(' ')
: '';
return `<details ${attributesString}>
${token.summary ? `<summary>${token.summary}</summary>` : ''}
${token.text}
</details>`;
}
// Extension wrapper function
function detailsExtension() {
return {
name: 'details',