@herb-tools/node 0.7.5 → 0.8.0

package/extension/libherb/visitor.c

@@ -1,12 +1,12 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.5/templates/src/visitor.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.0/templates/src/visitor.c.erb
 
 #include <stdio.h>
 
-#include "include/array.h"
-#include "include/visitor.h"
 #include "include/ast_node.h"
 #include "include/ast_nodes.h"
+#include "include/util/hb_array.h"
+#include "include/visitor.h"
 
 void herb_visit_node(const AST_NODE_T* node, bool (*visitor)(const AST_NODE_T*, void*), void* data) {
   if (visitor(node, data) && node != NULL) {
@@ -24,8 +24,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_DOCUMENT_NODE_T* document_node = ((const AST_DOCUMENT_NODE_T *) node);
 
       if (document_node->children != NULL) {
-        for (size_t index = 0; index < array_size(document_node->children); index++) {
-          herb_visit_node(array_get(document_node->children, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(document_node->children); index++) {
+          herb_visit_node(hb_array_get(document_node->children, index), visitor, data);
         }
       }
 
@@ -35,8 +35,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_HTML_OPEN_TAG_NODE_T* html_open_tag_node = ((const AST_HTML_OPEN_TAG_NODE_T *) node);
 
       if (html_open_tag_node->children != NULL) {
-        for (size_t index = 0; index < array_size(html_open_tag_node->children); index++) {
-          herb_visit_node(array_get(html_open_tag_node->children, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(html_open_tag_node->children); index++) {
+          herb_visit_node(hb_array_get(html_open_tag_node->children, index), visitor, data);
         }
       }
 
@@ -46,8 +46,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_HTML_CLOSE_TAG_NODE_T* html_close_tag_node = ((const AST_HTML_CLOSE_TAG_NODE_T *) node);
 
       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);
+        for (size_t index = 0; index < hb_array_size(html_close_tag_node->children); index++) {
+          herb_visit_node(hb_array_get(html_close_tag_node->children, index), visitor, data);
         }
       }
 
@@ -61,8 +61,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       }
 
       if (html_element_node->body != NULL) {
-        for (size_t index = 0; index < array_size(html_element_node->body); index++) {
-          herb_visit_node(array_get(html_element_node->body, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(html_element_node->body); index++) {
+          herb_visit_node(hb_array_get(html_element_node->body, index), visitor, data);
         }
       }
 
@@ -76,8 +76,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_HTML_ATTRIBUTE_VALUE_NODE_T* html_attribute_value_node = ((const AST_HTML_ATTRIBUTE_VALUE_NODE_T *) node);
 
       if (html_attribute_value_node->children != NULL) {
-        for (size_t index = 0; index < array_size(html_attribute_value_node->children); index++) {
-          herb_visit_node(array_get(html_attribute_value_node->children, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(html_attribute_value_node->children); index++) {
+          herb_visit_node(hb_array_get(html_attribute_value_node->children, index), visitor, data);
         }
       }
 
@@ -87,8 +87,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       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);
+        for (size_t index = 0; index < hb_array_size(html_attribute_name_node->children); index++) {
+          herb_visit_node(hb_array_get(html_attribute_name_node->children, index), visitor, data);
         }
       }
 
@@ -111,8 +111,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_HTML_COMMENT_NODE_T* html_comment_node = ((const AST_HTML_COMMENT_NODE_T *) node);
 
       if (html_comment_node->children != NULL) {
-        for (size_t index = 0; index < array_size(html_comment_node->children); index++) {
-          herb_visit_node(array_get(html_comment_node->children, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(html_comment_node->children); index++) {
+          herb_visit_node(hb_array_get(html_comment_node->children, index), visitor, data);
         }
       }
 
@@ -122,8 +122,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_HTML_DOCTYPE_NODE_T* html_doctype_node = ((const AST_HTML_DOCTYPE_NODE_T *) node);
 
       if (html_doctype_node->children != NULL) {
-        for (size_t index = 0; index < array_size(html_doctype_node->children); index++) {
-          herb_visit_node(array_get(html_doctype_node->children, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(html_doctype_node->children); index++) {
+          herb_visit_node(hb_array_get(html_doctype_node->children, index), visitor, data);
         }
       }
 
@@ -133,8 +133,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       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);
+        for (size_t index = 0; index < hb_array_size(xml_declaration_node->children); index++) {
+          herb_visit_node(hb_array_get(xml_declaration_node->children, index), visitor, data);
         }
       }
 
@@ -144,8 +144,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       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);
+        for (size_t index = 0; index < hb_array_size(cdata_node->children); index++) {
+          herb_visit_node(hb_array_get(cdata_node->children, index), visitor, data);
         }
       }
 
@@ -155,8 +155,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_ELSE_NODE_T* erb_else_node = ((const AST_ERB_ELSE_NODE_T *) node);
 
       if (erb_else_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_else_node->statements); index++) {
-          herb_visit_node(array_get(erb_else_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_else_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_else_node->statements, index), visitor, data);
         }
       }
 
@@ -166,8 +166,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_IF_NODE_T* erb_if_node = ((const AST_ERB_IF_NODE_T *) node);
 
       if (erb_if_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_if_node->statements); index++) {
-          herb_visit_node(array_get(erb_if_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_if_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_if_node->statements, index), visitor, data);
         }
       }
 
@@ -185,8 +185,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_BLOCK_NODE_T* erb_block_node = ((const AST_ERB_BLOCK_NODE_T *) node);
 
       if (erb_block_node->body != NULL) {
-        for (size_t index = 0; index < array_size(erb_block_node->body); index++) {
-          herb_visit_node(array_get(erb_block_node->body, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_block_node->body); index++) {
+          herb_visit_node(hb_array_get(erb_block_node->body, index), visitor, data);
         }
       }
 
@@ -200,8 +200,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_WHEN_NODE_T* erb_when_node = ((const AST_ERB_WHEN_NODE_T *) node);
 
       if (erb_when_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_when_node->statements); index++) {
-          herb_visit_node(array_get(erb_when_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_when_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_when_node->statements, index), visitor, data);
         }
       }
 
