wabi 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c62f8e76667820ba8b7e4c68692e5de2ce77d7369dcabb2abbb3d226a1880e
-  data.tar.gz: ac059f870c7c665c0e0dcca5e1540c6a554a4fb9f23e17cb98eaf723250aea65
+  metadata.gz: 4427b2a777bf298e102d813c0a5ccb2b7919e2a76ed7bd3d20e56127671e5041
+  data.tar.gz: ddd81feca27e709970b46be2704a58939d10a8a92405d27438cbf546bf30b878
 SHA512:
-  metadata.gz: 79428d950c54fed32896a55b83e9e4a5281c4df8a31be5f370d57e0a111ecbe130ac4f7dd657e6baf27e0de3aad893fc89fa8eaf6b61c60357f4c38c940b47eb
-  data.tar.gz: 75cc44242f00676ff1d06bbc87cf39f426fb1594079046fbc25b0cf47acd355e3a3a9a5e2caf44778f235e0a5158bcb5aa3be100087f296db8dac07fe2c55832
+  metadata.gz: e462360e2f326b745027ff02f126ca10a30c3456dfb5aec439b4f41e64548a39698c48274c145eb19ec3089cd654fb5139c426af7a0ec5f98d92e7dd2ff2ebfe
+  data.tar.gz: b2213c0ee4685e679df481349065e42a14c1112d9ea5be3866d7e2238e33c17cc35e310a7d76d44b0b7b49011b8a490316ded97ac4c8f921530e6d0a7de1f462

data/CHANGELOG.md

