@fuzdev/mdz 0.1.0 → 0.2.0

package/src/lib/mdz_token_parser.ts

@@ -18,16 +18,19 @@ import type {
 	MdzNodeList,
 	MdzNodeListItem,
 	MdzNodeBlockquote,
+	MdzNodeTable,
+	MdzNodeTableRow,
+	MdzNodeTableCell,
 	MdzNodeElement,
 	MdzNodeComponent,
-} from './mdz.js';
+} from './mdz.ts';
 import {
 	has_non_whitespace,
 	mdz_extract_single_tag,
 	mdz_heading_id,
 	mdz_merge_adjacent_text,
 	mdz_push_merging_text,
-} from './mdz_helpers.js';
+} from './mdz_helpers.ts';
 import {
 	type MdzToken,
 	type MdzTokenHeadingStart,
@@ -38,7 +41,10 @@ import {
 	type MdzTokenTagSelfClose,
 	type MdzTokenListOpen,
 	type MdzTokenListItemOpen,
-} from './mdz_lexer.js';
+	type MdzTokenTableOpen,
+	type MdzTokenTableRowOpen,
+	type MdzTokenTableCellOpen,
+} from './mdz_lexer.ts';
 
 /**
  * Builds an `MdzNode[]` tree from a lexed `MdzToken[]` stream.
@@ -52,10 +58,38 @@ export class MdzTokenParser {
 		this.#tokens = tokens;
 	}
 
+	/**
+	 * Rebind to a new token stream and rewind, so one parser instance can be
+	 * reused across inputs — the streaming table path reuses one across a row's
+	 * cells via `MdzTableCellParser`.
+	 *
+	 * @nodocs
+	 */
+	reset(tokens: Array<MdzToken>): void {
+		this.#tokens = tokens;
+		this.#index = 0;
+	}
+
 	parse(): Array<MdzNode> {
 		return this.#parse_block_stream(false);
 	}
 
