Skip to content

fix: bundle CSS types #11067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 5, 2024
Merged

fix: bundle CSS types #11067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12bf3a5
make Css a proper namespace
Rich-Harris Apr 4, 2024
e9a5a50
changeset
Rich-Harris Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/three-rice-tie.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: bundle CSS types
2 changes: 1 addition & 1 deletion packages/svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-virtual": "^3.0.2",
"@types/aria-query": "^5.0.4",
"dts-buddy": "^0.4.4",
"dts-buddy": "^0.4.6",
"esbuild": "^0.19.11",
"knip": "^4.2.1",
"rollup": "^4.9.5",
Expand Down
290 changes: 146 additions & 144 deletions packages/svelte/src/compiler/types/css.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,147 +1,149 @@
export interface BaseNode {
start: number;
end: number;
}

export interface StyleSheet extends BaseNode {
type: 'StyleSheet';
attributes: any[]; // TODO
children: Array<Atrule | Rule>;
content: {
export namespace Css {
export interface BaseNode {
start: number;
end: number;
styles: string;
};
}

export interface Atrule extends BaseNode {
type: 'Atrule';
name: string;
prelude: string;
block: Block | null;
}

export interface Rule extends BaseNode {
type: 'Rule';
prelude: SelectorList;
block: Block;
metadata: {
parent_rule: null | Rule;
has_local_selectors: boolean;
};
}

export interface SelectorList extends BaseNode {
type: 'SelectorList';
children: ComplexSelector[];
}

export interface ComplexSelector extends BaseNode {
type: 'ComplexSelector';
children: RelativeSelector[];
metadata: {
rule: null | Rule;
used: boolean;
};
}

export interface StyleSheet extends BaseNode {
type: 'StyleSheet';
attributes: any[]; // TODO
children: Array<Atrule | Rule>;
content: {
start: number;
end: number;
styles: string;
};
}

export interface Atrule extends BaseNode {
type: 'Atrule';
name: string;
prelude: string;
block: Block | null;
}

export interface Rule extends BaseNode {
type: 'Rule';
prelude: SelectorList;
block: Block;
metadata: {
parent_rule: null | Rule;
has_local_selectors: boolean;
};
}

export interface SelectorList extends BaseNode {
type: 'SelectorList';
children: ComplexSelector[];
}

export interface ComplexSelector extends BaseNode {
type: 'ComplexSelector';
children: RelativeSelector[];
metadata: {
rule: null | Rule;
used: boolean;
};
}

export interface RelativeSelector extends BaseNode {
type: 'RelativeSelector';
combinator: null | Combinator;
selectors: SimpleSelector[];
metadata: {
is_global: boolean;
is_host: boolean;
is_root: boolean;
scoped: boolean;
};
}

export interface TypeSelector extends BaseNode {
type: 'TypeSelector';
name: string;
}

export interface IdSelector extends BaseNode {
type: 'IdSelector';
name: string;
}

export interface ClassSelector extends BaseNode {
type: 'ClassSelector';
name: string;
}

export interface AttributeSelector extends BaseNode {
type: 'AttributeSelector';
name: string;
matcher: string | null;
value: string | null;
flags: string | null;
}

export interface PseudoElementSelector extends BaseNode {
type: 'PseudoElementSelector';
name: string;
}

export interface PseudoClassSelector extends BaseNode {
type: 'PseudoClassSelector';
name: string;
args: SelectorList | null;
}

export interface Percentage extends BaseNode {
type: 'Percentage';
value: string;
}

export interface NestingSelector extends BaseNode {
type: 'NestingSelector';
name: '&';
}

export interface Nth extends BaseNode {
type: 'Nth';
value: string;
}

export type SimpleSelector =
| TypeSelector
| IdSelector
| ClassSelector
| AttributeSelector
| PseudoElementSelector
| PseudoClassSelector
| Percentage
| Nth
| NestingSelector;

export interface Combinator extends BaseNode {
type: 'Combinator';
name: string;
}

export interface Block extends BaseNode {
type: 'Block';
children: Array<Declaration | Rule | Atrule>;
}

export interface Declaration extends BaseNode {
type: 'Declaration';
property: string;
value: string;
}

// for zimmerframe
export type Node =
| StyleSheet
| Rule
| Atrule
| SelectorList
| Block
| ComplexSelector
| RelativeSelector
| Combinator
| SimpleSelector
| Declaration;
}

export interface RelativeSelector extends BaseNode {
type: 'RelativeSelector';
combinator: null | Combinator;
selectors: SimpleSelector[];
metadata: {
is_global: boolean;
is_host: boolean;
is_root: boolean;
scoped: boolean;
};
}

export interface TypeSelector extends BaseNode {
type: 'TypeSelector';
name: string;
}

export interface IdSelector extends BaseNode {
type: 'IdSelector';
name: string;
}

export interface ClassSelector extends BaseNode {
type: 'ClassSelector';
name: string;
}

export interface AttributeSelector extends BaseNode {
type: 'AttributeSelector';
name: string;
matcher: string | null;
value: string | null;
flags: string | null;
}

export interface PseudoElementSelector extends BaseNode {
type: 'PseudoElementSelector';
name: string;
}

export interface PseudoClassSelector extends BaseNode {
type: 'PseudoClassSelector';
name: string;
args: SelectorList | null;
}

export interface Percentage extends BaseNode {
type: 'Percentage';
value: string;
}

export interface NestingSelector extends BaseNode {
type: 'NestingSelector';
name: '&';
}

export interface Nth extends BaseNode {
type: 'Nth';
value: string;
}

export type SimpleSelector =
| TypeSelector
| IdSelector
| ClassSelector
| AttributeSelector
| PseudoElementSelector
| PseudoClassSelector
| Percentage
| Nth
| NestingSelector;

export interface Combinator extends BaseNode {
type: 'Combinator';
name: string;
}

export interface Block extends BaseNode {
type: 'Block';
children: Array<Declaration | Rule | Atrule>;
}

export interface Declaration extends BaseNode {
type: 'Declaration';
property: string;
value: string;
}

// for zimmerframe
export type Node =
| StyleSheet
| Rule
| Atrule
| SelectorList
| Block
| ComplexSelector
| RelativeSelector
| Combinator
| SimpleSelector
| Declaration;
2 changes: 1 addition & 1 deletion packages/svelte/src/compiler/types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import type { Location } from 'locate-character';
import type { SourceMap } from 'magic-string';
import type { Context } from 'zimmerframe';
import type { Scope } from '../phases/scope.js';
import * as Css from './css.js';
import type { Css } from './css.js';
import type { EachBlock, Namespace, SvelteNode, SvelteOptions } from './template.js';

/** The return value of `compile` from `svelte/compiler` */
Expand Down
Loading