Skip to content

Commit 251f6a2

Browse files
sgoudhamsgoudham
authoredNov 2, 2024··
fix(ansi): better names for normal and bright objects (#112)
·
v1.7.1
1 parent eb55865 commit 251f6a2

File tree

3 files changed

+78
-67
lines changed

3 files changed

+78
-67
lines changed
 

‎mod.test.ts

+8
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ Deno.test("flavors", () => {
2020
Deno.test("ansiEntries", () => {
2121
flavorEntries.map(([flavorName, flavor]) => {
2222
flavor.ansiColorEntries.map(([ansiColorName, ansiColor]) => {
23+
assertEquals(
24+
ansiColor.normal.name,
25+
ansiColor.name
26+
);
27+
assertEquals(
28+
ansiColor.bright.name,
29+
`Bright ${ansiColor.name}`
30+
);
2331
assertEquals(
2432
ansiColor.normal.hex,
2533
palette[flavorName].ansiColors[ansiColorName].normal.hex,

‎palette.json

+64-64
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@
428428
"name": "Black",
429429
"order": 0,
430430
"normal": {
431-
"name": "Normal",
431+
"name": "Black",
432432
"hex": "#5c5f77",
433433
"rgb": {
434434
"r": 92,
@@ -443,7 +443,7 @@
443443
"code": 0
444444
},
445445
"bright": {
446-
"name": "Bright",
446+
"name": "Bright Black",
447447
"hex": "#6c6f85",
448448
"rgb": {
449449
"r": 108,
@@ -462,7 +462,7 @@
462462
"name": "Red",
463463
"order": 1,
464464
"normal": {
465-
"name": "Normal",
465+
"name": "Red",
466466
"hex": "#d20f39",
467467
"rgb": {
468468
"r": 210,
@@ -477,7 +477,7 @@
477477
"code": 1
478478
},
479479
"bright": {
480-
"name": "Bright",
480+
"name": "Bright Red",
481481
"hex": "#de293e",
482482
"rgb": {
483483
"r": 222,
@@ -496,7 +496,7 @@
496496
"name": "Green",
497497
"order": 2,
498498
"normal": {
499-
"name": "Normal",
499+
"name": "Green",
500500
"hex": "#40a02b",
501501
"rgb": {
502502
"r": 64,
@@ -511,7 +511,7 @@
511511
"code": 2
512512
},
513513
"bright": {
514-
"name": "Bright",
514+
"name": "Bright Green",
515515
"hex": "#49af3d",
516516
"rgb": {
517517
"r": 73,
@@ -530,7 +530,7 @@
530530
"name": "Yellow",
531531
"order": 3,
532532
"normal": {
533-
"name": "Normal",
533+
"name": "Yellow",
534534
"hex": "#df8e1d",
535535
"rgb": {
536536
"r": 223,
@@ -545,7 +545,7 @@
545545
"code": 3
546546
},
547547
"bright": {
548-
"name": "Bright",
548+
"name": "Bright Yellow",
549549
"hex": "#eea02d",
550550
"rgb": {
551551
"r": 238,
@@ -564,7 +564,7 @@
564564
"name": "Blue",
565565
"order": 4,
566566
"normal": {
567-
"name": "Normal",
567+
"name": "Blue",
568568
"hex": "#1e66f5",
569569
"rgb": {
570570
"r": 30,
@@ -579,7 +579,7 @@
579579
"code": 4
580580
},
581581
"bright": {
582-
"name": "Bright",
582+
"name": "Bright Blue",
583583
"hex": "#456eff",
584584
"rgb": {
585585
"r": 69,
@@ -598,7 +598,7 @@
598598
"name": "Magenta",
599599
"order": 5,
600600
"normal": {
601-
"name": "Normal",
601+
"name": "Magenta",
602602
"hex": "#ea76cb",
603603
"rgb": {
604604
"r": 234,
@@ -613,7 +613,7 @@
613613
"code": 5
614614
},
615615
"bright": {
616-
"name": "Bright",
616+
"name": "Bright Magenta",
617617
"hex": "#fe85d8",
618618
"rgb": {
619619
"r": 254,
@@ -632,7 +632,7 @@
632632
"name": "Cyan",
633633
"order": 6,
634634
"normal": {
635-
"name": "Normal",
635+
"name": "Cyan",
636636
"hex": "#179299",
637637
"rgb": {
638638
"r": 23,
@@ -647,7 +647,7 @@
647647
"code": 6
648648
},
649649
"bright": {
650-
"name": "Bright",
650+
"name": "Bright Cyan",
651651
"hex": "#2d9fa8",
652652
"rgb": {
653653
"r": 45,
@@ -666,7 +666,7 @@
666666
"name": "White",
667667
"order": 7,
668668
"normal": {
669-
"name": "Normal",
669+
"name": "White",
670670
"hex": "#acb0be",
671671
"rgb": {
672672
"r": 172,
@@ -681,7 +681,7 @@
681681
"code": 7
682682
},
683683
"bright": {
684-
"name": "Bright",
684+
"name": "Bright White",
685685
"hex": "#bcc0cc",
686686
"rgb": {
687687
"r": 188,
@@ -1126,7 +1126,7 @@
11261126
"name": "Black",
11271127
"order": 0,
11281128
"normal": {
1129-
"name": "Normal",
1129+
"name": "Black",
11301130
"hex": "#51576d",
11311131
"rgb": {
11321132
"r": 81,
@@ -1141,7 +1141,7 @@
11411141
"code": 0
11421142
},
11431143
"bright": {
1144-
"name": "Bright",
1144+
"name": "Bright Black",
11451145
"hex": "#626880",
11461146
"rgb": {
11471147
"r": 98,
@@ -1160,7 +1160,7 @@
11601160
"name": "Red",
11611161
"order": 1,
11621162
"normal": {
1163-
"name": "Normal",
1163+
"name": "Red",
11641164
"hex": "#e78284",
11651165
"rgb": {
11661166
"r": 231,
@@ -1175,7 +1175,7 @@
11751175
"code": 1
11761176
},
11771177
"bright": {
1178-
"name": "Bright",
1178+
"name": "Bright Red",
11791179
"hex": "#e67172",
11801180
"rgb": {
11811181
"r": 230,
@@ -1194,7 +1194,7 @@
11941194
"name": "Green",
11951195
"order": 2,
11961196
"normal": {
1197-
"name": "Normal",
1197+
"name": "Green",
11981198
"hex": "#a6d189",
11991199
"rgb": {
12001200
"r": 166,
@@ -1209,7 +1209,7 @@
12091209
"code": 2
12101210
},
12111211
"bright": {
1212-
"name": "Bright",
1212+
"name": "Bright Green",
12131213
"hex": "#8ec772",
12141214
"rgb": {
12151215
"r": 142,
@@ -1228,7 +1228,7 @@
12281228
"name": "Yellow",
12291229
"order": 3,
12301230
"normal": {
1231-
"name": "Normal",
1231+
"name": "Yellow",
12321232
"hex": "#e5c890",
12331233
"rgb": {
12341234
"r": 229,
@@ -1243,7 +1243,7 @@
12431243
"code": 3
12441244
},
12451245
"bright": {
1246-
"name": "Bright",
1246+
"name": "Bright Yellow",
12471247
"hex": "#d9ba73",
12481248
"rgb": {
12491249
"r": 217,
@@ -1262,7 +1262,7 @@
12621262
"name": "Blue",
12631263
"order": 4,
12641264
"normal": {
1265-
"name": "Normal",
1265+
"name": "Blue",
12661266
"hex": "#8caaee",
12671267
"rgb": {
12681268
"r": 140,
@@ -1277,7 +1277,7 @@
12771277
"code": 4
12781278
},
12791279
"bright": {
1280-
"name": "Bright",
1280+
"name": "Bright Blue",
12811281
"hex": "#7b9ef0",
12821282
"rgb": {
12831283
"r": 123,
@@ -1296,7 +1296,7 @@
12961296
"name": "Magenta",
12971297
"order": 5,
12981298
"normal": {
1299-
"name": "Normal",
1299+
"name": "Magenta",
13001300
"hex": "#f4b8e4",
13011301
"rgb": {
13021302
"r": 244,
@@ -1311,7 +1311,7 @@
13111311
"code": 5
13121312
},
13131313
"bright": {
1314-
"name": "Bright",
1314+
"name": "Bright Magenta",
13151315
"hex": "#f2a4db",
13161316
"rgb": {
13171317
"r": 242,
@@ -1330,7 +1330,7 @@
13301330
"name": "Cyan",
13311331
"order": 6,
13321332
"normal": {
1333-
"name": "Normal",
1333+
"name": "Cyan",
13341334
"hex": "#81c8be",
13351335
"rgb": {
13361336
"r": 129,
@@ -1345,7 +1345,7 @@
13451345
"code": 6
13461346
},
13471347
"bright": {
1348-
"name": "Bright",
1348+
"name": "Bright Cyan",
13491349
"hex": "#5abfb5",
13501350
"rgb": {
13511351
"r": 90,
@@ -1364,7 +1364,7 @@
13641364
"name": "White",
13651365
"order": 7,
13661366
"normal": {
1367-
"name": "Normal",
1367+
"name": "White",
13681368
"hex": "#a5adce",
13691369
"rgb": {
13701370
"r": 165,
@@ -1379,7 +1379,7 @@
13791379
"code": 7
13801380
},
13811381
"bright": {
1382-
"name": "Bright",
1382+
"name": "Bright White",
13831383
"hex": "#b5bfe2",
13841384
"rgb": {
13851385
"r": 181,
@@ -1824,7 +1824,7 @@
18241824
"name": "Black",
18251825
"order": 0,
18261826
"normal": {
1827-
"name": "Normal",
1827+
"name": "Black",
18281828
"hex": "#494d64",
18291829
"rgb": {
18301830
"r": 73,
@@ -1839,7 +1839,7 @@
18391839
"code": 0
18401840
},
18411841
"bright": {
1842-
"name": "Bright",
1842+
"name": "Bright Black",
18431843
"hex": "#5b6078",
18441844
"rgb": {
18451845
"r": 91,
@@ -1858,7 +1858,7 @@
18581858
"name": "Red",
18591859
"order": 1,
18601860
"normal": {
1861-
"name": "Normal",
1861+
"name": "Red",
18621862
"hex": "#ed8796",
18631863
"rgb": {
18641864
"r": 237,
@@ -1873,7 +1873,7 @@
18731873
"code": 1
18741874
},
18751875
"bright": {
1876-
"name": "Bright",
1876+
"name": "Bright Red",
18771877
"hex": "#ec7486",
18781878
"rgb": {
18791879
"r": 236,
@@ -1892,7 +1892,7 @@
18921892
"name": "Green",
18931893
"order": 2,
18941894
"normal": {
1895-
"name": "Normal",
1895+
"name": "Green",
18961896
"hex": "#a6da95",
18971897
"rgb": {
18981898
"r": 166,
@@ -1907,7 +1907,7 @@
19071907
"code": 2
19081908
},
19091909
"bright": {
1910-
"name": "Bright",
1910+
"name": "Bright Green",
19111911
"hex": "#8ccf7f",
19121912
"rgb": {
19131913
"r": 140,
@@ -1926,7 +1926,7 @@
19261926
"name": "Yellow",
19271927
"order": 3,
19281928
"normal": {
1929-
"name": "Normal",
1929+
"name": "Yellow",
19301930
"hex": "#eed49f",
19311931
"rgb": {
19321932
"r": 238,
@@ -1941,7 +1941,7 @@
19411941
"code": 3
19421942
},
19431943
"bright": {
1944-
"name": "Bright",
1944+
"name": "Bright Yellow",
19451945
"hex": "#e1c682",
19461946
"rgb": {
19471947
"r": 225,
@@ -1960,7 +1960,7 @@
19601960
"name": "Blue",
19611961
"order": 4,
19621962
"normal": {
1963-
"name": "Normal",
1963+
"name": "Blue",
19641964
"hex": "#8aadf4",
19651965
"rgb": {
19661966
"r": 138,
@@ -1975,7 +1975,7 @@
19751975
"code": 4
19761976
},
19771977
"bright": {
1978-
"name": "Bright",
1978+
"name": "Bright Blue",
19791979
"hex": "#78a1f6",
19801980
"rgb": {
19811981
"r": 120,
@@ -1994,7 +1994,7 @@
19941994
"name": "Magenta",
19951995
"order": 5,
19961996
"normal": {
1997-
"name": "Normal",
1997+
"name": "Magenta",
19981998
"hex": "#f5bde6",
19991999
"rgb": {
20002000
"r": 245,
@@ -2009,7 +2009,7 @@
20092009
"code": 5
20102010
},
20112011
"bright": {
2012-
"name": "Bright",
2012+
"name": "Bright Magenta",
20132013
"hex": "#f2a9dd",
20142014
"rgb": {
20152015
"r": 242,
@@ -2028,7 +2028,7 @@
20282028
"name": "Cyan",
20292029
"order": 6,
20302030
"normal": {
2031-
"name": "Normal",
2031+
"name": "Cyan",
20322032
"hex": "#8bd5ca",
20332033
"rgb": {
20342034
"r": 139,
@@ -2043,7 +2043,7 @@
20432043
"code": 6
20442044
},
20452045
"bright": {
2046-
"name": "Bright",
2046+
"name": "Bright Cyan",
20472047
"hex": "#63cbc0",
20482048
"rgb": {
20492049
"r": 99,
@@ -2062,7 +2062,7 @@
20622062
"name": "White",
20632063
"order": 7,
20642064
"normal": {
2065-
"name": "Normal",
2065+
"name": "White",
20662066
"hex": "#a5adcb",
20672067
"rgb": {
20682068
"r": 165,
@@ -2077,7 +2077,7 @@
20772077
"code": 7
20782078
},
20792079
"bright": {
2080-
"name": "Bright",
2080+
"name": "Bright White",
20812081
"hex": "#b8c0e0",
20822082
"rgb": {
20832083
"r": 184,
@@ -2522,7 +2522,7 @@
25222522
"name": "Black",
25232523
"order": 0,
25242524
"normal": {
2525-
"name": "Normal",
2525+
"name": "Black",
25262526
"hex": "#45475a",
25272527
"rgb": {
25282528
"r": 69,
@@ -2537,7 +2537,7 @@
25372537
"code": 0
25382538
},
25392539
"bright": {
2540-
"name": "Bright",
2540+
"name": "Bright Black",
25412541
"hex": "#585b70",
25422542
"rgb": {
25432543
"r": 88,
@@ -2556,7 +2556,7 @@
25562556
"name": "Red",
25572557
"order": 1,
25582558
"normal": {
2559-
"name": "Normal",
2559+
"name": "Red",
25602560
"hex": "#f38ba8",
25612561
"rgb": {
25622562
"r": 243,
@@ -2571,7 +2571,7 @@
25712571
"code": 1
25722572
},
25732573
"bright": {
2574-
"name": "Bright",
2574+
"name": "Bright Red",
25752575
"hex": "#f37799",
25762576
"rgb": {
25772577
"r": 243,
@@ -2590,7 +2590,7 @@
25902590
"name": "Green",
25912591
"order": 2,
25922592
"normal": {
2593-
"name": "Normal",
2593+
"name": "Green",
25942594
"hex": "#a6e3a1",
25952595
"rgb": {
25962596
"r": 166,
@@ -2605,7 +2605,7 @@
26052605
"code": 2
26062606
},
26072607
"bright": {
2608-
"name": "Bright",
2608+
"name": "Bright Green",
26092609
"hex": "#89d88b",
26102610
"rgb": {
26112611
"r": 137,
@@ -2624,7 +2624,7 @@
26242624
"name": "Yellow",
26252625
"order": 3,
26262626
"normal": {
2627-
"name": "Normal",
2627+
"name": "Yellow",
26282628
"hex": "#f9e2af",
26292629
"rgb": {
26302630
"r": 249,
@@ -2639,7 +2639,7 @@
26392639
"code": 3
26402640
},
26412641
"bright": {
2642-
"name": "Bright",
2642+
"name": "Bright Yellow",
26432643
"hex": "#ebd391",
26442644
"rgb": {
26452645
"r": 235,
@@ -2658,7 +2658,7 @@
26582658
"name": "Blue",
26592659
"order": 4,
26602660
"normal": {
2661-
"name": "Normal",
2661+
"name": "Blue",
26622662
"hex": "#89b4fa",
26632663
"rgb": {
26642664
"r": 137,
@@ -2673,7 +2673,7 @@
26732673
"code": 4
26742674
},
26752675
"bright": {
2676-
"name": "Bright",
2676+
"name": "Bright Blue",
26772677
"hex": "#74a8fc",
26782678
"rgb": {
26792679
"r": 116,
@@ -2692,7 +2692,7 @@
26922692
"name": "Magenta",
26932693
"order": 5,
26942694
"normal": {
2695-
"name": "Normal",
2695+
"name": "Magenta",
26962696
"hex": "#f5c2e7",
26972697
"rgb": {
26982698
"r": 245,
@@ -2707,7 +2707,7 @@
27072707
"code": 5
27082708
},
27092709
"bright": {
2710-
"name": "Bright",
2710+
"name": "Bright Magenta",
27112711
"hex": "#f2aede",
27122712
"rgb": {
27132713
"r": 242,
@@ -2726,7 +2726,7 @@
27262726
"name": "Cyan",
27272727
"order": 6,
27282728
"normal": {
2729-
"name": "Normal",
2729+
"name": "Cyan",
27302730
"hex": "#94e2d5",
27312731
"rgb": {
27322732
"r": 148,
@@ -2741,7 +2741,7 @@
27412741
"code": 6
27422742
},
27432743
"bright": {
2744-
"name": "Bright",
2744+
"name": "Bright Cyan",
27452745
"hex": "#6bd7ca",
27462746
"rgb": {
27472747
"r": 107,
@@ -2760,7 +2760,7 @@
27602760
"name": "White",
27612761
"order": 7,
27622762
"normal": {
2763-
"name": "Normal",
2763+
"name": "White",
27642764
"hex": "#a6adc8",
27652765
"rgb": {
27662766
"r": 166,
@@ -2775,7 +2775,7 @@
27752775
"code": 7
27762776
},
27772777
"bright": {
2778-
"name": "Bright",
2778+
"name": "Bright White",
27792779
"hex": "#bac2de",
27802780
"rgb": {
27812781
"r": 186,

‎scripts/gen_palette.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,9 @@ const formatted = entriesFromObject(definitions).reduce(
319319
ansiColors: entriesFromObject(ansiMappings).reduce(
320320
(acc, [name, props], currentIndex) => {
321321
const mapping = props.normal.mapping as ColorName;
322+
const normalName = name[0].toUpperCase() +
323+
name.substring(1).toLowerCase();
324+
const brightName = `Bright ${normalName}`;
322325
let normalColorHex = flavor.colors[mapping];
323326
let brightColorHex: string;
324327

@@ -345,17 +348,17 @@ const formatted = entriesFromObject(definitions).reduce(
345348
}
346349

347350
acc[name] = {
348-
name: name[0].toUpperCase() + name.substring(1).toLowerCase(),
351+
name: normalName,
349352
order: currentIndex,
350353
normal: {
351-
name: "Normal",
354+
name: normalName,
352355
hex: normalColorHex,
353356
rgb: toRgb(normalColorHex),
354357
hsl: toHsl(normalColorHex),
355358
code: props.normal.code,
356359
},
357360
bright: {
358-
name: "Bright",
361+
name: brightName,
359362
hex: brightColorHex,
360363
rgb: toRgb(brightColorHex),
361364
hsl: toHsl(brightColorHex),

0 commit comments

Comments
 (0)
Please sign in to comment.