@herb-tools/node 0.5.0 → 0.6.1

package/extension/libherb/parser.h

@@ -15,15 +15,20 @@ typedef enum {
 
 typedef enum { PARSER_STATE_DATA, PARSER_STATE_FOREIGN_CONTENT } parser_state_T;
 
+typedef struct PARSER_OPTIONS_STRUCT {
+  bool track_whitespace;
+} parser_options_T;
+
 typedef struct PARSER_STRUCT {
   lexer_T* lexer;
   token_T* current_token;
   array_T* open_tags_stack;
   parser_state_T state;
   foreign_content_type_T foreign_content_type;
+  parser_options_T* options;
 } parser_T;
 
-parser_T* parser_init(lexer_T* lexer);
+parser_T* parser_init(lexer_T* lexer, parser_options_T* options);
 
 AST_DOCUMENT_NODE_T* parser_parse(parser_T* parser);
 

package/extension/libherb/token.c

@@ -47,6 +47,10 @@ const char* token_type_to_string(const token_type_T type) {
     case TOKEN_NEWLINE: return "TOKEN_NEWLINE";
     case TOKEN_IDENTIFIER: return "TOKEN_IDENTIFIER";
     case TOKEN_HTML_DOCTYPE: return "TOKEN_HTML_DOCTYPE";
+    case TOKEN_XML_DECLARATION: return "TOKEN_XML_DECLARATION";
+    case TOKEN_XML_DECLARATION_END: return "TOKEN_XML_DECLARATION_END";
+    case TOKEN_CDATA_START: return "TOKEN_CDATA_START";
+    case TOKEN_CDATA_END: return "TOKEN_CDATA_END";
     case TOKEN_HTML_TAG_START: return "TOKEN_HTML_TAG_START";
     case TOKEN_HTML_TAG_END: return "TOKEN_HTML_TAG_END";
     case TOKEN_HTML_TAG_START_CLOSE: return "TOKEN_HTML_TAG_START_CLOSE";
@@ -56,6 +60,7 @@ const char* token_type_to_string(const token_type_T type) {
     case TOKEN_EQUALS: return "TOKEN_EQUALS";
     case TOKEN_QUOTE: return "TOKEN_QUOTE";
     case TOKEN_BACKTICK: return "TOKEN_BACKTICK";
+    case TOKEN_BACKSLASH: return "TOKEN_BACKSLASH";
     case TOKEN_DASH: return "TOKEN_DASH";
     case TOKEN_UNDERSCORE: return "TOKEN_UNDERSCORE";
     case TOKEN_EXCLAMATION: return "TOKEN_EXCLAMATION";

package/extension/libherb/token_struct.h

@@ -10,7 +10,11 @@ typedef enum {
   TOKEN_NEWLINE,    // \n
   TOKEN_IDENTIFIER,
 
-  TOKEN_HTML_DOCTYPE, // <!DOCTYPE, <!doctype, <!DoCtYpE, <!dOcTyPe
+  TOKEN_HTML_DOCTYPE,        // <!DOCTYPE, <!doctype, <!DoCtYpE, <!dOcTyPe
+  TOKEN_XML_DECLARATION,     // <?xml
+  TOKEN_XML_DECLARATION_END, // ?>
+  TOKEN_CDATA_START,         // <![CDATA[
+  TOKEN_CDATA_END,           // ]]>
 
   TOKEN_HTML_TAG_START,       // <
   TOKEN_HTML_TAG_START_CLOSE, // </
@@ -29,6 +33,7 @@ typedef enum {
   TOKEN_EQUALS,      // =
   TOKEN_QUOTE,       // ", '
   TOKEN_BACKTICK,    // `
+  TOKEN_BACKSLASH,   // backslash
   TOKEN_DASH,        // -
   TOKEN_UNDERSCORE,  // _
   TOKEN_EXCLAMATION, // !

package/extension/libherb/version.h

@@ -1,6 +1,6 @@
 #ifndef HERB_VERSION_H
 #define HERB_VERSION_H
 
-#define HERB_VERSION "0.5.0"
+#define HERB_VERSION "0.6.1"
 
 #endif

package/extension/libherb/visitor.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/visitor.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/src/visitor.c.erb
 
 #include <stdio.h>
 
@@ -42,12 +42,12 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
 
     } break;
 
-    case AST_HTML_SELF_CLOSE_TAG_NODE: {
-      const AST_HTML_SELF_CLOSE_TAG_NODE_T* html_self_close_tag_node = ((const AST_HTML_SELF_CLOSE_TAG_NODE_T *) node);
+    case AST_HTML_CLOSE_TAG_NODE: {
+      const AST_HTML_CLOSE_TAG_NODE_T* html_close_tag_node = ((const AST_HTML_CLOSE_TAG_NODE_T *) node);
 
-      if (html_self_close_tag_node->attributes != NULL) {
-        for (size_t index = 0; index < array_size(html_self_close_tag_node->attributes); index++) {
-          herb_visit_node(array_get(html_self_close_tag_node->attributes, index), visitor, data);
+      if (html_close_tag_node->children != NULL) {
+        for (size_t index = 0; index < array_size(html_close_tag_node->children); index++) {
+          herb_visit_node(array_get(html_close_tag_node->children, index), visitor, data);
         }
       }
 
@@ -83,6 +83,17 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
 
     } break;
 
+    case AST_HTML_ATTRIBUTE_NAME_NODE: {
+      const AST_HTML_ATTRIBUTE_NAME_NODE_T* html_attribute_name_node = ((const AST_HTML_ATTRIBUTE_NAME_NODE_T *) node);
+
+      if (html_attribute_name_node->children != NULL) {
+        for (size_t index = 0; index < array_size(html_attribute_name_node->children); index++) {
+          herb_visit_node(array_get(html_attribute_name_node->children, index), visitor, data);
+        }
+      }
+
+    } break;
+
     case AST_HTML_ATTRIBUTE_NODE: {
       const AST_HTML_ATTRIBUTE_NODE_T* html_attribute_node = ((const AST_HTML_ATTRIBUTE_NODE_T *) node);
 
@@ -118,6 +129,28 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
 
     } break;
 
+    case AST_XML_DECLARATION_NODE: {
+      const AST_XML_DECLARATION_NODE_T* xml_declaration_node = ((const AST_XML_DECLARATION_NODE_T *) node);
+
+      if (xml_declaration_node->children != NULL) {
+        for (size_t index = 0; index < array_size(xml_declaration_node->children); index++) {
+          herb_visit_node(array_get(xml_declaration_node->children, index), visitor, data);
+        }
+      }
+
+    } break;
+
+    case AST_CDATA_NODE: {
+      const AST_CDATA_NODE_T* cdata_node = ((const AST_CDATA_NODE_T *) node);
+
+      if (cdata_node->children != NULL) {
+        for (size_t index = 0; index < array_size(cdata_node->children); index++) {
+          herb_visit_node(array_get(cdata_node->children, index), visitor, data);
+        }
+      }
+
+    } break;
+
     case AST_ERB_ELSE_NODE: {
       const AST_ERB_ELSE_NODE_T* erb_else_node = ((const AST_ERB_ELSE_NODE_T *) node);
 

package/extension/nodes.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/nodes.cpp.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/javascript/packages/node/extension/nodes.cpp.erb
 
 #include <node_api.h>
 #include "error_helpers.h"
@@ -130,47 +130,12 @@ napi_value html_close_tag_nodeNodeFromCStruct(napi_env env, AST_HTML_CLOSE_TAG_N
   napi_value tag_name = CreateToken(env, html_close_tag_node->tag_name);
   napi_set_named_property(env, result, "tag_name", tag_name);
 
-  napi_value tag_closing = CreateToken(env, html_close_tag_node->tag_closing);
-  napi_set_named_property(env, result, "tag_closing", tag_closing);
-
-
-  return result;
-}
-napi_value html_self_close_tag_nodeNodeFromCStruct(napi_env env, AST_HTML_SELF_CLOSE_TAG_NODE_T* html_self_close_tag_node) {
-  if (!html_self_close_tag_node) {
-    napi_value null_value;
-    napi_get_null(env, &null_value);
-    return null_value;
-  }
-
-  napi_value result;
-  napi_create_object(env, &result);
-
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_self_close_tag_node->base));
-  napi_set_named_property(env, result, "type", type);
-
-  napi_value location = CreateLocation(env, html_self_close_tag_node->base.location);
-  napi_set_named_property(env, result, "location", location);
-
-  napi_value errors = ErrorsArrayFromCArray(env, html_self_close_tag_node->base.errors);
-  napi_set_named_property(env, result, "errors", errors);
-
-  napi_value tag_opening = CreateToken(env, html_self_close_tag_node->tag_opening);
-  napi_set_named_property(env, result, "tag_opening", tag_opening);
-
-  napi_value tag_name = CreateToken(env, html_self_close_tag_node->tag_name);
-  napi_set_named_property(env, result, "tag_name", tag_name);
-
-  napi_value attributes = NodesArrayFromCArray(env, html_self_close_tag_node->attributes);
-  napi_set_named_property(env, result, "attributes", attributes);
+  napi_value children = NodesArrayFromCArray(env, html_close_tag_node->children);
+  napi_set_named_property(env, result, "children", children);
 
-  napi_value tag_closing = CreateToken(env, html_self_close_tag_node->tag_closing);
+  napi_value tag_closing = CreateToken(env, html_close_tag_node->tag_closing);
   napi_set_named_property(env, result, "tag_closing", tag_closing);
 
-  napi_value is_void;
-  napi_get_boolean(env, html_self_close_tag_node->is_void, &is_void);
-  napi_set_named_property(env, result, "is_void", is_void);
-
 
   return result;
 }
@@ -266,8 +231,8 @@ napi_value html_attribute_name_nodeNodeFromCStruct(napi_env env, AST_HTML_ATTRIB
   napi_value errors = ErrorsArrayFromCArray(env, html_attribute_name_node->base.errors);
   napi_set_named_property(env, result, "errors", errors);
 
-  napi_value name = CreateToken(env, html_attribute_name_node->name);
-  napi_set_named_property(env, result, "name", name);
+  napi_value children = NodesArrayFromCArray(env, html_attribute_name_node->children);
+  napi_set_named_property(env, result, "children", children);
 
 
   return result;
@@ -388,6 +353,68 @@ napi_value html_doctype_nodeNodeFromCStruct(napi_env env, AST_HTML_DOCTYPE_NODE_
   napi_set_named_property(env, result, "tag_closing", tag_closing);
 
 
+  return result;
+}
+napi_value xml_declaration_nodeNodeFromCStruct(napi_env env, AST_XML_DECLARATION_NODE_T* xml_declaration_node) {
+  if (!xml_declaration_node) {
+    napi_value null_value;
+    napi_get_null(env, &null_value);
+    return null_value;
+  }
+
+  napi_value result;
+  napi_create_object(env, &result);
+
+  napi_value type = CreateString(env, ast_node_type_to_string(&xml_declaration_node->base));
+  napi_set_named_property(env, result, "type", type);
+
+  napi_value location = CreateLocation(env, xml_declaration_node->base.location);
+  napi_set_named_property(env, result, "location", location);
+
+  napi_value errors = ErrorsArrayFromCArray(env, xml_declaration_node->base.errors);
+  napi_set_named_property(env, result, "errors", errors);
+
+  napi_value tag_opening = CreateToken(env, xml_declaration_node->tag_opening);
+  napi_set_named_property(env, result, "tag_opening", tag_opening);
+
+  napi_value children = NodesArrayFromCArray(env, xml_declaration_node->children);
+  napi_set_named_property(env, result, "children", children);
+
+  napi_value tag_closing = CreateToken(env, xml_declaration_node->tag_closing);
+  napi_set_named_property(env, result, "tag_closing", tag_closing);
+
+
+  return result;
+}
+napi_value cdata_nodeNodeFromCStruct(napi_env env, AST_CDATA_NODE_T* cdata_node) {
+  if (!cdata_node) {
+    napi_value null_value;
+    napi_get_null(env, &null_value);
+    return null_value;
+  }
+
+  napi_value result;
+  napi_create_object(env, &result);
+
+  napi_value type = CreateString(env, ast_node_type_to_string(&cdata_node->base));
+  napi_set_named_property(env, result, "type", type);
+
+  napi_value location = CreateLocation(env, cdata_node->base.location);
+  napi_set_named_property(env, result, "location", location);
+
+  napi_value errors = ErrorsArrayFromCArray(env, cdata_node->base.errors);
+  napi_set_named_property(env, result, "errors", errors);
+
+  napi_value tag_opening = CreateToken(env, cdata_node->tag_opening);
+  napi_set_named_property(env, result, "tag_opening", tag_opening);
+
+  napi_value children = NodesArrayFromCArray(env, cdata_node->children);
+  napi_set_named_property(env, result, "children", children);
+
+  napi_value tag_closing = CreateToken(env, cdata_node->tag_closing);
+  napi_set_named_property(env, result, "tag_closing", tag_closing);
+
+
   return result;
 }
 napi_value whitespace_nodeNodeFromCStruct(napi_env env, AST_WHITESPACE_NODE_T* whitespace_node) {
@@ -1091,9 +1118,6 @@ napi_value NodeFromCStruct(napi_env env, AST_NODE_T* node) {
     case AST_HTML_CLOSE_TAG_NODE:
       return html_close_tag_nodeNodeFromCStruct(env, (AST_HTML_CLOSE_TAG_NODE_T*) node);
       break;
-    case AST_HTML_SELF_CLOSE_TAG_NODE:
-      return html_self_close_tag_nodeNodeFromCStruct(env, (AST_HTML_SELF_CLOSE_TAG_NODE_T*) node);
-      break;
     case AST_HTML_ELEMENT_NODE:
       return html_element_nodeNodeFromCStruct(env, (AST_HTML_ELEMENT_NODE_T*) node);
       break;
@@ -1115,6 +1139,12 @@ napi_value NodeFromCStruct(napi_env env, AST_NODE_T* node) {
     case AST_HTML_DOCTYPE_NODE:
       return html_doctype_nodeNodeFromCStruct(env, (AST_HTML_DOCTYPE_NODE_T*) node);
       break;
+    case AST_XML_DECLARATION_NODE:
+      return xml_declaration_nodeNodeFromCStruct(env, (AST_XML_DECLARATION_NODE_T*) node);
+      break;
+    case AST_CDATA_NODE:
+      return cdata_nodeNodeFromCStruct(env, (AST_CDATA_NODE_T*) node);
+      break;
     case AST_WHITESPACE_NODE:
       return whitespace_nodeNodeFromCStruct(env, (AST_WHITESPACE_NODE_T*) node);
       break;

package/extension/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/javascript/packages/node/extension/nodes.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/javascript/packages/node/extension/nodes.h.erb
 
 #ifndef HERB_EXTENSION_NODES_H
 #define HERB_EXTENSION_NODES_H
@@ -17,7 +17,6 @@ napi_value document_nodeNodeFromCStruct(napi_env env, AST_DOCUMENT_NODE_T* docum
 napi_value literal_nodeNodeFromCStruct(napi_env env, AST_LITERAL_NODE_T* literal_node);
 napi_value html_open_tag_nodeNodeFromCStruct(napi_env env, AST_HTML_OPEN_TAG_NODE_T* html_open_tag_node);
 napi_value html_close_tag_nodeNodeFromCStruct(napi_env env, AST_HTML_CLOSE_TAG_NODE_T* html_close_tag_node);
-napi_value html_self_close_tag_nodeNodeFromCStruct(napi_env env, AST_HTML_SELF_CLOSE_TAG_NODE_T* html_self_close_tag_node);
 napi_value html_element_nodeNodeFromCStruct(napi_env env, AST_HTML_ELEMENT_NODE_T* html_element_node);
 napi_value html_attribute_value_nodeNodeFromCStruct(napi_env env, AST_HTML_ATTRIBUTE_VALUE_NODE_T* html_attribute_value_node);
 napi_value html_attribute_name_nodeNodeFromCStruct(napi_env env, AST_HTML_ATTRIBUTE_NAME_NODE_T* html_attribute_name_node);
@@ -25,6 +24,8 @@ napi_value html_attribute_nodeNodeFromCStruct(napi_env env, AST_HTML_ATTRIBUTE_N
 napi_value html_text_nodeNodeFromCStruct(napi_env env, AST_HTML_TEXT_NODE_T* html_text_node);
 napi_value html_comment_nodeNodeFromCStruct(napi_env env, AST_HTML_COMMENT_NODE_T* html_comment_node);
 napi_value html_doctype_nodeNodeFromCStruct(napi_env env, AST_HTML_DOCTYPE_NODE_T* html_doctype_node);
+napi_value xml_declaration_nodeNodeFromCStruct(napi_env env, AST_XML_DECLARATION_NODE_T* xml_declaration_node);
+napi_value cdata_nodeNodeFromCStruct(napi_env env, AST_CDATA_NODE_T* cdata_node);
 napi_value whitespace_nodeNodeFromCStruct(napi_env env, AST_WHITESPACE_NODE_T* whitespace_node);
 napi_value erb_content_nodeNodeFromCStruct(napi_env env, AST_ERB_CONTENT_NODE_T* erb_content_node);
 napi_value erb_end_nodeNodeFromCStruct(napi_env env, AST_ERB_END_NODE_T* erb_end_node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@herb-tools/node",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Native Node.js addon for HTML-aware ERB parsing using Herb.",
   "type": "module",
   "license": "MIT",
@@ -48,7 +48,7 @@
     "host": "https://github.com/marcoroth/herb/releases/download/"
   },
   "dependencies": {
-    "@herb-tools/core": "0.5.0",
+    "@herb-tools/core": "0.6.1",
     "@mapbox/node-pre-gyp": "^2.0.0",
     "node-addon-api": "^5.1.0",
     "node-pre-gyp-github": "^2.0.0"