fix: allow conditional rendering when RenderScript is enabled

.changeset/grumpy-ads-know.md

@@ -0,0 +1,5 @@
+---
+"@astrojs/compiler": patch
+---
+
+Allows conditional rendering of scripts when `RenderScript` is enabled

internal/printer/__printer_js__/script_external_in_expression__renderScript__false_.snap

@@ -0,0 +1,82 @@
+
+[TestPrinter/script_external_in_expression_(renderScript:_false) - 1]
+## Input
+
+```
+<main>{<script src="./hello.js"></script>}
+```
+
+## Output
+
+```js
+import {
+  Fragment,
+  render as $$render,
+  createAstro as $$createAstro,
+  createComponent as $$createComponent,
+  renderComponent as $$renderComponent,
+  renderHead as $$renderHead,
+  maybeRenderHead as $$maybeRenderHead,
+  unescapeHTML as $$unescapeHTML,
+  renderSlot as $$renderSlot,
+  mergeSlots as $$mergeSlots,
+  addAttribute as $$addAttribute,
+  spreadAttributes as $$spreadAttributes,
+  defineStyleVars as $$defineStyleVars,
+  defineScriptVars as $$defineScriptVars,
+  renderTransition as $$renderTransition,
+  createTransitionScope as $$createTransitionScope,
+  renderScript as $$renderScript,
+  createMetadata as $$createMetadata
+} from "http://localhost:3000/";
+
+export const $$metadata = $$createMetadata("/src/pages/index.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [] });
+
+const $$Index = $$createComponent(($$result, $$props, $$slots) => {
+
+return $$render`${$$maybeRenderHead($$result)}<main>${$$render`<script src="./hello.js"></script>`}</main>`;
+}, '/src/pages/index.astro', undefined);
+export default $$Index;
+```
+---
+
+[TestPrinter/script_external_in_expression_(renderScript:_false)#01 - 1]
+## Input
+
+```
+<main>{false && <script>console.log("hello")</script>}
+```
+
+## Output
+
+```js
+import {
+  Fragment,
+  render as $$render,
+  createAstro as $$createAstro,
+  createComponent as $$createComponent,
+  renderComponent as $$renderComponent,
+  renderHead as $$renderHead,
+  maybeRenderHead as $$maybeRenderHead,
+  unescapeHTML as $$unescapeHTML,
+  renderSlot as $$renderSlot,
+  mergeSlots as $$mergeSlots,
+  addAttribute as $$addAttribute,
+  spreadAttributes as $$spreadAttributes,
+  defineStyleVars as $$defineStyleVars,
+  defineScriptVars as $$defineScriptVars,
+  renderTransition as $$renderTransition,
+  createTransitionScope as $$createTransitionScope,
+  renderScript as $$renderScript,
+  createMetadata as $$createMetadata
+} from "http://localhost:3000/";
+
+export const $$metadata = $$createMetadata("/src/pages/index.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [] });
+
+const $$Index = $$createComponent(($$result, $$props, $$slots) => {
+
+return $$render`${$$maybeRenderHead($$result)}<main>${false && $$render`<script>console.log("hello")</script>`}</main>`;
+}, '/src/pages/index.astro', undefined);
+export default $$Index;
+```
+---

internal/printer/__printer_js__/script_external_in_expression__renderScript__true_.snap

@@ -0,0 +1,41 @@
+
+[TestPrinter/script_external_in_expression_(renderScript:_true) - 1]
+## Input
+
+```
+<main>{<script src="./hello.js"></script>}
+```
+
+## Output
+
+```js
+import {
+  Fragment,
+  render as $$render,
+  createAstro as $$createAstro,
+  createComponent as $$createComponent,
+  renderComponent as $$renderComponent,
+  renderHead as $$renderHead,
+  maybeRenderHead as $$maybeRenderHead,
+  unescapeHTML as $$unescapeHTML,
+  renderSlot as $$renderSlot,
+  mergeSlots as $$mergeSlots,
+  addAttribute as $$addAttribute,
+  spreadAttributes as $$spreadAttributes,
+  defineStyleVars as $$defineStyleVars,
+  defineScriptVars as $$defineScriptVars,
+  renderTransition as $$renderTransition,
+  createTransitionScope as $$createTransitionScope,
+  renderScript as $$renderScript,
+  createMetadata as $$createMetadata
+} from "http://localhost:3000/";
+
+export const $$metadata = $$createMetadata("/src/pages/index.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [{ type: 'external', src: './hello.js' }] });
+
+const $$Index = $$createComponent(($$result, $$props, $$slots) => {
+
+return $$render`${$$maybeRenderHead($$result)}<main>${$$render`${$$renderScript($$result,"/src/pages/index.astro?astro&type=script&index=0&lang.ts")}`}</main>`;
+}, '/src/pages/index.astro', undefined);
+export default $$Index;
+```
+---

internal/printer/__printer_js__/script_in_expression__renderScript__false_.snap

@@ -0,0 +1,41 @@
+
+[TestPrinter/script_in_expression_(renderScript:_false) - 1]
+## Input
+
+```
+<main>{false && <script>console.log("hello")</script>}
+```
+
+## Output
+
+```js
+import {
+  Fragment,
+  render as $$render,
+  createAstro as $$createAstro,
+  createComponent as $$createComponent,
+  renderComponent as $$renderComponent,
+  renderHead as $$renderHead,
+  maybeRenderHead as $$maybeRenderHead,
+  unescapeHTML as $$unescapeHTML,
+  renderSlot as $$renderSlot,
+  mergeSlots as $$mergeSlots,
+  addAttribute as $$addAttribute,
+  spreadAttributes as $$spreadAttributes,
+  defineStyleVars as $$defineStyleVars,
+  defineScriptVars as $$defineScriptVars,
+  renderTransition as $$renderTransition,
+  createTransitionScope as $$createTransitionScope,
+  renderScript as $$renderScript,
+  createMetadata as $$createMetadata
+} from "http://localhost:3000/";
+
+export const $$metadata = $$createMetadata("/src/pages/index.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [] });
+
+const $$Index = $$createComponent(($$result, $$props, $$slots) => {
+
+return $$render`${$$maybeRenderHead($$result)}<main>${false && $$render`<script>console.log("hello")</script>`}</main>`;
+}, '/src/pages/index.astro', undefined);
+export default $$Index;
+```
+---

internal/printer/__printer_js__/script_in_expression__renderScript__true_.snap

@@ -0,0 +1,41 @@
+
+[TestPrinter/script_in_expression_(renderScript:_true) - 1]
+## Input
+
+```
+<main>{true && <script>console.log("hello")</script>}
+```
+
+## Output
+
+```js
+import {
+  Fragment,
+  render as $$render,
+  createAstro as $$createAstro,
+  createComponent as $$createComponent,
+  renderComponent as $$renderComponent,
+  renderHead as $$renderHead,
+  maybeRenderHead as $$maybeRenderHead,
+  unescapeHTML as $$unescapeHTML,
+  renderSlot as $$renderSlot,
+  mergeSlots as $$mergeSlots,
+  addAttribute as $$addAttribute,
+  spreadAttributes as $$spreadAttributes,
+  defineStyleVars as $$defineStyleVars,
+  defineScriptVars as $$defineScriptVars,
+  renderTransition as $$renderTransition,
+  createTransitionScope as $$createTransitionScope,
+  renderScript as $$renderScript,
+  createMetadata as $$createMetadata
+} from "http://localhost:3000/";
+
+export const $$metadata = $$createMetadata("/src/pages/index.astro", { modules: [], hydratedComponents: [], clientOnlyComponents: [], hydrationDirectives: new Set([]), hoisted: [{ type: 'inline', value: `console.log("hello")` }] });
+
+const $$Index = $$createComponent(($$result, $$props, $$slots) => {
+
+return $$render`${$$maybeRenderHead($$result)}<main>${true && $$render`${$$renderScript($$result,"/src/pages/index.astro?astro&type=script&index=0&lang.ts")}`}</main>`;
+}, '/src/pages/index.astro', undefined);
+export default $$Index;
+```
+---

internal/printer/printer_test.go

@@ -894,6 +894,34 @@ import Widget2 from '../components/Widget2.astro';
 			},
 			filename: "/src/pages/index.astro",
 		},
