@herb-tools/node 0.5.0 → 0.6.1

package/dist/herb-node.esm.js

@@ -6,7 +6,7 @@ import { createRequire } from 'module';
 import { fileURLToPath } from 'url';
 
 var name = "@herb-tools/node";
-var version = "0.5.0";
+var version = "0.6.1";
 var packageJSON = {
 	name: name,
 	version: version};

package/dist/herb-node.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"herb-node.esm.js","sources":["../src/node-backend.ts","../src/index-esm.mts"],"sourcesContent":["import packageJSON from \"../package.json\" with { type: \"json\" }\n\nimport { HerbBackend } from \"@herb-tools/core\"\n\nexport class HerbBackendNode extends HerbBackend {\n  backendVersion(): string {\n    return `${packageJSON.name}@${packageJSON.version}`\n  }\n}\n","export * from \"@herb-tools/core\"\n\nimport path from \"path\"\nimport binary from \"@mapbox/node-pre-gyp\"\n\nimport { createRequire } from \"module\"\nimport { fileURLToPath } from \"url\"\n\nconst __filename = fileURLToPath(import.meta.url)\nconst __dirname = path.dirname(__filename)\nconst require = createRequire(import.meta.url)\n\nconst packagePath = path.resolve(__dirname, \"../package.json\")\nconst libherbPath = binary.find(packagePath)\n\nconst libHerbBinary = require(libherbPath)\n\nimport { HerbBackendNode } from \"./node-backend.js\"\n\n/**\n * An instance of the `Herb` class using a Node.js backend.\n * This loads `libherb` in a Node.js C++ native extension.\n */\nconst Herb = new HerbBackendNode(\n  () => new Promise((resolve, _reject) => resolve(libHerbBinary)),\n)\n\nexport { Herb, HerbBackendNode }\n"],"names":[],"mappings":";;;;;;;;;;;;;AAIM,MAAO,eAAgB,SAAQ,WAAW,CAAA;IAC9C,cAAc,GAAA;QACZ,OAAO,CAAA,EAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,CAAA,CAAE;;AAEtD;;ACAD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;AAC1C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AAE9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC;AAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;AAE5C,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;AAI1C;;;AAGG;AACG,MAAA,IAAI,GAAG,IAAI,eAAe,CAC9B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;;;;"}
+{"version":3,"file":"herb-node.esm.js","sources":["../src/node-backend.ts","../src/index-esm.mts"],"sourcesContent":["import packageJSON from \"../package.json\" with { type: \"json\" }\n\nimport { HerbBackend } from \"@herb-tools/core\"\n\nexport class HerbBackendNode extends HerbBackend {\n  backendVersion(): string {\n    return `${packageJSON.name}@${packageJSON.version}`\n  }\n}\n","export * from \"@herb-tools/core\"\n\nimport path from \"path\"\nimport binary from \"@mapbox/node-pre-gyp\"\n\nimport { createRequire } from \"module\"\nimport { fileURLToPath } from \"url\"\n\nconst __filename = fileURLToPath(import.meta.url)\nconst __dirname = path.dirname(__filename)\nconst require = createRequire(import.meta.url)\n\nconst packagePath = path.resolve(__dirname, \"../package.json\")\nconst libherbPath = binary.find(packagePath)\n\nconst libHerbBinary = require(libherbPath)\n\nimport { HerbBackendNode } from \"./node-backend.js\"\n\n/**\n * An instance of the `Herb` class using a Node.js backend.\n * This loads `libherb` in a Node.js C++ native extension.\n */\nconst Herb = new HerbBackendNode(\n  () => new Promise((resolve, _reject) => resolve(libHerbBinary)),\n)\n\nexport { Herb, HerbBackendNode }\n"],"names":[],"mappings":";;;;;;;;;;;;;AAIM,MAAO,eAAgB,SAAQ,WAAW,CAAA;IAC9C,cAAc,GAAA;QACZ,OAAO,CAAA,EAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,OAAO,CAAA,CAAE;IACrD;AACD;;ACAD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AACjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;AAC1C,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AAE9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC;AAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC;AAE5C,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;AAI1C;;;AAGG;AACH,MAAM,IAAI,GAAG,IAAI,eAAe,CAC9B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;;;;"}

package/dist/types/util.d.ts

@@ -0,0 +1,2 @@
+export declare function ensureFile(object: any): Promise<string>;
+export declare function resolvePath(relativePath: string): string;

package/extension/error_helpers.cpp

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/javascript/packages/node/extension/error_helpers.cpp.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/javascript/packages/node/extension/error_helpers.cpp.erb
 
 #include <node_api.h>
 #include "error_helpers.h"

