ol 8.1.1-dev.1694732464464 → 8.1.1-dev.1694996921032

package/color.d.ts

@@ -1,3 +1,11 @@
+/**
+ * A color represented as a short array [red, green, blue, alpha].
+ * red, green, and blue should be integers in the range 0..255 inclusive.
+ * alpha should be a float in the range 0..1 inclusive. If no alpha value is
+ * given then `1` will be used.
+ * @typedef {Array<number>} Color
+ * @api
+ */
 /**
  * Return the color as an rgba string.
  * @param {Color|string} color Color.
@@ -5,6 +13,11 @@
  * @api
  */
 export function asString(color: Color | string): string;
+/**
+ * @param {string} s String.
+ * @return {Color} Color.
+ */
+export function fromString(s: string): Color;
 /**
  * Return the color as an array. This function maintains a cache of calculated
  * arrays which means the result should not be modified.
@@ -29,11 +42,6 @@ export function toString(color: Color): string;
  * @return {boolean} Whether the string is actually a valid color
  */
 export function isStringColor(s: string): boolean;
-/**
- * @param {string} s String.
- * @return {Color} Color.
- */
-export function fromString(s: string): Color;
 /**
  * A color represented as a short array [red, green, blue, alpha].
  * red, green, and blue should be integers in the range 0..255 inclusive.

package/color.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["color.js"],"names":[],"mappings":"AA+BA;;;;;GAKG;AACH,gCAJW,QAAM,MAAM,GACX,MAAM,CAQjB;AAwED;;;;;;GAMG;AACH,+BAJW,QAAM,MAAM,SAStB;AAwDD;;;;GAIG;AACH,+CAMC;AAED;;;GAGG;AACH,wCAFY,MAAM,CAiBjB;AAED;;;GAGG;AACH,iCAHW,MAAM,GACL,OAAO,CAOlB;AA1IG;;;GAGG;AACH,8BAHW,MAAM,SAsBhB;;;;;;;oBAnGQ,MAAM,MAAM,CAAC"}
+{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["color.js"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,gCAJW,QAAM,MAAM,GACX,MAAM,CAQjB;AAoBD;;;GAGG;AACH,8BAHW,MAAM,SA8BhB;AAED;;;;;;GAMG;AACH,+BAJW,QAAM,MAAM,SAStB;AAED;;;;GAIG;AACH,+CAMC;AAED;;;GAGG;AACH,wCAFY,MAAM,CAiBjB;AAED;;;GAGG;AACH,iCAHW,MAAM,GACL,OAAO,CASlB;;;;;;;oBA/HY,MAAM,MAAM,CAAC"}

package/color.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/color
  */
-import colorNames from 'color-name';
+import parseRgba from 'color-rgba';
 import {clamp} from './math.js';
 
 /**
@@ -13,22 +13,6 @@ import {clamp} from './math.js';
  * @api
  */
 
-/**
- * This RegExp matches # followed by 3, 4, 6, or 8 hex digits.
- * @const
- * @type {RegExp}
- * @private
- */
-const HEX_COLOR_RE_ = /^#([a-f0-9]{3}|[a-f0-9]{4}(?:[a-f0-9]{2}){0,2})$/i;
-
-/**
- * Regular expression for matching potential named color style strings.
- * @const
- * @type {RegExp}
- * @private
- */
-const NAMED_COLOR_RE_ = /^([a-z]*)$|^hsla?\(.*\)$/i;
-
 /**
  * Return the color as an rgba string.
  * @param {Color|string} color Color.
@@ -43,74 +27,55 @@ export function asString(color) {
 }
 
 /**
- * Return named color as an rgb(a) string.
- * @param {string} color Named color.
- * @return {string} RGB(A) string.
+ * @type {number}
  */
-function fromNamed(color) {
-  const name = color.toLowerCase();
-  if (!colorNames.hasOwnProperty(name)) {
-    if (name === 'transparent') {
-      return 'rgba(0,0,0,0)';
-    }
-    return '';
-  }
-  const rgb = colorNames[name];
-  return 'rgb(' + rgb[0] + ',' + rgb[1] + ',' + rgb[2] + ')';
-}
+const MAX_CACHE_SIZE = 1024;
 
 /**
- * @param {string} s String.
- * @return {Color} Color.
+ * We maintain a small cache of parsed strings.  Whenever the cache grows too large,
+ * we delete an arbitrary set of the entries.
+ *
+ * @type {Object<string, Color>}
  */