@@ -211,14 +211,14 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_CASE_NODE_T* erb_case_node = ((const AST_ERB_CASE_NODE_T *) node);
 
       if (erb_case_node->children != NULL) {
-        for (size_t index = 0; index < array_size(erb_case_node->children); index++) {
-          herb_visit_node(array_get(erb_case_node->children, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_case_node->children); index++) {
+          herb_visit_node(hb_array_get(erb_case_node->children, index), visitor, data);
         }
       }
 
       if (erb_case_node->conditions != NULL) {
-        for (size_t index = 0; index < array_size(erb_case_node->conditions); index++) {
-          herb_visit_node(array_get(erb_case_node->conditions, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_case_node->conditions); index++) {
+          herb_visit_node(hb_array_get(erb_case_node->conditions, index), visitor, data);
         }
       }
 
@@ -236,14 +236,14 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_CASE_MATCH_NODE_T* erb_case_match_node = ((const AST_ERB_CASE_MATCH_NODE_T *) node);
 
       if (erb_case_match_node->children != NULL) {
-        for (size_t index = 0; index < array_size(erb_case_match_node->children); index++) {
-          herb_visit_node(array_get(erb_case_match_node->children, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_case_match_node->children); index++) {
+          herb_visit_node(hb_array_get(erb_case_match_node->children, index), visitor, data);
         }
       }
 
       if (erb_case_match_node->conditions != NULL) {
-        for (size_t index = 0; index < array_size(erb_case_match_node->conditions); index++) {
-          herb_visit_node(array_get(erb_case_match_node->conditions, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_case_match_node->conditions); index++) {
+          herb_visit_node(hb_array_get(erb_case_match_node->conditions, index), visitor, data);
         }
       }
 
@@ -261,8 +261,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_WHILE_NODE_T* erb_while_node = ((const AST_ERB_WHILE_NODE_T *) node);
 
       if (erb_while_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_while_node->statements); index++) {
-          herb_visit_node(array_get(erb_while_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_while_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_while_node->statements, index), visitor, data);
         }
       }
 
@@ -276,8 +276,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_UNTIL_NODE_T* erb_until_node = ((const AST_ERB_UNTIL_NODE_T *) node);
 
       if (erb_until_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_until_node->statements); index++) {
-          herb_visit_node(array_get(erb_until_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_until_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_until_node->statements, index), visitor, data);
         }
       }
 
@@ -291,8 +291,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_FOR_NODE_T* erb_for_node = ((const AST_ERB_FOR_NODE_T *) node);
 
       if (erb_for_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_for_node->statements); index++) {
-          herb_visit_node(array_get(erb_for_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_for_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_for_node->statements, index), visitor, data);
         }
       }
 
