herb 0.9.7-x86-linux-gnu → 0.10.0-x86-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ee0a769d8e9f25d87b0450714da3d30212bb996aab7eca7ca92bf6ac58dca94
-  data.tar.gz: 2a50e7679a606dddc69a13bd3b71ac3c83ab72ff9d353a0f43c4337e3054fe52
+  metadata.gz: c1a995c36f01e7382d4280f7e7f76eb796f2d155eac5c7712ab060e26005c4a0
+  data.tar.gz: 59e99da8f1b4430075cf24816fa756ecc5ae394c52e771f78eae8ea9da17ece3
 SHA512:
-  metadata.gz: 3001a454f396103b51834b088f515a8cffec87689ff25520538ea1a827674a0e282b115fd3f925a05fc7b094df6bafd5e63d0a416bf033cb7b78dafb053327d0
-  data.tar.gz: af9af4d88b9e5eab4947f0a1dd84ccf012f5f0c952dab12ad4aef2bc0bc93261cc626b0bb8306375c120553f2a326c45f3f9e191a4ce3c4b1c437e3bd2c25512
+  metadata.gz: 28e958aeb7400c82ca07140a7bf505e5bb5d612724dfba73b1ac02c6d847587041379661544b164c2ba2a461e108d885f0e5964fa483212c04f517b92080e139
+  data.tar.gz: 45f6e97a8716f7d025b94d0ddda713ce303341deaec75f65237ade8728837db152c000d8e376fdf77542130123101e33c72000e9debf872ca02b12c87a725c35

data/README.md

