ripple 0.2.93 → 0.2.95

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is an elegant TypeScript UI framework",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.2.93",
+  "version": "0.2.95",
   "type": "module",
   "module": "src/runtime/index-client.js",
   "main": "src/runtime/index-client.js",

package/src/compiler/phases/2-analyze/index.js

@@ -301,6 +301,15 @@ const visitors = {
 		}
 	},
 
+	TSTypeReference(node, context) {
+		// bug in our acorn pasrer: it uses typeParameters instead of typeArguments
+		if (node.typeParameters) {
+			node.typeArguments = node.typeParameters;
+			delete node.typeParameters;
+		}
+		context.next();
+	},
+
 	IfStatement(node, context) {
 		if (!is_inside_component(context)) {
 			return context.next();

package/src/compiler/phases/3-transform/client/index.js

@@ -419,59 +419,7 @@ const visitors = {
 					delete declarator.id.typeAnnotation;
 				}
 
-				if (binding !== null && binding.kind === 'tracked') {
-					let expression;
-
-					if (context.state.to_ts) {
-						// TypeScript mode: lighter transformation
-						if (metadata.tracking && !metadata.await) {
-							expression = b.call(
-								'_$_.derived',
-								b.thunk(context.visit(declarator.init)),
-								b.id('__block'),
-							);
-						} else {
-							expression = b.call(
-								'_$_.tracked',
-								declarator.init === null ? undefined : context.visit(declarator.init),
-								b.id('__block'),
-							);
-						}
-					} else {
-						debugger;
-						// Runtime mode: full transformation
-						if (metadata.tracking && metadata.await) {
-							expression = b.call(
-								b.await(
-									b.call(
-										'_$_.resume_context',
-										b.call(
-											'_$_.async_computed',
-											b.thunk(context.visit(declarator.init), true),
-											b.id('__block'),
-										),
-									),
-								),
-							);
-						} else if (metadata.tracking && !metadata.await) {
-							expression = b.call(
-								'_$_.derived',
-								b.thunk(context.visit(declarator.init)),
-								b.id('__block'),
-							);
-						} else {
-							expression = b.call(
-								'_$_.tracked',
-								declarator.init === null ? undefined : context.visit(declarator.init),
-								b.id('__block'),
-							);
-						}
-					}
-
-					declarations.push(b.declarator(declarator.id, expression));
-				} else {
-					declarations.push(context.visit(declarator));
-				}
+				declarations.push(context.visit(declarator));
 			} else {
 				if (!context.state.to_ts) {
 					delete declarator.id.typeAnnotation;
@@ -1458,12 +1406,14 @@ function transform_ts_child(node, context) {
 		state.init.push(b.if(visit(node.test), consequent, alternate));
 	} else if (node.type === 'ForOfStatement') {
 		const body_scope = context.state.scopes.get(node.body);
-		const body = b.block(
-			transform_body(node.body.body, {
-				...context,
-				state: { ...context.state, scope: body_scope },
-			}),
-		);
+		const block_body = transform_body(node.body.body, {
+			...context,
+			state: { ...context.state, scope: body_scope },
+		});
+		if (node.index) {
+			block_body.unshift(b.let(visit(node.index), b.literal(0)));
+		}
+		const body = b.block(block_body);
 
 		state.init.push(b.for_of(visit(node.left), visit(node.right), body, node.await));
 	} else if (node.type === 'TryStatement') {

package/src/compiler/phases/3-transform/segments.js

@@ -22,6 +22,15 @@ export function convert_source_map_to_mappings(ast, source, generated_code) {
 	let sourceIndex = 0;
 	let generatedIndex = 0;
 
+	/**
+	 * Check if character is a word boundary (not alphanumeric or underscore)
+	 * @param {string} char
+	 * @returns {boolean}
+	 */
+	const isWordBoundary = (char) => {
+		return char === undefined || !/[a-zA-Z0-9_$]/.test(char);
+	};
+
 	/**
 	 * Find text in source string, searching character by character from sourceIndex
 	 * @param {string} text - Text to find
@@ -37,6 +46,16 @@ export function convert_source_map_to_mappings(ast, source, generated_code) {
 				}
 			}
 			if (match) {
+				// Check word boundaries for identifier-like tokens
+				const isIdentifierLike = /^[a-zA-Z_$]/.test(text);
+				if (isIdentifierLike) {
+					const charBefore = source[i - 1];
+					const charAfter = source[i + text.length];
+					if (!isWordBoundary(charBefore) || !isWordBoundary(charAfter)) {
+						continue; // Not a whole word match, keep searching
+					}
+				}
+				
 				sourceIndex = i + text.length;
 				return i;
 			}
@@ -59,6 +78,16 @@ export function convert_source_map_to_mappings(ast, source, generated_code) {
 				}
 			}
 			if (match) {
+				// Check word boundaries for identifier-like tokens
+				const isIdentifierLike = /^[a-zA-Z_$]/.test(text);
+				if (isIdentifierLike) {
+					const charBefore = generated_code[i - 1];
+					const charAfter = generated_code[i + text.length];
+					if (!isWordBoundary(charBefore) || !isWordBoundary(charAfter)) {
+						continue; // Not a whole word match, keep searching
+					}
+				}
+				
 				generatedIndex = i + text.length;
 				return i;
 			}
@@ -204,13 +233,17 @@ export function convert_source_map_to_mappings(ast, source, generated_code) {
 				}
 				return;
 			} else if (node.type === 'ForOfStatement' || node.type === 'ForInStatement') {
-				// Visit in source order: left, right, body
+				// Visit in source order: left, right, index (Ripple-specific), body
 				if (node.left) {
 					visit(node.left);
 				}
 				if (node.right) {
 					visit(node.right);
 				}
+				// Ripple-specific: index variable
+				if (node.index) {
+					visit(node.index);
+				}
 				if (node.body) {
 					visit(node.body);
 				}