@tsrx/vue 0.0.13 → 0.0.15

package/package.json

@@ -3,7 +3,7 @@
   "description": "Vue compiler built on @tsrx/core",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -19,16 +19,18 @@
       "default": "./src/index.js"
     },
     "./error-boundary": {
+      "types": "./types/error-boundary.d.ts",
       "default": "./src/error-boundary.js"
     },
     "./merge-refs": {
+      "types": "./types/merge-refs.d.ts",
       "default": "./src/merge-refs.js"
     }
   },
   "dependencies": {
     "esrap": "^2.1.0",
     "zimmerframe": "^1.1.2",
-    "@tsrx/core": "0.0.18"
+    "@tsrx/core": "0.0.20"
   },
   "peerDependencies": {
     "vue": ">=3.5",

package/src/index.js

@@ -21,14 +21,24 @@ export function parse(source, filename, options) {
  *
  * @param {string} source
  * @param {string} [filename]
- * @param {{ loose?: boolean }} [options]
+ * @param {{ collect?: boolean, loose?: boolean }} [options]
  * @returns {{ code: string, map: any, css: { code: string, hash: string } | null, errors: CompileError[] }}
  */
 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);
+	const comments = /** @type {AST.CommentWithLocation[]} */ ([]);
+	const collect = !!(options?.collect || options?.loose);
+	const ast = parseModule(
+		source,
+		filename,
+		collect ? { collect: true, loose: !!options?.loose, errors, comments } : undefined,
+	);
+	const { ast: _ast, ...result } = transform(
+		ast,
+		source,
+		filename,
+		collect ? { collect: true, loose: !!options?.loose, errors, comments } : undefined,
+	);
 	return { ...result, errors };
 }
 
@@ -42,8 +52,20 @@ export function compile(source, filename, options) {
  */
 export function compile_to_volar_mappings(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 comments = /** @type {AST.CommentWithLocation[]} */ ([]);
+	const ast = parseModule(source, filename, {
+		...options,
+		collect: true,
+		loose: !!options?.loose,
+		errors,
+		comments,
+	});
+	const transformed = transform(ast, source, filename, {
+		collect: true,
+		loose: !!options?.loose,
+		errors,
+		comments,
+	});
 	const result = createVolarMappingsResult({
 		ast: transformed.ast,
 		ast_from_source: ast,

package/src/transform.js

@@ -6,7 +6,7 @@ import {
 	clone_identifier,
 	componentToFunctionDeclaration,
 	createJsxTransform,
-	create_compile_error,
+	error,
 	identifier_to_jsx_name,
 	setLocation,
 } from '@tsrx/core';
@@ -68,13 +68,22 @@ const vue_platform = {
 				metadata: { path: [] },
 			};
 		},
-		transformElementChildren(node, walked_children, raw_children, attributes) {
-			return rewrite_host_text_or_html_children(node, walked_children, raw_children, attributes);
+		transformElementChildren(node, walked_children, raw_children, attributes, ctx) {
+			return rewrite_host_text_or_html_children(
+				node,
+				walked_children,
+				raw_children,
+				attributes,
+				ctx,
+			);
 		},
-		validateComponentAwait(await_expression) {
-			throw create_compile_error(
-				await_expression,
+		validateComponentAwait(await_expression, _component, ctx) {
+			error(
 				'`await` is not yet supported in Vue TSRX components.',
+				ctx?.filename ?? null,
+				await_expression,
+				ctx?.errors,
+				ctx?.comments,
 			);
 		},
 		componentToFunction(component, ctx, helper_state) {
@@ -418,15 +427,17 @@ function is_vue_setup_call(call_expression) {
  * @returns {any[]}
  */
 function preprocess_ref_attributes(attrs, element, transform_context) {
-	void transform_context;
 	if (!is_component_like_element(element)) {
 		return attrs;
 	}
 	for (const attr of attrs) {
 		if (attr?.type === 'RefAttribute') {
-			throw create_compile_error(
-				attr,
+			error(
 				'`{ref ...}` on the Vue target is only supported on host elements. Vue component refs resolve to component instances rather than the rendered DOM node, so Ripple-style component refs are not supported here.',
+				transform_context?.filename ?? null,
+				attr,
+				transform_context?.errors,
+				transform_context?.comments,
 			);
 		}
 	}
@@ -438,9 +449,16 @@ function preprocess_ref_attributes(attrs, element, transform_context) {
  * @param {any[]} walked_children
  * @param {any[]} raw_children
  * @param {any[]} attributes
+ * @param {any} [transform_context]
  * @returns {{ children: any[]; selfClosing?: boolean } | null}
  */
-function rewrite_host_text_or_html_children(node, walked_children, raw_children, attributes) {
+function rewrite_host_text_or_html_children(
+	node,
+	walked_children,
+	raw_children,
+	attributes,
+	transform_context,
+) {
 	const source_children = raw_children || walked_children;
 	const is_composite = is_component_like_element(node);
 	const html_children = source_children.filter((child) => child?.type === 'Html');
@@ -452,9 +470,12 @@ function rewrite_host_text_or_html_children(node, walked_children, raw_children,
 			has_dom_content_attribute(attributes, 'innerHTML') ||
 			has_dom_content_attribute(attributes, 'textContent')
 		) {
-			throw create_compile_error(
-				html_children[0],
+			error(
 				'`{html ...}` on the Vue target is only supported as the sole child of a host element. Use `innerHTML={...}` as an element attribute when you need the explicit prop form.',
+				transform_context?.filename ?? null,
+				html_children[0],
+				transform_context?.errors,
+				transform_context?.comments,
 			);
 		}
 

package/types/error-boundary.d.ts

@@ -0,0 +1,11 @@
+export interface TsrxErrorBoundaryProps {
+	content: () => any;
+	fallback: (error: unknown, reset: () => void) => any;
+}
+
+export interface TsrxErrorBoundaryComponent {
+	(props: TsrxErrorBoundaryProps): any;
+	__setup(): void;
+}
+
+export const TsrxErrorBoundary: TsrxErrorBoundaryComponent;

package/types/index.d.ts

@@ -6,7 +6,7 @@ export function parse(source: string, filename?: string, options?: ParseOptions)
 export function compile(
 	source: string,
 	filename?: string,
-	options?: { loose?: boolean },
+	options?: { collect?: boolean; loose?: boolean },
 ): {
 	code: string;
 	map: unknown;

package/types/merge-refs.d.ts

@@ -0,0 +1 @@
+export { mergeRefs } from '@tsrx/core/runtime/merge-refs';