checkoff 0.258.0 → 0.261.0

data/lib/checkoff/task_searches.rb

@@ -73,9 +73,6 @@ module Checkoff
       workspace = workspaces.workspace_or_raise(workspace_name)
       api_params, task_selector = @search_url_parser.convert_params(url)
       debug { "Task search params: api_params=#{api_params}, task_selector=#{task_selector}" }
-      # @sg-ignore task_selector expected Symbol,Array<Symbol,Integer,Array> received
-      #   Hash{String=>String} — Solargraph mis-assigns tuple-destructured types from
-      #   `api_params, task_selector = @search_url_parser.convert_params(url)` above
       raw_task_search(api_params, workspace_gid: workspace.gid, task_selector:,
                                   extra_fields:)
     end
@@ -189,12 +186,8 @@ module Checkoff
 
     # @param [Array<String>] extra_fields
     # @return [Hash{Symbol => Array<String>}]
-    # @sg-ignore return type could not be inferred — bracket access on a Hash{Symbol=>undefined}
-    #   local doesn't narrow even with a T.cast on the return expression
     def calculate_api_options(extra_fields)
-      # @type [Hash{Symbol => undefined}]
-      all_options = projects.task_options(extra_fields: ['custom_fields'] + extra_fields)
-      all_options[:options]
+      { fields: projects.task_fields(extra_fields: ['custom_fields'] + extra_fields) }
     end
 
     # bundle exec ./task_searches.rb

data/lib/checkoff/task_selectors.rb

@@ -40,7 +40,7 @@ module Checkoff
     end
 
     # @param [Asana::Resources::Task] task
-    # @param [Symbol, Array<Symbol, Integer, Array>] task_selector Filter based on
+    # @param [Symbol, Array<Symbol, String, Integer, Array>] task_selector Filter based on
     #   task details.  Examples: [:tag, 'foo'] [:not, [:tag, 'foo']] [:tag, 'foo']
     # @return [Boolean]
     def filter_via_task_selector(task, task_selector)
@@ -60,30 +60,43 @@ module Checkoff
     # @return [Checkoff::CustomFields]
     attr_reader :custom_fields
 
+    class << self
+      # @return [Array(Symbol, Array)]
+      def task_selector
+        task_selector_json = ARGV[2] || raise('Please pass task_selector in JSON form as third argument')
+        function_name, args = validate_task_selector(JSON.parse(task_selector_json))
+        [function_name.to_sym, args]
+      end
+
+      # @param parsed [Object] result of JSON.parse on a task selector
+      # @return [Array(String, Array)]
+      def validate_task_selector(parsed)
+        raise "Expected a 2-element [function_name, args] array, got #{parsed.inspect}" \
+          unless parsed.is_a?(Array) && parsed.length == 2
+
+        function_name = parsed.fetch(0)
+        args = parsed.fetch(1)
+        raise "Expected function_name to be a String, got #{function_name.inspect}" \
+          unless function_name.is_a?(String)
+        raise "Expected args to be an Array, got #{args.inspect}" unless args.is_a?(Array)
+
+        [function_name, args]
+      end
+    end
+
     # bundle exec ./task_selectors.rb
     # :nocov:
     class << self
       # @return [String]
-      # @sg-ignore `x || raise(...)` isn't inferred as narrowing away the nil branch
       def project_name
         ARGV[1] || raise('Please pass project name to pull tasks from as first argument')
       end
 
       # @return [String]
-      # @sg-ignore `x || raise(...)` isn't inferred as narrowing away the nil branch
       def workspace_name
         ARGV[0] || raise('Please pass workspace name as first argument')
       end
 
-      # @return [Array(Symbol, Array)]
-      # @sg-ignore `x || raise(...)` isn't inferred as narrowing away the nil branch
-      def task_selector
-        task_selector_json = ARGV[2] || raise('Please pass task_selector in JSON form as third argument')
-
-        # @return [Symbol, Array]
-        T.cast(JSON.parse(task_selector_json), [Symbol, Array])
-      end
-
       # @return [void]
       def run
         require 'checkoff/projects'

data/lib/checkoff/tasks.rb

@@ -32,7 +32,7 @@ module Checkoff
     LONG_CACHE_TIME = MINUTE * 15
     SHORT_CACHE_TIME = MINUTE * 5
 
-    # @param config [Hash, Checkoff::Internal::EnvFallbackConfigLoader]
+    # @param config [Hash{Symbol => Object}, Checkoff::Internal::EnvFallbackConfigLoader]
     # @param client [Asana::Client]
     # @param workspaces [Checkoff::Workspaces]
     # @param sections [Checkoff::Sections]
