ratatui_ruby 0.3.1 → 0.4.0

data/lib/ratatui_ruby/schema/scrollbar.rb

@@ -4,30 +4,138 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 module RatatuiRuby
-  ##
-  # Visual scroll indicator.
-  #
-  # A Scrollbar widget that can be oriented vertically or horizontally.
-  # It displays a track and a thumb to indicate the current scroll position
-  # relative to the total content length.
-  #
-  # == Fields
-  #
-  # [+content_length+] Total length of the content (Integer).
-  # [+position+] Current scroll position (Integer).
-  # [+orientation+] +:vertical+ or +:horizontal+ (Symbol, default: +:vertical+).
-  # [+thumb_symbol+] The character used for the scrollbar thumb (String, default: "█").
-  # [+block+] An optional Block to wrap the scrollbar.
-  class Scrollbar < Data.define(:content_length, :position, :orientation, :thumb_symbol, :block)
-    # Creates a new Scrollbar.
+    # Visualizes the scroll state of a viewport.
     #
-    # [+content_length+] Total length of the content (Integer).
-    # [+position+] Current scroll position (Integer).
-    # [+orientation+] +:vertical+ or +:horizontal+ (Symbol, default: +:vertical+).
-    # [+thumb_symbol+] The character used for the scrollbar thumb (String, default: "█").
-    # [+block+] An optional Block to wrap the scrollbar.
-    def initialize(content_length:, position:, orientation: :vertical, thumb_symbol: "█", block: nil)
-      super
+    # Content overflows. Users get lost in long lists without landmarks. They need to know where they are and how much is left.
+    #
+    # This widget maps your context. It draws a track and a thumb, representing your current position relative to the total length.
+    #
+    # Overlay it on top of lists, paragraphs, or tables to provide spatial awareness.
+    #
+    # === Examples
+    #
+    #   Scrollbar.new(
+    #     content_length: 100,
+    #     position: 25,
+    #     orientation: :vertical
+    #   )
+    class Scrollbar < Data.define(
+      :content_length,
+      :position,
+      :orientation,
+      :thumb_symbol,
+      :thumb_style,
+      :track_symbol,
+      :track_style,
+      :begin_symbol,
+      :begin_style,
+      :end_symbol,
+      :end_style,
+      :style,
+      :block
+    )
+      ##
+      # :attr_reader: content_length
+      # Total items or lines in the content.
+
+      ##
+      # :attr_reader: position
+      # Current scroll offset (index).
+      #
+      # Maps to Ratatui's <tt>ScrollbarState::get_position()</tt> (new in 0.30.0).
+
+      ##
+      # :attr_reader: orientation
+      # Direction of the scrollbar.
+      #
+      # <tt>:vertical</tt> (default, alias for <tt>:vertical_right</tt>), <tt>:horizontal</tt> (alias for <tt>:horizontal_bottom</tt>),
+      # <tt>:vertical_left</tt>, <tt>:vertical_right</tt>, <tt>:horizontal_top</tt>, or <tt>:horizontal_bottom</tt>.
+
+      ##
+      # :attr_reader: thumb_symbol
+      # Symbol used to represent the current position indicator.
+
+      ##
+      # :attr_reader: thumb_style
+      # Style of the position indicator (thumb).
+
+      ##
+      # :attr_reader: track_symbol
+      # Symbol used to represent the empty space of the scrollbar.
+
+      ##
+      # :attr_reader: track_style
+      # Style of the filled track area.
+
+      ##
+      # :attr_reader: begin_symbol
+      # Symbol rendered at the start of the track (e.g., arrow).
+
+      ##
+      # :attr_reader: begin_style
+      # Style of the start symbol.
+
+      ##
+      # :attr_reader: end_symbol
+      # Symbol rendered at the end of the track (e.g., arrow).
+
+      ##
+      # :attr_reader: end_style
+      # Style of the end symbol.
+
+      ##
+      # :attr_reader: style
+      # Base style applied to the entire widget.
+
+      ##
+      # :attr_reader: block
+      # Optional wrapping block.
+
+      # Creates a new Scrollbar.
+      #
+      # [content_length] Integer.
+      # [position] Integer.
+      # [orientation] Symbol (default: <tt>:vertical</tt>).
+      # [thumb_symbol] String (default: <tt>"█"</tt>).
+      # [thumb_style] Style (optional).
+      # [track_symbol] String (optional).
+      # [track_style] Style (optional).
+      # [begin_symbol] String (optional).
+      # [begin_style] Style (optional).
+      # [end_symbol] String (optional).
+      # [end_style] Style (optional).
+      # [style] Style (optional).
+      # [block] Block (optional).
+      def initialize(
+        content_length:,
+        position:,
+        orientation: :vertical,
+        thumb_symbol: "█",
+        thumb_style: nil,
+        track_symbol: nil,
+        track_style: nil,
+        begin_symbol: nil,
+        begin_style: nil,
+        end_symbol: nil,
+        end_style: nil,
+        style: nil,
+        block: nil
+      )
+        super(
+          content_length: Integer(content_length),
+          position: Integer(position),
+          orientation: orientation,
+          thumb_symbol: thumb_symbol,
+          thumb_style: thumb_style,
+          track_symbol: track_symbol,
+          track_style: track_style,
+          begin_symbol: begin_symbol,
+          begin_style: begin_style,
+          end_symbol: end_symbol,
+          end_style: end_style,
+          style: style,
+          block: block
+        )
+      end
     end
