Support attrs

thetarnav · Feb 28, 2024 · ae5762e · ae5762e
1 parent ca2e98d
commit ae5762e
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 23 deletions.
diff --git a/mds/mds.js b/mds/mds.js
@@ -81,6 +81,29 @@ export function token_type_to_string(type) {
 	}
 }
 
+export const
+	HREF = 1,
+	SRC  = 2,
+	LANG = 4
+
+/** @enum {(typeof Attr_Type)[keyof typeof Attr_Type]} */
+export const Attr_Type = /** @type {const} */({
+	Href: HREF,
+	Src:  SRC,
+	Lang: LANG,
+})
+
+/**
+ * @param   {Attr_Type} type
+ * @returns {string    } */
+export function attr_type_to_html_attr(type) {
+	switch (type) {
+	case HREF: return "href"
+	case SRC : return "src"
+	case LANG: return "lang"
+	}
+}
+
 /**
  * @typedef {import("./t.js").Any_Renderer} Any_Renderer
  * @typedef {import("./t.js").Parser      } Parser
@@ -117,7 +140,7 @@ export function parser_end(p) {
 export function parser_add_text(p) {
 	if (p.text.length === 0) return
 	console.assert(p.len > 0, "Never adding text to root")
-	p.renderer.add_text(p.text, p.renderer.data)
+	p.renderer.add_text(p.renderer.data, p.text)
 	p.text = ""
 }
 
@@ -139,7 +162,7 @@ export function parser_add_token(p, type) {
 	p.pending = ""
 	p.len += 1
 	p.types[p.len] = type
-	p.renderer.add_node(type, p.renderer.data)
+	p.renderer.add_node(p.renderer.data, type)
 }
 
 /**
@@ -247,9 +270,12 @@ export function parser_write(p, chunk) {
 				}
 				continue
 			default: /* parsing langiage */
-				p.code_block = '\n' === char
-					? 1
-					: p.code_block + char
+				if ('\n' === char) {
+					p.renderer.set_attr(p.renderer.data, LANG, p.code_block)
+					p.code_block = 1
+				} else {
+					p.code_block += char
+				}
 				continue
 			}
 		}
