simplify

Author: Rich-Harris

packages/svelte/src/compiler/phases/3-transform/client/visitors/template.js

@@ -1088,12 +1088,6 @@ function create_block(parent, name, nodes, context) {
 		// It's important that close is the last statement in the block, as any previous statements
 		// could contain element insertions into the template, which the close statement needs to
 		// know of when constructing the list of current inner elements.
-
-		if (context.path.length > 0) {
-			// this is a block — return DOM so it can be attached directly to the effect
-			close = b.return(close.expression);
-		}
-
 		body.push(close);
 	}
 

packages/svelte/src/internal/client/dom/blocks/snippet.js

@@ -1,6 +1,4 @@
-import { render_effect } from '../../reactivity/effects.js';
-import { remove } from '../reconciler.js';
-import { untrack } from '../../runtime.js';
+import { branch, render_effect } from '../../reactivity/effects.js';
 
 /**
  * @template {(node: import('#client').TemplateNode, ...args: any[]) => import('#client').Dom} SnippetFn
@@ -11,19 +9,13 @@ import { untrack } from '../../runtime.js';
  */
 export function snippet(get_snippet, node, ...args) {
 	/** @type {SnippetFn | null | undefined} */
-	var snippet_fn;
+	var snippet;
 
 	render_effect(() => {
-		if (snippet_fn === (snippet_fn = get_snippet())) return;
+		if (snippet === (snippet = get_snippet())) return;
 
-		if (snippet_fn) {
-			// Untrack so we only rerender when the snippet function itself changes,
-			// not when an eagerly-read prop inside the snippet function changes
-			var dom = untrack(() => /** @type {SnippetFn} */ (snippet_fn)(node, ...args));
-
-			if (dom !== undefined) {
-				return () => remove(dom);
-			}
+		if (snippet) {
+			branch(() => /** @type {SnippetFn} */ (snippet)(node, ...args));
 		}
 	});
 }

packages/svelte/src/internal/client/dom/template.js

@@ -157,7 +157,6 @@ export const comment = template('<!>', TEMPLATE_FRAGMENT);
  * and insert the elements into the dom (in client mode).
  * @param {Text | Comment | Element} anchor
  * @param {import('#client').Dom} dom
- * @returns {import('#client').Dom}
  */
 export function append(anchor, dom) {
 	var current = dom;
@@ -175,6 +174,4 @@ export function append(anchor, dom) {
 	}
 
 	/** @type {import('#client').Effect} */ (current_effect).dom = current;
-
-	return current;
 }

packages/svelte/tests/snapshot/samples/each-string-template/_expected/client/index.svelte.js

@@ -14,7 +14,7 @@ export default function Each_string_template($$anchor, $$props) {
 		var text = $.text($$anchor);
 
 		$.render_effect(() => $.set_text(text, `${$.stringify($.unwrap(thing))}, `));
-		return $.append($$anchor, text);
+		$.append($$anchor, text);
 	});
 
 	$.append($$anchor, fragment);

packages/svelte/tests/snapshot/samples/function-prop-no-getter/_expected/client/index.svelte.js

@@ -24,7 +24,7 @@ export default function Function_prop_no_getter($$anchor, $$props) {
 			var text = $.text($$anchor);
 
 			$.render_effect(() => $.set_text(text, `clicks: ${$.stringify($.get(count))}`));
-			return $.append($$anchor, text);
+			$.append($$anchor, text);
 		}
 	});