ripple 0.3.68 → 0.3.70

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

@@ -15,161 +15,136 @@ var root_9 = _$_.template(`<!>`, 1, 1);
 var root_12 = _$_.template(`<!>`, 1, 1);
 var root_11 = _$_.template(`<!>`, 1, 1);
 
-export function Layout(__anchor, __props, __block) {
-	_$_.push_component();
+export function Layout(__props) {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var div_1 = root();
 
-	var div_1 = root();
-
-	{
-		var expression = _$_.child(div_1);
+		{
+			var expression = _$_.child(div_1);
 
-		_$_.expression(expression, () => __props.children);
-		_$_.pop(div_1);
-	}
+			_$_.expression(expression, () => __props.children);
+			_$_.pop(div_1);
+		}
 
-	_$_.append(__anchor, div_1);
-	_$_.pop_component();
+		_$_.append(__anchor, div_1);
+	});
 }
 
-export function TextWrappedLayout(__anchor, __props, __block) {
-	_$_.push_component();
+export function TextWrappedLayout(__props) {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var div_2 = root_1();
 
-	var div_2 = root_1();
-
-	{
-		var text = _$_.child(div_2);
-		var expression_1 = _$_.sibling(text);
+		{
+			var expression_2 = _$_.child(div_2);
+			var expression_1 = _$_.sibling(expression_2);
 
-		_$_.expression(expression_1, () => __props.children);
-		_$_.pop(div_2);
-	}
+			_$_.expression(expression_1, () => __props.children);
+			_$_.pop(div_2);
+		}
 
-	_$_.append(__anchor, div_2);
-	_$_.pop_component();
+		_$_.append(__anchor, div_2);
+	});
 }
 
-export function SingleChild(__anchor, _, __block) {
-	_$_.push_component();
+export function SingleChild() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var div_3 = root_2();
 
-	var div_3 = root_2();
-
-	_$_.append(__anchor, div_3);
-	_$_.pop_component();
+		_$_.append(__anchor, div_3);
+	});
 }
 
-export function MultiRootChild(__anchor, _, __block) {
-	_$_.push_component();
-
-	var fragment = root_3();
+export function MultiRootChild() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var fragment = root_3();
 
-	_$_.next();
-	_$_.append(__anchor, fragment, true);
-	_$_.pop_component();
+		_$_.next();
+		_$_.append(__anchor, fragment, true);
+	});
 }
 
-export function EmptyLayout(__anchor, _, __block) {
-	_$_.push_component();
+export function EmptyLayout() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var fragment_1 = root_4();
+		var node = _$_.first_child_frag(fragment_1);
 
-	var fragment_1 = root_4();
-	var node = _$_.first_child_frag(fragment_1);
-
-	Layout(node, {}, _$_.active_block);
-	_$_.append(__anchor, fragment_1);
-	_$_.pop_component();
+		_$_.render_component(Layout, node, {});
+		_$_.append(__anchor, fragment_1);
+	});
 }
 
-export function LayoutWithSingleChild(__anchor, _, __block) {
-	_$_.push_component();
-
-	var fragment_2 = root_5();
-	var node_1 = _$_.first_child_frag(fragment_2);
+export function LayoutWithSingleChild() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var fragment_2 = root_5();
+		var node_1 = _$_.first_child_frag(fragment_2);
 
-	Layout(
-		node_1,
-		{
-			children: _$_.tsrx_element(function render_children(__anchor, __block) {
+		_$_.render_component(Layout, node_1, {
+			children: _$_.tsrx_element((__anchor, __block) => {
 				var fragment_3 = root_6();
 				var node_2 = _$_.first_child_frag(fragment_3);
 
-				SingleChild(node_2, {}, _$_.active_block);
+				_$_.render_component(SingleChild, node_2, {});
 				_$_.append(__anchor, fragment_3);
 			})
-		},
-		_$_.active_block
-	);
+		});
 
-	_$_.append(__anchor, fragment_2);
-	_$_.pop_component();
+		_$_.append(__anchor, fragment_2);
+	});
 }
 
