ripple 0.3.7 → 0.3.9

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # ripple
 
+## 0.3.9
+
+### Patch Changes
+
+- Updated dependencies []:
+  - ripple@0.3.9
+
+## 0.3.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - ripple@0.3.8
+
 ## 0.3.7
 
 ### Patch Changes

package/package.json

@@ -3,7 +3,7 @@
   "description": "Ripple is an elegant TypeScript UI framework",
   "license": "MIT",
   "author": "Dominic Gannaway",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "type": "module",
   "module": "src/runtime/index-client.js",
   "main": "src/runtime/index-client.js",
@@ -105,6 +105,6 @@
     "vscode-languageserver-types": "^3.17.5"
   },
   "peerDependencies": {
-    "ripple": "0.3.7"
+    "ripple": "0.3.9"
   }
 }

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

@@ -52,16 +52,6 @@ function DestructuringErrors() {
 	return this;
 }
 
-/**
- * @param {AST.Identifier | ESTreeJSX.JSXIdentifier} node
- * @param {string} name
- */
-function set_tracked_name(node, name) {
-	node.name = name.slice(1);
-	node.metadata ??= { path: [] };
-	node.metadata.source_name = name;
-}
-
 /**
  * Convert JSX node types to regular JavaScript node types
  * @param {ESTreeJSX.JSXIdentifier | ESTreeJSX.JSXMemberExpression | AST.Node} node - The JSX node to convert
@@ -423,7 +413,9 @@ function RipplePlugin(config) {
 						/** @type {AST.Property} */ (prop).method = true;
 						/** @type {AST.Property} */ (prop).kind = 'init';
 						/** @type {AST.Property} */ (prop).value = this.parseMethod(false, false);
-						/** @type {AST.Property} */ (prop).value.typeParameters = typeParameters;
+						/** @type {AST.FunctionExpression} */ (
+							/** @type {AST.Property} */ (prop).value
+						).typeParameters = typeParameters;
 						return;
 					}
 				}
@@ -676,202 +668,9 @@ function RipplePlugin(config) {
 						}
 					}
 				}
-				if (code === 64) {
-					// @ character
-					// Look ahead to see if this is followed by a valid identifier character or opening paren
-					if (this.pos + 1 < this.input.length) {
-						const nextChar = this.input.charCodeAt(this.pos + 1);
-
-						// Check if this is @( for unboxing expression syntax
-						if (nextChar === 40) {
-							// ( character
-							this.pos += 2; // skip '@('
-							return this.finishToken(tt.parenL, '@(');
-						}
-
-						// Check if the next character can start an identifier
-						if (
-							(nextChar >= 65 && nextChar <= 90) || // A-Z
-							(nextChar >= 97 && nextChar <= 122) || // a-z
-							nextChar === 95 ||
-							nextChar === 36
-						) {
-							// _ or $
-
-							// Check if we're in an expression context
-							// In JSX expressions, inside parentheses, assignments, etc.
-							// we want to treat @ as an identifier prefix rather than decorator
-							const currentType = this.type;
-							/**
-							 * @param {Parse.TokenType} type
-							 * @param {Parse.Parser} parser
-							 * @param {Parse.TokTypes} tt
-							 * @returns {boolean}
-							 */
-							function inExpression(type, parser, tt) {
-								return (
-									parser.exprAllowed ||
-									type === tt.braceL || // Inside { }
-									type === tt.parenL || // Inside ( )
-									type === tt.eq || // After =
-									type === tt.comma || // After ,
-									type === tt.colon || // After :
-									type === tt.question || // After ?
-									type === tt.logicalOR || // After ||
-									type === tt.logicalAND || // After &&
-									type === tt.dot || // After . (for member expressions like obj.@prop)
-									type === tt.questionDot // After ?. (for optional chaining like obj?.@prop)
-								);
-							}
-
-							/**
-							 * @param {Parse.Parser} parser
-							 * @param {Parse.TokTypes} tt
-							 * @returns {boolean}
-							 */
-							function inAwait(parser, tt) {
-								return currentType === tt.name &&
-									parser.value === 'await' &&
-									parser.canAwait &&
-									parser.preToken
-									? inExpression(parser.preToken, parser, tt)
-									: false;
-							}
-
-							if (inExpression(currentType, this, tt) || inAwait(this, tt)) {
-								return this.readAtIdentifier();
-							}
-						}
-					}
-				}
 				return super.getTokenFromCode(code);
 			}
 
