@tsrx/solid 0.0.12 → 0.0.14

package/package.json

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

package/src/index.js

@@ -1,5 +1,5 @@
 /** @import * as AST from 'estree' */
-/** @import { ParseOptions } from '@tsrx/core/types' */
+/** @import { CompileError, ParseOptions } from '@tsrx/core/types' */
 
 import { createVolarMappingsResult, dedupeMappings, parseModule } from '@tsrx/core';
 import { transform } from './transform.js';
@@ -21,12 +21,15 @@ export function parse(source, filename, options) {
  *
  * @param {string} source
  * @param {string} [filename]
- * @returns {{ code: string, map: any, css: { code: string, hash: string } | null }}
+ * @param {{ loose?: boolean }} [options]
+ * @returns {{ code: string, map: any, css: { code: string, hash: string } | null, errors: CompileError[] }}
  */
-export function compile(source, filename) {
-	const ast = parseModule(source, filename);
+export function compile(source, filename, options) {
+	const errors = /** @type {CompileError[]} */ ([]);
+	const collect = !!options?.loose;
+	const ast = parseModule(source, filename, collect ? { loose: true, errors } : undefined);
 	const { ast: _ast, ...result } = transform(ast, source, filename);
-	return result;
+	return { ...result, errors };
 }
 
 /**
@@ -38,7 +41,8 @@ export function compile(source, filename) {
  * @returns {import('@tsrx/core/types').VolarMappingsResult}
  */
 export function compile_to_volar_mappings(source, filename, options) {
-	const ast = parseModule(source, filename, options);
+	const errors = /** @type {import('@tsrx/core/types').CompileError[]} */ ([]);
+	const ast = parseModule(source, filename, { ...options, errors });
 	const transformed = transform(ast, source, filename);
 	const result = createVolarMappingsResult({
 		ast: transformed.ast,
@@ -46,7 +50,7 @@ export function compile_to_volar_mappings(source, filename, options) {
 		source,
 		generated_code: transformed.code,
 		source_map: transformed.map,
-		errors: [],
+		errors,
 	});
 
 	return {

package/src/transform.js

@@ -282,6 +282,7 @@ function component_to_function_declaration(component, transform_context) {
 	const fn = /** @type {any} */ ({
 		type: 'FunctionDeclaration',
 		id: component.id,
+		typeParameters: component.typeParameters,
 		params: final_params,
 		body: final_body,
 		async: false,
@@ -410,16 +411,14 @@ function body_to_jsx_child(body_nodes, transform_context) {
 	// Branch body has non-JSX statements: wrap everything in an arrow so the
 	// statements run when (and only when) the branch actually renders.
 	/** @type {any[]} */
-	const block_body = [...statements];
-	if (children.length > 0) {
-		block_body.push(
-			/** @type {any} */ ({
-				type: 'ReturnStatement',
-				argument: build_return_expression(children),
-				metadata: { path: [] },
-			}),
-		);
-	}
+	const block_body = [
+		...statements,
+		/** @type {any} */ ({
+			type: 'ReturnStatement',
+			argument: children.length > 0 ? build_return_expression(children) : create_null_literal(),
+			metadata: { path: [] },
+		}),
+	];
 
 	return /** @type {any} */ ({
 		type: 'ArrowFunctionExpression',

package/types/index.d.ts

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