cli-ui 1.5.1 → 2.2.3

data/lib/cli/ui/widgets.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 require('cli/ui')
 
 module CLI
@@ -16,57 +18,74 @@ module CLI
     #   CLI::UI::Widgets.register('my-widget') { MyWidget }
     #   puts(CLI::UI.fmt("{{@widget/my-widget:args}}"))
     module Widgets
+      extend T::Sig
+
       MAP = {}
 
       autoload(:Base, 'cli/ui/widgets/base')
+      autoload(:Status, 'cli/ui/widgets/status')
 
-      def self.register(name, &cb)
-        MAP[name] = cb
-      end
+      class << self
+        extend T::Sig
 
-      autoload(:Status, 'cli/ui/widgets/status')
-      register('status') { Widgets::Status }
+        sig { params(name: String, cb: T.proc.returns(T.class_of(Widgets::Base))).void }
+        def register(name, &cb)
+          MAP[name] = cb
+        end
 
-      # Looks up a widget by handle
-      #
-      # ==== Raises
-      # Raises InvalidWidgetHandle if the widget is not available.
-      #
-      # ==== Returns
-      # A callable widget, to be invoked like `.call(argstring)`
-      #
-      def self.lookup(handle)
-        MAP.fetch(handle.to_s).call
-      rescue KeyError, NameError
-        raise(InvalidWidgetHandle, handle)
-      end
+        # Looks up a widget by handle
+        #
+        # ==== Raises
+        # Raises InvalidWidgetHandle if the widget is not available.
+        #
+        # ==== Returns
+        # A callable widget, to be invoked like `.call(argstring)`
+        #
+        sig { params(handle: String).returns(T.class_of(Widgets::Base)) }
+        def lookup(handle)
+          MAP.fetch(handle).call
+        rescue KeyError, NameError
+          raise(InvalidWidgetHandle, handle)
+        end
 
-      # All available widgets by name
-      #
-      def self.available
-        MAP.keys
+        # All available widgets by name
+        #
+        sig { returns(T::Array[String]) }
+        def available
+          MAP.keys
+        end
       end
 
+      register('status') { Widgets::Status }
+
       class InvalidWidgetHandle < ArgumentError
+        extend T::Sig
+
+        sig { params(handle: String).void }
         def initialize(handle)
           super
           @handle = handle
         end
 
+        sig { returns(String) }
         def message
-          keys = Widget.available.join(',')
+          keys = Widgets.available.join(',')
           "invalid widget handle: #{@handle} " \
             "-- must be one of CLI::UI::Widgets.available (#{keys})"
         end
       end
 
       class InvalidWidgetArguments < ArgumentError
+        extend T::Sig
+
+        sig { params(argstring: String, pattern: Regexp).void }
         def initialize(argstring, pattern)
           super
           @argstring = argstring
           @pattern   = pattern
         end
 
+        sig { returns(String) }
         def message
           "invalid widget arguments: #{@argstring} " \
             "-- must match pattern: #{@pattern.inspect}"

data/lib/cli/ui/wrap.rb

@@ -1,4 +1,7 @@
 # coding: utf-8
+
+# typed: true
+
 require 'cli/ui'
 require 'cli/ui/frame/frame_stack'
 require 'cli/ui/frame/frame_style'
@@ -6,13 +9,17 @@ require 'cli/ui/frame/frame_style'
 module CLI
   module UI
     class Wrap
+      extend T::Sig
+
+      sig { params(input: String).void }
       def initialize(input)
         @input = input
       end
 
+      sig { returns(String) }
       def wrap
         max_width = Terminal.width - Frame.prefix_width
-        width = 0
+        width = T.let(0, Integer)
         final = []
         # Create an alternation of format codes of parameter lengths 1-20, since + and {1,n} not allowed in lookbehind
         format_codes = (1..20).map { |n| /\x1b\[[\d;]{#{n}}m/ }.join('|')