Skip to content

chore(snc): drop snc count for serialize-css #4730

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
rwaskiewicz merged 5 commits into from
Sep 5, 2023
Merged

chore(snc): drop snc count for serialize-css #4730

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ad48d7
chore(snc): drop snc count for serialize-css
rwaskiewicz Aug 25, 2023
70c0ef2
add handling for the case where a node's collection properties are falsy
rwaskiewicz Aug 25, 2023
6feaf4a
handle the case of undefine media queries
rwaskiewicz Aug 25, 2023
3a77591
handle additional falsy selectors
rwaskiewicz Aug 25, 2023
0e40f07
handle falsy comment
rwaskiewicz Aug 25, 2023
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
24 changes: 13 additions & 11 deletions src/compiler/style/css-parser/serialize-css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const serializeCssVisitNode = (opts: SerializeOpts, node: CssNode, index: number
return serializeCssRule(opts, node);
}
if (nodeType === CssNodeType.Comment) {
if (node.comment[0] === '!') {
if (node.comment?.[0] === '!') {
return `/*${node.comment}*/`;
} else {
return '';
Expand Down Expand Up @@ -83,7 +83,7 @@ const serializeCssVisitNode = (opts: SerializeOpts, node: CssNode, index: number
const serializeCssRule = (opts: SerializeOpts, node: CssNode) => {
const decls = node.declarations;
const usedSelectors = opts.usedSelectors;
const selectors = node.selectors.slice();
const selectors = node.selectors?.slice() ?? [];

if (decls == null || decls.length === 0) {
return '';
Expand Down Expand Up @@ -160,10 +160,12 @@ const serializeCssRule = (opts: SerializeOpts, node: CssNode) => {

const cleanedSelectors: string[] = [];
let cleanedSelector = '';
for (const selector of node.selectors) {
cleanedSelector = removeSelectorWhitespace(selector);
if (!cleanedSelectors.includes(cleanedSelector)) {
cleanedSelectors.push(cleanedSelector);
if (node.selectors) {
for (const selector of node.selectors) {
cleanedSelector = removeSelectorWhitespace(selector);
if (!cleanedSelectors.includes(cleanedSelector)) {
cleanedSelectors.push(cleanedSelector);
}
}
}

Expand Down Expand Up @@ -197,7 +199,7 @@ const serializeCssKeyframes = (opts: SerializeOpts, node: CssNode) => {
};

const serializeCssKeyframe = (opts: SerializeOpts, node: CssNode) => {
return node.values.join(',') + '{' + serializeCssMapVisit(opts, node.declarations) + '}';
return (node.values?.join(',') ?? '') + '{' + serializeCssMapVisit(opts, node.declarations) + '}';
};

const serializeCssFontFace = (opts: SerializeOpts, node: CssNode) => {
Expand All @@ -217,7 +219,7 @@ const serializeCssSupports = (opts: SerializeOpts, node: CssNode) => {
};

const serializeCssPage = (opts: SerializeOpts, node: CssNode) => {
const sel = node.selectors.join(', ');
const sel = node.selectors?.join(', ') ?? '';
return '@page ' + sel + '{' + serializeCssMapVisit(opts, node.declarations) + '}';
};

Expand All @@ -230,7 +232,7 @@ const serializeCssDocument = (opts: SerializeOpts, node: CssNode) => {
return doc + '{' + documentCss + '}';
};

const serializeCssMapVisit = (opts: SerializeOpts, nodes: CssNode[] | void) => {
const serializeCssMapVisit = (opts: SerializeOpts, nodes: CssNode[] | undefined | null): string => {
let rtn = '';

if (nodes) {
Expand Down Expand Up @@ -272,10 +274,10 @@ const removeSelectorWhitespace = (selector: string) => {
return rtn;
};

const removeMediaWhitespace = (media: string) => {
const removeMediaWhitespace = (media: string | undefined) => {
let rtn = '';
let char = '';
media = media.trim();
media = media?.trim() ?? '';

for (let i = 0, l = media.length; i < l; i++) {
char = media[i];
Expand Down