feat(utils): add optional parameter base to substitute_path()

Author: broken-pen

lua/orgmode/utils/fs.lua

@@ -3,18 +3,23 @@ local utils = require('orgmode.utils')
 local M = {}
 
 ---@param path_str string
+---@param base? string
 ---@return string | false
-function M.substitute_path(path_str)
+function M.substitute_path(path_str, base)
   if path_str:match('^/') then
     return path_str
   elseif path_str:match('^~/') then
     local home_path = os.getenv('HOME')
     return home_path and path_str:gsub('^~', home_path) or false
   elseif path_str:match('^%./') then
-    local base = vim.fn.fnamemodify(utils.current_file_path(), ':p:h')
+    if not base then
+      base = vim.fn.fnamemodify(utils.current_file_path(), ':p:h')
+    end
     return base .. '/' .. path_str:gsub('^%./', '')
   elseif path_str:match('^%.%./') then
-    local base = vim.fn.fnamemodify(utils.current_file_path(), ':p:h')
+    if not base then
+      base = vim.fn.fnamemodify(utils.current_file_path(), ':p:h')
+    end
     return base .. '/' .. path_str
   end
   return false

tests/plenary/utils/fs_spec.lua

@@ -49,6 +49,12 @@ describe('substitute_path', function()
   it('fails on all other relative paths', function()
     assert.is.False(fs_utils.substitute_path('a/b/c'))
   end)
+
+  it('allows passing a custom base', function()
+    local output = fs_utils.substitute_path('./b/c', 'a/')
+    assert(output)
+    assert.are.same(output, 'a//b/c')
+  end)
 end)
 
 describe('get_real_path', function()