-  end
 end

data/lib/ratatui_ruby/schema/shape/label.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: 2025 Kerrick Long <me@kerricklong.com>
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+module RatatuiRuby
+  module Shape
+    # A text label on a canvas.
+    #
+    # Labels render text at specific coordinates in canvas space.
+    # Unlike shapes, labels are always rendered on top of all other canvas elements.
+    #
+    # [x] The x-coordinate in canvas space (Numeric).
+    # [y] The y-coordinate in canvas space (Numeric).
+    # [text] The text content (String or Text::Line).
+    # [style] Optional style for the text.
+    #
+    # === Examples
+    #
+    #   # Simple label
+    #   Shape::Label.new(x: 0, y: 0, text: "Origin")
+    #
+    #   # Styled label
+    #   Shape::Label.new(
+    #     x: -122.4, y: 37.8,
+    #     text: "San Francisco",
+    #     style: Style.new(fg: :cyan, add_modifier: :bold)
+    #   )
+    #
+    #   # Label with Text::Line for rich formatting
+    #   Shape::Label.new(
+    #     x: 0.0, y: 0.0,
+    #     text: Text::Line.new(spans: [
+    #       Text::Span.new(content: "Hello ", style: Style.new(fg: :red)),
+    #       Text::Span.new(content: "World", style: Style.new(fg: :blue))
+    #     ])
+    #   )
+    class Label < Data.define(:x, :y, :text, :style)
+      ##
+      # :attr_reader: x
+      # X coordinate in canvas space (Float, duck-typed via +to_f+).
+
+      ##
+      # :attr_reader: y
+      # Y coordinate in canvas space (Float, duck-typed via +to_f+).
+
+      ##
+      # :attr_reader: text
+      # Text content (String or Text::Line).
+
+      ##
+      # :attr_reader: style
+      # Optional style for the text.
+
+      # Creates a new Label.
+      #
+      # [x] X coordinate (Numeric).
+      # [y] Y coordinate (Numeric).
+      # [text] Text content (String or Text::Line).
+      # [style] Style (optional).
+      def initialize(x:, y:, text:, style: nil)
+        super(x: Float(x), y: Float(y), text: text, style: style)
+      end
+    end
+  end
+end

data/lib/ratatui_ruby/schema/sparkline.rb

@@ -4,21 +4,128 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 module RatatuiRuby
-  # A widget that displays a compact data row.
-  #
-  # [data] Array of Integers.
-  # [max] Optional maximum value.
-  # [style] Optional style for the sparkline.
-  # [block] Optional block widget to wrap the sparkline.
-  class Sparkline < Data.define(:data, :max, :style, :block)
-    # Creates a new Sparkline widget.
+    # Displays high-density data in a compact row.
     #
