wabi 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1975dde8069f308dad1c022923250b6ede092df708ba5cf5fdee333554dccbbe
-  data.tar.gz: 8e90d286204bb1ab579116ea8ab3ea2eec74262d55d20b758846b70bda85b755
+  metadata.gz: 4427b2a777bf298e102d813c0a5ccb2b7919e2a76ed7bd3d20e56127671e5041
+  data.tar.gz: ddd81feca27e709970b46be2704a58939d10a8a92405d27438cbf546bf30b878
 SHA512:
-  metadata.gz: fa61e143320502d057ee2f9bd4e4b6618726035c491917c9af0b0767b4464068f9c94376211853eba983cb0e131e2ddc82a361711fae495bba31fc1d53e0a206
-  data.tar.gz: dc50cb00e2cabfa8c992fbd3410f6947a76208c3b955c651771cc95f81f180ca151ab061afecfa32d743e79d5abc87b7cea5906f6b511f3b6082421a638cdf3f
+  metadata.gz: e462360e2f326b745027ff02f126ca10a30c3456dfb5aec439b4f41e64548a39698c48274c145eb19ec3089cd654fb5139c426af7a0ec5f98d92e7dd2ff2ebfe
+  data.tar.gz: b2213c0ee4685e679df481349065e42a14c1112d9ea5be3866d7e2238e33c17cc35e310a7d76d44b0b7b49011b8a490316ded97ac4c8f921530e6d0a7de1f462

data/CHANGELOG.md

@@ -2,6 +2,123 @@
 
 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
+accessibility win, and an overlay-controller hardening refactor. No breaking
+changes.
+
+### Features
+
+- **Combobox async items.** With `url:` set, the combobox debounces input and
+  fetches a server-rendered `ComboboxItem` fragment (AbortController-guarded so
+  stale in-flight responses are dropped), swaps it into the content, and
+  rebuilds the Zag collection from the new DOM via `machine.updateProps`. New
+  optional `ComboboxLoading` slot (shown during the fetch); empty state is
+  server-rendered; fetch errors keep the prior results + `console.warn`.
+  `param` (default `q`), `debounce` (default 250ms), and `min_length`
+  (default 1) are configurable. Sync mode is unchanged.
+- **Slider marks/ticks.** `Slider(marks: [{value:, label:}])` (or bare
+  Integers) renders tick markers (short vertical lines) positioned via Zag
+  `getMarkerProps`, with optional labels. Works single + range.
+
+### Fixes
+
+- **Slider is now fully functional + visible.** Several latent issues from the
+  v0.6 slider are fixed together:
+  - **Thumb + marks render.** `thumbAlignment: "center"` on the machine — the
+    previous `"contain"` default gated thumb/marker visibility on a thumb-size
+    measurement that never completed in the vanilla Stimulus setup (the machine
+    starts before `render()` decorates the DOM with Zag's part ids), leaving
+    the thumb knob and any marks `visibility: hidden`.
+  - **Pointer interaction.** New `SliderControl` element carries Zag's
+    `getControlProps` (`onPointerDown`), so click/drag on the track now sets the
+    value live. Previously the slider was keyboard-only. `SliderControl` also
+    provides the positioning context that vertically centers the thumb on the
+    track (the root is a flex column with the label/marks, so an absolutely
+    positioned thumb anchored to it floated above the bar).
+  - **Hidden-input dedup.** `syncHiddenInputs` cleanup selector
+    (`data-wabi--slider-hidden`) never matched the inputs `appendHidden` created
+    via `dataset` (which emitted single-dash `data-wabi-slider-hidden`), so a
+    new hidden input leaked on every render and the form value went stale.
+    `appendHidden` now uses `setAttribute` with the matching double-dash name.
+  - **Thumb styling.** Smaller (12px) thumb with a thinner border + subtle
+    shadow; `bg-foreground` fill (adapts to theme: dark knob in light mode,
+    light knob in dark mode).
+  - **Composition note:** the track + thumb(s) now nest inside `SliderControl`
+    (`Slider > SliderLabel + SliderControl(SliderTrack(SliderRange) + SliderThumb…)`).
+
+### Accessibility
+
+- **`motion-reduce:transition-none`** on Toast and the animated overlays
+  (Dialog, Drawer, Popover, Tooltip, DropdownMenu, Select, Combobox content +
+  Dialog/Drawer backdrops) — `prefers-reduced-motion` users get instantaneous
+  enter/exit instead of slide/fade.
+
+### Refactor / internal
+
+- **`_shared/overlay_portal.js`** — Dialog, Popover, Tooltip, Select, and
+  DropdownMenu now share `capturePortalRefs` / `attachToBody` / `restoreFromBody`
+  (composition, not inheritance) instead of duplicating that boilerplate per
+  controller. Behavior-preserving (each overlay browser re-smoked).
+- DropdownMenu's closest-ancestor-sub lookup is deduped into `_parentMachineFor`
+  (was inline in both `connect()` and `render()`).
+- Overlay `disconnect()` now restores from `<body>` before unregistering from
+  `WabiPortalRegistry`, so the registry recomputes its sibling cache on the
+  post-move DOM. `data-wabi-sub-index` is cleaned up on DropdownMenu disconnect.
+
+### Deferred to v0.9
+
+- Toast `@zag-js/toast` group machine; `wabi:update` three-way merge; richer
+  Combobox async error UX; vertical-orientation Slider mark label offset; Phlex
+  2.4 Ruby 4 warnings (upstream).
+
 ## 0.7.0 - 2026-05-30
 
 Quality + finish: 10 items closing v0.6 deferrals and v0.5 long-tail. No new

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.7.0"
+  VERSION = "0.9.0"
 end

metadata

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