-export function LayoutWithMultipleChildren(__anchor, _, __block) {
-	_$_.push_component();
-
-	var fragment_4 = root_7();
-	var node_3 = _$_.first_child_frag(fragment_4);
+export function LayoutWithMultipleChildren() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var fragment_4 = root_7();
+		var node_3 = _$_.first_child_frag(fragment_4);
 
-	Layout(
-		node_3,
-		{
-			children: _$_.tsrx_element(function render_children(__anchor, __block) {
+		_$_.render_component(Layout, node_3, {
+			children: _$_.tsrx_element((__anchor, __block) => {
 				var fragment_5 = root_8();
 				var node_4 = _$_.first_child_frag(fragment_5);
 
-				SingleChild(node_4, {}, _$_.active_block);
+				_$_.render_component(SingleChild, node_4, {});
 				_$_.append(__anchor, fragment_5);
 			})
-		},
-		_$_.active_block
-	);
+		});
 
-	_$_.append(__anchor, fragment_4);
-	_$_.pop_component();
+		_$_.append(__anchor, fragment_4);
+	});
 }
 
-export function LayoutWithMultiRootChild(__anchor, _, __block) {
-	_$_.push_component();
-
-	var fragment_6 = root_9();
-	var node_5 = _$_.first_child_frag(fragment_6);
+export function LayoutWithMultiRootChild() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var fragment_6 = root_9();
+		var node_5 = _$_.first_child_frag(fragment_6);
 
-	Layout(
-		node_5,
-		{
-			children: _$_.tsrx_element(function render_children(__anchor, __block) {
+		_$_.render_component(Layout, node_5, {
+			children: _$_.tsrx_element((__anchor, __block) => {
 				var fragment_7 = root_10();
 				var node_6 = _$_.first_child_frag(fragment_7);
 
-				MultiRootChild(node_6, {}, _$_.active_block);
+				_$_.render_component(MultiRootChild, node_6, {});
 				_$_.append(__anchor, fragment_7);
 			})
-		},
-		_$_.active_block
-	);
+		});
 
-	_$_.append(__anchor, fragment_6);
-	_$_.pop_component();
+		_$_.append(__anchor, fragment_6);
+	});
 }
 
-export function LayoutWithTextAroundChildren(__anchor, _, __block) {
-	_$_.push_component();
-
-	var fragment_8 = root_11();
-	var node_7 = _$_.first_child_frag(fragment_8);
+export function LayoutWithTextAroundChildren() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var fragment_8 = root_11();
+		var node_7 = _$_.first_child_frag(fragment_8);
 
-	TextWrappedLayout(
-		node_7,
-		{
-			children: _$_.tsrx_element(function render_children(__anchor, __block) {
+		_$_.render_component(TextWrappedLayout, node_7, {
+			children: _$_.tsrx_element((__anchor, __block) => {
 				var fragment_9 = root_12();
 				var node_8 = _$_.first_child_frag(fragment_9);
 
-				SingleChild(node_8, {}, _$_.active_block);
+				_$_.render_component(SingleChild, node_8, {});
 				_$_.append(__anchor, fragment_9);
 			})
-		},
-		_$_.active_block
-	);
+		});
 
-	_$_.append(__anchor, fragment_8);
-	_$_.pop_component();
+		_$_.append(__anchor, fragment_8);
+	});
 }

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

@@ -11,225 +11,217 @@ var root_6 = _$_.template(`<div><!><span class="count"> </span></div>`, 0);
 
 import { track } from 'ripple';
 
-export function ClickCounter(__anchor, _, __block) {
-	_$_.push_component();
+export function ClickCounter() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		let lazy = _$_.track(0, __block, 'a070e3a7');
+		var div_1 = root();
 
-	let lazy = _$_.track(0, __block, 'a070e3a7');
-	var div_1 = root();
-
-	{
-		var button_1 = _$_.child(div_1);
+		{
+			var button_1 = _$_.child(div_1);
 
-		button_1.__click = () => {
-			_$_.update(lazy);
-		};
+			button_1.__click = () => {
+				_$_.update(lazy);
+			};
 
-		var span_1 = _$_.sibling(button_1);
+			var span_1 = _$_.sibling(button_1);
 
-		{
-			var expression = _$_.child(span_1);
+			{
+				var expression = _$_.child(span_1);
 
-			_$_.expression(expression, () => lazy.value);
-			_$_.pop(span_1);
+				_$_.expression(expression, () => lazy.value);
+				_$_.pop(span_1);
+			}
 		}
-	}
 
-	_$_.append(__anchor, div_1);
-	_$_.pop_component();
+		_$_.append(__anchor, div_1);
+	});
 }
 
