Resolve links relative to notebook dir

internal/core/fs_test.go

@@ -3,6 +3,7 @@ package core
 import (
 	"path/filepath"
 	"slices"
+	"strings"
 )
 
 // fileStorageMock implements an in-memory FileStorage for testing purposes.
@@ -61,7 +62,11 @@ func (fs *fileStorageMock) DirExists(path string) (bool, error) {
 }
 
 func (fs *fileStorageMock) IsDescendantOf(dir string, path string) (bool, error) {
-	panic("not implemented")
+	rel, err := filepath.Rel(dir, path)
+	if err != nil {
+		return false, err
+	}
+	return !filepath.IsAbs(rel) && !strings.HasPrefix(rel, ".."), nil
 }
 
 func (fs *fileStorageMock) Read(path string) ([]byte, error) {

internal/core/notebook.go

@@ -245,7 +245,20 @@ func (n *Notebook) FindCollections(kind CollectionKind, sorters []CollectionSort
 
 // RelPath returns the path relative to the notebook root to the given path.
 func (n *Notebook) RelPath(originalPath string) (string, error) {
-	path, err := n.fs.Abs(originalPath)
+	path := originalPath
+	if !filepath.IsAbs(path) {
+		isInsideNotebook, err := n.fs.IsDescendantOf(n.Path, n.fs.WorkingDir())
+		if err != nil {
+			return path, fmt.Errorf("%v: not a valid notebook path: %w", originalPath, err)
+		}
+		if isInsideNotebook {
+			path = filepath.Join(n.fs.WorkingDir(), path)
+		} else {
+			path = filepath.Join(n.Path, path)
+		}
+	}
+
+	path, err := n.fs.Abs(path)
 	if err != nil {
 		return path, fmt.Errorf("%v: not a valid notebook path: %w", originalPath, err)
 	}

internal/core/notebook_test.go

@@ -0,0 +1,68 @@
+package core
+
+import (
+	"testing"
+
+	"github.com/zk-org/zk/internal/util"
+	"github.com/zk-org/zk/internal/util/test/assert"
+)
+
+// TestRelPathResolvesInsideNotebook tests that Notebook.RelPath() resolves
+// relative paths relative to the notebook directory.
+func TestRelPathResolvesInsideNotebook(t *testing.T) {
+	notebookPath := "/notebook"
+	workingDir := "/notebook"
+
+	fs := newFileStorageMock(workingDir, []string{notebookPath})
+
+	notebook := NewNotebook(notebookPath, NewDefaultConfig(), NotebookPorts{
+		FS:     fs,
+		Logger: &util.NullLogger,
+	})
+
+	relPath, err := notebook.RelPath("inbox/note.md")
+
+	assert.Nil(t, err)
+	assert.Equal(t, relPath, "inbox/note.md")
+}
+
+// TestRelPathResolvesOutsideNotebook tests that Notebook.RelPath() resolves
+// relative paths relative to the notebook directory, not the current working
+// directory.
+func TestRelPathResolvesOutsideNotebook(t *testing.T) {
+	notebookPath := "/notebook"
+	workingDir := "/other/dir"
+
+	fs := newFileStorageMock(workingDir, []string{notebookPath})
+
+	notebook := NewNotebook(notebookPath, NewDefaultConfig(), NotebookPorts{
+		FS:     fs,
+		Logger: &util.NullLogger,
+	})
+
+	relPath, err := notebook.RelPath("inbox/note.md")
+
+	assert.Nil(t, err)
+	assert.Equal(t, relPath, "inbox/note.md")
+}
+
+// TestRelPathResolvesInsideNotebookSubdir tests that Notebook.RelPath() resolves
+// relative paths relative to the current working directory when it is a child
+// of the notebook root.
+func TestRelPathResolvesInsideNotebookSubdir(t *testing.T) {
+	notebookPath := "/notebook"
+	workingDir := "/notebook/subdir"
+
+	fs := newFileStorageMock(workingDir, []string{notebookPath, workingDir})
+
+	notebook := NewNotebook(notebookPath, NewDefaultConfig(), NotebookPorts{
+		FS:     fs,
+		Logger: &util.NullLogger,
+	})
+
+	// Relative path from /notebook/subdir should resolve to /notebook/subdir/note.md
+	relPath, err := notebook.RelPath("note.md")
+
+	assert.Nil(t, err)
+	assert.Equal(t, relPath, "subdir/note.md")
+}

tests/linked-by-hierarchical-path.tesh

@@ -0,0 +1,11 @@
+# Running from notebook directory.
+$ cd full-sample
+$ zk list -qf\{{title}} --linked-by inbox/er4k.md
+>Channel
+>Ownership in Rust
+
+# Running from outside notebook with --notebook-dir.
+$ cd ..
+$ zk list --notebook-dir=full-sample -qf\{{title}} --linked-by inbox/er4k.md
+>Channel
+>Ownership in Rust