@@ -306,8 +306,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_RESCUE_NODE_T* erb_rescue_node = ((const AST_ERB_RESCUE_NODE_T *) node);
 
       if (erb_rescue_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_rescue_node->statements); index++) {
-          herb_visit_node(array_get(erb_rescue_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_rescue_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_rescue_node->statements, index), visitor, data);
         }
       }
 
@@ -321,8 +321,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_ENSURE_NODE_T* erb_ensure_node = ((const AST_ERB_ENSURE_NODE_T *) node);
 
       if (erb_ensure_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_ensure_node->statements); index++) {
-          herb_visit_node(array_get(erb_ensure_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_ensure_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_ensure_node->statements, index), visitor, data);
         }
       }
 
@@ -332,8 +332,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_BEGIN_NODE_T* erb_begin_node = ((const AST_ERB_BEGIN_NODE_T *) node);
 
       if (erb_begin_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_begin_node->statements); index++) {
-          herb_visit_node(array_get(erb_begin_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_begin_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_begin_node->statements, index), visitor, data);
         }
       }
 
@@ -359,8 +359,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_UNLESS_NODE_T* erb_unless_node = ((const AST_ERB_UNLESS_NODE_T *) node);
 
       if (erb_unless_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_unless_node->statements); index++) {
-          herb_visit_node(array_get(erb_unless_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_unless_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_unless_node->statements, index), visitor, data);
         }
       }
 
