@tsrx/core 0.1.61 → 0.1.62

package/package.json

@@ -3,7 +3,7 @@
   "description": "Core compiler infrastructure for TSRX syntax",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.1.61",
+  "version": "0.1.62",
   "type": "module",
   "repository": {
     "type": "git",
@@ -79,7 +79,7 @@
     "is-reference": "^3.0.3",
     "magic-string": "^0.30.18",
     "zimmerframe": "^1.1.2",
-    "@tsrx/runtime": "0.1.1"
+    "@tsrx/runtime": "0.1.2"
   },
   "devDependencies": {
     "@types/node": "^24.3.0",

package/src/parse/index.js

@@ -809,6 +809,10 @@ export function get_comment_handlers(source, comments, index = 0) {
 								const hasBlankLine = /\n\s*\n/.test(slice);
 								const nodeEndLine = node.loc?.end?.line ?? null;
 								const commentStartLine = comments[0].loc?.start?.line ?? null;
+								const commentOnSameLine =
+									nodeEndLine !== null &&
+									commentStartLine !== null &&
+									nodeEndLine === commentStartLine;
 								const isImmediateNextLine =
 									nodeEndLine !== null &&
 									commentStartLine !== null &&
@@ -853,10 +857,7 @@ export function get_comment_handlers(source, comments, index = 0) {
 									// For function parameters, only attach as trailing comment if it's on the same line
 									// Comments on next line after comma should be leading comments of next parameter
 									if (isParam) {
-										// Check if comment is on same line as the node
-										const nodeEndLine = source.slice(0, node.end).split('\n').length;
-										const commentStartLine = source.slice(0, comments[0].start).split('\n').length;
-										if (nodeEndLine === commentStartLine) {
+										if (commentOnSameLine) {
 											node.trailingComments = [
 												/** @type {AST.CommentWithLocation} */ (comments.shift()),
 											];
@@ -868,11 +869,6 @@ export function get_comment_handlers(source, comments, index = 0) {
 										// Only attach as trailing if:
 										// 1. It's on the same line as this node, OR
 										// 2. This is the last item in the array (no next sibling to attach to)
-										const commentOnSameLine =
-											nodeEndLine !== null &&
-											commentStartLine !== null &&
-											nodeEndLine === commentStartLine;
-
 										if (commentOnSameLine || is_last_in_array) {
 											node.trailingComments = [
 												/** @type {AST.CommentWithLocation} */ (comments.shift()),

package/src/transform/jsx/ast-builders.js

@@ -391,14 +391,17 @@ export function flatten_switch_consequent(consequent) {
 export function clone_ast_node(node, with_locations = true) {
 	if (!node || typeof node !== 'object') return node;
 	if (Array.isArray(node)) {
-		return /** @type {T} */ (node.map((child) => clone_ast_node(child, with_locations)));
+		const clone = new Array(node.length);
+		for (let i = 0; i < node.length; i++) {
+			clone[i] = clone_ast_node(node[i], with_locations);
+		}
+		return /** @type {T} */ (clone);
 	}
-	const clone = { ...node };
+	const clone = /** @type {T} */ (with_locations ? { ...node } : {});
 	const clone_record = /** @type {Record<string, unknown>} */ (clone);
 
 	for (const key of Object.keys(node)) {
 		if (!with_locations && (key === 'loc' || key === 'start' || key === 'end')) {
-			delete clone_record[key];
 			continue;
 		}
 		if (key === 'metadata') {

package/src/transform/segments.js

@@ -517,6 +517,11 @@ export function convert_source_map_to_mappings(
 	function set_bracket_computed_mapping(node, mappings) {
 		if (has_location(node.key)) {
 			const key = node.key;
+			const start_key = `${key.loc.start.line}:${key.loc.start.column - 1}`;
+			const end_key = `${key.loc.end.line}:${key.loc.end.column + 1}`;
+			if (!src_to_gen_map.get(start_key)?.length || !src_to_gen_map.get(end_key)?.length) {
+				return;
+			}
 			mappings.push(
 				get_mapping_from_node(
 					/** @type {AST.NodeWithLocation} */ ({