Skip to content

Commit 51adf52

Browse files
committed
simplify
1 parent d4dc3f9 commit 51adf52

File tree

10 files changed

+19
-25
lines changed

10 files changed

+19
-25
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ function create_block(parent, name, nodes, context) {
10451045
);
10461046

10471047
/** @type {import('estree').Expression[]} */
1048-
const args = [b.id('$$anchor'), template_name];
1048+
const args = [template_name];
10491049

10501050
if (state.metadata.context.template_needs_import_node) {
10511051
args.push(b.false);
@@ -1089,7 +1089,7 @@ function create_block(parent, name, nodes, context) {
10891089

10901090
if (use_comment_template) {
10911091
// special case — we can use `$.comment` instead of creating a unique template
1092-
body.push(b.var(id, b.call('$.comment', b.id('$$anchor'))));
1092+
body.push(b.var(id, b.call('$.comment')));
10931093
} else {
10941094
state.hoisted.push(
10951095
b.var(
@@ -1103,7 +1103,7 @@ function create_block(parent, name, nodes, context) {
11031103
);
11041104

11051105
/** @type {import('estree').Expression[]} */
1106-
const args = [b.id('$$anchor'), template_name];
1106+
const args = [template_name];
11071107

11081108
if (state.metadata.context.template_needs_import_node) {
11091109
args.push(b.false);

packages/svelte/src/internal/client/dom/elements/custom-element.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ if (typeof HTMLElement === 'function') {
9898
* @param {Element} anchor
9999
*/
100100
return (anchor) => {
101-
const node = open(anchor, () => {
101+
const node = open(() => {
102102
const slot = document.createElement('slot');
103103
if (name !== 'default') {
104104
slot.name = name;

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

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,11 @@ export function svg_template_with_script(svg, return_fragment) {
8383
/**
8484
* @param {boolean} is_fragment
8585
* @param {boolean} use_clone_node
86-
* @param {null | Text | Comment | Element} anchor
8786
* @param {() => Node} [template_element_fn]
8887
* @returns {Element | DocumentFragment | Node[]}
8988
*/
9089
/*#__NO_SIDE_EFFECTS__*/
91-
function open_template(is_fragment, use_clone_node, anchor, template_element_fn) {
90+
function open_template(is_fragment, use_clone_node, template_element_fn) {
9291
if (hydrating) {
9392
return is_fragment ? hydrate_nodes : /** @type {Element} */ (hydrate_nodes[0]);
9493
}
@@ -99,23 +98,21 @@ function open_template(is_fragment, use_clone_node, anchor, template_element_fn)
9998
}
10099

101100
/**
102-
* @param {null | Text | Comment | Element} anchor
103101
* @param {() => Node} template_element_fn
104102
* @param {boolean} [use_clone_node]
105103
* @returns {Element}
106104
*/
107-
export function open(anchor, template_element_fn, use_clone_node = true) {
108-
return /** @type {Element} */ (open_template(false, use_clone_node, anchor, template_element_fn));
105+
export function open(template_element_fn, use_clone_node = true) {
106+
return /** @type {Element} */ (open_template(false, use_clone_node, template_element_fn));
109107
}
110108

111109
/**
112-
* @param {null | Text | Comment | Element} anchor
113110
* @param {() => Node} template_element_fn
114111
* @param {boolean} [use_clone_node]
115112
* @returns {Element | DocumentFragment | Node[]}
116113
*/
117-
export function open_frag(anchor, template_element_fn, use_clone_node = true) {
118-
return open_template(true, use_clone_node, anchor, template_element_fn);
114+
export function open_frag(template_element_fn, use_clone_node = true) {
115+
return open_template(true, use_clone_node, template_element_fn);
119116
}
120117

121118
const space_template = template(' ', false);
@@ -127,7 +124,7 @@ const comment_template = template('<!>', true);
127124
/*#__NO_SIDE_EFFECTS__*/
128125
export function space_frag(anchor) {
129126
/** @type {Node | null} */
130-
var node = /** @type {any} */ (open(anchor, space_template));
127+
var node = /** @type {any} */ (open(space_template));
131128
// if an {expression} is empty during SSR, there might be no
132129
// text node to hydrate (or an anchor comment is falsely detected instead)
133130
// — we must therefore create one
@@ -156,12 +153,9 @@ export function space(anchor) {
156153
return anchor;
157154
}
158155

159-
/**
160-
* @param {null | Text | Comment | Element} anchor
161-
*/
162156
/*#__NO_SIDE_EFFECTS__*/
163-
export function comment(anchor) {
164-
return open_frag(anchor, comment_template);
157+
export function comment() {
158+
return open_frag(comment_template);
165159
}
166160

167161
/**

packages/svelte/tests/snapshot/samples/bind-this/_expected/client/index.svelte.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function Bind_this($$anchor, $$props) {
77
$.push($$props, false);
88
$.init();
99

10-
var fragment = $.comment($$anchor);
10+
var fragment = $.comment();
1111
var node = $.first_child(fragment);
1212

1313
$.bind_this(Foo(node, {}), ($$value) => foo = $$value, () => foo);

packages/svelte/tests/snapshot/samples/dynamic-attributes-casing/_expected/client/main.svelte.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function Main($$anchor, $$props) {
1111
// needs to be a snapshot test because jsdom does auto-correct the attribute casing
1212
let x = 'test';
1313
let y = () => 'test';
14-
var fragment = $.open_frag($$anchor, frag, false);
14+
var fragment = $.open_frag(frag, false);
1515
var div = $.first_child(fragment);
1616
var svg = $.sibling($.sibling(div, true));
1717
var custom_element = $.sibling($.sibling(svg, true));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function Each_string_template($$anchor, $$props) {
77
$.push($$props, false);
88
$.init();
99

10-
var fragment = $.comment($$anchor);
10+
var fragment = $.comment();
1111
var node = $.first_child(fragment);
1212

1313
$.each_indexed(node, 1, () => ['foo', 'bar', 'baz'], ($$anchor, thing, $$index) => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default function Function_prop_no_getter($$anchor, $$props) {
1313
}
1414

1515
const plusOne = (num) => num + 1;
16-
var fragment = $.comment($$anchor);
16+
var fragment = $.comment();
1717
var node = $.first_child(fragment);
1818

1919
Button(node, {

packages/svelte/tests/snapshot/samples/hello-world/_expected/client/index.svelte.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default function Hello_world($$anchor, $$props) {
99
$.push($$props, false);
1010
$.init();
1111

12-
var h1 = $.open($$anchor, frag);
12+
var h1 = $.open(frag);
1313

1414
$.close($$anchor, h1);
1515
$.pop();

packages/svelte/tests/snapshot/samples/state-proxy-literal/_expected/client/index.svelte.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function State_proxy_literal($$anchor, $$props) {
1717

1818
let str = $.source('');
1919
let tpl = $.source(``);
20-
var fragment = $.open_frag($$anchor, frag);
20+
var fragment = $.open_frag(frag);
2121
var input = $.first_child(fragment);
2222

2323
$.remove_input_attr_defaults(input);

packages/svelte/tests/snapshot/samples/svelte-element/_expected/client/index.svelte.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function Svelte_element($$anchor, $$props) {
77
$.push($$props, true);
88

99
let tag = $.prop($$props, "tag", 3, 'hr');
10-
var fragment = $.comment($$anchor);
10+
var fragment = $.comment();
1111
var node = $.first_child(fragment);
1212

1313
$.element(node, tag, false);

0 commit comments

Comments
 (0)