herb 0.9.7 → 0.10.0

data/templates/src/diff/herb_hash_tree.c.erb

@@ -0,0 +1,147 @@
+// Merkle tree hashing: each node's hash incorporates the hashes of its children,
+// enabling O(1) subtree equality checks during tree diffing.
+// Based on: Merkle, R. "A Digital Signature Based on a Conventional Encryption
+// Function" (1987), Advances in Cryptology - CRYPTO '87.
+// https://en.wikipedia.org/wiki/Merkle_tree
+
+#include "../include/diff/herb_diff.h"
+
+static herb_hash_T hash_token(herb_hash_T hash, const token_T* token) {
+  if (token == NULL) { return herb_hash_byte(hash, 0); }
+
+  hash = herb_hash_uint32(hash, (uint32_t) token->type);
+  hash = herb_hash_string(hash, token->value);
+
+  return hash;
+}
+
+static herb_hash_T hash_child_array(herb_hash_T hash, const hb_array_T* children, herb_hash_map_T* hash_map) {
+  if (children == NULL) { return herb_hash_byte(hash, 0); }
+
+  const size_t count = hb_array_size(children);
+  hash = herb_hash_uint64(hash, (uint64_t) count);
+
+  for (size_t index = 0; index < count; index++) {
+    const AST_NODE_T* child = (const AST_NODE_T*) hb_array_get(children, index);
+    herb_hash_T child_hash = herb_hash_tree(child, hash_map);
+    hash = herb_hash_combine(hash, child_hash);
+  }
+
+  return hash;
+}
+
+herb_hash_T herb_hash_tree(const AST_NODE_T* node, herb_hash_map_T* hash_map) {
+  if (node == NULL) { return HERB_HASH_INIT; }
+
+  if (herb_hash_map_has(hash_map, node)) { return herb_hash_map_get(hash_map, node); }
+
+  herb_hash_T hash = HERB_HASH_INIT;
+  hash = herb_hash_uint32(hash, (uint32_t) node->type);
+
+  switch (node->type) {
+    <%- nodes.each do |node| -%>
+    case <%= node.type %>: {
+      <%- hashable_fields = node.fields.reject(&:always_invisible?).reject { |field| field.is_a?(Herb::Template::PrismNodeField) } -%>
+      <%- if hashable_fields.any? -%>
+      const <%= node.struct_type %>* <%= node.human %> = (const <%= node.struct_type %>*) node;
+      <%- hashable_fields.each do |field| -%>
+
+      <%- case field -%>
+      <%- when Herb::Template::TokenField -%>
+      hash = hash_token(hash, <%= node.human %>-><%= field.name %>);
+      <%- when Herb::Template::StringField, Herb::Template::ElementSourceField -%>
+      hash = herb_hash_string(hash, <%= node.human %>-><%= field.name %>);
+      <%- when Herb::Template::ArrayField -%>
+      hash = hash_child_array(hash, <%= node.human %>-><%= field.name %>, hash_map);
+      <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
+      hash = herb_hash_combine(hash, herb_hash_tree((const AST_NODE_T*) <%= node.human %>-><%= field.name %>, hash_map));
+      <%- when Herb::Template::BooleanField -%>
+      hash = herb_hash_bool(hash, <%= node.human %>-><%= field.name %>);
+      <%- when Herb::Template::LocationField -%>
+      // skip location field: <%= field.name %>
+      <%- end -%>
+      <%- end -%>
+      <%- end -%>
+    } break;
+
+    <%- end -%>
+  }
+
+  herb_hash_map_set(hash_map, node, hash);
+
+  return hash;
+}
+
+static herb_hash_T identity_hash_attributes(const hb_array_T* attributes, const herb_hash_map_T* hash_map) {
+  if (attributes == NULL) { return HERB_HASH_INIT; }
+
+  const size_t count = hb_array_size(attributes);
+  herb_hash_T combined = HERB_HASH_INIT;
+
+  for (size_t index = 0; index < count; index++) {
+    const AST_NODE_T* attribute = (const AST_NODE_T*) hb_array_get(attributes, index);
+    herb_hash_T attribute_hash = herb_hash_map_get(hash_map, attribute);
+    combined ^= attribute_hash;
+  }
+
+  return combined;
+}
+
+herb_hash_T herb_hash_node_move_identity(const AST_NODE_T* node, const herb_hash_map_T* hash_map) {
+  if (node == NULL) { return HERB_HASH_INIT; }
+
+  herb_hash_T hash = HERB_HASH_INIT;
+  hash = herb_hash_uint32(hash, (uint32_t) node->type);
+
+  switch (node->type) {
+    case AST_HTML_ELEMENT_NODE: {
+      const AST_HTML_ELEMENT_NODE_T* element = (const AST_HTML_ELEMENT_NODE_T*) node;
+      hash = hash_token(hash, element->tag_name);
+
+      if (element->open_tag != NULL) {
+        const AST_HTML_OPEN_TAG_NODE_T* open_tag = (const AST_HTML_OPEN_TAG_NODE_T*) element->open_tag;
+        hash = herb_hash_combine(hash, identity_hash_attributes(open_tag->children, hash_map));
+      }
+    } break;
+
+    case AST_HTML_CONDITIONAL_ELEMENT_NODE: {
+      const AST_HTML_CONDITIONAL_ELEMENT_NODE_T* element = (const AST_HTML_CONDITIONAL_ELEMENT_NODE_T*) node;
+      hash = hash_token(hash, element->tag_name);
+
+      if (element->open_tag != NULL) {
+        hash = herb_hash_combine(hash, identity_hash_attributes(element->open_tag->children, hash_map));
+      }
+    } break;
+
+    default: {
+      hash = herb_hash_map_get(hash_map, node);
+    } break;
+  }
+
+  return hash;
+}
+
+herb_hash_T herb_hash_node_identity(const AST_NODE_T* node, const herb_hash_map_T* hash_map) {
+  if (node == NULL) { return HERB_HASH_INIT; }
+
+  herb_hash_T hash = HERB_HASH_INIT;
+  hash = herb_hash_uint32(hash, (uint32_t) node->type);
+
+  switch (node->type) {
+    case AST_HTML_ELEMENT_NODE: {
+      const AST_HTML_ELEMENT_NODE_T* element = (const AST_HTML_ELEMENT_NODE_T*) node;
+      hash = hash_token(hash, element->tag_name);
+    } break;
+
+    case AST_HTML_CONDITIONAL_ELEMENT_NODE: {
+      const AST_HTML_CONDITIONAL_ELEMENT_NODE_T* element = (const AST_HTML_CONDITIONAL_ELEMENT_NODE_T*) node;
+      hash = hash_token(hash, element->tag_name);
+    } break;
+
+    default: {
+      hash = herb_hash_map_get(hash_map, node);
+    } break;
+  }
+
+  return hash;
+}

