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

fix tests

Browse Source
pull/10482/head
Rich Harris 3 years ago
parent 0d0cc80cec
commit ab60b6a045
5 changed files with 725 additions and 401 deletions
Show Stats Download Patch File Download Diff File

27
packages/svelte/src/compiler/legacy.js
Unescape View File

@ -102,14 +102,7 @@ export function convert(source, ast) {
}, },
instance, instance,
module, module,
css: ast.css css: ast.css ? visit(ast.css) : undefined
? walk(ast.css, null, {
_(node) {
// @ts-ignore
delete node.parent;
}
})
: undefined
}; };
}, },
AnimateDirective(node) { AnimateDirective(node) {
@ -192,6 +185,24 @@ export function convert(source, ast) {
ClassDirective(node) { ClassDirective(node) {
return { ...node, type: 'Class' }; return { ...node, type: 'Class' };
}, },
ComplexSelector(node, { visit }) {
const children = [];
for (const child of node.children) {
if (child.combinator) {
children.push(child.combinator);
}
children.push(...child.selectors);
}
return {
type: 'Selector',
start: node.start,
end: node.end,
children
};
},
Component(node, { visit }) { Component(node, { visit }) {
return { return {
type: 'InlineComponent', type: 'InlineComponent',

10
packages/svelte/src/compiler/types/legacy-nodes.d.ts vendored
Unescape View File

@ -1,4 +1,4 @@
import type { StyleDirective as LegacyStyleDirective, Text } from '#compiler'; import type { StyleDirective as LegacyStyleDirective, Text, Css } from '#compiler';
import type { import type {
ArrayExpression, ArrayExpression,
AssignmentExpression, AssignmentExpression,
@ -227,9 +227,17 @@ export type LegacyElementLike =
| LegacyTitle | LegacyTitle
| LegacyWindow; | LegacyWindow;
export interface LegacySelector extends BaseNode {
type: 'Selector';
children: Array<Css.Combinator | Css.SimpleSelector>;
}
export type LegacyCssNode = LegacySelector;
export type LegacySvelteNode = export type LegacySvelteNode =
| LegacyConstTag | LegacyConstTag
| LegacyElementLike | LegacyElementLike
| LegacyAttributeLike | LegacyAttributeLike
| LegacyAttributeShorthand | LegacyAttributeShorthand
| LegacyCssNode
| Text; | Text;

840
packages/svelte/tests/parser-modern/samples/css-nth-syntax/output.json
View File

File diff suppressed because it is too large Load Diff

235
packages/svelte/tests/parser-modern/samples/css-pseudo-classes/output.json
Unescape View File

@ -13,15 +13,23 @@
"end": 86, "end": 86,
"children": [ "children": [
{ {
"type": "Selector", "type": "ComplexSelector",
"start": 60, "start": 60,
"end": 86, "end": 86,
"children": [ "children": [
{ {
"type": "PseudoElementSelector", "type": "RelativeSelector",
"name": "view-transition-old", "combinator": null,
"selectors": [
{
"type": "PseudoElementSelector",
"name": "view-transition-old",
"start": 60,
"end": 81
}
],
"start": 60, "start": 60,
"end": 81 "end": 86
} }
] ]
} }
@ -52,33 +60,49 @@
"end": 146, "end": 146,
"children": [ "children": [
{ {
"type": "Selector", "type": "ComplexSelector",
"start": 111, "start": 111,
"end": 146, "end": 146,
"children": [ "children": [
{ {
"type": "PseudoClassSelector", "type": "RelativeSelector",
"name": "global", "combinator": null,
"args": { "selectors": [
"type": "SelectorList", {
"start": 119, "type": "PseudoClassSelector",
"end": 145, "name": "global",
"children": [ "args": {
{ "type": "SelectorList",
"type": "Selector",
"start": 119, "start": 119,
"end": 145, "end": 145,
"children": [ "children": [
{ {
"type": "PseudoElementSelector", "type": "ComplexSelector",
"name": "view-transition-old",
"start": 119, "start": 119,
"end": 140 "end": 145,
"children": [
{
"type": "RelativeSelector",
"combinator": null,
"selectors": [
{
"type": "PseudoElementSelector",
"name": "view-transition-old",
"start": 119,
"end": 140
}
],
"start": 119,
"end": 145
}
]
} }
] ]
} },
] "start": 111,
}, "end": 146
}
],
"start": 111, "start": 111,
"end": 146 "end": 146
} }
@ -111,15 +135,23 @@
"end": 199, "end": 199,
"children": [ "children": [
{ {
"type": "Selector", "type": "ComplexSelector",
"start": 171, "start": 171,
"end": 199, "end": 199,
"children": [ "children": [
{ {
"type": "PseudoElementSelector", "type": "RelativeSelector",
"name": "highlight", "combinator": null,
"selectors": [
{
"type": "PseudoElementSelector",
"name": "highlight",
"start": 171,
"end": 182
}
],
"start": 171, "start": 171,
"end": 182 "end": 199
} }
] ]
} }
@ -150,21 +182,29 @@
"end": 245, "end": 245,
"children": [ "children": [
{ {
"type": "Selector", "type": "ComplexSelector",
"start": 220, "start": 220,
"end": 245, "end": 245,
"children": [ "children": [
{ {
"type": "TypeSelector", "type": "RelativeSelector",
"name": "custom-element", "combinator": null,
"selectors": [
{
"type": "TypeSelector",
"name": "custom-element",
"start": 220,
"end": 234
},
{
"type": "PseudoElementSelector",
"name": "part",
"start": 234,
"end": 240
}
],
"start": 220, "start": 220,
"end": 234 "end": 245
},
{
"type": "PseudoElementSelector",
"name": "part",
"start": 234,
"end": 240
} }
] ]
} }
@ -195,15 +235,23 @@
"end": 285, "end": 285,
"children": [ "children": [
{ {
"type": "Selector", "type": "ComplexSelector",
"start": 266, "start": 266,
"end": 285, "end": 285,
"children": [ "children": [
{ {
"type": "PseudoElementSelector", "type": "RelativeSelector",
"name": "slotted", "combinator": null,
"selectors": [
{
"type": "PseudoElementSelector",
"name": "slotted",
"start": 266,
"end": 275
}
],
"start": 266, "start": 266,
"end": 275 "end": 285
} }
] ]
} }
@ -234,58 +282,89 @@
"end": 359, "end": 359,
"children": [ "children": [
{ {
"type": "Selector", "type": "ComplexSelector",
"start": 306, "start": 306,
"end": 359, "end": 359,
"children": [ "children": [
{ {
"type": "PseudoClassSelector", "type": "RelativeSelector",
"name": "is", "combinator": null,
"args": { "selectors": [
"type": "SelectorList", {
"start": 324, "type": "PseudoClassSelector",
"end": 355, "name": "is",
"children": [ "args": {
{ "type": "SelectorList",
"type": "Selector",
"start": 324, "start": 324,
"end": 330,
"children": [
{
"type": "TypeSelector",
"name": "button",
"start": 324,
"end": 330
}
]
},
{
"type": "Selector",
"start": 349,
"end": 355, "end": 355,
"children": [ "children": [
{ {
"type": "TypeSelector", "type": "ComplexSelector",
"name": "h1", "start": 324,
"start": 349, "end": 330,
"end": 351 "children": [
}, {
{ "type": "RelativeSelector",
"type": "Combinator", "combinator": null,
"name": "+", "selectors": [
"start": 352, {
"end": 353 "type": "TypeSelector",
"name": "button",
"start": 324,
"end": 330
}
],
"start": 324,
"end": 330
}
]
}, },
{ {
"type": "TypeSelector", "type": "ComplexSelector",
"name": "p", "start": 349,
"start": 354, "end": 355,
"end": 355 "children": [
{
"type": "RelativeSelector",
"combinator": null,
"selectors": [
{
"type": "TypeSelector",
"name": "h1",
"start": 349,
"end": 351
}
],
"start": 349,
"end": 351
},
{
"type": "RelativeSelector",
"combinator": {
"type": "Combinator",
"name": "+",
"start": 352,
"end": 353
},
"selectors": [
{
"type": "TypeSelector",
"name": "p",
"start": 354,
"end": 355
}
],
"start": 351,
"end": 355
}
]
} }
] ]
} },
] "start": 306,
}, "end": 359
}
],
"start": 306, "start": 306,
"end": 359 "end": 359
} }

14
packages/svelte/tests/parser-modern/samples/semicolon-inside-quotes/output.json
Unescape View File

@ -21,13 +21,21 @@
"end": 139, "end": 139,
"children": [ "children": [
{ {
"type": "Selector", "type": "ComplexSelector",
"start": 137, "start": 137,
"end": 139, "end": 139,
"children": [ "children": [
{ {
"type": "TypeSelector", "type": "RelativeSelector",
"name": "h1", "combinator": null,
"selectors": [
{
"type": "TypeSelector",
"name": "h1",
"start": 137,
"end": 139
}
],
"start": 137, "start": 137,
"end": 139 "end": 139
} }

Write Preview
Loading…
Cancel
Save