-export const fromString = (function () {
-  // We maintain a small cache of parsed strings.  To provide cheap LRU-like
-  // semantics, whenever the cache grows too large we simply delete an
-  // arbitrary 25% of the entries.
+const cache = {};
 
-  /**
-   * @const
-   * @type {number}
-   */
-  const MAX_CACHE_SIZE = 1024;
-
-  /**
-   * @type {Object<string, Color>}
-   */
-  const cache = {};
-
-  /**
-   * @type {number}
-   */
-  let cacheSize = 0;
+/**
+ * @type {number}
+ */
+let cacheSize = 0;
 
-  return (
-    /**
-     * @param {string} s String.
-     * @return {Color} Color.
-     */
-    function (s) {
-      let color;
-      if (cache.hasOwnProperty(s)) {
-        color = cache[s];
-      } else {
-        if (cacheSize >= MAX_CACHE_SIZE) {
-          let i = 0;
-          for (const key in cache) {
-            if ((i++ & 3) === 0) {
-              delete cache[key];
-              --cacheSize;
-            }
-          }
-        }
-        color = fromStringInternal_(s);
-        cache[s] = color;
-        ++cacheSize;
+/**
+ * @param {string} s String.
+ * @return {Color} Color.
+ */
+export function fromString(s) {
+  if (cache.hasOwnProperty(s)) {
+    return cache[s];
+  }
+  if (cacheSize >= MAX_CACHE_SIZE) {
+    let i = 0;
+    for (const key in cache) {
+      if ((i++ & 3) === 0) {
+        delete cache[key];
+        --cacheSize;
       }
-      return color;
     }
-  );
-})();
+  }
+
+  const color = parseRgba(s);
+  if (color.length !== 4) {
+    throw new Error('Failed to parse "' + s + '" as color');
+  }
+  for (const c of color) {
+    if (isNaN(c)) {
+      throw new Error('Failed to parse "' + s + '" as color');
+    }
+  }
+  normalize(color);
+  cache[s] = color;
+  ++cacheSize;
+  return color;
+}
 
 /**
  * Return the color as an array. This function maintains a cache of calculated
@@ -126,60 +91,6 @@ export function asArray(color) {
   return fromString(color);
 }
 
-/**
- * @param {string} s String.
- * @private
- * @return {Color} Color.
- */
-function fromStringInternal_(s) {
-  let r, g, b, a, color;
-
-  if (NAMED_COLOR_RE_.exec(s)) {
-    s = fromNamed(s);
-  }
-
-  if (HEX_COLOR_RE_.exec(s)) {
-    // hex
-    const n = s.length - 1; // number of hex digits
-    let d; // number of digits per channel
-    if (n <= 4) {
-      d = 1;
-    } else {
-      d = 2;
-    }
-    const hasAlpha = n === 4 || n === 8;
-    r = parseInt(s.substr(1 + 0 * d, d), 16);
-    g = parseInt(s.substr(1 + 1 * d, d), 16);
-    b = parseInt(s.substr(1 + 2 * d, d), 16);
-    if (hasAlpha) {
-      a = parseInt(s.substr(1 + 3 * d, d), 16);
-    } else {
-      a = 255;
-    }
-    if (d == 1) {
-      r = (r << 4) + r;
-      g = (g << 4) + g;
-      b = (b << 4) + b;
-      if (hasAlpha) {
-        a = (a << 4) + a;
-      }
-    }
-    color = [r, g, b, a / 255];
-  } else if (s.startsWith('rgba(')) {
-    // rgba()
-    color = s.slice(5, -1).split(',').map(Number);
-    normalize(color);
-  } else if (s.startsWith('rgb(')) {
-    // rgb()
-    color = s.slice(4, -1).split(',').map(Number);
-    color.push(1);
-    normalize(color);
-  } else {
-    throw new Error('Invalid color');
-  }
-  return color;
-}
-
 /**
  * Exported for the tests.
  * @param {Color} color Color.
@@ -219,8 +130,10 @@ export function toString(color) {
  * @return {boolean} Whether the string is actually a valid color
  */
 export function isStringColor(s) {
-  if (NAMED_COLOR_RE_.test(s)) {
-    s = fromNamed(s);
+  try {
+    fromString(s);
+    return true;
+  } catch (_) {
+    return false;
   }
-  return HEX_COLOR_RE_.test(s) || s.startsWith('rgba(') || s.startsWith('rgb(');
 }