-    # [data] Array of Integers.
-    # [max] Optional maximum value.
-    # [style] Optional style for the sparkline.
-    # [block] Optional block widget to wrap the sparkline.
-    def initialize(data:, max: nil, style: nil, block: nil)
-      super
+    # Users need context. A single value ("90% CPU") tells you current status, but not the trend.
+    # Full charts take up too much room.
+    #
+    # This widget solves the density problem. It condenses history into a single line of variable-height blocks.
+    #
+    # Use it in dashboards, headers, or list items to providing trending data at a glance.
+    #
+    # === Examples
+    #
+    #   Sparkline.new(
+    #     data: [1, 4, 3, 8, 2, 9, 3, 2],
+    #     style: Style.new(fg: :yellow)
+    #   )
+    class Sparkline < Data.define(:data, :max, :style, :block, :direction, :absent_value_symbol, :absent_value_style, :bar_set)
+      ##
+      # :attr_reader: data
+      # Array of integer values to plot.
+
+      ##
+      # :attr_reader: max
+      # Maximum value for scaling (optional).
+      #
+      # If nil, derived from data max.
+
+      ##
+      # :attr_reader: style
+      # Style for the bars.
+
+      ##
+      # :attr_reader: block
+      # Optional wrapping block.
+
+      ##
+      # :attr_reader: direction
+      # Direction to render data.
+      #
+      # Accepts +:left_to_right+ (default) or +:right_to_left+.
+      # Use +:right_to_left+ when new data should appear on the left.
+
+      ##
+      # :attr_reader: absent_value_symbol
+      # Character to render for absent (nil) values (optional).
+      #
+      # If nil, absent values are rendered with a space.
+
+      ##
+      # :attr_reader: absent_value_style
+      # Style for absent (nil) values (optional).
+
+      ##
+      # :attr_reader: bar_set
+      # Custom characters for the bars (optional).
+      #
+      # A Hash with keys defining the characters for the bars.
+      # Keys: <tt>:empty</tt>, <tt>:one_eighth</tt>, <tt>:one_quarter</tt>, <tt>:three_eighths</tt>, <tt>:half</tt>, <tt>:five_eighths</tt>, <tt>:three_quarters</tt>, <tt>:seven_eighths</tt>, <tt>:full</tt>.
+      #
+      # You can also use integers (0-8) as keys, where 0 is empty, 4 is half, and 8 is full.
+      #
+      # Alternatively, you can pass an Array of 9 strings, where index 0 is empty and index 8 is full.
+      #
+      # === Examples
+      #
+      #   bar_set: {
+      #     empty: " ",
+      #     one_eighth: " ",
+      #     one_quarter: "▂",
+      #     three_eighths: "▃",
+      #     half: "▄",
+      #     five_eighths: "▅",
+      #     three_quarters: "▆",
+      #     seven_eighths: "▇",
+      #     full: "█"
+      #   }
+      #
+      #   # Numeric keys (0-8)
+      #   bar_set: {
+      #     0 => " ", 1 => " ", 2 => "▂", 3 => "▃", 4 => "▄", 5 => "▅", 6 => "▆", 7 => "▇", 8 => "█"
+      #   }
+      #
+      #   # Array (9 items)
+      #   bar_set: [" ", " ", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
+
+      BAR_KEYS = %i[empty one_eighth one_quarter three_eighths half five_eighths three_quarters seven_eighths full].freeze
+
+      # Creates a new Sparkline widget.
+      #
+      # [data] Array of Integers or nil. nil marks an absent value (distinct from 0).
+      # [max] Max value (optional).
+      # [style] Style (optional).
+      # [block] Block (optional).
+      # [direction] +:left_to_right+ or +:right_to_left+ (default: +:left_to_right+).
+      # [absent_value_symbol] Character for absent (nil) values (optional).
+      # [absent_value_style] Style for absent (nil) values (optional).
+      # [bar_set] Hash or Array of custom characters (optional).
+      def initialize(data:, max: nil, style: nil, block: nil, direction: :left_to_right, absent_value_symbol: nil, absent_value_style: nil, bar_set: nil)
+        if bar_set
+          if bar_set.is_a?(Array) && bar_set.size == 9
+            # Convert Array to Hash using BAR_KEYS order
+            bar_set = BAR_KEYS.zip(bar_set).to_h
+          else
+            bar_set = bar_set.dup
+            # Normalize numeric keys (0-8) to symbolic keys
+            BAR_KEYS.each_with_index do |key, i|
+              if val = bar_set.delete(i) || bar_set.delete(i.to_s)
+                bar_set[key] = val
+              end
+            end
+          end
+        end
+        coerced_data = data.map { |v| v.nil? ? nil : Integer(v) }
+        super(
+          data: coerced_data,
+          max: max.nil? ? nil : Integer(max),
+          style: style,
+          block: block,
+          direction: direction,
+          absent_value_symbol: absent_value_symbol,
+          absent_value_style: absent_value_style,
+          bar_set: bar_set
+        )
+      end
     end
