sashakoshka/step
sashakoshka/step
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Documents now make use of relative paths to parse parent documents

Browse Source
This commit is contained in:
Sasha Koshka 2024-12-08 02:57:49 -05:00
parent f1fccdc2ae
commit cc13abd8f8
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
document.go
View File

@ -37,7 +37,7 @@ func (this *Document) Execute (output io.Writer, data ExecutionData) error {
if err != nil { return err } if err != nil { return err }
// execute parent with this document's result // execute parent with this document's result
parent, err := this.environment.Parse(this.Extends) parent, err := this.environment.ParseRelative(this.Extends, this)
if err != nil { return err } if err != nil { return err }
return parent.Execute(output, ExecutionData { return parent.Execute(output, ExecutionData {
Data: data.Data, Data: data.Data,

10
environment.go
View File

@ -52,19 +52,15 @@ func (this *Environment) Parse (name string) (*Document, error) {
// ParseRelative is like Parse, but treats the name as a path relative to the // ParseRelative is like Parse, but treats the name as a path relative to the
// given document. // given document.
func (this *Environment) ParseRelative (name string, document *Document) (*Document, error) { func (this *Environment) ParseRelative (name string, document *Document) (*Document, error) {
var fileName string
if document == nil { if document == nil {
fileName = filepath.Clean(name) name = filepath.Clean(name)
} else { } else {
nam, err := document.Abs(name) nam, err := document.Rel(name)
if err != nil { return nil, err }
fileName = nam
nam, err = document.Rel(name)
if err != nil { return nil, err } if err != nil { return nil, err }
name = nam name = nam
} }
input, err := this.GetFS().Open(fileName) input, err := this.GetFS().Open(name)
if err != nil { if err != nil {
// if the file couldn't be opened, delete from cache in case the // if the file couldn't be opened, delete from cache in case the
// file was deleted // file was deleted