Merge pull request #15 from FAIRChemistry/update-pulldown-cmark-dep

Update pulldown-cmark dep and add lines/ranges for validation errors

Cargo.toml

@@ -12,7 +12,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 serde = { version = "1.0.198", features = ["derive"] }
-pulldown-cmark = "0.8.0"
+pulldown-cmark = "0.12.2"
 serde_json = { "version" = "1.0.116", features = ["preserve_order"] }
 regex = "1.10.4"
 serde_with = "3.8.0"

src/attribute.rs

@@ -21,7 +21,7 @@
  *
  */
 
-use crate::xmltype::XMLType;
+use crate::{markdown::parser::Position, xmltype::XMLType};
 use serde::{de::Visitor, Deserialize, Serialize};
 use std::{error::Error, fmt, str::FromStr};
 
@@ -57,6 +57,9 @@ pub struct Attribute {
     pub xml: Option<XMLType>,
     /// Is an enumeration or not
     pub is_enum: bool,
+    /// The line number of the attribute
+    #[serde(skip_serializing)]
+    pub position: Option<Position>,
 }
 
 impl Attribute {
@@ -79,6 +82,7 @@ impl Attribute {
             xml: Some(XMLType::from_str(name.as_str()).unwrap()),
             default: None,
             is_enum: false,
+            position: None,
         }
     }
 
@@ -91,6 +95,15 @@ impl Attribute {
         self.docstring = docstring;
     }
 
+    /// Sets the line number of the attribute.
+    ///
+    /// # Arguments
+    ///
+    /// * `position` - The position to set.
+    pub fn set_position(&mut self, position: Position) {
+        self.position = Some(position);
+    }
+
     /// Adds an option to the attribute.
     ///
     /// # Arguments

src/datamodel.rs

@@ -85,9 +85,9 @@ impl DataModel {
     // Get the JSON schema for an object
     //
     // * `obj_name` - Name of the object
+    // * `openai` - Whether to remove options from the schema properties. OpenAI does not support options.
     //
     // # Panics
-    //
     // If no objects are found in the markdown file
     // If the object is not found in the markdown file
     //
@@ -304,6 +304,7 @@ impl DataModel {
     /// ```
     /// # Returns
     /// A data model
+    #[allow(clippy::result_large_err)]
     pub fn from_markdown(path: &Path) -> Result<Self, Validator> {
         let content = fs::read_to_string(path).expect("Could not read file");
         parse_markdown(&content)
@@ -326,6 +327,7 @@ impl DataModel {
     /// ```
     /// # Returns
     /// A data model
+    #[allow(clippy::result_large_err)]
     pub fn from_markdown_string(content: &str) -> Result<Self, Validator> {
         parse_markdown(content)
     }
@@ -359,6 +361,7 @@ mod tests {
             xml: None,
             default: None,
             is_enum: false,
+            position: None,
         });
 
         let mut obj2 = Object::new("Object2".to_string(), None);
@@ -374,18 +377,21 @@ mod tests {
             xml: None,
             default: None,
             is_enum: false,
+            position: None,
         });
 
         let enm1 = Enumeration {
             name: "Enum1".to_string(),
             mappings: BTreeMap::from([("key1".to_string(), "value1".to_string())]),
             docstring: "".to_string(),
+            position: None,
         };
 
         let enm2 = Enumeration {
             name: "Enum2".to_string(),
             mappings: BTreeMap::from([("key2".to_string(), "value2".to_string())]),
             docstring: "".to_string(),
+            position: None,
         };
 
         model1.objects.push(obj1);
@@ -422,6 +428,7 @@ mod tests {
             xml: None,
             default: Some(DataType::String("".to_string())),
             is_enum: false,
+            position: None,
         });
 
         obj.add_attribute(crate::attribute::Attribute {
@@ -436,6 +443,7 @@ mod tests {
             xml: None,
             default: None,
             is_enum: false,
+            position: None,
         });
 
         model.objects.push(obj);

src/json/export.rs

@@ -530,6 +530,7 @@ mod tests {
             default: None,
             xml: None,
             is_enum: false,
+            position: None,
         };
 
         let property: schema::Property =
@@ -563,6 +564,7 @@ mod tests {
             default: None,
             xml: None,
             is_enum: false,
+            position: None,
         };
 
         let property: schema::Property =