Skip to content

Commit 68b4715

Browse files
committed
put type narrowing to the correct place
1 parent 7fc1514 commit 68b4715

File tree

1 file changed

+6
-10
lines changed
  • packages/svelte/src/compiler/phases/2-analyze/css

1 file changed

+6
-10
lines changed

packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ function truncate(node) {
158158
}
159159

160160
/**
161-
* @param {Compiler.AST.CSS.RelativeSelector[]} relative_selectors
161+
* @param {ExtendedRelativeSelector[]} relative_selectors
162162
* @param {Compiler.AST.CSS.Rule} rule
163163
* @param {Compiler.AST.RegularElement | Compiler.AST.SvelteElement} element
164164
* @returns {boolean}
@@ -173,7 +173,7 @@ function apply_selector(relative_selectors, rule, element) {
173173
apply_combinator(relative_selector, parent_selectors, rule, element);
174174

175175
if (matched) {
176-
if (!is_outer_global(relative_selector)) {
176+
if (!is_outer_global(/** @type {Compiler.AST.CSS.RelativeSelector} */ (relative_selector))) {
177177
relative_selector.metadata.scoped = true;
178178
}
179179

@@ -184,8 +184,8 @@ function apply_selector(relative_selectors, rule, element) {
184184
}
185185

186186
/**
187-
* @param {Compiler.AST.CSS.RelativeSelector} relative_selector
188-
* @param {Compiler.AST.CSS.RelativeSelector[]} parent_selectors
187+
* @param {ExtendedRelativeSelector} relative_selector
188+
* @param {ExtendedRelativeSelector[]} parent_selectors
189189
* @param {Compiler.AST.CSS.Rule} rule
190190
* @param {Compiler.AST.RegularElement | Compiler.AST.SvelteElement | Compiler.AST.RenderTag | Compiler.AST.Component | Compiler.AST.SvelteComponent | Compiler.AST.SvelteSelf} node
191191
* @returns {boolean}
@@ -269,7 +269,7 @@ function apply_combinator(relative_selector, parent_selectors, rule, node) {
269269
* it's a `:global(...)` or unscopeable selector, or
270270
* is an `:is(...)` or `:where(...)` selector that contains
271271
* a global selector
272-
* @param {Compiler.AST.CSS.RelativeSelector} selector
272+
* @param {ExtendedRelativeSelector} selector
273273
* @param {Compiler.AST.CSS.Rule} rule
274274
*/
275275
function is_global(selector, rule) {
@@ -403,11 +403,7 @@ function relative_selector_might_apply_to_node(relative_selector, rule, element)
403403
if (
404404
selectors.length === 0 /* is :global(...) */ ||
405405
(element.metadata.scoped && selector_matched) ||
406-
apply_selector(
407-
/** @type {Compiler.AST.CSS.RelativeSelector[]} */ (selectors),
408-
rule,
409-
element
410-
)
406+
apply_selector(selectors, rule, element)
411407
) {
412408
complex_selector.metadata.used = true;
413409
selector_matched = matched = true;

0 commit comments

Comments
 (0)