-			/**
-			 * Read an @ prefixed identifier
-			 * @type {Parse.Parser['readAtIdentifier']}
-			 */
-			readAtIdentifier() {
-				const start = this.pos;
-				this.pos++; // skip '@'
-
-				// Read the identifier part manually
-				let word = '';
-				while (this.pos < this.input.length) {
-					const ch = this.input.charCodeAt(this.pos);
-					if (
-						(ch >= 65 && ch <= 90) || // A-Z
-						(ch >= 97 && ch <= 122) || // a-z
-						(ch >= 48 && ch <= 57) || // 0-9
-						ch === 95 ||
-						ch === 36
-					) {
-						// _ or $
-						word += this.input[this.pos++];
-					} else {
-						break;
-					}
-				}
-
-				if (word === '') {
-					this.raise(start, 'Invalid @ identifier');
-				}
-
-				// Return the full identifier including @
-				return this.finishToken(tt.name, '@' + word);
-			}
-
-			/**
-			 * Override parseIdent to mark @ identifiers as tracked
-			 * @type {Parse.Parser['parseIdent']}
-			 */
-			parseIdent(liberal) {
-				const node = /** @type {AST.Identifier &AST.NodeWithLocation} */ (
-					super.parseIdent(liberal)
-				);
-				if (node.name && node.name.startsWith('@')) {
-					set_tracked_name(node, node.name);
-					node.tracked = true;
-				}
-				return node;
-			}
-
-			/**
-			 * Override parseSubscripts to handle `.@[expression]` syntax for reactive computed member access
-			 * @type {Parse.Parser['parseSubscripts']}
-			 */
-			parseSubscripts(
-				base,
-				startPos,
-				startLoc,
-				noCalls,
-				maybeAsyncArrow,
-				optionalChained,
-				forInit,
-			) {
-				// Check for `.@[` pattern for reactive computed member access
-				const isDotOrOptional = this.type === tt.dot || this.type === tt.questionDot;
-
-				if (isDotOrOptional) {
-					// Check the next two characters without consuming tokens
-					// this.pos currently points AFTER the dot token
-					const nextChar = this.input.charCodeAt(this.pos);
-					const charAfter = this.input.charCodeAt(this.pos + 1);
-
-					// Check for @[ pattern (@ = 64, [ = 91)
-					if (nextChar === 64 && charAfter === 91) {
-						const node = /** @type {AST.MemberExpression} */ (this.startNodeAt(startPos, startLoc));
-						node.object = base;
-						node.computed = true;
-						node.optional = this.type === tt.questionDot;
-						node.tracked = true;
-
-						// Consume the dot/questionDot token
-						this.next();
-
-						// Manually skip the @ character
-						this.pos += 1;
-
-						// Now call finishToken to properly consume the [ bracket
-						this.finishToken(tt.bracketL);
-
-						// Now we're positioned correctly to parse the expression
-						this.next(); // Move to first token inside brackets
-
-						// Parse the expression inside brackets
-						node.property = this.parseExpression();
-
-						// Expect closing bracket
-						this.expect(tt.bracketR);
-
-						// Finish this MemberExpression node
-						base = /** @type {AST.MemberExpression} */ (this.finishNode(node, 'MemberExpression'));
-
-						// Recursively handle any further subscripts (chaining)
-						return this.parseSubscripts(
-							base,
-							startPos,
-							startLoc,
-							noCalls,
-							maybeAsyncArrow,
-							optionalChained,
-							forInit,
-						);
-					}
-				}
-
-				// Fall back to default parseSubscripts implementation
-				return super.parseSubscripts(
-					base,
-					startPos,
-					startLoc,
-					noCalls,
-					maybeAsyncArrow,
-					optionalChained,
-					forInit,
-				);
-			}
-
 			/**
 			 * Override isLet to recognize `let &{` and `let &[` as variable declarations.
 			 * Acorn's isLet checks the char after `let` and only recognizes `{`, `[`, or identifiers.
@@ -908,7 +707,7 @@ function RipplePlugin(config) {
 						// & directly followed by { or [ — lazy destructuring
 						this.next(); // consume &, now current token is { or [
 						const pattern = super.parseBindingAtom();
-						pattern.lazy = true;
+						/** @type {AST.ObjectPattern | AST.ArrayPattern} */ (pattern).lazy = true;
 						return pattern;
 					}
 				}
