color-name-list 11.10.0 → 11.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "color-name-list",
-  "version": "11.10.0",
+  "version": "11.11.0",
   "description": "long list of color names",
   "main": "dist/colornames.json",
   "browser": "dist/colornames.umd.js",
@@ -28,11 +28,14 @@
     "test:watch": "vitest",
     "build": "node scripts/build.js && npm run prettier",
     "prettier": "prettier --write ./dist/*",
-    "lint": "eslint ./scripts",
+    "lint": "npm run lint:scripts && npm run lint:markdown",
+    "lint:scripts": "eslint ./scripts",
+    "lint:markdown": "markdownlint-cli2 '**/*.md' '#node_modules'",
     "semantic-release": "semantic-release",
     "build-history": "node scripts/tools/history.js > dist/history.json",
     "history": "node scripts/tools/history.js > dist/history.json",
-    "prepare": "husky"
+    "prepare": "husky",
+    "sort-colors": "node scripts/sortSrc.js"
   },
   "repository": {
     "type": "git",
@@ -64,6 +67,7 @@
     "eslint-plugin-prettier": "^5.2.6",
     "globals": "^16.0.0",
     "husky": "^9.1.6",
+    "markdownlint-cli2": "^0.17.2",
     "prettier": "^3.5.3",
     "seedrandom": "^3.0.5",
     "semantic-release": "^24.2.0",

package/scripts/build.js

@@ -410,24 +410,70 @@ function log(key, value, message, errorLevel = 1) {
 // gets SVG template
 const svgTpl = fs.readFileSync(path.normalize(__dirname + '/changes.svg.tpl'), 'utf8').toString();
 
-// generates an SVG image with the new color based on the diff ot the last commit to the current
+// generates an SVG image with the new colors based on the diff between the last two commits that changed the file
 function diffSVG() {
+  // Get the last two commits that modified the CSV file
   exec(
-    `git diff -U0 HEAD ${baseFolder}${folderDist}${fileNameSrc}.csv`,
+    `git log -n 2 --pretty=format:"%H" -- ${baseFolder}${folderSrc}${fileNameSrc}.csv`,
     function (err, stdout, stderr) {
-      const diffTxt = stdout;
-      if (!/(?<=^[+])[^+].*/gm.test(diffTxt)) return;
-      const changes = diffTxt.match(/(?<=^[+])[^+].*/gm).filter((i) => i);
-      const svgTxtStr = changes.reduce((str, change, i) => {
-        const changeParts = change.split(',');
-        return `${str}<text x="40" y="${20 + (i + 1) * 70}" fill="${
-          changeParts[1]
-        }">${changeParts[0].replace(/&/g, '&amp;')}</text>`;
-      }, '');
-
-      fs.writeFileSync(
-        path.normalize(`${baseFolder}changes.svg`),
-        svgTpl.replace(/{height}/g, changes.length * 70 + 80).replace(/{items}/g, svgTxtStr)
+      if (err) {
+        console.error('Error getting commit history:', err);
+        return;
+      }
+
+      const commits = stdout.trim().split('\n');
+      if (commits.length < 2) {
+        console.log('Not enough commit history to generate diff');
+        return;
+      }
+
+      const newerCommit = commits[0];
+      const olderCommit = commits[1];
+
+      // Compare the two commits
+      exec(
+        `git diff -w -U0 ${olderCommit} ${newerCommit} -- ${baseFolder}${folderSrc}${fileNameSrc}.csv`,
+        function (err, stdout, stderr) {
+          if (err) {
+            console.error('Error generating diff:', err);
+            return;
+          }
+
+          const diffTxt = stdout;
+          if (!/(?<=^[+])[^+].*/gm.test(diffTxt)) {
+            console.log('No changes detected in the color file');
+            return;
+          }
+
+          const changes = diffTxt.match(/(?<=^[+])[^+].*/gm).filter((i) => i);
+
+          // Filter out the header line if it was included in the diff
+          const filteredChanges = changes.filter((line) => !line.startsWith('name,hex'));
+
+          if (filteredChanges.length === 0) {
+            console.log('No color changes detected');
+            return;
+          }
+
+          const svgTxtStr = filteredChanges.reduce((str, change, i) => {
+            const changeParts = change.split(',');
+            // Make sure we have both the name and hex color
+            if (changeParts.length < 2) return str;
+
+            return `${str}<text x="40" y="${20 + (i + 1) * 70}" fill="${
+              changeParts[1]
+            }">${changeParts[0].replace(/&/g, '&amp;')}</text>`;
+          }, '');
+
+          fs.writeFileSync(
+            path.normalize(`${baseFolder}changes.svg`),
+            svgTpl
+              .replace(/{height}/g, filteredChanges.length * 70 + 80)
+              .replace(/{items}/g, svgTxtStr)
+          );
+
+          console.log(`Generated SVG showing ${filteredChanges.length} new color(s)`);
+        }
       );
     }
   );

package/scripts/sortSrc.js

@@ -0,0 +1,57 @@
+#!/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
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+// Get the directory name using ES modules approach
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// Path to the CSV file
+const csvPath = path.join(__dirname, '..', 'src', 'colornames.csv');
+
+// Read the CSV file
+const readAndSortCSV = () => {
+  try {
+    // Read the file
+    const data = fs.readFileSync(csvPath, 'utf8');
+
+    // Split the data into lines
+    const lines = data.trim().split('\n');
+
+    // The header should be kept as the first line
+    const header = lines[0];
+
+    // Remove the header from the array of lines
+    const colorLines = lines.slice(1);
+
+    // Sort the color lines alphabetically by name (case-insensitive)
+    const sortedColorLines = colorLines.sort((a, b) => {
+      // 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);
+    });
+
+    // Combine the header and sorted lines
+    const sortedData = [header, ...sortedColorLines].join('\n');
+
+    // Write the sorted data back to the file
+    fs.writeFileSync(csvPath, sortedData, 'utf8');
+
+    console.log(`✅ Successfully sorted ${sortedColorLines.length} colors alphabetically by name`);
+    console.log(`📝 File saved: ${csvPath}`);
+
+  } catch (error) {
+    console.error('❌ Error sorting the CSV file:', error);
+    process.exit(1);
+  }
+};
+
+// Execute the function
+readAndSortCSV();

package/src/colornames.csv

@@ -17445,6 +17445,7 @@ Morro Bay,#546b78,
 Morrow White,#fcfccf,
 Mortar,#565051,
 Mortar Grey,#9e9f9e,
+MoS₂ Cyan,#00e6d3,
 Mosaic Blue,#007c94,
 Mosaic Green,#599f68,
 Mosaic Tile,#1c6b69,
@@ -20509,6 +20510,7 @@ Pinkish Orange,#ff724c,
 Pinkish Purple,#d648d7,
 Pinkish Red,#f10c45,
 Pinkish Tan,#d99b82,
+Pinkish White,#fff1fa,
 Pinkling,#eb84f5,x
 Pinkman,#dd11ff,x
 Pinktone,#f9ced1,
@@ -30288,5 +30290,4 @@ Zumthor,#cdd5d5,
 Zunda Green,#6bc026,x
 Zuni,#008996,
 Zürich Blue,#248bcc,
-Zürich White,#e6e1d9,
-Pinkish White,#fff1fa,
+Zürich White,#e6e1d9,