@@ -378,8 +378,8 @@ void herb_visit_child_nodes(const AST_NODE_T *node, bool (*visitor)(const AST_NO
       const AST_ERB_IN_NODE_T* erb_in_node = ((const AST_ERB_IN_NODE_T *) node);
 
       if (erb_in_node->statements != NULL) {
-        for (size_t index = 0; index < array_size(erb_in_node->statements); index++) {
-          herb_visit_node(array_get(erb_in_node->statements, index), visitor, data);
+        for (size_t index = 0; index < hb_array_size(erb_in_node->statements); index++) {
+          herb_visit_node(hb_array_get(erb_in_node->statements, index), visitor, data);
         }
       }
 

package/extension/libherb/visitor.h

@@ -1,9 +1,9 @@
 #ifndef HERB_VISITOR_H
 #define HERB_VISITOR_H
 
-#include "array.h"
 #include "ast_node.h"
 #include "ast_nodes.h"
+#include "util/hb_array.h"
 
 void herb_visit_node(const AST_NODE_T* node, bool (*visitor)(const AST_NODE_T*, void*), void* data);
 void herb_visit_child_nodes(const AST_NODE_T* node, bool (*visitor)(const AST_NODE_T* node, void* data), void* data);

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.7.5/templates/javascript/packages/node/extension/nodes.cpp.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.0/templates/javascript/packages/node/extension/nodes.cpp.erb
 
 #include <node_api.h>
 #include "error_helpers.h"
@@ -7,15 +7,15 @@
 #include "nodes.h"
 
 extern "C" {
-#include "../extension/libherb/include/herb.h"
-#include "../extension/libherb/include/token.h"
-#include "../extension/libherb/include/array.h"
 #include "../extension/libherb/include/ast_node.h"
 #include "../extension/libherb/include/ast_nodes.h"
+#include "../extension/libherb/include/herb.h"
+#include "../extension/libherb/include/token.h"
+#include "../extension/libherb/include/util/hb_array.h"
 }
 
 napi_value NodeFromCStruct(napi_env env, AST_NODE_T* node);
-napi_value NodesArrayFromCArray(napi_env env, array_T* array);
+napi_value NodesArrayFromCArray(napi_env env, hb_array_T* array);
 
 napi_value document_nodeNodeFromCStruct(napi_env env, AST_DOCUMENT_NODE_T* document_node) {
   if (!document_node) {
@@ -27,7 +27,7 @@ napi_value document_nodeNodeFromCStruct(napi_env env, AST_DOCUMENT_NODE_T* docum
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&document_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&document_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, document_node->base.location);
@@ -52,7 +52,7 @@ napi_value literal_nodeNodeFromCStruct(napi_env env, AST_LITERAL_NODE_T* literal
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&literal_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&literal_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, literal_node->base.location);
@@ -77,7 +77,7 @@ napi_value html_open_tag_nodeNodeFromCStruct(napi_env env, AST_HTML_OPEN_TAG_NOD
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_open_tag_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_open_tag_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_open_tag_node->base.location);
@@ -115,7 +115,7 @@ napi_value html_close_tag_nodeNodeFromCStruct(napi_env env, AST_HTML_CLOSE_TAG_N
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_close_tag_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_close_tag_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_close_tag_node->base.location);
@@ -149,7 +149,7 @@ napi_value html_element_nodeNodeFromCStruct(napi_env env, AST_HTML_ELEMENT_NODE_
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_element_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_element_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_element_node->base.location);
@@ -174,7 +174,7 @@ napi_value html_element_nodeNodeFromCStruct(napi_env env, AST_HTML_ELEMENT_NODE_
   napi_get_boolean(env, html_element_node->is_void, &is_void);
   napi_set_named_property(env, result, "is_void", is_void);
 
-  napi_value source = CreateString(env, element_source_to_string(html_element_node->source));
+  napi_value source = CreateStringFromHbString(env, element_source_to_string(html_element_node->source));
   napi_set_named_property(env, result, "source", source);
 
 
@@ -190,7 +190,7 @@ napi_value html_attribute_value_nodeNodeFromCStruct(napi_env env, AST_HTML_ATTRI
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_attribute_value_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_attribute_value_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_attribute_value_node->base.location);
@@ -225,7 +225,7 @@ napi_value html_attribute_name_nodeNodeFromCStruct(napi_env env, AST_HTML_ATTRIB
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_attribute_name_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_attribute_name_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_attribute_name_node->base.location);
@@ -250,7 +250,7 @@ napi_value html_attribute_nodeNodeFromCStruct(napi_env env, AST_HTML_ATTRIBUTE_N
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_attribute_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_attribute_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_attribute_node->base.location);
@@ -281,7 +281,7 @@ napi_value html_text_nodeNodeFromCStruct(napi_env env, AST_HTML_TEXT_NODE_T* htm
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_text_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_text_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_text_node->base.location);
@@ -306,7 +306,7 @@ napi_value html_comment_nodeNodeFromCStruct(napi_env env, AST_HTML_COMMENT_NODE_
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_comment_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_comment_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_comment_node->base.location);
@@ -337,7 +337,7 @@ napi_value html_doctype_nodeNodeFromCStruct(napi_env env, AST_HTML_DOCTYPE_NODE_
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&html_doctype_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&html_doctype_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, html_doctype_node->base.location);
@@ -368,7 +368,7 @@ napi_value xml_declaration_nodeNodeFromCStruct(napi_env env, AST_XML_DECLARATION
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&xml_declaration_node->base));
+  napi_value type = CreateStringFromHbString(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);
@@ -399,7 +399,7 @@ napi_value cdata_nodeNodeFromCStruct(napi_env env, AST_CDATA_NODE_T* cdata_node)
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&cdata_node->base));
+  napi_value type = CreateStringFromHbString(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);
@@ -430,7 +430,7 @@ napi_value whitespace_nodeNodeFromCStruct(napi_env env, AST_WHITESPACE_NODE_T* w
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&whitespace_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&whitespace_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, whitespace_node->base.location);
@@ -455,7 +455,7 @@ napi_value erb_content_nodeNodeFromCStruct(napi_env env, AST_ERB_CONTENT_NODE_T*
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_content_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_content_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_content_node->base.location);
@@ -498,7 +498,7 @@ napi_value erb_end_nodeNodeFromCStruct(napi_env env, AST_ERB_END_NODE_T* erb_end
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_end_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_end_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_end_node->base.location);
@@ -529,7 +529,7 @@ napi_value erb_else_nodeNodeFromCStruct(napi_env env, AST_ERB_ELSE_NODE_T* erb_e
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_else_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_else_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_else_node->base.location);
@@ -563,7 +563,7 @@ napi_value erb_if_nodeNodeFromCStruct(napi_env env, AST_ERB_IF_NODE_T* erb_if_no
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_if_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_if_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_if_node->base.location);
@@ -603,7 +603,7 @@ napi_value erb_block_nodeNodeFromCStruct(napi_env env, AST_ERB_BLOCK_NODE_T* erb
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_block_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_block_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_block_node->base.location);
@@ -640,7 +640,7 @@ napi_value erb_when_nodeNodeFromCStruct(napi_env env, AST_ERB_WHEN_NODE_T* erb_w
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_when_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_when_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_when_node->base.location);
@@ -674,7 +674,7 @@ napi_value erb_case_nodeNodeFromCStruct(napi_env env, AST_ERB_CASE_NODE_T* erb_c
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_case_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_case_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_case_node->base.location);
@@ -717,7 +717,7 @@ napi_value erb_case_match_nodeNodeFromCStruct(napi_env env, AST_ERB_CASE_MATCH_N
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_case_match_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_case_match_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_case_match_node->base.location);
@@ -760,7 +760,7 @@ napi_value erb_while_nodeNodeFromCStruct(napi_env env, AST_ERB_WHILE_NODE_T* erb
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_while_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_while_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_while_node->base.location);
@@ -797,7 +797,7 @@ napi_value erb_until_nodeNodeFromCStruct(napi_env env, AST_ERB_UNTIL_NODE_T* erb
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_until_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_until_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_until_node->base.location);
@@ -834,7 +834,7 @@ napi_value erb_for_nodeNodeFromCStruct(napi_env env, AST_ERB_FOR_NODE_T* erb_for
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_for_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_for_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_for_node->base.location);
@@ -871,7 +871,7 @@ napi_value erb_rescue_nodeNodeFromCStruct(napi_env env, AST_ERB_RESCUE_NODE_T* e
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_rescue_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_rescue_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_rescue_node->base.location);
@@ -908,7 +908,7 @@ napi_value erb_ensure_nodeNodeFromCStruct(napi_env env, AST_ERB_ENSURE_NODE_T* e
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_ensure_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_ensure_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_ensure_node->base.location);
@@ -942,7 +942,7 @@ napi_value erb_begin_nodeNodeFromCStruct(napi_env env, AST_ERB_BEGIN_NODE_T* erb
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_begin_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_begin_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_begin_node->base.location);
@@ -988,7 +988,7 @@ napi_value erb_unless_nodeNodeFromCStruct(napi_env env, AST_ERB_UNLESS_NODE_T* e
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_unless_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_unless_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_unless_node->base.location);
@@ -1028,7 +1028,7 @@ napi_value erb_yield_nodeNodeFromCStruct(napi_env env, AST_ERB_YIELD_NODE_T* erb
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_yield_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_yield_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_yield_node->base.location);
@@ -1059,7 +1059,7 @@ napi_value erb_in_nodeNodeFromCStruct(napi_env env, AST_ERB_IN_NODE_T* erb_in_no
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, ast_node_type_to_string(&erb_in_node->base));
+  napi_value type = CreateStringFromHbString(env, ast_node_type_to_string(&erb_in_node->base));
   napi_set_named_property(env, result, "type", type);
 
   napi_value location = CreateLocation(env, erb_in_node->base.location);
@@ -1084,13 +1084,13 @@ napi_value erb_in_nodeNodeFromCStruct(napi_env env, AST_ERB_IN_NODE_T* erb_in_no
   return result;
 }
 
-napi_value NodesArrayFromCArray(napi_env env, array_T* array) {
+napi_value NodesArrayFromCArray(napi_env env, hb_array_T* array) {
   napi_value result;
   napi_create_array(env, &result);
 
   if (array) {
-    for (size_t i = 0; i < array_size(array); i++) {
-      AST_NODE_T* child_node = (AST_NODE_T*) array_get(array, i);
+    for (size_t i = 0; i < hb_array_size(array); i++) {
+      AST_NODE_T* child_node = (AST_NODE_T*) hb_array_get(array, i);
       if (child_node) {
         napi_value js_child = NodeFromCStruct(env, child_node);
         napi_set_element(env, result, i, js_child);

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.7.5/templates/javascript/packages/node/extension/nodes.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.8.0/templates/javascript/packages/node/extension/nodes.h.erb
 
 #ifndef HERB_EXTENSION_NODES_H
 #define HERB_EXTENSION_NODES_H
@@ -11,7 +11,7 @@ extern "C" {
 }
 
 napi_value NodeFromCStruct(napi_env env, AST_NODE_T* node);
-napi_value NodesArrayFromCArray(napi_env env, array_T* array);
+napi_value NodesArrayFromCArray(napi_env env, hb_array_T* array);
 
 napi_value document_nodeNodeFromCStruct(napi_env env, AST_DOCUMENT_NODE_T* document_node);
 napi_value literal_nodeNodeFromCStruct(napi_env env, AST_LITERAL_NODE_T* literal_node);