-  end
 end

data/lib/ratatui_ruby/schema/style.rb

@@ -4,28 +4,56 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 module RatatuiRuby
-  # A value object that defines colors and modifiers for text or widgets.
-  #
-  # [fg] The foreground color (e.g., +:red+, +"#ff0000"+).
-  # [bg] The background color (e.g., +:black+, +"#000000"+).
-  # [modifiers] An array of symbols representing text modifiers:
-  #             [+:bold+, +:italic+, +:dim+, +:reversed+, +:underlined+, +:slow_blink+, +:rapid_blink+, +:crossed_out+, +:hidden+]
-  class Style < Data.define(:fg, :bg, :modifiers)
-    # Creates a new Style.
+    # Defines colors and text modifiers.
     #
-    # [fg] The foreground color (e.g., "red", "#ff0000").
-    # [bg] The background color (e.g., "black", "#000000").
-    # [modifiers] An array of symbols representing text modifiers.
-    def initialize(fg: nil, bg: nil, modifiers: [])
-      super
-    end
-
-    # Returns a default style with no colors or modifiers.
+    # The terminal is traditionally monochrome, but efficient interfaces use color to convey meaning.
+    # Red for errors. Green for success. Bold for headers.
+    #
+    # This value object encapsulates those choices. It applies foreground and background colors. It adds effects like italics or blinking.
+    #
+    # Use it to theme your application or highlight critical data.
+    #
+    # === Examples
     #
-    #   Style.default
-    #   # => #<RatatuiRuby::Style fg=nil, bg=nil, modifiers=[]>
-    def self.default
-      new
+    #   # Standard colors
+    #   Style.new(fg: :red, bg: :white, modifiers: [:bold])
+    #
+    #   # Hex colors
+    #   Style.new(fg: "#ff00ff")
+    class Style < Data.define(:fg, :bg, :modifiers)
+      ##
+      # :attr_reader: fg
+      # Foreground color.
+      #
+      # Symbol (<tt>:red</tt>) or Hex String (<tt>"#ffffff"</tt>).
+
+      ##
+      # :attr_reader: bg
+      # Background color.
+      #
+      # Symbol (<tt>:black</tt>) or Hex String (<tt>"#000000"</tt>).
+
+      ##
+      # :attr_reader: modifiers
+      # Text effects.
+      #
+      # Array of symbols: <tt>:bold</tt>, <tt>:dim</tt>, <tt>:italic</tt>, <tt>:underlined</tt>,
+      # <tt>:slow_blink</tt>, <tt>:rapid_blink</tt>, <tt>:reversed</tt>, <tt>:hidden</tt>, <tt>:crossed_out</tt>.
+
+      # Creates a new Style.
+      #
+      # [fg] Color (Symbol/String).
+      # [bg] Color (Symbol/String).
+      # [modifiers] Array of Symbols.
+      def initialize(fg: nil, bg: nil, modifiers: [])
+        super
+      end
+
+      # Returns an empty style.
+      #
+      # Use this as a baseline to prevent style inheritance issues or when no styling is required.
+      def self.default
+        new
+      end
     end
-  end
 end

data/lib/ratatui_ruby/schema/table.rb

