@tsrx/core 0.1.47 → 0.1.49

package/src/transform/jsx/helpers.js

@@ -3,6 +3,7 @@
 
 import tsx from 'esrap/languages/tsx';
 import { should_preserve_comment, format_comment } from '../../comment-utils.js';
+import { with_deferred_imports } from '../imports.js';
 
 /**
  * Zimmerframe provides `path` as the ancestor chain. A native template node in
@@ -75,7 +76,7 @@ export function set_node_path_metadata(node, path) {
  * TS input — dropping a leading pragma changes how the whole file checks.
  */
 export function tsx_with_ts_locations(boundary_tokens = false, comments = undefined) {
-	const base = tsx({ boundaryTokens: boundary_tokens });
+	const base = with_deferred_imports(tsx({ boundaryTokens: boundary_tokens }));
 	const { _: base_visitor, ...base_visitors } = base;
 
 	const leading_preserved = (/** @type {AST.Program} */ program) => {
@@ -251,7 +252,7 @@ const LOCATION_WRAPPED_NODE_TYPES = new Set([
 
 /**
  * @param {AST.Node | null | undefined} node
- * @returns {boolean}
+ * @returns {node is AST.JSXIfExpression | (AST.IfStatement & { statementType: 'IfStatement' })}
  */
 export function is_template_if_node(node) {
 	return (
@@ -261,19 +262,24 @@ export function is_template_if_node(node) {
 }
 
 /**
+ * A `@for … of …` directive, in either the expression or the retyped statement
+ * form. `JSXForExpression` also covers `@for … in …` and plain `@for (;;)`, so
+ * both arms must check `statementType` — callers read for-of-only fields such
+ * as `await` off the result.
+ *
  * @param {AST.Node | null | undefined} node
- * @returns {boolean}
+ * @returns {node is AST.JSXForOfExpression | (AST.ForOfStatement & { statementType: 'ForOfStatement' })}
  */
 export function is_template_for_of_node(node) {
 	return (
-		node?.type === 'JSXForExpression' ||
-		(node?.type === 'ForOfStatement' && node?.statementType === 'ForOfStatement')
+		(node?.type === 'JSXForExpression' || node?.type === 'ForOfStatement') &&
+		node.statementType === 'ForOfStatement'
 	);
 }
 
 /**
  * @param {AST.Node | null | undefined} node
- * @returns {boolean}
+ * @returns {node is AST.JSXSwitchExpression | (AST.SwitchStatement & { statementType: 'SwitchStatement' })}
  */
 export function is_template_switch_node(node) {
 	return (
@@ -284,7 +290,7 @@ export function is_template_switch_node(node) {
 
 /**
  * @param {AST.Node | null | undefined} node
- * @returns {boolean}
+ * @returns {node is AST.JSXTryExpression | (AST.TryStatement & { statementType: 'TryStatement' })}
  */
 export function is_template_try_node(node) {
 	return (