Skip to content

Add missing support for hsl format syntax without comma #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GuillaumeGomez wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add missing support for hsl format syntax without comma #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29977a6
Add other supported hsl syntax
GuillaumeGomez Apr 26, 2023
36d8eba
Update tests for hsl with only whitespace
GuillaumeGomez Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/__tests__/test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ deepStrictEqual(fromString('rgba(255 255 255 / .5)').toHslaArray(), [0, 0, 100,
deepStrictEqual(fromString('rgba(0, 0, 0, 0)').toRgbaArray(), [0, 0, 0, 0]);
deepStrictEqual(fromString('rgba(3, 2, 1, 0)').toRgbaArray(), [3, 2, 1, 0]);
deepStrictEqual(fromString('hsl(0, 0%, 100%)').toHslaArray(), [0, 0, 100, 1]);
deepStrictEqual(fromString('hsl(0 0% 100%)').toHslaArray(), [0, 0, 100, 1]);
deepStrictEqual(fromString('hsl(0, 0%, 100%)').toRgbaArray(), [255, 255, 255, 1]);
deepStrictEqual(fromString('hsl(0 0% 100%)').toRgbaArray(), [255, 255, 255, 1]);
deepStrictEqual(fromString('hsla(0, 0%, 100%, .5)').toHslaArray(), [0, 0, 100, 0.5]);
deepStrictEqual(fromString('hsla(0 0% 100% / .5)').toHslaArray(), [0, 0, 100, 0.5]);
deepStrictEqual(fromString('hsla(0, 0%, 100%, .5)').toRgbaArray(), [255, 255, 255, 0.5]);
deepStrictEqual(fromString('hsla(0 0% 100% / .5)').toRgbaArray(), [255, 255, 255, 0.5]);
deepStrictEqual(fromString('#ffffff').toRgbaArray(), [255, 255, 255, 1]);
deepStrictEqual(fromString('#ffffff').toHslaArray(), [0, 0, 100, 1]);
deepStrictEqual(fromString('#ffffffff').toRgbaArray(), [255, 255, 255, 1]);
Expand Down
13 changes: 9 additions & 4 deletions src/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ const rgb = /^rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)(?:\s*,\s*(0|1|0?\.\d+|\d+%
const rgbfn = /^rgba?\(\s*(\d+)\s+(\d+)\s+(\d+)(?:\s*\/\s*(0|1|0?\.\d+|\d+%))?\s*\)$/;
const rgbperc = /^rgba?\(\s*(\d+%)\s*,\s*(\d+%)\s*,\s*(\d+%)(?:\s*,\s*(0|1|0?\.\d+|\d+%))?\s*\)$/;
const rgbpercfn = /^rgba?\(\s*(\d+%)\s+(\d+%)\s+(\d+%)(?:\s*\/\s*(0|1|0?\.\d+|\d+%))?\s*\)$/;
const hsl = /^hsla?\(\s*(\d+)(deg|rad|grad|turn)?\s*,\s*(\d+)%\s*,\s*(\d+)%(?:\s*,\s*(0|1|0?\.\d+|\d+%))?\s*\)$/;
const hsl = /^hsla?\(\s*(0?\.\d+|\d+)(deg|rad|grad|turn)?\s*,\s*(\d+)%\s*,\s*(\d+)%(?:\s*,\s*(0?\.\d+|\d+%))?\s*\)$/;
const hslws = /^hsla?\(\s*(0?\.\d+|\d+)(deg|rad|grad|turn)?\s+(\d+)%\s+(\d+)%(?:\s*\/\s*(0?\.\d+|\d+%))?\s*\)$/;

function contains(haystack, needle) {
return haystack.indexOf(needle) > -1;
Expand Down Expand Up @@ -151,8 +152,8 @@ function fromRgbString(str) {
return fromRgba([r, g, b, a]);
}

function fromHslString(str) {
let [, h, unit, s, l, a] = hsl.exec(str);
function fromHslString(reg, str) {
let [, h, unit, s, l, a] = reg.exec(str);
unit = unit || 'deg';
h = unitConverter(parseFloat(h), unit, 'deg');
s = parseFloat(s);
Expand All @@ -175,7 +176,11 @@ export function fromString(str) {
}

if (hsl.test(str)) {
return fromHslString(str);
return fromHslString(hsl, str);
}

if (hslws.test(str)) {
return fromHslString(hslws, str);
}

return null;
Expand Down