@@ -2,6 +2,52 @@
 
 All notable changes to Wabi land here. Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); versions follow [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.9.0 - 2026-05-31
+
+DX + polish, plus a full fix of the vertical Slider.
+
+### Breaking
+
+- **Slider `marks:` moved from `Slider` to `SliderControl`.** Marks now render
+  inside the control (the track's positioning context) so they align with the
+  track in both orientations. Update `Slider.new(marks: […])` →
+  `SliderControl.new(marks: […])` (and pass `orientation:` to `SliderControl`
+  for vertical). Marks were introduced in v0.8.
+
+### Features
+
+- **`wabi:update` three-way merge.** Locally-edited component files are now
+  3-way merged (base + local + new) via `git merge-file` instead of the
+  all-or-nothing prompt: non-conflicting registry changes auto-apply while your
+  edits are preserved; true conflicts are written with `<<<<<<<` markers. Falls
+  back to the y/n/d/q prompt when git is unavailable or the lockfile predates
+  this release. The lockfile now records `{ hash, content }` per file
+  (back-compat: legacy string-hash entries still load and use the fallback). A
+  data-safety guard never writes a file when `git merge-file` errors.
+- **Combobox async error state.** New optional `ComboboxError` slot (hidden,
+  `aria-live`) — shown on async fetch failure (prior results kept), hidden on
+  the next successful fetch.
+
+### Fixes
+
+- **Vertical Slider now works end-to-end.** The v0.8 slider was effectively
+  horizontal-only; the vertical orientation didn't render usably. Fixed across
+  the board, each gated by orientation so horizontal is unchanged:
+  - `SliderControl` fills the column height in vertical (was collapsing to 0,
+    leaving the track 0px tall).
+  - Thumb centers on the cross-axis correctly per orientation (horizontal:
+    vertical-center; vertical: horizontal-center on the rail).
+  - `SliderRange` fill is `w-full` in vertical (was zero-width / invisible) with
+    Zag driving the height from the value.
+  - Marks render inside `SliderControl`, aligned with the track (below it for
+    horizontal, beside it spanning its height for vertical), with the tick +
+    label offset oriented accordingly.
+
+### Deferred to v0.10
+
+- Toast `@zag-js/toast` group machine (high-risk; failed twice).
+- Phlex 2.4 Ruby 4 warnings (upstream).
+
 ## 0.8.0 - 2026-05-31
 
 Focused high-value mix: one marquee feature, one self-contained feature, an

data/lib/wabi/generators/add_generator.rb

@@ -42,7 +42,10 @@ module Wabi
           target = File.join(destination_root, file["path"])
           FileUtils.mkdir_p(File.dirname(target))
           File.write(target, file["content"])
-          files_map[file["path"]] = Digest::SHA256.hexdigest(file["content"])
+          files_map[file["path"]] = {
+            "hash"    => Digest::SHA256.hexdigest(file["content"]),
+            "content" => file["content"],
+          }
           say "  create    #{file["path"]}", :green
         end
 

data/lib/wabi/generators/update_generator.rb

@@ -3,6 +3,8 @@
 require "rails/generators"
 require "digest"
 require "json"
+require "open3"
+require "tempfile"
 require "wabi/registry_client"
 require "wabi/lockfile"
 
@@ -72,7 +74,7 @@ module Wabi
           new_hash = Digest::SHA256.hexdigest(file["content"])
           target   = File.join(destination_root, path)
 
-          files_map[path] = new_hash
+          files_map[path] = { "hash" => new_hash, "content" => file["content"] }
 
           if !File.exist?(target)
             write_file(target, file["content"], reason: "create")
@@ -80,7 +82,7 @@ module Wabi
           end
 
           on_disk_hash   = Digest::SHA256.hexdigest(File.read(target))
-          installed_hash = installed_map[path]
+          installed_hash = Wabi::Lockfile.file_entry(installed_map[path])[:hash]
 
           if installed_hash.nil?
             handle_conflict(path, target, file["content"], reason: "legacy lockfile has no per-file hash")
@@ -90,7 +92,12 @@ module Wabi
           if on_disk_hash == installed_hash
             write_file(target, file["content"], reason: "update")
           else
-            handle_conflict(path, target, file["content"], reason: "edited locally")
+            base_content = Wabi::Lockfile.file_entry(installed_map[path])[:content]
+            if base_content && git_available? && !options[:force]
+              merge_file(path, target, base_content, file["content"])
+            else
+              handle_conflict(path, target, file["content"], reason: "edited locally")
+            end
           end
         end
 
@@ -150,6 +157,63 @@ module Wabi
         ask("    (y)es / (n)o / (d)iff / (q)uit?", limited_to: %w[y n d q])
       end
 
+      def merge_file(path, target, base_content, new_content)
+        if options[:dry_run]
+          say "  would 3-way merge #{path}", :cyan
+          return
+        end
+
+        begin
+          merged, conflicts, err = three_way_merge(target, base_content, new_content)
+        rescue Errno::ENOENT, StandardError => e
+          # git vanished mid-run, or any other spawn/IO failure.
+          merged, conflicts, err = nil, 255, e.message
+        end
+
+        # git merge-file returns 255 (an error, NOT a conflict count) on
+        # failure. Treat that — or empty output when we expected content — as a
+        # failure and DO NOT write: blanking the user's edited file would be
+        # irreversible data loss. Leave the file untouched; the user can re-run.
+        if conflicts == 255 || conflicts.negative? || (merged.to_s.empty? && !new_content.empty?)
+          detail = err.to_s.strip.empty? ? "" : ": #{err.to_s.strip.lines.first&.chomp}"
+          say "  error       #{path} (git merge-file failed, file unchanged#{detail})", :red
+          return
+        end
+
+        File.write(target, merged)
+        if conflicts.zero?
+          say "  merged      #{path}", :green
+        else
+          # git caps the exit code at 127, so report 127+ rather than lying.
+          count = conflicts >= 127 ? "127+ conflicts" : "#{conflicts} conflict#{'s' if conflicts != 1}"
+          say "  merged      #{path} (#{count} — resolve the <<<<<<< markers)", :yellow
+        end
+      end
+
+      def git_available?
+        return @git_available unless @git_available.nil?
+        @git_available = system("git", "--version", out: File::NULL, err: File::NULL) || false
+      end
+
+      # 3-way merge via `git merge-file`. Arg order is current/base/other =
+      # local/base/new (DO NOT reorder). Returns [merged_string, status, stderr]:
+      # status 0 = clean, 1..127 = number of conflicts (git caps at 127),
+      # 255 = error. stderr carries git's diagnostic on error.
+      def three_way_merge(local_path, base_content, new_content)
+        Tempfile.create("wabi-base") do |base_f|
+          Tempfile.create("wabi-new") do |new_f|
+            base_f.write(base_content); base_f.flush
+            new_f.write(new_content);   new_f.flush
+            merged, err, status = Open3.capture3(
+              "git", "merge-file", "-p",
+              "-L", "local (your edits)", "-L", "base (original)", "-L", "new (registry)",
+              local_path, base_f.path, new_f.path
+            )
+            [merged, status.exitstatus, err]
+          end
+        end
+      end
+
       def print_diff(target, new_content)
         on_disk = File.exist?(target) ? File.read(target) : ""
         on_disk_lines = on_disk.split("\n", -1)

data/lib/wabi/lockfile.rb

@@ -27,6 +27,17 @@ module Wabi
       @components = data["components"] || {}
     end
 
+    # Normalizes a per-file lockfile entry to { hash:, content: }, tolerating
+    # both the v0.9 object shape ({ "hash" =>, "content" => }) and the legacy
+    # string-hash shape (content: nil → caller falls back to the prompt).
+    def self.file_entry(raw)
+      case raw
+      when String then { hash: raw, content: nil }
+      when Hash   then { hash: raw["hash"], content: raw["content"] }
+      else             { hash: nil, content: nil }
+      end
+    end
+
     def record(name, version:, hash:, files: nil, js_dependencies: nil)
       entry = { "version" => version, "hash" => hash }
       entry["files"]           = files           if files

data/lib/wabi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wabi
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wabi
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Oscar Ortega