css-color-parser-h 2.0.1 → 2.0.2

package/dist/css-color-parser-h.umd.js

@@ -1182,498 +1182,21 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "default": function() { return /* binding */ main; }
+  "CssColorParser": function() { return /* reexport */ src_CssColorParser; },
+  "fromArray": function() { return /* reexport */ fromArray; },
+  "fromColorStr": function() { return /* reexport */ fromColorStr; },
+  "fromHSL": function() { return /* reexport */ fromHSL; },
+  "fromHWB": function() { return /* reexport */ fromHWB; },
+  "fromJson": function() { return /* reexport */ fromJson; },
+  "fromRandom": function() { return /* reexport */ fromRandom; },
+  "parseCssColorStr": function() { return /* reexport */ parseCssColorStr; },
+  "parseHEX": function() { return /* reexport */ parseHEX; },
+  "parseHSLA": function() { return /* reexport */ parseHSLA; },
+  "parseHWB": function() { return /* reexport */ parseHWB; },
+  "parseKeyWord": function() { return /* reexport */ parseKeyWord; },
+  "parseRGBA": function() { return /* reexport */ parseRGBA; }
 });
 
-// NAMESPACE OBJECT: ./src/utils/parsers.ts
-var parsers_namespaceObject = {};
-__webpack_require__.r(parsers_namespaceObject);
-__webpack_require__.d(parsers_namespaceObject, {
-  "fromArray": function() { return fromArray; },
-  "fromColorStr": function() { return fromColorStr; },
-  "fromHSL": function() { return fromHSL; },
-  "fromHWB": function() { return fromHWB; },
-  "fromJson": function() { return fromJson; },
-  "fromRandom": function() { return fromRandom; },
-  "parseCssColorStr": function() { return parseCssColorStr; },
-  "parseHEX": function() { return parseHEX; },
-  "parseHSLA": function() { return parseHSLA; },
-  "parseHWB": function() { return parseHWB; },
-  "parseKeyWord": function() { return parseKeyWord; },
-  "parseRGBA": function() { return parseRGBA; }
-});
-
-;// CONCATENATED MODULE: ./node_modules/tslib/tslib.es6.js
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var _extendStatics = function extendStatics(d, b) {
-  _extendStatics = Object.setPrototypeOf || {
-    __proto__: []
-  } instanceof Array && function (d, b) {
-    d.__proto__ = b;
-  } || function (d, b) {
-    for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
-  };
-  return _extendStatics(d, b);
-};
-function __extends(d, b) {
-  if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-  _extendStatics(d, b);
-  function __() {
-    this.constructor = d;
-  }
-  d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-var _assign = function __assign() {
-  _assign = Object.assign || function __assign(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-      s = arguments[i];
-      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-    }
-    return t;
-  };
-  return _assign.apply(this, arguments);
-};
-
-function __rest(s, e) {
-  var t = {};
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-}
-function __decorate(decorators, target, key, desc) {
-  var c = arguments.length,
-    r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
-    d;
-  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-function __param(paramIndex, decorator) {
-  return function (target, key) {
-    decorator(target, key, paramIndex);
-  };
-}
-function __esDecorate(ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-  function accept(f) {
-    if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected");
-    return f;
-  }
-  var kind = contextIn.kind,
-    key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-  var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
-  var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-  var _,
-    done = false;
-  for (var i = decorators.length - 1; i >= 0; i--) {
-    var context = {};
-    for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
-    for (var p in contextIn.access) context.access[p] = contextIn.access[p];
-    context.addInitializer = function (f) {
-      if (done) throw new TypeError("Cannot add initializers after decoration has completed");
-      extraInitializers.push(accept(f || null));
-    };
-    var result = (0, decorators[i])(kind === "accessor" ? {
-      get: descriptor.get,
-      set: descriptor.set
-    } : descriptor[key], context);
-    if (kind === "accessor") {
-      if (result === void 0) continue;
-      if (result === null || _typeof(result) !== "object") throw new TypeError("Object expected");
-      if (_ = accept(result.get)) descriptor.get = _;
-      if (_ = accept(result.set)) descriptor.set = _;
-      if (_ = accept(result.init)) initializers.unshift(_);
-    } else if (_ = accept(result)) {
-      if (kind === "field") initializers.unshift(_);else descriptor[key] = _;
-    }
-  }
-  if (target) Object.defineProperty(target, contextIn.name, descriptor);
-  done = true;
-}
-;
-function __runInitializers(thisArg, initializers, value) {
-  var useValue = arguments.length > 2;
-  for (var i = 0; i < initializers.length; i++) {
-    value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-  }
-  return useValue ? value : void 0;
-}
-;
-function __propKey(x) {
-  return _typeof(x) === "symbol" ? x : "".concat(x);
-}
-;
-function __setFunctionName(f, name, prefix) {
-  if (_typeof(name) === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
-  return Object.defineProperty(f, "name", {
-    configurable: true,
-    value: prefix ? "".concat(prefix, " ", name) : name
-  });
-}
-;
-function __metadata(metadataKey, metadataValue) {
-  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-function __awaiter(thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function (resolve) {
-      resolve(value);
-    });
-  }
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step(result) {
-      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-}
-function __generator(thisArg, body) {
-  var _ = {
-      label: 0,
-      sent: function sent() {
-        if (t[0] & 1) throw t[1];
-        return t[1];
-      },
-      trys: [],
-      ops: []
-    },
-    f,
-    y,
-    t,
-    g;
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
-    return this;
-  }), g;
-  function verb(n) {
-    return function (v) {
-      return step([n, v]);
-    };
-  }
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-    while (g && (g = 0, op[0] && (_ = 0)), _) try {
-      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-      if (y = 0, t) op = [op[0] & 2, t.value];
-      switch (op[0]) {
-        case 0:
-        case 1:
-          t = op;
-          break;
-        case 4:
-          _.label++;
-          return {
-            value: op[1],
-            done: false
-          };
-        case 5:
-          _.label++;
-          y = op[1];
-          op = [0];
-          continue;
-        case 7:
-          op = _.ops.pop();
-          _.trys.pop();
-          continue;
-        default:
-          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-            _ = 0;
-            continue;
-          }
-          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-            _.label = op[1];
-            break;
-          }
-          if (op[0] === 6 && _.label < t[1]) {
-            _.label = t[1];
-            t = op;
-            break;
-          }
-          if (t && _.label < t[2]) {
-            _.label = t[2];
-            _.ops.push(op);
-            break;
-          }
-          if (t[2]) _.ops.pop();
-          _.trys.pop();
-          continue;
-      }
-      op = body.call(thisArg, _);
-    } catch (e) {
-      op = [6, e];
-      y = 0;
-    } finally {
-      f = t = 0;
-    }
-    if (op[0] & 5) throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-}
-var __createBinding = Object.create ? function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  var desc = Object.getOwnPropertyDescriptor(m, k);
-  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-    desc = {
-      enumerable: true,
-      get: function get() {
-        return m[k];
-      }
-    };
-  }
-  Object.defineProperty(o, k2, desc);
-} : function (o, m, k, k2) {
-  if (k2 === undefined) k2 = k;
-  o[k2] = m[k];
-};
-function __exportStar(m, o) {
-  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(o, p)) __createBinding(o, m, p);
-}
-function __values(o) {
-  var s = typeof Symbol === "function" && Symbol.iterator,
-    m = s && o[s],
-    i = 0;
-  if (m) return m.call(o);
-  if (o && typeof o.length === "number") return {
-    next: function next() {
-      if (o && i >= o.length) o = void 0;
-      return {
-        value: o && o[i++],
-        done: !o
-      };
-    }
-  };
-  throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-function __read(o, n) {
-  var m = typeof Symbol === "function" && o[Symbol.iterator];
-  if (!m) return o;
-  var i = m.call(o),
-    r,
-    ar = [],
-    e;
-  try {
-    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-  } catch (error) {
-    e = {
-      error: error
-    };
-  } finally {
-    try {
-      if (r && !r.done && (m = i["return"])) m.call(i);
-    } finally {
-      if (e) throw e.error;
-    }
-  }
-  return ar;
-}
-
-/** @deprecated */
-function __spread() {
-  for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
-  return ar;
-}
-
-/** @deprecated */
-function __spreadArrays() {
-  for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-  for (var r = Array(s), k = 0, i = 0; i < il; i++) for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++) r[k] = a[j];
-  return r;
-}
-function __spreadArray(to, from, pack) {
-  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-    if (ar || !(i in from)) {
-      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-      ar[i] = from[i];
-    }
-  }
-  return to.concat(ar || Array.prototype.slice.call(from));
-}
-function __await(v) {
-  return this instanceof __await ? (this.v = v, this) : new __await(v);
-}
-function __asyncGenerator(thisArg, _arguments, generator) {
-  if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-  var g = generator.apply(thisArg, _arguments || []),
-    i,
-    q = [];
-  return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () {
-    return this;
-  }, i;
-  function verb(n) {
-    if (g[n]) i[n] = function (v) {
-      return new Promise(function (a, b) {
-        q.push([n, v, a, b]) > 1 || resume(n, v);
-      });
-    };
-  }
-  function resume(n, v) {
-    try {
-      step(g[n](v));
-    } catch (e) {
-      settle(q[0][3], e);
-    }
-  }
-  function step(r) {
-    r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r);
-  }
-  function fulfill(value) {
-    resume("next", value);
-  }
-  function reject(value) {
-    resume("throw", value);
-  }
-  function settle(f, v) {
-    if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]);
-  }
-}
-function __asyncDelegator(o) {
-  var i, p;
-  return i = {}, verb("next"), verb("throw", function (e) {
-    throw e;
-  }), verb("return"), i[Symbol.iterator] = function () {
-    return this;
-  }, i;
-  function verb(n, f) {
-    i[n] = o[n] ? function (v) {
-      return (p = !p) ? {
-        value: __await(o[n](v)),
-        done: false
-      } : f ? f(v) : v;
-    } : f;
-  }
-}
-function __asyncValues(o) {
-  if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-  var m = o[Symbol.asyncIterator],
-    i;
-  return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () {
-    return this;
-  }, i);
-  function verb(n) {
-    i[n] = o[n] && function (v) {
-      return new Promise(function (resolve, reject) {
-        v = o[n](v), settle(resolve, reject, v.done, v.value);
-      });
-    };
-  }
-  function settle(resolve, reject, d, v) {
-    Promise.resolve(v).then(function (v) {
-      resolve({
-        value: v,
-        done: d
-      });
-    }, reject);
-  }
-}
-function __makeTemplateObject(cooked, raw) {
-  if (Object.defineProperty) {
-    Object.defineProperty(cooked, "raw", {
-      value: raw
-    });
-  } else {
-    cooked.raw = raw;
-  }
-  return cooked;
-}
-;
-var __setModuleDefault = Object.create ? function (o, v) {
-  Object.defineProperty(o, "default", {
-    enumerable: true,
-    value: v
-  });
-} : function (o, v) {
-  o["default"] = v;
-};
-function __importStar(mod) {
-  if (mod && mod.__esModule) return mod;
-  var result = {};
-  if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-  __setModuleDefault(result, mod);
-  return result;
-}
-function __importDefault(mod) {
-  return mod && mod.__esModule ? mod : {
-    "default": mod
-  };
-}
-function __classPrivateFieldGet(receiver, state, kind, f) {
-  if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-  return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-}
-function __classPrivateFieldSet(receiver, state, value, kind, f) {
-  if (kind === "m") throw new TypeError("Private method is not writable");
-  if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-  return kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value), value;
-}
-function __classPrivateFieldIn(state, receiver) {
-  if (receiver === null || _typeof(receiver) !== "object" && typeof receiver !== "function") throw new TypeError("Cannot use 'in' operator on non-object");
-  return typeof state === "function" ? receiver === state : state.has(receiver);
-}
-/* harmony default export */ var tslib_es6 = ({
-  __extends: __extends,
-  __assign: _assign,
-  __rest: __rest,
-  __decorate: __decorate,
-  __param: __param,
-  __metadata: __metadata,
-  __awaiter: __awaiter,
-  __generator: __generator,
-  __createBinding: __createBinding,
-  __exportStar: __exportStar,
-  __values: __values,
-  __read: __read,
-  __spread: __spread,
-  __spreadArrays: __spreadArrays,
-  __spreadArray: __spreadArray,
-  __await: __await,
-  __asyncGenerator: __asyncGenerator,
-  __asyncDelegator: __asyncDelegator,
-  __asyncValues: __asyncValues,
-  __makeTemplateObject: __makeTemplateObject,
-  __importStar: __importStar,
-  __importDefault: __importDefault,
-  __classPrivateFieldGet: __classPrivateFieldGet,
-  __classPrivateFieldSet: __classPrivateFieldSet,
-  __classPrivateFieldIn: __classPrivateFieldIn
-});
 ;// CONCATENATED MODULE: ./src/utils/common.ts
 var Check = /** @class */ (function () {
     function Check() {
@@ -1722,6 +1245,151 @@ function setNumberPrecision(number, precision) {
     return Number(number.toFixed(precision));
 }
 
+;// CONCATENATED MODULE: ./src/utils/color-tools.ts
+
+/*
+ * @Author: roman_123
+ * @Description: 部分核心代码修改自cesium
+ * @Date: 2022-11-28 17:32:57
+ * @LastEditTime: 2022-12-06 00:02:21
+ */
+var CssColorStringParser = /** @class */ (function () {
+    function CssColorStringParser() {
+    }
+    // 去除字符串内所有空格
+    CssColorStringParser.clearStrSpace = function (v) {
+        return v.replace(/\s/g, '');
+    };
+    // 去除字符串两边空格,将中间多个空格合并为一个
+    CssColorStringParser.trimStr = function (v) {
+        v = v.replace(/\s+/g, ' ');
+        return v.trim();
+    };
+    // 解析3位16进制 #fff #fff0 
+    CssColorStringParser.parse3BitsHEX = function (v) {
+        var regx = /^#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])?$/i;
+        var res = regx.exec(v);
+        if (res) {
+            var res4 = defaultValue(res[4], 'f');
+            var r = CssColorStringParser._parseResStrForRgb(parseInt(res[1] + res[1], 16));
+            var g = CssColorStringParser._parseResStrForRgb(parseInt(res[2] + res[2], 16));
+            var b = CssColorStringParser._parseResStrForRgb(parseInt(res[3] + res[3], 16));
+            var a = CssColorStringParser._parsePercent(parseInt(res4 + res4, 16) / 255);
+            return [r, g, b, a];
+        }
+        return null;
+    };
+    // 解析6位16进制 #ffffff #ffffff00
+    CssColorStringParser.parse6BitsHEX = function (v) {
+        var regx = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})?$/i;
+        var res = regx.exec(v);
+        if (res) {
+            var res4 = defaultValue(res[4], 'ff');
+            var r = CssColorStringParser._parseResStrForRgb(parseInt(res[1], 16));
+            var g = CssColorStringParser._parseResStrForRgb(parseInt(res[2], 16));
+            var b = CssColorStringParser._parseResStrForRgb(parseInt(res[3], 16));
+            var a = CssColorStringParser._parsePercent(parseInt(res4, 16) / 255.0);
+            return [r, g, b, a];
+        }
+        return null;
+    };
+    // 解析rgb rgba  rgb(255,255,255) rgba(255,255,255,1) rgba(100%,100%,100%, 1)
+    CssColorStringParser.parseRGBA = function (v) {
+        var regx = /^rgba?\(([0-9.]+%?),([0-9.]+%?),([0-9.]+%?)(?:,([0-9.]+%?))?\)$/i;
+        var res = regx.exec(v);
+        if (res) {
+            var r = CssColorStringParser._parseResStrForRgb(res[1]);
+            var g = CssColorStringParser._parseResStrForRgb(res[2]);
+            var b = CssColorStringParser._parseResStrForRgb(res[3]);
+            var a = CssColorStringParser._parsePercent(res[4]);
+            return [r, g, b, a];
+        }
+        return null;
+    };
+    // 解析hsl hsla  hsl(360,100%,100%) hsla(360,100%,100%,1)
+    CssColorStringParser.parseHSLA = function (v) {
+        var regx = /^hsla?\(([0-9.]+)(?:deg)?,([0-9.]+%?),([0-9.]+%?)(?:,([0-9.]+%?))?\)$/i;
+        var res = regx.exec(v);
+        if (res) {
+            var h = CssColorStringParser._parseResStrForHue(res[1]);
+            var s = CssColorStringParser._parsePercent(res[2]);
+            var l = CssColorStringParser._parsePercent(res[3]);
+            var a = CssColorStringParser._parsePercent(res[4]);
+            return [h, s, l, a];
+        }
+        return null;
+    };
+    // 解析hwb
+    CssColorStringParser.parseHWB = function (v) {
+        var regx = /^hwb\s?\(\s?([0-9.]+)(?:deg)?\s([0-9.]+%?)\s([0-9.]+%?)\s?(?:\/\s?([0-9.]+%?))?\s?\)$/i;
+        var res = regx.exec(v);
+        if (res) {
+            var h = CssColorStringParser._parseResStrForHue(res[1]);
+            var w = CssColorStringParser._parsePercent(res[2]);
+            var b = CssColorStringParser._parsePercent(res[3]);
+            var a = CssColorStringParser._parsePercent(res[4]);
+            return [h, w, b, a];
+        }
+        return null;
+    };
+    // 解析rgb rgb(178 57 57 / 44%) 字符串中存在空格，因此使用清除两侧空格的原始字符串
+    CssColorStringParser.parseRGBA2 = function (v) {
+        var regx = /^rgba?\s?\(\s?([0-9.]+%?)\s?([0-9.]+%?)\s?([0-9.]+%?)(?:\s?\/\s?([0-9.]+%?))?\s?\)$/i;
+        var res = regx.exec(v);
+        if (res) {
+            var r = CssColorStringParser._parseResStrForRgb(res[1]);
+            var g = CssColorStringParser._parseResStrForRgb(res[2]);
+            var b = CssColorStringParser._parseResStrForRgb(res[3]);
+            var a = CssColorStringParser._parsePercent(res[4]);
+            return [r, g, b, a];
+        }
+        return null;
+    };
+    // 解析hsl hsl(215 85% 62% / 1)
+    CssColorStringParser.parseHSLA2 = function (v) {
+        var regx = /^hsla?\s?\(\s?([0-9.]+)(?:deg)?\s([0-9.]+%?)\s([0-9.]+%?)\s?(?:\/\s?([0-9.]+%?))?\s?\)$/i;
+        var res = regx.exec(v);
+        if (res) {
+            var h = CssColorStringParser._parseResStrForHue(res[1]);
+            var s = CssColorStringParser._parsePercent(res[2]);
+            var l = CssColorStringParser._parsePercent(res[3]);
+            var a = CssColorStringParser._parsePercent(res[4]);
+            return [h, s, l, a];
+        }
+        return null;
+    };
+    // 将结果解析为数字
+    CssColorStringParser._parseResStrForRgb = function (v) {
+        if (typeof v === 'string') {
+            v = parseFloat(v) / ('%' === v.substr(-1) ? 100.0 / 255 : 1);
+        }
+        if (isNaN(v)) {
+            v = 1;
+        }
+        return limitNumber(0, 255, v);
+    };
+    CssColorStringParser._parseResStrForHue = function (v) {
+        if (typeof v === 'string') {
+            v = parseFloat(v);
+        }
+        if (isNaN(v)) {
+            v = 0;
+        }
+        return limitNumber(0, 360, v);
+    };
+    CssColorStringParser._parsePercent = function (v) {
+        if (typeof v === 'string') {
+            v = parseFloat(v) / ('%' === v.substr(-1) ? 100.0 : 1);
+        }
+        if (isNaN(v)) {
+            v = 1;
+        }
+        return limitNumber(0, 1, v);
+    };
+    return CssColorStringParser;
+}());
+
+
 ;// CONCATENATED MODULE: ./src/CssColorParser.ts
 /*
  * @Descripttion: 颜色解析器
@@ -1729,9 +1397,10 @@ function setNumberPrecision(number, precision) {
  * @Author: roman_123
  * @Date: 2021-01-19 09:22:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-05-26 11:20:17
+ * @LastEditTime: 2023-05-26 15:59:40
  */
 
+
 var CssColorParser = /** @class */ (function () {
     function CssColorParser(red, green, blue, alpha) {
         this.r = 255;
@@ -1863,154 +1532,72 @@ var CssColorParser = /** @class */ (function () {
                 this.a === color.a);
         }
     };
-    return CssColorParser;
-}());
-/* harmony default export */ var src_CssColorParser = (CssColorParser);
-
-;// CONCATENATED MODULE: ./src/utils/color-tools.ts
-
-/*
- * @Author: roman_123
- * @Description: 部分核心代码修改自cesium
- * @Date: 2022-11-28 17:32:57
- * @LastEditTime: 2022-12-06 00:02:21
- */
-var CssColorStringParser = /** @class */ (function () {
-    function CssColorStringParser() {
-    }
-    // 去除字符串内所有空格
-    CssColorStringParser.clearStrSpace = function (v) {
-        return v.replace(/\s/g, '');
-    };
-    // 去除字符串两边空格,将中间多个空格合并为一个
-    CssColorStringParser.trimStr = function (v) {
-        v = v.replace(/\s+/g, ' ');
-        return v.trim();
-    };
-    // 解析3位16进制 #fff #fff0 
-    CssColorStringParser.parse3BitsHEX = function (v) {
-        var regx = /^#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])?$/i;
-        var res = regx.exec(v);
-        if (res) {
-            var res4 = defaultValue(res[4], 'f');
-            var r = CssColorStringParser._parseResStrForRgb(parseInt(res[1] + res[1], 16));
-            var g = CssColorStringParser._parseResStrForRgb(parseInt(res[2] + res[2], 16));
-            var b = CssColorStringParser._parseResStrForRgb(parseInt(res[3] + res[3], 16));
-            var a = CssColorStringParser._parsePercent(parseInt(res4 + res4, 16) / 255);
-            return [r, g, b, a];
-        }
-        return null;
-    };
-    // 解析6位16进制 #ffffff #ffffff00
-    CssColorStringParser.parse6BitsHEX = function (v) {
-        var regx = /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})?$/i;
-        var res = regx.exec(v);
-        if (res) {
-            var res4 = defaultValue(res[4], 'ff');
-            var r = CssColorStringParser._parseResStrForRgb(parseInt(res[1], 16));
-            var g = CssColorStringParser._parseResStrForRgb(parseInt(res[2], 16));
-            var b = CssColorStringParser._parseResStrForRgb(parseInt(res[3], 16));
-            var a = CssColorStringParser._parsePercent(parseInt(res4, 16) / 255.0);
-            return [r, g, b, a];
-        }
-        return null;
-    };
-    // 解析rgb rgba  rgb(255,255,255) rgba(255,255,255,1) rgba(100%,100%,100%, 1)
-    CssColorStringParser.parseRGBA = function (v) {
-        var regx = /^rgba?\(([0-9.]+%?),([0-9.]+%?),([0-9.]+%?)(?:,([0-9.]+%?))?\)$/i;
-        var res = regx.exec(v);
-        if (res) {
-            var r = CssColorStringParser._parseResStrForRgb(res[1]);
-            var g = CssColorStringParser._parseResStrForRgb(res[2]);
-            var b = CssColorStringParser._parseResStrForRgb(res[3]);
-            var a = CssColorStringParser._parsePercent(res[4]);
-            return [r, g, b, a];
-        }
-        return null;
-    };
-    // 解析hsl hsla  hsl(360,100%,100%) hsla(360,100%,100%,1)
-    CssColorStringParser.parseHSLA = function (v) {
-        var regx = /^hsla?\(([0-9.]+)(?:deg)?,([0-9.]+%?),([0-9.]+%?)(?:,([0-9.]+%?))?\)$/i;
-        var res = regx.exec(v);
-        if (res) {
-            var h = CssColorStringParser._parseResStrForHue(res[1]);
-            var s = CssColorStringParser._parsePercent(res[2]);
-            var l = CssColorStringParser._parsePercent(res[3]);
-            var a = CssColorStringParser._parsePercent(res[4]);
-            return [h, s, l, a];
-        }
-        return null;
-    };
-    // 解析hwb
-    CssColorStringParser.parseHWB = function (v) {
-        var regx = /^hwb\s?\(\s?([0-9.]+)(?:deg)?\s([0-9.]+%?)\s([0-9.]+%?)\s?(?:\/\s?([0-9.]+%?))?\s?\)$/i;
-        var res = regx.exec(v);
-        if (res) {
-            var h = CssColorStringParser._parseResStrForHue(res[1]);
-            var w = CssColorStringParser._parsePercent(res[2]);
-            var b = CssColorStringParser._parsePercent(res[3]);
-            var a = CssColorStringParser._parsePercent(res[4]);
-            return [h, w, b, a];
-        }
-        return null;
-    };
-    // 解析rgb rgb(178 57 57 / 44%) 字符串中存在空格，因此使用清除两侧空格的原始字符串
-    CssColorStringParser.parseRGBA2 = function (v) {
-        var regx = /^rgba?\s?\(\s?([0-9.]+%?)\s?([0-9.]+%?)\s?([0-9.]+%?)(?:\s?\/\s?([0-9.]+%?))?\s?\)$/i;
-        var res = regx.exec(v);
-        if (res) {
-            var r = CssColorStringParser._parseResStrForRgb(res[1]);
-            var g = CssColorStringParser._parseResStrForRgb(res[2]);
-            var b = CssColorStringParser._parseResStrForRgb(res[3]);
-            var a = CssColorStringParser._parsePercent(res[4]);
-            return [r, g, b, a];
+    /**
+     * @description: 解析16进制颜色
+     * @param {string} v
+     * @return {CssColorParser}
+     * @example: parseHEX('#FFF')
+     */
+    CssColorParser.parseHEX = function (v) {
+        var cssStr = CssColorStringParser.clearStrSpace(v);
+        var res = CssColorStringParser.parse3BitsHEX(cssStr);
+        if (!res) {
+            res = CssColorStringParser.parse6BitsHEX(cssStr);
         }
-        return null;
+        return res && CssColorParser.fromArray(res);
     };
-    // 解析hsl hsl(215 85% 62% / 1)
-    CssColorStringParser.parseHSLA2 = function (v) {
-        var regx = /^hsla?\s?\(\s?([0-9.]+)(?:deg)?\s([0-9.]+%?)\s([0-9.]+%?)\s?(?:\/\s?([0-9.]+%?))?\s?\)$/i;
-        var res = regx.exec(v);
-        if (res) {
-            var h = CssColorStringParser._parseResStrForHue(res[1]);
-            var s = CssColorStringParser._parsePercent(res[2]);
-            var l = CssColorStringParser._parsePercent(res[3]);
-            var a = CssColorStringParser._parsePercent(res[4]);
-            return [h, s, l, a];
+    /**
+     * @description: 解析rgba、rgb颜色
+     * @param {string} v
+     * @return {CssColorParser}
+     * @example: parseRGBA('rgba(255,255,255,1)')
+     */
+    CssColorParser.parseRGBA = function (v) {
+        var cssStr = CssColorStringParser.clearStrSpace(v);
+        var res = CssColorStringParser.parseRGBA(cssStr);
+        if (!res) {
+            var cssStr2 = CssColorStringParser.trimStr(v);
+            res = CssColorStringParser.parseRGBA2(cssStr2);
         }
-        return null;
+        return res && CssColorParser.fromArray(res);
     };
-    // 将结果解析为数字
-    CssColorStringParser._parseResStrForRgb = function (v) {
-        if (typeof v === 'string') {
-            v = parseFloat(v) / ('%' === v.substr(-1) ? 100.0 / 255 : 1);
-        }
-        if (isNaN(v)) {
-            v = 1;
-        }
-        return limitNumber(0, 255, v);
+    /**
+     * @description: 将ColorJson格式的json数据转换为解析对象
+     * @param {ColorJson} json
+     * @return {CssColorParser}
+     * @example: fromJson({r: 255, g: 255, b: 255, a: 1})
+     */
+    CssColorParser.fromJson = function (json) {
+        return new CssColorParser(json.r, json.g, json.b, json.a);
     };
-    CssColorStringParser._parseResStrForHue = function (v) {
-        if (typeof v === 'string') {
-            v = parseFloat(v);
-        }
-        if (isNaN(v)) {
-            v = 0;
-        }
-        return limitNumber(0, 360, v);
+    /**
+     * @description: 将RGBA数组转换为解析对象
+     * @param {Array} color
+     * @return {CssColorParser}
+     * @example: fromJson([255,255,255,1])
+     */
+    CssColorParser.fromArray = function (color) {
+        return new CssColorParser(color[0], color[1], color[2], color[3]);
     };
-    CssColorStringParser._parsePercent = function (v) {
-        if (typeof v === 'string') {
-            v = parseFloat(v) / ('%' === v.substr(-1) ? 100.0 : 1);
-        }
-        if (isNaN(v)) {
-            v = 1;
-        }
-        return limitNumber(0, 1, v);
+    /**
+     * @description: 产生随机颜色
+     * @return {CssColorParser}
+     * @example: fromRandom(new CssColorParser(0,0,0,0), new CssColorParser(255,255,255,1))
+     */
+    CssColorParser.fromRandom = function (color1, color2) {
+        var r = Math.random() * Math.abs(color2.r - color1.r) +
+            Math.min(color1.r, color2.r);
+        var g = Math.random() * Math.abs(color2.g - color1.g) +
+            Math.min(color1.g, color2.g);
+        var b = Math.random() * Math.abs(color2.b - color1.b) +
+            Math.min(color1.b, color2.b);
+        var a = Math.random() * Math.abs(color2.a - color1.a) +
+            Math.min(color1.a, color2.a);
+        return new CssColorParser(r, g, b, a);
     };
-    return CssColorStringParser;
+    return CssColorParser;
 }());
-
+/* harmony default export */ var src_CssColorParser = (CssColorParser);
 
 // EXTERNAL MODULE: ./node_modules/color-convert/index.js
 var color_convert = __webpack_require__(907);
@@ -2020,11 +1607,23 @@ var color_convert_default = /*#__PURE__*/__webpack_require__.n(color_convert);
 
 
 
+/**
+ * @description: 解析颜色关键字
+ * @param {string} v
+ * @return {CssColorParser}
+ * @example: parseKeyWord('red')
+ */
 function parseKeyWord(v) {
     var cssStr = CssColorStringParser.clearStrSpace(v);
     var res = color_convert_default().keyword.rgb(cssStr);
     return res && fromArray(res);
 }
+/**
+ * @description: 解析16进制字符串
+ * @param {string} v
+ * @return {CssColorParser}
+ * @example: parseHEX('#FFF')
+ */
 function parseHEX(v) {
     var cssStr = CssColorStringParser.clearStrSpace(v);
     var res = CssColorStringParser.parse3BitsHEX(cssStr);
@@ -2033,6 +1632,12 @@ function parseHEX(v) {
     }
     return res && fromArray(res);
 }
+/**
+ * @description: 解析RGBA
+ * @param {string} v
+ * @return {CssColorParser}
+ * @example: parseRGBA('rgba(255,255,255,1)')
+ */
 function parseRGBA(v) {
     var cssStr = CssColorStringParser.clearStrSpace(v);
     var res = CssColorStringParser.parseRGBA(cssStr);
@@ -2042,6 +1647,12 @@ function parseRGBA(v) {
     }
     return res && fromArray(res);
 }
+/**
+ * @description: 解析HSLA
+ * @param {string} v
+ * @return {CssColorParser}
+ * @example: parseHSLA('hsla(215,85%,62%,0.8)')
+ */
 function parseHSLA(v) {
     var cssStr = CssColorStringParser.clearStrSpace(v);
     var res = CssColorStringParser.parseHSLA(cssStr);
@@ -2051,6 +1662,12 @@ function parseHSLA(v) {
     }
     return res && fromHSL(res[0], res[1], res[2], res[3]);
 }
+/**
+ * @description: 解析HWB
+ * @param {string} v
+ * @return {CssColorParser}
+ * @example: parseHWB('hwb(215deg 30% 6% / 80%)')
+ */
 function parseHWB(v) {
     var cssStr2 = CssColorStringParser.trimStr(v);
     var res = CssColorStringParser.parseHWB(cssStr2);
@@ -2105,10 +1722,10 @@ function fromHWB(h, w, b, a) {
     return new src_CssColorParser(res[0], res[1], res[2], defaultValue(Number(a), 1));
 }
 /**
-   * @description: 从解析器中产生随机颜色
-   * @return {CssColorParser}
-   * @author: roman_123
-   */
+ * @description: 产生随机颜色
+ * @return {CssColorParser}
+ * @example: fromRandom('#000', ''#fff)
+ */
 function fromRandom(color1, color2) {
     if (typeof color1 === 'string') {
         color1 = parseCssColorStr(color1);
@@ -2149,16 +1766,15 @@ function fromArray(color) {
 }
 
 ;// CONCATENATED MODULE: ./src/main.ts
-
 /*
  * @Author: roman_123
  * @Description:
  * @Date: 2023-05-25 17:45:22
- * @LastEditTime: 2023-05-26 15:01:18
+ * @LastEditTime: 2023-05-26 15:54:02
  */
 
 
-/* harmony default export */ var main = (_assign({ CssColorParser: src_CssColorParser }, parsers_namespaceObject));
+
 
 }();
 /******/ 	return __webpack_exports__;