Expose dirname from SourceCodePos

core/SourceCodePos.savi

@@ -2,5 +2,12 @@
   // TODO: include more properties from the original Savi::Source::Pos?
   :var string String: ""
   :var filename String: ""
+  :: The filepath relative to the package
+  :var filepath_pkgrel String: ""
+  :: The filepath relative to the root package
+  :var filepath_rootpkgrel String: ""
+  :var dirname String: ""
+  :var pkgname String: ""
+  :var pkgpath String: ""
   :var row USize: 0
   :var col USize: 0

src/savi/compiler/code_gen.cr

@@ -3262,10 +3262,16 @@ class Savi::Compiler::CodeGen
   def gen_source_code_pos(pos : Source::Pos)
     @source_code_pos_globals.fetch pos do
       global = gen_global_const(@gtypes["SourceCodePosition"], {
-        "string"   => gen_string(pos.content),
-        "filename" => gen_string(pos.source.filename),
-        "row"      => @isize.const_int(pos.row),
-        "col"      => @isize.const_int(pos.col),
+        "string"  => gen_string(pos.content),
+        "filename"=> gen_string(pos.source.filename),
+        "dirname" => gen_string(pos.source.dirname),
+        "pkgname" => gen_string(pos.source.package.name),
+        "pkgpath" => gen_string(pos.source.package.path),
+        "row"     => @isize.const_int(pos.row),
+        "col"     => @isize.const_int(pos.col),
+        "filepath_pkgrel" => gen_string(pos.source.filepath_relative_to_package),
+        "filepath_rootpkgrel" => gen_string((Path.new(pos.source.dirname).relative_to(
+          Path.new(@ctx.not_nil!.root_package_link.path)) / pos.source.filename).to_s)
       })
 
       @source_code_pos_globals[pos] = global

src/savi/source.cr

@@ -14,6 +14,14 @@ struct Savi::Source
     File.join(@dirname, @filename)
   end
 
+  def filepath_relative_to_package
+    if reldir = Path.new(@dirname).relative_to?(@package.path)
+      (reldir / @filename).to_s
+    else
+      raise "File #{path} not relative to package #{@package.path}"
+    end
+  end
+
   def entire_pos
     Source::Pos.index_range(self, 0, content.bytesize)
   end