color-name-list 9.33.0 → 10.0.0

package/scripts/lib.js

@@ -1,5 +1,3 @@
-const RGB_HEX = /^#?(?:([\da-f]{3})[\da-f]?|([\da-f]{6})(?:[\da-f]{2})?)$/i;
-
 module.exports = {
   /**
    * takes a CSV string an parse it
@@ -88,112 +86,4 @@ module.exports = {
       }).join(settings.itemDelimitor);
     }).join(settings.rowDelimitor) + settings.insertAfter;
   },
-
-  // return HSP luminance http://alienryderflex.com/hsp.html
-  luminance: (rgb) => (Math.sqrt(
-      Math.pow(0.299 * rgb.r, 2) +
-      Math.pow(0.587 * rgb.g, 2) +
-      Math.pow(0.114 * rgb.b, 2)
-  )),
-
-  /**
-   * disassembles a HEX color to its RGB components
-   * https: //gist.github.com/comficker/871d378c535854c1c460f7867a191a5a#gistcomment-2615849
-   * @param   {string} hexSrt hex color representatin
-   * @return  {object} {r,g,b}
-   */
-  hexToRgb: (hexSrt) => {
-    const [, short, long] = String(hexSrt).match(RGB_HEX) || [];
-
-    if (long) {
-      const value = Number.parseInt(long, 16);
-      return {
-        r: value >> 16,
-        g: value >> 8 & 0xFF,
-        b: value & 0xFF,
-      };
-    } else if (short) {
-      const rgbArray = Array.from(short,
-          (s) => Number.parseInt(s, 16)
-      ).map((n) => (n << 4) | n);
-      return {
-        r: rgbArray[0],
-        g: rgbArray[1],
-        b: rgbArray[2],
-      };
-    }
-  },
-
-  /**
-   * Converts an RGB color value to HSL. Conversion formula
-   * adapted from http://en.wikipedia.org/wiki/HSL_color_space.
-   * Assumes r, g, and b are contained in the set [0, 255] and
-   * returns h, s, and l in the set [0, 1].
-   *
-   * @param   {Number}  r       The red color value
-   * @param   {Number}  g       The green color value
-   * @param   {Number}  b       The blue color value
-   * @return  {Object}          The HSL representation
-   */
-  rgbToHsl: (r, g, b) => {
-    r = r / 255;
-    g = g / 255;
-    b = b / 255;
-
-    const min = Math.min(r, g, b);
-    const max = Math.max(r, g, b);
-    const delta = max - min;
-
-    let h;
-    let s;
-    let l;
-
-    if (max === min) {
-      h = 0;
-    } else if (r === max) {
-      h = (g - b) / delta;
-    } else if (g === max) {
-      h = 2 + (b - r) / delta;
-    } else if (b === max) {
-      h = 4 + (r - g) / delta;
-    }
-
-    h = Math.min(h * 60, 360);
-
-    if (h < 0) {
-      h += 360;
-    }
-
-    l = (min + max) / 2;
-
-    if (max === min) {
-      s = 0;
-    } else if (l <= 0.5) {
-      s = delta / (max + min);
-    } else {
-      s = delta / (2 - max - min);
-    }
-
-    s *= 100;
-    l *= 100;
-    return {
-      h,
-      s,
-      l,
-    };
-  },
-
-  /**
-   * calculates the distabce between two RGB colors
-   * @param {object} rgb1 object containing r,g and b properties
-   * @param {object} rgb2 object containing r,g and b properties
-   * @return {int} distance
-   */
-  distance: (rgb1, rgb2) => (
-    Math.sqrt(
-        Math.pow(rgb1.r - rgb2.r, 2) +
-        Math.pow(rgb1.g - rgb2.g, 2) +
-        Math.pow(rgb1.b - rgb2.b, 2)
-    )
-  ),
 };

package/src/colornames.csv

@@ -493,6 +493,7 @@ Alpine Moon,#ded3e6,
 Alpine Morning Blue,#a6ccd8,
 Alpine Race,#234162,
 Alpine Salamander,#051009,
