@tsrx/core 0.1.26 → 0.1.27

package/package.json

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

package/src/plugin.js

@@ -55,27 +55,6 @@ const CharCode = Object.freeze({
 	closeBrace: 125,
 });
 
-/**
- * Keywords after which a `/` begins a regex literal rather than division, used
- * by the look-ahead scanners to track expression position in script content.
- */
-const REGEX_PRECEDING_KEYWORDS = new Set([
-	'return',
-	'typeof',
-	'instanceof',
-	'in',
-	'of',
-	'new',
-	'delete',
-	'void',
-	'do',
-	'else',
-	'yield',
-	'await',
-	'case',
-	'throw',
-]);
-
 // Transparent wrappers to look through when validating a dynamic tag
 // expression (`<{expr}>`), and syntax that disqualifies one outright.
 const DYNAMIC_TAG_WRAPPER_TYPES = new Set([
@@ -596,6 +575,26 @@ export function TSRXPlugin(config) {
 						}
 						continue;
 					}
+					if (this.#isTemplateBlockCommentStart(index)) {
+						const comment_start = index;
+						const comment_start_loc = acorn.getLineInfo(this.input, comment_start);
+						const close = this.input.indexOf('*/', index + 2);
+						const value_end = close === -1 ? this.input.length : close;
+						index = close === -1 ? this.input.length : close + 2;
+						if (this.options.onComment && comment_start >= token_end) {
+							const comment_end_loc = acorn.getLineInfo(this.input, index);
+							this.options.onComment(
+								true,
+								this.input.slice(comment_start + 2, value_end),
+								comment_start,
+								index,
+								new acorn.Position(comment_start_loc.line, comment_start_loc.column),
+								new acorn.Position(comment_end_loc.line, comment_end_loc.column),
+								/** @type {any} */ (null),
+							);
+						}
+						continue;
+					}
 					const ch = this.input.charCodeAt(index);
 					if (
 						ch === CharCode.lessThan ||
@@ -972,6 +971,19 @@ export function TSRXPlugin(config) {
 				);
 			}
 
+			/**
+			 * Unlike `//` (which is only a comment at line-start so inline text like
+			 * `https://…` stays text), `/*` starts a comment anywhere in template
+			 * text, matching `jsx_readToken`.
+			 * @param {number} index
+			 */
+			#isTemplateBlockCommentStart(index) {
+				return (
+					this.input.charCodeAt(index) === CharCode.slash &&
+					this.input.charCodeAt(index + 1) === CharCode.asterisk
+				);
+			}
+
 			/**
 			 * @param {number} start
 			 */
@@ -984,7 +996,8 @@ export function TSRXPlugin(config) {
 						ch === CharCode.openBrace ||
 						ch === CharCode.closeBrace ||
 						this.#isJSXControlFlowDirectiveAt(index) ||
-						this.#isTemplateLineCommentStart(index)
+						this.#isTemplateLineCommentStart(index) ||
+						this.#isTemplateBlockCommentStart(index)
 					) {
 						break;
 					}
@@ -2005,9 +2018,10 @@ export function TSRXPlugin(config) {
 					);
 					const closingEnd = closingStart + '</style>'.length;
 					const closingEndInfo = acorn.getLineInfo(this.input, closingEnd);