-export function IncrementDecrement(__anchor, _, __block) {
-	_$_.push_component();
-
-	let lazy_1 = _$_.track(0, __block, '87fcabdd');
-	var div_2 = root_1();
+export function IncrementDecrement() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		let lazy_1 = _$_.track(0, __block, '87fcabdd');
+		var div_2 = root_1();
 
-	{
-		var button_2 = _$_.child(div_2);
+		{
+			var button_2 = _$_.child(div_2);
 
-		button_2.__click = () => {
-			_$_.update(lazy_1, -1);
-		};
+			button_2.__click = () => {
+				_$_.update(lazy_1, -1);
+			};
 
-		var span_2 = _$_.sibling(button_2);
+			var span_2 = _$_.sibling(button_2);
 
-		{
-			var expression_1 = _$_.child(span_2);
+			{
+				var expression_1 = _$_.child(span_2);
 
-			_$_.expression(expression_1, () => lazy_1.value);
-			_$_.pop(span_2);
-		}
+				_$_.expression(expression_1, () => lazy_1.value);
+				_$_.pop(span_2);
+			}
 
-		var button_3 = _$_.sibling(span_2);
+			var button_3 = _$_.sibling(span_2);
 
-		button_3.__click = () => {
-			_$_.update(lazy_1);
-		};
-	}
+			button_3.__click = () => {
+				_$_.update(lazy_1);
+			};
+		}
 
-	_$_.append(__anchor, div_2);
-	_$_.pop_component();
+		_$_.append(__anchor, div_2);
+	});
 }
 
-export function MultipleEvents(__anchor, _, __block) {
-	_$_.push_component();
-
-	let lazy_2 = _$_.track(0, __block, '41b9f0b0');
-	let lazy_3 = _$_.track(0, __block, '72789f75');
-	var div_3 = root_2();
+export function MultipleEvents() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		let lazy_2 = _$_.track(0, __block, '41b9f0b0');
+		let lazy_3 = _$_.track(0, __block, '72789f75');
+		var div_3 = root_2();
 
-	{
-		var button_4 = _$_.child(div_3);
+		{
+			var button_4 = _$_.child(div_3);
 
-		button_4.__click = () => {
-			_$_.update(lazy_2);
-		};
+			button_4.__click = () => {
+				_$_.update(lazy_2);
+			};
 
-		_$_.event('MouseEnter', button_4, () => {
-			_$_.update(lazy_3);
-		});
+			_$_.event('MouseEnter', button_4, () => {
+				_$_.update(lazy_3);
+			});
 
-		var span_3 = _$_.sibling(button_4);
+			var span_3 = _$_.sibling(button_4);
 
-		{
-			var expression_2 = _$_.child(span_3);
+			{
+				var expression_2 = _$_.child(span_3);
 
-			_$_.expression(expression_2, () => lazy_2.value);
-			_$_.pop(span_3);
-		}
+				_$_.expression(expression_2, () => lazy_2.value);
+				_$_.pop(span_3);
+			}
 
-		var span_4 = _$_.sibling(span_3);
+			var span_4 = _$_.sibling(span_3);
 
-		{
-			var expression_3 = _$_.child(span_4);
+			{
+				var expression_3 = _$_.child(span_4);
 
-			_$_.expression(expression_3, () => lazy_3.value);
-			_$_.pop(span_4);
+				_$_.expression(expression_3, () => lazy_3.value);
+				_$_.pop(span_4);
+			}
 		}
-	}
 
-	_$_.append(__anchor, div_3);
-	_$_.pop_component();
+		_$_.append(__anchor, div_3);
+	});
 }
 
-export function MultiStateUpdate(__anchor, _, __block) {
-	_$_.push_component();
-
-	let lazy_4 = _$_.track(0, __block, '5a375160');
-	let lazy_5 = _$_.track('none', __block, '3ceeb88c');
+export function MultiStateUpdate() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		let lazy_4 = _$_.track(0, __block, '5a375160');
+		let lazy_5 = _$_.track('none', __block, '3ceeb88c');
 
-	const handleClick = () => {
-		_$_.update(lazy_4);
-		_$_.set(lazy_5, 'increment');
-	};
+		const handleClick = () => {
+			_$_.update(lazy_4);
+			_$_.set(lazy_5, 'increment');
+		};
 
-	var div_4 = root_3();
+		var div_4 = root_3();
 
-	{
-		var button_5 = _$_.child(div_4);
+		{
+			var button_5 = _$_.child(div_4);
 
-		button_5.__click = handleClick;
+			button_5.__click = handleClick;
 
-		var span_5 = _$_.sibling(button_5);
+			var span_5 = _$_.sibling(button_5);
 
-		{
-			var expression_4 = _$_.child(span_5);
+			{
+				var expression_4 = _$_.child(span_5);
 
-			_$_.expression(expression_4, () => lazy_4.value);
-			_$_.pop(span_5);
-		}
+				_$_.expression(expression_4, () => lazy_4.value);
+				_$_.pop(span_5);
+			}
 
-		var span_6 = _$_.sibling(span_5);
+			var span_6 = _$_.sibling(span_5);
 
-		{
-			var expression_5 = _$_.child(span_6);
+			{
+				var expression_5 = _$_.child(span_6);
 
-			_$_.expression(expression_5, () => lazy_5.value);
-			_$_.pop(span_6);
+				_$_.expression(expression_5, () => lazy_5.value);
+				_$_.pop(span_6);
+			}
 		}
-	}
 
-	_$_.append(__anchor, div_4);
-	_$_.pop_component();
+		_$_.append(__anchor, div_4);
+	});
 }
 
