ripple 0.3.9 → 0.3.11

package/tests/hydration/compiled/client/if-children.js

@@ -42,9 +42,9 @@ export function IfWithChildren(__anchor, { children }, __block) {
 				var div_3 = root_1();
 
 				{
-					var node_1 = _$_.child(div_3);
+					var expression = _$_.child(div_3);
 
-					children(node_1, {}, _$_.active_block);
+					_$_.expression(expression, () => children);
 					_$_.pop(div_3);
 				}
 
@@ -63,15 +63,15 @@ export function IfWithChildren(__anchor, { children }, __block) {
 	_$_.pop_component();
 }
 
-export function ChildItem(__anchor, { text }, __block) {
+export function ChildItem(__anchor, { text: label }, __block) {
 	_$_.push_component();
 
 	var div_4 = root_2();
 
 	{
-		var text_1 = _$_.child(div_4, true);
+		var expression_1 = _$_.child(div_4, true);
 
-		text_1.nodeValue = text;
+		_$_.expression(expression_1, () => label);
 		_$_.pop(div_4);
 	}
 
@@ -83,25 +83,22 @@ export function TestIfWithChildren(__anchor, _, __block) {
 	_$_.push_component();
 
 	var fragment = root_3();
-	var node_2 = _$_.first_child_frag(fragment);
+	var node_1 = _$_.first_child_frag(fragment);
 
 	IfWithChildren(
-		node_2,
+		node_1,
 		{
-			children(__anchor, _, __block) {
-				_$_.push_component();
-
+			children: _$_.ripple_element(function render_children(__anchor, __block) {
 				var fragment_1 = root_4();
-				var node_3 = _$_.first_child_frag(fragment_1);
+				var node_2 = _$_.first_child_frag(fragment_1);
 
-				ChildItem(node_3, { text: "Item 1" }, _$_.active_block);
+				ChildItem(node_2, { text: "Item 1" }, _$_.active_block);
 
-				var node_4 = _$_.sibling(node_3);
+				var node_3 = _$_.sibling(node_2);
 
-				ChildItem(node_4, { text: "Item 2" }, _$_.active_block);
+				ChildItem(node_3, { text: "Item 2" }, _$_.active_block);
 				_$_.append(__anchor, fragment_1);
-				_$_.pop_component();
-			}
+			})
 		},
 		_$_.active_block
 	);
@@ -121,7 +118,7 @@ export function IfWithStaticChildren(__anchor, _, __block) {
 
 		div_6.__click = () => _$_.set(lazy_1, !_$_.get(lazy_1));
 
-		var node_5 = _$_.sibling(div_6);
+		var node_4 = _$_.sibling(div_6);
 
 		{
 			var consequent_1 = (__anchor) => {
@@ -130,7 +127,7 @@ export function IfWithStaticChildren(__anchor, _, __block) {
 				_$_.append(__anchor, div_7);
 			};
 
-			_$_.if(node_5, (__render) => {
+			_$_.if(node_4, (__render) => {
 				if (_$_.get(lazy_1)) __render(consequent_1);
 			});
 		}
@@ -154,23 +151,23 @@ export function IfWithSiblingsAndChildren(__anchor, { children }, __block) {
 		div_8.__click = () => _$_.set(lazy_2, !_$_.get(lazy_2));
 		_$_.pop(div_8);
 
-		var node_6 = _$_.sibling(div_8);
+		var node_5 = _$_.sibling(div_8);
 
 		{
 			var consequent_2 = (__anchor) => {
 				var div_9 = root_8();
 
 				{
-					var node_7 = _$_.child(div_9);
+					var expression_2 = _$_.child(div_9);
 
-					children(node_7, {}, _$_.active_block);
+					_$_.expression(expression_2, () => children);
 					_$_.pop(div_9);
 				}
 
 				_$_.append(__anchor, div_9);
 			};
 
-			_$_.if(node_6, (__render) => {
+			_$_.if(node_5, (__render) => {
 				if (_$_.get(lazy_2)) __render(consequent_2);
 			});
 		}
@@ -186,25 +183,22 @@ export function TestIfWithSiblingsAndChildren(__anchor, _, __block) {
 	_$_.push_component();
 
 	var fragment_2 = root_9();
-	var node_8 = _$_.first_child_frag(fragment_2);
+	var node_6 = _$_.first_child_frag(fragment_2);
 
 	IfWithSiblingsAndChildren(
-		node_8,
+		node_6,
 		{
-			children(__anchor, _, __block) {
-				_$_.push_component();
-
+			children: _$_.ripple_element(function render_children(__anchor, __block) {
 				var fragment_3 = root_10();
-				var node_9 = _$_.first_child_frag(fragment_3);
+				var node_7 = _$_.first_child_frag(fragment_3);
 
-				ChildItem(node_9, { text: "Item A" }, _$_.active_block);
+				ChildItem(node_7, { text: "Item A" }, _$_.active_block);
 
-				var node_10 = _$_.sibling(node_9);
+				var node_8 = _$_.sibling(node_7);
 
-				ChildItem(node_10, { text: "Item B" }, _$_.active_block);
+				ChildItem(node_8, { text: "Item B" }, _$_.active_block);
 				_$_.append(__anchor, fragment_3);
-				_$_.pop_component();
-			}
+			})
 		},
 		_$_.active_block
 	);
@@ -225,7 +219,7 @@ export function ElementWithChildrenThenIf(__anchor, _, __block) {
 
 		_$_.pop(div_10);
 
-		var node_11 = _$_.sibling(div_10);
+		var node_9 = _$_.sibling(div_10);
 
 		{
 			var consequent_3 = (__anchor) => {
@@ -234,7 +228,7 @@ export function ElementWithChildrenThenIf(__anchor, _, __block) {
 				_$_.append(__anchor, div_12);
 			};
 
-			_$_.if(node_11, (__render) => {
+			_$_.if(node_9, (__render) => {
 				if (_$_.get(lazy_3)) __render(consequent_3);
 			});
 		}
@@ -262,7 +256,7 @@ export function DeepNestingThenIf(__anchor, _, __block) {
 
 		_$_.pop(article_1);
 
-		var node_12 = _$_.sibling(article_1);
+		var node_10 = _$_.sibling(article_1);
 
 		{
 			var consequent_4 = (__anchor) => {
@@ -271,7 +265,7 @@ export function DeepNestingThenIf(__anchor, _, __block) {
 				_$_.append(__anchor, footer_1);
 			};
 
-			_$_.if(node_12, (__render) => {
+			_$_.if(node_10, (__render) => {
 				if (_$_.get(lazy_4)) __render(consequent_4);
 			});
 		}
@@ -311,7 +305,7 @@ export function DomElementChildrenThenSibling(__anchor, _, __block) {
 		var div_15 = _$_.sibling(div_14);
 
 		{
-			var node_13 = _$_.child(div_15);
+			var node_11 = _$_.child(div_15);
 
 			{
 				var consequent_5 = (__anchor) => {
@@ -326,7 +320,7 @@ export function DomElementChildrenThenSibling(__anchor, _, __block) {
 					_$_.append(__anchor, div_16);
 				};
 
-				_$_.if(node_13, (__render) => {
+				_$_.if(node_11, (__render) => {
 					if (_$_.get(lazy_5) === 'code') __render(consequent_5); else __render(alternate, false);
 				});
 			}
@@ -370,8 +364,9 @@ export function DomChildrenThenStaticSiblings(__anchor, _, __block) {
 			var li_1 = _$_.child(ul_1);
 
 			{
-				var text_2 = _$_.child(li_1, true);
+				var expression_3 = _$_.child(li_1, true);
 
+				_$_.expression(expression_3, () => 'Item count: ' + _$_.with_scope(__block, () => String(_$_.get(lazy_6))));
 				_$_.pop(li_1);
 			}
 		}
@@ -383,11 +378,6 @@ export function DomChildrenThenStaticSiblings(__anchor, _, __block) {
 
 	button_5.__click = () => _$_.update(lazy_6);
 	_$_.next();
-
-	_$_.render(() => {
-		_$_.set_text(text_2, 'Item count: ' + _$_.with_scope(__block, () => String(_$_.get(lazy_6))));
-	});
-
 	_$_.append(__anchor, fragment_6, true);
 	_$_.pop_component();
 }

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

@@ -188,8 +188,8 @@ export function NestedIf(__anchor, _, __block) {
 			var div_8 = root_13();
 
 			{
-				var text = _$_.child(div_8);
-				var node_6 = _$_.sibling(text);
+				var expression = _$_.child(div_8);
+				var node_6 = _$_.sibling(expression);
 
 				{
 					var consequent_5 = (__anchor) => {

package/tests/hydration/compiled/client/mixed-control-flow.js

@@ -66,27 +66,15 @@ export function MixedControlFlowStatic(__anchor, _, __block) {
 											var div_1 = root_4();
 
 											{
-												var text = _$_.child(div_1, true);
+												var expression = _$_.child(div_1, true);
 
+												_$_.expression(expression, () => `A-${_$_.get(pattern).id}`);
 												_$_.pop(div_1);
 											}
 
-											_$_.render(
-												(__prev) => {
-													var __a = `A-${_$_.get(pattern).id}`;
-
-													if (__prev.a !== __a) {
-														_$_.set_text(text, __prev.a = __a);
-													}
-
-													var __b = `row row-${_$_.get(pattern).id} kind-a`;
-
-													if (__prev.b !== __b) {
-														_$_.set_class(div_1, __prev.b = __b, void 0, true);
-													}
-												},
-												{ a: ' ', b: Symbol() }
-											);
+											_$_.render(() => {
+												_$_.set_class(div_1, `row row-${_$_.get(pattern).id} kind-a`, void 0, true);
+											});
 
 											_$_.append(__anchor, div_1);
 										});
@@ -117,27 +105,15 @@ export function MixedControlFlowStatic(__anchor, _, __block) {
 											var div_3 = root_7();
 
 											{
-												var text_1 = _$_.child(div_3, true);
+												var expression_1 = _$_.child(div_3, true);
 
+												_$_.expression(expression_1, () => `B-${_$_.get(pattern).id}`);
 												_$_.pop(div_3);
 											}
 
-											_$_.render(
-												(__prev) => {
-													var __a = `B-${_$_.get(pattern).id}`;
-
-													if (__prev.a !== __a) {
-														_$_.set_text(text_1, __prev.a = __a);
-													}
-
-													var __b = `row row-${_$_.get(pattern).id} kind-b`;
-
-													if (__prev.b !== __b) {
-														_$_.set_class(div_3, __prev.b = __b, void 0, true);
-													}
-												},
-												{ a: ' ', b: Symbol() }
-											);
+											_$_.render(() => {
+												_$_.set_class(div_3, `row row-${_$_.get(pattern).id} kind-b`, void 0, true);
+											});
 
 											_$_.append(__anchor, div_3);
 										});
@@ -244,27 +220,15 @@ export function MixedControlFlowReactive(__anchor, _, __block) {
 											var p_1 = root_13();
 
 											{
-												var text_2 = _$_.child(p_1, true);
+												var expression_2 = _$_.child(p_1, true);
 
+												_$_.expression(expression_2, () => `A:${_$_.get(pattern_1).label}`);
 												_$_.pop(p_1);
 											}
 
-											_$_.render(
-												(__prev) => {
-													var __a = `A:${_$_.get(pattern_1).label}`;
-
-													if (__prev.a !== __a) {
-														_$_.set_text(text_2, __prev.a = __a);
-													}
-
-													var __b = `item item-${_$_.get(pattern_1).id}`;
-
-													if (__prev.b !== __b) {
-														_$_.set_class(p_1, __prev.b = __b, void 0, true);
-													}
-												},
-												{ a: ' ', b: Symbol() }
-											);
+											_$_.render(() => {
+												_$_.set_class(p_1, `item item-${_$_.get(pattern_1).id}`, void 0, true);
+											});
 
 											_$_.append(__anchor, p_1);
 										});
@@ -291,27 +255,15 @@ export function MixedControlFlowReactive(__anchor, _, __block) {
 											var p_3 = root_16();
 
 											{
-												var text_3 = _$_.child(p_3, true);
+												var expression_3 = _$_.child(p_3, true);
 
+												_$_.expression(expression_3, () => `B:${_$_.get(pattern_1).label}`);
 												_$_.pop(p_3);
 											}
 
-											_$_.render(
-												(__prev) => {
-													var __a = `B:${_$_.get(pattern_1).label}`;
-
-													if (__prev.a !== __a) {
-														_$_.set_text(text_3, __prev.a = __a);
-													}
-
-													var __b = `item item-${_$_.get(pattern_1).id}`;
-
-													if (__prev.b !== __b) {
-														_$_.set_class(p_3, __prev.b = __b, void 0, true);
-													}
-												},
-												{ a: ' ', b: Symbol() }
-											);
+											_$_.render(() => {
+												_$_.set_class(p_3, `item item-${_$_.get(pattern_1).id}`, void 0, true);
+											});
 
 											_$_.append(__anchor, p_3);
 										});
@@ -407,9 +359,9 @@ export function MixedControlFlowAsyncPending(__anchor, _, __block) {
 									_$_.set_class(div_7, `pending-row pending-row-${row}`, void 0, true);
 
 									{
-										var text_4 = _$_.child(div_7, true);
+										var expression_4 = _$_.child(div_7, true);
 
-										text_4.nodeValue = `pending ${row}`;
+										_$_.expression(expression_4, () => `pending ${row}`);
 										_$_.pop(div_7);
 									}
 
@@ -469,9 +421,9 @@ function AsyncRow(__anchor, { label }, __block) {
 		var div_9 = root_25();
 
 		{
-			var text_5 = _$_.child(div_9, true);
+			var expression_5 = _$_.child(div_9, true);
 
-			text_5.nodeValue = value;
+			_$_.expression(expression_5, () => value);
 			_$_.pop(div_9);
 		}