@@ -180,8 +180,6 @@ module Checkoff
     # @param assignee_gid [String]
     #
     # @return [Asana::Resources::Task]
-    # @sg-ignore @asana_task.create return type could not be inferred — calling a class method
-    #   through a Class<T>-typed ivar is a known Solargraph dispatch limitation
     def add_task(name,
                  workspace_gid: @workspaces.default_workspace_gid,
                  assignee_gid: default_assignee_gid)
@@ -282,7 +280,7 @@ module Checkoff
       task_hashes.task_to_h(task)
     end
 
-    # @param task_data [Hash]
+    # @param task_data [Hash{String => Object}]
     #
     # @return [Asana::Resources::Task]
     def h_to_task(task_data)
@@ -295,16 +293,14 @@ module Checkoff
     # @param portfolio_name [String]
     # @param workspace_name [String]
     # @return [Boolean]
-    # @sg-ignore Checkoff::Tasks#in_portfolio_named? return type could not be inferred
     def in_portfolio_named?(task,
                             portfolio_name,
                             workspace_name: T.must(@workspaces.default_workspace.name))
       portfolio_projects = @portfolios.projects_in_portfolio(workspace_name, portfolio_name)
-      T.cast(task.memberships.any? do |membership|
-        m = T.cast(membership, T::Hash[String, T.untyped])
-        project_gid = T.cast(m.fetch('project'), T::Hash[String, T.untyped]).fetch('gid')
+      task.memberships.any? do |membership|
+        project_gid = membership.fetch('project').fetch('gid')
         portfolio_projects.any? { |portfolio_project| portfolio_project.gid == project_gid }
-      end, T::Boolean)
+      end
     end
 
     # True if the task is in a project which is in the given portfolio
@@ -320,8 +316,7 @@ module Checkoff
       portfolio_project_gids = portfolio_projects.map(&:gid)
       seen = T.let(false, T::Boolean)
       task.memberships.each do |membership|
-        m = T.cast(membership, T::Hash[String, T.untyped])
-        project_gid = T.cast(m.fetch('project'), T::Hash[String, T.untyped]).fetch('gid')
+        project_gid = membership.fetch('project').fetch('gid')
         next unless portfolio_project_gids.include?(project_gid)
         return true if seen
 
@@ -386,9 +381,6 @@ module Checkoff
     end
 
     # @return [String]
-    # @sg-ignore @config.fetch return type could not be inferred — @config is intentionally
-    #   dual-typed [Hash, EnvFallbackConfigLoader] throughout this codebase; Solargraph can't
-    #   unify #fetch across that union
     def default_assignee_gid
       @config.fetch(:default_assignee_gid)
     end

data/lib/checkoff/timelines.rb

@@ -54,16 +54,11 @@ module Checkoff
       memberships_data = task_data.fetch('memberships')
       memberships_data.all? do |membership_data|
         # @type [Hash{String => String}]
-        # @sg-ignore Hash#fetch generic<X> leak on rbs >= 4.1.0, fix in progress upstream
-        # https://github.com/castwide/solargraph/pull/1228
         section_data = membership_data.fetch('section')
         section_gid = section_data.fetch('gid')
-        # @sg-ignore Hash#fetch generic<X> leak on rbs >= 4.1.0, fix in progress upstream
-        # https://github.com/castwide/solargraph/pull/1228
         section = @sections.section_by_gid(section_gid)
-        # @sg-ignore section_by_gid can return nil on a gid lookup miss, and
-        #   task_data_dependent_on_previous_section_last_milestone? dereferences it immediately
-        #   without a nil guard — looks like a real gap, flagging for the follow-up code PR
+        next false if section.nil?
+
         task_data_dependent_on_previous_section_last_milestone?(task_data, section)
       end
     end
@@ -85,20 +80,14 @@ module Checkoff
         md = membership_data
         unless limit_to_portfolio_name.nil?
           # @type [Hash{String => Object}]
-          # @sg-ignore Hash#fetch generic<X> leak on rbs >= 4.1.0, fix in progress upstream
-          # https://github.com/castwide/solargraph/pull/1228
           project_data = md.fetch('project')
           project_gid = project_data.fetch('gid')
           next true unless limit_to_projects.map(&:gid).include? project_gid
         end
         # @type [Hash{String => Object}]
-        # @sg-ignore Hash#fetch generic<X> leak on rbs >= 4.1.0, fix in progress upstream
-        # https://github.com/castwide/solargraph/pull/1228
         section_data = md.fetch('section')
         section_gid = section_data.fetch('gid')
 