-export function ToggleButton(__anchor, _, __block) {
-	_$_.push_component();
+export function ToggleButton() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		let lazy_6 = _$_.track(false, __block, 'be823ec7');
+		var div_5 = root_4();
 
-	let lazy_6 = _$_.track(false, __block, 'be823ec7');
-	var div_5 = root_4();
-
-	{
-		var button_6 = _$_.child(div_5);
+		{
+			var button_6 = _$_.child(div_5);
 
-		button_6.__click = () => {
-			_$_.set(lazy_6, !lazy_6.value);
-		};
+			button_6.__click = () => {
+				_$_.set(lazy_6, !lazy_6.value);
+			};
 
-		{
-			var expression_6 = _$_.child(button_6);
+			{
+				var expression_6 = _$_.child(button_6, true);
 
-			_$_.expression(expression_6, () => lazy_6.value ? 'ON' : 'OFF');
-			_$_.pop(button_6);
+				_$_.pop(button_6);
+			}
 		}
-	}
 
-	_$_.append(__anchor, div_5);
-	_$_.pop_component();
-}
+		_$_.render(() => {
+			_$_.set_text(expression_6, lazy_6.value ? 'ON' : 'OFF');
+		});
 
-export function ChildButton(__anchor, props, __block) {
-	_$_.push_component();
+		_$_.append(__anchor, div_5);
+	});
+}
 
-	var button_7 = root_5();
+export function ChildButton(props) {
+	return _$_.tsrx_element((__anchor, __block) => {
+		var button_7 = root_5();
 
-	_$_.render_event('Click', button_7, () => props.onClick);
+		_$_.render_event('Click', button_7, () => props.onClick);
 
-	{
-		var expression_7 = _$_.child(button_7);
+		{
+			var expression_7 = _$_.child(button_7);
 
-		_$_.expression(expression_7, () => props.label);
-		_$_.pop(button_7);
-	}
+			_$_.expression(expression_7, () => props.label);
+			_$_.pop(button_7);
+		}
 
-	_$_.append(__anchor, button_7);
-	_$_.pop_component();
+		_$_.append(__anchor, button_7);
+	});
 }
 
-export function ParentWithChildButton(__anchor, _, __block) {
-	_$_.push_component();
-
-	let lazy_7 = _$_.track(0, __block, 'dcc2e0f9');
-	var div_6 = root_6();
+export function ParentWithChildButton() {
+	return _$_.tsrx_element((__anchor, __block) => {
+		let lazy_7 = _$_.track(0, __block, 'dcc2e0f9');
+		var div_6 = root_6();
 
-	{
-		var node = _$_.child(div_6);
+		{
+			var node = _$_.child(div_6);
 
-		ChildButton(
-			node,
-			{
+			_$_.render_component(ChildButton, node, {
 				onClick: () => {
 					_$_.update(lazy_7);
 				},
 				label: "Click me"
-			},
-			_$_.active_block
-		);
+			});
 
-		var span_7 = _$_.sibling(node);
+			var span_7 = _$_.sibling(node);
 
-		{
-			var expression_8 = _$_.child(span_7);
+			{
+				var expression_8 = _$_.child(span_7);
 
-			_$_.expression(expression_8, () => lazy_7.value);
-			_$_.pop(span_7);
-		}
+				_$_.expression(expression_8, () => lazy_7.value);
+				_$_.pop(span_7);
+			}
 
-		_$_.pop(div_6);
-	}
+			_$_.pop(div_6);
+		}
 
-	_$_.append(__anchor, div_6);
-	_$_.pop_component();
+		_$_.append(__anchor, div_6);
+	});
 }
 
 _$_.delegate(['click']);