color-name-list 11.25.0 → 12.0.0

package/package.json

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

package/scripts/build.js

@@ -80,11 +80,13 @@ colorsSrc.values['name'].forEach((name) => {
 colorsSrc.values[bestOfKey].forEach((str) => {
   // check for spaces
   if (spacesValidation.test(str)) {
-    log(`"${bestOfKey}" marker'`, str, `${str} found either a leading or trailing space (or both)`);
+    // Use the actual CSV key so we can resolve the offending entries (names)
+    log(bestOfKey, str, `${str} found either a leading or trailing space (or both)`);
   }
 
   if (!(str == 'x' || str == '')) {
-    log(`"${bestOfKey}" marker`, str, `${str} must be a lowercase "x" character or empty`);
+    // Use the actual CSV key so we can resolve the offending entries (names)
+    log(bestOfKey, str, `${str} must be a lowercase "x" character or empty`);
   }
 });
 
@@ -383,6 +385,17 @@ function showLog() {
     totalErrors = i + 1;
     errorLevel = error.errorLevel || errorLevel;
     console.log(`${error.errorLevel ? '⛔' : '⚠'}  ${error.message}`);
+    if (Array.isArray(error.entries) && error.entries.length) {
+      // Print a concise list of offending names for quick scanning
+      const nameList = error.entries
+        .map((e) => (e && e.name ? `${e.name}${e.hex ? ` (${e.hex})` : ''}` : ''))
+        .filter(Boolean)
+        .join(', ');
+      if (nameList) {
+        console.log(`Offending name(s): ${nameList}`);
+      }
+    }
+    // Keep the JSON dump for full context
     console.log(JSON.stringify(error.entries));
     console.log('*-------------------------*');
   });

package/scripts/lib.js

@@ -104,3 +104,58 @@ export const objArrToString = (arr, keys, options) => {
     settings.insertAfter
   );
 };
+
+/**
+ * Normalize a color name to detect near-duplicates.
+ * - Lowercase
+ * - Strip diacritics
+ * - Remove all non-alphanumeric characters
+ * Examples:
+ *  "Snow Pink" -> "Snowpink"
+ * @param {string} name
+ * @return {string}
+ */
+export const normalizeNameForDuplicates = (name) => {
+  return String(name)
+    .toLowerCase()
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .replace(/[^a-z0-9]/g, '');
+};
+
+/**
+ * Given a list of items with a name and optional lineNumber, find groups of
+ * near-duplicate names that collapse to the same normalized key.
+ *
+ * @param {Array<{name:string, lineNumber?:number}>} items
+ * @returns {Array<{norm:string, entries:Array<{name:string, lineNumber?:number}>}>}
+ */
+export const findNearDuplicateNameConflicts = (items, options = {}) => {
+  const { allowlist = [] } = options;
+
+  // Normalize allowlist entries so callers can provide raw names or already-normalized keys.
+  const allowSet = new Set(
+    (Array.isArray(allowlist) ? allowlist : [])
+      .filter((v) => typeof v === 'string' && v.trim().length)
+      .map((v) => normalizeNameForDuplicates(String(v)))
+  );
+
+  const byNorm = new Map();
+  for (const item of items) {
+    if (!item || typeof item.name !== 'string') continue;
+    const norm = normalizeNameForDuplicates(item.name);
+    if (!byNorm.has(norm)) byNorm.set(norm, []);
+    byNorm.get(norm).push({ name: item.name, lineNumber: item.lineNumber });
+  }
+
+  const conflicts = [];
+  for (const [norm, arr] of byNorm.entries()) {
+    if (allowSet.has(norm)) continue; // explicitly allowed
+    const uniqueNames = Array.from(new Set(arr.map((x) => x.name)));
+    if (uniqueNames.length > 1) {
+      conflicts.push({ norm, entries: arr });
+    }
+  }
+
+  return conflicts;
+};