fix relative recursive templating without directory as context

Author: CodeShellDev

internals/template/path/operators/default.go

@@ -1,8 +1,6 @@
 package operators
 
 import (
-	"path/filepath"
-
 	"github.com/codeshelldev/goplater/internals/template/context"
 	"github.com/codeshelldev/goplater/internals/template/core"
 	"github.com/codeshelldev/goplater/internals/template/path/types"
@@ -13,12 +11,8 @@ func init() {
 		Name: "default",
 		AllowedProtocols: []types.TemplateProtocol{{ Name: "local" },{ Name: "remote" }},
 		ApplyFunc: func(pathComponent, content string, context context.TemplateContext) (string, context.TemplateContext) {
-			newContext := context
-			newContext.Path = filepath.Base(context.Path)
-			newContext.Invoker = context.Path
-
-			if core.Matcher.Match(newContext) {
-				content, _ = core.Renderer.Render(content, newContext)
+			if core.Matcher.Match(context) {
+				content, _ = core.Renderer.Render(content, context)
 			}
 
 			return content, context

internals/template/path/operators/supress.go

@@ -1,7 +1,6 @@
 package operators
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/codeshelldev/goplater/internals/template/context"
@@ -12,9 +11,7 @@ func init() {
 	Register(types.TemplateOperator{
 		Name: "supress",
 		AllowedProtocols: []types.TemplateProtocol{{ Name: "local" },{ Name: "remote" }},
-		ApplyFunc: func(pathComponent, content string, context context.TemplateContext) (string, context.TemplateContext) {
-			fmt.Println(context)
-			
+		ApplyFunc: func(pathComponent, content string, context context.TemplateContext) (string, context.TemplateContext) {			
 			return content, context
 		},
 		MatchFunc: func(match string) (bool, string) {

internals/template/path/protocols/local.go

@@ -20,15 +20,17 @@ func init() {
 			isRel := strings.HasPrefix(pathComponent, "./") || strings.HasPrefix(pathComponent, "../")
 
 			filePathAbs, _ := filepath.Abs(context.Invoker)
+			
+			relPathComponent := fsutils.Relative(filepath.Dir(filePathAbs), pathComponent)
+
+			context.Invoker = relPathComponent
 
 			if isRel {
 				res = fetchutils.Local(pathComponent, filepath.Dir(filePathAbs))
 			} else {
 				res = fetchutils.Local(pathComponent, context.Options.Source)
 			}
 
-			pathComponent = fsutils.Relative(filepath.Dir(filePathAbs), pathComponent)
-
 			return res, context
 		},
 		MatchFunc: func(match string) (bool, string) {