@@ -59,6 +59,7 @@ The Herb ecosystem offers multiple tools that integrate seamlessly into editors,
 | [Herb Language Service](https://herb-tools.dev/projects/language-service) | HTML+ERB language service with ActionView tag helper support. |
 | [Herb Language Server](https://herb-tools.dev/projects/language-server) | Rich editor integration for VS Code, Zed, Neovim, and more. |
 | [Herb Engine](https://herb-tools.dev/projects/engine) | HTML-aware ERB rendering engine, API-compatible with Erubi. |
+| [Herb Dev Server](https://herb-tools.dev/projects/dev-server) | File-watching dev server with live DOM patching for templates. *(experimental)* |
 | [Herb Dev Tools](https://herb-tools.dev/projects/dev-tools) | In-browser dev tools for inspecting and debugging templates, shipped with ReActionView. |
 | [ReActionView](https://reactionview.dev) | ActionView-compatible ERB engine with modern DX for Rails. |
 

data/ext/herb/extconf.rb

@@ -47,6 +47,7 @@ $VPATH << "$(srcdir)/../../src"
 $VPATH << "$(srcdir)/../../src/analyze"
 $VPATH << "$(srcdir)/../../src/analyze/action_view"
 $VPATH << "$(srcdir)/../../src/ast"
+$VPATH << "$(srcdir)/../../src/diff"
 $VPATH << "$(srcdir)/../../src/lexer"
 $VPATH << "$(srcdir)/../../src/location"
 $VPATH << "$(srcdir)/../../src/parser"

data/ext/herb/extension.c

@@ -412,6 +412,113 @@ static VALUE Herb_version(VALUE self) {
 #endif
 }
 
+typedef struct {
+  AST_DOCUMENT_NODE_T* old_root;
+  AST_DOCUMENT_NODE_T* new_root;
+  herb_diff_result_T* diff_result;
+  hb_allocator_T old_allocator;
+  hb_allocator_T new_allocator;
+  hb_allocator_T diff_allocator;
+} diff_args_T;
+
+static VALUE rb_create_diff_operation(const herb_diff_operation_T* operation) {
+  VALUE cDiffOperation = rb_const_get(mHerb, rb_intern("DiffOperation"));
+
+  VALUE type = ID2SYM(rb_intern(herb_diff_operation_type_to_string(operation->type)));
+
+  VALUE path_array = rb_ary_new_capa(operation->path.depth);
+  for (uint16_t index = 0; index < operation->path.depth; index++) {
+    rb_ary_push(path_array, UINT2NUM(operation->path.indices[index]));
+  }
+
+  VALUE old_node = operation->old_node != NULL ? rb_node_from_c_struct((AST_NODE_T*) operation->old_node) : Qnil;
+  VALUE new_node = operation->new_node != NULL ? rb_node_from_c_struct((AST_NODE_T*) operation->new_node) : Qnil;
+
+  return rb_funcall(
+    cDiffOperation,
+    rb_intern("new"),
+    6,
+    type,
+    path_array,
+    old_node,
+    new_node,
+    UINT2NUM(operation->old_index),
+    UINT2NUM(operation->new_index)
+  );
+}
+
+static VALUE diff_convert_body(VALUE arg) {
+  diff_args_T* args = (diff_args_T*) arg;
+  herb_diff_result_T* diff_result = args->diff_result;
+
+  VALUE cDiffResult = rb_const_get(mHerb, rb_intern("DiffResult"));
+
+  size_t operation_count = herb_diff_operation_count(diff_result);
+  VALUE operations_array = rb_ary_new_capa((long) operation_count);
+
+  for (size_t index = 0; index < operation_count; index++) {
+    const herb_diff_operation_T* operation = herb_diff_operation_at(diff_result, index);
+    rb_ary_push(operations_array, rb_create_diff_operation(operation));
+  }
+
+  VALUE result_args[] = { diff_result->trees_identical ? Qtrue : Qfalse, operations_array };
+
+  return rb_class_new_instance(2, result_args, cDiffResult);
+}
+
+static VALUE diff_cleanup(VALUE arg) {
+  diff_args_T* args = (diff_args_T*) arg;
+
+  if (args->old_root != NULL) { ast_node_free((AST_NODE_T*) args->old_root, &args->old_allocator); }
+  if (args->new_root != NULL) { ast_node_free((AST_NODE_T*) args->new_root, &args->new_allocator); }
+
+  hb_allocator_destroy(&args->diff_allocator);
+  hb_allocator_destroy(&args->old_allocator);
+  hb_allocator_destroy(&args->new_allocator);
+
+  return Qnil;
+}
+
+static VALUE Herb_diff(int argc, VALUE* argv, VALUE self) {
+  VALUE old_source, new_source;
+  rb_scan_args(argc, argv, "2", &old_source, &new_source);
+
+  char* old_string = (char*) check_string(old_source);
+  char* new_string = (char*) check_string(new_source);
+
+  diff_args_T args = { 0 };
+
+  parser_options_T parser_options = HERB_DEFAULT_PARSER_OPTIONS;
+
+  if (!hb_allocator_init(&args.old_allocator, HB_ALLOCATOR_ARENA)) { return Qnil; }
+
+  if (!hb_allocator_init(&args.new_allocator, HB_ALLOCATOR_ARENA)) {
+    hb_allocator_destroy(&args.old_allocator);
+
+    return Qnil;
+  }
+
+  if (!hb_allocator_init(&args.diff_allocator, HB_ALLOCATOR_ARENA)) {
+    hb_allocator_destroy(&args.old_allocator);
+    hb_allocator_destroy(&args.new_allocator);
+
+    return Qnil;
+  }
+
+  args.old_root = herb_parse(old_string, &parser_options, &args.old_allocator);
+  args.new_root = herb_parse(new_string, &parser_options, &args.new_allocator);
+
+  if (args.old_root == NULL || args.new_root == NULL) {
+    diff_cleanup((VALUE) &args);
+
+    return Qnil;
+  }
+
+  args.diff_result = herb_diff(args.old_root, args.new_root, &args.diff_allocator);
+
+  return rb_ensure(diff_convert_body, (VALUE) &args, diff_cleanup, (VALUE) &args);
+}
+
 __attribute__((__visibility__("default"))) void Init_herb(void) {
   mHerb = rb_define_module("Herb");
   cPosition = rb_define_class_under(mHerb, "Position", rb_cObject);
@@ -433,4 +540,5 @@ __attribute__((__visibility__("default"))) void Init_herb(void) {
   rb_define_singleton_method(mHerb, "arena_stats", Herb_arena_stats, -1);
   rb_define_singleton_method(mHerb, "leak_check", Herb_leak_check, 1);
   rb_define_singleton_method(mHerb, "version", Herb_version, 0);
+  rb_define_singleton_method(mHerb, "diff", Herb_diff, -1);
 }

data/herb.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://herb-tools.dev"
   spec.license = "MIT"
 
-  spec.required_ruby_version = ">= 3.0.0"
+  spec.required_ruby_version = ">= 3.2.0"
   spec.require_paths = ["lib"]
 
   spec.files = Dir[