diff --git a/packages/svelte/src/internal/client/dom/blocks/html.js b/packages/svelte/src/internal/client/dom/blocks/html.js index 2e03cbc3bb..0a57d46af2 100644 --- a/packages/svelte/src/internal/client/dom/blocks/html.js +++ b/packages/svelte/src/internal/client/dom/blocks/html.js @@ -8,7 +8,7 @@ import { reconcile_html, remove } from '../reconciler.js'; * @returns {void} */ export function html(dom, get_value, svg) { - /** @type {import('#client').TemplateNode | import('#client').TemplateNode[]} */ + /** @type {import('#client').Dom} */ let html_dom; /** @type {string} */ diff --git a/packages/svelte/src/internal/client/dom/blocks/if.js b/packages/svelte/src/internal/client/dom/blocks/if.js index e03c4dc5af..f257a64833 100644 --- a/packages/svelte/src/internal/client/dom/blocks/if.js +++ b/packages/svelte/src/internal/client/dom/blocks/if.js @@ -17,8 +17,8 @@ import { create_block } from './utils.js'; /** * @param {Comment} anchor * @param {() => boolean} get_condition - * @param {(anchor: Node) => import('#client').TemplateNode | import('#client').TemplateNode[]} consequent_fn - * @param {null | ((anchor: Node) => import('#client').TemplateNode | import('#client').TemplateNode[])} alternate_fn + * @param {(anchor: Node) => import('#client').Dom} consequent_fn + * @param {null | ((anchor: Node) => import('#client').Dom)} alternate_fn * @param {boolean} [elseif] True if this is an `{:else if ...}` block rather than an `{#if ...}`, as that affects which transitions are considered 'local' * @returns {void} */ @@ -27,10 +27,10 @@ export function if_block(anchor, get_condition, consequent_fn, alternate_fn, els hydrate_block_anchor(anchor); - /** @type {undefined | import('#client').TemplateNode | Array} */ + /** @type {undefined | import('#client').Dom} */ let consequent_dom; - /** @type {undefined | import('#client').TemplateNode | Array} */ + /** @type {undefined | import('#client').Dom} */ let alternate_dom; /** @type {import('#client').Effect | null} */ diff --git a/packages/svelte/src/internal/client/dom/reconciler.js b/packages/svelte/src/internal/client/dom/reconciler.js index 81b03bbd2f..02be902598 100644 --- a/packages/svelte/src/internal/client/dom/reconciler.js +++ b/packages/svelte/src/internal/client/dom/reconciler.js @@ -29,7 +29,7 @@ export function create_fragment_with_script_from_html(html) { } /** - * @param {Array | import('../types.js').TemplateNode} current + * @param {import('#client').Dom} current * @param {Text | Element | Comment} sibling * @returns {Text | Element | Comment} */ @@ -49,7 +49,7 @@ export function insert(current, sibling) { } /** - * @param {Array | import('../types.js').TemplateNode} current + * @param {import('#client').Dom} current */ export function remove(current) { if (is_array(current)) { diff --git a/packages/svelte/src/internal/client/dom/template.js b/packages/svelte/src/internal/client/dom/template.js index 97a8652c7a..8fcd271ecd 100644 --- a/packages/svelte/src/internal/client/dom/template.js +++ b/packages/svelte/src/internal/client/dom/template.js @@ -178,10 +178,10 @@ export function comment(anchor) { * @param {Element | Text} dom * @param {boolean} is_fragment * @param {null | Text | Comment | Element} anchor - * @returns {import('#client').TemplateNode | import('#client').TemplateNode[]} + * @returns {import('#client').Dom} */ function close_template(dom, is_fragment, anchor) { - /** @type {import('#client').TemplateNode | Array} */ + /** @type {import('#client').Dom} */ var current = is_fragment ? is_array(dom) ? dom diff --git a/packages/svelte/src/internal/client/types.d.ts b/packages/svelte/src/internal/client/types.d.ts index 68025ce99a..d2426ee5d3 100644 --- a/packages/svelte/src/internal/client/types.d.ts +++ b/packages/svelte/src/internal/client/types.d.ts @@ -49,9 +49,11 @@ export type Equals = (this: Value, value: unknown) => boolean; export type TemplateNode = Text | Element | Comment; +export type Dom = TemplateNode | TemplateNode[]; + export interface Block { /** dom */ - d: null | TemplateNode | Array; + d: null | Dom; } export type EachState = { @@ -65,7 +67,7 @@ export type EachItem = { /** animation manager */ a: AnimationManager | null; /** dom */ - d: null | TemplateNode | Array; + d: null | Dom; /** effect */ e: Effect; /** item */ @@ -139,15 +141,6 @@ export type StoreReferencesContainer = Record< export type ActionPayload

= { destroy?: () => void; update?: (value: P) => void }; -export type Render = { - /** dom */ - d: null | TemplateNode | Array; - /** effect */ - e: null | Effect; - /** prev */ - p: Render | null; -}; - export type Raf = { /** Alias for `requestAnimationFrame`, exposed in such a way that we can override in tests */ tick: (callback: (time: DOMHighResTimeStamp) => void) => any;