data/templates/template.rb

@@ -66,9 +66,9 @@ module Herb
     end
 
     class ArrayField < Field
-      def initialize(kind:, **options)
+      def initialize(kind:, **)
         @kind = kind
-        super(**options)
+        super(**)
       end
 
       def ruby_type
@@ -107,9 +107,9 @@ module Herb
     end
 
     class NodeField < Field
-      def initialize(kind:, **options)
+      def initialize(kind:, **)
         @kind = kind
-        super(**options)
+        super(**)
       end
 
       def c_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herb
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors:
 - Marco Roth
@@ -36,8 +36,10 @@ files:
 - herb.gemspec
 - lib/herb.rb
 - lib/herb/action_view/helper_registry.rb
+- lib/herb/action_view/render_analyzer.rb
 - lib/herb/ast.rb
 - lib/herb/ast/erb_content_node.rb
+- lib/herb/ast/erb_render_node.rb
 - lib/herb/ast/helpers.rb
 - lib/herb/ast/node.rb
 - lib/herb/ast/nodes.rb
@@ -46,6 +48,11 @@ files:
 - lib/herb/colors.rb
 - lib/herb/configuration.rb
 - lib/herb/defaults.yml
+- lib/herb/dev/runner.rb
+- lib/herb/dev/server.rb
+- lib/herb/dev/server_entry.rb
+- lib/herb/diff_operation.rb
+- lib/herb/diff_result.rb
 - lib/herb/engine.rb
 - lib/herb/engine/compiler.rb
 - lib/herb/engine/debug_visitor.rb
@@ -56,8 +63,10 @@ files:
 - lib/herb/engine/validator.rb
 - lib/herb/engine/validators/accessibility_validator.rb
 - lib/herb/engine/validators/nesting_validator.rb
+- lib/herb/engine/validators/render_validator.rb
 - lib/herb/engine/validators/security_validator.rb
 - lib/herb/errors.rb
+- lib/herb/html/util.rb
 - lib/herb/lex_result.rb
 - lib/herb/location.rb
 - lib/herb/parse_result.rb
