[builtin] add support for apply template in templates.

- New builtin function `apply` for apply template in templates. - Improve generator and event handler for the HTTP server. - Fix errors about `funcMap` - Update logo for Pagine v2
webpagine · Jun 13, 2024 · 29a15b7 · 29a15b7
1 parent 9e19025
commit 29a15b7
Show file tree

Hide file tree

Showing 11 changed files with 119 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-<img src="https://github.com/jellyterra/artworks/raw/master/logo/pagine.svg" width="410.4" height="140" alt="Pagine logo" />
+<img src="https://github.com/jellyterra/artworks/raw/master/logo/pagine_2.svg" height="140" alt="Pagine logo" />
 
 # Pagine v2
 

diff --git a/cmd/pagine/main.go b/cmd/pagine/main.go
@@ -16,6 +16,8 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"sync/atomic"
+	"time"
 )
 
 var (
@@ -63,6 +65,14 @@ func generateAll(root, dest vfs.DirFS) error {
 		return err
 	}
 
+	err = os.RemoveAll(dest.Path)
+	switch {
+	case err == nil:
+	case os.IsNotExist(err):
+	default:
+		return err
+	}
+
 	err = fs.WalkDir(root, "/", func(path string, entry fs.DirEntry, err error) error {
 		if err != nil || entry.IsDir() {
 			return err
@@ -163,19 +173,33 @@ func serve(root, dest vfs.DirFS) error {
 		return err
 	}
 
+	var updated atomic.Bool
+
 	go func() {
-		select {
-		case e := <-w.Events:
-			fmt.Println(e)
-			err := generateAll(root, dest)
-			if err != nil {
-				fmt.Println(err)
+		for {
+			if !updated.Load() {
+				updated.Store(true)
+				err := generateAll(root, dest)
+				if err != nil {
+					fmt.Println(err)
+				}
 			}
+			time.Sleep(1 * time.Second)
 		}
+	}()
 
-		err := notify()
-		if err != nil {
-			fmt.Println(err)
+	go func() {
+		for {
+			select {
+			case e := <-w.Events:
+				fmt.Println(e)
+				updated.Store(false)
+			}
+
+			err := notify()
+			if err != nil {
+				fmt.Println(err)
+			}
 		}
 	}()
 

diff --git a/render/asciidoc.go b/render/asciidoc.go
@@ -1,3 +1,7 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
 package render
 
 import (

diff --git a/render/error.go b/render/error.go
@@ -1,11 +1,15 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
 package render
 
 import "fmt"
 
-type NoRendererFoundError struct {
+type NotFoundError struct {
 	Path string
 }
 
-func (e *NoRendererFoundError) Error() string {
+func (e *NotFoundError) Error() string {
 	return fmt.Sprint("no renderer found for the content type: ", e.Path)
 }
diff --git a/structure/builtin.go b/structure/builtin.go
@@ -1,3 +1,7 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
 package structure
 
 func add(aInt, bInt any) int { return aInt.(int) + bInt.(int) }

diff --git a/structure/empty.go b/structure/empty.go
@@ -0,0 +1,27 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
+package structure
+
+var emptyFuncMap = map[string]any{
+	"add": add,
+	"sub": sub,
+	"mul": mul,
+	"div": div,
+	"mod": mod,
+
+	"getAttr": empty,
+
+	"apply":          __empty,
+	"embed":          _empty,
+	"render":         _empty,
+	"renderMarkdown": _empty,
+	"renderAsciidoc": _empty,
+}
+
+func empty() any { return "" }
+
+func _empty(_ any) any { return "" }
+
+func __empty(_ any, _ any) any { return "" }
diff --git a/structure/env.go b/structure/env.go
@@ -1,3 +1,7 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
 package structure
 
 import (

diff --git a/structure/hierarchy.go b/structure/hierarchy.go
@@ -1,3 +1,7 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
 package structure
 
 import (

diff --git a/structure/template.go b/structure/template.go
@@ -1,3 +1,7 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
 package structure
 
 import (
@@ -69,15 +73,3 @@ func LoadTemplate(root vfs.DirFS) (*Template, error) {
 		GoTemplate:    goTemplate,
 	}, nil
 }
-
-var emptyFuncMap = map[string]any{
-	"getAttr":        empty,
-	"embed":          _empty,
-	"render":         _empty,
-	"renderMarkdown": _empty,
-	"renderAsciidoc": _empty,
-}
-
-func empty() any { return nil }
-
-func _empty(_ any) any { return "" }
diff --git a/structure/unit.go b/structure/unit.go
@@ -1,10 +1,15 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
 package structure
 
 import (
-	"fmt"
+	"bytes"
 	"github.com/webpagine/pagine/v2/collection"
 	"github.com/webpagine/pagine/v2/render"
 	"github.com/webpagine/pagine/v2/vfs"
+	"html/template"
 	"maps"
 	"path/filepath"
 	"strings"
@@ -30,7 +35,7 @@ type Unit struct {
 }
 
 func (u *Unit) Generate(env *Env, root, dest vfs.DirFS, data MetadataSet, define map[string]any) ([]error, error) {
-	var errors []error
+	var errors collection.Array[error]
 
 	templateName, templateKey := ParseTemplatePair(u.Template)
 
@@ -50,15 +55,16 @@ func (u *Unit) Generate(env *Env, root, dest vfs.DirFS, data MetadataSet, define
 	)
 
 	renderFromPath := func(r render.Renderer, pathStr any) string {
-		result, err := render.FromPath(render.Asciidoc, root, pathStr.(string))
+		result, err := render.FromPath(r, root, pathStr.(string))
 		if err != nil {
-			errors = append(errors, err)
+			errors.Append(err)
 			return ""
 		}
 		return result
 	}
 
-	funcMap := map[string]any{
+	var funcMap map[string]any
+	funcMap = map[string]any{
 		"add": add,
 		"sub": sub,
 		"mul": mul,
@@ -70,18 +76,32 @@ func (u *Unit) Generate(env *Env, root, dest vfs.DirFS, data MetadataSet, define
 
 		"getAttr": func() any { return attr },
 
+		"apply": func(pathStr any, data any) any {
+			t, err := template.New(filepath.Base(pathStr.(string))).Funcs(funcMap).ParseFS(root, pathStr.(string))
+			if err != nil {
+				errors.Append(err)
+				return ""
+			}
+			b := bytes.NewBuffer(nil)
+			err = t.Execute(b, data)
+			if err != nil {
+				errors.Append(err)
+				return ""
+			}
+			return b.String()
+		},
 		"embed": func(pathStr any) any {
 			b, err := root.ReadFile(pathStr.(string))
 			if err != nil {
-				errors = append(errors, err)
+				errors.Append(err)
 				return ""
 			}
 			return string(b)
 		},
 		"render": func(pathStr any) any {
 			r, ok := render.Renderers[filepath.Ext(pathStr.(string))[1:]]
 			if !ok {
-				errors = append(errors, fmt.Errorf("unknown template %q", pathStr))
+				errors.Append(&render.NotFoundError{Path: pathStr.(string)})
 				return ""
 			}
 			return renderFromPath(r, pathStr)
@@ -103,5 +123,5 @@ func (u *Unit) Generate(env *Env, root, dest vfs.DirFS, data MetadataSet, define
 		return nil, err
 	}
 
-	return errors, nil
+	return errors.RawArray, nil
 }
diff --git a/vfs/dirfs.go b/vfs/dirfs.go
@@ -1,3 +1,7 @@
+// Copyright 2024 Jelly Terra
+// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0
+// that can be found in the LICENSE file and https://mozilla.org/MPL/2.0/.
+
 package vfs
 
 import (