ripple 0.2.46 → 0.2.48

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is a TypeScript UI framework for the web",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.2.46",
+  "version": "0.2.48",
   "type": "module",
   "module": "src/runtime/index.js",
   "main": "src/runtime/index.js",

package/src/compiler/phases/1-parse/index.js

@@ -25,6 +25,7 @@ function RipplePlugin(config) {
 
 		class RippleParser extends Parser {
 			#path = [];
+			skip_decorator = false;
 
 			// Helper method to get the element name from a JSX identifier or member expression
 			getElementName(node) {
@@ -237,9 +238,9 @@ function RipplePlugin(config) {
 						return this.finishNode(node, 'SpreadAttribute');
 					} else {
 						const id = this.parseIdentNode();
-						node.tracked = false;
+						id.tracked = false;
 						if (id.name.startsWith('@')) {
-							node.tracked = true;
+							id.tracked = true;
 							id.name = id.name.slice(1);
 						}
 						this.finishNode(id, 'Identifier');
@@ -274,6 +275,7 @@ function RipplePlugin(config) {
 				}
 			}
 
+
 			parseTryStatement(node) {
 				this.next();
 				node.block = this.parseBlock();
@@ -702,6 +704,54 @@ function RipplePlugin(config) {
 					return node;
 				}
 
+				if (this.type.label === '@') {
+					// Try to parse as an expression statement first using tryParse
+					// This allows us to handle Ripple @ syntax like @count++ without
+					// interfering with legitimate decorator syntax
+					this.skip_decorator = true;
+					const expressionResult = this.tryParse(() => {
+						const node = this.startNode();
+						this.next();
+						// Force expression context to ensure @ is tokenized correctly
+						const oldExprAllowed = this.exprAllowed;
+						this.exprAllowed = true;
+						node.expression = this.parseExpression();
+
+						if (node.expression.type === 'UpdateExpression') {
+							let object = node.expression.argument;
+							while (object.type === 'MemberExpression') {
+								object = object.object;
+							}
+							if (object.type === 'Identifier') {
+								object.tracked = true;
+							}
+						} else if (node.expression.type === 'AssignmentExpression') {
+							let object = node.expression.left;
+							while (object.type === 'MemberExpression') {
+								object = object.object;
+							}
+							if (object.type === 'Identifier') {
+								object.tracked = true;
+							}
+						} else if (node.expression.type === 'Identifier') {
+							node.expression.tracked = true;
+						} else {
+							// TODO?
+						}
+
+						this.exprAllowed = oldExprAllowed;
+						return this.finishNode(node, 'ExpressionStatement');
+					});
+					this.skip_decorator = false;
+					
+					// If parsing as expression statement succeeded, use that result
+					if (expressionResult.node) {
+						return expressionResult.node;
+					}
+					
+					// Otherwise, fall back to default decorator parsing
+				}
+
 				return super.parseStatement(context, topLevel, exports);
 			}