ripple 0.3.8 → 0.3.10

package/tests/client/dynamic-elements.test.ripple

@@ -1,5 +1,5 @@
 import type { PropsWithExtras } from 'ripple';
-import { createRefKey, flushSync, track, trackSplit } from 'ripple';
+import { createRefKey, flushSync, track } from 'ripple';
 
 describe('dynamic DOM elements', () => {
 	it('renders static dynamic element', () => {
@@ -405,14 +405,13 @@ describe('dynamic DOM elements', () => {
 	});
 
 	it('handles spread attributes with class and CSS scoping ', () => {
-		component DynamicButton(props: PropsWithExtras<{
+		component DynamicButton(&{ ...rest }: PropsWithExtras<{
 			class: string;
 			id: string;
 			onClick: EventListener;
 		}>) {
 			const tag = track('button');
-			const [rest] = trackSplit(props, []);
-			<@tag {...rest.value}>{rest.value.class}</@tag>
+			<@tag {...rest}>{rest.class}</@tag>
 
 			<style>
 				.even {

package/tests/client/lazy-destructuring.test.ripple

@@ -1,4 +1,4 @@
-import { flushSync, track, trackSplit } from 'ripple';
+import { flushSync, track } from 'ripple';
 
 describe('lazy destructuring', () => {
 	it('supports tracked value getter and setter', () => {
@@ -126,6 +126,38 @@ describe('lazy destructuring', () => {
 		expect(container.querySelector('pre')!.textContent).toBe('1');
 	});
 
+	it('supports nested lazy destructuring in non-lazy component params', () => {
+		component Inner({ something: &[first, second] }) {
+			first = second.value + 1;
+			<pre>{`${first}-${second.value}`}</pre>
+		}
+
+		component Test() {
+			<Inner something={track(1)} />
+		}
+
+		render(Test);
+		expect(container.querySelector('pre')!.textContent).toBe('2-2');
+	});
+
+	it(
+		'preserves lazy getter/setter behavior for nested rest destructuring in non-lazy component params',
+		() => {
+			component Inner({ values: [head, ...&{ length: rest_length, 0: first_rest }] }) {
+				const before = `${first_rest?.value ?? 'nil'}-${rest_length}`;
+				rest_length = 0;
+				<pre>{`${head}-${before}-${first_rest?.value ?? 'nil'}-${rest_length}`}</pre>
+			}
+
+			component Test() {
+				<Inner values={[10, track(20), track(30)]} />
+			}
+
+			render(Test);
+			expect(container.querySelector('pre')!.textContent).toBe('10-20-2-nil-0');
+		},
+	);
+
 	it('supports lazy destructuring in function params', () => {
 		component Test() {
 			function getInfo(&{ x, y }: { x: number; y: number }) {
@@ -139,6 +171,42 @@ describe('lazy destructuring', () => {
 		expect(container.querySelector('pre')!.textContent).toBe('10');
 	});
 
+	it('supports nested lazy destructuring in non-lazy function params', () => {
+		component Test() {
+			const something = track(1);
+
+			function getInfo({ something: &[first, second] }) {
+				first = second.value + 1;
+				return `${first}-${second.value}`;
+			}
+
+			const result = getInfo({ something });
+			<pre>{result}</pre>
+		}
+
+		render(Test);
+		expect(container.querySelector('pre')!.textContent).toBe('2-2');
+	});
+
+	it(
+		'preserves lazy getter/setter behavior for nested rest destructuring in non-lazy function params',
+		() => {
+			component Test() {
+				function summarize({ values: [head, ...&{ length: rest_length, 0: first_rest }] }) {
+					const before = `${first_rest?.value ?? 'nil'}-${rest_length}`;
+					rest_length = 0;
+					return `${head}-${before}-${first_rest?.value ?? 'nil'}-${rest_length}`;
+				}
+
+				const result = summarize({ values: [5, track(6), track(7)] });
+				<pre>{result}</pre>
+			}
+
+			render(Test);
+			expect(container.querySelector('pre')!.textContent).toBe('5-6-2-nil-0');
+		},
+	);
+
 	it('supports let lazy destructuring with assignment writeback', () => {
 		component Test() {
 			const obj = { a: 1, b: 2 };
@@ -205,17 +273,6 @@ describe('lazy destructuring', () => {
 		expect(container.querySelector('pre')!.textContent).toBe('1-99');
 	});
 
-	it('does not apply the track tuple fast-path to trackSplit lazy arrays', () => {
-		component Test() {
-			const source = { a: 1, b: 2, c: 3 };
-			let [a, b, rest] = trackSplit(source, ['a', 'b']);
-			<pre>{`${a.value}-${b.value}-${rest.value.c}`}</pre>
-		}
-
-		render(Test);
-		expect(container.querySelector('pre')!.textContent).toBe('1-2-3');
-	});
-
 	it('supports rest destructuring from iterable array-like tracked values', () => {
 		component Test() {
 			let &[value, ...rest] = track(0);

package/tests/client/svg.test.ripple

@@ -234,7 +234,7 @@ describe('SVG namespace handling', () => {
 	it('should render SVG with children as svg elements', () => {
 		component SVG({ children }: PropsWithChildren<{}>) {
 			<svg width={20} height={20} fill="blue" viewBox="0 0 30 10" preserveAspectRatio="none">
-				<children />
+				{children}
 			</svg>
 		}
 
@@ -285,7 +285,7 @@ describe('SVG namespace handling', () => {
 	it('should render SVG with children as dynamic elements', () => {
 		component SVG({ children }: PropsWithChildren<{}>) {
 			<svg width={20} height={20} fill="blue" viewBox="0 0 30 10" preserveAspectRatio="none">
-				<children />
+				{children}
 			</svg>
 		}
 
@@ -308,7 +308,7 @@ describe('SVG namespace handling', () => {
 	it('should render SVG with children as dynamic components', () => {
 		component SVG({ children }: PropsWithChildren<{}>) {
 			<svg width={20} height={20} fill="blue" viewBox="0 0 30 10" preserveAspectRatio="none">
-				<children />
+				{children}
 			</svg>
 		}
 
@@ -336,7 +336,7 @@ describe('SVG namespace handling', () => {
 		component SVG({ children }: PropsWithChildren<{}>) {
 			let &[tag] = track('svg');
 			<@tag width={100} height={50} fill="red" viewBox="0 0 30 10" preserveAspectRatio="none">
-				<children />
+				{children}
 			</@tag>
 		}
 

package/tests/hydration/basic.test.js

@@ -1,4 +1,5 @@
 import { describe, it, expect } from 'vitest';
+import { flushSync } from 'ripple';
 import { hydrateComponent, container } from '../setup-hydration.js';
 
 // Import server-compiled components
@@ -59,6 +60,28 @@ describe('hydration > basic', () => {
 		expect(container.innerHTML).toBeHtml('<div>42</div><span>COMPUTED</span>');
 	});
 
+	it('restores text children after hydrating away initial server text', async () => {
+		await hydrateComponent(
+			ServerComponents.TextPropWithToggle,
+			ClientComponents.TextPropWithToggle,
+		);
+
+		expect(container.querySelector('.text-prop')?.textContent).toBe('');
+
+		/** @type {any} */ (container.querySelector('.show-text'))?.click();
+		flushSync();
+
+		expect(container.querySelector('.text-prop')?.textContent).toBe('hello');
+
+		// Verify text is placed between hydration markers, not before anchor
+		const innerHTML = container.querySelector('.text-prop')?.innerHTML ?? '';
+		const textIndex = innerHTML.indexOf('hello');
+		const startMarker = innerHTML.indexOf('<!--[-->');
+		const endMarker = innerHTML.indexOf('<!--]-->');
+		expect(textIndex).toBeGreaterThan(startMarker);
+		expect(textIndex).toBeLessThan(endMarker);
+	});
+
 	it('hydrates static child component followed by sibling content', async () => {
 		await hydrateComponent(
 			ServerComponents.StaticChildWithSiblings,

package/tests/hydration/compiled/client/basic.js

@@ -13,19 +13,23 @@ var root_8 = _$_.template(`<!><!>`, 1, 2);
 var root_9 = _$_.template(`<div> </div>`, 0);
 var root_10 = _$_.template(`<!>`, 1, 1);
 var root_11 = _$_.template(`<div> </div><span> </span>`, 1, 2);
-var root_12 = _$_.template(`<h1 class="sr-only">heading</h1><p class="subtitle">first paragraph</p><p class="subtitle">second paragraph</p>`, 1, 3);
-var root_13 = _$_.template(`<!><span class="sibling1"> </span><span class="sibling2"> </span>`, 1, 3);
-var root_14 = _$_.template(`<h1 class="sr-only">Ripple</h1><img src="/images/logo.png" alt="Logo" class="logo"><p class="subtitle">the elegant TypeScript UI framework</p>`, 1, 3);
-var root_16 = _$_.template(`<a href="/playground" class="playground-link">Playground</a>`, 0);
-var root_15 = _$_.template(`<div class="social-links"><a href="https://github.com" class="github-link">GitHub</a><a href="https://discord.com" class="discord-link">Discord</a><!></div>`, 0);
-var root_17 = _$_.template(`<main><div class="container"><!></div></main>`, 0);
-var root_18 = _$_.template(`<div class="content"><p>Some content here</p></div>`, 0);
-var root_20 = _$_.template(`<!><!><!><!>`, 1, 4);
-var root_19 = _$_.template(`<!>`, 1, 1);
-var root_21 = _$_.template(`<footer class="last-child">I am the last child</footer>`, 0);
-var root_22 = _$_.template(`<div class="wrapper"><h1>Header</h1><p>Some content</p><!></div>`, 0);
-var root_23 = _$_.template(`<div class="inner"><span>Inner text</span><!></div>`, 0);
-var root_24 = _$_.template(`<section class="outer"><h2>Section title</h2><!></section>`, 0);
+var root_12 = _$_.template(`<div class="text-prop"><!></div>`, 0);
+var root_13 = _$_.template(`<!><button class="show-text">Show</button>`, 1, 2);
+var root_14 = _$_.template(`<h1 class="sr-only">heading</h1><p class="subtitle">first paragraph</p><p class="subtitle">second paragraph</p>`, 1, 3);
+var root_15 = _$_.template(`<!><span class="sibling1"> </span><span class="sibling2"> </span>`, 1, 3);
+var root_16 = _$_.template(`<h1 class="sr-only">Ripple</h1><img src="/images/logo.png" alt="Logo" class="logo"><p class="subtitle">the elegant TypeScript UI framework</p>`, 1, 3);
+var root_18 = _$_.template(`<a href="/playground" class="playground-link">Playground</a>`, 0);
+var root_17 = _$_.template(`<div class="social-links"><a href="https://github.com" class="github-link">GitHub</a><a href="https://discord.com" class="discord-link">Discord</a><!></div>`, 0);
+var root_19 = _$_.template(`<main><div class="container"><!></div></main>`, 0);
+var root_20 = _$_.template(`<div class="content"><p>Some content here</p></div>`, 0);
+var root_22 = _$_.template(`<!><!><!><!>`, 1, 4);
+var root_21 = _$_.template(`<!>`, 1, 1);
+var root_23 = _$_.template(`<footer class="last-child">I am the last child</footer>`, 0);
+var root_24 = _$_.template(`<div class="wrapper"><h1>Header</h1><p>Some content</p><!></div>`, 0);
+var root_25 = _$_.template(`<div class="inner"><span>Inner text</span><!></div>`, 0);
+var root_26 = _$_.template(`<section class="outer"><h2>Section title</h2><!></section>`, 0);
+
+import { track } from 'ripple';
 
 export function StaticText(__anchor, _, __block) {
 	_$_.push_component();
@@ -129,13 +133,13 @@ export function Greeting(__anchor, props, __block) {
 	var div_6 = root_9();
 
 	{
-		var text_1 = _$_.child(div_6, true);
+		var expression = _$_.child(div_6, true);
 
 		_$_.pop(div_6);
 	}
 
 	_$_.render(() => {
-		_$_.set_text(text_1, 'Hello ' + _$_.with_scope(__block, () => String(props.name)));
+		_$_.set_text(expression, 'Hello ' + _$_.with_scope(__block, () => String(props.name)));
 	});
 
 	_$_.append(__anchor, div_6);
@@ -157,21 +161,21 @@ export function ExpressionContent(__anchor, _, __block) {
 	_$_.push_component();
 
 	const value = 42;
-	const text = 'computed';
+	const label = 'computed';
 	var fragment_4 = root_11();
 	var div_7 = _$_.first_child_frag(fragment_4);
 
 	{
-		var text_2 = _$_.child(div_7, true);
+		var expression_1 = _$_.child(div_7, true);
 
-		text_2.nodeValue = value;
+		expression_1.nodeValue = value;
 		_$_.pop(div_7);
 	}
 
 	var span_2 = _$_.sibling(div_7);
 
 	{
-		var text_3 = _$_.child(span_2, true);
+		var expression_2 = _$_.child(span_2, true);
 
 		_$_.pop(span_2);
 	}
@@ -179,20 +183,63 @@ export function ExpressionContent(__anchor, _, __block) {
 	_$_.next();
 
 	_$_.render(() => {
-		_$_.set_text(text_3, _$_.with_scope(__block, () => text.toUpperCase()));
+		_$_.set_text(expression_2, _$_.with_scope(__block, () => label.toUpperCase()));
 	});
 
 	_$_.append(__anchor, fragment_4, true);
 	_$_.pop_component();
 }
 
+function TextProp(__anchor, __props, __block) {
+	_$_.push_component();
+
+	var div_8 = root_12();
+
+	{
+		var expression_3 = _$_.child(div_8);
+
+		_$_.pop(div_8);
+	}
+
+	_$_.render(() => {
+		_$_.expression(expression_3, () => __props.children);
+	});
+
+	_$_.append(__anchor, div_8);
+	_$_.pop_component();
+}
+
+export function TextPropWithToggle(__anchor, _, __block) {
+	_$_.push_component();
+
+	let lazy = _$_.track(false, void 0, void 0, __block);
+	var fragment_5 = root_13();
+	var node_4 = _$_.first_child_frag(fragment_5);
+
+	TextProp(
+		node_4,
+		{
+			get children() {
+				return _$_.normalize_children(_$_.get(lazy) ? 'hello' : '');
+			}
+		},
+		_$_.active_block
+	);
+
+	var button_1 = _$_.sibling(node_4);
+
+	button_1.__click = () => _$_.set(lazy, true);
+	_$_.append(__anchor, fragment_5);
+	_$_.pop_component();
+}
+
 function StaticHeader(__anchor, _, __block) {
 	_$_.push_component();
 
-	var fragment_5 = root_12();
+	var fragment_6 = root_14();
 
 	_$_.next(2);
-	_$_.append(__anchor, fragment_5, true);
+	_$_.append(__anchor, fragment_6, true);
 	_$_.pop_component();
 }
 
@@ -200,89 +247,92 @@ export function StaticChildWithSiblings(__anchor, _, __block) {
 	_$_.push_component();
 
 	const foo = 'bar';
-	var fragment_6 = root_13();
-	var node_4 = _$_.first_child_frag(fragment_6);
+	var fragment_7 = root_15();
+	var node_5 = _$_.first_child_frag(fragment_7);
 
-	StaticHeader(node_4, {}, _$_.active_block);
+	StaticHeader(node_5, {}, _$_.active_block);
 
-	var span_3 = _$_.sibling(node_4);
+	var span_3 = _$_.sibling(node_5);
 
 	{
-		var text_4 = _$_.child(span_3, true);
+		var expression_4 = _$_.child(span_3, true);
 
-		text_4.nodeValue = foo;
+		expression_4.nodeValue = foo;
 		_$_.pop(span_3);
 	}
 
 	var span_4 = _$_.sibling(span_3);
 
 	{
-		var text_5 = _$_.child(span_4, true);
+		var expression_5 = _$_.child(span_4, true);
 
-		text_5.nodeValue = foo;
+		expression_5.nodeValue = foo;
 		_$_.pop(span_4);
 	}
 
 	_$_.next();
-	_$_.append(__anchor, fragment_6, true);
+	_$_.append(__anchor, fragment_7, true);
 	_$_.pop_component();
 }
 
 function Header(__anchor, _, __block) {
 	_$_.push_component();
 
-	var fragment_7 = root_14();
+	var fragment_8 = root_16();
 
 	_$_.next(2);
-	_$_.append(__anchor, fragment_7, true);
+	_$_.append(__anchor, fragment_8, true);
 	_$_.pop_component();
 }
 
 function Actions(__anchor, { playgroundVisible = false }, __block) {
 	_$_.push_component();
 
-	var div_8 = root_15();
+	var div_9 = root_17();
 
 	{
-		var a_2 = _$_.child(div_8);
+		var a_2 = _$_.child(div_9);
 		var a_1 = _$_.sibling(a_2);
-		var node_5 = _$_.sibling(a_1);
+		var node_6 = _$_.sibling(a_1);
 
 		{
 			var consequent = (__anchor) => {
-				var a_3 = root_16();
+				var a_3 = root_18();
 
 				_$_.append(__anchor, a_3);
 			};
 
-			_$_.if(node_5, (__render) => {
+			_$_.if(node_6, (__render) => {
 				if (playgroundVisible) __render(consequent);
 			});
 		}
 
-		_$_.pop(div_8);
+		_$_.pop(div_9);
 	}
 
-	_$_.append(__anchor, div_8);
+	_$_.append(__anchor, div_9);
 	_$_.pop_component();
 }
 
 function Layout(__anchor, { children }, __block) {
 	_$_.push_component();
 
-	var main_1 = root_17();
+	var main_1 = root_19();
 
 	{
-		var div_9 = _$_.child(main_1);
+		var div_10 = _$_.child(main_1);
 
 		{
-			var node_6 = _$_.child(div_9);
+			var expression_6 = _$_.child(div_10);
 
-			children(node_6, {}, _$_.active_block);
-			_$_.pop(div_9);
+			_$_.pop(div_10);
 		}
 	}
 
+	_$_.render(() => {
+		_$_.expression(expression_6, () => children);
+	});
+
 	_$_.append(__anchor, main_1);
 	_$_.pop_component();
 }
@@ -290,26 +340,26 @@ function Layout(__anchor, { children }, __block) {
 function Content(__anchor, _, __block) {
 	_$_.push_component();
 
-	var div_10 = root_18();
+	var div_11 = root_20();
 
-	_$_.append(__anchor, div_10);
+	_$_.append(__anchor, div_11);
 	_$_.pop_component();
 }
 
 export function WebsiteIndex(__anchor, _, __block) {
 	_$_.push_component();
 
-	var fragment_8 = root_19();
-	var node_7 = _$_.first_child_frag(fragment_8);
+	var fragment_9 = root_21();
+	var node_7 = _$_.first_child_frag(fragment_9);
 
 	Layout(
 		node_7,
 		{
-			children(__anchor, _, __block) {
+			children: _$_.ripple_element(function render_children(__anchor, _, __block) {
 				_$_.push_component();
 
-				var fragment_9 = root_20();
-				var node_8 = _$_.first_child_frag(fragment_9);
+				var fragment_10 = root_22();
+				var node_8 = _$_.first_child_frag(fragment_10);
 
 				Header(node_8, {}, _$_.active_block);
 
@@ -324,21 +374,21 @@ export function WebsiteIndex(__anchor, _, __block) {
 				var node_11 = _$_.sibling(node_10);
 
 				Actions(node_11, { playgroundVisible: false }, _$_.active_block);
-				_$_.append(__anchor, fragment_9);
+				_$_.append(__anchor, fragment_10);
 				_$_.pop_component();
-			}
+			})
 		},
 		_$_.active_block
 	);
 
-	_$_.append(__anchor, fragment_8);
+	_$_.append(__anchor, fragment_9);
 	_$_.pop_component();
 }
 
 function LastChild(__anchor, _, __block) {
 	_$_.push_component();
 
-	var footer_1 = root_21();
+	var footer_1 = root_23();
 
 	_$_.append(__anchor, footer_1);
 	_$_.pop_component();
@@ -347,42 +397,42 @@ function LastChild(__anchor, _, __block) {
 export function ComponentAsLastSibling(__anchor, _, __block) {
 	_$_.push_component();
 
-	var div_11 = root_22();
+	var div_12 = root_24();
 
 	{
-		var h1_1 = _$_.child(div_11);
+		var h1_1 = _$_.child(div_12);
 		var p_1 = _$_.sibling(h1_1);
 		var node_12 = _$_.sibling(p_1);
 
 		LastChild(node_12, {}, _$_.active_block);
-		_$_.pop(div_11);
+		_$_.pop(div_12);
 	}
 
-	_$_.append(__anchor, div_11);
+	_$_.append(__anchor, div_12);
 	_$_.pop_component();
 }
 
 function InnerContent(__anchor, _, __block) {
 	_$_.push_component();
 
-	var div_12 = root_23();
+	var div_13 = root_25();
 
 	{
-		var span_5 = _$_.child(div_12);
+		var span_5 = _$_.child(div_13);
 		var node_13 = _$_.sibling(span_5);
 
 		LastChild(node_13, {}, _$_.active_block);
-		_$_.pop(div_12);
+		_$_.pop(div_13);
 	}
 
-	_$_.append(__anchor, div_12);
+	_$_.append(__anchor, div_13);
 	_$_.pop_component();
 }
 
 export function NestedComponentAsLastSibling(__anchor, _, __block) {
 	_$_.push_component();
 
-	var section_1 = root_24();
+	var section_1 = root_26();
 
 	{
 		var h2_1 = _$_.child(section_1);
@@ -394,4 +444,6 @@ export function NestedComponentAsLastSibling(__anchor, _, __block) {
 
 	_$_.append(__anchor, section_1);
 	_$_.pop_component();
-}
+}
+
+_$_.delegate(['click']);