From: early <me@earlybird.gay>
Date: Sun, 8 Sep 2024 00:05:21 +0000 (-0600)
Subject: File() -> Source(), recursive list file deps
X-Git-Url: https://git.earlybird.gay/?a=commitdiff_plain;h=5d9318032405ae13cbe0025edbfb4b326697dab8;p=today

File() -> Source(), recursive list file deps
---

diff --git a/include/callstack.go b/include/callstack.go
index 3e889df..15e4910 100644
--- a/include/callstack.go
+++ b/include/callstack.go
@@ -35,21 +35,27 @@ func isNotEligible(caller string, ignorePackages []string) bool {
 // getCallStackButt gets the calling file, ignoring any file in an ignored
 // package.
 func getCallStackButt(ignorePackages []string) (string, error) {
-	skip := 0
-	for {
-		callers := make([]uintptr, 10)
+	const incr int = 2
+	const max int = incr * 10
+	for skip := 0; skip < max; skip += incr {
+		callers := make([]uintptr, incr)
 		count := runtime.Callers(skip, callers)
 		frames := runtime.CallersFrames(callers)
-		for frame, more := frames.Next(); more; {
+
+		frame, more := frames.Next()
+		for {
 			// If getCallStackButt gets called from main, use the runtime to
 			// determine what module main is in.
 			if isNotEligible(frame.Function, ignorePackages) {
+				if !more {
+					break
+				}
 				frame, more = frames.Next()
 			} else {
 				return frame.File, nil
 			}
 		}
-		if count < 10 {
+		if count < incr {
 			break
 		}
 	}
diff --git a/internal/compile/compile.go b/internal/compile/compile.go
index f5937bb..2cbcc70 100644
--- a/internal/compile/compile.go
+++ b/internal/compile/compile.go
@@ -16,7 +16,7 @@ import (
 
 type Source interface {
 	Name() string
-	File() include.Opener
+	Source() include.Opener
 	Includes() []Source
 }
 
@@ -44,7 +44,7 @@ type Result struct {
 
 func Compile(root TemplateSource, transform ...func(root *html.Node)) (Result, error) {
 	var result Result
-	reader, err := root.File().Open()
+	reader, err := root.Source().Open()
 	if err != nil {
 		return result, err
 	}
diff --git a/internal/compile/component.go b/internal/compile/component.go
index 0c2aaff..7f77949 100644
--- a/internal/compile/component.go
+++ b/internal/compile/component.go
@@ -19,7 +19,7 @@ func insertComponentSource(subSource Source, document *html.Node) error {
 	// subSource should be:
 	// <template> and <script>
 	// <script>
-	reader, err := subSource.File().Open()
+	reader, err := subSource.Source().Open()
 	if err != nil {
 		return err
 	}
diff --git a/internal/compile/template.go b/internal/compile/template.go
index 894e667..808c3fd 100644
--- a/internal/compile/template.go
+++ b/internal/compile/template.go
@@ -324,7 +324,7 @@ func insertTemplateSource(subSource TemplateSource, context *html.Node) (*comput
 	// ===== SUBSOURCE PROCESSING =====
 	// Parse the subSource in the context of context.
 	// Require that subSource be contained in a template.
-	reader, err := subSource.File().Open()
+	reader, err := subSource.Source().Open()
 	if err != nil {
 		return nil, err
 	}
@@ -337,6 +337,11 @@ func insertTemplateSource(subSource TemplateSource, context *html.Node) (*comput
 		return nil, errors.New("fragments must be contained in a template")
 	}
 
+	isShadow := false
+	if getAttr(root, "shadowrootmode") != "" {
+		isShadow = true
+	}
+
 	// Walk the tree to do a couple of things:
 	//   - Replace template functions with namespaced functions.
 	//   - Find slots in the subSource.
@@ -372,7 +377,11 @@ func insertTemplateSource(subSource TemplateSource, context *html.Node) (*comput
 		slotName := htmltree.GetAttr(n, "slot")
 		slot := slots[slotName]
 		if slot != nil {
-			slot.Parent.InsertBefore(n, slot)
+			if !isShadow {
+				slot.Parent.InsertBefore(n, slot)
+			} else {
+				context.AppendChild(n)
+			}
 			usedSlot[slotName] = true
 		} else {
 			root.AppendChild(n)
@@ -381,34 +390,42 @@ func insertTemplateSource(subSource TemplateSource, context *html.Node) (*comput
 	}
 
 	// ...then move content from the template to the context...
-	n = root.FirstChild
-	for n != nil {
-		next := n.NextSibling
-		root.RemoveChild(n)
-		context.AppendChild(n)
-		n = next
+	if !isShadow {
+		// If not in shadow, move stuff out of the root into the context.
+		n = root.FirstChild
+		for n != nil {
+			next := n.NextSibling
+			root.RemoveChild(n)
+			context.AppendChild(n)
+			n = next
+		}
+	} else {
+		// If in shadow, move the whole root.
+		context.InsertBefore(root, context.FirstChild)
 	}
 
 	// ...then remove any slots that were used.
 	// For slots that aren't used, move up their data first.
-	htmltree.Walk(context, func(n *html.Node) (bool, error) {
-		if n.Type == html.ElementNode && n.Data == "slot" {
-			slotName := htmltree.GetAttr(n, "name")
-			slot := slots[slotName]
-			used := usedSlot[slotName]
-			if !used {
-				n = slot.FirstChild
-				for n != nil {
-					next := n.NextSibling
-					slot.RemoveChild(n)
-					slot.Parent.InsertBefore(n, slot)
-					n = next
+	if !isShadow {
+		htmltree.Walk(context, func(n *html.Node) (bool, error) {
+			if n.Type == html.ElementNode && n.Data == "slot" {
+				slotName := htmltree.GetAttr(n, "name")
+				slot := slots[slotName]
+				used := usedSlot[slotName]
+				if !used {
+					n = slot.FirstChild
+					for n != nil {
+						next := n.NextSibling
+						slot.RemoveChild(n)
+						slot.Parent.InsertBefore(n, slot)
+						n = next
+					}
 				}
+				slot.Parent.RemoveChild(slot)
 			}
-			slot.Parent.RemoveChild(slot)
-		}
-		return false, nil
-	})
+			return false, nil
+		})
+	}
 
 	// Generate a computeNode for this part.
 	htmlId := getAttr(context, "id")
@@ -441,7 +458,6 @@ func insertTemplateSource(subSource TemplateSource, context *html.Node) (*comput
 	if !subSource.IncludeTagName() {
 		n := context.FirstChild
 		for n != nil {
-			fmt.Println(n, context, n.Parent)
 			context.RemoveChild(n)
 			context.Parent.InsertBefore(n, context)
 			n = context.FirstChild
diff --git a/page/page.go b/page/page.go
index 65c2f05..d3ea5e9 100644
--- a/page/page.go
+++ b/page/page.go
@@ -10,6 +10,7 @@ import (
 	"git.earlybird.gay/today-engine/htmltree"
 	"git.earlybird.gay/today-engine/include"
 	"git.earlybird.gay/today-engine/internal/compile"
+	"git.earlybird.gay/today-engine/part"
 	"git.earlybird.gay/today-engine/render"
 )
 
@@ -136,10 +137,24 @@ func (p *Page) Name() string {
 	return p.name
 }
 
-func (p *Page) File() include.Opener {
+func (p *Page) Source() include.Opener {
 	return p.source
 }
 
+// FileDependencies returns a list of absolute paths to files that are used in
+// this page and its dependencies.
+func (p *Page) FileDependencies() []string {
+	out := make([]string, 0)
+	if fopener, ok := p.Source().(include.FileOpener); ok {
+		out = append(out, fopener.FileName())
+	}
+	for _, dep := range p.includes {
+		partDep, _ := dep.(*part.Part)
+		out = append(out, partDep.FileDependencies()...)
+	}
+	return out
+}
+
 // Pages are never included as a child, so this is always false.
 func (p *Page) IncludeTagName() bool {
 	return false
diff --git a/part/part.go b/part/part.go
index 7ef9c72..ed808cf 100644
--- a/part/part.go
+++ b/part/part.go
@@ -101,10 +101,24 @@ func (p *Part) Name() string {
 	return p.name
 }
 
-func (p *Part) File() include.Opener {
+func (p *Part) Source() include.Opener {
 	return p.source
 }
 
+// FileDependencies returns a list of absolute paths to files that are used in
+// this part and its dependencies.
+func (p *Part) FileDependencies() []string {
+	out := make([]string, 0)
+	if fopener, ok := p.Source().(include.FileOpener); ok {
+		out = append(out, fopener.FileName())
+	}
+	for _, dep := range p.includes {
+		partDep, _ := dep.(*Part)
+		out = append(out, partDep.FileDependencies()...)
+	}
+	return out
+}
+
 func (p *Part) IncludeTagName() bool {
 	return !p.noTag
 }