+		{
+			name:   "script external in expression (renderScript: true)",
+			source: `<main>{<script src="./hello.js"></script>}`,
+			transformOptions: transform.TransformOptions{
+				RenderScript: true,
+			},
+			filename: "/src/pages/index.astro",
+		},
+		{
+			// maintain the original behavior, though it may be
+			// unneeded as renderScript is now on by default
+			name:   "script external in expression (renderScript: false)",
+			source: `<main>{<script src="./hello.js"></script>}`,
+			filename: "/src/pages/index.astro",
+		},
+		{
+			name:   "script in expression (renderScript: true)",
+			source: `<main>{true && <script>console.log("hello")</script>}`,
+			transformOptions: transform.TransformOptions{
+				RenderScript: true,
+			},
+			filename: "/src/pages/index.astro",
+		},
+		{
+			name:     "script in expression (renderScript: false)",
+			source:   `<main>{false && <script>console.log("hello")</script>}`,
+			filename: "/src/pages/index.astro",
+		},
 		{
 			name:   "script inline (renderScript: true)",
 			source: `<main><script is:inline type="module">console.log("Hello");</script>`,
@@ -2092,7 +2120,6 @@ const meta = { title: 'My App' };
 					Kind:         test_utils.JsOutput,
 					FolderName:   "__printer_js__",
 				})
-
 		})
 	}
 }
@@ -2215,7 +2242,6 @@ const c = '\''
 			code := test_utils.Dedent(tt.source)
 
 			doc, err := astro.ParseWithOptions(strings.NewReader(code), astro.ParseOptionEnableLiteral(true), astro.ParseOptionWithHandler(&handler.Handler{}))
-
 			if err != nil {
 				t.Error(err)
 			}

internal/transform/transform.go

@@ -122,7 +122,7 @@ func ExtractStyles(doc *astro.Node) {
 				return
 			}
 			// Ignore styles in svg/noscript/etc
-			if !IsHoistable(n) {
+			if !IsHoistable(n, false) {
 				return
 			}
 			// prepend node to maintain authored order
@@ -403,7 +403,8 @@ func ExtractScript(doc *astro.Node, n *astro.Node, opts *TransformOptions, h *ha
 			return
 		}
 		// Ignore scripts in svg/noscript/etc
-		if !IsHoistable(n) {
+		// In expressions ignore scripts, unless `RenderScript` is true
+		if !IsHoistable(n, opts.RenderScript) {
 			return
 		}
 

internal/transform/utils.go

@@ -47,10 +47,15 @@ func GetAttr(n *astro.Node, key string) *astro.Attribute {
 	return nil
 }
 
-func IsHoistable(n *astro.Node) bool {
+func IsHoistable(n *astro.Node, renderScriptEnabled bool) bool {
 	parent := n.Closest(func(p *astro.Node) bool {
 		return p.DataAtom == atom.Svg || p.DataAtom == atom.Noscript || p.DataAtom == atom.Template
 	})
+
+	if renderScriptEnabled && parent != nil && parent.Expression {
+		return true
+	}
+
 	return parent == nil
 }