From 52f9e55da0ff431816ad12cba5b10724593715ee Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Sun, 25 Oct 2026 19:40:37 -0400 Subject: [PATCH 01/14] remove incorrect import --- src/lib/syntax/color/srgb.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/syntax/color/srgb.ts b/src/lib/syntax/color/srgb.ts index 541a61f6..e8741aac 100644 --- a/src/lib/syntax/color/srgb.ts +++ b/src/lib/syntax/color/srgb.ts @@ -21,7 +21,6 @@ import { XYZ_to_lin_sRGB } from "./xyz.ts"; import { COLORS_NAMES } from "../constants.ts"; import { parseColor } from "../syntax.ts"; import { hwbvalues } from "./hwb.ts"; -import { backup } from "node:sqlite"; export function srgbvalues(token: ColorToken | IdentToken): number[] | null { if (token.typ === EnumToken.IdenTokenType) { From 2edc5e07510ba0f7ae57559b69d79fdf3582194b Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Wed, 28 Oct 2026 17:26:59 -0400 Subject: [PATCH 02/14] support dashed ident dimension token #170 --- CHANGELOG.md | 22 +++++++++++ dist/index-umd-web.js | 43 +++++++++++++++++++--- dist/index.cjs | 43 +++++++++++++++++++--- dist/index.d.ts | 4 ++ dist/src/lib/ast/math/expression.js | 3 ++ dist/src/lib/ast/types.js | 4 ++ dist/src/lib/parser/tokenize.js | 24 +++++++++++- dist/src/lib/printer/render.js | 1 + dist/src/lib/validation/match.js | 11 ++++-- src/lib/ast/features/inlinecssvariables.ts | 8 ++-- src/lib/ast/math/expression.ts | 4 ++ src/lib/ast/types.ts | 4 ++ src/lib/parser/tokenize.ts | 32 ++++++++++++++-- src/lib/printer/render.ts | 1 + src/lib/validation/match.ts | 11 ++++-- test/specs/code/block.js | 22 +++++++++++ 16 files changed, 209 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee72b46f..9a955a68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +# 1.8.0 + +- [x] support dashed indent as unit + +```css +.module { + margin-block: 1.5--bs; + border-block: .5--bs; + /* gives a vertical margin of 12px, + and vertical border of 4px */ +} +``` + +is rendered as + +```css +.module { + margin-block: 1.5--bs; + border-block: .5--bs +} +``` + # v1.7.0 - [x] implement CSS [Custom Functions and Mixins Modules and Level 1](https://drafts.csswg.org/css-mixins/#apply-rule) diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js index c5f4f496..caebd55b 100644 --- a/dist/index-umd-web.js +++ b/dist/index-umd-web.js @@ -697,6 +697,10 @@ * CSS type token */ EnumToken[EnumToken["CssTypeTokenType"] = 144] = "CssTypeTokenType"; + /** + * user defined dimension token type + */ + EnumToken[EnumToken["UserDefinedDimensionTokenType"] = 145] = "UserDefinedDimensionTokenType"; /* aliases */ /** * alias for time token type @@ -10316,6 +10320,9 @@ } } if (acc.length > 0 && curr[0] != exports.EnumToken.ListToken) { + if ("val" in token && +token.val == 0) { + return acc; + } acc.push({ typ: exports.EnumToken.Add, [LOCSRCID]: token[LOCSRCID], @@ -14186,19 +14193,20 @@ token?.typ == exports.EnumToken.ResolutionTokenType || token?.typ == exports.EnumToken.TimeTokenType || token?.typ == exports.EnumToken.FrequencyTokenType || + token?.typ == exports.EnumToken.UserDefinedDimensionTokenType || token?.typ == exports.EnumToken.FlexTokenType; break; } case "angle": { const token = context.peek(); - success = token?.typ === exports.EnumToken.AngleTokenType; + success = token?.typ === exports.EnumToken.AngleTokenType || token?.typ === exports.EnumToken.UserDefinedDimensionTokenType; } break; case "angle-percentage": { const token = context.peek(); - success = token?.typ === exports.EnumToken.AngleTokenType || token?.typ === exports.EnumToken.PercentageTokenType; + success = token?.typ === exports.EnumToken.AngleTokenType || token?.typ === exports.EnumToken.UserDefinedDimensionTokenType || token?.typ === exports.EnumToken.PercentageTokenType; } break; case "percentage": @@ -14216,16 +14224,18 @@ success = token?.typ == exports.EnumToken.PercentageTokenType || token?.typ == exports.EnumToken.LengthTokenType || + token?.typ == exports.EnumToken.UserDefinedDimensionTokenType || (token?.typ == exports.EnumToken.NumberTokenType && token?.val === 0); } break; case "flex": - success = context.peek()?.typ == exports.EnumToken.FlexTokenType; + success = context.peek()?.typ == exports.EnumToken.FlexTokenType || context.peek()?.typ == exports.EnumToken.UserDefinedDimensionTokenType; break; case "length": { const token = context.peek(); success = token?.typ == exports.EnumToken.LengthTokenType || + token?.typ == exports.EnumToken.UserDefinedDimensionTokenType || (token?.typ == exports.EnumToken.NumberTokenType && token?.val === 0); break; } @@ -14235,7 +14245,7 @@ if (token == null) { break; } - success = token.typ == exports.EnumToken.TimeTokenType; + success = token.typ == exports.EnumToken.TimeTokenType || token.typ == exports.EnumToken.UserDefinedDimensionTokenType; } break; case "color": @@ -26687,6 +26697,7 @@ case exports.EnumToken.AngleTokenType: case exports.EnumToken.LengthTokenType: case exports.EnumToken.DimensionTokenType: + case exports.EnumToken.UserDefinedDimensionTokenType: case exports.EnumToken.FrequencyTokenType: case exports.EnumToken.ResolutionTokenType: let val = token.val.typ == exports.EnumToken.FractionTokenType @@ -26952,7 +26963,6 @@ SymbolsMapTokensLower[key.toLowerCase()] = tokenType; } } - SymbolsMapTokens[""] = exports.EnumToken.DelimTokenType; SymbolsMapTokens["+"] = exports.EnumToken.Plus; SymbolsMapTokens["="] = exports.EnumToken.DelimTokenType; SymbolsMapTokens["|"] = exports.EnumToken.PipeTokenType; @@ -27401,6 +27411,11 @@ hasLetter = true; break; } + // dashed ident as unit + if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } return 0; } if (!hasLetter && !hasPercent) { @@ -27429,6 +27444,10 @@ else if (isLetter(codepoint)) { hasLetter = true; } + // custom ident as unit + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + } else { return 0; } @@ -27466,6 +27485,10 @@ hasLetter = true; break; } + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } if (codepoint == 37 /* TokenMap.PERCENTAGE */) { hasPercent = true; break; @@ -27529,6 +27552,11 @@ hasLetter = true; break; } + // custom ident as unit + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } else if (codepoint == 37 /* TokenMap.PERCENTAGE */) { hasPercent = true; break; @@ -27570,7 +27598,7 @@ const slice = codepoint == 0x45 || codepoint == 0x65 ? position - 1 : position; while (position + 1 <= parseInfo.stream.length) { codepoint = parseInfo.stream.charCodeAt(++position); - if (!isLetter(codepoint)) { + if (!isLetter(codepoint) && codepoint != 0x2d) { break; } } @@ -27855,6 +27883,9 @@ this.val = parseFloat(parseInfo.stream.slice(parseInfo.position - parseInfo.offset, options?.slice)); if (hint != exports.EnumToken.PercentageTokenType) { this.unit = val; + if (val.startsWith('--')) { + this.typ = exports.EnumToken.UserDefinedDimensionTokenType; + } } } else if (hint == exports.EnumToken.NumberTokenType) { diff --git a/dist/index.cjs b/dist/index.cjs index 4397e591..c5a3f822 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -693,6 +693,10 @@ exports.EnumToken = void 0; * CSS type token */ EnumToken[EnumToken["CssTypeTokenType"] = 144] = "CssTypeTokenType"; + /** + * user defined dimension token type + */ + EnumToken[EnumToken["UserDefinedDimensionTokenType"] = 145] = "UserDefinedDimensionTokenType"; /* aliases */ /** * alias for time token type @@ -10312,6 +10316,9 @@ function evaluate(tokens) { } } if (acc.length > 0 && curr[0] != exports.EnumToken.ListToken) { + if ("val" in token && +token.val == 0) { + return acc; + } acc.push({ typ: exports.EnumToken.Add, [LOCSRCID]: token[LOCSRCID], @@ -14182,19 +14189,20 @@ function matchProperty(property, context, options) { token?.typ == exports.EnumToken.ResolutionTokenType || token?.typ == exports.EnumToken.TimeTokenType || token?.typ == exports.EnumToken.FrequencyTokenType || + token?.typ == exports.EnumToken.UserDefinedDimensionTokenType || token?.typ == exports.EnumToken.FlexTokenType; break; } case "angle": { const token = context.peek(); - success = token?.typ === exports.EnumToken.AngleTokenType; + success = token?.typ === exports.EnumToken.AngleTokenType || token?.typ === exports.EnumToken.UserDefinedDimensionTokenType; } break; case "angle-percentage": { const token = context.peek(); - success = token?.typ === exports.EnumToken.AngleTokenType || token?.typ === exports.EnumToken.PercentageTokenType; + success = token?.typ === exports.EnumToken.AngleTokenType || token?.typ === exports.EnumToken.UserDefinedDimensionTokenType || token?.typ === exports.EnumToken.PercentageTokenType; } break; case "percentage": @@ -14212,16 +14220,18 @@ function matchProperty(property, context, options) { success = token?.typ == exports.EnumToken.PercentageTokenType || token?.typ == exports.EnumToken.LengthTokenType || + token?.typ == exports.EnumToken.UserDefinedDimensionTokenType || (token?.typ == exports.EnumToken.NumberTokenType && token?.val === 0); } break; case "flex": - success = context.peek()?.typ == exports.EnumToken.FlexTokenType; + success = context.peek()?.typ == exports.EnumToken.FlexTokenType || context.peek()?.typ == exports.EnumToken.UserDefinedDimensionTokenType; break; case "length": { const token = context.peek(); success = token?.typ == exports.EnumToken.LengthTokenType || + token?.typ == exports.EnumToken.UserDefinedDimensionTokenType || (token?.typ == exports.EnumToken.NumberTokenType && token?.val === 0); break; } @@ -14231,7 +14241,7 @@ function matchProperty(property, context, options) { if (token == null) { break; } - success = token.typ == exports.EnumToken.TimeTokenType; + success = token.typ == exports.EnumToken.TimeTokenType || token.typ == exports.EnumToken.UserDefinedDimensionTokenType; } break; case "color": @@ -26683,6 +26693,7 @@ function renderValue(token, options = {}, cache = Object.create(null), reducer, case exports.EnumToken.AngleTokenType: case exports.EnumToken.LengthTokenType: case exports.EnumToken.DimensionTokenType: + case exports.EnumToken.UserDefinedDimensionTokenType: case exports.EnumToken.FrequencyTokenType: case exports.EnumToken.ResolutionTokenType: let val = token.val.typ == exports.EnumToken.FractionTokenType @@ -26948,7 +26959,6 @@ function assignTokenMap(entries, tokenType, suffix = "", lowercase = false) { SymbolsMapTokensLower[key.toLowerCase()] = tokenType; } } -SymbolsMapTokens[""] = exports.EnumToken.DelimTokenType; SymbolsMapTokens["+"] = exports.EnumToken.Plus; SymbolsMapTokens["="] = exports.EnumToken.DelimTokenType; SymbolsMapTokens["|"] = exports.EnumToken.PipeTokenType; @@ -27397,6 +27407,11 @@ class Tokenizer { hasLetter = true; break; } + // dashed ident as unit + if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } return 0; } if (!hasLetter && !hasPercent) { @@ -27425,6 +27440,10 @@ class Tokenizer { else if (isLetter(codepoint)) { hasLetter = true; } + // custom ident as unit + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + } else { return 0; } @@ -27462,6 +27481,10 @@ class Tokenizer { hasLetter = true; break; } + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } if (codepoint == 37 /* TokenMap.PERCENTAGE */) { hasPercent = true; break; @@ -27525,6 +27548,11 @@ class Tokenizer { hasLetter = true; break; } + // custom ident as unit + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } else if (codepoint == 37 /* TokenMap.PERCENTAGE */) { hasPercent = true; break; @@ -27566,7 +27594,7 @@ class Tokenizer { const slice = codepoint == 0x45 || codepoint == 0x65 ? position - 1 : position; while (position + 1 <= parseInfo.stream.length) { codepoint = parseInfo.stream.charCodeAt(++position); - if (!isLetter(codepoint)) { + if (!isLetter(codepoint) && codepoint != 0x2d) { break; } } @@ -27851,6 +27879,9 @@ class Tokenizer { this.val = parseFloat(parseInfo.stream.slice(parseInfo.position - parseInfo.offset, options?.slice)); if (hint != exports.EnumToken.PercentageTokenType) { this.unit = val; + if (val.startsWith('--')) { + this.typ = exports.EnumToken.UserDefinedDimensionTokenType; + } } } else if (hint == exports.EnumToken.NumberTokenType) { diff --git a/dist/index.d.ts b/dist/index.d.ts index ab7e3d1f..1b2ec603 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -677,6 +677,10 @@ declare enum EnumToken { * CSS type token */ CssTypeTokenType = 144, + /** + * user defined dimension token type + */ + UserDefinedDimensionTokenType = 145, /** * alias for time token type */ diff --git a/dist/src/lib/ast/math/expression.js b/dist/src/lib/ast/math/expression.js index a5f7a7d8..fad8a7dd 100644 --- a/dist/src/lib/ast/math/expression.js +++ b/dist/src/lib/ast/math/expression.js @@ -139,6 +139,9 @@ function evaluate(tokens) { } } if (acc.length > 0 && curr[0] != EnumToken.ListToken) { + if ("val" in token && +token.val == 0) { + return acc; + } acc.push({ typ: EnumToken.Add, [LOCSRCID]: token[LOCSRCID], diff --git a/dist/src/lib/ast/types.js b/dist/src/lib/ast/types.js index b04a8036..413693b3 100644 --- a/dist/src/lib/ast/types.js +++ b/dist/src/lib/ast/types.js @@ -691,6 +691,10 @@ var EnumToken; * CSS type token */ EnumToken[EnumToken["CssTypeTokenType"] = 144] = "CssTypeTokenType"; + /** + * user defined dimension token type + */ + EnumToken[EnumToken["UserDefinedDimensionTokenType"] = 145] = "UserDefinedDimensionTokenType"; /* aliases */ /** * alias for time token type diff --git a/dist/src/lib/parser/tokenize.js b/dist/src/lib/parser/tokenize.js index 7add55ac..aa2f9e0c 100644 --- a/dist/src/lib/parser/tokenize.js +++ b/dist/src/lib/parser/tokenize.js @@ -45,7 +45,6 @@ function assignTokenMap(entries, tokenType, suffix = "", lowercase = false) { SymbolsMapTokensLower[key.toLowerCase()] = tokenType; } } -SymbolsMapTokens[""] = EnumToken.DelimTokenType; SymbolsMapTokens["+"] = EnumToken.Plus; SymbolsMapTokens["="] = EnumToken.DelimTokenType; SymbolsMapTokens["|"] = EnumToken.PipeTokenType; @@ -494,6 +493,11 @@ class Tokenizer { hasLetter = true; break; } + // dashed ident as unit + if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } return 0; } if (!hasLetter && !hasPercent) { @@ -522,6 +526,10 @@ class Tokenizer { else if (isLetter(codepoint)) { hasLetter = true; } + // custom ident as unit + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + } else { return 0; } @@ -559,6 +567,10 @@ class Tokenizer { hasLetter = true; break; } + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } if (codepoint == 37 /* TokenMap.PERCENTAGE */) { hasPercent = true; break; @@ -622,6 +634,11 @@ class Tokenizer { hasLetter = true; break; } + // custom ident as unit + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } else if (codepoint == 37 /* TokenMap.PERCENTAGE */) { hasPercent = true; break; @@ -663,7 +680,7 @@ class Tokenizer { const slice = codepoint == 0x45 || codepoint == 0x65 ? position - 1 : position; while (position + 1 <= parseInfo.stream.length) { codepoint = parseInfo.stream.charCodeAt(++position); - if (!isLetter(codepoint)) { + if (!isLetter(codepoint) && codepoint != 0x2d) { break; } } @@ -948,6 +965,9 @@ class Tokenizer { this.val = parseFloat(parseInfo.stream.slice(parseInfo.position - parseInfo.offset, options?.slice)); if (hint != EnumToken.PercentageTokenType) { this.unit = val; + if (val.startsWith('--')) { + this.typ = EnumToken.UserDefinedDimensionTokenType; + } } } else if (hint == EnumToken.NumberTokenType) { diff --git a/dist/src/lib/printer/render.js b/dist/src/lib/printer/render.js index 733b84bc..e15bfb50 100644 --- a/dist/src/lib/printer/render.js +++ b/dist/src/lib/printer/render.js @@ -1144,6 +1144,7 @@ function renderValue(token, options = {}, cache = Object.create(null), reducer, case EnumToken.AngleTokenType: case EnumToken.LengthTokenType: case EnumToken.DimensionTokenType: + case EnumToken.UserDefinedDimensionTokenType: case EnumToken.FrequencyTokenType: case EnumToken.ResolutionTokenType: let val = token.val.typ == EnumToken.FractionTokenType diff --git a/dist/src/lib/validation/match.js b/dist/src/lib/validation/match.js index ac453b18..a60a6896 100644 --- a/dist/src/lib/validation/match.js +++ b/dist/src/lib/validation/match.js @@ -1795,19 +1795,20 @@ function matchProperty(property, context, options) { token?.typ == EnumToken.ResolutionTokenType || token?.typ == EnumToken.TimeTokenType || token?.typ == EnumToken.FrequencyTokenType || + token?.typ == EnumToken.UserDefinedDimensionTokenType || token?.typ == EnumToken.FlexTokenType; break; } case "angle": { const token = context.peek(); - success = token?.typ === EnumToken.AngleTokenType; + success = token?.typ === EnumToken.AngleTokenType || token?.typ === EnumToken.UserDefinedDimensionTokenType; } break; case "angle-percentage": { const token = context.peek(); - success = token?.typ === EnumToken.AngleTokenType || token?.typ === EnumToken.PercentageTokenType; + success = token?.typ === EnumToken.AngleTokenType || token?.typ === EnumToken.UserDefinedDimensionTokenType || token?.typ === EnumToken.PercentageTokenType; } break; case "percentage": @@ -1825,16 +1826,18 @@ function matchProperty(property, context, options) { success = token?.typ == EnumToken.PercentageTokenType || token?.typ == EnumToken.LengthTokenType || + token?.typ == EnumToken.UserDefinedDimensionTokenType || (token?.typ == EnumToken.NumberTokenType && token?.val === 0); } break; case "flex": - success = context.peek()?.typ == EnumToken.FlexTokenType; + success = context.peek()?.typ == EnumToken.FlexTokenType || context.peek()?.typ == EnumToken.UserDefinedDimensionTokenType; break; case "length": { const token = context.peek(); success = token?.typ == EnumToken.LengthTokenType || + token?.typ == EnumToken.UserDefinedDimensionTokenType || (token?.typ == EnumToken.NumberTokenType && token?.val === 0); break; } @@ -1844,7 +1847,7 @@ function matchProperty(property, context, options) { if (token == null) { break; } - success = token.typ == EnumToken.TimeTokenType; + success = token.typ == EnumToken.TimeTokenType || token.typ == EnumToken.UserDefinedDimensionTokenType; } break; case "color": diff --git a/src/lib/ast/features/inlinecssvariables.ts b/src/lib/ast/features/inlinecssvariables.ts index 4ae95470..28dcddfa 100644 --- a/src/lib/ast/features/inlinecssvariables.ts +++ b/src/lib/ast/features/inlinecssvariables.ts @@ -71,9 +71,11 @@ function replace( if (parentValue != null) { let i: number = 0; - for (; i < (parentValue).chi.length; i++) { - if ((parentValue).chi[i] == value) { - (parentValue).chi.splice(i, 1, ...info.node.val); + const source = parentValue.typ == EnumToken.DeclarationNodeType ? (parentValue).val : (parentValue as FunctionToken).chi; + + for (; i < source.length; i++) { + if (source[i] == value) { + source.splice(i, 1, ...info.node.val); break; } } diff --git a/src/lib/ast/math/expression.ts b/src/lib/ast/math/expression.ts index c911f2a2..31ebb370 100644 --- a/src/lib/ast/math/expression.ts +++ b/src/lib/ast/math/expression.ts @@ -188,6 +188,10 @@ export function evaluate(tokens: Token[]): Token[] { } if (acc.length > 0 && curr[0] != EnumToken.ListToken) { + if ("val" in token && +(token as NumberToken).val == 0) { + return acc; + } + acc.push({ typ: EnumToken.Add, [LOCSRCID]: token[LOCSRCID], diff --git a/src/lib/ast/types.ts b/src/lib/ast/types.ts index 94b709f0..ec7a6001 100644 --- a/src/lib/ast/types.ts +++ b/src/lib/ast/types.ts @@ -730,6 +730,10 @@ export enum EnumToken { */ CssTypeTokenType, + /** + * user defined dimension token type + */ + UserDefinedDimensionTokenType, /* aliases */ /** diff --git a/src/lib/parser/tokenize.ts b/src/lib/parser/tokenize.ts index 6d65657d..3da64d5b 100644 --- a/src/lib/parser/tokenize.ts +++ b/src/lib/parser/tokenize.ts @@ -76,7 +76,6 @@ function assignTokenMap(entries: string[], tokenType: EnumToken, suffix: string } } -SymbolsMapTokens[""] = EnumToken.DelimTokenType; SymbolsMapTokens["+"] = EnumToken.Plus; SymbolsMapTokens["="] = EnumToken.DelimTokenType; SymbolsMapTokens["|"] = EnumToken.PipeTokenType; @@ -624,6 +623,13 @@ export class Tokenizer { break; } + // dashed ident as unit + if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + + hasLetter = true; + break; + } + return 0; } @@ -657,6 +663,10 @@ export class Tokenizer { hasPercent = true; } else if (isLetter(codepoint)) { hasLetter = true; + } + // custom ident as unit + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; } else { return 0; } @@ -702,6 +712,11 @@ export class Tokenizer { break; } + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + hasLetter = true; + break; + } + if (codepoint == TokenMap.PERCENTAGE) { hasPercent = true; break; @@ -773,7 +788,14 @@ export class Tokenizer { } else if (isLetter(codepoint)) { hasLetter = true; break; - } else if (codepoint == TokenMap.PERCENTAGE) { + } + // custom ident as unit + else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + + hasLetter = true; + break; + + }else if (codepoint == TokenMap.PERCENTAGE) { hasPercent = true; break; } else { @@ -825,7 +847,7 @@ export class Tokenizer { while (position + 1 <= parseInfo.stream.length) { codepoint = parseInfo.stream.charCodeAt(++position) as number; - if (!isLetter(codepoint)) { + if (!isLetter(codepoint) && codepoint != 0x2d) { break; } } @@ -1178,6 +1200,10 @@ export class Tokenizer { if (hint != EnumToken.PercentageTokenType) { this.unit = val; + + if (val!.startsWith('--')) { + this.typ = EnumToken.UserDefinedDimensionTokenType; + } } } else if (hint == EnumToken.NumberTokenType) { this.val = parseFloat(val as string); diff --git a/src/lib/printer/render.ts b/src/lib/printer/render.ts index 1fc40015..f4e4029f 100644 --- a/src/lib/printer/render.ts +++ b/src/lib/printer/render.ts @@ -1646,6 +1646,7 @@ export function renderValue( case EnumToken.AngleTokenType: case EnumToken.LengthTokenType: case EnumToken.DimensionTokenType: + case EnumToken.UserDefinedDimensionTokenType: case EnumToken.FrequencyTokenType: case EnumToken.ResolutionTokenType: let val: string = diff --git a/src/lib/validation/match.ts b/src/lib/validation/match.ts index 68727e32..9d215eee 100644 --- a/src/lib/validation/match.ts +++ b/src/lib/validation/match.ts @@ -2383,6 +2383,7 @@ function matchProperty( token?.typ == EnumToken.ResolutionTokenType || token?.typ == EnumToken.TimeTokenType || token?.typ == EnumToken.FrequencyTokenType || + token?.typ == EnumToken.UserDefinedDimensionTokenType || token?.typ == EnumToken.FlexTokenType; break; } @@ -2391,7 +2392,7 @@ function matchProperty( { const token = context.peek(); - success = token?.typ === EnumToken.AngleTokenType; + success = token?.typ === EnumToken.AngleTokenType || token?.typ === EnumToken.UserDefinedDimensionTokenType; } break; @@ -2400,7 +2401,7 @@ function matchProperty( { const token = context.peek(); - success = token?.typ === EnumToken.AngleTokenType || token?.typ === EnumToken.PercentageTokenType; + success = token?.typ === EnumToken.AngleTokenType || token?.typ === EnumToken.UserDefinedDimensionTokenType || token?.typ === EnumToken.PercentageTokenType; } break; @@ -2425,12 +2426,13 @@ function matchProperty( success = token?.typ == EnumToken.PercentageTokenType || token?.typ == EnumToken.LengthTokenType || + token?.typ == EnumToken.UserDefinedDimensionTokenType || (token?.typ == EnumToken.NumberTokenType && (token as NumberToken)?.val === 0); } break; case "flex": - success = context.peek()?.typ == EnumToken.FlexTokenType; + success = context.peek()?.typ == EnumToken.FlexTokenType || context.peek()?.typ == EnumToken.UserDefinedDimensionTokenType; break; case "length": { @@ -2438,6 +2440,7 @@ function matchProperty( success = token?.typ == EnumToken.LengthTokenType || + token?.typ == EnumToken.UserDefinedDimensionTokenType || (token?.typ == EnumToken.NumberTokenType && (token as NumberToken)?.val === 0); break; } @@ -2450,7 +2453,7 @@ function matchProperty( break; } - success = token.typ == EnumToken.TimeTokenType; + success = token.typ == EnumToken.TimeTokenType || token.typ == EnumToken.UserDefinedDimensionTokenType; } break; diff --git a/test/specs/code/block.js b/test/specs/code/block.js index 48020054..27e6a7d3 100644 --- a/test/specs/code/block.js +++ b/test/specs/code/block.js @@ -1556,6 +1556,28 @@ color: color-mix(in oklch, oklch(78.3% 0.108 326.5), oklch(39.2% 0.4 none)) ; color: color(srgb .843871 -.026576 .636173/50%); color: color(srgb .11 .33 .44); color: color(srgb .764947 .131643 .788822) +}`), + ); + }); + + it("user defined dimension #65", async () => { + const options = { + input: ` + +.module { + margin-block: 1.5--bs; + border-block: .5--bs; + /* gives a vertical margin of 12px, + and vertical border of 4px */ +} + `, + beautify: true, + }; + + return transform(options).then((result) => + expect(result.code).equals(`.module { + margin-block: 1.5--bs; + border-block: .5--bs }`), ); }); From 9a26995b73902efc3a9d58377385973a61a1f2d5 Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Thu, 29 Oct 2026 12:27:43 -0400 Subject: [PATCH 03/14] the walker functions now use DFS instead of BFS #170 --- .github/workflows/npm.yml | 2 +- CHANGELOG.md | 1 + benchmark/package.json | 2 +- dist/index-umd-web.js | 608 ++++++++++++------ dist/index.cjs | 608 ++++++++++++------ dist/index.d.ts | 8 +- .../lib/ast/features/inlinecssvariables.js | 9 +- dist/src/lib/ast/find.js | 39 +- dist/src/lib/ast/walk.js | 160 ++++- dist/src/lib/parser/parse.js | 388 ++++++----- dist/src/lib/parser/utils/token.js | 13 +- dist/src/lib/printer/render.js | 2 +- src/@types/walker.d.ts | 4 +- src/lib/ast/features/inlinecssvariables.ts | 3 +- src/lib/ast/find.ts | 51 +- src/lib/ast/walk.ts | 178 ++++- src/lib/parser/parse.ts | 598 ++++++++++------- src/lib/parser/utils/token.ts | 17 +- src/lib/printer/render.ts | 2 +- test/specs/code/visitors.js | 101 ++- 20 files changed, 1869 insertions(+), 925 deletions(-) diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml index 11e7293f..114a8357 100644 --- a/.github/workflows/npm.yml +++ b/.github/workflows/npm.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v7 - uses: actions/setup-node@v7 with: - node-version: '24.x' + node-version: '26.x' registry-url: 'https://registry.npmjs.org' package-manager-cache: false # never use caching in release builds - run: npm install diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a955a68..80f45db6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ # 1.8.0 - [x] support dashed indent as unit +- [x] the walker functions now use DFS instead of BFS ```css .module { diff --git a/benchmark/package.json b/benchmark/package.json index 6cff9843..b8cfa1cd 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -18,7 +18,7 @@ "csso": "^5.0.5", "esbuild": "^0.28.2", "lightningcss": "^1.33.0", - "postcss": "^8.5.31", + "postcss": "^8.5.32", "vitest": "^5.0.5" } } \ No newline at end of file diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js index caebd55b..a2b2f237 100644 --- a/dist/index-umd-web.js +++ b/dist/index-umd-web.js @@ -9780,7 +9780,6 @@ let isNumeric = false; let children = true; let attributes = false; - let i = 0; if (options != null && typeof options == "object") { filter = options.filter; reverse = options.reverse; @@ -9800,12 +9799,11 @@ } }, }; - while ((node = parents[i++])) { - if (i > maxQueueLength) { - parents.splice(0, maxQueueLength); - i -= maxQueueLength; - } - let option = null; + let option = null; + let source = null; + while (parents.length > 0) { + node = parents.pop(); + // enter node if (filter != null) { // @ts-expect-error option = filter(node); @@ -9826,25 +9824,64 @@ yield result; } if (attributes) { - if (node[TOKENS] != null) { + source = null; + if (Array.isArray(node[TOKENS])) { + source = node[TOKENS]; + } + else if (node.typ == exports.EnumToken.DeclarationNodeType) { + source = node.val; + } + else if (node.l != null) { + // @ts-expect-error + if (Array.isArray(node.l)) { + // @ts-expect-error + source = node.l.slice(); + } + else { + // @ts-expect-error + source = [node.l]; + } // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node[TOKENS].toReversed() : node[TOKENS])); - for (const child of node[TOKENS]) { - if (child[PARENT] != node) { - child[PARENT] = node; + if (node.r != null) { + // @ts-expect-error + if (Array.isArray(node.r)) { + // @ts-expect-error + source.push(...node.r.slice()); + } + else { + // @ts-expect-error + source = [node.r]; } } // @ts-expect-error - } - else if (Array.isArray(node.val)) { + if (node.op != null && typeof node.op == "object") { + // @ts-expect-error + source.push(node.op); + } // @ts-expect-error - for (const val of node.val) { - if (val[PARENT] != node) { - val[PARENT] = node; - } + if (node.op1 != null && typeof node.op1 == "object") { + // @ts-expect-error + source.push(node.op1); } // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); + if (node.op2 != null && typeof node.op2 == "object") { + // @ts-expect-error + source.push(node.op2); + } + } + if (source != null) { + if (reverse) { + for (let i = 0; i < node[TOKENS].length; i++) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; + } + } + else { + for (let i = node[TOKENS].length - 1; i >= 0; i--) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; + } + } } } if (children && @@ -9852,13 +9889,89 @@ node["chi"] != null && (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0)) { // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.chi.toReversed() : node.chi)); - for (const child of node.chi) { - if (child[PARENT] != node) { - child[PARENT] = node; + source = node.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + parents.push(source[i]); + source[i][PARENT] = node; } } + else { + for (let i = source.length - 1; i >= 0; i--) { + parents.push(source[i]); + source[i][PARENT] = node; + } + } + // for (const child of source as Array) { + // parents.push(child); + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } } + // } + // node = parents.pop() as AstNode; + // } + // while ((node = parents[i++])) { + // if (i > maxQueueLength) { + // parents.splice(0, maxQueueLength); + // i -= maxQueueLength; + // } + // let option: WalkerOption = null; + // if (filter != null) { + // // @ts-expect-error + // option = filter(node); + // isNumeric = typeof option == "number"; + // if (isNumeric) { + // if ((option as number) & WalkerOptionEnum.Ignore) { + // continue; + // } + // if ((option as number) & WalkerOptionEnum.Stop) { + // break; + // } + // } + // } + // if (!isNumeric || ((option as number) & WalkerOptionEnum.Children) === 0) { + // result.node = node; + // // @ts-expect-error + // result.parent = node[PARENT]; + // yield result; + // } + // if (attributes) { + // if (node[TOKENS] != null) { + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); + // for (const child of node[TOKENS] as AstNode[]) { + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } + // // @ts-expect-error + // } else if (Array.isArray(node.val)) { + // // @ts-expect-error + // for (const val of node.val) { + // if (val[PARENT] != node) { + // val[PARENT] = node; + // } + // } + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); + // } + // } + // if ( + // children && + // // @ts-expect-error + // node["chi"] != null && + // (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) + // ) { + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); + // for (const child of (node).chi) { + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } + // } } } /** @@ -17557,7 +17670,7 @@ } } for (const { value, parent: parentValue } of walkValues(node.val)) { - if (value.typ == exports.EnumToken.MathFunctionTokenDefType || + if (value.typ == exports.EnumToken.MathFunctionTokenType || (value.typ == exports.EnumToken.WildCardFunctionTokenType && value.val == "var")) { if (value.chi.length == 1 && value.chi[0].typ == exports.EnumToken.DashedIdenTokenType) { @@ -17565,9 +17678,10 @@ if (info?.replaceable) { if (parentValue != null) { let i = 0; - for (; i < parentValue.chi.length; i++) { - if (parentValue.chi[i] == value) { - parentValue.chi.splice(i, 1, ...info.node.val); + const source = parentValue.typ == exports.EnumToken.DeclarationNodeType ? parentValue.val : parentValue.chi; + for (; i < source.length; i++) { + if (source[i] == value) { + source.splice(i, 1, ...info.node.val); break; } } @@ -21144,9 +21258,16 @@ if (replacement == null || (Array.isArray(replacement) && replacement.length === 0)) { throw new TypeError(`replacement is null`); } - for (const newNode of Array.isArray(replacement) ? replacement : [replacement]) { - if (newNode[PARENT] != node[PARENT]) { - newNode[PARENT] = node[PARENT]; + if (!Array.isArray(replacement)) { + if (replacement[PARENT] != parent) { + replacement[PARENT] = parent; + } + } + else { + for (const newNode of replacement) { + if (newNode[PARENT] != parent) { + newNode[PARENT] = parent; + } } } if (parent.typ == exports.EnumToken.BinaryExpressionTokenType) { @@ -22629,9 +22750,9 @@ * @returns */ function find(ast, matcher) { - for (const { node, parent } of walk(ast)) { - if (matcher(node, parent)) { - return node; + for (const r of walk(ast)) { + if (matcher(r.node, r.parent)) { + return r.node; } } return null; @@ -22670,21 +22791,21 @@ */ function findByValue(ast, matcher) { let source; - for (const { node } of walk(ast)) { + for (const r1 of walk(ast)) { source = null; - if (node.typ === exports.EnumToken.DeclarationNodeType) { - source = node.val; + if (r1.node.typ === exports.EnumToken.DeclarationNodeType) { + source = r1.node.val; } - else if (Array.isArray(node[TOKENS])) { - source = node[TOKENS]; + else if (Array.isArray(r1.node[TOKENS])) { + source = r1.node[TOKENS]; } if (source == null) { continue; } - for (const { value, parent, root: rootNode, parents } of walkValues(source, node)) { - if (matcher(value, node)) { + for (const r2 of walkValues(source, r1.node)) { + if (matcher(r2.value, r1.node)) { // @ts-ignore - return { node, value: { node: value, parent, root: rootNode, parents } }; + return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; } } } @@ -22726,9 +22847,9 @@ */ function findAll(ast, matcher) { const result = []; - for (const { node, parent } of walk(ast)) { - if (matcher(node, parent)) { - result.push(node); + for (const r of walk(ast)) { + if (matcher(r.node, r.node[PARENT])) { + result.push(r.node); } } return result; @@ -22764,11 +22885,12 @@ * @returns */ function findLast(ast, matcher) { - for (const { node, parent } of walk(ast, null, true)) { - if (matcher(node, parent)) { - return node; + for (const result of walk(ast, null, true)) + // for (const { node, parent } of walk(ast as AstNode, null, true)) { + if (matcher(result.node, result.parent)) { + return result.node; } - } + // } return null; } @@ -26697,9 +26819,9 @@ case exports.EnumToken.AngleTokenType: case exports.EnumToken.LengthTokenType: case exports.EnumToken.DimensionTokenType: - case exports.EnumToken.UserDefinedDimensionTokenType: case exports.EnumToken.FrequencyTokenType: case exports.EnumToken.ResolutionTokenType: + case exports.EnumToken.UserDefinedDimensionTokenType: let val = token.val.typ == exports.EnumToken.FractionTokenType ? renderValue(token.val, options, cache) : minifyNumber(token.val); @@ -31617,54 +31739,107 @@ if (options.visitor != null) { const handlers = []; const visitors = parseVisitors(options.visitor, errors); - const subNodes = []; let parens; let genericKey; - let nodes = new Array(stats.tokensCount); - let i; - let k; - let j; - let freeBlock = 1; - nodes[0] = ast; - for (i = 0; i < nodes.length; i++) { - if (nodes[i] == null) { - break; - } - subNodes.length = 0; + let nodes = [ast]; + let node; + while (nodes.length > 0) { + node = nodes.pop(); if (visitors.includeTokens) { - switch (nodes[i].typ) { + switch (node.typ) { case exports.EnumToken.RuleNodeType: case exports.EnumToken.AtRuleNodeType: case exports.EnumToken.KeyframesRuleNodeType: case exports.EnumToken.KeyframesAtRuleNodeType: - for (const token of nodes[i][TOKENS]) { - subNodes.push(token); + for (let i = + // @ts-ignore + node[TOKENS].length - + 1; i >= 0; i--) { + // @ts-ignore + node[TOKENS][i][PARENT] = node; + nodes.push( + // @ts-ignore + node[TOKENS][i]); } break; case exports.EnumToken.DeclarationNodeType: - for (const token of nodes[i].val) { - subNodes.push(token); + for (let i = + // @ts-ignore + node.val.length - 1; i >= 0; i--) { + node.val[i][PARENT] = node; + // @ts-ignore + nodes.push(node.val[i]); } break; } - } - // @ts-ignore - if (nodes[i].chi != null) { // @ts-ignore - for (const child of nodes[i].chi) { - subNodes.push(child); + if (node.l != null) { + // @ts-ignore + if (node.op2 != null) { + // @ts-ignore + nodes.push(node.op2); + // @ts-ignore + node.op2[PARENT] = node; + } + // @ts-ignore + if (node.op1 != null) { + // @ts-ignore + nodes.push(node.op1); + // @ts-ignore + node.op1[PARENT] = node; + } + // @ts-ignore + if (nodes.op != null && node.op.typ != null) { + // @ts-ignore + nodes.push(node.op); + // @ts-ignore + node.op[PARENT] = node; + } + // @ts-ignore + if (node.r != null) { + // @ts-ignore + if (Array.isArray(node.r)) { + // @ts-ignore + for (let i = node.r.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.r[i]); + // @ts-ignore + node.r[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.r); + // @ts-ignore + node.r[PARENT] = node; + } + } + // @ts-ignore + if (Array.isArray(node.l)) { + // @ts-ignore + for (let i = node.l.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.l[i]); + // @ts-ignore + node.l[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.l); + // @ts-ignore + node.l[PARENT] = node; + } } } - if (subNodes.length > 0) { - if (freeBlock <= i) { - freeBlock = i + 1; - } - for (k = 0; k < subNodes.length; k++) { - j = k + freeBlock; - nodes[j] = subNodes[k]; - nodes[j][PARENT] = nodes[i]; + // @ts-ignore + if (node.chi != null) { + for ( + // @ts-ignore + let i = node.chi.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.chi[i]); } - freeBlock += subNodes.length; } parens = null; handlers.length = 0; @@ -31672,23 +31847,23 @@ handlers.push(...visitors.preAllVisitorsHandlers); } genericKey = - nodes[i].typ == exports.EnumToken.DeclarationNodeType + node.typ == exports.EnumToken.DeclarationNodeType ? "Declaration" - : nodes[i].typ == exports.EnumToken.AtRuleNodeType + : node.typ == exports.EnumToken.AtRuleNodeType ? "AtRule" - : nodes[i].typ == exports.EnumToken.KeyframesAtRuleNodeType + : node.typ == exports.EnumToken.KeyframesAtRuleNodeType ? "KeyframesAtRule" - : nodes[i].typ === exports.EnumToken.KeyframesRuleNodeType + : node.typ === exports.EnumToken.KeyframesRuleNodeType ? "KeyframesRule" - : nodes[i].typ == exports.EnumToken.RuleNodeType + : node.typ == exports.EnumToken.RuleNodeType ? "Rule" - : nodes[i].typ == exports.EnumToken.KeyframesRuleNodeType + : node.typ == exports.EnumToken.KeyframesRuleNodeType ? "KeyframesRule" : null; - let keyName = nodes[i].typ == exports.EnumToken.DeclarationNodeType || nodes[i].typ == exports.EnumToken.AtRuleNodeType - ? camelize(nodes[i].nam) - : nodes[i].typ == exports.EnumToken.KeyframesAtRuleNodeType - ? camelize(nodes[i].val) + let keyName = node.typ == exports.EnumToken.DeclarationNodeType || node.typ == exports.EnumToken.AtRuleNodeType + ? camelize(node.nam) + : node.typ == exports.EnumToken.KeyframesAtRuleNodeType + ? camelize(node.val) : null; if (visitors.allVisitorsHandlers?.size > 0) { handlers.push(...visitors.allVisitorsHandlers); @@ -31708,10 +31883,9 @@ } } } - // @ts-ignore - if (map.has(nodes[i].typ)) { + if (map.has(node.typ)) { // @ts-ignore - for (const handler of map.get(nodes[i].typ)) { + for (const handler of map.get(node.typ)) { if (typeof handler == "function") { handlers.push(handler); } @@ -31739,16 +31913,15 @@ if (handlers.length == 0) { continue; } - let node = nodes[i]; for (const callable of handlers) { - replacement = callable(node, nodes[i][PARENT], ast, + replacement = callable(node, node[PARENT], ast, // @ts-expect-error function* () { if (parens == null) { - let node = nodes[i][PARENT]; - while (node != null) { - yield node; - node = node[PARENT]; + let parent = node[PARENT]; + while (parent != null) { + yield parent; + parent = parent[PARENT]; } } }); @@ -31759,37 +31932,33 @@ continue; } // @ts-ignore - node = replacement; + // node = replacement as AstNode; // - if (Array.isArray(node)) { + if (Array.isArray(replacement)) { break; } } - if (node != nodes[i]) { + // @ts-ignore + if (replacement != null && node != replacement) { // @ts-ignore - replaceNodeOrValue(nodes[i][PARENT], nodes[i], node); + replaceNodeOrValue(node[PARENT], node, replacement); } } nodes = null; } if (invalidNodes.length > 0) { - let count = invalidNodes.length; - for (const { node, parent } of walk(ast)) { + for (const node of invalidNodes) { if (options.lenient && node[STATE] & exports.EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & exports.EnumAstNodeStatus.Invalid || - node[STATE] & exports.EnumAstNodeStatus.Unknown || - node[STATE] & exports.EnumAstNodeStatus.Unparsed || - node[STATE] & exports.EnumAstNodeStatus.Malformed || - node[STATE] & exports.EnumAstNodeStatus.Disallowed) { + if (node[STATE] & + (exports.EnumAstNodeStatus.Invalid | + exports.EnumAstNodeStatus.Unknown | + exports.EnumAstNodeStatus.Unparsed | + exports.EnumAstNodeStatus.Malformed | + exports.EnumAstNodeStatus.Disallowed)) { // @ts-ignore - parent.chi.splice(parent.chi.indexOf(node), 1); - node[PARENT] = null; - count--; - if (count == 0) { - break; - } + node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); } } } @@ -31810,7 +31979,6 @@ ...stats, parse: `${(endParseTime - startTime).toFixed(2)}ms`, minify: `${(endTime - endParseTime).toFixed(2)}ms`, - // tokenize: `${(options?.parseInfo?.time ?? 0).toFixed(2)}ms`, total: `${(endTime - startTime).toFixed(2)}ms`, }, }; @@ -32600,58 +32768,107 @@ let genericKey; const handlers = []; const visitors = parseVisitors(options.visitor, errors); - let nodes = new Array(stats.tokensCount); - const subNodes = []; - let i; - let k; - let j; - let freeblock = 1; - nodes[0] = ast; - for (i = 0; i < nodes.length; i++) { - if (nodes[i] == null) { - break; - } - subNodes.length = 0; + let nodes = [ast]; + let node; + // nodes[0] = ast; + while (nodes.length > 0) { + node = nodes.pop(); if (visitors.includeTokens) { - switch (nodes[i].typ) { + switch (node.typ) { case exports.EnumToken.RuleNodeType: case exports.EnumToken.AtRuleNodeType: case exports.EnumToken.KeyframesRuleNodeType: case exports.EnumToken.KeyframesAtRuleNodeType: - if (nodes[i][TOKENS] == null) { - if (nodes[i].typ == exports.EnumToken.RuleNodeType) { - nodes[i][TOKENS] = parseString(nodes[i].sel); - } - } - for (const token of nodes[i][TOKENS]) { - subNodes.push(token); + for (let i = + // @ts-ignore + node[TOKENS].length - + 1; i >= 0; i--) { + // @ts-ignore + node[TOKENS][i][PARENT] = node; + nodes.push( + // @ts-ignore + node[TOKENS][i]); } break; case exports.EnumToken.DeclarationNodeType: - for (const token of nodes[i].val) { - subNodes.push(token); + for (let i = + // @ts-ignore + node.val.length - 1; i >= 0; i--) { + // @ts-ignore + node.val[i][PARENT] = node; + // @ts-ignore + nodes.push(node.val[i]); } break; } - } - // @ts-ignore - if (nodes[i].chi != null) { // @ts-ignore - for (k = 0; k < nodes[i].chi.length; k++) { + if (node.l != null) { + // @ts-ignore + if (node.op2 != null) { + // @ts-ignore + nodes.push(node.op2); + // @ts-ignore + nodes.op2[PARENT] = node; + } // @ts-ignore - subNodes.push(nodes[i].chi[k]); + if (node.op1 != null) { + // @ts-ignore + nodes.push(node.op1); + // @ts-ignore + nodes.op1[PARENT] = node; + } + // @ts-ignore + if (nodes.op != null && node.op.typ != null) { + // @ts-ignore + nodes.push(node.op); + // @ts-ignore + nodes.op[PARENT] = node; + } + // @ts-ignore + if (node.r != null) { + // @ts-ignore + if (Array.isArray(node.r)) { + // @ts-ignore + for (let i = node.r.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.r[i]); + // @ts-ignore + node.r[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.r); + // @ts-ignore + node.r[PARENT] = node; + } + } + // @ts-ignore + if (Array.isArray(node.l)) { + // @ts-ignore + for (let i = node.l.length - 1; i >= 0; i--) { + // @ts-ignore + node.l[i][PARENT] = node; + // @ts-ignore + nodes.push(node.l[i]); + } + } + else { + // @ts-ignore + nodes.push(node.l); + // @ts-ignore + node.l[PARENT] = node; + } } } - if (subNodes.length > 0) { - if (freeblock <= i) { - freeblock = i + 1; - } - for (k = 0; k < subNodes.length; k++) { - j = k + freeblock; - nodes[j] = subNodes[k]; - nodes[j][PARENT] = nodes[i]; + // @ts-ignore + if (node.chi != null) { + for ( + // @ts-ignore + let i = node.chi.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.chi[i]); } - freeblock += subNodes.length; } parens = null; handlers.length = 0; @@ -32659,23 +32876,23 @@ handlers.push(...visitors.preAllVisitorsHandlers); } genericKey = - nodes[i].typ == exports.EnumToken.DeclarationNodeType + node.typ == exports.EnumToken.DeclarationNodeType ? "Declaration" - : nodes[i].typ == exports.EnumToken.AtRuleNodeType + : node.typ == exports.EnumToken.AtRuleNodeType ? "AtRule" - : nodes[i].typ == exports.EnumToken.KeyframesAtRuleNodeType + : node.typ == exports.EnumToken.KeyframesAtRuleNodeType ? "KeyframesAtRule" - : nodes[i].typ === exports.EnumToken.KeyframesRuleNodeType + : node.typ === exports.EnumToken.KeyframesRuleNodeType ? "KeyframesRule" - : nodes[i].typ == exports.EnumToken.RuleNodeType + : node.typ == exports.EnumToken.RuleNodeType ? "Rule" - : nodes[i].typ == exports.EnumToken.KeyframesRuleNodeType + : node.typ == exports.EnumToken.KeyframesRuleNodeType ? "KeyframesRule" : null; - let keyName = nodes[i].typ == exports.EnumToken.DeclarationNodeType || nodes[i].typ == exports.EnumToken.AtRuleNodeType - ? camelize(nodes[i].nam) - : nodes[i].typ == exports.EnumToken.KeyframesAtRuleNodeType - ? camelize(nodes[i].val) + let keyName = node.typ == exports.EnumToken.DeclarationNodeType || node.typ == exports.EnumToken.AtRuleNodeType + ? camelize(node.nam) + : node.typ == exports.EnumToken.KeyframesAtRuleNodeType + ? camelize(node.val) : null; if (visitors.allVisitorsHandlers?.size > 0) { handlers.push(...visitors.allVisitorsHandlers); @@ -32688,20 +32905,6 @@ if (typeof handler == "function") { handlers.push(handler); } - // else if (Array.isArray(handler)) { - // for (const h of handler) { - // if (typeof h == "function") { - // handlers.push(h); - // } - // // @ts-ignore - // else if (h[keyName] != null) { - // // @ts-ignore - // handlers.push(h[keyName]); - // } - // } - // } else if (typeof handler.handler! == "function") { - // handlers.push(handler.handler); - // } // @ts-ignore else if (typeof handler[keyName] == "function") { // @ts-ignore @@ -32709,10 +32912,9 @@ } } } - // @ts-ignore - if (map.has(nodes[i].typ)) { + if (map.has(node.typ)) { // @ts-ignore - for (const handler of map.get(nodes[i].typ)) { + for (const handler of map.get(node.typ)) { if (typeof handler == "function") { handlers.push(handler); } @@ -32740,16 +32942,16 @@ if (handlers.length == 0) { continue; } - let node = nodes[i]; for (const callable of handlers) { - replacement = callable(node, nodes[i][PARENT], ast, + replacement = callable(node, node[PARENT], ast, // @ts-expect-error function* () { if (parens == null) { - let node = nodes[i][PARENT]; - while (node != null) { - yield node; - node = node[PARENT]; + let parent = node[PARENT]; + // let node = node[PARENT] as AstNode; + while (parent != null) { + yield parent; + parent = parent[PARENT]; } } }); @@ -32763,37 +32965,37 @@ continue; } // @ts-ignore - node = replacement; + // node = replacement as AstNode; // - if (Array.isArray(node)) { + if (Array.isArray(replacement)) { break; } } - if (node != nodes[i]) { + // @ts-ignore + if (replacement != null && node != replacement) { + console.error({ + node, + replacement, + }); // @ts-ignore - replaceNodeOrValue(nodes[i][PARENT], nodes[i], node); + replaceNodeOrValue(node[PARENT], node, replacement); } } nodes = null; } if (invalidNodes.length > 0) { - let count = invalidNodes.length; - for (const { node, parent } of walk(ast)) { + for (const node of invalidNodes) { if (options.lenient && node[STATE] & exports.EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & exports.EnumAstNodeStatus.Invalid || - node[STATE] & exports.EnumAstNodeStatus.Unknown || - node[STATE] & exports.EnumAstNodeStatus.Unparsed || - node[STATE] & exports.EnumAstNodeStatus.Malformed || - node[STATE] & exports.EnumAstNodeStatus.Disallowed) { + if (node[STATE] & (exports.EnumAstNodeStatus.Invalid | exports.EnumAstNodeStatus.Unknown | exports.EnumAstNodeStatus.Unparsed | exports.EnumAstNodeStatus.Malformed | exports.EnumAstNodeStatus.Disallowed)) { // @ts-ignore - parent.chi.splice(parent.chi.indexOf(node), 1); - node[PARENT] = null; - count--; - if (count == 0) { - break; - } + node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); + // node[PARENT] = null; + // count--; + // if (count == 0) { + // break; + // } } } } diff --git a/dist/index.cjs b/dist/index.cjs index c5a3f822..18adfe1f 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -9776,7 +9776,6 @@ function* walk(node, filter, reverse) { let isNumeric = false; let children = true; let attributes = false; - let i = 0; if (options != null && typeof options == "object") { filter = options.filter; reverse = options.reverse; @@ -9796,12 +9795,11 @@ function* walk(node, filter, reverse) { } }, }; - while ((node = parents[i++])) { - if (i > maxQueueLength) { - parents.splice(0, maxQueueLength); - i -= maxQueueLength; - } - let option = null; + let option = null; + let source = null; + while (parents.length > 0) { + node = parents.pop(); + // enter node if (filter != null) { // @ts-expect-error option = filter(node); @@ -9822,25 +9820,64 @@ function* walk(node, filter, reverse) { yield result; } if (attributes) { - if (node[TOKENS] != null) { + source = null; + if (Array.isArray(node[TOKENS])) { + source = node[TOKENS]; + } + else if (node.typ == exports.EnumToken.DeclarationNodeType) { + source = node.val; + } + else if (node.l != null) { + // @ts-expect-error + if (Array.isArray(node.l)) { + // @ts-expect-error + source = node.l.slice(); + } + else { + // @ts-expect-error + source = [node.l]; + } // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node[TOKENS].toReversed() : node[TOKENS])); - for (const child of node[TOKENS]) { - if (child[PARENT] != node) { - child[PARENT] = node; + if (node.r != null) { + // @ts-expect-error + if (Array.isArray(node.r)) { + // @ts-expect-error + source.push(...node.r.slice()); + } + else { + // @ts-expect-error + source = [node.r]; } } // @ts-expect-error - } - else if (Array.isArray(node.val)) { + if (node.op != null && typeof node.op == "object") { + // @ts-expect-error + source.push(node.op); + } // @ts-expect-error - for (const val of node.val) { - if (val[PARENT] != node) { - val[PARENT] = node; - } + if (node.op1 != null && typeof node.op1 == "object") { + // @ts-expect-error + source.push(node.op1); } // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); + if (node.op2 != null && typeof node.op2 == "object") { + // @ts-expect-error + source.push(node.op2); + } + } + if (source != null) { + if (reverse) { + for (let i = 0; i < node[TOKENS].length; i++) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; + } + } + else { + for (let i = node[TOKENS].length - 1; i >= 0; i--) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; + } + } } } if (children && @@ -9848,13 +9885,89 @@ function* walk(node, filter, reverse) { node["chi"] != null && (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0)) { // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.chi.toReversed() : node.chi)); - for (const child of node.chi) { - if (child[PARENT] != node) { - child[PARENT] = node; + source = node.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + parents.push(source[i]); + source[i][PARENT] = node; } } + else { + for (let i = source.length - 1; i >= 0; i--) { + parents.push(source[i]); + source[i][PARENT] = node; + } + } + // for (const child of source as Array) { + // parents.push(child); + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } } + // } + // node = parents.pop() as AstNode; + // } + // while ((node = parents[i++])) { + // if (i > maxQueueLength) { + // parents.splice(0, maxQueueLength); + // i -= maxQueueLength; + // } + // let option: WalkerOption = null; + // if (filter != null) { + // // @ts-expect-error + // option = filter(node); + // isNumeric = typeof option == "number"; + // if (isNumeric) { + // if ((option as number) & WalkerOptionEnum.Ignore) { + // continue; + // } + // if ((option as number) & WalkerOptionEnum.Stop) { + // break; + // } + // } + // } + // if (!isNumeric || ((option as number) & WalkerOptionEnum.Children) === 0) { + // result.node = node; + // // @ts-expect-error + // result.parent = node[PARENT]; + // yield result; + // } + // if (attributes) { + // if (node[TOKENS] != null) { + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); + // for (const child of node[TOKENS] as AstNode[]) { + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } + // // @ts-expect-error + // } else if (Array.isArray(node.val)) { + // // @ts-expect-error + // for (const val of node.val) { + // if (val[PARENT] != node) { + // val[PARENT] = node; + // } + // } + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); + // } + // } + // if ( + // children && + // // @ts-expect-error + // node["chi"] != null && + // (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) + // ) { + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); + // for (const child of (node).chi) { + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } + // } } } /** @@ -17553,7 +17666,7 @@ function replace(node, variableScope) { } } for (const { value, parent: parentValue } of walkValues(node.val)) { - if (value.typ == exports.EnumToken.MathFunctionTokenDefType || + if (value.typ == exports.EnumToken.MathFunctionTokenType || (value.typ == exports.EnumToken.WildCardFunctionTokenType && value.val == "var")) { if (value.chi.length == 1 && value.chi[0].typ == exports.EnumToken.DashedIdenTokenType) { @@ -17561,9 +17674,10 @@ function replace(node, variableScope) { if (info?.replaceable) { if (parentValue != null) { let i = 0; - for (; i < parentValue.chi.length; i++) { - if (parentValue.chi[i] == value) { - parentValue.chi.splice(i, 1, ...info.node.val); + const source = parentValue.typ == exports.EnumToken.DeclarationNodeType ? parentValue.val : parentValue.chi; + for (; i < source.length; i++) { + if (source[i] == value) { + source.splice(i, 1, ...info.node.val); break; } } @@ -21140,9 +21254,16 @@ function replaceNodeOrValue(parent, node, replacement) { if (replacement == null || (Array.isArray(replacement) && replacement.length === 0)) { throw new TypeError(`replacement is null`); } - for (const newNode of Array.isArray(replacement) ? replacement : [replacement]) { - if (newNode[PARENT] != node[PARENT]) { - newNode[PARENT] = node[PARENT]; + if (!Array.isArray(replacement)) { + if (replacement[PARENT] != parent) { + replacement[PARENT] = parent; + } + } + else { + for (const newNode of replacement) { + if (newNode[PARENT] != parent) { + newNode[PARENT] = parent; + } } } if (parent.typ == exports.EnumToken.BinaryExpressionTokenType) { @@ -22625,9 +22746,9 @@ button { * @returns */ function find(ast, matcher) { - for (const { node, parent } of walk(ast)) { - if (matcher(node, parent)) { - return node; + for (const r of walk(ast)) { + if (matcher(r.node, r.parent)) { + return r.node; } } return null; @@ -22666,21 +22787,21 @@ button { */ function findByValue(ast, matcher) { let source; - for (const { node } of walk(ast)) { + for (const r1 of walk(ast)) { source = null; - if (node.typ === exports.EnumToken.DeclarationNodeType) { - source = node.val; + if (r1.node.typ === exports.EnumToken.DeclarationNodeType) { + source = r1.node.val; } - else if (Array.isArray(node[TOKENS])) { - source = node[TOKENS]; + else if (Array.isArray(r1.node[TOKENS])) { + source = r1.node[TOKENS]; } if (source == null) { continue; } - for (const { value, parent, root: rootNode, parents } of walkValues(source, node)) { - if (matcher(value, node)) { + for (const r2 of walkValues(source, r1.node)) { + if (matcher(r2.value, r1.node)) { // @ts-ignore - return { node, value: { node: value, parent, root: rootNode, parents } }; + return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; } } } @@ -22722,9 +22843,9 @@ button-small { */ function findAll(ast, matcher) { const result = []; - for (const { node, parent } of walk(ast)) { - if (matcher(node, parent)) { - result.push(node); + for (const r of walk(ast)) { + if (matcher(r.node, r.node[PARENT])) { + result.push(r.node); } } return result; @@ -22760,11 +22881,12 @@ button { * @returns */ function findLast(ast, matcher) { - for (const { node, parent } of walk(ast, null, true)) { - if (matcher(node, parent)) { - return node; + for (const result of walk(ast, null, true)) + // for (const { node, parent } of walk(ast as AstNode, null, true)) { + if (matcher(result.node, result.parent)) { + return result.node; } - } + // } return null; } @@ -26693,9 +26815,9 @@ function renderValue(token, options = {}, cache = Object.create(null), reducer, case exports.EnumToken.AngleTokenType: case exports.EnumToken.LengthTokenType: case exports.EnumToken.DimensionTokenType: - case exports.EnumToken.UserDefinedDimensionTokenType: case exports.EnumToken.FrequencyTokenType: case exports.EnumToken.ResolutionTokenType: + case exports.EnumToken.UserDefinedDimensionTokenType: let val = token.val.typ == exports.EnumToken.FractionTokenType ? renderValue(token.val, options, cache) : minifyNumber(token.val); @@ -31613,54 +31735,107 @@ function doParseSync(tokenizer, options = {}) { if (options.visitor != null) { const handlers = []; const visitors = parseVisitors(options.visitor, errors); - const subNodes = []; let parens; let genericKey; - let nodes = new Array(stats.tokensCount); - let i; - let k; - let j; - let freeBlock = 1; - nodes[0] = ast; - for (i = 0; i < nodes.length; i++) { - if (nodes[i] == null) { - break; - } - subNodes.length = 0; + let nodes = [ast]; + let node; + while (nodes.length > 0) { + node = nodes.pop(); if (visitors.includeTokens) { - switch (nodes[i].typ) { + switch (node.typ) { case exports.EnumToken.RuleNodeType: case exports.EnumToken.AtRuleNodeType: case exports.EnumToken.KeyframesRuleNodeType: case exports.EnumToken.KeyframesAtRuleNodeType: - for (const token of nodes[i][TOKENS]) { - subNodes.push(token); + for (let i = + // @ts-ignore + node[TOKENS].length - + 1; i >= 0; i--) { + // @ts-ignore + node[TOKENS][i][PARENT] = node; + nodes.push( + // @ts-ignore + node[TOKENS][i]); } break; case exports.EnumToken.DeclarationNodeType: - for (const token of nodes[i].val) { - subNodes.push(token); + for (let i = + // @ts-ignore + node.val.length - 1; i >= 0; i--) { + node.val[i][PARENT] = node; + // @ts-ignore + nodes.push(node.val[i]); } break; } - } - // @ts-ignore - if (nodes[i].chi != null) { // @ts-ignore - for (const child of nodes[i].chi) { - subNodes.push(child); + if (node.l != null) { + // @ts-ignore + if (node.op2 != null) { + // @ts-ignore + nodes.push(node.op2); + // @ts-ignore + node.op2[PARENT] = node; + } + // @ts-ignore + if (node.op1 != null) { + // @ts-ignore + nodes.push(node.op1); + // @ts-ignore + node.op1[PARENT] = node; + } + // @ts-ignore + if (nodes.op != null && node.op.typ != null) { + // @ts-ignore + nodes.push(node.op); + // @ts-ignore + node.op[PARENT] = node; + } + // @ts-ignore + if (node.r != null) { + // @ts-ignore + if (Array.isArray(node.r)) { + // @ts-ignore + for (let i = node.r.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.r[i]); + // @ts-ignore + node.r[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.r); + // @ts-ignore + node.r[PARENT] = node; + } + } + // @ts-ignore + if (Array.isArray(node.l)) { + // @ts-ignore + for (let i = node.l.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.l[i]); + // @ts-ignore + node.l[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.l); + // @ts-ignore + node.l[PARENT] = node; + } } } - if (subNodes.length > 0) { - if (freeBlock <= i) { - freeBlock = i + 1; - } - for (k = 0; k < subNodes.length; k++) { - j = k + freeBlock; - nodes[j] = subNodes[k]; - nodes[j][PARENT] = nodes[i]; + // @ts-ignore + if (node.chi != null) { + for ( + // @ts-ignore + let i = node.chi.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.chi[i]); } - freeBlock += subNodes.length; } parens = null; handlers.length = 0; @@ -31668,23 +31843,23 @@ function doParseSync(tokenizer, options = {}) { handlers.push(...visitors.preAllVisitorsHandlers); } genericKey = - nodes[i].typ == exports.EnumToken.DeclarationNodeType + node.typ == exports.EnumToken.DeclarationNodeType ? "Declaration" - : nodes[i].typ == exports.EnumToken.AtRuleNodeType + : node.typ == exports.EnumToken.AtRuleNodeType ? "AtRule" - : nodes[i].typ == exports.EnumToken.KeyframesAtRuleNodeType + : node.typ == exports.EnumToken.KeyframesAtRuleNodeType ? "KeyframesAtRule" - : nodes[i].typ === exports.EnumToken.KeyframesRuleNodeType + : node.typ === exports.EnumToken.KeyframesRuleNodeType ? "KeyframesRule" - : nodes[i].typ == exports.EnumToken.RuleNodeType + : node.typ == exports.EnumToken.RuleNodeType ? "Rule" - : nodes[i].typ == exports.EnumToken.KeyframesRuleNodeType + : node.typ == exports.EnumToken.KeyframesRuleNodeType ? "KeyframesRule" : null; - let keyName = nodes[i].typ == exports.EnumToken.DeclarationNodeType || nodes[i].typ == exports.EnumToken.AtRuleNodeType - ? camelize(nodes[i].nam) - : nodes[i].typ == exports.EnumToken.KeyframesAtRuleNodeType - ? camelize(nodes[i].val) + let keyName = node.typ == exports.EnumToken.DeclarationNodeType || node.typ == exports.EnumToken.AtRuleNodeType + ? camelize(node.nam) + : node.typ == exports.EnumToken.KeyframesAtRuleNodeType + ? camelize(node.val) : null; if (visitors.allVisitorsHandlers?.size > 0) { handlers.push(...visitors.allVisitorsHandlers); @@ -31704,10 +31879,9 @@ function doParseSync(tokenizer, options = {}) { } } } - // @ts-ignore - if (map.has(nodes[i].typ)) { + if (map.has(node.typ)) { // @ts-ignore - for (const handler of map.get(nodes[i].typ)) { + for (const handler of map.get(node.typ)) { if (typeof handler == "function") { handlers.push(handler); } @@ -31735,16 +31909,15 @@ function doParseSync(tokenizer, options = {}) { if (handlers.length == 0) { continue; } - let node = nodes[i]; for (const callable of handlers) { - replacement = callable(node, nodes[i][PARENT], ast, + replacement = callable(node, node[PARENT], ast, // @ts-expect-error function* () { if (parens == null) { - let node = nodes[i][PARENT]; - while (node != null) { - yield node; - node = node[PARENT]; + let parent = node[PARENT]; + while (parent != null) { + yield parent; + parent = parent[PARENT]; } } }); @@ -31755,37 +31928,33 @@ function doParseSync(tokenizer, options = {}) { continue; } // @ts-ignore - node = replacement; + // node = replacement as AstNode; // - if (Array.isArray(node)) { + if (Array.isArray(replacement)) { break; } } - if (node != nodes[i]) { + // @ts-ignore + if (replacement != null && node != replacement) { // @ts-ignore - replaceNodeOrValue(nodes[i][PARENT], nodes[i], node); + replaceNodeOrValue(node[PARENT], node, replacement); } } nodes = null; } if (invalidNodes.length > 0) { - let count = invalidNodes.length; - for (const { node, parent } of walk(ast)) { + for (const node of invalidNodes) { if (options.lenient && node[STATE] & exports.EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & exports.EnumAstNodeStatus.Invalid || - node[STATE] & exports.EnumAstNodeStatus.Unknown || - node[STATE] & exports.EnumAstNodeStatus.Unparsed || - node[STATE] & exports.EnumAstNodeStatus.Malformed || - node[STATE] & exports.EnumAstNodeStatus.Disallowed) { + if (node[STATE] & + (exports.EnumAstNodeStatus.Invalid | + exports.EnumAstNodeStatus.Unknown | + exports.EnumAstNodeStatus.Unparsed | + exports.EnumAstNodeStatus.Malformed | + exports.EnumAstNodeStatus.Disallowed)) { // @ts-ignore - parent.chi.splice(parent.chi.indexOf(node), 1); - node[PARENT] = null; - count--; - if (count == 0) { - break; - } + node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); } } } @@ -31806,7 +31975,6 @@ function doParseSync(tokenizer, options = {}) { ...stats, parse: `${(endParseTime - startTime).toFixed(2)}ms`, minify: `${(endTime - endParseTime).toFixed(2)}ms`, - // tokenize: `${(options?.parseInfo?.time ?? 0).toFixed(2)}ms`, total: `${(endTime - startTime).toFixed(2)}ms`, }, }; @@ -32596,58 +32764,107 @@ async function doParse(iter, options = {}) { let genericKey; const handlers = []; const visitors = parseVisitors(options.visitor, errors); - let nodes = new Array(stats.tokensCount); - const subNodes = []; - let i; - let k; - let j; - let freeblock = 1; - nodes[0] = ast; - for (i = 0; i < nodes.length; i++) { - if (nodes[i] == null) { - break; - } - subNodes.length = 0; + let nodes = [ast]; + let node; + // nodes[0] = ast; + while (nodes.length > 0) { + node = nodes.pop(); if (visitors.includeTokens) { - switch (nodes[i].typ) { + switch (node.typ) { case exports.EnumToken.RuleNodeType: case exports.EnumToken.AtRuleNodeType: case exports.EnumToken.KeyframesRuleNodeType: case exports.EnumToken.KeyframesAtRuleNodeType: - if (nodes[i][TOKENS] == null) { - if (nodes[i].typ == exports.EnumToken.RuleNodeType) { - nodes[i][TOKENS] = parseString(nodes[i].sel); - } - } - for (const token of nodes[i][TOKENS]) { - subNodes.push(token); + for (let i = + // @ts-ignore + node[TOKENS].length - + 1; i >= 0; i--) { + // @ts-ignore + node[TOKENS][i][PARENT] = node; + nodes.push( + // @ts-ignore + node[TOKENS][i]); } break; case exports.EnumToken.DeclarationNodeType: - for (const token of nodes[i].val) { - subNodes.push(token); + for (let i = + // @ts-ignore + node.val.length - 1; i >= 0; i--) { + // @ts-ignore + node.val[i][PARENT] = node; + // @ts-ignore + nodes.push(node.val[i]); } break; } - } - // @ts-ignore - if (nodes[i].chi != null) { // @ts-ignore - for (k = 0; k < nodes[i].chi.length; k++) { + if (node.l != null) { + // @ts-ignore + if (node.op2 != null) { + // @ts-ignore + nodes.push(node.op2); + // @ts-ignore + nodes.op2[PARENT] = node; + } // @ts-ignore - subNodes.push(nodes[i].chi[k]); + if (node.op1 != null) { + // @ts-ignore + nodes.push(node.op1); + // @ts-ignore + nodes.op1[PARENT] = node; + } + // @ts-ignore + if (nodes.op != null && node.op.typ != null) { + // @ts-ignore + nodes.push(node.op); + // @ts-ignore + nodes.op[PARENT] = node; + } + // @ts-ignore + if (node.r != null) { + // @ts-ignore + if (Array.isArray(node.r)) { + // @ts-ignore + for (let i = node.r.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.r[i]); + // @ts-ignore + node.r[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.r); + // @ts-ignore + node.r[PARENT] = node; + } + } + // @ts-ignore + if (Array.isArray(node.l)) { + // @ts-ignore + for (let i = node.l.length - 1; i >= 0; i--) { + // @ts-ignore + node.l[i][PARENT] = node; + // @ts-ignore + nodes.push(node.l[i]); + } + } + else { + // @ts-ignore + nodes.push(node.l); + // @ts-ignore + node.l[PARENT] = node; + } } } - if (subNodes.length > 0) { - if (freeblock <= i) { - freeblock = i + 1; - } - for (k = 0; k < subNodes.length; k++) { - j = k + freeblock; - nodes[j] = subNodes[k]; - nodes[j][PARENT] = nodes[i]; + // @ts-ignore + if (node.chi != null) { + for ( + // @ts-ignore + let i = node.chi.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.chi[i]); } - freeblock += subNodes.length; } parens = null; handlers.length = 0; @@ -32655,23 +32872,23 @@ async function doParse(iter, options = {}) { handlers.push(...visitors.preAllVisitorsHandlers); } genericKey = - nodes[i].typ == exports.EnumToken.DeclarationNodeType + node.typ == exports.EnumToken.DeclarationNodeType ? "Declaration" - : nodes[i].typ == exports.EnumToken.AtRuleNodeType + : node.typ == exports.EnumToken.AtRuleNodeType ? "AtRule" - : nodes[i].typ == exports.EnumToken.KeyframesAtRuleNodeType + : node.typ == exports.EnumToken.KeyframesAtRuleNodeType ? "KeyframesAtRule" - : nodes[i].typ === exports.EnumToken.KeyframesRuleNodeType + : node.typ === exports.EnumToken.KeyframesRuleNodeType ? "KeyframesRule" - : nodes[i].typ == exports.EnumToken.RuleNodeType + : node.typ == exports.EnumToken.RuleNodeType ? "Rule" - : nodes[i].typ == exports.EnumToken.KeyframesRuleNodeType + : node.typ == exports.EnumToken.KeyframesRuleNodeType ? "KeyframesRule" : null; - let keyName = nodes[i].typ == exports.EnumToken.DeclarationNodeType || nodes[i].typ == exports.EnumToken.AtRuleNodeType - ? camelize(nodes[i].nam) - : nodes[i].typ == exports.EnumToken.KeyframesAtRuleNodeType - ? camelize(nodes[i].val) + let keyName = node.typ == exports.EnumToken.DeclarationNodeType || node.typ == exports.EnumToken.AtRuleNodeType + ? camelize(node.nam) + : node.typ == exports.EnumToken.KeyframesAtRuleNodeType + ? camelize(node.val) : null; if (visitors.allVisitorsHandlers?.size > 0) { handlers.push(...visitors.allVisitorsHandlers); @@ -32684,20 +32901,6 @@ async function doParse(iter, options = {}) { if (typeof handler == "function") { handlers.push(handler); } - // else if (Array.isArray(handler)) { - // for (const h of handler) { - // if (typeof h == "function") { - // handlers.push(h); - // } - // // @ts-ignore - // else if (h[keyName] != null) { - // // @ts-ignore - // handlers.push(h[keyName]); - // } - // } - // } else if (typeof handler.handler! == "function") { - // handlers.push(handler.handler); - // } // @ts-ignore else if (typeof handler[keyName] == "function") { // @ts-ignore @@ -32705,10 +32908,9 @@ async function doParse(iter, options = {}) { } } } - // @ts-ignore - if (map.has(nodes[i].typ)) { + if (map.has(node.typ)) { // @ts-ignore - for (const handler of map.get(nodes[i].typ)) { + for (const handler of map.get(node.typ)) { if (typeof handler == "function") { handlers.push(handler); } @@ -32736,16 +32938,16 @@ async function doParse(iter, options = {}) { if (handlers.length == 0) { continue; } - let node = nodes[i]; for (const callable of handlers) { - replacement = callable(node, nodes[i][PARENT], ast, + replacement = callable(node, node[PARENT], ast, // @ts-expect-error function* () { if (parens == null) { - let node = nodes[i][PARENT]; - while (node != null) { - yield node; - node = node[PARENT]; + let parent = node[PARENT]; + // let node = node[PARENT] as AstNode; + while (parent != null) { + yield parent; + parent = parent[PARENT]; } } }); @@ -32759,37 +32961,37 @@ async function doParse(iter, options = {}) { continue; } // @ts-ignore - node = replacement; + // node = replacement as AstNode; // - if (Array.isArray(node)) { + if (Array.isArray(replacement)) { break; } } - if (node != nodes[i]) { + // @ts-ignore + if (replacement != null && node != replacement) { + console.error({ + node, + replacement, + }); // @ts-ignore - replaceNodeOrValue(nodes[i][PARENT], nodes[i], node); + replaceNodeOrValue(node[PARENT], node, replacement); } } nodes = null; } if (invalidNodes.length > 0) { - let count = invalidNodes.length; - for (const { node, parent } of walk(ast)) { + for (const node of invalidNodes) { if (options.lenient && node[STATE] & exports.EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & exports.EnumAstNodeStatus.Invalid || - node[STATE] & exports.EnumAstNodeStatus.Unknown || - node[STATE] & exports.EnumAstNodeStatus.Unparsed || - node[STATE] & exports.EnumAstNodeStatus.Malformed || - node[STATE] & exports.EnumAstNodeStatus.Disallowed) { + if (node[STATE] & (exports.EnumAstNodeStatus.Invalid | exports.EnumAstNodeStatus.Unknown | exports.EnumAstNodeStatus.Unparsed | exports.EnumAstNodeStatus.Malformed | exports.EnumAstNodeStatus.Disallowed)) { // @ts-ignore - parent.chi.splice(parent.chi.indexOf(node), 1); - node[PARENT] = null; - count--; - if (count == 0) { - break; - } + node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); + // node[PARENT] = null; + // count--; + // if (count == 0) { + // break; + // } } } } diff --git a/dist/index.d.ts b/dist/index.d.ts index 1b2ec603..966c15a0 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -5122,7 +5122,7 @@ export declare interface WalkResult { /** * current node */ - node: AstNode$1; + node: AstNode$1 | Token$1; /** * parent node */ @@ -5134,7 +5134,7 @@ export declare interface WalkResult { /** * parent nodes */ - parents: Generator; + parents: Generator; } /** @@ -6564,7 +6564,7 @@ button-small { * @param matcher * @returns */ -declare function findAll(ast: AstNode$1, matcher: (node: AstNode$1, parent?: AstNode$1 | null) => boolean): AstNode$1[]; +declare function findAll(ast: AstNode$1, matcher: (node: AstNode$1 | Token$1, parent?: AstNode$1 | Token$1 | null) => boolean): Array; /** * Search the ast sub-tree and return the last match. * @@ -6595,7 +6595,7 @@ button { * @param matcher * @returns */ -declare function findLast(ast: AstNode$1, matcher: (node: AstNode$1, parent?: AstNode$1 | null) => boolean): AstNode$1 | null; +declare function findLast(ast: AstNode$1 | Token$1, matcher: (node: AstNode$1 | Token$1, parent?: AstNode$1 | Token$1 | null) => boolean): AstNode$1 | Token$1 | null; /** * diff --git a/dist/src/lib/ast/features/inlinecssvariables.js b/dist/src/lib/ast/features/inlinecssvariables.js index 0175c54a..a6b4acfa 100644 --- a/dist/src/lib/ast/features/inlinecssvariables.js +++ b/dist/src/lib/ast/features/inlinecssvariables.js @@ -38,7 +38,7 @@ function replace(node, variableScope) { } } for (const { value, parent: parentValue } of walkValues(node.val)) { - if (value.typ == EnumToken.MathFunctionTokenDefType || + if (value.typ == EnumToken.MathFunctionTokenType || (value.typ == EnumToken.WildCardFunctionTokenType && value.val == "var")) { if (value.chi.length == 1 && value.chi[0].typ == EnumToken.DashedIdenTokenType) { @@ -46,9 +46,10 @@ function replace(node, variableScope) { if (info?.replaceable) { if (parentValue != null) { let i = 0; - for (; i < parentValue.chi.length; i++) { - if (parentValue.chi[i] == value) { - parentValue.chi.splice(i, 1, ...info.node.val); + const source = parentValue.typ == EnumToken.DeclarationNodeType ? parentValue.val : parentValue.chi; + for (; i < source.length; i++) { + if (source[i] == value) { + source.splice(i, 1, ...info.node.val); break; } } diff --git a/dist/src/lib/ast/find.js b/dist/src/lib/ast/find.js index a00fcdb8..179e2c83 100644 --- a/dist/src/lib/ast/find.js +++ b/dist/src/lib/ast/find.js @@ -7,7 +7,7 @@ */ import { EnumToken } from './types.js'; import { walk, walkValues } from './walk.js'; -import { TOKENS } from '../syntax/constants.js'; +import { PARENT, TOKENS } from '../syntax/constants.js'; /** * Search the ast subtree and return the first match @@ -41,9 +41,9 @@ button { * @returns */ function find(ast, matcher) { - for (const { node, parent } of walk(ast)) { - if (matcher(node, parent)) { - return node; + for (const r of walk(ast)) { + if (matcher(r.node, r.parent)) { + return r.node; } } return null; @@ -82,21 +82,21 @@ button { */ function findByValue(ast, matcher) { let source; - for (const { node } of walk(ast)) { + for (const r1 of walk(ast)) { source = null; - if (node.typ === EnumToken.DeclarationNodeType) { - source = node.val; + if (r1.node.typ === EnumToken.DeclarationNodeType) { + source = r1.node.val; } - else if (Array.isArray(node[TOKENS])) { - source = node[TOKENS]; + else if (Array.isArray(r1.node[TOKENS])) { + source = r1.node[TOKENS]; } if (source == null) { continue; } - for (const { value, parent, root: rootNode, parents } of walkValues(source, node)) { - if (matcher(value, node)) { + for (const r2 of walkValues(source, r1.node)) { + if (matcher(r2.value, r1.node)) { // @ts-ignore - return { node, value: { node: value, parent, root: rootNode, parents } }; + return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; } } } @@ -138,9 +138,9 @@ button-small { */ function findAll(ast, matcher) { const result = []; - for (const { node, parent } of walk(ast)) { - if (matcher(node, parent)) { - result.push(node); + for (const r of walk(ast)) { + if (matcher(r.node, r.node[PARENT])) { + result.push(r.node); } } return result; @@ -176,11 +176,12 @@ button { * @returns */ function findLast(ast, matcher) { - for (const { node, parent } of walk(ast, null, true)) { - if (matcher(node, parent)) { - return node; + for (const result of walk(ast, null, true)) + // for (const { node, parent } of walk(ast as AstNode, null, true)) { + if (matcher(result.node, result.parent)) { + return result.node; } - } + // } return null; } diff --git a/dist/src/lib/ast/walk.js b/dist/src/lib/ast/walk.js index 151a4637..3b670d8a 100644 --- a/dist/src/lib/ast/walk.js +++ b/dist/src/lib/ast/walk.js @@ -6,6 +6,7 @@ License: MIT */ import { PARENT, TOKENS } from '../syntax/constants.js'; +import { EnumToken } from './types.js'; /** * Options for the walk function @@ -126,7 +127,6 @@ function* walk(node, filter, reverse) { let isNumeric = false; let children = true; let attributes = false; - let i = 0; if (options != null && typeof options == "object") { filter = options.filter; reverse = options.reverse; @@ -146,12 +146,11 @@ function* walk(node, filter, reverse) { } }, }; - while ((node = parents[i++])) { - if (i > maxQueueLength) { - parents.splice(0, maxQueueLength); - i -= maxQueueLength; - } - let option = null; + let option = null; + let source = null; + while (parents.length > 0) { + node = parents.pop(); + // enter node if (filter != null) { // @ts-expect-error option = filter(node); @@ -172,25 +171,64 @@ function* walk(node, filter, reverse) { yield result; } if (attributes) { - if (node[TOKENS] != null) { + source = null; + if (Array.isArray(node[TOKENS])) { + source = node[TOKENS]; + } + else if (node.typ == EnumToken.DeclarationNodeType) { + source = node.val; + } + else if (node.l != null) { // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node[TOKENS].toReversed() : node[TOKENS])); - for (const child of node[TOKENS]) { - if (child[PARENT] != node) { - child[PARENT] = node; + if (Array.isArray(node.l)) { + // @ts-expect-error + source = node.l.slice(); + } + else { + // @ts-expect-error + source = [node.l]; + } + // @ts-expect-error + if (node.r != null) { + // @ts-expect-error + if (Array.isArray(node.r)) { + // @ts-expect-error + source.push(...node.r.slice()); + } + else { + // @ts-expect-error + source = [node.r]; } } // @ts-expect-error - } - else if (Array.isArray(node.val)) { + if (node.op != null && typeof node.op == "object") { + // @ts-expect-error + source.push(node.op); + } // @ts-expect-error - for (const val of node.val) { - if (val[PARENT] != node) { - val[PARENT] = node; - } + if (node.op1 != null && typeof node.op1 == "object") { + // @ts-expect-error + source.push(node.op1); } // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); + if (node.op2 != null && typeof node.op2 == "object") { + // @ts-expect-error + source.push(node.op2); + } + } + if (source != null) { + if (reverse) { + for (let i = 0; i < node[TOKENS].length; i++) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; + } + } + else { + for (let i = node[TOKENS].length - 1; i >= 0; i--) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; + } + } } } if (children && @@ -198,13 +236,89 @@ function* walk(node, filter, reverse) { node["chi"] != null && (!isNumeric || (option & WalkerOptionEnum.IgnoreChildren) === 0)) { // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.chi.toReversed() : node.chi)); - for (const child of node.chi) { - if (child[PARENT] != node) { - child[PARENT] = node; + source = node.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + parents.push(source[i]); + source[i][PARENT] = node; + } + } + else { + for (let i = source.length - 1; i >= 0; i--) { + parents.push(source[i]); + source[i][PARENT] = node; } } + // for (const child of source as Array) { + // parents.push(child); + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } } + // } + // node = parents.pop() as AstNode; + // } + // while ((node = parents[i++])) { + // if (i > maxQueueLength) { + // parents.splice(0, maxQueueLength); + // i -= maxQueueLength; + // } + // let option: WalkerOption = null; + // if (filter != null) { + // // @ts-expect-error + // option = filter(node); + // isNumeric = typeof option == "number"; + // if (isNumeric) { + // if ((option as number) & WalkerOptionEnum.Ignore) { + // continue; + // } + // if ((option as number) & WalkerOptionEnum.Stop) { + // break; + // } + // } + // } + // if (!isNumeric || ((option as number) & WalkerOptionEnum.Children) === 0) { + // result.node = node; + // // @ts-expect-error + // result.parent = node[PARENT]; + // yield result; + // } + // if (attributes) { + // if (node[TOKENS] != null) { + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); + // for (const child of node[TOKENS] as AstNode[]) { + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } + // // @ts-expect-error + // } else if (Array.isArray(node.val)) { + // // @ts-expect-error + // for (const val of node.val) { + // if (val[PARENT] != node) { + // val[PARENT] = node; + // } + // } + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); + // } + // } + // if ( + // children && + // // @ts-expect-error + // node["chi"] != null && + // (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) + // ) { + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); + // for (const child of (node).chi) { + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } + // } } } /** diff --git a/dist/src/lib/parser/parse.js b/dist/src/lib/parser/parse.js index d5855be1..119b9648 100644 --- a/dist/src/lib/parser/parse.js +++ b/dist/src/lib/parser/parse.js @@ -701,54 +701,107 @@ function doParseSync(tokenizer, options = {}) { if (options.visitor != null) { const handlers = []; const visitors = parseVisitors(options.visitor, errors); - const subNodes = []; let parens; let genericKey; - let nodes = new Array(stats.tokensCount); - let i; - let k; - let j; - let freeBlock = 1; - nodes[0] = ast; - for (i = 0; i < nodes.length; i++) { - if (nodes[i] == null) { - break; - } - subNodes.length = 0; + let nodes = [ast]; + let node; + while (nodes.length > 0) { + node = nodes.pop(); if (visitors.includeTokens) { - switch (nodes[i].typ) { + switch (node.typ) { case EnumToken.RuleNodeType: case EnumToken.AtRuleNodeType: case EnumToken.KeyframesRuleNodeType: case EnumToken.KeyframesAtRuleNodeType: - for (const token of nodes[i][TOKENS]) { - subNodes.push(token); + for (let i = + // @ts-ignore + node[TOKENS].length - + 1; i >= 0; i--) { + // @ts-ignore + node[TOKENS][i][PARENT] = node; + nodes.push( + // @ts-ignore + node[TOKENS][i]); } break; case EnumToken.DeclarationNodeType: - for (const token of nodes[i].val) { - subNodes.push(token); + for (let i = + // @ts-ignore + node.val.length - 1; i >= 0; i--) { + node.val[i][PARENT] = node; + // @ts-ignore + nodes.push(node.val[i]); } break; } - } - // @ts-ignore - if (nodes[i].chi != null) { // @ts-ignore - for (const child of nodes[i].chi) { - subNodes.push(child); + if (node.l != null) { + // @ts-ignore + if (node.op2 != null) { + // @ts-ignore + nodes.push(node.op2); + // @ts-ignore + node.op2[PARENT] = node; + } + // @ts-ignore + if (node.op1 != null) { + // @ts-ignore + nodes.push(node.op1); + // @ts-ignore + node.op1[PARENT] = node; + } + // @ts-ignore + if (nodes.op != null && node.op.typ != null) { + // @ts-ignore + nodes.push(node.op); + // @ts-ignore + node.op[PARENT] = node; + } + // @ts-ignore + if (node.r != null) { + // @ts-ignore + if (Array.isArray(node.r)) { + // @ts-ignore + for (let i = node.r.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.r[i]); + // @ts-ignore + node.r[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.r); + // @ts-ignore + node.r[PARENT] = node; + } + } + // @ts-ignore + if (Array.isArray(node.l)) { + // @ts-ignore + for (let i = node.l.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.l[i]); + // @ts-ignore + node.l[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.l); + // @ts-ignore + node.l[PARENT] = node; + } } } - if (subNodes.length > 0) { - if (freeBlock <= i) { - freeBlock = i + 1; - } - for (k = 0; k < subNodes.length; k++) { - j = k + freeBlock; - nodes[j] = subNodes[k]; - nodes[j][PARENT] = nodes[i]; + // @ts-ignore + if (node.chi != null) { + for ( + // @ts-ignore + let i = node.chi.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.chi[i]); } - freeBlock += subNodes.length; } parens = null; handlers.length = 0; @@ -756,23 +809,23 @@ function doParseSync(tokenizer, options = {}) { handlers.push(...visitors.preAllVisitorsHandlers); } genericKey = - nodes[i].typ == EnumToken.DeclarationNodeType + node.typ == EnumToken.DeclarationNodeType ? "Declaration" - : nodes[i].typ == EnumToken.AtRuleNodeType + : node.typ == EnumToken.AtRuleNodeType ? "AtRule" - : nodes[i].typ == EnumToken.KeyframesAtRuleNodeType + : node.typ == EnumToken.KeyframesAtRuleNodeType ? "KeyframesAtRule" - : nodes[i].typ === EnumToken.KeyframesRuleNodeType + : node.typ === EnumToken.KeyframesRuleNodeType ? "KeyframesRule" - : nodes[i].typ == EnumToken.RuleNodeType + : node.typ == EnumToken.RuleNodeType ? "Rule" - : nodes[i].typ == EnumToken.KeyframesRuleNodeType + : node.typ == EnumToken.KeyframesRuleNodeType ? "KeyframesRule" : null; - let keyName = nodes[i].typ == EnumToken.DeclarationNodeType || nodes[i].typ == EnumToken.AtRuleNodeType - ? camelize(nodes[i].nam) - : nodes[i].typ == EnumToken.KeyframesAtRuleNodeType - ? camelize(nodes[i].val) + let keyName = node.typ == EnumToken.DeclarationNodeType || node.typ == EnumToken.AtRuleNodeType + ? camelize(node.nam) + : node.typ == EnumToken.KeyframesAtRuleNodeType + ? camelize(node.val) : null; if (visitors.allVisitorsHandlers?.size > 0) { handlers.push(...visitors.allVisitorsHandlers); @@ -792,10 +845,9 @@ function doParseSync(tokenizer, options = {}) { } } } - // @ts-ignore - if (map.has(nodes[i].typ)) { + if (map.has(node.typ)) { // @ts-ignore - for (const handler of map.get(nodes[i].typ)) { + for (const handler of map.get(node.typ)) { if (typeof handler == "function") { handlers.push(handler); } @@ -823,16 +875,15 @@ function doParseSync(tokenizer, options = {}) { if (handlers.length == 0) { continue; } - let node = nodes[i]; for (const callable of handlers) { - replacement = callable(node, nodes[i][PARENT], ast, + replacement = callable(node, node[PARENT], ast, // @ts-expect-error function* () { if (parens == null) { - let node = nodes[i][PARENT]; - while (node != null) { - yield node; - node = node[PARENT]; + let parent = node[PARENT]; + while (parent != null) { + yield parent; + parent = parent[PARENT]; } } }); @@ -843,37 +894,33 @@ function doParseSync(tokenizer, options = {}) { continue; } // @ts-ignore - node = replacement; + // node = replacement as AstNode; // - if (Array.isArray(node)) { + if (Array.isArray(replacement)) { break; } } - if (node != nodes[i]) { + // @ts-ignore + if (replacement != null && node != replacement) { // @ts-ignore - replaceNodeOrValue(nodes[i][PARENT], nodes[i], node); + replaceNodeOrValue(node[PARENT], node, replacement); } } nodes = null; } if (invalidNodes.length > 0) { - let count = invalidNodes.length; - for (const { node, parent } of walk(ast)) { + for (const node of invalidNodes) { if (options.lenient && node[STATE] & EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & EnumAstNodeStatus.Invalid || - node[STATE] & EnumAstNodeStatus.Unknown || - node[STATE] & EnumAstNodeStatus.Unparsed || - node[STATE] & EnumAstNodeStatus.Malformed || - node[STATE] & EnumAstNodeStatus.Disallowed) { + if (node[STATE] & + (EnumAstNodeStatus.Invalid | + EnumAstNodeStatus.Unknown | + EnumAstNodeStatus.Unparsed | + EnumAstNodeStatus.Malformed | + EnumAstNodeStatus.Disallowed)) { // @ts-ignore - parent.chi.splice(parent.chi.indexOf(node), 1); - node[PARENT] = null; - count--; - if (count == 0) { - break; - } + node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); } } } @@ -894,7 +941,6 @@ function doParseSync(tokenizer, options = {}) { ...stats, parse: `${(endParseTime - startTime).toFixed(2)}ms`, minify: `${(endTime - endParseTime).toFixed(2)}ms`, - // tokenize: `${(options?.parseInfo?.time ?? 0).toFixed(2)}ms`, total: `${(endTime - startTime).toFixed(2)}ms`, }, }; @@ -1684,58 +1730,107 @@ async function doParse(iter, options = {}) { let genericKey; const handlers = []; const visitors = parseVisitors(options.visitor, errors); - let nodes = new Array(stats.tokensCount); - const subNodes = []; - let i; - let k; - let j; - let freeblock = 1; - nodes[0] = ast; - for (i = 0; i < nodes.length; i++) { - if (nodes[i] == null) { - break; - } - subNodes.length = 0; + let nodes = [ast]; + let node; + // nodes[0] = ast; + while (nodes.length > 0) { + node = nodes.pop(); if (visitors.includeTokens) { - switch (nodes[i].typ) { + switch (node.typ) { case EnumToken.RuleNodeType: case EnumToken.AtRuleNodeType: case EnumToken.KeyframesRuleNodeType: case EnumToken.KeyframesAtRuleNodeType: - if (nodes[i][TOKENS] == null) { - if (nodes[i].typ == EnumToken.RuleNodeType) { - nodes[i][TOKENS] = parseString(nodes[i].sel); - } - } - for (const token of nodes[i][TOKENS]) { - subNodes.push(token); + for (let i = + // @ts-ignore + node[TOKENS].length - + 1; i >= 0; i--) { + // @ts-ignore + node[TOKENS][i][PARENT] = node; + nodes.push( + // @ts-ignore + node[TOKENS][i]); } break; case EnumToken.DeclarationNodeType: - for (const token of nodes[i].val) { - subNodes.push(token); + for (let i = + // @ts-ignore + node.val.length - 1; i >= 0; i--) { + // @ts-ignore + node.val[i][PARENT] = node; + // @ts-ignore + nodes.push(node.val[i]); } break; } - } - // @ts-ignore - if (nodes[i].chi != null) { // @ts-ignore - for (k = 0; k < nodes[i].chi.length; k++) { + if (node.l != null) { + // @ts-ignore + if (node.op2 != null) { + // @ts-ignore + nodes.push(node.op2); + // @ts-ignore + nodes.op2[PARENT] = node; + } + // @ts-ignore + if (node.op1 != null) { + // @ts-ignore + nodes.push(node.op1); + // @ts-ignore + nodes.op1[PARENT] = node; + } + // @ts-ignore + if (nodes.op != null && node.op.typ != null) { + // @ts-ignore + nodes.push(node.op); + // @ts-ignore + nodes.op[PARENT] = node; + } + // @ts-ignore + if (node.r != null) { + // @ts-ignore + if (Array.isArray(node.r)) { + // @ts-ignore + for (let i = node.r.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.r[i]); + // @ts-ignore + node.r[i][PARENT] = node; + } + } + else { + // @ts-ignore + nodes.push(node.r); + // @ts-ignore + node.r[PARENT] = node; + } + } // @ts-ignore - subNodes.push(nodes[i].chi[k]); + if (Array.isArray(node.l)) { + // @ts-ignore + for (let i = node.l.length - 1; i >= 0; i--) { + // @ts-ignore + node.l[i][PARENT] = node; + // @ts-ignore + nodes.push(node.l[i]); + } + } + else { + // @ts-ignore + nodes.push(node.l); + // @ts-ignore + node.l[PARENT] = node; + } } } - if (subNodes.length > 0) { - if (freeblock <= i) { - freeblock = i + 1; - } - for (k = 0; k < subNodes.length; k++) { - j = k + freeblock; - nodes[j] = subNodes[k]; - nodes[j][PARENT] = nodes[i]; + // @ts-ignore + if (node.chi != null) { + for ( + // @ts-ignore + let i = node.chi.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.chi[i]); } - freeblock += subNodes.length; } parens = null; handlers.length = 0; @@ -1743,23 +1838,23 @@ async function doParse(iter, options = {}) { handlers.push(...visitors.preAllVisitorsHandlers); } genericKey = - nodes[i].typ == EnumToken.DeclarationNodeType + node.typ == EnumToken.DeclarationNodeType ? "Declaration" - : nodes[i].typ == EnumToken.AtRuleNodeType + : node.typ == EnumToken.AtRuleNodeType ? "AtRule" - : nodes[i].typ == EnumToken.KeyframesAtRuleNodeType + : node.typ == EnumToken.KeyframesAtRuleNodeType ? "KeyframesAtRule" - : nodes[i].typ === EnumToken.KeyframesRuleNodeType + : node.typ === EnumToken.KeyframesRuleNodeType ? "KeyframesRule" - : nodes[i].typ == EnumToken.RuleNodeType + : node.typ == EnumToken.RuleNodeType ? "Rule" - : nodes[i].typ == EnumToken.KeyframesRuleNodeType + : node.typ == EnumToken.KeyframesRuleNodeType ? "KeyframesRule" : null; - let keyName = nodes[i].typ == EnumToken.DeclarationNodeType || nodes[i].typ == EnumToken.AtRuleNodeType - ? camelize(nodes[i].nam) - : nodes[i].typ == EnumToken.KeyframesAtRuleNodeType - ? camelize(nodes[i].val) + let keyName = node.typ == EnumToken.DeclarationNodeType || node.typ == EnumToken.AtRuleNodeType + ? camelize(node.nam) + : node.typ == EnumToken.KeyframesAtRuleNodeType + ? camelize(node.val) : null; if (visitors.allVisitorsHandlers?.size > 0) { handlers.push(...visitors.allVisitorsHandlers); @@ -1772,20 +1867,6 @@ async function doParse(iter, options = {}) { if (typeof handler == "function") { handlers.push(handler); } - // else if (Array.isArray(handler)) { - // for (const h of handler) { - // if (typeof h == "function") { - // handlers.push(h); - // } - // // @ts-ignore - // else if (h[keyName] != null) { - // // @ts-ignore - // handlers.push(h[keyName]); - // } - // } - // } else if (typeof handler.handler! == "function") { - // handlers.push(handler.handler); - // } // @ts-ignore else if (typeof handler[keyName] == "function") { // @ts-ignore @@ -1793,10 +1874,9 @@ async function doParse(iter, options = {}) { } } } - // @ts-ignore - if (map.has(nodes[i].typ)) { + if (map.has(node.typ)) { // @ts-ignore - for (const handler of map.get(nodes[i].typ)) { + for (const handler of map.get(node.typ)) { if (typeof handler == "function") { handlers.push(handler); } @@ -1824,16 +1904,16 @@ async function doParse(iter, options = {}) { if (handlers.length == 0) { continue; } - let node = nodes[i]; for (const callable of handlers) { - replacement = callable(node, nodes[i][PARENT], ast, + replacement = callable(node, node[PARENT], ast, // @ts-expect-error function* () { if (parens == null) { - let node = nodes[i][PARENT]; - while (node != null) { - yield node; - node = node[PARENT]; + let parent = node[PARENT]; + // let node = node[PARENT] as AstNode; + while (parent != null) { + yield parent; + parent = parent[PARENT]; } } }); @@ -1847,37 +1927,37 @@ async function doParse(iter, options = {}) { continue; } // @ts-ignore - node = replacement; + // node = replacement as AstNode; // - if (Array.isArray(node)) { + if (Array.isArray(replacement)) { break; } } - if (node != nodes[i]) { + // @ts-ignore + if (replacement != null && node != replacement) { + console.error({ + node, + replacement, + }); // @ts-ignore - replaceNodeOrValue(nodes[i][PARENT], nodes[i], node); + replaceNodeOrValue(node[PARENT], node, replacement); } } nodes = null; } if (invalidNodes.length > 0) { - let count = invalidNodes.length; - for (const { node, parent } of walk(ast)) { + for (const node of invalidNodes) { if (options.lenient && node[STATE] & EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & EnumAstNodeStatus.Invalid || - node[STATE] & EnumAstNodeStatus.Unknown || - node[STATE] & EnumAstNodeStatus.Unparsed || - node[STATE] & EnumAstNodeStatus.Malformed || - node[STATE] & EnumAstNodeStatus.Disallowed) { + if (node[STATE] & (EnumAstNodeStatus.Invalid | EnumAstNodeStatus.Unknown | EnumAstNodeStatus.Unparsed | EnumAstNodeStatus.Malformed | EnumAstNodeStatus.Disallowed)) { // @ts-ignore - parent.chi.splice(parent.chi.indexOf(node), 1); - node[PARENT] = null; - count--; - if (count == 0) { - break; - } + node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); + // node[PARENT] = null; + // count--; + // if (count == 0) { + // break; + // } } } } diff --git a/dist/src/lib/parser/utils/token.js b/dist/src/lib/parser/utils/token.js index 93091c98..ba5df9f0 100644 --- a/dist/src/lib/parser/utils/token.js +++ b/dist/src/lib/parser/utils/token.js @@ -39,9 +39,16 @@ function replaceNodeOrValue(parent, node, replacement) { if (replacement == null || (Array.isArray(replacement) && replacement.length === 0)) { throw new TypeError(`replacement is null`); } - for (const newNode of Array.isArray(replacement) ? replacement : [replacement]) { - if (newNode[PARENT] != node[PARENT]) { - newNode[PARENT] = node[PARENT]; + if (!Array.isArray(replacement)) { + if (replacement[PARENT] != parent) { + replacement[PARENT] = parent; + } + } + else { + for (const newNode of replacement) { + if (newNode[PARENT] != parent) { + newNode[PARENT] = parent; + } } } if (parent.typ == EnumToken.BinaryExpressionTokenType) { diff --git a/dist/src/lib/printer/render.js b/dist/src/lib/printer/render.js index e15bfb50..3b48051c 100644 --- a/dist/src/lib/printer/render.js +++ b/dist/src/lib/printer/render.js @@ -1144,9 +1144,9 @@ function renderValue(token, options = {}, cache = Object.create(null), reducer, case EnumToken.AngleTokenType: case EnumToken.LengthTokenType: case EnumToken.DimensionTokenType: - case EnumToken.UserDefinedDimensionTokenType: case EnumToken.FrequencyTokenType: case EnumToken.ResolutionTokenType: + case EnumToken.UserDefinedDimensionTokenType: let val = token.val.typ == EnumToken.FractionTokenType ? renderValue(token.val, options, cache) : minifyNumber(token.val); diff --git a/src/@types/walker.d.ts b/src/@types/walker.d.ts index c2737ab3..19a6316b 100644 --- a/src/@types/walker.d.ts +++ b/src/@types/walker.d.ts @@ -64,7 +64,7 @@ export declare interface WalkResult { /** * current node */ - node: AstNode; + node: AstNode | Token; /** * parent node */ @@ -76,7 +76,7 @@ export declare interface WalkResult { /** * parent nodes */ - parents: Generator; + parents: Generator; } /** diff --git a/src/lib/ast/features/inlinecssvariables.ts b/src/lib/ast/features/inlinecssvariables.ts index 28dcddfa..39ce395e 100644 --- a/src/lib/ast/features/inlinecssvariables.ts +++ b/src/lib/ast/features/inlinecssvariables.ts @@ -56,9 +56,10 @@ function replace( for (const { value, parent: parentValue } of walkValues((node).val)) { if ( - value.typ == EnumToken.MathFunctionTokenDefType || + value.typ == EnumToken.MathFunctionTokenType || (value.typ == EnumToken.WildCardFunctionTokenType && (value as FunctionToken).val == "var") ) { + if ( (value as FunctionToken).chi.length == 1 && (value as FunctionToken).chi[0].typ == EnumToken.DashedIdenTokenType diff --git a/src/lib/ast/find.ts b/src/lib/ast/find.ts index 23bd1b84..0b403e18 100644 --- a/src/lib/ast/find.ts +++ b/src/lib/ast/find.ts @@ -36,9 +36,9 @@ button { * @returns */ export function find(ast: AstNode, matcher: (node: AstNode, parent?: AstNode | null) => boolean): AstNode | null { - for (const { node, parent } of walk(ast)) { - if (matcher(node, parent)) { - return node; + for (const r of walk(ast)) { + if (matcher(r.node as AstNode, r.parent)) { + return r.node as AstNode; } } @@ -83,23 +83,23 @@ export function findByValue( ): { node: AstNode; value: TokenSearchResult } | null { let source: Token[] | null; - for (const { node } of walk(ast)) { + for (const r1 of walk(ast)) { source = null; - if (node.typ === EnumToken.DeclarationNodeType) { - source = (node as AstDeclaration).val; - } else if (Array.isArray(node[TOKENS])) { - source = node[TOKENS]; + if (r1.node.typ === EnumToken.DeclarationNodeType) { + source = (r1.node as AstDeclaration).val; + } else if (Array.isArray(r1.node[TOKENS])) { + source = r1.node[TOKENS]; } if (source == null) { continue; } - for (const { value, parent, root: rootNode, parents } of walkValues(source, node)) { - if (matcher(value, node)) { + for (const r2 of walkValues(source, r1.node)) { + if (matcher(r2.value, r1.node as AstNode)) { // @ts-ignore - return { node, value: { node: value, parent, root: rootNode, parents } }; + return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; } } } @@ -141,12 +141,15 @@ button-small { * @param matcher * @returns */ -export function findAll(ast: AstNode, matcher: (node: AstNode, parent?: AstNode | null) => boolean): AstNode[] { - const result: AstNode[] = []; +export function findAll( + ast: AstNode, + matcher: (node: AstNode | Token, parent?: AstNode | Token | null) => boolean, +): Array { + const result: Array = []; - for (const { node, parent } of walk(ast)) { - if (matcher(node, parent)) { - result.push(node); + for (const r of walk(ast)) { + if (matcher(r.node as AstNode, r.node[PARENT])) { + result.push(r.node); } } @@ -183,12 +186,16 @@ button { * @param matcher * @returns */ -export function findLast(ast: AstNode, matcher: (node: AstNode, parent?: AstNode | null) => boolean): AstNode | null { - for (const { node, parent } of walk(ast, null, true)) { - if (matcher(node, parent)) { - return node; - } - } +export function findLast( + ast: AstNode | Token, + matcher: (node: AstNode | Token, parent?: AstNode | Token | null) => boolean, +): AstNode | Token | null { + for (const result of walk(ast as AstNode, null, true)) + // for (const { node, parent } of walk(ast as AstNode, null, true)) { + if (matcher(result.node, result.parent)) { + return result.node; + } + // } return null; } diff --git a/src/lib/ast/walk.ts b/src/lib/ast/walk.ts index 4d4dec4d..1a54643d 100644 --- a/src/lib/ast/walk.ts +++ b/src/lib/ast/walk.ts @@ -1,4 +1,5 @@ import type { + AstDeclaration, AstNode, AstRuleList, FunctionToken, @@ -11,6 +12,7 @@ import type { WalkerValueFilter, WalkResult, } from "../../@types/index.d.ts"; +import type { BinaryExpressionToken, MediaRangeQueryToken } from "../../@types/token.d.ts"; import { PARENT, TOKENS } from "../syntax/constants.ts"; import { EnumToken } from "./types.ts"; @@ -277,18 +279,17 @@ export function walk(node: AstNode, filter?: WalkerOptions | null): Generator { - const parents: AstNode[] = [node]; + const parents: Array = [node]; const root: AstRuleList = node; let options: WalkerOptions | null = filter as WalkerOptions | null; let isNumeric: boolean = false; let children: boolean = true; let attributes: boolean = false; - let i: number = 0; if (options != null && typeof options == "object") { filter = options.filter as WalkerFilter; @@ -312,14 +313,14 @@ export function* walk( }, } as WalkResult; - while ((node = parents[i++])) { - if (i > maxQueueLength) { - parents.splice(0, maxQueueLength); - i -= maxQueueLength; - } + let option: WalkerOption = null; + let source: Token[] | null = null; + + while (parents.length > 0) { - let option: WalkerOption = null; + node = parents.pop() as AstNode | Token; + // enter node if (filter != null) { // @ts-expect-error option = filter(node); @@ -345,26 +346,65 @@ export function* walk( } if (attributes) { - if (node[TOKENS] != null) { + source = null; + + if (Array.isArray(node[TOKENS])) { + source = node[TOKENS] as Token[]; + } else if (node.typ == EnumToken.DeclarationNodeType) { + source = (node as AstDeclaration).val as Token[]; + } else if ((node as BinaryExpressionToken | MediaRangeQueryToken).l != null) { // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); + if (Array.isArray(node.l)) { + // @ts-expect-error + source = (node.l as Token[]).slice(); + } else { + // @ts-expect-error + source = [node.l as Token]; + } - for (const child of node[TOKENS] as AstNode[]) { - if (child[PARENT] != node) { - child[PARENT] = node; + // @ts-expect-error + if (node.r != null) { + // @ts-expect-error + if (Array.isArray(node.r)) { + // @ts-expect-error + source.push(...(node.r as Token[]).slice()); + } else { + // @ts-expect-error + source = [node.r as Token]; } } + // @ts-expect-error - } else if (Array.isArray(node.val)) { + if (node.op != null && typeof node.op == "object") { + // @ts-expect-error + source.push(node.op as Token); + } + // @ts-expect-error - for (const val of node.val) { - if (val[PARENT] != node) { - val[PARENT] = node; - } + if (node.op1 != null && typeof node.op1 == "object") { + // @ts-expect-error + source.push(node.op1 as Token); } // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); + if (node.op2 != null && typeof node.op2 == "object") { + // @ts-expect-error + source.push(node.op2 as Token); + } + } + + if (source != null) { + if (reverse) { + for (let i = 0; i < (node[TOKENS] as Token[]).length; i++) { + parents.push((node[TOKENS] as Token[])[i] as Token); + (node[TOKENS] as Token[])[i][PARENT] = node; + } + } else { + for (let i = (node[TOKENS] as Token[]).length - 1; i >= 0; i--) { + parents.push((node[TOKENS] as Token[])[i] as Token); + (node[TOKENS] as Token[])[i][PARENT] = node; + } + } } } @@ -375,14 +415,104 @@ export function* walk( (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) ) { // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); + source = node.chi ; - for (const child of (node).chi) { - if (child[PARENT] != node) { - child[PARENT] = node; + if (reverse) { + for (let i = 0; i < source!.length; i++) { + parents.push(source![i]); + source![i][PARENT] = node; + } + } else { + for (let i = source!.length - 1; i >= 0; i--) { + parents.push(source![i]); + source![i][PARENT] = node } } + + // for (const child of source as Array) { + // parents.push(child); + + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } } + // } + + // node = parents.pop() as AstNode; + // } + + // while ((node = parents[i++])) { + // if (i > maxQueueLength) { + // parents.splice(0, maxQueueLength); + // i -= maxQueueLength; + // } + + // let option: WalkerOption = null; + + // if (filter != null) { + // // @ts-expect-error + // option = filter(node); + // isNumeric = typeof option == "number"; + + // if (isNumeric) { + // if ((option as number) & WalkerOptionEnum.Ignore) { + // continue; + // } + + // if ((option as number) & WalkerOptionEnum.Stop) { + // break; + // } + // } + // } + + // if (!isNumeric || ((option as number) & WalkerOptionEnum.Children) === 0) { + // result.node = node; + // // @ts-expect-error + // result.parent = node[PARENT]; + + // yield result; + // } + + // if (attributes) { + // if (node[TOKENS] != null) { + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); + + // for (const child of node[TOKENS] as AstNode[]) { + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } + // // @ts-expect-error + // } else if (Array.isArray(node.val)) { + // // @ts-expect-error + // for (const val of node.val) { + // if (val[PARENT] != node) { + // val[PARENT] = node; + // } + // } + + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); + // } + // } + + // if ( + // children && + // // @ts-expect-error + // node["chi"] != null && + // (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) + // ) { + // // @ts-expect-error + // parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); + + // for (const child of (node).chi) { + // if (child[PARENT] != node) { + // child[PARENT] = node; + // } + // } + // } } } diff --git a/src/lib/parser/parse.ts b/src/lib/parser/parse.ts index 8cc753d9..77f80a80 100644 --- a/src/lib/parser/parse.ts +++ b/src/lib/parser/parse.ts @@ -924,65 +924,129 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { const handlers = [] as Array>; const visitors = parseVisitors(options.visitor, errors); - const subNodes: Array = []; let parens: Token[] | null; let genericKey: string | null; - let nodes: AstNode[] | null = new Array(stats.tokensCount); + let nodes: Array | null = [ast]; let i: number; - let k: number; - let j: number; - let freeBlock: number = 1; - nodes[0] = ast; - - for (i = 0; i < nodes.length; i++) { - if (nodes[i] == null) { - break; - } + let node: AstNode | Token | null; + while (nodes.length > 0) { + node = nodes.pop() as AstNode | Token; - subNodes.length = 0; if (visitors.includeTokens) { - switch (nodes[i].typ) { + switch (node.typ) { case EnumToken.RuleNodeType: case EnumToken.AtRuleNodeType: case EnumToken.KeyframesRuleNodeType: case EnumToken.KeyframesAtRuleNodeType: - for (const token of (nodes[i] as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule)[ - TOKENS - ]!) { - subNodes.push(token); + for ( + let i = + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule)[TOKENS].length - + 1; + i >= 0; + i-- + ) { + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule)[TOKENS][i][PARENT] = + node; + nodes.push( + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule)[TOKENS][i], + ); } break; case EnumToken.DeclarationNodeType: - for (const token of (nodes[i] as AstDeclaration).val) { - subNodes.push(token); + for ( + let i = + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule).val.length - 1; + i >= 0; + i-- + ) { + (node as AstDeclaration).val[i][PARENT] = node; + // @ts-ignore + nodes.push((node as AstDeclaration).val[i]); } break; } - } - // @ts-ignore - if (nodes[i].chi != null) { // @ts-ignore - for (const child of nodes[i].chi) { - subNodes.push(child); - } - } + if (node.l != null) { + // @ts-ignore + if (node.op2 != null) { + // @ts-ignore + nodes.push(node.op2); + // @ts-ignore + node.op2[PARENT] = node; + } - if (subNodes.length > 0) { - if (freeBlock <= i) { - freeBlock = i + 1; - } + // @ts-ignore + if (node.op1 != null) { + // @ts-ignore + nodes.push(node.op1); + // @ts-ignore + node.op1[PARENT] = node; + } - for (k = 0; k < subNodes.length; k++) { - j = k + freeBlock; - nodes[j] = subNodes[k] as AstNode; - nodes[j][PARENT] = nodes[i]; + // @ts-ignore + if (nodes.op != null && node.op.typ != null) { + // @ts-ignore + nodes.push(node.op); + // @ts-ignore + node.op[PARENT] = node; + } + + // @ts-ignore + if (node.r != null) { + // @ts-ignore + if (Array.isArray(node.r)) { + // @ts-ignore + for (let i = node.r.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.r[i]); + // @ts-ignore + node.r[i][PARENT] = node; + } + } else { + // @ts-ignore + nodes.push(node.r); + // @ts-ignore + node.r[PARENT] = node; + } + } + + // @ts-ignore + if (Array.isArray(node.l)) { + // @ts-ignore + for (let i = node.l.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.l[i]); + // @ts-ignore + node.l[i][PARENT] = node; + } + } else { + // @ts-ignore + nodes.push(node.l); + // @ts-ignore + node.l[PARENT] = node; + } } + } - freeBlock += subNodes.length; + // @ts-ignore + if (node.chi != null) { + for ( + // @ts-ignore + let i = (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule).chi.length - 1; + i >= 0; + i-- + ) { + // @ts-ignore + nodes.push((node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule).chi[i]); + } } parens = null; @@ -993,24 +1057,24 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } genericKey = - nodes[i].typ == EnumToken.DeclarationNodeType + node.typ == EnumToken.DeclarationNodeType ? "Declaration" - : nodes[i].typ == EnumToken.AtRuleNodeType + : node.typ == EnumToken.AtRuleNodeType ? "AtRule" - : nodes[i].typ == EnumToken.KeyframesAtRuleNodeType + : node.typ == EnumToken.KeyframesAtRuleNodeType ? "KeyframesAtRule" - : nodes[i].typ === EnumToken.KeyframesRuleNodeType + : node.typ === EnumToken.KeyframesRuleNodeType ? "KeyframesRule" - : nodes[i].typ == EnumToken.RuleNodeType + : node.typ == EnumToken.RuleNodeType ? "Rule" - : nodes[i].typ == EnumToken.KeyframesRuleNodeType + : node.typ == EnumToken.KeyframesRuleNodeType ? "KeyframesRule" : null; let keyName: string | null = - nodes[i].typ == EnumToken.DeclarationNodeType || nodes[i].typ == EnumToken.AtRuleNodeType - ? camelize((nodes[i] as AstDeclaration | AstAtRule).nam) - : nodes[i].typ == EnumToken.KeyframesAtRuleNodeType - ? camelize((nodes[i] as AstKeyframesAtRule).val) + node.typ == EnumToken.DeclarationNodeType || node.typ == EnumToken.AtRuleNodeType + ? camelize((node as AstDeclaration | AstAtRule).nam) + : node.typ == EnumToken.KeyframesAtRuleNodeType + ? camelize((node as AstKeyframesAtRule).val) : null; if (visitors.allVisitorsHandlers?.size! > 0) { @@ -1034,10 +1098,9 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } } - // @ts-ignore - if (map!.has(nodes[i].typ)) { + if (map!.has(node.typ)) { // @ts-ignore - for (const handler of map!.get(nodes[i].typ)!) { + for (const handler of map!.get(node.typ)!) { if (typeof handler == "function") { handlers.push(handler as GenericVisitorHandler); } else if (Array.isArray(handler)) { @@ -1067,21 +1130,19 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { continue; } - let node = nodes[i]; - for (const callable of handlers) { replacement = (callable as GenericVisitorHandler)( node as T, - nodes[i][PARENT] as AstNode, + node[PARENT] as AstNode, ast as AstStyleSheet, // @ts-expect-error function* () { if (parens == null) { - let node = nodes![i][PARENT] as AstNode; + let parent = node![PARENT] as AstNode; - while (node != null) { - yield node; - node = node[PARENT] as AstNode; + while (parent != null) { + yield parent; + parent = parent[PARENT] as AstNode; } } }, @@ -1096,17 +1157,18 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } // @ts-ignore - node = replacement as AstNode; + // node = replacement as AstNode; // - if (Array.isArray(node)) { + if (Array.isArray(replacement)) { break; } } - if (node != nodes[i]) { + // @ts-ignore + if (replacement != null && node != replacement) { // @ts-ignore - replaceNodeOrValue(nodes[i][PARENT], nodes[i], node); + replaceNodeOrValue(node[PARENT], node, replacement); } } @@ -1114,28 +1176,21 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } if (invalidNodes.length > 0) { - let count: number = invalidNodes.length; - - for (const { node, parent } of walk(ast)) { + for (const node of invalidNodes) { if (options.lenient && node[STATE] & EnumAstNodeStatus.Unknown) { continue; } if ( - node[STATE] & EnumAstNodeStatus.Invalid || - node[STATE] & EnumAstNodeStatus.Unknown || - node[STATE] & EnumAstNodeStatus.Unparsed || - node[STATE] & EnumAstNodeStatus.Malformed || - node[STATE] & EnumAstNodeStatus.Disallowed + node[STATE] & + (EnumAstNodeStatus.Invalid | + EnumAstNodeStatus.Unknown | + EnumAstNodeStatus.Unparsed | + EnumAstNodeStatus.Malformed | + EnumAstNodeStatus.Disallowed) ) { // @ts-ignore - parent!.chi.splice(parent!.chi.indexOf(node), 1); - node[PARENT] = null; - count--; - - if (count == 0) { - break; - } + node[PARENT].chi.splice(node[PARENT]!.chi.indexOf(node), 1); } } } @@ -1160,7 +1215,6 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { ...stats, parse: `${(endParseTime - startTime).toFixed(2)}ms`, minify: `${(endTime - endParseTime).toFixed(2)}ms`, - // tokenize: `${(options?.parseInfo?.time ?? 0).toFixed(2)}ms`, total: `${(endTime - startTime).toFixed(2)}ms`, }, } as ParseResult; @@ -1251,6 +1305,7 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { // @ts-ignore if (node.typ == EnumToken.CssVariableDeclarationMapTokenType) { + // @ts-ignore const from = (node as CssVariableMapTokenType).from.find( (t) => t.typ == EnumToken.IdenTokenType || isIdentColor(t), ) as IdentToken; @@ -1262,6 +1317,7 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { action: "drop", }); } else { + // @ts-ignore for (const token of (node as CssVariableMapTokenType).vars) { if (token.typ == EnumToken.IdenTokenType || isIdentColor(token)) { if (!((token as IdentToken).val in cssVariablesMap[from.val])) { @@ -1292,42 +1348,43 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { result.cssModuleVariables = {} as Record; } - result.cssModuleVariables[node.nam] = node; + // @ts-ignore + result.cssModuleVariables[(node as AstDeclaration).nam] = node; } parent!.chi!.splice(parent!.chi!.indexOf(node), 1); continue; } if (node.typ == EnumToken.DeclarationNodeType) { - if (node.nam.startsWith("--")) { - if (!(node.nam in namesMapping)) { + if ((node as AstDeclaration).nam.startsWith("--")) { + if (!((node as AstDeclaration).nam in namesMapping)) { let value: string = moduleSettings.scoped! & ModuleScopeEnumOptions.Global - ? node.nam + ? (node as AstDeclaration).nam : moduleSettings.generateScopedName!( - node.nam, + (node as AstDeclaration).nam, moduleSettings.filePath as string, moduleSettings.pattern as string, moduleSettings.hashLength, ); - mapping[node.nam] = + mapping[(node as AstDeclaration).nam] = "--" + (moduleSettings.naming! & ModuleCaseTransformEnum.DashCaseOnly || moduleSettings.naming! & ModuleCaseTransformEnum.CamelCaseOnly ? getKeyName(value, moduleSettings.naming as ModuleCaseTransformEnum) : value); - revMapping[node.nam] = node.nam; + revMapping[(node as AstDeclaration).nam] = (node as AstDeclaration).nam; } - node.nam = mapping[node.nam]; + (node as AstDeclaration).nam = mapping[(node as AstDeclaration).nam]; } - if (equalsIgnoreCase("composes", node.nam)) { + if (equalsIgnoreCase("composes", (node as AstDeclaration).nam)) { const composeSelectors = [] as ComposesSelectorToken[]; // let isValid: boolean = true; - for (const token of node.val) { + for (const token of (node as AstDeclaration).val) { if (token.typ == EnumToken.ComposesSelectorNodeType) { composeSelectors.push(token as ComposesSelectorToken); } @@ -1347,7 +1404,10 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { node, }); - (parentRule as AstRule).chi.splice((parentRule as AstRule).chi.indexOf(node), 1); + (parentRule as AstRule).chi.splice( + (parentRule as AstRule).chi.indexOf(node as AstDeclaration), + 1, + ); continue; } @@ -1448,7 +1508,7 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } } - (parent as AstRule).chi.splice((parent as AstRule).chi.indexOf(node), 1); + (parent as AstRule).chi.splice((parent as AstRule).chi.indexOf(node as AstDeclaration), 1); } if ( @@ -1463,9 +1523,9 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { "grid-template", "grid-template-columns", "grid-template-rows", - ].includes(node.nam) + ].includes((node as AstDeclaration).nam) ) { - for (const { value } of walkValues(node.val, node)) { + for (const { value } of walkValues((node as AstDeclaration).val, node)) { if (value.typ != EnumToken.IdenTokenType) { continue; } @@ -1507,10 +1567,15 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { (value as IdentToken).val = mapping[idenToken]; } - } else if (node.nam == "grid-template-areas" || node.nam == "grid-template") { - for (let i = 0; i < node.val.length; i++) { - if (node.val[i].typ == EnumToken.String) { - const tokens = parseString((node.val[i] as StringToken).val.slice(1, -1)); + } else if ( + (node as AstDeclaration).nam == "grid-template-areas" || + (node as AstDeclaration).nam == "grid-template" + ) { + for (let i = 0; i < (node as AstDeclaration).val.length; i++) { + if ((node as AstDeclaration).val[i].typ == EnumToken.String) { + const tokens = parseString( + ((node as AstDeclaration).val[i] as StringToken).val.slice(1, -1), + ); for (const { value } of walkValues(tokens)) { if ( @@ -1537,14 +1602,19 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } } - (node.val[i] as StringToken).val = - (node.val[i] as StringToken).val.charAt(0) + + ((node as AstDeclaration).val[i] as StringToken).val = + ((node as AstDeclaration).val[i] as StringToken).val.charAt(0) + renderTokens(tokens) + - (node.val[i] as StringToken).val.charAt((node.val[i] as StringToken).val.length - 1); + ((node as AstDeclaration).val[i] as StringToken).val.charAt( + ((node as AstDeclaration).val[i] as StringToken).val.length - 1, + ); } } - } else if (node.nam == "animation" || node.nam == "animation-name") { - for (const { value } of walkValues(node.val, node)) { + } else if ( + (node as AstDeclaration).nam == "animation" || + (node as AstDeclaration).nam == "animation-name" + ) { + for (const { value } of walkValues((node as AstDeclaration).val, node)) { if ( value.typ == EnumToken.IdenTokenType && ![ @@ -1595,20 +1665,20 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } } - for (const { value, parent } of walkValues(node.val, node)) { - if (value.typ == EnumToken.DashedIdenTokenType) { - (value as DashedIdentToken).val = mapping[(value as DashedIdentToken).val]; + for (const r of walkValues((node as AstDeclaration).val, node)) { + if (r.value.typ == EnumToken.DashedIdenTokenType) { + (r.value as DashedIdentToken).val = mapping[(r.value as DashedIdentToken).val]; } else if ( - (value.typ == EnumToken.IdenTokenType || isIdentColor(value)) && - (value as IdentToken).val in importedCssVariables + (r.value.typ == EnumToken.IdenTokenType || isIdentColor(r.value)) && + (r.value as IdentToken).val in importedCssVariables ) { // @ts-ignore - replaceNodeOrValue(parent, value, importedCssVariables[(value as IdentToken).val].val); + replaceNodeOrValue(r.parent, r.value, importedCssVariables[(value as IdentToken).val].val); } } } else if (node.typ == EnumToken.RuleNodeType) { // if (node[TOKENS] == null) { - const tokens = parseString(node.sel); + const tokens = parseString((node as AstRule).sel); matchSelectorSyntax(tokens, [] as ErrorDescription[], options); node[TOKENS] = trimArray(tokens); @@ -1710,21 +1780,21 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { if (moduleSettings.scoped! & ModuleScopeEnumOptions.Pure) { if (!hasIdOrClass) { throw new Error( - `pure module: No id or class found in selector '${node.sel}' at '${options.source!.getOffsets(node[LOCSTA] as number).join(":")}'`, + `pure module: No id or class found in selector '${(node as AstRule).sel}' at '${options.source!.getOffsets(node[LOCSTA] as number).join(":")}'`, ); } } - node.sel = ""; + (node as AstRule).sel = ""; for (const token of node[TOKENS]! as Token[]) { - node.sel += renderValue(token); + (node as AstRule).sel += renderValue(token); } } else if (node.typ == EnumToken.AtRuleNodeType || node.typ == EnumToken.KeyframesAtRuleNodeType) { - const val: string = node.nam.toLowerCase(); + const val: string = (node as AstAtRule).nam.toLowerCase(); if (node[TOKENS] == null) { - node[TOKENS] = parseString(node.val); + node[TOKENS] = parseString((node as AstAtRule).val); } if (val == "property" || val == "keyframes") { @@ -2147,68 +2217,133 @@ export async function doParse(iter: Tokenizer | Promise, options: Par const handlers = [] as Array>; const visitors = parseVisitors(options.visitor, errors); - let nodes: AstNode[] | null = new Array(stats.tokensCount); - const subNodes: Array = []; + let nodes: Array | null = [ast]; let i: number; let k: number; let j: number; let freeblock: number = 1; - nodes[0] = ast; + let node: AstNode | Token; + // nodes[0] = ast; - for (i = 0; i < nodes.length; i++) { - if (nodes[i] == null) { - break; - } + while (nodes.length > 0) { + node = nodes.pop() as AstNode | Token; - subNodes.length = 0; if (visitors.includeTokens) { - switch (nodes[i].typ) { + switch (node.typ) { case EnumToken.RuleNodeType: case EnumToken.AtRuleNodeType: case EnumToken.KeyframesRuleNodeType: case EnumToken.KeyframesAtRuleNodeType: - if (nodes[i][TOKENS] == null) { - if (nodes[i].typ == EnumToken.RuleNodeType) { - nodes[i][TOKENS] = parseString((nodes[i] as AstRule).sel); - } - } - - for (const token of (nodes[i] as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule)[ - TOKENS - ]!) { - subNodes.push(token); + for ( + let i = + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule)[TOKENS].length - + 1; + i >= 0; + i-- + ) { + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule)[TOKENS][i][PARENT] = + node; + nodes.push( + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule)[TOKENS][i], + ); } break; case EnumToken.DeclarationNodeType: - for (const token of (nodes[i] as AstDeclaration).val) { - subNodes.push(token); + for ( + let i = + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule).val.length - 1; + i >= 0; + i-- + ) { + // @ts-ignore + (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule).val[i][PARENT] = node; + // @ts-ignore + nodes.push((node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule).val[i]); } + break; } - } - // @ts-ignore - if (nodes[i].chi != null) { // @ts-ignore - for (k = 0; k < nodes[i].chi.length; k++) { + if (node.l != null) { // @ts-ignore - subNodes.push(nodes[i].chi[k]); - } - } + if (node.op2 != null) { + // @ts-ignore + nodes.push(node.op2); + // @ts-ignore + nodes.op2[PARENT] = node; + } - if (subNodes.length > 0) { - if (freeblock <= i) { - freeblock = i + 1; - } + // @ts-ignore + if (node.op1 != null) { + // @ts-ignore + nodes.push(node.op1); + // @ts-ignore + nodes.op1[PARENT] = node; + } - for (k = 0; k < subNodes.length; k++) { - j = k + freeblock; - nodes[j] = subNodes[k] as AstNode; - nodes[j][PARENT] = nodes[i]; + // @ts-ignore + if (nodes.op != null && node.op.typ != null) { + // @ts-ignore + nodes.push(node.op); + // @ts-ignore + nodes.op[PARENT] = node; + } + + // @ts-ignore + if (node.r != null) { + // @ts-ignore + if (Array.isArray(node.r)) { + // @ts-ignore + for (let i = node.r.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.r[i]); + // @ts-ignore + node.r[i][PARENT] = node; + } + } else { + // @ts-ignore + nodes.push(node.r); + // @ts-ignore + node.r[PARENT] = node; + } + } + + // @ts-ignore + if (Array.isArray(node.l)) { + // @ts-ignore + for (let i = node.l.length - 1; i >= 0; i--) { + // @ts-ignore + node.l[i][PARENT] = node; + // @ts-ignore + nodes.push(node.l[i]); + } + } else { + // @ts-ignore + nodes.push(node.l); + + // @ts-ignore + node.l[PARENT] = node; + } } + } - freeblock += subNodes.length; + // @ts-ignore + if (node.chi != null) { + for ( + // @ts-ignore + let i = (node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule).chi.length - 1; + i >= 0; + i-- + ) { + // @ts-ignore + nodes.push((node as AstRule | AstAtRule | AstKeyframesRule | AstKeyframesAtRule).chi[i]); + } } parens = null; @@ -2219,24 +2354,24 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } genericKey = - nodes[i].typ == EnumToken.DeclarationNodeType + node.typ == EnumToken.DeclarationNodeType ? "Declaration" - : nodes[i].typ == EnumToken.AtRuleNodeType + : node.typ == EnumToken.AtRuleNodeType ? "AtRule" - : nodes[i].typ == EnumToken.KeyframesAtRuleNodeType + : node.typ == EnumToken.KeyframesAtRuleNodeType ? "KeyframesAtRule" - : nodes[i].typ === EnumToken.KeyframesRuleNodeType + : node.typ === EnumToken.KeyframesRuleNodeType ? "KeyframesRule" - : nodes[i].typ == EnumToken.RuleNodeType + : node.typ == EnumToken.RuleNodeType ? "Rule" - : nodes[i].typ == EnumToken.KeyframesRuleNodeType + : node.typ == EnumToken.KeyframesRuleNodeType ? "KeyframesRule" : null; let keyName: string | null = - nodes[i].typ == EnumToken.DeclarationNodeType || nodes[i].typ == EnumToken.AtRuleNodeType - ? camelize((nodes[i] as AstDeclaration | AstAtRule).nam) - : nodes[i].typ == EnumToken.KeyframesAtRuleNodeType - ? camelize((nodes[i] as AstKeyframesAtRule).val) + node.typ == EnumToken.DeclarationNodeType || node.typ == EnumToken.AtRuleNodeType + ? camelize((node as AstDeclaration | AstAtRule).nam) + : node.typ == EnumToken.KeyframesAtRuleNodeType + ? camelize((node as AstKeyframesAtRule).val) : null; if (visitors.allVisitorsHandlers?.size! > 0) { @@ -2252,22 +2387,6 @@ export async function doParse(iter: Tokenizer | Promise, options: Par handlers.push(handler as GenericVisitorHandler); } - // else if (Array.isArray(handler)) { - // for (const h of handler) { - // if (typeof h == "function") { - // handlers.push(h); - // } - - // // @ts-ignore - // else if (h[keyName] != null) { - // // @ts-ignore - // handlers.push(h[keyName]); - // } - // } - // } else if (typeof handler.handler! == "function") { - // handlers.push(handler.handler); - // } - // @ts-ignore else if (typeof handler[keyName]! == "function") { // @ts-ignore @@ -2276,10 +2395,9 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } } - // @ts-ignore - if (map!.has(nodes[i].typ)) { + if (map!.has(node.typ)) { // @ts-ignore - for (const handler of map!.get(nodes[i].typ)!) { + for (const handler of map!.get(node.typ)!) { if (typeof handler == "function") { handlers.push(handler as GenericVisitorHandler); } else if (Array.isArray(handler)) { @@ -2309,21 +2427,20 @@ export async function doParse(iter: Tokenizer | Promise, options: Par continue; } - let node = nodes[i] as AstNode; - for (const callable of handlers) { replacement = (callable as GenericVisitorHandler)( node as T, - nodes[i][PARENT] as AstNode, + node[PARENT] as AstNode, ast as AstStyleSheet, // @ts-expect-error function* () { if (parens == null) { - let node = nodes![i][PARENT] as AstNode; + let parent: AstNode | AstNode[] = node[PARENT] as AstNode; + // let node = node[PARENT] as AstNode; - while (node != null) { - yield node; - node = node[PARENT] as AstNode; + while (parent != null) { + yield parent; + parent = parent[PARENT] as AstNode; } } }, @@ -2342,17 +2459,23 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } // @ts-ignore - node = replacement as AstNode; + // node = replacement as AstNode; // - if (Array.isArray(node)) { + if (Array.isArray(replacement)) { break; } } - if (node != nodes[i]) { + // @ts-ignore + if (replacement != null && node != replacement) { + console.error({ + node, + replacement, + }); + // @ts-ignore - replaceNodeOrValue(nodes[i]![PARENT] as AstNode, nodes[i], node); + replaceNodeOrValue(node![PARENT] as AstNode, node, replacement); } } @@ -2362,26 +2485,27 @@ export async function doParse(iter: Tokenizer | Promise, options: Par if (invalidNodes.length > 0) { let count: number = invalidNodes.length; - for (const { node, parent } of walk(ast)) { + for (const node of invalidNodes) { if (options.lenient && node[STATE] & EnumAstNodeStatus.Unknown) { continue; } if ( - node[STATE] & EnumAstNodeStatus.Invalid || - node[STATE] & EnumAstNodeStatus.Unknown || - node[STATE] & EnumAstNodeStatus.Unparsed || - node[STATE] & EnumAstNodeStatus.Malformed || - node[STATE] & EnumAstNodeStatus.Disallowed + node[STATE] & + (EnumAstNodeStatus.Invalid | + EnumAstNodeStatus.Unknown | + EnumAstNodeStatus.Unparsed | + EnumAstNodeStatus.Malformed | + EnumAstNodeStatus.Disallowed) ) { // @ts-ignore - parent!.chi.splice(parent!.chi.indexOf(node), 1); - node[PARENT] = null; - count--; + node[PARENT]!.chi.splice(node[PARENT]!.chi.indexOf(node), 1); + // node[PARENT] = null; + // count--; - if (count == 0) { - break; - } + // if (count == 0) { + // break; + // } } } } @@ -2535,6 +2659,7 @@ export async function doParse(iter: Tokenizer | Promise, options: Par // @ts-ignore if (node.typ == EnumToken.CssVariableDeclarationMapTokenType) { + // @ts-ignore const from = (node as CssVariableMapTokenType).from.find( (t) => t.typ == EnumToken.IdenTokenType || isIdentColor(t), ) as IdentToken; @@ -2546,6 +2671,7 @@ export async function doParse(iter: Tokenizer | Promise, options: Par action: "drop", }); } else { + // @ts-ignore for (const token of (node as CssVariableMapTokenType).vars) { if (token.typ == EnumToken.IdenTokenType || isIdentColor(token)) { if (!((token as IdentToken).val in cssVariablesMap[from.val])) { @@ -2576,20 +2702,21 @@ export async function doParse(iter: Tokenizer | Promise, options: Par result.cssModuleVariables = {} as Record; } - result.cssModuleVariables[node.nam] = node; + // @ts-ignore + result.cssModuleVariables[(node as AstDeclaration).nam] = node; } parent!.chi!.splice(parent!.chi!.indexOf(node), 1); continue; } if (node.typ == EnumToken.DeclarationNodeType) { - if (node.nam.startsWith("--")) { - if (!(node.nam in namesMapping)) { + if ((node as AstDeclaration).nam.startsWith("--")) { + if (!((node as AstDeclaration).nam in namesMapping)) { let result = moduleSettings.scoped! & ModuleScopeEnumOptions.Global - ? node.nam + ? (node as AstDeclaration).nam : moduleSettings.generateScopedName!( - node.nam, + (node as AstDeclaration).nam, moduleSettings.filePath as string, moduleSettings.pattern as string, moduleSettings.hashLength, @@ -2597,23 +2724,23 @@ export async function doParse(iter: Tokenizer | Promise, options: Par // @ts-ignore let value: string = result instanceof Promise ? await result : result; - mapping[node.nam] = + mapping[(node as AstDeclaration).nam] = "--" + (moduleSettings.naming! & ModuleCaseTransformEnum.DashCaseOnly || moduleSettings.naming! & ModuleCaseTransformEnum.CamelCaseOnly ? getKeyName(value, moduleSettings.naming as ModuleCaseTransformEnum) : value); - revMapping[node.nam] = node.nam; + revMapping[(node as AstDeclaration).nam] = (node as AstDeclaration).nam; } - node.nam = mapping[node.nam]; + (node as AstDeclaration).nam = mapping[(node as AstDeclaration).nam]; } - if (equalsIgnoreCase("composes", node.nam)) { + if (equalsIgnoreCase("composes", (node as AstDeclaration).nam)) { const composeSelectors = [] as ComposesSelectorToken[]; // let isValid: boolean = true; - for (const token of node.val) { + for (const token of (node as AstDeclaration).val) { if (token.typ == EnumToken.ComposesSelectorNodeType) { composeSelectors.push(token as ComposesSelectorToken); } @@ -2633,7 +2760,10 @@ export async function doParse(iter: Tokenizer | Promise, options: Par node, }); - (parentRule as AstRule).chi.splice((parentRule as AstRule).chi.indexOf(node), 1); + (parentRule as AstRule).chi.splice( + (parentRule as AstRule).chi.indexOf(node as AstDeclaration), + 1, + ); continue; } @@ -2836,7 +2966,7 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } } - (parent as AstRule).chi.splice((parent as AstRule).chi.indexOf(node), 1); + (parent as AstRule).chi.splice((parent as AstRule).chi.indexOf(node as AstDeclaration), 1); } if ( @@ -2851,9 +2981,9 @@ export async function doParse(iter: Tokenizer | Promise, options: Par "grid-template", "grid-template-columns", "grid-template-rows", - ].includes(node.nam) + ].includes((node as AstDeclaration).nam) ) { - for (const { value } of walkValues(node.val, node)) { + for (const { value } of walkValues((node as AstDeclaration).val, node)) { if (value.typ != EnumToken.IdenTokenType) { continue; } @@ -2900,10 +3030,15 @@ export async function doParse(iter: Tokenizer | Promise, options: Par (value as IdentToken).val = mapping[idenToken]; } - } else if (node.nam == "grid-template-areas" || node.nam == "grid-template") { - for (let i = 0; i < node.val.length; i++) { - if (node.val[i].typ == EnumToken.String) { - const tokens = parseString((node.val[i] as StringToken).val.slice(1, -1)); + } else if ( + (node as AstDeclaration).nam == "grid-template-areas" || + (node as AstDeclaration).nam == "grid-template" + ) { + for (let i = 0; i < (node as AstDeclaration).val.length; i++) { + if ((node as AstDeclaration).val[i].typ == EnumToken.String) { + const tokens = parseString( + ((node as AstDeclaration).val[i] as StringToken).val.slice(1, -1), + ); for (const { value } of walkValues(tokens)) { if ( @@ -2935,14 +3070,19 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } } - (node.val[i] as StringToken).val = - (node.val[i] as StringToken).val.charAt(0) + + ((node as AstDeclaration).val[i] as StringToken).val = + ((node as AstDeclaration).val[i] as StringToken).val.charAt(0) + renderTokens(tokens) + - (node.val[i] as StringToken).val.charAt((node.val[i] as StringToken).val.length - 1); + ((node as AstDeclaration).val[i] as StringToken).val.charAt( + ((node as AstDeclaration).val[i] as StringToken).val.length - 1, + ); } } - } else if (node.nam == "animation" || node.nam == "animation-name") { - for (const { value } of walkValues(node.val, node)) { + } else if ( + (node as AstDeclaration).nam == "animation" || + (node as AstDeclaration).nam == "animation-name" + ) { + for (const { value } of walkValues((node as AstDeclaration).val, node)) { if ( value.typ == EnumToken.IdenTokenType && ![ @@ -2995,7 +3135,7 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } } - for (const { value, parent } of walkValues(node.val, node)) { + for (const { value, parent } of walkValues((node as AstDeclaration).val, node)) { if (value.typ == EnumToken.DashedIdenTokenType) { (value as DashedIdentToken).val = mapping[(value as DashedIdentToken).val]; } else if ( @@ -3012,7 +3152,7 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } } else if (node.typ == EnumToken.RuleNodeType) { // if (node[TOKENS] == null) { - const tokens = parseString(node.sel); + const tokens = parseString((node as AstRule).sel); matchSelectorSyntax(tokens, [] as ErrorDescription[], options); node[TOKENS] = trimArray(tokens); @@ -3117,21 +3257,21 @@ export async function doParse(iter: Tokenizer | Promise, options: Par if (moduleSettings.scoped! & ModuleScopeEnumOptions.Pure) { if (!hasIdOrClass) { throw new Error( - `pure module: No id or class found in selector '${node.sel}' at '${(options.source?.getOffsets?.(node[LOCSTA] as number) ?? []).join(":")}'`, + `pure module: No id or class found in selector '${(node as AstRule).sel}' at '${(options.source?.getOffsets?.(node[LOCSTA] as number) ?? []).join(":")}'`, ); } } - node.sel = ""; + (node as AstRule).sel = ""; for (const token of node[TOKENS]! as Token[]) { - node.sel += renderValue(token); + (node as AstRule).sel += renderValue(token); } } else if (node.typ == EnumToken.AtRuleNodeType || node.typ == EnumToken.KeyframesAtRuleNodeType) { - const val: string = node.nam.toLowerCase(); + const val: string = (node as AstAtRule).nam.toLowerCase(); if (node[TOKENS] == null) { - node[TOKENS] = parseString(node.val); + node[TOKENS] = parseString((node as AstAtRule).val); } if (val == "property" || val == "keyframes") { diff --git a/src/lib/parser/utils/token.ts b/src/lib/parser/utils/token.ts index a5338517..d059f96b 100644 --- a/src/lib/parser/utils/token.ts +++ b/src/lib/parser/utils/token.ts @@ -67,12 +67,23 @@ export function replaceNodeOrValue( throw new TypeError(`replacement is null`); } - for (const newNode of Array.isArray(replacement) ? replacement : [replacement]) { - if (newNode[PARENT] != node[PARENT]) { - newNode[PARENT] = node[PARENT]; + if (!Array.isArray(replacement) ) { + + if (replacement[PARENT] != parent) { + replacement[PARENT] = parent; } } + else { + + for (const newNode of replacement as Token[]) { + if (newNode[PARENT] != parent) { + newNode[PARENT] = parent; + } + } + } + + if (parent.typ == EnumToken.BinaryExpressionTokenType) { if ((parent as BinaryExpressionToken).l == node) { (parent as BinaryExpressionToken).l = replacement as Token; diff --git a/src/lib/printer/render.ts b/src/lib/printer/render.ts index f4e4029f..6535c27a 100644 --- a/src/lib/printer/render.ts +++ b/src/lib/printer/render.ts @@ -1646,9 +1646,9 @@ export function renderValue( case EnumToken.AngleTokenType: case EnumToken.LengthTokenType: case EnumToken.DimensionTokenType: - case EnumToken.UserDefinedDimensionTokenType: case EnumToken.FrequencyTokenType: case EnumToken.ResolutionTokenType: + case EnumToken.UserDefinedDimensionTokenType: let val: string = ((token as LengthToken).val).typ == EnumToken.FractionTokenType ? renderValue((token as LengthToken).val, options, cache) diff --git a/test/specs/code/visitors.js b/test/specs/code/visitors.js index 0f2a484e..27261836 100644 --- a/test/specs/code/visitors.js +++ b/test/specs/code/visitors.js @@ -465,7 +465,6 @@ html,body { Rule: { type: WalkerEvent.Enter, handler(node) { - node.sel = ".ruled"; // node.val = "slide-in-out"; // return node; @@ -474,7 +473,6 @@ html,body { Declaration: { type: WalkerEvent.Leave, handler(node) { - // node.sel = ".ruled"; // node.val = "slide-in-out"; // return node; @@ -573,8 +571,6 @@ html,body { ); }); - - it("visitor #10", function () { const css = ` @@ -614,25 +610,25 @@ html,body { removePrefix: true, beautify: true, visitor: [ - { - Rule: { - type: WalkerEvent.Enter, - handler(node) { - node.sel = ".ruled"; - // node.val = "slide-in-out"; - // return node; - }, - }, - }, - { - KeyframesAtRule: { - slideIn(node) { - node.val = "slide-in-out"; - return node; - }, - }, - }, - ], + { + Rule: { + type: WalkerEvent.Enter, + handler(node) { + node.sel = ".ruled"; + // node.val = "slide-in-out"; + // return node; + }, + }, + }, + { + KeyframesAtRule: { + slideIn(node) { + node.val = "slide-in-out"; + return node; + }, + }, + }, + ], }; const result = transformSync(css, options); @@ -675,19 +671,70 @@ html,body { } `; const options = { - removePrefix: true, - beautify: true, - visitor: function Rule(node) { + removePrefix: true, + beautify: true, + visitor: function Rule(node) { node.sel = ".ruled"; // node.val = "slide-in-out"; // return node; }, -}; + }; const result = transformSync(css, options); expect(result.code).equals(`.ruled { height: 10px +}`); + }); + + it("visitor #12", function () { + const css = ` + +body { color: color(from var(--base-color) display-p3 r calc(g + 0.24) calc(b + 0.15)); } + +html, +body { + line-height: 1.474; +} + +.ruler { + + height: 10px; + background-color: orange +} +`; + const options = { + beautify: true, + visitor: [ + function DeclarationNodeType(declaration) { + if (declaration.nam == "height") { + declaration.nam = "width"; + } + }, + { + ColorTokenType: { + type: WalkerEvent.Enter, + handler: function (color) { + return { + typ: EnumToken.Color, + val: "red", + kin: ColorType.HEX, + }; + }, + }, + }, + ], + }; + + return expect(transformSync(css, options).code).equals(`body { + color: red +} +html,body { + line-height: 1.474 +} +.ruler { + width: 10px; + background-color: red }`); }); }); From 97a8adcaf329541d357ea9807b3a30ae3a641c54 Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Thu, 29 Oct 2026 13:31:21 -0400 Subject: [PATCH 04/14] the walker functions now use DFS instead of BFS #170 --- dist/index-umd-web.js | 225 +++++++++++++++++------------------ dist/index.cjs | 225 +++++++++++++++++------------------ dist/src/lib/ast/walk.js | 182 ++++++++++++---------------- dist/src/lib/parser/parse.js | 43 +++++-- src/lib/ast/walk.ts | 202 ++++++++++++------------------- 5 files changed, 399 insertions(+), 478 deletions(-) diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js index a2b2f237..93a022d1 100644 --- a/dist/index-umd-web.js +++ b/dist/index-umd-web.js @@ -9697,7 +9697,6 @@ */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); - const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9902,76 +9901,7 @@ source[i][PARENT] = node; } } - // for (const child of source as Array) { - // parents.push(child); - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } } - // } - // node = parents.pop() as AstNode; - // } - // while ((node = parents[i++])) { - // if (i > maxQueueLength) { - // parents.splice(0, maxQueueLength); - // i -= maxQueueLength; - // } - // let option: WalkerOption = null; - // if (filter != null) { - // // @ts-expect-error - // option = filter(node); - // isNumeric = typeof option == "number"; - // if (isNumeric) { - // if ((option as number) & WalkerOptionEnum.Ignore) { - // continue; - // } - // if ((option as number) & WalkerOptionEnum.Stop) { - // break; - // } - // } - // } - // if (!isNumeric || ((option as number) & WalkerOptionEnum.Children) === 0) { - // result.node = node; - // // @ts-expect-error - // result.parent = node[PARENT]; - // yield result; - // } - // if (attributes) { - // if (node[TOKENS] != null) { - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); - // for (const child of node[TOKENS] as AstNode[]) { - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } - // // @ts-expect-error - // } else if (Array.isArray(node.val)) { - // // @ts-expect-error - // for (const val of node.val) { - // if (val[PARENT] != node) { - // val[PARENT] = node; - // } - // } - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); - // } - // } - // if ( - // children && - // // @ts-expect-error - // node["chi"] != null && - // (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) - // ) { - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); - // for (const child of (node).chi) { - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } - // } } } /** @@ -10022,7 +9952,7 @@ * ``` */ function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); + const nodes = reverse ? values.slice() : values.toReversed(); let previous = null; if (filter != null && typeof filter == "function") { filter = { @@ -10039,7 +9969,6 @@ let value; let option; let node; - let i = -1; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -10058,13 +9987,9 @@ } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & exports.WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -10092,10 +10017,16 @@ // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -10104,31 +10035,62 @@ result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0) { if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { const values = []; - if ("l" in value && value.l != null) { + if ("op2" in value && value.op2 != null) { + values.push(value.op2); + value.op2[PARENT] = value; + } + if ("op1" in value && value.op1 != null) { + values.push(value.op1); + value.op1[PARENT] = value; + } + // @ts-expect-error + if ("op" in value && value.op.typ != null) { // @ts-expect-error - values.push(value.l); + values.push(value.op); // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + value.op[PARENT] = value; + } + if ("r" in value && value.r != null) { + if (Array.isArray(value.r)) { + for (let i = value.r.length - 1; i >= 0; i--) { + values.push(value.r[i]); + value.r[i][PARENT] = value; + } + } + else { + values.push(value.r); + value.r[PARENT] = value; + } + } + if ("l" in value && value.l != null) { + if (Array.isArray(value.l)) { + for (let i = value.l.length - 1; i >= 0; i--) { + values.push(value.l[i]); + value.l[i][PARENT] = value; + } + } + else { + values.push(value.l); value.l[PARENT] = value; } } @@ -10162,12 +10124,16 @@ } } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -10184,10 +10150,16 @@ // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -31756,7 +31728,8 @@ node[TOKENS].length - 1; i >= 0; i--) { // @ts-ignore - node[TOKENS][i][PARENT] = node; + node[TOKENS][i][PARENT] = + node; nodes.push( // @ts-ignore node[TOKENS][i]); @@ -32056,6 +32029,7 @@ } // @ts-ignore if (node.typ == exports.EnumToken.CssVariableDeclarationMapTokenType) { + // @ts-ignore const from = node.from.find((t) => t.typ == exports.EnumToken.IdenTokenType || isIdentColor(t)); if (!(from.val in cssVariablesMap)) { errors.push({ @@ -32065,6 +32039,7 @@ }); } else { + // @ts-ignore for (const token of node.vars) { if (token.typ == exports.EnumToken.IdenTokenType || isIdentColor(token)) { if (!(token.val in cssVariablesMap[from.val])) { @@ -32088,6 +32063,7 @@ if (result.cssModuleVariables == null) { result.cssModuleVariables = {}; } + // @ts-ignore result.cssModuleVariables[node.nam] = node; } parent.chi.splice(parent.chi.indexOf(node), 1); @@ -32253,7 +32229,8 @@ value.val = mapping[idenToken]; } } - else if (node.nam == "grid-template-areas" || node.nam == "grid-template") { + else if (node.nam == "grid-template-areas" || + node.nam == "grid-template") { for (let i = 0; i < node.val.length; i++) { if (node.val[i].typ == exports.EnumToken.String) { const tokens = parseString(node.val[i].val.slice(1, -1)); @@ -32280,7 +32257,8 @@ } } } - else if (node.nam == "animation" || node.nam == "animation-name") { + else if (node.nam == "animation" || + node.nam == "animation-name") { for (const { value } of walkValues(node.val, node)) { if (value.typ == exports.EnumToken.IdenTokenType && ![ @@ -32323,14 +32301,14 @@ } } } - for (const { value, parent } of walkValues(node.val, node)) { - if (value.typ == exports.EnumToken.DashedIdenTokenType) { - value.val = mapping[value.val]; + for (const r of walkValues(node.val, node)) { + if (r.value.typ == exports.EnumToken.DashedIdenTokenType) { + r.value.val = mapping[r.value.val]; } - else if ((value.typ == exports.EnumToken.IdenTokenType || isIdentColor(value)) && - value.val in importedCssVariables) { + else if ((r.value.typ == exports.EnumToken.IdenTokenType || isIdentColor(r.value)) && + r.value.val in importedCssVariables) { // @ts-ignore - replaceNodeOrValue(parent, value, importedCssVariables[value.val].val); + replaceNodeOrValue(r.parent, r.value, importedCssVariables[value.val].val); } } } @@ -32784,7 +32762,8 @@ node[TOKENS].length - 1; i >= 0; i--) { // @ts-ignore - node[TOKENS][i][PARENT] = node; + node[TOKENS][i][PARENT] = + node; nodes.push( // @ts-ignore node[TOKENS][i]); @@ -32988,7 +32967,12 @@ if (options.lenient && node[STATE] & exports.EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & (exports.EnumAstNodeStatus.Invalid | exports.EnumAstNodeStatus.Unknown | exports.EnumAstNodeStatus.Unparsed | exports.EnumAstNodeStatus.Malformed | exports.EnumAstNodeStatus.Disallowed)) { + if (node[STATE] & + (exports.EnumAstNodeStatus.Invalid | + exports.EnumAstNodeStatus.Unknown | + exports.EnumAstNodeStatus.Unparsed | + exports.EnumAstNodeStatus.Malformed | + exports.EnumAstNodeStatus.Disallowed)) { // @ts-ignore node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); // node[PARENT] = null; @@ -33121,6 +33105,7 @@ } // @ts-ignore if (node.typ == exports.EnumToken.CssVariableDeclarationMapTokenType) { + // @ts-ignore const from = node.from.find((t) => t.typ == exports.EnumToken.IdenTokenType || isIdentColor(t)); if (!(from.val in cssVariablesMap)) { errors.push({ @@ -33130,6 +33115,7 @@ }); } else { + // @ts-ignore for (const token of node.vars) { if (token.typ == exports.EnumToken.IdenTokenType || isIdentColor(token)) { if (!(token.val in cssVariablesMap[from.val])) { @@ -33153,6 +33139,7 @@ if (result.cssModuleVariables == null) { result.cssModuleVariables = {}; } + // @ts-ignore result.cssModuleVariables[node.nam] = node; } parent.chi.splice(parent.chi.indexOf(node), 1); @@ -33393,7 +33380,8 @@ value.val = mapping[idenToken]; } } - else if (node.nam == "grid-template-areas" || node.nam == "grid-template") { + else if (node.nam == "grid-template-areas" || + node.nam == "grid-template") { for (let i = 0; i < node.val.length; i++) { if (node.val[i].typ == exports.EnumToken.String) { const tokens = parseString(node.val[i].val.slice(1, -1)); @@ -33424,7 +33412,8 @@ } } } - else if (node.nam == "animation" || node.nam == "animation-name") { + else if (node.nam == "animation" || + node.nam == "animation-name") { for (const { value } of walkValues(node.val, node)) { if (value.typ == exports.EnumToken.IdenTokenType && ![ diff --git a/dist/index.cjs b/dist/index.cjs index 18adfe1f..f684a743 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -9693,7 +9693,6 @@ exports.WalkerEvent = void 0; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); -const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9898,76 +9897,7 @@ function* walk(node, filter, reverse) { source[i][PARENT] = node; } } - // for (const child of source as Array) { - // parents.push(child); - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } } - // } - // node = parents.pop() as AstNode; - // } - // while ((node = parents[i++])) { - // if (i > maxQueueLength) { - // parents.splice(0, maxQueueLength); - // i -= maxQueueLength; - // } - // let option: WalkerOption = null; - // if (filter != null) { - // // @ts-expect-error - // option = filter(node); - // isNumeric = typeof option == "number"; - // if (isNumeric) { - // if ((option as number) & WalkerOptionEnum.Ignore) { - // continue; - // } - // if ((option as number) & WalkerOptionEnum.Stop) { - // break; - // } - // } - // } - // if (!isNumeric || ((option as number) & WalkerOptionEnum.Children) === 0) { - // result.node = node; - // // @ts-expect-error - // result.parent = node[PARENT]; - // yield result; - // } - // if (attributes) { - // if (node[TOKENS] != null) { - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); - // for (const child of node[TOKENS] as AstNode[]) { - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } - // // @ts-expect-error - // } else if (Array.isArray(node.val)) { - // // @ts-expect-error - // for (const val of node.val) { - // if (val[PARENT] != node) { - // val[PARENT] = node; - // } - // } - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); - // } - // } - // if ( - // children && - // // @ts-expect-error - // node["chi"] != null && - // (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) - // ) { - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); - // for (const child of (node).chi) { - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } - // } } } /** @@ -10018,7 +9948,7 @@ function* walk(node, filter, reverse) { * ``` */ function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); + const nodes = reverse ? values.slice() : values.toReversed(); let previous = null; if (filter != null && typeof filter == "function") { filter = { @@ -10035,7 +9965,6 @@ function* walkValues(values, root = null, filter, reverse) { let value; let option; let node; - let i = -1; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -10054,13 +9983,9 @@ function* walkValues(values, root = null, filter, reverse) { } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & exports.WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -10088,10 +10013,16 @@ function* walkValues(values, root = null, filter, reverse) { // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -10100,31 +10031,62 @@ function* walkValues(values, root = null, filter, reverse) { result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0) { if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { const values = []; - if ("l" in value && value.l != null) { + if ("op2" in value && value.op2 != null) { + values.push(value.op2); + value.op2[PARENT] = value; + } + if ("op1" in value && value.op1 != null) { + values.push(value.op1); + value.op1[PARENT] = value; + } + // @ts-expect-error + if ("op" in value && value.op.typ != null) { // @ts-expect-error - values.push(value.l); + values.push(value.op); // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + value.op[PARENT] = value; + } + if ("r" in value && value.r != null) { + if (Array.isArray(value.r)) { + for (let i = value.r.length - 1; i >= 0; i--) { + values.push(value.r[i]); + value.r[i][PARENT] = value; + } + } + else { + values.push(value.r); + value.r[PARENT] = value; + } + } + if ("l" in value && value.l != null) { + if (Array.isArray(value.l)) { + for (let i = value.l.length - 1; i >= 0; i--) { + values.push(value.l[i]); + value.l[i][PARENT] = value; + } + } + else { + values.push(value.l); value.l[PARENT] = value; } } @@ -10158,12 +10120,16 @@ function* walkValues(values, root = null, filter, reverse) { } } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -10180,10 +10146,16 @@ function* walkValues(values, root = null, filter, reverse) { // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -31752,7 +31724,8 @@ function doParseSync(tokenizer, options = {}) { node[TOKENS].length - 1; i >= 0; i--) { // @ts-ignore - node[TOKENS][i][PARENT] = node; + node[TOKENS][i][PARENT] = + node; nodes.push( // @ts-ignore node[TOKENS][i]); @@ -32052,6 +32025,7 @@ function doParseSync(tokenizer, options = {}) { } // @ts-ignore if (node.typ == exports.EnumToken.CssVariableDeclarationMapTokenType) { + // @ts-ignore const from = node.from.find((t) => t.typ == exports.EnumToken.IdenTokenType || isIdentColor(t)); if (!(from.val in cssVariablesMap)) { errors.push({ @@ -32061,6 +32035,7 @@ function doParseSync(tokenizer, options = {}) { }); } else { + // @ts-ignore for (const token of node.vars) { if (token.typ == exports.EnumToken.IdenTokenType || isIdentColor(token)) { if (!(token.val in cssVariablesMap[from.val])) { @@ -32084,6 +32059,7 @@ function doParseSync(tokenizer, options = {}) { if (result.cssModuleVariables == null) { result.cssModuleVariables = {}; } + // @ts-ignore result.cssModuleVariables[node.nam] = node; } parent.chi.splice(parent.chi.indexOf(node), 1); @@ -32249,7 +32225,8 @@ function doParseSync(tokenizer, options = {}) { value.val = mapping[idenToken]; } } - else if (node.nam == "grid-template-areas" || node.nam == "grid-template") { + else if (node.nam == "grid-template-areas" || + node.nam == "grid-template") { for (let i = 0; i < node.val.length; i++) { if (node.val[i].typ == exports.EnumToken.String) { const tokens = parseString(node.val[i].val.slice(1, -1)); @@ -32276,7 +32253,8 @@ function doParseSync(tokenizer, options = {}) { } } } - else if (node.nam == "animation" || node.nam == "animation-name") { + else if (node.nam == "animation" || + node.nam == "animation-name") { for (const { value } of walkValues(node.val, node)) { if (value.typ == exports.EnumToken.IdenTokenType && ![ @@ -32319,14 +32297,14 @@ function doParseSync(tokenizer, options = {}) { } } } - for (const { value, parent } of walkValues(node.val, node)) { - if (value.typ == exports.EnumToken.DashedIdenTokenType) { - value.val = mapping[value.val]; + for (const r of walkValues(node.val, node)) { + if (r.value.typ == exports.EnumToken.DashedIdenTokenType) { + r.value.val = mapping[r.value.val]; } - else if ((value.typ == exports.EnumToken.IdenTokenType || isIdentColor(value)) && - value.val in importedCssVariables) { + else if ((r.value.typ == exports.EnumToken.IdenTokenType || isIdentColor(r.value)) && + r.value.val in importedCssVariables) { // @ts-ignore - replaceNodeOrValue(parent, value, importedCssVariables[value.val].val); + replaceNodeOrValue(r.parent, r.value, importedCssVariables[value.val].val); } } } @@ -32780,7 +32758,8 @@ async function doParse(iter, options = {}) { node[TOKENS].length - 1; i >= 0; i--) { // @ts-ignore - node[TOKENS][i][PARENT] = node; + node[TOKENS][i][PARENT] = + node; nodes.push( // @ts-ignore node[TOKENS][i]); @@ -32984,7 +32963,12 @@ async function doParse(iter, options = {}) { if (options.lenient && node[STATE] & exports.EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & (exports.EnumAstNodeStatus.Invalid | exports.EnumAstNodeStatus.Unknown | exports.EnumAstNodeStatus.Unparsed | exports.EnumAstNodeStatus.Malformed | exports.EnumAstNodeStatus.Disallowed)) { + if (node[STATE] & + (exports.EnumAstNodeStatus.Invalid | + exports.EnumAstNodeStatus.Unknown | + exports.EnumAstNodeStatus.Unparsed | + exports.EnumAstNodeStatus.Malformed | + exports.EnumAstNodeStatus.Disallowed)) { // @ts-ignore node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); // node[PARENT] = null; @@ -33117,6 +33101,7 @@ async function doParse(iter, options = {}) { } // @ts-ignore if (node.typ == exports.EnumToken.CssVariableDeclarationMapTokenType) { + // @ts-ignore const from = node.from.find((t) => t.typ == exports.EnumToken.IdenTokenType || isIdentColor(t)); if (!(from.val in cssVariablesMap)) { errors.push({ @@ -33126,6 +33111,7 @@ async function doParse(iter, options = {}) { }); } else { + // @ts-ignore for (const token of node.vars) { if (token.typ == exports.EnumToken.IdenTokenType || isIdentColor(token)) { if (!(token.val in cssVariablesMap[from.val])) { @@ -33149,6 +33135,7 @@ async function doParse(iter, options = {}) { if (result.cssModuleVariables == null) { result.cssModuleVariables = {}; } + // @ts-ignore result.cssModuleVariables[node.nam] = node; } parent.chi.splice(parent.chi.indexOf(node), 1); @@ -33389,7 +33376,8 @@ async function doParse(iter, options = {}) { value.val = mapping[idenToken]; } } - else if (node.nam == "grid-template-areas" || node.nam == "grid-template") { + else if (node.nam == "grid-template-areas" || + node.nam == "grid-template") { for (let i = 0; i < node.val.length; i++) { if (node.val[i].typ == exports.EnumToken.String) { const tokens = parseString(node.val[i].val.slice(1, -1)); @@ -33420,7 +33408,8 @@ async function doParse(iter, options = {}) { } } } - else if (node.nam == "animation" || node.nam == "animation-name") { + else if (node.nam == "animation" || + node.nam == "animation-name") { for (const { value } of walkValues(node.val, node)) { if (value.typ == exports.EnumToken.IdenTokenType && ![ diff --git a/dist/src/lib/ast/walk.js b/dist/src/lib/ast/walk.js index 3b670d8a..e09f981f 100644 --- a/dist/src/lib/ast/walk.js +++ b/dist/src/lib/ast/walk.js @@ -44,7 +44,6 @@ var WalkerEvent; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(WalkerEvent || (WalkerEvent = {})); -const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -249,76 +248,7 @@ function* walk(node, filter, reverse) { source[i][PARENT] = node; } } - // for (const child of source as Array) { - // parents.push(child); - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } } - // } - // node = parents.pop() as AstNode; - // } - // while ((node = parents[i++])) { - // if (i > maxQueueLength) { - // parents.splice(0, maxQueueLength); - // i -= maxQueueLength; - // } - // let option: WalkerOption = null; - // if (filter != null) { - // // @ts-expect-error - // option = filter(node); - // isNumeric = typeof option == "number"; - // if (isNumeric) { - // if ((option as number) & WalkerOptionEnum.Ignore) { - // continue; - // } - // if ((option as number) & WalkerOptionEnum.Stop) { - // break; - // } - // } - // } - // if (!isNumeric || ((option as number) & WalkerOptionEnum.Children) === 0) { - // result.node = node; - // // @ts-expect-error - // result.parent = node[PARENT]; - // yield result; - // } - // if (attributes) { - // if (node[TOKENS] != null) { - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); - // for (const child of node[TOKENS] as AstNode[]) { - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } - // // @ts-expect-error - // } else if (Array.isArray(node.val)) { - // // @ts-expect-error - // for (const val of node.val) { - // if (val[PARENT] != node) { - // val[PARENT] = node; - // } - // } - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); - // } - // } - // if ( - // children && - // // @ts-expect-error - // node["chi"] != null && - // (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) - // ) { - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); - // for (const child of (node).chi) { - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } - // } } } /** @@ -369,7 +299,7 @@ function* walk(node, filter, reverse) { * ``` */ function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); + const nodes = reverse ? values.slice() : values.toReversed(); let previous = null; if (filter != null && typeof filter == "function") { filter = { @@ -386,7 +316,6 @@ function* walkValues(values, root = null, filter, reverse) { let value; let option; let node; - let i = -1; const eventType = filter.event ?? WalkerEvent.Enter; // @ts-ignore const result = { @@ -405,13 +334,9 @@ function* walkValues(values, root = null, filter, reverse) { } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -439,10 +364,16 @@ function* walkValues(values, root = null, filter, reverse) { // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -451,31 +382,62 @@ function* walkValues(values, root = null, filter, reverse) { result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & WalkerOptionEnum.IgnoreChildren) === 0) { if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { const values = []; - if ("l" in value && value.l != null) { + if ("op2" in value && value.op2 != null) { + values.push(value.op2); + value.op2[PARENT] = value; + } + if ("op1" in value && value.op1 != null) { + values.push(value.op1); + value.op1[PARENT] = value; + } + // @ts-expect-error + if ("op" in value && value.op.typ != null) { // @ts-expect-error - values.push(value.l); + values.push(value.op); // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + value.op[PARENT] = value; + } + if ("r" in value && value.r != null) { + if (Array.isArray(value.r)) { + for (let i = value.r.length - 1; i >= 0; i--) { + values.push(value.r[i]); + value.r[i][PARENT] = value; + } + } + else { + values.push(value.r); + value.r[PARENT] = value; + } + } + if ("l" in value && value.l != null) { + if (Array.isArray(value.l)) { + for (let i = value.l.length - 1; i >= 0; i--) { + values.push(value.l[i]); + value.l[i][PARENT] = value; + } + } + else { + values.push(value.l); value.l[PARENT] = value; } } @@ -509,12 +471,16 @@ function* walkValues(values, root = null, filter, reverse) { } } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -531,10 +497,16 @@ function* walkValues(values, root = null, filter, reverse) { // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } diff --git a/dist/src/lib/parser/parse.js b/dist/src/lib/parser/parse.js index 119b9648..3da9dea2 100644 --- a/dist/src/lib/parser/parse.js +++ b/dist/src/lib/parser/parse.js @@ -718,7 +718,8 @@ function doParseSync(tokenizer, options = {}) { node[TOKENS].length - 1; i >= 0; i--) { // @ts-ignore - node[TOKENS][i][PARENT] = node; + node[TOKENS][i][PARENT] = + node; nodes.push( // @ts-ignore node[TOKENS][i]); @@ -1018,6 +1019,7 @@ function doParseSync(tokenizer, options = {}) { } // @ts-ignore if (node.typ == EnumToken.CssVariableDeclarationMapTokenType) { + // @ts-ignore const from = node.from.find((t) => t.typ == EnumToken.IdenTokenType || isIdentColor(t)); if (!(from.val in cssVariablesMap)) { errors.push({ @@ -1027,6 +1029,7 @@ function doParseSync(tokenizer, options = {}) { }); } else { + // @ts-ignore for (const token of node.vars) { if (token.typ == EnumToken.IdenTokenType || isIdentColor(token)) { if (!(token.val in cssVariablesMap[from.val])) { @@ -1050,6 +1053,7 @@ function doParseSync(tokenizer, options = {}) { if (result.cssModuleVariables == null) { result.cssModuleVariables = {}; } + // @ts-ignore result.cssModuleVariables[node.nam] = node; } parent.chi.splice(parent.chi.indexOf(node), 1); @@ -1215,7 +1219,8 @@ function doParseSync(tokenizer, options = {}) { value.val = mapping[idenToken]; } } - else if (node.nam == "grid-template-areas" || node.nam == "grid-template") { + else if (node.nam == "grid-template-areas" || + node.nam == "grid-template") { for (let i = 0; i < node.val.length; i++) { if (node.val[i].typ == EnumToken.String) { const tokens = parseString(node.val[i].val.slice(1, -1)); @@ -1242,7 +1247,8 @@ function doParseSync(tokenizer, options = {}) { } } } - else if (node.nam == "animation" || node.nam == "animation-name") { + else if (node.nam == "animation" || + node.nam == "animation-name") { for (const { value } of walkValues(node.val, node)) { if (value.typ == EnumToken.IdenTokenType && ![ @@ -1285,14 +1291,14 @@ function doParseSync(tokenizer, options = {}) { } } } - for (const { value, parent } of walkValues(node.val, node)) { - if (value.typ == EnumToken.DashedIdenTokenType) { - value.val = mapping[value.val]; + for (const r of walkValues(node.val, node)) { + if (r.value.typ == EnumToken.DashedIdenTokenType) { + r.value.val = mapping[r.value.val]; } - else if ((value.typ == EnumToken.IdenTokenType || isIdentColor(value)) && - value.val in importedCssVariables) { + else if ((r.value.typ == EnumToken.IdenTokenType || isIdentColor(r.value)) && + r.value.val in importedCssVariables) { // @ts-ignore - replaceNodeOrValue(parent, value, importedCssVariables[value.val].val); + replaceNodeOrValue(r.parent, r.value, importedCssVariables[value.val].val); } } } @@ -1746,7 +1752,8 @@ async function doParse(iter, options = {}) { node[TOKENS].length - 1; i >= 0; i--) { // @ts-ignore - node[TOKENS][i][PARENT] = node; + node[TOKENS][i][PARENT] = + node; nodes.push( // @ts-ignore node[TOKENS][i]); @@ -1950,7 +1957,12 @@ async function doParse(iter, options = {}) { if (options.lenient && node[STATE] & EnumAstNodeStatus.Unknown) { continue; } - if (node[STATE] & (EnumAstNodeStatus.Invalid | EnumAstNodeStatus.Unknown | EnumAstNodeStatus.Unparsed | EnumAstNodeStatus.Malformed | EnumAstNodeStatus.Disallowed)) { + if (node[STATE] & + (EnumAstNodeStatus.Invalid | + EnumAstNodeStatus.Unknown | + EnumAstNodeStatus.Unparsed | + EnumAstNodeStatus.Malformed | + EnumAstNodeStatus.Disallowed)) { // @ts-ignore node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); // node[PARENT] = null; @@ -2083,6 +2095,7 @@ async function doParse(iter, options = {}) { } // @ts-ignore if (node.typ == EnumToken.CssVariableDeclarationMapTokenType) { + // @ts-ignore const from = node.from.find((t) => t.typ == EnumToken.IdenTokenType || isIdentColor(t)); if (!(from.val in cssVariablesMap)) { errors.push({ @@ -2092,6 +2105,7 @@ async function doParse(iter, options = {}) { }); } else { + // @ts-ignore for (const token of node.vars) { if (token.typ == EnumToken.IdenTokenType || isIdentColor(token)) { if (!(token.val in cssVariablesMap[from.val])) { @@ -2115,6 +2129,7 @@ async function doParse(iter, options = {}) { if (result.cssModuleVariables == null) { result.cssModuleVariables = {}; } + // @ts-ignore result.cssModuleVariables[node.nam] = node; } parent.chi.splice(parent.chi.indexOf(node), 1); @@ -2355,7 +2370,8 @@ async function doParse(iter, options = {}) { value.val = mapping[idenToken]; } } - else if (node.nam == "grid-template-areas" || node.nam == "grid-template") { + else if (node.nam == "grid-template-areas" || + node.nam == "grid-template") { for (let i = 0; i < node.val.length; i++) { if (node.val[i].typ == EnumToken.String) { const tokens = parseString(node.val[i].val.slice(1, -1)); @@ -2386,7 +2402,8 @@ async function doParse(iter, options = {}) { } } } - else if (node.nam == "animation" || node.nam == "animation-name") { + else if (node.nam == "animation" || + node.nam == "animation-name") { for (const { value } of walkValues(node.val, node)) { if (value.typ == EnumToken.IdenTokenType && ![ diff --git a/src/lib/ast/walk.ts b/src/lib/ast/walk.ts index 1a54643d..0ec79245 100644 --- a/src/lib/ast/walk.ts +++ b/src/lib/ast/walk.ts @@ -317,7 +317,6 @@ export function* walk( let source: Token[] | null = null; while (parents.length > 0) { - node = parents.pop() as AstNode | Token; // enter node @@ -415,7 +414,7 @@ export function* walk( (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) ) { // @ts-expect-error - source = node.chi ; + source = node.chi; if (reverse) { for (let i = 0; i < source!.length; i++) { @@ -425,94 +424,10 @@ export function* walk( } else { for (let i = source!.length - 1; i >= 0; i--) { parents.push(source![i]); - source![i][PARENT] = node + source![i][PARENT] = node; } } - - // for (const child of source as Array) { - // parents.push(child); - - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } } - // } - - // node = parents.pop() as AstNode; - // } - - // while ((node = parents[i++])) { - // if (i > maxQueueLength) { - // parents.splice(0, maxQueueLength); - // i -= maxQueueLength; - // } - - // let option: WalkerOption = null; - - // if (filter != null) { - // // @ts-expect-error - // option = filter(node); - // isNumeric = typeof option == "number"; - - // if (isNumeric) { - // if ((option as number) & WalkerOptionEnum.Ignore) { - // continue; - // } - - // if ((option as number) & WalkerOptionEnum.Stop) { - // break; - // } - // } - // } - - // if (!isNumeric || ((option as number) & WalkerOptionEnum.Children) === 0) { - // result.node = node; - // // @ts-expect-error - // result.parent = node[PARENT]; - - // yield result; - // } - - // if (attributes) { - // if (node[TOKENS] != null) { - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node[TOKENS]!.toReversed() : node[TOKENS])); - - // for (const child of node[TOKENS] as AstNode[]) { - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } - // // @ts-expect-error - // } else if (Array.isArray(node.val)) { - // // @ts-expect-error - // for (const val of node.val) { - // if (val[PARENT] != node) { - // val[PARENT] = node; - // } - // } - - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); - // } - // } - - // if ( - // children && - // // @ts-expect-error - // node["chi"] != null && - // (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) - // ) { - // // @ts-expect-error - // parents.splice(i, 0, ...(reverse ? node.chi!.toReversed() : node.chi)); - - // for (const child of (node).chi) { - // if (child[PARENT] != node) { - // child[PARENT] = node; - // } - // } - // } } } @@ -576,7 +491,7 @@ export function* walkValues( }, reverse?: boolean, ): Generator { - const stack: Token[] = values.slice(); + const nodes: Token[] = reverse ? values.slice() : values.toReversed(); let previous: Token | null = null; if (filter != null && typeof filter == "function") { @@ -614,15 +529,10 @@ export function* walkValues( }, } as WalkAttributesResult; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop() as Token; option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } - if (filter.fn != null && eventType & WalkerEvent.Enter) { const isValid: boolean = filter.type == null || @@ -662,11 +572,15 @@ export function* walkValues( if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -676,35 +590,66 @@ export function* walkValues( result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) { if ("chi" in value) { - const sliced = (value).chi.slice(); + const source = value.chi as Token[]; - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - - if (reverse) { - stack.unshift(child); - } else { - stack.push(child); + } else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { const values: Token[] = []; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); + if ("op2" in value && value.op2 != null) { + values.push(value.op2); + value.op2[PARENT] = value; + } + + if ("op1" in value && value.op1 != null) { + values.push(value.op1); + value.op1[PARENT] = value; + } + // @ts-expect-error + if ("op" in value && value.op.typ != null) { // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + values.push(value.op); + // @ts-expect-error + value.op[PARENT] = value; + } + + if ("r" in value && value.r != null) { + if (Array.isArray(value.r)) { + for (let i = value.r.length - 1; i >= 0; i--) { + values.push(value.r[i]); + value.r[i][PARENT] = value; + } + } else { + values.push(value.r); + value.r[PARENT] = value; + } + } + + if ("l" in value && value.l != null) { + if (Array.isArray(value.l)) { + for (let i = value.l.length - 1; i >= 0; i--) { + values.push(value.l[i]); + value.l[i][PARENT] = value; + } + } else { + values.push(value.l); value.l[PARENT] = value; } } @@ -743,11 +688,15 @@ export function* walkValues( } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); - } else { - stack.push(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; + } + } else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -768,11 +717,16 @@ export function* walkValues( // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } From 69c309cd02a52b817a71bc5802979533d68c8c38 Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Fri, 30 Oct 2026 09:13:49 -0400 Subject: [PATCH 05/14] add yuku-css to the benchmark #170 --- benchmark/package.json | 3 +- benchmark/src/minifiers.js | 8 +++ dist/index-umd-web.js | 113 ++++++++++++------------------------ dist/index.cjs | 113 ++++++++++++------------------------ dist/src/lib/ast/walk.js | 113 ++++++++++++------------------------ src/lib/ast/find.ts | 14 +++-- src/lib/ast/walk.ts | 114 +++++++++++++------------------------ 7 files changed, 165 insertions(+), 313 deletions(-) diff --git a/benchmark/package.json b/benchmark/package.json index b8cfa1cd..dd2ab8a7 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -19,6 +19,7 @@ "esbuild": "^0.28.2", "lightningcss": "^1.33.0", "postcss": "^8.5.32", - "vitest": "^5.0.5" + "vitest": "^5.0.5", + "yuku-css": "^0.2.0" } } \ No newline at end of file diff --git a/benchmark/src/minifiers.js b/benchmark/src/minifiers.js index a8d82986..a28e56ed 100644 --- a/benchmark/src/minifiers.js +++ b/benchmark/src/minifiers.js @@ -11,6 +11,7 @@ import * as csso from "csso"; import * as csstree from "css-tree"; import * as esbuild from "esbuild"; import { transform } from "lightningcss"; +import { transform as yukuTransform} from "yuku-css"; import { transformSync as tbelaTransform } from "@tbela99/css-parser"; import { transformSync as tbelaDevTransform } from "@tbela99/css-parser2"; @@ -65,6 +66,7 @@ const versions = { "css-tree": pkgVersion("css-tree", "css-tree/package.json"), esbuild: pkgVersion("esbuild", "esbuild/package.json"), lightningcss: pkgVersion("lightningcss", "lightningcss/package.json"), + 'yuku-css': pkgVersion("yuku-css", "yuku-css/package.json"), "css-parser": pkgVersion("css-parser", "@tbela99/css-parser/package.json"), "css-parser-dev": pkgVersion("css-parser-dev", "@tbela99/css-parser2/package.json"), }; @@ -118,6 +120,12 @@ export const minifiers = [ label: `lightningcss - ${versions.lightningcss.version}`, minify: (css) => transform({ filename: "style.css", code: Buffer.from(css), minify: true }).code.toString(), }, + { + id: "yuku-css", + url: versions["yuku-css"].url, + label: `yuku-css - ${versions["yuku-css"].version}`, + minify: (css) => yukuTransform(css).code, + }, { id: "css-parser", url: versions["css-parser"].url, diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js index 93a022d1..179129e1 100644 --- a/dist/index-umd-web.js +++ b/dist/index-umd-web.js @@ -9697,6 +9697,7 @@ */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); + const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9952,7 +9953,7 @@ * ``` */ function* walkValues(values, root = null, filter, reverse) { - const nodes = reverse ? values.slice() : values.toReversed(); + const stack = values.slice(); let previous = null; if (filter != null && typeof filter == "function") { filter = { @@ -9969,6 +9970,7 @@ let value; let option; let node; + let i = -1; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -9987,9 +9989,13 @@ } }, }; - while (nodes.length > 0) { - value = nodes.pop(); + while (++i < stack.length) { + value = stack[i]; option = null; + if (i > maxQueueLength) { + stack.splice(0, maxQueueLength); + i -= maxQueueLength; + } if (filter.fn != null && eventType & exports.WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -10017,16 +10023,10 @@ // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - if (reverse) { - for (let i = 0; i < op.length; i++) { - nodes.push(op[i]); - op[i][PARENT] = value; - } - } - else { - for (let i = op.length - 1; i >= 0; i--) { - nodes.push(op[i]); - op[i][PARENT] = value; + stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); + for (const o of op) { + if (o[PARENT] != value) { + o[PARENT] = value; } } } @@ -10035,62 +10035,31 @@ result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = nodes[nodes.length - 1] ?? null; + result.nextValue = stack[0] ?? null; yield result; if (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0) { if ("chi" in value) { - const source = value.chi; - if (reverse) { - for (let i = 0; i < source.length; i++) { - nodes.push(source[i]); - source[i][PARENT] = value; + const sliced = value.chi.slice(); + for (const child of sliced) { + if (child[PARENT] != value) { + child[PARENT] = value; } - } - else { - for (let i = source.length - 1; i >= 0; i--) { - nodes.push(source[i]); - source[i][PARENT] = value; + if (reverse) { + stack.unshift(child); + } + else { + stack.push(child); } } } else { const values = []; - if ("op2" in value && value.op2 != null) { - values.push(value.op2); - value.op2[PARENT] = value; - } - if ("op1" in value && value.op1 != null) { - values.push(value.op1); - value.op1[PARENT] = value; - } - // @ts-expect-error - if ("op" in value && value.op.typ != null) { + if ("l" in value && value.l != null) { // @ts-expect-error - values.push(value.op); + values.push(value.l); // @ts-expect-error - value.op[PARENT] = value; - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (let i = value.r.length - 1; i >= 0; i--) { - values.push(value.r[i]); - value.r[i][PARENT] = value; - } - } - else { - values.push(value.r); - value.r[PARENT] = value; - } - } - if ("l" in value && value.l != null) { - if (Array.isArray(value.l)) { - for (let i = value.l.length - 1; i >= 0; i--) { - values.push(value.l[i]); - value.l[i][PARENT] = value; - } - } - else { - values.push(value.l); + if (value.l[PARENT] != value) { + // @ts-expect-error value.l[PARENT] = value; } } @@ -10124,16 +10093,12 @@ } } if (values.length > 0) { - if (reverse) { - for (let i = 0; i < values.length; i++) { - nodes.push(values[i]); - values[i][PARENT] = value; + for (const v of values) { + if (reverse) { + stack.unshift(v); } - } - else { - for (let i = values.length - 1; i >= 0; i--) { - nodes.push(values[i]); - values[i][PARENT] = value; + else { + stack.push(v); } } } @@ -10150,16 +10115,10 @@ // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - if (reverse) { - for (let i = 0; i < op.length; i++) { - nodes.push(op[i]); - op[i][PARENT] = value; - } - } - else { - for (let i = op.length - 1; i >= 0; i--) { - nodes.push(op[i]); - op[i][PARENT] = value; + stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); + for (const o of op) { + if (o[PARENT] != value) { + o[PARENT] = value; } } } diff --git a/dist/index.cjs b/dist/index.cjs index f684a743..a55ee5e3 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -9693,6 +9693,7 @@ exports.WalkerEvent = void 0; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); +const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9948,7 +9949,7 @@ function* walk(node, filter, reverse) { * ``` */ function* walkValues(values, root = null, filter, reverse) { - const nodes = reverse ? values.slice() : values.toReversed(); + const stack = values.slice(); let previous = null; if (filter != null && typeof filter == "function") { filter = { @@ -9965,6 +9966,7 @@ function* walkValues(values, root = null, filter, reverse) { let value; let option; let node; + let i = -1; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -9983,9 +9985,13 @@ function* walkValues(values, root = null, filter, reverse) { } }, }; - while (nodes.length > 0) { - value = nodes.pop(); + while (++i < stack.length) { + value = stack[i]; option = null; + if (i > maxQueueLength) { + stack.splice(0, maxQueueLength); + i -= maxQueueLength; + } if (filter.fn != null && eventType & exports.WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -10013,16 +10019,10 @@ function* walkValues(values, root = null, filter, reverse) { // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - if (reverse) { - for (let i = 0; i < op.length; i++) { - nodes.push(op[i]); - op[i][PARENT] = value; - } - } - else { - for (let i = op.length - 1; i >= 0; i--) { - nodes.push(op[i]); - op[i][PARENT] = value; + stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); + for (const o of op) { + if (o[PARENT] != value) { + o[PARENT] = value; } } } @@ -10031,62 +10031,31 @@ function* walkValues(values, root = null, filter, reverse) { result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = nodes[nodes.length - 1] ?? null; + result.nextValue = stack[0] ?? null; yield result; if (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0) { if ("chi" in value) { - const source = value.chi; - if (reverse) { - for (let i = 0; i < source.length; i++) { - nodes.push(source[i]); - source[i][PARENT] = value; + const sliced = value.chi.slice(); + for (const child of sliced) { + if (child[PARENT] != value) { + child[PARENT] = value; } - } - else { - for (let i = source.length - 1; i >= 0; i--) { - nodes.push(source[i]); - source[i][PARENT] = value; + if (reverse) { + stack.unshift(child); + } + else { + stack.push(child); } } } else { const values = []; - if ("op2" in value && value.op2 != null) { - values.push(value.op2); - value.op2[PARENT] = value; - } - if ("op1" in value && value.op1 != null) { - values.push(value.op1); - value.op1[PARENT] = value; - } - // @ts-expect-error - if ("op" in value && value.op.typ != null) { + if ("l" in value && value.l != null) { // @ts-expect-error - values.push(value.op); + values.push(value.l); // @ts-expect-error - value.op[PARENT] = value; - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (let i = value.r.length - 1; i >= 0; i--) { - values.push(value.r[i]); - value.r[i][PARENT] = value; - } - } - else { - values.push(value.r); - value.r[PARENT] = value; - } - } - if ("l" in value && value.l != null) { - if (Array.isArray(value.l)) { - for (let i = value.l.length - 1; i >= 0; i--) { - values.push(value.l[i]); - value.l[i][PARENT] = value; - } - } - else { - values.push(value.l); + if (value.l[PARENT] != value) { + // @ts-expect-error value.l[PARENT] = value; } } @@ -10120,16 +10089,12 @@ function* walkValues(values, root = null, filter, reverse) { } } if (values.length > 0) { - if (reverse) { - for (let i = 0; i < values.length; i++) { - nodes.push(values[i]); - values[i][PARENT] = value; + for (const v of values) { + if (reverse) { + stack.unshift(v); } - } - else { - for (let i = values.length - 1; i >= 0; i--) { - nodes.push(values[i]); - values[i][PARENT] = value; + else { + stack.push(v); } } } @@ -10146,16 +10111,10 @@ function* walkValues(values, root = null, filter, reverse) { // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - if (reverse) { - for (let i = 0; i < op.length; i++) { - nodes.push(op[i]); - op[i][PARENT] = value; - } - } - else { - for (let i = op.length - 1; i >= 0; i--) { - nodes.push(op[i]); - op[i][PARENT] = value; + stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); + for (const o of op) { + if (o[PARENT] != value) { + o[PARENT] = value; } } } diff --git a/dist/src/lib/ast/walk.js b/dist/src/lib/ast/walk.js index e09f981f..de1afba6 100644 --- a/dist/src/lib/ast/walk.js +++ b/dist/src/lib/ast/walk.js @@ -44,6 +44,7 @@ var WalkerEvent; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(WalkerEvent || (WalkerEvent = {})); +const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -299,7 +300,7 @@ function* walk(node, filter, reverse) { * ``` */ function* walkValues(values, root = null, filter, reverse) { - const nodes = reverse ? values.slice() : values.toReversed(); + const stack = values.slice(); let previous = null; if (filter != null && typeof filter == "function") { filter = { @@ -316,6 +317,7 @@ function* walkValues(values, root = null, filter, reverse) { let value; let option; let node; + let i = -1; const eventType = filter.event ?? WalkerEvent.Enter; // @ts-ignore const result = { @@ -334,9 +336,13 @@ function* walkValues(values, root = null, filter, reverse) { } }, }; - while (nodes.length > 0) { - value = nodes.pop(); + while (++i < stack.length) { + value = stack[i]; option = null; + if (i > maxQueueLength) { + stack.splice(0, maxQueueLength); + i -= maxQueueLength; + } if (filter.fn != null && eventType & WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -364,16 +370,10 @@ function* walkValues(values, root = null, filter, reverse) { // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - if (reverse) { - for (let i = 0; i < op.length; i++) { - nodes.push(op[i]); - op[i][PARENT] = value; - } - } - else { - for (let i = op.length - 1; i >= 0; i--) { - nodes.push(op[i]); - op[i][PARENT] = value; + stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); + for (const o of op) { + if (o[PARENT] != value) { + o[PARENT] = value; } } } @@ -382,62 +382,31 @@ function* walkValues(values, root = null, filter, reverse) { result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = nodes[nodes.length - 1] ?? null; + result.nextValue = stack[0] ?? null; yield result; if (!isNumeric || (option & WalkerOptionEnum.IgnoreChildren) === 0) { if ("chi" in value) { - const source = value.chi; - if (reverse) { - for (let i = 0; i < source.length; i++) { - nodes.push(source[i]); - source[i][PARENT] = value; + const sliced = value.chi.slice(); + for (const child of sliced) { + if (child[PARENT] != value) { + child[PARENT] = value; } - } - else { - for (let i = source.length - 1; i >= 0; i--) { - nodes.push(source[i]); - source[i][PARENT] = value; + if (reverse) { + stack.unshift(child); + } + else { + stack.push(child); } } } else { const values = []; - if ("op2" in value && value.op2 != null) { - values.push(value.op2); - value.op2[PARENT] = value; - } - if ("op1" in value && value.op1 != null) { - values.push(value.op1); - value.op1[PARENT] = value; - } - // @ts-expect-error - if ("op" in value && value.op.typ != null) { + if ("l" in value && value.l != null) { // @ts-expect-error - values.push(value.op); + values.push(value.l); // @ts-expect-error - value.op[PARENT] = value; - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (let i = value.r.length - 1; i >= 0; i--) { - values.push(value.r[i]); - value.r[i][PARENT] = value; - } - } - else { - values.push(value.r); - value.r[PARENT] = value; - } - } - if ("l" in value && value.l != null) { - if (Array.isArray(value.l)) { - for (let i = value.l.length - 1; i >= 0; i--) { - values.push(value.l[i]); - value.l[i][PARENT] = value; - } - } - else { - values.push(value.l); + if (value.l[PARENT] != value) { + // @ts-expect-error value.l[PARENT] = value; } } @@ -471,16 +440,12 @@ function* walkValues(values, root = null, filter, reverse) { } } if (values.length > 0) { - if (reverse) { - for (let i = 0; i < values.length; i++) { - nodes.push(values[i]); - values[i][PARENT] = value; + for (const v of values) { + if (reverse) { + stack.unshift(v); } - } - else { - for (let i = values.length - 1; i >= 0; i--) { - nodes.push(values[i]); - values[i][PARENT] = value; + else { + stack.push(v); } } } @@ -497,16 +462,10 @@ function* walkValues(values, root = null, filter, reverse) { // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - if (reverse) { - for (let i = 0; i < op.length; i++) { - nodes.push(op[i]); - op[i][PARENT] = value; - } - } - else { - for (let i = op.length - 1; i >= 0; i--) { - nodes.push(op[i]); - op[i][PARENT] = value; + stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); + for (const o of op) { + if (o[PARENT] != value) { + o[PARENT] = value; } } } diff --git a/src/lib/ast/find.ts b/src/lib/ast/find.ts index 0b403e18..e17c53b8 100644 --- a/src/lib/ast/find.ts +++ b/src/lib/ast/find.ts @@ -98,8 +98,12 @@ export function findByValue( for (const r2 of walkValues(source, r1.node)) { if (matcher(r2.value, r1.node as AstNode)) { + return { // @ts-ignore - return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } @@ -192,10 +196,10 @@ export function findLast( ): AstNode | Token | null { for (const result of walk(ast as AstNode, null, true)) // for (const { node, parent } of walk(ast as AstNode, null, true)) { - if (matcher(result.node, result.parent)) { - return result.node; - } - // } + if (matcher(result.node, result.parent)) { + return result.node; + } + // } return null; } diff --git a/src/lib/ast/walk.ts b/src/lib/ast/walk.ts index 0ec79245..c144f62d 100644 --- a/src/lib/ast/walk.ts +++ b/src/lib/ast/walk.ts @@ -478,6 +478,7 @@ export function* walk( * // [ "Iden", "from" ] * ``` */ + export function* walkValues( values: Token[], root: AstNode | Token | null = null, @@ -491,7 +492,7 @@ export function* walkValues( }, reverse?: boolean, ): Generator { - const nodes: Token[] = reverse ? values.slice() : values.toReversed(); + const stack: Token[] = values.slice(); let previous: Token | null = null; if (filter != null && typeof filter == "function") { @@ -529,10 +530,15 @@ export function* walkValues( }, } as WalkAttributesResult; - while (nodes.length > 0) { - value = nodes.pop() as Token; + while (++i < stack.length) { + value = stack[i]; option = null; + if (i > maxQueueLength) { + stack.splice(0, maxQueueLength); + i -= maxQueueLength; + } + if (filter.fn != null && eventType & WalkerEvent.Enter) { const isValid: boolean = filter.type == null || @@ -572,15 +578,11 @@ export function* walkValues( if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - if (reverse) { - for (let i = 0; i < op.length; i++) { - nodes.push(op[i]); - op[i][PARENT] = value; - } - } else { - for (let i = op.length - 1; i >= 0; i--) { - nodes.push(op[i]); - op[i][PARENT] = value; + stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); + + for (const o of op) { + if (o[PARENT] != value) { + o[PARENT] = value; } } } @@ -590,66 +592,35 @@ export function* walkValues( result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = nodes[nodes.length - 1] ?? null; + result.nextValue = stack[0] ?? null; yield result; if (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) { if ("chi" in value) { - const source = value.chi as Token[]; + const sliced = (value).chi.slice(); - if (reverse) { - for (let i = 0; i < source.length; i++) { - nodes.push(source[i]); - source[i][PARENT] = value; + for (const child of sliced) { + if (child[PARENT] != value) { + child[PARENT] = value; } - } else { - for (let i = source.length - 1; i >= 0; i--) { - nodes.push(source[i]); - source[i][PARENT] = value; + + if (reverse) { + stack.unshift(child); + } else { + stack.push(child); } } } else { const values: Token[] = []; - if ("op2" in value && value.op2 != null) { - values.push(value.op2); - value.op2[PARENT] = value; - } - - if ("op1" in value && value.op1 != null) { - values.push(value.op1); - value.op1[PARENT] = value; - } - - // @ts-expect-error - if ("op" in value && value.op.typ != null) { - // @ts-expect-error - values.push(value.op); + if ("l" in value && value.l != null) { // @ts-expect-error - value.op[PARENT] = value; - } - - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (let i = value.r.length - 1; i >= 0; i--) { - values.push(value.r[i]); - value.r[i][PARENT] = value; - } - } else { - values.push(value.r); - value.r[PARENT] = value; - } - } + values.push(value.l); - if ("l" in value && value.l != null) { - if (Array.isArray(value.l)) { - for (let i = value.l.length - 1; i >= 0; i--) { - values.push(value.l[i]); - value.l[i][PARENT] = value; - } - } else { - values.push(value.l); + // @ts-expect-error + if (value.l[PARENT] != value) { + // @ts-expect-error value.l[PARENT] = value; } } @@ -688,15 +659,11 @@ export function* walkValues( } if (values.length > 0) { - if (reverse) { - for (let i = 0; i < values.length; i++) { - nodes.push(values[i]); - values[i][PARENT] = value; - } - } else { - for (let i = values.length - 1; i >= 0; i--) { - nodes.push(values[i]); - values[i][PARENT] = value; + for (const v of values) { + if (reverse) { + stack.unshift(v); + } else { + stack.push(v); } } } @@ -717,16 +684,11 @@ export function* walkValues( // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; + stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - if (reverse) { - for (let i = 0; i < op.length; i++) { - nodes.push(op[i]); - op[i][PARENT] = value; - } - } else { - for (let i = op.length - 1; i >= 0; i--) { - nodes.push(op[i]); - op[i][PARENT] = value; + for (const o of op) { + if (o[PARENT] != value) { + o[PARENT] = value; } } } From d5f3cf581f71ab7c983d1f50613942969acf45a0 Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Fri, 30 Oct 2026 10:43:25 -0400 Subject: [PATCH 06/14] reduce walker oeprations #170 --- dist/index-umd-web.js | 610 +++++++++++++++++++++++++---------- dist/index.cjs | 610 +++++++++++++++++++++++++---------- dist/index.d.ts | 2 +- dist/src/lib/ast/find.js | 8 +- dist/src/lib/ast/walk.js | 212 ++++++++---- dist/src/lib/parser/parse.js | 390 ++++++++++++++++------ src/lib/ast/walk.ts | 242 +++++++++----- src/lib/parser/parse.ts | 440 +++++++++++++++++++------ test/specs/code/visitors.js | 63 ++++ 9 files changed, 1871 insertions(+), 706 deletions(-) diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js index 179129e1..7fc86ae4 100644 --- a/dist/index-umd-web.js +++ b/dist/index-umd-web.js @@ -9697,7 +9697,6 @@ */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); - const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9952,9 +9951,19 @@ * // [ "Iden", "from" ] * ``` */ - function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); + function* walkValues(tokens, root = null, filter, reverse) { + const nodes = []; let previous = null; + if (reverse) { + for (let i = 0; i < tokens.length; i++) { + nodes.push(tokens[i]); + } + } + else { + for (let i = tokens.length - 1; i >= 0; i--) { + nodes.push(tokens[i]); + } + } if (filter != null && typeof filter == "function") { filter = { event: exports.WalkerEvent.Enter, @@ -9970,7 +9979,7 @@ let value; let option; let node; - let i = -1; + const values = []; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -9989,13 +9998,9 @@ } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & exports.WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -10023,10 +10028,16 @@ // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -10035,70 +10046,129 @@ result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0) { - if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + // + if (value.chi != null) { + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { - const values = []; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); - // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + values.length = 0; + switch (value.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + values.push(value.l); value.l[PARENT] = value; - } - } - if ("op" in value && typeof value.op == "object") { - // @ts-expect-error - values.push(value.op); - // @ts-expect-error - if (value.op[PARENT] != value) { - // @ts-expect-error + values.push(value.r); + value.r[PARENT] = value; + break; + case exports.EnumToken.MatchExpressionTokenType: + values.push(value.l); + value.l[PARENT] = value; + values.push(value.op); value.op[PARENT] = value; - } - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (const r of value.r) { - // - values.push(r); - if (r[PARENT] != value) { - // - r[PARENT] = value; - } - } - } - else { - // values.push(value.r); - if (value.r[PARENT] != value) { - // - value.r[PARENT] = value; + value.r[PARENT] = value; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op); + value.op[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; } - } + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + values.push(value.l); + value.l[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.op.length; i++) { + const element = value.op[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op1); + value.op1[PARENT] = value; + for (let i = 0; i < value.val.length; i++) { + const element = value.val[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op2); + value.op2[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -10115,10 +10185,16 @@ // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -22735,8 +22811,12 @@ } for (const r2 of walkValues(source, r1.node)) { if (matcher(r2.value, r1.node)) { - // @ts-ignore - return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } @@ -31705,64 +31785,153 @@ break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - node.op2[PARENT] = node; - } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - node.op1[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // node.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // node.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // node.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.l[i]); + // // @ts-ignore + // node.l[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - node.op[PARENT] = node; + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.l[i]); - // @ts-ignore - node.l[i][PARENT] = node; - } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; } // @ts-ignore if (node.chi != null) { @@ -32740,64 +32909,153 @@ break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - nodes.op2[PARENT] = node; - } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - nodes.op1[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // nodes.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // nodes.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // nodes.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // node.l[i][PARENT] = node; + // // @ts-ignore + // nodes.push(node.l[i]); + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - nodes.op[PARENT] = node; + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - node.l[i][PARENT] = node; - // @ts-ignore - nodes.push(node.l[i]); - } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; } // @ts-ignore if (node.chi != null) { diff --git a/dist/index.cjs b/dist/index.cjs index a55ee5e3..d3d4b5ef 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -9693,7 +9693,6 @@ exports.WalkerEvent = void 0; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); -const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9948,9 +9947,19 @@ function* walk(node, filter, reverse) { * // [ "Iden", "from" ] * ``` */ -function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); +function* walkValues(tokens, root = null, filter, reverse) { + const nodes = []; let previous = null; + if (reverse) { + for (let i = 0; i < tokens.length; i++) { + nodes.push(tokens[i]); + } + } + else { + for (let i = tokens.length - 1; i >= 0; i--) { + nodes.push(tokens[i]); + } + } if (filter != null && typeof filter == "function") { filter = { event: exports.WalkerEvent.Enter, @@ -9966,7 +9975,7 @@ function* walkValues(values, root = null, filter, reverse) { let value; let option; let node; - let i = -1; + const values = []; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -9985,13 +9994,9 @@ function* walkValues(values, root = null, filter, reverse) { } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & exports.WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -10019,10 +10024,16 @@ function* walkValues(values, root = null, filter, reverse) { // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -10031,70 +10042,129 @@ function* walkValues(values, root = null, filter, reverse) { result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0) { - if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + // + if (value.chi != null) { + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { - const values = []; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); - // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + values.length = 0; + switch (value.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + values.push(value.l); value.l[PARENT] = value; - } - } - if ("op" in value && typeof value.op == "object") { - // @ts-expect-error - values.push(value.op); - // @ts-expect-error - if (value.op[PARENT] != value) { - // @ts-expect-error + values.push(value.r); + value.r[PARENT] = value; + break; + case exports.EnumToken.MatchExpressionTokenType: + values.push(value.l); + value.l[PARENT] = value; + values.push(value.op); value.op[PARENT] = value; - } - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (const r of value.r) { - // - values.push(r); - if (r[PARENT] != value) { - // - r[PARENT] = value; - } - } - } - else { - // values.push(value.r); - if (value.r[PARENT] != value) { - // - value.r[PARENT] = value; + value.r[PARENT] = value; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op); + value.op[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; } - } + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + values.push(value.l); + value.l[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.op.length; i++) { + const element = value.op[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op1); + value.op1[PARENT] = value; + for (let i = 0; i < value.val.length; i++) { + const element = value.val[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op2); + value.op2[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -10111,10 +10181,16 @@ function* walkValues(values, root = null, filter, reverse) { // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -22731,8 +22807,12 @@ function findByValue(ast, matcher) { } for (const r2 of walkValues(source, r1.node)) { if (matcher(r2.value, r1.node)) { - // @ts-ignore - return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } @@ -31701,64 +31781,153 @@ function doParseSync(tokenizer, options = {}) { break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - node.op2[PARENT] = node; - } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - node.op1[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // node.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // node.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // node.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.l[i]); + // // @ts-ignore + // node.l[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - node.op[PARENT] = node; + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.l[i]); - // @ts-ignore - node.l[i][PARENT] = node; - } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; } // @ts-ignore if (node.chi != null) { @@ -32736,64 +32905,153 @@ async function doParse(iter, options = {}) { break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - nodes.op2[PARENT] = node; - } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - nodes.op1[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // nodes.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // nodes.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // nodes.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // node.l[i][PARENT] = node; + // // @ts-ignore + // nodes.push(node.l[i]); + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - nodes.op[PARENT] = node; + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - node.l[i][PARENT] = node; - // @ts-ignore - nodes.push(node.l[i]); - } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; } // @ts-ignore if (node.chi != null) { diff --git a/dist/index.d.ts b/dist/index.d.ts index 966c15a0..114097be 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -3396,7 +3396,7 @@ declare function walk(node: AstNode$1, filter?: WalkerOptions | null): Generator * // [ "Iden", "from" ] * ``` */ -declare function walkValues(values: Token$1[], root?: AstNode$1 | Token$1 | null, filter?: WalkerValueFilter | null | { +declare function walkValues(tokens: Token$1[], root?: AstNode$1 | Token$1 | null, filter?: WalkerValueFilter | null | { event?: WalkerEvent; fn?: WalkerValueFilter; type?: EnumToken | EnumToken[] | ((token: Token$1) => boolean); diff --git a/dist/src/lib/ast/find.js b/dist/src/lib/ast/find.js index 179e2c83..121dc17a 100644 --- a/dist/src/lib/ast/find.js +++ b/dist/src/lib/ast/find.js @@ -95,8 +95,12 @@ function findByValue(ast, matcher) { } for (const r2 of walkValues(source, r1.node)) { if (matcher(r2.value, r1.node)) { - // @ts-ignore - return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } diff --git a/dist/src/lib/ast/walk.js b/dist/src/lib/ast/walk.js index de1afba6..2e794219 100644 --- a/dist/src/lib/ast/walk.js +++ b/dist/src/lib/ast/walk.js @@ -44,7 +44,6 @@ var WalkerEvent; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(WalkerEvent || (WalkerEvent = {})); -const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -299,9 +298,19 @@ function* walk(node, filter, reverse) { * // [ "Iden", "from" ] * ``` */ -function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); +function* walkValues(tokens, root = null, filter, reverse) { + const nodes = []; let previous = null; + if (reverse) { + for (let i = 0; i < tokens.length; i++) { + nodes.push(tokens[i]); + } + } + else { + for (let i = tokens.length - 1; i >= 0; i--) { + nodes.push(tokens[i]); + } + } if (filter != null && typeof filter == "function") { filter = { event: WalkerEvent.Enter, @@ -317,7 +326,7 @@ function* walkValues(values, root = null, filter, reverse) { let value; let option; let node; - let i = -1; + const values = []; const eventType = filter.event ?? WalkerEvent.Enter; // @ts-ignore const result = { @@ -336,13 +345,9 @@ function* walkValues(values, root = null, filter, reverse) { } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -370,10 +375,16 @@ function* walkValues(values, root = null, filter, reverse) { // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -382,70 +393,129 @@ function* walkValues(values, root = null, filter, reverse) { result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & WalkerOptionEnum.IgnoreChildren) === 0) { - if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + // + if (value.chi != null) { + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { - const values = []; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); - // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + values.length = 0; + switch (value.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + values.push(value.l); value.l[PARENT] = value; - } - } - if ("op" in value && typeof value.op == "object") { - // @ts-expect-error - values.push(value.op); - // @ts-expect-error - if (value.op[PARENT] != value) { - // @ts-expect-error + values.push(value.r); + value.r[PARENT] = value; + break; + case EnumToken.MatchExpressionTokenType: + values.push(value.l); + value.l[PARENT] = value; + values.push(value.op); value.op[PARENT] = value; - } - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (const r of value.r) { - // - values.push(r); - if (r[PARENT] != value) { - // - r[PARENT] = value; - } - } - } - else { - // values.push(value.r); - if (value.r[PARENT] != value) { - // - value.r[PARENT] = value; + value.r[PARENT] = value; + break; + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; } - } + values.push(value.op); + value.op[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case EnumToken.WhenElseQueryConditionTokenType: + values.push(value.l); + value.l[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case EnumToken.IfConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.op.length; i++) { + const element = value.op[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op1); + value.op1[PARENT] = value; + for (let i = 0; i < value.val.length; i++) { + const element = value.val[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op2); + value.op2[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -462,10 +532,16 @@ function* walkValues(values, root = null, filter, reverse) { // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } diff --git a/dist/src/lib/parser/parse.js b/dist/src/lib/parser/parse.js index 3da9dea2..3b481b23 100644 --- a/dist/src/lib/parser/parse.js +++ b/dist/src/lib/parser/parse.js @@ -736,64 +736,153 @@ function doParseSync(tokenizer, options = {}) { break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - node.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // node.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // node.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // node.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.l[i]); + // // @ts-ignore + // node.l[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - node.op1[PARENT] = node; + break; + case EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } - } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.l[i]); - // @ts-ignore - node.l[i][PARENT] = node; - } + break; + case EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; } // @ts-ignore if (node.chi != null) { @@ -1771,64 +1860,153 @@ async function doParse(iter, options = {}) { break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - nodes.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // nodes.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // nodes.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // nodes.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // node.l[i][PARENT] = node; + // // @ts-ignore + // nodes.push(node.l[i]); + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - nodes.op1[PARENT] = node; + break; + case EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - nodes.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } - } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - node.l[i][PARENT] = node; - // @ts-ignore - nodes.push(node.l[i]); - } + break; + case EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; } // @ts-ignore if (node.chi != null) { diff --git a/src/lib/ast/walk.ts b/src/lib/ast/walk.ts index c144f62d..ec7dd050 100644 --- a/src/lib/ast/walk.ts +++ b/src/lib/ast/walk.ts @@ -2,8 +2,11 @@ import type { AstDeclaration, AstNode, AstRuleList, + ContainerStyleRangeToken, FunctionToken, - ParensToken, + IfConditionToken, + MatchExpressionToken, + SupportsQueryConditionToken, Token, WalkAttributesResult, WalkerFilter, @@ -11,8 +14,9 @@ import type { WalkerOptions, WalkerValueFilter, WalkResult, + WhenElseUnaryConditionToken } from "../../@types/index.d.ts"; -import type { BinaryExpressionToken, MediaRangeQueryToken } from "../../@types/token.d.ts"; +import type { BinaryExpressionToken, IfElseConditionToken, MediaRangeQueryToken } from "../../@types/token.d.ts"; import { PARENT, TOKENS } from "../syntax/constants.ts"; import { EnumToken } from "./types.ts"; @@ -52,8 +56,6 @@ export enum WalkerEvent { Leave = 0x2, } -const maxQueueLength = 25000; - /** * Walk ast nodes * @param node initial node @@ -478,9 +480,8 @@ export function* walk( * // [ "Iden", "from" ] * ``` */ - export function* walkValues( - values: Token[], + tokens: Token[], root: AstNode | Token | null = null, filter?: | WalkerValueFilter @@ -492,9 +493,19 @@ export function* walkValues( }, reverse?: boolean, ): Generator { - const stack: Token[] = values.slice(); + const nodes: Token[] = []; let previous: Token | null = null; + if (reverse) { + for (let i = 0; i < tokens.length; i++) { + nodes.push(tokens[i]); + } + } else { + for (let i = tokens.length - 1; i >= 0; i--) { + nodes.push(tokens[i]); + } + } + if (filter != null && typeof filter == "function") { filter = { event: WalkerEvent.Enter, @@ -510,7 +521,8 @@ export function* walkValues( let value: Token; let option: WalkerOption; let node: Token | null; - let i: number = -1; + + const values: Token[] = []; const eventType = filter.event ?? WalkerEvent.Enter; // @ts-ignore const result = { @@ -530,15 +542,10 @@ export function* walkValues( }, } as WalkAttributesResult; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop() as Token; option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } - if (filter.fn != null && eventType & WalkerEvent.Enter) { const isValid: boolean = filter.type == null || @@ -578,11 +585,15 @@ export function* walkValues( if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -592,78 +603,154 @@ export function* walkValues( result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) { - if ("chi" in value) { - const sliced = (value).chi.slice(); + // + if ((value as FunctionToken).chi != null) { + const source = (value as FunctionToken).chi as Token[]; - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - - if (reverse) { - stack.unshift(child); - } else { - stack.push(child); + } else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { - const values: Token[] = []; + values.length = 0; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); + switch (value.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + values.push((value as BinaryExpressionToken | IfElseConditionToken).l); + (value as BinaryExpressionToken | IfElseConditionToken).l[PARENT] = value; - // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error - value.l[PARENT] = value; - } - } + values.push((value as BinaryExpressionToken | IfElseConditionToken).r); + (value as BinaryExpressionToken | IfElseConditionToken).r[PARENT] = value; - if ("op" in value && typeof value.op == "object") { - // @ts-expect-error - values.push(value.op); + break; - // @ts-expect-error - if (value.op[PARENT] != value) { - // @ts-expect-error - value.op[PARENT] = value; - } - } + case EnumToken.MatchExpressionTokenType: + values.push((value as MatchExpressionToken).l); + (value as MatchExpressionToken).l[PARENT] = value; - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (const r of value.r) { - // - values.push(r); + values.push((value as MatchExpressionToken).op); + (value as MatchExpressionToken).op[PARENT] = value; - if (r[PARENT] != value) { - // - r[PARENT] = value; - } + values.push((value as MatchExpressionToken).r); + (value as MatchExpressionToken).r[PARENT] = value; + + break; + + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < (value as SupportsQueryConditionToken).l.length; i++) { + const element = (value as SupportsQueryConditionToken).l[i]; + values.push(element); + element[PARENT] = value; } - } else { - // - values.push(value.r); - if (value.r[PARENT] != value) { - // - value.r[PARENT] = value; + values.push((value as SupportsQueryConditionToken).op); + (value as SupportsQueryConditionToken).op[PARENT] = value; + + for (let i = 0; i < (value as SupportsQueryConditionToken).r.length; i++) { + const element = (value as SupportsQueryConditionToken).r[i]; + values.push(element); + element[PARENT] = value; } - } + + break; + case EnumToken.WhenElseQueryConditionTokenType: + values.push((value as WhenElseUnaryConditionToken).l); + (value as WhenElseUnaryConditionToken).l[PARENT] = value; + + for (let i = 0; i < (value as WhenElseUnaryConditionToken).r.length; i++) { + const element = (value as WhenElseUnaryConditionToken).r[i]; + values.push(element); + element[PARENT] = value; + } + + break; + + case EnumToken.IfConditionTokenType: + for (let i = 0; i < (value as IfConditionToken).l.length; i++) { + const element = (value as IfConditionToken).l[i]; + values.push(element); + element[PARENT] = value; + } + + for (let i = 0; i < (value as IfConditionToken).r.length; i++) { + const element = (value as IfConditionToken).r[i]; + values.push(element); + element[PARENT] = value; + } + + break; + + case EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < (value as ContainerStyleRangeToken).l.length; i++) { + const element = (value as ContainerStyleRangeToken).l[i]; + values.push(element); + element[PARENT] = value; + } + + for (let i = 0; i < (value as ContainerStyleRangeToken).op.length; i++) { + const element = (value as ContainerStyleRangeToken).op[i]; + values.push(element); + element[PARENT] = value; + } + + for (let i = 0; i < (value as ContainerStyleRangeToken).r.length; i++) { + const element = (value as ContainerStyleRangeToken).r[i]; + values.push(element); + element[PARENT] = value; + } + break; + + case EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < (value as MediaRangeQueryToken).l.length; i++) { + const element = (value as MediaRangeQueryToken).l[i]; + values.push(element); + element[PARENT] = value; + } + + values.push((value as MediaRangeQueryToken).op1); + (value as MediaRangeQueryToken).op1[PARENT] = value; + + for (let i = 0; i < (value as MediaRangeQueryToken).val.length; i++) { + const element = (value as MediaRangeQueryToken).val[i]; + values.push(element); + element[PARENT] = value; + } + + values.push((value as MediaRangeQueryToken).op2); + (value as MediaRangeQueryToken).op2[PARENT] = value; + + for (let i = 0; i < (value as MediaRangeQueryToken).r.length; i++) { + const element = (value as MediaRangeQueryToken).r[i]; + values.push(element); + element[PARENT] = value; + } + break; } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); - } else { - stack.push(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; + } + } else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -684,11 +771,16 @@ export function* walkValues( // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } diff --git a/src/lib/parser/parse.ts b/src/lib/parser/parse.ts index 77f80a80..acfffc08 100644 --- a/src/lib/parser/parse.ts +++ b/src/lib/parser/parse.ts @@ -18,9 +18,11 @@ import type { AstStyleSheet, AtRuleToken, AttrStartToken, + BinaryExpressionToken, ClassSelectorToken, ColorToken, ComposesSelectorToken, + ContainerStyleRangeToken, CssVariableImportTokenType, CssVariableMapTokenType, CssVariableToken, @@ -33,7 +35,11 @@ import type { GenericVisitorHandler, GenericVisitorResult, IdentToken, + IfConditionToken, + IfElseConditionToken, LoadResult, + MatchExpressionToken, + MediaRangeQueryToken, ModuleSyncOptions, ParsedVisitorHandlers, ParseInfo, @@ -44,9 +50,11 @@ import type { PseudoClassToken, ResolvedPath, StringToken, + SupportsQueryConditionToken, Token, UrlToken, VisitorNodeMap, + WhenElseUnaryConditionToken, WhitespaceToken, } from "../../@types/index.d.ts"; import { @@ -974,66 +982,180 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - node.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // node.op2[PARENT] = node; + // } + + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // node.op1[PARENT] = node; + // } + + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // node.op[PARENT] = node; + // } + + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.l[i]); + // // @ts-ignore + // node.l[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + nodes.push((node as BinaryExpressionToken | IfElseConditionToken).r); + (node as BinaryExpressionToken | IfElseConditionToken).r[PARENT] = node; + + nodes.push((node as BinaryExpressionToken | IfElseConditionToken).l); + (node as BinaryExpressionToken | IfElseConditionToken).l[PARENT] = node; + + break; + + case EnumToken.MatchExpressionTokenType: + nodes.push((node as MatchExpressionToken).r); + (node as MatchExpressionToken).r[PARENT] = node; + + nodes.push((node as MatchExpressionToken).op); + (node as MatchExpressionToken).op[PARENT] = node; + + nodes.push((node as MatchExpressionToken).l); + (node as MatchExpressionToken).l[PARENT] = node; + break; + + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = (node as SupportsQueryConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as SupportsQueryConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - node.op1[PARENT] = node; + nodes.push((node as SupportsQueryConditionToken).op); + (node as SupportsQueryConditionToken).op[PARENT] = node; + + for (let i = (node as SupportsQueryConditionToken).l.length - 1; i >= 0; i--) { + const element = (node as SupportsQueryConditionToken).l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - node.op[PARENT] = node; + break; + case EnumToken.WhenElseQueryConditionTokenType: + for (let i = (node as WhenElseUnaryConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as WhenElseUnaryConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } + nodes.push((node as WhenElseUnaryConditionToken).l); + (node as WhenElseUnaryConditionToken).l[PARENT] = node; - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + break; + + case EnumToken.IfConditionTokenType: + for (let i = (node as IfConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as IfConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.l[i]); - // @ts-ignore - node.l[i][PARENT] = node; - } - } else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + for (let i = (node as IfConditionToken).l.length - 1; i >= 0; i--) { + const element = (node as IfConditionToken).l[i]; + nodes.push(element); + element[PARENT] = node; } - } + + break; + + case EnumToken.ContainerStyleRangeTokenType: + for (let i = (node as ContainerStyleRangeToken).r.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).r[i]; + nodes.push(element); + element[PARENT] = node; + } + + for (let i = (node as ContainerStyleRangeToken).op.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = (node as ContainerStyleRangeToken).l.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.MediaRangeQueryTokenType: + for (let i = (node as MediaRangeQueryToken).r.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).r[i]; + nodes.push(element); + element[PARENT] = node; + } + + nodes.push((node as MediaRangeQueryToken).op2); + (node as MediaRangeQueryToken).op2[PARENT] = node; + + for (let i = (node as MediaRangeQueryToken).val.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).val[i]; + nodes.push(element); + element[PARENT] = node; + } + + nodes.push((node as MediaRangeQueryToken).op1); + (node as MediaRangeQueryToken).op1[PARENT] = node; + + for (let i = (node as MediaRangeQueryToken).l.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; } // @ts-ignore @@ -2270,67 +2392,181 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - nodes.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // nodes.op2[PARENT] = node; + // } + + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // nodes.op1[PARENT] = node; + // } + + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // nodes.op[PARENT] = node; + // } + + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // node.l[i][PARENT] = node; + // // @ts-ignore + // nodes.push(node.l[i]); + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + nodes.push((node as BinaryExpressionToken | IfElseConditionToken).r); + (node as BinaryExpressionToken | IfElseConditionToken).r[PARENT] = node; + + nodes.push((node as BinaryExpressionToken | IfElseConditionToken).l); + (node as BinaryExpressionToken | IfElseConditionToken).l[PARENT] = node; + + break; + + case EnumToken.MatchExpressionTokenType: + nodes.push((node as MatchExpressionToken).r); + (node as MatchExpressionToken).r[PARENT] = node; + + nodes.push((node as MatchExpressionToken).op); + (node as MatchExpressionToken).op[PARENT] = node; + + nodes.push((node as MatchExpressionToken).l); + (node as MatchExpressionToken).l[PARENT] = node; + break; + + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = (node as SupportsQueryConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as SupportsQueryConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - nodes.op1[PARENT] = node; + nodes.push((node as SupportsQueryConditionToken).op); + (node as SupportsQueryConditionToken).op[PARENT] = node; + + for (let i = (node as SupportsQueryConditionToken).l.length - 1; i >= 0; i--) { + const element = (node as SupportsQueryConditionToken).l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - nodes.op[PARENT] = node; + break; + case EnumToken.WhenElseQueryConditionTokenType: + for (let i = (node as WhenElseUnaryConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as WhenElseUnaryConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } + nodes.push((node as WhenElseUnaryConditionToken).l); + (node as WhenElseUnaryConditionToken).l[PARENT] = node; - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + break; + + case EnumToken.IfConditionTokenType: + for (let i = (node as IfConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as IfConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - node.l[i][PARENT] = node; - // @ts-ignore - nodes.push(node.l[i]); - } - } else { - // @ts-ignore - nodes.push(node.l); + for (let i = (node as IfConditionToken).l.length - 1; i >= 0; i--) { + const element = (node as IfConditionToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } - // @ts-ignore - node.l[PARENT] = node; + break; + + case EnumToken.ContainerStyleRangeTokenType: + for (let i = (node as ContainerStyleRangeToken).r.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - } + + for (let i = (node as ContainerStyleRangeToken).op.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = (node as ContainerStyleRangeToken).l.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.MediaRangeQueryTokenType: + for (let i = (node as MediaRangeQueryToken).r.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).r[i]; + nodes.push(element); + element[PARENT] = node; + } + + nodes.push((node as MediaRangeQueryToken).op2); + (node as MediaRangeQueryToken).op2[PARENT] = node; + + for (let i = (node as MediaRangeQueryToken).val.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).val[i]; + nodes.push(element); + element[PARENT] = node; + } + + nodes.push((node as MediaRangeQueryToken).op1); + (node as MediaRangeQueryToken).op1[PARENT] = node; + + for (let i = (node as MediaRangeQueryToken).l.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; } // @ts-ignore diff --git a/test/specs/code/visitors.js b/test/specs/code/visitors.js index 27261836..51612a89 100644 --- a/test/specs/code/visitors.js +++ b/test/specs/code/visitors.js @@ -737,5 +737,68 @@ html,body { background-color: red }`); }); + + it("visitor #13", function () { + const visitor = []; + + const css = ` + +body { color: color(from var(--base-color) display-p3 r calc(g + 0.24) calc(b + 0.15)); } + +html, +body { + line-height: 1.474; +} + +.ruler { + + height: 10px; + background-color: orange +} + +`; + const options = { + beautify: true, + visitor(node) { + visitor.push( + `${EnumToken[node.typ]} -> ${"nam" in node ? node.nam : "sel" in node ? node.sel : "val" in node ? node.val : ""}`, + ); + }, + }; + + transformSync(css, options); + return expect(visitor).deep.equals([ + "StyleSheetNodeType -> ", + "RuleNodeType -> body", + "DeclarationNodeType -> color", + "Color -> color", + "Iden -> from", + "Whitespace -> ", + "WildCardFunctionTokenType -> var", + "DashedIden -> --base-color", + "Whitespace -> ", + "Iden -> display-p3", + "Whitespace -> ", + "Iden -> r", + "Whitespace -> ", + "MathFunctionTokenType -> calc", + "BinaryExpressionTokenType -> ", + "Iden -> g", + "Number -> 0.24", + "Whitespace -> ", + "MathFunctionTokenType -> calc", + "BinaryExpressionTokenType -> ", + "Iden -> b", + "Number -> 0.15", + "RuleNodeType -> html,body", + "DeclarationNodeType -> line-height", + "Number -> 1.474", + "RuleNodeType -> .ruler", + "DeclarationNodeType -> height", + "Length -> 10", + "DeclarationNodeType -> background-color", + "Color -> orange", + ]); + }); }); } From b22e14cb1d064671687a3f6137cc632839fbe500 Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Fri, 30 Oct 2026 10:43:25 -0400 Subject: [PATCH 07/14] reduce walker operations #170 --- dist/index-umd-web.js | 847 ++++++++++++++++++++++++--------- dist/index.cjs | 847 ++++++++++++++++++++++++--------- dist/index.d.ts | 3 +- dist/src/lib/ast/find.js | 8 +- dist/src/lib/ast/walk.js | 426 ++++++++++++----- dist/src/lib/parser/parse.js | 409 +++++++++++----- dist/src/lib/printer/render.js | 4 +- src/@types/token.d.ts | 1 + src/lib/ast/walk.ts | 487 ++++++++++++++----- src/lib/parser/parse.ts | 476 +++++++++++++----- src/lib/parser/tokenize.ts | 15 +- src/lib/printer/render.ts | 6 +- test/specs/code/visitors.js | 63 +++ 13 files changed, 2645 insertions(+), 947 deletions(-) diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js index 179129e1..0142bb51 100644 --- a/dist/index-umd-web.js +++ b/dist/index-umd-web.js @@ -9697,7 +9697,6 @@ */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); - const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9800,7 +9799,7 @@ }, }; let option = null; - let source = null; + let source = []; while (parents.length > 0) { node = parents.pop(); // enter node @@ -9824,62 +9823,153 @@ yield result; } if (attributes) { - source = null; + source.length = 0; if (Array.isArray(node[TOKENS])) { - source = node[TOKENS]; - } - else if (node.typ == exports.EnumToken.DeclarationNodeType) { - source = node.val; - } - else if (node.l != null) { - // @ts-expect-error - if (Array.isArray(node.l)) { - // @ts-expect-error - source = node.l.slice(); + // source = node[TOKENS] as Token[]; + if (reverse) { + for (const token of node[TOKENS]) { + parents.push(token); + token[PARENT] = node; + } } else { - // @ts-expect-error - source = [node.l]; - } - // @ts-expect-error - if (node.r != null) { - // @ts-expect-error - if (Array.isArray(node.r)) { - // @ts-expect-error - source.push(...node.r.slice()); - } - else { - // @ts-expect-error - source = [node.r]; + for (let i = node[TOKENS].length - 1; i >= 0; i--) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; } } - // @ts-expect-error - if (node.op != null && typeof node.op == "object") { - // @ts-expect-error - source.push(node.op); - } - // @ts-expect-error - if (node.op1 != null && typeof node.op1 == "object") { - // @ts-expect-error - source.push(node.op1); - } - // @ts-expect-error - if (node.op2 != null && typeof node.op2 == "object") { - // @ts-expect-error - source.push(node.op2); - } } - if (source != null) { + else if (node.typ == exports.EnumToken.DeclarationNodeType) { + // source = (node as AstDeclaration).val as Token[]; if (reverse) { - for (let i = 0; i < node[TOKENS].length; i++) { - parents.push(node[TOKENS][i]); - node[TOKENS][i][PARENT] = node; + for (const token of node.val) { + parents.push(token); + token[PARENT] = node; } } else { - for (let i = node[TOKENS].length - 1; i >= 0; i--) { - parents.push(node[TOKENS][i]); - node[TOKENS][i][PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + parents.push(node.val[i]); + node.val[i][PARENT] = node; + } + } + } + else { + source.length = 0; + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + source.push(node.l); + node.l[PARENT] = node; + source.push(node.r); + node.r[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + source.push(node.l); + node.l[PARENT] = node; + source.push(node.op); + node.op[PARENT] = node; + source.push(node.r); + node.r[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op); + node.op[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + source.push(node.l); + node.l[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case exports.EnumToken.ComposesSelectorNodeType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + if (node.r != null) { + source.push(node.r); + node.r[PARENT] = node; + } + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.op.length; i++) { + const element = node.op[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op1); + node.op1[PARENT] = node; + for (let i = 0; i < node.val.length; i++) { + const element = node.val[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op2); + node.op2[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + } + if (source.length > 0) { + if (reverse) { + for (let i = 0; i < source.length; i++) { + parents.push(source[i]); + source[i][PARENT] = node; + } + } + else { + for (let i = source.length - 1; i >= 0; i--) { + parents.push(source[i]); + source[i][PARENT] = node; + } } } } @@ -9888,18 +9978,22 @@ // @ts-expect-error node["chi"] != null && (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0)) { - // @ts-expect-error - source = node.chi; if (reverse) { - for (let i = 0; i < source.length; i++) { - parents.push(source[i]); - source[i][PARENT] = node; + // @ts-expect-error + for (let i = 0; i < node.chi.length; i++) { + // @ts-expect-error + parents.push(node.chi[i]); + // @ts-expect-error + node.chi[i][PARENT] = node; } } else { - for (let i = source.length - 1; i >= 0; i--) { - parents.push(source[i]); - source[i][PARENT] = node; + // @ts-expect-error + for (let i = node.chi.length - 1; i >= 0; i--) { + // @ts-expect-error + parents.push(node.chi[i]); + // @ts-expect-error + node.chi[i][PARENT] = node; } } } @@ -9952,9 +10046,19 @@ * // [ "Iden", "from" ] * ``` */ - function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); + function* walkValues(tokens, root = null, filter, reverse) { + const nodes = []; let previous = null; + if (reverse) { + for (let i = 0; i < tokens.length; i++) { + nodes.push(tokens[i]); + } + } + else { + for (let i = tokens.length - 1; i >= 0; i--) { + nodes.push(tokens[i]); + } + } if (filter != null && typeof filter == "function") { filter = { event: exports.WalkerEvent.Enter, @@ -9970,7 +10074,7 @@ let value; let option; let node; - let i = -1; + const values = []; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -9989,13 +10093,9 @@ } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & exports.WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -10023,10 +10123,16 @@ // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -10035,70 +10141,140 @@ result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0) { - if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + // + if (value.chi != null) { + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { - const values = []; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); - // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + values.length = 0; + switch (value.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + values.push(value.l); value.l[PARENT] = value; - } - } - if ("op" in value && typeof value.op == "object") { - // @ts-expect-error - values.push(value.op); - // @ts-expect-error - if (value.op[PARENT] != value) { - // @ts-expect-error + values.push(value.r); + value.r[PARENT] = value; + break; + case exports.EnumToken.MatchExpressionTokenType: + values.push(value.l); + value.l[PARENT] = value; + values.push(value.op); value.op[PARENT] = value; - } - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (const r of value.r) { - // - values.push(r); - if (r[PARENT] != value) { - // - r[PARENT] = value; - } - } - } - else { - // values.push(value.r); - if (value.r[PARENT] != value) { - // + value.r[PARENT] = value; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op); + value.op[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.ComposesSelectorNodeType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + if (value.r != null) { + values.push(value.r); value.r[PARENT] = value; } - } + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + values.push(value.l); + value.l[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.op.length; i++) { + const element = value.op[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op1); + value.op1[PARENT] = value; + for (let i = 0; i < value.val.length; i++) { + const element = value.val[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op2); + value.op2[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -10115,10 +10291,16 @@ // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -22735,8 +22917,12 @@ } for (const r2 of walkValues(source, r1.node)) { if (matcher(r2.value, r1.node)) { - // @ts-ignore - return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } @@ -26952,8 +27138,10 @@ case exports.EnumToken.BadUrlTokenType: case exports.EnumToken.EOFTokenType: return ""; + case exports.EnumToken.ComposesSelectorNodeType: + return `${token.l.reduce((acc, curr) => acc + renderValue(curr, options, cache, reducer), "")}${token.r == null ? "" : " from " + renderValue(token.r, options, cache, reducer)}`; default: - console.debug({ token }); + console.error({ token }); throw new Error(`Unsupported token type for ${exports.EnumToken[token.typ]}`); } // errors?.push({ action: "ignore", message: `render: unexpected token ${JSON.stringify(token, null, 1)}` }); @@ -31705,64 +31893,164 @@ break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - node.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // node.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // node.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // node.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.l[i]); + // // @ts-ignore + // node.l[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - node.op1[PARENT] = node; + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore + break; + case exports.EnumToken.ComposesSelectorNodeType: if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + nodes.push(node.r); + node.r[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.l[i]); - // @ts-ignore - node.l[i][PARENT] = node; - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; + } + break; } // @ts-ignore if (node.chi != null) { @@ -32740,64 +33028,164 @@ break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - nodes.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // nodes.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // nodes.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // nodes.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // node.l[i][PARENT] = node; + // // @ts-ignore + // nodes.push(node.l[i]); + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - nodes.op1[PARENT] = node; + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - nodes.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore + break; + case exports.EnumToken.ComposesSelectorNodeType: if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + nodes.push(node.r); + node.r[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - node.l[i][PARENT] = node; - // @ts-ignore - nodes.push(node.l[i]); - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; + } + break; } // @ts-ignore if (node.chi != null) { @@ -32934,11 +33322,6 @@ exports.EnumAstNodeStatus.Disallowed)) { // @ts-ignore node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); - // node[PARENT] = null; - // count--; - // if (count == 0) { - // break; - // } } } } diff --git a/dist/index.cjs b/dist/index.cjs index a55ee5e3..786e7e71 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -9693,7 +9693,6 @@ exports.WalkerEvent = void 0; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); -const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9796,7 +9795,7 @@ function* walk(node, filter, reverse) { }, }; let option = null; - let source = null; + let source = []; while (parents.length > 0) { node = parents.pop(); // enter node @@ -9820,62 +9819,153 @@ function* walk(node, filter, reverse) { yield result; } if (attributes) { - source = null; + source.length = 0; if (Array.isArray(node[TOKENS])) { - source = node[TOKENS]; - } - else if (node.typ == exports.EnumToken.DeclarationNodeType) { - source = node.val; - } - else if (node.l != null) { - // @ts-expect-error - if (Array.isArray(node.l)) { - // @ts-expect-error - source = node.l.slice(); + // source = node[TOKENS] as Token[]; + if (reverse) { + for (const token of node[TOKENS]) { + parents.push(token); + token[PARENT] = node; + } } else { - // @ts-expect-error - source = [node.l]; - } - // @ts-expect-error - if (node.r != null) { - // @ts-expect-error - if (Array.isArray(node.r)) { - // @ts-expect-error - source.push(...node.r.slice()); - } - else { - // @ts-expect-error - source = [node.r]; + for (let i = node[TOKENS].length - 1; i >= 0; i--) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; } } - // @ts-expect-error - if (node.op != null && typeof node.op == "object") { - // @ts-expect-error - source.push(node.op); - } - // @ts-expect-error - if (node.op1 != null && typeof node.op1 == "object") { - // @ts-expect-error - source.push(node.op1); - } - // @ts-expect-error - if (node.op2 != null && typeof node.op2 == "object") { - // @ts-expect-error - source.push(node.op2); - } } - if (source != null) { + else if (node.typ == exports.EnumToken.DeclarationNodeType) { + // source = (node as AstDeclaration).val as Token[]; if (reverse) { - for (let i = 0; i < node[TOKENS].length; i++) { - parents.push(node[TOKENS][i]); - node[TOKENS][i][PARENT] = node; + for (const token of node.val) { + parents.push(token); + token[PARENT] = node; } } else { - for (let i = node[TOKENS].length - 1; i >= 0; i--) { - parents.push(node[TOKENS][i]); - node[TOKENS][i][PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + parents.push(node.val[i]); + node.val[i][PARENT] = node; + } + } + } + else { + source.length = 0; + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + source.push(node.l); + node.l[PARENT] = node; + source.push(node.r); + node.r[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + source.push(node.l); + node.l[PARENT] = node; + source.push(node.op); + node.op[PARENT] = node; + source.push(node.r); + node.r[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op); + node.op[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + source.push(node.l); + node.l[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case exports.EnumToken.ComposesSelectorNodeType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + if (node.r != null) { + source.push(node.r); + node.r[PARENT] = node; + } + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.op.length; i++) { + const element = node.op[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op1); + node.op1[PARENT] = node; + for (let i = 0; i < node.val.length; i++) { + const element = node.val[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op2); + node.op2[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + } + if (source.length > 0) { + if (reverse) { + for (let i = 0; i < source.length; i++) { + parents.push(source[i]); + source[i][PARENT] = node; + } + } + else { + for (let i = source.length - 1; i >= 0; i--) { + parents.push(source[i]); + source[i][PARENT] = node; + } } } } @@ -9884,18 +9974,22 @@ function* walk(node, filter, reverse) { // @ts-expect-error node["chi"] != null && (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0)) { - // @ts-expect-error - source = node.chi; if (reverse) { - for (let i = 0; i < source.length; i++) { - parents.push(source[i]); - source[i][PARENT] = node; + // @ts-expect-error + for (let i = 0; i < node.chi.length; i++) { + // @ts-expect-error + parents.push(node.chi[i]); + // @ts-expect-error + node.chi[i][PARENT] = node; } } else { - for (let i = source.length - 1; i >= 0; i--) { - parents.push(source[i]); - source[i][PARENT] = node; + // @ts-expect-error + for (let i = node.chi.length - 1; i >= 0; i--) { + // @ts-expect-error + parents.push(node.chi[i]); + // @ts-expect-error + node.chi[i][PARENT] = node; } } } @@ -9948,9 +10042,19 @@ function* walk(node, filter, reverse) { * // [ "Iden", "from" ] * ``` */ -function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); +function* walkValues(tokens, root = null, filter, reverse) { + const nodes = []; let previous = null; + if (reverse) { + for (let i = 0; i < tokens.length; i++) { + nodes.push(tokens[i]); + } + } + else { + for (let i = tokens.length - 1; i >= 0; i--) { + nodes.push(tokens[i]); + } + } if (filter != null && typeof filter == "function") { filter = { event: exports.WalkerEvent.Enter, @@ -9966,7 +10070,7 @@ function* walkValues(values, root = null, filter, reverse) { let value; let option; let node; - let i = -1; + const values = []; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -9985,13 +10089,9 @@ function* walkValues(values, root = null, filter, reverse) { } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & exports.WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -10019,10 +10119,16 @@ function* walkValues(values, root = null, filter, reverse) { // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -10031,70 +10137,140 @@ function* walkValues(values, root = null, filter, reverse) { result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & exports.WalkerOptionEnum.IgnoreChildren) === 0) { - if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + // + if (value.chi != null) { + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { - const values = []; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); - // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + values.length = 0; + switch (value.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + values.push(value.l); value.l[PARENT] = value; - } - } - if ("op" in value && typeof value.op == "object") { - // @ts-expect-error - values.push(value.op); - // @ts-expect-error - if (value.op[PARENT] != value) { - // @ts-expect-error + values.push(value.r); + value.r[PARENT] = value; + break; + case exports.EnumToken.MatchExpressionTokenType: + values.push(value.l); + value.l[PARENT] = value; + values.push(value.op); value.op[PARENT] = value; - } - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (const r of value.r) { - // - values.push(r); - if (r[PARENT] != value) { - // - r[PARENT] = value; - } - } - } - else { - // values.push(value.r); - if (value.r[PARENT] != value) { - // + value.r[PARENT] = value; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op); + value.op[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.ComposesSelectorNodeType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + if (value.r != null) { + values.push(value.r); value.r[PARENT] = value; } - } + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + values.push(value.l); + value.l[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.op.length; i++) { + const element = value.op[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op1); + value.op1[PARENT] = value; + for (let i = 0; i < value.val.length; i++) { + const element = value.val[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op2); + value.op2[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -10111,10 +10287,16 @@ function* walkValues(values, root = null, filter, reverse) { // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -22731,8 +22913,12 @@ function findByValue(ast, matcher) { } for (const r2 of walkValues(source, r1.node)) { if (matcher(r2.value, r1.node)) { - // @ts-ignore - return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } @@ -26948,8 +27134,10 @@ function renderValue(token, options = {}, cache = Object.create(null), reducer, case exports.EnumToken.BadUrlTokenType: case exports.EnumToken.EOFTokenType: return ""; + case exports.EnumToken.ComposesSelectorNodeType: + return `${token.l.reduce((acc, curr) => acc + renderValue(curr, options, cache, reducer), "")}${token.r == null ? "" : " from " + renderValue(token.r, options, cache, reducer)}`; default: - console.debug({ token }); + console.error({ token }); throw new Error(`Unsupported token type for ${exports.EnumToken[token.typ]}`); } // errors?.push({ action: "ignore", message: `render: unexpected token ${JSON.stringify(token, null, 1)}` }); @@ -31701,64 +31889,164 @@ function doParseSync(tokenizer, options = {}) { break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - node.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // node.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // node.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // node.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.l[i]); + // // @ts-ignore + // node.l[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - node.op1[PARENT] = node; + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore + break; + case exports.EnumToken.ComposesSelectorNodeType: if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + nodes.push(node.r); + node.r[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.l[i]); - // @ts-ignore - node.l[i][PARENT] = node; - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; + } + break; } // @ts-ignore if (node.chi != null) { @@ -32736,64 +33024,164 @@ async function doParse(iter, options = {}) { break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - nodes.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // nodes.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // nodes.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // nodes.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // node.l[i][PARENT] = node; + // // @ts-ignore + // nodes.push(node.l[i]); + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case exports.EnumToken.BinaryExpressionTokenType: + case exports.EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.SupportsQueryConditionTokenType: + case exports.EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - nodes.op1[PARENT] = node; + break; + case exports.EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case exports.EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - nodes.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore + break; + case exports.EnumToken.ComposesSelectorNodeType: if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + nodes.push(node.r); + node.r[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - node.l[i][PARENT] = node; - // @ts-ignore - nodes.push(node.l[i]); - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case exports.EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; + case exports.EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; + } + break; } // @ts-ignore if (node.chi != null) { @@ -32930,11 +33318,6 @@ async function doParse(iter, options = {}) { exports.EnumAstNodeStatus.Disallowed)) { // @ts-ignore node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); - // node[PARENT] = null; - // count--; - // if (count == 0) { - // break; - // } } } } diff --git a/dist/index.d.ts b/dist/index.d.ts index 966c15a0..8182fb7d 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -2472,6 +2472,7 @@ export declare interface ComposesSelectorToken extends BaseToken { * @inheritdoc */ typ: EnumToken.ComposesSelectorTokenType; + /** * Left handle */ @@ -3396,7 +3397,7 @@ declare function walk(node: AstNode$1, filter?: WalkerOptions | null): Generator * // [ "Iden", "from" ] * ``` */ -declare function walkValues(values: Token$1[], root?: AstNode$1 | Token$1 | null, filter?: WalkerValueFilter | null | { +declare function walkValues(tokens: Token$1[], root?: AstNode$1 | Token$1 | null, filter?: WalkerValueFilter | null | { event?: WalkerEvent; fn?: WalkerValueFilter; type?: EnumToken | EnumToken[] | ((token: Token$1) => boolean); diff --git a/dist/src/lib/ast/find.js b/dist/src/lib/ast/find.js index 179e2c83..121dc17a 100644 --- a/dist/src/lib/ast/find.js +++ b/dist/src/lib/ast/find.js @@ -95,8 +95,12 @@ function findByValue(ast, matcher) { } for (const r2 of walkValues(source, r1.node)) { if (matcher(r2.value, r1.node)) { - // @ts-ignore - return { node: r1.node, value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents } }; + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } diff --git a/dist/src/lib/ast/walk.js b/dist/src/lib/ast/walk.js index de1afba6..939f9a45 100644 --- a/dist/src/lib/ast/walk.js +++ b/dist/src/lib/ast/walk.js @@ -44,7 +44,6 @@ var WalkerEvent; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(WalkerEvent || (WalkerEvent = {})); -const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -147,7 +146,7 @@ function* walk(node, filter, reverse) { }, }; let option = null; - let source = null; + let source = []; while (parents.length > 0) { node = parents.pop(); // enter node @@ -171,62 +170,153 @@ function* walk(node, filter, reverse) { yield result; } if (attributes) { - source = null; + source.length = 0; if (Array.isArray(node[TOKENS])) { - source = node[TOKENS]; - } - else if (node.typ == EnumToken.DeclarationNodeType) { - source = node.val; - } - else if (node.l != null) { - // @ts-expect-error - if (Array.isArray(node.l)) { - // @ts-expect-error - source = node.l.slice(); + // source = node[TOKENS] as Token[]; + if (reverse) { + for (const token of node[TOKENS]) { + parents.push(token); + token[PARENT] = node; + } } else { - // @ts-expect-error - source = [node.l]; - } - // @ts-expect-error - if (node.r != null) { - // @ts-expect-error - if (Array.isArray(node.r)) { - // @ts-expect-error - source.push(...node.r.slice()); - } - else { - // @ts-expect-error - source = [node.r]; + for (let i = node[TOKENS].length - 1; i >= 0; i--) { + parents.push(node[TOKENS][i]); + node[TOKENS][i][PARENT] = node; } } - // @ts-expect-error - if (node.op != null && typeof node.op == "object") { - // @ts-expect-error - source.push(node.op); - } - // @ts-expect-error - if (node.op1 != null && typeof node.op1 == "object") { - // @ts-expect-error - source.push(node.op1); - } - // @ts-expect-error - if (node.op2 != null && typeof node.op2 == "object") { - // @ts-expect-error - source.push(node.op2); - } } - if (source != null) { + else if (node.typ == EnumToken.DeclarationNodeType) { + // source = (node as AstDeclaration).val as Token[]; if (reverse) { - for (let i = 0; i < node[TOKENS].length; i++) { - parents.push(node[TOKENS][i]); - node[TOKENS][i][PARENT] = node; + for (const token of node.val) { + parents.push(token); + token[PARENT] = node; } } else { - for (let i = node[TOKENS].length - 1; i >= 0; i--) { - parents.push(node[TOKENS][i]); - node[TOKENS][i][PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + parents.push(node.val[i]); + node.val[i][PARENT] = node; + } + } + } + else { + source.length = 0; + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + source.push(node.l); + node.l[PARENT] = node; + source.push(node.r); + node.r[PARENT] = node; + break; + case EnumToken.MatchExpressionTokenType: + source.push(node.l); + node.l[PARENT] = node; + source.push(node.op); + node.op[PARENT] = node; + source.push(node.r); + node.r[PARENT] = node; + break; + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op); + node.op[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case EnumToken.WhenElseQueryConditionTokenType: + source.push(node.l); + node.l[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case EnumToken.ComposesSelectorNodeType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + if (node.r != null) { + source.push(node.r); + node.r[PARENT] = node; + } + break; + case EnumToken.IfConditionTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.op.length; i++) { + const element = node.op[i]; + source.push(element); + element[PARENT] = node; + } + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + case EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < node.l.length; i++) { + const element = node.l[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op1); + node.op1[PARENT] = node; + for (let i = 0; i < node.val.length; i++) { + const element = node.val[i]; + source.push(element); + element[PARENT] = node; + } + source.push(node.op2); + node.op2[PARENT] = node; + for (let i = 0; i < node.r.length; i++) { + const element = node.r[i]; + source.push(element); + element[PARENT] = node; + } + break; + } + if (source.length > 0) { + if (reverse) { + for (let i = 0; i < source.length; i++) { + parents.push(source[i]); + source[i][PARENT] = node; + } + } + else { + for (let i = source.length - 1; i >= 0; i--) { + parents.push(source[i]); + source[i][PARENT] = node; + } } } } @@ -235,18 +325,22 @@ function* walk(node, filter, reverse) { // @ts-expect-error node["chi"] != null && (!isNumeric || (option & WalkerOptionEnum.IgnoreChildren) === 0)) { - // @ts-expect-error - source = node.chi; if (reverse) { - for (let i = 0; i < source.length; i++) { - parents.push(source[i]); - source[i][PARENT] = node; + // @ts-expect-error + for (let i = 0; i < node.chi.length; i++) { + // @ts-expect-error + parents.push(node.chi[i]); + // @ts-expect-error + node.chi[i][PARENT] = node; } } else { - for (let i = source.length - 1; i >= 0; i--) { - parents.push(source[i]); - source[i][PARENT] = node; + // @ts-expect-error + for (let i = node.chi.length - 1; i >= 0; i--) { + // @ts-expect-error + parents.push(node.chi[i]); + // @ts-expect-error + node.chi[i][PARENT] = node; } } } @@ -299,9 +393,19 @@ function* walk(node, filter, reverse) { * // [ "Iden", "from" ] * ``` */ -function* walkValues(values, root = null, filter, reverse) { - const stack = values.slice(); +function* walkValues(tokens, root = null, filter, reverse) { + const nodes = []; let previous = null; + if (reverse) { + for (let i = 0; i < tokens.length; i++) { + nodes.push(tokens[i]); + } + } + else { + for (let i = tokens.length - 1; i >= 0; i--) { + nodes.push(tokens[i]); + } + } if (filter != null && typeof filter == "function") { filter = { event: WalkerEvent.Enter, @@ -317,7 +421,7 @@ function* walkValues(values, root = null, filter, reverse) { let value; let option; let node; - let i = -1; + const values = []; const eventType = filter.event ?? WalkerEvent.Enter; // @ts-ignore const result = { @@ -336,13 +440,9 @@ function* walkValues(values, root = null, filter, reverse) { } }, }; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop(); option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } if (filter.fn != null && eventType & WalkerEvent.Enter) { const isValid = filter.type == null || value.typ == filter.type || @@ -370,10 +470,16 @@ function* walkValues(values, root = null, filter, reverse) { // if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -382,70 +488,140 @@ function* walkValues(values, root = null, filter, reverse) { result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || (option & WalkerOptionEnum.IgnoreChildren) === 0) { - if ("chi" in value) { - const sliced = value.chi.slice(); - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; - } - if (reverse) { - stack.unshift(child); + // + if (value.chi != null) { + const source = value.chi; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - else { - stack.push(child); + } + else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { - const values = []; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); - // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error + values.length = 0; + switch (value.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + values.push(value.l); value.l[PARENT] = value; - } - } - if ("op" in value && typeof value.op == "object") { - // @ts-expect-error - values.push(value.op); - // @ts-expect-error - if (value.op[PARENT] != value) { - // @ts-expect-error + values.push(value.r); + value.r[PARENT] = value; + break; + case EnumToken.MatchExpressionTokenType: + values.push(value.l); + value.l[PARENT] = value; + values.push(value.op); value.op[PARENT] = value; - } - } - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (const r of value.r) { - // - values.push(r); - if (r[PARENT] != value) { - // - r[PARENT] = value; - } - } - } - else { - // values.push(value.r); - if (value.r[PARENT] != value) { - // + value.r[PARENT] = value; + break; + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op); + value.op[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case EnumToken.ComposesSelectorNodeType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + if (value.r != null) { + values.push(value.r); value.r[PARENT] = value; } - } + break; + case EnumToken.WhenElseQueryConditionTokenType: + values.push(value.l); + value.l[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case EnumToken.IfConditionTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.op.length; i++) { + const element = value.op[i]; + values.push(element); + element[PARENT] = value; + } + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; + case EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < value.l.length; i++) { + const element = value.l[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op1); + value.op1[PARENT] = value; + for (let i = 0; i < value.val.length; i++) { + const element = value.val[i]; + values.push(element); + element[PARENT] = value; + } + values.push(value.op2); + value.op2[PARENT] = value; + for (let i = 0; i < value.r.length; i++) { + const element = value.r[i]; + values.push(element); + element[PARENT] = value; + } + break; } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; } - else { - stack.push(v); + } + else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -462,10 +638,16 @@ function* walkValues(values, root = null, filter, reverse) { // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } + else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } diff --git a/dist/src/lib/parser/parse.js b/dist/src/lib/parser/parse.js index 3da9dea2..dd781bd0 100644 --- a/dist/src/lib/parser/parse.js +++ b/dist/src/lib/parser/parse.js @@ -736,64 +736,164 @@ function doParseSync(tokenizer, options = {}) { break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - node.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // node.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // node.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // node.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.l[i]); + // // @ts-ignore + // node.l[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - node.op1[PARENT] = node; + break; + case EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore + break; + case EnumToken.ComposesSelectorNodeType: if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + nodes.push(node.r); + node.r[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.l[i]); - // @ts-ignore - node.l[i][PARENT] = node; - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; + case EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; + } + break; } // @ts-ignore if (node.chi != null) { @@ -1771,64 +1871,164 @@ async function doParse(iter, options = {}) { break; } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - nodes.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // nodes.op2[PARENT] = node; + // } + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // nodes.op1[PARENT] = node; + // } + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // nodes.op[PARENT] = node; + // } + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // node.l[i][PARENT] = node; + // // @ts-ignore + // nodes.push(node.l[i]); + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.MatchExpressionTokenType: + nodes.push(node.r); + node.r[PARENT] = node; + nodes.push(node.op); + node.op[PARENT] = node; + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op); + node.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - nodes.op1[PARENT] = node; + break; + case EnumToken.WhenElseQueryConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.l); + node.l[PARENT] = node; + break; + case EnumToken.IfConditionTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - nodes.op[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore + break; + case EnumToken.ComposesSelectorNodeType: if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } - else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + nodes.push(node.r); + node.r[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - node.l[i][PARENT] = node; - // @ts-ignore - nodes.push(node.l[i]); - } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + break; + case EnumToken.ContainerStyleRangeTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.op.length - 1; i >= 0; i--) { + const element = node.op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; } - } + break; + case EnumToken.MediaRangeQueryTokenType: + for (let i = node.r.length - 1; i >= 0; i--) { + const element = node.r[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op2); + node.op2[PARENT] = node; + for (let i = node.val.length - 1; i >= 0; i--) { + const element = node.val[i]; + nodes.push(element); + element[PARENT] = node; + } + nodes.push(node.op1); + node.op1[PARENT] = node; + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; + } + break; } // @ts-ignore if (node.chi != null) { @@ -1965,11 +2165,6 @@ async function doParse(iter, options = {}) { EnumAstNodeStatus.Disallowed)) { // @ts-ignore node[PARENT].chi.splice(node[PARENT].chi.indexOf(node), 1); - // node[PARENT] = null; - // count--; - // if (count == 0) { - // break; - // } } } } diff --git a/dist/src/lib/printer/render.js b/dist/src/lib/printer/render.js index 3b48051c..11388996 100644 --- a/dist/src/lib/printer/render.js +++ b/dist/src/lib/printer/render.js @@ -1346,8 +1346,10 @@ function renderValue(token, options = {}, cache = Object.create(null), reducer, case EnumToken.BadUrlTokenType: case EnumToken.EOFTokenType: return ""; + case EnumToken.ComposesSelectorNodeType: + return `${token.l.reduce((acc, curr) => acc + renderValue(curr, options, cache, reducer), "")}${token.r == null ? "" : " from " + renderValue(token.r, options, cache, reducer)}`; default: - console.debug({ token }); + console.error({ token }); throw new Error(`Unsupported token type for ${EnumToken[token.typ]}`); } // errors?.push({ action: "ignore", message: `render: unexpected token ${JSON.stringify(token, null, 1)}` }); diff --git a/src/@types/token.d.ts b/src/@types/token.d.ts index e19aa5f6..a8ceb0fd 100644 --- a/src/@types/token.d.ts +++ b/src/@types/token.d.ts @@ -1461,6 +1461,7 @@ export declare interface ComposesSelectorToken extends BaseToken { * @inheritdoc */ typ: EnumToken.ComposesSelectorTokenType; + /** * Left handle */ diff --git a/src/lib/ast/walk.ts b/src/lib/ast/walk.ts index c144f62d..b9706909 100644 --- a/src/lib/ast/walk.ts +++ b/src/lib/ast/walk.ts @@ -2,8 +2,12 @@ import type { AstDeclaration, AstNode, AstRuleList, + ComposesSelectorToken, + ContainerStyleRangeToken, FunctionToken, - ParensToken, + IfConditionToken, + MatchExpressionToken, + SupportsQueryConditionToken, Token, WalkAttributesResult, WalkerFilter, @@ -11,8 +15,9 @@ import type { WalkerOptions, WalkerValueFilter, WalkResult, + WhenElseUnaryConditionToken, } from "../../@types/index.d.ts"; -import type { BinaryExpressionToken, MediaRangeQueryToken } from "../../@types/token.d.ts"; +import type { BinaryExpressionToken, IfElseConditionToken, MediaRangeQueryToken } from "../../@types/token.d.ts"; import { PARENT, TOKENS } from "../syntax/constants.ts"; import { EnumToken } from "./types.ts"; @@ -52,8 +57,6 @@ export enum WalkerEvent { Leave = 0x2, } -const maxQueueLength = 25000; - /** * Walk ast nodes * @param node initial node @@ -314,7 +317,7 @@ export function* walk( } as WalkResult; let option: WalkerOption = null; - let source: Token[] | null = null; + let source: Token[] = []; while (parents.length > 0) { node = parents.pop() as AstNode | Token; @@ -345,63 +348,180 @@ export function* walk( } if (attributes) { - source = null; + source.length = 0; if (Array.isArray(node[TOKENS])) { - source = node[TOKENS] as Token[]; - } else if (node.typ == EnumToken.DeclarationNodeType) { - source = (node as AstDeclaration).val as Token[]; - } else if ((node as BinaryExpressionToken | MediaRangeQueryToken).l != null) { - // @ts-expect-error - if (Array.isArray(node.l)) { - // @ts-expect-error - source = (node.l as Token[]).slice(); + // source = node[TOKENS] as Token[]; + + if (reverse) { + for (const token of node[TOKENS] as Token[]) { + parents.push(token); + token[PARENT] = node; + } } else { - // @ts-expect-error - source = [node.l as Token]; + for (let i = (node[TOKENS] as Token[]).length - 1; i >= 0; i--) { + parents.push((node[TOKENS] as Token[])[i]); + (node[TOKENS] as Token[])[i][PARENT] = node; + } } + } else if (node.typ == EnumToken.DeclarationNodeType) { + // source = (node as AstDeclaration).val as Token[]; - // @ts-expect-error - if (node.r != null) { - // @ts-expect-error - if (Array.isArray(node.r)) { - // @ts-expect-error - source.push(...(node.r as Token[]).slice()); - } else { - // @ts-expect-error - source = [node.r as Token]; + if (reverse) { + for (const token of (node as AstDeclaration).val as Token[]) { + parents.push(token); + token[PARENT] = node; + } + } else { + for (let i = ((node as AstDeclaration).val as Token[]).length - 1; i >= 0; i--) { + parents.push(((node as AstDeclaration).val as Token[])[i]); + ((node as AstDeclaration).val as Token[])[i][PARENT] = node; } } + } else { + source.length = 0; - // @ts-expect-error - if (node.op != null && typeof node.op == "object") { - // @ts-expect-error - source.push(node.op as Token); - } + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + source.push((node as BinaryExpressionToken | IfElseConditionToken).l); + (node as BinaryExpressionToken | IfElseConditionToken).l[PARENT] = node; - // @ts-expect-error - if (node.op1 != null && typeof node.op1 == "object") { - // @ts-expect-error - source.push(node.op1 as Token); - } + source.push((node as BinaryExpressionToken | IfElseConditionToken).r); + (node as BinaryExpressionToken | IfElseConditionToken).r[PARENT] = node; - // @ts-expect-error - if (node.op2 != null && typeof node.op2 == "object") { - // @ts-expect-error - source.push(node.op2 as Token); + break; + + case EnumToken.MatchExpressionTokenType: + source.push((node as MatchExpressionToken).l); + (node as MatchExpressionToken).l[PARENT] = node; + + source.push((node as MatchExpressionToken).op); + (node as MatchExpressionToken).op[PARENT] = node; + + source.push((node as MatchExpressionToken).r); + (node as MatchExpressionToken).r[PARENT] = node; + + break; + + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < (node as SupportsQueryConditionToken).l.length; i++) { + const element = (node as SupportsQueryConditionToken).l[i]; + source.push(element); + element[PARENT] = node; + } + + source.push((node as SupportsQueryConditionToken).op); + (node as SupportsQueryConditionToken).op[PARENT] = node; + + for (let i = 0; i < (node as SupportsQueryConditionToken).r.length; i++) { + const element = (node as SupportsQueryConditionToken).r[i]; + source.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.WhenElseQueryConditionTokenType: + source.push((node as WhenElseUnaryConditionToken).l); + (node as WhenElseUnaryConditionToken).l[PARENT] = node; + + for (let i = 0; i < (node as WhenElseUnaryConditionToken).r.length; i++) { + const element = (node as WhenElseUnaryConditionToken).r[i]; + source.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.ComposesSelectorNodeType: + for (let i = 0; i < (node as ComposesSelectorToken).l.length; i++) { + const element = (node as ComposesSelectorToken).l[i]; + source.push(element); + element[PARENT] = node; + } + + if ((node as ComposesSelectorToken).r != null) { + source.push((node as ComposesSelectorToken).r as Token); + ((node as ComposesSelectorToken).r as Token)[PARENT] = node; + } + + break; + + case EnumToken.IfConditionTokenType: + for (let i = 0; i < (node as IfConditionToken).l.length; i++) { + const element = (node as IfConditionToken).l[i]; + source.push(element); + element[PARENT] = node; + } + + for (let i = 0; i < (node as IfConditionToken).r.length; i++) { + const element = (node as IfConditionToken).r[i]; + source.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < (node as ContainerStyleRangeToken).l.length; i++) { + const element = (node as ContainerStyleRangeToken).l[i]; + source.push(element); + element[PARENT] = node; + } + + for (let i = 0; i < (node as ContainerStyleRangeToken).op.length; i++) { + const element = (node as ContainerStyleRangeToken).op[i]; + source.push(element); + element[PARENT] = node; + } + + for (let i = 0; i < (node as ContainerStyleRangeToken).r.length; i++) { + const element = (node as ContainerStyleRangeToken).r[i]; + source.push(element); + element[PARENT] = node; + } + break; + + case EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < (node as MediaRangeQueryToken).l.length; i++) { + const element = (node as MediaRangeQueryToken).l[i]; + source.push(element); + element[PARENT] = node; + } + + source.push((node as MediaRangeQueryToken).op1); + (node as MediaRangeQueryToken).op1[PARENT] = node; + + for (let i = 0; i < (node as MediaRangeQueryToken).val.length; i++) { + const element = (node as MediaRangeQueryToken).val[i]; + source.push(element); + element[PARENT] = node; + } + + source.push((node as MediaRangeQueryToken).op2); + (node as MediaRangeQueryToken).op2[PARENT] = node; + + for (let i = 0; i < (node as MediaRangeQueryToken).r.length; i++) { + const element = (node as MediaRangeQueryToken).r[i]; + source.push(element); + element[PARENT] = node; + } + break; } - } - if (source != null) { - if (reverse) { - for (let i = 0; i < (node[TOKENS] as Token[]).length; i++) { - parents.push((node[TOKENS] as Token[])[i] as Token); - (node[TOKENS] as Token[])[i][PARENT] = node; - } - } else { - for (let i = (node[TOKENS] as Token[]).length - 1; i >= 0; i--) { - parents.push((node[TOKENS] as Token[])[i] as Token); - (node[TOKENS] as Token[])[i][PARENT] = node; + if (source.length > 0) { + if (reverse) { + for (let i = 0; i < source.length; i++) { + parents.push(source[i]); + source[i][PARENT] = node; + } + } else { + for (let i = source.length - 1; i >= 0; i--) { + parents.push(source[i]); + source[i][PARENT] = node; + } } } } @@ -413,18 +533,22 @@ export function* walk( node["chi"] != null && (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) ) { - // @ts-expect-error - source = node.chi; if (reverse) { - for (let i = 0; i < source!.length; i++) { - parents.push(source![i]); - source![i][PARENT] = node; + // @ts-expect-error + for (let i = 0; i < (node.chi as AstNode[])!.length; i++) { + // @ts-expect-error + parents.push((node.chi as AstNode[])![i]); + // @ts-expect-error + (node.chi as AstNode[])![i][PARENT] = node; } } else { - for (let i = source!.length - 1; i >= 0; i--) { - parents.push(source![i]); - source![i][PARENT] = node; + // @ts-expect-error + for (let i = (node.chi as AstNode[])!.length - 1; i >= 0; i--) { + // @ts-expect-error + parents.push((node.chi as AstNode[])![i]); + // @ts-expect-error + (node.chi as AstNode[])![i][PARENT] = node; } } } @@ -478,9 +602,8 @@ export function* walk( * // [ "Iden", "from" ] * ``` */ - export function* walkValues( - values: Token[], + tokens: Token[], root: AstNode | Token | null = null, filter?: | WalkerValueFilter @@ -492,9 +615,19 @@ export function* walkValues( }, reverse?: boolean, ): Generator { - const stack: Token[] = values.slice(); + const nodes: Token[] = []; let previous: Token | null = null; + if (reverse) { + for (let i = 0; i < tokens.length; i++) { + nodes.push(tokens[i]); + } + } else { + for (let i = tokens.length - 1; i >= 0; i--) { + nodes.push(tokens[i]); + } + } + if (filter != null && typeof filter == "function") { filter = { event: WalkerEvent.Enter, @@ -510,7 +643,8 @@ export function* walkValues( let value: Token; let option: WalkerOption; let node: Token | null; - let i: number = -1; + + const values: Token[] = []; const eventType = filter.event ?? WalkerEvent.Enter; // @ts-ignore const result = { @@ -530,15 +664,10 @@ export function* walkValues( }, } as WalkAttributesResult; - while (++i < stack.length) { - value = stack[i]; + while (nodes.length > 0) { + value = nodes.pop() as Token; option = null; - if (i > maxQueueLength) { - stack.splice(0, maxQueueLength); - i -= maxQueueLength; - } - if (filter.fn != null && eventType & WalkerEvent.Enter) { const isValid: boolean = filter.type == null || @@ -578,11 +707,15 @@ export function* walkValues( if (option != null && typeof option == "object" && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } @@ -592,78 +725,169 @@ export function* walkValues( result.value = value; result.parent = value[PARENT] ?? root; result.previousValue = previous; - result.nextValue = stack[0] ?? null; + result.nextValue = nodes[nodes.length - 1] ?? null; yield result; if (!isNumeric || ((option as number) & WalkerOptionEnum.IgnoreChildren) === 0) { - if ("chi" in value) { - const sliced = (value).chi.slice(); + // + if ((value as FunctionToken).chi != null) { + const source = (value as FunctionToken).chi as Token[]; - for (const child of sliced) { - if (child[PARENT] != value) { - child[PARENT] = value; + if (reverse) { + for (let i = 0; i < source.length; i++) { + nodes.push(source[i]); + source[i][PARENT] = value; } - - if (reverse) { - stack.unshift(child); - } else { - stack.push(child); + } else { + for (let i = source.length - 1; i >= 0; i--) { + nodes.push(source[i]); + source[i][PARENT] = value; } } } else { - const values: Token[] = []; + values.length = 0; - if ("l" in value && value.l != null) { - // @ts-expect-error - values.push(value.l); + switch (value.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + values.push((value as BinaryExpressionToken | IfElseConditionToken).l); + (value as BinaryExpressionToken | IfElseConditionToken).l[PARENT] = value; - // @ts-expect-error - if (value.l[PARENT] != value) { - // @ts-expect-error - value.l[PARENT] = value; - } - } + values.push((value as BinaryExpressionToken | IfElseConditionToken).r); + (value as BinaryExpressionToken | IfElseConditionToken).r[PARENT] = value; - if ("op" in value && typeof value.op == "object") { - // @ts-expect-error - values.push(value.op); + break; - // @ts-expect-error - if (value.op[PARENT] != value) { - // @ts-expect-error - value.op[PARENT] = value; - } - } + case EnumToken.MatchExpressionTokenType: + values.push((value as MatchExpressionToken).l); + (value as MatchExpressionToken).l[PARENT] = value; + + values.push((value as MatchExpressionToken).op); + (value as MatchExpressionToken).op[PARENT] = value; + + values.push((value as MatchExpressionToken).r); + (value as MatchExpressionToken).r[PARENT] = value; - if ("r" in value && value.r != null) { - if (Array.isArray(value.r)) { - for (const r of value.r) { - // - values.push(r); + break; - if (r[PARENT] != value) { - // - r[PARENT] = value; - } + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = 0; i < (value as SupportsQueryConditionToken).l.length; i++) { + const element = (value as SupportsQueryConditionToken).l[i]; + values.push(element); + element[PARENT] = value; } - } else { - // - values.push(value.r); - if (value.r[PARENT] != value) { - // - value.r[PARENT] = value; + values.push((value as SupportsQueryConditionToken).op); + (value as SupportsQueryConditionToken).op[PARENT] = value; + + for (let i = 0; i < (value as SupportsQueryConditionToken).r.length; i++) { + const element = (value as SupportsQueryConditionToken).r[i]; + values.push(element); + element[PARENT] = value; } - } + + break; + + case EnumToken.ComposesSelectorNodeType: + for (let i = 0; i < (value as ComposesSelectorToken).l.length; i++) { + const element = (value as ComposesSelectorToken).l[i]; + values.push(element); + element[PARENT] = value; + } + + if ((value as ComposesSelectorToken).r != null) { + values.push((value as ComposesSelectorToken).r as Token); + ((value as ComposesSelectorToken).r as Token)[PARENT] = value; + } + + break; + + case EnumToken.WhenElseQueryConditionTokenType: + values.push((value as WhenElseUnaryConditionToken).l); + (value as WhenElseUnaryConditionToken).l[PARENT] = value; + + for (let i = 0; i < (value as WhenElseUnaryConditionToken).r.length; i++) { + const element = (value as WhenElseUnaryConditionToken).r[i]; + values.push(element); + element[PARENT] = value; + } + + break; + + case EnumToken.IfConditionTokenType: + for (let i = 0; i < (value as IfConditionToken).l.length; i++) { + const element = (value as IfConditionToken).l[i]; + values.push(element); + element[PARENT] = value; + } + + for (let i = 0; i < (value as IfConditionToken).r.length; i++) { + const element = (value as IfConditionToken).r[i]; + values.push(element); + element[PARENT] = value; + } + + break; + + case EnumToken.ContainerStyleRangeTokenType: + for (let i = 0; i < (value as ContainerStyleRangeToken).l.length; i++) { + const element = (value as ContainerStyleRangeToken).l[i]; + values.push(element); + element[PARENT] = value; + } + + for (let i = 0; i < (value as ContainerStyleRangeToken).op.length; i++) { + const element = (value as ContainerStyleRangeToken).op[i]; + values.push(element); + element[PARENT] = value; + } + + for (let i = 0; i < (value as ContainerStyleRangeToken).r.length; i++) { + const element = (value as ContainerStyleRangeToken).r[i]; + values.push(element); + element[PARENT] = value; + } + break; + + case EnumToken.MediaRangeQueryTokenType: + for (let i = 0; i < (value as MediaRangeQueryToken).l.length; i++) { + const element = (value as MediaRangeQueryToken).l[i]; + values.push(element); + element[PARENT] = value; + } + + values.push((value as MediaRangeQueryToken).op1); + (value as MediaRangeQueryToken).op1[PARENT] = value; + + for (let i = 0; i < (value as MediaRangeQueryToken).val.length; i++) { + const element = (value as MediaRangeQueryToken).val[i]; + values.push(element); + element[PARENT] = value; + } + + values.push((value as MediaRangeQueryToken).op2); + (value as MediaRangeQueryToken).op2[PARENT] = value; + + for (let i = 0; i < (value as MediaRangeQueryToken).r.length; i++) { + const element = (value as MediaRangeQueryToken).r[i]; + values.push(element); + element[PARENT] = value; + } + break; } if (values.length > 0) { - for (const v of values) { - if (reverse) { - stack.unshift(v); - } else { - stack.push(v); + if (reverse) { + for (let i = 0; i < values.length; i++) { + nodes.push(values[i]); + values[i][PARENT] = value; + } + } else { + for (let i = values.length - 1; i >= 0; i--) { + nodes.push(values[i]); + values[i][PARENT] = value; } } } @@ -684,11 +908,16 @@ export function* walkValues( // @ts-ignore if (option != null && ("typ" in option || Array.isArray(option))) { const op = Array.isArray(option) ? option : [option]; - stack.splice(i, 0, ...(reverse ? op.toReversed() : op)); - for (const o of op) { - if (o[PARENT] != value) { - o[PARENT] = value; + if (reverse) { + for (let i = 0; i < op.length; i++) { + nodes.push(op[i]); + op[i][PARENT] = value; + } + } else { + for (let i = op.length - 1; i >= 0; i--) { + nodes.push(op[i]); + op[i][PARENT] = value; } } } diff --git a/src/lib/parser/parse.ts b/src/lib/parser/parse.ts index 77f80a80..c115ba5c 100644 --- a/src/lib/parser/parse.ts +++ b/src/lib/parser/parse.ts @@ -18,9 +18,11 @@ import type { AstStyleSheet, AtRuleToken, AttrStartToken, + BinaryExpressionToken, ClassSelectorToken, ColorToken, ComposesSelectorToken, + ContainerStyleRangeToken, CssVariableImportTokenType, CssVariableMapTokenType, CssVariableToken, @@ -33,7 +35,11 @@ import type { GenericVisitorHandler, GenericVisitorResult, IdentToken, + IfConditionToken, + IfElseConditionToken, LoadResult, + MatchExpressionToken, + MediaRangeQueryToken, ModuleSyncOptions, ParsedVisitorHandlers, ParseInfo, @@ -44,9 +50,11 @@ import type { PseudoClassToken, ResolvedPath, StringToken, + SupportsQueryConditionToken, Token, UrlToken, VisitorNodeMap, + WhenElseUnaryConditionToken, WhitespaceToken, } from "../../@types/index.d.ts"; import { @@ -974,66 +982,194 @@ export function doParseSync(tokenizer: Tokenizer, options: ParserSyncOptions = { } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - node.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // node.op2[PARENT] = node; + // } + + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // node.op1[PARENT] = node; + // } + + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // node.op[PARENT] = node; + // } + + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.l[i]); + // // @ts-ignore + // node.l[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + nodes.push((node as BinaryExpressionToken | IfElseConditionToken).r); + (node as BinaryExpressionToken | IfElseConditionToken).r[PARENT] = node; + + nodes.push((node as BinaryExpressionToken | IfElseConditionToken).l); + (node as BinaryExpressionToken | IfElseConditionToken).l[PARENT] = node; + + break; + + case EnumToken.MatchExpressionTokenType: + nodes.push((node as MatchExpressionToken).r); + (node as MatchExpressionToken).r[PARENT] = node; + + nodes.push((node as MatchExpressionToken).op); + (node as MatchExpressionToken).op[PARENT] = node; + + nodes.push((node as MatchExpressionToken).l); + (node as MatchExpressionToken).l[PARENT] = node; + break; + + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = (node as SupportsQueryConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as SupportsQueryConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - node.op1[PARENT] = node; + nodes.push((node as SupportsQueryConditionToken).op); + (node as SupportsQueryConditionToken).op[PARENT] = node; + + for (let i = (node as SupportsQueryConditionToken).l.length - 1; i >= 0; i--) { + const element = (node as SupportsQueryConditionToken).l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - node.op[PARENT] = node; + break; + case EnumToken.WhenElseQueryConditionTokenType: + for (let i = (node as WhenElseUnaryConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as WhenElseUnaryConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } + nodes.push((node as WhenElseUnaryConditionToken).l); + (node as WhenElseUnaryConditionToken).l[PARENT] = node; - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + break; + + case EnumToken.IfConditionTokenType: + for (let i = (node as IfConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as IfConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.l[i]); - // @ts-ignore - node.l[i][PARENT] = node; - } - } else { - // @ts-ignore - nodes.push(node.l); - // @ts-ignore - node.l[PARENT] = node; + for (let i = (node as IfConditionToken).l.length - 1; i >= 0; i--) { + const element = (node as IfConditionToken).l[i]; + nodes.push(element); + element[PARENT] = node; } - } + + break; + + case EnumToken.ComposesSelectorNodeType: + if ((node as ComposesSelectorToken).r != null) { + nodes.push((node as ComposesSelectorToken).r as Token); + ((node as ComposesSelectorToken).r as Token)[PARENT] = node; + } + + for (let i = (node as ComposesSelectorToken).l.length - 1; i >= 0; i--) { + const element = (node as ComposesSelectorToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.ContainerStyleRangeTokenType: + for (let i = (node as ContainerStyleRangeToken).r.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).r[i]; + nodes.push(element); + element[PARENT] = node; + } + + for (let i = (node as ContainerStyleRangeToken).op.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = (node as ContainerStyleRangeToken).l.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.MediaRangeQueryTokenType: + for (let i = (node as MediaRangeQueryToken).r.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).r[i]; + nodes.push(element); + element[PARENT] = node; + } + + nodes.push((node as MediaRangeQueryToken).op2); + (node as MediaRangeQueryToken).op2[PARENT] = node; + + for (let i = (node as MediaRangeQueryToken).val.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).val[i]; + nodes.push(element); + element[PARENT] = node; + } + + nodes.push((node as MediaRangeQueryToken).op1); + (node as MediaRangeQueryToken).op1[PARENT] = node; + + for (let i = (node as MediaRangeQueryToken).l.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; } // @ts-ignore @@ -2270,67 +2406,195 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } // @ts-ignore - if (node.l != null) { - // @ts-ignore - if (node.op2 != null) { - // @ts-ignore - nodes.push(node.op2); - // @ts-ignore - nodes.op2[PARENT] = node; + // if (node.l != null) { + // // @ts-ignore + // if (node.op2 != null) { + // // @ts-ignore + // nodes.push(node.op2); + // // @ts-ignore + // nodes.op2[PARENT] = node; + // } + + // // @ts-ignore + // if (node.op1 != null) { + // // @ts-ignore + // nodes.push(node.op1); + // // @ts-ignore + // nodes.op1[PARENT] = node; + // } + + // // @ts-ignore + // if (nodes.op != null && node.op.typ != null) { + // // @ts-ignore + // nodes.push(node.op); + // // @ts-ignore + // nodes.op[PARENT] = node; + // } + + // // @ts-ignore + // if (node.r != null) { + // // @ts-ignore + // if (Array.isArray(node.r)) { + // // @ts-ignore + // for (let i = node.r.length - 1; i >= 0; i--) { + // // @ts-ignore + // nodes.push(node.r[i]); + // // @ts-ignore + // node.r[i][PARENT] = node; + // } + // } else { + // // @ts-ignore + // nodes.push(node.r); + // // @ts-ignore + // node.r[PARENT] = node; + // } + // } + + // // @ts-ignore + // if (Array.isArray(node.l)) { + // // @ts-ignore + // for (let i = node.l.length - 1; i >= 0; i--) { + // // @ts-ignore + // node.l[i][PARENT] = node; + // // @ts-ignore + // nodes.push(node.l[i]); + // } + // } else { + // // @ts-ignore + // nodes.push(node.l); + + // // @ts-ignore + // node.l[PARENT] = node; + // } + // } + } + + switch (node.typ) { + case EnumToken.BinaryExpressionTokenType: + case EnumToken.IfElseConditionTokenType: + nodes.push((node as BinaryExpressionToken | IfElseConditionToken).r); + (node as BinaryExpressionToken | IfElseConditionToken).r[PARENT] = node; + + nodes.push((node as BinaryExpressionToken | IfElseConditionToken).l); + (node as BinaryExpressionToken | IfElseConditionToken).l[PARENT] = node; + + break; + + case EnumToken.MatchExpressionTokenType: + nodes.push((node as MatchExpressionToken).r); + (node as MatchExpressionToken).r[PARENT] = node; + + nodes.push((node as MatchExpressionToken).op); + (node as MatchExpressionToken).op[PARENT] = node; + + nodes.push((node as MatchExpressionToken).l); + (node as MatchExpressionToken).l[PARENT] = node; + break; + + case EnumToken.SupportsQueryConditionTokenType: + case EnumToken.MediaQueryConditionTokenType: + for (let i = (node as SupportsQueryConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as SupportsQueryConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (node.op1 != null) { - // @ts-ignore - nodes.push(node.op1); - // @ts-ignore - nodes.op1[PARENT] = node; + nodes.push((node as SupportsQueryConditionToken).op); + (node as SupportsQueryConditionToken).op[PARENT] = node; + + for (let i = (node as SupportsQueryConditionToken).l.length - 1; i >= 0; i--) { + const element = (node as SupportsQueryConditionToken).l[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (nodes.op != null && node.op.typ != null) { - // @ts-ignore - nodes.push(node.op); - // @ts-ignore - nodes.op[PARENT] = node; + break; + case EnumToken.WhenElseQueryConditionTokenType: + for (let i = (node as WhenElseUnaryConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as WhenElseUnaryConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } + nodes.push((node as WhenElseUnaryConditionToken).l); + (node as WhenElseUnaryConditionToken).l[PARENT] = node; - // @ts-ignore - if (node.r != null) { - // @ts-ignore - if (Array.isArray(node.r)) { - // @ts-ignore - for (let i = node.r.length - 1; i >= 0; i--) { - // @ts-ignore - nodes.push(node.r[i]); - // @ts-ignore - node.r[i][PARENT] = node; - } - } else { - // @ts-ignore - nodes.push(node.r); - // @ts-ignore - node.r[PARENT] = node; - } + break; + + case EnumToken.IfConditionTokenType: + for (let i = (node as IfConditionToken).r.length - 1; i >= 0; i--) { + const element = (node as IfConditionToken).r[i]; + nodes.push(element); + element[PARENT] = node; } - // @ts-ignore - if (Array.isArray(node.l)) { - // @ts-ignore - for (let i = node.l.length - 1; i >= 0; i--) { - // @ts-ignore - node.l[i][PARENT] = node; - // @ts-ignore - nodes.push(node.l[i]); - } - } else { - // @ts-ignore - nodes.push(node.l); + for (let i = (node as IfConditionToken).l.length - 1; i >= 0; i--) { + const element = (node as IfConditionToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } - // @ts-ignore - node.l[PARENT] = node; + break; + + case EnumToken.ComposesSelectorNodeType: + if ((node as ComposesSelectorToken).r != null) { + nodes.push((node as ComposesSelectorToken).r as Token); + ((node as ComposesSelectorToken).r as Token)[PARENT] = node; } - } + + for (let i = (node as ComposesSelectorToken).l.length - 1; i >= 0; i--) { + const element = (node as ComposesSelectorToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.ContainerStyleRangeTokenType: + for (let i = (node as ContainerStyleRangeToken).r.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).r[i]; + nodes.push(element); + element[PARENT] = node; + } + + for (let i = (node as ContainerStyleRangeToken).op.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).op[i]; + nodes.push(element); + element[PARENT] = node; + } + for (let i = (node as ContainerStyleRangeToken).l.length - 1; i >= 0; i--) { + const element = (node as ContainerStyleRangeToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; + + case EnumToken.MediaRangeQueryTokenType: + for (let i = (node as MediaRangeQueryToken).r.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).r[i]; + nodes.push(element); + element[PARENT] = node; + } + + nodes.push((node as MediaRangeQueryToken).op2); + (node as MediaRangeQueryToken).op2[PARENT] = node; + + for (let i = (node as MediaRangeQueryToken).val.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).val[i]; + nodes.push(element); + element[PARENT] = node; + } + + nodes.push((node as MediaRangeQueryToken).op1); + (node as MediaRangeQueryToken).op1[PARENT] = node; + + for (let i = (node as MediaRangeQueryToken).l.length - 1; i >= 0; i--) { + const element = (node as MediaRangeQueryToken).l[i]; + nodes.push(element); + element[PARENT] = node; + } + + break; } // @ts-ignore @@ -2483,8 +2747,6 @@ export async function doParse(iter: Tokenizer | Promise, options: Par } if (invalidNodes.length > 0) { - let count: number = invalidNodes.length; - for (const node of invalidNodes) { if (options.lenient && node[STATE] & EnumAstNodeStatus.Unknown) { continue; @@ -2500,12 +2762,6 @@ export async function doParse(iter: Tokenizer | Promise, options: Par ) { // @ts-ignore node[PARENT]!.chi.splice(node[PARENT]!.chi.indexOf(node), 1); - // node[PARENT] = null; - // count--; - - // if (count == 0) { - // break; - // } } } } diff --git a/src/lib/parser/tokenize.ts b/src/lib/parser/tokenize.ts index 3da64d5b..f2f06a8b 100644 --- a/src/lib/parser/tokenize.ts +++ b/src/lib/parser/tokenize.ts @@ -625,7 +625,6 @@ export class Tokenizer { // dashed ident as unit if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { - hasLetter = true; break; } @@ -663,7 +662,7 @@ export class Tokenizer { hasPercent = true; } else if (isLetter(codepoint)) { hasLetter = true; - } + } // custom ident as unit else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { hasLetter = true; @@ -710,9 +709,7 @@ export class Tokenizer { if (isLetter(codepoint)) { hasLetter = true; break; - } - - else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { + } else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { hasLetter = true; break; } @@ -788,14 +785,12 @@ export class Tokenizer { } else if (isLetter(codepoint)) { hasLetter = true; break; - } + } // custom ident as unit else if (codepoint == 0x2d && parseInfo.stream.charCodeAt(position + 1) == 0x2d) { - hasLetter = true; break; - - }else if (codepoint == TokenMap.PERCENTAGE) { + } else if (codepoint == TokenMap.PERCENTAGE) { hasPercent = true; break; } else { @@ -1201,7 +1196,7 @@ export class Tokenizer { if (hint != EnumToken.PercentageTokenType) { this.unit = val; - if (val!.startsWith('--')) { + if (val!.startsWith("--")) { this.typ = EnumToken.UserDefinedDimensionTokenType; } } diff --git a/src/lib/printer/render.ts b/src/lib/printer/render.ts index 6535c27a..4cc0fba9 100644 --- a/src/lib/printer/render.ts +++ b/src/lib/printer/render.ts @@ -13,6 +13,7 @@ import type { ClassSelectorToken, ColorToken, CommentToken, + ComposesSelectorToken, DashedIdentToken, ErrorDescription, FractionToken, @@ -1989,8 +1990,11 @@ export function renderValue( case EnumToken.EOFTokenType: return ""; + case EnumToken.ComposesSelectorNodeType: + return `${(token as ComposesSelectorToken).l.reduce((acc, curr) => acc + renderValue(curr, options, cache, reducer, errors), "")}${(token as ComposesSelectorToken).r == null ? "" : " from " + renderValue((token as ComposesSelectorToken).r as Token, options, cache, reducer, errors)}`; + default: - console.debug({ token }); + console.error({ token }); throw new Error(`Unsupported token type for ${EnumToken[token.typ]}`); } diff --git a/test/specs/code/visitors.js b/test/specs/code/visitors.js index 27261836..51612a89 100644 --- a/test/specs/code/visitors.js +++ b/test/specs/code/visitors.js @@ -737,5 +737,68 @@ html,body { background-color: red }`); }); + + it("visitor #13", function () { + const visitor = []; + + const css = ` + +body { color: color(from var(--base-color) display-p3 r calc(g + 0.24) calc(b + 0.15)); } + +html, +body { + line-height: 1.474; +} + +.ruler { + + height: 10px; + background-color: orange +} + +`; + const options = { + beautify: true, + visitor(node) { + visitor.push( + `${EnumToken[node.typ]} -> ${"nam" in node ? node.nam : "sel" in node ? node.sel : "val" in node ? node.val : ""}`, + ); + }, + }; + + transformSync(css, options); + return expect(visitor).deep.equals([ + "StyleSheetNodeType -> ", + "RuleNodeType -> body", + "DeclarationNodeType -> color", + "Color -> color", + "Iden -> from", + "Whitespace -> ", + "WildCardFunctionTokenType -> var", + "DashedIden -> --base-color", + "Whitespace -> ", + "Iden -> display-p3", + "Whitespace -> ", + "Iden -> r", + "Whitespace -> ", + "MathFunctionTokenType -> calc", + "BinaryExpressionTokenType -> ", + "Iden -> g", + "Number -> 0.24", + "Whitespace -> ", + "MathFunctionTokenType -> calc", + "BinaryExpressionTokenType -> ", + "Iden -> b", + "Number -> 0.15", + "RuleNodeType -> html,body", + "DeclarationNodeType -> line-height", + "Number -> 1.474", + "RuleNodeType -> .ruler", + "DeclarationNodeType -> height", + "Length -> 10", + "DeclarationNodeType -> background-color", + "Color -> orange", + ]); + }); }); } From 255b7d779ab27089a8daaca045ef4432636b691e Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Fri, 30 Oct 2026 14:31:57 -0400 Subject: [PATCH 08/14] disallow mixin inside nested group or style rule #170 --- CHANGELOG.md | 1 + dist/index-umd-web.js | 11 ++++++++++- dist/index.cjs | 11 ++++++++++- dist/src/lib/parser/parse.js | 9 +++++++++ dist/src/lib/parser/tokenize.js | 2 +- src/lib/parser/parse.ts | 10 ++++++++++ test/specs/code/at-rules.js | 33 +++++++++++++++++++++++++++++++++ 7 files changed, 74 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80f45db6..23366ae2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [x] support dashed indent as unit - [x] the walker functions now use DFS instead of BFS +- [x] [disallow](https://drafts.csswg.org/css-mixins-1/#mixin-rule) mixin inside rules or nested groups ```css .module { diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js index 0142bb51..cbb1f7fc 100644 --- a/dist/index-umd-web.js +++ b/dist/index-umd-web.js @@ -28124,7 +28124,7 @@ this.val = parseFloat(parseInfo.stream.slice(parseInfo.position - parseInfo.offset, options?.slice)); if (hint != exports.EnumToken.PercentageTokenType) { this.unit = val; - if (val.startsWith('--')) { + if (val.startsWith("--")) { this.typ = exports.EnumToken.UserDefinedDimensionTokenType; } } @@ -34859,6 +34859,15 @@ atRule[TOKENS] = stream.slice(); atRule[STATE] = result.success ? exports.EnumAstNodeStatus.Validated : exports.EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; + if (equalsIgnoreCase(atRule.nam, "mixin")) { + if (context != null && context.typ != exports.EnumToken.StyleSheetNodeType) { + atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "mixin rule cannot be a nested group rule or rule style body", + location: atRule[LOCSTA], + }); + } + } // @ts-expect-error return Object.assign(atRule, { typ: exports.EnumToken.AtRuleNodeType, diff --git a/dist/index.cjs b/dist/index.cjs index 786e7e71..12340d4c 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -28120,7 +28120,7 @@ class Tokenizer { this.val = parseFloat(parseInfo.stream.slice(parseInfo.position - parseInfo.offset, options?.slice)); if (hint != exports.EnumToken.PercentageTokenType) { this.unit = val; - if (val.startsWith('--')) { + if (val.startsWith("--")) { this.typ = exports.EnumToken.UserDefinedDimensionTokenType; } } @@ -34855,6 +34855,15 @@ function parseAtRule(stream, context, options, errors, parseAsBlock = null) { atRule[TOKENS] = stream.slice(); atRule[STATE] = result.success ? exports.EnumAstNodeStatus.Validated : exports.EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; + if (equalsIgnoreCase(atRule.nam, "mixin")) { + if (context != null && context.typ != exports.EnumToken.StyleSheetNodeType) { + atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "mixin rule cannot be a nested group rule or rule style body", + location: atRule[LOCSTA], + }); + } + } // @ts-expect-error return Object.assign(atRule, { typ: exports.EnumToken.AtRuleNodeType, diff --git a/dist/src/lib/parser/parse.js b/dist/src/lib/parser/parse.js index dd781bd0..121911b4 100644 --- a/dist/src/lib/parser/parse.js +++ b/dist/src/lib/parser/parse.js @@ -3702,6 +3702,15 @@ function parseAtRule(stream, context, options, errors, parseAsBlock = null) { atRule[TOKENS] = stream.slice(); atRule[STATE] = result.success ? EnumAstNodeStatus.Validated : EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; + if (equalsIgnoreCase(atRule.nam, "mixin")) { + if (context != null && context.typ != EnumToken.StyleSheetNodeType) { + atRule[STATE] |= EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "mixin rule cannot be a nested group rule or rule style body", + location: atRule[LOCSTA], + }); + } + } // @ts-expect-error return Object.assign(atRule, { typ: EnumToken.AtRuleNodeType, diff --git a/dist/src/lib/parser/tokenize.js b/dist/src/lib/parser/tokenize.js index aa2f9e0c..e76342ec 100644 --- a/dist/src/lib/parser/tokenize.js +++ b/dist/src/lib/parser/tokenize.js @@ -965,7 +965,7 @@ class Tokenizer { this.val = parseFloat(parseInfo.stream.slice(parseInfo.position - parseInfo.offset, options?.slice)); if (hint != EnumToken.PercentageTokenType) { this.unit = val; - if (val.startsWith('--')) { + if (val.startsWith("--")) { this.typ = EnumToken.UserDefinedDimensionTokenType; } } diff --git a/src/lib/parser/parse.ts b/src/lib/parser/parse.ts index c115ba5c..b1d25981 100644 --- a/src/lib/parser/parse.ts +++ b/src/lib/parser/parse.ts @@ -4725,6 +4725,16 @@ export function parseAtRule( atRule[STATE] = result.success ? EnumAstNodeStatus.Validated : EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; + if (equalsIgnoreCase(atRule.nam, "mixin")) { + if (context != null && context.typ != EnumToken.StyleSheetNodeType) { + atRule[STATE] |= EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "mixin rule cannot be a nested group rule or rule style body", + location: atRule[LOCSTA], + }); + } + } + // @ts-expect-error return Object.assign(atRule, { typ: EnumToken.AtRuleNodeType, diff --git a/test/specs/code/at-rules.js b/test/specs/code/at-rules.js index 83ce72bc..7f198b9d 100644 --- a/test/specs/code/at-rules.js +++ b/test/specs/code/at-rules.js @@ -2006,6 +2006,39 @@ h1 { @media (width<=800px) or (height<=600px) or (orientation:portrait) { @contents } +}`), + ); + }); + + it("at-rule function with no arguments #69", function () { + return transform( + ` + +.goal .bg-indigo { + @mixin --shadowed-values(--color2: green, --color3: green) { + @private { --color3: blue; } + background: linear-gradient(var(--color1), var(--color2), var(--color3)); +} +p { + --color1: red; + --color2: red; + --color3: red; + @apply --shadowed-values(); +} +} + `, + { + beautify: true, + validation: true, + }, + ).then((result) => + expect(result.code).equals(`.goal .bg-indigo { + p { + --color1: red; + --color2: red; + --color3: red; + @apply --shadowed-values() + } }`), ); }); From 5f48505cf3bbab8f2b0740213e5bf53e52ae1ec3 Mon Sep 17 00:00:00 2001 From: Thierry Bela Nanga Date: Fri, 30 Oct 2026 15:11:59 -0400 Subject: [PATCH 09/14] disallow contents outside mixin #170 --- CHANGELOG.md | 2 ++ benchmark/package.json | 2 +- dist/index-umd-web.js | 56 ++++++++++++++++++++++++----- dist/index.cjs | 56 ++++++++++++++++++++++++----- dist/src/data/validation.json.js | 3 ++ dist/src/lib/parser/parse.js | 51 +++++++++++++++++++++----- dist/src/lib/parser/utils/token.js | 2 +- scripts/local-patch.json | 3 ++ src/data/validation.json | 2 +- src/lib/parser/parse.ts | 57 +++++++++++++++++++++++++----- src/lib/parser/utils/token.ts | 19 ++++------ test/specs/code/at-rules.js | 32 ++++++++++++++++- 12 files changed, 235 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23366ae2..1dd0e7ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ - [x] support dashed indent as unit - [x] the walker functions now use DFS instead of BFS - [x] [disallow](https://drafts.csswg.org/css-mixins-1/#mixin-rule) mixin inside rules or nested groups +- [x] [disallow](https://drafts.csswg.org/css-mixins-1/#mixin-rule) layer inside mixin +- [x] [disallow](https://drafts.csswg.org/css-mixins-1/#contents-rule) contents outside mixin ```css .module { diff --git a/benchmark/package.json b/benchmark/package.json index dd2ab8a7..79cc42c0 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@tbela99/css-parser": "^1.7.0", - "@tbela99/css-parser2": "github:tbela99/css-parser#89f2136", + "@tbela99/css-parser2": "github:tbela99/css-parser#4cdfbfb", "clean-css": "^5.3.3", "css-tree": "^3.2.1", "cssnano": "^9.9.0", diff --git a/dist/index-umd-web.js b/dist/index-umd-web.js index cbb1f7fc..9a9e925e 100644 --- a/dist/index-umd-web.js +++ b/dist/index-umd-web.js @@ -5733,6 +5733,9 @@ "@apply": { syntax: " @apply [ | ] [ { } ]?;" }, + "@contents": { + syntax: " @contents [ { } ]?;" + }, "@left-top": { syntax: " @left-top { }" }, @@ -21349,7 +21352,7 @@ exports.EnumToken.LteTokenType, exports.EnumToken.ChildCombinatorTokenType, exports.EnumToken.PipeTokenType, - exports.EnumToken.ColonTokenType + exports.EnumToken.ColonTokenType, ]); const trimSpaceAfter = new Set([ ...tokensfuncSet.values(), @@ -34859,14 +34862,49 @@ atRule[TOKENS] = stream.slice(); atRule[STATE] = result.success ? exports.EnumAstNodeStatus.Validated : exports.EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; - if (equalsIgnoreCase(atRule.nam, "mixin")) { - if (context != null && context.typ != exports.EnumToken.StyleSheetNodeType) { - atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; - atRule[ERRORS].push({ - message: "mixin rule cannot be a nested group rule or rule style body", - location: atRule[LOCSTA], - }); - } + switch (atRule.nam) { + case "mixin": + if (context != null && context.typ != exports.EnumToken.StyleSheetNodeType) { + atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "mixin rule cannot be a nested group rule or rule style body", + location: atRule[LOCSTA], + }); + } + break; + case "contents": + let parent = context; + let valid = parent == null; + while (parent != null) { + if (parent.typ == exports.EnumToken.AtRuleNodeType && "mixin" == parent.nam) { + valid = true; + break; + } + parent = parent[PARENT]; + } + if (!valid) { + atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "contents rule cannot be used outside mixin rule", + location: atRule[LOCSTA], + }); + } + break; + case "layer": + if (context != null && context.typ != exports.EnumToken.StyleSheetNodeType) { + let parent = context; + while (parent != null) { + if (parent.typ == exports.EnumToken.AtRuleNodeType && parent.nam == "mixin") { + atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "at-rule layeris not allowed inside mixin rule", + location: atRule[LOCSTA], + }); + break; + } + parent = parent[PARENT]; + } + } } // @ts-expect-error return Object.assign(atRule, { diff --git a/dist/index.cjs b/dist/index.cjs index 12340d4c..e895e2f8 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -5729,6 +5729,9 @@ var atRules = { "@apply": { syntax: " @apply [ | ] [ { } ]?;" }, + "@contents": { + syntax: " @contents [ { } ]?;" + }, "@left-top": { syntax: " @left-top { }" }, @@ -21345,7 +21348,7 @@ const trimTokenSpace = new Set([ exports.EnumToken.LteTokenType, exports.EnumToken.ChildCombinatorTokenType, exports.EnumToken.PipeTokenType, - exports.EnumToken.ColonTokenType + exports.EnumToken.ColonTokenType, ]); const trimSpaceAfter = new Set([ ...tokensfuncSet.values(), @@ -34855,14 +34858,49 @@ function parseAtRule(stream, context, options, errors, parseAsBlock = null) { atRule[TOKENS] = stream.slice(); atRule[STATE] = result.success ? exports.EnumAstNodeStatus.Validated : exports.EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; - if (equalsIgnoreCase(atRule.nam, "mixin")) { - if (context != null && context.typ != exports.EnumToken.StyleSheetNodeType) { - atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; - atRule[ERRORS].push({ - message: "mixin rule cannot be a nested group rule or rule style body", - location: atRule[LOCSTA], - }); - } + switch (atRule.nam) { + case "mixin": + if (context != null && context.typ != exports.EnumToken.StyleSheetNodeType) { + atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "mixin rule cannot be a nested group rule or rule style body", + location: atRule[LOCSTA], + }); + } + break; + case "contents": + let parent = context; + let valid = parent == null; + while (parent != null) { + if (parent.typ == exports.EnumToken.AtRuleNodeType && "mixin" == parent.nam) { + valid = true; + break; + } + parent = parent[PARENT]; + } + if (!valid) { + atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "contents rule cannot be used outside mixin rule", + location: atRule[LOCSTA], + }); + } + break; + case "layer": + if (context != null && context.typ != exports.EnumToken.StyleSheetNodeType) { + let parent = context; + while (parent != null) { + if (parent.typ == exports.EnumToken.AtRuleNodeType && parent.nam == "mixin") { + atRule[STATE] |= exports.EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "at-rule layeris not allowed inside mixin rule", + location: atRule[LOCSTA], + }); + break; + } + parent = parent[PARENT]; + } + } } // @ts-expect-error return Object.assign(atRule, { diff --git a/dist/src/data/validation.json.js b/dist/src/data/validation.json.js index 1777cbd8..b25f64c7 100644 --- a/dist/src/data/validation.json.js +++ b/dist/src/data/validation.json.js @@ -4720,6 +4720,9 @@ var atRules = { "@apply": { syntax: " @apply [ | ] [ { } ]?;" }, + "@contents": { + syntax: " @contents [ { } ]?;" + }, "@left-top": { syntax: " @left-top { }" }, diff --git a/dist/src/lib/parser/parse.js b/dist/src/lib/parser/parse.js index 121911b4..33132a6b 100644 --- a/dist/src/lib/parser/parse.js +++ b/dist/src/lib/parser/parse.js @@ -3702,14 +3702,49 @@ function parseAtRule(stream, context, options, errors, parseAsBlock = null) { atRule[TOKENS] = stream.slice(); atRule[STATE] = result.success ? EnumAstNodeStatus.Validated : EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; - if (equalsIgnoreCase(atRule.nam, "mixin")) { - if (context != null && context.typ != EnumToken.StyleSheetNodeType) { - atRule[STATE] |= EnumAstNodeStatus.Disallowed; - atRule[ERRORS].push({ - message: "mixin rule cannot be a nested group rule or rule style body", - location: atRule[LOCSTA], - }); - } + switch (atRule.nam) { + case "mixin": + if (context != null && context.typ != EnumToken.StyleSheetNodeType) { + atRule[STATE] |= EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "mixin rule cannot be a nested group rule or rule style body", + location: atRule[LOCSTA], + }); + } + break; + case "contents": + let parent = context; + let valid = parent == null; + while (parent != null) { + if (parent.typ == EnumToken.AtRuleNodeType && "mixin" == parent.nam) { + valid = true; + break; + } + parent = parent[PARENT]; + } + if (!valid) { + atRule[STATE] |= EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "contents rule cannot be used outside mixin rule", + location: atRule[LOCSTA], + }); + } + break; + case "layer": + if (context != null && context.typ != EnumToken.StyleSheetNodeType) { + let parent = context; + while (parent != null) { + if (parent.typ == EnumToken.AtRuleNodeType && parent.nam == "mixin") { + atRule[STATE] |= EnumAstNodeStatus.Disallowed; + atRule[ERRORS].push({ + message: "at-rule layeris not allowed inside mixin rule", + location: atRule[LOCSTA], + }); + break; + } + parent = parent[PARENT]; + } + } } // @ts-expect-error return Object.assign(atRule, { diff --git a/dist/src/lib/parser/utils/token.js b/dist/src/lib/parser/utils/token.js index ba5df9f0..e44c4e5d 100644 --- a/dist/src/lib/parser/utils/token.js +++ b/dist/src/lib/parser/utils/token.js @@ -17,7 +17,7 @@ const trimTokenSpace = new Set([ EnumToken.LteTokenType, EnumToken.ChildCombinatorTokenType, EnumToken.PipeTokenType, - EnumToken.ColonTokenType + EnumToken.ColonTokenType, ]); const trimSpaceAfter = new Set([ ...tokensfuncSet.values(), diff --git a/scripts/local-patch.json b/scripts/local-patch.json index d1348a72..faec5264 100644 --- a/scripts/local-patch.json +++ b/scripts/local-patch.json @@ -87,6 +87,9 @@ "@apply": { "syntax": " @apply [ | ] [ { } ]?;" }, + "@contents": { + "syntax": " @contents [ { } ]?;" + }, "@left-top": { "syntax": " @left-top { }" }, diff --git a/src/data/validation.json b/src/data/validation.json index 62765968..8f31c03f 100644 --- a/src/data/validation.json +++ b/src/data/validation.json @@ -1 +1 @@ -{"declarations":{"-ms-accelerator":{"syntax":"false | true"},"-ms-block-progression":{"syntax":"tb | rl | bt | lr"},"-ms-content-zoom-chaining":{"syntax":"none | chained"},"-ms-content-zoom-limit":{"syntax":"<'-ms-content-zoom-limit-min'> <'-ms-content-zoom-limit-max'>"},"-ms-content-zoom-limit-max":{"syntax":""},"-ms-content-zoom-limit-min":{"syntax":""},"-ms-content-zoom-snap":{"syntax":"<'-ms-content-zoom-snap-type'> || <'-ms-content-zoom-snap-points'>"},"-ms-content-zoom-snap-points":{"syntax":"snapInterval( , ) | snapList( # )"},"-ms-content-zoom-snap-type":{"syntax":"none | proximity | mandatory"},"-ms-content-zooming":{"syntax":"none | zoom"},"-ms-filter":{"syntax":""},"-ms-flow-from":{"syntax":"[ none | ]#"},"-ms-flow-into":{"syntax":"[ none | ]#"},"-ms-grid-columns":{"syntax":"none | | "},"-ms-grid-rows":{"syntax":"none | | "},"-ms-high-contrast-adjust":{"syntax":"auto | none"},"-ms-hyphenate-limit-chars":{"syntax":"auto | {1,3}"},"-ms-hyphenate-limit-lines":{"syntax":"no-limit | "},"-ms-hyphenate-limit-zone":{"syntax":" | "},"-ms-ime-align":{"syntax":"auto | after"},"-ms-overflow-style":{"syntax":" auto | none | scrollbar | -ms-autohiding-scrollbar"},"-ms-scroll-chaining":{"syntax":"chained | none"},"-ms-scroll-limit":{"syntax":"<'-ms-scroll-limit-x-min'> <'-ms-scroll-limit-y-min'> <'-ms-scroll-limit-x-max'> <'-ms-scroll-limit-y-max'>"},"-ms-scroll-limit-x-max":{"syntax":"auto | "},"-ms-scroll-limit-x-min":{"syntax":""},"-ms-scroll-limit-y-max":{"syntax":"auto | "},"-ms-scroll-limit-y-min":{"syntax":""},"-ms-scroll-rails":{"syntax":"none | railed"},"-ms-scroll-snap-points-x":{"syntax":"snapInterval( , ) | snapList( # )"},"-ms-scroll-snap-points-y":{"syntax":"snapInterval( , ) | snapList( # )"},"-ms-scroll-snap-type":{"syntax":"none | proximity | mandatory"},"-ms-scroll-snap-x":{"syntax":"<'-ms-scroll-snap-type'> <'-ms-scroll-snap-points-x'>"},"-ms-scroll-snap-y":{"syntax":"<'-ms-scroll-snap-type'> <'-ms-scroll-snap-points-y'>"},"-ms-scroll-translation":{"syntax":"none | vertical-to-horizontal"},"-ms-scrollbar-3dlight-color":{"syntax":""},"-ms-scrollbar-arrow-color":{"syntax":""},"-ms-scrollbar-base-color":{"syntax":""},"-ms-scrollbar-darkshadow-color":{"syntax":""},"-ms-scrollbar-face-color":{"syntax":""},"-ms-scrollbar-highlight-color":{"syntax":""},"-ms-scrollbar-shadow-color":{"syntax":""},"-ms-scrollbar-track-color":{"syntax":""},"-ms-text-autospace":{"syntax":"none | ideograph-alpha | ideograph-numeric | ideograph-parenthesis | ideograph-space"},"-ms-touch-select":{"syntax":"grippers | none"},"-ms-user-select":{"syntax":"none | element | text"},"-ms-wrap-flow":{"syntax":"auto | both | start | end | maximum | clear"},"-ms-wrap-margin":{"syntax":""},"-ms-wrap-through":{"syntax":"wrap | none"},"-moz-appearance":{"syntax":"none | button | button-arrow-down | button-arrow-next | button-arrow-previous | button-arrow-up | button-bevel | button-focus | caret | checkbox | checkbox-container | checkbox-label | checkmenuitem | dualbutton | groupbox | listbox | listitem | menuarrow | menubar | menucheckbox | menuimage | menuitem | menuitemtext | menulist | menulist-button | menulist-text | menulist-textfield | menupopup | menuradio | menuseparator | meterbar | meterchunk | progressbar | progressbar-vertical | progresschunk | progresschunk-vertical | radio | radio-container | radio-label | radiomenuitem | range | range-thumb | resizer | resizerpanel | scale-horizontal | scalethumbend | scalethumb-horizontal | scalethumbstart | scalethumbtick | scalethumb-vertical | scale-vertical | scrollbarbutton-down | scrollbarbutton-left | scrollbarbutton-right | scrollbarbutton-up | scrollbarthumb-horizontal | scrollbarthumb-vertical | scrollbartrack-horizontal | scrollbartrack-vertical | searchfield | separator | sheet | spinner | spinner-downbutton | spinner-textfield | spinner-upbutton | splitter | statusbar | statusbarpanel | tab | tabpanel | tabpanels | tab-scroll-arrow-back | tab-scroll-arrow-forward | textfield | textfield-multiline | toolbar | toolbarbutton | toolbarbutton-dropdown | toolbargripper | toolbox | tooltip | treeheader | treeheadercell | treeheadersortarrow | treeitem | treeline | treetwisty | treetwistyopen | treeview | -moz-mac-unified-toolbar | -moz-win-borderless-glass | -moz-win-browsertabbar-toolbox | -moz-win-communicationstext | -moz-win-communications-toolbox | -moz-win-exclude-glass | -moz-win-glass | -moz-win-mediatext | -moz-win-media-toolbox | -moz-window-button-box | -moz-window-button-box-maximized | -moz-window-button-close | -moz-window-button-maximize | -moz-window-button-minimize | -moz-window-button-restore | -moz-window-frame-bottom | -moz-window-frame-left | -moz-window-frame-right | -moz-window-titlebar | -moz-window-titlebar-maximized"},"-moz-binding":{"syntax":" | none"},"-moz-border-bottom-colors":{"syntax":"+ | none"},"-moz-border-left-colors":{"syntax":"+ | none"},"-moz-border-right-colors":{"syntax":"+ | none"},"-moz-border-top-colors":{"syntax":"+ | none"},"-moz-context-properties":{"syntax":"none | [ fill | fill-opacity | stroke | stroke-opacity ]#"},"-moz-float-edge":{"syntax":"border-box | content-box | margin-box | padding-box"},"-moz-force-broken-image-icon":{"syntax":"0 | 1"},"-moz-orient":{"syntax":"inline | block | horizontal | vertical"},"-moz-outline-radius":{"syntax":"{1,4} [ / {1,4} ]?"},"-moz-outline-radius-bottomleft":{"syntax":""},"-moz-outline-radius-bottomright":{"syntax":""},"-moz-outline-radius-topleft":{"syntax":""},"-moz-outline-radius-topright":{"syntax":""},"-moz-stack-sizing":{"syntax":"ignore | stretch-to-fit"},"-moz-text-blink":{"syntax":"none | blink"},"-moz-user-focus":{"syntax":"ignore | normal | select-after | select-before | select-menu | select-same | select-all | none"},"-moz-user-input":{"syntax":"auto | none | enabled | disabled"},"-moz-user-modify":{"syntax":"read-only | read-write | write-only"},"-moz-window-dragging":{"syntax":"drag | no-drag"},"-moz-window-shadow":{"syntax":"default | menu | tooltip | sheet | none"},"-webkit-appearance":{"syntax":" none | button | button-bevel | caps-lock-indicator | caret | checkbox | default-button | inner-spin-button | listbox | listitem | media-controls-background | media-controls-fullscreen-background | media-current-time-display | media-enter-fullscreen-button | media-exit-fullscreen-button | media-fullscreen-button | media-mute-button | media-overlay-play-button | media-play-button | media-seek-back-button | media-seek-forward-button | media-slider | media-sliderthumb | media-time-remaining-display | media-toggle-closed-captions-button | media-volume-slider | media-volume-slider-container | media-volume-sliderthumb | menulist | menulist-button | menulist-text | menulist-textfield | meter | progress-bar | progress-bar-value | push-button | radio | scrollbarbutton-down | scrollbarbutton-left | scrollbarbutton-right | scrollbarbutton-up | scrollbargripper-horizontal | scrollbargripper-vertical | scrollbarthumb-horizontal | scrollbarthumb-vertical | scrollbartrack-horizontal | scrollbartrack-vertical | searchfield | searchfield-cancel-button | searchfield-decoration | searchfield-results-button | searchfield-results-decoration | slider-horizontal | slider-vertical | sliderthumb-horizontal | sliderthumb-vertical | square-button | textarea | textfield | -apple-pay-button"},"-webkit-border-after":{"syntax":"<'border-top'>"},"-webkit-border-after-color":{"syntax":"<'border-top-color'>"},"-webkit-border-after-style":{"syntax":"<'border-top-style'>"},"-webkit-border-after-width":{"syntax":"<'border-top-width'>"},"-webkit-border-before":{"syntax":"<'border-top'>"},"-webkit-border-before-color":{"syntax":"<'border-top-color'>"},"-webkit-border-before-style":{"syntax":"<'border-top-style'>"},"-webkit-border-before-width":{"syntax":"<'border-top-width'>"},"-webkit-border-end":{"syntax":"<'border-top'>"},"-webkit-border-end-color":{"syntax":"<'border-top-color'>"},"-webkit-border-end-style":{"syntax":"<'border-top-style'>"},"-webkit-border-end-width":{"syntax":"<'border-top-width'>"},"-webkit-border-start":{"syntax":"<'border-top'>"},"-webkit-border-start-color":{"syntax":"<'border-top-color'>"},"-webkit-border-start-style":{"syntax":"<'border-top-style'>"},"-webkit-border-start-width":{"syntax":"<'border-top-width'>"},"-webkit-box-reflect":{"syntax":"[ above | below | right | left ]? ? ?"},"-webkit-line-clamp":{"syntax":"none | "},"-webkit-mask":{"syntax":"[ || [ / ]? || || [ | border | padding | content | text ] || [ | border | padding | content ] ]#"},"-webkit-mask-attachment":{"syntax":"#"},"-webkit-mask-clip":{"syntax":"[ | no-clip | border | padding | content | text ]#"},"-webkit-mask-composite":{"syntax":"#"},"-webkit-mask-image":{"syntax":"#"},"-webkit-mask-origin":{"syntax":"[ | border | padding | content ]#"},"-webkit-mask-position":{"syntax":"#"},"-webkit-mask-position-x":{"syntax":"[ | left | center | right ]#"},"-webkit-mask-position-y":{"syntax":"[ | top | center | bottom ]#"},"-webkit-mask-repeat":{"syntax":"#"},"-webkit-mask-repeat-x":{"syntax":"repeat | no-repeat | space | round"},"-webkit-mask-repeat-y":{"syntax":"repeat | no-repeat | space | round"},"-webkit-mask-size":{"syntax":"#"},"-webkit-overflow-scrolling":{"syntax":"auto | touch"},"-webkit-tap-highlight-color":{"syntax":""},"-webkit-text-fill-color":{"syntax":""},"-webkit-text-stroke":{"syntax":" || "},"-webkit-text-stroke-color":{"syntax":""},"-webkit-text-stroke-width":{"syntax":""},"-webkit-touch-callout":{"syntax":"default | none"},"-webkit-user-modify":{"syntax":"read-only | read-write | read-write-plaintext-only"},"-webkit-user-select":{"syntax":" auto | none | text | all"},"accent-color":{"syntax":"auto | "},"align-content":{"syntax":"normal | | | ? "},"align-items":{"syntax":"normal | stretch | | [ ? ] | anchor-center"},"align-self":{"syntax":"auto | normal | stretch | | ? | anchor-center"},"align-tracks":{"syntax":"[ normal | | | ? ]#"},"alignment-baseline":{"syntax":" auto | baseline | before-edge | text-before-edge | middle | central | after-edge | text-after-edge | ideographic | alphabetic | hanging | mathematical"},"all":{"syntax":"initial | inherit | unset | revert | revert-layer"},"anchor-name":{"syntax":"none | #"},"anchor-scope":{"syntax":"none | all | #"},"animation":{"syntax":"#"},"animation-composition":{"syntax":"#"},"animation-delay":{"syntax":"