+Alpine Sky,#79b4ce,
 Alpine Summer,#a5a99a,
 Alpine Trail,#515a52,
 Alright Then I Became a Princess,#ffaaa5,
@@ -703,6 +704,7 @@ Ancient Murasaki Purple,#895b8a,
 Ancient Olive,#6a5536,
 Ancient Pages,#ddd4ce,
 Ancient Pewter,#898d91,
+Ancient Pine,#444b43,x
 Ancient Planks,#774411,
 Ancient Pottery,#a37d5e,
 Ancient Prunus,#5a3d3f,
@@ -1279,6 +1281,7 @@ Artisan Tile,#845e40,
 Artisans Gold,#f2ab46,x
 Artist Blue,#01343a,
 Artist's Canvas,#eee4d2,
+Artist's Charcoal,#37393e,x
 Artist's Shadow,#a1969b,
 Artiste,#987387,
 Artistic License,#434053,
@@ -1870,6 +1873,7 @@ Banana Yellow,#ffe135,
 Banana Yogurt,#fae7b5,
 Bananarama,#e4d466,
 Bananas Foster,#dbbe97,
+Bancha,#666a47,x
 Bancroft Village,#816e54,
 Band-Aid,#d7a97c,
 Banded Tulip,#e0d3bd,
@@ -3870,6 +3874,7 @@ Bruised Burgundy,#5b4148,
 Bruised Plum,#3b1921,x
 Brume,#c6c6c2,x
 Brunette,#664238,x
+Bruni Green,#829e2c,
 Brunneous,#5e4662,
 Brunnera Blue,#9ba9ca,
 Bruno Brown,#433430,
@@ -3957,6 +3962,7 @@ Buffalo Trail,#e2ac78,
 Buffed Copper,#dd9475,
 Buffed Plum,#aeafb9,
 Buffhide,#a79c81,
+Buffy Citrine,#868929,
 Bugle Boy,#bb8f4f,
 Bugman's Glow,#cd5b45,
 Built on Sand,#e9e3da,
@@ -4211,7 +4217,7 @@ Cactus Garden,#7b8370,
 Cactus Green,#56603d,
 Cactus Hill,#b1a386,
 Cactus Sand,#9c9369,
-Cactus Spike,#c1e0a3,x
+Cactus Spike,#c1e0a3,
 Cactus Valley,#88976b,
 Cactus Water,#d0f7e4,
 Cadaverous,#009977,
@@ -4819,8 +4825,7 @@ Cathedral Stone,#80796e,
 Cathode Green,#00ff55,x
 Catkin Yellow,#cca800,
 Catmint,#c9a8ce,
-Catnap,#9fc3ac,
-Catnip,#80aa95,
+Catnip,#80aa95,x
 Catnip Wood,#6f6066,
 Catskill Brown,#595452,
 Catskill White,#e0e4dc,
@@ -5903,8 +5908,7 @@ Cobre,#996515,
 Cobrizo,#b56d5d,
 Coca Mocha,#bd9d95,x
 Cochin Chicken,#f8b862,
-Cochineal Red,#7a4848,
-Cochineal Red/Rouge,#9d2933,
+Cochineal Red,#9d2933,
 Cochise,#ddcdb3,
 Cochonnet,#ff88bb,
 Cockatoo,#58c8b6,x
@@ -6417,6 +6421,7 @@ Cosmic Coral,#e77e6c,
 Cosmic Dust,#dce2e5,
 Cosmic Energy,#9392ab,
 Cosmic Explorer,#551155,x
+Cosmic Green,#30a877,x
 Cosmic Heart,#9601f4,x
 Cosmic Latte,#fff8e7,x
 Cosmic Quest,#9ea19f,
@@ -6496,6 +6501,7 @@ Country Lake,#5d7a85,
 Country Lane,#fcead1,
 Country Lane Red,#894340,
 Country Linens,#d7c2a6,
+Country Meadow,#1a5a4e,
 Country Mist,#dfebe2,
 Country Rubble,#d0bca2,
 Country Sky,#49545a,