-					const closingElement = /** @type {ESTreeJSX.JSXClosingElement & AST.NodeWithLocation} */ (
-						this.startNodeAt(closingStart, closingStartLoc)
-					);
+					const closingElement =
+						/** @type {ESTreeJSX.TSRXJSXClosingElement & AST.NodeWithLocation} */ (
+							this.startNodeAt(closingStart, closingStartLoc)
+						);
 					closingElement.name = name;
 					this.finishNodeAt(
 						closingElement,
@@ -4208,8 +4222,10 @@ export function TSRXPlugin(config) {
 				} else {
 					if (is_style) {
 						/** @type {AST.JSXStyleElement} */ (node).type = 'JSXStyleElement';
-						/** @type {AST.JSXStyleElement} */ (node).openingElement = open;
-						/** @type {AST.JSXStyleElement} */ (node).closingElement = null;
+						/** @type {AST.JSXStyleElement} */ (node).openingElement =
+							/** @type {AST.JSXStyleElement['openingElement']} */ (open);
+						/** @type {AST.JSXStyleElement} */ (node).closingElement =
+							/** @type {AST.JSXStyleElement['closingElement']} */ (null);
 					} else {
 						/** @type {ESTreeJSX.JSXElement} */ (node).type = 'JSXElement';
 						/** @type {ESTreeJSX.JSXElement} */ (node).openingElement = open;

package/types/index.d.ts

@@ -253,6 +253,9 @@ declare module 'estree' {
 		TsrxFragment: TsrxFragment;
 		Text: Text;
 		TSRXJSXElement: TSRXJSXElement;
+		TSRXJSXFragment: TSRXJSXFragment;
+		TSRXJSXOpeningElement: ESTreeJSX.TSRXJSXOpeningElement;
+		TSRXJSXClosingElement: ESTreeJSX.TSRXJSXClosingElement;
 		TSRXExpression: TSRXExpression;
 		Attribute: Attribute;
 		SpreadAttribute: SpreadAttribute;
@@ -346,7 +349,11 @@ declare module 'estree' {
 		| AST.JSXCodeBlock;
 
 	interface TSRXJSXElement
-		extends Omit<ESTreeJSX.JSXElement, 'children'>, AST.NodeWithMaybeComments {
+		extends
+			Omit<ESTreeJSX.JSXElement, 'children' | 'openingElement' | 'closingElement'>,
+			AST.NodeWithMaybeComments {
+		openingElement: ESTreeJSX.TSRXJSXOpeningElement;
+		closingElement: ESTreeJSX.TSRXJSXClosingElement | null;
 		children: TSRXJSXChild[];
 		metadata: BaseNodeMetaData & {
 			ts_name?: string;
@@ -366,13 +373,10 @@ declare module 'estree' {
 		innerComments?: AST.Comment[] | undefined;
 	}
 
-	interface JSXStyleElement extends AST.BaseExpression {
+	interface JSXStyleElement extends Omit<AST.TSRXJSXElement, 'type' | 'children'> {
 		type: 'JSXStyleElement';
-		openingElement: ESTreeJSX.JSXOpeningElement;
-		closingElement: ESTreeJSX.JSXClosingElement | null;
 		children: AST.CSS.StyleSheet[];
 		css?: string;
-		metadata: BaseNodeMetaData;
 		unclosed?: boolean;
 	}
 
@@ -520,7 +524,7 @@ declare module 'estree' {
 
 	type TSRXStatement = AST.Statement | TSESTree.Statement;
 
-	type NodeWithChildren = TSRXJSXElement | TSRXJSXFragment | JSXStyleElement;
+	type NodeWithChildren = TSRXJSXElement | TSRXJSXFragment | JSXStyleElement | ESTreeJSX.JSXElement;
 
 	export namespace CSS {
 		export interface BaseNode extends AST.NodeWithMaybeComments {
@@ -736,11 +740,11 @@ declare module 'estree-jsx' {
 	}
 
 	interface TSRXJSXOpeningElement extends Omit<JSXOpeningElement, 'name'> {
-		name: AST.MemberExpression | JSXIdentifier | JSXNamespacedName;
+		name: AST.MemberExpression | JSXIdentifier | JSXNamespacedName | JSXExpressionContainer;
 	}
 
 	interface TSRXJSXClosingElement extends Omit<JSXClosingElement, 'name'> {
-		name: AST.MemberExpression | JSXIdentifier | JSXNamespacedName;
+		name: AST.MemberExpression | JSXIdentifier | JSXNamespacedName | JSXExpressionContainer;
 	}
 
 	interface ExpressionMap {