feat(store): toggle sort

Author: phanen

lua/fzf-lua-extra/providers/lazy.lua

@@ -13,40 +13,25 @@ local p_do = function(cb)
   end
 end
 
-local State = {}
-State.state = {
-  all_name = function()
-    State.encode = function(p) return p.name end
-  end,
-  all_repo = function()
-    ---@param p LazyPlugin
-    ---@return string
-    State.encode = function(p)
-      local fullname = p[1]
-      if not fullname then
-        local url = p.url
-        if not url then
-          fullname = 'unknown/' .. p.name -- dummy name
-        else
-          local url_slice = vim.split(url, '/')
-          local username = url_slice[#url_slice - 1]
-          local repo = url_slice[#url_slice]
-          fullname = username .. '/' .. repo
-        end
-      end
-      return fullname
+local fmt_repo = function(p)
+  local fullname = p[1]
+  if not fullname then
+    local url = p.url
+    if not url then
+      fullname = 'unknown/' .. p.name -- dummy name
+    else
+      local url_slice = vim.split(url, '/')
+      local username = url_slice[#url_slice - 1]
+      local repo = url_slice[#url_slice]
+      fullname = username .. '/' .. repo
     end
-  end,
-}
-State.cycle = function()
-  State.key = next(State.state, State.key)
-  if not State.key then State.key = next(State.state, State.key) end
-  State.state[State.key]()
+  end
+  return fullname
 end
 
----@return function, function
-State.get = function() return State.filter, State.encode end
-State.cycle()
+local state = require('fzf-lua-extra.state').new()
+state:put('fmt', 'full', function(p) return p.name end)
+state:put('fmt', 'repo', fmt_repo)
 
 ---@class fle.config.Lazy: fzf-lua.config.Base
 local __DEFAULT__ = {
@@ -68,18 +53,15 @@ local __DEFAULT__ = {
     ['ctrl-r'] = p_do(
       function(p) require('lazy.core.loader')[p._ and p._.loaded and 'reload' or 'load'](p) end
     ),
-    ['ctrl-g'] = { fn = State.cycle, reload = true },
+    ['ctrl-g'] = { fn = function() state:cycle() end, reload = true },
   },
 }
 
 return function(opts)
   assert(__DEFAULT__)
   local contents = function(fzf_cb)
-    local filter, encode = State.get()
-    vim
-      .iter(utils.get_lazy_plugins())
-      :filter(filter or function() return true end)
-      :each(function(_, p) fzf_cb(encode(p)) end)
+    local fmt = state:get()
+    vim.iter(utils.get_lazy_plugins()):each(function(_, p) fzf_cb(fmt(p)) end)
     fzf_cb()
   end
   return FzfLua.fzf_exec(contents, opts)

lua/fzf-lua-extra/providers/store.lua

@@ -82,24 +82,20 @@ local function format_repository_info(repo, compact)
   return table.concat(parts, ' ')
 end
 
-local State = {}
-State.state = {
-  all = function()
-    State.encode = function(p) return format_repository_info(p) end
-  end,
-  compat = function()
-    State.encode = function(p) return format_repository_info(p, true) end
-  end,
-}
-State.cycle = function()
-  State.key = next(State.state, State.key)
-  if not State.key then State.key = next(State.state, State.key) end
-  State.state[State.key]()
+-- format_repository_info
+local state = require('fzf-lua-extra.state').new()
+state:put('fmt', 'detail', function(p) return format_repository_info(p) end)
+state:put('fmt', 'compat', function(p) return format_repository_info(p, true) end)
+local sort_by_stars = function(a, b)
+  return a.stars > b.stars or (a.stars == b.stars and a.issues > b.issues)
+end
+local sort_by_issues = function(a, b)
+  return a.issues > b.issues or (a.issues == b.issues and a.stars > b.stars)
 end
 
----@return function, function
-State.get = function() return State.filter, State.encode end
-State.cycle()
+state:put('sort', 'no_sort', false)
+state:put('sort', 'stars', sort_by_stars)
+state:put('sort', 'issues', sort_by_issues)
 
 ---@class fle.config.Store: fzf-lua.config.Base
 local __DEFAULT__ = {
@@ -120,6 +116,7 @@ local __DEFAULT__ = {
     items = {},
   },
   fzf_opts = {
+    ['--no-sort'] = true,
     ['--delimiter'] = '\t',
     ['--with-nth'] = '2..',
     ['--no-hscroll'] = true,
@@ -153,7 +150,8 @@ local __DEFAULT__ = {
     ['ctrl-r'] = p_do(
       function(p) require('lazy.core.loader')[p._ and p._.loaded and 'reload' or 'load'](p) end
     ),
-    ['ctrl-g'] = { fn = State.cycle, reload = true },
+    ['ctrl-g'] = { fn = function() state:cycle('fmt') end, reload = true },
+    ['ctrl-s'] = { fn = function() state:cycle('sort') end, reload = true },
   },
 }
 
@@ -217,12 +215,15 @@ return function(opts)
           { cache_path = utils.path('store.json'), cache_invalid = opts.cache_invalid }
         ).stdout or ''
       )
+      local fmt = state:get('fmt')
+      local sort = state:get('sort')
       local items = db.items
+      -- TODO: maybe we also need "toggle-sort"
+      if sort then table.sort(items, sort) end
       opts.previewer.items = opts.previewer.items or {}
       for _, item in ipairs(items) do
         opts.previewer.items[item.full_name] = item
-        local filter, encode = State.get()
-        if not filter or filter(item) then cb(encode(item)) end
+        cb(fmt(item))
       end
       cb(nil)
     end)

lua/fzf-lua-extra/state.lua

@@ -0,0 +1,44 @@
+---@class fle.State
+---@field private iterables table<string, table<string, any>> iterator
+---@field private keys table<string, string>
+local M = {}
+
+M.__index = M
+
+M.new = function()
+  return setmetatable({
+    iterables = {},
+    keys = {},
+  }, M)
+end
+
+---@param ns string
+---@param k any
+---@param v any
+function M:put(ns, k, v)
+  if not self.iterables[ns] then
+    self.iterables[ns] = {}
+    self.keys[ns] = k
+  end
+  self.iterables[ns][k] = v
+end
+
+---@param ns? string
+function M:cycle(ns)
+  ns = ns or assert(next(self.iterables), 'No namespaces available to cycle')
+  local iters = self.iterables[ns]
+  local key = self.keys[ns]
+  local nextkey = next(iters, key)
+  if nextkey == nil then nextkey = next(iters) end
+  self.keys[ns] = nextkey
+end
+
+---@param ns? string
+---@return any, string
+function M:get(ns)
+  ns = ns or assert(next(self.iterables), 'No namespaces available to get')
+  local key = assert(self.keys[ns])
+  return self.iterables[ns][key], key
+end
+
+return M