msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

chore: tidy up types for DOM operations

Browse Source
pull/17298/head
Rich Harris 3 days ago
parent f091b11eab
commit dea2deda46
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File

5
packages/svelte/src/internal/client/dom/blocks/css-props.js
Unescape View File

@ -1,5 +1,4 @@
/** @import { TemplateNode } from '#client' */ import { render_effect } from '../../reactivity/effects.js';
import { render_effect, teardown } from '../../reactivity/effects.js';
import { hydrating, set_hydrate_node } from '../hydration.js'; import { hydrating, set_hydrate_node } from '../hydration.js';
import { get_first_child } from '../operations.js'; import { get_first_child } from '../operations.js';
@ -10,7 +9,7 @@ import { get_first_child } from '../operations.js';
*/ */
export function css_props(element, get_styles) { export function css_props(element, get_styles) {
if (hydrating) { if (hydrating) {
set_hydrate_node(/** @type {TemplateNode} */ (get_first_child(element))); set_hydrate_node(get_first_child(element));
} }
render_effect(() => { render_effect(() => {

2
packages/svelte/src/internal/client/dom/blocks/each.js
Unescape View File

@ -131,7 +131,7 @@ export function each(node, flags, get_collection, get_key, render_fn, fallback_f
var parent_node = /** @type {Element} */ (node); var parent_node = /** @type {Element} */ (node);
anchor = hydrating anchor = hydrating
? set_hydrate_node(/** @type {Comment | Text} */ (get_first_child(parent_node))) ? set_hydrate_node(get_first_child(parent_node))
: parent_node.appendChild(create_text()); : parent_node.appendChild(create_text());
} }

6
packages/svelte/src/internal/client/dom/blocks/html.js
Unescape View File

@ -65,6 +65,8 @@ export function html(node, get_value, svg = false, mathml = false, skip_warning
// We're deliberately not trying to repair mismatches between server and client, // We're deliberately not trying to repair mismatches between server and client,
// as it's costly and error-prone (and it's an edge case to have a mismatch anyway) // as it's costly and error-prone (and it's an edge case to have a mismatch anyway)
var hash = /** @type {Comment} */ (hydrate_node).data; var hash = /** @type {Comment} */ (hydrate_node).data;
/** @type {TemplateNode | null} */
var next = hydrate_next(); var next = hydrate_next();
var last = next; var last = next;
@ -73,7 +75,7 @@ export function html(node, get_value, svg = false, mathml = false, skip_warning
(next.nodeType !== COMMENT_NODE || /** @type {Comment} */ (next).data !== '') (next.nodeType !== COMMENT_NODE || /** @type {Comment} */ (next).data !== '')
) { ) {
last = next; last = next;
next = /** @type {TemplateNode} */ (get_next_sibling(next)); next = get_next_sibling(next);
} }
if (next === null) { if (next === null) {
@ -110,7 +112,7 @@ export function html(node, get_value, svg = false, mathml = false, skip_warning
if (svg || mathml) { if (svg || mathml) {
while (get_first_child(node)) { while (get_first_child(node)) {
anchor.before(/** @type {Node} */ (get_first_child(node))); anchor.before(/** @type {TemplateNode} */ (get_first_child(node)));
} }
} else { } else {
anchor.before(node); anchor.before(node);

6
packages/svelte/src/internal/client/dom/blocks/svelte-element.js
Unescape View File

@ -95,9 +95,9 @@ export function element(node, get_tag, is_svg, render_fn, get_namespace, locatio
// If hydrating, use the existing ssr comment as the anchor so that the // If hydrating, use the existing ssr comment as the anchor so that the
// inner open and close methods can pick up the existing nodes correctly // inner open and close methods can pick up the existing nodes correctly
var child_anchor = /** @type {TemplateNode} */ ( var child_anchor = hydrating
hydrating ? get_first_child(element) : element.appendChild(create_text()) ? get_first_child(element)
); : element.appendChild(create_text());
if (hydrating) { if (hydrating) {
if (child_anchor === null) { if (child_anchor === null) {

4
packages/svelte/src/internal/client/dom/blocks/svelte-head.js
Unescape View File

@ -21,7 +21,7 @@ export function head(hash, render_fn) {
if (hydrating) { if (hydrating) {
previous_hydrate_node = hydrate_node; previous_hydrate_node = hydrate_node;
var head_anchor = /** @type {TemplateNode} */ (get_first_child(document.head)); var head_anchor = get_first_child(document.head);
// There might be multiple head blocks in our app, and they could have been // There might be multiple head blocks in our app, and they could have been
// rendered in an arbitrary order — find one corresponding to this component // rendered in an arbitrary order — find one corresponding to this component
@ -29,7 +29,7 @@ export function head(hash, render_fn) {
head_anchor !== null && head_anchor !== null &&
(head_anchor.nodeType !== COMMENT_NODE || /** @type {Comment} */ (head_anchor).data !== hash) (head_anchor.nodeType !== COMMENT_NODE || /** @type {Comment} */ (head_anchor).data !== hash)
) { ) {
head_anchor = /** @type {TemplateNode} */ (get_next_sibling(head_anchor)); head_anchor = get_next_sibling(head_anchor);
} }
// If we can't find an opening hydration marker, skip hydration (this can happen // If we can't find an opening hydration marker, skip hydration (this can happen

4
packages/svelte/src/internal/client/dom/hydration.js
Unescape View File

@ -30,7 +30,7 @@ export function set_hydrating(value) {
*/ */
export let hydrate_node; export let hydrate_node;
/** @param {TemplateNode} node */ /** @param {TemplateNode | null} node */
export function set_hydrate_node(node) { export function set_hydrate_node(node) {
if (node === null) { if (node === null) {
w.hydration_mismatch(); w.hydration_mismatch();
@ -41,7 +41,7 @@ export function set_hydrate_node(node) {
} }
export function hydrate_next() { export function hydrate_next() {
return set_hydrate_node(/** @type {TemplateNode} */ (get_next_sibling(hydrate_node))); return set_hydrate_node(get_next_sibling(hydrate_node));
} }
/** @param {TemplateNode} node */ /** @param {TemplateNode} node */

14
packages/svelte/src/internal/client/dom/operations.js
Unescape View File

@ -83,21 +83,19 @@ export function create_text(value = '') {
/** /**
* @template {Node} N * @template {Node} N
* @param {N} node * @param {N} node
* @returns {Node | null}
*/ */
/*@__NO_SIDE_EFFECTS__*/ /*@__NO_SIDE_EFFECTS__*/
export function get_first_child(node) { export function get_first_child(node) {
return first_child_getter.call(node); return /** @type {TemplateNode | null} */ (first_child_getter.call(node));
} }
/** /**
* @template {Node} N * @template {Node} N
* @param {N} node * @param {N} node
* @returns {Node | null}
*/ */
/*@__NO_SIDE_EFFECTS__*/ /*@__NO_SIDE_EFFECTS__*/
export function get_next_sibling(node) { export function get_next_sibling(node) {
return next_sibling_getter.call(node); return /** @type {TemplateNode | null} */ (next_sibling_getter.call(node));
} }
/** /**
@ -105,14 +103,14 @@ export function get_next_sibling(node) {
* @template {Node} N * @template {Node} N
* @param {N} node * @param {N} node
* @param {boolean} is_text * @param {boolean} is_text
* @returns {Node | null} * @returns {TemplateNode | null}
*/ */
export function child(node, is_text) { export function child(node, is_text) {
if (!hydrating) { if (!hydrating) {
return get_first_child(node); return get_first_child(node);
} }
var child = /** @type {TemplateNode} */ (get_first_child(hydrate_node)); var child = get_first_child(hydrate_node);
// Child can be null if we have an element with a single child, like `<p>{text}</p>`, where `text` is empty // Child can be null if we have an element with a single child, like `<p>{text}</p>`, where `text` is empty
if (child === null) { if (child === null) {
@ -163,7 +161,7 @@ export function first_child(fragment, is_text = false) {
* @param {TemplateNode} node * @param {TemplateNode} node
* @param {number} count * @param {number} count
* @param {boolean} is_text * @param {boolean} is_text
* @returns {Node | null} * @returns {TemplateNode | null}
*/ */
export function sibling(node, count = 1, is_text = false) { export function sibling(node, count = 1, is_text = false) {
let next_sibling = hydrating ? hydrate_node : node; let next_sibling = hydrating ? hydrate_node : node;
@ -195,7 +193,7 @@ export function sibling(node, count = 1, is_text = false) {
} }
set_hydrate_node(next_sibling); set_hydrate_node(next_sibling);
return /** @type {TemplateNode} */ (next_sibling); return next_sibling;
} }
/** /**

6
packages/svelte/src/internal/client/dom/template.js
Unescape View File

@ -60,7 +60,7 @@ export function from_html(content, flags) {
if (node === undefined) { if (node === undefined) {
node = create_fragment_from_html(has_start ? content : '<!>' + content); node = create_fragment_from_html(has_start ? content : '<!>' + content);
if (!is_fragment) node = /** @type {Node} */ (get_first_child(node)); if (!is_fragment) node = /** @type {TemplateNode} */ (get_first_child(node));
} }
var clone = /** @type {TemplateNode} */ ( var clone = /** @type {TemplateNode} */ (
@ -113,7 +113,7 @@ function from_namespace(content, flags, ns = 'svg') {
if (is_fragment) { if (is_fragment) {
node = document.createDocumentFragment(); node = document.createDocumentFragment();
while (get_first_child(root)) { while (get_first_child(root)) {
node.appendChild(/** @type {Node} */ (get_first_child(root))); node.appendChild(/** @type {TemplateNode} */ (get_first_child(root)));
} }
} else { } else {
node = /** @type {Element} */ (get_first_child(root)); node = /** @type {Element} */ (get_first_child(root));
@ -227,7 +227,7 @@ export function from_tree(structure, flags) {
: undefined; : undefined;
node = fragment_from_tree(structure, ns); node = fragment_from_tree(structure, ns);
if (!is_fragment) node = /** @type {Node} */ (get_first_child(node)); if (!is_fragment) node = /** @type {TemplateNode} */ (get_first_child(node));
} }
var clone = /** @type {TemplateNode} */ ( var clone = /** @type {TemplateNode} */ (

4
packages/svelte/src/internal/client/reactivity/effects.js vendored
Unescape View File

@ -548,7 +548,7 @@ export function destroy_effect(effect, remove_dom = true) {
export function remove_effect_dom(node, end) { export function remove_effect_dom(node, end) {
while (node !== null) { while (node !== null) {
/** @type {TemplateNode | null} */ /** @type {TemplateNode | null} */
var next = node === end ? null : /** @type {TemplateNode} */ (get_next_sibling(node)); var next = node === end ? null : get_next_sibling(node);
node.remove(); node.remove();
node = next; node = next;
@ -715,7 +715,7 @@ export function move_effect(effect, fragment) {
while (node !== null) { while (node !== null) {
/** @type {TemplateNode | null} */ /** @type {TemplateNode | null} */
var next = node === end ? null : /** @type {TemplateNode} */ (get_next_sibling(node)); var next = node === end ? null : get_next_sibling(node);
fragment.append(node); fragment.append(node);
node = next; node = next;

5
packages/svelte/src/internal/client/render.js
Unescape View File

@ -99,12 +99,13 @@ export function hydrate(component, options) {
const previous_hydrate_node = hydrate_node; const previous_hydrate_node = hydrate_node;
try { try {
var anchor = /** @type {TemplateNode} */ (get_first_child(target)); var anchor = get_first_child(target);
while ( while (
anchor && anchor &&
(anchor.nodeType !== COMMENT_NODE || /** @type {Comment} */ (anchor).data !== HYDRATION_START) (anchor.nodeType !== COMMENT_NODE || /** @type {Comment} */ (anchor).data !== HYDRATION_START)
) { ) {
anchor = /** @type {TemplateNode} */ (get_next_sibling(anchor)); anchor = get_next_sibling(anchor);
} }
if (!anchor) { if (!anchor) {

Write Preview
Loading…
Cancel
Save