WIP on supporting object properties [skip ci]

Author: MisanthropicBit

lua/neotest-jest/init.lua

@@ -71,6 +71,7 @@ function adapter.build_position(file_path, source, captured_nodes)
   local name = vim.treesitter.get_node_text(node, source)
   local definition = captured_nodes[match_type .. ".definition"]
   local type = node:type()
+  local nonStringNode = false
 
   if type == "string" then
     -- If the node is a string then strip the quotes from the name by getting
@@ -94,6 +95,8 @@ function adapter.build_position(file_path, source, captured_nodes)
     end
 
     name = table.concat(new_name, "")
+  else
+    nonStringNode = true
   end
 
   return {
@@ -103,7 +106,7 @@ function adapter.build_position(file_path, source, captured_nodes)
     range = { definition:range() },
     -- Record the position of the line where the string name occurs
     test_name_range = match_type == "test" and { node:range() } or nil,
-    is_parameterized = captured_nodes["each_property"] and true or false,
+    is_parameterized = (captured_nodes["each_property"] or nonStringNode) and true or false,
   }
 end
 
@@ -335,10 +338,10 @@ end
 
 local function cleanAnsi(s)
   return s:gsub("\x1b%[%d+;%d+;%d+;%d+;%d+m", "")
-    :gsub("\x1b%[%d+;%d+;%d+;%d+m", "")
-    :gsub("\x1b%[%d+;%d+;%d+m", "")
-    :gsub("\x1b%[%d+;%d+m", "")
-    :gsub("\x1b%[%d+m", "")
+      :gsub("\x1b%[%d+;%d+;%d+;%d+m", "")
+      :gsub("\x1b%[%d+;%d+;%d+m", "")
+      :gsub("\x1b%[%d+;%d+m", "")
+      :gsub("\x1b%[%d+m", "")
 end
 
 local function findErrorPosition(file, errStr)
@@ -418,8 +421,16 @@ function adapter.build_spec(args)
   local testNamePattern = ".*"
 
   if pos.type == types.PositionType.test or pos.type == types.PositionType.namespace then
-    -- pos.id in form "path/to/file::Describe text::test text"
-    local testName = pos.id:sub(pos.id:find("::") + 2)
+    local temp = parameterized_tests.getParametricTestToSourceLevelTest(pos.path, pos.id)
+    local testName
+
+    if temp then
+      testName = temp:sub(pos.id:find("::") + 2)
+    else
+      -- pos.id in form "path/to/file::Describe text::test text"
+      testName = pos.id:sub(pos.id:find("::") + 2)
+    end
+
     testName, _ = testName:gsub("::", " ")
     testNamePattern = util.escapeTestPattern(testName)
 
@@ -452,7 +463,7 @@ function adapter.build_spec(args)
   }
 
   local options =
-    getJestArguments(jest_util.getJestDefaultArguments(jestArgsContext), jestArgsContext)
+      getJestArguments(jest_util.getJestDefaultArguments(jestArgsContext), jestArgsContext)
 
   if compat.tbl_islist(options) then
     vim.list_extend(command, options)
@@ -540,7 +551,7 @@ function adapter.results(spec, result, tree)
 
   -- FIX: Generate results for source-level parametrized namespaces
   if
-    adapter.jest_test_discovery == true and parameterized_tests.isPositionParameterized(tree, pos)
+      adapter.jest_test_discovery == true and parameterized_tests.isPositionParameterized(tree, pos)
   then
     local status
 

lua/neotest-jest/parameterized-tests.lua

@@ -11,6 +11,9 @@ local M = {}
 ---@field namespace_pos_id string
 ---@field namespace_name   string
 
+---@type table<string, table<string, string>>
+local parametric_test_to_source_level_test = {}
+
 local JEST_PARAMETER_TYPES = {
   "%%p",
   "%%s",
@@ -209,14 +212,15 @@ function M.enrichPositionsWithParameterizedTests(file_path, parsed_parameterized
   -- Get all runtime test information for path
   local jest_test_discovery_output = runJestTestDiscovery(file_path)
 
-  logger.warn(jest_test_discovery_output)
-
   if jest_test_discovery_output == nil then
     return
   end
 
   local tests_by_position = getTestsByPosition(jest_test_discovery_output)
 
+  -- Reset map
+  parametric_test_to_source_level_test[file_path] = {}
+
   -- For each parameterized test, find all tests that were in the same position
   -- as it and add new range-less (range = nil) children to the tree
   for _, tree in pairs(parsed_parameterized_tests_positions) do
@@ -256,7 +260,6 @@ function M.enrichPositionsWithParameterizedTests(file_path, parsed_parameterized
         -- There is no way for neotest-jest or jest to distinguish between
         -- tests that share the same name anyway so not creating new nodes is
         -- acceptable for now
-        -- if hasTestParameters(tree, pos) then
         if not tree:get_key(test_result.pos_id) then
           createNewChildNode(
             ns_tree or tree,
@@ -272,7 +275,13 @@ function M.enrichPositionsWithParameterizedTests(file_path, parsed_parameterized
               source_pos_id = pos.id,
             }
           )
+
+          if not parametric_test_to_source_level_test[file_path] then
+            parametric_test_to_source_level_test[file_path] = {}
+          end
         end
+
+        parametric_test_to_source_level_test[file_path][pos.id] = test_result.pos_id
       end
     end
   end
@@ -329,4 +338,12 @@ function M.replaceTestParametersWithRegex(test_name)
   return result
 end
 
+function M.getParametricTestToSourceLevelTest(path, pos_id)
+  if parametric_test_to_source_level_test[path] then
+    return parametric_test_to_source_level_test[path][pos_id]
+  end
+
+  return nil
+end
+
 return M

spec/tests/nonStringTestNames.test.ts

@@ -0,0 +1,29 @@
+class Test {
+  public prop: string = 'prop'
+}
+
+const func1 = function () {}
+
+const func2 = () => {}
+
+describe('non-string test names', () => {
+  it(Test, () => {
+    
+  })
+
+  it(Test.prop, () => {
+    
+  })
+
+  it(func1, () => {
+    
+  })
+
+  it(func2, () => {
+    
+  })
+
+  it(1, () => {
+    
+  })
+})