Merge pull request #105 from rodneylab/build__update_dependencies

build  update dependencies

Author: rodneylab

Cargo.lock

@@ -26,7 +26,8 @@ html5ever = "0.29.0"
 js-sys = "0.3.69"
 mrml = { version = "4.0.1", features = ["parse", "render"], default-features = false }
 nom = { version = "7.1.3", features = ["alloc"] }
-pulldown-cmark = "0.9.2"
+pulldown-cmark = "0.10.3"
+pulldown-cmark-escape = "0.10.1"
 serde = { version = "1.0.215", features = ["derive"] }
 serde-wasm-bindgen = "0.6.5"
 textwrap = "0.16.1"

Cargo.toml

@@ -4,5 +4,5 @@
     "wasmbuild": "deno run -A jsr:@deno/wasmbuild@0.17.3 --project=parsedown"
   },
   "exclude": ["lib/"],
-  "imports": { "@std/assert": "jsr:@std/assert@^1.0.3" }
+  "imports": { "@std/assert": "jsr:@std/assert@^1.0.8" }
 }

deno.json

@@ -4,7 +4,7 @@
 // deno-fmt-ignore-file
 /// <reference types="./parsedown.generated.d.ts" />
 
-// source-hash: 94b0ac08011ee053711880e7382330d1e6d84942
+// source-hash: 386c448320ef24975d9d36b44f28bba83b3508d3
 let wasm;
 
 const heap = new Array(128).fill(undefined);

lib/parsedown.generated.js

@@ -0,0 +1,195 @@
+use nom::{
+    branch::alt,
+    bytes::complete::{is_not, tag},
+    character::complete::{alphanumeric1, multispace0},
+    combinator::recognize,
+    multi::many1_count,
+    sequence::{delimited, pair},
+    IResult,
+};
+
+#[derive(Debug, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum InlineHTMLTagType {
+    Opening(String),
+    //SelfClosing,
+    Closing(String),
+}
+
+fn parse_html_tag_content(line: &str) -> IResult<&str, (&str, &str)> {
+    let (remainder, tag_content) = is_not(">/")(line)?;
+    let (attributes, (tag_name, _space)) = pair(
+        recognize(many1_count(alt((alphanumeric1, tag("-"))))),
+        multispace0,
+    )(tag_content)?;
+    Ok((remainder, (tag_name, attributes)))
+}
+
+fn parse_closing_html_tag(line: &str) -> IResult<&str, (&str, &str, InlineHTMLTagType)> {
+    let (remaining_line, (tag_name, tag_attributes)) =
+        delimited(tag("</"), parse_html_tag_content, tag(">"))(line)?;
+    Ok((
+        remaining_line,
+        (
+            tag_name,
+            tag_attributes,
+            InlineHTMLTagType::Closing(tag_name.into()),
+        ),
+    ))
+}
+
+fn parse_opening_html_tag(line: &str) -> IResult<&str, (&str, &str, InlineHTMLTagType)> {
+    let (remaining_line, (tag_name, tag_attributes)) =
+        delimited(tag("<"), parse_html_tag_content, tag(">"))(line)?;
+    Ok((
+        remaining_line,
+        (
+            tag_name,
+            tag_attributes,
+            InlineHTMLTagType::Opening(tag_name.into()),
+        ),
+    ))
+}
+
+pub fn parse_node(html_node: &str) -> Option<InlineHTMLTagType> {
+    match alt((parse_opening_html_tag, parse_closing_html_tag))(html_node) {
+        Ok((_, (_, _, tag_type))) => Some(tag_type),
+        Err(_) => None,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{
+        parse_closing_html_tag, parse_html_tag_content, parse_node, parse_opening_html_tag,
+        InlineHTMLTagType,
+    };
+
+    #[test]
+    pub fn parse_html_tag_content_parses_valid_html_tag_without_attributes() {
+        // arrange
+        let tag_content = "abbr";
+
+        // act
+        let result = parse_html_tag_content(tag_content);
+
+        // assert
+        assert_eq!(result, Ok(("", ("abbr", ""))));
+    }
+
+    #[test]
+    pub fn parse_html_tag_content_parses_valid_html_tag_with_attributes() {
+        // arrange
+        let tag_content = r#"tool-tip inert role="tooltip""#;
+
+        // act
+        let result = parse_html_tag_content(tag_content);
+
+        // assert
+        assert_eq!(result, Ok(("", ("tool-tip", r#"inert role="tooltip""#))));
+    }
+
+    #[test]
+    pub fn parse_opening_html_tag_parses_valid_html_tag_without_attributes() {
+        // arrange
+        let tag = "<abbr>";
+
+        // act
+        let result = parse_opening_html_tag(tag);
+
+        // assert
+        assert_eq!(
+            result,
+            Ok((
+                "",
+                ("abbr", "", InlineHTMLTagType::Opening(String::from("abbr")))
+            ))
+        );
+    }
+
+    #[test]
+    pub fn parse_opening_html_tag_parses_valid_html_tag_with_attributes() {
+        // arrange
+        let tag = r#"<tool-tip inert role="tooltip">"#;
+
+        // act
+        let result = parse_opening_html_tag(tag);
+
+        // assert
+        assert_eq!(
+            result,
+            Ok((
+                "",
+                (
+                    "tool-tip",
+                    r#"inert role="tooltip""#,
+                    InlineHTMLTagType::Opening(String::from("tool-tip"))
+                )
+            ))
+        );
+    }
+
+    #[test]
+    pub fn parse_closing_html_tag_parses_valid_html_tag() {
+        // arrange
+        let tag = "</tool-tip>";
+
+        // act
+        let result = parse_closing_html_tag(tag);
+
+        // assert
+        assert_eq!(
+            result,
+            Ok((
+                "",
+                (
+                    "tool-tip",
+                    "",
+                    InlineHTMLTagType::Closing(String::from("tool-tip"))
+                )
+            ))
+        );
+    }
+
+    #[test]
+    pub fn parse_node_parses_valid_opening_html_tag() {
+        // arrange
+        let tag = "</tool-tip>";
+
+        // act
+        let result = parse_node(tag);
+
+        // assert
+        assert_eq!(
+            result,
+            Some(InlineHTMLTagType::Closing(String::from("tool-tip")))
+        );
+    }
+
+    #[test]
+    pub fn parse_node_parses_valid_closing_html_tag() {
+        // arrange
+        let tag = r#"<tool-tip inert role="tooltip">"#;
+
+        // act
+        let result = parse_node(tag);
+
+        // assert
+        assert_eq!(
+            result,
+            Some(InlineHTMLTagType::Opening(String::from("tool-tip")))
+        );
+    }
+
+    #[test]
+    pub fn parse_node_returns_none_for_invalid_html_tag() {
+        // arrange
+        let tag = "<tool-tip";
+
+        // act
+        let result = parse_node(tag);
+
+        // assert
+        assert_eq!(result, None);
+    }
+}

lib/parsedown_bg.wasm

@@ -1,8 +1,10 @@
 #![warn(clippy::all, clippy::pedantic)]
 
 mod html_process;
+mod inline_html;
 mod markdown;
 mod url_utility;
+mod utilities;
 
 use html_process::process_html;
 use markdown::{