@herb-tools/node 0.6.1 → 0.7.1

package/binding.gyp

@@ -18,6 +18,7 @@
         "./extension/libherb/ast_nodes.c",
         "./extension/libherb/ast_pretty_print.c",
         "./extension/libherb/buffer.c",
+        "./extension/libherb/element_source.c",
         "./extension/libherb/errors.c",
         "./extension/libherb/extract.c",
         "./extension/libherb/herb.c",

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.6.1";
+var version = "0.7.1";
 var packageJSON = {
 	name: name,
 	version: version};

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.6.1/templates/javascript/packages/node/extension/error_helpers.cpp.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.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.6.1/templates/javascript/packages/node/extension/error_helpers.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/javascript/packages/node/extension/error_helpers.h.erb
 
 #ifndef HERB_EXTENSION_ERRORS_H
 #define HERB_EXTENSION_ERRORS_H

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.6.1/templates/src/ast_nodes.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/ast_nodes.c.erb
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -62,7 +62,7 @@ AST_HTML_CLOSE_TAG_NODE_T* ast_html_close_tag_node_init(token_T* tag_opening, to
   return html_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* 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, element_source_t source, 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));
 
   ast_node_init(&html_element_node->base, AST_HTML_ELEMENT_NODE, start_position, end_position, errors);
@@ -72,6 +72,7 @@ AST_HTML_ELEMENT_NODE_T* ast_html_element_node_init(struct AST_HTML_OPEN_TAG_NOD
   html_element_node->body = body;
   html_element_node->close_tag = close_tag;
   html_element_node->is_void = is_void;
+  html_element_node->source = source;
 
   return html_element_node;
 }

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.6.1/templates/src/include/ast_nodes.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/include/ast_nodes.h.erb
 
 #ifndef HERB_AST_NODES_H
 #define HERB_AST_NODES_H
@@ -13,6 +13,7 @@
 #include "location.h"
 #include "token_struct.h"
 #include "analyzed_ruby.h"
