color-name-list 13.19.2 → 13.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "color-name-list",
-  "version": "13.19.2",
+  "version": "13.20.0",
   "description": "long list of color names",
   "main": "dist/colornames.json",
   "browser": "dist/colornames.umd.js",

package/scripts/build.js

@@ -178,12 +178,15 @@ fs.writeFileSync(
 const outputFormats = {
   csv: {
     insertBefore: csvKeys.join(',') + '\n',
+    rowDelimitor: '\n',
+    insertAfter: '\n',
   },
   toon: {
     // TOON tabular array header for flat objects: [N]{name,hex}:
     insertBefore: `[${colorsSrc.entries.length}]{${csvKeys.join(',')}}:\n  `,
     itemDelimitor: ',',
     rowDelimitor: '\n  ',
+    insertAfter: '\n',
   },
   yaml: {
     insertBefore: '-\n  ',
@@ -192,12 +195,13 @@ const outputFormats = {
     includeKeyPerItem: true,
     rowDelimitor: '\n-\n  ',
     itemDelimitor: '\n  ',
+    insertAfter: '\n',
   },
   scss: {
     insertBefore: '$color-name-list: (',
     beforeValue: '"',
     afterValue: '"',
-    insertAfter: ');',
+    insertAfter: ');\n',
     itemDelimitor: ':',
     rowDelimitor: ',',
   },
@@ -205,13 +209,13 @@ const outputFormats = {
     insertBefore: `<table><thead><tr><th>${csvKeys.join('</th><th>')}</th></tr><thead><tbody><tr><td>`,
     itemDelimitor: '</td><td>',
     rowDelimitor: '</td></tr><tr><td>',
-    insertAfter: `</td></tr></tbody></table>`,
+    insertAfter: `</td></tr></tbody></table>\n`,
   },
   xml: {
     insertBefore: `<?xml version='1.0'?>\n<colors>\n<color>\n<${csvKeys[0]}>`,
     itemDelimitor: `</${csvKeys[0]}>\n<${csvKeys[1]}>`,
     rowDelimitor: `</${csvKeys[1]}>\n</color>\n<color>\n<${csvKeys[0]}>`,
-    insertAfter: `</${csvKeys[1]}>\n</color>\n</colors>`,
+    insertAfter: `</${csvKeys[1]}>\n</color>\n</colors>\n`,
   },
 };
 

package/scripts/sortSrc.js

@@ -41,11 +41,11 @@ const readAndSortCSV = () => {
       // Extract the name from each line (first column before the comma)
       const nameA = a.split(',')[0].toLowerCase();
       const nameB = b.split(',')[0].toLowerCase();
-      return nameA.localeCompare(nameB);
+      return nameA.localeCompare(nameB, 'en');
     });
 
     // Combine header & sorted lines (no blank line). Ensure exactly one final newline.
-    const sortedData = [header, ...sortedColorLines].join('\n');
+    const sortedData = [header, ...sortedColorLines].join('\n') + '\n';
 
     // Write back
     fs.writeFileSync(csvPath, sortedData, 'utf8');

package/src/colornames.csv

@@ -2495,14 +2495,13 @@ Bird Blue Grey,#7f92a0,
 Bird Flower,#d0c117,
 Bird’s Child,#fff1cf,
 Bird’s Egg Green,#aaccb9,
-Bird’s Eye,#b9030a,
 Bird’s Nest,#cfbb9b,
+Bird’s-Eye,#ab823d,
+Bird’s-Eye Maple,#e4c495,
 Birdhouse Brown,#6c483a,
 Birdie,#e9e424,
 Birdie Num Num,#89acda,x
 Birdseed,#e2c28e,
-Birdseye,#ab823d,
-Birdseye Maple,#e4c495,
 Biro Blue,#2f3946,
 Birōdo Green,#224634,
 Birth of a Star,#fce9df,
@@ -3975,6 +3974,7 @@ Bull Shot,#75442b,
 Bullet Hell,#faf1c8,x
 Bullfighters Red,#cd4646,
 Bullfrog,#8a966a,x
+Bullseye,#b9030a,x
 Bulma Hair,#359e6b,x
 Bulrush,#6d5837,
 Bumangués Blue,#0777bc,
@@ -29989,4 +29989,4 @@ Zumthor,#cdd5d5,
 Zunda Green,#6bc026,x
 Zuni,#008996,
 Zürich Blue,#248bcc,
-Zürich White,#e6e1d9,
+Zürich White,#e6e1d9,

package/tests/allowlists.test.js

@@ -0,0 +1,76 @@
+import { describe, it, expect, beforeAll } from 'vitest';
+import { csvTestData } from './csv-test-data.js';
+import duplicateAllowlist from './duplicate-allowlist.json';
+import duplicatePluralsAllowlist from './duplicate-plurals-allowlist.json';
+import titleCaseAllowlist from './title-case-allowlist.json';
+import { buildFailureMessage } from './_utils/report.js';
+
+describe('Allowlists Validation', () => {
+  beforeAll(() => {
+    // Load CSV data once for all tests
+    csvTestData.load();
+  });
+
+  const allColorNames = new Set();
+
+  beforeAll(() => {
+    csvTestData.data.values['name'].forEach(name => allColorNames.add(name));
+  });
+
+  it('should ensure all entries in duplicate-allowlist.json exist in colornames.csv', () => {
+    const missingEntries = duplicateAllowlist.filter(name => !allColorNames.has(name));
+
+    if (missingEntries.length) {
+      throw new Error(
+        buildFailureMessage({
+          title: 'Found {n} unused {items} in duplicate-allowlist.json:',
+          offenders: missingEntries,
+          offenderLabel: 'entry',
+          details: [
+            'These names are listed in the allowlist but do not exist in src/colornames.csv.',
+            'Please remove them from tests/duplicate-allowlist.json to keep the list clean.',
+          ],
+        })
+      );
+    }
+    expect(missingEntries.length).toBe(0);
+  });
+
+  it('should ensure all entries in duplicate-plurals-allowlist.json exist in colornames.csv', () => {
+    const missingEntries = duplicatePluralsAllowlist.filter(name => !allColorNames.has(name));
+
+    if (missingEntries.length) {
+      throw new Error(
+        buildFailureMessage({
+          title: 'Found {n} unused {items} in duplicate-plurals-allowlist.json:',
+          offenders: missingEntries,
+          offenderLabel: 'entry',
+          details: [
+            'These names are listed in the allowlist but do not exist in src/colornames.csv.',
+            'Please remove them from tests/duplicate-plurals-allowlist.json to keep the list clean.',
+          ],
+        })
+      );
+    }
+    expect(missingEntries.length).toBe(0);
+  });
+
+  it('should ensure all entries in title-case-allowlist.json exist in colornames.csv', () => {
+    const missingEntries = titleCaseAllowlist.filter(name => !allColorNames.has(name));
+
+    if (missingEntries.length) {
+      throw new Error(
+        buildFailureMessage({
+          title: 'Found {n} unused {items} in title-case-allowlist.json:',
+          offenders: missingEntries,
+          offenderLabel: 'entry',
+          details: [
+            'These names are listed in the allowlist but do not exist in src/colornames.csv.',
+            'Please remove them from tests/title-case-allowlist.json to keep the list clean.',
+          ],
+        })
+      );
+    }
+    expect(missingEntries.length).toBe(0);
+  });
+});

package/tests/duplicate-allowlist.json

@@ -1,5 +1,4 @@
 [
-  "Bird's Eye",
   "Winter Green",
   "Star Dust",
   "Star Bright",
@@ -19,7 +18,7 @@
   "Sail On",
   "In the Red",
   "In the Pink",
-  "In A Pickle",
+  "In a Pickle",
   "In for a Penny",
   "On the Nile",
   "In the Navy",

package/tests/title-case-allowlist.json

@@ -9,7 +9,6 @@
 	"Mauve-a-Lish",
 	"Peek-a-Blue",
 	"Apple-a-Day",
-	"Banan-appeal",
 	"Fly-by-Night",
 	"Down-to-Earth",
 	"Iron-ic",

package/tests/validations.test.js

@@ -30,9 +30,27 @@ describe('CSV Data Validations', () => {
     });
 
     if (invalidHexCodes.length) {
-      const details = invalidHexCodes.map(
-        ({ hex, name, lineNumber }) => `  * line ${lineNumber}: "${name}" -> ${hex}`
-      );
+      const details = invalidHexCodes.map(({ hex, name, lineNumber }) => {
+        let msg = `  * line ${lineNumber}: "${name}" -> "${hex}"`;
+        if (hex.trim() !== hex) {
+          msg += ' (contains surrounding whitespace)';
+        }
+        return msg;
+      });
+
+      const hasWhitespaceIssues = invalidHexCodes.some((i) => i.hex.trim() !== i.hex);
+      const tips = [
+        'Edit src/colornames.csv and fix the hex values',
+        'Use lowercase letters only: a-f',
+        'Always use 6 characters: #rrggbb format',
+      ];
+
+      if (hasWhitespaceIssues) {
+        tips.push('Remove any leading or trailing spaces around the hex code');
+      }
+
+      tips.push('After changes, run: npm run sort-colors');
+
       throw new Error(
         buildFailureMessage({
           title: 'Found {n} invalid hex color {items}:',
@@ -45,12 +63,7 @@ describe('CSV Data Validations', () => {
             'Examples of valid hex codes: #ff0000, #a1b2c3, #000000',
             'Examples of invalid hex codes: #f00 (too short), #FF0000 (uppercase), #gghhii (invalid characters)',
           ],
-          tips: [
-            'Edit src/colornames.csv and fix the hex values',
-            'Use lowercase letters only: a-f',
-            'Always use 6 characters: #rrggbb format',
-            'After changes, run: npm run sort-colors',
-          ],
+          tips,
         })
       );
     }