@tsrx/core 0.0.16 → 0.0.18

package/package.json

@@ -3,7 +3,7 @@
   "description": "Core compiler infrastructure for TSRX syntax",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "type": "module",
   "repository": {
     "type": "git",
@@ -27,6 +27,9 @@
     "./types/acorn": {
       "types": "./types/acorn.d.ts"
     },
+    "./runtime/merge-refs": {
+      "default": "./src/runtime/merge-refs.js"
+    },
     "./test-harness/source-mappings": "./tests/shared/source-mappings.js",
     "./test-harness/compile": "./tests/shared/compile.js"
   },

package/src/index.js

@@ -139,6 +139,9 @@ export { escape } from './utils/escaping.js';
 // Transform
 export {
 	createJsxTransform,
+	merge_duplicate_refs as mergeDuplicateRefs,
+	to_jsx_attribute as toJsxAttribute,
+	validate_at_most_one_ref_attribute as validateAtMostOneRefAttribute,
 	component_to_function_declaration as componentToFunctionDeclaration,
 } from './transform/jsx/index.js';
 export {

package/src/plugin.js

@@ -176,6 +176,7 @@ export function TSRXPlugin(config) {
 			/** @type {AST.Node[]} */
 			#path = [];
 			#allowTagStartAfterDoubleQuotedText = false;
+			#allowDoubleQuotedTextChildAfterBrace = false;
 			#commentContextId = 0;
 			#loose = false;
 			/** @type {import('../types/index').CompileError[] | undefined} */
@@ -196,6 +197,79 @@ export function TSRXPlugin(config) {
 				this.#filename = tsrx_options?.filename || null;
 			}
 
+			#previousNonWhitespaceChar() {
+				let index = this.pos - 1;
+				while (index >= 0) {
+					const ch = this.input.charCodeAt(index);
+					if (ch !== 32 && ch !== 9 && ch !== 10 && ch !== 13) {
+						return ch;
+					}
+					index--;
+				}
+				return null;
+			}
+
+			#isDoubleQuotedTextChildStart() {
+				if (this.#path.findLast((n) => n.type === 'TsxCompat' || n.type === 'Tsx')) {
+					return false;
+				}
+
+				const parent = this.#path.at(-1);
+				if (!parent || (parent.type !== 'Component' && parent.type !== 'Element')) {
+					return false;
+				}
+
+				const context = this.curContext();
+				if (context === tstc.tc_oTag || context === tstc.tc_cTag) {
+					return false;
+				}
+
+				const prev = this.#previousNonWhitespaceChar();
+				return (
+					prev === null ||
+					prev === 34 || // "
+					prev === 59 || // ;
+					prev === 62 || // >
+					(prev === 123 && this.#allowDoubleQuotedTextChildAfterBrace) || // {
+					prev === 125 // }
+				);
+			}
+
+			#readDoubleQuotedTextChildToken() {
+				const start = this.pos;
+				let out = '';
+				this.pos++;
+				let chunkStart = this.pos;
+
+				while (this.pos < this.input.length) {
+					const ch = this.input.charCodeAt(this.pos);
+
+					if (ch === 34 /* " */) {
+						out += this.input.slice(chunkStart, this.pos);
+						this.pos++;
+						return this.finishToken(tt.string, out);
+					}
+
+					if (ch === 38 /* & */) {
+						out += this.input.slice(chunkStart, this.pos);
+						out += this.jsx_readEntity();
+						chunkStart = this.pos;
+						continue;
+					}
+
+					if (acorn.isNewLine(ch)) {
+						out += this.input.slice(chunkStart, this.pos);
+						out += this.jsx_readNewLine(true);
+						chunkStart = this.pos;
+						continue;
+					}
+
+					this.pos++;
+				}
+
+				this.raise(start, 'Unterminated double-quoted text child');
+			}
+
 			/**
 			 * @param {number} position
 			 * @param {number} end
@@ -559,6 +633,16 @@ export function TSRXPlugin(config) {
 			 * @type {Parse.Parser['getTokenFromCode']}
 			 */
 			getTokenFromCode(code) {
+				if (code === 34) {
+					const is_double_quoted_text_child = this.#isDoubleQuotedTextChildStart();
+					this.#allowDoubleQuotedTextChildAfterBrace = false;
+					if (is_double_quoted_text_child) {
+						return this.#readDoubleQuotedTextChildToken();
+					}
+				} else {
+					this.#allowDoubleQuotedTextChildAfterBrace = false;
+				}
+
 				if (code !== 60) {
 					this.#allowTagStartAfterDoubleQuotedText = false;
 				}
@@ -981,6 +1065,9 @@ export function TSRXPlugin(config) {
 				const parent_function_body_depth = this.#functionBodyDepth;
 				this.#functionBodyDepth = 0;
 
+				if (this.type === tt.braceL) {
+					this.#allowDoubleQuotedTextChildAfterBrace = true;
+				}
 				this.eat(tt.braceL);
 				node.body = [];
 				this.#path.push(node);
@@ -1318,12 +1405,12 @@ export function TSRXPlugin(config) {
 			parseDoubleQuotedTextChild() {
 				const node = /** @type {AST.TextNode} */ (this.startNode());
 				const expression = /** @type {AST.Literal} */ (this.startNode());
-				const raw = this.input.slice(this.start, this.end);
+				node.raw = this.input.slice(this.start, this.end);
 				const end = this.end;
 				const endLoc = this.endLoc;
 
 				expression.value = this.value;
-				expression.raw = raw;
+				expression.raw = JSON.stringify(this.value);
 				node.expression = this.finishNodeAt(expression, 'Literal', end, endLoc);
 
 				this.#allowTagStartAfterDoubleQuotedText = true;
@@ -2577,6 +2664,7 @@ export function TSRXPlugin(config) {
 					if (node === void 0) node = /** @type {AST.BlockStatement} */ (this.startNode());
 
 					node.body = [];
+					this.#allowDoubleQuotedTextChildAfterBrace = true;
 					this.expect(tt.braceL);
 					if (createNewLexicalScope) {
 						this.enterScope(0);

package/src/runtime/merge-refs.js

@@ -0,0 +1,61 @@
+/**
+ * Merge multiple refs (function refs and ref objects) into a single
+ * callback ref. Used by the tsrx-react, tsrx-preact, and tsrx-vue
+ * compilers when an element has more than one `ref` attribute, since
+ * those runtimes treat duplicate `ref` props as a regular duplicate-prop
+ * collision (last wins) rather than running both. Solid does not use this
+ * helper — its native runtime accepts an array of refs and the compiler
+ * emits an array literal directly.
+ *
+ * The returned callback ref handles four cases per input:
+ * - `null` / `undefined`: skipped.
+ * - function ref: invoked with the node. If it returns a function, that
+ *   return value is treated as a React 19 cleanup. Otherwise we record a
+ *   cleanup that calls the ref with `null` so the legacy unmount contract
+ *   still fires.
+ * - React-style ref object (`{ current }`): assigned on mount, cleared
+ *   on unmount.
+ * - Vue-style ref object (`{ value }`, e.g. `ref()` / `useTemplateRef()`):
+ *   assigned on mount, cleared on unmount.
+ *
+ * The merged ref always returns a cleanup. Under React 19 the cleanup
+ * runs on unmount and the inner refs are not separately re-invoked with
+ * `null`. Under older React, Preact, and Vue the cleanup return value
+ * is ignored, so the runtime instead invokes the merged ref a second
+ * time with `null` — which re-runs the loop body, calling each inner
+ * with `null` and clearing each ref object. Either way every inner ref
+ * sees a balanced mount/unmount.
+ *
+ * @param {...((node: any) => void | (() => void)) | { current: any } | { value: any } | null | undefined} refs
+ * @returns {(node: any) => (() => void)}
+ */
+export function mergeRefs(...refs) {
+	return (node) => {
+		/** @type {Array<() => void>} */
+		const cleanups = [];
+		for (const ref of refs) {
+			if (ref == null) continue;
+			if (typeof ref === 'function') {
+				const result = ref(node);
+				if (typeof result === 'function') {
+					cleanups.push(result);
+				} else {
+					cleanups.push(() => ref(null));
+				}
+			} else if ('current' in ref) {
+				ref.current = node;
+				cleanups.push(() => {
+					ref.current = null;
+				});
+			} else if ('value' in ref) {
+				ref.value = node;
+				cleanups.push(() => {
+					ref.value = null;
+				});
+			}
+		}
+		return () => {
+			for (const cleanup of cleanups) cleanup();
+		};
+	};
+}

package/src/transform/jsx/index.js

@@ -50,6 +50,7 @@ import { is_hoist_safe_jsx_node } from '../jsx-hoist.js';
  *   local_statement_component_index: number,
  *   needs_error_boundary: boolean,
  *   needs_suspense: boolean,
+ *   needs_merge_refs: boolean,
  *   helper_state: { base_name: string, next_id: number, helpers: any[], statics: any[] } | null,
  *   available_bindings: Map<string, AST.Identifier>,
  *   lazy_next_id: number,
@@ -103,6 +104,7 @@ export function createJsxTransform(platform) {
 			local_statement_component_index: 0,
 			needs_error_boundary: false,
 			needs_suspense: false,
+			needs_merge_refs: false,
 			helper_state: null,
 			available_bindings: new Map(),
 			lazy_next_id: 0,
@@ -2679,10 +2681,11 @@ function create_jsx_element(tag_name, attributes, children) {
 }
 
 /**
- * Inject import declarations for `Suspense` and `TsrxErrorBoundary` if the
- * transform determined they are needed. The import sources are platform-
- * specific (e.g. `react` vs `preact/compat`, `@tsrx/react/error-boundary`
- * vs `@tsrx/preact/error-boundary`).
+ * Inject runtime-helper import declarations the transform decided it needed
+ * during the walk: `Suspense` for `try { ... } pending { ... }`,
+ * `TsrxErrorBoundary` for `try { ... } catch (...)`, and `mergeRefs` for
+ * elements with multiple `ref` attributes under the `'merge-refs'`
+ * strategy. Import sources are platform-specific.
  *
  * @param {AST.Program} program
  * @param {TransformContext} transform_context
@@ -2743,6 +2746,35 @@ function inject_try_imports(program, transform_context, platform, suspense_sourc
 		});
 	}
 
+	if (transform_context.needs_merge_refs && platform.imports.mergeRefs) {
+		const merge_refs_source = platform.imports.mergeRefs;
+		imports.push({
+			type: 'ImportDeclaration',
+			specifiers: [
+				{
+					type: 'ImportSpecifier',
+					imported: {
+						type: 'Identifier',
+						name: 'mergeRefs',
+						metadata: { path: [] },
+					},
+					local: {
+						type: 'Identifier',
+						name: MERGE_REFS_LOCAL_NAME,
+						metadata: { path: [] },
+					},
+					metadata: { path: [] },
+				},
+			],
+			source: {
+				type: 'Literal',
+				value: merge_refs_source,
+				raw: `'${merge_refs_source}'`,
+			},
+			metadata: { path: [] },
+		});
+	}
+
 	if (imports.length > 0) {
 		program.body.unshift(...imports);
 	}
@@ -2915,9 +2947,15 @@ function to_jsx_expression_container(expression, source_node = expression) {
 /**
  * Dispatch point for element attribute transformation. Platforms can replace
  * the default "map over `to_jsx_attribute`" via
- * `hooks.transformElementAttributes` — Solid uses this to collapse
- * `<elem>{'text'}</elem>` into a `textContent` attribute and to route
- * attributes through its composite-element handling.
+ * `hooks.transformElementAttributes`. Whether or not the hook is used,
+ * the result is run through `merge_duplicate_refs` so platforms with a
+ * `multiRefStrategy` get duplicate-`ref` handling for free.
+ *
+ * Before lowering, the raw attribute list is validated to reject elements
+ * with more than one TSX-style `ref={...}` attribute — that shape produces
+ * duplicate JSX props which the JSX runtime collapses to last-wins (and
+ * which TypeScript can't type cleanly). Multiple Ripple `{ref expr}`
+ * keyword-form refs remain valid and merge into a single ref attribute.
  *
  * @param {any[]} attrs
  * @param {TransformContext} transform_context
@@ -2925,21 +2963,175 @@ function to_jsx_expression_container(expression, source_node = expression) {
  * @returns {any[]}
  */
 function transform_element_attributes_dispatch(attrs, transform_context, element) {
+	validate_at_most_one_ref_attribute(attrs);
 	const preprocess = transform_context.platform.hooks?.preprocessElementAttributes;
 	if (preprocess) {
 		attrs = preprocess(attrs, transform_context, element);
 	}
 	const hook = transform_context.platform.hooks?.transformElementAttributes;
-	if (hook) return hook(attrs, transform_context, element);
-	return attrs.map((/** @type {any} */ a) => to_jsx_attribute(a, transform_context));
+	const result = hook
+		? hook(attrs, transform_context, element)
+		: attrs.map((/** @type {any} */ a) => to_jsx_attribute(a, transform_context));
+	return merge_duplicate_refs(result, transform_context);
+}
+
+/**
+ * Reject elements with more than one TSX-style `ref={...}` attribute.
+ * Ripple's `{ref expr}` keyword form is parsed as a `RefAttribute` node
+ * and is excluded from the count — multiple keyword-form refs are a Ripple
+ * feature that compose via the merge pass. This validator runs over the
+ * raw, pre-lowering attribute list so each shape is still distinguishable
+ * by `type`. Ripple `Element` attributes have type `Attribute` with an
+ * `Identifier` name (the parser normalizes `JSXAttribute`/`JSXIdentifier`
+ * for non-Tsx elements); inside `<tsx:react>` compat blocks they retain
+ * the original `JSXAttribute`/`JSXIdentifier` shape, so we accept both.
+ *
+ * @param {any[]} raw_attrs
+ */
+export function validate_at_most_one_ref_attribute(raw_attrs) {
+	let first = null;
+	for (const attr of raw_attrs) {
+		if (!attr) continue;
+		const is_ref_attr =
+			(attr.type === 'Attribute' &&
+				attr.name &&
+				attr.name.type === 'Identifier' &&
+				attr.name.name === 'ref') ||
+			(attr.type === 'JSXAttribute' &&
+				attr.name &&
+				attr.name.type === 'JSXIdentifier' &&
+				attr.name.name === 'ref');
+		if (!is_ref_attr) continue;
+		if (first) {
+			throw create_compile_error(
+				attr,
+				'Element has multiple `ref={...}` attributes; an element may have at most one. ' +
+					"Use Ripple's `{ref expr}` keyword form to combine multiple refs on one element.",
+			);
+		}
+		first = attr;
+	}
+}
+
+/**
+ * Collapse multiple `ref` JSXAttributes on a single element into one. Both
+ * Ripple's `{ref expr}` keyword form and TSX-style `ref={expr}` are handled
+ * because they have already been normalized to `JSXAttribute` named `ref`
+ * by `to_jsx_attribute` (Ripple) or the parser (TSX-style). The shape of
+ * the merged value depends on `platform.jsx.multiRefStrategy`:
+ *
+ * - `'merge-refs'` — emit `ref={__mergeRefs(a, b, ...)}` and flag
+ *   `needs_merge_refs` so an import is injected later. React and Preact
+ *   need this because their runtimes dedupe duplicate `ref` props.
+ * - `'array'` — emit `ref={[a, b, ...]}`. Solid's runtime iterates
+ *   array refs natively, so no helper is required.
+ * - `undefined` — return the list unchanged. The platform takes care
+ *   of duplicate refs at runtime (or doesn't support them).
+ *
+ * Single-ref elements are always left unchanged so trivial cases stay
+ * import-free and produce no helper call.
+ *
+ * @param {any[]} jsx_attrs
+ * @param {TransformContext} transform_context
+ * @returns {any[]}
+ */
+export function merge_duplicate_refs(jsx_attrs, transform_context) {
+	const strategy = transform_context.platform.jsx.multiRefStrategy;
+	if (!strategy) return jsx_attrs;
+
+	let count = 0;
+	for (const attr of jsx_attrs) {
+		if (is_jsx_ref_attribute(attr)) count += 1;
+	}
+	if (count <= 1) return jsx_attrs;
+
+	/** @type {any[]} */
+	const ref_exprs = [];
+	/** @type {any[]} */
+	const result = [];
+	for (const attr of jsx_attrs) {
+		if (is_jsx_ref_attribute(attr)) {
+			ref_exprs.push(attr.value.expression);
+		} else {
+			result.push(attr);
+		}
+	}
+
+	const merged_value =
+		strategy === 'merge-refs'
+			? /** @type {any} */ ({
+					type: 'CallExpression',
+					callee: {
+						type: 'Identifier',
+						name: MERGE_REFS_LOCAL_NAME,
+						metadata: { path: [] },
+					},
+					arguments: ref_exprs,
+					optional: false,
+					metadata: { path: [] },
+				})
+			: /** @type {any} */ ({
+					type: 'ArrayExpression',
+					elements: ref_exprs,
+					metadata: { path: [] },
+				});
+
+	if (strategy === 'merge-refs') {
+		transform_context.needs_merge_refs = true;
+	}
+
+	// The merged ref attribute is a synthesis of multiple input refs and
+	// has no single source position to map back to, so we omit `loc` for
+	// the same reason `to_jsx_attribute` does for `RefAttribute`-derived
+	// JSX attributes.
+	result.push(
+		/** @type {any} */ ({
+			type: 'JSXAttribute',
+			name: { type: 'JSXIdentifier', name: 'ref', metadata: { path: [] } },
+			value: {
+				type: 'JSXExpressionContainer',
+				expression: merged_value,
+				metadata: { path: [] },
+			},
+			shorthand: false,
+			metadata: { path: [] },
+		}),
+	);
+
+	return result;
 }
 
+/**
+ * @param {any} attr
+ * @returns {boolean}
+ */
+function is_jsx_ref_attribute(attr) {
+	return (
+		!!attr &&
+		attr.type === 'JSXAttribute' &&
+		!!attr.name &&
+		attr.name.type === 'JSXIdentifier' &&
+		attr.name.name === 'ref' &&
+		!!attr.value &&
+		attr.value.type === 'JSXExpressionContainer' &&
+		!!attr.value.expression &&
+		attr.value.expression.type !== 'JSXEmptyExpression'
+	);
+}
+
+/**
+ * Local alias used for the injected `mergeRefs` import. The leading
+ * double-underscore matches the convention for compiler-generated
+ * identifiers and avoids shadowing user-declared `mergeRefs` symbols.
+ */
+const MERGE_REFS_LOCAL_NAME = '__mergeRefs';
+
 /**
  * @param {any} attr
  * @param {TransformContext} transform_context
  * @returns {ESTreeJSX.JSXAttribute | ESTreeJSX.JSXSpreadAttribute}
  */
-function to_jsx_attribute(attr, transform_context) {
+export function to_jsx_attribute(attr, transform_context) {
 	if (!attr) return attr;
 	if (attr.type === 'JSXAttribute' || attr.type === 'JSXSpreadAttribute') {
 		return attr;
@@ -2954,15 +3146,20 @@ function to_jsx_attribute(attr, transform_context) {
 		);
 	}
 	if (attr.type === 'RefAttribute') {
-		// RefAttribute uses `{ref expr}` syntax whose source positions don't map to the
-		// generated `ref={expr}` JSX attribute, so we intentionally omit loc.
-		return /** @type {any} */ ({
-			type: 'JSXAttribute',
-			name: { type: 'JSXIdentifier', name: 'ref', metadata: { path: [] } },
-			value: to_jsx_expression_container(attr.argument),
-			shorthand: false,
-			metadata: { path: [] },
-		});
+		// `{ref expr}` and the generated `ref={expr}` have different shapes,
+		// so the source-to-generated mapping is imprecise — but pointing
+		// editors at the `{ref expr}` span is still useful for hover/jump,
+		// matching how shorthand `{name}` → `name={name}` carries loc.
+		return set_loc(
+			/** @type {any} */ ({
+				type: 'JSXAttribute',
+				name: { type: 'JSXIdentifier', name: 'ref', metadata: { path: [] } },
+				value: to_jsx_expression_container(attr.argument),
+				shorthand: false,
+				metadata: { path: [] },
+			}),
+			attr,
+		);
 	}
 
 	// Platforms that expect React-style DOM attrs (React) rewrite `class` to

package/types/index.d.ts

@@ -398,6 +398,7 @@ declare module 'estree' {
 	export interface TextNode extends AST.BaseExpression {
 		type: 'Text';
 		expression: AST.Expression;
+		raw?: string;
 		loc?: AST.SourceLocation;
 	}
 

package/types/jsx-platform.d.ts

@@ -91,8 +91,10 @@ export interface JsxPlatformHooks {
 	injectImports?: (program: AST.Program, ctx: any, suspenseSource: string) => void;
 	/**
 	 * Transform a Ripple element's attributes to JSX attributes. Default
-	 * is "map over `to_jsx_attribute`". Solid replaces this to route
-	 * attributes through its composite-element handling.
+	 * is "map over `to_jsx_attribute`" plus the shared multi-`ref` merge
+	 * pass. Platforms that own a `transformElement` hook (e.g. Solid) bypass
+	 * this entirely — they never reach the dispatch path that would call
+	 * it — and run their own attribute pass inside their `transformElement`.
 	 */
 	transformElementAttributes?: (attrs: any[], ctx: any, element: any) => any[];
 	/**
@@ -194,6 +196,13 @@ export interface JsxPlatform {
 		 * block appears. Usually `'@tsrx/<platform>/error-boundary'`.
 		 */
 		errorBoundary: string;
+		/**
+		 * Module to import `mergeRefs` from when an element has more than one
+		 * `ref` attribute and the platform uses the `'merge-refs'` strategy.
+		 * Required when `jsx.multiRefStrategy === 'merge-refs'`; ignored
+		 * otherwise. React: `'@tsrx/react/merge-refs'`. Preact: `'@tsrx/preact/merge-refs'`.
+		 */
+		mergeRefs?: string;
 	};
 
 	jsx: {
@@ -207,6 +216,20 @@ export interface JsxPlatform {
 		 * only `'react'`. Preact accepts both `'preact'` and `'react'`.
 		 */
 		acceptedTsxKinds: readonly string[];
+		/**
+		 * How to collapse multiple `ref` attributes on the same element into
+		 * one. React's and Preact's runtimes treat duplicate `ref` props as
+		 * a normal duplicate-prop collision (last wins), so they need a
+		 * compile-time merge. Solid's runtime accepts an array of refs
+		 * natively, so it can use the cheaper array form.
+		 *
+		 * - `'merge-refs'`: emit `ref={mergeRefs(a, b, ...)}` and inject an
+		 *   import from `imports.mergeRefs`.
+		 * - `'array'`: emit `ref={[a, b, ...]}`. No runtime helper needed.
+		 * - `undefined`: no merging — duplicate `ref` attributes pass through
+		 *   unchanged. The platform's runtime is responsible.
+		 */
+		multiRefStrategy?: 'merge-refs' | 'array';
 	};
 
 	validation: {