+	/**
+	 * Parse the entire token stream as a single inline run — used for table
+	 * cells, whose tokens come from `MdzLexer.lex_table_cell`. Adjacent text
+	 * merges as it accumulates, matching `#parse_table_cell`.
+	 *
+	 * @nodocs
+	 */
+	parse_inline_run(): Array<MdzNode> {
+		const children: Array<MdzNode> = [];
+		while (this.#index < this.#tokens.length) {
+			const node = this.#parse_inline();
+			if (node) mdz_push_merging_text(children, node);
+		}
+		return children;
+	}
+
 	/**
 	 * Parse a run of block-level tokens into nodes — the document root, or a
 	 * blockquote's contents (a quote's content is a mini-document, so both
@@ -118,6 +152,13 @@ export class MdzTokenParser {
 				continue;
 			}
 
+			if (token.type === 'table_open') {
+				const flushed = this.#flush_paragraph(paragraph_children, true);
+				if (flushed) nodes.push(flushed);
+				nodes.push(this.#parse_table());
+				continue;
+			}
+
 			if (token.type === 'paragraph_break') {
 				const flushed = this.#flush_paragraph(paragraph_children, true);
 				if (flushed) nodes.push(flushed);
@@ -147,6 +188,74 @@ export class MdzTokenParser {
 		return {type: 'Blockquote', children, start: open.start, end};
 	}
 
+	#parse_table(): MdzNodeTable {
+		const open = this.#tokens[this.#index]! as MdzTokenTableOpen;
+		this.#index++;
+
+		const rows: Array<MdzNodeTableRow> = [];
+
+		while (this.#index < this.#tokens.length) {
+			const t = this.#tokens[this.#index]!;
+			if (t.type === 'table_row_open') {
+				rows.push(this.#parse_table_row());
+				continue;
+			}
+			if (t.type === 'table_close') {
+				this.#index++;
+				break;
+			}
+			this.#index++; // skip anything unexpected (defensive)
+		}
+
+		const end = rows.length > 0 ? rows[rows.length - 1]!.end : open.end;
+		return {type: 'Table', align: open.align, children: rows, start: open.start, end};
+	}
+
+	#parse_table_row(): MdzNodeTableRow {
+		const open = this.#tokens[this.#index]! as MdzTokenTableRowOpen;
+		const header = open.header;
+		this.#index++;
+
+		const cells: Array<MdzNodeTableCell> = [];
+
+		while (this.#index < this.#tokens.length) {
+			const t = this.#tokens[this.#index]!;
+			if (t.type === 'table_cell_open') {
+				cells.push(this.#parse_table_cell());
+				continue;
+			}
+			if (t.type === 'table_row_close') {
+				this.#index++;
+				return {type: 'TableRow', header, children: cells, start: open.start, end: t.end};
+			}
+			this.#index++; // skip anything unexpected (defensive)
+		}
+
+		const end = cells.length > 0 ? cells[cells.length - 1]!.end : open.end;
+		return {type: 'TableRow', header, children: cells, start: open.start, end};
+	}
+
+	#parse_table_cell(): MdzNodeTableCell {
+		const open = this.#tokens[this.#index]! as MdzTokenTableCellOpen;
+		const start = open.start;
+		this.#index++;
+
+		const children: Array<MdzNode> = [];
+
+		while (this.#index < this.#tokens.length) {
+			const t = this.#tokens[this.#index]!;
+			if (t.type === 'table_cell_close') {
+				this.#index++;
+				return {type: 'TableCell', children, start, end: t.end};
+			}
+			const node = this.#parse_inline();
+			if (node) mdz_push_merging_text(children, node);
+		}
+
+		const end = children.length > 0 ? children[children.length - 1]!.end : open.end;
+		return {type: 'TableCell', children, start, end};
+	}
+
 	#parse_heading(): MdzNodeHeading {
 		const token = this.#tokens[this.#index]! as MdzTokenHeadingStart;
 		const start = token.start;
@@ -238,6 +347,12 @@ export class MdzTokenParser {
 				children.push(this.#parse_blockquote());
 				continue;
 			}
+			if (t.type === 'table_open') {
+				flush();
+				in_paragraph = false;
+				children.push(this.#parse_table());
+				continue;
+			}
 			if (t.type === 'codeblock') {
 				flush();
 				in_paragraph = false;
@@ -382,7 +497,8 @@ export class MdzTokenParser {
 				t.type === 'codeblock' ||
 				t.type === 'list_open' ||
 				t.type === 'list_item_close' ||
-				t.type === 'blockquote_open'
+				t.type === 'blockquote_open' ||
+				t.type === 'table_open'
 			) {
 				break;
 			}
@@ -430,7 +546,8 @@ export class MdzTokenParser {
 				t.type === 'codeblock' ||
 				t.type === 'list_open' ||
 				t.type === 'list_item_close' ||
-				t.type === 'blockquote_open'
+				t.type === 'blockquote_open' ||
+				t.type === 'table_open'
 			) {
 				break;
 			}

package/src/lib/svelte_preprocess_mdz.ts

@@ -18,7 +18,7 @@ import type {ImportDeclaration, VariableDeclaration} from 'estree';
 import {parse, type PreprocessorGroup, type AST} from 'svelte/compiler';
 import MagicString from 'magic-string';
 import {walk} from 'zimmerframe';
-import {should_exclude_path} from '@fuzdev/fuz_util/path.js';
+import {should_exclude_path} from '@fuzdev/fuz_util/path.ts';
 import {
 	find_attribute,
 	extract_static_string,
@@ -34,10 +34,10 @@ import {
 	handle_preprocess_error,
 	type PreprocessImportInfo,
 	type ResolvedComponentImport,
-} from '@fuzdev/fuz_util/svelte_preprocess_helpers.js';
+} from '@fuzdev/fuz_util/svelte_preprocess_helpers.ts';
 
-import {mdz_parse} from './mdz.js';
-import {mdz_to_svelte} from './mdz_to_svelte.js';
+import {mdz_parse} from './mdz.ts';
+import {mdz_to_svelte} from './mdz_to_svelte.ts';
 
 /**
  * An estree `ImportDeclaration` augmented with Svelte's position data.

package/src/lib/tsdoc_mdz.ts

@@ -8,7 +8,7 @@
  * @module
  */
 
-import {mdz_is_url} from './mdz_helpers.js';
+import {mdz_is_url} from './mdz_helpers.ts';
 
 /** Format a reference as mdz: URLs pass through, identifiers get backticks. */
 const format_reference = (ref: string): string => (mdz_is_url(ref) ? ref : `\`${ref}\``);