Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
refactor: simplify parsing repeated shorthands (#3634)
Bogdan Chadkin08b22cdc778c
diff --git a/packages/css-data/src/shorthands.ts b/packages/css-data/src/shorthands.tsindex 69f4527bc8..a8a78a8ab6 100644--- a/packages/css-data/src/shorthands.ts+++ b/packages/css-data/src/shorthands.ts@@ -73,6 +73,24 @@ const joinByOperator = (list: List<CssNode> | CssNode[], operator: string) => {return joined;};+const parseRepeated = (+ value: CssNode,+ parseSingle: (single: CssNode) => Value[]+): Value[] => {+ const values: CssNode[][] = [];+ for (const single of splitByOperator(value, ",")) {+ if (single === undefined) {+ continue;+ }+ const singleValues = parseSingle(single);+ singleValues.forEach((singleValue, index) => {+ values[index] = values[index] ?? [];+ values[index].push(singleValue);+ });+ }+ return values.map((list) => createValueNode(joinByOperator(list, ",")));+};+/*** Match the list of specified syntaxes with nodes* Matches can be placed in different order than the list@@ -427,21 +445,19 @@ const expandFlex = function* (value: CssNode) {**/const expandAnimation = function* (value: CssNode) {- const durations: CssNode[] = [];- const timings: CssNode[] = [];- const delays: CssNode[] = [];- const iterationCounts: CssNode[] = [];- const directions: CssNode[] = [];- const fillModes: CssNode[] = [];- const playStates: CssNode[] = [];- const names: CssNode[] = [];- for (const animation of splitByOperator(value, ",")) {- if (animation === undefined) {- continue;- }+ const [+ duration,+ timingFunction,+ delay,+ iterationCount,+ direction,+ fillMode,+ playState,+ name,+ ] = parseRepeated(value, (single) => {const [duration,- timing,+ easing,delay,iterationCount,direction,@@ -459,49 +475,27 @@ const expandAnimation = function* (value: CssNode) {"<single-animation-play-state>","[ none | <keyframes-name> ]",],- animation+ single);- durations.push(duration ?? createDimension("0", "s"));- timings.push(timing ?? createIdentifier("ease"));- delays.push(delay ?? createDimension("0", "s"));- iterationCounts.push(iterationCount ?? createNumber("1"));- directions.push(direction ?? createIdentifier("normal"));- fillModes.push(fillMode ?? createIdentifier("none"));- playStates.push(playState ?? createIdentifier("running"));- names.push(name ?? createIdentifier("none"));- }- yield [- "animation-duration",- createValueNode(joinByOperator(durations, ",")),- ] as const;- yield [- "animation-timing-function",- createValueNode(joinByOperator(timings, ",")),- ] as const;- yield [- "animation-delay",- createValueNode(joinByOperator(delays, ",")),- ] as const;- yield [- "animation-iteration-count",- createValueNode(joinByOperator(iterationCounts, ",")),- ] as const;- yield [- "animation-direction",- createValueNode(joinByOperator(directions, ",")),- ] as const;- yield [- "animation-fill-mode",- createValueNode(joinByOperator(fillModes, ",")),- ] as const;- yield [- "animation-play-state",- createValueNode(joinByOperator(playStates, ",")),- ] as const;- yield [- "animation-name",- createValueNode(joinByOperator(names, ",")),- ] as const;+ return [+ duration ?? createDimension("0", "s"),+ easing ?? createIdentifier("ease"),+ delay ?? createDimension("0", "s"),+ iterationCount ?? createNumber("1"),+ direction ?? createIdentifier("normal"),+ fillMode ?? createIdentifier("none"),+ playState ?? createIdentifier("running"),+ name ?? createIdentifier("none"),+ ];+ });+ yield ["animation-duration", duration] as const;+ yield ["animation-timing-function", timingFunction] as const;+ yield ["animation-delay", delay] as const;+ yield ["animation-iteration-count", iterationCount] as const;+ yield ["animation-direction", direction] as const;+ yield ["animation-fill-mode", fillMode] as const;+ yield ["animation-play-state", playState] as const;+ yield ["animation-name", name] as const;// reset with animation shorthand but cannot be set with ityield ["animation-timeline", createIdentifier("auto")] as const;yield ["animation-range-start", createIdentifier("normal")] as const;@@ -520,52 +514,34 @@ const expandAnimation = function* (value: CssNode) {**/const expandTransition = function* (value: CssNode) {- const properties: CssNode[] = [];- const durations: CssNode[] = [];- const easings: CssNode[] = [];- const delays: CssNode[] = [];- const behaviors: CssNode[] = [];- for (const transition of splitByOperator(value, ",")) {- if (transition === undefined) {- continue;+ const [property, duration, timingFunction, delay, behavior] = parseRepeated(+ value,+ (single) => {+ const [property, duration, easing, delay, behavior] = parseUnordered(+ [+ "[ none | <single-transition-property> ]",+ "<time>",+ "<easing-function>",+ "<time>",+ // <transition-behavior-value> is not supported by csstree+ "normal | allow-discrete",+ ],+ single+ );+ return [+ property ?? createIdentifier("all"),+ duration ?? createDimension("0", "s"),+ easing ?? createIdentifier("ease"),+ delay ?? createDimension("0", "s"),+ behavior ?? createIdentifier("normal"),+ ];}- const [property, duration, easing, delay, behavior] = parseUnordered(- [- "[ none | <single-transition-property> ]",- "<time>",- "<easing-function>",- "<time>",- // <transition-behavior-value> is not supported by csstree- "normal | allow-discrete",- ],- transition- );- properties.push(property ?? createIdentifier("all"));- durations.push(duration ?? createDimension("0", "s"));- easings.push(easing ?? createIdentifier("ease"));- delays.push(delay ?? createDimension("0", "s"));- behaviors.push(behavior ?? createIdentifier("normal"));- }- yield [- "transition-property",- createValueNode(joinByOperator(properties, ",")),- ] as const;- yield [- "transition-duration",- createValueNode(joinByOperator(durations, ",")),- ] as const;- yield [- "transition-timing-function",- createValueNode(joinByOperator(easings, ",")),- ] as const;- yield [- "transition-delay",- createValueNode(joinByOperator(delays, ",")),- ] as const;- yield [- "transition-behavior",- createValueNode(joinByOperator(behaviors, ",")),- ] as const;+ );+ yield ["transition-property", property] as const;+ yield ["transition-duration", duration] as const;+ yield ["transition-timing-function", timingFunction] as const;+ yield ["transition-delay", delay] as const;+ yield ["transition-behavior", behavior] as const;};/**@@ -586,78 +562,56 @@ const expandTransition = function* (value: CssNode) {**/const expandMask = function* (value: CssNode) {- const references: CssNode[] = [];- const positions: CssNode[] = [];- const bgSizes: CssNode[] = [];- const repeatStyles: CssNode[] = [];- const origins: CssNode[] = [];- const clips: CssNode[] = [];- const compositionOperators: CssNode[] = [];- const modes: CssNode[] = [];- for (const mask of splitByOperator(value, ",")) {- if (mask === undefined) {- continue;- }- const [- reference,- positionAndSize,- repeatStyle,- origin,- clip,- compositingOperator,- mode,- ] = parseUnordered(- [- "<mask-reference>",- "<position> [ / <bg-size> ]?",- "<repeat-style>",- "<geometry-box>",- "[ <geometry-box> | no-clip ]",- "<compositing-operator>",- "<masking-mode>",- ],- mask- );- references.push(reference ?? createIdentifier("none"));- let position: undefined | CssNode;- let bgSize: undefined | CssNode;- if (positionAndSize) {- [position, bgSize] = splitByOperator(positionAndSize, "/");- }- positions.push(- position ??- createValueNode([- { type: "Dimension", value: "0", unit: "%" },- { type: "Dimension", value: "0", unit: "%" },- ])- );- bgSizes.push(bgSize ?? createIdentifier("auto"));- repeatStyles.push(repeatStyle ?? createIdentifier("repeat"));- origins.push(origin ?? createIdentifier("border-box"));- clips.push(clip ?? origin ?? createIdentifier("border-box"));- compositionOperators.push(compositingOperator ?? createIdentifier("add"));- modes.push(mode ?? createIdentifier("match-source"));- }- yield [- "mask-image",- createValueNode(joinByOperator(references, ",")),- ] as const;- yield [- "mask-position",- createValueNode(joinByOperator(positions, ",")),- ] as const;- yield ["mask-size", createValueNode(joinByOperator(bgSizes, ","))] as const;- yield [- "mask-repeat",- createValueNode(joinByOperator(repeatStyles, ",")),- ] as const;- yield ["mask-origin", createValueNode(joinByOperator(origins, ","))] as const;- yield ["mask-clip", createValueNode(joinByOperator(clips, ","))] as const;- yield [- "mask-composite",- createValueNode(joinByOperator(compositionOperators, ",")),- ] as const;- yield ["mask-mode", createValueNode(joinByOperator(modes, ","))] as const;+ const [image, position, size, repeat, origin, clip, composite, mode] =+ parseRepeated(value, (single) => {+ const [+ reference,+ positionAndSize,+ repeatStyle,+ origin,+ clip,+ compositingOperator,+ mode,+ ] = parseUnordered(+ [+ "<mask-reference>",+ "<position> [ / <bg-size> ]?",+ "<repeat-style>",+ "<geometry-box>",+ "[ <geometry-box> | no-clip ]",+ "<compositing-operator>",+ "<masking-mode>",+ ],+ single+ );+ let position: undefined | Value;+ let bgSize: undefined | Value;+ if (positionAndSize) {+ [position, bgSize] = splitByOperator(positionAndSize, "/");+ }+ return [+ reference ?? createIdentifier("none"),+ position ??+ createValueNode([+ { type: "Dimension", value: "0", unit: "%" },+ { type: "Dimension", value: "0", unit: "%" },+ ]),+ bgSize ?? createIdentifier("auto"),+ repeatStyle ?? createIdentifier("repeat"),+ origin ?? createIdentifier("border-box"),+ clip ?? origin ?? createIdentifier("border-box"),+ compositingOperator ?? createIdentifier("add"),+ mode ?? createIdentifier("match-source"),+ ];+ });+ yield ["mask-image", image] as const;+ yield ["mask-position", position] as const;+ yield ["mask-size", size] as const;+ yield ["mask-repeat", repeat] as const;+ yield ["mask-origin", origin] as const;+ yield ["mask-clip", clip] as const;+ yield ["mask-composite", composite] as const;+ yield ["mask-mode", mode] as const;};/**@@ -733,24 +687,18 @@ const expandOffset = function* (value: CssNode) {**/const expandScrollTimeline = function* (value: CssNode) {- const list = splitByOperator(value, ",");- const names: CssNode[] = [];- const axises: CssNode[] = [];- for (const singleTimeline of list) {- const [name, axis] = getValueList(- singleTimeline ?? createIdentifier("none")+ const [name, axis] = parseRepeated(value, (single) => {+ const [name, axis] = parseUnordered(+ [`none | <custom-ident>`, `block | inline | x | y`],+ single);- names.push(name);- axises.push(axis ?? createIdentifier("block"));- }- yield [- "scroll-timeline-name",- createValueNode(joinByOperator(names, ",")),- ] as const;- yield [- "scroll-timeline-axis",- createValueNode(joinByOperator(axises, ",")),- ] as const;+ return [+ name ?? createIdentifier("none"),+ axis ?? createIdentifier("block"),+ ];+ });+ yield ["scroll-timeline-name", name] as const;+ yield ["scroll-timeline-axis", axis] as const;};/**