package/extension/error_helpers.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/javascript/packages/node/extension/error_helpers.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/javascript/packages/node/extension/error_helpers.h.erb
 
 #ifndef HERB_EXTENSION_ERRORS_H
 #define HERB_EXTENSION_ERRORS_H

package/extension/herb.cpp

@@ -64,8 +64,8 @@ napi_value Herb_lex_file(napi_env env, napi_callback_info info) {
 }
 
 napi_value Herb_parse(napi_env env, napi_callback_info info) {
-  size_t argc = 1;
-  napi_value args[1];
+  size_t argc = 2;
+  napi_value args[2];
   napi_get_cb_info(env, info, &argc, args, nullptr, nullptr);
 
   if (argc < 1) {
@@ -76,7 +76,32 @@ napi_value Herb_parse(napi_env env, napi_callback_info info) {
   char* string = CheckString(env, args[0]);
   if (!string) { return nullptr; }
 
-  AST_DOCUMENT_NODE_T* root = herb_parse(string);
+  parser_options_T* parser_options = nullptr;
+  parser_options_T opts = {0};
+
+  if (argc >= 2) {
+    napi_valuetype valuetype;
+    napi_typeof(env, args[1], &valuetype);
+
+    if (valuetype == napi_object) {
+      napi_value track_whitespace_prop;
+      bool has_prop;
+      napi_has_named_property(env, args[1], "track_whitespace", &has_prop);
+
+      if (has_prop) {
+        napi_get_named_property(env, args[1], "track_whitespace", &track_whitespace_prop);
+        bool track_whitespace_value;
+        napi_get_value_bool(env, track_whitespace_prop, &track_whitespace_value);
+
+        if (track_whitespace_value) {
+          opts.track_whitespace = true;
+          parser_options = &opts;
+        }
+      }
+    }
+  }
+
+  AST_DOCUMENT_NODE_T* root = herb_parse(string, parser_options);
   herb_analyze_parse_tree(root, string);
   napi_value result = CreateParseResult(env, root, args[0]);
 
@@ -107,7 +132,7 @@ napi_value Herb_parse_file(napi_env env, napi_callback_info info) {
     return nullptr;
   }
 
-  AST_DOCUMENT_NODE_T* root = herb_parse(string);
+  AST_DOCUMENT_NODE_T* root = herb_parse(string, nullptr);
   napi_value result = CreateParseResult(env, root, source_value);
 
   ast_node_free((AST_NODE_T *) root);

package/extension/libherb/ast_nodes.c

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/src/ast_nodes.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/src/ast_nodes.c.erb
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -49,32 +49,19 @@ AST_HTML_OPEN_TAG_NODE_T* ast_html_open_tag_node_init(token_T* tag_opening, toke
   return html_open_tag_node;
 }
 
-AST_HTML_CLOSE_TAG_NODE_T* ast_html_close_tag_node_init(token_T* tag_opening, token_T* tag_name, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors) {
+AST_HTML_CLOSE_TAG_NODE_T* ast_html_close_tag_node_init(token_T* tag_opening, token_T* tag_name, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors) {
   AST_HTML_CLOSE_TAG_NODE_T* html_close_tag_node = malloc(sizeof(AST_HTML_CLOSE_TAG_NODE_T));
 
   ast_node_init(&html_close_tag_node->base, AST_HTML_CLOSE_TAG_NODE, start_position, end_position, errors);
 
   html_close_tag_node->tag_opening = token_copy(tag_opening);
   html_close_tag_node->tag_name = token_copy(tag_name);
+  html_close_tag_node->children = children;
   html_close_tag_node->tag_closing = token_copy(tag_closing);
 
   return html_close_tag_node;
 }
 
-AST_HTML_SELF_CLOSE_TAG_NODE_T* ast_html_self_close_tag_node_init(token_T* tag_opening, token_T* tag_name, array_T* attributes, token_T* tag_closing, bool is_void, position_T* start_position, position_T* end_position, array_T* errors) {
-  AST_HTML_SELF_CLOSE_TAG_NODE_T* html_self_close_tag_node = malloc(sizeof(AST_HTML_SELF_CLOSE_TAG_NODE_T));
-
-  ast_node_init(&html_self_close_tag_node->base, AST_HTML_SELF_CLOSE_TAG_NODE, start_position, end_position, errors);
-
-  html_self_close_tag_node->tag_opening = token_copy(tag_opening);
-  html_self_close_tag_node->tag_name = token_copy(tag_name);
-  html_self_close_tag_node->attributes = attributes;
-  html_self_close_tag_node->tag_closing = token_copy(tag_closing);
-  html_self_close_tag_node->is_void = is_void;
-
-  return html_self_close_tag_node;
-}
-
 AST_HTML_ELEMENT_NODE_T* ast_html_element_node_init(struct AST_HTML_OPEN_TAG_NODE_STRUCT* open_tag, token_T* tag_name, array_T* body, struct AST_HTML_CLOSE_TAG_NODE_STRUCT* close_tag, bool is_void, position_T* start_position, position_T* end_position, array_T* errors) {
   AST_HTML_ELEMENT_NODE_T* html_element_node = malloc(sizeof(AST_HTML_ELEMENT_NODE_T));
 
@@ -102,12 +89,12 @@ AST_HTML_ATTRIBUTE_VALUE_NODE_T* ast_html_attribute_value_node_init(token_T* ope
   return html_attribute_value_node;
 }
 
-AST_HTML_ATTRIBUTE_NAME_NODE_T* ast_html_attribute_name_node_init(token_T* name, position_T* start_position, position_T* end_position, array_T* errors) {
+AST_HTML_ATTRIBUTE_NAME_NODE_T* ast_html_attribute_name_node_init(array_T* children, position_T* start_position, position_T* end_position, array_T* errors) {
   AST_HTML_ATTRIBUTE_NAME_NODE_T* html_attribute_name_node = malloc(sizeof(AST_HTML_ATTRIBUTE_NAME_NODE_T));
 
   ast_node_init(&html_attribute_name_node->base, AST_HTML_ATTRIBUTE_NAME_NODE, start_position, end_position, errors);
 
-  html_attribute_name_node->name = token_copy(name);
+  html_attribute_name_node->children = children;
 
   return html_attribute_name_node;
 }
@@ -158,6 +145,30 @@ AST_HTML_DOCTYPE_NODE_T* ast_html_doctype_node_init(token_T* tag_opening, array_
   return html_doctype_node;
 }
 
+AST_XML_DECLARATION_NODE_T* ast_xml_declaration_node_init(token_T* tag_opening, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors) {
+  AST_XML_DECLARATION_NODE_T* xml_declaration_node = malloc(sizeof(AST_XML_DECLARATION_NODE_T));
+
+  ast_node_init(&xml_declaration_node->base, AST_XML_DECLARATION_NODE, start_position, end_position, errors);
+
+  xml_declaration_node->tag_opening = token_copy(tag_opening);
+  xml_declaration_node->children = children;
+  xml_declaration_node->tag_closing = token_copy(tag_closing);
+
+  return xml_declaration_node;
+}
+
+AST_CDATA_NODE_T* ast_cdata_node_init(token_T* tag_opening, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors) {
+  AST_CDATA_NODE_T* cdata_node = malloc(sizeof(AST_CDATA_NODE_T));
+
+  ast_node_init(&cdata_node->base, AST_CDATA_NODE, start_position, end_position, errors);
+
+  cdata_node->tag_opening = token_copy(tag_opening);
+  cdata_node->children = children;
+  cdata_node->tag_closing = token_copy(tag_closing);
+
+  return cdata_node;
+}
+
 AST_WHITESPACE_NODE_T* ast_whitespace_node_init(token_T* value, position_T* start_position, position_T* end_position, array_T* errors) {
   AST_WHITESPACE_NODE_T* whitespace_node = malloc(sizeof(AST_WHITESPACE_NODE_T));
 
@@ -208,7 +219,7 @@ AST_ERB_ELSE_NODE_T* ast_erb_else_node_init(token_T* tag_opening, token_T* conte
   return erb_else_node;
 }
 
-AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, AST_NODE_T* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors) {
+AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, struct AST_NODE_STRUCT* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors) {
   AST_ERB_IF_NODE_T* erb_if_node = malloc(sizeof(AST_ERB_IF_NODE_T));
 
   ast_node_init(&erb_if_node->base, AST_ERB_IF_NODE, start_position, end_position, errors);
@@ -414,7 +425,6 @@ const char* ast_node_type_to_string(AST_NODE_T* node) {
     case AST_LITERAL_NODE: return "AST_LITERAL_NODE";
     case AST_HTML_OPEN_TAG_NODE: return "AST_HTML_OPEN_TAG_NODE";
     case AST_HTML_CLOSE_TAG_NODE: return "AST_HTML_CLOSE_TAG_NODE";
-    case AST_HTML_SELF_CLOSE_TAG_NODE: return "AST_HTML_SELF_CLOSE_TAG_NODE";
     case AST_HTML_ELEMENT_NODE: return "AST_HTML_ELEMENT_NODE";
     case AST_HTML_ATTRIBUTE_VALUE_NODE: return "AST_HTML_ATTRIBUTE_VALUE_NODE";
     case AST_HTML_ATTRIBUTE_NAME_NODE: return "AST_HTML_ATTRIBUTE_NAME_NODE";
@@ -422,6 +432,8 @@ const char* ast_node_type_to_string(AST_NODE_T* node) {
     case AST_HTML_TEXT_NODE: return "AST_HTML_TEXT_NODE";
     case AST_HTML_COMMENT_NODE: return "AST_HTML_COMMENT_NODE";
     case AST_HTML_DOCTYPE_NODE: return "AST_HTML_DOCTYPE_NODE";
+    case AST_XML_DECLARATION_NODE: return "AST_XML_DECLARATION_NODE";
+    case AST_CDATA_NODE: return "AST_CDATA_NODE";
     case AST_WHITESPACE_NODE: return "AST_WHITESPACE_NODE";
     case AST_ERB_CONTENT_NODE: return "AST_ERB_CONTENT_NODE";
     case AST_ERB_END_NODE: return "AST_ERB_END_NODE";
@@ -451,7 +463,6 @@ const char* ast_node_human_type(AST_NODE_T* node) {
     case AST_LITERAL_NODE: return "LiteralNode";
     case AST_HTML_OPEN_TAG_NODE: return "HTMLOpenTagNode";
     case AST_HTML_CLOSE_TAG_NODE: return "HTMLCloseTagNode";
-    case AST_HTML_SELF_CLOSE_TAG_NODE: return "HTMLSelfCloseTagNode";
     case AST_HTML_ELEMENT_NODE: return "HTMLElementNode";
     case AST_HTML_ATTRIBUTE_VALUE_NODE: return "HTMLAttributeValueNode";
     case AST_HTML_ATTRIBUTE_NAME_NODE: return "HTMLAttributeNameNode";
@@ -459,6 +470,8 @@ const char* ast_node_human_type(AST_NODE_T* node) {
     case AST_HTML_TEXT_NODE: return "HTMLTextNode";
     case AST_HTML_COMMENT_NODE: return "HTMLCommentNode";
     case AST_HTML_DOCTYPE_NODE: return "HTMLDoctypeNode";
+    case AST_XML_DECLARATION_NODE: return "XMLDeclarationNode";
+    case AST_CDATA_NODE: return "CDATANode";
     case AST_WHITESPACE_NODE: return "WhitespaceNode";
     case AST_ERB_CONTENT_NODE: return "ERBContentNode";
     case AST_ERB_END_NODE: return "ERBEndNode";
@@ -538,25 +551,17 @@ static void ast_free_html_open_tag_node(AST_HTML_OPEN_TAG_NODE_T* html_open_tag_
 static void ast_free_html_close_tag_node(AST_HTML_CLOSE_TAG_NODE_T* html_close_tag_node) {
   if (html_close_tag_node->tag_opening != NULL) { token_free(html_close_tag_node->tag_opening); }
   if (html_close_tag_node->tag_name != NULL) { token_free(html_close_tag_node->tag_name); }
-  if (html_close_tag_node->tag_closing != NULL) { token_free(html_close_tag_node->tag_closing); }
-
-  ast_free_base_node(&html_close_tag_node->base);
-}
-
-static void ast_free_html_self_close_tag_node(AST_HTML_SELF_CLOSE_TAG_NODE_T* html_self_close_tag_node) {
-  if (html_self_close_tag_node->tag_opening != NULL) { token_free(html_self_close_tag_node->tag_opening); }
-  if (html_self_close_tag_node->tag_name != NULL) { token_free(html_self_close_tag_node->tag_name); }
-  if (html_self_close_tag_node->attributes != NULL) {
-    for (size_t i = 0; i < array_size(html_self_close_tag_node->attributes); i++) {
-      AST_NODE_T* child = array_get(html_self_close_tag_node->attributes, i);
+  if (html_close_tag_node->children != NULL) {
+    for (size_t i = 0; i < array_size(html_close_tag_node->children); i++) {
+      AST_NODE_T* child = array_get(html_close_tag_node->children, i);
       if (child) { ast_node_free(child); }
     }
 
-    array_free(&html_self_close_tag_node->attributes);
+    array_free(&html_close_tag_node->children);
   }
-  if (html_self_close_tag_node->tag_closing != NULL) { token_free(html_self_close_tag_node->tag_closing); }
+  if (html_close_tag_node->tag_closing != NULL) { token_free(html_close_tag_node->tag_closing); }
 
-  ast_free_base_node(&html_self_close_tag_node->base);
+  ast_free_base_node(&html_close_tag_node->base);
 }
 
 static void ast_free_html_element_node(AST_HTML_ELEMENT_NODE_T* html_element_node) {
@@ -591,7 +596,14 @@ static void ast_free_html_attribute_value_node(AST_HTML_ATTRIBUTE_VALUE_NODE_T*
 }
 
 static void ast_free_html_attribute_name_node(AST_HTML_ATTRIBUTE_NAME_NODE_T* html_attribute_name_node) {
-  if (html_attribute_name_node->name != NULL) { token_free(html_attribute_name_node->name); }
+  if (html_attribute_name_node->children != NULL) {
+    for (size_t i = 0; i < array_size(html_attribute_name_node->children); i++) {
+      AST_NODE_T* child = array_get(html_attribute_name_node->children, i);
+      if (child) { ast_node_free(child); }
+    }
+
+    array_free(&html_attribute_name_node->children);
+  }
 
   ast_free_base_node(&html_attribute_name_node->base);
 }
@@ -640,6 +652,36 @@ static void ast_free_html_doctype_node(AST_HTML_DOCTYPE_NODE_T* html_doctype_nod
   ast_free_base_node(&html_doctype_node->base);
 }
 
+static void ast_free_xml_declaration_node(AST_XML_DECLARATION_NODE_T* xml_declaration_node) {
+  if (xml_declaration_node->tag_opening != NULL) { token_free(xml_declaration_node->tag_opening); }
+  if (xml_declaration_node->children != NULL) {
+    for (size_t i = 0; i < array_size(xml_declaration_node->children); i++) {
+      AST_NODE_T* child = array_get(xml_declaration_node->children, i);
+      if (child) { ast_node_free(child); }
+    }
+
+    array_free(&xml_declaration_node->children);
+  }
+  if (xml_declaration_node->tag_closing != NULL) { token_free(xml_declaration_node->tag_closing); }
+
+  ast_free_base_node(&xml_declaration_node->base);
+}
+
+static void ast_free_cdata_node(AST_CDATA_NODE_T* cdata_node) {
+  if (cdata_node->tag_opening != NULL) { token_free(cdata_node->tag_opening); }
+  if (cdata_node->children != NULL) {
+    for (size_t i = 0; i < array_size(cdata_node->children); i++) {
+      AST_NODE_T* child = array_get(cdata_node->children, i);
+      if (child) { ast_node_free(child); }
+    }
+
+    array_free(&cdata_node->children);
+  }
+  if (cdata_node->tag_closing != NULL) { token_free(cdata_node->tag_closing); }
+
+  ast_free_base_node(&cdata_node->base);
+}
+
 static void ast_free_whitespace_node(AST_WHITESPACE_NODE_T* whitespace_node) {
   if (whitespace_node->value != NULL) { token_free(whitespace_node->value); }
 
@@ -938,7 +980,6 @@ void ast_node_free(AST_NODE_T* node) {
     case AST_LITERAL_NODE: ast_free_literal_node((AST_LITERAL_NODE_T*) node); break;
     case AST_HTML_OPEN_TAG_NODE: ast_free_html_open_tag_node((AST_HTML_OPEN_TAG_NODE_T*) node); break;
     case AST_HTML_CLOSE_TAG_NODE: ast_free_html_close_tag_node((AST_HTML_CLOSE_TAG_NODE_T*) node); break;
-    case AST_HTML_SELF_CLOSE_TAG_NODE: ast_free_html_self_close_tag_node((AST_HTML_SELF_CLOSE_TAG_NODE_T*) node); break;
     case AST_HTML_ELEMENT_NODE: ast_free_html_element_node((AST_HTML_ELEMENT_NODE_T*) node); break;
     case AST_HTML_ATTRIBUTE_VALUE_NODE: ast_free_html_attribute_value_node((AST_HTML_ATTRIBUTE_VALUE_NODE_T*) node); break;
     case AST_HTML_ATTRIBUTE_NAME_NODE: ast_free_html_attribute_name_node((AST_HTML_ATTRIBUTE_NAME_NODE_T*) node); break;
@@ -946,6 +987,8 @@ void ast_node_free(AST_NODE_T* node) {
     case AST_HTML_TEXT_NODE: ast_free_html_text_node((AST_HTML_TEXT_NODE_T*) node); break;
     case AST_HTML_COMMENT_NODE: ast_free_html_comment_node((AST_HTML_COMMENT_NODE_T*) node); break;
     case AST_HTML_DOCTYPE_NODE: ast_free_html_doctype_node((AST_HTML_DOCTYPE_NODE_T*) node); break;
+    case AST_XML_DECLARATION_NODE: ast_free_xml_declaration_node((AST_XML_DECLARATION_NODE_T*) node); break;
+    case AST_CDATA_NODE: ast_free_cdata_node((AST_CDATA_NODE_T*) node); break;
     case AST_WHITESPACE_NODE: ast_free_whitespace_node((AST_WHITESPACE_NODE_T*) node); break;
     case AST_ERB_CONTENT_NODE: ast_free_erb_content_node((AST_ERB_CONTENT_NODE_T*) node); break;
     case AST_ERB_END_NODE: ast_free_erb_end_node((AST_ERB_END_NODE_T*) node); break;

package/extension/libherb/ast_nodes.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/src/include/ast_nodes.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/src/include/ast_nodes.h.erb
 
 #ifndef HERB_AST_NODES_H
 #define HERB_AST_NODES_H
@@ -19,7 +19,6 @@ typedef enum {
   AST_LITERAL_NODE,
   AST_HTML_OPEN_TAG_NODE,
   AST_HTML_CLOSE_TAG_NODE,
-  AST_HTML_SELF_CLOSE_TAG_NODE,
   AST_HTML_ELEMENT_NODE,
   AST_HTML_ATTRIBUTE_VALUE_NODE,
   AST_HTML_ATTRIBUTE_NAME_NODE,
@@ -27,6 +26,8 @@ typedef enum {
   AST_HTML_TEXT_NODE,
   AST_HTML_COMMENT_NODE,
   AST_HTML_DOCTYPE_NODE,
+  AST_XML_DECLARATION_NODE,
+  AST_CDATA_NODE,
   AST_WHITESPACE_NODE,
   AST_ERB_CONTENT_NODE,
   AST_ERB_END_NODE,
@@ -78,18 +79,10 @@ typedef struct AST_HTML_CLOSE_TAG_NODE_STRUCT {
   AST_NODE_T base;
   token_T* tag_opening;
   token_T* tag_name;
+  array_T* children;
   token_T* tag_closing;
 } AST_HTML_CLOSE_TAG_NODE_T;
 
-typedef struct AST_HTML_SELF_CLOSE_TAG_NODE_STRUCT {
-  AST_NODE_T base;
-  token_T* tag_opening;
-  token_T* tag_name;
-  array_T* attributes;
-  token_T* tag_closing;
-  bool is_void;
-} AST_HTML_SELF_CLOSE_TAG_NODE_T;
-
 typedef struct AST_HTML_ELEMENT_NODE_STRUCT {
   AST_NODE_T base;
   struct AST_HTML_OPEN_TAG_NODE_STRUCT* open_tag;
@@ -109,7 +102,7 @@ typedef struct AST_HTML_ATTRIBUTE_VALUE_NODE_STRUCT {
 
 typedef struct AST_HTML_ATTRIBUTE_NAME_NODE_STRUCT {
   AST_NODE_T base;
-  token_T* name;
+  array_T* children;
 } AST_HTML_ATTRIBUTE_NAME_NODE_T;
 
 typedef struct AST_HTML_ATTRIBUTE_NODE_STRUCT {
@@ -138,6 +131,20 @@ typedef struct AST_HTML_DOCTYPE_NODE_STRUCT {
   token_T* tag_closing;
 } AST_HTML_DOCTYPE_NODE_T;
 
+typedef struct AST_XML_DECLARATION_NODE_STRUCT {
+  AST_NODE_T base;
+  token_T* tag_opening;
+  array_T* children;
+  token_T* tag_closing;
+} AST_XML_DECLARATION_NODE_T;
+
+typedef struct AST_CDATA_NODE_STRUCT {
+  AST_NODE_T base;
+  token_T* tag_opening;
+  array_T* children;
+  token_T* tag_closing;
+} AST_CDATA_NODE_T;
+
 typedef struct AST_WHITESPACE_NODE_STRUCT {
   AST_NODE_T base;
   token_T* value;
@@ -174,7 +181,7 @@ typedef struct AST_ERB_IF_NODE_STRUCT {
   token_T* content;
   token_T* tag_closing;
   array_T* statements;
-  AST_NODE_T* subsequent;
+  struct AST_NODE_STRUCT* subsequent;
   struct AST_ERB_END_NODE_STRUCT* end_node;
 } AST_ERB_IF_NODE_T;
 
@@ -301,20 +308,21 @@ typedef struct AST_ERB_IN_NODE_STRUCT {
 AST_DOCUMENT_NODE_T* ast_document_node_init(array_T* children, position_T* start_position, position_T* end_position, array_T* errors);
 AST_LITERAL_NODE_T* ast_literal_node_init(const char* content, position_T* start_position, position_T* end_position, array_T* errors);
 AST_HTML_OPEN_TAG_NODE_T* ast_html_open_tag_node_init(token_T* tag_opening, token_T* tag_name, token_T* tag_closing, array_T* children, bool is_void, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_CLOSE_TAG_NODE_T* ast_html_close_tag_node_init(token_T* tag_opening, token_T* tag_name, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_SELF_CLOSE_TAG_NODE_T* ast_html_self_close_tag_node_init(token_T* tag_opening, token_T* tag_name, array_T* attributes, token_T* tag_closing, bool is_void, position_T* start_position, position_T* end_position, array_T* errors);
+AST_HTML_CLOSE_TAG_NODE_T* ast_html_close_tag_node_init(token_T* tag_opening, token_T* tag_name, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
 AST_HTML_ELEMENT_NODE_T* ast_html_element_node_init(struct AST_HTML_OPEN_TAG_NODE_STRUCT* open_tag, token_T* tag_name, array_T* body, struct AST_HTML_CLOSE_TAG_NODE_STRUCT* close_tag, bool is_void, position_T* start_position, position_T* end_position, array_T* errors);
 AST_HTML_ATTRIBUTE_VALUE_NODE_T* ast_html_attribute_value_node_init(token_T* open_quote, array_T* children, token_T* close_quote, bool quoted, position_T* start_position, position_T* end_position, array_T* errors);
-AST_HTML_ATTRIBUTE_NAME_NODE_T* ast_html_attribute_name_node_init(token_T* name, position_T* start_position, position_T* end_position, array_T* errors);
+AST_HTML_ATTRIBUTE_NAME_NODE_T* ast_html_attribute_name_node_init(array_T* children, position_T* start_position, position_T* end_position, array_T* errors);
 AST_HTML_ATTRIBUTE_NODE_T* ast_html_attribute_node_init(struct AST_HTML_ATTRIBUTE_NAME_NODE_STRUCT* name, token_T* equals, struct AST_HTML_ATTRIBUTE_VALUE_NODE_STRUCT* value, position_T* start_position, position_T* end_position, array_T* errors);
 AST_HTML_TEXT_NODE_T* ast_html_text_node_init(const char* content, position_T* start_position, position_T* end_position, array_T* errors);
 AST_HTML_COMMENT_NODE_T* ast_html_comment_node_init(token_T* comment_start, array_T* children, token_T* comment_end, position_T* start_position, position_T* end_position, array_T* errors);
 AST_HTML_DOCTYPE_NODE_T* ast_html_doctype_node_init(token_T* tag_opening, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
+AST_XML_DECLARATION_NODE_T* ast_xml_declaration_node_init(token_T* tag_opening, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
+AST_CDATA_NODE_T* ast_cdata_node_init(token_T* tag_opening, array_T* children, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
 AST_WHITESPACE_NODE_T* ast_whitespace_node_init(token_T* value, position_T* start_position, position_T* end_position, array_T* errors);
 AST_ERB_CONTENT_NODE_T* ast_erb_content_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, analyzed_ruby_T* analyzed_ruby, bool parsed, bool valid, position_T* start_position, position_T* end_position, array_T* errors);
 AST_ERB_END_NODE_T* ast_erb_end_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, position_T* start_position, position_T* end_position, array_T* errors);
 AST_ERB_ELSE_NODE_T* ast_erb_else_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, position_T* start_position, position_T* end_position, array_T* errors);
-AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, AST_NODE_T* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
+AST_ERB_IF_NODE_T* ast_erb_if_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, struct AST_NODE_STRUCT* subsequent, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
 AST_ERB_BLOCK_NODE_T* ast_erb_block_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* body, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);
 AST_ERB_WHEN_NODE_T* ast_erb_when_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* statements, position_T* start_position, position_T* end_position, array_T* errors);
 AST_ERB_CASE_NODE_T* ast_erb_case_node_init(token_T* tag_opening, token_T* content, token_T* tag_closing, array_T* children, array_T* conditions, struct AST_ERB_ELSE_NODE_STRUCT* else_clause, struct AST_ERB_END_NODE_STRUCT* end_node, position_T* start_position, position_T* end_position, array_T* errors);

package/extension/libherb/ast_pretty_print.c

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/src/ast_pretty_print.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/src/ast_pretty_print.c.erb
 
 #include "include/ast_node.h"
 #include "include/ast_nodes.h"
@@ -58,20 +58,10 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_errors(node, indent, relative_indent, false, buffer);
       pretty_print_token_property(html_close_tag_node->tag_opening, "tag_opening", indent, relative_indent, false, buffer);
       pretty_print_token_property(html_close_tag_node->tag_name, "tag_name", indent, relative_indent, false, buffer);
+      pretty_print_array("children", html_close_tag_node->children, indent, relative_indent, false, buffer);
       pretty_print_token_property(html_close_tag_node->tag_closing, "tag_closing", indent, relative_indent, true, buffer);
     } break;
 
-    case AST_HTML_SELF_CLOSE_TAG_NODE: {
-      const AST_HTML_SELF_CLOSE_TAG_NODE_T* html_self_close_tag_node = (AST_HTML_SELF_CLOSE_TAG_NODE_T*) node;
-
-      pretty_print_errors(node, indent, relative_indent, false, buffer);
-      pretty_print_token_property(html_self_close_tag_node->tag_opening, "tag_opening", indent, relative_indent, false, buffer);
-      pretty_print_token_property(html_self_close_tag_node->tag_name, "tag_name", indent, relative_indent, false, buffer);
-      pretty_print_array("attributes", html_self_close_tag_node->attributes, indent, relative_indent, false, buffer);
-      pretty_print_token_property(html_self_close_tag_node->tag_closing, "tag_closing", indent, relative_indent, false, buffer);
-      pretty_print_boolean_property("is_void", html_self_close_tag_node->is_void, indent, relative_indent, true, buffer);
-    } break;
-
     case AST_HTML_ELEMENT_NODE: {
       const AST_HTML_ELEMENT_NODE_T* html_element_node = (AST_HTML_ELEMENT_NODE_T*) node;
 
@@ -125,7 +115,7 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       const AST_HTML_ATTRIBUTE_NAME_NODE_T* html_attribute_name_node = (AST_HTML_ATTRIBUTE_NAME_NODE_T*) node;
 
       pretty_print_errors(node, indent, relative_indent, false, buffer);
-      pretty_print_token_property(html_attribute_name_node->name, "name", indent, relative_indent, true, buffer);
+      pretty_print_array("children", html_attribute_name_node->children, indent, relative_indent, true, buffer);
     } break;
 
     case AST_HTML_ATTRIBUTE_NODE: {
@@ -190,6 +180,24 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       pretty_print_token_property(html_doctype_node->tag_closing, "tag_closing", indent, relative_indent, true, buffer);
     } break;
 
+    case AST_XML_DECLARATION_NODE: {
+      const AST_XML_DECLARATION_NODE_T* xml_declaration_node = (AST_XML_DECLARATION_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(xml_declaration_node->tag_opening, "tag_opening", indent, relative_indent, false, buffer);
+      pretty_print_array("children", xml_declaration_node->children, indent, relative_indent, false, buffer);
+      pretty_print_token_property(xml_declaration_node->tag_closing, "tag_closing", indent, relative_indent, true, buffer);
+    } break;
+
+    case AST_CDATA_NODE: {
+      const AST_CDATA_NODE_T* cdata_node = (AST_CDATA_NODE_T*) node;
+
+      pretty_print_errors(node, indent, relative_indent, false, buffer);
+      pretty_print_token_property(cdata_node->tag_opening, "tag_opening", indent, relative_indent, false, buffer);
+      pretty_print_array("children", cdata_node->children, indent, relative_indent, false, buffer);
+      pretty_print_token_property(cdata_node->tag_closing, "tag_closing", indent, relative_indent, true, buffer);
+    } break;
+
     case AST_WHITESPACE_NODE: {
       const AST_WHITESPACE_NODE_T* whitespace_node = (AST_WHITESPACE_NODE_T*) node;
 

package/extension/libherb/ast_pretty_print.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/src/include/ast_pretty_print.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/src/include/ast_pretty_print.h.erb
 
 #ifndef HERB_AST_PRETTY_PRINT_H
 #define HERB_AST_PRETTY_PRINT_H

package/extension/libherb/errors.c

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/src/errors.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/src/errors.c.erb
 
 #include "include/array.h"
 #include "include/errors.h"

package/extension/libherb/errors.h

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/src/include/errors.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/src/include/errors.h.erb
 
 #ifndef HERB_ERRORS_H
 #define HERB_ERRORS_H

package/extension/libherb/herb.c

@@ -27,9 +27,9 @@ array_T* herb_lex(const char* source) {
   return tokens;
 }
 
-AST_DOCUMENT_NODE_T* herb_parse(const char* source) {
+AST_DOCUMENT_NODE_T* herb_parse(const char* source, parser_options_T* options) {
   lexer_T* lexer = lexer_init(source);
-  parser_T* parser = parser_init(lexer);
+  parser_T* parser = parser_init(lexer, options);
 
   AST_DOCUMENT_NODE_T* document = parser_parse(parser);
 

package/extension/libherb/herb.h

@@ -5,6 +5,7 @@
 #include "ast_node.h"
 #include "buffer.h"
 #include "extract.h"
+#include "parser.h"
 
 #include <stdint.h>
 
@@ -18,7 +19,7 @@ void herb_lex_json_to_buffer(const char* source, buffer_T* output);
 array_T* herb_lex(const char* source);
 array_T* herb_lex_file(const char* path);
 
-AST_DOCUMENT_NODE_T* herb_parse(const char* source);
+AST_DOCUMENT_NODE_T* herb_parse(const char* source, parser_options_T* options);
 
 const char* herb_version(void);
 const char* herb_prism_version(void);