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

chore: remove visitor merging logic (#12671)

Browse Source
pull/12679/head
Rich Harris 3 months ago committed by GitHub
parent 21da63ddb6
commit ccccac394b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 62 additions and 142 deletions
Show Stats Download Patch File Download Diff File

130
packages/svelte/src/compiler/phases/2-analyze/css/css-analyze.js
Unescape View File

@ -4,7 +4,6 @@
import { walk } from 'zimmerframe'; import { walk } from 'zimmerframe';
import * as e from '../../../errors.js'; import * as e from '../../../errors.js';
import { is_keyframes_node } from '../../css.js'; import { is_keyframes_node } from '../../css.js';
import { merge } from '../../visitors.js';
/** /**
* @typedef {Visitors< * @typedef {Visitors<
@ -50,17 +49,66 @@ function is_global_block_selector(simple_selector) {
} }
/** @type {CssVisitors} */ /** @type {CssVisitors} */
const analysis_visitors = { const css_visitors = {
Atrule(node, context) { Atrule(node, context) {
if (is_keyframes_node(node)) { if (is_keyframes_node(node)) {
if (!node.prelude.startsWith('-global-')) { if (!node.prelude.startsWith('-global-')) {
context.state.keyframes.push(node.prelude); context.state.keyframes.push(node.prelude);
} }
} }
context.next();
}, },
ComplexSelector(node, context) { ComplexSelector(node, context) {
context.next(); // analyse relevant selectors first context.next(); // analyse relevant selectors first
{
const global = node.children.find(is_global);
if (global) {
const idx = node.children.indexOf(global);
if (global.selectors[0].args !== null && idx !== 0 && idx !== node.children.length - 1) {
// ensure `:global(...)` is not used in the middle of a selector (but multiple `global(...)` in sequence are ok)
for (let i = idx + 1; i < node.children.length; i++) {
if (!is_global(node.children[i])) {
e.css_global_invalid_placement(global.selectors[0]);
}
}
}
}
}
// ensure `:global(...)` do not lead to invalid css after `:global()` is removed
for (const relative_selector of node.children) {
for (let i = 0; i < relative_selector.selectors.length; i++) {
const selector = relative_selector.selectors[i];
if (selector.type === 'PseudoClassSelector' && selector.name === 'global') {
const child = selector.args?.children[0].children[0];
// ensure `:global(element)` to be at the first position in a compound selector
if (child?.selectors[0].type === 'TypeSelector' && i !== 0) {
e.css_global_invalid_selector_list(selector);
}
// ensure `:global(.class)` is not followed by a type selector, eg: `:global(.class)element`
if (relative_selector.selectors[i + 1]?.type === 'TypeSelector') {
e.css_type_selector_invalid_placement(relative_selector.selectors[i + 1]);
}
// ensure `:global(...)`contains a single selector
// (standalone :global() with multiple selectors is OK)
if (
selector.args !== null &&
selector.args.children.length > 1 &&
(node.children.length > 1 || relative_selector.selectors.length > 1)
) {
e.css_global_invalid_selector(selector);
}
}
}
}
node.metadata.rule = context.state.rule; node.metadata.rule = context.state.rule;
node.metadata.used ||= node.children.every( node.metadata.used ||= node.children.every(
@ -119,22 +167,6 @@ const analysis_visitors = {
return is_global_block; return is_global_block;
}); });
context.next({
...context.state,
rule: node
});
node.metadata.has_local_selectors = node.prelude.children.some((selector) => {
return selector.children.some(
({ metadata }) => !metadata.is_global && !metadata.is_global_like
);
});
}
};
/** @type {CssVisitors} */
const validation_visitors = {
Rule(node, context) {
if (node.metadata.is_global_block) { if (node.metadata.is_global_block) {
if (node.prelude.children.length > 1) { if (node.prelude.children.length > 1) {
e.css_global_block_invalid_list(node.prelude); e.css_global_block_invalid_list(node.prelude);
@ -174,59 +206,21 @@ const validation_visitors = {
} }
} }
context.next(); context.next({
}, ...context.state,
ComplexSelector(node) { rule: node
{ });
const global = node.children.find(is_global);
if (global) {
const idx = node.children.indexOf(global);
if (global.selectors[0].args !== null && idx !== 0 && idx !== node.children.length - 1) {
// ensure `:global(...)` is not used in the middle of a selector (but multiple `global(...)` in sequence are ok)
for (let i = idx + 1; i < node.children.length; i++) {
if (!is_global(node.children[i])) {
e.css_global_invalid_placement(global.selectors[0]);
}
}
}
}
}
// ensure `:global(...)` do not lead to invalid css after `:global()` is removed
for (const relative_selector of node.children) {
for (let i = 0; i < relative_selector.selectors.length; i++) {
const selector = relative_selector.selectors[i];
if (selector.type === 'PseudoClassSelector' && selector.name === 'global') {
const child = selector.args?.children[0].children[0];
// ensure `:global(element)` to be at the first position in a compound selector
if (child?.selectors[0].type === 'TypeSelector' && i !== 0) {
e.css_global_invalid_selector_list(selector);
}
// ensure `:global(.class)` is not followed by a type selector, eg: `:global(.class)element`
if (relative_selector.selectors[i + 1]?.type === 'TypeSelector') {
e.css_type_selector_invalid_placement(relative_selector.selectors[i + 1]);
}
// ensure `:global(...)`contains a single selector node.metadata.has_local_selectors = node.prelude.children.some((selector) => {
// (standalone :global() with multiple selectors is OK) return selector.children.some(
if ( ({ metadata }) => !metadata.is_global && !metadata.is_global_like
selector.args !== null && );
selector.args.children.length > 1 && });
(node.children.length > 1 || relative_selector.selectors.length > 1)
) {
e.css_global_invalid_selector(selector);
}
}
}
}
}, },
NestingSelector(node, context) { NestingSelector(node, context) {
const rule = /** @type {Css.Rule} */ (context.state.rule); const rule = /** @type {Css.Rule} */ (context.state.rule);
const parent_rule = rule.metadata.parent_rule; const parent_rule = rule.metadata.parent_rule;
if (!parent_rule) { if (!parent_rule) {
e.css_nesting_selector_invalid_placement(node); e.css_nesting_selector_invalid_placement(node);
} else if ( } else if (
@ -238,11 +232,11 @@ const validation_visitors = {
) { ) {
e.css_global_block_invalid_modifier_start(node); e.css_global_block_invalid_modifier_start(node);
} }
context.next();
} }
}; };
const css_visitors = merge(analysis_visitors, validation_visitors);
/** /**
* @param {Css.StyleSheet} stylesheet * @param {Css.StyleSheet} stylesheet
* @param {ComponentAnalysis} analysis * @param {ComponentAnalysis} analysis

74
packages/svelte/src/compiler/phases/visitors.js
Unescape View File

@ -1,74 +0,0 @@
/** @import { Visitors, Context } from 'zimmerframe' */
const overrides = {
visit() {
throw new Error('Cannot call visit() during analysis');
},
stop() {
throw new Error('Cannot call stop() during analysis');
}
};
// TODO get rid of this
/**
* @template {{ type: string }} T
* @template U
* @param {...Visitors<T, U>} tasks
* @returns
*/
export function merge(...tasks) {
/** @type {Record<string, any[]>} */
const visitors = {};
for (const task of tasks) {
for (const key in task) {
if (!visitors[key]) visitors[key] = [];
visitors[key].push(task[key]);
}
}
/** @type {Visitors<T, U>} */
// @ts-expect-error
const combined = {};
for (const key in visitors) {
const fns = visitors[key];
/**
* @param {T} node
* @param {Context<T, U>} context
*/
function visitor(node, context) {
/**
* @param {number} i
* @param {U} state
*/
function go(i, state) {
const fn = fns[i];
if (!fn) return context.next(state);
let called_next = false;
fn(node, {
...context,
...overrides,
state,
next(next_state = state) {
called_next = true;
go(i + 1, next_state);
}
});
if (!called_next) {
go(i + 1, state);
}
}
go(0, context.state);
}
// @ts-expect-error
combined[key] = visitor;
}
return combined;
}
Write Preview
Loading…
Cancel
Save