providers/import: Add execute function that returns ExecutionResult
This commit is contained in:
parent
1b3c1d3585
commit
30323c0d59
@ -22,6 +22,7 @@ func (this *Provider) FuncMapFor (document *step.Document) template.FuncMap {
|
|||||||
document: document,
|
document: document,
|
||||||
}
|
}
|
||||||
return template.FuncMap {
|
return template.FuncMap {
|
||||||
|
"execute": stat.funcExecute,
|
||||||
"include": stat.funcInclude,
|
"include": stat.funcInclude,
|
||||||
"includeHTML": stat.funcIncludeHTML,
|
"includeHTML": stat.funcIncludeHTML,
|
||||||
}
|
}
|
||||||
@ -31,16 +32,28 @@ type state struct {
|
|||||||
document *step.Document
|
document *step.Document
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *state) funcInclude (name string, data any) (string, error) {
|
func (this *state) funcExecute (name string, data any) (step.ExecutionResult, error) {
|
||||||
document, err := this.document.Environment().Parse(name)
|
document, err := this.document.Environment().Parse(name)
|
||||||
if err != nil { return "", err }
|
if err != nil { return step.ExecutionResult { }, err }
|
||||||
builder := strings.Builder { }
|
builder := strings.Builder { }
|
||||||
err = document.Execute(&builder, step.ExecutionData { Data: data })
|
err = document.Execute(&builder, step.ExecutionData { Data: data })
|
||||||
if err != nil { return "", err }
|
if err != nil { return step.ExecutionResult { }, err }
|
||||||
return builder.String(), nil
|
return step.ExecutionResult {
|
||||||
|
Author: document.Author,
|
||||||
|
Title: document.Title,
|
||||||
|
Extends: document.Extends,
|
||||||
|
FrontMatter: document.FrontMatter,
|
||||||
|
Body: template.HTML(builder.String()),
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (this *state) funcInclude (name string, data any) (string, error) {
|
||||||
|
result, err := this.funcIncludeHTML(name, data)
|
||||||
|
return string(result), err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *state) funcIncludeHTML (name string, data any) (template.HTML, error) {
|
func (this *state) funcIncludeHTML (name string, data any) (template.HTML, error) {
|
||||||
result, err := this.funcInclude(name, data)
|
result, err := this.funcExecute(name, data)
|
||||||
return template.HTML(result), err
|
if err != nil { return "", err }
|
||||||
|
return result.Body, nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user