@@ -74,14 +83,21 @@ files:
 - lib/herb/warnings.rb
 - sig/herb.rbs
 - sig/herb/action_view/helper_registry.rbs
+- sig/herb/action_view/render_analyzer.rbs
 - sig/herb/ast.rbs
 - sig/herb/ast/erb_content_node.rbs
+- sig/herb/ast/erb_render_node.rbs
 - sig/herb/ast/helpers.rbs
 - sig/herb/ast/node.rbs
 - sig/herb/ast/nodes.rbs
 - sig/herb/bootstrap.rbs
 - sig/herb/colors.rbs
 - sig/herb/configuration.rbs
+- sig/herb/dev/runner.rbs
+- sig/herb/dev/server.rbs
+- sig/herb/dev/server_entry.rbs
+- sig/herb/diff_operation.rbs
+- sig/herb/diff_result.rbs
 - sig/herb/engine.rbs
 - sig/herb/engine/compiler.rbs
 - sig/herb/engine/debug.rbs
@@ -93,8 +109,10 @@ files:
 - sig/herb/engine/validator.rbs
 - sig/herb/engine/validators/accessibility_validator.rbs
 - sig/herb/engine/validators/nesting_validator.rbs
+- sig/herb/engine/validators/render_validator.rbs
 - sig/herb/engine/validators/security_validator.rbs
 - sig/herb/errors.rbs
+- sig/herb/html/util.rbs
 - sig/herb/lex_result.rbs
 - sig/herb/location.rbs
 - sig/herb/parse_result.rbs
@@ -113,6 +131,8 @@ files:
 - sig/serialized.rbs
 - sig/serialized_ast_errors.rbs
 - sig/serialized_ast_nodes.rbs
+- sig/vendor/did_you_mean.rbs
+- sig/vendor/parallel.rbs
 - src/analyze/action_view/attribute_extraction_helpers.c
 - src/analyze/action_view/generated_handlers.c
 - src/analyze/action_view/generated_handlers.h
@@ -145,6 +165,15 @@ files:
 - src/ast/ast_nodes.c
 - src/ast/ast_pretty_print.c
 - src/ast/pretty_print.c
+- src/diff/herb_diff.c
+- src/diff/herb_diff_attributes.c
+- src/diff/herb_diff_children.c
+- src/diff/herb_diff_helpers.c
+- src/diff/herb_diff_nodes.c
+- src/diff/herb_hash.c
+- src/diff/herb_hash_index_map.c
+- src/diff/herb_hash_map.c
+- src/diff/herb_hash_tree.c
 - src/errors.c
 - src/extract.c
 - src/herb.c
@@ -170,6 +199,10 @@ files:
 - src/include/ast/ast_nodes.h
 - src/include/ast/ast_pretty_print.h
 - src/include/ast/pretty_print.h
+- src/include/diff/herb_diff.h
+- src/include/diff/herb_hash.h
+- src/include/diff/herb_hash_index_map.h
+- src/include/diff/herb_hash_map.h
 - src/include/errors.h
 - src/include/extract.h
 - src/include/herb.h
@@ -249,6 +282,7 @@ files:
 - templates/java/org/herb/ast/Nodes.java.erb
 - templates/java/org/herb/ast/Visitor.java.erb
 - templates/javascript/packages/core/src/action-view-helpers.ts.erb
+- templates/javascript/packages/core/src/config.ts.erb
 - templates/javascript/packages/core/src/errors.ts.erb
 - templates/javascript/packages/core/src/node-type-guards.ts.erb
 - templates/javascript/packages/core/src/nodes.ts.erb
@@ -263,6 +297,7 @@ files:
 - templates/lib/herb/visitor.rb.erb
 - templates/rust/src/action_view_helpers.rs.erb
 - templates/rust/src/ast/nodes.rs.erb
+- templates/rust/src/config.rs.erb
 - templates/rust/src/errors.rs.erb
 - templates/rust/src/nodes.rs.erb
 - templates/rust/src/union_types.rs.erb
@@ -276,6 +311,9 @@ files:
 - templates/src/analyze/transform.c.erb
 - templates/src/ast/ast_nodes.c.erb
 - templates/src/ast/ast_pretty_print.c.erb
+- templates/src/diff/herb_diff_helpers.c.erb
+- templates/src/diff/herb_diff_nodes.c.erb
+- templates/src/diff/herb_hash_tree.c.erb
 - templates/src/errors.c.erb
 - templates/src/include/analyze/action_view/helper_registry.h.erb
 - templates/src/include/ast/ast_nodes.h.erb
@@ -387,7 +425,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="