@@ -6552,6 +6558,7 @@ Cozy Nook,#fba765,
 Cozy Summer Sunset,#eb9f9f,x
 Cozy Wool,#d1b99b,x
 Crab Bisque,#f0b599,
+Crab Curry,#d94b28,
 Crab Nebula,#004455,
 Crab-Apple,#f0e681,
 Crabapple,#87382f,
@@ -7754,6 +7761,7 @@ Diesel,#322c2b,x
 Different Gold,#bc934d,
 Diffused Light,#ebe5d5,
 Diffused Orchid,#93739e,
+Dig It,#8e6e57,
 Digger's Gold,#a37336,
 Digital,#636365,
 Digital Garage,#b7b3a4,
@@ -8689,6 +8697,7 @@ Emerald Pool,#155e60,
 Emerald Rain,#80c872,x
 Emerald Reflection,#50c878,
 Emerald Ring,#578758,
+Emerald Shimmer,#78944a,
 Emerald Spring,#095155,
 Emerald Starling,#11bb11,
 Emerald Stone,#016360,
@@ -9243,6 +9252,7 @@ Falling Snow,#f0f1e7,
 Falling Star,#cad5c8,
 Falling Tears,#c2d7df,
 Fallout Green,#b6c121,
+Fallout Grey,#889977,
 Fallow,#c19a51,
 Fallow Deer,#9f8d57,
 False Cypress,#939b88,
@@ -9323,6 +9333,7 @@ Fawn,#cfaf7b,x
 Fawn Brindle,#a7a094,
 Fawn Brown,#71452a,
 Feasty Fuchsia,#ee0088,x
+Feather,#dad9ce,x
 Feather Boa,#f1c9cd,
 Feather Falls,#606972,
 Feather Fern,#d5dcd0,
@@ -9497,6 +9508,7 @@ Finch,#75785a,
 Fine Alabaster,#ecd3cb,
 Fine Blue,#b6e1e1,
 Fine Burgundy,#815158,
+Fine Gold,#daa826,
 Fine Grain,#d8cfc1,
 Fine Greige,#b5a998,
 Fine Linen,#faf5c3,
@@ -10097,7 +10109,7 @@ French Tarragon,#667255,
 French Taupe,#d3c2bf,
 French Toast,#dd8822,
 French Truffle,#896d61,
-French Vanilla,#efe1a7,
+French Vanilla,#efe1a7,x
 French Vanilla Sorbet,#fbe8ce,
 French Violet,#8806ce,
 French White,#f1e7db,
@@ -10192,6 +10204,7 @@ Fresh Willow,#e1d9aa,
 Fresh Wood Ashes,#eae6cc,
 Fresh Yellow,#f7e190,
 Fresh Zest,#f5e9cf,
+Freshly Baked,#e9c180,x
 Freshly Purpleized,#5c5083,x
 Freshly Roasted Coffee,#663322,x
 Freshman,#e6f2c4,
@@ -10650,6 +10663,7 @@ Gentle Frost,#dce0cd,x
 Gentle Giant,#b3ebe0,
 Gentle Glow,#f6e5b9,x
 Gentle Grape,#908a9b,
+Gentle Landscape,#a5ce8f,
 Gentle Mauve,#958c9e,
 Gentle Rain,#cbc9c5,
 Gentle Sea,#b0c8d0,
@@ -11182,8 +11196,8 @@ Good as Gold,#d3ba75,
 Good Graces,#f3f0d6,
 Good Karma,#333c76,x
 Good Life,#c49e69,
-Good Luck,#86c994,x
-Good Luck Charm,#9d865c,
+Good Luck,#499674,
+Good Luck Charm,#86c994,
 Good Morning,#fcfcda,x
 Good Morning Akihabara,#f4ead5,
 Good Night!,#46565f,x
@@ -11690,6 +11704,7 @@ Greenfield,#60724f,
 Greenfinch,#bda928,x
 Greengage,#84be84,
 Greengrass,#72a355,
+Greenhorn,#b2cc9a,x
 Greenhouse,#3e6334,x
 Greenhouse Glass,#d7e7cd,
 Greening,#dfe4d5,
