add arrow function to declaration action

.luacheckrc

@@ -2,4 +2,5 @@ std = luajit
 cache = true
 codes = true
 
+ignore = { "631" }
 read_globals = { "vim" }

lua/shrub/actions/arrow_fun_to_declaration.lua

@@ -2,18 +2,33 @@ local utils = require("shrub.utils")
 
 ---@class ShrubActionConfig
 local M = {
+    root_node_type = { "lexical_declaration" },
     query = [[
+        (lexical_declaration
             (variable_declarator
-                name: (_) @name 
+                name: (_) @name
                 value: (
                     arrow_function
                     parameters: (_) @params
                     body: (_) @body
                 )
             )
+        )@declaration
         ]],
-    root_node_type = { "variable_declarator" },
-    handle_captures = function(captures, bufnr) end,
+    handle_captures = function(captures, bufnr)
+        -- TODO: write multiple statement blocks or add formatting
+        utils.replace_ts_node_text(bufnr, captures.declaration, function()
+            return string.format(
+                "function %s%s %s",
+                table.concat(utils.get_ts_node_text(bufnr, captures.name), " "),
+                table.concat(
+                    utils.get_ts_node_text(bufnr, captures.params),
+                    " "
+                ),
+                table.concat(utils.get_ts_node_text(bufnr, captures.body), " ")
+            )
+        end)
+    end,
 }
 
 return M

lua/shrub/actions/fun_declaration_to_arrow.lua

@@ -2,31 +2,25 @@ local utils = require("shrub.utils")
 
 ---@class ShrubActionConfig
 local M = {
+    root_node_type = { "function_declaration" },
     query = [[
         (function_declaration
             name: (_) @name
             parameters: (_) @params
             body: (_) @body
-            ) @function
+            ) @func
         ]],
-    root_node_type = { "function_declaration" },
     handle_captures = function(captures, bufnr)
-        utils.replace_ts_node_text(bufnr, captures["function"], function()
+        utils.replace_ts_node_text(bufnr, captures.func, function()
             -- TODO: write multiple statement blocks or add formatting
             return string.format(
                 "const %s = %s => %s",
+                table.concat(utils.get_ts_node_text(bufnr, captures.name), " "),
                 table.concat(
-                    utils.get_ts_node_text(bufnr, captures["name"]),
+                    utils.get_ts_node_text(bufnr, captures.params),
                     " "
                 ),
-                table.concat(
-                    utils.get_ts_node_text(bufnr, captures["params"]),
-                    " "
-                ),
-                table.concat(
-                    utils.get_ts_node_text(bufnr, captures["body"]),
-                    " "
-                )
+                table.concat(utils.get_ts_node_text(bufnr, captures.body), " ")
             )
         end)
     end,

lua/shrub/actions/init.lua

@@ -4,6 +4,7 @@ local M = {
     _ft = "typescript",
 }
 
+--- register a new action as config
 ---@type table<ShrubAction, ShrubActionConfig>
 local shrub_actions = {
     statement_block_surround = require(
@@ -13,7 +14,7 @@ local shrub_actions = {
     fun_declaration_to_arrow = require(
         "shrub.actions.fun_declaration_to_arrow"
     ),
-    arrow_to_function_declaration = require(
+    arrow_fun_to_declaration = require(
         "shrub.actions.arrow_fun_to_declaration"
     ),
 }

lua/shrub/actions/statement_block_surround.lua

@@ -8,7 +8,7 @@ local M = {
             body: (_) @arrow_body)
         (if_statement
         consequence: (_) @condition_body
-        ) 
+        )
         ]],
     handle_captures = function(captures, bufnr)
         if captures["condition_body"] ~= nil then

lua/shrub/config.lua

@@ -33,6 +33,16 @@ M.keys = {
             desc = "convert a function declaration to an arrow function",
         },
     },
+    {
+        "n",
+        "<leader>jaf",
+        '<cmd>lua require"shrub".arrow_fun_to_declaration()<cr>',
+        {
+            noremap = true,
+            silent = true,
+            desc = "convert an arrow function to a function declaration",
+        },
+    },
 }
 
 return M

lua/shrub/types.lua

@@ -1,6 +1,5 @@
 ---@alias ShrubAction "statement_block_surround" | "statement_block_remove" | "fun_declaration_to_arrow" | "arrow_fun_to_declaration"
-
 ---@class ShrubActionConfig
 ---@field query string treesitter query string
 ---@field root_node_type string[] nearest node type that will be used as the root of the query
----@field handle_captures fun(captures:table<string,TSNode>, bufnr:integer): any execute an action on table of captured nodes based on the captures where the key is the capture name and the value is the TSNode
+---@field handle_captures fun(captures:table<string,TSNode>, bufnr:integer): any execute action on table of captured nodes based on the captures where the key is the capture name and the value is the TSNode

tests/actions_spec.lua

@@ -33,11 +33,18 @@ describe("Actions:", function()
         },
         {
             action = "fun_declaration_to_arrow",
-            description = "chould convert a function declaration to an arrow function",
+            description = "should convert a function declaration to an arrow function",
             before = [[function myFn() { return "success"; }]],
             after = [[const myFn = () => { return "success"; }]],
             pos = { 0, 20 },
         },
+        {
+            action = "arrow_fun_to_declaration",
+            description = "should convert an arrow function to a function declaration",
+            before = [[const myFn = () => { return "success"; }]],
+            after = [[function myFn() { return "success"; }]],
+            pos = { 0, 25 },
+        },
     }
 
     for _, test in ipairs(test_table) do