fix: scripts not rendered when script expression is in a conditional …

…attribute, fixes #260

generator/generator.go

@@ -962,13 +962,8 @@ func isScriptAttribute(name string) bool {
 
 func (g *generator) writeElementScript(indentLevel int, n parser.Element) (err error) {
 	var scriptExpressions []string
-	for i := 0; i < len(n.Attributes); i++ {
-		if attr, ok := n.Attributes[i].(parser.ExpressionAttribute); ok {
-			name := html.EscapeString(attr.Name)
-			if isScriptAttribute(name) {
-				scriptExpressions = append(scriptExpressions, attr.Expression.Value)
-			}
-		}
+	for _, attr := range n.Attributes {
+		scriptExpressions = append(scriptExpressions, getAttributeScripts(attr)...)
 	}
 	if len(scriptExpressions) == 0 {
 		return
@@ -984,6 +979,24 @@ func (g *generator) writeElementScript(indentLevel int, n parser.Element) (err e
 	return err
 }
 
+func getAttributeScripts(attr parser.Attribute) (scripts []string) {
+	if attr, ok := attr.(parser.ConditionalAttribute); ok {
+		for _, attr := range attr.Then {
+			scripts = append(scripts, getAttributeScripts(attr)...)
+		}
+		for _, attr := range attr.Else {
+			scripts = append(scripts, getAttributeScripts(attr)...)
+		}
+	}
+	if attr, ok := attr.(parser.ExpressionAttribute); ok {
+		name := html.EscapeString(attr.Name)
+		if isScriptAttribute(name) {
+			scripts = append(scripts, attr.Expression.Value)
+		}
+	}
+	return scripts
+}
+
 func (g *generator) writeBoolConstantAttribute(indentLevel int, attr parser.BoolConstantAttribute) (err error) {
 	name := html.EscapeString(attr.Name)
 	if _, err = g.w.WriteStringLiteral(indentLevel, fmt.Sprintf(` %s`, name)); err != nil {

generator/test-script-usage/expected.html

@@ -9,4 +9,7 @@
   function __templ_onClick_657d(){alert("clicked");}
 </script>
 <button hx-on::click="__templ_onClick_657d()" type="button">Button E</button>
-
+<script type="text/javascript">
+  function __templ_conditionalScript_de41(){alert("conditional");}
+</script>
+<input type="button" value="Click me" onclick="__templ_conditionalScript_de41()" />

generator/test-script-usage/template.templ

@@ -22,4 +22,19 @@ templ ThreeButtons() {
 	<button onMouseover="console.log(&#39;mouseover&#39;)" type="button">Button C</button>
 	<button hx-on::click="alert(&#39;clicked inline&#39;)" type="button">Button D</button>
 	<button hx-on::click={ onClick() } type="button">Button E</button>
+	@Conditional(true)
+}
+
+script conditionalScript() {
+  alert("conditional");
+}
+
+templ Conditional(show bool) {
+	<input
+ 		type="button"
+ 		value="Click me"
+ 		if show {
+			onclick={ conditionalScript() }
+		}
+	/>
 }

parser/v2/types.go

@@ -666,7 +666,7 @@ func (ca ConstantAttribute) Write(w io.Writer, indent int) error {
 	return writeIndent(w, indent, ca.String())
 }
 
-// href={ templ.Bool(...) }
+// noshade={ templ.Bool(...) }
 type BoolExpressionAttribute struct {
 	Name       string
 	Expression Expression