-        # @sg-ignore Hash#fetch generic<X> leak on rbs >= 4.1.0, fix in progress upstream
-        # https://github.com/castwide/solargraph/pull/1228
         last_milestone = last_milestone_in_section(section_gid)
 
         next false if last_milestone.nil?
@@ -107,8 +96,6 @@ module Checkoff
 
         all_dependent_task_gids ||= @tasks.all_dependent_tasks(task).map(&:gid)
 
-        # @sg-ignore all_dependent_task_gids is nil-initialized then set via ||= above, but
-        #   Solargraph doesn't narrow it back to non-nil after the reassignment
         all_dependent_task_gids.include? last_milestone.gid
       end
     end
@@ -130,8 +117,6 @@ module Checkoff
         md = membership_data
         unless limit_to_portfolio_name.nil?
           # @type [Hash{String => Object}]
-          # @sg-ignore Hash#fetch generic<X> leak on rbs >= 4.1.0, fix in progress upstream
-          # https://github.com/castwide/solargraph/pull/1228
           project_data = md.fetch('project')
           project_gid = project_data.fetch('gid')
           next true unless limit_to_projects.map(&:gid).include? project_gid
@@ -146,8 +131,6 @@ module Checkoff
             dependent_task.resource_subtype == 'milestone'
           end
 
-        # @sg-ignore all_dependent_milestones is nil-initialized then set via ||= above, but
-        #   Solargraph doesn't narrow it back to non-nil after the reassignment
         all_dependent_milestones.any? do |milestone|
           milestone.memberships.any? do |milestone_membership_data|
             milestone_membership_data.fetch('project').fetch('gid') == project_gid
@@ -169,7 +152,7 @@ module Checkoff
 
     private
 
-    # @param task_data [Hash]
+    # @param task_data [Hash{String => Object}]
     # @param section [Asana::Resources::Section]
     #
     # @return [Boolean]

data/lib/checkoff/timing.rb

@@ -36,7 +36,7 @@ module Checkoff
     end
 
     # @param date_or_time [Date,Time,nil]
-    # @param period [Symbol, Array(Symbol,Integer)]
+    # @param period [Symbol, Array<Symbol, Integer>]
     #
     #        Valid values: :this_week, :now_or_before, :indefinite, [:less_than_n_days_ago, Integer]
     def in_period?(date_or_time, period)
@@ -175,7 +175,6 @@ module Checkoff
     # @param num_days [Integer]
     #
     # @return [Date]
-    # @sg-ignore Checkoff::Timing#n_days_from_today return type could not be inferred
     def n_days_from_today(num_days)
       T.cast(@today_getter.today + num_days, Date)
     end

data/lib/checkoff/version.rb

@@ -4,5 +4,5 @@
 # Command-line and gem client for Asana (unofficial)
 module Checkoff
   # Version of library
-  VERSION = '0.258.0'
+  VERSION = '0.261.0'
 end

data/lib/checkoff/workspaces.rb

@@ -22,7 +22,7 @@ module Checkoff
     # @!parse
     #   extend CacheMethod::ClassMethods
 
-    # @param config [Hash, Checkoff::Internal::EnvFallbackConfigLoader]
+    # @param config [Hash{Symbol => Object}, Checkoff::Internal::EnvFallbackConfigLoader]
     # @param client [Asana::Client]
     # @param asana_workspace [Class<Asana::Resources::Workspace>]
     def initialize(config: Checkoff::Internal::ConfigLoader.load(:asana),
@@ -44,8 +44,6 @@ module Checkoff
     cache_method :workspace, LONG_CACHE_TIME
 
     # @return [Asana::Resources::Workspace]
-    # @sg-ignore @asana_workspace.find_by_id return type could not be inferred — calling a
-    #   class method through a Class<T>-typed ivar is a known Solargraph dispatch limitation
     def default_workspace
       @asana_workspace.find_by_id(client, default_workspace_gid)
     end
@@ -53,7 +51,6 @@ module Checkoff
 
     # @param [String, Symbol] workspace_name
     # @return [Asana::Resources::Workspace]
-    # @sg-ignore workspace() is nil-checked below
     def workspace_or_raise(workspace_name)
       w = workspace(workspace_name)
       raise "Could not find workspace #{workspace_name}" if w.nil?
@@ -62,9 +59,6 @@ module Checkoff
     end
 
     # @return [String]
-    # @sg-ignore @config.fetch return type could not be inferred — @config is intentionally
-    #   dual-typed [Hash, EnvFallbackConfigLoader] throughout this codebase; Solargraph can't
-    #   unify #fetch across that union
     def default_workspace_gid
       @config.fetch(:default_workspace_gid)
     end