@@ -923,11 +722,6 @@ function RipplePlugin(config) {
 				const lookahead_type = this.lookahead().type;
 				const is_next_call_token = lookahead_type === tt.parenL || lookahead_type === tt.relational;
 
-				// Check if this is @(expression) for unboxing tracked values
-				if (this.type === tt.parenL && this.value === '@(') {
-					return this.parseTrackedExpression();
-				}
-
 				// Check if this is #server identifier for server function calls
 				if (this.type === tt.name && this.value === '#server') {
 					const node = this.startNode();
@@ -968,31 +762,6 @@ function RipplePlugin(config) {
 				return expr;
 			}
 
-			/**
-			 * Parse `@(expression)` syntax for unboxing tracked values
-			 * Creates a TrackedExpression node with the argument property
-			 * @type {Parse.Parser['parseTrackedExpression']}
-			 */
-			parseTrackedExpression() {
-				const node = /** @type {AST.TrackedExpression} */ (this.startNode());
-				this.next(); // consume '@(' token
-				node.argument = this.parseExpression();
-				this.expect(tt.parenR); // expect ')'
-				return this.finishNode(node, 'TrackedExpression');
-			}
-
-			/**
-			 * Override to allow TrackedExpression as a valid lvalue for update expressions
-			 * @type {Parse.Parser['checkLValSimple']}
-			 */
-			checkLValSimple(expr, bindingType, checkClashes) {
-				// Allow TrackedExpression as a valid lvalue for ++/-- operators
-				if (expr.type === 'TrackedExpression') {
-					return;
-				}
-				return super.checkLValSimple(expr, bindingType, checkClashes);
-			}
-
 			/**
 			 * Override checkLocalExport to check all scopes in the scope stack.
 			 * This is needed because server blocks create nested scopes, but exports
@@ -1131,6 +900,7 @@ function RipplePlugin(config) {
 					return this.parseFor(node, null);
 				}
 
+				// @ts-ignore — acorn internal: isLet accepts 0 args at runtime
 				let isLet = this.isLet();
 				if (this.type === tt._var || this.type === tt._const || isLet) {
 					let init = /** @type {AST.VariableDeclaration} */ (this.startNode()),
@@ -1173,7 +943,9 @@ function RipplePlugin(config) {
 				}
 
 				let containsEsc = this.containsEsc;
-				let refDestructuringErrors = new DestructuringErrors();
+				let refDestructuringErrors = new /** @type {new () => Parse.DestructuringErrors} */ (
+					/** @type {unknown} */ (DestructuringErrors)
+				)();
 				let initPos = this.start;
 				let init_expr =
 					awaitAt > -1
@@ -1342,7 +1114,6 @@ function RipplePlugin(config) {
 			jsx_parseExpressionContainer() {
 				let node = /** @type {ESTreeJSX.JSXExpressionContainer} */ (this.startNode());
 				this.next();
-				let tracked = false;
 
 				if (this.value === 'html') {
 					node.html = true;
@@ -1353,20 +1124,12 @@ function RipplePlugin(config) {
 							'"html" is a Ripple keyword and must be used in the form {html some_content}',
 						);
 					}
-					if (this.type.label === '@') {
-						this.next(); // consume @
-						tracked = true;
-					}
 				}
 
 				node.expression =
 					this.type === tt.braceR ? this.jsx_parseEmptyExpression() : this.parseExpression();
 				this.expect(tt.braceR);
 
-				if (tracked && node.expression.type === 'Identifier') {
-					node.expression.tracked = true;
-				}
-
 				return this.finishNode(node, 'JSXExpressionContainer');
 			}
 
@@ -1429,10 +1192,6 @@ function RipplePlugin(config) {
 					} else {
 						const id = /** @type {AST.Identifier} */ (this.parseIdentNode());
 						id.tracked = false;
-						if (id.name.startsWith('@')) {
-							set_tracked_name(id, id.name);
-							id.tracked = true;
-						}
 						this.finishNode(id, 'Identifier');
 						/** @type {AST.Attribute} */ (node).name = id;
 						/** @type {AST.Attribute} */ (node).value = id;
@@ -1484,14 +1243,6 @@ function RipplePlugin(config) {
 						// Unexpected token after @
 						this.unexpected();
 					}
-				} else if (
-					(this.type === tt.name || this.type === tstt.jsxName) &&
-					this.value &&
-					/** @type {string} */ (this.value).startsWith('@')
-				) {
-					set_tracked_name(node, /** @type {string} */ (this.value));
-					node.tracked = true;
-					this.next();
 				} else if (this.type === tt.name || this.type.keyword || this.type === tstt.jsxName) {
 					node.name = /** @type {string} */ (this.value);
 					node.tracked = false; // Explicitly mark as not tracked
@@ -1525,40 +1276,9 @@ function RipplePlugin(config) {
 						)
 					);
 					memberExpr.object = node;
-
-					// Check for .@[expression] syntax for tracked computed member access
-					// After eating the dot, check if the current token is @ followed by [
-					if (this.type.label === '@') {
-						// Check if the next character after @ is [
-						const nextChar = this.input.charCodeAt(this.pos);
-
-						if (nextChar === 91) {
-							// [ character
-							memberExpr.computed = true;
-
-							// Consume the @ token
-							this.next();
-
-							// Now this.type should be bracketL
-							// Consume the [ and parse the expression inside
-							this.expect(tt.bracketL);
-
-							// Parse the expression inside brackets
-							memberExpr.property = /** @type {ESTreeJSX.JSXIdentifier} */ (this.parseExpression());
-							/** @type {AST.TrackedNode} */ (memberExpr.property).tracked = true;
-
-							// Expect closing bracket
-							this.expect(tt.bracketR);
-						} else {
-							// @ not followed by [, treat as regular tracked identifier
-							memberExpr.property = this.jsx_parseIdentifier();
-							memberExpr.computed = false;
-						}
-					} else {
-						// Regular dot notation
-						memberExpr.property = this.jsx_parseIdentifier();
-						memberExpr.computed = false;
-					}
+					memberExpr.property = this.jsx_parseIdentifier();
+					memberExpr.computed = false;
+					memberExpr = this.finishNode(memberExpr, 'JSXMemberExpression');
 					while (this.eat(tt.dot)) {
 						let newMemberExpr = /** @type {ESTreeJSX.JSXMemberExpression} */ (
 							this.startNodeAt(
@@ -1571,7 +1291,7 @@ function RipplePlugin(config) {
 						newMemberExpr.computed = false;
 						memberExpr = this.finishNode(newMemberExpr, 'JSXMemberExpression');
 					}
-					return this.finishNode(memberExpr, 'JSXMemberExpression');
+					return memberExpr;
 				}
 				return node;
 			}
@@ -1842,8 +1562,9 @@ function RipplePlugin(config) {
 								if (expression.type === 'Literal') {
 									expression.was_expression = true;
 								}
-								/** @type {ESTreeJSX.JSXExpressionContainer['expression']} */ (attr.value) =
-									expression;
+								// @ts-ignore — intentional AST node conversion from JSX to Ripple
+								/** @type {ESTreeJSX.JSXAttribute} */ (attr).value =
+									/** @type {ESTreeJSX.JSXExpressionContainer['expression']} */ (expression);
 							}
 						}
 					}
@@ -2355,53 +2076,6 @@ function RipplePlugin(config) {
 					this.awaitPos = 0;
 					return this.parseComponent({ requireName: true, declareName: true });
 				}
-				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 = /** @type {AST.ExpressionStatement} */ (this.startNode());
-						this.next();
-						// Force expression context to ensure @ is tokenized correctly
-						const old_expr_allowed = this.exprAllowed;
-						this.exprAllowed = true;
-						node.expression = this.parseExpression();
-
-						if (node.expression.type === 'UpdateExpression') {
-							/** @type {AST.Expression} */
-							let object = node.expression.argument;
-							while (object.type === 'MemberExpression') {
-								object = /** @type {AST.Expression} */ (object.object);
-							}
-							if (object.type === 'Identifier') {
-								object.tracked = true;
-							}
-						} else if (node.expression.type === 'AssignmentExpression') {
-							/** @type {AST.Expression | AST.Pattern | AST.Identifier} */
-							let object = node.expression.left;
-							while (object.type === 'MemberExpression') {
-								object = /** @type {AST.Expression} */ (object.object);
-							}
-							if (object.type === 'Identifier') {
-								object.tracked = true;
-							}
-						} else if (node.expression.type === 'Identifier') {
-							node.expression.tracked = true;
-						} else {
-							// TODO?
-						}
-
-						this.exprAllowed = old_expr_allowed;
-						return this.finishNode(node, 'ExpressionStatement');
-					});
-					this.skip_decorator = false;
-
-					// If parsing as expression statement succeeded, use that result
-					if (expressionResult.node) {
-						return expressionResult.node;
-					}
-				}
 
 				if (this.type === tstt.jsxTagStart) {
 					this.next();
@@ -2416,6 +2090,37 @@ function RipplePlugin(config) {
 					return node;
 				}
 
+				// &[ or &{ at statement level — lazy destructuring assignment
+				// e.g., &[data] = track(0); or &{x, y} = obj;
+				if (this.type === tt.bitwiseAND) {
+					const charAfterAmp = this.input.charCodeAt(this.end);
+					if (charAfterAmp === 123 || charAfterAmp === 91) {
+						const node = /** @type {AST.ExpressionStatement} */ (this.startNode());
+						const assign_node = /** @type {AST.AssignmentExpression} */ (this.startNode());
+						this.next(); // consume &
+						// Parse the left-hand side (array or object expression)
+						const left = /** @type {AST.ArrayPattern | AST.ObjectPattern} */ (
+							/** @type {unknown} */ (this.parseExprAtom())
+						);
+						// Convert expression to destructuring pattern
+						this.toAssignable(left, false);
+						left.lazy = true;
+						// Expect = operator
+						this.expect(tt.eq);
+						// Parse the right-hand side
+						assign_node.operator = '=';
+						assign_node.left = left;
+						assign_node.right = /** @type {AST.Expression} */ (this.parseMaybeAssign());
+						node.expression = /** @type {AST.AssignmentExpression} */ (
+							this.finishNode(assign_node, 'AssignmentExpression')
+						);
+						this.semicolon();
+						return /** @type {AST.ExpressionStatement} */ (
+							this.finishNode(node, 'ExpressionStatement')
+						);
+					}
+				}
+
 				return super.parseStatement(context, topLevel, exports);
 			}
 
@@ -2809,15 +2514,9 @@ function get_comment_handlers(source, comments, index = 0) {
 								isSwitchCaseSibling = true;
 							} else if (parent.type === 'SwitchCase') {
 								node_array = parent.consequent;
-							} else if (
-								parent.type === 'ArrayExpression' ||
-								parent.type === 'RippleArrayExpression'
-							) {
+							} else if (parent.type === 'ArrayExpression') {
 								node_array = parent.elements;
-							} else if (
-								parent.type === 'ObjectExpression' ||
-								parent.type === 'RippleObjectExpression'
-							) {
+							} else if (parent.type === 'ObjectExpression') {
 								node_array = parent.properties;
 							} else if (
 								parent.type === 'FunctionDeclaration' ||