fix: allow single and double quotes in comments within script templat…

…es (#384)

generator/generator.go

@@ -11,6 +11,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode"
 
 	_ "embed"
 
@@ -1420,8 +1421,9 @@ func (g *generator) writeScript(t parser.ScriptTemplate) error {
 		}
 		// Function: `function scriptName(a, b, c){` + `constantScriptValue` + `}`,
 		prefix := "function " + fn + "(" + stripTypes(t.Parameters.Value) + "){"
+		body := strings.TrimLeftFunc(t.Value, unicode.IsSpace)
 		suffix := "}"
-		if _, err = g.w.WriteIndent(indentLevel, "Function: "+createGoString(prefix+strings.TrimSpace(t.Value)+suffix)+",\n"); err != nil {
+		if _, err = g.w.WriteIndent(indentLevel, "Function: "+createGoString(prefix+body+suffix)+",\n"); err != nil {
 			return err
 		}
 		// Call: templ.SafeScript(scriptName, a, b, c)

generator/test-script-inline/expected.html

@@ -1,11 +1,13 @@
 <script type="text/javascript">
-	function __templ_withoutParameters_6bbf(){alert("hello");}
+	function __templ_withoutParameters_6bbf(){alert("hello");
+}
 </script>
 <script type="text/javascript">
   __templ_withoutParameters_6bbf()
 </script>
 <script type="text/javascript">
-  function __templ_withParameters_1056(a, b, c){console.log(a, b, c);}
+  function __templ_withParameters_1056(a, b, c){console.log(a, b, c);
+}
 </script>
 <script type="text/javascript">
   __templ_withParameters_1056("injected","test",123)
@@ -15,4 +17,4 @@
 </script>
 <script type="text/javascript">
   __templ_withParameters_1056("injected","test",123)
-</script>
+</script>

generator/test-script-usage/expected.html

@@ -1,15 +1,19 @@
 <script type="text/javascript">
-	function __templ_withParameters_1056(a, b, c){console.log(a, b, c);}function __templ_withoutParameters_6bbf(){alert("hello");}
+	function __templ_withParameters_1056(a, b, c){console.log(a, b, c);
+}function __templ_withoutParameters_6bbf(){alert("hello");
+}
 </script>
 <button onClick="__templ_withParameters_1056(&#34;test&#34;,&#34;A&#34;,123)" onMouseover="__templ_withoutParameters_6bbf()" type="button">A</button>
 <button onClick="__templ_withParameters_1056(&#34;test&#34;,&#34;B&#34;,123)" onMouseover="__templ_withoutParameters_6bbf()" type="button">B</button>
 <button onMouseover="console.log(&#39;mouseover&#39;)" type="button">Button C</button>
 <button hx-on::click="alert('clicked inline')" type="button">Button D</button>
 <script type="text/javascript">
-  function __templ_onClick_657d(){alert("clicked");}
+  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");}
+  function __templ_conditionalScript_de41(){alert("conditional");
+}
 </script>
 <input type="button" value="Click me" onclick="__templ_conditionalScript_de41()" />

generator/test-script-usage/template.templ

@@ -16,6 +16,10 @@ templ Button(text string) {
 	<button onClick={ withParameters("test", text, 123) } onMouseover={ withoutParameters() } type="button">{ text }</button>
 }
 
+script withComment() {
+	//'
+}
+
 templ ThreeButtons() {
 	@Button("A")
 	@Button("B")

parser/v2/expressionparser.go

@@ -48,6 +48,9 @@ var stringUntilNewLine = parse.StringUntil[string](parse.NewLine)
 var newLineOrEOF = parse.Or(parse.NewLine, parse.EOF[string]())
 var stringUntilNewLineOrEOF = parse.StringUntil(newLineOrEOF)
 
+var jsOrGoSingleLineComment = parse.StringFrom(parse.String("//"), parse.StringUntil(parse.Any(parse.NewLine, parse.EOF[string]())))
+var jsOrGoMultiLineComment = parse.StringFrom(parse.String("/*"), parse.StringUntil(parse.String("*/")))
+
 var exp = expressionParser{
 	startBraceCount: 1,
 }
@@ -66,7 +69,25 @@ loop:
 	for {
 		var result string
 
-		// Try to read a string literal first.
+		// Try to parse a single line comment.
+		if result, ok, err = jsOrGoSingleLineComment.Parse(pi); err != nil {
+			return
+		}
+		if ok {
+			sb.WriteString(result)
+			continue
+		}
+
+		// Try to parse a multi-line comment.
+		if result, ok, err = jsOrGoMultiLineComment.Parse(pi); err != nil {
+			return
+		}
+		if ok {
+			sb.WriteString(result)
+			continue
+		}
+
+		// Try to read a string literal.
 		if result, ok, err = string_lit.Parse(pi); err != nil {
 			return
 		}

parser/v2/scripttemplateparser_test.go

@@ -165,6 +165,45 @@ console.log(value);
 				Value: `console.log(value);` + "\n",
 			},
 		},
+		{
+			name: "script: comment with single quote",
+			input: `script Name() {
+	//'
+} Trailing '`, // Without a single quote later, issue #360 isn't triggered.
+			expected: ScriptTemplate{
+				Name: Expression{
+					Value: "Name",
+					Range: Range{
+						From: Position{
+							Index: 7,
+							Line:  0,
+							Col:   7,
+						},
+						To: Position{
+							Index: 11,
+							Line:  0,
+							Col:   11,
+						},
+					},
+				},
+				Parameters: Expression{
+					Value: "",
+					Range: Range{
+						From: Position{
+							Index: 12,
+							Line:  0,
+							Col:   12,
+						},
+						To: Position{
+							Index: 12,
+							Line:  0,
+							Col:   12,
+						},
+					},
+				},
+				Value: `	//'` + "\n",
+			},
+		},
 	}
 	for _, tt := range tests {
 		tt := tt