Skip to content
This repository has been archived by the owner on Feb 18, 2022. It is now read-only.

Switching to postcss-value-parser #24

Merged
merged 1 commit into from
Dec 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"node": ">=10.0.0"
},
"dependencies": {
"postcss-values-parser": "^6.0.0"
"postcss-value-parser": "^4.2.0"
},
"peerDependencies": {
"postcss": "^8.3.7"
Expand Down
46 changes: 6 additions & 40 deletions src/onCSSDeclaration.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { parse } from 'postcss-values-parser';
import Func from 'postcss-values-parser/lib/nodes/Func';
import Punctuation from 'postcss-values-parser/lib/nodes/Punctuation';
import valuesParser from 'postcss-value-parser';
import options from './options';

/** @type {(decl: CSSDeclaration) => void} Transform 4 & 8 character hex color notation in CSS Declarations. */
Expand All @@ -9,15 +7,15 @@ const onCSSDeclaration = (decl) => {
const { value: originalValue } = decl;

// replace instances of hexa with rgba()
const valueAST = parse(originalValue);
const valueAST = valuesParser(originalValue);

walk(valueAST, (node) => {
valueAST.walk((node) => {
if (isAlphaHex(node)) {
node.replaceWith(hexa2rgba(node));
hexa2rgba(node);
}
});

const modifiedValue = String(valueAST);
const modifiedValue = valueAST.toString();

if (modifiedValue !== originalValue) {
if (options.preserve) decl.cloneBefore({ value: modifiedValue });
Expand All @@ -39,17 +37,6 @@ const hasAlphaHex = (node) => alphaHexRegExp.test(node.value);
const isAlphaHex = (node) =>
node.type === 'word' && alphaHexValueRegExp.test(node.value);

/** Walks all nodes in a value. */
const walk = (node, fn) => {
if (Object(node.nodes).length) {
node.nodes.slice().forEach((child) => {
fn(child);

walk(child, fn);
});
}
};

/** Decimal precision. */
const alphaDecimalPrecision = 100000;

Expand All @@ -72,30 +59,9 @@ const hexa2rgba = (node) => {
) / alphaDecimalPrecision,
];

// return a new rgba function, preserving the whitespace of the original node
const rgbaFunc = Object.assign(
new Func({
name: 'rgba',
raws: {},
}),
{
raws: node.raws,
}
);

rgbaFunc.append(createNumberNode(r));
rgbaFunc.append(new Punctuation({ value: ',' }));
rgbaFunc.append(createNumberNode(g));
rgbaFunc.append(new Punctuation({ value: ',' }));
rgbaFunc.append(createNumberNode(b));
rgbaFunc.append(new Punctuation({ value: ',' }));
rgbaFunc.append(createNumberNode(a));

return rgbaFunc;
node.value = `rgba(${r},${g},${b},${a})`;
};

const createNumberNode = (number) => parse(number).first;

export default onCSSDeclaration;

/** @typedef {import('postcss').Declaration} CSSDeclaration */