@@ -4,27 +4,125 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 module RatatuiRuby
-  # A widget that displays data in a grid with rows and columns.
-  #
-  # [header] An array of strings or Paragraphs representing the header row.
-  # [rows] An array of arrays of strings or Paragraphs representing the data rows.
-  # [widths] An array of Constraint objects defining column widths.
-  # [highlight_style] The style for the selected row.
-  # [highlight_symbol] The symbol to display in front of the selected row.
-  # [selected_row] The index of the currently selected row, or nil if none.
-  # [block] An optional Block widget to wrap the table.
-  class Table < Data.define(:header, :rows, :widths, :highlight_style, :highlight_symbol, :selected_row, :block)
-    # Creates a new Table.
+    # Displays structured data in rows and columns.
     #
-    # [header] An array of strings or Paragraphs representing the header row.
-    # [rows] An array of arrays of strings or Paragraphs representing the data rows.
-    # [widths] An array of Constraint objects defining column widths.
-    # [highlight_style] The style for the selected row.
-    # [highlight_symbol] The symbol to display in front of the selected row.
-    # [selected_row] The index of the currently selected row, or nil if none.
-    # [block] An optional Block widget to wrap the table.
-    def initialize(header: nil, rows: [], widths: [], highlight_style: nil, highlight_symbol: "> ", selected_row: nil, block: nil)
-      super
+    # Data is often multidimensional. You need to show relationships between fields (Name, Age, ID).
+    # Aligning columns manually in a monospaced environment is painful and error-prone.
+    #
+    # This widget creates a grid. It enforces column widths using constraints. It renders headers, rows, and footers aligned perfectly.
+    #
+    # Use it to display database records, logs, or file lists.
+    #
+    # === Examples
+    #
+    #   Table.new(
+    #     header: ["ID", "Name", "Status"],
+    #     rows: [
+    #       ["1", "Hideo", "Active"],
+    #       ["2", "Kojima", "Idle"]
+    #     ],
+    #     widths: [
+    #       Constraint.length(5),
+    #       Constraint.fill(1),
+    #       Constraint.length(10)
+    #     ]
+    #   )
+    class Table < Data.define(:header, :rows, :widths, :highlight_style, :highlight_symbol, :highlight_spacing, :column_highlight_style, :cell_highlight_style, :selected_row, :selected_column, :block, :footer, :flex, :style, :column_spacing)
+      ##
+      # :attr_reader: header
+      # Header row content (Array of Strings).
+
+      ##
+      # :attr_reader: rows
+      # Data rows (Array of Arrays of Strings).
+
+      ##
+      # :attr_reader: widths
+      # Column width constraints (Array of Constraint).
+
+      ##
+      # :attr_reader: highlight_style
+      # Style for the selected row.
+
+      ##
+      # :attr_reader: highlight_symbol
+      # Symbol for the selected row.
+
+      ##
+      # :attr_reader: highlight_spacing
+      # When to show the highlight symbol column (:always, :when_selected, :never).
+
+      ##
+      # :attr_reader: column_highlight_style
+      # Style for the selected column.
+
+      ##
+      # :attr_reader: cell_highlight_style
+      # Style for the selected cell (intersection of row and column).
+
+      ##
+      # :attr_reader: selected_row
+      # Index of the selected row (Integer or nil).
+
+      ##
+      # :attr_reader: selected_column
+      # Index of the selected column (Integer or nil).
+
+      ##
+      # :attr_reader: block
+      # Optional wrapping block.
+
+      ##
+      # :attr_reader: footer
+      # Footer row content (Array of Strings).
+
+      ##
+      # :attr_reader: flex
+      # Flex mode for column distribution.
+
+      ##
+      # :attr_reader: style
+      # Base style for the entire table.
+
+      ##
+      # :attr_reader: column_spacing
+      # Spacing between columns (Integer, default 1).
+
+      # Creates a new Table.
+      #
+      # [header] Array of strings/paragraphs.
+      # [rows] 2D Array of strings/paragraphs.
+      # [widths] Array of Constraints.
+      # [highlight_style] Style object.
+      # [highlight_symbol] String.
+      # [highlight_spacing] Symbol (optional, default: <tt>:when_selected</tt>).
+      # [column_highlight_style] Style object.
+      # [cell_highlight_style] Style object.
+      # [selected_row] Integer (nullable).
+      # [selected_column] Integer (nullable).
+      # [block] Block (optional).
+      # [footer] Array of strings/paragraphs (optional).
+      # [flex] Symbol (optional, default: <tt>:legacy</tt>).
+      # [style] Style object or Hash (optional).
+      # [column_spacing] Integer (optional, default: 1).
+      def initialize(header: nil, rows: [], widths: [], highlight_style: nil, highlight_symbol: "> ", highlight_spacing: :when_selected, column_highlight_style: nil, cell_highlight_style: nil, selected_row: nil, selected_column: nil, block: nil, footer: nil, flex: :legacy, style: nil, column_spacing: 1)
+        super(
+          header: header,
+          rows: rows,
+          widths: widths,
+          highlight_style: highlight_style,
+          highlight_symbol: highlight_symbol,
+          highlight_spacing: highlight_spacing,
+          column_highlight_style: column_highlight_style,
+          cell_highlight_style: cell_highlight_style,
+          selected_row: selected_row.nil? ? nil : Integer(selected_row),
+          selected_column: selected_column.nil? ? nil : Integer(selected_column),
+          block: block,
+          footer: footer,
+          flex: flex,
+          style: style,
+          column_spacing: Integer(column_spacing)
+        )
+      end
     end
