@tsrx/core 0.1.10 → 0.1.11

package/package.json

@@ -3,7 +3,7 @@
   "description": "Core compiler infrastructure for TSRX syntax",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "type": "module",
   "repository": {
     "type": "git",
@@ -80,12 +80,12 @@
     "solid-js": "2.0.0-beta.7",
     "typescript": "^5.9.3",
     "vscode-languageserver-types": "^3.17.5",
-    "vue": "3.6.0-beta.10",
-    "vue-jsx-vapor": "^3.2.12",
-    "@tsrx/preact": "0.1.10",
-    "@tsrx/react": "0.2.10",
-    "@tsrx/solid": "0.1.10",
-    "@tsrx/vue": "0.1.10"
+    "vue": "3.6.0-beta.12",
+    "vue-jsx-vapor": "^3.2.14",
+    "@tsrx/preact": "0.1.11",
+    "@tsrx/react": "0.2.11",
+    "@tsrx/solid": "0.1.11",
+    "@tsrx/vue": "0.1.11"
   },
   "files": [
     "src",

package/src/index.js

@@ -146,6 +146,7 @@ export {
 	clone_switch_helper_invocation as cloneSwitchHelperInvocation,
 	collect_param_bindings as collectParamBindings,
 	collect_statement_bindings as collectStatementBindings,
+	create_hook_safe_helper as createHookSafeHelper,
 	create_host_html_attribute as createHostHtmlAttribute,
 	create_host_html_conflict_error as createHostHtmlConflictError,
 	createJsxTransform,

package/src/transform/jsx/index.js

@@ -1215,23 +1215,27 @@ function is_hook_callee(callee) {
 
 /**
  * @param {AST.Identifier[]} bindings
+ * @param {Set<string>} [mapped_bindings]
  * @returns {AST.ObjectPattern}
  */
-function create_helper_props_pattern(bindings) {
+function create_helper_props_pattern(bindings, mapped_bindings = new Set()) {
 	return /** @type {any} */ ({
 		type: 'ObjectPattern',
-		properties: bindings.map((binding) => create_helper_props_property(binding)),
+		properties: bindings.map((binding) =>
+			create_helper_props_property(binding, mapped_bindings.has(binding.name)),
+		),
 		metadata: { path: [] },
 	});
 }
 
 /**
  * @param {AST.Identifier} binding
+ * @param {boolean} [map_binding]
  * @returns {AST.Property}
  */
-function create_helper_props_property(binding) {
-	const key = create_generated_identifier(binding.name);
-	const value = create_generated_identifier(binding.name);
+function create_helper_props_property(binding, map_binding = false) {
+	const key = map_binding ? clone_identifier(binding) : create_generated_identifier(binding.name);
+	const value = map_binding ? clone_identifier(binding) : create_generated_identifier(binding.name);
 
 	return b.prop('init', key, value, false, true);
 }
@@ -3411,14 +3415,16 @@ function get_hook_callee_name(callee) {
  *   Used by the switch lift's chained-call build, which allocates ids in
  *   source order in a forward pass and then constructs helpers in reverse so
  *   each fall-through case can reference the next case's component element.
+ * @param {{ transientBindings?: Set<string> }} [options]
  * @returns {{ setup_statements: any[], component_element: ESTreeJSX.JSXElement }}
  */
-function create_hook_safe_helper(
+export function create_hook_safe_helper(
 	body_nodes,
 	key_expression,
 	source_node,
 	transform_context,
 	preallocated_helper_id,
+	options = {},
 ) {
 	validate_hook_safe_body_does_not_assign_hook_results_to_outer_bindings(
 		body_nodes,
@@ -3436,9 +3442,14 @@ function create_hook_safe_helper(
 		body_nodes,
 		transform_context.available_bindings,
 	);
+	const transient_bindings = options.transientBindings ?? new Set();
 	const aliases = use_module_scoped_component
 		? []
-		: helper_bindings.map((binding) => create_helper_type_alias_declaration(helper_id, binding));
+		: helper_bindings.map((binding) =>
+				transient_bindings.has(binding.name)
+					? null
+					: create_helper_type_alias_declaration(helper_id, binding),
+			);
 	const props_type =
 		helper_bindings.length > 0 && !use_module_scoped_component
 			? create_helper_props_type_literal(helper_bindings, aliases)
@@ -3447,8 +3458,8 @@ function create_hook_safe_helper(
 		helper_bindings.length > 0
 			? [
 					props_type !== null
-						? create_typed_helper_props_pattern(helper_bindings, props_type)
-						: create_helper_props_pattern(helper_bindings),
+						? create_typed_helper_props_pattern(helper_bindings, props_type, transient_bindings)
+						: create_helper_props_pattern(helper_bindings, transient_bindings),
 				]
 			: [];
 
@@ -3490,7 +3501,7 @@ function create_hook_safe_helper(
 	if (!transform_context.helper_state) {
 		return {
 			setup_statements: [
-				...aliases.map((alias) => alias.declaration),
+				...aliases.flatMap((alias) => (alias ? [alias.declaration] : [])),
 				create_helper_declaration(helper_id, helper_fn, source_node, transform_context),
 			],
 			component_element,
@@ -3514,7 +3525,7 @@ function create_hook_safe_helper(
 
 	return {
 		setup_statements: [
-			...aliases.map((alias) => alias.declaration),
+			...aliases.flatMap((alias) => (alias ? [alias.declaration] : [])),
 			create_cached_helper_declaration(
 				helper_id,
 				cache_id,
@@ -3588,7 +3599,7 @@ function create_helper_type_alias_declaration(helper_id, binding) {
 
 /**
  * @param {AST.Identifier[]} bindings
- * @param {{ id: AST.Identifier }[]} aliases
+ * @param {({ id: AST.Identifier } | null)[]} aliases
  * @returns {any}
  */
 function create_helper_props_type_literal(bindings, aliases) {
@@ -3596,7 +3607,13 @@ function create_helper_props_type_literal(bindings, aliases) {
 		bindings.map((binding, i) =>
 			b.ts_property_signature(
 				create_generated_identifier(binding.name),
-				b.ts_type_annotation(b.ts_type_query(clone_identifier(aliases[i].id))),
+				b.ts_type_annotation(
+					aliases[i]
+						? b.ts_type_query(
+								clone_identifier(/** @type {{ id: AST.Identifier }} */ (aliases[i]).id),
+							)
+						: b.ts_keyword_type('any'),
+				),
 			),
 		),
 	);
@@ -3605,10 +3622,11 @@ function create_helper_props_type_literal(bindings, aliases) {
 /**
  * @param {AST.Identifier[]} bindings
  * @param {any} props_type
+ * @param {Set<string>} [mapped_bindings]
  * @returns {AST.ObjectPattern}
  */
-function create_typed_helper_props_pattern(bindings, props_type) {
-	const pattern = create_helper_props_pattern(bindings);
+function create_typed_helper_props_pattern(bindings, props_type, mapped_bindings = new Set()) {
+	const pattern = create_helper_props_pattern(bindings, mapped_bindings);
 	/** @type {any} */ (pattern).typeAnnotation = b.ts_type_annotation(props_type);
 	return pattern;
 }
@@ -4502,18 +4520,25 @@ function try_statement_to_jsx_child(node, transform_context) {
 				? to_jsx_expression_container(create_null_literal())
 				: statement_body_to_jsx_child(pending_body_nodes, transform_context);
 
-		result = create_jsx_element(
-			'Suspense',
-			[
-				{
-					type: 'JSXAttribute',
-					name: { type: 'JSXIdentifier', name: 'fallback', metadata: { path: [] } },
-					value: fallback_content,
-					metadata: { path: [] },
-				},
-			],
-			[result],
-		);
+		result =
+			transform_context.platform.hooks?.createPendingBoundary?.(
+				result,
+				fallback_content,
+				transform_context,
+				node,
+			) ??
+			create_jsx_element(
+				'Suspense',
+				[
+					{
+						type: 'JSXAttribute',
+						name: { type: 'JSXIdentifier', name: 'fallback', metadata: { path: [] } },
+						value: fallback_content,
+						metadata: { path: [] },
+					},
+				],
+				[result],
+			);
 	}
 
 	// Wrap in <TsrxErrorBoundary> if catch block exists
@@ -4551,19 +4576,42 @@ function try_statement_to_jsx_child(node, transform_context) {
 
 		const fallback_fn = b.arrow(
 			catch_params,
-			b.block(build_render_statements(catch_body_nodes, true, transform_context)),
+			b.block(build_render_statements(catch_body_nodes, true, transform_context), handler.body),
+			false,
+			undefined,
+			handler,
 		);
 
+		const fallback_component =
+			transform_context.platform.hooks?.createErrorFallbackComponent?.(
+				catch_body_nodes,
+				catch_params,
+				transform_context,
+				node,
+			) ?? null;
+
 		transform_context.available_bindings = saved_catch_bindings;
 
 		const boundary_content =
 			transform_context.platform.hooks?.createErrorBoundaryContent?.(
+				result,
+				transform_context,
+				node,
+			) ?? null;
+
+		const custom_boundary =
+			transform_context.platform.hooks?.createErrorBoundary?.(
+				result,
 				try_content,
+				fallback_fn,
 				transform_context,
 				node,
+				{ fallbackComponent: fallback_component },
 			) ?? null;
 
-		if (boundary_content && transform_context.inside_element_child) {
+		if (custom_boundary) {
+			result = custom_boundary;
+		} else if (boundary_content && transform_context.inside_element_child) {
 			result = to_jsx_expression_container(
 				b.call(
 					'TsrxErrorBoundary',
@@ -4572,21 +4620,21 @@ function try_statement_to_jsx_child(node, transform_context) {
 			);
 
 			return result;
+		} else {
+			result = create_jsx_element(
+				'TsrxErrorBoundary',
+				[
+					b.jsx_attribute(
+						b.jsx_id('fallback'),
+						to_jsx_expression_container(/** @type {any} */ (fallback_fn)),
+					),
+					...(boundary_content
+						? [b.jsx_attribute(b.jsx_id('content'), to_jsx_expression_container(boundary_content))]
+						: []),
+				],
+				boundary_content ? [] : [result],
+			);
 		}
-
-		result = create_jsx_element(
-			'TsrxErrorBoundary',
-			[
-				b.jsx_attribute(
-					b.jsx_id('fallback'),
-					to_jsx_expression_container(/** @type {any} */ (fallback_fn)),
-				),
-				...(boundary_content
-					? [b.jsx_attribute(b.jsx_id('content'), to_jsx_expression_container(boundary_content))]
-					: []),
-			],
-			boundary_content ? [] : [result],
-		);
 	}
 
 	// result is a JSXElement, but we need to return a JSXExpressionContainer

package/types/jsx-platform.d.ts

@@ -200,11 +200,49 @@ export interface JsxPlatformHooks {
 	 * the loop to the downstream Vapor JSX compiler as a typed `VaporFor` component.
 	 */
 	renderForOf?: (node: any, loopParams: any[], bodyStatements: any[], ctx: any) => any | null;
+	/**
+	 * Optionally replace the default React-style pending lowering for
+	 * `try { ... } pending { ... }`. The default emits
+	 * `<Suspense fallback={fallbackContent}>tryContent</Suspense>`.
+	 * Vue Vapor uses this to provide `default` and `fallback` slots via
+	 * `v-slots`.
+	 */
+	createPendingBoundary?: (
+		tryContent: any,
+		fallbackContent: any,
+		ctx: any,
+		node: any,
+	) => any | null;
+	/**
+	 * Optionally create a generated component for a catch fallback body while
+	 * the catch parameters are still in scope. Platforms can use this to reuse
+	 * one mapped catch-body component from multiple runtime catch sites.
+	 */
+	createErrorFallbackComponent?: (
+		catchBodyNodes: any[],
+		catchParams: any[],
+		ctx: any,
+		node: any,
+	) => any | null;
+	/**
+	 * Optionally replace the default `try/catch` boundary wrapper. The hook
+	 * receives the current render content, the original try-body content before
+	 * any pending wrapper, and the generated catch fallback function.
+	 */
+	createErrorBoundary?: (
+		tryContent: any,
+		rawTryContent: any,
+		fallbackFn: any,
+		ctx: any,
+		node: any,
+		info?: { fallbackComponent?: any },
+	) => any | null;
 	/**
 	 * Optionally move the primary `try { ... }` render content into an explicit
 	 * error-boundary prop instead of rendering it as the boundary's JSX children.
 	 * Vue Vapor uses this because boundary content must execute lazily from a
-	 * zero-argument function.
+	 * zero-argument function. If a `pending` block exists, `tryContent` is the
+	 * already-created pending boundary so catch wrappers still enclose it.
 	 */
 	createErrorBoundaryContent?: (tryContent: any, ctx: any, node: any) => any | null;
 	/**