@tsrx/core 0.1.29 → 0.1.31

package/package.json

@@ -3,7 +3,7 @@
   "description": "Core compiler infrastructure for TSRX syntax",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "type": "module",
   "repository": {
     "type": "git",

package/src/index.js

@@ -164,6 +164,10 @@ export {
 	in_jsx_child_context as inJsxChildContext,
 	tsx_node_to_jsx_expression as tsxNodeToJsxExpression,
 	tsx_with_ts_locations as tsxWithTsLocations,
+	is_template_if_node as isTemplateIfNode,
+	is_template_for_of_node as isTemplateForOfNode,
+	is_template_switch_node as isTemplateSwitchNode,
+	is_template_try_node as isTemplateTryNode,
 } from './transform/jsx/helpers.js';
 export {
 	collect_style_ref_attributes as collectStyleRefAttributes,

package/src/plugin.js

@@ -3650,15 +3650,17 @@ export function TSRXPlugin(config) {
 			}
 
 			/**
-			 * `@try`/`@pending`/`@catch` blocks lower their direct `return`
-			 * values into reactive boundary fallbacks, so unlike `@if`/`@for`/`@switch`
-			 * blocks they legitimately allow `return <markup>` statements. Set the flag
-			 * immediately before parsing each such block so its body sees it.
+			 * `@try`/`@pending`/`@catch` blocks are template control-flow blocks like
+			 * `@if`/`@for`/`@switch`: `return` is not allowed inside them. A `return`
+			 * is only valid in the JS setup at the top of a `@{ … }` code block, never
+			 * inside a `@`-directive block. Report any direct `return` with the same
+			 * template-return diagnostic used elsewhere.
 			 * @returns {AST.BlockStatement}
 			 */
 			#parseTemplateControlFlowReturnBlock(createNewLexicalScope = true) {
-				this.#controlFlowBlockAllowsNativeReturn = true;
-				return this.#parseTemplateControlFlowBlock(createNewLexicalScope);
+				const block = this.#parseTemplateControlFlowBlock(createNewLexicalScope);
+				this.#report_invalid_template_return_statements(block.body);
+				return block;
 			}
 
 			/**

package/src/transform/jsx/helpers.js

@@ -260,3 +260,51 @@ export function tsx_with_ts_locations() {
 
 	return { ...base, ...wrappers };
 }
+
+/**
+ * @param {any} node
+ * @returns {boolean}
+ */
+export function is_template_if_node(node) {
+	return (
+		node?.type === 'JSXIfExpression' ||
+		node?.metadata?.tsrxDirective === 'if' ||
+		(node?.type === 'IfStatement' && node?.statementType === 'IfStatement')
+	);
+}
+
+/**
+ * @param {any} node
+ * @returns {boolean}
+ */
+export function is_template_for_of_node(node) {
+	return (
+		node?.type === 'JSXForExpression' ||
+		node?.metadata?.tsrxDirective === 'for' ||
+		(node?.type === 'ForOfStatement' && node?.statementType === 'ForOfStatement')
+	);
+}
+
+/**
+ * @param {any} node
+ * @returns {boolean}
+ */
+export function is_template_switch_node(node) {
+	return (
+		node?.type === 'JSXSwitchExpression' ||
+		node?.metadata?.tsrxDirective === 'switch' ||
+		(node?.type === 'SwitchStatement' && node?.statementType === 'SwitchStatement')
+	);
+}
+
+/**
+ * @param {any} node
+ * @returns {boolean}
+ */
+export function is_template_try_node(node) {
+	return (
+		node?.type === 'JSXTryExpression' ||
+		node?.metadata?.tsrxDirective === 'try' ||
+		(node?.type === 'TryStatement' && node?.statementType === 'TryStatement')
+	);
+}

package/src/transform/jsx/index.js

@@ -10,8 +10,11 @@ import { prune_css } from '../../analyze/prune.js';
 import {
 	in_jsx_child_context,
 	set_node_path_metadata,
-	tsx_node_to_jsx_expression,
 	tsx_with_ts_locations,
+	is_template_if_node,
+	is_template_for_of_node,
+	is_template_switch_node,
+	is_template_try_node,
 } from './helpers.js';
 import {
 	add_extra_source_mappings_from_matching_expression,
@@ -779,19 +782,25 @@ function apply_css_definition_metadata(
 }
 
 /**
+ * Pruning runs from the fragment visitor, before the walker has descended into
+ * the subtree and stamped walker paths, so each collected element gets its
+ * ancestor chain (`metadata.path`) here — descendant/sibling selector matching
+ * in `prune_css` reads it.
+ *
  * @param {any} value
  * @param {any[]} [elements]
  * @param {TransformContext | null} [transform_context]
+ * @param {any[]} [path]
  * @returns {any[]}
  */
-function collect_css_prunable_elements(value, elements = [], transform_context = null) {
+function collect_css_prunable_elements(value, elements = [], transform_context = null, path = []) {
 	if (!value || typeof value !== 'object') {
 		return elements;
 	}
 
 	if (Array.isArray(value)) {
 		for (const child of value) {
-			collect_css_prunable_elements(child, elements, transform_context);
+			collect_css_prunable_elements(child, elements, transform_context, path);
 		}
 		return elements;
 	}
@@ -810,15 +819,18 @@ function collect_css_prunable_elements(value, elements = [], transform_context =
 
 	if (value.type === 'JSXElement' && value.metadata?.native_tsrx) {
 		if (!is_style_element(value)) {
+			set_node_path_metadata(value, path);
 			elements.push(value);
 		}
 	}
 
+	const child_path = value.type ? [...path, value] : path;
+
 	for (const key of Object.keys(value)) {
 		if (key === 'loc' || key === 'start' || key === 'end' || key === 'metadata' || key === 'css') {
 			continue;
 		}
-		collect_css_prunable_elements(value[key], elements, transform_context);
+		collect_css_prunable_elements(value[key], elements, transform_context, child_path);
 	}
 
 	return elements;
@@ -4476,54 +4488,6 @@ function validate_if_body_control_flow(node, transform_context) {
 	}
 }
 
-/**
- * @param {any} node
- * @returns {boolean}
- */
-function is_template_if_node(node) {
-	return (
-		node?.type === 'JSXIfExpression' ||
-		node?.metadata?.tsrxDirective === 'if' ||
-		(node?.type === 'IfStatement' && node?.statementType === 'IfStatement')
-	);
-}
-
-/**
- * @param {any} node
- * @returns {boolean}
- */
-function is_template_for_of_node(node) {
-	return (
-		node?.type === 'JSXForExpression' ||
-		node?.metadata?.tsrxDirective === 'for' ||
-		(node?.type === 'ForOfStatement' && node?.statementType === 'ForOfStatement')
-	);
-}
-
-/**
- * @param {any} node
- * @returns {boolean}
- */
-function is_template_switch_node(node) {
-	return (
-		node?.type === 'JSXSwitchExpression' ||
-		node?.metadata?.tsrxDirective === 'switch' ||
-		(node?.type === 'SwitchStatement' && node?.statementType === 'SwitchStatement')
-	);
-}
-
-/**
- * @param {any} node
- * @returns {boolean}
- */
-function is_template_try_node(node) {
-	return (
-		node?.type === 'JSXTryExpression' ||
-		node?.metadata?.tsrxDirective === 'try' ||
-		(node?.type === 'TryStatement' && node?.statementType === 'TryStatement')
-	);
-}
-
 /**
  * @param {any} node
  * @returns {boolean}