@tsrx/solid 0.0.25 → 0.0.27

package/package.json

@@ -3,7 +3,7 @@
   "description": "Solid compiler built on @tsrx/core",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -22,7 +22,7 @@
   "dependencies": {
     "esrap": "^2.1.0",
     "zimmerframe": "^1.1.2",
-    "@tsrx/core": "0.0.25"
+    "@tsrx/core": "0.0.27"
   },
   "peerDependencies": {
     "solid-js": ">=1.8 || >=2.0.0-beta"

package/src/index.js

@@ -22,7 +22,7 @@ export function parse(source, filename, options) {
  * @param {string} source
  * @param {string} [filename]
  * @param {{ collect?: boolean, loose?: boolean }} [options]
- * @returns {{ code: string, map: any, css: { code: string, hash: string } | null, errors: CompileError[] }}
+ * @returns {{ code: string, map: any, css: string, cssHash: string | null, errors: CompileError[] }}
  */
 export function compile(source, filename, options) {
 	const errors = /** @type {CompileError[]} */ ([]);
@@ -63,6 +63,7 @@ export function compile_to_volar_mappings(source, filename, options) {
 	const transformed = transform(ast, source, filename, {
 		collect: true,
 		loose: !!options?.loose,
+		typeOnly: true,
 		errors,
 		comments,
 	});

package/src/transform.js

@@ -26,6 +26,7 @@ import {
 	flatten_switch_consequent,
 	get_for_of_iteration_params,
 	identifier_to_jsx_name,
+	is_bare_render_expression,
 	is_dynamic_element_id,
 	is_jsx_child,
 	set_loc,
@@ -176,7 +177,11 @@ function component_to_function_declaration(component, transform_context) {
 	const params = component.params || [];
 	const body = /** @type {any[]} */ (component.body || []);
 
-	const lazy_bindings = collect_lazy_bindings_from_component(params, body, transform_context);
+	// In type-only mode the lazy rewrite is skipped so destructuring patterns
+	// survive into the virtual TSX and TypeScript can flow real types.
+	const lazy_bindings = transform_context.typeOnly
+		? new Map()
+		: collect_lazy_bindings_from_component(params, body, transform_context);
 
 	// Detect top-level early-return patterns such as `if (cond) { return; }`
 	// and `if (cond) { <p />; return; }`.
@@ -233,6 +238,10 @@ function component_to_function_declaration(component, transform_context) {
 		const collect = (nodes, outer, jsx_bucket) => {
 			for (const child of nodes) {
 				if (is_jsx_child(child)) {
+					if (get_returning_if_info(child) !== null) {
+						jsx_bucket.push(child);
+						continue;
+					}
 					if (early_interleaved) {
 						const jsx = to_jsx_child(child, transform_context);
 						if (is_capturable_jsx_child(jsx)) {
@@ -260,11 +269,11 @@ function component_to_function_declaration(component, transform_context) {
 			transform_context.needs_show = true;
 			const branch_body = body_to_jsx_child(early_info.consequent_body, transform_context);
 			const fallback_body =
-				after_jsx.length > 0 ? body_to_jsx_child(after_jsx, transform_context) : null;
+				after_jsx.length > 0 ? body_to_early_return_jsx_child(after_jsx, transform_context) : null;
 			next_body.push(build_show_element(early_if.test, branch_body, fallback_body));
 		} else if (after_jsx.length > 0) {
 			transform_context.needs_show = true;
-			const show_body = body_to_jsx_child(after_jsx, transform_context);
+			const show_body = body_to_early_return_jsx_child(after_jsx, transform_context);
 			next_body.push(build_show_element(negate_expression(early_if.test), show_body, null));
 		}
 
@@ -286,6 +295,8 @@ function component_to_function_declaration(component, transform_context) {
 			} else {
 				render_nodes.push(jsx);
 			}
+		} else if (is_bare_render_expression(child)) {
+			render_nodes.push(to_jsx_expression_container(child, child));
 		} else {
 			statements.push(child);
 		}
@@ -478,6 +489,8 @@ function body_to_jsx_child(body_nodes, transform_context) {
 			} else {
 				children.push(jsx);
 			}
+		} else if (is_bare_render_expression(child)) {
+			children.push(to_jsx_expression_container(child, child));
 		} else {
 			statements.push(child);
 		}
@@ -522,6 +535,45 @@ function body_to_jsx_child(body_nodes, transform_context) {
 	});
 }
 
+/**
+ * Lower render-continuation bodies that may contain additional early-return
+ * guards. Sequential guards need to nest the remaining continuation instead
+ * of rendering later children beside a `<Show>` for the guard itself.
+ *
+ * @param {any[]} body_nodes
+ * @param {TransformContext} transform_context
+ * @returns {any}
+ */
+function body_to_early_return_jsx_child(body_nodes, transform_context) {
+	const early_idx = body_nodes.findIndex((node) => get_returning_if_info(node) !== null);
+	if (early_idx === -1) {
+		return body_to_jsx_child(body_nodes, transform_context);
+	}
+
+	const early_if = /** @type {any} */ (body_nodes[early_idx]);
+	const early_info = /** @type {{ consequent_body: any[], return_index: number }} */ (
+		get_returning_if_info(early_if)
+	);
+	const before = body_nodes.slice(0, early_idx);
+	const after = body_nodes.slice(early_idx + 1);
+	const branch_has_content_before_return = early_info.return_index > 0;
+	const children = [...before];
+
+	if (branch_has_content_before_return) {
+		transform_context.needs_show = true;
+		const branch_body = body_to_jsx_child(early_info.consequent_body, transform_context);
+		const fallback_body =
+			after.length > 0 ? body_to_early_return_jsx_child(after, transform_context) : null;
+		children.push(build_show_element(early_if.test, branch_body, fallback_body));
+	} else if (after.length > 0) {
+		transform_context.needs_show = true;
+		const show_body = body_to_early_return_jsx_child(after, transform_context);
+		children.push(build_show_element(negate_expression(early_if.test), show_body, null));
+	}
+
+	return body_to_jsx_child(children, transform_context);
+}
+
 /**
  * @param {any} node
  * @returns {boolean}
@@ -618,6 +670,8 @@ function loop_body_to_callback_statements(body_nodes, transform_context) {
 
 		if (is_jsx_child(child)) {
 			children.push(to_jsx_child(child, transform_context));
+		} else if (is_bare_render_expression(child)) {
+			children.push(to_jsx_expression_container(child, child));
 		} else {
 			statements.push(child);
 		}
@@ -825,11 +879,15 @@ function get_returning_if_info(node) {
  * @returns {any}
  */
 function negate_expression(expr) {
+	if (expr?.type === 'UnaryExpression' && expr.operator === '!') {
+		return clone_expression_node(expr.argument);
+	}
+
 	return {
 		type: 'UnaryExpression',
 		operator: '!',
 		prefix: true,
-		argument: expr,
+		argument: clone_expression_node(expr),
 		metadata: { path: [] },
 	};
 }

package/types/index.d.ts

@@ -1,21 +1,8 @@
 import type { Program } from 'estree';
-import type { CompileError, ParseOptions, VolarMappingsResult } from '@tsrx/core/types';
+import type { CompileFn, ParseOptions, VolarCompileFn } from '@tsrx/core/types';
 
 export function parse(source: string, filename?: string, options?: ParseOptions): Program;
 
-export function compile(
-	source: string,
-	filename?: string,
-	options?: { collect?: boolean; loose?: boolean },
-): {
-	code: string;
-	map: unknown;
-	css: { code: string; hash: string } | null;
-	errors: CompileError[];
-};
+export const compile: CompileFn;
 
-export function compile_to_volar_mappings(
-	source: string,
-	filename?: string,
-	options?: ParseOptions,
-): VolarMappingsResult;
+export const compile_to_volar_mappings: VolarCompileFn;