fix: added default value for note_path_func

Author: neo451

lua/obsidian/config/default.lua

@@ -22,6 +22,10 @@ return {
   workspaces = {},
   log_level = vim.log.levels.INFO,
   note_id_func = require("obsidian.builtin").zettel_id,
+  note_path_func = function(spec)
+    local path = spec.dir / tostring(spec.id)
+    return path
+  end,
   wiki_link_func = require("obsidian.builtin").wiki_link_id_prefix,
   markdown_link_func = require("obsidian.builtin").markdown_link,
   preferred_link_style = "wiki",

lua/obsidian/note.lua

@@ -122,24 +122,19 @@ end
 --- This respects the user's `note_path_func` if configured, otherwise essentially falls back to
 --- `note_opts.dir / (note_opts.id .. ".md")`.
 ---
---- @param id string The note ID
---- @param dir obsidian.Path The note path
+---@param id string The note ID
+---@param dir obsidian.Path The note path
 ---@return obsidian.Path
 ---@private
 Note._generate_path = function(id, dir)
   ---@type obsidian.Path
   local path
 
-  if Obsidian.opts.note_path_func ~= nil then
-    path = Path.new(Obsidian.opts.note_path_func { id = id, dir = dir, title = nil })
-    -- Ensure path is either absolute or inside `opts.dir`.
-    -- NOTE: `opts.dir` should always be absolute, but for extra safety we handle the case where
-    -- it's not.
-    if not path:is_absolute() and (dir:is_absolute() or not dir:is_parent_of(path)) then
-      path = dir / path
-    end
-  else
-    path = dir / tostring(id)
+  path = Path.new(Obsidian.opts.note_path_func { id = id, dir = dir })
+
+  -- NOTE: `opts.dir` should always be absolute, but for extra safety we handle the case where
+  if not path:is_absolute() and (dir:is_absolute() or not dir:is_parent_of(path)) then
+    path = dir / path
   end
 
   -- Ensure there is only one ".md" suffix. This might arise if `note_path_func`

lua/obsidian/types.lua

@@ -71,8 +71,8 @@
 ---@field notes_subdir string|?
 ---@field templates obsidian.config.TemplateOpts
 ---@field new_notes_location obsidian.config.NewNotesLocation
----@field note_id_func (fun(title: string|?, path: obsidian.Path|?): string)|?
----@field note_path_func (fun(spec: { id: string, dir: obsidian.Path, title: string|? }): string|obsidian.Path)|?
+---@field note_id_func (fun(id: string|?, path: obsidian.Path|?): string)|?
+---@field note_path_func (fun(spec: { id: string, dir: obsidian.Path }): string|obsidian.Path)|?
 ---@field wiki_link_func (fun(opts: {path: string, label: string, id: string|?}): string)
 ---@field markdown_link_func (fun(opts: {path: string, label: string, id: string|?}): string)
 ---@field preferred_link_style obsidian.config.LinkStyle