diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml index 11e7293f3..114a8357d 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 ee72b46f0..041919057 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ # Changelog +# 1.8.0 + +- [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 +- [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/README.md b/README.md index 8f15ff963..7917af421 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ $ deno add @tbela99/css-parser * **CSS variable inlining** where values can be safely resolved. * **Duplicate declaration removal** to eliminate redundant rules. * **`@import` flattening** to produce self-contained stylesheets. +* **51.5kb** once minified and gzipped. ## Vendor prefix removal **Vendor prefix cleanup** to modernize generated CSS. diff --git a/benchmark/package.json b/benchmark/package.json index 6cff98432..eea24d298 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -11,14 +11,15 @@ }, "dependencies": { "@tbela99/css-parser": "^1.7.0", - "@tbela99/css-parser2": "github:tbela99/css-parser#89f2136", + "@tbela99/css-parser2": "github:tbela99/css-parser#293f2dc", "clean-css": "^5.3.3", "css-tree": "^3.2.1", "cssnano": "^9.9.0", "csso": "^5.0.5", "esbuild": "^0.28.2", "lightningcss": "^1.33.0", - "postcss": "^8.5.31", - "vitest": "^5.0.5" + "postcss": "^8.5.32", + "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 a8d829865..a28e56ed9 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 c5f4f4962..47d5e7c17 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 @@ -5729,6 +5733,9 @@ "@apply": { syntax: " @apply [ | ] [ { } ]?;" }, + "@contents": { + syntax: " @contents [ { } ]?;" + }, "@left-top": { syntax: " @left-top { }" }, @@ -9693,7 +9700,6 @@ */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); - const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9776,7 +9782,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; @@ -9796,12 +9801,11 @@ } }, }; - while ((node = parents[i++])) { - if (i > maxQueueLength) { - parents.splice(0, maxQueueLength); - i -= maxQueueLength; - } - let option = null; + let option = null; + let source = []; + while (parents.length > 0) { + node = parents.pop(); + // enter node if (filter != null) { // @ts-expect-error option = filter(node); @@ -9822,36 +9826,175 @@ 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]) { - if (child[PARENT] != node) { - child[PARENT] = node; + source.length = 0; + if (Array.isArray(node[TOKENS])) { + if (reverse) { + for (const token of node[TOKENS]) { + 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; } } - // @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; + else if (node.typ == exports.EnumToken.DeclarationNodeType) { + if (reverse) { + for (const token of node.val) { + parents.push(token); + token[PARENT] = node; + } + } + else { + 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; + } } } - // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); } } if (children && // @ts-expect-error 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; + if (reverse) { + // @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 { + // @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; } } } @@ -9904,9 +10047,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, @@ -9922,7 +10075,7 @@ let value; let option; let node; - let i = -1; + const values = []; const eventType = filter.event ?? exports.WalkerEvent.Enter; // @ts-ignore const result = { @@ -9941,13 +10094,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 || @@ -9975,10 +10124,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; } } } @@ -9987,70 +10142,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; } } } @@ -10067,10 +10292,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; } } } @@ -10316,6 +10547,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 +14420,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 +14451,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 +14472,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": @@ -17547,7 +17784,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) { @@ -17555,9 +17792,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; } } @@ -21112,7 +21350,7 @@ exports.EnumToken.LteTokenType, exports.EnumToken.ChildCombinatorTokenType, exports.EnumToken.PipeTokenType, - exports.EnumToken.ColonTokenType + exports.EnumToken.ColonTokenType, ]); const trimSpaceAfter = new Set([ ...tokensfuncSet.values(), @@ -21134,9 +21372,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) { @@ -22619,9 +22864,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; @@ -22660,21 +22905,25 @@ */ 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)) { - // @ts-ignore - return { node, value: { node: value, parent, root: rootNode, parents } }; + for (const r2 of walkValues(source, r1.node)) { + if (matcher(r2.value, r1.node)) { + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } @@ -22716,9 +22965,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; @@ -22754,11 +23003,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; } @@ -26689,6 +26939,7 @@ case exports.EnumToken.DimensionTokenType: 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); @@ -26888,8 +27139,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)}` }); @@ -26952,7 +27205,6 @@ SymbolsMapTokensLower[key.toLowerCase()] = tokenType; } } - SymbolsMapTokens[""] = exports.EnumToken.DelimTokenType; SymbolsMapTokens["+"] = exports.EnumToken.Plus; SymbolsMapTokens["="] = exports.EnumToken.DelimTokenType; SymbolsMapTokens["|"] = exports.EnumToken.PipeTokenType; @@ -27401,6 +27653,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 +27686,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 +27727,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 +27794,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 +27840,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 +28125,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) { @@ -31586,54 +31859,208 @@ 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 (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; + } + 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; + } + 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.ComposesSelectorNodeType: + if (node.r != null) { + nodes.push(node.r); + 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; + } + 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 (nodes[i].chi != null) { + if (node.chi != null) { + for ( // @ts-ignore - for (const child of nodes[i].chi) { - subNodes.push(child); - } - } - 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]; + let i = node.chi.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.chi[i]); } - freeBlock += subNodes.length; } parens = null; handlers.length = 0; @@ -31641,23 +32068,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); @@ -31677,10 +32104,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); } @@ -31708,16 +32134,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]; } } }); @@ -31728,37 +32153,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); } } } @@ -31779,7 +32200,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`, }, }; @@ -31857,6 +32277,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({ @@ -31866,6 +32287,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])) { @@ -31889,6 +32311,7 @@ if (result.cssModuleVariables == null) { result.cssModuleVariables = {}; } + // @ts-ignore result.cssModuleVariables[node.nam] = node; } parent.chi.splice(parent.chi.indexOf(node), 1); @@ -32054,7 +32477,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)); @@ -32081,7 +32505,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 && ![ @@ -32124,14 +32549,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); } } } @@ -32569,82 +32994,232 @@ 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 (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; + } + 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; + } + 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.ComposesSelectorNodeType: + if (node.r != null) { + nodes.push(node.r); + 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; + } + 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 (nodes[i].chi != null) { + if (node.chi != null) { + for ( // @ts-ignore - for (k = 0; k < nodes[i].chi.length; k++) { + let i = node.chi.length - 1; i >= 0; i--) { // @ts-ignore - subNodes.push(nodes[i].chi[k]); + nodes.push(node.chi[i]); } } - 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]; - } - freeblock += subNodes.length; - } parens = null; handlers.length = 0; if (visitors.preAllVisitorsHandlers?.size > 0) { 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); @@ -32657,20 +33232,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 @@ -32678,10 +33239,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); } @@ -32709,16 +33269,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]; } } }); @@ -32732,37 +33292,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); } } } @@ -32888,6 +33448,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({ @@ -32897,6 +33458,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])) { @@ -32920,6 +33482,7 @@ if (result.cssModuleVariables == null) { result.cssModuleVariables = {}; } + // @ts-ignore result.cssModuleVariables[node.nam] = node; } parent.chi.splice(parent.chi.indexOf(node), 1); @@ -33160,7 +33723,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)); @@ -33191,7 +33755,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 && ![ @@ -34295,6 +34860,50 @@ atRule[TOKENS] = stream.slice(); atRule[STATE] = result.success ? exports.EnumAstNodeStatus.Validated : exports.EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; + 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, { typ: exports.EnumToken.AtRuleNodeType, diff --git a/dist/index.cjs b/dist/index.cjs index 4397e5913..052194539 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 @@ -5725,6 +5729,9 @@ var atRules = { "@apply": { syntax: " @apply [ | ] [ { } ]?;" }, + "@contents": { + syntax: " @contents [ { } ]?;" + }, "@left-top": { syntax: " @left-top { }" }, @@ -9689,7 +9696,6 @@ exports.WalkerEvent = void 0; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(exports.WalkerEvent || (exports.WalkerEvent = {})); -const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -9772,7 +9778,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; @@ -9792,12 +9797,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 = []; + while (parents.length > 0) { + node = parents.pop(); + // enter node if (filter != null) { // @ts-expect-error option = filter(node); @@ -9818,36 +9822,175 @@ function* walk(node, filter, reverse) { 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]) { - if (child[PARENT] != node) { - child[PARENT] = node; + source.length = 0; + if (Array.isArray(node[TOKENS])) { + if (reverse) { + for (const token of node[TOKENS]) { + 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; } } - // @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; + else if (node.typ == exports.EnumToken.DeclarationNodeType) { + if (reverse) { + for (const token of node.val) { + parents.push(token); + token[PARENT] = node; + } + } + else { + 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; + } } } - // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); } } if (children && // @ts-expect-error 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; + if (reverse) { + // @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 { + // @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; } } } @@ -9900,9 +10043,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, @@ -9918,7 +10071,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 = { @@ -9937,13 +10090,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 || @@ -9971,10 +10120,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; } } } @@ -9983,70 +10138,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; } } } @@ -10063,10 +10288,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; } } } @@ -10312,6 +10543,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 +14416,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 +14447,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 +14468,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": @@ -17543,7 +17780,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) { @@ -17551,9 +17788,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; } } @@ -21108,7 +21346,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(), @@ -21130,9 +21368,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) { @@ -22615,9 +22860,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; @@ -22656,21 +22901,25 @@ 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)) { - // @ts-ignore - return { node, value: { node: value, parent, root: rootNode, parents } }; + for (const r2 of walkValues(source, r1.node)) { + if (matcher(r2.value, r1.node)) { + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } @@ -22712,9 +22961,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; @@ -22750,11 +22999,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; } @@ -26685,6 +26935,7 @@ function renderValue(token, options = {}, cache = Object.create(null), reducer, case exports.EnumToken.DimensionTokenType: 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); @@ -26884,8 +27135,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)}` }); @@ -26948,7 +27201,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 +27649,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 +27682,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 +27723,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 +27790,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 +27836,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 +28121,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) { @@ -31582,54 +31855,208 @@ 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 (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; + } + 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; + } + 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.ComposesSelectorNodeType: + if (node.r != null) { + nodes.push(node.r); + 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; + } + 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 (nodes[i].chi != null) { + if (node.chi != null) { + for ( // @ts-ignore - for (const child of nodes[i].chi) { - subNodes.push(child); - } - } - 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]; + let i = node.chi.length - 1; i >= 0; i--) { + // @ts-ignore + nodes.push(node.chi[i]); } - freeBlock += subNodes.length; } parens = null; handlers.length = 0; @@ -31637,23 +32064,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); @@ -31673,10 +32100,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); } @@ -31704,16 +32130,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]; } } }); @@ -31724,37 +32149,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); } } } @@ -31775,7 +32196,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`, }, }; @@ -31853,6 +32273,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({ @@ -31862,6 +32283,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])) { @@ -31885,6 +32307,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); @@ -32050,7 +32473,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)); @@ -32077,7 +32501,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 && ![ @@ -32120,14 +32545,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); } } } @@ -32565,82 +32990,232 @@ 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 (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; + } + 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; + } + 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.ComposesSelectorNodeType: + if (node.r != null) { + nodes.push(node.r); + 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; + } + 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 (nodes[i].chi != null) { + if (node.chi != null) { + for ( // @ts-ignore - for (k = 0; k < nodes[i].chi.length; k++) { + let i = node.chi.length - 1; i >= 0; i--) { // @ts-ignore - subNodes.push(nodes[i].chi[k]); + nodes.push(node.chi[i]); } } - 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]; - } - freeblock += subNodes.length; - } parens = null; handlers.length = 0; if (visitors.preAllVisitorsHandlers?.size > 0) { 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); @@ -32653,20 +33228,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 @@ -32674,10 +33235,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); } @@ -32705,16 +33265,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]; } } }); @@ -32728,37 +33288,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); } } } @@ -32884,6 +33444,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({ @@ -32893,6 +33454,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])) { @@ -32916,6 +33478,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); @@ -33156,7 +33719,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)); @@ -33187,7 +33751,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 && ![ @@ -34291,6 +34856,50 @@ 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; + 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, { typ: exports.EnumToken.AtRuleNodeType, diff --git a/dist/index.d.ts b/dist/index.d.ts index ab7e3d1fd..8182fb7d3 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 */ @@ -2468,6 +2472,7 @@ export declare interface ComposesSelectorToken extends BaseToken { * @inheritdoc */ typ: EnumToken.ComposesSelectorTokenType; + /** * Left handle */ @@ -3392,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); @@ -5118,7 +5123,7 @@ export declare interface WalkResult { /** * current node */ - node: AstNode$1; + node: AstNode$1 | Token$1; /** * parent node */ @@ -5130,7 +5135,7 @@ export declare interface WalkResult { /** * parent nodes */ - parents: Generator; + parents: Generator; } /** @@ -6560,7 +6565,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. * @@ -6591,7 +6596,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/data/validation.json.js b/dist/src/data/validation.json.js index 1777cbd82..b25f64c73 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/ast/features/inlinecssvariables.js b/dist/src/lib/ast/features/inlinecssvariables.js index 0175c54a3..a6b4acfae 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 a00fcdb8d..121dc17ae 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,25 @@ 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)) { - // @ts-ignore - return { node, value: { node: value, parent, root: rootNode, parents } }; + for (const r2 of walkValues(source, r1.node)) { + if (matcher(r2.value, r1.node)) { + return { + // @ts-ignore + node: r1.node, + // @ts-ignore + value: { node: r2.value, parent: r2.parent, root: r2.root, parents: r2.parents }, + }; } } } @@ -138,9 +142,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 +180,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/math/expression.js b/dist/src/lib/ast/math/expression.js index a5f7a7d8a..fad8a7ddd 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 b04a80360..413693b3f 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/ast/walk.js b/dist/src/lib/ast/walk.js index 151a46373..ff29374d1 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 @@ -43,7 +44,6 @@ var WalkerEvent; */ WalkerEvent[WalkerEvent["Leave"] = 2] = "Leave"; })(WalkerEvent || (WalkerEvent = {})); -const maxQueueLength = 25000; /** * Walk ast nodes * @param node initial node @@ -126,7 +126,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 +145,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 = []; + while (parents.length > 0) { + node = parents.pop(); + // enter node if (filter != null) { // @ts-expect-error option = filter(node); @@ -172,36 +170,175 @@ function* walk(node, filter, reverse) { 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]) { - if (child[PARENT] != node) { - child[PARENT] = node; + source.length = 0; + if (Array.isArray(node[TOKENS])) { + if (reverse) { + for (const token of node[TOKENS]) { + 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; } } - // @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; + else if (node.typ == EnumToken.DeclarationNodeType) { + if (reverse) { + for (const token of node.val) { + parents.push(token); + token[PARENT] = node; + } + } + else { + 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; + } } } - // @ts-expect-error - parents.splice(i, 0, ...(reverse ? node.val.toReversed() : node.val)); } } if (children && // @ts-expect-error 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; + if (reverse) { + // @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 { + // @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; } } } @@ -254,9 +391,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, @@ -272,7 +419,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 = { @@ -291,13 +438,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 || @@ -325,10 +468,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; } } } @@ -337,70 +486,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 (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; } - 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 = []; - 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; } } } @@ -417,10 +636,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 d5855be16..33132a6b9 100644 --- a/dist/src/lib/parser/parse.js +++ b/dist/src/lib/parser/parse.js @@ -701,54 +701,208 @@ 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 (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; + } + 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; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; + } + break; + case EnumToken.ComposesSelectorNodeType: + if (node.r != null) { + nodes.push(node.r); + 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; + } + 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 (nodes[i].chi != null) { + if (node.chi != null) { + for ( // @ts-ignore - for (const child of nodes[i].chi) { - subNodes.push(child); - } - } - 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]; + 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 +910,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 +946,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 +976,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 +995,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 +1042,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`, }, }; @@ -972,6 +1119,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({ @@ -981,6 +1129,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])) { @@ -1004,6 +1153,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); @@ -1169,7 +1319,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)); @@ -1196,7 +1347,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 && ![ @@ -1239,14 +1391,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); } } } @@ -1684,58 +1836,208 @@ 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 (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; + } + 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; + } + for (let i = node.l.length - 1; i >= 0; i--) { + const element = node.l[i]; + nodes.push(element); + element[PARENT] = node; + } + break; + case EnumToken.ComposesSelectorNodeType: + if (node.r != null) { + nodes.push(node.r); + 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; + } + 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 (nodes[i].chi != null) { + if (node.chi != null) { + for ( // @ts-ignore - for (k = 0; k < nodes[i].chi.length; k++) { + let i = node.chi.length - 1; i >= 0; i--) { // @ts-ignore - subNodes.push(nodes[i].chi[k]); - } - } - 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]; + nodes.push(node.chi[i]); } - freeblock += subNodes.length; } parens = null; handlers.length = 0; @@ -1743,23 +2045,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 +2074,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 +2081,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 +2111,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 +2134,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); } } } @@ -2003,6 +2290,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({ @@ -2012,6 +2300,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])) { @@ -2035,6 +2324,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); @@ -2275,7 +2565,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)); @@ -2306,7 +2597,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 && ![ @@ -3410,6 +3702,50 @@ function parseAtRule(stream, context, options, errors, parseAsBlock = null) { atRule[TOKENS] = stream.slice(); atRule[STATE] = result.success ? EnumAstNodeStatus.Validated : EnumAstNodeStatus.Invalid; atRule[ERRORS] = result.errors; + 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, { typ: EnumToken.AtRuleNodeType, diff --git a/dist/src/lib/parser/tokenize.js b/dist/src/lib/parser/tokenize.js index 7add55acf..e76342ec9 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/parser/utils/token.js b/dist/src/lib/parser/utils/token.js index 93091c984..e44c4e5d9 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(), @@ -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 733b84bc3..113889969 100644 --- a/dist/src/lib/printer/render.js +++ b/dist/src/lib/printer/render.js @@ -1146,6 +1146,7 @@ function renderValue(token, options = {}, cache = Object.create(null), reducer, case EnumToken.DimensionTokenType: case EnumToken.FrequencyTokenType: case EnumToken.ResolutionTokenType: + case EnumToken.UserDefinedDimensionTokenType: let val = token.val.typ == EnumToken.FractionTokenType ? renderValue(token.val, options, cache) : minifyNumber(token.val); @@ -1345,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/dist/src/lib/validation/match.js b/dist/src/lib/validation/match.js index ac453b185..a60a6896a 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/package.json b/package.json index fb24690e3..aac1d7a7b 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "@types/chai": "^5.2.3", "@types/chai-as-promised": "^8.0.2", "@types/mocha": "^10.0.10", - "@types/node": "^26.6.5", + "@types/node": "^26.6.6", "@types/web": "^0.0.359", "@typescript/typescript6": "^6.0.2", "@web/test-runner": "^1.0.0", @@ -79,11 +79,11 @@ "markdown-it-task-lists": "^2.1.1", "mocha": "^12.0.3", "playwright": "^1.64.1", - "rollup": "^4.65.0", + "rollup": "^4.67.2", "rollup-plugin-dts": "^6.5.1", "rollup-plugin-version-injector": "^1.3.3", "superc8": "^12.7.0", - "tslib": "^2.8.1", + "tslib": "^2.9.1", "typedoc": "^0.28.20", "typedoc-plugin-coverage": "^4.0.3", "typedoc-plugin-llms-txt": "^0.1.2", diff --git a/scripts/local-patch.json b/scripts/local-patch.json index d1348a723..faec52641 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/@types/parse.d.ts b/src/@types/parse.d.ts index 0cee2f0b1..d52e0a018 100644 --- a/src/@types/parse.d.ts +++ b/src/@types/parse.d.ts @@ -1,7 +1,16 @@ import { SourceFile } from "../lib/parser/source.ts"; +/** + * property list options + */ export declare interface PropertyListOptions { + /** + * remove duplicate declarations + */ removeDuplicateDeclarations?: boolean | string | string[]; + /** + * compute shorthand + */ computeShorthand?: boolean; } diff --git a/src/@types/shorthand.d.ts b/src/@types/shorthand.d.ts index 6e225ea13..016d6db6b 100644 --- a/src/@types/shorthand.d.ts +++ b/src/@types/shorthand.d.ts @@ -1,102 +1,326 @@ import { EnumToken } from "../lib/ast/types.ts"; +/** + * shorthand property type + */ export interface PropertyType { + /** + * shorthand name + */ shorthand: string; } +/** + * single property + */ export interface SinglePropertyType { + /** + * keyof shorthand property type + */ typ: keyof EnumToken; + /** + * value + */ val: string | number; } +/** + * shorthand property map + */ export interface SinglePropertyTypeMapping { + /** + * shorthand pattern + */ pattern?: string[][]; + /** + * shorthand mappings + */ mapping: Record; } - +/** + * shorthand configuration + */ export interface ShorthandPropertyType { + /** + * shorthand name + */ shorthand: string; + /** + * mapped shorthand property + */ map?: string; + /** + * property names + */ properties: string[]; + /** + * property types + */ types: string[]; + /** + * allow multiple values + */ multiple: boolean; + /** + * values separator + */ separator: { + /** + * token type + */ typ: keyof EnumToken; + /** + * token value + */ val: string; }; + /** + * value separator + */ valueSeparator?: { + /** + * token type + */ typ: keyof EnumToken; + /** + * token value + */ val: string; }; + /** + * keywords + */ keywords: string[]; } +/** + * shorthand property set. a set of identical properties such as `margin` + */ export interface PropertySetType { + /** + * shorthand property definition + */ [key: string]: PropertyType | ShorthandPropertyType; } +/** + * mapped shorthand property. a set of different properties such as `font` + */ export interface PropertyMapType { + /** + * default values + */ default: string[]; + /** + * property types + */ types: string[]; + /** + * keywords + */ keywords: string[]; + /** + * required + */ required?: boolean; + /** + * allow multiple values + */ multiple?: boolean; + /** + * property has a prefix + */ prefix?: { + /** + * token type + */ typ: keyof EnumToken; + /** + * token value + */ val: string; }; + /** + * previous property + */ previous?: string; + /** + * separator + */ separator?: { + /** + * token type + */ typ: keyof EnumToken; }; + /** + * property constraints + */ constraints?: { + /** + * property constraints + */ [key: string]: { + /** + * property constraints + */ [key: string]: any; }; }; + /** + * values mapping + */ mapping?: Record; } +/** + * mapped shorthand definition + */ export interface ShorthandMapType { + /** + * shorthand name + */ shorthand: string; + /** + * shorthand pattern + */ pattern: string; + /** + * shorthand keywords + */ keywords: string[]; + /** + * default values + */ default: string[]; + /** + * values mapping + */ mapping?: Record; + /** + * allow multiple values + */ multiple?: boolean; - separator?: { typ: keyof EnumToken; val?: string }; + /** + * shorthand values separator + */ + separator?: { + /** + * token type + */ + typ: keyof EnumToken; + /** + * token value + */ + val?: string; + }; + /** + * shorthand property sets + */ set?: Record; + /** + * shorthand properties + */ properties: { + /** + * shorthand properties + */ [property: string]: PropertyMapType; }; } +/** + * shorthand properties + */ export interface ShorthandProperties { + /** + * property types + */ types: EnumToken[]; + /** + * default values + */ default: string[]; + /** + * keywords + */ keywords: string[]; + /** + * required + */ required?: boolean; + /** + * allow multiple values + */ multiple?: boolean; + /** + * propery constraints + */ constraints?: Array; + /** + * values mapping + */ mapping?: { + /** + * values mapping + */ [key: string]: any; }; + /** + * property validation + */ validation?: { + /** + * property validation + */ [key: string]: any; }; + /** + * property has a prefix + */ prefix?: string; } +/** + * shorthand definition + */ export interface ShorthandDef { + /** + * shorthand name + */ shorthand: string; + /** + * shorthand pattern + */ pattern: string; + /** + * shorthand keywords + */ keywords: string; + /** + * default values + */ defaults: string[]; + /** + * allow multiple values + */ multiple?: boolean; + /** + * values separator + */ separator?: string; } +/** + * shorthand type + */ export interface ShorthandType { + /** + * shorthand name + */ shorthand: string; + /** + * shorthand properties + */ properties: ShorthandProperties; } diff --git a/src/@types/token.d.ts b/src/@types/token.d.ts index e19aa5f65..a8ceb0fdd 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/@types/visitor.d.ts b/src/@types/visitor.d.ts index 724bc15cb..54d88a7ef 100644 --- a/src/@types/visitor.d.ts +++ b/src/@types/visitor.d.ts @@ -543,8 +543,14 @@ export declare interface VisitorNodeMap { */ Rule?: GenericVisitorAstNodeHandlerMap; + /** + * keyframes rule visitor + */ KeyframesRule?: GenericVisitorAstNodeHandlerMap; + /** + * keyframes at-rule visitor + */ KeyframesAtRule?: GenericVisitorAstNodeHandlerMap; /** diff --git a/src/@types/walker.d.ts b/src/@types/walker.d.ts index c2737ab3d..19a6316bf 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/data/validation.json b/src/data/validation.json index 62765968a..8f31c03f2 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":"