From: early <me@earlybird.gay>
Date: Sat, 21 Dec 2024 02:14:57 +0000 (-0700)
Subject: Improve parent scoping; decouple compute id from html id
X-Git-Url: https://git.earlybird.gay/?a=commitdiff_plain;h=76409af3ea7ab65b2436f8d9e8cf63a0e5481e34;p=today

Improve parent scoping; decouple compute id from html id
---

diff --git a/web/internal/compile/compile.go b/web/internal/compile/compile.go
index 0081d2b..ea89f75 100644
--- a/web/internal/compile/compile.go
+++ b/web/internal/compile/compile.go
@@ -71,7 +71,6 @@ func Compile(root TemplateSource, transform ...func(root *html.Node)) ([]Result,
 		}, document.FirstChild)
 
 		// Replace template functions in the root before we add any subsources
-		// fmt.Println(root.TemplateFuncs())
 		htmltree.Walk(document, func(n *html.Node) (bool, error) {
 			replaceTemplateFuncs(root, n)
 			return false, nil
@@ -111,11 +110,15 @@ func Compile(root TemplateSource, transform ...func(root *html.Node)) ([]Result,
 						for fname, f := range templateSource.TemplateFuncs() {
 							templateFuncs[snakeCase(n.Data)+"_"+fname] = f
 						}
-						// Add $today_parent before template sources
+						// Add parent scoping
 						n.Parent.InsertBefore(&html.Node{
 							Type: html.TextNode,
-							Data: "{{ $today_parent := . }}",
+							Data: "{{ call $today_upParent . }}",
 						}, n)
+						n.Parent.InsertBefore(&html.Node{
+							Type: html.TextNode,
+							Data: "{{ call $today_downParent }}",
+						}, n.NextSibling)
 						// Parse HTML fragment and replace the content of the node with it
 						computeSubSource, err := insertTemplateSource(lang, templateSource, n)
 						if err != nil {
@@ -143,10 +146,13 @@ func Compile(root TemplateSource, transform ...func(root *html.Node)) ([]Result,
 
 		// POSTPROCESSING
 
-		// Assign .SetDot to $setDot
+		// Assign functions
+		funcAssigns := `{{ $today_setDot := .SetDot }}
+		{{ $today_upParent := .UpParent }}
+		{{ $today_downParent := .DownParent }}`
 		document.InsertBefore(&html.Node{
 			Type: html.TextNode,
-			Data: `{{ $setDot := .SetDot }}{{ with .Data }}`,
+			Data: funcAssigns + `{{ with .Data }}`,
 		}, document.FirstChild)
 		// Add end to end
 		document.InsertBefore(&html.Node{
@@ -157,7 +163,7 @@ func Compile(root TemplateSource, transform ...func(root *html.Node)) ([]Result,
 		// Split up templates in text nodes
 		splitTemplateNodes(document)
 
-		// Traverse the document and add $setDot on entry and exit from pipelines
+		// Traverse the document and add $today_setDot on entry and exit from pipelines
 		addSetDots(document)
 
 		for _, tf := range transform {
diff --git a/web/internal/compile/compute.go b/web/internal/compile/compute.go
index ddc3256..1b29637 100644
--- a/web/internal/compile/compute.go
+++ b/web/internal/compile/compute.go
@@ -2,6 +2,7 @@
 package compile
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 	"reflect"
@@ -16,14 +17,35 @@ type computeNode struct {
 	compute          render.OnLoadFunc
 	asDataFromParent map[string]string
 	children         []*computeNode
+
+	setDot     func(any) error
+	upParent   func(any) error
+	downParent func() error
 }
 
-func (root *computeNode) Compute(r *http.Request) (render.Data, func(any) error, error) {
-	var dot any
-	setDot := func(val any) error {
+func (root *computeNode) Compute(r *http.Request) (render.Data, error) {
+	var dot, parent any
+	var parentStack []any
+	root.setDot = func(val any) error {
 		dot = val
 		return nil
 	}
+	root.upParent = func(val any) error {
+		parent = val
+		parentStack = append(parentStack, val)
+		return nil
+	}
+	root.downParent = func() error {
+		if len(parentStack) == 0 {
+			return errors.New("unbalanced parent stack control")
+		} else if len(parentStack) == 1 {
+			parent = nil
+		} else {
+			parent = parentStack[len(parentStack)-1]
+		}
+		parentStack = parentStack[:len(parentStack)-1]
+		return nil
+	}
 	ctx := r.Context()
 
 	var f func(n *computeNode, data render.Data) error
@@ -59,6 +81,7 @@ func (root *computeNode) Compute(r *http.Request) (render.Data, func(any) error,
 					}
 					childData.Set(dataKey, val)
 				}
+				childData.Set("today_parent", parent)
 				f(child, childData)
 				return childData, child.compute(ctx, childData)
 			})
@@ -69,7 +92,19 @@ func (root *computeNode) Compute(r *http.Request) (render.Data, func(any) error,
 	}
 
 	data := render.NewData(r)
-	return data, setDot, f(root, data)
+	return data, f(root, data)
+}
+
+func (root *computeNode) SetDot(val any) error {
+	return root.setDot(val)
+}
+
+func (root *computeNode) UpParent(val any) error {
+	return root.upParent(val)
+}
+
+func (root *computeNode) DownParent() error {
+	return root.downParent()
 }
 
 // Get a variable from data.
diff --git a/web/internal/compile/conversions.go b/web/internal/compile/conversions.go
index 303aff1..cc4ea83 100644
--- a/web/internal/compile/conversions.go
+++ b/web/internal/compile/conversions.go
@@ -5,5 +5,5 @@ import "strings"
 
 // EXTREMELY lazy snake caser
 func snakeCase(s string) string {
-	return strings.ToLower(strings.Replace(s, "-", "_", -1))
+	return strings.ToLower(strings.ReplaceAll(s, "-", "_"))
 }
diff --git a/web/internal/compile/template.go b/web/internal/compile/template.go
index bf90afb..0225dc4 100644
--- a/web/internal/compile/template.go
+++ b/web/internal/compile/template.go
@@ -4,6 +4,7 @@ package compile
 import (
 	"errors"
 	"fmt"
+	"math/rand/v2"
 	"regexp"
 	"slices"
 	"strings"
@@ -291,9 +292,9 @@ func replaceTemplateFields(n *html.Node) {
 				inAttrs && isDataAttr[i] {
 				// special case; . is parentable but shouldn't be appended
 				if token == "." {
-					token = "$today_parent"
+					token = ".today_parent"
 				} else {
-					token = "$today_parent" + token
+					token = ".today_parent" + token
 				}
 			}
 			output = append(output, token)
@@ -328,7 +329,7 @@ func removeDataAttrs(n *html.Node) map[string]string {
 func insertTemplateSource(lang language.Tag, subSource TemplateSource, context *html.Node) (*computeNode, error) {
 	computedName := snakeCase(subSource.Name())
 	// ===== CONTEXT PREPROCESSING =====
-	// Raise any fields pre-existing in the context to $today_parent.field.
+	// Raise any fields pre-existing in the context to .today_parent.field.
 	raiseDepth := 0
 	raiseStack := []string{}
 	htmltree.Walk(context.FirstChild, func(n *html.Node) (bool, error) {
@@ -503,15 +504,11 @@ func insertTemplateSource(lang language.Tag, subSource TemplateSource, context *
 	}
 
 	// Generate a computeNode for this part.
-	htmlId := getAttr(context, "id")
-	scopeName := computedName + "_" + snakeCase(htmlId)
-	if htmlId == "" || containsTemplate(htmlId) {
-		htmlId = ""
-		scopeName = computedName
-	}
+	computeId := fmt.Sprintf("%x", rand.Int32())
+	scopeName := computedName + "_" + computeId
 	compute := &computeNode{
 		name:             computedName,
-		htmlId:           htmlId,
+		htmlId:           computeId,
 		compute:          subSource.OnLoad(),
 		asDataFromParent: asData,
 	}
@@ -568,7 +565,7 @@ func addSetDots(document *html.Node) {
 			if setsDot(n.Data) {
 				n.Parent.InsertBefore(&html.Node{
 					Type: html.TextNode,
-					Data: `{{ call $setDot . }}`,
+					Data: `{{ call $today_setDot . }}`,
 				}, n.NextSibling)
 				endAcc = append(endAcc, true)
 			} else {
@@ -580,7 +577,7 @@ func addSetDots(document *html.Node) {
 			if shouldSet {
 				n.Parent.InsertBefore(&html.Node{
 					Type: html.TextNode,
-					Data: "{{ call $setDot . }}",
+					Data: "{{ call $today_setDot . }}",
 				}, n.NextSibling)
 			}
 			if strings.Contains(n.Data, "else") {
diff --git a/web/page/serve.go b/web/page/serve.go
index 427983f..a4ea10e 100644
--- a/web/page/serve.go
+++ b/web/page/serve.go
@@ -9,7 +9,9 @@ import (
 )
 
 type RootData struct {
-	SetDot func(value any) error
+	SetDot     func(value any) error
+	UpParent   func(value any) error
+	DownParent func() error
 
 	Data render.Data
 }
@@ -21,12 +23,15 @@ type renderable struct {
 
 func (p *Page) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	toRender := p.chooseRenderable(r)
-	data, setDot, err := toRender.templateLoad.Compute(r)
+	loader := toRender.templateLoad
+	data, err := loader.Compute(r)
 	if err != nil {
 		panic(err)
 	}
 	root := RootData{
-		SetDot: setDot,
+		SetDot:     loader.SetDot,
+		UpParent:   loader.UpParent,
+		DownParent: loader.DownParent,
 
 		Data: data,
 	}
diff --git a/web/render/data.go b/web/render/data.go
index 3f9fe9f..d344a25 100644
--- a/web/render/data.go
+++ b/web/render/data.go
@@ -49,5 +49,8 @@ func (d Data) Set(key string, value any) {
 
 type OnLoadFunc func(ctx context.Context, data Data) error
 type Loader interface {
-	Compute(r *http.Request) (Data, func(any) error, error)
+	Compute(r *http.Request) (Data, error)
+	SetDot(val any) error
+	UpParent(val any) error
+	DownParent() error
 }