feat(ecma): object and array destructuring

lua/splitjoin.lua

@@ -25,7 +25,7 @@ local function get_operable_node_under_cursor(bufnr, winnr)
   local tsparser = get_parser(bufnr)
         tsparser:parse()
   local langtree = tsparser:language_for_range(cursor_range);
-  local tstree = langtree:tree_for_range(cursor_range, { ignore_injections = false })
+  local tstree = langtree:tree_for_range(cursor_range, { ignore_injections = false }) or langtree:trees()[1]
   if not tstree then return nil, nil end
   local lang = langtree:lang()
   local query = get_query(lang, 'splitjoin')

lua/splitjoin/languages/ecmascript/defaults.lua

@@ -12,12 +12,25 @@ return {
       join = Node.join,
     },
 
+    object_pattern = {
+      surround = { '{', '}' },
+      padding = ' ',
+      split = Node.split,
+      join = Node.join,
+    },
+
     array = {
       surround = { '[', ']' },
       split = Node.split,
       join = Node.join,
     },
 
+    array_pattern = {
+      surround = { '[', ']' },
+      split = Node.split,
+      join = Node.join,
+    },
+
     named_imports = {
       surround = { '{', '}' },
     },

lua/splitjoin/util/node.lua

@@ -151,6 +151,9 @@ function Node.split(node, options)
   Node.goto_node(node)
 end
 
+--- default, child-aware joiner
+---@param node TSNode
+---@param options SplitjoinLanguageOptions
 function Node.join(node, options)
   local replacement = ''
   local sep = options.separator or ','

queries/javascript/splitjoin.scm

@@ -1,6 +1,6 @@
 ; collections
-(object) @splitjoin.javascript.object
 (array) @splitjoin.javascript.array
+(object) @splitjoin.javascript.object
 
 ; imports
 (named_imports) @splitjoin.javascript.imports
@@ -11,3 +11,7 @@
 (arrow_function) @splitjoin.javascript.function.arrow
 (arguments) @splitjoin.javascript.function.arguments
 (formal_parameters) @splitjoin.javascript.function.parameters
+
+; assignment patterns
+(array_pattern) @splitjoin.javascript.array
+(object_pattern) @splitjoin.javascript.object

queries/typescript/splitjoin.scm

@@ -8,3 +8,7 @@
     (type_arguments)
     (named_imports)
   ] @_splitjoin
+
+; assignment patterns
+(array_pattern) @splitjoin.typescript.array
+(object_pattern) @splitjoin.typescript.object

test/fixtures/fixture.js

@@ -19,3 +19,7 @@ function f() { return 0; }
 const f = function() { return 0; }
 
 const g = () => 0
+
+function destruct({ a, b, c }, d) { return { a, b, c, d }; }
+
+destruct = ({ a, b, c }, d) => 0;

test/javascript_spec.lua

@@ -161,10 +161,11 @@ describe(lang, function()
           function({ a, b, c }, d) {}
         ]],
         d[[
-          function(
-            { a, b, c },
-            d,
-          ) {}
+          function({
+            a,
+            b,
+            c,
+          }, d) {}
         ]],
         ','
       )
@@ -175,10 +176,11 @@ describe(lang, function()
           ({ a, b, c }, d) => 0
         ]],
         d[[
-          (
-            { a, b, c },
-            d,
-          ) => 0
+          ({
+            a,
+            b,
+            c,
+          }, d) => 0
         ]],
         ','
       )