Skip to content

Commit 950f329

Browse files
bartvenemanbartveneman
authored
use default reporting for color duplicates (#80)
the reporting for coor duplicates was different from all other reporting and it didn't tell us how many duplicates there were for example. This commit fixes just that. closes #61
1 parent b3c86d1 commit 950f329

File tree

3 files changed

+141
-128
lines changed

3 files changed

+141
-128
lines changed

‎src/analyzer/values/colors.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,16 @@ module.exports = declarations => {
144144
return [...allColors, ...declarationColors]
145145
}, [])
146146
const {totalUnique, unique} = uniquer(all, colorSorter.sortFn)
147+
const duplicates = withDuplicateNotations(unique)
147148

148149
return {
149150
total: all.length,
150151
unique,
151152
totalUnique,
152-
duplicates: withDuplicateNotations(unique)
153+
duplicates: {
154+
unique: duplicates,
155+
totalUnique: duplicates.length,
156+
total: duplicates.length
157+
}
153158
}
154159
}

‎test/analyzer/index.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@ test('Returns the correct analysis object structure', async t => {
171171
total: 0,
172172
totalUnique: 0,
173173
unique: [],
174-
duplicates: []
174+
duplicates: {
175+
total: 0,
176+
totalUnique: 0,
177+
unique: []
178+
}
175179
},
176180
fontfamilies: {
177181
total: 0,

‎test/analyzer/values/output.json‎

Lines changed: 130 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -272,132 +272,136 @@
272272
"count": 1
273273
}
274274
],
275-
"duplicates": [
276-
{
277-
"count": 2,
278-
"value": "rgba(0,0,0,0)",
279-
"notations": [
280-
{
281-
"value": "hsla(0,0%,0%,0)",
282-
"count": 1
283-
},
284-
{
285-
"value": "rgba(0,0,0,0)",
286-
"count": 1
287-
}
288-
]
289-
},
290-
{
291-
"value": "rgba(100, 200, 10, .5)",
292-
"count": 2,
293-
"notations": [
294-
{
295-
"count": 1,
296-
"value": "rgba(100, 200, 10, .5)"
297-
},
298-
{
299-
"count": 1,
300-
"value": "rgba(100, 200, 10, 0.5)"
301-
}
302-
]
303-
},
304-
{
305-
"value": "hsl(270,60%,70%)",
306-
"count": 3,
307-
"notations": [
308-
{
309-
"count": 1,
310-
"value": "hsl(270,60%,70%)"
311-
},
312-
{
313-
"count": 1,
314-
"value": "hsl(270, 60%, 70%)"
315-
},
316-
{
317-
"count": 1,
318-
"value": "hsl(270 60% 70%)"
319-
}
320-
]
321-
},
322-
{
323-
"value": "hsl(270 60% 50% / .15)",
324-
"count": 4,
325-
"notations": [
326-
{
327-
"count": 1,
328-
"value": "hsl(270, 60%, 50%, 15%)"
329-
},
330-
{
331-
"count": 1,
332-
"value": "hsl(270 60% 50% / .15)"
333-
},
334-
{
335-
"count": 1,
336-
"value": "hsl(270 60% 50% / 15%)"
337-
},
338-
{
339-
"count": 1,
340-
"value": "hsl(270, 60%, 50%, .15)"
341-
}
342-
]
343-
},
344-
{
345-
"value": "#fff",
346-
"count": 4,
347-
"notations": [
348-
{
349-
"count": 1,
350-
"value": "hsl(360, 100%, 100%)"
351-
},
352-
{
353-
"count": 1,
354-
"value": "white"
355-
},
356-
{
357-
"count": 1,
358-
"value": "#fff"
359-
},
360-
{
361-
"count": 1,
362-
"value": "rgb(255, 255, 255)"
363-
}
364-
]
365-
},
366-
{
367-
"count": 8,
368-
"value": "black",
369-
"notations": [
370-
{
371-
"value": "hsl(0,0,0)",
372-
"count": 1
373-
},
374-
{
375-
"value": "rgba(0,0,0,1)",
376-
"count": 1
377-
},
378-
{
379-
"value": "hsla(0,0,0,1)",
380-
"count": 1
381-
},
382-
{
383-
"value": "#000000",
384-
"count": 1
385-
},
386-
{
387-
"value": "black",
388-
"count": 2
389-
},
390-
{
391-
"value": "#000",
392-
"count": 1
393-
},
394-
{
395-
"value": "rgb(0,0,0)",
396-
"count": 1
397-
}
398-
]
399-
}
400-
]
275+
"duplicates": {
276+
"total": 6,
277+
"totalUnique": 6,
278+
"unique": [
279+
{
280+
"count": 2,
281+
"value": "rgba(0,0,0,0)",
282+
"notations": [
283+
{
284+
"value": "hsla(0,0%,0%,0)",
285+
"count": 1
286+
},
287+
{
288+
"value": "rgba(0,0,0,0)",
289+
"count": 1
290+
}
291+
]
292+
},
293+
{
294+
"value": "rgba(100, 200, 10, .5)",
295+
"count": 2,
296+
"notations": [
297+
{
298+
"count": 1,
299+
"value": "rgba(100, 200, 10, .5)"
300+
},
301+
{
302+
"count": 1,
303+
"value": "rgba(100, 200, 10, 0.5)"
304+
}
305+
]
306+
},
307+
{
308+
"value": "hsl(270,60%,70%)",
309+
"count": 3,
310+
"notations": [
311+
{
312+
"count": 1,
313+
"value": "hsl(270,60%,70%)"
314+
},
315+
{
316+
"count": 1,
317+
"value": "hsl(270, 60%, 70%)"
318+
},
319+
{
320+
"count": 1,
321+
"value": "hsl(270 60% 70%)"
322+
}
323+
]
324+
},
325+
{
326+
"value": "hsl(270 60% 50% / .15)",
327+
"count": 4,
328+
"notations": [
329+
{
330+
"count": 1,
331+
"value": "hsl(270, 60%, 50%, 15%)"
332+
},
333+
{
334+
"count": 1,
335+
"value": "hsl(270 60% 50% / .15)"
336+
},
337+
{
338+
"count": 1,
339+
"value": "hsl(270 60% 50% / 15%)"
340+
},
341+
{
342+
"count": 1,
343+
"value": "hsl(270, 60%, 50%, .15)"
344+
}
345+
]
346+
},
347+
{
348+
"value": "#fff",
349+
"count": 4,
350+
"notations": [
351+
{
352+
"count": 1,
353+
"value": "hsl(360, 100%, 100%)"
354+
},
355+
{
356+
"count": 1,
357+
"value": "white"
358+
},
359+
{
360+
"count": 1,
361+
"value": "#fff"
362+
},
363+
{
364+
"count": 1,
365+
"value": "rgb(255, 255, 255)"
366+
}
367+
]
368+
},
369+
{
370+
"count": 8,
371+
"value": "black",
372+
"notations": [
373+
{
374+
"value": "hsl(0,0,0)",
375+
"count": 1
376+
},
377+
{
378+
"value": "rgba(0,0,0,1)",
379+
"count": 1
380+
},
381+
{
382+
"value": "hsla(0,0,0,1)",
383+
"count": 1
384+
},
385+
{
386+
"value": "#000000",
387+
"count": 1
388+
},
389+
{
390+
"value": "black",
391+
"count": 2
392+
},
393+
{
394+
"value": "#000",
395+
"count": 1
396+
},
397+
{
398+
"value": "rgb(0,0,0)",
399+
"count": 1
400+
}
401+
]
402+
}
403+
]
404+
}
401405
},
402406
"browserhacks": {
403407
"total": 1,

0 commit comments

Comments
 (0)