refactor: simplify api

Author: seflue

lua/telescope-orgmode/actions.lua

@@ -1,3 +1,4 @@
+require('telescope-orgmode.typehints')
 local finders = require('telescope-orgmode.finders')
 local org = require('telescope-orgmode.org')
 
@@ -63,9 +64,9 @@ function M.insert(_)
     local destination = (function()
       if entry.value.headline then
         -- Link to a specific heading if is set
-        return org.get_link_to_headline(entry.value.headline)
+        return entry.value.headline:get_link()
       else
-        return org.get_link_to_file(entry.value.file)
+        return entry.value.file:get_link()
       end
     end)()
 

lua/telescope-orgmode/entry_maker/headlines.lua

@@ -1,12 +1,7 @@
-require('telescope-orgmode.typehints')
+require('telescope-orgmode.entry_maker.types')
 local org = require('telescope-orgmode.org')
 local entry_display = require('telescope.pickers.entry_display')
 
----@class OrgHeadlineEntry
----@field file OrgApiFile
----@field filename string
----@field headline OrgApiHeadline
-
 ---@param file_results { file: OrgApiFile, filename: string }[]
 ---@return OrgHeadlineEntry[]
 local function index_headlines(file_results, opts)

lua/telescope-orgmode/entry_maker/orgfiles.lua

@@ -1,14 +1,9 @@
-require('telescope-orgmode.typehints')
+require('telescope-orgmode.entry_maker.types')
 local org = require('telescope-orgmode.org')
 local entry_display = require('telescope.pickers.entry_display')
 
 local M = {}
 
----@class OrgFileEntry
----@field file OrgApiFile
----@field filename string
----@field title string?
-
 ---@param file_results { file: OrgApiFile, filename: string }[]
 ---@return OrgFileEntry[]
 local function index_orgfiles(file_results)

lua/telescope-orgmode/entry_maker/types.lua

@@ -1,5 +1,7 @@
 require('telescope-orgmode.typehints')
 
+local OrgApiHeadline = require('orgmode.api.headline')
+local OrgApiFile = require('orgmode.api.file')
 local OrgApi = require('orgmode.api')
 
 local M = {}
@@ -28,18 +30,6 @@ function M.refile(opts)
   return OrgApi.refile(opts)
 end
 
----@param headline OrgApiHeadline
----@return string
-function M.get_link_to_headline(headline)
-  return OrgApi.get_link_to_headline(headline)
-end
-
----@param file OrgApiFile
----@return string
-function M.get_link_to_file(file)
-  return OrgApi.get_link_to_file(file)
-end
-
 function M.insert_link(destination)
   return OrgApi.insert_link(destination)
 end

lua/telescope-orgmode/org.lua

@@ -1,13 +1,3 @@
----@class MatchEntry
----@field value OrgHeadlineEntry | OrgFileEntry
----@field ordinal string
----@field filename string
----@field lnum number
----@field display function
----@field location string,
----@field line string,
----@field tags string,
-
 -- Type-hints copied from nvim-orgmode to simplify development
 
 ---@class OrgFileMetadata
@@ -32,6 +22,7 @@
 ---@field filename string absolute path of the current file
 ---@field headlines OrgApiHeadline[]
 ---@field is_archive_file boolean
+---@field get_link string
 ---@field private _file OrgFile
 --
 ---@class OrgRange
@@ -64,6 +55,7 @@
 ---@field is_archived boolean headline marked with the `:ARCHIVE:` tag
 ---@field headlines OrgApiHeadline[]
 ---@field id_get_or_create number
+---@field get_link string
 ---@field private _section OrgHeadline
 ---@field private _index number