@tsrx/core 0.1.14 → 0.1.15

package/package.json

@@ -3,7 +3,7 @@
   "description": "Core compiler infrastructure for TSRX syntax",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "type": "module",
   "repository": {
     "type": "git",

package/src/parse/index.js

@@ -605,6 +605,10 @@ export function get_comment_handlers(source, comments, index = 0) {
 									node_array = parent.elements;
 								} else if (parent.type === 'ObjectExpression') {
 									node_array = parent.properties;
+								} else if (parent.type === 'ObjectPattern') {
+									node_array = parent.properties;
+								} else if (parent.type === 'TSTypeLiteral') {
+									node_array = parent.members;
 								} else if (
 									parent.type === 'FunctionDeclaration' ||
 									parent.type === 'FunctionExpression' ||
@@ -622,11 +626,22 @@ export function get_comment_handlers(source, comments, index = 0) {
 								is_last_in_array = node_array.indexOf(node) === node_array.length - 1;
 							}
 
+							const trailingCommentBoundary =
+								parent &&
+								parent.type === 'ObjectPattern' &&
+								parent.typeAnnotation &&
+								parent.typeAnnotation.start !== undefined
+									? parent.typeAnnotation.start
+									: parent?.end;
+
 							if (is_last_in_array) {
 								if (isParam || isArgument) {
 									while (comments.length) {
 										const potentialComment = comments[0];
-										if (parent && potentialComment.start >= parent.end) {
+										if (
+											trailingCommentBoundary !== undefined &&
+											potentialComment.start >= trailingCommentBoundary
+										) {
 											break;
 										}
 
@@ -653,7 +668,12 @@ export function get_comment_handlers(source, comments, index = 0) {
 									// and they can be separated by newlines
 									while (comments.length) {
 										const comment = comments[0];
-										if (parent && comment.start >= parent.end) break;
+										if (
+											trailingCommentBoundary !== undefined &&
+											comment.start >= trailingCommentBoundary
+										) {
+											break;
+										}
 
 										const maybeInner = getEmptyElementInnerCommentTarget(comment);
 										if (maybeInner) {

package/src/transform/jsx/helpers.js

@@ -235,6 +235,7 @@ export function tsx_with_ts_locations() {
 		'AwaitExpression',
 		'SwitchStatement',
 		'TaggedTemplateExpression',
+		'ArrowFunctionExpression',
 		// JSX wrapper nodes: esrap writes `<`, `>`, `</`, `{`, `}` without
 		// locations, so the opening/closing element's and expression
 		// container's start and end don't resolve.

package/src/transform/segments.js

@@ -903,6 +903,23 @@ export function convert_source_map_to_mappings(
 				node.type === 'ArrowFunctionExpression'
 			) {
 				const is_method = node.metadata?.is_method;
+
+				if (node.type === 'ArrowFunctionExpression' && node.loc) {
+					const start_key = `${node.loc.start.line}:${node.loc.start.column}`;
+					const end_key = `${node.loc.end.line}:${node.loc.end.column}`;
+
+					if (src_to_gen_map.has(start_key) && src_to_gen_map.has(end_key)) {
+						mappings.push(
+							get_mapping_from_node(
+								node,
+								src_to_gen_map,
+								gen_line_offsets,
+								mapping_data_verify_only,
+							),
+						);
+					}
+				}
+
 				// Add function/component keyword token
 				if (
 					(node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression') &&