add errors

Author: joshuadavidthomas

crates/djls-template-ast/src/ast.rs

@@ -5,19 +5,28 @@ use thiserror::Error;
 #[derive(Clone, Debug, Default, Serialize)]
 pub struct Ast {
     nodes: Vec<Node>,
+    errors: Vec<AstError>,
 }
 
 impl Ast {
     pub fn nodes(&self) -> &Vec<Node> {
         &self.nodes
     }
 
+    pub fn errors(&self) -> &Vec<AstError> {
+        &self.errors
+    }
+
     pub fn add_node(&mut self, node: Node) {
         self.nodes.push(node);
     }
 
+    pub fn add_error(&mut self, error: AstError) {
+        self.errors.push(error);
+    }
+
     pub fn finalize(&mut self) -> Result<Ast, AstError> {
-        if self.nodes.is_empty() {
+        if self.nodes.is_empty() && self.errors.is_empty() {
             return Err(AstError::EmptyAst);
         }
         Ok(self.clone())
@@ -123,10 +132,24 @@ pub enum AttributeValue {
 
 pub type Attributes = BTreeMap<String, AttributeValue>;
 
-#[derive(Error, Debug)]
+#[derive(Clone, Debug, Error, Serialize)]
 pub enum AstError {
-    #[error("error parsing django tag, recieved empty tag name")]
-    EmptyTag,
-    #[error("empty ast")]
+    #[error("Empty AST")]
     EmptyAst,
+    #[error("Stream error: {0}")]
+    StreamError(String),
+    #[error("Unclosed tag: {0}")]
+    UnclosedTag(String),
+    #[error("Unexpected tag: {0}")]
+    UnexpectedTag(String),
+    #[error("Invalid tag: {0}")]
+    InvalidTag(String),
+    #[error("Block error: {0} in {1}")]
+    BlockError(String, String),
+    #[error("Argument error: {0} - {1}")]
+    ArgumentError(String, String),
+    #[error("Unexpected token")]
+    UnexpectedToken,
+    #[error("Unexpected end of file")]
+    UnexpectedEof,
 }

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__comments__parse_comments.snap

@@ -7,3 +7,4 @@ nodes:
       Comment: HTML comment
   - Django:
       Comment: Django comment
+errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_complex_if_elif.snap

@@ -36,3 +36,4 @@ nodes:
                   Closing:
                     name: endif
                     bits: []
+errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_for_block.snap

@@ -30,3 +30,4 @@ nodes:
                   Closing:
                     name: endfor
                     bits: []
+errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_if_block.snap

@@ -17,3 +17,4 @@ nodes:
                   Closing:
                     name: endif
                     bits: []
+errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_django_variable.snap

@@ -11,3 +11,4 @@ nodes:
         filters:
           - name: title
             arguments: []
+errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_filter_chains.snap

@@ -15,3 +15,4 @@ nodes:
             arguments: []
           - name: upper
             arguments: []
+errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_mixed_content.snap

@@ -107,3 +107,4 @@ nodes:
                     name: endif
                     bits: []
   - Text: "!"
+errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__django__parse_nested_for_if.snap

@@ -37,3 +37,4 @@ nodes:
                   Closing:
                     name: endfor
                     bits: []
+errors: []

crates/djls-template-ast/src/snapshots/djls_template_ast__parser__tests__full_templates__parse_full.snap

@@ -128,3 +128,4 @@ nodes:
                                           Closing:
                                             name: endif
                                             bits: []
+errors: []