@@ -17153,6 +17168,7 @@ Moonglade Water,#65ffff,
 Moonglow,#f8e4c4,
 Moonless Mystery,#1e2433,x
 Moonless Night,#3c393d,x
+Moonless Sky,#444b4a,x
 Moonlight,#f6eed5,x
 Moonlight Blue,#567090,
 Moonlight Green,#d2e8d8,
@@ -17782,6 +17798,7 @@ Navy Dark Blue,#004c6a,
 Navy Green,#35530a,
 Navy Peony,#223a5e,
 Navy Purple,#9556eb,
+Navy Seal,#253a91,
 Navy Teal,#20576e,
 Navy Trim,#203462,
 Neapolitan,#9b7a78,
@@ -18360,7 +18377,6 @@ Ochre Spice,#e96d03,x
 Ochre Yellow,#efcc83,
 Octagon Ocean,#085b73,
 Octarine,#ccdd00,
-Octavius,#37393e,
 October,#c67533,
 October Bounty,#e3c6a3,
 October Harvest,#d1bb98,
@@ -18421,7 +18437,7 @@ Oily Steel,#99aaaa,
 Oitake Green,#5e644f,
 OK Corral,#d07360,
 Oklahoma Wheat,#f5e0ba,
-Okra,#fdefe9,
+Okra,#3e912d,
 Okroshka,#40533d,
 Old Amethyst,#87868f,
 Old Army Helmet,#616652,
@@ -20574,6 +20590,7 @@ Poisonberry,#73403e,
 Poisoning Green,#66ff11,
 Poisonous,#55ff11,x
 Poisonous Apple,#993333,
+Poisonous Cloud,#d3db39,
 Poisonous Dart,#77ff66,x
 Poisonous Ice Cream,#d7d927,
 Poisonous Pesticide,#32cd32,
@@ -20883,6 +20900,7 @@ Practical Beige,#c9b29c,
 Practical Tan,#e1cbb6,
 Practice Green,#679a7c,
 Pragmatic,#c2a593,
+Prairie,#0b9d6a,x
 Prairie Clay,#935444,
 Prairie Denim,#516678,
 Prairie Dog,#937067,
@@ -21112,6 +21130,7 @@ Pueblo White,#e5dfcd,
 Puerto Princesa,#54927e,
 Puerto Rico,#59baa3,
 Puff Dragon,#635940,
+Puff of Pink,#ffcbee,x
 Puff Pastry Yellow,#fccf8b,
 Puffball,#ccbfc9,
 Puffball Vapour,#e2dadf,
@@ -23252,6 +23271,7 @@ Sanguinary,#f01a4d,x
 Sanguine,#6c110e,x
 Sanguine Brown,#6c3736,
 Sanskrit,#e69332,
+Santa Belly Red,#ad2c15,
 Santa Fe,#b16d52,
 Santa Fe Sunrise,#cc9469,
 Santa Fe Sunset,#a75a4c,
@@ -24541,6 +24561,7 @@ Smell of Lavender,#dce0ea,
 Smell the Mint,#bef7cf,x
 Smell the Roses,#bb7283,
 Smells of Fresh Bread,#d7cecd,
+Smidgen of Love,#f0ccd9,x
 Smiley Face,#ffc962,x
 Smitten,#c84186,
 Smock Blue,#3b646c,
@@ -25807,6 +25828,7 @@ Subterrain Kingdom,#4f4e4a,x
 Subterranean,#452c1f,
 Subterranean River,#1f3b4d,
 Subtle Blue,#d9e4e5,
+Subtle Breeze,#b5d2d8,x
 Subtle Green,#b5cbbb,
 Subtle Night Sky,#554b4f,
 Subtle Shadow,#d8d8d0,

package/scripts/server.js