@@ -359,6 +385,9 @@ export function parser_write(p, chunk) {
 						  ^
 				*/
 				if (')' === char) {
+					const type = in_token === LINK ? HREF : SRC
+					const url = p.pending.slice(2)
+					p.renderer.set_attr(p.renderer.data, type, url)
 					parser_end_token(p)
 				} else {
 					p.pending += char
@@ -381,7 +410,7 @@ export function parser_write(p, chunk) {
 			}
 			/* Line break */
 			else {
-				p.renderer.add_text('\n', p.renderer.data)
+				p.renderer.add_text(p.renderer.data, '\n')
 				p.pending = char
 			}
 			continue
@@ -489,6 +518,7 @@ export function parser_write(p, chunk) {
  * @typedef {import("./t.js").Default_Renderer_Add_Node} Default_Renderer_Add_Node
  * @typedef {import("./t.js").Default_Renderer_End_Node} Default_Renderer_End_Node
  * @typedef {import("./t.js").Default_Renderer_Add_Text} Default_Renderer_Add_Text
+ * @typedef {import("./t.js").Default_Renderer_Set_Attr} Default_Renderer_Set_Attr
  */
 
 /**
@@ -499,6 +529,7 @@ export function default_renderer(root) {
 		add_node: default_add_node,
 		end_node: default_end_node,
 		add_text: default_add_text,
+		set_attr: default_set_attr,
 		data    : {
 			nodes: /**@type {*}*/([root,,,,,]),
 			index: 0,
@@ -507,7 +538,7 @@ export function default_renderer(root) {
 }
 
 /** @type {Default_Renderer_Add_Node} */
-export function default_add_node(type, data) {
+export function default_add_node(data, type) {
 	/**@type {HTMLElement}*/ let mount
 	/**@type {HTMLElement}*/ let slot
 
@@ -545,20 +576,26 @@ export function default_end_node(data) {
 }
 
 /** @type {Default_Renderer_Add_Text} */
-export function default_add_text(text, data) {
+export function default_add_text(data, text) {
 	switch (text) {
 	case ""  : break
 	case "\n": data.nodes[data.index].appendChild(document.createElement("br")) ;break
 	default  : data.nodes[data.index].appendChild(document.createTextNode(text))
 	}
 }
 
+/** @type {Default_Renderer_Set_Attr} */
+export function default_set_attr(data, type, value) {
+	data.nodes[data.index].setAttribute(attr_type_to_html_attr(type), value)
+}
+
 
 /**
  * @typedef {import("./t.js").Logger_Renderer         } Logger_Renderer
  * @typedef {import("./t.js").Logger_Renderer_Add_Node} Logger_Renderer_Add_Node
  * @typedef {import("./t.js").Logger_Renderer_End_Node} Logger_Renderer_End_Node
  * @typedef {import("./t.js").Logger_Renderer_Add_Text} Logger_Renderer_Add_Text
+ * @typedef {import("./t.js").Logger_Renderer_Set_Attr} Logger_Renderer_Set_Attr
  */
 
 /** @returns {Logger_Renderer} */
@@ -568,11 +605,12 @@ export function logger_renderer() {
 		add_node: logger_add_node,
 		end_node: logger_end_node,
 		add_text: logger_add_text,
+		set_attr: logger_set_attr,
 	}
 }
 
 /** @type {Logger_Renderer_Add_Node} */
-export function logger_add_node(type, data) {
+export function logger_add_node(data, type) {
 	console.log("add_node:", token_type_to_string(type))
 }
 
@@ -582,6 +620,11 @@ export function logger_end_node(data) {
 }
 
 /** @type {Logger_Renderer_Add_Text} */
-export function logger_add_text(text, data) {
-	console.log('add_text: "' + text + '"')
+export function logger_add_text(data, text) {
+	console.log('add_text: "%s"', text)
 }
+
+/** @type {Logger_Renderer_Set_Attr} */
+export function logger_set_attr(data, type, value) {
+	console.log('set_attr: %s="%s"', attr_type_to_html_attr(type), value)
+}
diff --git a/mds/t.d.ts b/mds/t.d.ts
@@ -1,4 +1,4 @@
-import {Token_Type} from './mds.js'
+import {Attr_Type, Token_Type} from './mds.js'
 
 export type Parser = {
 	/** {@link Renderer} interface */
@@ -19,15 +19,17 @@ export type Parser = {
 	code_block: string | 0 | 1
 }
 
-export type Renderer_Add_Node<TData> = (type: Token_Type, data: TData) => void
+export type Renderer_Add_Node<TData> = (data: TData, type: Token_Type) => void
 export type Renderer_End_Node<TData> = (data: TData) => void
-export type Renderer_Add_Text<TData> = (text: string, data: TData) => void
+export type Renderer_Add_Text<TData> = (data: TData, text: string) => void
+export type Renderer_Set_Attr<TData> = (data: TData, type: Attr_Type, value: string) => void
 
 export type Renderer<TData> = {
 	data    : TData
 	add_node: Renderer_Add_Node<TData>
 	end_node: Renderer_End_Node<TData>
 	add_text: Renderer_Add_Text<TData>
+	set_attr: Renderer_Set_Attr<TData>
 }
 
 export type Any_Renderer = Renderer<any>
@@ -40,9 +42,11 @@ export type Default_Renderer          = Renderer         <Default_Renderer_Data>
 export type Default_Renderer_Add_Node = Renderer_Add_Node<Default_Renderer_Data>
 export type Default_Renderer_End_Node = Renderer_End_Node<Default_Renderer_Data>
 export type Default_Renderer_Add_Text = Renderer_Add_Text<Default_Renderer_Data>
+export type Default_Renderer_Set_Attr = Renderer_Set_Attr<Default_Renderer_Data>
 
 export type Logger_Renderer_Data     = undefined
 export type Logger_Renderer          = Renderer         <Logger_Renderer_Data>
 export type Logger_Renderer_Add_Node = Renderer_Add_Node<Logger_Renderer_Data>
 export type Logger_Renderer_End_Node = Renderer_End_Node<Logger_Renderer_Data>
 export type Logger_Renderer_Add_Text = Renderer_Add_Text<Logger_Renderer_Data>
+export type Logger_Renderer_Set_Attr = Renderer_Set_Attr<Logger_Renderer_Data>
diff --git a/readme.md b/readme.md
@@ -64,8 +64,9 @@ mds.parser_end(parser)
     - [x] Single line breaks don't end tokens
     - [x] Escaping line breaks
 - [x] Headers
-- [x] code block with triple backticks
-    - [ ] send language to renderer
+- [ ] Code Block with indent
+- [x] Code Block with triple backticks
+    - [x] language attr
 - [x] `inline code` with backticks
 - [x] *italic* with single asterisks
 - [x] **Bold** with double asterisks
@@ -76,12 +77,13 @@ mds.parser_end(parser)
     - [x] ***bold>em*bold**
     - [x] *em**em>bold***
     - [x] ***bold>em**em*
+- [ ] Strikethrough
 - [x] Escape characters (e.g. \* or \_ with \\\* or \\\_)
 - [x] \[Link\](url)
-    - [ ] href attr
+    - [x] href attr
     - [x] Escaping escaping bug: \\[Link\\](url)
 - [x] Images
-    - [ ] src attr
+    - [x] src attr
 - [ ] Lists
 - [ ] Blockquotes
 - [ ] Tables

diff --git a/test.js b/test.js
@@ -6,6 +6,7 @@ import * as mds    from "./mds/mds.js"
 /**
  * @typedef {(string | Test_Renderer_Node)[]} Children
  * @typedef {Map<Test_Renderer_Node, Test_Renderer_Node>} Parent_Map
+ * @typedef {{[key in mds.Attr_Type]?: string}} Node_Attrs
  *
  * @typedef  {object} Test_Renderer_Data
  * @property {Test_Renderer_Node} root
@@ -15,11 +16,13 @@ import * as mds    from "./mds/mds.js"
  * @typedef  {object} Test_Renderer_Node
  * @property {mds.Token_Type} type
  * @property {Children      } children
+ * @property {Node_Attrs=   } attrs
  *
  * @typedef {mds.Renderer         <Test_Renderer_Data>} Test_Renderer
  * @typedef {mds.Renderer_Add_Node<Test_Renderer_Data>} Test_Add_Node
  * @typedef {mds.Renderer_End_Node<Test_Renderer_Data>} Test_End_Node
  * @typedef {mds.Renderer_Add_Text<Test_Renderer_Data>} Test_Add_Text
+ * @typedef {mds.Renderer_Set_Attr<Test_Renderer_Data>} Test_Set_Attr
  */
 
 /** @returns {Test_Renderer} */
@@ -33,6 +36,7 @@ function test_renderer() {
 		add_node: test_renderer_add_node,
 		end_node: test_renderer_end_node,
 		add_text: test_renderer_add_text,
+		set_attr: test_renderer_set_attr,
 		data    : {
 			parent_map: new Map(),
 			root: root,
@@ -41,7 +45,7 @@ function test_renderer() {
 	}
 }
 /** @type {Test_Add_Node} */
-function test_renderer_add_node(type, data) {
+function test_renderer_add_node(data, type) {
 	/** @type {Test_Renderer_Node} */
     const node = {type, children: []}
 	const parent = data.node
@@ -50,7 +54,7 @@ function test_renderer_add_node(type, data) {
 	data.node = node
 }
 /** @type {Test_Add_Text} */
-function test_renderer_add_text(text, data) {
+function test_renderer_add_text(data, text) {
 	if (text === "") return
 
 	if (text !== "\n" &&
@@ -68,6 +72,16 @@ function test_renderer_end_node(data) {
 	assert.notEqual(parent, undefined)
 	data.node = /** @type {Test_Renderer_Node} */(parent)
 }
+/** @type {Test_Set_Attr} */
+function test_renderer_set_attr(data, type, value) {
+	if (value.length === 0) return
+
+	if (data.node.attrs === undefined) {
+		data.node.attrs = {[type]: value}
+	} else {
+		data.node.attrs[type] = value
+	}
+}
 
 /**
  * @param {string  } title
@@ -238,7 +252,8 @@ test_single_write("Code_Block with language",
 	"```js\nfoo\n```",
 	[{
 		type    : mds.Token_Type.Code_Block,
-		children: ["foo"]
+		children: ["foo"],
+		attrs   : {[mds.Attr_Type.Lang]: "js"}
 	}]
 )
 
@@ -326,6 +341,7 @@ test_single_write("Link",
 		type    : mds.Token_Type.Paragraph,
 		children: [{
 			type    : mds.Token_Type.Link,
+			attrs   : {[mds.Attr_Type.Href]: "url"},
 			children: ["title"],
 		}]
 	}]
@@ -337,6 +353,7 @@ test_single_write("Link with code",
 		type    : mds.Token_Type.Paragraph,
 		children: [{
 			type    : mds.Token_Type.Link,
+			attrs   : {[mds.Attr_Type.Href]: "url"},
 			children: [{
 				type    : mds.Token_Type.Code_Inline,
 				children: ["title"],
@@ -351,6 +368,7 @@ test_single_write("Image",
 		type    : mds.Token_Type.Paragraph,
 		children: [{
 			type    : mds.Token_Type.Image,
+			attrs   : {[mds.Attr_Type.Src]: "url"},
 			children: ["title"],
 		}]
 	}]
@@ -362,6 +380,7 @@ test_single_write("Image with code",
 		type    : mds.Token_Type.Paragraph,
 		children: [{
 			type    : mds.Token_Type.Image,
+			attrs   : {[mds.Attr_Type.Src]: "url"},
 			children: ["`title`"],
 		}]
 	}]
@@ -373,8 +392,10 @@ test_single_write("Link with Image",
 		type    : mds.Token_Type.Paragraph,
 		children: [{
 			type    : mds.Token_Type.Link,
+			attrs   : {[mds.Attr_Type.Href]: "href"},
 			children: [{
 				type    : mds.Token_Type.Image,
+				attrs   : {[mds.Attr_Type.Src]: "src"},
 				children: ["title"],
 			}],
 		}]
@@ -406,6 +427,7 @@ test_single_write("Un-Escaped link Both",
 		type    : mds.Token_Type.Paragraph,
 		children: ["\\", {
 			type    : mds.Token_Type.Link,
+			attrs   : {[mds.Attr_Type.Href]: "url"},
 			children: ["foo\\"],
 		}]
 	}]
@@ -483,5 +505,5 @@ for (const {c, italic, strong} of [{
 				children: ["em"]
 			}]
 		}]
-	)	
-}
+	)
+}