lipgloss 0.1.0-x86_64-darwin → 0.2.0-x86_64-darwin

data/go/build/darwin_amd64/liblipgloss.h

@@ -20,6 +20,7 @@ typedef struct { const char *p; ptrdiff_t n; } _GoString_;
 
 
 
+
 #line 3 "lipgloss.go"
 
 #include <stdlib.h>
@@ -87,11 +88,18 @@ typedef struct { void *data; GoInt len; GoInt cap; } GoSlice;
 extern "C" {
 #endif
 
+extern char* lipgloss_color_blend_luv(char* c1, char* c2, double t);
+extern char* lipgloss_color_blend_rgb(char* c1, char* c2, double t);
+extern char* lipgloss_color_blend_hcl(char* c1, char* c2, double t);
+extern char* lipgloss_color_blends(char* c1, char* c2, int steps, int blendMode);
+extern char* lipgloss_color_grid(char* x0y0, char* x1y0, char* x0y1, char* x1y1, int xSteps, int ySteps, int blendMode);
 extern char* lipgloss_join_horizontal(double position, char* stringsJSON);
 extern char* lipgloss_join_vertical(double position, char* stringsJSON);
 extern int lipgloss_width(char* text);
 extern int lipgloss_height(char* text);
 extern char* lipgloss_place(int width, int height, double horizontalPosition, double verticalPosition, char* text);
+extern char* lipgloss_place_with_whitespace(int width, int height, double horizontalPosition, double verticalPosition, char* text, char* whitespaceChars, char* whitespaceForeground);
+extern char* lipgloss_place_with_whitespace_adaptive(int width, int height, double horizontalPosition, double verticalPosition, char* text, char* whitespaceChars, char* whitespaceForegroundLight, char* whitespaceForegroundDark);
 extern char* lipgloss_place_horizontal(int width, double position, char* text);
 extern char* lipgloss_place_vertical(int height, double position, char* text);
 extern int lipgloss_has_dark_background();
@@ -138,11 +146,24 @@ extern long long unsigned int lipgloss_style_strikethrough_spaces(long long unsi
 extern long long unsigned int lipgloss_style_set_string(long long unsigned int id, char* text);
 extern long long unsigned int lipgloss_style_inherit(long long unsigned int id, long long unsigned int inheritFromID);
 extern char* lipgloss_style_string(long long unsigned int id);
+extern int lipgloss_style_get_bold(long long unsigned int id);
+extern int lipgloss_style_get_italic(long long unsigned int id);
+extern int lipgloss_style_get_underline(long long unsigned int id);
+extern int lipgloss_style_get_strikethrough(long long unsigned int id);
+extern int lipgloss_style_get_reverse(long long unsigned int id);
+extern int lipgloss_style_get_blink(long long unsigned int id);
+extern int lipgloss_style_get_faint(long long unsigned int id);
+extern char* lipgloss_style_get_foreground(long long unsigned int id);
+extern char* lipgloss_style_get_background(long long unsigned int id);
+extern int lipgloss_style_get_width(long long unsigned int id);
+extern int lipgloss_style_get_height(long long unsigned int id);
 extern long long unsigned int lipgloss_style_border(long long unsigned int id, int borderType, int* sides, int sidesCount);
 extern long long unsigned int lipgloss_style_border_style(long long unsigned int id, int borderType);
 extern long long unsigned int lipgloss_style_border_custom(long long unsigned int id, char* top, char* bottom, char* left, char* right, char* topLeft, char* topRight, char* bottomLeft, char* bottomRight, char* middleLeft, char* middleRight, char* middle, char* middleTop, char* middleBottom);
 extern long long unsigned int lipgloss_style_border_foreground(long long unsigned int id, char* color);
+extern long long unsigned int lipgloss_style_border_foreground_adaptive(long long unsigned int id, char* light, char* dark);
 extern long long unsigned int lipgloss_style_border_background(long long unsigned int id, char* color);
+extern long long unsigned int lipgloss_style_border_background_adaptive(long long unsigned int id, char* light, char* dark);
 extern long long unsigned int lipgloss_style_border_top(long long unsigned int id, int value);
 extern long long unsigned int lipgloss_style_border_right(long long unsigned int id, int value);
 extern long long unsigned int lipgloss_style_border_bottom(long long unsigned int id, int value);

data/go/color.go

@@ -0,0 +1,168 @@
+package main
+
+import "C"
+
+import (
+	"encoding/json"
+	"github.com/lucasb-eyer/go-colorful"
+)
+
+//export lipgloss_color_blend_luv
+func lipgloss_color_blend_luv(c1 *C.char, c2 *C.char, t C.double) *C.char {
+	color1, err := colorful.Hex(C.GoString(c1))
+	if err != nil {
+		return C.CString(C.GoString(c1))
+	}
+
+	color2, err := colorful.Hex(C.GoString(c2))
+	if err != nil {
+		return C.CString(C.GoString(c1))
+	}
+
+	blended := color1.BlendLuv(color2, float64(t))
+	return C.CString(blended.Hex())
+}
+
+//export lipgloss_color_blend_rgb
+func lipgloss_color_blend_rgb(c1 *C.char, c2 *C.char, t C.double) *C.char {
+	color1, err := colorful.Hex(C.GoString(c1))
+	if err != nil {
+		return C.CString(C.GoString(c1))
+	}
+
+	color2, err := colorful.Hex(C.GoString(c2))
+	if err != nil {
+		return C.CString(C.GoString(c1))
+	}
+
+	blended := color1.BlendRgb(color2, float64(t))
+	return C.CString(blended.Hex())
+}
+
+//export lipgloss_color_blend_hcl
+func lipgloss_color_blend_hcl(c1 *C.char, c2 *C.char, t C.double) *C.char {
+	color1, err := colorful.Hex(C.GoString(c1))
+	if err != nil {
+		return C.CString(C.GoString(c1))
+	}
+
+	color2, err := colorful.Hex(C.GoString(c2))
+	if err != nil {
+		return C.CString(C.GoString(c1))
+	}
+
+	blended := color1.BlendHcl(color2, float64(t))
+	return C.CString(blended.Hex())
+}
+
+//export lipgloss_color_blends
+func lipgloss_color_blends(c1 *C.char, c2 *C.char, steps C.int, blendMode C.int) *C.char {
+	color1, err := colorful.Hex(C.GoString(c1))
+	if err != nil {
+		return C.CString("[]")
+	}
+
+	color2, err := colorful.Hex(C.GoString(c2))
+	if err != nil {
+		return C.CString("[]")
+	}
+
+	n := int(steps)
+	colors := make([]string, n)
+
+	for i := 0; i < n; i++ {
+		t := float64(i) / float64(n-1)
+		if n == 1 {
+			t = 0
+		}
+
+		var blended colorful.Color
+		switch int(blendMode) {
+		case 0: // LUV
+			blended = color1.BlendLuv(color2, t)
+		case 1: // RGB
+			blended = color1.BlendRgb(color2, t)
+		case 2: // HCL
+			blended = color1.BlendHcl(color2, t)
+		default:
+			blended = color1.BlendLuv(color2, t)
+		}
+		colors[i] = blended.Hex()
+	}
+
+	result, _ := json.Marshal(colors)
+	return C.CString(string(result))
+}
+
+//export lipgloss_color_grid
+func lipgloss_color_grid(x0y0 *C.char, x1y0 *C.char, x0y1 *C.char, x1y1 *C.char, xSteps C.int, ySteps C.int, blendMode C.int) *C.char {
+	c00, err := colorful.Hex(C.GoString(x0y0))
+	if err != nil {
+		return C.CString("[]")
+	}
+
+	c10, err := colorful.Hex(C.GoString(x1y0))
+	if err != nil {
+		return C.CString("[]")
+	}
+
+	c01, err := colorful.Hex(C.GoString(x0y1))
+	if err != nil {
+		return C.CString("[]")
+	}
+
+	c11, err := colorful.Hex(C.GoString(x1y1))
+	if err != nil {
+		return C.CString("[]")
+	}
+
+	nx := int(xSteps)
+	ny := int(ySteps)
+	mode := int(blendMode)
+
+	blendFunc := func(a, b colorful.Color, t float64) colorful.Color {
+		switch mode {
+		case 0: // LUV
+			return a.BlendLuv(b, t)
+		case 1: // RGB
+			return a.BlendRgb(b, t)
+		case 2: // HCL
+			return a.BlendHcl(b, t)
+		default:
+			return a.BlendLuv(b, t)
+		}
+	}
+
+	x0 := make([]colorful.Color, ny)
+	x1 := make([]colorful.Color, ny)
+
+	for y := 0; y < ny; y++ {
+		t := float64(y) / float64(ny)
+
+		if ny == 1 {
+			t = 0
+		}
+
+		x0[y] = blendFunc(c00, c01, t)
+		x1[y] = blendFunc(c10, c11, t)
+	}
+
+	grid := make([][]string, ny)
+
+	for y := 0; y < ny; y++ {
+		grid[y] = make([]string, nx)
+
+		for x := 0; x < nx; x++ {
+			t := float64(x) / float64(nx)
+
+			if nx == 1 {
+				t = 0
+			}
+
+			grid[y][x] = blendFunc(x0[y], x1[y], t).Hex()
+		}
+	}
+
+	result, _ := json.Marshal(grid)
+	return C.CString(string(result))
+}

data/go/layout.go

@@ -49,6 +49,48 @@ func lipgloss_place(width C.int, height C.int, horizontalPosition C.double, vert
 	return C.CString(result)
 }
 
+//export lipgloss_place_with_whitespace
+func lipgloss_place_with_whitespace(width C.int, height C.int, horizontalPosition C.double, verticalPosition C.double, text *C.char, whitespaceChars *C.char, whitespaceForeground *C.char) *C.char {
+	opts := []lipgloss.WhitespaceOption{}
+
+	wsChars := C.GoString(whitespaceChars)
+	if wsChars != "" {
+		opts = append(opts, lipgloss.WithWhitespaceChars(wsChars))
+	}
+
+	wsFg := C.GoString(whitespaceForeground)
+	if wsFg != "" {
+		opts = append(opts, lipgloss.WithWhitespaceForeground(lipgloss.Color(wsFg)))
+	}
+
+	result := lipgloss.Place(int(width), int(height), lipgloss.Position(horizontalPosition), lipgloss.Position(verticalPosition), C.GoString(text), opts...)
+	return C.CString(result)
+}
+
+//export lipgloss_place_with_whitespace_adaptive
+func lipgloss_place_with_whitespace_adaptive(width C.int, height C.int, horizontalPosition C.double, verticalPosition C.double, text *C.char, whitespaceChars *C.char, whitespaceForegroundLight *C.char, whitespaceForegroundDark *C.char) *C.char {
+	opts := []lipgloss.WhitespaceOption{}
+
+	wsChars := C.GoString(whitespaceChars)
+	if wsChars != "" {
+		opts = append(opts, lipgloss.WithWhitespaceChars(wsChars))
+	}
+
+	wsFgLight := C.GoString(whitespaceForegroundLight)
+	wsFgDark := C.GoString(whitespaceForegroundDark)
+
+	if wsFgLight != "" || wsFgDark != "" {
+		opts = append(opts, lipgloss.WithWhitespaceForeground(lipgloss.AdaptiveColor{
+			Light: wsFgLight,
+			Dark:  wsFgDark,
+		}))
+	}
+
+	result := lipgloss.Place(int(width), int(height), lipgloss.Position(horizontalPosition), lipgloss.Position(verticalPosition), C.GoString(text), opts...)
+
+	return C.CString(result)
+}
+
 //export lipgloss_place_horizontal
 func lipgloss_place_horizontal(width C.int, position C.double, text *C.char) *C.char {
 	result := lipgloss.PlaceHorizontal(int(width), lipgloss.Position(position), C.GoString(text))

data/go/style.go

@@ -279,3 +279,110 @@ func lipgloss_style_string(id C.ulonglong) *C.char {
 	style := getStyle(uint64(id))
 	return C.CString(style.String())
 }
+
+// Getter methods
+
+//export lipgloss_style_get_bold
+func lipgloss_style_get_bold(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	if style.GetBold() {
+		return 1
+	}
+	return 0
+}
+
+//export lipgloss_style_get_italic
+func lipgloss_style_get_italic(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	if style.GetItalic() {
+		return 1
+	}
+	return 0
+}
+
+//export lipgloss_style_get_underline
+func lipgloss_style_get_underline(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	if style.GetUnderline() {
+		return 1
+	}
+	return 0
+}
+
+//export lipgloss_style_get_strikethrough
+func lipgloss_style_get_strikethrough(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	if style.GetStrikethrough() {
+		return 1
+	}
+	return 0
+}
+
+//export lipgloss_style_get_reverse
+func lipgloss_style_get_reverse(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	if style.GetReverse() {
+		return 1
+	}
+	return 0
+}
+
+//export lipgloss_style_get_blink
+func lipgloss_style_get_blink(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	if style.GetBlink() {
+		return 1
+	}
+	return 0
+}
+
+//export lipgloss_style_get_faint
+func lipgloss_style_get_faint(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	if style.GetFaint() {
+		return 1
+	}
+	return 0
+}
+
+// terminalColorToString converts a TerminalColor to its string representation
+func terminalColorToString(tc lipgloss.TerminalColor) string {
+	if tc == nil {
+		return ""
+	}
+	switch c := tc.(type) {
+	case lipgloss.Color:
+		return string(c)
+	case lipgloss.NoColor:
+		return ""
+	default:
+		// For adaptive/complete colors, we can't easily extract a single value
+		return ""
+	}
+}
+
+//export lipgloss_style_get_foreground
+func lipgloss_style_get_foreground(id C.ulonglong) *C.char {
+	style := getStyle(uint64(id))
+	color := terminalColorToString(style.GetForeground())
+	return C.CString(color)
+}
+
+//export lipgloss_style_get_background
+func lipgloss_style_get_background(id C.ulonglong) *C.char {
+	style := getStyle(uint64(id))
+	color := terminalColorToString(style.GetBackground())
+	return C.CString(color)
+}
+
+//export lipgloss_style_get_width
+func lipgloss_style_get_width(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	return C.int(style.GetWidth())
+}
+
+//export lipgloss_style_get_height
+func lipgloss_style_get_height(id C.ulonglong) C.int {
+	style := getStyle(uint64(id))
+	return C.int(style.GetHeight())
+}

data/go/style_border.go

@@ -114,12 +114,32 @@ func lipgloss_style_border_foreground(id C.ulonglong, color *C.char) C.ulonglong
 	return C.ulonglong(allocStyle(style))
 }
 
+//export lipgloss_style_border_foreground_adaptive
+func lipgloss_style_border_foreground_adaptive(id C.ulonglong, light *C.char, dark *C.char) C.ulonglong {
+	style := getStyle(uint64(id)).BorderForeground(lipgloss.AdaptiveColor{
+		Light: C.GoString(light),
+		Dark:  C.GoString(dark),
+	})
+
+	return C.ulonglong(allocStyle(style))
+}
+
 //export lipgloss_style_border_background
 func lipgloss_style_border_background(id C.ulonglong, color *C.char) C.ulonglong {
 	style := getStyle(uint64(id)).BorderBackground(lipgloss.Color(C.GoString(color)))
 	return C.ulonglong(allocStyle(style))
 }
 
+//export lipgloss_style_border_background_adaptive
+func lipgloss_style_border_background_adaptive(id C.ulonglong, light *C.char, dark *C.char) C.ulonglong {
+	style := getStyle(uint64(id)).BorderBackground(lipgloss.AdaptiveColor{
+		Light: C.GoString(light),
+		Dark:  C.GoString(dark),
+	})
+
+	return C.ulonglong(allocStyle(style))
+}
+
 //export lipgloss_style_border_top
 func lipgloss_style_border_top(id C.ulonglong, value C.int) C.ulonglong {
 	style := getStyle(uint64(id)).BorderTop(value != 0)

data/lib/lipgloss/color.rb

@@ -7,6 +7,42 @@ module Lipgloss
   #   type complete_color_hash = { true_color: String, ansi256: String, ansi: String }
   #   type complete_adaptive_color_hash = { light: complete_color_hash, dark: complete_color_hash }
 
+  module ANSIColor
+    # @rbs!
+    #   type ansi_color_symbol = :black | :red | :green | :yellow | :blue | :magenta | :cyan | :white | :bright_black | :bright_red | :bright_green | :bright_yellow | :bright_blue | :bright_magenta | :bright_cyan | :bright_white
+    #   type ansi_color_value = ansi_color_symbol | Symbol | String | Integer
+
+    COLORS = {
+      black: "0",
+      red: "1",
+      green: "2",
+      yellow: "3",
+      blue: "4",
+      magenta: "5",
+      cyan: "6",
+      white: "7",
+      bright_black: "8",
+      bright_red: "9",
+      bright_green: "10",
+      bright_yellow: "11",
+      bright_blue: "12",
+      bright_magenta: "13",
+      bright_cyan: "14",
+      bright_white: "15"
+    }.freeze #: Hash[Symbol, String]
+
+    # @rbs value: ansi_color_value
+    # @rbs return: String
+    def self.resolve(value)
+      case value
+      when Symbol then COLORS.fetch(value) { raise ArgumentError, "Unknown ANSI color: #{value.inspect}" }
+      when String then value
+      when Integer then value.to_s
+      else raise ArgumentError, "ANSI color must be a Symbol, String, or Integer, got #{value.class}"
+      end
+    end
+  end
+
   # Adaptive color that changes based on terminal background
   #
   # @example
@@ -38,8 +74,8 @@ module Lipgloss
   # @example
   #   color = Lipgloss::CompleteColor.new(
   #     true_color: "#0000FF",
-  #     ansi256: "21",
-  #     ansi: "4"
+  #     ansi256: 21,
+  #     ansi: :blue
   #   )
   class CompleteColor
     # @rbs @true_color: String
@@ -51,13 +87,13 @@ module Lipgloss
     attr_reader :ansi #: String
 
     # @rbs true_color: String -- 24-bit color (e.g., "#0000FF")
-    # @rbs ansi256: String -- 8-bit ANSI color (e.g., "21")
-    # @rbs ansi: String -- 4-bit ANSI color (e.g., "4")
+    # @rbs ansi256: ANSIColor::ansi_color_value -- 8-bit ANSI color (0-255, or symbol for 0-15)
+    # @rbs ansi: ANSIColor::ansi_color_value -- 4-bit ANSI color (:red, :blue, etc., or 0-15)
     # @rbs return: void
     def initialize(true_color:, ansi256:, ansi:)
       @true_color = true_color
-      @ansi256 = ansi256
-      @ansi = ansi
+      @ansi256 = ANSIColor.resolve(ansi256)
+      @ansi = ANSIColor.resolve(ansi)
     end
 
     # @rbs return: complete_color_hash
@@ -71,8 +107,8 @@ module Lipgloss
   #
   # @example
   #   color = Lipgloss::CompleteAdaptiveColor.new(
-  #     light: Lipgloss::CompleteColor.new(true_color: "#000", ansi256: "0", ansi: "0"),
-  #     dark: Lipgloss::CompleteColor.new(true_color: "#FFF", ansi256: "15", ansi: "15")
+  #     light: Lipgloss::CompleteColor.new(true_color: "#000", ansi256: :black, ansi: :black),
+  #     dark: Lipgloss::CompleteColor.new(true_color: "#FFF", ansi256: :bright_white, ansi: :bright_white)
   #   )
   class CompleteAdaptiveColor
     # @rbs @light: CompleteColor

data/lib/lipgloss/position.rb

@@ -23,5 +23,28 @@ module Lipgloss
 
     # Center alignment (0.5)
     CENTER = 0.5
+
+    # @rbs!
+    #   type position_symbol = :top | :bottom | :left | :right | :center
+    #   type position_value = position_symbol | Symbol | String | Integer | Float
+
+    SYMBOLS = {
+      top: TOP,
+      bottom: BOTTOM,
+      left: LEFT,
+      right: RIGHT,
+      center: CENTER
+    }.freeze #: Hash[Symbol, Float]
+
+    # @rbs value: position_value
+    # @rbs return: Float
+    def self.resolve(value)
+      case value
+      when Symbol then SYMBOLS.fetch(value) { raise ArgumentError, "Unknown position: #{value.inspect}" }
+      when String then SYMBOLS.fetch(value.to_sym) { raise ArgumentError, "Unknown position: #{value.inspect}" }
+      when Numeric then value.to_f
+      else raise ArgumentError, "Position must be a Symbol or Numeric, got #{value.class}"
+      end
+    end
   end
 end

data/lib/lipgloss/style.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+# rbs_inline: enabled
+
+module Lipgloss
+  class Style
+    # @rbs *positions: Position::position_value
+    # @rbs return: Style
+    def align(*positions)
+      _align(*positions.map { |p| Position.resolve(p) })
+    end
+
+    # @rbs position: Position::position_value
+    # @rbs return: Style
+    def align_horizontal(position)
+      _align_horizontal(Position.resolve(position))
+    end
+
+    # @rbs position: Position::position_value
+    # @rbs return: Style
+    def align_vertical(position)
+      _align_vertical(Position.resolve(position))
+    end
+  end
+end

data/lib/lipgloss/version.rb

@@ -2,5 +2,5 @@
 # rbs_inline: enabled
 
 module Lipgloss
-  VERSION = "0.1.0" #: String
+  VERSION = "0.2.0" #: String
 end

data/lib/lipgloss.rb

@@ -2,10 +2,18 @@
 # rbs_inline: enabled
 
 require_relative "lipgloss/version"
-require_relative "lipgloss/lipgloss"
+
+begin
+  major, minor, _patch = RUBY_VERSION.split(".") #: [String, String, String]
+  require_relative "lipgloss/#{major}.#{minor}/lipgloss"
+rescue LoadError
+  require_relative "lipgloss/lipgloss"
+end
+
 require_relative "lipgloss/position"
 require_relative "lipgloss/border"
 require_relative "lipgloss/color"
+require_relative "lipgloss/style"
 require_relative "lipgloss/table"
 
 module Lipgloss
@@ -24,4 +32,46 @@ module Lipgloss
   ASCII_BORDER = Border::ASCII #: Symbol
 
   NO_TAB_CONVERSION = -1 #: Integer
+
+  class << self
+    # @rbs position: Position::position_value
+    # @rbs *strings: String
+    # @rbs return: String
+    def join_horizontal(position, *strings)
+      _join_horizontal(Position.resolve(position), strings)
+    end
+
+    # @rbs position: Position::position_value
+    # @rbs *strings: String
+    # @rbs return: String
+    def join_vertical(position, *strings)
+      _join_vertical(Position.resolve(position), strings)
+    end
+
+    # @rbs width: Integer
+    # @rbs height: Integer
+    # @rbs horizontal: Position::position_value
+    # @rbs vertical: Position::position_value
+    # @rbs string: String
+    # @rbs return: String
+    def place(width, height, horizontal, vertical, string, **opts)
+      _place(width, height, Position.resolve(horizontal), Position.resolve(vertical), string, **opts)
+    end
+
+    # @rbs width: Integer
+    # @rbs position: Position::position_value
+    # @rbs string: String
+    # @rbs return: String
+    def place_horizontal(width, position, string)
+      _place_horizontal(width, Position.resolve(position), string)
+    end
+
+    # @rbs height: Integer
+    # @rbs position: Position::position_value
+    # @rbs string: String
+    # @rbs return: String
+    def place_vertical(height, position, string)
+      _place_vertical(height, Position.resolve(position), string)
+    end
+  end
 end

data/lipgloss.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors = ["Marco Roth"]
   spec.email = ["marco.roth@intergga.ch"]
 
-  spec.summary = "Ruby wrapper for Charm's lipgloss CSS-like terminal styling library."
-  spec.description = spec.summary
+  spec.summary = "Ruby wrapper for Charm's lipgloss. CSS-like terminal styling library."
+  spec.description = "Style Definitions for Nice Terminal Layouts. Built with TUIs in mind."
   spec.homepage = "https://github.com/marcoroth/lipgloss-ruby"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 3.2.0"