-  end
 end

data/lib/ratatui_ruby/schema/tabs.rb

@@ -4,19 +4,81 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 module RatatuiRuby
-  # A widget that displays a set of tabs, one of which is selected.
-  #
-  # [titles] Array of strings or lines to display as tab titles.
-  # [selected_index] The index of the currently selected tab.
-  # [block] Optional block widget to wrap the tabs.
-  class Tabs < Data.define(:titles, :selected_index, :block)
-    # Creates a new Tabs widget.
+    # Displays a tab bar for navigation.
     #
-    # [titles] Array of strings or lines to display as tab titles.
-    # [selected_index] The index of the currently selected tab.
-    # [block] Optional block widget to wrap the tabs.
-    def initialize(titles: [], selected_index: 0, block: nil)
-      super
+    # Screen real estate is limited. You cannot show everything at once. Segregating content into views is necessary for complex apps.
+    #
+    # This widget separates dimensions. It displays a row of titles, indicating which view is active.
+    #
+    # Use it at the top of your interface to switch between major modes or contexts.
+    #
+    # === Examples
+    #
+    #   Tabs.new(
+    #     titles: ["Home", "Settings", "Logs"],
+    #     selected_index: 0,
+    #     highlight_style: Style.new(fg: :yellow),
+    #     divider: "|"
+    #   )
+    class Tabs < Data.define(:titles, :selected_index, :block, :divider, :highlight_style, :style, :padding_left, :padding_right)
+      ##
+      # :attr_reader: titles
+      # Tab titles (Array of Strings).
+
+      ##
+      # :attr_reader: selected_index
+      # Index of the active tab.
+
+      ##
+      # :attr_reader: block
+      # Optional wrapping block.
+
+      ##
+      # :attr_reader: divider
+      # Separator string between tabs.
+
+      ##
+      # :attr_reader: highlight_style
+      # Style for the selected tab title.
+
+      ##
+      # :attr_reader: style
+      # Base style for the tabs area.
+
+      ##
+      # :attr_reader: padding_left
+      # Left padding for the tabs area (Integer, default: 0).
+
+      ##
+      # :attr_reader: padding_right
+      # Right padding for the tabs area (Integer, default: 0).
+
+      # Creates a new Tabs widget.
+      #
+      # [titles] Array of Strings/Lines.
+      # [selected_index] Integer (default: 0).
+      # [block] Block (optional).
+      # [divider] String (optional).
+      # [highlight_style] Style (optional).
+      # [style] Style (optional).
+      # [padding_left] Integer (default: 0).
+      # [padding_right] Integer (default: 0).
+      def initialize(titles: [], selected_index: 0, block: nil, divider: nil, highlight_style: nil, style: nil, padding_left: 0, padding_right: 0)
+        super(
+          titles: titles,
+          selected_index: Integer(selected_index),
+          block: block,
+          divider: divider,
+          highlight_style: highlight_style,
+          style: style,
+          padding_left: Integer(padding_left),
+          padding_right: Integer(padding_right)
+        )
+      end
+
+      # Returns the total width of the tabs.
+      def width
+        RatatuiRuby._tabs_width(self)
+      end
     end
-  end
 end