@tsrx/core 0.0.14 → 0.0.15

package/README.md

@@ -61,15 +61,20 @@ component Button(props: Props) {
 ### 2. JSX-as-statements
 
 Inside a `component` body, JSX elements are valid _statement_ forms. They describe
-rendered output and are not expressions — they have no value.
+rendered output and are not expressions — they have no value. Static text may be
+written as a direct double-quoted child; dynamic values and other JavaScript
+expressions stay inside `{}`.
 
 ```tsx
 component Greeting() {
-  <h1>{'Hello'}</h1>
-  <p>{'Welcome'}</p>
+  <h1>"Hello"</h1>
+  <p>"Welcome"</p>
 }
 ```
 
+Only double quotes have direct-child text meaning. Single-quoted strings and
+template literals remain JavaScript expressions and must be written inside `{}`.
+
 Elsewhere (outside a `component` body), JSX remains an expression, as in standard
 JSX.
 
@@ -84,9 +89,9 @@ introduced — but framework compilers treat them as _reactive_ boundaries.
 ```tsx
 component List(props: { items: Item[]; showHeader: boolean }) {
   if (props.showHeader) {
-    <h1>{'Items'}</h1>
+    <h1>"Items"</h1>
   } else {
-    <h2>{'(no header)'}</h2>
+    <h2>"(no header)"</h2>
   }
 
   for (const item of props.items) {
@@ -95,10 +100,10 @@ component List(props: { items: Item[]; showHeader: boolean }) {
 
   switch (props.items.length) {
     case 0:
-      <p>{'empty'}</p>
+      <p>"empty"</p>
       break;
     default:
-      <p>{'has items'}</p>
+      <p>"has items"</p>
   }
 
   try {
@@ -169,7 +174,7 @@ children).
 
 ```tsx
 component Page() {
-  const header = <tsx><h1>{'Hello'}</h1></tsx>;
+  const header = <tsx><h1>Hello</h1></tsx>;
   renderSomewhereElse(header);
 }
 ```

package/package.json

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

package/src/plugin.js

@@ -175,6 +175,7 @@ export function TSRXPlugin(config) {
 		class TSRXParser extends Parser {
 			/** @type {AST.Node[]} */
 			#path = [];
+			#allowTagStartAfterDoubleQuotedText = false;
 			#commentContextId = 0;
 			#loose = false;
 			/** @type {import('../types/index').CompileError[] | undefined} */
@@ -558,6 +559,10 @@ export function TSRXPlugin(config) {
 			 * @type {Parse.Parser['getTokenFromCode']}
 			 */
 			getTokenFromCode(code) {
+				if (code !== 60) {
+					this.#allowTagStartAfterDoubleQuotedText = false;
+				}
+
 				if (code === 60) {
 					// < character
 					const inComponent = this.#path.findLast((n) => n.type === 'Component');
@@ -634,8 +639,14 @@ export function TSRXPlugin(config) {
 						// Inside component template bodies, allow adjacent tags without requiring
 						// a newline/indentation before the next '<'. This is important for inputs
 						// like `<div />` and `</div><style>...</style>` which Prettier formats.
-						if (prevNonWhitespaceChar === 123 /* '{' */ || prevNonWhitespaceChar === 62 /* '>' */) {
+						if (
+							(prevNonWhitespaceChar === 34 /* '"' */ &&
+								this.#allowTagStartAfterDoubleQuotedText) ||
+							prevNonWhitespaceChar === 123 /* '{' */ ||
+							prevNonWhitespaceChar === 62 /* '>' */
+						) {
 							if (!isWhitespaceAfterLt) {
+								this.#allowTagStartAfterDoubleQuotedText = false;
 								++this.pos;
 								return this.finishToken(tstt.jsxTagStart);
 							}
@@ -712,6 +723,7 @@ export function TSRXPlugin(config) {
 						}
 					}
 				}
+				this.#allowTagStartAfterDoubleQuotedText = false;
 				return super.getTokenFromCode(code);
 			}
 
@@ -1300,6 +1312,30 @@ export function TSRXPlugin(config) {
 				);
 			}
 
+			/**
+			 * @returns {AST.TextNode}
+			 */
+			parseDoubleQuotedTextChild() {
+				const node = /** @type {AST.TextNode} */ (this.startNode());
+				const expression = /** @type {AST.Literal} */ (this.startNode());
+				const raw = this.input.slice(this.start, this.end);
+				const end = this.end;
+				const endLoc = this.endLoc;
+
+				expression.value = this.value;
+				expression.raw = raw;
+				node.expression = this.finishNodeAt(expression, 'Literal', end, endLoc);
+
+				this.#allowTagStartAfterDoubleQuotedText = true;
+				try {
+					this.next();
+				} finally {
+					this.#allowTagStartAfterDoubleQuotedText = false;
+				}
+
+				return this.finishNodeAt(node, 'Text', end, endLoc);
+			}
+
 			/**
 			 * @type {Parse.Parser['jsx_parseAttribute']}
 			 */
@@ -2293,6 +2329,8 @@ export function TSRXPlugin(config) {
 						delete node.text;
 					}
 					body.push(node);
+				} else if (this.type === tt.string && this.input.charCodeAt(this.start) === 34) {
+					body.push(this.parseDoubleQuotedTextChild());
 				} else if (this.type === tt.braceR) {
 					// Leaving a component/template body. We may still be in TSX/JSX tokenization
 					// context (e.g. after parsing markup), but the closing `}` is a JS token.

package/src/transform/segments.js

@@ -1450,12 +1450,6 @@ export function convert_source_map_to_mappings(
 					}
 				}
 
-				if (node.loc) {
-					mappings.push(
-						get_mapping_from_node(node, src_to_gen_map, gen_line_offsets, mapping_data_verify_only),
-					);
-				}
-
 				return;
 			} else if (node.type === 'SwitchCase') {
 				// Visit in source order: test, consequent
@@ -1705,14 +1699,21 @@ export function convert_source_map_to_mappings(
 					// Generic spans can be emitted by downstream transforms with sparse source-map
 					// coverage around the angle-bracket delimiters. Skip missing whole-node mappings
 					// instead of crashing Volar, and rely on child type-node mappings instead.
-					const mapping = get_mapping_from_node(
-						node,
-						src_to_gen_map,
-						gen_line_offsets,
-						mapping_data_verify_only,
-					);
-					if (!(mapping instanceof Error)) {
+					try {
+						const mapping = get_mapping_from_node(
+							node,
+							src_to_gen_map,
+							gen_line_offsets,
+							mapping_data_verify_only,
+						);
 						mappings.push(mapping);
+					} catch (error) {
+						if (
+							!(error instanceof Error) ||
+							!error.message.startsWith('No source map entry for position')
+						) {
+							throw error;
+						}
 					}
 				}
 				// Generic type parameters - visit to collect type variable names

package/types/parse.d.ts

@@ -1174,6 +1174,8 @@ export namespace Parse {
 
 		parseElement(): AST.Element | AST.Tsx | AST.TsxCompat;
 
+		parseDoubleQuotedTextChild(): AST.TextNode;
+
 		parseTemplateBody(
 			body: (AST.Statement | AST.Node | ESTreeJSX.JSXText | ESTreeJSX.JSXElement['children'])[],
 		): void;