+#include "element_source.h"
 
 typedef enum {
   AST_DOCUMENT_NODE,
@@ -90,6 +91,7 @@ typedef struct AST_HTML_ELEMENT_NODE_STRUCT {
   array_T* body;
   struct AST_HTML_CLOSE_TAG_NODE_STRUCT* close_tag;
   bool is_void;
+  element_source_t source;
 } AST_HTML_ELEMENT_NODE_T;
 
 typedef struct AST_HTML_ATTRIBUTE_VALUE_NODE_STRUCT {
@@ -309,7 +311,7 @@ AST_DOCUMENT_NODE_T* ast_document_node_init(array_T* children, position_T* start
 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, 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_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, element_source_t source, 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(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);

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.6.1/templates/src/ast_pretty_print.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/ast_pretty_print.c.erb
 
 #include "include/ast_node.h"
 #include "include/ast_nodes.h"
@@ -98,7 +98,8 @@ void ast_pretty_print_node(AST_NODE_T* node, const size_t indent, const size_t r
       }
       buffer_append(buffer, "\n");
 
-      pretty_print_boolean_property("is_void", html_element_node->is_void, indent, relative_indent, true, buffer);
+      pretty_print_boolean_property("is_void", html_element_node->is_void, indent, relative_indent, false, buffer);
+      pretty_print_string_property(element_source_to_string(html_element_node->source), "source", indent, relative_indent, true, buffer);
     } break;
 
     case AST_HTML_ATTRIBUTE_VALUE_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.6.1/templates/src/include/ast_pretty_print.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/include/ast_pretty_print.h.erb
 
 #ifndef HERB_AST_PRETTY_PRINT_H
 #define HERB_AST_PRETTY_PRINT_H

package/extension/libherb/element_source.c

@@ -0,0 +1,11 @@
+#include "include/element_source.h"
+
+const char* element_source_to_string(element_source_t source) {
+  switch (source) {
+    case ELEMENT_SOURCE_HTML: return "HTML";
+    case ELEMENT_SOURCE_ACTIONVIEW: return "ActionView";
+    case ELEMENT_SOURCE_HAML: return "Haml";
+    case ELEMENT_SOURCE_SLIM: return "Slim";
+    default: return "Unknown";
+  }
+}

package/extension/libherb/element_source.h

@@ -0,0 +1,13 @@
+#ifndef HERB_ELEMENT_SOURCE_H
+#define HERB_ELEMENT_SOURCE_H
+
+typedef enum {
+  ELEMENT_SOURCE_HTML,
+  ELEMENT_SOURCE_ACTIONVIEW,
+  ELEMENT_SOURCE_HAML,
+  ELEMENT_SOURCE_SLIM
+} element_source_t;
+
+const char* element_source_to_string(element_source_t source);
+
+#endif

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.6.1/templates/src/errors.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.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.6.1/templates/src/include/errors.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/include/errors.h.erb
 
 #ifndef HERB_ERRORS_H
 #define HERB_ERRORS_H

package/extension/libherb/include/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.6.1/templates/src/include/ast_nodes.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/include/ast_nodes.h.erb
 
 #ifndef HERB_AST_NODES_H
 #define HERB_AST_NODES_H
@@ -13,6 +13,7 @@
 #include "location.h"
 #include "token_struct.h"
 #include "analyzed_ruby.h"
+#include "element_source.h"
 
 typedef enum {
   AST_DOCUMENT_NODE,
@@ -90,6 +91,7 @@ typedef struct AST_HTML_ELEMENT_NODE_STRUCT {
   array_T* body;
   struct AST_HTML_CLOSE_TAG_NODE_STRUCT* close_tag;
   bool is_void;
+  element_source_t source;
 } AST_HTML_ELEMENT_NODE_T;
 
 typedef struct AST_HTML_ATTRIBUTE_VALUE_NODE_STRUCT {
@@ -309,7 +311,7 @@ AST_DOCUMENT_NODE_T* ast_document_node_init(array_T* children, position_T* start
 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, 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_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, element_source_t source, 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(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);

package/extension/libherb/include/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.6.1/templates/src/include/ast_pretty_print.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/include/ast_pretty_print.h.erb
 
 #ifndef HERB_AST_PRETTY_PRINT_H
 #define HERB_AST_PRETTY_PRINT_H

package/extension/libherb/include/element_source.h

@@ -0,0 +1,13 @@
+#ifndef HERB_ELEMENT_SOURCE_H
+#define HERB_ELEMENT_SOURCE_H
+
+typedef enum {
+  ELEMENT_SOURCE_HTML,
+  ELEMENT_SOURCE_ACTIONVIEW,
+  ELEMENT_SOURCE_HAML,
+  ELEMENT_SOURCE_SLIM
+} element_source_t;
+
+const char* element_source_to_string(element_source_t source);
+
+#endif

package/extension/libherb/include/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.6.1/templates/src/include/errors.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/include/errors.h.erb
 
 #ifndef HERB_ERRORS_H
 #define HERB_ERRORS_H

package/extension/libherb/include/version.h

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

package/extension/libherb/parser.c

@@ -805,6 +805,20 @@ static AST_HTML_OPEN_TAG_NODE_T* parser_parse_html_open_tag(parser_T* parser) {
       continue;
     }
 
+    if (parser->current_token->type == TOKEN_COLON) {
+      lexer_T lexer_copy = *parser->lexer;
+      token_T* next_token = lexer_next_token(&lexer_copy);
+
+      if (next_token && next_token->type == TOKEN_IDENTIFIER) {
+        token_free(next_token);
+        array_append(children, parser_parse_html_attribute(parser));
+
+        continue;
+      }
+
+      token_free(next_token);
+    }
+
     parser_append_unexpected_error(
       parser,
       "Unexpected Token",
@@ -910,6 +924,7 @@ static AST_HTML_ELEMENT_NODE_T* parser_parse_html_self_closing_element(
     NULL,
     NULL,
     true,
+    ELEMENT_SOURCE_HTML,
     open_tag->base.location->start,
     open_tag->base.location->end,
     NULL
@@ -958,6 +973,7 @@ static AST_HTML_ELEMENT_NODE_T* parser_parse_html_regular_element(
     body,
     close_tag,
     false,
+    ELEMENT_SOURCE_HTML,
     open_tag->base.location->start,
     close_tag->base.location->end,
     errors
@@ -988,6 +1004,7 @@ static AST_HTML_ELEMENT_NODE_T* parser_parse_html_element(parser_T* parser) {
     NULL,
     NULL,
     false,
+    ELEMENT_SOURCE_HTML,
     open_tag->base.location->start,
     open_tag->base.location->end,
     errors

package/extension/libherb/parser_helpers.c

@@ -173,6 +173,7 @@ AST_HTML_ELEMENT_NODE_T* parser_handle_missing_close_tag(
     body,
     NULL,
     false,
+    ELEMENT_SOURCE_HTML,
     open_tag->base.location->start,
     open_tag->base.location->end,
     errors

package/extension/libherb/version.h

@@ -1,6 +1,6 @@
 #ifndef HERB_VERSION_H
 #define HERB_VERSION_H
 
-#define HERB_VERSION "0.6.1"
+#define HERB_VERSION "0.7.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.6.1/templates/src/visitor.c.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/src/visitor.c.erb
 
 #include <stdio.h>
 

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.6.1/templates/javascript/packages/node/extension/nodes.cpp.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/javascript/packages/node/extension/nodes.cpp.erb
 
 #include <node_api.h>
 #include "error_helpers.h"
@@ -174,6 +174,9 @@ 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_set_named_property(env, result, "source", source);
+
 
   return result;
 }

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.6.1/templates/javascript/packages/node/extension/nodes.h.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.7.1/templates/javascript/packages/node/extension/nodes.h.erb
 
 #ifndef HERB_EXTENSION_NODES_H
 #define HERB_EXTENSION_NODES_H