color-name-list 11.24.0 → 11.24.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "color-name-list",
-  "version": "11.24.0",
+  "version": "11.24.2",
   "description": "long list of color names",
   "main": "dist/colornames.json",
   "browser": "dist/colornames.umd.js",
@@ -24,9 +24,10 @@
   "scripts": {
     "commit": "git-cz",
     "pull-colors": "curl -L 'https://docs.google.com/spreadsheets/d/e/2PACX-1vQube6Y0wHyEtJnjg0eU3N7VseoxVnD4L9uDqvWZdl_tzzrHDVN10IPP7cdFipX8j70atNMLfPCB0Q6/pub?gid=40578722&single=true&output=csv' -o src/colornames.csv",
-    "test": "npm run test:precommit && npm run build && vitest run",
+    "test": "npm run test:precommit && vitest run",
     "test:watch": "vitest",
-    "test:precommit": "npm run build --testonly",
+    "test:precommit": "npm run build:test",
+    "build:test": "node scripts/build.js --testonly",
     "build": "node scripts/build.js && npm run prettier",
     "prettier": "prettier --write ./dist/*",
     "lint": "npm run lint:scripts && npm run lint:markdown",

package/scripts/build.js

@@ -4,7 +4,8 @@ import { parseCSVString, findDuplicates, objArrToString } from './lib.js';
 import { exec } from 'child_process';
 
 const args = process.argv;
-const isTestRun = !!args.find((arg) => arg === '--testOnly');
+// treat --testonly / --testOnly the same
+const isTestRun = args.some((arg) => arg.toLowerCase() === '--testonly');
 
 // only hex colors with 6 values
 const hexColorValidation = /^#[0-9a-f]{6}$/;
@@ -88,10 +89,10 @@ colorsSrc.values[bestOfKey].forEach((str) => {
 });
 
 showLog();
-
+// In test mode we still perform the build so tests can import dist artifacts,
+// but we avoid mutating repository files like README.md or generating the SVG.
 if (isTestRun) {
-  console.log('⇪ See test results above ⇪');
-  process.exit();
+  console.log('Test mode: skipping README & SVG generation.');
 }
 
 // creates JS related files
@@ -336,37 +337,41 @@ for (const outputFormat in outputFormats) {
   }
 }
 
-// updates the color count in readme file
-const readme = fs.readFileSync(path.normalize(`${baseFolder}${readmeFileName}`), 'utf8').toString();
-fs.writeFileSync(
-  path.normalize(`${baseFolder}${readmeFileName}`),
-  readme
-    .replace(
-      // update color count in text
-      /__\d+__/g,
-      `__${colorsSrc.entries.length}__`
-    )
-    .replace(
-      // update color count in badge
-      /\d+-colors-orange/,
-      `${colorsSrc.entries.length}-colors-orange`
-    )
-    .replace(
-      // update color count in percentage
-      /__\d+(\.\d+)?%__/,
-      `__${((colorsSrc.entries.length / (256 * 256 * 256)) * 100).toFixed(2)}%__`
-    )
-    .replace(
-      // update file size
-      /\d+(\.\d+)? MB\)__/g,
-      `${(
-        fs.statSync(path.normalize(`${baseFolder}${folderDist}${fileNameSrc}.json`)).size /
-        1024 /
-        1024
-      ).toFixed(2)} MB)__`
-    ),
-  'utf8'
-);
+if (!isTestRun) {
+  // updates the color count in readme file
+  const readme = fs
+    .readFileSync(path.normalize(`${baseFolder}${readmeFileName}`), 'utf8')
+    .toString();
+  fs.writeFileSync(
+    path.normalize(`${baseFolder}${readmeFileName}`),
+    readme
+      .replace(
+        // update color count in text
+        /__\d+__/g,
+        `__${colorsSrc.entries.length}__`
+      )
+      .replace(
+        // update color count in badge
+        /\d+-colors-orange/,
+        `${colorsSrc.entries.length}-colors-orange`
+      )
+      .replace(
+        // update color count in percentage
+        /__\d+(\.\d+)?%__/,
+        `__${((colorsSrc.entries.length / (256 * 256 * 256)) * 100).toFixed(2)}%__`
+      )
+      .replace(
+        // update file size
+        /\d+(\.\d+)? MB\)__/, // no global to only hit first occurrence
+        `${(
+          fs.statSync(path.normalize(`${baseFolder}${folderDist}${fileNameSrc}.json`)).size /
+          1024 /
+          1024
+        ).toFixed(2)} MB)__`
+      ),
+    'utf8'
+  );
+}
 
 /**
  * outputs the collected logs
@@ -479,4 +484,6 @@ function diffSVG() {
   );
 }
 
-diffSVG();
+if (!isTestRun) {
+  diffSVG();
+}

package/scripts/sortSrc.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
 /**
- * Script to sort the colornames.csv file alphabetically by name
- * This helps maintain order when new colors are added to the list
- */
+* Script to sort the colornames.csv file alphabetically by name
+* This helps maintain order when new colors are added to the list
+*/
 
 import fs from 'fs';
 import path from 'path';