@@ -1,289 +0,0 @@
-const http = require('http');
-const url = require('url');
-const fs = require('fs');
-const zlib = require('zlib');
-const colorNameLists = require('color-name-lists');
-const colors = JSON.parse(
-    fs.readFileSync(__dirname + '/../dist/colornames.json', 'utf8')
-);
-const colorsBestOf = JSON.parse(
-    fs.readFileSync(__dirname + '/../dist/colornames.bestof.json', 'utf8')
-);
-const FindColors = require('./findColors.js');
-const getPaletteTitle = require('./generatePaletteName.js');
-const port = process.env.PORT || 8080;
-const currentVersion = 'v1';
-const urlNameSubpath = 'names';
-const APIurl = ''; // subfolder for the API
-const baseUrl = `${APIurl}${currentVersion}/`;
-const baseUrlNames = `${baseUrl}${urlNameSubpath}/`;
-const urlColorSeparator = ',';
-const responseHeaderObj = {
-  'Access-Control-Allow-Origin': '*',
-  'Access-Control-Allow-Methods': 'GET',
-  'Access-Control-Allow-Credentials': false,
-  'Access-Control-Max-Age': '86400',
-  'Access-Control-Allow-Headers': 'X-Requested-With, X-HTTP-Method-Override, Content-Type, Accept',
-  'Content-Type': 'application/json; charset=utf-8',
-};
-
-// accepts encoding
-
-// [{name: 'red', value: '#f00'}, ...]
-const colorsLists = {
-  default: colors,
-  colors: colors,
-  bestOf: colorsBestOf,
-};
-
-Object.assign(colorsLists, colorNameLists.lists);
-
-const avalibleColorNameLists = Object.keys(colorsLists);
-
-const findColors = new FindColors(colorsLists);
-
-/**
- * validates a hex color
- * @param   {string} color hex representation of color
- * @return  {boolen}
- */
-const validateColor = (color) => (
-  /^[0-9A-F]{3}([0-9A-F]{3})?$/i.test(color)
-);
-
-/**
- * responds to the client
- * @param {object} response      server response object
- * @param {object} responseObj   the actual response object
- * @param {*} statusCode         HTTP status code
- */
-const httpRespond = (
-    response,
-    responseObj = {},
-    statusCode = 200,
-    responseHeader = responseHeaderObj
-) => {
-  response.writeHead(statusCode, responseHeader);
-  const stringifiedResponse = JSON.stringify(responseObj);
-
-  if (responseHeader['Content-Encoding'] === 'gzip') {
-    // ends the response with the gziped API answer
-    zlib.gzip(stringifiedResponse, (_, result) => {
-      response.end(result);
-    });
-  } else {
-    response.end(stringifiedResponse);
-  }
-};
-
-const respondNameSearch = (
-    searchParams = new URLSearchParams(''),
-    listKey = 'default',
-    requestUrl,
-    request,
-    response,
-    responseHeader,
-) => {
-  const nameQuery = request.url.replace(requestUrl.search, '')
-  // splits the base url from everything
-  // after the API URL
-      .split(baseUrlNames)[1] || '';
-
-  // gets the name
-  const nameString = searchParams.has('name')
-                     ? searchParams.get('name') : '';
-
-  const searchString = decodeURI(nameString || nameQuery);
-
-  if (searchString.length < 3) {
-    return httpRespond(
-        response,
-        {error: {
-          status: 404,
-          message: `the color name your are looking for must be at least 3 characters long.`,
-        }},
-        404,
-        responseHeader
-    );
-  }
-
-  return httpRespond(response, {
-    colors: findColors.searchNames(searchString, listKey),
-  }, 200, responseHeader);
-};
-
-const respondValueSearch = (
-    searchParams = new URLSearchParams(''),
-    listKey = 'default',
-    requestUrl,
-    request,
-    response,
-    responseHeader
-) => {
-  const uniqueMode = searchParams.has('noduplicates')
-                    && searchParams.get('noduplicates') === 'true';
-
-  const colorQuery = request.url.replace(requestUrl.search, '')
-  // splits the base url from everything
-  // after the API URL
-      .split(baseUrl)[1] || '';
-
-  const colorListString = searchParams.has('values')
-                          ? searchParams.get('values') : '';
-
-  // gets all the colors after
-  const urlColorList = (colorQuery || colorListString).toLowerCase()
-      .split(urlColorSeparator)
-      .filter((hex) => hex);
-
-  // creates a list of invalid colors
-  const invalidColors = urlColorList.filter((hex) => (
-    !validateColor(hex) && hex
-  ));
-
-  if (invalidColors.length) {
-    return httpRespond(
-      response,
-      {
-        error: {
-          status: 404,
-          message: `'${invalidColors.join(', ')}' is not a valid HEX color`,
-        }
-      },
-      404,
-      responseHeader
-    );
-  }
-
-  let paletteTitle;
-  let colorsResponse;
-
-  if (urlColorList[0]) {
-    colorsResponse = findColors.getNamesForValues(
-        urlColorList, uniqueMode, listKey
-    );
-  } else {
-    colorsResponse = colorsLists[listKey];
-  }
-
-  if (urlColorList.length === 1) {
-    // if there is only one color, just return its name as palette title
-    paletteTitle = colorsResponse[0].name;
-  } else if (urlColorList.length > 1) {
-    // get a palette title for the returned colors
-    paletteTitle = getPaletteTitle(colorsResponse.map((color) => color.name));
-  } else {
-    // return all colors if no colors were given
-    paletteTitle = `All the ${listKey} names`;
-  }
-
-  // actual http response
-  return httpRespond(response, {
-    paletteTitle,
-    colors: colorsResponse,
-  }, 200, responseHeader);
-};
-
-/**
- * Paths:
- *
- * /                      => Error
- * /v1/                   => all colors
- * /v1/212121             => array with one color
- * /v1/212121,222,f02f123 => array with 3 color
- * /v1/names/             => all colors
- * /v1/names/red          => all colors containing the word red
- */
-
-const requestHandler = (request, response) => {
-  const requestUrl = url.parse(request.url);
-  const isAPI = requestUrl.pathname.includes(baseUrl);
-  const isNamesAPI = requestUrl.pathname.includes(urlNameSubpath + '/');
-  const responseHeader = {...responseHeaderObj};
-
-  // understanding where requests come from
-  console.info(
-      'request from',
-      request.headers.origin
-  );
-
-  if (request.headers['accept-encoding']) {
-    const accepts = request.headers['accept-encoding'];
-    if (accepts.toLowerCase().includes("gzip")) {
-      responseHeader['Content-Encoding'] = 'gzip';
-    }
-  }
-
-  let accpets = request.headers['accept-encoding'];
-
-  // makes sure the API is beeing requested
-  if (!isAPI) {
-    return httpRespond(
-      response,
-      {
-        error: {
-          status: 404,
-          message: 'invalid URL: make sure to provide the API version',
-        }
-      },
-      404,
-      responseHeader
-    );
-  }
-
-  // const search = requestUrl.search || '';
-  const searchParams = new URLSearchParams(requestUrl.search);
-
-  const goodNamesMode = searchParams.has('goodnamesonly')
-                        && searchParams.get('goodnamesonly') === 'true';
-
-  let listKey = searchParams.has('list')
-                && searchParams.get('list');
-
-  listKey = goodNamesMode ? 'bestOf' : listKey;
-  listKey = listKey || 'default';
-
-  const isValidListKey = listKey && avalibleColorNameLists.includes(listKey);
-
-  if (!isValidListKey) {
-    return httpRespond(
-      response,
-      {
-        error: {
-          status: 404,
-          message: `invalid list key: '${listKey}, available keys are: ${avalibleColorNameLists.join(', ')}`,
-        }
-      },
-      404
-    );
-  }
-
-  if (!isNamesAPI) {
-    return respondValueSearch(
-        searchParams,
-        listKey,
-        requestUrl,
-        request,
-        response,
-        responseHeader,
-    );
-  } else {
-    return respondNameSearch(
-        searchParams,
-        listKey,
-        requestUrl,
-        request,
-        response,
-        responseHeader,
-    );
-  }
-};
-
-const server = http.createServer(requestHandler);
-server.listen(port, '0.0.0.0', (error) => {
-  if (error) {
-    return console.log(`something terrible happened: ${error}`);
-  }
-  console.log(`Server running and listening on port ${port}`);
-  console.log(`http://localhost:${port}/${baseUrl}`);
-});