@@ -18,11 +18,17 @@ const csvPath = path.join(__dirname, '..', 'src', 'colornames.csv');
 // Read the CSV file
 const readAndSortCSV = () => {
   try {
-    // Read the file
-    const data = fs.readFileSync(csvPath, 'utf8');
+    // Read file & normalise line endings to LF
+    const raw = fs.readFileSync(csvPath, 'utf8').replace(/\r\n?/g, '\n');
 
-    // Split the data into lines
-    const lines = data.trim().split('\n');
+    // Split (keeping possible last empty line which we'll drop below)
+    let lines = raw.split('\n');
+
+    // Drop trailing empty / whitespace-only lines
+    while (lines.length && !lines[lines.length - 1].trim()) lines.pop();
+
+    // Trim trailing whitespace on each line
+    lines = lines.map(l => l.replace(/\s+$/,''));
 
     // The header should be kept as the first line
     const header = lines[0];
@@ -38,10 +44,10 @@ const readAndSortCSV = () => {
       return nameA.localeCompare(nameB);
     });
 
-    // Combine the header and sorted lines
-    const sortedData = [header, ...sortedColorLines].join('\n');
+    // Combine header & sorted lines (no blank line). Ensure exactly one final newline.
+    const sortedData = [header, ...sortedColorLines].join('\n') + '\n';
 
-    // Write the sorted data back to the file
+    // Write back
     fs.writeFileSync(csvPath, sortedData, 'utf8');
 
     console.log(`✅ Successfully sorted ${sortedColorLines.length} colors alphabetically by name`);

package/src/colornames.csv

@@ -2605,7 +2605,6 @@ Black Garnet,#4e4444,
 Black Glaze,#001111,
 Black Green,#384e49,
 Black Grey,#24272e,
-Black Halo,#201b20,
 Black Haze,#e0ded7,
 Black Headed Gull,#9c856c,
 Black Heath,#6d6150,
@@ -2858,7 +2857,6 @@ Bloodletter,#e97451,
 Bloodline,#882200,
 Bloodmyst Isle,#f02723,
 Bloodsport,#b52f3a,x
-Bloodstain,#772200,
 Bloodstone,#413431,
 Bloodthirsty,#880011,x
 Bloodthirsty Beige,#f8d7d0,x
@@ -3722,7 +3720,6 @@ Bright Nori,#2d5e22,
 Bright Ocarina,#f0e8da,
 Bright Olive,#9cbb04,
 Bright Orange,#ff7034,
-Bright Pink,#fe01b1,
 Bright Purple,#be03fd,
 Bright Red,#ff000d,
 Bright Rose,#c51959,
@@ -3760,7 +3757,6 @@ Brilliant Green,#88b407,
 Brilliant Impression,#efc600,
 Brilliant Lavender,#f4bbff,
 Brilliant Liquorice,#545454,
-Brilliant Rose,#fe54a3,
 Brilliant Sea,#009cb7,
 Brilliant Silver,#a9b0b4,
 Brilliant Turquoise,#00a68b,
@@ -3839,11 +3835,9 @@ Brooklyn,#586766,
 Brookside,#5a7562,
 Brookview,#99b792,
 Broom,#eecc24,x
-Broom Butterfly Blue,#6bb3db,
 Broomstick,#74462d,
 Brother Blue,#b0b7c6,
 Brown,#653700,x
-Brown 383,#443724,
 Brown Alpaca,#b86d29,x
 Brown Bag,#deac6e,
 Brown Bear,#4a3f37,
@@ -3948,10 +3942,9 @@ Bubble Algae,#90e4c1,
 Bubble Bath,#e8e0e9,
 Bubble Bobble Green,#00b800,
 Bubble Bobble P2,#0084ff,
-Bubble Gum,#ff85ff,x
 Bubble Shell,#d3a49a,
 Bubble Turquoise,#43817a,
-Bubblegum,#e76178,
+Bubblegum,#ff85ff,x
 Bubblegum Baby Girl,#cc55ee,x
 Bubblegum Bright,#ff01b7,
 Bubblegum Crisis,#eeccee,x
@@ -4059,6 +4052,7 @@ Burgundy Grey,#dadba0,
 Burgundy Snail,#7e7150,
 Burgundy Wine,#6c403e,
 Buried Gold,#dbbc4b,x
+Buried Lust,#772200,x
 Buried Treasure,#d28b42,
 Burj Khalifa Fountain,#d4dee8,
 Burka Black,#353e4f,
@@ -4521,7 +4515,6 @@ Cannon Ball,#484335,
 Cannon Barrel,#3c4142,
 Cannon Black,#251706,
 Cannon Grey,#646c64,
-Cannon Pink,#8e5164,
 Canoe,#ddc49e,
 Canoe Blue,#1d5671,
 Canola Oil,#f7eb7a,
@@ -4573,7 +4566,7 @@ Cape Lee,#50818b,
 Cape Palliser,#75482f,
 Cape Pond,#0092ad,
 Cape Storm,#3c4754,
-Cape Verde,#01554f,
+Cape Verde,#01554f,x
 Capella,#d9ced2,
 Caper,#afc182,
 Caper Green,#847640,
@@ -4635,11 +4628,9 @@ Caramel Drizzle,#d9ad7f,x
 Caramel Finish,#ffd59a,x
 Caramel Gold,#b1936d,x
 Caramel Ice,#eec9aa,
-Caramel Infused,#cc7755,
 Caramel Kiss,#b08a61,
 Caramel Latte,#8c6342,
 Caramel Macchiato,#c58d4b,x
-Caramel Milk,#ddc283,
 Caramel Mousse,#e5caa4,x
 Caramel Powder,#eebb99,
 Caramel Sauce,#b3804d,
@@ -5293,6 +5284,7 @@ Cherry Red,#f7022a,
 Cherry Sangria,#c92435,x
 Cherry Shine,#d81d26,
 Cherry Soda,#ff0044,x
+Cherry Static,#e76178,x
 Cherry Tart,#933d3e,
 Cherry Tomato,#f2013f,x
 Cherry Tree,#dfb7b4,
@@ -15538,6 +15530,7 @@ Lizard Legs,#7f6944,
 Llama Wool,#917864,
 Llilacquered,#c35b99,x
 Loafer,#dbd9c2,
+Loam,#443724,
 Lobaria Lichen,#9fc8b2,
 Lobby Lilac,#a780b2,
 Lobelia,#7498be,
@@ -16929,6 +16922,7 @@ Milky Green,#c6d4c9,
 Milky Lavender,#aea3d0,
 Milky Maize,#f9d9a0,
 Milky Skies,#c3b1af,
+Milky Waves,#6bb3db,x
 Milky Way,#e8f4f7,
 Milky Way Galaxy,#faefd5,
 Milky Yellow,#f8dd74,
@@ -18175,6 +18169,7 @@ Nick’s Nook,#909062,
 Nickel,#929292,x
 Nickel Ore Green,#537e7e,
 Nickel Plate,#c1c6bf,
+Nicotine Glaze,#cc7755,
 Nicotine Gold,#eebb33,x
 Niebla Azul,#b6c3c4,
 Nifty Turquoise,#019187,
@@ -18185,6 +18180,7 @@ Night Blue,#040348,
 Night Brown,#44281b,
 Night Brown Black,#322d25,
 Night Club,#494b4e,
+Night Demons,#201b20,x
 Night Dive,#003355,
 Night Edition,#20586d,x
 Night Flight,#434d5c,
@@ -20442,6 +20438,7 @@ Pink Heath,#f2bddf,
 Pink Hibiscus,#b36c86,
 Pink Horror,#90305d,x
 Pink Hydrangea,#f8c1bb,
+Pink Hysteria,#fe01b1,x
 Pink Ice,#cf9fa9,
 Pink Icing,#eea0a6,
 Pink Illusion,#d8b8f8,
@@ -20564,6 +20561,7 @@ Pink-N-Purple,#866180,
 Pinkadelic,#cb5c5b,
 Pinkalicious,#ff99ff,x
 Pinkathon,#f1bdba,
+Pinkella,#fe54a3,
 Pinkham,#e8c5ae,
 Pinkinity,#e82a8e,
 Pinkish,#d46a7e,
@@ -25317,6 +25315,7 @@ Sovereign Red,#ce243f,x
 Sovereignty,#304e63,
 Soviet Gold,#ffd900,x
 Soy Milk,#d5d2c7,x
+Soy Sauce,#1a0600,
 Soya,#fae3bc,
 Soya Bean,#6f634b,
 Soybean,#cab68b,
@@ -26478,6 +26477,7 @@ Sunshine Surprise,#fcb02f,
 Sunshine Yellow,#fffd37,
 Sunshone Plum,#886688,x
 Sunspark,#fbca69,
+Sunspill,#ddc283,x
 Sunstitch,#fee2b2,
 Sunstone,#c7887f,
 Suntan,#d9b19f,
@@ -28422,6 +28422,7 @@ Veiling Waterfalls,#d4eaff,x
 Velddrif,#a17d61,
 Vellum Parchment,#efe4d9,
 Velour,#baa7bf,
+Velour Scar,#8e5164,x
 Veltliner White,#d7d8c3,
 Velum Smoke,#d6ceb9,
 Velvet,#750851,x

package/tea.yaml

@@ -1,6 +1,18 @@
 # https://tea.xyz/what-is-this-file
+#
+# DO NOT REMOVE OR EDIT THIS WARNING:
+#
+# This file is auto-generated by the TEA app. It is intended to validate ownership of your repository.
+# DO NOT commit this file or accept any PR if you don't know what this is.
+# We are aware that spammers will try to use this file to try to profit off others' work.
+# We take this very seriously and will take action against any malicious actors.
+#
+# If you are not the owner of this repository, and someone maliciously opens a commit with this file
+# please report it to us at support@tea.xyz.
+#
+# A constitution without this header is invalid.
 ---
-version: 1.0.0
+version: 2.0.0
 codeOwners:
-  - '0xFA64435d1281921E36b90CeA9a1fbf0e5c408e65'
+  - '0x2220923A4190a1A2FEE4545Ad86c15998c58C15B'
 quorum: 1

package/tests/sorting.test.js

@@ -0,0 +1,45 @@
+import { describe, it, expect } from 'vitest';
+import fs from 'fs';
+import path from 'path';
+
+/**
+ * Ensures that the source CSV file is already sorted alphabetically (case-insensitive)
+ * by the color name. If not, it throws with a helpful message telling how to fix it.
+ */
+describe('Source CSV sorting', () => {
+  it('colornames.csv should be sorted by name (case-insensitive)', () => {
+    const csvPath = path.resolve('./src/colornames.csv');
+    const raw = fs.readFileSync(csvPath, 'utf8').replace(/\r\n/g, '\n').trimEnd();
+    const lines = raw.split('\n');
+    expect(lines.length).toBeGreaterThan(1);
+
+    const header = lines.shift();
+    expect(header.startsWith('name,hex')).toBe(true);
+
+    const entries = lines
+      .filter((l) => l.trim().length)
+      .map((l, idx) => {
+        const [name, hex] = l.split(',');
+        return { originalIndex: idx + 2, line: l, name, lower: name.toLowerCase(), hex };
+      });
+
+    for (let i = 1; i < entries.length; i++) {
+      const prev = entries[i - 1];
+      const curr = entries[i];
+      if (prev.lower.localeCompare(curr.lower) > 0) {
+        throw new Error(
+          [
+            'Source file src/colornames.csv is not sorted alphabetically by name.',
+            `Out of order around lines ${prev.originalIndex} -> ${curr.originalIndex}:`,
+            `  "${prev.name}" should come AFTER "${curr.name}"`,
+            '',
+            'To fix automatically run:',
+            '  npm run sort-colors',
+            '',
+            'Commit the updated src/colornames.csv after sorting.'
+          ].join('\n')
+        );
+      }
+    }
+  });
+});